@delight-rpc/extra-websocket 0.7.1 → 0.7.3
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/lib/client.js +10 -10
- package/lib/client.js.map +1 -1
- package/package.json +5 -5
package/lib/client.js
CHANGED
|
@@ -5,11 +5,11 @@ import { getResult } from 'return-style';
|
|
|
5
5
|
import { isntUndefined, isString } from '@blackglory/prelude';
|
|
6
6
|
import { withAbortSignal, raceAbortSignals, timeoutSignal } from 'extra-abort';
|
|
7
7
|
export function createClient(socket, { parameterValidators, expectedVersion, channel, timeout } = {}) {
|
|
8
|
-
const pendings =
|
|
8
|
+
const pendings = new Map();
|
|
9
9
|
const removeMessageListener = socket.on('message', listener);
|
|
10
10
|
const client = DelightRPC.createClient(async function send(request, signal) {
|
|
11
11
|
const res = new Deferred();
|
|
12
|
-
pendings
|
|
12
|
+
pendings.set(request.id, res);
|
|
13
13
|
try {
|
|
14
14
|
socket.send(JSON.stringify(request));
|
|
15
15
|
const mergedSignal = raceAbortSignals([
|
|
@@ -23,7 +23,7 @@ export function createClient(socket, { parameterValidators, expectedVersion, cha
|
|
|
23
23
|
return await withAbortSignal(mergedSignal, () => res);
|
|
24
24
|
}
|
|
25
25
|
finally {
|
|
26
|
-
delete
|
|
26
|
+
pendings.delete(request.id);
|
|
27
27
|
}
|
|
28
28
|
}, {
|
|
29
29
|
parameterValidators,
|
|
@@ -35,7 +35,7 @@ export function createClient(socket, { parameterValidators, expectedVersion, cha
|
|
|
35
35
|
removeMessageListener();
|
|
36
36
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
37
37
|
deferred.reject(new ClientClosed());
|
|
38
|
-
delete
|
|
38
|
+
pendings.delete(key);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
function listener(event) {
|
|
@@ -44,17 +44,17 @@ export function createClient(socket, { parameterValidators, expectedVersion, cha
|
|
|
44
44
|
if (isString(data)) {
|
|
45
45
|
const res = getResult(() => JSON.parse(data));
|
|
46
46
|
if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
|
|
47
|
-
(_a = pendings
|
|
47
|
+
(_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
export function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
|
|
53
|
-
const pendings =
|
|
53
|
+
const pendings = new Map();
|
|
54
54
|
const removeMessageListener = socket.on('message', listener);
|
|
55
55
|
const client = new DelightRPC.BatchClient(async function send(request) {
|
|
56
56
|
const res = new Deferred();
|
|
57
|
-
pendings
|
|
57
|
+
pendings.set(request.id, res);
|
|
58
58
|
try {
|
|
59
59
|
socket.send(JSON.stringify(request));
|
|
60
60
|
const mergedSignal = raceAbortSignals([
|
|
@@ -67,7 +67,7 @@ export function createBatchClient(socket, { expectedVersion, channel, timeout }
|
|
|
67
67
|
return await withAbortSignal(mergedSignal, () => res);
|
|
68
68
|
}
|
|
69
69
|
finally {
|
|
70
|
-
delete
|
|
70
|
+
pendings.delete(request.id);
|
|
71
71
|
}
|
|
72
72
|
}, {
|
|
73
73
|
expectedVersion,
|
|
@@ -78,7 +78,7 @@ export function createBatchClient(socket, { expectedVersion, channel, timeout }
|
|
|
78
78
|
removeMessageListener();
|
|
79
79
|
for (const [key, deferred] of Object.entries(pendings)) {
|
|
80
80
|
deferred.reject(new ClientClosed());
|
|
81
|
-
delete
|
|
81
|
+
pendings.delete(key);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
function listener(event) {
|
|
@@ -87,7 +87,7 @@ export function createBatchClient(socket, { expectedVersion, channel, timeout }
|
|
|
87
87
|
if (isString(data)) {
|
|
88
88
|
const res = getResult(() => JSON.parse(data));
|
|
89
89
|
if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
|
|
90
|
-
(_a = pendings
|
|
90
|
+
(_a = pendings.get(res.id)) === null || _a === void 0 ? void 0 : _a.resolve(res);
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
}
|
package/lib/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE9E,MAAM,UAAU,YAAY,CAC1B,MAAsB,EACtB,EAAE,mBAAmB,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,KAKpD,EAAE;IAEN,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@delight-rpc/extra-websocket",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -59,11 +59,11 @@
|
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
61
|
"@blackglory/errors": "^3.0.3",
|
|
62
|
-
"@blackglory/prelude": "^0.
|
|
62
|
+
"@blackglory/prelude": "^0.4.0",
|
|
63
63
|
"@delight-rpc/protocol": "^4.1.1",
|
|
64
|
-
"extra-abort": "^0.
|
|
65
|
-
"extra-logger": "^0.
|
|
66
|
-
"extra-promise": "^
|
|
64
|
+
"extra-abort": "^0.4.0",
|
|
65
|
+
"extra-logger": "^0.8.0",
|
|
66
|
+
"extra-promise": "^7.0.1",
|
|
67
67
|
"return-style": "^3.0.1"
|
|
68
68
|
},
|
|
69
69
|
"peerDependencies": {
|