@trpc/client 10.0.0-proxy-alpha.56 → 10.0.0-proxy-alpha.59
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 +1 -2
- package/dist/createTRPCClientProxy.d.ts +4 -4
- package/dist/createTRPCClientProxy.d.ts.map +1 -1
- package/dist/getFetch.d.ts.map +1 -1
- package/dist/{httpUtils-801112a6.js → httpUtils-0961d5e3.js} +8 -4
- package/dist/{httpUtils-44781613.mjs → httpUtils-ad4258b6.mjs} +8 -4
- package/dist/index.js +6 -6
- package/dist/index.mjs +6 -6
- package/dist/internals/fetchHelpers.d.ts.map +1 -1
- package/dist/links/httpBatchLink.js +1 -1
- package/dist/links/httpBatchLink.mjs +1 -1
- package/dist/links/httpLink.js +1 -1
- package/dist/links/httpLink.mjs +1 -1
- package/dist/links/internals/httpUtils.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/createTRPCClientProxy.ts +5 -4
- package/src/getFetch.ts +6 -4
- package/src/internals/fetchHelpers.ts +2 -3
- package/src/links/internals/httpUtils.ts +7 -5
package/README.md
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { AnyRouter, OmitNeverKeys, Procedure, ProcedureArgs, ProcedureRouterRecord, inferProcedureOutput } from '@trpc/server';
|
|
2
2
|
import type { Unsubscribable, inferObservableValue } from '@trpc/server/observable';
|
|
3
|
-
import type { TRPCResultMessage } from '@trpc/server/rpc';
|
|
4
3
|
import { TRPCClientError } from './TRPCClientError';
|
|
5
4
|
import { CreateTRPCClientOptions } from './createTRPCClient';
|
|
6
5
|
import { TRPCClient as Client, TRPCSubscriptionObserver } from './internals/TRPCClient';
|
|
6
|
+
export declare type inferRouterProxyClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
|
|
7
7
|
declare type Resolver<TProcedure extends Procedure<any>> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferProcedureOutput<TProcedure>>;
|
|
8
8
|
declare type SubscriptionResolver<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = (...args: [
|
|
9
9
|
input: ProcedureArgs<TProcedure['_def']>[0],
|
|
10
|
-
opts: ProcedureArgs<TProcedure['_def']>[1] & Partial<TRPCSubscriptionObserver<
|
|
10
|
+
opts: ProcedureArgs<TProcedure['_def']>[1] & Partial<TRPCSubscriptionObserver<inferObservableValue<inferProcedureOutput<TProcedure>>, TRPCClientError<TRouter>>>
|
|
11
11
|
]) => Unsubscribable;
|
|
12
12
|
declare type DecorateProcedure<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = OmitNeverKeys<{
|
|
13
13
|
query: TProcedure extends {
|
|
@@ -31,7 +31,7 @@ declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord,
|
|
|
31
31
|
* @deprecated use `createTRPCProxyClient` instead
|
|
32
32
|
* @internal
|
|
33
33
|
*/
|
|
34
|
-
export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>):
|
|
35
|
-
export declare function createTRPCProxyClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>):
|
|
34
|
+
export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): inferRouterProxyClient<TRouter>;
|
|
35
|
+
export declare function createTRPCProxyClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): inferRouterProxyClient<TRouter>;
|
|
36
36
|
export {};
|
|
37
37
|
//# sourceMappingURL=createTRPCClientProxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"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"}
|
package/dist/getFetch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,CAcvD"}
|
|
@@ -11,8 +11,7 @@ function arrayToDict(array) {
|
|
|
11
11
|
}
|
|
12
12
|
const METHOD = {
|
|
13
13
|
query: 'GET',
|
|
14
|
-
mutation: 'POST'
|
|
15
|
-
subscription: 'PATCH'
|
|
14
|
+
mutation: 'POST'
|
|
16
15
|
};
|
|
17
16
|
function getInput(opts) {
|
|
18
17
|
return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.runtime.transformer.serialize(_input)));
|
|
@@ -48,7 +47,11 @@ function httpRequest(opts) {
|
|
|
48
47
|
const url = getUrl(opts);
|
|
49
48
|
const body = getBody(opts);
|
|
50
49
|
const meta = {};
|
|
51
|
-
Promise.resolve(runtime.headers()).then((headers)=>
|
|
50
|
+
Promise.resolve(runtime.headers()).then((headers)=>{
|
|
51
|
+
if (type === 'subscription') {
|
|
52
|
+
throw new Error('Subscriptions should use wsLink');
|
|
53
|
+
}
|
|
54
|
+
return runtime.fetch(url, {
|
|
52
55
|
method: METHOD[type],
|
|
53
56
|
signal: ac?.signal,
|
|
54
57
|
body: body,
|
|
@@ -56,7 +59,8 @@ function httpRequest(opts) {
|
|
|
56
59
|
'content-type': 'application/json',
|
|
57
60
|
...headers
|
|
58
61
|
}
|
|
59
|
-
})
|
|
62
|
+
});
|
|
63
|
+
}).then((_res)=>{
|
|
60
64
|
meta.response = _res;
|
|
61
65
|
return _res.json();
|
|
62
66
|
}).then((json)=>{
|
|
@@ -9,8 +9,7 @@ function arrayToDict(array) {
|
|
|
9
9
|
}
|
|
10
10
|
const METHOD = {
|
|
11
11
|
query: 'GET',
|
|
12
|
-
mutation: 'POST'
|
|
13
|
-
subscription: 'PATCH'
|
|
12
|
+
mutation: 'POST'
|
|
14
13
|
};
|
|
15
14
|
function getInput(opts) {
|
|
16
15
|
return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.runtime.transformer.serialize(_input)));
|
|
@@ -46,7 +45,11 @@ function httpRequest(opts) {
|
|
|
46
45
|
const url = getUrl(opts);
|
|
47
46
|
const body = getBody(opts);
|
|
48
47
|
const meta = {};
|
|
49
|
-
Promise.resolve(runtime.headers()).then((headers)=>
|
|
48
|
+
Promise.resolve(runtime.headers()).then((headers)=>{
|
|
49
|
+
if (type === 'subscription') {
|
|
50
|
+
throw new Error('Subscriptions should use wsLink');
|
|
51
|
+
}
|
|
52
|
+
return runtime.fetch(url, {
|
|
50
53
|
method: METHOD[type],
|
|
51
54
|
signal: ac?.signal,
|
|
52
55
|
body: body,
|
|
@@ -54,7 +57,8 @@ function httpRequest(opts) {
|
|
|
54
57
|
'content-type': 'application/json',
|
|
55
58
|
...headers
|
|
56
59
|
}
|
|
57
|
-
})
|
|
60
|
+
});
|
|
61
|
+
}).then((_res)=>{
|
|
58
62
|
meta.response = _res;
|
|
59
63
|
return _res.json();
|
|
60
64
|
}).then((json)=>{
|
package/dist/index.js
CHANGED
|
@@ -10,17 +10,16 @@ var shared = require('@trpc/server/shared');
|
|
|
10
10
|
var links_httpLink = require('./links/httpLink.js');
|
|
11
11
|
var links_loggerLink = require('./links/loggerLink.js');
|
|
12
12
|
var links_wsLink = require('./links/wsLink.js');
|
|
13
|
-
require('./httpUtils-
|
|
13
|
+
require('./httpUtils-0961d5e3.js');
|
|
14
14
|
|
|
15
15
|
function getWindow() {
|
|
16
16
|
if (typeof window !== 'undefined') {
|
|
17
17
|
return window;
|
|
18
18
|
}
|
|
19
|
-
return
|
|
19
|
+
return globalThis;
|
|
20
20
|
}
|
|
21
21
|
function getAbortController(ac) {
|
|
22
|
-
|
|
23
|
-
return (ac ?? win.AbortController) ?? undefined;
|
|
22
|
+
return (ac ?? getWindow().AbortController) ?? undefined;
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
function getFetch(f) {
|
|
@@ -28,8 +27,9 @@ function getFetch(f) {
|
|
|
28
27
|
return f;
|
|
29
28
|
}
|
|
30
29
|
const win = getWindow();
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
const globalFetch = win.fetch;
|
|
31
|
+
if (globalFetch) {
|
|
32
|
+
return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
|
|
33
33
|
}
|
|
34
34
|
throw new Error('No fetch implementation found');
|
|
35
35
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -9,17 +9,16 @@ import { createProxy } from '@trpc/server/shared';
|
|
|
9
9
|
export { httpLink } from './links/httpLink.mjs';
|
|
10
10
|
export { loggerLink } from './links/loggerLink.mjs';
|
|
11
11
|
export { createWSClient, wsLink } from './links/wsLink.mjs';
|
|
12
|
-
import './httpUtils-
|
|
12
|
+
import './httpUtils-ad4258b6.mjs';
|
|
13
13
|
|
|
14
14
|
function getWindow() {
|
|
15
15
|
if (typeof window !== 'undefined') {
|
|
16
16
|
return window;
|
|
17
17
|
}
|
|
18
|
-
return
|
|
18
|
+
return globalThis;
|
|
19
19
|
}
|
|
20
20
|
function getAbortController(ac) {
|
|
21
|
-
|
|
22
|
-
return (ac ?? win.AbortController) ?? undefined;
|
|
21
|
+
return (ac ?? getWindow().AbortController) ?? undefined;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
function getFetch(f) {
|
|
@@ -27,8 +26,9 @@ function getFetch(f) {
|
|
|
27
26
|
return f;
|
|
28
27
|
}
|
|
29
28
|
const win = getWindow();
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
const globalFetch = win.fetch;
|
|
30
|
+
if (globalFetch) {
|
|
31
|
+
return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
|
|
32
32
|
}
|
|
33
33
|
throw new Error('No fetch implementation found');
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,SAAS,CAEpC"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var observable = require('@trpc/server/observable');
|
|
6
6
|
var transformResult = require('../transformResult-e15ccdf6.js');
|
|
7
|
-
var httpUtils = require('../httpUtils-
|
|
7
|
+
var httpUtils = require('../httpUtils-0961d5e3.js');
|
|
8
8
|
|
|
9
9
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
|
|
10
10
|
* A function that should never be called unless we messed something up.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { observable } from '@trpc/server/observable';
|
|
2
2
|
import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
|
|
3
|
-
import { g as getUrl, h as httpRequest } from '../httpUtils-
|
|
3
|
+
import { g as getUrl, h as httpRequest } from '../httpUtils-ad4258b6.mjs';
|
|
4
4
|
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
|
|
6
6
|
* A function that should never be called unless we messed something up.
|
package/dist/links/httpLink.js
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var observable = require('@trpc/server/observable');
|
|
6
6
|
var transformResult = require('../transformResult-e15ccdf6.js');
|
|
7
|
-
var httpUtils = require('../httpUtils-
|
|
7
|
+
var httpUtils = require('../httpUtils-0961d5e3.js');
|
|
8
8
|
|
|
9
9
|
function httpLink(opts) {
|
|
10
10
|
const { url } = opts;
|
package/dist/links/httpLink.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { observable } from '@trpc/server/observable';
|
|
2
2
|
import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
|
|
3
|
-
import { h as httpRequest } from '../httpUtils-
|
|
3
|
+
import { h as httpRequest } from '../httpUtils-ad4258b6.mjs';
|
|
4
4
|
|
|
5
5
|
function httpLink(opts) {
|
|
6
6
|
const { url } = opts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../../../packages/client/src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;CACb;
|
|
1
|
+
{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../../../packages/client/src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;CACb;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CACH;AAED,aAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,oBAAY,kBAAkB,GAAG,eAAe,GAC9C,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,kBAAkB,UAgB9C;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAwC9B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/client",
|
|
3
|
-
"version": "10.0.0-proxy-alpha.
|
|
3
|
+
"version": "10.0.0-proxy-alpha.59",
|
|
4
4
|
"description": "tRPC Client lib",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"ts-watch": "tsc --project tsconfig.watch.json"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|
|
66
|
-
"@trpc/server": "10.0.0-proxy-alpha.
|
|
66
|
+
"@trpc/server": "10.0.0-proxy-alpha.59"
|
|
67
67
|
},
|
|
68
68
|
"devDependencies": {
|
|
69
|
-
"@trpc/server": "10.0.0-proxy-alpha.
|
|
69
|
+
"@trpc/server": "10.0.0-proxy-alpha.59"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "45d04747c5f1205b9e0037f888d9fefddea97768"
|
|
75
75
|
}
|
|
@@ -23,6 +23,9 @@ import {
|
|
|
23
23
|
TRPCSubscriptionObserver,
|
|
24
24
|
} from './internals/TRPCClient';
|
|
25
25
|
|
|
26
|
+
export type inferRouterProxyClient<TRouter extends AnyRouter> =
|
|
27
|
+
DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
|
|
28
|
+
|
|
26
29
|
type Resolver<TProcedure extends Procedure<any>> = (
|
|
27
30
|
...args: ProcedureArgs<TProcedure['_def']>
|
|
28
31
|
) => Promise<inferProcedureOutput<TProcedure>>;
|
|
@@ -36,9 +39,7 @@ type SubscriptionResolver<
|
|
|
36
39
|
opts: ProcedureArgs<TProcedure['_def']>[1] &
|
|
37
40
|
Partial<
|
|
38
41
|
TRPCSubscriptionObserver<
|
|
39
|
-
|
|
40
|
-
inferObservableValue<inferProcedureOutput<TProcedure>>
|
|
41
|
-
>,
|
|
42
|
+
inferObservableValue<inferProcedureOutput<TProcedure>>,
|
|
42
43
|
TRPCClientError<TRouter>
|
|
43
44
|
>
|
|
44
45
|
>,
|
|
@@ -101,7 +102,7 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
|
|
|
101
102
|
const fullPath = pathCopy.join('.');
|
|
102
103
|
return (client as any)[procedureType](fullPath, ...args);
|
|
103
104
|
});
|
|
104
|
-
return proxy as
|
|
105
|
+
return proxy as inferRouterProxyClient<TRouter>;
|
|
105
106
|
}
|
|
106
107
|
|
|
107
108
|
export function createTRPCProxyClient<TRouter extends AnyRouter>(
|
package/src/getFetch.ts
CHANGED
|
@@ -4,11 +4,13 @@ export function getFetch(f?: typeof fetch): typeof fetch {
|
|
|
4
4
|
if (f) {
|
|
5
5
|
return f;
|
|
6
6
|
}
|
|
7
|
+
|
|
7
8
|
const win = getWindow();
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
const globalFetch = win.fetch;
|
|
10
|
+
if (globalFetch) {
|
|
11
|
+
return typeof globalFetch.bind === 'function'
|
|
12
|
+
? globalFetch.bind(win)
|
|
13
|
+
: globalFetch;
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
throw new Error('No fetch implementation found');
|
|
@@ -2,11 +2,10 @@ export function getWindow() {
|
|
|
2
2
|
if (typeof window !== 'undefined') {
|
|
3
3
|
return window;
|
|
4
4
|
}
|
|
5
|
-
return
|
|
5
|
+
return globalThis;
|
|
6
6
|
}
|
|
7
7
|
export function getAbortController(
|
|
8
8
|
ac?: typeof AbortController,
|
|
9
9
|
): typeof AbortController | undefined {
|
|
10
|
-
|
|
11
|
-
return ac ?? win.AbortController ?? undefined;
|
|
10
|
+
return ac ?? getWindow().AbortController ?? undefined;
|
|
12
11
|
}
|
|
@@ -19,7 +19,6 @@ function arrayToDict(array: unknown[]) {
|
|
|
19
19
|
const METHOD = {
|
|
20
20
|
query: 'GET',
|
|
21
21
|
mutation: 'POST',
|
|
22
|
-
subscription: 'PATCH',
|
|
23
22
|
} as const;
|
|
24
23
|
|
|
25
24
|
export interface HTTPResult {
|
|
@@ -87,8 +86,11 @@ export function httpRequest(
|
|
|
87
86
|
|
|
88
87
|
const meta = {} as HTTPResult['meta'];
|
|
89
88
|
Promise.resolve(runtime.headers())
|
|
90
|
-
.then((headers) =>
|
|
91
|
-
|
|
89
|
+
.then((headers) => {
|
|
90
|
+
if (type === 'subscription') {
|
|
91
|
+
throw new Error('Subscriptions should use wsLink');
|
|
92
|
+
}
|
|
93
|
+
return runtime.fetch(url, {
|
|
92
94
|
method: METHOD[type],
|
|
93
95
|
signal: ac?.signal,
|
|
94
96
|
body: body,
|
|
@@ -96,8 +98,8 @@ export function httpRequest(
|
|
|
96
98
|
'content-type': 'application/json',
|
|
97
99
|
...headers,
|
|
98
100
|
},
|
|
99
|
-
})
|
|
100
|
-
)
|
|
101
|
+
});
|
|
102
|
+
})
|
|
101
103
|
.then((_res) => {
|
|
102
104
|
meta.response = _res;
|
|
103
105
|
return _res.json();
|