node-opcua-utils 2.64.1 → 2.69.0

package/dist/watchdog.d.ts

@@ -1,57 +1,57 @@
-/// <reference types="node" />
-/**
- * @module node-opcua-utils
- */
-import { EventEmitter } from "events";
-declare type ArbitraryClockTick = number;
-declare type DurationInMillisecond = number;
-export interface IWatchdogData2 {
-    key: number;
-    subscriber: ISubscriber;
-    timeout: DurationInMillisecond;
-    lastSeen: ArbitraryClockTick;
-    visitCount: number;
-}
-export interface ISubscriber {
-    _watchDog?: WatchDog;
-    _watchDogData?: IWatchdogData2;
-    watchdogReset: () => void;
-    keepAlive?: () => void;
-    onClientSeen?: () => void;
-}
-export declare class WatchDog extends EventEmitter {
-    static lastSeenToDuration(lastSeen: number): number;
-    static emptyKeepAlive: () => void;
-    /**
-     * returns the number of subscribers using the WatchDog object.
-     */
-    get subscriberCount(): number;
-    private readonly _watchdogDataMap;
-    private _counter;
-    private _currentTime;
-    private _timer;
-    private readonly _visitSubscriberB;
-    constructor();
-    /**
-     * add a subscriber to the WatchDog.
-     * @method addSubscriber
-     *
-     * add a subscriber to the WatchDog.
-     *
-     * This method modifies the subscriber be adding a
-     * new method to it called 'keepAlive'
-     * The subscriber must also provide a "watchdogReset". watchdogReset will be called
-     * if the subscriber failed to call keepAlive withing the timeout period.
-     * @param subscriber
-     * @param timeout
-     * @return the numerical key associated with this subscriber
-     */
-    addSubscriber(subscriber: ISubscriber, timeout: number): number;
-    removeSubscriber(subscriber: ISubscriber): void;
-    shutdown(): void;
-    getCurrentSystemTick(): ArbitraryClockTick;
-    private _visit_subscriber;
-    private _start_timer;
-    private _stop_timer;
-}
-export {};
+/// <reference types="node" />
+/**
+ * @module node-opcua-utils
+ */
+import { EventEmitter } from "events";
+declare type ArbitraryClockTick = number;
+declare type DurationInMillisecond = number;
+export interface IWatchdogData2 {
+    key: number;
+    subscriber: ISubscriber;
+    timeout: DurationInMillisecond;
+    lastSeen: ArbitraryClockTick;
+    visitCount: number;
+}
+export interface ISubscriber {
+    _watchDog?: WatchDog;
+    _watchDogData?: IWatchdogData2;
+    watchdogReset: () => void;
+    keepAlive?: () => void;
+    onClientSeen?: () => void;
+}
+export declare class WatchDog extends EventEmitter {
+    static lastSeenToDuration(lastSeen: number): number;
+    static emptyKeepAlive: () => void;
+    /**
+     * returns the number of subscribers using the WatchDog object.
+     */
+    get subscriberCount(): number;
+    private readonly _watchdogDataMap;
+    private _counter;
+    private _currentTime;
+    private _timer;
+    private readonly _visitSubscriberB;
+    constructor();
+    /**
+     * add a subscriber to the WatchDog.
+     * @method addSubscriber
+     *
+     * add a subscriber to the WatchDog.
+     *
+     * This method modifies the subscriber be adding a
+     * new method to it called 'keepAlive'
+     * The subscriber must also provide a "watchdogReset". watchdogReset will be called
+     * if the subscriber failed to call keepAlive withing the timeout period.
+     * @param subscriber
+     * @param timeout
+     * @return the numerical key associated with this subscriber
+     */
+    addSubscriber(subscriber: ISubscriber, timeout: number): number;
+    removeSubscriber(subscriber: ISubscriber): void;
+    shutdown(): void;
+    getCurrentSystemTick(): ArbitraryClockTick;
+    private _visit_subscriber;
+    private _start_timer;
+    private _stop_timer;
+}
+export {};

package/dist/watchdog.js

