@orpc/client 0.0.0-next.9e880d7 → 0.0.0-next.9f70405
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 +22 -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/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 +36 -23
- package/dist/index.d.ts +36 -23
- package/dist/index.mjs +34 -32
- package/dist/plugins/index.d.mts +124 -24
- package/dist/plugins/index.d.ts +124 -24
- 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.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.cZd8JfIk.mjs → client.DpICn1BD.mjs} +56 -64
- package/dist/shared/client.ds1abV85.d.mts +46 -0
- package/package.json +10 -4
- package/dist/shared/client.45nqoGFI.d.mts +0 -42
- package/dist/shared/client.45nqoGFI.d.ts +0 -42
- package/dist/shared/client.CS0uVV6J.d.mts +0 -81
- package/dist/shared/client.CmE0kcXu.d.ts +0 -81
- package/dist/shared/client.CvnV7_uV.mjs +0 -12
- package/dist/shared/client.XAn8cDTM.mjs +0 -266
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { isObject, isTypescriptObject } from '@orpc/shared';
|
|
2
|
+
import { getEventMeta, withEventMeta } from '@orpc/standard-server';
|
|
3
|
+
|
|
4
|
+
const COMMON_ORPC_ERROR_DEFS = {
|
|
5
|
+
BAD_REQUEST: {
|
|
6
|
+
status: 400,
|
|
7
|
+
message: "Bad Request"
|
|
8
|
+
},
|
|
9
|
+
UNAUTHORIZED: {
|
|
10
|
+
status: 401,
|
|
11
|
+
message: "Unauthorized"
|
|
12
|
+
},
|
|
13
|
+
FORBIDDEN: {
|
|
14
|
+
status: 403,
|
|
15
|
+
message: "Forbidden"
|
|
16
|
+
},
|
|
17
|
+
NOT_FOUND: {
|
|
18
|
+
status: 404,
|
|
19
|
+
message: "Not Found"
|
|
20
|
+
},
|
|
21
|
+
METHOD_NOT_SUPPORTED: {
|
|
22
|
+
status: 405,
|
|
23
|
+
message: "Method Not Supported"
|
|
24
|
+
},
|
|
25
|
+
NOT_ACCEPTABLE: {
|
|
26
|
+
status: 406,
|
|
27
|
+
message: "Not Acceptable"
|
|
28
|
+
},
|
|
29
|
+
TIMEOUT: {
|
|
30
|
+
status: 408,
|
|
31
|
+
message: "Request Timeout"
|
|
32
|
+
},
|
|
33
|
+
CONFLICT: {
|
|
34
|
+
status: 409,
|
|
35
|
+
message: "Conflict"
|
|
36
|
+
},
|
|
37
|
+
PRECONDITION_FAILED: {
|
|
38
|
+
status: 412,
|
|
39
|
+
message: "Precondition Failed"
|
|
40
|
+
},
|
|
41
|
+
PAYLOAD_TOO_LARGE: {
|
|
42
|
+
status: 413,
|
|
43
|
+
message: "Payload Too Large"
|
|
44
|
+
},
|
|
45
|
+
UNSUPPORTED_MEDIA_TYPE: {
|
|
46
|
+
status: 415,
|
|
47
|
+
message: "Unsupported Media Type"
|
|
48
|
+
},
|
|
49
|
+
UNPROCESSABLE_CONTENT: {
|
|
50
|
+
status: 422,
|
|
51
|
+
message: "Unprocessable Content"
|
|
52
|
+
},
|
|
53
|
+
TOO_MANY_REQUESTS: {
|
|
54
|
+
status: 429,
|
|
55
|
+
message: "Too Many Requests"
|
|
56
|
+
},
|
|
57
|
+
CLIENT_CLOSED_REQUEST: {
|
|
58
|
+
status: 499,
|
|
59
|
+
message: "Client Closed Request"
|
|
60
|
+
},
|
|
61
|
+
INTERNAL_SERVER_ERROR: {
|
|
62
|
+
status: 500,
|
|
63
|
+
message: "Internal Server Error"
|
|
64
|
+
},
|
|
65
|
+
NOT_IMPLEMENTED: {
|
|
66
|
+
status: 501,
|
|
67
|
+
message: "Not Implemented"
|
|
68
|
+
},
|
|
69
|
+
BAD_GATEWAY: {
|
|
70
|
+
status: 502,
|
|
71
|
+
message: "Bad Gateway"
|
|
72
|
+
},
|
|
73
|
+
SERVICE_UNAVAILABLE: {
|
|
74
|
+
status: 503,
|
|
75
|
+
message: "Service Unavailable"
|
|
76
|
+
},
|
|
77
|
+
GATEWAY_TIMEOUT: {
|
|
78
|
+
status: 504,
|
|
79
|
+
message: "Gateway Timeout"
|
|
80
|
+
}
|
|
81
|
+
};
|
|
82
|
+
function fallbackORPCErrorStatus(code, status) {
|
|
83
|
+
return status ?? COMMON_ORPC_ERROR_DEFS[code]?.status ?? 500;
|
|
84
|
+
}
|
|
85
|
+
function fallbackORPCErrorMessage(code, message) {
|
|
86
|
+
return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
|
|
87
|
+
}
|
|
88
|
+
class ORPCError extends Error {
|
|
89
|
+
defined;
|
|
90
|
+
code;
|
|
91
|
+
status;
|
|
92
|
+
data;
|
|
93
|
+
constructor(code, ...[options]) {
|
|
94
|
+
if (options?.status && !isORPCErrorStatus(options.status)) {
|
|
95
|
+
throw new Error("[ORPCError] Invalid error status code.");
|
|
96
|
+
}
|
|
97
|
+
const message = fallbackORPCErrorMessage(code, options?.message);
|
|
98
|
+
super(message, options);
|
|
99
|
+
this.code = code;
|
|
100
|
+
this.status = fallbackORPCErrorStatus(code, options?.status);
|
|
101
|
+
this.defined = options?.defined ?? false;
|
|
102
|
+
this.data = options?.data;
|
|
103
|
+
}
|
|
104
|
+
toJSON() {
|
|
105
|
+
return {
|
|
106
|
+
defined: this.defined,
|
|
107
|
+
code: this.code,
|
|
108
|
+
status: this.status,
|
|
109
|
+
message: this.message,
|
|
110
|
+
data: this.data
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
function isDefinedError(error) {
|
|
115
|
+
return error instanceof ORPCError && error.defined;
|
|
116
|
+
}
|
|
117
|
+
function toORPCError(error) {
|
|
118
|
+
return error instanceof ORPCError ? error : new ORPCError("INTERNAL_SERVER_ERROR", {
|
|
119
|
+
message: "Internal server error",
|
|
120
|
+
cause: error
|
|
121
|
+
});
|
|
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
|
+
}
|
|
142
|
+
|
|
143
|
+
function mapEventIterator(iterator, maps) {
|
|
144
|
+
return async function* () {
|
|
145
|
+
try {
|
|
146
|
+
while (true) {
|
|
147
|
+
const { done, value } = await iterator.next();
|
|
148
|
+
let mappedValue = await maps.value(value, done);
|
|
149
|
+
if (mappedValue !== value) {
|
|
150
|
+
const meta = getEventMeta(value);
|
|
151
|
+
if (meta && isTypescriptObject(mappedValue)) {
|
|
152
|
+
mappedValue = withEventMeta(mappedValue, meta);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (done) {
|
|
156
|
+
return mappedValue;
|
|
157
|
+
}
|
|
158
|
+
yield mappedValue;
|
|
159
|
+
}
|
|
160
|
+
} catch (error) {
|
|
161
|
+
let mappedError = await maps.error(error);
|
|
162
|
+
if (mappedError !== error) {
|
|
163
|
+
const meta = getEventMeta(error);
|
|
164
|
+
if (meta && isTypescriptObject(mappedError)) {
|
|
165
|
+
mappedError = withEventMeta(mappedError, meta);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
throw mappedError;
|
|
169
|
+
} finally {
|
|
170
|
+
await iterator.return?.();
|
|
171
|
+
}
|
|
172
|
+
}();
|
|
173
|
+
}
|
|
174
|
+
|
|
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 };
|
|
@@ -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,59 +1,42 @@
|
|
|
1
|
-
import { intercept,
|
|
2
|
-
import {
|
|
3
|
-
import { C as
|
|
4
|
-
import { ErrorEvent } from '@orpc/standard-server';
|
|
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
|
-
constructor(codec, sender, options) {
|
|
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.
|
|
15
|
-
this.
|
|
16
|
-
this.eventIteratorShouldRetry = options.eventIteratorShouldRetry ?? true;
|
|
17
|
-
this.interceptors = options.interceptors ?? [];
|
|
18
|
-
this.clientInterceptors = options.clientInterceptors ?? [];
|
|
23
|
+
this.interceptors = toArray(options.interceptors);
|
|
24
|
+
this.clientInterceptors = toArray(options.clientInterceptors);
|
|
19
25
|
}
|
|
20
|
-
eventIteratorMaxRetries;
|
|
21
|
-
eventIteratorRetryDelay;
|
|
22
|
-
eventIteratorShouldRetry;
|
|
23
26
|
interceptors;
|
|
24
27
|
clientInterceptors;
|
|
25
28
|
call(path, input, options) {
|
|
26
|
-
return intercept(this.interceptors, { path, input
|
|
29
|
+
return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
|
|
27
30
|
const output = await this.#call(path2, input2, options2);
|
|
28
|
-
|
|
29
|
-
return output;
|
|
30
|
-
}
|
|
31
|
-
return createAutoRetryEventIterator(output, async (reconnectOptions) => {
|
|
32
|
-
const maxRetries = await value(this.eventIteratorMaxRetries, reconnectOptions, options2, path2, input2);
|
|
33
|
-
if (options2.signal?.aborted || reconnectOptions.retryTimes > maxRetries) {
|
|
34
|
-
return null;
|
|
35
|
-
}
|
|
36
|
-
const shouldRetry = await value(this.eventIteratorShouldRetry, reconnectOptions, options2, path2, input2);
|
|
37
|
-
if (!shouldRetry) {
|
|
38
|
-
return null;
|
|
39
|
-
}
|
|
40
|
-
const retryDelay = await value(this.eventIteratorRetryDelay, reconnectOptions, options2, path2, input2);
|
|
41
|
-
await new Promise((resolve) => setTimeout(resolve, retryDelay));
|
|
42
|
-
const updatedOptions = { ...options2, lastEventId: reconnectOptions.lastEventId };
|
|
43
|
-
const maybeIterator = await this.#call(path2, input2, updatedOptions);
|
|
44
|
-
if (!isAsyncIteratorObject(maybeIterator)) {
|
|
45
|
-
throw new InvalidEventIteratorRetryResponse("Invalid Event Iterator retry response");
|
|
46
|
-
}
|
|
47
|
-
return maybeIterator;
|
|
48
|
-
}, options2.lastEventId);
|
|
31
|
+
return output;
|
|
49
32
|
});
|
|
50
33
|
}
|
|
51
34
|
async #call(path, input, options) {
|
|
52
35
|
const request = await this.codec.encode(path, input, options);
|
|
53
36
|
const response = await intercept(
|
|
54
37
|
this.clientInterceptors,
|
|
55
|
-
{ request },
|
|
56
|
-
({ 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)
|
|
57
40
|
);
|
|
58
41
|
const output = await this.codec.decode(response, options, path, input);
|
|
59
42
|
return output;
|
|
@@ -137,6 +120,9 @@ class StandardRPCJsonSerializer {
|
|
|
137
120
|
if (isObject(data)) {
|
|
138
121
|
const json = {};
|
|
139
122
|
for (const k in data) {
|
|
123
|
+
if (k === "toJSON" && typeof data[k] === "function") {
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
140
126
|
json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
|
|
141
127
|
}
|
|
142
128
|
return [json, meta, maps, blobs];
|
|
@@ -203,6 +189,13 @@ class StandardRPCJsonSerializer {
|
|
|
203
189
|
}
|
|
204
190
|
}
|
|
205
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
|
+
|
|
206
199
|
class StandardRPCLinkCodec {
|
|
207
200
|
constructor(serializer, options) {
|
|
208
201
|
this.serializer = serializer;
|
|
@@ -219,23 +212,18 @@ class StandardRPCLinkCodec {
|
|
|
219
212
|
headers;
|
|
220
213
|
async encode(path, input, options) {
|
|
221
214
|
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
|
222
|
-
|
|
215
|
+
let headers = await value(this.headers, options, path, input);
|
|
223
216
|
const baseUrl = await value(this.baseUrl, options, path, input);
|
|
224
|
-
const url = new URL(
|
|
217
|
+
const url = new URL(baseUrl);
|
|
218
|
+
url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
|
|
225
219
|
if (options.lastEventId !== void 0) {
|
|
226
|
-
|
|
227
|
-
headers["last-event-id"] = [...headers["last-event-id"], options.lastEventId];
|
|
228
|
-
} else if (headers["last-event-id"] !== void 0) {
|
|
229
|
-
headers["last-event-id"] = [headers["last-event-id"], options.lastEventId];
|
|
230
|
-
} else {
|
|
231
|
-
headers["last-event-id"] = options.lastEventId;
|
|
232
|
-
}
|
|
220
|
+
headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
|
|
233
221
|
}
|
|
234
222
|
const serialized = this.serializer.serialize(input);
|
|
235
|
-
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !
|
|
223
|
+
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
|
236
224
|
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
|
237
225
|
const getUrl = new URL(url);
|
|
238
|
-
getUrl.searchParams.append("data", stringifyJSON(serialized)
|
|
226
|
+
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
|
239
227
|
if (getUrl.toString().length <= maxUrlLength) {
|
|
240
228
|
return {
|
|
241
229
|
body: void 0,
|
|
@@ -255,7 +243,7 @@ class StandardRPCLinkCodec {
|
|
|
255
243
|
};
|
|
256
244
|
}
|
|
257
245
|
async decode(response) {
|
|
258
|
-
const isOk = response.status
|
|
246
|
+
const isOk = !isORPCErrorStatus(response.status);
|
|
259
247
|
const deserialized = await (async () => {
|
|
260
248
|
let isBodyOk = false;
|
|
261
249
|
try {
|
|
@@ -274,11 +262,12 @@ class StandardRPCLinkCodec {
|
|
|
274
262
|
}
|
|
275
263
|
})();
|
|
276
264
|
if (!isOk) {
|
|
277
|
-
if (
|
|
278
|
-
throw
|
|
265
|
+
if (isORPCErrorJson(deserialized)) {
|
|
266
|
+
throw createORPCErrorFromJson(deserialized);
|
|
279
267
|
}
|
|
280
|
-
throw new
|
|
281
|
-
|
|
268
|
+
throw new ORPCError(getMalformedResponseErrorCode(response.status), {
|
|
269
|
+
status: response.status,
|
|
270
|
+
data: { ...response, body: deserialized }
|
|
282
271
|
});
|
|
283
272
|
}
|
|
284
273
|
return deserialized;
|
|
@@ -304,9 +293,6 @@ class StandardRPCSerializer {
|
|
|
304
293
|
return this.#serialize(data, true);
|
|
305
294
|
}
|
|
306
295
|
#serialize(data, enableFormData) {
|
|
307
|
-
if (data === void 0 || data instanceof Blob) {
|
|
308
|
-
return data;
|
|
309
|
-
}
|
|
310
296
|
const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
|
|
311
297
|
const meta = meta_.length === 0 ? void 0 : meta_;
|
|
312
298
|
if (!enableFormData || blobs.length === 0) {
|
|
@@ -331,8 +317,8 @@ class StandardRPCSerializer {
|
|
|
331
317
|
return e;
|
|
332
318
|
}
|
|
333
319
|
const deserialized = this.#deserialize(e.data);
|
|
334
|
-
if (
|
|
335
|
-
return
|
|
320
|
+
if (isORPCErrorJson(deserialized)) {
|
|
321
|
+
return createORPCErrorFromJson(deserialized, { cause: e });
|
|
336
322
|
}
|
|
337
323
|
return new ErrorEvent({
|
|
338
324
|
data: deserialized,
|
|
@@ -344,9 +330,6 @@ class StandardRPCSerializer {
|
|
|
344
330
|
return this.#deserialize(data);
|
|
345
331
|
}
|
|
346
332
|
#deserialize(data) {
|
|
347
|
-
if (data === void 0 || data instanceof Blob) {
|
|
348
|
-
return data;
|
|
349
|
-
}
|
|
350
333
|
if (!(data instanceof FormData)) {
|
|
351
334
|
return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
|
|
352
335
|
}
|
|
@@ -360,4 +343,13 @@ class StandardRPCSerializer {
|
|
|
360
343
|
}
|
|
361
344
|
}
|
|
362
345
|
|
|
363
|
-
|
|
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.9f70405",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
|
7
7
|
"repository": {
|
|
@@ -33,15 +33,21 @@
|
|
|
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"
|
|
36
41
|
}
|
|
37
42
|
},
|
|
38
43
|
"files": [
|
|
39
44
|
"dist"
|
|
40
45
|
],
|
|
41
46
|
"dependencies": {
|
|
42
|
-
"@orpc/shared": "0.0.0-next.
|
|
43
|
-
"@orpc/standard-server": "0.0.0-next.
|
|
44
|
-
"@orpc/standard-server-fetch": "0.0.0-next.
|
|
47
|
+
"@orpc/shared": "0.0.0-next.9f70405",
|
|
48
|
+
"@orpc/standard-server-peer": "0.0.0-next.9f70405",
|
|
49
|
+
"@orpc/standard-server-fetch": "0.0.0-next.9f70405",
|
|
50
|
+
"@orpc/standard-server": "0.0.0-next.9f70405"
|
|
45
51
|
},
|
|
46
52
|
"devDependencies": {
|
|
47
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 ClientOptionsOut as C, type EventIteratorReconnectOptions as E, type InferClientContext as I, type NestedClient as N, type ClientContext 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 ClientOptionsOut as C, type EventIteratorReconnectOptions as E, type InferClientContext as I, type NestedClient as N, type ClientContext 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 };
|