@nmtjs/client 0.15.3 → 0.16.0-beta.10
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/client.d.ts +68 -0
- package/dist/client.js +101 -0
- package/dist/client.js.map +1 -0
- package/dist/clients/runtime.d.ts +6 -12
- package/dist/clients/runtime.js +58 -57
- package/dist/clients/runtime.js.map +1 -1
- package/dist/clients/static.d.ts +4 -9
- package/dist/clients/static.js +20 -20
- package/dist/clients/static.js.map +1 -1
- package/dist/core.d.ts +36 -83
- package/dist/core.js +315 -690
- package/dist/core.js.map +1 -1
- package/dist/events.d.ts +1 -2
- package/dist/events.js +74 -11
- package/dist/events.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/layers/ping.d.ts +6 -0
- package/dist/layers/ping.js +65 -0
- package/dist/layers/ping.js.map +1 -0
- package/dist/layers/rpc.d.ts +19 -0
- package/dist/layers/rpc.js +557 -0
- package/dist/layers/rpc.js.map +1 -0
- package/dist/layers/streams.d.ts +25 -0
- package/dist/layers/streams.js +207 -0
- package/dist/layers/streams.js.map +1 -0
- package/dist/plugins/browser.js +28 -9
- package/dist/plugins/browser.js.map +1 -1
- package/dist/plugins/heartbeat.js +10 -10
- package/dist/plugins/heartbeat.js.map +1 -1
- package/dist/plugins/index.d.ts +1 -1
- package/dist/plugins/index.js +0 -1
- package/dist/plugins/index.js.map +1 -1
- package/dist/plugins/logging.js.map +1 -1
- package/dist/plugins/reconnect.js +11 -94
- package/dist/plugins/reconnect.js.map +1 -1
- package/dist/plugins/types.d.ts +27 -11
- package/dist/streams.js.map +1 -1
- package/dist/transformers.js.map +1 -1
- package/dist/transport.d.ts +49 -31
- package/dist/types.d.ts +23 -13
- package/dist/types.js.map +1 -1
- package/package.json +9 -10
- package/src/client.ts +232 -0
- package/src/clients/runtime.ts +93 -79
- package/src/clients/static.ts +46 -38
- package/src/core.ts +408 -901
- package/src/events.ts +113 -14
- package/src/index.ts +4 -0
- package/src/layers/ping.ts +99 -0
- package/src/layers/rpc.ts +767 -0
- package/src/layers/streams.ts +320 -0
- package/src/plugins/browser.ts +39 -9
- package/src/plugins/heartbeat.ts +10 -10
- package/src/plugins/index.ts +8 -1
- package/src/plugins/reconnect.ts +12 -119
- package/src/plugins/types.ts +30 -13
- package/src/transport.ts +75 -46
- package/src/types.ts +34 -19
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
import { MAX_UINT32, noopFn } from '@nmtjs/common';
|
|
2
|
+
import { ClientMessageType, createProtocolBlobReference, getProtocolBlobStreamId, ServerMessageType, } from '@nmtjs/protocol';
|
|
3
|
+
import { ProtocolServerBlobStream } from '@nmtjs/protocol/client';
|
|
4
|
+
import { ClientStreams, ServerStreams } from '../streams.js';
|
|
5
|
+
const DEFAULT_PULL_SIZE = 65535;
|
|
6
|
+
const toReasonString = (reason) => {
|
|
7
|
+
if (typeof reason === 'string')
|
|
8
|
+
return reason;
|
|
9
|
+
if (reason === undefined || reason === null)
|
|
10
|
+
return undefined;
|
|
11
|
+
return String(reason);
|
|
12
|
+
};
|
|
13
|
+
export const createStreamLayer = (core) => {
|
|
14
|
+
const clientStreams = new ClientStreams();
|
|
15
|
+
const serverStreams = new ServerStreams();
|
|
16
|
+
const serverBlobInitializers = new Map();
|
|
17
|
+
let streamId = 0;
|
|
18
|
+
const getStreamId = () => {
|
|
19
|
+
if (streamId >= MAX_UINT32) {
|
|
20
|
+
streamId = 0;
|
|
21
|
+
}
|
|
22
|
+
return streamId++;
|
|
23
|
+
};
|
|
24
|
+
const addClientStream = (blob) => {
|
|
25
|
+
const id = getStreamId();
|
|
26
|
+
return clientStreams.add(blob.source, id, blob.metadata);
|
|
27
|
+
};
|
|
28
|
+
const abortServerBlob = (streamId, reason) => {
|
|
29
|
+
if (core.messageContext) {
|
|
30
|
+
core.emitStreamEvent({
|
|
31
|
+
direction: 'outgoing',
|
|
32
|
+
streamType: 'server_blob',
|
|
33
|
+
action: 'abort',
|
|
34
|
+
streamId,
|
|
35
|
+
reason: toReasonString(reason),
|
|
36
|
+
});
|
|
37
|
+
const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ServerStreamAbort, { streamId, reason: toReasonString(reason) });
|
|
38
|
+
core.send(buffer).catch(noopFn);
|
|
39
|
+
}
|
|
40
|
+
void serverStreams.abort(streamId).catch(noopFn);
|
|
41
|
+
};
|
|
42
|
+
const createServerBlob = (id, metadata) => {
|
|
43
|
+
const stream = new ProtocolServerBlobStream(metadata, {
|
|
44
|
+
pull: () => {
|
|
45
|
+
if (!core.messageContext)
|
|
46
|
+
return;
|
|
47
|
+
core.emitStreamEvent({
|
|
48
|
+
direction: 'outgoing',
|
|
49
|
+
streamType: 'server_blob',
|
|
50
|
+
action: 'pull',
|
|
51
|
+
streamId: id,
|
|
52
|
+
byteLength: DEFAULT_PULL_SIZE,
|
|
53
|
+
});
|
|
54
|
+
const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ServerStreamPull, { streamId: id, size: DEFAULT_PULL_SIZE });
|
|
55
|
+
core.send(buffer).catch(noopFn);
|
|
56
|
+
},
|
|
57
|
+
close: () => {
|
|
58
|
+
serverBlobInitializers.delete(id);
|
|
59
|
+
serverStreams.remove(id);
|
|
60
|
+
},
|
|
61
|
+
readableStrategy: { highWaterMark: 0 },
|
|
62
|
+
});
|
|
63
|
+
serverStreams.add(id, stream);
|
|
64
|
+
return createProtocolBlobReference(id, metadata);
|
|
65
|
+
};
|
|
66
|
+
const addServerBlobStream = (metadata, options) => {
|
|
67
|
+
const id = getStreamId();
|
|
68
|
+
const stream = new ProtocolServerBlobStream(metadata);
|
|
69
|
+
serverStreams.add(id, stream);
|
|
70
|
+
if (options?.start) {
|
|
71
|
+
let started = false;
|
|
72
|
+
serverBlobInitializers.set(id, (subscriptionOptions) => {
|
|
73
|
+
if (started)
|
|
74
|
+
return;
|
|
75
|
+
started = true;
|
|
76
|
+
options.start?.(stream, subscriptionOptions);
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
blob: createProtocolBlobReference(id, metadata),
|
|
81
|
+
streamId: id,
|
|
82
|
+
stream,
|
|
83
|
+
};
|
|
84
|
+
};
|
|
85
|
+
const consumeServerBlob = (blob, options) => {
|
|
86
|
+
const id = getProtocolBlobStreamId(blob);
|
|
87
|
+
const stream = serverStreams.get(id);
|
|
88
|
+
if (options?.signal?.aborted) {
|
|
89
|
+
abortServerBlob(id, options.signal.reason);
|
|
90
|
+
return stream;
|
|
91
|
+
}
|
|
92
|
+
if (options?.signal) {
|
|
93
|
+
options.signal.addEventListener('abort', () => {
|
|
94
|
+
abortServerBlob(id, options.signal?.reason);
|
|
95
|
+
}, { once: true });
|
|
96
|
+
}
|
|
97
|
+
serverBlobInitializers.get(id)?.(options);
|
|
98
|
+
serverBlobInitializers.delete(id);
|
|
99
|
+
return stream;
|
|
100
|
+
};
|
|
101
|
+
core.on('message', (message) => {
|
|
102
|
+
switch (message.type) {
|
|
103
|
+
case ServerMessageType.ServerStreamPush:
|
|
104
|
+
core.emitStreamEvent({
|
|
105
|
+
direction: 'incoming',
|
|
106
|
+
streamType: 'server_blob',
|
|
107
|
+
action: 'push',
|
|
108
|
+
streamId: message.streamId,
|
|
109
|
+
byteLength: message.chunk.byteLength,
|
|
110
|
+
});
|
|
111
|
+
void serverStreams.push(message.streamId, message.chunk);
|
|
112
|
+
break;
|
|
113
|
+
case ServerMessageType.ServerStreamEnd:
|
|
114
|
+
serverBlobInitializers.delete(message.streamId);
|
|
115
|
+
core.emitStreamEvent({
|
|
116
|
+
direction: 'incoming',
|
|
117
|
+
streamType: 'server_blob',
|
|
118
|
+
action: 'end',
|
|
119
|
+
streamId: message.streamId,
|
|
120
|
+
});
|
|
121
|
+
void serverStreams.end(message.streamId);
|
|
122
|
+
break;
|
|
123
|
+
case ServerMessageType.ServerStreamAbort:
|
|
124
|
+
serverBlobInitializers.delete(message.streamId);
|
|
125
|
+
core.emitStreamEvent({
|
|
126
|
+
direction: 'incoming',
|
|
127
|
+
streamType: 'server_blob',
|
|
128
|
+
action: 'abort',
|
|
129
|
+
streamId: message.streamId,
|
|
130
|
+
reason: message.reason,
|
|
131
|
+
});
|
|
132
|
+
void serverStreams.abort(message.streamId);
|
|
133
|
+
break;
|
|
134
|
+
case ServerMessageType.ClientStreamPull:
|
|
135
|
+
core.emitStreamEvent({
|
|
136
|
+
direction: 'incoming',
|
|
137
|
+
streamType: 'client_blob',
|
|
138
|
+
action: 'pull',
|
|
139
|
+
streamId: message.streamId,
|
|
140
|
+
byteLength: message.size,
|
|
141
|
+
});
|
|
142
|
+
void clientStreams.pull(message.streamId, message.size).then((chunk) => {
|
|
143
|
+
if (!core.messageContext)
|
|
144
|
+
return;
|
|
145
|
+
if (chunk) {
|
|
146
|
+
core.emitStreamEvent({
|
|
147
|
+
direction: 'outgoing',
|
|
148
|
+
streamType: 'client_blob',
|
|
149
|
+
action: 'push',
|
|
150
|
+
streamId: message.streamId,
|
|
151
|
+
byteLength: chunk.byteLength,
|
|
152
|
+
});
|
|
153
|
+
const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamPush, { streamId: message.streamId, chunk });
|
|
154
|
+
core.send(buffer).catch(noopFn);
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
core.emitStreamEvent({
|
|
158
|
+
direction: 'outgoing',
|
|
159
|
+
streamType: 'client_blob',
|
|
160
|
+
action: 'end',
|
|
161
|
+
streamId: message.streamId,
|
|
162
|
+
});
|
|
163
|
+
const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamEnd, { streamId: message.streamId });
|
|
164
|
+
core.send(buffer).catch(noopFn);
|
|
165
|
+
void clientStreams.end(message.streamId).catch(noopFn);
|
|
166
|
+
}, () => {
|
|
167
|
+
if (!core.messageContext)
|
|
168
|
+
return;
|
|
169
|
+
core.emitStreamEvent({
|
|
170
|
+
direction: 'outgoing',
|
|
171
|
+
streamType: 'client_blob',
|
|
172
|
+
action: 'abort',
|
|
173
|
+
streamId: message.streamId,
|
|
174
|
+
});
|
|
175
|
+
const buffer = core.protocol.encodeMessage(core.messageContext, ClientMessageType.ClientStreamAbort, { streamId: message.streamId });
|
|
176
|
+
core.send(buffer).catch(noopFn);
|
|
177
|
+
clientStreams.remove(message.streamId);
|
|
178
|
+
});
|
|
179
|
+
break;
|
|
180
|
+
case ServerMessageType.ClientStreamAbort:
|
|
181
|
+
core.emitStreamEvent({
|
|
182
|
+
direction: 'incoming',
|
|
183
|
+
streamType: 'client_blob',
|
|
184
|
+
action: 'abort',
|
|
185
|
+
streamId: message.streamId,
|
|
186
|
+
reason: message.reason,
|
|
187
|
+
});
|
|
188
|
+
void clientStreams.abort(message.streamId, message.reason).catch(noopFn);
|
|
189
|
+
break;
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
core.on('disconnected', (reason) => {
|
|
193
|
+
void clientStreams.clear(reason).catch(noopFn);
|
|
194
|
+
void serverStreams.clear(reason).catch(noopFn);
|
|
195
|
+
serverBlobInitializers.clear();
|
|
196
|
+
});
|
|
197
|
+
return {
|
|
198
|
+
clientStreams,
|
|
199
|
+
serverStreams,
|
|
200
|
+
getStreamId,
|
|
201
|
+
addClientStream,
|
|
202
|
+
createServerBlob,
|
|
203
|
+
addServerBlobStream,
|
|
204
|
+
consumeServerBlob,
|
|
205
|
+
};
|
|
206
|
+
};
|
|
207
|
+
//# sourceMappingURL=streams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../src/layers/streams.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/browser.js
CHANGED
|
@@ -1,29 +1,48 @@
|
|
|
1
|
+
const syncPauseReasons = (setPauseReason) => {
|
|
2
|
+
if (globalThis.window && 'navigator' in globalThis.window) {
|
|
3
|
+
setPauseReason('offline', globalThis.window.navigator?.onLine === false);
|
|
4
|
+
}
|
|
5
|
+
if (globalThis.document) {
|
|
6
|
+
setPauseReason('tab_hidden', globalThis.document.visibilityState === 'hidden');
|
|
7
|
+
}
|
|
8
|
+
};
|
|
1
9
|
export const browserConnectivityPlugin = () => {
|
|
2
|
-
return (
|
|
10
|
+
return ({ core }) => {
|
|
3
11
|
const cleanup = [];
|
|
4
|
-
const
|
|
5
|
-
if (
|
|
6
|
-
|
|
12
|
+
const triggerReconnect = () => {
|
|
13
|
+
if (!core.isDisposed()) {
|
|
14
|
+
core.triggerReconnect();
|
|
7
15
|
}
|
|
8
16
|
};
|
|
9
17
|
return {
|
|
10
18
|
name: 'browser-connectivity',
|
|
11
19
|
onInit: () => {
|
|
20
|
+
syncPauseReasons(core.setReconnectPauseReason.bind(core));
|
|
12
21
|
if (globalThis.window) {
|
|
13
|
-
const onPageShow = () =>
|
|
22
|
+
const onPageShow = () => triggerReconnect();
|
|
14
23
|
globalThis.window.addEventListener('pageshow', onPageShow);
|
|
15
24
|
cleanup.push(() => globalThis.window?.removeEventListener('pageshow', onPageShow));
|
|
16
|
-
const onOnline = () =>
|
|
25
|
+
const onOnline = () => {
|
|
26
|
+
core.setReconnectPauseReason('offline', false);
|
|
27
|
+
triggerReconnect();
|
|
28
|
+
};
|
|
17
29
|
globalThis.window.addEventListener('online', onOnline);
|
|
18
30
|
cleanup.push(() => globalThis.window?.removeEventListener('online', onOnline));
|
|
19
|
-
const
|
|
31
|
+
const onOffline = () => {
|
|
32
|
+
core.setReconnectPauseReason('offline', true);
|
|
33
|
+
};
|
|
34
|
+
globalThis.window.addEventListener('offline', onOffline);
|
|
35
|
+
cleanup.push(() => globalThis.window?.removeEventListener('offline', onOffline));
|
|
36
|
+
const onFocus = () => triggerReconnect();
|
|
20
37
|
globalThis.window.addEventListener('focus', onFocus);
|
|
21
38
|
cleanup.push(() => globalThis.window?.removeEventListener('focus', onFocus));
|
|
22
39
|
}
|
|
23
40
|
if (globalThis.document) {
|
|
24
41
|
const onVisibilityChange = () => {
|
|
25
|
-
|
|
26
|
-
|
|
42
|
+
const hidden = globalThis.document?.visibilityState === 'hidden';
|
|
43
|
+
core.setReconnectPauseReason('tab_hidden', hidden);
|
|
44
|
+
if (!hidden) {
|
|
45
|
+
triggerReconnect();
|
|
27
46
|
}
|
|
28
47
|
};
|
|
29
48
|
globalThis.document.addEventListener('visibilitychange', onVisibilityChange);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/plugins/browser.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/plugins/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ const isPaused = () => {
|
|
|
26
26
|
return false;
|
|
27
27
|
};
|
|
28
28
|
export const heartbeatPlugin = (options = {}) => {
|
|
29
|
-
return (
|
|
29
|
+
return ({ core, ping }) => {
|
|
30
30
|
const interval = options.interval ?? DEFAULT_HEARTBEAT_INTERVAL;
|
|
31
31
|
const timeout = options.timeout ?? DEFAULT_HEARTBEAT_TIMEOUT;
|
|
32
32
|
let heartbeatAbortController = null;
|
|
@@ -39,32 +39,32 @@ export const heartbeatPlugin = (options = {}) => {
|
|
|
39
39
|
const startHeartbeat = () => {
|
|
40
40
|
if (heartbeatTask)
|
|
41
41
|
return;
|
|
42
|
-
if (
|
|
42
|
+
if (core.transportType !== ConnectionType.Bidirectional)
|
|
43
43
|
return;
|
|
44
44
|
heartbeatAbortController = new AbortController();
|
|
45
45
|
const signal = heartbeatAbortController.signal;
|
|
46
46
|
heartbeatTask = (async () => {
|
|
47
47
|
while (!signal.aborted &&
|
|
48
|
-
!
|
|
49
|
-
|
|
48
|
+
!core.isDisposed() &&
|
|
49
|
+
core.state === 'connected') {
|
|
50
50
|
if (isPaused()) {
|
|
51
51
|
await sleep(1000, signal);
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
54
|
await sleep(interval, signal);
|
|
55
55
|
if (signal.aborted ||
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
core.isDisposed() ||
|
|
57
|
+
core.state !== 'connected') {
|
|
58
58
|
continue;
|
|
59
59
|
}
|
|
60
60
|
try {
|
|
61
|
-
await
|
|
61
|
+
await ping.ping(timeout, signal);
|
|
62
62
|
}
|
|
63
63
|
catch {
|
|
64
64
|
if (!signal.aborted &&
|
|
65
|
-
!
|
|
66
|
-
|
|
67
|
-
await
|
|
65
|
+
!core.isDisposed() &&
|
|
66
|
+
core.state === 'connected') {
|
|
67
|
+
await core
|
|
68
68
|
.requestReconnect('heartbeat_timeout')
|
|
69
69
|
.catch(() => void 0);
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/plugins/heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAIhD,MAAM,0BAA0B,GAAG,KAAK,CAAA;AACxC,MAAM,yBAAyB,GAAG,IAAI,CAAA;AAEtC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,MAAoB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/plugins/heartbeat.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
export type { ClientPlugin, ClientPluginContext, ClientPluginEvent, ClientPluginInstance, ReconnectConfig, StreamEvent, } from './types.ts';
|
|
1
2
|
export * from './browser.ts';
|
|
2
3
|
export * from './heartbeat.ts';
|
|
3
4
|
export * from './logging.ts';
|
|
4
5
|
export * from './reconnect.ts';
|
|
5
|
-
export * from './types.ts';
|
package/dist/plugins/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAQA,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/plugins/logging.ts"],"names":[],"mappings":"AAWA,MAAM,cAAc,GAAG,CAAC,KAAqB,EAAkB,EAAE
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/plugins/logging.ts"],"names":[],"mappings":"AAWA,MAAM,cAAc,GAAG,CAAC,KAAqB,EAAkB,EAAE;IAC/D,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAEpC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;IACtC,OAAO,IAAsB,CAAA;AAC/B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAA6B,EAAgB,EAAE;IAC3E,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,KAAK,CAAA;IAEpD,OAAO,GAAG,EAAE,CAAC,CAAC;QACZ,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;YAChE,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ;gBAClC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC9B,CAAC,CAAC,UAAU,CAAA;YAEd,IAAI,CAAC,WAAW;gBAAE,OAAM;YAExB,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;gBAC/C,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC1C,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;gBAC3C,CAAC,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YAC3C,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1,98 +1,15 @@
|
|
|
1
|
-
import { ConnectionType } from '@nmtjs/protocol';
|
|
2
|
-
const DEFAULT_RECONNECT_TIMEOUT = 1000;
|
|
3
|
-
const DEFAULT_MAX_RECONNECT_TIMEOUT = 60000;
|
|
4
|
-
const sleep = (ms, signal) => {
|
|
5
|
-
return new Promise((resolve) => {
|
|
6
|
-
if (signal?.aborted)
|
|
7
|
-
return resolve();
|
|
8
|
-
const timer = setTimeout(resolve, ms);
|
|
9
|
-
if (signal) {
|
|
10
|
-
signal.addEventListener('abort', () => {
|
|
11
|
-
clearTimeout(timer);
|
|
12
|
-
resolve();
|
|
13
|
-
}, { once: true });
|
|
14
|
-
}
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
const computeReconnectDelay = (ms) => {
|
|
18
|
-
if (globalThis.window) {
|
|
19
|
-
const jitter = Math.floor(ms * 0.2 * Math.random());
|
|
20
|
-
return ms + jitter;
|
|
21
|
-
}
|
|
22
|
-
return ms;
|
|
23
|
-
};
|
|
24
|
-
const isReconnectPaused = () => {
|
|
25
|
-
if (globalThis.window && 'navigator' in globalThis.window) {
|
|
26
|
-
if (globalThis.window.navigator?.onLine === false)
|
|
27
|
-
return true;
|
|
28
|
-
}
|
|
29
|
-
if (globalThis.document) {
|
|
30
|
-
if (globalThis.document.visibilityState === 'hidden')
|
|
31
|
-
return true;
|
|
32
|
-
}
|
|
33
|
-
return false;
|
|
34
|
-
};
|
|
35
1
|
export const reconnectPlugin = (options = {}) => {
|
|
36
|
-
return (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
reconnectAbortController = null;
|
|
43
|
-
reconnecting = null;
|
|
44
|
-
};
|
|
45
|
-
const ensureReconnectLoop = () => {
|
|
46
|
-
if (reconnecting)
|
|
47
|
-
return;
|
|
48
|
-
reconnectAbortController = new AbortController();
|
|
49
|
-
const signal = reconnectAbortController.signal;
|
|
50
|
-
reconnecting = (async () => {
|
|
51
|
-
while (!signal.aborted &&
|
|
52
|
-
!client.isDisposed() &&
|
|
53
|
-
client.state === 'disconnected' &&
|
|
54
|
-
client.lastDisconnectReason !== 'client') {
|
|
55
|
-
if (isReconnectPaused()) {
|
|
56
|
-
await sleep(1000, signal);
|
|
57
|
-
continue;
|
|
58
|
-
}
|
|
59
|
-
const delay = computeReconnectDelay(reconnectTimeout);
|
|
60
|
-
await sleep(delay, signal);
|
|
61
|
-
if (signal.aborted ||
|
|
62
|
-
client.isDisposed() ||
|
|
63
|
-
client.state !== 'disconnected' ||
|
|
64
|
-
client.lastDisconnectReason === 'client') {
|
|
65
|
-
break;
|
|
66
|
-
}
|
|
67
|
-
const previousTimeout = reconnectTimeout;
|
|
68
|
-
await client.connect().catch(() => void 0);
|
|
69
|
-
if (client.state === 'disconnected') {
|
|
70
|
-
reconnectTimeout = Math.min(previousTimeout * 2, options.maxTimeout ?? DEFAULT_MAX_RECONNECT_TIMEOUT);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
})().finally(() => {
|
|
74
|
-
reconnecting = null;
|
|
75
|
-
reconnectAbortController = null;
|
|
2
|
+
return ({ core }) => ({
|
|
3
|
+
name: 'reconnect',
|
|
4
|
+
onInit: () => {
|
|
5
|
+
core.configureReconnect({
|
|
6
|
+
initialTimeout: options.initialTimeout,
|
|
7
|
+
maxTimeout: options.maxTimeout,
|
|
76
8
|
});
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
cancelReconnect();
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
|
-
ensureReconnectLoop();
|
|
86
|
-
};
|
|
87
|
-
return {
|
|
88
|
-
name: 'reconnect',
|
|
89
|
-
onConnect: () => {
|
|
90
|
-
reconnectTimeout = options.initialTimeout ?? DEFAULT_RECONNECT_TIMEOUT;
|
|
91
|
-
cancelReconnect();
|
|
92
|
-
},
|
|
93
|
-
onDisconnect,
|
|
94
|
-
dispose: cancelReconnect,
|
|
95
|
-
};
|
|
96
|
-
};
|
|
9
|
+
},
|
|
10
|
+
dispose: () => {
|
|
11
|
+
core.configureReconnect(null);
|
|
12
|
+
},
|
|
13
|
+
});
|
|
97
14
|
};
|
|
98
15
|
//# sourceMappingURL=reconnect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../src/plugins/reconnect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../src/plugins/reconnect.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,OAAO,GAA2B,EAAE,EACtB,EAAE;IAChB,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACpB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,GAAG,EAAE;YACX,IAAI,CAAC,kBAAkB,CAAC;gBACtB,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;KACF,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
package/dist/plugins/types.d.ts
CHANGED
|
@@ -1,6 +1,25 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ClientCore, ConnectionState } from '../core.ts';
|
|
2
|
+
import type { PingLayerApi } from '../layers/ping.ts';
|
|
2
3
|
export type ClientDisconnectReason = 'client' | 'server' | (string & {});
|
|
4
|
+
export interface ReconnectConfig {
|
|
5
|
+
initialTimeout?: number;
|
|
6
|
+
maxTimeout?: number;
|
|
7
|
+
}
|
|
8
|
+
export type StreamEvent = {
|
|
9
|
+
direction: 'incoming' | 'outgoing';
|
|
10
|
+
streamType: 'rpc' | 'client_blob' | 'server_blob';
|
|
11
|
+
action: 'response' | 'pull' | 'push' | 'end' | 'abort';
|
|
12
|
+
callId?: number;
|
|
13
|
+
streamId?: number;
|
|
14
|
+
byteLength?: number;
|
|
15
|
+
reason?: string;
|
|
16
|
+
};
|
|
3
17
|
export type ClientPluginEvent = {
|
|
18
|
+
kind: 'state_changed';
|
|
19
|
+
timestamp: number;
|
|
20
|
+
state: ConnectionState;
|
|
21
|
+
previous: ConnectionState;
|
|
22
|
+
} | {
|
|
4
23
|
kind: 'connected';
|
|
5
24
|
timestamp: number;
|
|
6
25
|
transportType: 'bidirectional' | 'unidirectional';
|
|
@@ -33,17 +52,10 @@ export type ClientPluginEvent = {
|
|
|
33
52
|
callId: number;
|
|
34
53
|
procedure: string;
|
|
35
54
|
error: unknown;
|
|
36
|
-
} | {
|
|
55
|
+
} | ({
|
|
37
56
|
kind: 'stream_event';
|
|
38
57
|
timestamp: number;
|
|
39
|
-
|
|
40
|
-
streamType: 'rpc' | 'client_blob' | 'server_blob';
|
|
41
|
-
action: 'response' | 'pull' | 'push' | 'end' | 'abort';
|
|
42
|
-
callId?: number;
|
|
43
|
-
streamId?: number;
|
|
44
|
-
byteLength?: number;
|
|
45
|
-
reason?: string;
|
|
46
|
-
};
|
|
58
|
+
} & StreamEvent);
|
|
47
59
|
/**
|
|
48
60
|
* Client plugin lifecycle contract.
|
|
49
61
|
*
|
|
@@ -60,4 +72,8 @@ export interface ClientPluginInstance {
|
|
|
60
72
|
onClientEvent?(event: ClientPluginEvent): void | Promise<void>;
|
|
61
73
|
dispose?(): void;
|
|
62
74
|
}
|
|
63
|
-
export
|
|
75
|
+
export interface ClientPluginContext {
|
|
76
|
+
core: ClientCore;
|
|
77
|
+
ping: PingLayerApi;
|
|
78
|
+
}
|
|
79
|
+
export type ClientPlugin = (context: ClientPluginContext) => ClientPluginInstance;
|
package/dist/streams.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../src/streams.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAEjE,MAAM,OAAO,aAAa;IACf,WAAW,GAAG,IAAI,GAAG,EAAoC,CAAA;IAElE,IAAI,IAAI
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../src/streams.ts"],"names":[],"mappings":"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"}
|
package/dist/transformers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../src/transformers.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,qBAAqB;IAChC,MAAM,CAAC,UAAkB,EAAE,OAAY
|
|
1
|
+
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../src/transformers.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,qBAAqB;IAChC,MAAM,CAAC,UAAkB,EAAE,OAAY;QACrC,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,CAAC,UAAkB,EAAE,OAAY;QACrC,OAAO,OAAO,CAAA;IAChB,CAAC;CACF"}
|