@delight-rpc/extra-websocket 0.2.3 → 0.3.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 +1 -1
- package/lib/client.js +6 -6
- package/lib/client.js.map +1 -1
- package/lib/server.d.ts +1 -1
- package/lib/server.js +3 -3
- package/lib/server.js.map +1 -1
- package/package.json +17 -16
package/README.md
CHANGED
|
@@ -41,7 +41,7 @@ function createServer<IAPI extends object>(
|
|
|
41
41
|
loggerLevel?: Level = Level.None
|
|
42
42
|
parameterValidators?: DelightRPC.ParameterValidators<IAPI>
|
|
43
43
|
version?: `${number}.${number}.${number}`
|
|
44
|
-
channel?: string
|
|
44
|
+
channel?: string | RegExp | AnyChannel
|
|
45
45
|
ownPropsOnly?: boolean
|
|
46
46
|
}
|
|
47
47
|
): () => void
|
package/lib/client.js
CHANGED
|
@@ -32,7 +32,7 @@ const prelude_1 = require("@blackglory/prelude");
|
|
|
32
32
|
const extra_abort_1 = require("extra-abort");
|
|
33
33
|
function createClient(socket, { parameterValidators, expectedVersion, channel, timeout } = {}) {
|
|
34
34
|
const pendings = {};
|
|
35
|
-
socket.
|
|
35
|
+
const removeMessageListener = socket.on('message', listener);
|
|
36
36
|
const client = DelightRPC.createClient(async function send(request) {
|
|
37
37
|
const res = new extra_promise_1.Deferred();
|
|
38
38
|
pendings[request.id] = res;
|
|
@@ -55,13 +55,13 @@ function createClient(socket, { parameterValidators, expectedVersion, channel, t
|
|
|
55
55
|
});
|
|
56
56
|
return [client, close];
|
|
57
57
|
function close() {
|
|
58
|
-
|
|
58
|
+
removeMessageListener();
|
|
59
59
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
60
60
|
deferred.reject(new ClientClosed());
|
|
61
61
|
delete pendings[key];
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
function
|
|
64
|
+
function listener(event) {
|
|
65
65
|
const data = event.data;
|
|
66
66
|
if ((0, prelude_1.isString)(data)) {
|
|
67
67
|
const res = (0, return_style_1.getResult)(() => JSON.parse(data));
|
|
@@ -74,7 +74,7 @@ function createClient(socket, { parameterValidators, expectedVersion, channel, t
|
|
|
74
74
|
exports.createClient = createClient;
|
|
75
75
|
function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
|
|
76
76
|
const pendings = {};
|
|
77
|
-
socket.
|
|
77
|
+
const removeMessageListener = socket.on('message', listener);
|
|
78
78
|
const client = new DelightRPC.BatchClient(async function send(request) {
|
|
79
79
|
const res = new extra_promise_1.Deferred();
|
|
80
80
|
pendings[request.id] = res;
|
|
@@ -96,13 +96,13 @@ function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
|
|
|
96
96
|
});
|
|
97
97
|
return [client, close];
|
|
98
98
|
function close() {
|
|
99
|
-
|
|
99
|
+
removeMessageListener();
|
|
100
100
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
101
101
|
deferred.reject(new ClientClosed());
|
|
102
102
|
delete pendings[key];
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
-
function
|
|
105
|
+
function listener(event) {
|
|
106
106
|
const data = event.data;
|
|
107
107
|
if ((0, prelude_1.isString)(data)) {
|
|
108
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,iDAA2D;AAE3D,6CAA4D;AAE5D,SAAgB,YAAY,CAC1B,MAAsB,EACtB,EAAE,mBAAmB,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,KAKpD,EAAE;IAEN,MAAM,QAAQ,GAA+C,EAAE,CAAA;IAE/D,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/lib/server.d.ts
CHANGED
|
@@ -6,6 +6,6 @@ export declare function createServer<IAPI extends object>(api: DelightRPC.Implem
|
|
|
6
6
|
loggerLevel?: Level;
|
|
7
7
|
parameterValidators?: DelightRPC.ParameterValidators<IAPI>;
|
|
8
8
|
version?: `${number}.${number}.${number}`;
|
|
9
|
-
channel?: string;
|
|
9
|
+
channel?: string | RegExp | typeof DelightRPC.AnyChannel;
|
|
10
10
|
ownPropsOnly?: boolean;
|
|
11
11
|
}): () => void;
|
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.2
|
|
3
|
+
"version": "0.3.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"repository": "git@github.com:delight-rpc/extra-websocket.git",
|
|
12
12
|
"author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
|
|
13
13
|
"license": "MIT",
|
|
14
|
+
"sideEffects": false,
|
|
14
15
|
"scripts": {
|
|
15
16
|
"prepare": "ts-patch install -s",
|
|
16
17
|
"lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src",
|
|
@@ -30,41 +31,41 @@
|
|
|
30
31
|
},
|
|
31
32
|
"devDependencies": {
|
|
32
33
|
"@blackglory/jest-matchers": "^0.3.1",
|
|
33
|
-
"@commitlint/cli": "^17.0.
|
|
34
|
-
"@commitlint/config-conventional": "^17.0.
|
|
35
|
-
"@delight-rpc/websocket": "^0.5.
|
|
34
|
+
"@commitlint/cli": "^17.0.3",
|
|
35
|
+
"@commitlint/config-conventional": "^17.0.3",
|
|
36
|
+
"@delight-rpc/websocket": "^0.5.3",
|
|
36
37
|
"@types/jest": "^27.5.1",
|
|
37
38
|
"@types/node": "14",
|
|
38
39
|
"@types/ws": "^8.5.3",
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
40
|
-
"@typescript-eslint/parser": "^5.
|
|
40
|
+
"@typescript-eslint/eslint-plugin": "^5.30.7",
|
|
41
|
+
"@typescript-eslint/parser": "^5.30.7",
|
|
41
42
|
"cross-env": "^7.0.3",
|
|
42
|
-
"delight-rpc": "^4.1
|
|
43
|
-
"eslint": "8.
|
|
44
|
-
"extra-websocket": "^0.
|
|
43
|
+
"delight-rpc": "^4.2.1",
|
|
44
|
+
"eslint": "8.20.0",
|
|
45
|
+
"extra-websocket": "^0.3.0",
|
|
45
46
|
"husky": "4",
|
|
46
47
|
"jest": "^27.5.1",
|
|
47
48
|
"npm-run-all": "^4.1.5",
|
|
48
49
|
"rimraf": "^3.0.2",
|
|
49
50
|
"standard-version": "^9.5.0",
|
|
50
51
|
"ts-jest": "^27.1.4",
|
|
51
|
-
"ts-node": "^10.
|
|
52
|
+
"ts-node": "^10.9.1",
|
|
52
53
|
"ts-patch": "^2.0.1",
|
|
53
|
-
"typescript": "^4.7.
|
|
54
|
+
"typescript": "^4.7.4",
|
|
54
55
|
"typescript-transform-paths": "^3.3.1",
|
|
55
|
-
"ws": "^8.
|
|
56
|
+
"ws": "^8.8.1"
|
|
56
57
|
},
|
|
57
58
|
"dependencies": {
|
|
58
59
|
"@blackglory/errors": "^2.2.1",
|
|
59
|
-
"@blackglory/prelude": "^0.1.
|
|
60
|
+
"@blackglory/prelude": "^0.1.3",
|
|
60
61
|
"@delight-rpc/protocol": "^2.2.0",
|
|
61
62
|
"extra-abort": "^0.1.2",
|
|
62
63
|
"extra-logger": "^0.6.8",
|
|
63
|
-
"extra-promise": "^2.
|
|
64
|
+
"extra-promise": "^2.2.0",
|
|
64
65
|
"return-style": "^1.0.0"
|
|
65
66
|
},
|
|
66
67
|
"peerDependencies": {
|
|
67
|
-
"delight-rpc": "^4.1
|
|
68
|
-
"extra-websocket": "^0.
|
|
68
|
+
"delight-rpc": "^4.2.1",
|
|
69
|
+
"extra-websocket": "^0.3.0"
|
|
69
70
|
}
|
|
70
71
|
}
|