cry-ebus2 3.0.9 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/EbusClientEvents.js +1 -2
- package/dist/EbusConfiguration.js +1 -2
- package/dist/EbusReject.d.ts +1 -1
- package/dist/EbusReject.d.ts.map +1 -1
- package/dist/EbusReject.js +4 -5
- package/dist/EbusReject.js.map +1 -1
- package/dist/EbusRejectReason.js +1 -2
- package/dist/EbusRequestOptions.js +1 -2
- package/dist/EbusUnpackedResult.d.ts +2 -2
- package/dist/EbusUnpackedResult.d.ts.map +1 -1
- package/dist/EbusUnpackedResult.js +12 -12
- package/dist/EbusUnpackedResult.js.map +1 -1
- package/dist/block.js +1 -5
- package/dist/block.js.map +1 -1
- package/dist/broker.d.ts +4 -3
- package/dist/broker.d.ts.map +1 -1
- package/dist/broker.js +54 -59
- package/dist/broker.js.map +1 -1
- package/dist/client.d.ts +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1 -5
- package/dist/client.js.map +1 -1
- package/dist/clientBlocking.d.ts +6 -6
- package/dist/clientBlocking.d.ts.map +1 -1
- package/dist/clientBlocking.js +47 -47
- package/dist/clientBlocking.js.map +1 -1
- package/dist/clientNonBlocking.d.ts +6 -6
- package/dist/clientNonBlocking.d.ts.map +1 -1
- package/dist/clientNonBlocking.js +64 -65
- package/dist/clientNonBlocking.js.map +1 -1
- package/dist/consts.d.ts +1 -1
- package/dist/consts.d.ts.map +1 -1
- package/dist/consts.js +1 -4
- package/dist/consts.js.map +1 -1
- package/dist/delayWorker.d.ts +1 -1
- package/dist/delayWorker.d.ts.map +1 -1
- package/dist/delayWorker.js +7 -14
- package/dist/delayWorker.js.map +1 -1
- package/dist/echoWorker.d.ts +1 -1
- package/dist/echoWorker.d.ts.map +1 -1
- package/dist/echoWorker.js +5 -12
- package/dist/echoWorker.js.map +1 -1
- package/dist/errorWorker.d.ts +1 -1
- package/dist/errorWorker.d.ts.map +1 -1
- package/dist/errorWorker.js +7 -14
- package/dist/errorWorker.js.map +1 -1
- package/dist/index.d.ts +18 -18
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -29
- package/dist/index.js.map +1 -1
- package/dist/loadConfiguration.d.ts +1 -1
- package/dist/loadConfiguration.d.ts.map +1 -1
- package/dist/loadConfiguration.js +4 -8
- package/dist/loadConfiguration.js.map +1 -1
- package/dist/pub.d.ts +1 -1
- package/dist/pub.d.ts.map +1 -1
- package/dist/pub.js +12 -13
- package/dist/pub.js.map +1 -1
- package/dist/rejectWorker.d.ts +1 -1
- package/dist/rejectWorker.d.ts.map +1 -1
- package/dist/rejectWorker.js +7 -14
- package/dist/rejectWorker.js.map +1 -1
- package/dist/run/all.js +12 -14
- package/dist/run/all.js.map +1 -1
- package/dist/run/broker.js +4 -6
- package/dist/run/broker.js.map +1 -1
- package/dist/run/call.js +27 -24
- package/dist/run/call.js.map +1 -1
- package/dist/run/calling.js +8 -11
- package/dist/run/calling.js.map +1 -1
- package/dist/run/callingBurst.js +8 -11
- package/dist/run/callingBurst.js.map +1 -1
- package/dist/run/delay.js +4 -6
- package/dist/run/delay.js.map +1 -1
- package/dist/run/echo.js +4 -6
- package/dist/run/echo.js.map +1 -1
- package/dist/run/error.js +4 -6
- package/dist/run/error.js.map +1 -1
- package/dist/run/ping.js +24 -26
- package/dist/run/ping.js.map +1 -1
- package/dist/run/pub.js +7 -9
- package/dist/run/pub.js.map +1 -1
- package/dist/run/reject.js +4 -6
- package/dist/run/reject.js.map +1 -1
- package/dist/run/sub.js +31 -35
- package/dist/run/sub.js.map +1 -1
- package/dist/run/termimalCommands.js +1 -3
- package/dist/run/termimalCommands.js.map +1 -1
- package/dist/run/workers.js +13 -19
- package/dist/run/workers.js.map +1 -1
- package/dist/serialize.d.ts +1 -1
- package/dist/serialize.d.ts.map +1 -1
- package/dist/serialize.js +12 -20
- package/dist/serialize.js.map +1 -1
- package/dist/service.d.ts +1 -1
- package/dist/service.js +17 -17
- package/dist/service.js.map +1 -1
- package/dist/sleep.js +1 -5
- package/dist/sleep.js.map +1 -1
- package/dist/sub.d.ts +2 -2
- package/dist/sub.d.ts.map +1 -1
- package/dist/sub.js +16 -15
- package/dist/sub.js.map +1 -1
- package/dist/test/config.js +10 -12
- package/dist/test/config.js.map +1 -1
- package/dist/test/echo.js +19 -21
- package/dist/test/echo.js.map +1 -1
- package/dist/test/index.d.ts +1 -0
- package/dist/test/index.js +1 -1
- package/dist/test/index.js.map +1 -1
- package/dist/test/pack.js +33 -35
- package/dist/test/pack.js.map +1 -1
- package/dist/test/performance.js +7 -9
- package/dist/test/performance.js.map +1 -1
- package/dist/test/pub.js +14 -16
- package/dist/test/pub.js.map +1 -1
- package/dist/test/pub2.js +8 -10
- package/dist/test/pub2.js.map +1 -1
- package/dist/test/reject.js +16 -20
- package/dist/test/reject.js.map +1 -1
- package/dist/test/services.js +19 -21
- package/dist/test/services.js.map +1 -1
- package/dist/test/stress.js +7 -9
- package/dist/test/stress.js.map +1 -1
- package/dist/test/timing.js +27 -33
- package/dist/test/timing.js.map +1 -1
- package/dist/types.js +4 -7
- package/dist/types.js.map +1 -1
- package/dist/worker.d.ts +3 -3
- package/dist/worker.d.ts.map +1 -1
- package/dist/worker.js +52 -50
- package/dist/worker.js.map +1 -1
- package/package.json +17 -13
- package/src/EbusReject.ts +1 -1
- package/src/EbusUnpackedResult.ts +3 -3
- package/src/broker.ts +6 -6
- package/src/client.ts +1 -1
- package/src/clientBlocking.ts +9 -9
- package/src/clientNonBlocking.ts +9 -9
- package/src/consts.ts +1 -1
- package/src/delayWorker.ts +3 -3
- package/src/echoWorker.ts +2 -2
- package/src/errorWorker.ts +3 -3
- package/src/index.ts +18 -18
- package/src/loadConfiguration.ts +2 -2
- package/src/pub.ts +3 -3
- package/src/rejectWorker.ts +3 -4
- package/src/run/all.ts +5 -6
- package/src/run/broker.ts +1 -1
- package/src/run/call.ts +26 -11
- package/src/run/calling.ts +2 -2
- package/src/run/callingBurst.ts +2 -2
- package/src/run/delay.ts +1 -1
- package/src/run/echo.ts +1 -1
- package/src/run/error.ts +1 -1
- package/src/run/ping.ts +10 -9
- package/src/run/pub.ts +1 -1
- package/src/run/reject.ts +1 -1
- package/src/run/sub.ts +23 -22
- package/src/run/workers.ts +8 -14
- package/src/serialize.ts +1 -1
- package/src/service.ts +1 -1
- package/src/sub.ts +4 -4
- package/src/test/config.ts +3 -3
- package/src/test/echo.ts +4 -4
- package/src/test/pack.ts +1 -3
- package/src/test/performance.ts +4 -4
- package/src/test/pub.ts +6 -6
- package/src/test/pub2.ts +4 -6
- package/src/test/reject.ts +4 -5
- package/src/test/services.ts +3 -3
- package/src/test/stress.ts +2 -2
- package/src/test/timing.ts +5 -5
- package/src/worker.ts +7 -7
- package/tsconfig.json +3 -3
package/dist/service.js
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Service = void 0;
|
|
4
|
-
const cry_helpers_1 = require("cry-helpers");
|
|
5
|
-
const types_1 = require("./types");
|
|
1
|
+
import { Log } from "cry-helpers";
|
|
2
|
+
import { Header, Message } from "./types.js";
|
|
6
3
|
const prefixes = ["EBUS_BROKER", "EBUS"];
|
|
7
|
-
const log = new
|
|
8
|
-
class Service {
|
|
4
|
+
const log = new Log(prefixes);
|
|
5
|
+
export class Service {
|
|
6
|
+
name;
|
|
7
|
+
socket;
|
|
8
|
+
workers = new Map();
|
|
9
|
+
loads = new Map();
|
|
10
|
+
heartbeats = new Map();
|
|
11
|
+
requests = [];
|
|
12
|
+
log;
|
|
13
|
+
dispatched;
|
|
9
14
|
constructor(socket, name, log) {
|
|
10
|
-
this.workers = new Map();
|
|
11
|
-
this.loads = new Map();
|
|
12
|
-
this.heartbeats = new Map();
|
|
13
|
-
this.requests = [];
|
|
14
15
|
this.socket = socket;
|
|
15
16
|
this.name = name;
|
|
16
17
|
this.log = log;
|
|
@@ -27,7 +28,7 @@ class Service {
|
|
|
27
28
|
load = 0;
|
|
28
29
|
this.loads.set(worker.toString("hex"), load);
|
|
29
30
|
this.printLoad();
|
|
30
|
-
await this.socket.send([client, null,
|
|
31
|
+
await this.socket.send([client, null, Header.Client, type, ...rep]);
|
|
31
32
|
this.dispatchPending();
|
|
32
33
|
}
|
|
33
34
|
printLoad() {
|
|
@@ -67,8 +68,8 @@ class Service {
|
|
|
67
68
|
await this.socket.send([
|
|
68
69
|
worker,
|
|
69
70
|
null,
|
|
70
|
-
|
|
71
|
-
|
|
71
|
+
Header.Worker,
|
|
72
|
+
Message.Request,
|
|
72
73
|
client,
|
|
73
74
|
null,
|
|
74
75
|
reqId,
|
|
@@ -100,13 +101,12 @@ class Service {
|
|
|
100
101
|
await this.socket.send([
|
|
101
102
|
worker,
|
|
102
103
|
null,
|
|
103
|
-
|
|
104
|
-
|
|
104
|
+
Header.Worker,
|
|
105
|
+
Message.Heartbeat,
|
|
105
106
|
null,
|
|
106
107
|
null,
|
|
107
108
|
null,
|
|
108
109
|
]);
|
|
109
110
|
}
|
|
110
111
|
}
|
|
111
|
-
exports.Service = Service;
|
|
112
112
|
//# sourceMappingURL=service.js.map
|
package/dist/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/dist/sleep.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sleep = void 0;
|
|
4
|
-
async function sleep(msec, ret) {
|
|
1
|
+
export async function sleep(msec, ret) {
|
|
5
2
|
return new Promise(resolve => setTimeout(() => {
|
|
6
3
|
resolve(ret);
|
|
7
4
|
}, msec));
|
|
8
5
|
}
|
|
9
|
-
exports.sleep = sleep;
|
|
10
6
|
//# sourceMappingURL=sleep.js.map
|
package/dist/sleep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,IAAY,EAAE,GAAS;IAC/C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CACpC,GAAG,EAAE;QACD,OAAO,CAAC,GAAG,CAAC,CAAA;IAChB,CAAC,EACD,IAAI,CAAC,CACR,CAAC;AACN,CAAC"}
|
package/dist/sub.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { TypedEmitter } from "tiny-typed-emitter";
|
|
3
3
|
import { Subscriber } from "zeromq";
|
|
4
|
-
import { EbusConfiguration } from "./EbusConfiguration";
|
|
4
|
+
import { EbusConfiguration } from "./EbusConfiguration.js";
|
|
5
5
|
export interface EbusSubscriptionEvent {
|
|
6
6
|
message: (message: [channel: string, message: any]) => void;
|
|
7
7
|
connect: () => void;
|
package/dist/sub.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sub.d.ts","sourceRoot":"","sources":["../src/sub.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"sub.d.ts","sourceRoot":"","sources":["../src/sub.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAM1D,MAAM,WAAW,qBAAqB;IAElC,OAAO,EAAE,CAAE,OAAO,EAAE,CAAC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,CAAC,KAAM,IAAI,CAAC;IAC5D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,IAAI,CAAC;CAC1B;AACD,qBAAa,GAAI,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAExD,aAAa,EAAE,iBAAiB,CAAA;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAG,UAAU,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAEd,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;YAOrC,OAAO;IAaf,SAAS,CAAC,OAAO,EAAE,MAAM;IAQzB,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAWtC,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,YAAY;CAKvB"}
|
package/dist/sub.js
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const zeromq_1 = require("zeromq");
|
|
7
|
-
const loadConfiguration_1 = require("./loadConfiguration");
|
|
8
|
-
const serialize_1 = require("./serialize");
|
|
1
|
+
import { Log } from "cry-helpers";
|
|
2
|
+
import { unpack } from "cry-helpers/dist/serialize.js";
|
|
3
|
+
import { TypedEmitter } from "tiny-typed-emitter";
|
|
4
|
+
import { Subscriber } from "zeromq";
|
|
5
|
+
import { loadConfiguration } from "./loadConfiguration.js";
|
|
9
6
|
const prefixes = ["EBUS_SUB", "EBUS"];
|
|
10
|
-
const log = new
|
|
11
|
-
class Sub extends
|
|
7
|
+
const log = new Log(prefixes);
|
|
8
|
+
export class Sub extends TypedEmitter {
|
|
9
|
+
configuration;
|
|
10
|
+
address;
|
|
11
|
+
sock;
|
|
12
|
+
interval;
|
|
13
|
+
subscriptions;
|
|
12
14
|
constructor(config = {}) {
|
|
13
15
|
super();
|
|
14
|
-
this.configuration =
|
|
16
|
+
this.configuration = loadConfiguration(prefixes, config);
|
|
15
17
|
this.address = this.configuration.pubAddress;
|
|
16
18
|
this.subscriptions = new Set();
|
|
17
19
|
}
|
|
@@ -20,9 +22,9 @@ class Sub extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
20
22
|
try {
|
|
21
23
|
this.sock.close();
|
|
22
24
|
}
|
|
23
|
-
catch
|
|
25
|
+
catch { }
|
|
24
26
|
}
|
|
25
|
-
this.sock = new
|
|
27
|
+
this.sock = new Subscriber;
|
|
26
28
|
this.sock.events.on("connect", () => this.onConnect());
|
|
27
29
|
this.sock.events.on("disconnect", () => this.onDisconnect());
|
|
28
30
|
this.sock.reconnectInterval = 100;
|
|
@@ -48,7 +50,7 @@ class Sub extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
processMessage(messagePacked, channel) {
|
|
51
|
-
let message =
|
|
53
|
+
let message = unpack(messagePacked);
|
|
52
54
|
log.debug(`sub message received on ${channel}`, message);
|
|
53
55
|
this.emit("message", [channel.toString(), message]);
|
|
54
56
|
if (channel.toString() === "ebus/stop") {
|
|
@@ -68,5 +70,4 @@ class Sub extends tiny_typed_emitter_1.TypedEmitter {
|
|
|
68
70
|
this.emit("disconnect");
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
|
-
exports.Sub = Sub;
|
|
72
73
|
//# sourceMappingURL=sub.js.map
|
package/dist/sub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sub.js","sourceRoot":"","sources":["../src/sub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sub.js","sourceRoot":"","sources":["../src/sub.ts"],"names":[],"mappings":"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"}
|
package/dist/test/config.js
CHANGED
|
@@ -1,22 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const echoWorker_1 = require("../echoWorker");
|
|
6
|
-
const index_1 = require("../index");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { Client } from "../client.js";
|
|
3
|
+
import { EchoWorker } from "../echoWorker.js";
|
|
4
|
+
import { Broker } from "../index.js";
|
|
7
5
|
describe('services', async function () {
|
|
8
6
|
this.timeout(4000);
|
|
9
7
|
process.env.ebus_server = "tcp://localhost";
|
|
10
8
|
process.env.ebus_port = "4444";
|
|
11
|
-
let broker = new
|
|
9
|
+
let broker = new Broker();
|
|
12
10
|
broker.start();
|
|
13
|
-
let worker = new
|
|
11
|
+
let worker = new EchoWorker();
|
|
14
12
|
worker.start();
|
|
15
|
-
let client = new
|
|
13
|
+
let client = new Client();
|
|
16
14
|
it('should be at right port', async () => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
expect(broker.configuration.address).to.match(/:4444$/);
|
|
16
|
+
expect(worker.configuration.address).to.match(/:4444$/);
|
|
17
|
+
expect(client.configuration.address).to.match(/:4444$/);
|
|
20
18
|
});
|
|
21
19
|
it('exists', () => {
|
|
22
20
|
process.exit();
|
package/dist/test/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/test/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/test/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAe,MAAM,aAAa,CAAC;AAElD,QAAQ,CAAC,UAAU,EAAE,KAAK;IAEtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAElB,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,iBAAiB,CAAA;IAC3C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,MAAM,CAAA;IAE9B,IAAI,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,CAAA;IACd,IAAI,MAAM,GAAG,IAAI,UAAU,EAAE,CAAA;IAC7B,MAAM,CAAC,KAAK,EAAE,CAAA;IACd,IAAI,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;IAGzB,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACvD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACvD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAEN,CAAC,CAAC,CAAC"}
|
package/dist/test/echo.js
CHANGED
|
@@ -1,53 +1,51 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const echoWorker_1 = require("../echoWorker");
|
|
6
|
-
const index_1 = require("../index");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { Client } from "../client.js";
|
|
3
|
+
import { EchoWorker } from "../echoWorker.js";
|
|
4
|
+
import { Broker, DelayWorker, unpack, pack } from "../index.js";
|
|
7
5
|
describe('echo worker', async function () {
|
|
8
6
|
this.timeout(60000);
|
|
9
|
-
new
|
|
10
|
-
new
|
|
11
|
-
new
|
|
12
|
-
let client = new
|
|
7
|
+
new Broker().start();
|
|
8
|
+
new EchoWorker().start();
|
|
9
|
+
new DelayWorker().start();
|
|
10
|
+
let client = new Client();
|
|
13
11
|
it('should return passed-in object', async () => {
|
|
14
12
|
let rep = await client.request("echo", {
|
|
15
13
|
delay: 50,
|
|
16
14
|
}, { receiveTimeout: 120000 });
|
|
17
|
-
|
|
15
|
+
expect(rep?.delay).to.eq(50);
|
|
18
16
|
});
|
|
19
17
|
it('should return passed-in object zipped', async () => {
|
|
20
18
|
let rep = await client.request("delay", { delay: 50 }, { zip: true, receiveTimeout: 120000 });
|
|
21
|
-
|
|
19
|
+
expect(rep?.delay).to.eq(50);
|
|
22
20
|
});
|
|
23
21
|
it('should return passed-in object raw', async () => {
|
|
24
22
|
let load = Buffer.from("ABC");
|
|
25
23
|
let rep = await client.request("echo", load, { raw: true });
|
|
26
|
-
|
|
24
|
+
expect(rep?.toString()).to.eq("ABC");
|
|
27
25
|
});
|
|
28
26
|
it('should return passed-in object raw and zipped', async () => {
|
|
29
27
|
let load = Buffer.from("ABC");
|
|
30
28
|
let rep = await client.request("echo", load, { raw: true, zip: true });
|
|
31
|
-
|
|
29
|
+
expect(Buffer.from(rep).toString()).to.eq("ABC");
|
|
32
30
|
});
|
|
33
31
|
it('should return unpacked object', async () => {
|
|
34
32
|
let load = Buffer.from("ABC");
|
|
35
33
|
let res = (await client.requestUpacked("echo", load, { raw: true, zip: true, }));
|
|
36
|
-
let rep =
|
|
37
|
-
|
|
34
|
+
let rep = unpack(res.data, res.opts);
|
|
35
|
+
expect(Buffer.from(rep).toString()).to.eq("ABC");
|
|
38
36
|
});
|
|
39
37
|
it('should accept externally prepacked object', async () => {
|
|
40
38
|
let load = { a: { b: 2 } };
|
|
41
|
-
let loadPrepacked =
|
|
39
|
+
let loadPrepacked = pack(load, { zip: true });
|
|
42
40
|
let rep = (await client.request("echo", loadPrepacked, { prepacked: true, zip: true, receiveTimeout: 30000 }));
|
|
43
|
-
|
|
41
|
+
expect(rep.a.b).to.eq(2);
|
|
44
42
|
});
|
|
45
43
|
it('should accept externally prepacked object', async () => {
|
|
46
44
|
let load = { a: { b: 2 } };
|
|
47
|
-
let loadPrepacked =
|
|
45
|
+
let loadPrepacked = pack(load, { zip: true });
|
|
48
46
|
let res = (await client.requestUpacked("echo", loadPrepacked, { prepacked: true, zip: true, receiveTimeout: 30000 }));
|
|
49
|
-
let rep =
|
|
50
|
-
|
|
47
|
+
let rep = unpack(res.data, res.opts);
|
|
48
|
+
expect(rep.a.b).to.eq(2);
|
|
51
49
|
});
|
|
52
50
|
it('exists', () => {
|
|
53
51
|
process.exit();
|
package/dist/test/echo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo.js","sourceRoot":"","sources":["../../src/test/echo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"echo.js","sourceRoot":"","sources":["../../src/test/echo.ts"],"names":[],"mappings":"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"}
|
package/dist/test/index.d.ts
CHANGED
package/dist/test/index.js
CHANGED
package/dist/test/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,qCAAqC;AACrC,qCAAqC;;AAErC,uCAAuC;AACvC,+DAA+D;AAC/D,IAAI;AAEJ,mCAAmC;AACnC,sBAAsB;AAEtB,oDAAoD;AACpD,2CAA2C;AAC3C,gCAAgC;AAChC,QAAQ;AACR,IAAI;AAEJ,sCAAsC;AACtC,yBAAyB;AAEzB,qDAAqD;AACrD,2CAA2C;AAC3C,iCAAiC;AACjC,QAAQ;AACR,IAAI;AAEJ,8BAA8B;AAC9B,+EAA+E;AAE/E,4BAA4B;AAE5B,0BAA0B;AAC1B,mDAAmD;AACnD,qBAAqB;AAErB,6CAA6C;AAC7C,0BAA0B;AAC1B,4EAA4E;AAC5E,0DAA0D;AAC1D,2CAA2C;AAC3C,8CAA8C;AAC9C,4CAA4C;AAC5C,kDAAkD;AAClD,6CAA6C;AAC7C,gDAAgD;AAChD,oDAAoD;AACpD,SAAS;AAET,kDAAkD;AAClD,oBAAoB;AACpB,IAAI;AAEJ,wBAAwB;AACxB,yBAAyB;AACzB,sBAAsB;AACtB,KAAK"}
|
package/dist/test/pack.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const chai_1 = require("chai");
|
|
4
|
-
const index_1 = require("../index");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { unpack, pack } from "../index.js";
|
|
5
3
|
const largeArray = () => [
|
|
6
4
|
/* 1 */
|
|
7
5
|
{
|
|
@@ -1362,82 +1360,82 @@ describe('pack', async function () {
|
|
|
1362
1360
|
let o1 = o();
|
|
1363
1361
|
o1[0].o = 2;
|
|
1364
1362
|
let o2 = o();
|
|
1365
|
-
|
|
1366
|
-
|
|
1367
|
-
|
|
1368
|
-
|
|
1363
|
+
expect(o1[0].o).to.equal(2);
|
|
1364
|
+
expect(o2[0].o).to.equal(1);
|
|
1365
|
+
expect(o1[0].a[0]).to.eq("ABC");
|
|
1366
|
+
expect(o2[0].a[0]).to.eq("ABC");
|
|
1369
1367
|
});
|
|
1370
1368
|
it('should unpack serialized, unzipped', async () => {
|
|
1371
1369
|
let opts = { zip: false };
|
|
1372
|
-
let packed =
|
|
1373
|
-
let unpacked =
|
|
1374
|
-
|
|
1375
|
-
|
|
1376
|
-
|
|
1377
|
-
|
|
1378
|
-
|
|
1370
|
+
let packed = pack(o(), opts);
|
|
1371
|
+
let unpacked = unpack(packed, opts);
|
|
1372
|
+
expect(unpacked[0].a[0]).to.eq("ABC");
|
|
1373
|
+
expect(unpacked[0].d.valueOf()).to.eq(d.valueOf());
|
|
1374
|
+
expect(unpacked[0].r.toString()).to.eq(r.toString());
|
|
1375
|
+
expect(unpacked[0].r instanceof RegExp).to.eq(true);
|
|
1376
|
+
expect(unpacked[0].d instanceof Date).to.eq(true);
|
|
1379
1377
|
});
|
|
1380
1378
|
it('should unpack serialized, zipped', async () => {
|
|
1381
1379
|
let opts = { zip: true };
|
|
1382
|
-
let packed =
|
|
1383
|
-
let unpacked =
|
|
1384
|
-
|
|
1385
|
-
|
|
1380
|
+
let packed = pack(o(), opts);
|
|
1381
|
+
let unpacked = unpack(packed, opts);
|
|
1382
|
+
expect(unpacked[0].a[0]).to.eq("ABC");
|
|
1383
|
+
expect(unpacked[0].d.valueOf()).to.eq(d.valueOf());
|
|
1386
1384
|
});
|
|
1387
1385
|
it('should unpack serialized, zipped', async () => {
|
|
1388
1386
|
let opts = { zip: true };
|
|
1389
|
-
let packed =
|
|
1390
|
-
let unpacked =
|
|
1391
|
-
|
|
1387
|
+
let packed = pack(o(), opts);
|
|
1388
|
+
let unpacked = unpack(packed, opts);
|
|
1389
|
+
expect(unpacked[0].a[0]).to.eq("ABC");
|
|
1392
1390
|
});
|
|
1393
1391
|
it('should unpack serialized, zipped', async () => {
|
|
1394
1392
|
let opts = { zip: true, raw: true };
|
|
1395
1393
|
let buff1 = Buffer.from(JSON.stringify(o()));
|
|
1396
1394
|
let buff2 = Buffer.from(JSON.stringify(o()));
|
|
1397
|
-
let res = Buffer.from(
|
|
1398
|
-
|
|
1395
|
+
let res = Buffer.from(unpack(pack(buff1, opts), opts));
|
|
1396
|
+
expect(res.toString()).to.equal(buff2.toString());
|
|
1399
1397
|
});
|
|
1400
1398
|
it('should unpack unserialized, zipped', async () => {
|
|
1401
1399
|
let opts = { zip: false, raw: true };
|
|
1402
1400
|
let buff1 = Buffer.from(JSON.stringify(o()));
|
|
1403
1401
|
let buff2 = Buffer.from(JSON.stringify(o()));
|
|
1404
|
-
let res =
|
|
1402
|
+
let res = unpack(pack(buff1, opts), opts);
|
|
1405
1403
|
for (let i = 0; i < buff2.length; i++)
|
|
1406
|
-
|
|
1404
|
+
expect(res[i]).to.equal(buff2[i]);
|
|
1407
1405
|
});
|
|
1408
1406
|
it('should unpack unserialized, zipped', async () => {
|
|
1409
1407
|
let opts = { zip: false, raw: true };
|
|
1410
1408
|
let buff1 = Buffer.from(JSON.stringify(o()));
|
|
1411
1409
|
let buff2 = Buffer.from(JSON.stringify(o()));
|
|
1412
|
-
let res =
|
|
1410
|
+
let res = unpack(pack(buff1, opts), opts);
|
|
1413
1411
|
for (let i = 0; i < buff2.length; i++)
|
|
1414
|
-
|
|
1412
|
+
expect(res[i]).to.equal(buff2[i]);
|
|
1415
1413
|
});
|
|
1416
1414
|
it('should pack and upack large object, zipped', async () => {
|
|
1417
1415
|
let opts = { zip: true };
|
|
1418
|
-
let res =
|
|
1416
|
+
let res = unpack(pack(largeArray(), opts), opts);
|
|
1419
1417
|
res.should.deep.equalInAnyOrder(largeArray());
|
|
1420
1418
|
});
|
|
1421
1419
|
it('should pack and upack large object, unzipped', async () => {
|
|
1422
1420
|
let opts = { zip: false };
|
|
1423
|
-
let res =
|
|
1421
|
+
let res = unpack(pack(largeArray(), opts), opts);
|
|
1424
1422
|
res.should.deep.equalInAnyOrder(largeArray());
|
|
1425
1423
|
});
|
|
1426
1424
|
it('notepack should be more efficient than JSON.stringify', async () => {
|
|
1427
1425
|
let opts = { zip: false };
|
|
1428
|
-
let res =
|
|
1426
|
+
let res = pack(largeArray(), opts);
|
|
1429
1427
|
let jsn = JSON.stringify(largeArray());
|
|
1430
1428
|
let factor = res.length / jsn.length;
|
|
1431
|
-
|
|
1429
|
+
expect(factor < .9).to.be.true;
|
|
1432
1430
|
});
|
|
1433
1431
|
it('zipped object should be smalled than non-zipped', async () => {
|
|
1434
1432
|
let optsZipped = { zip: true };
|
|
1435
1433
|
let optsUnzipped = { zip: false };
|
|
1436
|
-
let resZipped =
|
|
1437
|
-
let resUnzipped =
|
|
1434
|
+
let resZipped = pack(largeArray(), optsZipped);
|
|
1435
|
+
let resUnzipped = pack(largeArray(), optsUnzipped);
|
|
1438
1436
|
let factor = resZipped.length / resUnzipped.length;
|
|
1439
1437
|
// console.log('factor',factor);
|
|
1440
|
-
|
|
1438
|
+
expect(factor < .8).to.be.true;
|
|
1441
1439
|
});
|
|
1442
1440
|
it('exists', () => {
|
|
1443
1441
|
process.exit();
|