@@ -1,143 +1,143 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WatchDog = void 0;
-/**
- * @module node-opcua-utils
- */
-const events_1 = require("events");
-const node_opcua_assert_1 = require("node-opcua-assert");
-const get_clock_tick_1 = require("./get_clock_tick");
-function hasExpired(watchDogData, currentTime) {
-    const elapsedTime = currentTime - watchDogData.lastSeen;
-    return elapsedTime > watchDogData.timeout;
-}
-function keepAliveFunc() {
-    (0, node_opcua_assert_1.assert)(this._watchDog instanceof WatchDog);
-    // istanbul ignore next
-    if (!this._watchDogData || !this._watchDog) {
-        throw new Error("Internal error");
-    }
-    (0, node_opcua_assert_1.assert)(typeof this._watchDogData.key === "number");
-    this._watchDogData.lastSeen = this._watchDog.getCurrentSystemTick();
-    if (this.onClientSeen) {
-        this.onClientSeen();
-    }
-}
-class WatchDog extends events_1.EventEmitter {
-    constructor() {
-        super();
-        this._watchdogDataMap = {};
-        this._counter = 0;
-        this._currentTime = this.getCurrentSystemTick();
-        this._visitSubscriberB = this._visit_subscriber.bind(this);
-        this._timer = null; // as NodeJS.Timer;
-    }
-    static lastSeenToDuration(lastSeen) {
-        return (0, get_clock_tick_1.get_clock_tick)() - lastSeen;
-    }
-    /**
-     * returns the number of subscribers using the WatchDog object.
-     */
-    get subscriberCount() {
-        return Object.keys(this._watchdogDataMap).length;
-    }
-    /**
-     * add a subscriber to the WatchDog.
-     * @method addSubscriber
-     *
-     * add a subscriber to the WatchDog.
-     *
-     * This method modifies the subscriber be adding a
-     * new method to it called 'keepAlive'
-     * The subscriber must also provide a "watchdogReset". watchdogReset will be called
-     * if the subscriber failed to call keepAlive withing the timeout period.
-     * @param subscriber
-     * @param timeout
-     * @return the numerical key associated with this subscriber
-     */
-    addSubscriber(subscriber, timeout) {
-        this._currentTime = this.getCurrentSystemTick();
-        timeout = timeout || 1000;
-        (0, node_opcua_assert_1.assert)(typeof timeout === "number", " invalid timeout ");
-        (0, node_opcua_assert_1.assert)(typeof subscriber.watchdogReset === "function", " the subscriber must provide a watchdogReset method ");
-        (0, node_opcua_assert_1.assert)(typeof subscriber.keepAlive !== "function" || subscriber.keepAlive === WatchDog.emptyKeepAlive);
-        this._counter += 1;
-        const key = this._counter;
-        subscriber._watchDog = this;
-        subscriber._watchDogData = {
-            key,
-            lastSeen: this._currentTime,
-            subscriber,
-            timeout,
-            visitCount: 0
-        };
-        this._watchdogDataMap[key] = subscriber._watchDogData;
-        if (subscriber.onClientSeen) {
-            subscriber.onClientSeen();
-        }
-        subscriber.keepAlive = keepAliveFunc.bind(subscriber);
-        // start timer when the first subscriber comes in
-        if (this.subscriberCount === 1) {
-            (0, node_opcua_assert_1.assert)(this._timer === null);
-            this._start_timer();
-        }
-        (0, node_opcua_assert_1.assert)(this._timer !== null);
-        return key;
-    }
-    removeSubscriber(subscriber) {
-        if (!subscriber._watchDog) {
-            return; // already removed !!!
-        }
-        if (!subscriber._watchDogData) {
-            throw new Error("Internal error");
-        }
-        (0, node_opcua_assert_1.assert)(subscriber._watchDog instanceof WatchDog);
-        (0, node_opcua_assert_1.assert)(typeof subscriber._watchDogData.key === "number");
-        (0, node_opcua_assert_1.assert)(typeof subscriber.keepAlive === "function");
-        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(this._watchdogDataMap, subscriber._watchDogData.key));
-        delete this._watchdogDataMap[subscriber._watchDogData.key];
-        delete subscriber._watchDog;
-        // leave it as it might be usefull, delete subscriber._watchDogData;
-        subscriber.keepAlive = WatchDog.emptyKeepAlive;
-        // delete timer when the last subscriber comes out
-        if (this.subscriberCount === 0) {
-            this._stop_timer();
-        }
-    }
-    shutdown() {
-        (0, node_opcua_assert_1.assert)(this._timer === null && Object.keys(this._watchdogDataMap).length === 0, " leaking subscriber in watchdog");
-    }
-    getCurrentSystemTick() {
-        return (0, get_clock_tick_1.get_clock_tick)();
-    }
-    _visit_subscriber() {
-        this._currentTime = this.getCurrentSystemTick();
-        const expiredSubscribers = Object.values(this._watchdogDataMap).filter((watchDogData) => {
-            watchDogData.visitCount += 1;
-            return hasExpired(watchDogData, this._currentTime);
-        });
-        if (expiredSubscribers.length) {
-            this.emit("timeout", expiredSubscribers);
-        }
-        expiredSubscribers.forEach((watchDogData) => {
-            this.removeSubscriber(watchDogData.subscriber);
-            watchDogData.subscriber.watchdogReset();
-        });
-    }
-    _start_timer() {
-        (0, node_opcua_assert_1.assert)(this._timer === null, " setInterval already called ?");
-        this._timer = setInterval(this._visitSubscriberB, 1000);
-    }
-    _stop_timer() {
-        (0, node_opcua_assert_1.assert)(this._timer !== null, "_stop_timer already called ?");
-        if (this._timer !== null) {
-            clearInterval(this._timer);
-            this._timer = null;
-        }
-    }
-}
-exports.WatchDog = WatchDog;
-WatchDog.emptyKeepAlive = () => {
-    /* */
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WatchDog = void 0;
+/**
+ * @module node-opcua-utils
+ */
+const events_1 = require("events");
+const node_opcua_assert_1 = require("node-opcua-assert");
+const get_clock_tick_1 = require("./get_clock_tick");
+function hasExpired(watchDogData, currentTime) {
+    const elapsedTime = currentTime - watchDogData.lastSeen;
+    return elapsedTime > watchDogData.timeout;
+}
+function keepAliveFunc() {
+    (0, node_opcua_assert_1.assert)(this._watchDog instanceof WatchDog);
+    // istanbul ignore next
+    if (!this._watchDogData || !this._watchDog) {
+        throw new Error("Internal error");
+    }
+    (0, node_opcua_assert_1.assert)(typeof this._watchDogData.key === "number");
+    this._watchDogData.lastSeen = this._watchDog.getCurrentSystemTick();
+    if (this.onClientSeen) {
+        this.onClientSeen();
+    }
+}
+class WatchDog extends events_1.EventEmitter {
+    constructor() {
+        super();
+        this._watchdogDataMap = {};
+        this._counter = 0;
+        this._currentTime = this.getCurrentSystemTick();
+        this._visitSubscriberB = this._visit_subscriber.bind(this);
+        this._timer = null; // as NodeJS.Timer;
+    }
+    static lastSeenToDuration(lastSeen) {
+        return (0, get_clock_tick_1.get_clock_tick)() - lastSeen;
+    }
+    /**
+     * returns the number of subscribers using the WatchDog object.
+     */
+    get subscriberCount() {
+        return Object.keys(this._watchdogDataMap).length;
+    }
+    /**
+     * add a subscriber to the WatchDog.
+     * @method addSubscriber
+     *
+     * add a subscriber to the WatchDog.
+     *
+     * This method modifies the subscriber be adding a
+     * new method to it called 'keepAlive'
+     * The subscriber must also provide a "watchdogReset". watchdogReset will be called
+     * if the subscriber failed to call keepAlive withing the timeout period.
+     * @param subscriber
+     * @param timeout
+     * @return the numerical key associated with this subscriber
+     */
+    addSubscriber(subscriber, timeout) {
+        this._currentTime = this.getCurrentSystemTick();
+        timeout = timeout || 1000;
+        (0, node_opcua_assert_1.assert)(typeof timeout === "number", " invalid timeout ");
+        (0, node_opcua_assert_1.assert)(typeof subscriber.watchdogReset === "function", " the subscriber must provide a watchdogReset method ");
+        (0, node_opcua_assert_1.assert)(typeof subscriber.keepAlive !== "function" || subscriber.keepAlive === WatchDog.emptyKeepAlive);
+        this._counter += 1;
+        const key = this._counter;
+        subscriber._watchDog = this;
+        subscriber._watchDogData = {
+            key,
+            lastSeen: this._currentTime,
+            subscriber,
+            timeout,
+            visitCount: 0
+        };
+        this._watchdogDataMap[key] = subscriber._watchDogData;
+        if (subscriber.onClientSeen) {
+            subscriber.onClientSeen();
+        }
+        subscriber.keepAlive = keepAliveFunc.bind(subscriber);
+        // start timer when the first subscriber comes in
+        if (this.subscriberCount === 1) {
+            (0, node_opcua_assert_1.assert)(this._timer === null);
+            this._start_timer();
+        }
+        (0, node_opcua_assert_1.assert)(this._timer !== null);
+        return key;
+    }
+    removeSubscriber(subscriber) {
+        if (!subscriber._watchDog) {
+            return; // already removed !!!
+        }
+        if (!subscriber._watchDogData) {
+            throw new Error("Internal error");
+        }
+        (0, node_opcua_assert_1.assert)(subscriber._watchDog instanceof WatchDog);
+        (0, node_opcua_assert_1.assert)(typeof subscriber._watchDogData.key === "number");
+        (0, node_opcua_assert_1.assert)(typeof subscriber.keepAlive === "function");
+        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(this._watchdogDataMap, subscriber._watchDogData.key));
+        delete this._watchdogDataMap[subscriber._watchDogData.key];
+        delete subscriber._watchDog;
+        // leave it as it might be usefull, delete subscriber._watchDogData;
+        subscriber.keepAlive = WatchDog.emptyKeepAlive;
+        // delete timer when the last subscriber comes out
+        if (this.subscriberCount === 0) {
+            this._stop_timer();
+        }
+    }
+    shutdown() {
+        (0, node_opcua_assert_1.assert)(this._timer === null && Object.keys(this._watchdogDataMap).length === 0, " leaking subscriber in watchdog");
+    }
+    getCurrentSystemTick() {
+        return (0, get_clock_tick_1.get_clock_tick)();
+    }
+    _visit_subscriber() {
+        this._currentTime = this.getCurrentSystemTick();
+        const expiredSubscribers = Object.values(this._watchdogDataMap).filter((watchDogData) => {
+            watchDogData.visitCount += 1;
+            return hasExpired(watchDogData, this._currentTime);
+        });
+        if (expiredSubscribers.length) {
+            this.emit("timeout", expiredSubscribers);
+        }
+        expiredSubscribers.forEach((watchDogData) => {
+            this.removeSubscriber(watchDogData.subscriber);
+            watchDogData.subscriber.watchdogReset();
+        });
+    }
+    _start_timer() {
+        (0, node_opcua_assert_1.assert)(this._timer === null, " setInterval already called ?");
+        this._timer = setInterval(this._visitSubscriberB, 1000);
+    }
+    _stop_timer() {
+        (0, node_opcua_assert_1.assert)(this._timer !== null, "_stop_timer already called ?");
+        if (this._timer !== null) {
+            clearInterval(this._timer);
+            this._timer = null;
+        }
+    }
+}
+exports.WatchDog = WatchDog;
+WatchDog.emptyKeepAlive = () => {
+    /* */
+};
 //# sourceMappingURL=watchdog.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-utils",
