@orpc/client 0.0.0-next.ce2f84d → 0.0.0-next.cf06e99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/fetch/index.d.mts +4 -4
- package/dist/adapters/fetch/index.d.ts +4 -4
- package/dist/adapters/fetch/index.mjs +4 -7
- package/dist/adapters/standard/index.d.mts +3 -3
- package/dist/adapters/standard/index.d.ts +3 -3
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/index.d.mts +5 -5
- package/dist/index.d.ts +5 -5
- package/dist/index.mjs +2 -2
- package/dist/plugins/index.d.mts +102 -24
- package/dist/plugins/index.d.ts +102 -24
- package/dist/plugins/index.mjs +194 -35
- package/dist/shared/{client.grRbC25r.d.ts → client.Bt2hFtM_.d.mts} +18 -12
- package/dist/shared/{client.jKEwIsRd.mjs → client.CRWEpqLB.mjs} +17 -17
- package/dist/shared/{client.C0lT7w02.d.mts → client.CipPQkhk.d.mts} +6 -7
- package/dist/shared/{client.C0lT7w02.d.ts → client.CipPQkhk.d.ts} +6 -7
- package/dist/shared/{client.Bt94sjrK.d.mts → client.DXvQo1nS.d.mts} +10 -23
- package/dist/shared/{client.D-jrSuDb.d.ts → client.Dc8eXpCj.d.ts} +10 -23
- package/dist/shared/{client.DSPm2IGZ.mjs → client.DpICn1BD.mjs} +32 -14
- package/dist/shared/{client.5813Ufvs.d.mts → client.FvDtk0Vr.d.ts} +18 -12
- package/package.json +4 -4
@@ -1,8 +1,8 @@
|
|
1
1
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
2
2
|
import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
|
3
|
-
import { a as ClientContext, b as ClientOptions } from '../../shared/client.
|
4
|
-
import {
|
5
|
-
import { f as StandardRPCLinkOptions } from '../../shared/client.
|
3
|
+
import { a as ClientContext, b as ClientOptions } from '../../shared/client.CipPQkhk.mjs';
|
4
|
+
import { f as StandardLinkClient } from '../../shared/client.Bt2hFtM_.mjs';
|
5
|
+
import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.DXvQo1nS.mjs';
|
6
6
|
import '@orpc/shared';
|
7
7
|
|
8
8
|
interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
|
@@ -19,7 +19,7 @@ declare class LinkFetchClient<T extends ClientContext> implements StandardLinkCl
|
|
19
19
|
|
20
20
|
interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
|
21
21
|
}
|
22
|
-
declare class RPCLink<T extends ClientContext> extends
|
22
|
+
declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
|
23
23
|
constructor(options: RPCLinkOptions<T>);
|
24
24
|
}
|
25
25
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
2
2
|
import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
|
3
|
-
import { a as ClientContext, b as ClientOptions } from '../../shared/client.
|
4
|
-
import {
|
5
|
-
import { f as StandardRPCLinkOptions } from '../../shared/client.
|
3
|
+
import { a as ClientContext, b as ClientOptions } from '../../shared/client.CipPQkhk.js';
|
4
|
+
import { f as StandardLinkClient } from '../../shared/client.FvDtk0Vr.js';
|
5
|
+
import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Dc8eXpCj.js';
|
6
6
|
import '@orpc/shared';
|
7
7
|
|
8
8
|
interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
|
@@ -19,7 +19,7 @@ declare class LinkFetchClient<T extends ClientContext> implements StandardLinkCl
|
|
19
19
|
|
20
20
|
interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
|
21
21
|
}
|
22
|
-
declare class RPCLink<T extends ClientContext> extends
|
22
|
+
declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
|
23
23
|
constructor(options: RPCLinkOptions<T>);
|
24
24
|
}
|
25
25
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
|
2
|
-
import { S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLinkCodec, d as StandardRPCSerializer } from '../../shared/client.DSPm2IGZ.mjs';
|
3
2
|
import '@orpc/shared';
|
3
|
+
import { c as StandardRPCLink } from '../../shared/client.DpICn1BD.mjs';
|
4
4
|
import '@orpc/standard-server';
|
5
|
-
import '../../shared/client.
|
5
|
+
import '../../shared/client.CRWEpqLB.mjs';
|
6
6
|
|
7
7
|
class LinkFetchClient {
|
8
8
|
fetch;
|
@@ -19,13 +19,10 @@ class LinkFetchClient {
|
|
19
19
|
}
|
20
20
|
}
|
21
21
|
|
22
|
-
class RPCLink extends
|
22
|
+
class RPCLink extends StandardRPCLink {
|
23
23
|
constructor(options) {
|
24
|
-
const jsonSerializer = new StandardRPCJsonSerializer(options);
|
25
|
-
const serializer = new StandardRPCSerializer(jsonSerializer);
|
26
|
-
const linkCodec = new StandardRPCLinkCodec(serializer, options);
|
27
24
|
const linkClient = new LinkFetchClient(options);
|
28
|
-
super(
|
25
|
+
super(linkClient, options);
|
29
26
|
}
|
30
27
|
}
|
31
28
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
export {
|
2
|
-
export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions,
|
3
|
-
import { H as HTTPPath } from '../../shared/client.
|
1
|
+
export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.Bt2hFtM_.mjs';
|
2
|
+
export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.DXvQo1nS.mjs';
|
3
|
+
import { H as HTTPPath } from '../../shared/client.CipPQkhk.mjs';
|
4
4
|
import '@orpc/shared';
|
5
5
|
import '@orpc/standard-server';
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
|
-
export {
|
2
|
-
export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions,
|
3
|
-
import { H as HTTPPath } from '../../shared/client.
|
1
|
+
export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.FvDtk0Vr.js';
|
2
|
+
export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.Dc8eXpCj.js';
|
3
|
+
import { H as HTTPPath } from '../../shared/client.CipPQkhk.js';
|
4
4
|
import '@orpc/shared';
|
5
5
|
import '@orpc/standard-server';
|
6
6
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export {
|
1
|
+
export { C as CompositeStandardLinkPlugin, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLink, d as StandardRPCLinkCodec, e as StandardRPCSerializer, g as getMalformedResponseErrorCode, t as toHttpPath } from '../../shared/client.DpICn1BD.mjs';
|
2
2
|
import '@orpc/shared';
|
3
3
|
import '@orpc/standard-server';
|
4
|
-
import '../../shared/client.
|
4
|
+
import '../../shared/client.CRWEpqLB.mjs';
|
package/dist/index.d.mts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import { N as NestedClient, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.
|
2
|
-
export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.
|
1
|
+
import { N as NestedClient, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.CipPQkhk.mjs';
|
2
|
+
export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.CipPQkhk.mjs';
|
3
3
|
import { Promisable, MaybeOptionalOptions, ThrowableError } from '@orpc/shared';
|
4
4
|
export { Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
|
5
5
|
export { ErrorEvent } from '@orpc/standard-server';
|
@@ -120,13 +120,13 @@ declare class ORPCError<TCode extends ORPCErrorCode, TData> extends Error {
|
|
120
120
|
readonly data: TData;
|
121
121
|
constructor(code: TCode, ...[options]: MaybeOptionalOptions<ORPCErrorOptions<TData>>);
|
122
122
|
toJSON(): ORPCErrorJSON<TCode, TData>;
|
123
|
-
static fromJSON<TCode extends ORPCErrorCode, TData>(json: ORPCErrorJSON<TCode, TData>, options?: ErrorOptions): ORPCError<TCode, TData>;
|
124
|
-
static isValidJSON(json: unknown): json is ORPCErrorJSON<ORPCErrorCode, unknown>;
|
125
123
|
}
|
126
124
|
type ORPCErrorJSON<TCode extends string, TData> = Pick<ORPCError<TCode, TData>, 'defined' | 'code' | 'status' | 'message' | 'data'>;
|
127
125
|
declare function isDefinedError<T>(error: T): error is Extract<T, ORPCError<any, any>>;
|
128
126
|
declare function toORPCError(error: unknown): ORPCError<any, any>;
|
129
127
|
declare function isORPCErrorStatus(status: number): boolean;
|
128
|
+
declare function isORPCErrorJson(json: unknown): json is ORPCErrorJSON<ORPCErrorCode, unknown>;
|
129
|
+
declare function createORPCErrorFromJson<TCode extends ORPCErrorCode, TData>(json: ORPCErrorJSON<TCode, TData>, options?: ErrorOptions): ORPCError<TCode, TData>;
|
130
130
|
|
131
131
|
declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
|
132
132
|
value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
|
@@ -152,4 +152,4 @@ type SafeResult<TOutput, TError> = [error: null, data: TOutput, isDefined: false
|
|
152
152
|
declare function safe<TOutput, TError = ThrowableError>(promise: ClientPromiseResult<TOutput, TError>): Promise<SafeResult<TOutput, TError>>;
|
153
153
|
declare function resolveFriendlyClientOptions<T extends ClientContext>(options: FriendlyClientOptions<T>): ClientOptions<T>;
|
154
154
|
|
155
|
-
export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, isORPCErrorStatus, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };
|
155
|
+
export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, createORPCErrorFromJson, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, isORPCErrorJson, isORPCErrorStatus, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };
|
package/dist/index.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import { N as NestedClient, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.
|
2
|
-
export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.
|
1
|
+
import { N as NestedClient, C as ClientLink, I as InferClientContext, a as ClientContext, b as ClientOptions, c as ClientPromiseResult, F as FriendlyClientOptions } from './shared/client.CipPQkhk.js';
|
2
|
+
export { f as Client, e as ClientRest, d as HTTPMethod, H as HTTPPath } from './shared/client.CipPQkhk.js';
|
3
3
|
import { Promisable, MaybeOptionalOptions, ThrowableError } from '@orpc/shared';
|
4
4
|
export { Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
|
5
5
|
export { ErrorEvent } from '@orpc/standard-server';
|
@@ -120,13 +120,13 @@ declare class ORPCError<TCode extends ORPCErrorCode, TData> extends Error {
|
|
120
120
|
readonly data: TData;
|
121
121
|
constructor(code: TCode, ...[options]: MaybeOptionalOptions<ORPCErrorOptions<TData>>);
|
122
122
|
toJSON(): ORPCErrorJSON<TCode, TData>;
|
123
|
-
static fromJSON<TCode extends ORPCErrorCode, TData>(json: ORPCErrorJSON<TCode, TData>, options?: ErrorOptions): ORPCError<TCode, TData>;
|
124
|
-
static isValidJSON(json: unknown): json is ORPCErrorJSON<ORPCErrorCode, unknown>;
|
125
123
|
}
|
126
124
|
type ORPCErrorJSON<TCode extends string, TData> = Pick<ORPCError<TCode, TData>, 'defined' | 'code' | 'status' | 'message' | 'data'>;
|
127
125
|
declare function isDefinedError<T>(error: T): error is Extract<T, ORPCError<any, any>>;
|
128
126
|
declare function toORPCError(error: unknown): ORPCError<any, any>;
|
129
127
|
declare function isORPCErrorStatus(status: number): boolean;
|
128
|
+
declare function isORPCErrorJson(json: unknown): json is ORPCErrorJSON<ORPCErrorCode, unknown>;
|
129
|
+
declare function createORPCErrorFromJson<TCode extends ORPCErrorCode, TData>(json: ORPCErrorJSON<TCode, TData>, options?: ErrorOptions): ORPCError<TCode, TData>;
|
130
130
|
|
131
131
|
declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
|
132
132
|
value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
|
@@ -152,4 +152,4 @@ type SafeResult<TOutput, TError> = [error: null, data: TOutput, isDefined: false
|
|
152
152
|
declare function safe<TOutput, TError = ThrowableError>(promise: ClientPromiseResult<TOutput, TError>): Promise<SafeResult<TOutput, TError>>;
|
153
153
|
declare function resolveFriendlyClientOptions<T extends ClientContext>(options: FriendlyClientOptions<T>): ClientOptions<T>;
|
154
154
|
|
155
|
-
export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, isORPCErrorStatus, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };
|
155
|
+
export { COMMON_ORPC_ERROR_DEFS, ClientContext, ClientLink, ClientOptions, ClientPromiseResult, type CommonORPCErrorCode, DynamicLink, FriendlyClientOptions, InferClientContext, NestedClient, ORPCError, type ORPCErrorCode, type ORPCErrorJSON, type ORPCErrorOptions, type SafeResult, createORPCClient, type createORPCClientOptions, createORPCErrorFromJson, fallbackORPCErrorMessage, fallbackORPCErrorStatus, isDefinedError, isORPCErrorJson, isORPCErrorStatus, mapEventIterator, resolveFriendlyClientOptions, safe, toORPCError };
|
package/dist/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import { i as isDefinedError } from './shared/client.
|
2
|
-
export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.
|
1
|
+
import { i as isDefinedError } from './shared/client.CRWEpqLB.mjs';
|
2
|
+
export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, d as createORPCErrorFromJson, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, c as isORPCErrorJson, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.CRWEpqLB.mjs';
|
3
3
|
export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
|
4
4
|
export { ErrorEvent } from '@orpc/standard-server';
|
5
5
|
|
package/dist/plugins/index.d.mts
CHANGED
@@ -1,11 +1,73 @@
|
|
1
1
|
import { Value } from '@orpc/shared';
|
2
|
-
import {
|
3
|
-
import { b as
|
4
|
-
import '
|
2
|
+
import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
|
3
|
+
import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.Bt2hFtM_.mjs';
|
4
|
+
import { a as ClientContext } from '../shared/client.CipPQkhk.mjs';
|
5
5
|
|
6
|
-
interface
|
6
|
+
interface BatchLinkPluginGroup<T extends ClientContext> {
|
7
|
+
condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
|
8
|
+
context: T;
|
9
|
+
path?: readonly string[];
|
10
|
+
input?: unknown;
|
11
|
+
}
|
12
|
+
interface BatchLinkPluginOptions<T extends ClientContext> {
|
13
|
+
groups: readonly [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
|
14
|
+
/**
|
15
|
+
* The maximum number of requests in the batch.
|
16
|
+
*
|
17
|
+
* @default 10
|
18
|
+
*/
|
19
|
+
maxSize?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
20
|
+
/**
|
21
|
+
* Defines the URL to use for the batch request.
|
22
|
+
*
|
23
|
+
* @default the URL of the first request in the batch + '/__batch__'
|
24
|
+
*/
|
25
|
+
url?: Value<string | URL, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
26
|
+
/**
|
27
|
+
* The maximum length of the URL.
|
28
|
+
*
|
29
|
+
* @default 2083
|
30
|
+
*/
|
31
|
+
maxUrlLength?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
32
|
+
/**
|
33
|
+
* Defines the HTTP headers to use for the batch request.
|
34
|
+
*
|
35
|
+
* @default The same headers of all requests in the batch
|
36
|
+
*/
|
37
|
+
headers?: Value<StandardHeaders, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
38
|
+
/**
|
39
|
+
* Map the batch request items before sending them.
|
40
|
+
*
|
41
|
+
* @default Removes headers that are duplicated in the batch headers.
|
42
|
+
*/
|
43
|
+
mapRequestItem?: (options: StandardLinkClientInterceptorOptions<T> & {
|
44
|
+
batchUrl: URL;
|
45
|
+
batchHeaders: StandardHeaders;
|
46
|
+
}) => StandardRequest;
|
47
|
+
/**
|
48
|
+
* Exclude a request from the batch.
|
49
|
+
*
|
50
|
+
* @default () => false
|
51
|
+
*/
|
52
|
+
exclude?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
|
53
|
+
}
|
54
|
+
declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
55
|
+
#private;
|
56
|
+
private readonly groups;
|
57
|
+
private readonly maxSize;
|
58
|
+
private readonly batchUrl;
|
59
|
+
private readonly maxUrlLength;
|
60
|
+
private readonly batchHeaders;
|
61
|
+
private readonly mapRequestItem;
|
62
|
+
private readonly exclude;
|
63
|
+
private pending;
|
64
|
+
order: number;
|
65
|
+
constructor(options: BatchLinkPluginOptions<T>);
|
66
|
+
init(options: StandardLinkOptions<T>): void;
|
67
|
+
}
|
68
|
+
|
69
|
+
interface ClientRetryPluginAttemptOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
7
70
|
lastEventRetry: number | undefined;
|
8
|
-
lastEventId: string | undefined;
|
9
71
|
attemptIndex: number;
|
10
72
|
error: unknown;
|
11
73
|
}
|
@@ -16,37 +78,23 @@ interface ClientRetryPluginContext {
|
|
16
78
|
*
|
17
79
|
* @default 0
|
18
80
|
*/
|
19
|
-
retry?: Value<number, [
|
20
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
21
|
-
path: readonly string[],
|
22
|
-
input: unknown
|
23
|
-
]>;
|
81
|
+
retry?: Value<number, [StandardLinkInterceptorOptions<ClientRetryPluginContext>]>;
|
24
82
|
/**
|
25
83
|
* Delay (in ms) before retrying.
|
26
84
|
*
|
27
85
|
* @default (o) => o.lastEventRetry ?? 2000
|
28
86
|
*/
|
29
|
-
retryDelay?: Value<number, [
|
30
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
31
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
32
|
-
path: readonly string[],
|
33
|
-
input: unknown
|
34
|
-
]>;
|
87
|
+
retryDelay?: Value<number, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
35
88
|
/**
|
36
89
|
* Determine should retry or not.
|
37
90
|
*
|
38
91
|
* @default true
|
39
92
|
*/
|
40
|
-
shouldRetry?: Value<boolean, [
|
41
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
42
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
43
|
-
path: readonly string[],
|
44
|
-
input: unknown
|
45
|
-
]>;
|
93
|
+
shouldRetry?: Value<boolean, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
46
94
|
/**
|
47
95
|
* The hook called when retrying, and return the unsubscribe function.
|
48
96
|
*/
|
49
|
-
onRetry?: (options: ClientRetryPluginAttemptOptions
|
97
|
+
onRetry?: (options: ClientRetryPluginAttemptOptions<ClientRetryPluginContext>) => void | (() => void);
|
50
98
|
}
|
51
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
52
100
|
}
|
@@ -62,4 +110,34 @@ declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements S
|
|
62
110
|
init(options: StandardLinkOptions<T>): void;
|
63
111
|
}
|
64
112
|
|
65
|
-
|
113
|
+
interface SimpleCsrfProtectionLinkPluginOptions<T extends ClientContext> {
|
114
|
+
/**
|
115
|
+
* The name of the header to check.
|
116
|
+
*
|
117
|
+
* @default 'x-csrf-token'
|
118
|
+
*/
|
119
|
+
headerName?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
120
|
+
/**
|
121
|
+
* The value of the header to check.
|
122
|
+
*
|
123
|
+
* @default 'orpc'
|
124
|
+
*
|
125
|
+
*/
|
126
|
+
headerValue?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
127
|
+
/**
|
128
|
+
* Exclude a procedure from the plugin.
|
129
|
+
*
|
130
|
+
* @default false
|
131
|
+
*/
|
132
|
+
exclude?: Value<boolean, [options: StandardLinkClientInterceptorOptions<T>]>;
|
133
|
+
}
|
134
|
+
declare class SimpleCsrfProtectionLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
135
|
+
private readonly headerName;
|
136
|
+
private readonly headerValue;
|
137
|
+
private readonly exclude;
|
138
|
+
constructor(options?: SimpleCsrfProtectionLinkPluginOptions<T>);
|
139
|
+
order: number;
|
140
|
+
init(options: StandardLinkOptions<T>): void;
|
141
|
+
}
|
142
|
+
|
143
|
+
export { BatchLinkPlugin, type BatchLinkPluginGroup, type BatchLinkPluginOptions, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions, SimpleCsrfProtectionLinkPlugin, type SimpleCsrfProtectionLinkPluginOptions };
|
package/dist/plugins/index.d.ts
CHANGED
@@ -1,11 +1,73 @@
|
|
1
1
|
import { Value } from '@orpc/shared';
|
2
|
-
import {
|
3
|
-
import { b as
|
4
|
-
import '
|
2
|
+
import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
|
3
|
+
import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.FvDtk0Vr.js';
|
4
|
+
import { a as ClientContext } from '../shared/client.CipPQkhk.js';
|
5
5
|
|
6
|
-
interface
|
6
|
+
interface BatchLinkPluginGroup<T extends ClientContext> {
|
7
|
+
condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
|
8
|
+
context: T;
|
9
|
+
path?: readonly string[];
|
10
|
+
input?: unknown;
|
11
|
+
}
|
12
|
+
interface BatchLinkPluginOptions<T extends ClientContext> {
|
13
|
+
groups: readonly [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
|
14
|
+
/**
|
15
|
+
* The maximum number of requests in the batch.
|
16
|
+
*
|
17
|
+
* @default 10
|
18
|
+
*/
|
19
|
+
maxSize?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
20
|
+
/**
|
21
|
+
* Defines the URL to use for the batch request.
|
22
|
+
*
|
23
|
+
* @default the URL of the first request in the batch + '/__batch__'
|
24
|
+
*/
|
25
|
+
url?: Value<string | URL, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
26
|
+
/**
|
27
|
+
* The maximum length of the URL.
|
28
|
+
*
|
29
|
+
* @default 2083
|
30
|
+
*/
|
31
|
+
maxUrlLength?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
32
|
+
/**
|
33
|
+
* Defines the HTTP headers to use for the batch request.
|
34
|
+
*
|
35
|
+
* @default The same headers of all requests in the batch
|
36
|
+
*/
|
37
|
+
headers?: Value<StandardHeaders, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
38
|
+
/**
|
39
|
+
* Map the batch request items before sending them.
|
40
|
+
*
|
41
|
+
* @default Removes headers that are duplicated in the batch headers.
|
42
|
+
*/
|
43
|
+
mapRequestItem?: (options: StandardLinkClientInterceptorOptions<T> & {
|
44
|
+
batchUrl: URL;
|
45
|
+
batchHeaders: StandardHeaders;
|
46
|
+
}) => StandardRequest;
|
47
|
+
/**
|
48
|
+
* Exclude a request from the batch.
|
49
|
+
*
|
50
|
+
* @default () => false
|
51
|
+
*/
|
52
|
+
exclude?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
|
53
|
+
}
|
54
|
+
declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
55
|
+
#private;
|
56
|
+
private readonly groups;
|
57
|
+
private readonly maxSize;
|
58
|
+
private readonly batchUrl;
|
59
|
+
private readonly maxUrlLength;
|
60
|
+
private readonly batchHeaders;
|
61
|
+
private readonly mapRequestItem;
|
62
|
+
private readonly exclude;
|
63
|
+
private pending;
|
64
|
+
order: number;
|
65
|
+
constructor(options: BatchLinkPluginOptions<T>);
|
66
|
+
init(options: StandardLinkOptions<T>): void;
|
67
|
+
}
|
68
|
+
|
69
|
+
interface ClientRetryPluginAttemptOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
7
70
|
lastEventRetry: number | undefined;
|
8
|
-
lastEventId: string | undefined;
|
9
71
|
attemptIndex: number;
|
10
72
|
error: unknown;
|
11
73
|
}
|
@@ -16,37 +78,23 @@ interface ClientRetryPluginContext {
|
|
16
78
|
*
|
17
79
|
* @default 0
|
18
80
|
*/
|
19
|
-
retry?: Value<number, [
|
20
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
21
|
-
path: readonly string[],
|
22
|
-
input: unknown
|
23
|
-
]>;
|
81
|
+
retry?: Value<number, [StandardLinkInterceptorOptions<ClientRetryPluginContext>]>;
|
24
82
|
/**
|
25
83
|
* Delay (in ms) before retrying.
|
26
84
|
*
|
27
85
|
* @default (o) => o.lastEventRetry ?? 2000
|
28
86
|
*/
|
29
|
-
retryDelay?: Value<number, [
|
30
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
31
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
32
|
-
path: readonly string[],
|
33
|
-
input: unknown
|
34
|
-
]>;
|
87
|
+
retryDelay?: Value<number, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
35
88
|
/**
|
36
89
|
* Determine should retry or not.
|
37
90
|
*
|
38
91
|
* @default true
|
39
92
|
*/
|
40
|
-
shouldRetry?: Value<boolean, [
|
41
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
42
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
43
|
-
path: readonly string[],
|
44
|
-
input: unknown
|
45
|
-
]>;
|
93
|
+
shouldRetry?: Value<boolean, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
46
94
|
/**
|
47
95
|
* The hook called when retrying, and return the unsubscribe function.
|
48
96
|
*/
|
49
|
-
onRetry?: (options: ClientRetryPluginAttemptOptions
|
97
|
+
onRetry?: (options: ClientRetryPluginAttemptOptions<ClientRetryPluginContext>) => void | (() => void);
|
50
98
|
}
|
51
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
52
100
|
}
|
@@ -62,4 +110,34 @@ declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements S
|
|
62
110
|
init(options: StandardLinkOptions<T>): void;
|
63
111
|
}
|
64
112
|
|
65
|
-
|
113
|
+
interface SimpleCsrfProtectionLinkPluginOptions<T extends ClientContext> {
|
114
|
+
/**
|
115
|
+
* The name of the header to check.
|
116
|
+
*
|
117
|
+
* @default 'x-csrf-token'
|
118
|
+
*/
|
119
|
+
headerName?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
120
|
+
/**
|
121
|
+
* The value of the header to check.
|
122
|
+
*
|
123
|
+
* @default 'orpc'
|
124
|
+
*
|
125
|
+
*/
|
126
|
+
headerValue?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
127
|
+
/**
|
128
|
+
* Exclude a procedure from the plugin.
|
129
|
+
*
|
130
|
+
* @default false
|
131
|
+
*/
|
132
|
+
exclude?: Value<boolean, [options: StandardLinkClientInterceptorOptions<T>]>;
|
133
|
+
}
|
134
|
+
declare class SimpleCsrfProtectionLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
135
|
+
private readonly headerName;
|
136
|
+
private readonly headerValue;
|
137
|
+
private readonly exclude;
|
138
|
+
constructor(options?: SimpleCsrfProtectionLinkPluginOptions<T>);
|
139
|
+
order: number;
|
140
|
+
init(options: StandardLinkOptions<T>): void;
|
141
|
+
}
|
142
|
+
|
143
|
+
export { BatchLinkPlugin, type BatchLinkPluginGroup, type BatchLinkPluginOptions, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions, SimpleCsrfProtectionLinkPlugin, type SimpleCsrfProtectionLinkPluginOptions };
|
package/dist/plugins/index.mjs
CHANGED
@@ -1,6 +1,152 @@
|
|
1
|
-
import { value,
|
1
|
+
import { isAsyncIteratorObject, value, splitInHalf, toArray } from '@orpc/shared';
|
2
|
+
import { toBatchRequest, parseBatchResponse } from '@orpc/standard-server/batch';
|
2
3
|
import { getEventMeta } from '@orpc/standard-server';
|
3
4
|
|
5
|
+
class BatchLinkPlugin {
|
6
|
+
groups;
|
7
|
+
maxSize;
|
8
|
+
batchUrl;
|
9
|
+
maxUrlLength;
|
10
|
+
batchHeaders;
|
11
|
+
mapRequestItem;
|
12
|
+
exclude;
|
13
|
+
pending;
|
14
|
+
order = 5e6;
|
15
|
+
constructor(options) {
|
16
|
+
this.groups = options.groups;
|
17
|
+
this.pending = /* @__PURE__ */ new Map();
|
18
|
+
this.maxSize = options.maxSize ?? 10;
|
19
|
+
this.maxUrlLength = options.maxUrlLength ?? 2083;
|
20
|
+
this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
|
21
|
+
this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
|
22
|
+
const headers = {};
|
23
|
+
for (const [key, value2] of Object.entries(options2.request.headers)) {
|
24
|
+
if (rest.every((item) => item.request.headers[key] === value2)) {
|
25
|
+
headers[key] = value2;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
return headers;
|
29
|
+
});
|
30
|
+
this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
|
31
|
+
const headers = {};
|
32
|
+
for (const [key, value2] of Object.entries(request.headers)) {
|
33
|
+
if (batchHeaders[key] !== value2) {
|
34
|
+
headers[key] = value2;
|
35
|
+
}
|
36
|
+
}
|
37
|
+
return {
|
38
|
+
method: request.method,
|
39
|
+
url: request.url,
|
40
|
+
headers,
|
41
|
+
body: request.body,
|
42
|
+
signal: request.signal
|
43
|
+
};
|
44
|
+
});
|
45
|
+
this.exclude = options.exclude ?? (() => false);
|
46
|
+
}
|
47
|
+
init(options) {
|
48
|
+
options.clientInterceptors ??= [];
|
49
|
+
options.clientInterceptors.push((options2) => {
|
50
|
+
if (options2.request.headers["x-orpc-batch"] !== "1") {
|
51
|
+
return options2.next();
|
52
|
+
}
|
53
|
+
return options2.next({
|
54
|
+
...options2,
|
55
|
+
request: {
|
56
|
+
...options2.request,
|
57
|
+
headers: {
|
58
|
+
...options2.request.headers,
|
59
|
+
"x-orpc-batch": void 0
|
60
|
+
}
|
61
|
+
}
|
62
|
+
});
|
63
|
+
});
|
64
|
+
options.clientInterceptors.push((options2) => {
|
65
|
+
if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body)) {
|
66
|
+
return options2.next();
|
67
|
+
}
|
68
|
+
const group = this.groups.find((group2) => group2.condition(options2));
|
69
|
+
if (!group) {
|
70
|
+
return options2.next();
|
71
|
+
}
|
72
|
+
return new Promise((resolve, reject) => {
|
73
|
+
this.#enqueueRequest(group, options2, resolve, reject);
|
74
|
+
setTimeout(() => this.#processPendingBatches());
|
75
|
+
});
|
76
|
+
});
|
77
|
+
}
|
78
|
+
#enqueueRequest(group, options, resolve, reject) {
|
79
|
+
const items = this.pending.get(group);
|
80
|
+
if (items) {
|
81
|
+
items.push([options, resolve, reject]);
|
82
|
+
} else {
|
83
|
+
this.pending.set(group, [[options, resolve, reject]]);
|
84
|
+
}
|
85
|
+
}
|
86
|
+
async #processPendingBatches() {
|
87
|
+
const pending = this.pending;
|
88
|
+
this.pending = /* @__PURE__ */ new Map();
|
89
|
+
for (const [group, items] of pending) {
|
90
|
+
const getItems = items.filter(([options]) => options.request.method === "GET");
|
91
|
+
const restItems = items.filter(([options]) => options.request.method !== "GET");
|
92
|
+
this.#executeBatch("GET", group, getItems);
|
93
|
+
this.#executeBatch("POST", group, restItems);
|
94
|
+
}
|
95
|
+
}
|
96
|
+
async #executeBatch(method, group, groupItems) {
|
97
|
+
if (!groupItems.length) {
|
98
|
+
return;
|
99
|
+
}
|
100
|
+
const batchItems = groupItems;
|
101
|
+
if (batchItems.length === 1) {
|
102
|
+
batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
|
103
|
+
return;
|
104
|
+
}
|
105
|
+
try {
|
106
|
+
const options = batchItems.map(([options2]) => options2);
|
107
|
+
const maxSize = await value(this.maxSize, options);
|
108
|
+
if (batchItems.length > maxSize) {
|
109
|
+
const [first, second] = splitInHalf(batchItems);
|
110
|
+
this.#executeBatch(method, group, first);
|
111
|
+
this.#executeBatch(method, group, second);
|
112
|
+
return;
|
113
|
+
}
|
114
|
+
const batchUrl = new URL(await value(this.batchUrl, options));
|
115
|
+
const batchHeaders = await value(this.batchHeaders, options);
|
116
|
+
const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
|
117
|
+
const batchRequest = toBatchRequest({
|
118
|
+
method,
|
119
|
+
url: batchUrl,
|
120
|
+
headers: batchHeaders,
|
121
|
+
requests: mappedItems
|
122
|
+
});
|
123
|
+
const maxUrlLength = await value(this.maxUrlLength, options);
|
124
|
+
if (batchRequest.url.toString().length > maxUrlLength) {
|
125
|
+
const [first, second] = splitInHalf(batchItems);
|
126
|
+
this.#executeBatch(method, group, first);
|
127
|
+
this.#executeBatch(method, group, second);
|
128
|
+
return;
|
129
|
+
}
|
130
|
+
const lazyResponse = await options[0].next({
|
131
|
+
request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": "1" } },
|
132
|
+
signal: batchRequest.signal,
|
133
|
+
context: group.context,
|
134
|
+
input: group.input,
|
135
|
+
path: toArray(group.path)
|
136
|
+
});
|
137
|
+
const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
|
138
|
+
for await (const item of parsed) {
|
139
|
+
batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
|
140
|
+
}
|
141
|
+
throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
|
142
|
+
} catch (error) {
|
143
|
+
for (const [, , reject] of batchItems) {
|
144
|
+
reject(error);
|
145
|
+
}
|
146
|
+
}
|
147
|
+
}
|
148
|
+
}
|
149
|
+
|
4
150
|
class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
5
151
|
}
|
6
152
|
class ClientRetryPlugin {
|
@@ -18,69 +164,49 @@ class ClientRetryPlugin {
|
|
18
164
|
options.interceptors ??= [];
|
19
165
|
options.interceptors.push(async (interceptorOptions) => {
|
20
166
|
const maxAttempts = await value(
|
21
|
-
interceptorOptions.
|
22
|
-
interceptorOptions
|
23
|
-
interceptorOptions.path,
|
24
|
-
interceptorOptions.input
|
167
|
+
interceptorOptions.context.retry ?? this.defaultRetry,
|
168
|
+
interceptorOptions
|
25
169
|
);
|
26
|
-
const retryDelay = interceptorOptions.
|
27
|
-
const shouldRetry = interceptorOptions.
|
28
|
-
const onRetry = interceptorOptions.
|
170
|
+
const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
|
171
|
+
const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
|
172
|
+
const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
|
29
173
|
if (maxAttempts <= 0) {
|
30
174
|
return interceptorOptions.next();
|
31
175
|
}
|
32
|
-
let lastEventId = interceptorOptions.
|
176
|
+
let lastEventId = interceptorOptions.lastEventId;
|
33
177
|
let lastEventRetry;
|
34
178
|
let unsubscribe;
|
35
179
|
let attemptIndex = 0;
|
36
180
|
const next = async (initial) => {
|
37
181
|
let current = initial;
|
38
182
|
while (true) {
|
39
|
-
const
|
183
|
+
const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
|
40
184
|
if (current) {
|
41
185
|
if (attemptIndex >= maxAttempts) {
|
42
186
|
throw current.error;
|
43
187
|
}
|
44
188
|
const attemptOptions = {
|
189
|
+
...updatedInterceptorOptions,
|
45
190
|
attemptIndex,
|
46
191
|
error: current.error,
|
47
|
-
lastEventId,
|
48
192
|
lastEventRetry
|
49
193
|
};
|
50
194
|
const shouldRetryBool = await value(
|
51
195
|
shouldRetry,
|
52
|
-
attemptOptions
|
53
|
-
newClientOptions,
|
54
|
-
interceptorOptions.path,
|
55
|
-
interceptorOptions.input
|
196
|
+
attemptOptions
|
56
197
|
);
|
57
198
|
if (!shouldRetryBool) {
|
58
199
|
throw current.error;
|
59
200
|
}
|
60
|
-
unsubscribe = onRetry?.(
|
61
|
-
|
62
|
-
newClientOptions,
|
63
|
-
interceptorOptions.path,
|
64
|
-
interceptorOptions.input
|
65
|
-
);
|
66
|
-
const retryDelayMs = await value(
|
67
|
-
retryDelay,
|
68
|
-
attemptOptions,
|
69
|
-
newClientOptions,
|
70
|
-
interceptorOptions.path,
|
71
|
-
interceptorOptions.input
|
72
|
-
);
|
201
|
+
unsubscribe = onRetry?.(attemptOptions);
|
202
|
+
const retryDelayMs = await value(retryDelay, attemptOptions);
|
73
203
|
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
74
204
|
attemptIndex++;
|
75
205
|
}
|
76
206
|
try {
|
77
|
-
|
78
|
-
...interceptorOptions,
|
79
|
-
options: newClientOptions
|
80
|
-
});
|
81
|
-
return output2;
|
207
|
+
return await interceptorOptions.next(updatedInterceptorOptions);
|
82
208
|
} catch (error) {
|
83
|
-
if (
|
209
|
+
if (updatedInterceptorOptions.signal?.aborted === true) {
|
84
210
|
throw error;
|
85
211
|
}
|
86
212
|
current = { error };
|
@@ -128,4 +254,37 @@ class ClientRetryPlugin {
|
|
128
254
|
}
|
129
255
|
}
|
130
256
|
|
131
|
-
|
257
|
+
class SimpleCsrfProtectionLinkPlugin {
|
258
|
+
headerName;
|
259
|
+
headerValue;
|
260
|
+
exclude;
|
261
|
+
constructor(options = {}) {
|
262
|
+
this.headerName = options.headerName ?? "x-csrf-token";
|
263
|
+
this.headerValue = options.headerValue ?? "orpc";
|
264
|
+
this.exclude = options.exclude ?? false;
|
265
|
+
}
|
266
|
+
order = 8e6;
|
267
|
+
init(options) {
|
268
|
+
options.clientInterceptors ??= [];
|
269
|
+
options.clientInterceptors.push(async (options2) => {
|
270
|
+
const excluded = await value(this.exclude, options2);
|
271
|
+
if (excluded) {
|
272
|
+
return options2.next();
|
273
|
+
}
|
274
|
+
const headerName = await value(this.headerName, options2);
|
275
|
+
const headerValue = await value(this.headerValue, options2);
|
276
|
+
return options2.next({
|
277
|
+
...options2,
|
278
|
+
request: {
|
279
|
+
...options2.request,
|
280
|
+
headers: {
|
281
|
+
...options2.request.headers,
|
282
|
+
[headerName]: headerValue
|
283
|
+
}
|
284
|
+
}
|
285
|
+
});
|
286
|
+
});
|
287
|
+
}
|
288
|
+
}
|
289
|
+
|
290
|
+
export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { Interceptor, ThrowableError } from '@orpc/shared';
|
2
2
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
-
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.
|
3
|
+
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.CipPQkhk.mjs';
|
4
4
|
|
5
5
|
interface StandardLinkCodec<T extends ClientContext> {
|
6
6
|
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
@@ -10,20 +10,26 @@ interface StandardLinkClient<T extends ClientContext> {
|
|
10
10
|
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
11
11
|
}
|
12
12
|
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
14
|
-
}
|
15
13
|
interface StandardLinkPlugin<T extends ClientContext> {
|
14
|
+
order?: number;
|
16
15
|
init?(options: StandardLinkOptions<T>): void;
|
17
16
|
}
|
17
|
+
declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
|
18
|
+
protected readonly plugins: TPlugin[];
|
19
|
+
constructor(plugins?: readonly TPlugin[]);
|
20
|
+
init(options: StandardLinkOptions<T>): void;
|
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
|
+
}
|
18
30
|
interface StandardLinkOptions<T extends ClientContext> {
|
19
|
-
interceptors?: Interceptor<
|
20
|
-
|
21
|
-
input: unknown;
|
22
|
-
options: ClientOptions<T>;
|
23
|
-
}, unknown, ThrowableError>[];
|
24
|
-
clientInterceptors?: Interceptor<{
|
25
|
-
request: StandardRequest;
|
26
|
-
}, StandardLazyResponse, ThrowableError>[];
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown, ThrowableError>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse, ThrowableError>[];
|
27
33
|
plugins?: StandardLinkPlugin<T>[];
|
28
34
|
}
|
29
35
|
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
@@ -36,4 +42,4 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
36
42
|
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
37
43
|
}
|
38
44
|
|
39
|
-
export {
|
45
|
+
export { CompositeStandardLinkPlugin as C, type StandardLinkClientInterceptorOptions as S, type StandardLinkPlugin as a, type StandardLinkOptions as b, type StandardLinkInterceptorOptions as c, StandardLink as d, type StandardLinkCodec as e, type StandardLinkClient as f };
|
@@ -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;
|
@@ -139,6 +123,22 @@ function toORPCError(error) {
|
|
139
123
|
function isORPCErrorStatus(status) {
|
140
124
|
return status < 200 || status >= 400;
|
141
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
142
|
|
143
143
|
function mapEventIterator(iterator, maps) {
|
144
144
|
return async function* () {
|
@@ -172,4 +172,4 @@ function mapEventIterator(iterator, maps) {
|
|
172
172
|
}();
|
173
173
|
}
|
174
174
|
|
175
|
-
export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, 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 };
|
@@ -3,13 +3,15 @@ import { PromiseWithError } from '@orpc/shared';
|
|
3
3
|
type HTTPPath = `/${string}`;
|
4
4
|
type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
5
5
|
type ClientContext = Record<PropertyKey, any>;
|
6
|
-
|
6
|
+
interface ClientOptions<T extends ClientContext> {
|
7
7
|
signal?: AbortSignal;
|
8
8
|
lastEventId?: string | undefined;
|
9
|
-
|
10
|
-
|
9
|
+
context: T;
|
10
|
+
}
|
11
|
+
type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
12
|
+
context?: T;
|
11
13
|
} : {
|
12
|
-
context:
|
14
|
+
context: T;
|
13
15
|
});
|
14
16
|
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
15
17
|
type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
|
@@ -20,9 +22,6 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
|
|
20
22
|
[k: string]: NestedClient<TClientContext>;
|
21
23
|
};
|
22
24
|
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
23
|
-
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
24
|
-
context: TClientContext;
|
25
|
-
};
|
26
25
|
interface ClientLink<TClientContext extends ClientContext> {
|
27
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
28
27
|
}
|
@@ -3,13 +3,15 @@ import { PromiseWithError } from '@orpc/shared';
|
|
3
3
|
type HTTPPath = `/${string}`;
|
4
4
|
type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
5
5
|
type ClientContext = Record<PropertyKey, any>;
|
6
|
-
|
6
|
+
interface ClientOptions<T extends ClientContext> {
|
7
7
|
signal?: AbortSignal;
|
8
8
|
lastEventId?: string | undefined;
|
9
|
-
|
10
|
-
|
9
|
+
context: T;
|
10
|
+
}
|
11
|
+
type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
12
|
+
context?: T;
|
11
13
|
} : {
|
12
|
-
context:
|
14
|
+
context: T;
|
13
15
|
});
|
14
16
|
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
15
17
|
type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
|
@@ -20,9 +22,6 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
|
|
20
22
|
[k: string]: NestedClient<TClientContext>;
|
21
23
|
};
|
22
24
|
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
23
|
-
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
24
|
-
context: TClientContext;
|
25
|
-
};
|
26
25
|
interface ClientLink<TClientContext extends ClientContext> {
|
27
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
28
27
|
}
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.
|
2
|
-
import {
|
1
|
+
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.CipPQkhk.mjs';
|
2
|
+
import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.Bt2hFtM_.mjs';
|
3
3
|
import { Segment, Value } from '@orpc/shared';
|
4
4
|
import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
5
5
|
|
@@ -44,31 +44,19 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
44
44
|
/**
|
45
45
|
* Base url for all requests.
|
46
46
|
*/
|
47
|
-
url: Value<string | URL, [
|
48
|
-
options: ClientOptions<T>,
|
49
|
-
path: readonly string[],
|
50
|
-
input: unknown
|
51
|
-
]>;
|
47
|
+
url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
52
48
|
/**
|
53
49
|
* The maximum length of the URL.
|
54
50
|
*
|
55
51
|
* @default 2083
|
56
52
|
*/
|
57
|
-
maxUrlLength?: Value<number, [
|
58
|
-
options: ClientOptions<T>,
|
59
|
-
path: readonly string[],
|
60
|
-
input: unknown
|
61
|
-
]>;
|
53
|
+
maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
62
54
|
/**
|
63
55
|
* The method used to make the request.
|
64
56
|
*
|
65
57
|
* @default 'POST'
|
66
58
|
*/
|
67
|
-
method?: Value<HTTPMethod, [
|
68
|
-
options: ClientOptions<T>,
|
69
|
-
path: readonly string[],
|
70
|
-
input: unknown
|
71
|
-
]>;
|
59
|
+
method?: Value<HTTPMethod, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
72
60
|
/**
|
73
61
|
* The method to use when the payload cannot safely pass to the server with method return from method function.
|
74
62
|
* GET is not allowed, it's very dangerous.
|
@@ -79,11 +67,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
79
67
|
/**
|
80
68
|
* Inject headers to the request.
|
81
69
|
*/
|
82
|
-
headers?: Value<StandardHeaders, [
|
83
|
-
options: ClientOptions<T>,
|
84
|
-
path: readonly string[],
|
85
|
-
input: unknown
|
86
|
-
]>;
|
70
|
+
headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
87
71
|
}
|
88
72
|
declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
|
89
73
|
private readonly serializer;
|
@@ -99,5 +83,8 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
|
|
99
83
|
|
100
84
|
interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
|
101
85
|
}
|
86
|
+
declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
|
87
|
+
constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
|
88
|
+
}
|
102
89
|
|
103
|
-
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, type StandardRPCLinkCodecOptions as
|
90
|
+
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, StandardRPCLink as g, type StandardRPCLinkCodecOptions as h, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.
|
2
|
-
import {
|
1
|
+
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.CipPQkhk.js';
|
2
|
+
import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.FvDtk0Vr.js';
|
3
3
|
import { Segment, Value } from '@orpc/shared';
|
4
4
|
import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
5
5
|
|
@@ -44,31 +44,19 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
44
44
|
/**
|
45
45
|
* Base url for all requests.
|
46
46
|
*/
|
47
|
-
url: Value<string | URL, [
|
48
|
-
options: ClientOptions<T>,
|
49
|
-
path: readonly string[],
|
50
|
-
input: unknown
|
51
|
-
]>;
|
47
|
+
url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
52
48
|
/**
|
53
49
|
* The maximum length of the URL.
|
54
50
|
*
|
55
51
|
* @default 2083
|
56
52
|
*/
|
57
|
-
maxUrlLength?: Value<number, [
|
58
|
-
options: ClientOptions<T>,
|
59
|
-
path: readonly string[],
|
60
|
-
input: unknown
|
61
|
-
]>;
|
53
|
+
maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
62
54
|
/**
|
63
55
|
* The method used to make the request.
|
64
56
|
*
|
65
57
|
* @default 'POST'
|
66
58
|
*/
|
67
|
-
method?: Value<HTTPMethod, [
|
68
|
-
options: ClientOptions<T>,
|
69
|
-
path: readonly string[],
|
70
|
-
input: unknown
|
71
|
-
]>;
|
59
|
+
method?: Value<HTTPMethod, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
72
60
|
/**
|
73
61
|
* The method to use when the payload cannot safely pass to the server with method return from method function.
|
74
62
|
* GET is not allowed, it's very dangerous.
|
@@ -79,11 +67,7 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
79
67
|
/**
|
80
68
|
* Inject headers to the request.
|
81
69
|
*/
|
82
|
-
headers?: Value<StandardHeaders, [
|
83
|
-
options: ClientOptions<T>,
|
84
|
-
path: readonly string[],
|
85
|
-
input: unknown
|
86
|
-
]>;
|
70
|
+
headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
87
71
|
}
|
88
72
|
declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
|
89
73
|
private readonly serializer;
|
@@ -99,5 +83,8 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
|
|
99
83
|
|
100
84
|
interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
|
101
85
|
}
|
86
|
+
declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
|
87
|
+
constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
|
88
|
+
}
|
102
89
|
|
103
|
-
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, type StandardRPCLinkCodecOptions as
|
90
|
+
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, StandardRPCLink as g, type StandardRPCLinkCodecOptions as h, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
|
@@ -1,23 +1,32 @@
|
|
1
1
|
import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
|
2
2
|
import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
|
3
|
-
import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.
|
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
18
|
constructor(codec, sender, options = {}) {
|
9
19
|
this.codec = codec;
|
10
20
|
this.sender = sender;
|
11
|
-
|
12
|
-
|
13
|
-
}
|
21
|
+
const plugin = new CompositeStandardLinkPlugin(options.plugins);
|
22
|
+
plugin.init(options);
|
14
23
|
this.interceptors = toArray(options.interceptors);
|
15
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;
|
@@ -253,12 +262,12 @@ class StandardRPCLinkCodec {
|
|
253
262
|
}
|
254
263
|
})();
|
255
264
|
if (!isOk) {
|
256
|
-
if (
|
257
|
-
throw
|
265
|
+
if (isORPCErrorJson(deserialized)) {
|
266
|
+
throw createORPCErrorFromJson(deserialized);
|
258
267
|
}
|
259
268
|
throw new ORPCError(getMalformedResponseErrorCode(response.status), {
|
260
269
|
status: response.status,
|
261
|
-
data: deserialized
|
270
|
+
data: { ...response, body: deserialized }
|
262
271
|
});
|
263
272
|
}
|
264
273
|
return deserialized;
|
@@ -308,8 +317,8 @@ class StandardRPCSerializer {
|
|
308
317
|
return e;
|
309
318
|
}
|
310
319
|
const deserialized = this.#deserialize(e.data);
|
311
|
-
if (
|
312
|
-
return
|
320
|
+
if (isORPCErrorJson(deserialized)) {
|
321
|
+
return createORPCErrorFromJson(deserialized, { cause: e });
|
313
322
|
}
|
314
323
|
return new ErrorEvent({
|
315
324
|
data: deserialized,
|
@@ -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 };
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { Interceptor, ThrowableError } from '@orpc/shared';
|
2
2
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
-
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.
|
3
|
+
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.CipPQkhk.js';
|
4
4
|
|
5
5
|
interface StandardLinkCodec<T extends ClientContext> {
|
6
6
|
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
@@ -10,20 +10,26 @@ interface StandardLinkClient<T extends ClientContext> {
|
|
10
10
|
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
11
11
|
}
|
12
12
|
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
14
|
-
}
|
15
13
|
interface StandardLinkPlugin<T extends ClientContext> {
|
14
|
+
order?: number;
|
16
15
|
init?(options: StandardLinkOptions<T>): void;
|
17
16
|
}
|
17
|
+
declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
|
18
|
+
protected readonly plugins: TPlugin[];
|
19
|
+
constructor(plugins?: readonly TPlugin[]);
|
20
|
+
init(options: StandardLinkOptions<T>): void;
|
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
|
+
}
|
18
30
|
interface StandardLinkOptions<T extends ClientContext> {
|
19
|
-
interceptors?: Interceptor<
|
20
|
-
|
21
|
-
input: unknown;
|
22
|
-
options: ClientOptions<T>;
|
23
|
-
}, unknown, ThrowableError>[];
|
24
|
-
clientInterceptors?: Interceptor<{
|
25
|
-
request: StandardRequest;
|
26
|
-
}, StandardLazyResponse, ThrowableError>[];
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown, ThrowableError>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse, ThrowableError>[];
|
27
33
|
plugins?: StandardLinkPlugin<T>[];
|
28
34
|
}
|
29
35
|
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
@@ -36,4 +42,4 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
36
42
|
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
37
43
|
}
|
38
44
|
|
39
|
-
export {
|
45
|
+
export { CompositeStandardLinkPlugin as C, type StandardLinkClientInterceptorOptions as S, type StandardLinkPlugin as a, type StandardLinkOptions as b, type StandardLinkInterceptorOptions as c, StandardLink as d, type StandardLinkCodec as e, type 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.cf06e99",
|
5
5
|
"license": "MIT",
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
7
7
|
"repository": {
|
@@ -39,9 +39,9 @@
|
|
39
39
|
"dist"
|
40
40
|
],
|
41
41
|
"dependencies": {
|
42
|
-
"@orpc/shared": "0.0.0-next.
|
43
|
-
"@orpc/standard-server
|
44
|
-
"@orpc/standard-server": "0.0.0-next.
|
42
|
+
"@orpc/shared": "0.0.0-next.cf06e99",
|
43
|
+
"@orpc/standard-server": "0.0.0-next.cf06e99",
|
44
|
+
"@orpc/standard-server-fetch": "0.0.0-next.cf06e99"
|
45
45
|
},
|
46
46
|
"devDependencies": {
|
47
47
|
"zod": "^3.24.2"
|