Skip to content

Commit

Permalink
refactor: update code for strict checking
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielpeintner
danielpeintner committed Sep 6, 2023
1 parent 4c02b9e commit a6c9f9f
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 31 deletions.
14 changes: 12 additions & 2 deletions packages/binding-mbus/src/mbus-client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ export default class MBusClient implements ProtocolClient {
new MBusConnection(host, port, { connectionTimeout: form["mbus:timeout"] || DEFAULT_TIMEOUT })
);
connection = this._connections.get(hostAndPort);
if (!connection) {
debug(`MbusConnection undefined`);
throw new Error("MbusConnection undefined");
}
} else {
debug(`Reusing MbusConnection for ${hostAndPort}`);
}
Expand All @@ -124,8 +128,14 @@ export default class MBusClient implements ProtocolClient {
const query = parsed.searchParams;

input["mbus:unitID"] = parseInt(pathComp[1], 10) || input["mbus:unitID"];
input["mbus:offset"] = parseInt(query.get("offset"), 10) || input["mbus:offset"];
input["mbus:timeout"] = parseInt(query.get("timeout"), 10) || input["mbus:timeout"];
const stringOffset = query.get("offset");
if (stringOffset !== null) {
input["mbus:offset"] = parseInt(stringOffset, 10);
}
const stringTimeout = query.get("timeout");
if (stringTimeout !== null) {
input["mbus:timeout"] = parseInt(stringTimeout, 10);
}
}

private validateAndFillDefaultForm(form: MBusForm): MBusForm {
Expand Down
65 changes: 39 additions & 26 deletions packages/binding-mbus/src/mbus-connection.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ export class MBusConnection {
client: any; // MBusClient.IMBusRTU
connecting: boolean;
connected: boolean;
timer: NodeJS.Timer; // connection idle timer
currentTransaction: MBusTransaction; // transaction currently in progress or null
timer?: NodeJS.Timer; // connection idle timer
currentTransaction?: MBusTransaction; // transaction currently in progress or undefined
queue: Array<MBusTransaction>; // queue of further transactions
config: {
connectionTimeout?: number;
operationTimeout?: number;
connectionRetryTime?: number;
maxRetries?: number;
maxRetries: number;
};

constructor(
Expand All @@ -92,8 +92,8 @@ export class MBusConnection {
});
this.connecting = false;
this.connected = false;
this.timer = null;
this.currentTransaction = null;
this.timer = undefined;
this.currentTransaction = undefined;
this.queue = new Array<MBusTransaction>();

this.config = Object.assign(configDefaults, config);
Expand Down Expand Up @@ -182,21 +182,25 @@ export class MBusConnection {
// inform all the operations that the connection cannot be recovered
this.queue.forEach((transaction) => {
transaction.operations.forEach((op) => {
op.failed(error);
op.failed(`${error}`);
});
});
}
} else if (this.connected && this.currentTransaction == null && this.queue.length > 0) {
// take next transaction from queue and execute
this.currentTransaction = this.queue.shift();
try {
await this.executeTransaction(this.currentTransaction);
this.currentTransaction = null;
this.trigger();
} catch (err) {
warn(`Transaction failed: ${err}`);
this.currentTransaction = null;
this.trigger();
if (!this.currentTransaction) {
warn(`Current transaction is undefined -> transaction not executed`);
} else {
try {
await this.executeTransaction(this.currentTransaction);
this.currentTransaction = undefined;
this.trigger();
} catch (err) {
warn(`Transaction failed: ${err}`);
this.currentTransaction = undefined;
this.trigger();
}
}
}
}
Expand All @@ -211,7 +215,7 @@ export class MBusConnection {
} catch (err) {
warn(`Read operation failed on unit ${transaction.unitId}. ${err}.`);
// inform all operations and the invoker
transaction.operations.forEach((op) => op.failed(err));
transaction.operations.forEach((op) => op.failed(`${error}`));
throw err;
}
}
Expand Down Expand Up @@ -249,7 +253,7 @@ export class MBusConnection {
}
});
clearInterval(this.timer);
this.timer = null;
this.timer = undefined;
}
}

Expand All @@ -259,11 +263,14 @@ export class MBusConnection {
export class PropertyOperation {
unitId: number;
base: number;
resolve: (value?: Content | PromiseLike<Content>) => void;
reject: (reason?: Error) => void;
resolve?: (value?: Content | PromiseLike<Content>) => void;
reject?: (reason?: Error) => void;

constructor(form: MBusForm) {
this.unitId = form["mbus:unitID"];
if (form["mbus:offset"] === undefined) {
throw new Error("form['mbus:offset'] is undefined");
}
this.base = form["mbus:offset"];
}

Expand All @@ -272,12 +279,10 @@ export class PropertyOperation {
*
*/
async execute(): Promise<Content | PromiseLike<Content>> {
return new Promise(
(resolve: (value?: Content | PromiseLike<Content>) => void, reject: (reason?: Error) => void) => {
this.resolve = resolve;
this.reject = reject;
}
);
return new Promise<Content>((resolve, reject) => {
this.resolve = resolve;
this.reject = reject;
});
}

/**
Expand Down Expand Up @@ -311,7 +316,11 @@ export class PropertyOperation {
const resp = new Content("application/json", Readable.from(JSON.stringify(payload)));

// resolve the Promise given to the invoking script
this.resolve(resp);
if (this.resolve) {
this.resolve(resp);
} else {
warn("resolve undefined");
}
}

/**
Expand All @@ -322,6 +331,10 @@ export class PropertyOperation {
failed(reason: string): void {
warn("Operation failed:", reason);
// reject the Promise given to the invoking script
this.reject(new Error(reason));
if (this.reject) {
this.reject(new Error(reason));
} else {
warn("reject undefined");
}
}
}
14 changes: 11 additions & 3 deletions packages/binding-mbus/test/mbus-client-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: EPL-2.0 OR W3C-20150513
********************************************************************************/
import { should } from "chai";
import { expect, should } from "chai";
import * as chai from "chai";
import MBusClient from "../src/mbus-client";
import { MBusForm } from "../src/mbus";
Expand Down Expand Up @@ -56,8 +56,16 @@ describe("mbus client test", () => {
// eslint-disable-next-line dot-notation
client["overrideFormFromURLPath"](form);
form["mbus:unitID"].should.be.equal(2, "Form value not overridden");
form["mbus:offset"].should.be.equal(2, "Form value not overridden");
form["mbus:timeout"].should.be.equal(5, "Form value not overridden");
if (form["mbus:offset"]) {
form["mbus:offset"].should.be.equal(2, "Form value not overridden");
} else {
expect.fail("mbus:offset undefined");
}
if (form["mbus:timeout"]) {
form["mbus:timeout"].should.be.equal(5, "Form value not overridden");
} else {
expect.fail("mbus:timeout undefined");
}
});

describe("read resource", () => {
Expand Down

0 comments on commit a6c9f9f

Please sign in to comment.