@orpc/client 0.0.0-next.e563486 → 0.0.0-next.e565b64
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 +23 -17
- package/dist/adapters/fetch/index.d.mts +16 -13
- package/dist/adapters/fetch/index.d.ts +16 -13
- package/dist/adapters/fetch/index.mjs +5 -13
- package/dist/adapters/message-port/index.d.mts +59 -0
- package/dist/adapters/message-port/index.d.ts +59 -0
- package/dist/adapters/message-port/index.mjs +71 -0
- package/dist/adapters/standard/index.d.mts +8 -103
- package/dist/adapters/standard/index.d.ts +8 -103
- package/dist/adapters/standard/index.mjs +2 -3
- 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 +32 -13
- package/dist/index.d.ts +32 -13
- package/dist/index.mjs +34 -32
- package/dist/plugins/index.d.mts +125 -25
- package/dist/plugins/index.d.ts +125 -25
- package/dist/plugins/index.mjs +214 -50
- package/dist/shared/client.4TS_0JaO.d.mts +29 -0
- package/dist/shared/client.4TS_0JaO.d.ts +29 -0
- package/dist/shared/client.7UM0t5o-.d.ts +91 -0
- package/dist/shared/client.BMoG_EdN.d.mts +46 -0
- package/dist/shared/client.BdD8cpjs.d.mts +91 -0
- package/dist/shared/client.C0KbSWlC.d.ts +46 -0
- package/dist/shared/{client.BacCdg3F.mjs → client.CRWEpqLB.mjs} +22 -19
- package/dist/shared/{client.CjUckqXO.mjs → client.DpICn1BD.mjs} +54 -36
- package/package.json +16 -5
- package/dist/shared/client.CupM8eRP.d.mts +0 -30
- package/dist/shared/client.CupM8eRP.d.ts +0 -30
- package/dist/shared/client.CvnV7_uV.mjs +0 -12
- package/dist/shared/client.DrOAzyMB.d.mts +0 -45
- package/dist/shared/client.aGal-uGY.d.ts +0 -45
@@ -0,0 +1,46 @@
|
|
1
|
+
import { Interceptor } 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>, Promise<unknown>>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
|
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 };
|
@@ -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.BMoG_EdN.mjs';
|
3
|
+
import { Segment, Value, Promisable } 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<Promisable<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<Promisable<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<Promisable<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<Promisable<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 };
|
@@ -0,0 +1,46 @@
|
|
1
|
+
import { Interceptor } 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.js';
|
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>, Promise<unknown>>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
|
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 };
|
@@ -91,8 +91,8 @@ class ORPCError extends Error {
|
|
91
91
|
status;
|
92
92
|
data;
|
93
93
|
constructor(code, ...[options]) {
|
94
|
-
if (options?.status && (options.status
|
95
|
-
throw new Error("[ORPCError]
|
94
|
+
if (options?.status && !isORPCErrorStatus(options.status)) {
|
95
|
+
throw new Error("[ORPCError] Invalid error status code.");
|
96
96
|
}
|
97
97
|
const message = fallbackORPCErrorMessage(code, options?.message);
|
98
98
|
super(message, options);
|
@@ -110,22 +110,6 @@ class ORPCError extends Error {
|
|
110
110
|
data: this.data
|
111
111
|
};
|
112
112
|
}
|
113
|
-
static fromJSON(json, options) {
|
114
|
-
return new ORPCError(json.code, {
|
115
|
-
...options,
|
116
|
-
...json
|
117
|
-
});
|
118
|
-
}
|
119
|
-
static isValidJSON(json) {
|
120
|
-
if (!isObject(json)) {
|
121
|
-
return false;
|
122
|
-
}
|
123
|
-
const validKeys = ["defined", "code", "status", "message", "data"];
|
124
|
-
if (Object.keys(json).some((k) => !validKeys.includes(k))) {
|
125
|
-
return false;
|
126
|
-
}
|
127
|
-
return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && "message" in json && typeof json.message === "string";
|
128
|
-
}
|
129
113
|
}
|
130
114
|
function isDefinedError(error) {
|
131
115
|
return error instanceof ORPCError && error.defined;
|
@@ -136,6 +120,25 @@ function toORPCError(error) {
|
|
136
120
|
cause: error
|
137
121
|
});
|
138
122
|
}
|
123
|
+
function isORPCErrorStatus(status) {
|
124
|
+
return status < 200 || status >= 400;
|
125
|
+
}
|
126
|
+
function isORPCErrorJson(json) {
|
127
|
+
if (!isObject(json)) {
|
128
|
+
return false;
|
129
|
+
}
|
130
|
+
const validKeys = ["defined", "code", "status", "message", "data"];
|
131
|
+
if (Object.keys(json).some((k) => !validKeys.includes(k))) {
|
132
|
+
return false;
|
133
|
+
}
|
134
|
+
return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && isORPCErrorStatus(json.status) && "message" in json && typeof json.message === "string";
|
135
|
+
}
|
136
|
+
function createORPCErrorFromJson(json, options = {}) {
|
137
|
+
return new ORPCError(json.code, {
|
138
|
+
...options,
|
139
|
+
...json
|
140
|
+
});
|
141
|
+
}
|
139
142
|
|
140
143
|
function mapEventIterator(iterator, maps) {
|
141
144
|
return async function* () {
|
@@ -169,4 +172,4 @@ function mapEventIterator(iterator, maps) {
|
|
169
172
|
}();
|
170
173
|
}
|
171
174
|
|
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 };
|
175
|
+
export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, isORPCErrorJson as c, createORPCErrorFromJson as d, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
|
@@ -1,23 +1,32 @@
|
|
1
|
-
import { intercept, isObject, value,
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
import { O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.BacCdg3F.mjs';
|
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';
|
5
4
|
|
6
|
-
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
|
+
}
|
7
15
|
}
|
16
|
+
|
8
17
|
class StandardLink {
|
9
18
|
constructor(codec, sender, options = {}) {
|
10
19
|
this.codec = codec;
|
11
20
|
this.sender = sender;
|
12
|
-
const plugin = new
|
21
|
+
const plugin = new CompositeStandardLinkPlugin(options.plugins);
|
13
22
|
plugin.init(options);
|
14
|
-
this.interceptors = options.interceptors
|
15
|
-
this.clientInterceptors = options.clientInterceptors
|
23
|
+
this.interceptors = toArray(options.interceptors);
|
24
|
+
this.clientInterceptors = toArray(options.clientInterceptors);
|
16
25
|
}
|
17
26
|
interceptors;
|
18
27
|
clientInterceptors;
|
19
28
|
call(path, input, options) {
|
20
|
-
return intercept(this.interceptors, { path, input
|
29
|
+
return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
|
21
30
|
const output = await this.#call(path2, input2, options2);
|
22
31
|
return output;
|
23
32
|
});
|
@@ -26,8 +35,8 @@ class StandardLink {
|
|
26
35
|
const request = await this.codec.encode(path, input, options);
|
27
36
|
const response = await intercept(
|
28
37
|
this.clientInterceptors,
|
29
|
-
{ request },
|
30
|
-
({ 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)
|
31
40
|
);
|
32
41
|
const output = await this.codec.decode(response, options, path, input);
|
33
42
|
return output;
|
@@ -111,6 +120,9 @@ class StandardRPCJsonSerializer {
|
|
111
120
|
if (isObject(data)) {
|
112
121
|
const json = {};
|
113
122
|
for (const k in data) {
|
123
|
+
if (k === "toJSON" && typeof data[k] === "function") {
|
124
|
+
continue;
|
125
|
+
}
|
114
126
|
json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
|
115
127
|
}
|
116
128
|
return [json, meta, maps, blobs];
|
@@ -177,6 +189,13 @@ class StandardRPCJsonSerializer {
|
|
177
189
|
}
|
178
190
|
}
|
179
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
|
+
|
180
199
|
class StandardRPCLinkCodec {
|
181
200
|
constructor(serializer, options) {
|
182
201
|
this.serializer = serializer;
|
@@ -193,23 +212,18 @@ class StandardRPCLinkCodec {
|
|
193
212
|
headers;
|
194
213
|
async encode(path, input, options) {
|
195
214
|
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
196
|
-
|
215
|
+
let headers = await value(this.headers, options, path, input);
|
197
216
|
const baseUrl = await value(this.baseUrl, options, path, input);
|
198
|
-
const url = new URL(
|
217
|
+
const url = new URL(baseUrl);
|
218
|
+
url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
|
199
219
|
if (options.lastEventId !== void 0) {
|
200
|
-
|
201
|
-
headers["last-event-id"] = [...headers["last-event-id"], options.lastEventId];
|
202
|
-
} else if (headers["last-event-id"] !== void 0) {
|
203
|
-
headers["last-event-id"] = [headers["last-event-id"], options.lastEventId];
|
204
|
-
} else {
|
205
|
-
headers["last-event-id"] = options.lastEventId;
|
206
|
-
}
|
220
|
+
headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
|
207
221
|
}
|
208
222
|
const serialized = this.serializer.serialize(input);
|
209
|
-
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !
|
223
|
+
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
210
224
|
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
211
225
|
const getUrl = new URL(url);
|
212
|
-
getUrl.searchParams.append("data", stringifyJSON(serialized)
|
226
|
+
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
213
227
|
if (getUrl.toString().length <= maxUrlLength) {
|
214
228
|
return {
|
215
229
|
body: void 0,
|
@@ -229,7 +243,7 @@ class StandardRPCLinkCodec {
|
|
229
243
|
};
|
230
244
|
}
|
231
245
|
async decode(response) {
|
232
|
-
const isOk = response.status
|
246
|
+
const isOk = !isORPCErrorStatus(response.status);
|
233
247
|
const deserialized = await (async () => {
|
234
248
|
let isBodyOk = false;
|
235
249
|
try {
|
@@ -248,11 +262,12 @@ class StandardRPCLinkCodec {
|
|
248
262
|
}
|
249
263
|
})();
|
250
264
|
if (!isOk) {
|
251
|
-
if (
|
252
|
-
throw
|
265
|
+
if (isORPCErrorJson(deserialized)) {
|
266
|
+
throw createORPCErrorFromJson(deserialized);
|
253
267
|
}
|
254
|
-
throw new
|
255
|
-
|
268
|
+
throw new ORPCError(getMalformedResponseErrorCode(response.status), {
|
269
|
+
status: response.status,
|
270
|
+
data: { ...response, body: deserialized }
|
256
271
|
});
|
257
272
|
}
|
258
273
|
return deserialized;
|
@@ -278,9 +293,6 @@ class StandardRPCSerializer {
|
|
278
293
|
return this.#serialize(data, true);
|
279
294
|
}
|
280
295
|
#serialize(data, enableFormData) {
|
281
|
-
if (data === void 0 || data instanceof Blob) {
|
282
|
-
return data;
|
283
|
-
}
|
284
296
|
const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
|
285
297
|
const meta = meta_.length === 0 ? void 0 : meta_;
|
286
298
|
if (!enableFormData || blobs.length === 0) {
|
@@ -305,8 +317,8 @@ class StandardRPCSerializer {
|
|
305
317
|
return e;
|
306
318
|
}
|
307
319
|
const deserialized = this.#deserialize(e.data);
|
308
|
-
if (
|
309
|
-
return
|
320
|
+
if (isORPCErrorJson(deserialized)) {
|
321
|
+
return createORPCErrorFromJson(deserialized, { cause: e });
|
310
322
|
}
|
311
323
|
return new ErrorEvent({
|
312
324
|
data: deserialized,
|
@@ -318,9 +330,6 @@ class StandardRPCSerializer {
|
|
318
330
|
return this.#deserialize(data);
|
319
331
|
}
|
320
332
|
#deserialize(data) {
|
321
|
-
if (data === void 0 || data instanceof Blob) {
|
322
|
-
return data;
|
323
|
-
}
|
324
333
|
if (!(data instanceof FormData)) {
|
325
334
|
return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
|
326
335
|
}
|
@@ -334,4 +343,13 @@ class StandardRPCSerializer {
|
|
334
343
|
}
|
335
344
|
}
|
336
345
|
|
337
|
-
|
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 };
|
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.e565b64",
|
5
5
|
"license": "MIT",
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
7
7
|
"repository": {
|
@@ -33,18 +33,29 @@
|
|
33
33
|
"types": "./dist/adapters/fetch/index.d.mts",
|
34
34
|
"import": "./dist/adapters/fetch/index.mjs",
|
35
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"
|
41
|
+
},
|
42
|
+
"./message-port": {
|
43
|
+
"types": "./dist/adapters/message-port/index.d.mts",
|
44
|
+
"import": "./dist/adapters/message-port/index.mjs",
|
45
|
+
"default": "./dist/adapters/message-port/index.mjs"
|
36
46
|
}
|
37
47
|
},
|
38
48
|
"files": [
|
39
49
|
"dist"
|
40
50
|
],
|
41
51
|
"dependencies": {
|
42
|
-
"@orpc/shared": "0.0.0-next.
|
43
|
-
"@orpc/standard-server": "0.0.0-next.
|
44
|
-
"@orpc/standard-server
|
52
|
+
"@orpc/shared": "0.0.0-next.e565b64",
|
53
|
+
"@orpc/standard-server-fetch": "0.0.0-next.e565b64",
|
54
|
+
"@orpc/standard-server": "0.0.0-next.e565b64",
|
55
|
+
"@orpc/standard-server-peer": "0.0.0-next.e565b64"
|
45
56
|
},
|
46
57
|
"devDependencies": {
|
47
|
-
"zod": "^3.
|
58
|
+
"zod": "^3.25.11"
|
48
59
|
},
|
49
60
|
"scripts": {
|
50
61
|
"build": "unbuild",
|
@@ -1,30 +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
|
-
export type { ClientOptionsOut as C, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientOptions as d, ClientRest as e, Client as f };
|
@@ -1,30 +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
|
-
export type { ClientOptionsOut as C, InferClientContext as I, NestedClient as N, ClientContext as a, ClientLink as b, ClientPromiseResult as c, ClientOptions as d, ClientRest as e, Client as f };
|
@@ -1,45 +0,0 @@
|
|
1
|
-
import { Interceptor } from '@orpc/shared';
|
2
|
-
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
-
import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from './client.CupM8eRP.mjs';
|
4
|
-
|
5
|
-
interface StandardLinkCodec<T extends ClientContext> {
|
6
|
-
encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
|
7
|
-
decode(response: StandardLazyResponse, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<unknown>;
|
8
|
-
}
|
9
|
-
interface StandardLinkClient<T extends ClientContext> {
|
10
|
-
call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
11
|
-
}
|
12
|
-
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
14
|
-
}
|
15
|
-
interface StandardLinkOptions<T extends ClientContext> {
|
16
|
-
interceptors?: Interceptor<{
|
17
|
-
path: readonly string[];
|
18
|
-
input: unknown;
|
19
|
-
options: ClientOptionsOut<T>;
|
20
|
-
}, unknown, unknown>[];
|
21
|
-
clientInterceptors?: Interceptor<{
|
22
|
-
request: StandardRequest;
|
23
|
-
}, StandardLazyResponse, unknown>[];
|
24
|
-
plugins?: ClientPlugin<T>[];
|
25
|
-
}
|
26
|
-
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
27
|
-
#private;
|
28
|
-
readonly codec: StandardLinkCodec<T>;
|
29
|
-
readonly sender: StandardLinkClient<T>;
|
30
|
-
private readonly interceptors;
|
31
|
-
private readonly clientInterceptors;
|
32
|
-
constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
|
33
|
-
call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
|
34
|
-
}
|
35
|
-
|
36
|
-
interface ClientPlugin<T extends ClientContext> {
|
37
|
-
init?(options: StandardLinkOptions<T>): void;
|
38
|
-
}
|
39
|
-
declare class CompositeClientPlugin<T extends ClientContext> implements ClientPlugin<T> {
|
40
|
-
private readonly plugins;
|
41
|
-
constructor(plugins?: ClientPlugin<T>[]);
|
42
|
-
init(options: StandardLinkOptions<T>): void;
|
43
|
-
}
|
44
|
-
|
45
|
-
export { type ClientPlugin as C, InvalidEventIteratorRetryResponse as I, type StandardLinkOptions as S, CompositeClientPlugin as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
|
@@ -1,45 +0,0 @@
|
|
1
|
-
import { Interceptor } from '@orpc/shared';
|
2
|
-
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
-
import { a as ClientContext, C as ClientOptionsOut, b as ClientLink } from './client.CupM8eRP.js';
|
4
|
-
|
5
|
-
interface StandardLinkCodec<T extends ClientContext> {
|
6
|
-
encode(path: readonly string[], input: unknown, options: ClientOptionsOut<any>): Promise<StandardRequest>;
|
7
|
-
decode(response: StandardLazyResponse, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<unknown>;
|
8
|
-
}
|
9
|
-
interface StandardLinkClient<T extends ClientContext> {
|
10
|
-
call(request: StandardRequest, options: ClientOptionsOut<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
11
|
-
}
|
12
|
-
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
14
|
-
}
|
15
|
-
interface StandardLinkOptions<T extends ClientContext> {
|
16
|
-
interceptors?: Interceptor<{
|
17
|
-
path: readonly string[];
|
18
|
-
input: unknown;
|
19
|
-
options: ClientOptionsOut<T>;
|
20
|
-
}, unknown, unknown>[];
|
21
|
-
clientInterceptors?: Interceptor<{
|
22
|
-
request: StandardRequest;
|
23
|
-
}, StandardLazyResponse, unknown>[];
|
24
|
-
plugins?: ClientPlugin<T>[];
|
25
|
-
}
|
26
|
-
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
27
|
-
#private;
|
28
|
-
readonly codec: StandardLinkCodec<T>;
|
29
|
-
readonly sender: StandardLinkClient<T>;
|
30
|
-
private readonly interceptors;
|
31
|
-
private readonly clientInterceptors;
|
32
|
-
constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
|
33
|
-
call(path: readonly string[], input: unknown, options: ClientOptionsOut<T>): Promise<unknown>;
|
34
|
-
}
|
35
|
-
|
36
|
-
interface ClientPlugin<T extends ClientContext> {
|
37
|
-
init?(options: StandardLinkOptions<T>): void;
|
38
|
-
}
|
39
|
-
declare class CompositeClientPlugin<T extends ClientContext> implements ClientPlugin<T> {
|
40
|
-
private readonly plugins;
|
41
|
-
constructor(plugins?: ClientPlugin<T>[]);
|
42
|
-
init(options: StandardLinkOptions<T>): void;
|
43
|
-
}
|
44
|
-
|
45
|
-
export { type ClientPlugin as C, InvalidEventIteratorRetryResponse as I, type StandardLinkOptions as S, CompositeClientPlugin as a, type StandardLinkClient as b, type StandardLinkCodec as c, StandardLink as d };
|