cry-ebus2 3.0.9 → 3.1.2

package/src/pub.ts

@@ -1,9 +1,9 @@
 
 import { Log } from "cry-helpers"
 import { Publisher } from "zeromq"
-import { EbusConfiguration } from "./EbusConfiguration"
-import { loadConfiguration } from "./loadConfiguration"
-import { pack } from "./serialize"
+import { EbusConfiguration } from "./EbusConfiguration.js"
+import { loadConfiguration } from "./loadConfiguration.js"
+import { pack } from "./serialize.js"
 
 const prefixes = ["EBUS_PUB", "EBUS"]
 const log = new Log(prefixes)

package/src/rejectWorker.ts

@@ -1,7 +1,6 @@
-import { block } from "./block"
-import { EbusRejectError } from "./EbusReject"
-import { sleep } from "./sleep"
-import { Worker } from "./worker"
+import { EbusRejectError } from "./EbusReject.js"
+import { sleep } from "./sleep.js"
+import { Worker } from "./worker.js"
 
 export interface RejectRequest
 {

package/src/run/all.ts

@@ -1,11 +1,10 @@
-import { Broker } from "../broker";
-import { DelayWorker } from "../delayWorker";
-import { EchoWorker } from "../echoWorker";
-import { ErrorWorker } from "../errorWorker";
-import { RejectWorker } from "../rejectWorker";
+import { Broker } from "../broker.js";
+import { DelayWorker } from "../delayWorker.js";
+import { EchoWorker } from "../echoWorker.js";
+import { ErrorWorker } from "../errorWorker.js";
+import { RejectWorker } from "../rejectWorker.js";
 
 import { config } from "dotenv"
-import { Sub } from "../sub";
 config()
 
 new Broker().start()

package/src/run/{broker.ts → broker.mts}

@@ -1,6 +1,6 @@
 
 import { config } from "dotenv"
-import { Broker } from "../broker";
+import { Broker } from "../broker.js";
 
 config()
 new Broker().start()

package/src/run/call.ts

@@ -1,10 +1,10 @@
 
 import { objStrToJson } from "cry-helpers";
 import { config } from "dotenv";
-import { Client } from "../client";
-import { program } from "commander"
-import { EbusRequestOptions } from "../EbusRequestOptions";
+import { Command, program } from "commander"
 import { exit } from "process";
+import { Client } from "../client.js";
+import { EbusRequestOptions } from "../EbusRequestOptions.js";
 
 config();
 
@@ -12,6 +12,17 @@ program.version('0.0.2');
 
 let client = new Client()
 
+interface MyCommand extends Command {
+    timeout: number
+    repeat: string
+    silent: string
+    dryRun: string
+    depth: string
+    measure: string
+}
+
+const myProgram = program as MyCommand
+
 function exitProgram(message: string) 
 {
     console.error(message)
@@ -24,35 +35,37 @@ program
     .option('-r, --repeat <repeat>', 'repeat n times', "1")
     .option('-d, --depth <depth>', 'json output depth', "3")
     .option('-n, --dry-run', 'do not call, just report')
+    .option('-m, --measure', 'measure call duration')
     .option('-S, --silent', 'do not output progress')
     .arguments('<worker> [params]')
     .action(async (worker,params) => {
        
         let workload = tryParseJson(params || '')
         let opts: Partial<EbusRequestOptions> | undefined = {}
-        let repeat = parseInt(program.repeat)
+        let repeat = parseInt(myProgram.repeat)
+        let start = new Date().valueOf()
         if (isNaN(repeat)) repeat = 1;
-        if (program.timeout === NaN) exitProgram("timeout must be a number");
-        if (typeof program.timeout==="number") opts.receiveTimeout=program.timeout
+        if (myProgram.timeout === NaN) exitProgram("timeout must be a number");
+        if (typeof myProgram.timeout==="number") opts.receiveTimeout=myProgram.timeout
         if (Object.keys(opts).length === 0) opts = undefined;
-        if (!program.silent) {
+        if (!myProgram.silent) {
             console.log('');
-            console.log(`${program.dryRun ? 'would ' : ''}call \x1b[7m ${worker} \x1b[27m`, opts)
+            console.log(`${myProgram.dryRun ? 'would ' : ''}call \x1b[7m ${worker} \x1b[27m`, opts)
             if (repeat!==1)
                 console.log(`repeat \x1b[7m ${repeat} \x1b[27m times`, opts)
             if (workload) console.log(`with ${typeof workload} message`, workload)
             console.log('')
         }
         
-        if (!program.dryRun) {
+        if (!myProgram.dryRun) {
             try {
 
                 for (let i = 0; i < repeat; i++ ) {
                     let res = await client.request(worker, workload, opts)
-                    let depth = Number.parseInt(program.depth) || 3
+                    let depth = Number.parseInt(myProgram.depth) || 3
                     console.dir(res, { depth });
                     if (client.lastError) console.log(client.lastError);
-                    if (!program.silent) console.log();
+                    if (!myProgram.silent) console.log();
                 }
             
             } catch (err: any) {
@@ -62,6 +75,8 @@ program
             }
         }
 
+        if (myProgram.measure) console.log("elapsed time: ", new Date().valueOf() - start, "ms\n");
+
         process.exit(0)
     })
 

package/src/run/calling.ts

@@ -1,6 +1,6 @@
 import { config } from "dotenv"
-import { Client } from "../index"
-import { sleep } from "../sleep"
+import { Client } from "../index.js"
+import { sleep } from "../sleep.js"
 
 config()
 let client = new Client()

package/src/run/callingBurst.ts

@@ -1,6 +1,6 @@
 import { config } from "dotenv";
-import { ClientNonBlocking } from "../clientNonBlocking";
-import { sleep } from "../sleep";
+import { ClientNonBlocking } from "../clientNonBlocking.js";
+import { sleep } from "../sleep.js";
 
 
 var myArgs = process.argv.slice(2);

package/src/run/{delay.ts → delay.mts}

@@ -1,6 +1,6 @@
 
 import { config } from "dotenv"
-import { DelayWorker } from "../delayWorker"
+import { DelayWorker } from "../delayWorker.js"
 
 config()
 new DelayWorker().start()

package/src/run/{echo.ts → echo.mts}

@@ -1,6 +1,6 @@
 
 import { config } from "dotenv"
-import { EchoWorker } from "../echoWorker"
+import { EchoWorker } from "../echoWorker.js"
 
 config()
 new EchoWorker().start()

package/src/run/{error.ts → error.mts}

@@ -1,6 +1,6 @@
 
 import { config } from "dotenv"
-import { ErrorWorker } from "../errorWorker"
+import { ErrorWorker } from "../errorWorker.js"
 
 config()
 new ErrorWorker().start()

package/src/run/{ping.ts → ping.mts}

@@ -1,14 +1,15 @@
 
 import { objStrToJson } from "cry-helpers";
 import { config } from "dotenv";
-import { Client } from "../client";
 import { program } from "commander"
-import { EbusRequestOptions } from "../EbusRequestOptions";
 import { exit } from "process";
+import { Client } from "../client.js";
+import { EbusRequestOptions } from "../EbusRequestOptions.js";
 
 config();
 
 program.version('0.0.2');
+const myProgram = program as any  // TODO: describe options
 
 let client = new Client()
 
@@ -32,16 +33,16 @@ program
         if (!workers?.length) workers = await client.workers();
             
         let opts : Partial<EbusRequestOptions> | undefined = {}
-        if (program.timeout === NaN) exitProgram("timeout must be a number");
-        if (typeof program.timeout==="number") opts.receiveTimeout=program.timeout
+        if (myProgram.timeout === NaN) exitProgram("timeout must be a number");
+        if (typeof myProgram.timeout==="number") opts.receiveTimeout=myProgram.timeout
         if (Object.keys(opts).length === 0) opts = undefined;
-        if (!program.silent) {
+        if (!myProgram.silent) {
             console.log('');
-            console.log(`${program.dryRun?'would ':''}ping \x1b[7m ${workers} \x1b[27m`)
+            console.log(`${myProgram.dryRun?'would ':''}ping \x1b[7m ${workers} \x1b[27m`)
             console.log('')
         }
         
-        if (!program.dryRun) {
+        if (!myProgram.dryRun) {
             try {
 
                 for await (let worker of workers) {
@@ -53,7 +54,7 @@ program
                     else
                         console.log(worker, "\x1b[31m", client.lastError?.reason, "\x1b[0m", client.lastError?.rejectMessage || client.lastError, "\x1b[0m")
                 }
-                if (!program.silent) console.log();
+                if (!myProgram.silent) console.log();
             
             } catch (err: any) {
                 console.error(`\x1b[31munexpected error\x1b[0m  ${err.message}`)
@@ -65,7 +66,7 @@ program
         process.exit(0)
     })
 
-program.parse(process.argv);
+myProgram.parse(process.argv);
 
 function tryParseJson(str: string) {
     try {

package/src/run/pub.ts

@@ -2,7 +2,7 @@
 
 import { objStrToJson } from "cry-helpers";
 import { config } from "dotenv";
-import { Client } from "../client";
+import { Client } from "../client.js";
 
 config()
 let client = new Client()

package/src/run/reject.ts

@@ -1,6 +1,6 @@
 
 import { config } from "dotenv"
-import { RejectWorker } from "../rejectWorker"
+import { RejectWorker } from "../rejectWorker.js"
 
 config()
 new RejectWorker().start()

package/src/run/sub.ts

@@ -1,9 +1,9 @@
 
 
 import { config } from "dotenv"
-import { Sub } from "../sub";
 import { program } from "commander"
-import TX from "./termimalCommands"
+import { Sub } from "../sub.js";
+import TX from "./termimalCommands.js"
 
 config()
 
@@ -12,6 +12,7 @@ function collect(value:string, previous:string[]) {
 }
 
 let sub = new Sub()
+const myProgram = program as any        // TODO: describe options
 
 program
     .description('listens to ebus events')
@@ -29,28 +30,28 @@ program
 
 
         let sthDefined =
-            typeof program.connect === "boolean"
-            || typeof program.disconnect === "boolean"
-            || typeof program.message === "boolean";
+            typeof myProgram.connect === "boolean"
+            || typeof myProgram.disconnect === "boolean"
+            || typeof myProgram.message === "boolean";
         
         if (!sthDefined)
-            program.connect = program.disconnect = program.message = true
+            myProgram.connect = myProgram.disconnect = myProgram.message = true
         
-        console.log('program.connect', program.connect);
-        console.log('program.disconnect', program.disconnect);
-        console.log('program.message', program.message);
+        console.log('myProgram.connect', myProgram.connect);
+        console.log('myProgram.disconnect', myProgram.disconnect);
+        console.log('myProgram.message', myProgram.message);
         
         messageEvents()
         connectEvent()
         disconnectEvent()
         
-        if (!(program.connect || program.disconnect ||  program.message)) {
-            if (!program.silent) console.log("WARN: not listening to any events.")
+        if (!(myProgram.connect || myProgram.disconnect ||  myProgram.message)) {
+            if (!myProgram.silent) console.log("WARN: not listening to any events.")
             process.exit(0)
         }
 
-        if (!program.dryRun) {
-            if (!program.silent) console.log('start receiving\n');
+        if (!myProgram.dryRun) {
+            if (!myProgram.silent) console.log('start receiving\n');
             await sub.startReceiving()
         }
 
@@ -60,8 +61,8 @@ program
 
 
 function disconnectEvent() {
-    if (program.disconnect) {
-        if (!program.silent)
+    if (myProgram.disconnect) {
+        if (!myProgram.silent)
             console.log(`listen to ${TX.fgGreen}disconnect${TX.reset} event`);
         
         sub.on("disconnect", () => { console.log("DISCONNECT"); });
@@ -70,8 +71,8 @@ function disconnectEvent() {
 }
 
 function connectEvent() {
-    if (program.connect) {
-        if (!program.silent)
+    if (myProgram.connect) {
+        if (!myProgram.silent)
             console.log(`listen to ${TX.fgGreen}connect${TX.reset} event`);
      
         sub.on("connect", () => { console.log("CONNECT"); });
@@ -80,23 +81,23 @@ function connectEvent() {
 }
 
 async function messageEvents() {
-    if (program.message) {
+    if (myProgram.message) {
         
         sub.on("message", ([channel, message]) => { console.log(channel, message) })
         
         let stxt = "";
-        if (!program.subscribe.length) {
+        if (!myProgram.subscribe.length) {
             
             await sub.subscribe("");
             stxt = "on all channels";
       
         } else {
          
-            program.subscribe.forEach(async (c: string) => await sub.subscribe(c));
-            stxt = `on channels ${TX.fgYellow}${program.subscribe.join(", ")}`;
+            myProgram.subscribe.forEach(async (c: string) => await sub.subscribe(c));
+            stxt = `on channels ${TX.fgYellow}${myProgram.subscribe.join(", ")}`;
             
         }
-        if (!program.silent)
+        if (!myProgram.silent)
             console.log(`listen to ${TX.fgGreen}message${TX.reset} events`, stxt, TX.reset);
     }
 

package/src/run/workers.ts

@@ -1,10 +1,9 @@
 
-import { objStrToJson } from "cry-helpers";
 import { config } from "dotenv";
-import { Client } from "../client";
-import { program } from "commander"
-import { EbusRequestOptions } from "../EbusRequestOptions";
-import { exit } from "process";
+import { Command } from "commander"
+import { Client } from "../client.js";
+
+const program = new Command()
 
 config();
 
@@ -12,11 +11,6 @@ program.version('0.0.2');
 
 let client = new Client()
 
-function exitProgram(message: string) {
-    console.error(message)
-    exit(2)
-}
-
 program
     .description('calls a worker')
     .option('-w, --workers', 'get workers (default)', true)
@@ -26,11 +20,11 @@ program
 
         try {
 
-            if (program.restart) {
-                console.log(`request restart of \x1b[32m${program.restart}\x1b[0m workers`)
-                await client.restartAllWorkers(program.restart);
+            if ((program as any).restart) {
+                console.log(`request restart of \x1b[32m${(program as any).restart}\x1b[0m workers`)
+                await client.restartAllWorkers((program as any).restart);
             }
-            else if (program.services) {
+            else if ((program as any).services) {
                 let res = await client.services()
                 console.dir(res)
             } else {

package/src/serialize.ts

@@ -1,7 +1,7 @@
 
 import { serialize } from "cry-helpers";
 import { deflateRaw, inflateRaw } from "pako";
-import { EbusRequestOptions } from "./EbusRequestOptions";
+import { EbusRequestOptions } from "./EbusRequestOptions.js";
 import notepack from "notepack.io"
 
 export function pack(data: any, opts: Partial<EbusRequestOptions>)

package/src/service.ts

@@ -1,6 +1,6 @@
 import { Log } from "cry-helpers"
 import { Router } from "zeromq"
-import { Header, Message } from "./types"
+import { Header, Message } from "./types.js"
 const prefixes = ["EBUS_BROKER", "EBUS"]
 const log = new Log(prefixes)
 export class Service {

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"
-import { loadConfiguration } from "./loadConfiguration"
-import { unpack } from "./serialize"
+import { EbusConfiguration } from "./EbusConfiguration.js"
+import { loadConfiguration } from "./loadConfiguration.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/test/config.ts

@@ -1,8 +1,8 @@
 
 import { expect } from "chai";
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { Broker, DelayWorker } from "../index";
+import { Client } from "../client.js";
+import { EchoWorker } from "../echoWorker.js";
+import { Broker, DelayWorker } from "../index.js";
 
 describe('services', async function () {
 

package/src/test/echo.ts

@@ -1,9 +1,9 @@
 
 import { expect } from "chai"
-import { Client } from "../client";
-import { EbusUnpackedResult } from "../EbusUnpackedResult";
-import { EchoWorker } from "../echoWorker";
-import { Broker, DelayWorker, unpack, pack } from "../index";
+import { Client } from "../client.js";
+import { EbusUnpackedResult } from "../EbusUnpackedResult.js";
+import { EchoWorker } from "../echoWorker.js";
+import { Broker, DelayWorker, unpack, pack } from "../index.js";
 
 describe('echo worker', async function () {
 

package/src/test/pack.ts

@@ -1,8 +1,6 @@
 
 import { expect } from "chai";
-import exp from "constants";
-import { DESTRUCTION } from "dns";
-import { unpack, pack } from "../index";
+import { unpack, pack } from "../index.js";
 
 const largeArray = () => [
     /* 1 */

package/src/test/performance.ts

@@ -1,8 +1,8 @@
 
-import { Client } from "../client";
-import { EbusRequestOptions } from "../EbusRequestOptions";
-import { EchoWorker } from "../echoWorker";
-import { Broker, DelayWorker, unpack, pack } from "../index";
+import { Client } from "../client.js";
+import { EbusRequestOptions } from "../EbusRequestOptions.js";
+import { EchoWorker } from "../echoWorker.js";
+import { Broker, DelayWorker, unpack, pack } from "../index.js";
 
 describe('performance', async function () {
 

package/src/test/pub.ts

@@ -1,9 +1,9 @@
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { ErrorWorker } from "../errorWorker";
-import { Broker, DelayWorker } from "../index";
-import { RejectWorker } from "../rejectWorker";
-import { Sub } from "../sub";
+import { Client } from "../client.js";
+import { EchoWorker } from "../echoWorker.js";
+import { ErrorWorker } from "../errorWorker.js";
+import { Broker, DelayWorker } from "../index.js";
+import { RejectWorker } from "../rejectWorker.js";
+import { Sub } from "../sub.js";
 
 describe('pub/sub', async function () {
 

package/src/test/pub2.ts

@@ -1,9 +1,7 @@
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { ErrorWorker } from "../errorWorker";
-import { Broker, DelayWorker, unpack, pack } from "../index";
-import { RejectWorker } from "../rejectWorker";
-import { Sub } from "../sub";
+import { Client } from "../client.js";
+import { EchoWorker } from "../echoWorker.js";
+import { Broker } from "../index.js";
+import { Sub } from "../sub.js";
 
 describe('pub/sub', async function () {
 

package/src/test/reject.ts

@@ -1,10 +1,9 @@
 
 import { expect } from "chai"
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { ErrorWorker } from "../errorWorker";
-import { Broker, DelayWorker, unpack, pack } from "../index";
-import { RejectWorker } from "../rejectWorker";
+import { Client } from "../client.js";
+import { ErrorWorker } from "../errorWorker.js";
+import { Broker } from "../index.js";
+import { RejectWorker } from "../rejectWorker.js";
 
 describe('timing', async function () {
 

package/src/test/services.ts

@@ -1,8 +1,8 @@
 
 import { expect } from "chai";
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { Broker, DelayWorker } from "../index";
+import { Client } from "../client.js";
+import { EchoWorker } from "../echoWorker.js";
+import { Broker, DelayWorker } from "../index.js";
 
 describe('services', async function () {
 

package/src/test/stress.ts

@@ -1,7 +1,7 @@
 
 import { expect } from "chai"
-import { Client } from "../client";
-import { Broker, DelayWorker, unpack, pack } from "../index";
+import { Client } from "../client.js";
+import { Broker, DelayWorker, unpack, pack } from "../index.js";
 
 describe('stress', async function () {
 

package/src/test/timing.ts

@@ -1,10 +1,10 @@
 
 import { expect } from "chai"
-import { Client } from "../client";
-import { EchoWorker } from "../echoWorker";
-import { ErrorWorker } from "../errorWorker";
-import { RejectWorker } from "../rejectWorker";
-import { Broker, DelayWorker, unpack, pack } from "../index";
+import { Client } from "../client.js";
+import { EchoWorker } from "../echoWorker.js";
+import { ErrorWorker } from "../errorWorker.js";
+import { RejectWorker } from "../rejectWorker.js";
+import { Broker, DelayWorker, unpack, pack } from "../index.js";
 
 describe('timing', async function () {
 

package/src/worker.ts

@@ -1,12 +1,12 @@
 import { Log , serialize} from "cry-helpers"
 import { Dealer } from "zeromq"
-import { EbusConfiguration } from "./EbusConfiguration"
-import { EbusRequestOptions } from "./EbusRequestOptions"
-import { loadConfiguration } from "./loadConfiguration"
-import { Header, Message } from "./types"
-import { pack, unpack } from "./serialize"
-import { sleep } from "./sleep"
-import { EbusRejectError } from "./EbusReject"
+import { EbusConfiguration } from "./EbusConfiguration.js"
+import { EbusRequestOptions } from "./EbusRequestOptions.js"
+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 Log(prefixes)

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. */
@@ -42,7 +42,7 @@
 		//"noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
 
 		/* Module Resolution Options */
-		"moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+		"moduleResolution": "NodeNext" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
 		// "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
 		// "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
 		"rootDirs": ["src", "src/test"] /* List of root folders whose combined content represents the structure of the project at runtime. */,

package/dist/run/broker.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=broker.d.ts.map