@orpc/client 0.0.0-next.b45a533 → 0.0.0-next.b47b94e
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 +25 -17
- package/dist/adapters/fetch/index.d.mts +17 -13
- package/dist/adapters/fetch/index.d.ts +17 -13
- package/dist/adapters/fetch/index.mjs +5 -11
- package/dist/adapters/standard/index.d.mts +8 -146
- package/dist/adapters/standard/index.d.ts +8 -146
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/adapters/websocket/index.d.mts +29 -0
- package/dist/adapters/websocket/index.d.ts +29 -0
- package/dist/adapters/websocket/index.mjs +31 -0
- package/dist/index.d.mts +36 -22
- package/dist/index.d.ts +36 -22
- package/dist/index.mjs +35 -33
- package/dist/plugins/index.d.mts +162 -0
- package/dist/plugins/index.d.ts +162 -0
- package/dist/plugins/index.mjs +291 -0
- package/dist/shared/client.4TS_0JaO.d.mts +29 -0
- package/dist/shared/client.4TS_0JaO.d.ts +29 -0
- package/dist/shared/client.7ZYxJok_.d.ts +46 -0
- package/dist/shared/client.B2432-Lu.d.ts +91 -0
- package/dist/shared/client.CRWEpqLB.mjs +175 -0
- package/dist/shared/client.ClwIM_ku.d.mts +91 -0
- package/dist/shared/{client.Df5pd75N.mjs → client.DpICn1BD.mjs} +113 -78
- package/dist/shared/client.ds1abV85.d.mts +46 -0
- package/package.json +15 -4
- package/dist/shared/client.D_CzLDyB.d.mts +0 -42
- package/dist/shared/client.D_CzLDyB.d.ts +0 -42
- package/dist/shared/client.XAn8cDTM.mjs +0 -266
@@ -0,0 +1,91 @@
|
|
1
|
+
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.4TS_0JaO.mjs';
|
2
|
+
import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.ds1abV85.mjs';
|
3
|
+
import { Segment, Value } from '@orpc/shared';
|
4
|
+
import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
5
|
+
|
6
|
+
declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
|
7
|
+
readonly BIGINT: 0;
|
8
|
+
readonly DATE: 1;
|
9
|
+
readonly NAN: 2;
|
10
|
+
readonly UNDEFINED: 3;
|
11
|
+
readonly URL: 4;
|
12
|
+
readonly REGEXP: 5;
|
13
|
+
readonly SET: 6;
|
14
|
+
readonly MAP: 7;
|
15
|
+
};
|
16
|
+
type StandardRPCJsonSerializedMetaItem = readonly [type: number, ...path: Segment[]];
|
17
|
+
type StandardRPCJsonSerialized = [json: unknown, meta: StandardRPCJsonSerializedMetaItem[], maps: Segment[][], blobs: Blob[]];
|
18
|
+
interface StandardRPCCustomJsonSerializer {
|
19
|
+
type: number;
|
20
|
+
condition(data: unknown): boolean;
|
21
|
+
serialize(data: any): unknown;
|
22
|
+
deserialize(serialized: any): unknown;
|
23
|
+
}
|
24
|
+
interface StandardRPCJsonSerializerOptions {
|
25
|
+
customJsonSerializers?: readonly StandardRPCCustomJsonSerializer[];
|
26
|
+
}
|
27
|
+
declare class StandardRPCJsonSerializer {
|
28
|
+
private readonly customSerializers;
|
29
|
+
constructor(options?: StandardRPCJsonSerializerOptions);
|
30
|
+
serialize(data: unknown, segments?: Segment[], meta?: StandardRPCJsonSerializedMetaItem[], maps?: Segment[][], blobs?: Blob[]): StandardRPCJsonSerialized;
|
31
|
+
deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[]): unknown;
|
32
|
+
deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[], maps: readonly Segment[][], getBlob: (index: number) => Blob): unknown;
|
33
|
+
}
|
34
|
+
|
35
|
+
declare class StandardRPCSerializer {
|
36
|
+
#private;
|
37
|
+
private readonly jsonSerializer;
|
38
|
+
constructor(jsonSerializer: StandardRPCJsonSerializer);
|
39
|
+
serialize(data: unknown): object;
|
40
|
+
deserialize(data: unknown): unknown;
|
41
|
+
}
|
42
|
+
|
43
|
+
interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
44
|
+
/**
|
45
|
+
* Base url for all requests.
|
46
|
+
*/
|
47
|
+
url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
48
|
+
/**
|
49
|
+
* The maximum length of the URL.
|
50
|
+
*
|
51
|
+
* @default 2083
|
52
|
+
*/
|
53
|
+
maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
54
|
+
/**
|
55
|
+
* The method used to make the request.
|
56
|
+
*
|
57
|
+
* @default 'POST'
|
58
|
+
*/
|
59
|
+
method?: Value<Exclude<HTTPMethod, 'HEAD'>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
60
|
+
/**
|
61
|
+
* The method to use when the payload cannot safely pass to the server with method return from method function.
|
62
|
+
* GET is not allowed, it's very dangerous.
|
63
|
+
*
|
64
|
+
* @default 'POST'
|
65
|
+
*/
|
66
|
+
fallbackMethod?: Exclude<HTTPMethod, 'HEAD' | 'GET'>;
|
67
|
+
/**
|
68
|
+
* Inject headers to the request.
|
69
|
+
*/
|
70
|
+
headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
71
|
+
}
|
72
|
+
declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
|
73
|
+
private readonly serializer;
|
74
|
+
private readonly baseUrl;
|
75
|
+
private readonly maxUrlLength;
|
76
|
+
private readonly fallbackMethod;
|
77
|
+
private readonly expectedMethod;
|
78
|
+
private readonly headers;
|
79
|
+
constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
|
80
|
+
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
81
|
+
decode(response: StandardLazyResponse): Promise<unknown>;
|
82
|
+
}
|
83
|
+
|
84
|
+
interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
|
85
|
+
}
|
86
|
+
declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
|
87
|
+
constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
|
88
|
+
}
|
89
|
+
|
90
|
+
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, StandardRPCJsonSerializer as e, StandardRPCLink as g, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
|
91
|
+
export type { StandardRPCJsonSerializedMetaItem as a, StandardRPCJsonSerialized as b, StandardRPCCustomJsonSerializer as c, StandardRPCJsonSerializerOptions as d, StandardRPCLinkOptions as f, StandardRPCLinkCodecOptions as h };
|
@@ -1,106 +1,116 @@
|
|
1
|
-
import { intercept,
|
2
|
-
import {
|
3
|
-
import {
|
1
|
+
import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
|
2
|
+
import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
|
3
|
+
import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, c as isORPCErrorJson, d as createORPCErrorFromJson, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.CRWEpqLB.mjs';
|
4
4
|
|
5
|
-
class
|
5
|
+
class CompositeStandardLinkPlugin {
|
6
|
+
plugins;
|
7
|
+
constructor(plugins = []) {
|
8
|
+
this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
|
9
|
+
}
|
10
|
+
init(options) {
|
11
|
+
for (const plugin of this.plugins) {
|
12
|
+
plugin.init?.(options);
|
13
|
+
}
|
14
|
+
}
|
6
15
|
}
|
16
|
+
|
7
17
|
class StandardLink {
|
8
|
-
constructor(codec, sender, options) {
|
18
|
+
constructor(codec, sender, options = {}) {
|
9
19
|
this.codec = codec;
|
10
20
|
this.sender = sender;
|
11
|
-
|
12
|
-
|
13
|
-
this.
|
14
|
-
this.
|
15
|
-
this.clientInterceptors = options.clientInterceptors ?? [];
|
21
|
+
const plugin = new CompositeStandardLinkPlugin(options.plugins);
|
22
|
+
plugin.init(options);
|
23
|
+
this.interceptors = toArray(options.interceptors);
|
24
|
+
this.clientInterceptors = toArray(options.clientInterceptors);
|
16
25
|
}
|
17
|
-
eventIteratorMaxRetries;
|
18
|
-
eventIteratorRetryDelay;
|
19
|
-
eventIteratorShouldRetry;
|
20
26
|
interceptors;
|
21
27
|
clientInterceptors;
|
22
28
|
call(path, input, options) {
|
23
|
-
return intercept(this.interceptors, { path, input
|
29
|
+
return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
|
24
30
|
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);
|
31
|
+
return output;
|
46
32
|
});
|
47
33
|
}
|
48
34
|
async #call(path, input, options) {
|
49
35
|
const request = await this.codec.encode(path, input, options);
|
50
36
|
const response = await intercept(
|
51
37
|
this.clientInterceptors,
|
52
|
-
{ request },
|
53
|
-
({ request: request2 }) => this.sender.call(request2,
|
38
|
+
{ ...options, input, path, request },
|
39
|
+
({ input: input2, path: path2, request: request2, ...options2 }) => this.sender.call(request2, options2, path2, input2)
|
54
40
|
);
|
55
41
|
const output = await this.codec.decode(response, options, path, input);
|
56
42
|
return output;
|
57
43
|
}
|
58
44
|
}
|
59
45
|
|
60
|
-
|
46
|
+
const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES = {
|
47
|
+
BIGINT: 0,
|
48
|
+
DATE: 1,
|
49
|
+
NAN: 2,
|
50
|
+
UNDEFINED: 3,
|
51
|
+
URL: 4,
|
52
|
+
REGEXP: 5,
|
53
|
+
SET: 6,
|
54
|
+
MAP: 7
|
55
|
+
};
|
56
|
+
class StandardRPCJsonSerializer {
|
57
|
+
customSerializers;
|
58
|
+
constructor(options = {}) {
|
59
|
+
this.customSerializers = options.customJsonSerializers ?? [];
|
60
|
+
if (this.customSerializers.length !== new Set(this.customSerializers.map((custom) => custom.type)).size) {
|
61
|
+
throw new Error("Custom serializer type must be unique.");
|
62
|
+
}
|
63
|
+
}
|
61
64
|
serialize(data, segments = [], meta = [], maps = [], blobs = []) {
|
65
|
+
for (const custom of this.customSerializers) {
|
66
|
+
if (custom.condition(data)) {
|
67
|
+
const result = this.serialize(custom.serialize(data), segments, meta, maps, blobs);
|
68
|
+
meta.push([custom.type, ...segments]);
|
69
|
+
return result;
|
70
|
+
}
|
71
|
+
}
|
62
72
|
if (data instanceof Blob) {
|
63
73
|
maps.push(segments);
|
64
74
|
blobs.push(data);
|
65
75
|
return [data, meta, maps, blobs];
|
66
76
|
}
|
67
77
|
if (typeof data === "bigint") {
|
68
|
-
meta.push([
|
78
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT, ...segments]);
|
69
79
|
return [data.toString(), meta, maps, blobs];
|
70
80
|
}
|
71
81
|
if (data instanceof Date) {
|
72
|
-
meta.push([
|
82
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE, ...segments]);
|
73
83
|
if (Number.isNaN(data.getTime())) {
|
74
84
|
return [null, meta, maps, blobs];
|
75
85
|
}
|
76
86
|
return [data.toISOString(), meta, maps, blobs];
|
77
87
|
}
|
78
88
|
if (Number.isNaN(data)) {
|
79
|
-
meta.push([
|
89
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN, ...segments]);
|
80
90
|
return [null, meta, maps, blobs];
|
81
91
|
}
|
82
92
|
if (data instanceof URL) {
|
83
|
-
meta.push([
|
93
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL, ...segments]);
|
84
94
|
return [data.toString(), meta, maps, blobs];
|
85
95
|
}
|
86
96
|
if (data instanceof RegExp) {
|
87
|
-
meta.push([
|
97
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP, ...segments]);
|
88
98
|
return [data.toString(), meta, maps, blobs];
|
89
99
|
}
|
90
100
|
if (data instanceof Set) {
|
91
101
|
const result = this.serialize(Array.from(data), segments, meta, maps, blobs);
|
92
|
-
meta.push([
|
102
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET, ...segments]);
|
93
103
|
return result;
|
94
104
|
}
|
95
105
|
if (data instanceof Map) {
|
96
106
|
const result = this.serialize(Array.from(data.entries()), segments, meta, maps, blobs);
|
97
|
-
meta.push([
|
107
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP, ...segments]);
|
98
108
|
return result;
|
99
109
|
}
|
100
110
|
if (Array.isArray(data)) {
|
101
111
|
const json = data.map((v, i) => {
|
102
112
|
if (v === void 0) {
|
103
|
-
meta.push([
|
113
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED, ...segments, i]);
|
104
114
|
return v;
|
105
115
|
}
|
106
116
|
return this.serialize(v, [...segments, i], meta, maps, blobs)[0];
|
@@ -110,6 +120,9 @@ class RPCJsonSerializer {
|
|
110
120
|
if (isObject(data)) {
|
111
121
|
const json = {};
|
112
122
|
for (const k in data) {
|
123
|
+
if (k === "toJSON" && typeof data[k] === "function") {
|
124
|
+
continue;
|
125
|
+
}
|
113
126
|
json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
|
114
127
|
}
|
115
128
|
return [json, meta, maps, blobs];
|
@@ -129,38 +142,45 @@ class RPCJsonSerializer {
|
|
129
142
|
currentRef[preSegment] = getBlob(i);
|
130
143
|
});
|
131
144
|
}
|
132
|
-
for (const
|
145
|
+
for (const item of meta) {
|
146
|
+
const type = item[0];
|
133
147
|
let currentRef = ref;
|
134
148
|
let preSegment = "data";
|
135
|
-
|
149
|
+
for (let i = 1; i < item.length; i++) {
|
136
150
|
currentRef = currentRef[preSegment];
|
137
|
-
preSegment =
|
138
|
-
}
|
151
|
+
preSegment = item[i];
|
152
|
+
}
|
153
|
+
for (const custom of this.customSerializers) {
|
154
|
+
if (custom.type === type) {
|
155
|
+
currentRef[preSegment] = custom.deserialize(currentRef[preSegment]);
|
156
|
+
break;
|
157
|
+
}
|
158
|
+
}
|
139
159
|
switch (type) {
|
140
|
-
case
|
160
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT:
|
141
161
|
currentRef[preSegment] = BigInt(currentRef[preSegment]);
|
142
162
|
break;
|
143
|
-
case
|
163
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE:
|
144
164
|
currentRef[preSegment] = new Date(currentRef[preSegment] ?? "Invalid Date");
|
145
165
|
break;
|
146
|
-
case
|
166
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN:
|
147
167
|
currentRef[preSegment] = Number.NaN;
|
148
168
|
break;
|
149
|
-
case
|
169
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED:
|
150
170
|
currentRef[preSegment] = void 0;
|
151
171
|
break;
|
152
|
-
case
|
172
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL:
|
153
173
|
currentRef[preSegment] = new URL(currentRef[preSegment]);
|
154
174
|
break;
|
155
|
-
case
|
175
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP: {
|
156
176
|
const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
|
157
177
|
currentRef[preSegment] = new RegExp(pattern, flags);
|
158
178
|
break;
|
159
179
|
}
|
160
|
-
case
|
180
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET:
|
161
181
|
currentRef[preSegment] = new Set(currentRef[preSegment]);
|
162
182
|
break;
|
163
|
-
case
|
183
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP:
|
164
184
|
currentRef[preSegment] = new Map(currentRef[preSegment]);
|
165
185
|
break;
|
166
186
|
}
|
@@ -169,6 +189,13 @@ class RPCJsonSerializer {
|
|
169
189
|
}
|
170
190
|
}
|
171
191
|
|
192
|
+
function toHttpPath(path) {
|
193
|
+
return `/${path.map(encodeURIComponent).join("/")}`;
|
194
|
+
}
|
195
|
+
function getMalformedResponseErrorCode(status) {
|
196
|
+
return Object.entries(COMMON_ORPC_ERROR_DEFS).find(([, def]) => def.status === status)?.[0] ?? "MALFORMED_ORPC_ERROR_RESPONSE";
|
197
|
+
}
|
198
|
+
|
172
199
|
class StandardRPCLinkCodec {
|
173
200
|
constructor(serializer, options) {
|
174
201
|
this.serializer = serializer;
|
@@ -185,14 +212,18 @@ class StandardRPCLinkCodec {
|
|
185
212
|
headers;
|
186
213
|
async encode(path, input, options) {
|
187
214
|
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
188
|
-
|
215
|
+
let headers = await value(this.headers, options, path, input);
|
189
216
|
const baseUrl = await value(this.baseUrl, options, path, input);
|
190
|
-
const url = new URL(
|
217
|
+
const url = new URL(baseUrl);
|
218
|
+
url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
|
219
|
+
if (options.lastEventId !== void 0) {
|
220
|
+
headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
|
221
|
+
}
|
191
222
|
const serialized = this.serializer.serialize(input);
|
192
|
-
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !
|
223
|
+
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
193
224
|
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
194
225
|
const getUrl = new URL(url);
|
195
|
-
getUrl.searchParams.append("data", stringifyJSON(serialized)
|
226
|
+
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
196
227
|
if (getUrl.toString().length <= maxUrlLength) {
|
197
228
|
return {
|
198
229
|
body: void 0,
|
@@ -212,7 +243,7 @@ class StandardRPCLinkCodec {
|
|
212
243
|
};
|
213
244
|
}
|
214
245
|
async decode(response) {
|
215
|
-
const isOk = response.status
|
246
|
+
const isOk = !isORPCErrorStatus(response.status);
|
216
247
|
const deserialized = await (async () => {
|
217
248
|
let isBodyOk = false;
|
218
249
|
try {
|
@@ -231,19 +262,20 @@ class StandardRPCLinkCodec {
|
|
231
262
|
}
|
232
263
|
})();
|
233
264
|
if (!isOk) {
|
234
|
-
if (
|
235
|
-
throw
|
265
|
+
if (isORPCErrorJson(deserialized)) {
|
266
|
+
throw createORPCErrorFromJson(deserialized);
|
236
267
|
}
|
237
|
-
throw new
|
238
|
-
|
268
|
+
throw new ORPCError(getMalformedResponseErrorCode(response.status), {
|
269
|
+
status: response.status,
|
270
|
+
data: { ...response, body: deserialized }
|
239
271
|
});
|
240
272
|
}
|
241
273
|
return deserialized;
|
242
274
|
}
|
243
275
|
}
|
244
276
|
|
245
|
-
class
|
246
|
-
constructor(jsonSerializer
|
277
|
+
class StandardRPCSerializer {
|
278
|
+
constructor(jsonSerializer) {
|
247
279
|
this.jsonSerializer = jsonSerializer;
|
248
280
|
}
|
249
281
|
serialize(data) {
|
@@ -261,9 +293,6 @@ class RPCSerializer {
|
|
261
293
|
return this.#serialize(data, true);
|
262
294
|
}
|
263
295
|
#serialize(data, enableFormData) {
|
264
|
-
if (data === void 0 || data instanceof Blob) {
|
265
|
-
return data;
|
266
|
-
}
|
267
296
|
const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
|
268
297
|
const meta = meta_.length === 0 ? void 0 : meta_;
|
269
298
|
if (!enableFormData || blobs.length === 0) {
|
@@ -288,8 +317,8 @@ class RPCSerializer {
|
|
288
317
|
return e;
|
289
318
|
}
|
290
319
|
const deserialized = this.#deserialize(e.data);
|
291
|
-
if (
|
292
|
-
return
|
320
|
+
if (isORPCErrorJson(deserialized)) {
|
321
|
+
return createORPCErrorFromJson(deserialized, { cause: e });
|
293
322
|
}
|
294
323
|
return new ErrorEvent({
|
295
324
|
data: deserialized,
|
@@ -301,9 +330,6 @@ class RPCSerializer {
|
|
301
330
|
return this.#deserialize(data);
|
302
331
|
}
|
303
332
|
#deserialize(data) {
|
304
|
-
if (data === void 0 || data instanceof Blob) {
|
305
|
-
return data;
|
306
|
-
}
|
307
333
|
if (!(data instanceof FormData)) {
|
308
334
|
return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
|
309
335
|
}
|
@@ -317,4 +343,13 @@ class RPCSerializer {
|
|
317
343
|
}
|
318
344
|
}
|
319
345
|
|
320
|
-
|
346
|
+
class StandardRPCLink extends StandardLink {
|
347
|
+
constructor(linkClient, options) {
|
348
|
+
const jsonSerializer = new StandardRPCJsonSerializer(options);
|
349
|
+
const serializer = new StandardRPCSerializer(jsonSerializer);
|
350
|
+
const linkCodec = new StandardRPCLinkCodec(serializer, options);
|
351
|
+
super(linkCodec, linkClient, options);
|
352
|
+
}
|
353
|
+
}
|
354
|
+
|
355
|
+
export { CompositeStandardLinkPlugin as C, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLink as c, StandardRPCLinkCodec as d, StandardRPCSerializer as e, getMalformedResponseErrorCode as g, toHttpPath as t };
|
@@ -0,0 +1,46 @@
|
|
1
|
+
import { Interceptor, ThrowableError } from '@orpc/shared';
|
2
|
+
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
+
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.4TS_0JaO.mjs';
|
4
|
+
|
5
|
+
interface StandardLinkPlugin<T extends ClientContext> {
|
6
|
+
order?: number;
|
7
|
+
init?(options: StandardLinkOptions<T>): void;
|
8
|
+
}
|
9
|
+
declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
|
10
|
+
protected readonly plugins: TPlugin[];
|
11
|
+
constructor(plugins?: readonly TPlugin[]);
|
12
|
+
init(options: StandardLinkOptions<T>): void;
|
13
|
+
}
|
14
|
+
|
15
|
+
interface StandardLinkCodec<T extends ClientContext> {
|
16
|
+
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
17
|
+
decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
|
18
|
+
}
|
19
|
+
interface StandardLinkClient<T extends ClientContext> {
|
20
|
+
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
21
|
+
}
|
22
|
+
|
23
|
+
interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
|
24
|
+
path: readonly string[];
|
25
|
+
input: unknown;
|
26
|
+
}
|
27
|
+
interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
28
|
+
request: StandardRequest;
|
29
|
+
}
|
30
|
+
interface StandardLinkOptions<T extends ClientContext> {
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown, ThrowableError>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse, ThrowableError>[];
|
33
|
+
plugins?: StandardLinkPlugin<T>[];
|
34
|
+
}
|
35
|
+
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
36
|
+
#private;
|
37
|
+
readonly codec: StandardLinkCodec<T>;
|
38
|
+
readonly sender: StandardLinkClient<T>;
|
39
|
+
private readonly interceptors;
|
40
|
+
private readonly clientInterceptors;
|
41
|
+
constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
|
42
|
+
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
43
|
+
}
|
44
|
+
|
45
|
+
export { CompositeStandardLinkPlugin as C, StandardLink as d };
|
46
|
+
export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };
|
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.b47b94e",
|
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",
|
@@ -28,15 +33,21 @@
|
|
28
33
|
"types": "./dist/adapters/fetch/index.d.mts",
|
29
34
|
"import": "./dist/adapters/fetch/index.mjs",
|
30
35
|
"default": "./dist/adapters/fetch/index.mjs"
|
36
|
+
},
|
37
|
+
"./websocket": {
|
38
|
+
"types": "./dist/adapters/websocket/index.d.mts",
|
39
|
+
"import": "./dist/adapters/websocket/index.mjs",
|
40
|
+
"default": "./dist/adapters/websocket/index.mjs"
|
31
41
|
}
|
32
42
|
},
|
33
43
|
"files": [
|
34
44
|
"dist"
|
35
45
|
],
|
36
46
|
"dependencies": {
|
37
|
-
"@orpc/shared": "0.0.0-next.
|
38
|
-
"@orpc/standard-server": "0.0.0-next.
|
39
|
-
"@orpc/standard-server
|
47
|
+
"@orpc/shared": "0.0.0-next.b47b94e",
|
48
|
+
"@orpc/standard-server-fetch": "0.0.0-next.b47b94e",
|
49
|
+
"@orpc/standard-server": "0.0.0-next.b47b94e",
|
50
|
+
"@orpc/standard-server-peer": "0.0.0-next.b47b94e"
|
40
51
|
},
|
41
52
|
"devDependencies": {
|
42
53
|
"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 };
|
@@ -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 };
|