-    "version": "2.64.1",
+    "version": "2.69.0",
     "description": "pure nodejs OPCUA SDK - module -utils",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -9,16 +9,16 @@
         "lint": "eslint source test",
         "format": "prettier --write source test",
         "test": "mocha",
-        "clean": "node -e \"require('rimraf').sync('dist');\""
+        "clean": "npx rimraf dist *.tsbuildinfo"
     },
     "dependencies": {
         "chalk": "4.1.2",
-        "node-opcua-assert": "2.64.1"
+        "node-opcua-assert": "2.66.0"
     },
     "devDependencies": {
-        "@types/node": "17.0.21",
+        "@types/node": "17.0.36",
         "should": "^13.2.3",
-        "sinon": "^13.0.1"
+        "sinon": "^14.0.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -35,5 +35,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
+    "gitHead": "6c88d05e8c82ce4bc9c8af9f0a8eb6136f31d2ce"
 }

package/source/string_utils.ts

@@ -6,7 +6,7 @@ export function capitalizeFirstLetter(str: string): string {
     if (str == null) {
         return str;
     }
-    return str.substr(0, 1).toUpperCase() + str.substr(1);
+    return str.substring(0, 1).toUpperCase() + str.substring(1);
 }
 
 const ACode = "A".charCodeAt(0);
