typeferry 0.15.0 → 0.15.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/dist/auth/client/native-http.js +3 -2
- package/dist/auth/client/native-http.js.map +1 -1
- package/dist/auth/client/token-refresh.js +5 -1
- package/dist/auth/client/token-refresh.js.map +1 -1
- package/dist/client/client-http.d.ts +1 -1
- package/dist/client/client-http.js +10 -2
- package/dist/client/client-http.js.map +1 -1
- package/dist/client/client.d.ts +27 -1
- package/dist/client/client.js +113 -6
- package/dist/client/client.js.map +1 -1
- package/dist/client/request-lifetime.d.ts +18 -0
- package/dist/client/request-lifetime.js +67 -0
- package/dist/client/request-lifetime.js.map +1 -0
- package/dist/utils/abort.d.ts +9 -0
- package/dist/utils/abort.js +15 -0
- package/dist/utils/abort.js.map +1 -0
- package/dist/utils/types.d.ts +4 -0
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { throwIfAborted } from '../../utils/abort.js';
|
|
1
2
|
/**
|
|
2
3
|
* Adapts native private-cookie HTTP to ClientOptions.httpFetch. This boundary is
|
|
3
4
|
* for RPC and auth JSON, not binary uploads/downloads. Cancellation is checked
|
|
@@ -5,13 +6,13 @@
|
|
|
5
6
|
*/
|
|
6
7
|
export function createNativeHttpFetch(bridge) {
|
|
7
8
|
return async (url, options = {}) => {
|
|
8
|
-
options.signal
|
|
9
|
+
throwIfAborted(options.signal);
|
|
9
10
|
if (options.body != null && typeof options.body !== 'string') {
|
|
10
11
|
throw new Error('Native HTTP adapter supports text request bodies only');
|
|
11
12
|
}
|
|
12
13
|
const headers = Object.fromEntries(new Headers(options.headers).entries());
|
|
13
14
|
const result = await bridge.request({ url, method: options.method ?? 'GET', headers, ...(typeof options.body === 'string' ? { body: options.body } : {}) });
|
|
14
|
-
options.signal
|
|
15
|
+
throwIfAborted(options.signal);
|
|
15
16
|
const body = [204, 205, 304].includes(result.status) ? null : result.body;
|
|
16
17
|
return new Response(body, { status: result.status, statusText: result.statusText, headers: result.headers });
|
|
17
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-http.js","sourceRoot":"","sources":["../../../src/auth/client/native-http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"native-http.js","sourceRoot":"","sources":["../../../src/auth/client/native-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAelD;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAwB;IAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;QACjC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAE9B,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;QAC1E,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QAE3J,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAE9B,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAA;QAEzE,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9G,CAAC,CAAA;AACH,CAAC"}
|
|
@@ -64,6 +64,7 @@ export async function refreshAccessToken(client, config = {}) {
|
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
state.isRefreshing = true;
|
|
67
|
+
const context = client.context;
|
|
67
68
|
try {
|
|
68
69
|
/**
|
|
69
70
|
* Refresh token is sent exclusively via the HttpOnly cookie
|
|
@@ -79,6 +80,9 @@ export async function refreshAccessToken(client, config = {}) {
|
|
|
79
80
|
ignoreInit: true,
|
|
80
81
|
http: true,
|
|
81
82
|
});
|
|
83
|
+
if (client.context !== context) {
|
|
84
|
+
throw new Error('TypeFerry: Session changed during token refresh');
|
|
85
|
+
}
|
|
82
86
|
if (!result) {
|
|
83
87
|
throw new Error('Token refresh failed');
|
|
84
88
|
}
|
|
@@ -106,7 +110,7 @@ export async function refreshAccessToken(client, config = {}) {
|
|
|
106
110
|
code: err.code,
|
|
107
111
|
hasToken: !!client.context.token,
|
|
108
112
|
}, err);
|
|
109
|
-
if (isAuthFailure)
|
|
113
|
+
if (isAuthFailure && client.context === context)
|
|
110
114
|
client.clearContext();
|
|
111
115
|
processQueue(state, err, null);
|
|
112
116
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-refresh.js","sourceRoot":"","sources":["../../../src/auth/client/token-refresh.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI3E,MAAM,aAAa,GAAuB;IACxC,aAAa,EAAE,cAAc;IAC7B,sBAAsB,EAAE,EAAE;IAC1B,oBAAoB,EAAE,sBAAsB;CAC7C,CAAA;AAED,4EAA4E;AAC5E,MAAM,cAAc,GAAG,KAAK,CAAA;AAc5B,MAAM,eAAe,GAAG,IAAI,OAAO,EAAwB,CAAA;AAE3D,SAAS,eAAe,CAAC,MAAc;IACrC,IAAI,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,CAAA;QAChD,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,YAAY,CACnB,KAAmB,EACnB,KAAmB,EACnB,KAAoB;IAEpB,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;QAChD,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,CAAA;QACf,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAM,CAAC,CAAA;QACjB,CAAC;IACH,CAAC,CAAC,CAAA;IACF,KAAK,CAAC,WAAW,GAAG,EAAE,CAAA;AACxB,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CACzB,GAA+C;IAE/C,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,IAAI,CAAA;IACzD,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAuB;QAAE,OAAO,IAAI,CAAA;IAErD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAA;IACvB,IAAI,GAAG,KAAK,sBAAsB;QAAE,OAAO,IAAI,CAAA;IAC/C,IAAI,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QAAE,OAAO,IAAI,CAAA;IACpD,IAAI,GAAG,CAAC,QAAQ,CAAC,8BAA8B,CAAC;QAAE,OAAO,IAAI,CAAA;IAE7D,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,SAAsC,EAAE;IAExC,MAAM,IAAI,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,EAAE,CAAA;IAC5C,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAErC,gDAAgD;IAChD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"token-refresh.js","sourceRoot":"","sources":["../../../src/auth/client/token-refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,6 @@ export declare class ClientHttp {
|
|
|
22
22
|
constructor(client: Client);
|
|
23
23
|
/** Strip sensitive keys (refresh tokens) from context before sending over the wire. */
|
|
24
24
|
private stripSensitiveKeys;
|
|
25
|
-
request<TResult = unknown>(payload: Record<string, unknown>, resolve: Resolve<TResult> | null, reject: Reject): Promise<void>;
|
|
25
|
+
request<TResult = unknown>(payload: Record<string, unknown>, resolve: Resolve<TResult> | null, reject: Reject, signal?: AbortSignal): Promise<void>;
|
|
26
26
|
}
|
|
27
27
|
export {};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EJSON } from '../ejson/index.js';
|
|
2
|
+
import { throwIfAborted } from '../utils/abort.js';
|
|
2
3
|
import { CLIENT_ID_HEADER_KEY, ClientEvents, PayloadType, Presentation, TOKEN_HEADER_KEY, } from '../utils/index.js';
|
|
3
4
|
import { LogLevel } from './logger.js';
|
|
4
5
|
import { resolveBackendOrigins } from './backend-origin.js';
|
|
@@ -59,11 +60,13 @@ export class ClientHttp {
|
|
|
59
60
|
const { refreshToken: _, ...safe } = context;
|
|
60
61
|
return safe;
|
|
61
62
|
}
|
|
62
|
-
async request(payload, resolve, reject) {
|
|
63
|
+
async request(payload, resolve, reject, signal) {
|
|
63
64
|
try {
|
|
65
|
+
throwIfAborted(signal);
|
|
64
66
|
const httpFetch = this.client.options.httpFetch ?? fetch;
|
|
65
67
|
const data = await httpFetch(this.uri, {
|
|
66
68
|
method: 'POST',
|
|
69
|
+
...(signal ? { signal } : {}),
|
|
67
70
|
headers: {
|
|
68
71
|
[CLIENT_ID_HEADER_KEY]: this.client.uuid,
|
|
69
72
|
Accept: 'text/plain, */*',
|
|
@@ -78,6 +81,7 @@ export class ClientHttp {
|
|
|
78
81
|
payload,
|
|
79
82
|
}),
|
|
80
83
|
});
|
|
84
|
+
throwIfAborted(signal);
|
|
81
85
|
if (data.status !== 200) {
|
|
82
86
|
const errorText = await data.text();
|
|
83
87
|
const error = new ClientHttpResponseError(data.status, data.statusText, errorText);
|
|
@@ -89,10 +93,14 @@ export class ClientHttp {
|
|
|
89
93
|
}, error);
|
|
90
94
|
return reject(error);
|
|
91
95
|
}
|
|
92
|
-
if (
|
|
96
|
+
if (payload.void) {
|
|
97
|
+
resolve?.(undefined);
|
|
93
98
|
return;
|
|
94
99
|
}
|
|
100
|
+
if (!resolve)
|
|
101
|
+
return;
|
|
95
102
|
const response = await data.text();
|
|
103
|
+
throwIfAborted(signal);
|
|
96
104
|
const decoded = Presentation.decode(response);
|
|
97
105
|
this.client.emit(ClientEvents.INBOUND_MESSAGE, decoded);
|
|
98
106
|
if (decoded.type === PayloadType.ERROR)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-http.js","sourceRoot":"","sources":["../../src/client/client-http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,gBAAgB,GACjB,MAAM,UAAU,CAAA;AAEjB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAKxD;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IACvC,MAAM,CAAQ;IAEvB;;OAEG;IACH,YAAY,MAAc,EAAE,UAAkB,EAAE,YAAoB;QAClE,KAAK,CAAC,GAAG,MAAM,IAAI,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QACjE,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAA;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,UAAU;IACrB,MAAM,CAAQ;IACd,QAAQ,CAAQ;IAChB,IAAI,CAAQ;IACZ,GAAG,CAAQ;IAEX,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;QAEnE;;;;;;WAMG;QACH,MAAM,WAAW,GAAG,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,CAAA;YACzE,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpD,CAAC;aAAM,IAAI,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACxD,8DAA8D;YAC9D,IAAI,CAAC,IAAI;gBACP,OAAO,MAAM,KAAK,WAAW;oBAC3B,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM;oBACxB,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAA;YACrE,IAAI,CAAC,IAAI,GAAG,IAAI;gBACd,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE;gBACvD,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACnD,CAAC;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,MAAM,CAAA;IAC/B,CAAC;IAED,uFAAuF;IAC/E,kBAAkB,CACxB,OAAgC;QAEhC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,OAAO,CACX,OAAgC,EAChC,OAAgC,EAChC,MAAc;
|
|
1
|
+
{"version":3,"file":"client-http.js","sourceRoot":"","sources":["../../src/client/client-http.ts"],"names":[],"mappings":"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"}
|
package/dist/client/client.d.ts
CHANGED
|
@@ -23,7 +23,29 @@ export type WebSocketOptions = {
|
|
|
23
23
|
export type WebSocketRequestParams = {
|
|
24
24
|
[key: string]: unknown;
|
|
25
25
|
};
|
|
26
|
+
/**
|
|
27
|
+
* Describes a logical RPC before its transport or credentials are captured.
|
|
28
|
+
*/
|
|
29
|
+
export type DispatchRequest = {
|
|
30
|
+
readonly client: Client;
|
|
31
|
+
readonly method: string;
|
|
32
|
+
readonly kind: 'call' | 'void';
|
|
33
|
+
readonly deadline: number;
|
|
34
|
+
readonly signal: AbortSignal;
|
|
35
|
+
};
|
|
36
|
+
/**
|
|
37
|
+
* An application session signal invalidates dispatch and obsolete completion.
|
|
38
|
+
*/
|
|
39
|
+
export type DispatchAdmission = {
|
|
40
|
+
readonly signal?: AbortSignal;
|
|
41
|
+
};
|
|
26
42
|
export type ClientOptions = {
|
|
43
|
+
/**
|
|
44
|
+
* Optional application admission policy, awaited before an RPC sends.
|
|
45
|
+
* Credential changes during admission cause a bounded recheck without sending.
|
|
46
|
+
* Control/public methods needed by recovery must be admitted without waiting.
|
|
47
|
+
*/
|
|
48
|
+
beforeDispatch?: (request: DispatchRequest) => DispatchAdmission | void | Promise<DispatchAdmission | void>;
|
|
27
49
|
/**
|
|
28
50
|
* Explicit backend origins take precedence over host, port, httpPort and secure.
|
|
29
51
|
*/
|
|
@@ -72,6 +94,7 @@ export declare class Client<MethodsType extends ServerMethods = ServerMethods> e
|
|
|
72
94
|
errorHandler: ErrorHandler | null | undefined;
|
|
73
95
|
channels: Map<string, ClientChannel>;
|
|
74
96
|
timeouts: Set<Timeout>;
|
|
97
|
+
private readonly requests;
|
|
75
98
|
initialized: boolean;
|
|
76
99
|
authenticated: boolean;
|
|
77
100
|
options: ClientOptions;
|
|
@@ -130,7 +153,7 @@ export declare class Client<MethodsType extends ServerMethods = ServerMethods> e
|
|
|
130
153
|
/**
|
|
131
154
|
* Calls a method without expecting a return value (fire-and-forget).
|
|
132
155
|
*/
|
|
133
|
-
void<T = unknown>(method: string, params?: MethodParams<T>,
|
|
156
|
+
void<T = unknown>(method: string, params?: MethodParams<T>, options?: CallOptions): Promise<void>;
|
|
134
157
|
private waitForInitialization;
|
|
135
158
|
/**
|
|
136
159
|
* Executes a method call using WebSocket RPC or HTTP fallback.
|
|
@@ -140,6 +163,9 @@ export declare class Client<MethodsType extends ServerMethods = ServerMethods> e
|
|
|
140
163
|
private static readonly DEFAULT_CALL_OPTIONS;
|
|
141
164
|
private normalizeCallOptions;
|
|
142
165
|
private retryCall;
|
|
166
|
+
private waitForAdmittedInitialization;
|
|
167
|
+
private dispatchAdmitted;
|
|
168
|
+
private admittedRequest;
|
|
143
169
|
call<P = Record<string, unknown>, R = unknown>(method: string, params?: P, options?: CallOptions): Promise<R>;
|
|
144
170
|
typed<T extends ServerMethods>(types: T): Client<T>;
|
|
145
171
|
combine<T extends Client>(methods: T): Client<InferClientMethods<T> & MethodsType>;
|
package/dist/client/client.js
CHANGED
|
@@ -10,6 +10,7 @@ import { ContextManager } from './context-manager.js';
|
|
|
10
10
|
import { IdleTimer } from './idle-timer.js';
|
|
11
11
|
import { logger, LogLevel } from './logger.js';
|
|
12
12
|
import { VisibilityManager } from './visibility-manager.js';
|
|
13
|
+
import { RequestLifetime } from './request-lifetime.js';
|
|
13
14
|
/**
|
|
14
15
|
* When working with Next.js, it is probably a good idea to not run this in the
|
|
15
16
|
* server side by using it inside a `useEffect` hook.
|
|
@@ -22,6 +23,7 @@ export class Client extends ClientChannel {
|
|
|
22
23
|
errorHandler;
|
|
23
24
|
channels = new Map();
|
|
24
25
|
timeouts = new Set();
|
|
26
|
+
requests = new Set();
|
|
25
27
|
initialized = false;
|
|
26
28
|
authenticated = false;
|
|
27
29
|
options = {
|
|
@@ -158,6 +160,8 @@ export class Client extends ClientChannel {
|
|
|
158
160
|
this.contextManager.clearContext();
|
|
159
161
|
}
|
|
160
162
|
async close() {
|
|
163
|
+
for (const request of this.requests)
|
|
164
|
+
request.cancel();
|
|
161
165
|
this.emit(ClientEvents.CLOSE);
|
|
162
166
|
this.timeouts.forEach(timeout => clearTimeout(timeout));
|
|
163
167
|
this.idleTimer?.destroy();
|
|
@@ -224,7 +228,11 @@ export class Client extends ClientChannel {
|
|
|
224
228
|
/**
|
|
225
229
|
* Calls a method without expecting a return value (fire-and-forget).
|
|
226
230
|
*/
|
|
227
|
-
void(method, params,
|
|
231
|
+
void(method, params, options = {}) {
|
|
232
|
+
if (this.options.beforeDispatch || options.signal) {
|
|
233
|
+
return this.admittedRequest(method, params, this.normalizeCallOptions(options), 'void');
|
|
234
|
+
}
|
|
235
|
+
const { http, httpFallback = true } = options;
|
|
228
236
|
return new Promise((resolve, reject) => {
|
|
229
237
|
const payload = { method, params };
|
|
230
238
|
this.emit(ClientEvents.OUTBOUND_MESSAGE, payload);
|
|
@@ -259,14 +267,16 @@ export class Client extends ClientChannel {
|
|
|
259
267
|
* Executes a method call using WebSocket RPC or HTTP fallback.
|
|
260
268
|
* Uses UUID-based request/response correlation.
|
|
261
269
|
*/
|
|
262
|
-
async executeCall(method, params, http, httpFallback, timeout) {
|
|
270
|
+
async executeCall(method, params, http, httpFallback, timeout, lifetime) {
|
|
271
|
+
lifetime?.remaining();
|
|
263
272
|
this.emit(ClientEvents.OUTBOUND_MESSAGE, { method, params });
|
|
273
|
+
lifetime?.remaining();
|
|
264
274
|
// HTTP path: used when http=true or socket not ready with fallback enabled
|
|
265
275
|
if (http || (!this.clientSocket.ready && httpFallback)) {
|
|
266
276
|
return new Promise((resolve, reject) => {
|
|
267
277
|
const uuid = Presentation.uuid();
|
|
268
278
|
const payload = { uuid, type: PayloadType.METHOD, method, params };
|
|
269
|
-
this.clientHttp.request(payload, resolve, reject);
|
|
279
|
+
this.clientHttp.request(payload, resolve, reject, lifetime?.signal);
|
|
270
280
|
});
|
|
271
281
|
}
|
|
272
282
|
// WebSocket path: use UUID-correlated RPC
|
|
@@ -292,13 +302,23 @@ export class Client extends ClientChannel {
|
|
|
292
302
|
normalizeCallOptions(options) {
|
|
293
303
|
return { ...Client.DEFAULT_CALL_OPTIONS, ...options };
|
|
294
304
|
}
|
|
295
|
-
async retryCall(method, params, opts) {
|
|
305
|
+
async retryCall(method, params, opts, lifetime) {
|
|
296
306
|
let lastError;
|
|
297
307
|
for (let attempt = 0; attempt <= opts.maxRetries; attempt++) {
|
|
308
|
+
let dispatched = false;
|
|
309
|
+
const execute = () => {
|
|
310
|
+
dispatched = true;
|
|
311
|
+
return this.executeCall(method, params, opts.http, opts.httpFallback, lifetime?.remaining() ?? opts.timeout, lifetime);
|
|
312
|
+
};
|
|
298
313
|
try {
|
|
299
|
-
return
|
|
314
|
+
return lifetime
|
|
315
|
+
? await this.dispatchAdmitted(method, 'call', opts, lifetime, execute)
|
|
316
|
+
: await execute();
|
|
300
317
|
}
|
|
301
318
|
catch (error) {
|
|
319
|
+
if (!dispatched)
|
|
320
|
+
throw error;
|
|
321
|
+
lifetime?.remaining();
|
|
302
322
|
lastError = error;
|
|
303
323
|
if (attempt > 0) {
|
|
304
324
|
this.logger.method(LogLevel.WARN, 'Method call retry failed', {
|
|
@@ -310,13 +330,100 @@ export class Client extends ClientChannel {
|
|
|
310
330
|
}
|
|
311
331
|
if (attempt >= opts.maxRetries)
|
|
312
332
|
throw lastError;
|
|
313
|
-
|
|
333
|
+
let timer;
|
|
334
|
+
const delay = new Promise(resolve => {
|
|
335
|
+
timer = setTimeout(resolve, opts.delayBetweenRetriesMs);
|
|
336
|
+
});
|
|
337
|
+
try {
|
|
338
|
+
if (lifetime)
|
|
339
|
+
await lifetime.wait(delay);
|
|
340
|
+
else
|
|
341
|
+
await delay;
|
|
342
|
+
}
|
|
343
|
+
finally {
|
|
344
|
+
clearTimeout(timer);
|
|
345
|
+
}
|
|
314
346
|
}
|
|
315
347
|
}
|
|
316
348
|
throw lastError ?? new Error('TypeFerry method call did not execute');
|
|
317
349
|
}
|
|
350
|
+
async waitForAdmittedInitialization(lifetime) {
|
|
351
|
+
if (this.initialized)
|
|
352
|
+
return;
|
|
353
|
+
let initialized;
|
|
354
|
+
const ready = new Promise(resolve => {
|
|
355
|
+
initialized = resolve;
|
|
356
|
+
this.once(ClientEvents.INITIALIZED, initialized);
|
|
357
|
+
});
|
|
358
|
+
try {
|
|
359
|
+
await lifetime.wait(ready);
|
|
360
|
+
}
|
|
361
|
+
finally {
|
|
362
|
+
if (initialized)
|
|
363
|
+
this.off(ClientEvents.INITIALIZED, initialized);
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
async dispatchAdmitted(method, kind, opts, lifetime, dispatch) {
|
|
367
|
+
while (true) {
|
|
368
|
+
lifetime.remaining();
|
|
369
|
+
const context = this.context;
|
|
370
|
+
const admission = await lifetime.wait(this.options.beforeDispatch?.({
|
|
371
|
+
client: this,
|
|
372
|
+
method,
|
|
373
|
+
kind,
|
|
374
|
+
deadline: lifetime.deadline,
|
|
375
|
+
signal: lifetime.signal,
|
|
376
|
+
}));
|
|
377
|
+
if (admission?.signal)
|
|
378
|
+
lifetime.follow(admission.signal);
|
|
379
|
+
if (!opts.ignoreInit)
|
|
380
|
+
await this.waitForAdmittedInitialization(lifetime);
|
|
381
|
+
lifetime.remaining();
|
|
382
|
+
// Renewal can race an awaited hook or initialization. Recheck before
|
|
383
|
+
// sending, retaining every admitted session's cancellation boundary.
|
|
384
|
+
if (context !== this.context)
|
|
385
|
+
continue;
|
|
386
|
+
return dispatch();
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
async admittedRequest(method, params, opts, kind) {
|
|
390
|
+
const lifetime = new RequestLifetime(opts.timeout, opts.signal);
|
|
391
|
+
this.requests.add(lifetime);
|
|
392
|
+
try {
|
|
393
|
+
if (kind === 'call') {
|
|
394
|
+
return await lifetime.wait(this.retryCall(method, params, opts, lifetime));
|
|
395
|
+
}
|
|
396
|
+
await lifetime.wait(this.dispatchAdmitted(method, kind, opts, lifetime, async () => {
|
|
397
|
+
this.emit(ClientEvents.OUTBOUND_MESSAGE, { method, params });
|
|
398
|
+
lifetime.remaining();
|
|
399
|
+
if (opts.http || (!this.clientSocket.ready && opts.httpFallback)) {
|
|
400
|
+
await new Promise((resolve, reject) => {
|
|
401
|
+
const payload = {
|
|
402
|
+
type: PayloadType.METHOD,
|
|
403
|
+
uuid: Presentation.uuid(),
|
|
404
|
+
method,
|
|
405
|
+
params,
|
|
406
|
+
void: true,
|
|
407
|
+
};
|
|
408
|
+
void this.clientHttp.request(payload, resolve, reject, lifetime.signal);
|
|
409
|
+
});
|
|
410
|
+
}
|
|
411
|
+
else {
|
|
412
|
+
this.clientSocket.send('rpc:void', { method, params });
|
|
413
|
+
}
|
|
414
|
+
}));
|
|
415
|
+
return undefined;
|
|
416
|
+
}
|
|
417
|
+
finally {
|
|
418
|
+
lifetime.dispose();
|
|
419
|
+
this.requests.delete(lifetime);
|
|
420
|
+
}
|
|
421
|
+
}
|
|
318
422
|
async call(method, params, options) {
|
|
319
423
|
const opts = this.normalizeCallOptions(options);
|
|
424
|
+
if (this.options.beforeDispatch || opts.signal) {
|
|
425
|
+
return this.admittedRequest(method, params, opts, 'call');
|
|
426
|
+
}
|
|
320
427
|
const shouldWaitForInit = !opts.ignoreInit && !this.initialized;
|
|
321
428
|
if (shouldWaitForInit)
|
|
322
429
|
await this.waitForInitialization(opts.timeout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Owns one opt-in request's deadline and cancellation through its completion.
|
|
3
|
+
* Admission policy remains with the application; late waits cannot revive work.
|
|
4
|
+
*/
|
|
5
|
+
export declare class RequestLifetime {
|
|
6
|
+
readonly deadline: number;
|
|
7
|
+
private readonly controller;
|
|
8
|
+
private readonly timer;
|
|
9
|
+
private readonly followed;
|
|
10
|
+
private readonly cleanups;
|
|
11
|
+
constructor(timeout: number, signal?: AbortSignal);
|
|
12
|
+
get signal(): AbortSignal;
|
|
13
|
+
cancel(reason?: unknown): void;
|
|
14
|
+
follow(signal: AbortSignal): void;
|
|
15
|
+
remaining(): number;
|
|
16
|
+
wait<T>(operation: PromiseLike<T> | T): Promise<T>;
|
|
17
|
+
dispose(): void;
|
|
18
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { getAbortReason, throwIfAborted } from '../utils/abort.js';
|
|
2
|
+
/**
|
|
3
|
+
* Owns one opt-in request's deadline and cancellation through its completion.
|
|
4
|
+
* Admission policy remains with the application; late waits cannot revive work.
|
|
5
|
+
*/
|
|
6
|
+
export class RequestLifetime {
|
|
7
|
+
deadline;
|
|
8
|
+
controller = new AbortController();
|
|
9
|
+
timer;
|
|
10
|
+
followed = new Set();
|
|
11
|
+
cleanups = [];
|
|
12
|
+
constructor(timeout, signal) {
|
|
13
|
+
this.deadline = Date.now() + timeout;
|
|
14
|
+
this.timer = setTimeout(() => this.cancel(new Error('TypeFerry: Request timed out')), Math.max(0, timeout));
|
|
15
|
+
if (signal)
|
|
16
|
+
this.follow(signal);
|
|
17
|
+
}
|
|
18
|
+
get signal() {
|
|
19
|
+
return this.controller.signal;
|
|
20
|
+
}
|
|
21
|
+
cancel(reason = new Error('TypeFerry: Client closed')) {
|
|
22
|
+
this.controller.abort(reason);
|
|
23
|
+
}
|
|
24
|
+
follow(signal) {
|
|
25
|
+
if (this.followed.has(signal))
|
|
26
|
+
return;
|
|
27
|
+
this.followed.add(signal);
|
|
28
|
+
if (signal.aborted) {
|
|
29
|
+
this.cancel(getAbortReason(signal));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const abort = () => this.cancel(getAbortReason(signal));
|
|
33
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
34
|
+
this.cleanups.push(() => signal.removeEventListener('abort', abort));
|
|
35
|
+
}
|
|
36
|
+
remaining() {
|
|
37
|
+
if (Date.now() >= this.deadline)
|
|
38
|
+
this.cancel(new Error('TypeFerry: Request timed out'));
|
|
39
|
+
throwIfAborted(this.signal);
|
|
40
|
+
return this.deadline - Date.now();
|
|
41
|
+
}
|
|
42
|
+
async wait(operation) {
|
|
43
|
+
let abort;
|
|
44
|
+
const cancelled = new Promise((_resolve, reject) => {
|
|
45
|
+
abort = () => reject(getAbortReason(this.signal));
|
|
46
|
+
if (this.signal.aborted)
|
|
47
|
+
abort();
|
|
48
|
+
else
|
|
49
|
+
this.signal.addEventListener('abort', abort, { once: true });
|
|
50
|
+
});
|
|
51
|
+
try {
|
|
52
|
+
const result = await Promise.race([operation, cancelled]);
|
|
53
|
+
this.remaining();
|
|
54
|
+
return result;
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
if (abort)
|
|
58
|
+
this.signal.removeEventListener('abort', abort);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
dispose() {
|
|
62
|
+
clearTimeout(this.timer);
|
|
63
|
+
for (const cleanup of this.cleanups)
|
|
64
|
+
cleanup();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=request-lifetime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-lifetime.js","sourceRoot":"","sources":["../../src/client/request-lifetime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Older supported WebViews have abort events but no reason or throwIfAborted.
|
|
3
|
+
* Keep cancellation local without requiring newer AbortSignal convenience APIs.
|
|
4
|
+
*/
|
|
5
|
+
export declare function getAbortReason(signal: AbortSignal): unknown;
|
|
6
|
+
/**
|
|
7
|
+
* Checks cancellation on both older native WebViews and current browsers.
|
|
8
|
+
*/
|
|
9
|
+
export declare function throwIfAborted(signal?: AbortSignal | null): void;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Older supported WebViews have abort events but no reason or throwIfAborted.
|
|
3
|
+
* Keep cancellation local without requiring newer AbortSignal convenience APIs.
|
|
4
|
+
*/
|
|
5
|
+
export function getAbortReason(signal) {
|
|
6
|
+
return signal.reason ?? new DOMException('The operation was aborted', 'AbortError');
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Checks cancellation on both older native WebViews and current browsers.
|
|
10
|
+
*/
|
|
11
|
+
export function throwIfAborted(signal) {
|
|
12
|
+
if (signal?.aborted)
|
|
13
|
+
throw getAbortReason(signal);
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=abort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../src/utils/abort.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,MAAmB;IAChD,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,2BAA2B,EAAE,YAAY,CAAC,CAAA;AACrF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAA2B;IACxD,IAAI,MAAM,EAAE,OAAO;QAAE,MAAM,cAAc,CAAC,MAAM,CAAC,CAAA;AACnD,CAAC"}
|
package/dist/utils/types.d.ts
CHANGED
|
@@ -13,6 +13,10 @@ type ServerMethodNode = {
|
|
|
13
13
|
};
|
|
14
14
|
export type MethodParams<T = any> = T;
|
|
15
15
|
export type CallOptions = {
|
|
16
|
+
/**
|
|
17
|
+
* Cancels local waiting and delivery; a sent operation may still run remotely.
|
|
18
|
+
*/
|
|
19
|
+
signal?: AbortSignal;
|
|
16
20
|
http?: boolean;
|
|
17
21
|
timeout?: number;
|
|
18
22
|
httpFallback?: boolean;
|