@delight-rpc/extra-websocket 0.2.0 → 0.2.1
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 +15 -4
- package/lib/client.js.map +1 -1
- package/package.json +2 -1
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,7 +29,8 @@ 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
35
|
socket.addEventListener('message', handler);
|
|
35
36
|
const client = DelightRPC.createClient(async function send(request) {
|
|
@@ -37,7 +38,12 @@ function createClient(socket, { parameterValidators, expectedVersion, channel }
|
|
|
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];
|
|
@@ -66,7 +72,7 @@ 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
77
|
socket.addEventListener('message', handler);
|
|
72
78
|
const client = new DelightRPC.BatchClient(async function send(request) {
|
|
@@ -74,7 +80,12 @@ function createBatchClient(socket, { expectedVersion, channel } = {}) {
|
|
|
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];
|
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@delight-rpc/extra-websocket",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -58,6 +58,7 @@
|
|
|
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"
|