cry-ebus2 3.1.7 → 3.1.8

package/dist/worker.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Worker = void 0;
-const cry_helpers_1 = require("cry-helpers");
-const zeromq_1 = require("zeromq");
-const loadConfiguration_js_1 = require("./loadConfiguration.js");
-const types_js_1 = require("./types.js");
-const serialize_js_1 = require("./serialize.js");
-const sleep_js_1 = require("./sleep.js");
-const EbusReject_js_1 = require("./EbusReject.js");
+import { Log, serialize } from "cry-helpers";
+import { Dealer } from "zeromq";
+import { loadConfiguration } from "./loadConfiguration.js";
+import { Header, Message } from "./types.js";
+import { pack, unpack } from "./serialize.js";
+import { sleep } from "./sleep.js";
+import { EbusRejectError } from "./EbusReject.js";
 const prefixes = ["EBUS_WORKER", "EBUS"];
-const log = new cry_helpers_1.Log(prefixes);
-class Worker {
+const log = new Log(prefixes);
+export class Worker {
     constructor(service, config = {}) {
         this.service = "";
         this.service = service || this.service;
-        this.configuration = (0, loadConfiguration_js_1.loadConfiguration)(prefixes, config);
+        this.configuration = loadConfiguration(prefixes, config);
         this.address = this.configuration.address;
         this.lastHeartbeat = new Date().valueOf();
         this.processing = false;
@@ -44,7 +41,7 @@ class Worker {
             try {
                 try {
                     if (this.socket) {
-                        await this.socket.send([null, types_js_1.Header.Worker, types_js_1.Message.Heartbeat, this.service, null, null]);
+                        await this.socket.send([null, Header.Worker, Message.Heartbeat, this.service, null, null]);
                     }
                 }
                 catch (err) {
@@ -66,10 +63,10 @@ class Worker {
     async start() {
         log.debug(`worker for ${this.service} is starting`);
         const loop = async () => {
-            this.socket = new zeromq_1.Dealer();
+            this.socket = new Dealer();
             this.socket.reconnectInterval = 100;
             await this.socket.connect(this.configuration.address);
-            await this.socket.send([null, types_js_1.Header.Worker, types_js_1.Message.Ready, this.service]);
+            await this.socket.send([null, Header.Worker, Message.Ready, this.service]);
             await this.socket.receive();
             log.status(`started worker for ${this.service} on ${this.configuration.address}`);
             this.startHeartbeat();
@@ -77,17 +74,17 @@ class Worker {
                 this.lastHeartbeat = new Date().valueOf();
                 try {
                     switch (type.toString()) {
-                        case types_js_1.Message.Shutdown:
+                        case Message.Shutdown:
                             log.status(`worker for ${this.service} received broker shutdown signal`);
                             break;
-                        case types_js_1.Message.Heartbeat:
+                        case Message.Heartbeat:
                             log.trace(`worker for ${this.service} received heartbeat from broker`);
                             break;
-                        case types_js_1.Message.ShutdownAndRestart:
+                        case Message.ShutdownAndRestart:
                             log.status(`worker for ${this.service} received ShutdownAndRestart from broker`);
                             process.exit(1);
                             break;
-                        case types_js_1.Message.Request:
+                        case Message.Request:
                             this.processing = true;
                             await this.processRequest(reqId, optBuff, type, req, client);
                             this.processing = false;
@@ -98,8 +95,7 @@ class Worker {
                     }
                 }
                 catch (err) {
-                    console.error(`error in worker for '${this.service}'`);
-                    console.error(err);
+                    console.error(`error in worker for '${this.service}'`, err);
                     return;
                 }
             }
@@ -124,44 +120,43 @@ class Worker {
     }
     // to be implemented at the actual worker
     async onError(err, req, opts) {
-        console.log('worker/onError - should override');
+        console.log('worker/onError - should override', (err === null || err === void 0 ? void 0 : err.message) || err, req);
     }
     async processRequest(reqId, optBuff, type, req, client) {
-        let opts = cry_helpers_1.serialize.unpack(optBuff);
+        let opts = serialize.unpack(optBuff);
         log.debug(`worker for ${this.service} received request ${type} with opts`, opts);
         let timeout = opts.receiveTimeout || this.configuration.receiveTimeout;
-        let responseMessageType = types_js_1.Message.Reply;
+        let responseMessageType = Message.Reply;
         let promises = [
-            this.process((0, serialize_js_1.unpack)(req, opts), opts),
-            (0, sleep_js_1.sleep)(timeout, new EbusReject_js_1.EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
+            this.process(unpack(req, opts), opts),
+            sleep(timeout, new EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
         ];
         let rep;
         try {
             rep = await Promise.race(promises);
-            if (rep instanceof EbusReject_js_1.EbusRejectError && rep.reason === "timeout") {
-                log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${cry_helpers_1.serialize.pack(opts)}`);
-                console.log('opts', opts);
-                log.warn((0, serialize_js_1.unpack)(req, opts));
-                responseMessageType = types_js_1.Message.Timeout;
-                this.onError("timeout", (0, serialize_js_1.unpack)(req, opts), opts);
+            if (rep instanceof EbusRejectError && rep.reason === "timeout") {
+                log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${serialize.pack(opts)}`);
+                log.warn(unpack(req, opts));
+                responseMessageType = Message.Timeout;
+                this.onError("timeout", unpack(req, opts), opts);
             }
         }
         catch (err) {
             rep = err;
-            if (!(rep instanceof EbusReject_js_1.EbusRejectError)) {
-                rep = new EbusReject_js_1.EbusRejectError("error", `error in worker for '${this.service}' process method: '${err.message}'`, err);
-                responseMessageType = types_js_1.Message.Error;
+            if (!(rep instanceof EbusRejectError)) {
+                rep = new EbusRejectError("error", `error in worker for '${this.service}' process method: '${err.message}'`, err);
+                responseMessageType = Message.Error;
             }
-            if (rep instanceof EbusReject_js_1.EbusRejectError && rep.reason === "timeout")
-                responseMessageType = types_js_1.Message.Timeout;
-            if (rep instanceof EbusReject_js_1.EbusRejectError && rep.reason === "reject")
-                responseMessageType = types_js_1.Message.Reject;
-            if (rep instanceof EbusReject_js_1.EbusRejectError && rep.reason === "error")
-                responseMessageType = types_js_1.Message.Error;
-            this.onError(err, (0, serialize_js_1.unpack)(req, opts), opts);
+            if (rep instanceof EbusRejectError && rep.reason === "timeout")
+                responseMessageType = Message.Timeout;
+            if (rep instanceof EbusRejectError && rep.reason === "reject")
+                responseMessageType = Message.Reject;
+            if (rep instanceof EbusRejectError && rep.reason === "error")
+                responseMessageType = Message.Error;
+            this.onError(err, unpack(req, opts), opts);
         }
         let data = rep;
-        if (rep instanceof EbusReject_js_1.EbusRejectError)
+        if (rep instanceof EbusRejectError)
             opts = { zip: false, raw: false, returningError: true, };
         if ((rep === null || rep === void 0 ? void 0 : rep.data) !== undefined && (rep === null || rep === void 0 ? void 0 : rep.opts) !== undefined) {
             opts = req.opts;
@@ -174,18 +169,17 @@ class Worker {
         try {
             await this.socket.send([
                 null,
-                types_js_1.Header.Worker,
+                Header.Worker,
                 responseMessageType,
                 client,
                 null,
                 reqId,
-                cry_helpers_1.serialize.pack(opts),
-                (0, serialize_js_1.pack)(data, opts),
+                serialize.pack(opts),
+                pack(data, opts),
             ]);
         }
         catch (err) {
-            console.error(`unable to send reply for ${this.configuration.address}`);
-            console.error(err);
+            console.error(`unable to send reply for ${this.configuration.address}`, err);
             throw err;
         }
     }
@@ -197,8 +191,8 @@ class Worker {
         if (this.socket && !this.socket.closed) {
             await this.socket.send([
                 null,
-                types_js_1.Header.Worker,
-                types_js_1.Message.Disconnect,
+                Header.Worker,
+                Message.Disconnect,
                 this.service,
             ]);
             log.debug(`worker for ${this.service} is closing socket`);
@@ -210,7 +204,7 @@ class Worker {
             log.error(`worker for '${this.service}' not connected, cannot publish to ${channel}`, message);
             return;
         }
-        await this.socket.send([null, types_js_1.Header.Worker, types_js_1.Message.Publish, channel, (0, serialize_js_1.pack)(message, {})]);
+        await this.socket.send([null, Header.Worker, Message.Publish, channel, pack(message, {})]);
         log.debug(`ebus worker published on '${channel}'`, message);
         // let socket = new Request()
         // await socket.connect(this.configuration.address)
@@ -222,5 +216,4 @@ class Worker {
         throw new Error(`worker for service ${this.service} must implement process()`);
     }
 }
-exports.Worker = Worker;
 //# sourceMappingURL=worker.js.map

package/dist/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "cry-ebus2",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
@@ -15,22 +16,23 @@
   "license": "ISC",
   "devDependencies": {
     "@types/dotenv": "^8.2.0",
-    "@types/node": "^18.7.10",
+    "@types/node": "^18.7.23",
     "deep-equal-in-any-order": "^2.0.0",
     "i": "^0.3.7",
-    "npm": "^8.18.0",
-    "typescript": "^4.7.4"
+    "npm": "^8.19.2",
+    "typescript": "^4.8.4"
   },
   "dependencies": {
     "-": "^0.0.1",
     "@types/chai": "^4.3.3",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.0",
     "@types/pako": "^2.0.0",
     "chai": "^4.3.6",
-    "commander": "^9.4.0",
-    "cry-crm-logic": "^2.0.1",
-    "cry-helpers": "^2.1.65",
-    "dotenv": "^16.0.1",
+    "commander": "^9.4.1",
+    "cry-crm-logic": "^3.0.10",
+    "cry-ebus2": "^3.1.7",
+    "cry-helpers": "^2.1.71",
+    "dotenv": "^16.0.3",
     "mocha": "^10.0.0",
     "notepack.io": "^3.0.1",
     "pako": "^2.0.4",

package/src/clientNonBlocking.ts

@@ -1,4 +1,4 @@
-1
+
 import { Log, serialize } from "cry-helpers"
 import { Request } from "zeromq"
 import { EbusConfiguration } from "./EbusConfiguration.js"
@@ -8,8 +8,8 @@ import { Header, Message } from "./types.js"
 import { pack, unpack } from "./serialize.js"
 import { EbusRejectError } from "./EbusReject.js"
 import { EbusUnpackedResult } from "./EbusUnpackedResult.js"
-import DeferredPromise from "cry-helpers/dist/defferedpromise.js"
 import { EbusClientEvents } from "./EbusClientEvents.js"
+import DeferredPromise from "./deferredPromise.js"
 import { TypedEmitter } from 'tiny-typed-emitter';
 
 const prefixes = ["EBUS_CLIENT", "EBUS"]

package/src/deferredPromise.ts

@@ -0,0 +1,67 @@
+/**
+ * A new instance of deferred is constructed by calling `new DeferredPromse<T>()`.
+ * The purpose of the deferred object is to expose the associated Promise
+ * instance APIs that can be used for signaling the successful
+ * or unsuccessful completion, as well as the state of the task.
+ * @export
+ * @class DeferredPromise
+ * @implements {Promise<T>}
+ * @template T
+ * @example
+ * const deferred = new DeferredPromse<string>();
+ * console.log(deferred.state); // 'pending'
+ *
+ * deferred
+ * .then(str => console.log(str))
+ * .catch(err => console.error(err));
+ *
+ * deferred.resolve('Foo');
+ * console.log(deferred.state); // 'fulfilled'
+ * // deferred.reject('Bar');
+ */
+export default class DeferredPromise<T> implements Promise<T> {
+    [Symbol.toStringTag]: 'Promise';
+
+    private _promise: Promise<T>;
+    private _resolve: ((value?: T | PromiseLike<T>) => void) | undefined;
+    private _reject: ((reason?: any) => void) | undefined
+    private _state: 'pending' | 'fulfilled' | 'rejected' = 'pending';
+
+    public get state(): 'pending' | 'fulfilled' | 'rejected' {
+        return this._state;
+    }
+
+    constructor() {
+        this._promise = new Promise<T>((resolve, reject) => {
+            this._resolve = resolve as any;
+            this._reject = reject;
+        });
+    }
+
+    public finally(onfinally?: (() => void) | null): Promise<T> {
+        return this._promise.finally(onfinally);
+    }
+
+    public then<TResult1, TResult2>(
+        onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
+        onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>)
+        : Promise<TResult1 | TResult2> {
+        return this._promise.then(onfulfilled, onrejected);
+    }
+
+    public catch<TResult>(onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult> {
+        return this._promise.catch(onrejected);
+    }
+
+    public resolve(value?: T | PromiseLike<T>): void {
+        if (this._resolve === undefined) throw new Error("Promise.resolve is undefined")
+        this._resolve(value);
+        this._state = 'fulfilled';
+    }
+
+    public reject(reason?: any): void {
+        if (this._reject === undefined) throw new Error("Promise.resolve is undefined")
+        this._reject(reason);
+        this._state = 'rejected';
+    }
+}

package/src/run/sub.ts

@@ -86,7 +86,7 @@ async function messageEvents() {
         sub.on("message", ([channel, message]) => { console.log(channel, message) })
         
         let stxt = "";
-        if (!myProgram.subscribe.length) {
+        if (!myProgram.subscribe?.length) {
             
             await sub.subscribe("");
             stxt = "on all channels";

package/src/sub.ts

@@ -1,9 +1,9 @@
 import { Log } from "cry-helpers"
-import { unpack } from "cry-helpers/dist/serialize.js"
 import { TypedEmitter } from "tiny-typed-emitter"
 import { Subscriber } from "zeromq"
 import { EbusConfiguration } from "./EbusConfiguration.js"
 import { loadConfiguration } from "./loadConfiguration.js"
+import { unpack } from "./serialize.js"
 
 const prefixes = ["EBUS_SUB", "EBUS"]
 const log = new Log(prefixes)
@@ -62,7 +62,7 @@ export class Sub extends TypedEmitter<EbusSubscriptionEvent> {
     }
 
     private processMessage(messagePacked: Buffer, channel: Buffer) {
-        let message = unpack(messagePacked)
+        let message = unpack(messagePacked, { })
         log.debug(`sub message received on ${channel}`, message)
         this.emit("message", [channel.toString(), message])
         if (channel.toString() === "ebus/stop") {

package/src/worker.ts

@@ -131,8 +131,7 @@ export class Worker {
                     
 
                 } catch (err) {
-                    console.error(`error in worker for '${this.service}'`)
-                    console.error(err)
+                    console.error(`error in worker for '${this.service}'`, err)
                     return
                 }
 
@@ -165,8 +164,7 @@ export class Worker {
     // to be implemented at the actual worker
     public async onError(err:any, req: any, opts: any) 
     {
-        console.log('worker/onError - should override');
-        
+        console.log('worker/onError - should override', err?.message||err, req);
     }
 
     private async processRequest(reqId: Buffer, optBuff: Buffer, type: Buffer, req: Buffer, client: Buffer) {
@@ -187,8 +185,6 @@ export class Worker {
             rep = await Promise.race(promises)
             if (rep instanceof EbusRejectError && rep.reason === "timeout") {
                 log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${serialize.pack(opts)}`)
-                console.log('opts',opts);
-                
                 log.warn(unpack(req, opts))
                 responseMessageType = Message.Timeout
                 this.onError("timeout", unpack(req, opts), opts);
@@ -237,8 +233,7 @@ export class Worker {
                 pack(data, opts),
             ])
         } catch (err) {
-            console.error(`unable to send reply for ${this.configuration.address}`)
-            console.error(err)
+            console.error(`unable to send reply for ${this.configuration.address}`, err)
             throw err
         }
     }

package/tsconfig.json

@@ -5,7 +5,7 @@
 		/* Basic Options */
 		// "incremental": true,                   /* Enable incremental compilation */
 		"target": "ES2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-		"module": "CommonJS" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+		"module": "NodeNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
 		"lib": ["es2018", "ES2018.AsyncIterable"] /* Specify library files to be included in the compilation. */,
 		//"allowJs": true,                          /* Allow javascript files to be compiled. */
 		// "checkJs": true,                       /* Report errors in .js files. */
@@ -30,7 +30,7 @@
 		"strictNullChecks": true /* Enable strict null checks. */,
 		"strictFunctionTypes": true /* Enable strict checking of function types. */,
 		"strictBindCallApply": true /* Enable strict 'bind', 'call', and 'apply' methods on functions. */,
-		"strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
+		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,
 		"noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
 		"alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,