@@ -113,9 +113,9 @@ export function lowerFirstLetter(str: string): string {
     if (str.match(/_/)) {
         return str.split("_").map(lowerFirstLetter).join("_");
     }
-    let result = str.substr(0, 1).toLowerCase() + str.substr(1);
+    let result = str.substring(0, 1).toLowerCase() + str.substring(1);
     if (result.length > 3 && isUpperCaseChar(str[1]) && isUpperCaseChar(str[2])) {
-        result = str.substr(0, 2).toLowerCase() + str.substr(2);
+        result = str.substring(0, 2).toLowerCase() + str.substring(2);
     }
     return result;
 }

package/source/timestamp.ts

@@ -1,5 +1,5 @@
 function w(s: string | number, length: number): string {
-    return ("000" + s).substr(-length);
+    return ("" + s).padStart(length, "0");
 }
 
 function t(d: Date): string {

package/dist/construct_filename.d.ts

@@ -1,4 +0,0 @@
-/**
- * @module node-opcua-utils
- */
-export declare function constructFilename(filename: string): void;

package/dist/construct_filename.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @module node-opcua-utils
- */
-function constructFilename(filename) {
-    throw new Error("constructFilename has been deprecated ! use node-opcua-nodesets.constructFilename or ....");
-    // xx    var dirname = $_$.dirname;
-    // xx    var file = path.join(dirname, filename);
-    // xx    return file;
-}
-exports.constructFilename = constructFilename;
-//# sourceMappingURL=construct_filename.js.map

package/dist/construct_filename.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"construct_filename.js","sourceRoot":"","sources":["../source/construct_filename.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,SAAgB,iBAAiB,CAAC,QAAgB;IAC9C,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;IAC7G,mCAAmC;IACnC,iDAAiD;IACjD,qBAAqB;AACzB,CAAC;AALD,8CAKC"}

package/dist/linefile.d.ts

@@ -1,8 +0,0 @@
-export declare class LineFile {
-    private _line;
-    constructor();
-    write(...arg: string[]): void;
-    toString(): string;
-    save(filename: string): void;
-    saveFormat(filename: string, formatter: (code: string) => string): void;
-}

package/dist/linefile.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @module node-opcua-utils
- */
-const fs_1 = require("fs");
-const os = require("os");
-class LineFile {
-    constructor() {
-        this._line = [];
-        this.write("// --------- This code has been automatically generated !!! " + new Date().toISOString());
-        this.write("/**");
-        this.write(" * @module node-opcua-types");
-        this.write(" */");
-    }
-    write(...arg) {
-        let str = "";
-        // tslint:disable:prefer-for-of
-        for (let i = 0; i < arguments.length; i++) {
-            str += arguments[i];
-        }
-        this._line.push(str);
-    }
-    toString() {
-        return this._line.join(os.EOL);
-    }
-    save(filename) {
-        fs_1.writeFileSync(filename, this.toString(), "ascii");
-    }
-    saveFormat(filename, formatter) {
-        const code = formatter(this.toString());
-        fs_1.writeFileSync(filename, code, "ascii");
-    }
-}
-exports.LineFile = LineFile;
-//# sourceMappingURL=linefile.js.map

package/dist/linefile.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"linefile.js","sourceRoot":"","sources":["../source/linefile.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH,2BAAmC;AACnC,yBAAyB;AAEzB,MAAa,QAAQ;IAIjB;QACI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,KAAK,CAAC,8DAA8D,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QACtG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,GAAG,GAAa;QACzB,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,+BAA+B;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACvB;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAEM,IAAI,CAAC,QAAgB;QACxB,kBAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAEM,UAAU,CAAC,QAAgB,EAAE,SAAmC;QACnE,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxC,kBAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;CACJ;AAlCD,4BAkCC"}