typeferry 0.12.0 → 0.13.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 +5 -0
- package/dist/application/config.d.ts +47 -39
- package/dist/application/config.js +29 -16
- package/dist/application/config.js.map +1 -1
- package/dist/application/native-simulator-settings.js +1 -1
- package/dist/application/native-simulator-settings.js.map +1 -1
- package/dist/application/proxy.d.ts +5 -1
- package/dist/application/proxy.js +25 -4
- package/dist/application/proxy.js.map +1 -1
- package/dist/application/run-tests.js +1 -1
- package/dist/application/run-tests.js.map +1 -1
- package/dist/auth/client/native-session.js +4 -2
- package/dist/auth/client/native-session.js.map +1 -1
- package/dist/auth/client/oauth/use-google-login.js +2 -0
- package/dist/auth/client/oauth/use-google-login.js.map +1 -1
- package/dist/auth/server/cookie-utils.js +4 -3
- package/dist/auth/server/cookie-utils.js.map +1 -1
- package/dist/auth/server/device-info.js +8 -8
- package/dist/auth/server/device-info.js.map +1 -1
- package/dist/auth/server/oauth/google.js +11 -7
- package/dist/auth/server/oauth/google.js.map +1 -1
- package/dist/auth/server/session-manager.js +2 -2
- package/dist/auth/server/session-manager.js.map +1 -1
- package/dist/client/client-channel.d.ts +3 -11
- package/dist/client/client-channel.js +11 -4
- package/dist/client/client-channel.js.map +1 -1
- package/dist/client/client-http.d.ts +2 -2
- package/dist/client/client-http.js.map +1 -1
- package/dist/client/client.d.ts +13 -13
- package/dist/client/client.js +24 -11
- package/dist/client/client.js.map +1 -1
- package/dist/client/context-manager.d.ts +1 -1
- package/dist/client/logger.d.ts +1 -0
- package/dist/client/logger.js +12 -15
- package/dist/client/logger.js.map +1 -1
- package/dist/client/visibility-manager.d.ts +22 -11
- package/dist/client/visibility-manager.js +258 -42
- package/dist/client/visibility-manager.js.map +1 -1
- package/dist/ejson/adjust-types-from-json-value.d.ts +1 -1
- package/dist/ejson/adjust-types-from-json-value.js +4 -2
- package/dist/ejson/adjust-types-from-json-value.js.map +1 -1
- package/dist/ejson/base64.d.ts +1 -1
- package/dist/ejson/base64.js +1 -1
- package/dist/ejson/base64.js.map +1 -1
- package/dist/ejson/built-in-converters.d.ts +59 -1
- package/dist/ejson/built-in-converters.js +109 -125
- package/dist/ejson/built-in-converters.js.map +1 -1
- package/dist/ejson/clone.js +1 -1
- package/dist/ejson/clone.js.map +1 -1
- package/dist/ejson/custom-models.d.ts +10 -10
- package/dist/ejson/custom-models.js +22 -2
- package/dist/ejson/custom-models.js.map +1 -1
- package/dist/ejson/custom-types.d.ts +2 -1
- package/dist/ejson/custom-types.js.map +1 -1
- package/dist/ejson/equals.d.ts +4 -1
- package/dist/ejson/equals.js +6 -3
- package/dist/ejson/equals.js.map +1 -1
- package/dist/ejson/from-json-value.d.ts +1 -1
- package/dist/ejson/from-json-value.js +1 -1
- package/dist/ejson/from-json-value.js.map +1 -1
- package/dist/ejson/helpers/adjust-types-to-json-value.d.ts +1 -1
- package/dist/ejson/helpers/adjust-types-to-json-value.js +4 -2
- package/dist/ejson/helpers/adjust-types-to-json-value.js.map +1 -1
- package/dist/ejson/helpers/from-json-value-helper.d.ts +1 -1
- package/dist/ejson/helpers/from-json-value-helper.js +5 -3
- package/dist/ejson/helpers/from-json-value-helper.js.map +1 -1
- package/dist/ejson/helpers/to-json-value-helper.d.ts +1 -1
- package/dist/ejson/helpers/to-json-value-helper.js +3 -1
- package/dist/ejson/helpers/to-json-value-helper.js.map +1 -1
- package/dist/ejson/index.d.ts +14 -12
- package/dist/ejson/index.js +3 -3
- package/dist/ejson/index.js.map +1 -1
- package/dist/ejson/is-binary.d.ts +1 -1
- package/dist/ejson/is-binary.js +1 -1
- package/dist/ejson/is-binary.js.map +1 -1
- package/dist/ejson/parse.d.ts +1 -1
- package/dist/ejson/parse.js +1 -1
- package/dist/ejson/parse.js.map +1 -1
- package/dist/ejson/stable-stringify.d.ts +1 -6
- package/dist/ejson/stable-stringify.js +3 -1
- package/dist/ejson/stable-stringify.js.map +1 -1
- package/dist/ejson/to-json-value.d.ts +1 -1
- package/dist/ejson/to-json-value.js +1 -1
- package/dist/ejson/to-json-value.js.map +1 -1
- package/dist/ejson/utils.d.ts +15 -13
- package/dist/ejson/utils.js +39 -37
- package/dist/ejson/utils.js.map +1 -1
- package/dist/minimongo/NOTICE.md +30 -0
- package/dist/minimongo/README.md +329 -0
- package/dist/minimongo/components.d.ts +31 -0
- package/dist/minimongo/components.js +53 -0
- package/dist/minimongo/components.js.map +1 -0
- package/dist/minimongo/contracts.type-test.d.ts +1 -0
- package/dist/minimongo/contracts.type-test.js +21 -0
- package/dist/minimongo/contracts.type-test.js.map +1 -0
- package/dist/minimongo/cursor.d.ts +67 -0
- package/dist/minimongo/cursor.js +157 -0
- package/dist/minimongo/cursor.js.map +1 -0
- package/dist/minimongo/document-store.d.ts +31 -0
- package/dist/minimongo/document-store.js +48 -0
- package/dist/minimongo/document-store.js.map +1 -0
- package/dist/minimongo/errors.d.ts +14 -0
- package/dist/minimongo/errors.js +16 -0
- package/dist/minimongo/errors.js.map +1 -0
- package/dist/minimongo/events.d.ts +20 -0
- package/dist/minimongo/events.js +80 -0
- package/dist/minimongo/events.js.map +1 -0
- package/dist/minimongo/identity.d.ts +8 -0
- package/dist/minimongo/identity.js +15 -0
- package/dist/minimongo/identity.js.map +1 -0
- package/dist/minimongo/immutable.d.ts +6 -0
- package/dist/minimongo/immutable.js +17 -0
- package/dist/minimongo/immutable.js.map +1 -0
- package/dist/minimongo/index.d.ts +7 -0
- package/dist/minimongo/index.js +6 -0
- package/dist/minimongo/index.js.map +1 -0
- package/dist/minimongo/local-collection.d.ts +48 -0
- package/dist/minimongo/local-collection.js +129 -0
- package/dist/minimongo/local-collection.js.map +1 -0
- package/dist/minimongo/matcher.d.ts +27 -0
- package/dist/minimongo/matcher.js +457 -0
- package/dist/minimongo/matcher.js.map +1 -0
- package/dist/minimongo/modifier.d.ts +12 -0
- package/dist/minimongo/modifier.js +323 -0
- package/dist/minimongo/modifier.js.map +1 -0
- package/dist/minimongo/path.d.ts +17 -0
- package/dist/minimongo/path.js +126 -0
- package/dist/minimongo/path.js.map +1 -0
- package/dist/minimongo/projection.d.ts +5 -0
- package/dist/minimongo/projection.js +100 -0
- package/dist/minimongo/projection.js.map +1 -0
- package/dist/minimongo/sorter.d.ts +16 -0
- package/dist/minimongo/sorter.js +140 -0
- package/dist/minimongo/sorter.js.map +1 -0
- package/dist/minimongo/transform.d.ts +4 -0
- package/dist/minimongo/transform.js +30 -0
- package/dist/minimongo/transform.js.map +1 -0
- package/dist/minimongo/types.d.ts +169 -0
- package/dist/minimongo/types.js +2 -0
- package/dist/minimongo/types.js.map +1 -0
- package/dist/minimongo/value-semantics.d.ts +8 -0
- package/dist/minimongo/value-semantics.js +156 -0
- package/dist/minimongo/value-semantics.js.map +1 -0
- package/dist/mongodb/change-streams.js +14 -8
- package/dist/mongodb/change-streams.js.map +1 -1
- package/dist/mongodb/decorators/collection.js +4 -1
- package/dist/mongodb/decorators/collection.js.map +1 -1
- package/dist/mongodb/decorators/metadata.js +1 -1
- package/dist/mongodb/decorators/metadata.js.map +1 -1
- package/dist/mongodb/find-one-or-create.d.ts +2 -2
- package/dist/mongodb/find-one-or-create.js +1 -1
- package/dist/mongodb/find-one-or-create.js.map +1 -1
- package/dist/mongodb/live/engine.js.map +1 -1
- package/dist/mongodb/live/source.js +11 -5
- package/dist/mongodb/live/source.js.map +1 -1
- package/dist/mongodb/live/types.d.ts +1 -1
- package/dist/react/components/client-provider.d.ts +3 -2
- package/dist/react/components/client-provider.js +1 -1
- package/dist/react/components/client-provider.js.map +1 -1
- package/dist/react/contracts.type-test.d.ts +1 -0
- package/dist/react/contracts.type-test.js +21 -0
- package/dist/react/contracts.type-test.js.map +1 -0
- package/dist/react/hooks/use-auth.d.ts +5 -1
- package/dist/react/hooks/use-auth.js +4 -2
- package/dist/react/hooks/use-auth.js.map +1 -1
- package/dist/react/hooks/use-caller.d.ts +10 -5
- package/dist/react/hooks/use-caller.js +12 -8
- package/dist/react/hooks/use-caller.js.map +1 -1
- package/dist/react/hooks/use-channel.d.ts +1 -1
- package/dist/react/hooks/use-channel.js +1 -1
- package/dist/react/hooks/use-channel.js.map +1 -1
- package/dist/react/hooks/use-circuit-breaker.d.ts +14 -6
- package/dist/react/hooks/use-circuit-breaker.js +5 -2
- package/dist/react/hooks/use-circuit-breaker.js.map +1 -1
- package/dist/react/hooks/use-client.d.ts +1 -1
- package/dist/react/hooks/use-client.js +2 -0
- package/dist/react/hooks/use-client.js.map +1 -1
- package/dist/react/hooks/use-connection-state.d.ts +4 -4
- package/dist/react/hooks/use-connection-state.js +2 -0
- package/dist/react/hooks/use-connection-state.js.map +1 -1
- package/dist/react/hooks/use-deps-change.d.ts +1 -1
- package/dist/react/hooks/use-deps-change.js.map +1 -1
- package/dist/react/hooks/use-local-event.d.ts +2 -2
- package/dist/react/hooks/use-local-event.js +2 -2
- package/dist/react/hooks/use-local-event.js.map +1 -1
- package/dist/react/hooks/use-method-refresh.d.ts +24 -15
- package/dist/react/hooks/use-method-refresh.js +18 -22
- package/dist/react/hooks/use-method-refresh.js.map +1 -1
- package/dist/react/hooks/use-method.d.ts +12 -11
- package/dist/react/hooks/use-method.js +9 -5
- package/dist/react/hooks/use-method.js.map +1 -1
- package/dist/react/hooks/use-mongodb-live-publication.js +2 -0
- package/dist/react/hooks/use-mongodb-live-publication.js.map +1 -1
- package/dist/react/hooks/use-object.d.ts +2 -2
- package/dist/react/hooks/use-object.js.map +1 -1
- package/dist/react/hooks/use-subscribe.d.ts +1 -2
- package/dist/react/hooks/use-subscribe.js +11 -9
- package/dist/react/hooks/use-subscribe.js.map +1 -1
- package/dist/react/hooks/use-throttled-events.d.ts +1 -1
- package/dist/react/hooks/use-throttled-events.js +2 -0
- package/dist/react/hooks/use-throttled-events.js.map +1 -1
- package/dist/react/hooks/use-token-refresh.js +1 -1
- package/dist/react/hooks/use-token-refresh.js.map +1 -1
- package/dist/server/client-node.d.ts +17 -10
- package/dist/server/client-node.js +16 -13
- package/dist/server/client-node.js.map +1 -1
- package/dist/server/decorators/register.js +10 -6
- package/dist/server/decorators/register.js.map +1 -1
- package/dist/server/method.d.ts +1 -1
- package/dist/server/method.js +9 -6
- package/dist/server/method.js.map +1 -1
- package/dist/server/methods.js +2 -1
- package/dist/server/methods.js.map +1 -1
- package/dist/server/server-channel.d.ts +4 -2
- package/dist/server/server-channel.js +33 -20
- package/dist/server/server-channel.js.map +1 -1
- package/dist/server/server.d.ts +25 -12
- package/dist/server/server.js +18 -17
- package/dist/server/server.js.map +1 -1
- package/dist/server/transports/node-hono-transport.d.ts +4 -4
- package/dist/server/transports/node-hono-transport.js +66 -14
- package/dist/server/transports/node-hono-transport.js.map +1 -1
- package/dist/server/transports/redis-transport.d.ts +5 -4
- package/dist/server/transports/redis-transport.js +9 -4
- package/dist/server/transports/redis-transport.js.map +1 -1
- package/dist/server/transports/websocket-transport.d.ts +1 -1
- package/dist/server/transports/websocket-transport.js +6 -1
- package/dist/server/transports/websocket-transport.js.map +1 -1
- package/dist/server/transports/ws-shared.d.ts +2 -1
- package/dist/server/transports/ws-shared.js +4 -1
- package/dist/server/transports/ws-shared.js.map +1 -1
- package/dist/utils/errors.d.ts +1 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/event-emitter.d.ts +1 -1
- package/dist/utils/event-emitter.js.map +1 -1
- package/dist/utils/events.d.ts +4 -4
- package/dist/utils/events.js.map +1 -1
- package/dist/utils/helpers.d.ts +4 -4
- package/dist/utils/helpers.js +4 -3
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/intercept.d.ts +1 -2
- package/dist/utils/intercept.js.map +1 -1
- package/dist/utils/iterator.d.ts +6 -8
- package/dist/utils/iterator.js +3 -3
- package/dist/utils/iterator.js.map +1 -1
- package/dist/utils/presentation.d.ts +1 -1
- package/dist/utils/presentation.js +2 -0
- package/dist/utils/presentation.js.map +1 -1
- package/dist/utils/promise.d.ts +5 -5
- package/dist/utils/promise.js +2 -2
- package/dist/utils/promise.js.map +1 -1
- package/package.json +9 -2
|
@@ -1,14 +1,76 @@
|
|
|
1
|
-
import { ClientEvents } from '../utils/index.js';
|
|
1
|
+
import { ClientEvents, MessageType, Presentation, WebSocketState } from '../utils/index.js';
|
|
2
|
+
import { LogLevel } from './logger.js';
|
|
2
3
|
/**
|
|
3
4
|
* Time threshold below which we trust the socket connection is healthy.
|
|
4
|
-
*
|
|
5
|
-
* disconnected.
|
|
5
|
+
* Longer hides check delivered traffic before trusting an open socket.
|
|
6
6
|
*/
|
|
7
7
|
const FORCE_RECONNECT_THRESHOLD = 60 * 60 * 1000; // 1 hour
|
|
8
8
|
/** Heartbeat fires every 30s to detect OS sleep gaps. */
|
|
9
9
|
const HEARTBEAT_INTERVAL_MS = 30_000;
|
|
10
|
-
/**
|
|
10
|
+
/** A timer gap is wake evidence; background throttling can also cause it. */
|
|
11
11
|
const HEARTBEAT_THRESHOLD_MS = 60_000;
|
|
12
|
+
/** The existing server heartbeat sends traffic every 25 seconds. */
|
|
13
|
+
const RECOVERY_TIMEOUT_MS = 30_000;
|
|
14
|
+
/**
|
|
15
|
+
* Only delivered server envelopes satisfy the grace. This is activity evidence,
|
|
16
|
+
* not a new round-trip protocol or a replacement for ordinary RPC timeouts.
|
|
17
|
+
*/
|
|
18
|
+
function isServerTraffic(value) {
|
|
19
|
+
if (typeof value !== 'object' || value === null || !('t' in value))
|
|
20
|
+
return false;
|
|
21
|
+
switch (value.t) {
|
|
22
|
+
case MessageType.PING:
|
|
23
|
+
return true;
|
|
24
|
+
case MessageType.AUTH:
|
|
25
|
+
return 'authenticated' in value && typeof value.authenticated === 'boolean';
|
|
26
|
+
case MessageType.RPC_RESPONSE:
|
|
27
|
+
return 'id' in value && typeof value.id === 'string';
|
|
28
|
+
case MessageType.EVENT:
|
|
29
|
+
return 'event' in value && typeof value.event === 'string' &&
|
|
30
|
+
'channel' in value && typeof value.channel === 'string';
|
|
31
|
+
default:
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Owns one bounded recovery wait and releases every timer/listener when it
|
|
37
|
+
* settles. Abort also settles the promise so close cannot strand async work.
|
|
38
|
+
*/
|
|
39
|
+
function waitForRecovery(signal, timeoutMs, subscribe) {
|
|
40
|
+
if (signal.aborted)
|
|
41
|
+
return Promise.resolve(false);
|
|
42
|
+
return new Promise((resolve, reject) => {
|
|
43
|
+
let unsubscribe;
|
|
44
|
+
let settled = false;
|
|
45
|
+
const cleanup = () => {
|
|
46
|
+
clearTimeout(timer);
|
|
47
|
+
signal.removeEventListener('abort', onAbort);
|
|
48
|
+
unsubscribe?.();
|
|
49
|
+
unsubscribe = undefined;
|
|
50
|
+
};
|
|
51
|
+
const finish = (success) => {
|
|
52
|
+
if (settled)
|
|
53
|
+
return;
|
|
54
|
+
settled = true;
|
|
55
|
+
cleanup();
|
|
56
|
+
resolve(success);
|
|
57
|
+
};
|
|
58
|
+
const onAbort = () => finish(false);
|
|
59
|
+
const timer = setTimeout(() => finish(false), timeoutMs);
|
|
60
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
61
|
+
try {
|
|
62
|
+
unsubscribe = subscribe?.(finish);
|
|
63
|
+
// A subscriber can settle synchronously before returning its cleanup.
|
|
64
|
+
if (settled)
|
|
65
|
+
cleanup();
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
settled = true;
|
|
69
|
+
cleanup();
|
|
70
|
+
reject(error);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}
|
|
12
74
|
/** Max retry attempts for the pre-reconnect hook (network may not be ready on wake). */
|
|
13
75
|
const HOOK_RETRY_ATTEMPTS = 3;
|
|
14
76
|
/** Delay between hook retry attempts in ms. */
|
|
@@ -39,36 +101,115 @@ export class VisibilityManager {
|
|
|
39
101
|
* Guards against duplicate reconnects when both the heartbeat and
|
|
40
102
|
* visibilitychange fire in quick succession after wake.
|
|
41
103
|
*/
|
|
42
|
-
|
|
104
|
+
recovery = null;
|
|
105
|
+
missedHeartbeat = false;
|
|
106
|
+
destroyed = false;
|
|
107
|
+
initializedSocket;
|
|
108
|
+
rememberInitialization = () => {
|
|
109
|
+
this.initializedSocket = this.client.clientSocket.socket;
|
|
110
|
+
};
|
|
43
111
|
constructor(client, idleTimer) {
|
|
44
112
|
this.client = client;
|
|
45
113
|
this.idleTimer = idleTimer;
|
|
114
|
+
this.initializedSocket = client.initialized ? client.clientSocket.socket : undefined;
|
|
115
|
+
this.client.on(ClientEvents.INITIALIZED, this.rememberInitialization);
|
|
46
116
|
this.setup();
|
|
47
117
|
}
|
|
48
118
|
/**
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
* do a full cleanup before reconnecting.
|
|
119
|
+
* Explicit recovery replaces the socket immediately. Automatic wake recovery
|
|
120
|
+
* first checks for traffic so timer throttling does not cancel live requests.
|
|
52
121
|
*/
|
|
53
122
|
reconnect() {
|
|
123
|
+
// Explicit reconnect remains usable after close; cancelled automatic work
|
|
124
|
+
// still cannot restart the client or reattach browser recovery listeners.
|
|
125
|
+
this.recovery?.abort();
|
|
126
|
+
const recovery = new AbortController();
|
|
127
|
+
this.recovery = recovery;
|
|
128
|
+
this.finishRecovery(recovery, this.replaceConnection(recovery));
|
|
129
|
+
}
|
|
130
|
+
/** Removes listeners, timers and pending recovery work. */
|
|
131
|
+
destroy() {
|
|
132
|
+
this.destroyed = true;
|
|
133
|
+
this.client.off(ClientEvents.INITIALIZED, this.rememberInitialization);
|
|
134
|
+
this.recovery?.abort();
|
|
135
|
+
this.recovery = null;
|
|
136
|
+
this.missedHeartbeat = false;
|
|
137
|
+
if (typeof document !== 'undefined' && this.visibilityHandler) {
|
|
138
|
+
document.removeEventListener('visibilitychange', this.visibilityHandler);
|
|
139
|
+
}
|
|
140
|
+
this.visibilityHandler = null;
|
|
141
|
+
this.stopHeartbeat();
|
|
142
|
+
}
|
|
143
|
+
finishRecovery(recovery, operation) {
|
|
144
|
+
void operation.catch(error => {
|
|
145
|
+
if (!recovery.signal.aborted) {
|
|
146
|
+
this.client.logger.connection(LogLevel.WARN, 'Wake recovery failed', {}, error);
|
|
147
|
+
}
|
|
148
|
+
}).finally(() => {
|
|
149
|
+
recovery.abort();
|
|
150
|
+
if (this.recovery === recovery)
|
|
151
|
+
this.recovery = null;
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
waitForInitialization(signal) {
|
|
155
|
+
return waitForRecovery(signal, RECOVERY_TIMEOUT_MS, finish => {
|
|
156
|
+
const initialized = () => finish(true);
|
|
157
|
+
const failed = () => finish(false);
|
|
158
|
+
this.client.on(ClientEvents.INITIALIZED, initialized);
|
|
159
|
+
this.client.on(ClientEvents.INITIALIZATION_FAILED, failed);
|
|
160
|
+
return () => {
|
|
161
|
+
this.client.off(ClientEvents.INITIALIZED, initialized);
|
|
162
|
+
this.client.off(ClientEvents.INITIALIZATION_FAILED, failed);
|
|
163
|
+
};
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
async replaceConnection(recovery) {
|
|
54
167
|
const wasInitialized = this.client.initialized;
|
|
168
|
+
// Subscribe before replacing: even synchronous initialization is observable.
|
|
169
|
+
const initialized = this.waitForInitialization(recovery.signal);
|
|
55
170
|
this.client.initialized = false;
|
|
56
171
|
this.client.initializing = false;
|
|
57
172
|
this.client.clientSocket.retireConnection();
|
|
173
|
+
if (recovery.signal.aborted)
|
|
174
|
+
return initialized;
|
|
58
175
|
this.client.clientSocket.connect();
|
|
59
176
|
this.lastHeartbeat = Date.now();
|
|
60
|
-
this.reconnecting = false;
|
|
61
177
|
if (wasInitialized) {
|
|
62
178
|
this.client.emit(ClientEvents.WEBSOCKET_RECONNECTING);
|
|
63
179
|
}
|
|
180
|
+
return initialized;
|
|
64
181
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
182
|
+
waitForTraffic(socket, signal) {
|
|
183
|
+
return waitForRecovery(signal, RECOVERY_TIMEOUT_MS, finish => {
|
|
184
|
+
const token = this.client.context.token;
|
|
185
|
+
const contextChanged = () => {
|
|
186
|
+
if (token !== this.client.context.token)
|
|
187
|
+
finish(false);
|
|
188
|
+
};
|
|
189
|
+
const message = (event) => {
|
|
190
|
+
if (typeof event.data !== 'string')
|
|
191
|
+
return;
|
|
192
|
+
try {
|
|
193
|
+
const envelope = Presentation.decode(event.data);
|
|
194
|
+
if (isServerTraffic(envelope))
|
|
195
|
+
finish(true);
|
|
196
|
+
}
|
|
197
|
+
catch {
|
|
198
|
+
// Malformed frames are not evidence of a working TypeFerry peer.
|
|
199
|
+
}
|
|
200
|
+
};
|
|
201
|
+
const closed = () => finish(false);
|
|
202
|
+
this.client.on(ClientEvents.CONTEXT_CHANGED, contextChanged);
|
|
203
|
+
socket.addEventListener('message', message);
|
|
204
|
+
socket.addEventListener('close', closed);
|
|
205
|
+
socket.addEventListener('error', closed);
|
|
206
|
+
return () => {
|
|
207
|
+
this.client.off(ClientEvents.CONTEXT_CHANGED, contextChanged);
|
|
208
|
+
socket.removeEventListener('message', message);
|
|
209
|
+
socket.removeEventListener('close', closed);
|
|
210
|
+
socket.removeEventListener('error', closed);
|
|
211
|
+
};
|
|
212
|
+
});
|
|
72
213
|
}
|
|
73
214
|
setup() {
|
|
74
215
|
if (typeof window === 'undefined')
|
|
@@ -92,7 +233,12 @@ export class VisibilityManager {
|
|
|
92
233
|
const gap = now - this.lastHeartbeat;
|
|
93
234
|
this.lastHeartbeat = now;
|
|
94
235
|
if (gap > HEARTBEAT_THRESHOLD_MS) {
|
|
95
|
-
|
|
236
|
+
if (document.visibilityState === 'hidden') {
|
|
237
|
+
this.missedHeartbeat = true;
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
this.handleSleepDetected('heartbeat', gap);
|
|
241
|
+
}
|
|
96
242
|
}
|
|
97
243
|
}, HEARTBEAT_INTERVAL_MS);
|
|
98
244
|
}
|
|
@@ -112,39 +258,110 @@ export class VisibilityManager {
|
|
|
112
258
|
}
|
|
113
259
|
/**
|
|
114
260
|
* Unified entry point for sleep detection from both the heartbeat
|
|
115
|
-
* timer and `visibilitychange`.
|
|
261
|
+
* timer and `visibilitychange`. One recovery owns the full lifecycle to prevent
|
|
116
262
|
* duplicate reconnects when both fire after wake.
|
|
117
263
|
*/
|
|
118
264
|
handleSleepDetected(source, durationMs) {
|
|
119
|
-
if (this.
|
|
265
|
+
if (this.destroyed || this.recovery)
|
|
120
266
|
return;
|
|
121
|
-
|
|
267
|
+
const recovery = new AbortController();
|
|
268
|
+
this.recovery = recovery;
|
|
269
|
+
this.missedHeartbeat = false;
|
|
122
270
|
if (this.client.options?.debug) {
|
|
123
271
|
console.log(`TypeFerry: Sleep detected via ${source} (${Math.round(durationMs / 1000)}s gap), reconnecting`);
|
|
124
272
|
}
|
|
125
|
-
this.runHookAndReconnect();
|
|
273
|
+
this.finishRecovery(recovery, this.runHookAndReconnect(recovery));
|
|
126
274
|
}
|
|
127
275
|
/**
|
|
128
|
-
*
|
|
129
|
-
*
|
|
130
|
-
*
|
|
276
|
+
* A token change still needs a new handshake. Otherwise delivered traffic
|
|
277
|
+
* allows the existing socket to survive a timer gap without replaying RPCs.
|
|
278
|
+
* Socket identity prevents a late hook/probe from retiring a newer connection.
|
|
131
279
|
*/
|
|
132
|
-
async runHookAndReconnect() {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
280
|
+
async runHookAndReconnect(recovery) {
|
|
281
|
+
const { signal } = recovery;
|
|
282
|
+
const socket = this.client.clientSocket.socket;
|
|
283
|
+
const token = this.client.context.token;
|
|
284
|
+
const hookSucceeded = this.onBeforeReconnect
|
|
285
|
+
? await this.runBeforeReconnect(signal)
|
|
286
|
+
: true;
|
|
287
|
+
if (signal.aborted)
|
|
288
|
+
return;
|
|
289
|
+
const currentSocket = this.client.clientSocket.socket;
|
|
290
|
+
if (!hookSucceeded || this.needsTokenHandshake(socket, token)) {
|
|
291
|
+
await this.replaceConnection(recovery);
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
if (currentSocket !== socket) {
|
|
295
|
+
if (this.initializedSocket !== this.client.clientSocket.socket) {
|
|
296
|
+
await this.waitForInitialization(signal);
|
|
297
|
+
}
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
if (this.client.clientSocket.ready &&
|
|
301
|
+
this.client.initialized &&
|
|
302
|
+
this.initializedSocket === socket &&
|
|
303
|
+
socket) {
|
|
304
|
+
const receivedTraffic = await this.waitForTraffic(socket, signal);
|
|
305
|
+
if (signal.aborted)
|
|
306
|
+
return;
|
|
307
|
+
if (this.needsTokenHandshake(socket, token)) {
|
|
308
|
+
await this.replaceConnection(recovery);
|
|
309
|
+
return;
|
|
310
|
+
}
|
|
311
|
+
if (this.client.clientSocket.socket !== socket) {
|
|
312
|
+
if (this.initializedSocket !== this.client.clientSocket.socket) {
|
|
313
|
+
await this.waitForInitialization(signal);
|
|
144
314
|
}
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
317
|
+
if (receivedTraffic && this.client.clientSocket.ready)
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
// Join transport-owned backoff, handshake or subscription initialization.
|
|
321
|
+
if (this.client.clientSocket.connecting ||
|
|
322
|
+
this.client.clientSocket.socket?.readyState === WebSocketState.CONNECTING ||
|
|
323
|
+
this.client.initializing ||
|
|
324
|
+
(this.client.clientSocket.ready && this.initializedSocket !== currentSocket)) {
|
|
325
|
+
await this.waitForInitialization(signal);
|
|
326
|
+
return;
|
|
327
|
+
}
|
|
328
|
+
await this.replaceConnection(recovery);
|
|
329
|
+
}
|
|
330
|
+
/**
|
|
331
|
+
* A competing reconnect may already have adopted the refreshed token. Keep
|
|
332
|
+
* that successor, but never mistake a newer socket for a newer handshake.
|
|
333
|
+
*/
|
|
334
|
+
needsTokenHandshake(previousSocket, previousToken) {
|
|
335
|
+
const token = this.client.context.token;
|
|
336
|
+
if (token === previousToken)
|
|
337
|
+
return false;
|
|
338
|
+
const socket = this.client.clientSocket.socket;
|
|
339
|
+
if (!socket || socket === previousSocket)
|
|
340
|
+
return true;
|
|
341
|
+
return new URL(socket.url).searchParams.get('token') !== (token ?? null);
|
|
342
|
+
}
|
|
343
|
+
async runBeforeReconnect(signal) {
|
|
344
|
+
const hook = this.onBeforeReconnect;
|
|
345
|
+
if (!hook)
|
|
346
|
+
return true;
|
|
347
|
+
for (let attempt = 0; attempt < HOOK_RETRY_ATTEMPTS; attempt++) {
|
|
348
|
+
if (signal.aborted)
|
|
349
|
+
return false;
|
|
350
|
+
try {
|
|
351
|
+
const succeeded = await waitForRecovery(signal, RECOVERY_TIMEOUT_MS, finish => {
|
|
352
|
+
void hook().then(() => finish(true), () => finish(false));
|
|
353
|
+
});
|
|
354
|
+
if (succeeded)
|
|
355
|
+
return true;
|
|
356
|
+
}
|
|
357
|
+
catch {
|
|
358
|
+
// Synchronous hook failures use the same bounded retry as rejections.
|
|
359
|
+
}
|
|
360
|
+
if (attempt < HOOK_RETRY_ATTEMPTS - 1) {
|
|
361
|
+
await waitForRecovery(signal, HOOK_RETRY_DELAY_MS);
|
|
145
362
|
}
|
|
146
363
|
}
|
|
147
|
-
|
|
364
|
+
return false;
|
|
148
365
|
}
|
|
149
366
|
/**
|
|
150
367
|
* Determines whether reconnection is needed and triggers it. Routes
|
|
@@ -155,7 +372,10 @@ export class VisibilityManager {
|
|
|
155
372
|
this.hiddenAt = null;
|
|
156
373
|
const socket = this.client.clientSocket.socket;
|
|
157
374
|
const isConnected = socket?.readyState === WebSocket.OPEN && this.client.initialized;
|
|
158
|
-
const needsReconnect = !isConnected ||
|
|
375
|
+
const needsReconnect = !isConnected ||
|
|
376
|
+
this.missedHeartbeat ||
|
|
377
|
+
Date.now() - this.lastHeartbeat > HEARTBEAT_THRESHOLD_MS ||
|
|
378
|
+
hiddenDuration > FORCE_RECONNECT_THRESHOLD;
|
|
159
379
|
if (needsReconnect) {
|
|
160
380
|
this.handleSleepDetected('visibility', hiddenDuration);
|
|
161
381
|
return;
|
|
@@ -165,9 +385,5 @@ export class VisibilityManager {
|
|
|
165
385
|
this.idleTimer.start();
|
|
166
386
|
}
|
|
167
387
|
}
|
|
168
|
-
/** Promisified delay for hook retry backoff. */
|
|
169
|
-
delay(ms) {
|
|
170
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
171
|
-
}
|
|
172
388
|
}
|
|
173
389
|
//# sourceMappingURL=visibility-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibility-manager.js","sourceRoot":"","sources":["../../src/client/visibility-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"visibility-manager.js","sourceRoot":"","sources":["../../src/client/visibility-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const adjustTypesFromJSONValue: (obj:
|
|
1
|
+
export declare const adjustTypesFromJSONValue: (obj: unknown) => unknown;
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
* different if the object you hand it itself needs changing.
|
|
5
5
|
*/
|
|
6
6
|
import { fromJSONValueHelper } from './helpers/from-json-value-helper.js';
|
|
7
|
-
import { isObject, keysOf } from './utils.js';
|
|
8
|
-
export const adjustTypesFromJSONValue = obj => {
|
|
7
|
+
import { isObject, isObjectRecord, keysOf } from './utils.js';
|
|
8
|
+
export const adjustTypesFromJSONValue = (obj) => {
|
|
9
9
|
if (obj === null) {
|
|
10
10
|
return null;
|
|
11
11
|
}
|
|
@@ -17,6 +17,8 @@ export const adjustTypesFromJSONValue = obj => {
|
|
|
17
17
|
if (!isObject(obj)) {
|
|
18
18
|
return obj;
|
|
19
19
|
}
|
|
20
|
+
if (!isObjectRecord(obj))
|
|
21
|
+
return obj;
|
|
20
22
|
keysOf(obj).forEach(key => {
|
|
21
23
|
const value = obj[key];
|
|
22
24
|
if (isObject(value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjust-types-from-json-value.js","sourceRoot":"","sources":["../../src/ejson/adjust-types-from-json-value.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"adjust-types-from-json-value.js","sourceRoot":"","sources":["../../src/ejson/adjust-types-from-json-value.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE1D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAY,EAAW,EAAE;IAChE,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,YAAY,KAAK,GAAG,EAAE,CAAC;QACzB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,6BAA6B;IAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAA;IAEpC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACxB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;YAC1C,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACtB,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;gBAClB,OAAM;YACR,CAAC;YACD,wDAAwD;YACxD,2BAA2B;YAC3B,wBAAwB,CAAC,KAAK,CAAC,CAAA;QACjC,CAAC;IACH,CAAC,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
package/dist/ejson/base64.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { newBinary } from './utils.js';
|
|
|
3
3
|
* Encodes binary payloads for EJSON without relying on a CJS-only dependency
|
|
4
4
|
* that breaks browser ESM loading in source-first consumers.
|
|
5
5
|
*/
|
|
6
|
-
export declare function encodeBase64(bytes:
|
|
6
|
+
export declare function encodeBase64(bytes: ArrayLike<number>): string;
|
|
7
7
|
/**
|
|
8
8
|
* Decodes EJSON base64 payloads while preserving the legacy polyfill
|
|
9
9
|
* behavior for runtimes without `Uint8Array`.
|
package/dist/ejson/base64.js
CHANGED
|
@@ -25,7 +25,7 @@ function getBase64Lengths(value) {
|
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
27
|
function readBase64Char(value, index) {
|
|
28
|
-
const decoded = BASE64_LOOKUP[value.charCodeAt(index)];
|
|
28
|
+
const decoded = BASE64_LOOKUP[value.charCodeAt(index)] ?? INVALID_CHAR;
|
|
29
29
|
if (decoded === INVALID_CHAR) {
|
|
30
30
|
throw new Error('Invalid base64 character');
|
|
31
31
|
}
|
package/dist/ejson/base64.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../src/ejson/base64.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,MAAM,eAAe,GACnB,kEAAkE,CAAA;AAEpE,MAAM,YAAY,GAAG,GAAG,CAAA;AAExB,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;IAC1B,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;IAClC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAEzB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;IACpC,CAAC;IAED,iCAAiC;IACjC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;IAE9B,OAAO,MAAM,CAAA;AACf,CAAC,CAAC,EAAE,CAAA;AAEJ,SAAS,gBAAgB,CAAC,KAAa;IAIrC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACtC,MAAM,qBAAqB,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAA;IAC7E,MAAM,iBAAiB,GACrB,qBAAqB,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAA;IAE9E,OAAO;QACL,WAAW,EAAE,qBAAqB;QAClC,iBAAiB;KAClB,CAAA;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAa,EAAE,KAAa;IAClD,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"base64.js","sourceRoot":"","sources":["../../src/ejson/base64.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,59 @@
|
|
|
1
|
-
|
|
1
|
+
type EJSONRecord = Record<string, unknown>;
|
|
2
|
+
export interface EJSONConverter {
|
|
3
|
+
matchJSONValue(value: unknown): boolean;
|
|
4
|
+
matchObject(value: unknown): boolean;
|
|
5
|
+
toJSONValue(value: unknown): unknown;
|
|
6
|
+
fromJSONValue(value: unknown): unknown;
|
|
7
|
+
}
|
|
8
|
+
export declare const dateConverter: {
|
|
9
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
10
|
+
matchObject: (value: unknown) => value is Date;
|
|
11
|
+
toJSONValue: (value: unknown) => {
|
|
12
|
+
$date: number;
|
|
13
|
+
};
|
|
14
|
+
fromJSONValue: (value: unknown) => Date;
|
|
15
|
+
};
|
|
16
|
+
export declare const regexpConverter: {
|
|
17
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
18
|
+
matchObject: (value: unknown) => value is RegExp;
|
|
19
|
+
toJSONValue: (value: unknown) => {
|
|
20
|
+
$regexp: string;
|
|
21
|
+
$flags: string;
|
|
22
|
+
};
|
|
23
|
+
fromJSONValue: (value: unknown) => RegExp;
|
|
24
|
+
};
|
|
25
|
+
export declare const infNaNConverter: {
|
|
26
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
27
|
+
matchObject: (value: unknown) => boolean;
|
|
28
|
+
toJSONValue: (value: unknown) => {
|
|
29
|
+
$InfNaN: number;
|
|
30
|
+
};
|
|
31
|
+
fromJSONValue: (value: unknown) => number;
|
|
32
|
+
};
|
|
33
|
+
export declare const binaryConverter: {
|
|
34
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
35
|
+
matchObject: (value: unknown) => value is Uint8Array<ArrayBufferLike> | import("./utils.js").PolyfillableArray;
|
|
36
|
+
toJSONValue: (value: unknown) => {
|
|
37
|
+
$binary: string;
|
|
38
|
+
};
|
|
39
|
+
fromJSONValue: (value: unknown) => Uint8Array<ArrayBufferLike> | import("./utils.js").PolyfillableArray;
|
|
40
|
+
};
|
|
41
|
+
export declare const escapeConverter: {
|
|
42
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
43
|
+
matchObject: (value: unknown) => boolean;
|
|
44
|
+
toJSONValue: (value: unknown) => {
|
|
45
|
+
$escape: EJSONRecord;
|
|
46
|
+
};
|
|
47
|
+
fromJSONValue: (value: unknown) => EJSONRecord;
|
|
48
|
+
};
|
|
49
|
+
export declare const customConverter: {
|
|
50
|
+
matchJSONValue: (value: unknown) => boolean;
|
|
51
|
+
matchObject: (value: unknown) => boolean;
|
|
52
|
+
toJSONValue: (value: unknown) => {
|
|
53
|
+
$type: string;
|
|
54
|
+
$value: unknown;
|
|
55
|
+
};
|
|
56
|
+
fromJSONValue: (value: unknown) => unknown;
|
|
57
|
+
};
|
|
58
|
+
export declare const builtinConverters: readonly EJSONConverter[];
|
|
59
|
+
export {};
|