@orpc/client 0.0.0-next.6c1c681 → 0.0.0-next.6d75718
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 +10 -0
- package/dist/adapters/fetch/index.d.mts +7 -6
- package/dist/adapters/fetch/index.d.ts +7 -6
- package/dist/adapters/fetch/index.mjs +2 -2
- package/dist/adapters/standard/index.d.mts +12 -76
- package/dist/adapters/standard/index.d.ts +12 -76
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/index.d.mts +10 -15
- package/dist/index.d.ts +10 -15
- package/dist/index.mjs +34 -32
- package/dist/plugins/index.d.mts +61 -0
- package/dist/plugins/index.d.ts +61 -0
- package/dist/plugins/index.mjs +126 -0
- package/dist/shared/{client.CPmBUYbj.mjs → client.B1XjLWRe.mjs} +24 -41
- package/dist/shared/{client.XAn8cDTM.mjs → client.BacCdg3F.mjs} +2 -96
- package/dist/shared/client.Bt40CWA-.d.ts +39 -0
- package/dist/shared/client.CKw2tbcl.d.mts +39 -0
- package/dist/shared/client.RZs5Myak.d.mts +30 -0
- package/dist/shared/client.RZs5Myak.d.ts +30 -0
- package/package.json +9 -4
- package/dist/shared/client.D_CzLDyB.d.mts +0 -42
- package/dist/shared/client.D_CzLDyB.d.ts +0 -42
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Value } from '@orpc/shared';
|
|
2
|
+
import { S as StandardLinkPlugin, a as StandardLinkOptions } from '../shared/client.Bt40CWA-.js';
|
|
3
|
+
import { C as ClientOptions } from '../shared/client.RZs5Myak.js';
|
|
4
|
+
import '@orpc/standard-server';
|
|
5
|
+
|
|
6
|
+
interface ClientRetryPluginAttemptOptions {
|
|
7
|
+
lastEventRetry: number | undefined;
|
|
8
|
+
lastEventId: string | undefined;
|
|
9
|
+
attemptIndex: number;
|
|
10
|
+
error: unknown;
|
|
11
|
+
}
|
|
12
|
+
interface ClientRetryPluginContext {
|
|
13
|
+
/**
|
|
14
|
+
* Maximum retry attempts before throwing
|
|
15
|
+
* Use `Number.POSITIVE_INFINITY` for infinite retries (e.g., when handling Server-Sent Events).
|
|
16
|
+
*
|
|
17
|
+
* @default 0
|
|
18
|
+
*/
|
|
19
|
+
retry?: number;
|
|
20
|
+
/**
|
|
21
|
+
* Delay (in ms) before retrying.
|
|
22
|
+
*
|
|
23
|
+
* @default (o) => o.lastEventRetry ?? 2000
|
|
24
|
+
*/
|
|
25
|
+
retryDelay?: Value<number, [
|
|
26
|
+
attemptOptions: ClientRetryPluginAttemptOptions,
|
|
27
|
+
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
|
28
|
+
path: readonly string[],
|
|
29
|
+
input: unknown
|
|
30
|
+
]>;
|
|
31
|
+
/**
|
|
32
|
+
* Determine should retry or not.
|
|
33
|
+
*
|
|
34
|
+
* @default true
|
|
35
|
+
*/
|
|
36
|
+
shouldRetry?: Value<boolean, [
|
|
37
|
+
attemptOptions: ClientRetryPluginAttemptOptions,
|
|
38
|
+
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
|
39
|
+
path: readonly string[],
|
|
40
|
+
input: unknown
|
|
41
|
+
]>;
|
|
42
|
+
/**
|
|
43
|
+
* The hook called when retrying, and return the unsubscribe function.
|
|
44
|
+
*/
|
|
45
|
+
onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptions<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
|
|
46
|
+
}
|
|
47
|
+
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
|
48
|
+
}
|
|
49
|
+
interface ClientRetryPluginOptions {
|
|
50
|
+
default?: ClientRetryPluginContext;
|
|
51
|
+
}
|
|
52
|
+
declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements StandardLinkPlugin<T> {
|
|
53
|
+
private readonly defaultRetry;
|
|
54
|
+
private readonly defaultRetryDelay;
|
|
55
|
+
private readonly defaultShouldRetry;
|
|
56
|
+
private readonly defaultOnRetry;
|
|
57
|
+
constructor(options?: ClientRetryPluginOptions);
|
|
58
|
+
init(options: StandardLinkOptions<T>): void;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export { ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { isAsyncIteratorObject, value } from '@orpc/shared';
|
|
2
|
+
import { getEventMeta } from '@orpc/standard-server';
|
|
3
|
+
|
|
4
|
+
class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
|
5
|
+
}
|
|
6
|
+
class ClientRetryPlugin {
|
|
7
|
+
defaultRetry;
|
|
8
|
+
defaultRetryDelay;
|
|
9
|
+
defaultShouldRetry;
|
|
10
|
+
defaultOnRetry;
|
|
11
|
+
constructor(options = {}) {
|
|
12
|
+
this.defaultRetry = options.default?.retry ?? 0;
|
|
13
|
+
this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
|
|
14
|
+
this.defaultShouldRetry = options.default?.shouldRetry ?? true;
|
|
15
|
+
this.defaultOnRetry = options.default?.onRetry;
|
|
16
|
+
}
|
|
17
|
+
init(options) {
|
|
18
|
+
options.interceptors ??= [];
|
|
19
|
+
options.interceptors.push(async (interceptorOptions) => {
|
|
20
|
+
const maxAttempts = interceptorOptions.options.context.retry ?? this.defaultRetry;
|
|
21
|
+
const retryDelay = interceptorOptions.options.context.retryDelay ?? this.defaultRetryDelay;
|
|
22
|
+
const shouldRetry = interceptorOptions.options.context.shouldRetry ?? this.defaultShouldRetry;
|
|
23
|
+
const onRetry = interceptorOptions.options.context.onRetry ?? this.defaultOnRetry;
|
|
24
|
+
if (maxAttempts <= 0) {
|
|
25
|
+
return interceptorOptions.next();
|
|
26
|
+
}
|
|
27
|
+
let lastEventId = interceptorOptions.options.lastEventId;
|
|
28
|
+
let lastEventRetry;
|
|
29
|
+
let unsubscribe;
|
|
30
|
+
let attemptIndex = 0;
|
|
31
|
+
const next = async (initial) => {
|
|
32
|
+
let current = initial;
|
|
33
|
+
while (true) {
|
|
34
|
+
const newClientOptions = { ...interceptorOptions.options, lastEventId };
|
|
35
|
+
if (current) {
|
|
36
|
+
if (attemptIndex >= maxAttempts) {
|
|
37
|
+
throw current.error;
|
|
38
|
+
}
|
|
39
|
+
const attemptOptions = {
|
|
40
|
+
attemptIndex,
|
|
41
|
+
error: current.error,
|
|
42
|
+
lastEventId,
|
|
43
|
+
lastEventRetry
|
|
44
|
+
};
|
|
45
|
+
const shouldRetryBool = await value(
|
|
46
|
+
shouldRetry,
|
|
47
|
+
attemptOptions,
|
|
48
|
+
newClientOptions,
|
|
49
|
+
interceptorOptions.path,
|
|
50
|
+
interceptorOptions.input
|
|
51
|
+
);
|
|
52
|
+
if (!shouldRetryBool) {
|
|
53
|
+
throw current.error;
|
|
54
|
+
}
|
|
55
|
+
unsubscribe = onRetry?.(
|
|
56
|
+
attemptOptions,
|
|
57
|
+
newClientOptions,
|
|
58
|
+
interceptorOptions.path,
|
|
59
|
+
interceptorOptions.input
|
|
60
|
+
);
|
|
61
|
+
const retryDelayMs = await value(
|
|
62
|
+
retryDelay,
|
|
63
|
+
attemptOptions,
|
|
64
|
+
newClientOptions,
|
|
65
|
+
interceptorOptions.path,
|
|
66
|
+
interceptorOptions.input
|
|
67
|
+
);
|
|
68
|
+
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
|
69
|
+
attemptIndex++;
|
|
70
|
+
}
|
|
71
|
+
try {
|
|
72
|
+
const output2 = await interceptorOptions.next({
|
|
73
|
+
...interceptorOptions,
|
|
74
|
+
options: newClientOptions
|
|
75
|
+
});
|
|
76
|
+
return output2;
|
|
77
|
+
} catch (error) {
|
|
78
|
+
if (newClientOptions.signal?.aborted === true) {
|
|
79
|
+
throw error;
|
|
80
|
+
}
|
|
81
|
+
current = { error };
|
|
82
|
+
} finally {
|
|
83
|
+
unsubscribe?.();
|
|
84
|
+
unsubscribe = void 0;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
const output = await next();
|
|
89
|
+
if (!isAsyncIteratorObject(output)) {
|
|
90
|
+
return output;
|
|
91
|
+
}
|
|
92
|
+
return async function* () {
|
|
93
|
+
let current = output;
|
|
94
|
+
try {
|
|
95
|
+
while (true) {
|
|
96
|
+
try {
|
|
97
|
+
const item = await current.next();
|
|
98
|
+
const meta = getEventMeta(item.value);
|
|
99
|
+
lastEventId = meta?.id ?? lastEventId;
|
|
100
|
+
lastEventRetry = meta?.retry ?? lastEventRetry;
|
|
101
|
+
if (item.done) {
|
|
102
|
+
return item.value;
|
|
103
|
+
}
|
|
104
|
+
yield item.value;
|
|
105
|
+
} catch (error) {
|
|
106
|
+
const meta = getEventMeta(error);
|
|
107
|
+
lastEventId = meta?.id ?? lastEventId;
|
|
108
|
+
lastEventRetry = meta?.retry ?? lastEventRetry;
|
|
109
|
+
const maybeEventIterator = await next({ error });
|
|
110
|
+
if (!isAsyncIteratorObject(maybeEventIterator)) {
|
|
111
|
+
throw new ClientRetryPluginInvalidEventIteratorRetryResponse(
|
|
112
|
+
"RetryPlugin: Expected an Event Iterator, got a non-Event Iterator"
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
current = maybeEventIterator;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
} finally {
|
|
119
|
+
await current.return?.();
|
|
120
|
+
}
|
|
121
|
+
}();
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
export { ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse };
|
|
@@ -1,48 +1,25 @@
|
|
|
1
|
-
import { intercept,
|
|
2
|
-
import {
|
|
1
|
+
import { toArray, intercept, isObject, value, trim, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
|
|
2
|
+
import { O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.BacCdg3F.mjs';
|
|
3
3
|
import { ErrorEvent } from '@orpc/standard-server';
|
|
4
4
|
|
|
5
5
|
class InvalidEventIteratorRetryResponse extends Error {
|
|
6
6
|
}
|
|
7
7
|
class StandardLink {
|
|
8
|
-
constructor(codec, sender, options) {
|
|
8
|
+
constructor(codec, sender, options = {}) {
|
|
9
9
|
this.codec = codec;
|
|
10
10
|
this.sender = sender;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
this.interceptors = options.interceptors
|
|
15
|
-
this.clientInterceptors = options.clientInterceptors
|
|
11
|
+
for (const plugin of toArray(options.plugins)) {
|
|
12
|
+
plugin.init?.(options);
|
|
13
|
+
}
|
|
14
|
+
this.interceptors = toArray(options.interceptors);
|
|
15
|
+
this.clientInterceptors = toArray(options.clientInterceptors);
|
|
16
16
|
}
|
|
17
|
-
eventIteratorMaxRetries;
|
|
18
|
-
eventIteratorRetryDelay;
|
|
19
|
-
eventIteratorShouldRetry;
|
|
20
17
|
interceptors;
|
|
21
18
|
clientInterceptors;
|
|
22
19
|
call(path, input, options) {
|
|
23
20
|
return intercept(this.interceptors, { path, input, options }, async ({ path: path2, input: input2, options: options2 }) => {
|
|
24
21
|
const output = await this.#call(path2, input2, options2);
|
|
25
|
-
|
|
26
|
-
return output;
|
|
27
|
-
}
|
|
28
|
-
return createAutoRetryEventIterator(output, async (reconnectOptions) => {
|
|
29
|
-
const maxRetries = await value(this.eventIteratorMaxRetries, reconnectOptions, options2, path2, input2);
|
|
30
|
-
if (options2.signal?.aborted || reconnectOptions.retryTimes > maxRetries) {
|
|
31
|
-
return null;
|
|
32
|
-
}
|
|
33
|
-
const shouldRetry = await value(this.eventIteratorShouldRetry, reconnectOptions, options2, path2, input2);
|
|
34
|
-
if (!shouldRetry) {
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
37
|
-
const retryDelay = await value(this.eventIteratorRetryDelay, reconnectOptions, options2, path2, input2);
|
|
38
|
-
await new Promise((resolve) => setTimeout(resolve, retryDelay));
|
|
39
|
-
const updatedOptions = { ...options2, lastEventId: reconnectOptions.lastEventId };
|
|
40
|
-
const maybeIterator = await this.#call(path2, input2, updatedOptions);
|
|
41
|
-
if (!isAsyncIteratorObject(maybeIterator)) {
|
|
42
|
-
throw new InvalidEventIteratorRetryResponse("Invalid Event Iterator retry response");
|
|
43
|
-
}
|
|
44
|
-
return maybeIterator;
|
|
45
|
-
}, options2.lastEventId);
|
|
22
|
+
return output;
|
|
46
23
|
});
|
|
47
24
|
}
|
|
48
25
|
async #call(path, input, options) {
|
|
@@ -134,6 +111,9 @@ class StandardRPCJsonSerializer {
|
|
|
134
111
|
if (isObject(data)) {
|
|
135
112
|
const json = {};
|
|
136
113
|
for (const k in data) {
|
|
114
|
+
if (k === "toJSON" && typeof data[k] === "function") {
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
137
117
|
json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
|
|
138
118
|
}
|
|
139
119
|
return [json, meta, maps, blobs];
|
|
@@ -216,14 +196,23 @@ class StandardRPCLinkCodec {
|
|
|
216
196
|
headers;
|
|
217
197
|
async encode(path, input, options) {
|
|
218
198
|
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
|
219
|
-
const headers = await value(this.headers, options, path, input);
|
|
199
|
+
const headers = { ...await value(this.headers, options, path, input) };
|
|
220
200
|
const baseUrl = await value(this.baseUrl, options, path, input);
|
|
221
201
|
const url = new URL(`${trim(baseUrl.toString(), "/")}/${path.map(encodeURIComponent).join("/")}`);
|
|
202
|
+
if (options.lastEventId !== void 0) {
|
|
203
|
+
if (Array.isArray(headers["last-event-id"])) {
|
|
204
|
+
headers["last-event-id"] = [...headers["last-event-id"], options.lastEventId];
|
|
205
|
+
} else if (headers["last-event-id"] !== void 0) {
|
|
206
|
+
headers["last-event-id"] = [headers["last-event-id"], options.lastEventId];
|
|
207
|
+
} else {
|
|
208
|
+
headers["last-event-id"] = options.lastEventId;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
222
211
|
const serialized = this.serializer.serialize(input);
|
|
223
|
-
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !
|
|
212
|
+
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
|
224
213
|
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
|
225
214
|
const getUrl = new URL(url);
|
|
226
|
-
getUrl.searchParams.append("data", stringifyJSON(serialized)
|
|
215
|
+
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
|
227
216
|
if (getUrl.toString().length <= maxUrlLength) {
|
|
228
217
|
return {
|
|
229
218
|
body: void 0,
|
|
@@ -292,9 +281,6 @@ class StandardRPCSerializer {
|
|
|
292
281
|
return this.#serialize(data, true);
|
|
293
282
|
}
|
|
294
283
|
#serialize(data, enableFormData) {
|
|
295
|
-
if (data === void 0 || data instanceof Blob) {
|
|
296
|
-
return data;
|
|
297
|
-
}
|
|
298
284
|
const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
|
|
299
285
|
const meta = meta_.length === 0 ? void 0 : meta_;
|
|
300
286
|
if (!enableFormData || blobs.length === 0) {
|
|
@@ -332,9 +318,6 @@ class StandardRPCSerializer {
|
|
|
332
318
|
return this.#deserialize(data);
|
|
333
319
|
}
|
|
334
320
|
#deserialize(data) {
|
|
335
|
-
if (data === void 0 || data instanceof Blob) {
|
|
336
|
-
return data;
|
|
337
|
-
}
|
|
338
321
|
if (!(data instanceof FormData)) {
|
|
339
322
|
return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
|
|
340
323
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isObject, isTypescriptObject
|
|
1
|
+
import { isObject, isTypescriptObject } from '@orpc/shared';
|
|
2
2
|
import { getEventMeta, withEventMeta } from '@orpc/standard-server';
|
|
3
3
|
|
|
4
4
|
const COMMON_ORPC_ERROR_DEFS = {
|
|
@@ -137,34 +137,6 @@ function toORPCError(error) {
|
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
|
|
140
|
-
const iteratorStates = /* @__PURE__ */ new WeakMap();
|
|
141
|
-
function registerEventIteratorState(iterator, state) {
|
|
142
|
-
iteratorStates.set(iterator, state);
|
|
143
|
-
}
|
|
144
|
-
function updateEventIteratorStatus(state, status) {
|
|
145
|
-
if (state.status !== status) {
|
|
146
|
-
state.status = status;
|
|
147
|
-
state.listeners.forEach((cb) => cb(status));
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
function onEventIteratorStatusChange(iterator, callback, options = {}) {
|
|
151
|
-
const notifyImmediately = options.notifyImmediately ?? true;
|
|
152
|
-
const state = iteratorStates.get(iterator);
|
|
153
|
-
if (!state) {
|
|
154
|
-
throw new Error("Iterator is not registered.");
|
|
155
|
-
}
|
|
156
|
-
if (notifyImmediately) {
|
|
157
|
-
callback(state.status);
|
|
158
|
-
}
|
|
159
|
-
state.listeners.push(callback);
|
|
160
|
-
return () => {
|
|
161
|
-
const index = state.listeners.indexOf(callback);
|
|
162
|
-
if (index !== -1) {
|
|
163
|
-
state.listeners.splice(index, 1);
|
|
164
|
-
}
|
|
165
|
-
};
|
|
166
|
-
}
|
|
167
|
-
|
|
168
140
|
function mapEventIterator(iterator, maps) {
|
|
169
141
|
return async function* () {
|
|
170
142
|
try {
|
|
@@ -196,71 +168,5 @@ function mapEventIterator(iterator, maps) {
|
|
|
196
168
|
}
|
|
197
169
|
}();
|
|
198
170
|
}
|
|
199
|
-
const MAX_ALLOWED_RETRY_TIMES = 99;
|
|
200
|
-
function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
|
|
201
|
-
const state = {
|
|
202
|
-
status: "connected",
|
|
203
|
-
listeners: []
|
|
204
|
-
};
|
|
205
|
-
const iterator = async function* () {
|
|
206
|
-
let current = initial;
|
|
207
|
-
let lastEventId = initialLastEventId;
|
|
208
|
-
let lastRetry;
|
|
209
|
-
let retryTimes = 0;
|
|
210
|
-
try {
|
|
211
|
-
while (true) {
|
|
212
|
-
try {
|
|
213
|
-
updateEventIteratorStatus(state, "connected");
|
|
214
|
-
const { done, value } = await current.next();
|
|
215
|
-
const meta = getEventMeta(value);
|
|
216
|
-
lastEventId = meta?.id ?? lastEventId;
|
|
217
|
-
lastRetry = meta?.retry ?? lastRetry;
|
|
218
|
-
retryTimes = 0;
|
|
219
|
-
if (done) {
|
|
220
|
-
return value;
|
|
221
|
-
}
|
|
222
|
-
yield value;
|
|
223
|
-
} catch (e) {
|
|
224
|
-
updateEventIteratorStatus(state, "reconnecting");
|
|
225
|
-
const meta = getEventMeta(e);
|
|
226
|
-
lastEventId = meta?.id ?? lastEventId;
|
|
227
|
-
lastRetry = meta?.retry ?? lastRetry;
|
|
228
|
-
let currentError = e;
|
|
229
|
-
current = await retry({ times: MAX_ALLOWED_RETRY_TIMES }, async (exit) => {
|
|
230
|
-
retryTimes += 1;
|
|
231
|
-
if (retryTimes > MAX_ALLOWED_RETRY_TIMES) {
|
|
232
|
-
throw exit(new Error(
|
|
233
|
-
`Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event iterator. Possible infinite retry loop detected. Please review the retry logic.`,
|
|
234
|
-
{ cause: currentError }
|
|
235
|
-
));
|
|
236
|
-
}
|
|
237
|
-
const reconnected = await (async () => {
|
|
238
|
-
try {
|
|
239
|
-
return await reconnect({
|
|
240
|
-
lastRetry,
|
|
241
|
-
lastEventId,
|
|
242
|
-
retryTimes,
|
|
243
|
-
error: currentError
|
|
244
|
-
});
|
|
245
|
-
} catch (e2) {
|
|
246
|
-
currentError = e2;
|
|
247
|
-
throw e2;
|
|
248
|
-
}
|
|
249
|
-
})();
|
|
250
|
-
if (!reconnected) {
|
|
251
|
-
throw exit(currentError);
|
|
252
|
-
}
|
|
253
|
-
return reconnected;
|
|
254
|
-
});
|
|
255
|
-
}
|
|
256
|
-
}
|
|
257
|
-
} finally {
|
|
258
|
-
updateEventIteratorStatus(state, "closed");
|
|
259
|
-
await current.return?.();
|
|
260
|
-
}
|
|
261
|
-
}();
|
|
262
|
-
registerEventIteratorState(iterator, state);
|
|
263
|
-
return iterator;
|
|
264
|
-
}
|
|
265
171
|
|
|
266
|
-
export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a,
|
|
172
|
+
export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { Interceptor } from '@orpc/shared';
|
|
2
|
+
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
|
3
|
+
import { a as ClientContext, C as ClientOptions, b as ClientLink } from './client.RZs5Myak.js';
|
|
4
|
+
|
|
5
|
+
interface StandardLinkCodec<T extends ClientContext> {
|
|
6
|
+
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
|
7
|
+
decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
|
|
8
|
+
}
|
|
9
|
+
interface StandardLinkClient<T extends ClientContext> {
|
|
10
|
+
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
declare class InvalidEventIteratorRetryResponse extends Error {
|
|
14
|
+
}
|
|
15
|
+
interface StandardLinkPlugin<T extends ClientContext> {
|
|
16
|
+
init?(options: StandardLinkOptions<T>): void;
|
|
17
|
+
}
|
|
18
|
+
interface StandardLinkOptions<T extends ClientContext> {
|
|
19
|
+
interceptors?: Interceptor<{
|
|
20
|
+
path: readonly string[];
|
|
21
|
+
input: unknown;
|
|
22
|
+
options: ClientOptions<T>;
|
|
23
|
+
}, unknown, unknown>[];
|
|
24
|
+
clientInterceptors?: Interceptor<{
|
|
25
|
+
request: StandardRequest;
|
|
26
|
+
}, StandardLazyResponse, unknown>[];
|
|
27
|
+
plugins?: StandardLinkPlugin<T>[];
|
|
28
|
+
}
|
|
29
|
+
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
30
|
+
#private;
|
|
31
|
+
readonly codec: StandardLinkCodec<T>;
|
|
32
|
+
readonly sender: StandardLinkClient<T>;
|
|
33
|
+
private readonly interceptors;
|
|
34
|
+
private readonly clientInterceptors;
|
|
35
|
+
constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
|
|
36
|
+
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { Interceptor } from '@orpc/shared';
|
|
2
|
+
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
|
3
|
+
import { a as ClientContext, C as ClientOptions, b as ClientLink } from './client.RZs5Myak.mjs';
|
|
4
|
+
|
|
5
|
+
interface StandardLinkCodec<T extends ClientContext> {
|
|
6
|
+
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
|
7
|
+
decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
|
|
8
|
+
}
|
|
9
|
+
interface StandardLinkClient<T extends ClientContext> {
|
|
10
|
+
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
declare class InvalidEventIteratorRetryResponse extends Error {
|
|
14
|
+
}
|
|
15
|
+
interface StandardLinkPlugin<T extends ClientContext> {
|
|
16
|
+
init?(options: StandardLinkOptions<T>): void;
|
|
17
|
+
}
|
|
18
|
+
interface StandardLinkOptions<T extends ClientContext> {
|
|
19
|
+
interceptors?: Interceptor<{
|
|
20
|
+
path: readonly string[];
|
|
21
|
+
input: unknown;
|
|
22
|
+
options: ClientOptions<T>;
|
|
23
|
+
}, unknown, unknown>[];
|
|
24
|
+
clientInterceptors?: Interceptor<{
|
|
25
|
+
request: StandardRequest;
|
|
26
|
+
}, StandardLazyResponse, unknown>[];
|
|
27
|
+
plugins?: StandardLinkPlugin<T>[];
|
|
28
|
+
}
|
|
29
|
+
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
30
|
+
#private;
|
|
31
|
+
readonly codec: StandardLinkCodec<T>;
|
|
32
|
+
readonly sender: StandardLinkClient<T>;
|
|
33
|
+
private readonly interceptors;
|
|
34
|
+
private readonly clientInterceptors;
|
|
35
|
+
constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
|
|
36
|
+
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
type ClientContext = Record<string, any>;
|
|
2
|
+
type FriendlyClientOptions<TClientContext extends ClientContext> = {
|
|
3
|
+
signal?: AbortSignal;
|
|
4
|
+
lastEventId?: string | undefined;
|
|
5
|
+
} & (Record<never, never> extends TClientContext ? {
|
|
6
|
+
context?: TClientContext;
|
|
7
|
+
} : {
|
|
8
|
+
context: TClientContext;
|
|
9
|
+
});
|
|
10
|
+
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
|
11
|
+
type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
|
|
12
|
+
__error?: {
|
|
13
|
+
type: TError;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
|
|
17
|
+
(...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
|
|
18
|
+
}
|
|
19
|
+
type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
|
|
20
|
+
[k: string]: NestedClient<TClientContext>;
|
|
21
|
+
};
|
|
22
|
+
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
|
23
|
+
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
|
24
|
+
context: TClientContext;
|
|
25
|
+
};
|
|
26
|
+
interface ClientLink<TClientContext extends ClientContext> {
|
|
27
|
+
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export type { ClientOptions as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientRest as d, Client as e };
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
type ClientContext = Record<string, any>;
|
|
2
|
+
type FriendlyClientOptions<TClientContext extends ClientContext> = {
|
|
3
|
+
signal?: AbortSignal;
|
|
4
|
+
lastEventId?: string | undefined;
|
|
5
|
+
} & (Record<never, never> extends TClientContext ? {
|
|
6
|
+
context?: TClientContext;
|
|
7
|
+
} : {
|
|
8
|
+
context: TClientContext;
|
|
9
|
+
});
|
|
10
|
+
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
|
11
|
+
type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
|
|
12
|
+
__error?: {
|
|
13
|
+
type: TError;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
|
|
17
|
+
(...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
|
|
18
|
+
}
|
|
19
|
+
type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
|
|
20
|
+
[k: string]: NestedClient<TClientContext>;
|
|
21
|
+
};
|
|
22
|
+
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
|
23
|
+
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
|
24
|
+
context: TClientContext;
|
|
25
|
+
};
|
|
26
|
+
interface ClientLink<TClientContext extends ClientContext> {
|
|
27
|
+
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export type { ClientOptions as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientRest as d, Client as e };
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@orpc/client",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.0-next.
|
|
4
|
+
"version": "0.0.0-next.6d75718",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
|
7
7
|
"repository": {
|
|
@@ -19,6 +19,11 @@
|
|
|
19
19
|
"import": "./dist/index.mjs",
|
|
20
20
|
"default": "./dist/index.mjs"
|
|
21
21
|
},
|
|
22
|
+
"./plugins": {
|
|
23
|
+
"types": "./dist/plugins/index.d.mts",
|
|
24
|
+
"import": "./dist/plugins/index.mjs",
|
|
25
|
+
"default": "./dist/plugins/index.mjs"
|
|
26
|
+
},
|
|
22
27
|
"./standard": {
|
|
23
28
|
"types": "./dist/adapters/standard/index.d.mts",
|
|
24
29
|
"import": "./dist/adapters/standard/index.mjs",
|
|
@@ -34,9 +39,9 @@
|
|
|
34
39
|
"dist"
|
|
35
40
|
],
|
|
36
41
|
"dependencies": {
|
|
37
|
-
"@orpc/shared": "0.0.0-next.
|
|
38
|
-
"@orpc/standard-server": "0.0.0-next.
|
|
39
|
-
"@orpc/standard-server-fetch": "0.0.0-next.
|
|
42
|
+
"@orpc/shared": "0.0.0-next.6d75718",
|
|
43
|
+
"@orpc/standard-server": "0.0.0-next.6d75718",
|
|
44
|
+
"@orpc/standard-server-fetch": "0.0.0-next.6d75718"
|
|
40
45
|
},
|
|
41
46
|
"devDependencies": {
|
|
42
47
|
"zod": "^3.24.2"
|
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
type ClientContext = Record<string, any>;
|
|
2
|
-
type ClientOptions<TClientContext extends ClientContext> = {
|
|
3
|
-
signal?: AbortSignal;
|
|
4
|
-
lastEventId?: string | undefined;
|
|
5
|
-
} & (Record<never, never> extends TClientContext ? {
|
|
6
|
-
context?: TClientContext;
|
|
7
|
-
} : {
|
|
8
|
-
context: TClientContext;
|
|
9
|
-
});
|
|
10
|
-
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options: ClientOptions<TClientContext>];
|
|
11
|
-
type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
|
|
12
|
-
__error?: {
|
|
13
|
-
type: TError;
|
|
14
|
-
};
|
|
15
|
-
};
|
|
16
|
-
interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
|
|
17
|
-
(...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
|
|
18
|
-
}
|
|
19
|
-
type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
|
|
20
|
-
[k: string]: NestedClient<TClientContext>;
|
|
21
|
-
};
|
|
22
|
-
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
|
23
|
-
type ClientOptionsOut<TClientContext extends ClientContext> = ClientOptions<TClientContext> & {
|
|
24
|
-
context: TClientContext;
|
|
25
|
-
};
|
|
26
|
-
interface ClientLink<TClientContext extends ClientContext> {
|
|
27
|
-
call: (path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>) => Promise<unknown>;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
|
|
31
|
-
value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
|
|
32
|
-
error: (error: unknown) => Promise<unknown>;
|
|
33
|
-
}): AsyncGenerator<TMap, TMap, TNext>;
|
|
34
|
-
interface EventIteratorReconnectOptions {
|
|
35
|
-
lastRetry: number | undefined;
|
|
36
|
-
lastEventId: string | undefined;
|
|
37
|
-
retryTimes: number;
|
|
38
|
-
error: unknown;
|
|
39
|
-
}
|
|
40
|
-
declare function createAutoRetryEventIterator<TYield, TReturn>(initial: AsyncIterator<TYield, TReturn, void>, reconnect: (options: EventIteratorReconnectOptions) => Promise<AsyncIterator<TYield, TReturn, void> | null>, initialLastEventId: string | undefined): AsyncGenerator<TYield, TReturn, void>;
|
|
41
|
-
|
|
42
|
-
export { type ClientContext as C, type EventIteratorReconnectOptions as E, type InferClientContext as I, type NestedClient as N, type ClientOptionsOut as a, type ClientLink as b, type ClientPromiseResult as c, createAutoRetryEventIterator as d, type ClientOptions as e, type ClientRest as f, type Client as g, mapEventIterator as m };
|