@delight-rpc/extra-websocket 0.1.1 → 0.2.2
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/README.md +2 -0
- package/lib/client.d.ts +4 -2
- package/lib/client.js +21 -10
- package/lib/client.js.map +1 -1
- package/lib/server.js +3 -3
- package/lib/server.js.map +1 -1
- package/package.json +12 -11
package/README.md
CHANGED
|
@@ -15,6 +15,7 @@ function createClient<IAPI extends object>(
|
|
|
15
15
|
parameterValidators?: DelightRPC.ParameterValidators<IAPI>
|
|
16
16
|
expectedVersion?: `${number}.${number}.${number}`
|
|
17
17
|
channel?: string
|
|
18
|
+
timeout?: number
|
|
18
19
|
}
|
|
19
20
|
): [client: DelightRPC.ClientProxy<IAPI>, close: () => void]
|
|
20
21
|
```
|
|
@@ -26,6 +27,7 @@ function createBatchClient(
|
|
|
26
27
|
, options?: {
|
|
27
28
|
expectedVersion?: `${number}.${number}.${number}`
|
|
28
29
|
channel?: string
|
|
30
|
+
timeout?: number
|
|
29
31
|
}
|
|
30
32
|
): [client: DelightRPC.BatchClient, close: () => void]
|
|
31
33
|
```
|
package/lib/client.d.ts
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import * as DelightRPC from 'delight-rpc';
|
|
2
2
|
import { CustomError } from '@blackglory/errors';
|
|
3
3
|
import { ExtraWebSocket } from 'extra-websocket';
|
|
4
|
-
export declare function createClient<IAPI extends object>(socket: ExtraWebSocket, { parameterValidators, expectedVersion, channel }?: {
|
|
4
|
+
export declare function createClient<IAPI extends object>(socket: ExtraWebSocket, { parameterValidators, expectedVersion, channel, timeout }?: {
|
|
5
5
|
parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
|
|
6
6
|
expectedVersion?: `${number}.${number}.${number}`;
|
|
7
7
|
channel?: string;
|
|
8
|
+
timeout?: number;
|
|
8
9
|
}): [client: DelightRPC.ClientProxy<IAPI>, close: () => void];
|
|
9
|
-
export declare function createBatchClient(socket: ExtraWebSocket, { expectedVersion, channel }?: {
|
|
10
|
+
export declare function createBatchClient(socket: ExtraWebSocket, { expectedVersion, channel, timeout }?: {
|
|
10
11
|
expectedVersion?: `${number}.${number}.${number}`;
|
|
11
12
|
channel?: string;
|
|
13
|
+
timeout?: number;
|
|
12
14
|
}): [client: DelightRPC.BatchClient, close: () => void];
|
|
13
15
|
export declare class ClientClosed extends CustomError {
|
|
14
16
|
}
|
package/lib/client.js
CHANGED
|
@@ -29,15 +29,21 @@ const extra_promise_1 = require("extra-promise");
|
|
|
29
29
|
const errors_1 = require("@blackglory/errors");
|
|
30
30
|
const return_style_1 = require("return-style");
|
|
31
31
|
const prelude_1 = require("@blackglory/prelude");
|
|
32
|
-
|
|
32
|
+
const extra_abort_1 = require("extra-abort");
|
|
33
|
+
function createClient(socket, { parameterValidators, expectedVersion, channel, timeout } = {}) {
|
|
33
34
|
const pendings = {};
|
|
34
|
-
socket.
|
|
35
|
+
const removeMessageListener = socket.on('message', listener);
|
|
35
36
|
const client = DelightRPC.createClient(async function send(request) {
|
|
36
37
|
const res = new extra_promise_1.Deferred();
|
|
37
38
|
pendings[request.id] = res;
|
|
38
39
|
try {
|
|
39
40
|
socket.send(JSON.stringify(request));
|
|
40
|
-
|
|
41
|
+
if ((0, prelude_1.isUndefined)(timeout)) {
|
|
42
|
+
return await res;
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), () => res);
|
|
46
|
+
}
|
|
41
47
|
}
|
|
42
48
|
finally {
|
|
43
49
|
delete pendings[request.id];
|
|
@@ -49,13 +55,13 @@ function createClient(socket, { parameterValidators, expectedVersion, channel }
|
|
|
49
55
|
});
|
|
50
56
|
return [client, close];
|
|
51
57
|
function close() {
|
|
52
|
-
|
|
58
|
+
removeMessageListener();
|
|
53
59
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
54
60
|
deferred.reject(new ClientClosed());
|
|
55
61
|
delete pendings[key];
|
|
56
62
|
}
|
|
57
63
|
}
|
|
58
|
-
function
|
|
64
|
+
function listener(event) {
|
|
59
65
|
const data = event.data;
|
|
60
66
|
if ((0, prelude_1.isString)(data)) {
|
|
61
67
|
const res = (0, return_style_1.getResult)(() => JSON.parse(data));
|
|
@@ -66,15 +72,20 @@ function createClient(socket, { parameterValidators, expectedVersion, channel }
|
|
|
66
72
|
}
|
|
67
73
|
}
|
|
68
74
|
exports.createClient = createClient;
|
|
69
|
-
function createBatchClient(socket, { expectedVersion, channel } = {}) {
|
|
75
|
+
function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
|
|
70
76
|
const pendings = {};
|
|
71
|
-
socket.
|
|
77
|
+
const removeMessageListener = socket.on('message', listener);
|
|
72
78
|
const client = new DelightRPC.BatchClient(async function send(request) {
|
|
73
79
|
const res = new extra_promise_1.Deferred();
|
|
74
80
|
pendings[request.id] = res;
|
|
75
81
|
try {
|
|
76
82
|
socket.send(JSON.stringify(request));
|
|
77
|
-
|
|
83
|
+
if ((0, prelude_1.isUndefined)(timeout)) {
|
|
84
|
+
return await res;
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), () => res);
|
|
88
|
+
}
|
|
78
89
|
}
|
|
79
90
|
finally {
|
|
80
91
|
delete pendings[request.id];
|
|
@@ -85,13 +96,13 @@ function createBatchClient(socket, { expectedVersion, channel } = {}) {
|
|
|
85
96
|
});
|
|
86
97
|
return [client, close];
|
|
87
98
|
function close() {
|
|
88
|
-
|
|
99
|
+
removeMessageListener();
|
|
89
100
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
90
101
|
deferred.reject(new ClientClosed());
|
|
91
102
|
delete pendings[key];
|
|
92
103
|
}
|
|
93
104
|
}
|
|
94
|
-
function
|
|
105
|
+
function listener(event) {
|
|
95
106
|
const data = event.data;
|
|
96
107
|
if ((0, prelude_1.isString)(data)) {
|
|
97
108
|
const res = (0, return_style_1.getResult)(() => JSON.parse(data));
|
package/lib/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AACzC,iDAAwC;AACxC,+CAAgD;AAGhD,+CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/lib/server.js
CHANGED
|
@@ -35,9 +35,9 @@ function createServer(api, socket, { loggerLevel = extra_logger_1.Level.None, pa
|
|
|
35
35
|
level: loggerLevel,
|
|
36
36
|
transport: new extra_logger_1.TerminalTransport()
|
|
37
37
|
});
|
|
38
|
-
socket.
|
|
39
|
-
return () =>
|
|
40
|
-
async function
|
|
38
|
+
const removeMessageListener = socket.on('message', listener);
|
|
39
|
+
return () => removeMessageListener();
|
|
40
|
+
async function listener(event) {
|
|
41
41
|
const data = event.data;
|
|
42
42
|
if ((0, prelude_1.isString)(data)) {
|
|
43
43
|
const request = (0, return_style_1.getResult)(() => JSON.parse(data));
|
package/lib/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAGzC,+CAAwC;AACxC,+CAA+D;AAC/D,iDAAwD;AAExD,6CAAoC;AAA3B,qGAAA,KAAK,OAAA;AAEd,SAAgB,YAAY,CAC1B,GAAsC,EACtC,MAAsB,EACtB,EAAE,WAAW,GAAG,oBAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAM3E,EAAE;IAEN,MAAM,MAAM,GAAG,IAAI,qBAAM,CAAC;QACxB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,IAAI,gCAAiB,EAAE;KACnC,CAAC,CAAA;IAEF,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAGzC,+CAAwC;AACxC,+CAA+D;AAC/D,iDAAwD;AAExD,6CAAoC;AAA3B,qGAAA,KAAK,OAAA;AAEd,SAAgB,YAAY,CAC1B,GAAsC,EACtC,MAAsB,EACtB,EAAE,WAAW,GAAG,oBAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAM3E,EAAE;IAEN,MAAM,MAAM,GAAG,IAAI,qBAAM,CAAC;QACxB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,IAAI,gCAAiB,EAAE;KACnC,CAAC,CAAA;IAEF,MAAM,qBAAqB,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC5D,OAAO,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;IAEpC,KAAK,UAAU,QAAQ,CAAC,KAAmB;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;QACvB,IAAI,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE;YAClB,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YACjD,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;gBACvE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CACpC,GAAG,EAAE;oBACH,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACjC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;qBAChC;yBAAM;wBACL,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAChE;gBACH,CAAC,EACD,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAC7B,GAAG,EACH,OAAO,EACP;oBACE,mBAAmB;oBACnB,OAAO;oBACP,OAAO;oBACP,YAAY;iBACb,CACF,CACF,CAAA;gBAED,IAAI,IAAA,kBAAQ,EAAC,QAAQ,CAAC,EAAE;oBACtB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;iBACtC;aACF;SACF;IACH,CAAC;AACH,CAAC;AAlDD,oCAkDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@delight-rpc/extra-websocket",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -30,27 +30,27 @@
|
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@blackglory/jest-matchers": "^0.3.1",
|
|
33
|
-
"@commitlint/cli": "^17.0.
|
|
34
|
-
"@commitlint/config-conventional": "^17.0.
|
|
35
|
-
"@delight-rpc/websocket": "^0.5.
|
|
33
|
+
"@commitlint/cli": "^17.0.2",
|
|
34
|
+
"@commitlint/config-conventional": "^17.0.2",
|
|
35
|
+
"@delight-rpc/websocket": "^0.5.2",
|
|
36
36
|
"@types/jest": "^27.5.1",
|
|
37
37
|
"@types/node": "14",
|
|
38
38
|
"@types/ws": "^8.5.3",
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "^5.27.
|
|
40
|
-
"@typescript-eslint/parser": "^5.27.
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^5.27.1",
|
|
40
|
+
"@typescript-eslint/parser": "^5.27.1",
|
|
41
41
|
"cross-env": "^7.0.3",
|
|
42
42
|
"delight-rpc": "^4.1.0",
|
|
43
|
-
"eslint": "8.
|
|
44
|
-
"extra-websocket": "^0.
|
|
43
|
+
"eslint": "8.17.0",
|
|
44
|
+
"extra-websocket": "^0.3.0",
|
|
45
45
|
"husky": "4",
|
|
46
46
|
"jest": "^27.5.1",
|
|
47
47
|
"npm-run-all": "^4.1.5",
|
|
48
48
|
"rimraf": "^3.0.2",
|
|
49
49
|
"standard-version": "^9.5.0",
|
|
50
50
|
"ts-jest": "^27.1.4",
|
|
51
|
-
"ts-node": "^10.8.
|
|
51
|
+
"ts-node": "^10.8.1",
|
|
52
52
|
"ts-patch": "^2.0.1",
|
|
53
|
-
"typescript": "^4.7.
|
|
53
|
+
"typescript": "^4.7.3",
|
|
54
54
|
"typescript-transform-paths": "^3.3.1",
|
|
55
55
|
"ws": "^8.7.0"
|
|
56
56
|
},
|
|
@@ -58,12 +58,13 @@
|
|
|
58
58
|
"@blackglory/errors": "^2.2.1",
|
|
59
59
|
"@blackglory/prelude": "^0.1.1",
|
|
60
60
|
"@delight-rpc/protocol": "^2.2.0",
|
|
61
|
+
"extra-abort": "^0.1.2",
|
|
61
62
|
"extra-logger": "^0.6.8",
|
|
62
63
|
"extra-promise": "^2.0.0",
|
|
63
64
|
"return-style": "^1.0.0"
|
|
64
65
|
},
|
|
65
66
|
"peerDependencies": {
|
|
66
67
|
"delight-rpc": "^4.1.0",
|
|
67
|
-
"extra-websocket": "^0.1
|
|
68
|
+
"extra-websocket": "^0.2.1"
|
|
68
69
|
}
|
|
69
70
|
}
|