@mionjs/client 0.8.4-alpha.0 → 0.8.6
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/cjs/index.cjs +1 -1
- package/.dist/cjs/index.d.ts +1 -1
- package/.dist/cjs/src/client.cjs +1 -1
- package/.dist/cjs/src/client.cjs.map +1 -1
- package/.dist/cjs/src/client.d.ts +8 -6
- package/.dist/cjs/src/constants.cjs +1 -1
- package/.dist/cjs/src/constants.cjs.map +1 -1
- package/.dist/cjs/src/constants.d.ts +1 -1
- package/.dist/cjs/src/lib/clientMethodsMetadata.cjs +1 -1
- package/.dist/cjs/src/lib/clientMethodsMetadata.cjs.map +1 -1
- package/.dist/cjs/src/lib/clientMethodsMetadata.d.ts +7 -3
- package/.dist/cjs/src/lib/fetchRemoteMethodsMetadata.cjs +2 -0
- package/.dist/cjs/src/lib/fetchRemoteMethodsMetadata.cjs.map +1 -0
- package/.dist/cjs/src/lib/fetchRemoteMethodsMetadata.d.ts +2 -0
- package/.dist/cjs/src/lib/serializer.cjs +1 -1
- package/.dist/cjs/src/lib/serializer.cjs.map +1 -1
- package/.dist/cjs/src/lib/serializer.d.ts +2 -1
- package/.dist/cjs/src/lib/testUtils.cjs +1 -1
- package/.dist/cjs/src/lib/testUtils.cjs.map +1 -1
- package/.dist/cjs/src/request.cjs +1 -1
- package/.dist/cjs/src/request.cjs.map +1 -1
- package/.dist/cjs/src/request.d.ts +10 -4
- package/.dist/cjs/src/routesFlow.cjs +1 -1
- package/.dist/cjs/src/routesFlow.cjs.map +1 -1
- package/.dist/cjs/src/routesFlow.d.ts +2 -2
- package/.dist/cjs/src/subRequest.cjs +1 -1
- package/.dist/cjs/src/subRequest.cjs.map +1 -1
- package/.dist/cjs/src/subRequest.d.ts +4 -5
- package/.dist/cjs/src/types.d.ts +54 -26
- package/.dist/esm/index.d.ts +1 -1
- package/.dist/esm/index.js +5 -4
- package/.dist/esm/src/client.d.ts +8 -6
- package/.dist/esm/src/client.js +22 -17
- package/.dist/esm/src/client.js.map +1 -1
- package/.dist/esm/src/constants.d.ts +1 -1
- package/.dist/esm/src/constants.js +1 -1
- package/.dist/esm/src/constants.js.map +1 -1
- package/.dist/esm/src/lib/clientMethodsMetadata.d.ts +7 -3
- package/.dist/esm/src/lib/clientMethodsMetadata.js +30 -47
- package/.dist/esm/src/lib/clientMethodsMetadata.js.map +1 -1
- package/.dist/esm/src/lib/fetchRemoteMethodsMetadata.d.ts +2 -0
- package/.dist/esm/src/lib/fetchRemoteMethodsMetadata.js +31 -0
- package/.dist/esm/src/lib/fetchRemoteMethodsMetadata.js.map +1 -0
- package/.dist/esm/src/lib/serializer.d.ts +2 -1
- package/.dist/esm/src/lib/serializer.js +87 -54
- package/.dist/esm/src/lib/serializer.js.map +1 -1
- package/.dist/esm/src/lib/testUtils.js +3 -37
- package/.dist/esm/src/lib/testUtils.js.map +1 -1
- package/.dist/esm/src/request.d.ts +10 -4
- package/.dist/esm/src/request.js +105 -48
- package/.dist/esm/src/request.js.map +1 -1
- package/.dist/esm/src/routesFlow.d.ts +2 -2
- package/.dist/esm/src/routesFlow.js +9 -5
- package/.dist/esm/src/routesFlow.js.map +1 -1
- package/.dist/esm/src/subRequest.d.ts +4 -5
- package/.dist/esm/src/subRequest.js +7 -13
- package/.dist/esm/src/subRequest.js.map +1 -1
- package/.dist/esm/src/types.d.ts +54 -26
- package/package.json +8 -8
- package/.dist/cjs/_virtual/jit-fns.cjs +0 -319
- package/.dist/cjs/_virtual/jit-fns.cjs.map +0 -1
- package/.dist/cjs/_virtual/pure-fns.cjs +0 -56
- package/.dist/cjs/_virtual/pure-fns.cjs.map +0 -1
- package/.dist/cjs/_virtual/router-cache.cjs +0 -2
- package/.dist/cjs/_virtual/router-cache.cjs.map +0 -1
- package/.dist/cjs/src/aot/aotCaches.cjs +0 -2
- package/.dist/cjs/src/aot/aotCaches.cjs.map +0 -1
- package/.dist/cjs/src/aot/aotCaches.d.ts +0 -5
- package/.dist/esm/_virtual/jit-fns.js +0 -1395
- package/.dist/esm/_virtual/jit-fns.js.map +0 -1
- package/.dist/esm/_virtual/pure-fns.js +0 -109
- package/.dist/esm/_virtual/pure-fns.js.map +0 -1
- package/.dist/esm/_virtual/router-cache.js +0 -5
- package/.dist/esm/_virtual/router-cache.js.map +0 -1
- package/.dist/esm/src/aot/aotCaches.d.ts +0 -5
- package/.dist/esm/src/aot/aotCaches.js +0 -16
- package/.dist/esm/src/aot/aotCaches.js.map +0 -1
|
@@ -1,43 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getAOTCaches } from "../aot/aotCaches.js";
|
|
1
|
+
import { routesCache, resetJitFnCaches, resetJitFunctionsCache } from "@mionjs/core";
|
|
3
2
|
function resetClientCaches() {
|
|
4
|
-
const
|
|
3
|
+
const cache = routesCache.getCache();
|
|
5
4
|
for (const key in cache)
|
|
6
|
-
|
|
5
|
+
delete cache[key];
|
|
7
6
|
resetJitFnCaches(), resetJitFunctionsCache();
|
|
8
|
-
const neededJitHashes = /* @__PURE__ */ new Set(), neededPureFnKeys = /* @__PURE__ */ new Set();
|
|
9
|
-
for (const routeId of mionRouteIds) {
|
|
10
|
-
const meta = routesCache.getMetadata(routeId);
|
|
11
|
-
meta && (collectJitDepsFromParentHash(meta.paramsJitHash, neededJitHashes, neededPureFnKeys, jitFnsCache), collectJitDepsFromParentHash(meta.returnJitHash, neededJitHashes, neededPureFnKeys, jitFnsCache), meta.headersParam && collectJitDepsFromParentHash(meta.headersParam.jitHash, neededJitHashes, neededPureFnKeys, jitFnsCache), meta.headersReturn && collectJitDepsFromParentHash(meta.headersReturn.jitHash, neededJitHashes, neededPureFnKeys, jitFnsCache));
|
|
12
|
-
}
|
|
13
|
-
const filteredJitFns = {};
|
|
14
|
-
for (const hash of neededJitHashes)
|
|
15
|
-
hash in jitFnsCache && (filteredJitFns[hash] = jitFnsCache[hash]);
|
|
16
|
-
const filteredPureFns = {};
|
|
17
|
-
for (const key of neededPureFnKeys) {
|
|
18
|
-
const [ns, fnHash] = key.split("::");
|
|
19
|
-
pureFnsCache[ns]?.[fnHash] && (filteredPureFns[ns] || (filteredPureFns[ns] = {}), filteredPureFns[ns][fnHash] = pureFnsCache[ns][fnHash]);
|
|
20
|
-
}
|
|
21
|
-
(Object.keys(filteredJitFns).length > 0 || Object.keys(filteredPureFns).length > 0) && addAOTCaches(filteredJitFns, filteredPureFns);
|
|
22
|
-
}
|
|
23
|
-
function collectJitDepsFromParentHash(parentHash, jitHashes, pureFnKeys, jitFnsCache) {
|
|
24
|
-
if (!parentHash)
|
|
25
|
-
return;
|
|
26
|
-
const hashes = getJitFnHashes(parentHash);
|
|
27
|
-
for (const individualHash of Object.values(hashes))
|
|
28
|
-
collectJitDeps(individualHash, jitHashes, pureFnKeys, jitFnsCache);
|
|
29
|
-
}
|
|
30
|
-
function collectJitDeps(hash, jitHashes, pureFnKeys, jitFnsCache) {
|
|
31
|
-
if (!hash || jitHashes.has(hash))
|
|
32
|
-
return;
|
|
33
|
-
jitHashes.add(hash);
|
|
34
|
-
const entry = jitFnsCache[hash];
|
|
35
|
-
if (entry) {
|
|
36
|
-
for (const dep of entry.jitDependencies)
|
|
37
|
-
collectJitDeps(dep, jitHashes, pureFnKeys, jitFnsCache);
|
|
38
|
-
for (const pureDep of entry.pureFnDependencies)
|
|
39
|
-
pureFnKeys.add(pureDep);
|
|
40
|
-
}
|
|
41
7
|
}
|
|
42
8
|
export {
|
|
43
9
|
resetClientCaches
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testUtils.js","sources":["../../../../src/lib/testUtils.ts"],"sourcesContent":["/* ########\n * 2024 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {
|
|
1
|
+
{"version":3,"file":"testUtils.js","sources":["../../../../src/lib/testUtils.ts"],"sourcesContent":["/* ########\n * 2024 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {resetJitFnCaches, resetJitFunctionsCache, routesCache} from '@mionjs/core';\n\n/** Resets all client caches. Only for testing — simulates app restart. */\nexport function resetClientCaches() {\n const cache = routesCache.getCache();\n for (const key in cache) delete cache[key];\n resetJitFnCaches();\n resetJitFunctionsCache();\n}\n"],"names":[],"mappings":";SAUgB,oBAAiB;AAC7B,QAAM,QAAQ,YAAY,SAAA;AAC1B,aAAW,OAAO;AAAO,WAAO,MAAM,GAAG;AACzC,mBAAA,GACA,uBAAA;AACJ;"}
|
|
@@ -1,24 +1,30 @@
|
|
|
1
1
|
import { ResponseBody } from '@mionjs/router';
|
|
2
|
-
import { ClientOptions,
|
|
2
|
+
import { ClientOptions, MiddlewareSubRequest, SubRequest, RouteSubRequest, PrefilledMiddleFnsCache } from './types.ts';
|
|
3
3
|
import { RunTypeError } from '@mionjs/core';
|
|
4
|
-
export declare class MionClientRequest<RR extends
|
|
4
|
+
export declare class MionClientRequest<RR extends RouteSubRequest<any>, MiddleFnRequestsList extends MiddlewareSubRequest<any>[]> {
|
|
5
5
|
readonly options: ClientOptions;
|
|
6
6
|
private readonly prefilledMiddleFnsCache;
|
|
7
7
|
readonly route?: RR | undefined;
|
|
8
8
|
readonly middleFns?: MiddleFnRequestsList | undefined;
|
|
9
|
-
readonly workflowSubRequests?:
|
|
9
|
+
readonly workflowSubRequests?: RouteSubRequest<any>[] | undefined;
|
|
10
|
+
readonly signal?: AbortSignal | undefined;
|
|
10
11
|
readonly path: string;
|
|
11
12
|
readonly requestId: string;
|
|
12
13
|
readonly subRequestList: {
|
|
13
14
|
[key: string]: SubRequest<any>;
|
|
14
15
|
};
|
|
15
16
|
response: Response | undefined;
|
|
16
|
-
constructor(options: ClientOptions, prefilledMiddleFnsCache: PrefilledMiddleFnsCache, route?: RR | undefined, middleFns?: MiddleFnRequestsList | undefined, workflowSubRequests?:
|
|
17
|
+
constructor(options: ClientOptions, prefilledMiddleFnsCache: PrefilledMiddleFnsCache, route?: RR | undefined, middleFns?: MiddleFnRequestsList | undefined, workflowSubRequests?: RouteSubRequest<any>[] | undefined, signal?: AbortSignal | undefined);
|
|
17
18
|
call(): Promise<ResponseBody>;
|
|
19
|
+
private makeCall;
|
|
20
|
+
private shouldRetryWithProperSerialization;
|
|
21
|
+
private retryWithProperSerialization;
|
|
18
22
|
validateParams(subReqList?: SubRequest<any>[]): Promise<RunTypeError[]>;
|
|
19
23
|
prefill(subReqList?: SubRequest<any>[]): Promise<void>;
|
|
20
24
|
removePrefill(subRequests?: SubRequest<any>[]): Promise<void>;
|
|
21
25
|
addSubRequest(subRequest: SubRequest<any>): void;
|
|
26
|
+
private handlePlatformError;
|
|
27
|
+
private resolveSubRequests;
|
|
22
28
|
private onError;
|
|
23
29
|
private getResponseValueFromBodyOrHeader;
|
|
24
30
|
private restorePrefilledMiddleFns;
|
package/.dist/esm/src/request.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { getRoutePath, toBase64Url, MION_ROUTES, isRpcError, RpcError,
|
|
2
|
-
import { fetchRemoteMethodsMetadata } from "./lib/
|
|
1
|
+
import { getRoutePath, toBase64Url, routesCache, MION_ROUTES, isRpcError, RpcError, HandlerType, HeadersSubset } from "@mionjs/core";
|
|
2
|
+
import { fetchRemoteMethodsMetadata } from "./lib/fetchRemoteMethodsMetadata.js";
|
|
3
|
+
import { createMetadataSubRequest } from "./lib/clientMethodsMetadata.js";
|
|
3
4
|
import { validateSubRequests } from "./lib/validation.js";
|
|
4
5
|
import { serializeRequestBody, deserializeResponseBody } from "./lib/serializer.js";
|
|
5
6
|
import { ROUTES_FLOW_KEY, MAX_GET_URL_LENGTH } from "./constants.js";
|
|
@@ -9,12 +10,13 @@ class MionClientRequest {
|
|
|
9
10
|
route;
|
|
10
11
|
middleFns;
|
|
11
12
|
workflowSubRequests;
|
|
13
|
+
signal;
|
|
12
14
|
path;
|
|
13
15
|
requestId;
|
|
14
16
|
subRequestList = {};
|
|
15
17
|
response;
|
|
16
|
-
constructor(options, prefilledMiddleFnsCache, route, middleFns, workflowSubRequests) {
|
|
17
|
-
if (this.options = options, this.prefilledMiddleFnsCache = prefilledMiddleFnsCache, this.route = route, this.middleFns = middleFns, this.workflowSubRequests = workflowSubRequests, workflowSubRequests && workflowSubRequests.length > 0) {
|
|
18
|
+
constructor(options, prefilledMiddleFnsCache, route, middleFns, workflowSubRequests, signal) {
|
|
19
|
+
if (this.options = options, this.prefilledMiddleFnsCache = prefilledMiddleFnsCache, this.route = route, this.middleFns = middleFns, this.workflowSubRequests = workflowSubRequests, this.signal = signal, workflowSubRequests && workflowSubRequests.length > 0) {
|
|
18
20
|
const routePaths = workflowSubRequests.map((sr) => getRoutePath(sr.pointer, this.options)), query = buildRoutesFlowQuery(routePaths, workflowSubRequests), flowPath = getRoutePath([ROUTES_FLOW_KEY], this.options);
|
|
19
21
|
this.path = `${flowPath}?data=${toBase64Url(JSON.stringify(query))}`, this.requestId = "mion-routes-flow", workflowSubRequests.forEach((sr) => this.addSubRequest(sr));
|
|
20
22
|
} else
|
|
@@ -23,63 +25,58 @@ class MionClientRequest {
|
|
|
23
25
|
}
|
|
24
26
|
/** Calls a remote route */
|
|
25
27
|
async call() {
|
|
26
|
-
|
|
28
|
+
if (this.signal?.aborted) {
|
|
29
|
+
const errors = /* @__PURE__ */ new Map();
|
|
30
|
+
return this.onError(this.signal.reason ?? new DOMException("This operation was aborted", "AbortError"), "Request aborted", errors), Promise.reject(errors);
|
|
31
|
+
}
|
|
32
|
+
return this.makeCall(this.options.serializer);
|
|
33
|
+
}
|
|
34
|
+
/** Call flow that auto-detects missing metadata and uses optimistic serialization when needed */
|
|
35
|
+
async makeCall(originalSerializer, skipOptimistic) {
|
|
36
|
+
const errors = /* @__PURE__ */ new Map(), subRequestIds = Object.keys(this.subRequestList), isOptimistic = !subRequestIds.every((id) => routesCache.hasMetadata(id)) && !skipOptimistic;
|
|
27
37
|
try {
|
|
28
|
-
|
|
29
|
-
|
|
38
|
+
if (isOptimistic) {
|
|
39
|
+
this.options.serializer = "optimistic", this.restorePrefilledMiddleFns();
|
|
40
|
+
const allSubRequestIds = Object.keys(this.subRequestList);
|
|
41
|
+
this.addSubRequest(createMetadataSubRequest(allSubRequestIds));
|
|
42
|
+
} else if (this.options.serializer = originalSerializer, await fetchRemoteMethodsMetadata(subRequestIds, this.options, this.signal), this.restorePrefilledMiddleFns(errors), errors.size || (validateSubRequests(subRequestIds, this, errors), errors.size))
|
|
30
43
|
return Promise.reject(errors);
|
|
31
44
|
} catch (error) {
|
|
32
45
|
return this.onError(error, "Error preparing request", errors), Promise.reject(errors);
|
|
33
46
|
}
|
|
34
47
|
try {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}) : fetchOptions = {
|
|
45
|
-
...this.options.fetchOptions,
|
|
46
|
-
method: "POST",
|
|
47
|
-
headers: {
|
|
48
|
-
...this.options.fetchOptions.headers,
|
|
49
|
-
...headersFromParams,
|
|
50
|
-
"Content-Type": serialized.contentType
|
|
51
|
-
},
|
|
52
|
-
body: serialized.body
|
|
53
|
-
};
|
|
54
|
-
} else
|
|
55
|
-
fetchOptions = {
|
|
56
|
-
...this.options.fetchOptions,
|
|
57
|
-
method: "POST",
|
|
58
|
-
headers: { ...this.options.fetchOptions.headers, ...headersFromParams, "Content-Type": serialized.contentType },
|
|
59
|
-
body: serialized.body
|
|
60
|
-
};
|
|
48
|
+
let serialized;
|
|
49
|
+
try {
|
|
50
|
+
serialized = serializeRequestBody(this);
|
|
51
|
+
} catch (serializeError) {
|
|
52
|
+
if (isOptimistic)
|
|
53
|
+
return delete this.subRequestList[MION_ROUTES.methodsMetadata], this.makeCall(originalSerializer, !0);
|
|
54
|
+
throw serializeError;
|
|
55
|
+
}
|
|
56
|
+
const headersFromParams = extractRequestHeaders(this), url = new URL(this.path, this.options.baseURL), fetchOptions = buildFetchOptions(url, serialized, headersFromParams, this.options, isOptimistic, this.isQueryRoute(), this.signal);
|
|
61
57
|
this.response = await fetch(url, fetchOptions);
|
|
62
58
|
} catch (error) {
|
|
63
59
|
return this.onError(error, "Error executing request", errors), Promise.reject(errors);
|
|
64
60
|
}
|
|
65
61
|
try {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
methodMeta.isResolved = !0, methodMeta.error = platformError, errors.set(id, platformError);
|
|
71
|
-
}), Promise.reject(errors);
|
|
72
|
-
}
|
|
73
|
-
return Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {
|
|
74
|
-
const resp = this.getResponseValueFromBodyOrHeader(id, deserialized, this.response.headers);
|
|
75
|
-
methodMeta.isResolved = !0, isRpcError(resp) ? (methodMeta.error = resp, errors.set(id, resp)) : methodMeta.resolvedValue = resp;
|
|
76
|
-
}), Object.entries(deserialized).forEach(([id, value]) => {
|
|
77
|
-
!(id in this.subRequestList) && isRpcError(value) && errors.set(id, value);
|
|
78
|
-
}), errors.size ? Promise.reject(errors) : deserialized;
|
|
62
|
+
if (this.signal?.aborted)
|
|
63
|
+
return this.onError(this.signal.reason, "Request aborted", errors), Promise.reject(errors);
|
|
64
|
+
const deserialized = await deserializeResponseBody(this.response, this.options);
|
|
65
|
+
return this.handlePlatformError(deserialized, errors) ? Promise.reject(errors) : isOptimistic && !this.signal?.aborted && this.shouldRetryWithProperSerialization(deserialized) ? this.retryWithProperSerialization(originalSerializer) : (this.resolveSubRequests(deserialized, errors, isOptimistic ? MION_ROUTES.methodsMetadata : void 0), errors.size ? Promise.reject(errors) : deserialized);
|
|
79
66
|
} catch (error) {
|
|
80
67
|
return this.onError(error, "Error parsing response", errors), Promise.reject(errors);
|
|
81
68
|
}
|
|
82
69
|
}
|
|
70
|
+
/** Checks if the response contains errors that require retry with proper JIT serialization */
|
|
71
|
+
shouldRetryWithProperSerialization(deserialized) {
|
|
72
|
+
return Object.values(deserialized).some((value) => isRpcError(value) && (value.type === "serialization-error" || value.type === "validation-error" || value.type === "parsing-json-request-error"));
|
|
73
|
+
}
|
|
74
|
+
/** Retries the request with proper JIT serialization after metadata has been cached */
|
|
75
|
+
async retryWithProperSerialization(originalSerializer) {
|
|
76
|
+
return delete this.subRequestList[MION_ROUTES.methodsMetadata], Object.values(this.subRequestList).forEach((sr) => {
|
|
77
|
+
sr.isResolved = !1, sr.resolvedValue = void 0, sr.error = void 0;
|
|
78
|
+
}), this.makeCall(originalSerializer);
|
|
79
|
+
}
|
|
83
80
|
/** Validate params */
|
|
84
81
|
async validateParams(subReqList) {
|
|
85
82
|
subReqList && subReqList.forEach((subRequest) => this.addSubRequest(subRequest));
|
|
@@ -111,7 +108,46 @@ class MionClientRequest {
|
|
|
111
108
|
throw new Error(`SubRequest ${subRequest.id} is already resolved`);
|
|
112
109
|
this.subRequestList[subRequest.id] = subRequest;
|
|
113
110
|
}
|
|
111
|
+
/** Checks for platform-level errors and propagates them to all subrequests. Returns true if a platform error was found */
|
|
112
|
+
handlePlatformError(deserialized, errors) {
|
|
113
|
+
if (!(MION_ROUTES.platformError in deserialized))
|
|
114
|
+
return !1;
|
|
115
|
+
const platformError = deserialized[MION_ROUTES.platformError];
|
|
116
|
+
return Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {
|
|
117
|
+
methodMeta.isResolved = !0, methodMeta.error = platformError, errors.set(id, platformError);
|
|
118
|
+
}), !0;
|
|
119
|
+
}
|
|
120
|
+
/** Resolves sub request values from the deserialized response body and collects errors */
|
|
121
|
+
resolveSubRequests(deserialized, errors, skipId) {
|
|
122
|
+
Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {
|
|
123
|
+
if (id === skipId)
|
|
124
|
+
return;
|
|
125
|
+
const resp = this.getResponseValueFromBodyOrHeader(id, deserialized, this.response.headers);
|
|
126
|
+
methodMeta.isResolved = !0, isRpcError(resp) ? (methodMeta.error = resp, errors.set(id, resp)) : methodMeta.resolvedValue = resp;
|
|
127
|
+
}), Object.entries(deserialized).forEach(([id, value]) => {
|
|
128
|
+
!(id in this.subRequestList) && isRpcError(value) && errors.set(id, value);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
114
131
|
onError(error, stageMessage, errors) {
|
|
132
|
+
const reason = this.signal?.aborted ? this.signal.reason : void 0;
|
|
133
|
+
if (reason instanceof DOMException) {
|
|
134
|
+
if (reason.name === "TimeoutError") {
|
|
135
|
+
errors.set(this.requestId, new RpcError({
|
|
136
|
+
type: "request-timeout",
|
|
137
|
+
publicMessage: "Request timed out",
|
|
138
|
+
originalError: error instanceof Error ? error : void 0
|
|
139
|
+
}));
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
if (reason.name === "AbortError") {
|
|
143
|
+
errors.set(this.requestId, new RpcError({
|
|
144
|
+
type: "request-aborted",
|
|
145
|
+
publicMessage: "Request was aborted",
|
|
146
|
+
originalError: error instanceof Error ? error : void 0
|
|
147
|
+
}));
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
115
151
|
if (isRpcError(error)) {
|
|
116
152
|
errors.set(this.requestId, error);
|
|
117
153
|
return;
|
|
@@ -127,6 +163,7 @@ class MionClientRequest {
|
|
|
127
163
|
const headersSubset = reconstructHeadersSubsetFromResponse(id, headers);
|
|
128
164
|
return headersSubset || respBody[id];
|
|
129
165
|
}
|
|
166
|
+
/** When errors is omitted, silently skips routes without cached metadata (used by optimistic flow) */
|
|
130
167
|
restorePrefilledMiddleFns(errors) {
|
|
131
168
|
if (this.workflowSubRequests && this.workflowSubRequests.length > 0) {
|
|
132
169
|
this.restorePrefilledMiddleFnsForWorkflow(errors);
|
|
@@ -134,7 +171,7 @@ class MionClientRequest {
|
|
|
134
171
|
}
|
|
135
172
|
const methodMeta = routesCache.getMetadata(this.requestId);
|
|
136
173
|
if (!methodMeta) {
|
|
137
|
-
errors.set(this.requestId, new RpcError({
|
|
174
|
+
errors && errors.set(this.requestId, new RpcError({
|
|
138
175
|
type: "route-metadata-not-found",
|
|
139
176
|
publicMessage: `Metadata for Route '${this.requestId} not found.'.`
|
|
140
177
|
}));
|
|
@@ -161,7 +198,7 @@ class MionClientRequest {
|
|
|
161
198
|
for (const routeSubRequest of this.workflowSubRequests) {
|
|
162
199
|
const methodMeta = routesCache.getMetadata(routeSubRequest.id);
|
|
163
200
|
if (!methodMeta) {
|
|
164
|
-
errors.set(routeSubRequest.id, new RpcError({
|
|
201
|
+
errors && errors.set(routeSubRequest.id, new RpcError({
|
|
165
202
|
type: "route-metadata-not-found",
|
|
166
203
|
publicMessage: `Metadata for Route '${routeSubRequest.id}' not found.`
|
|
167
204
|
}));
|
|
@@ -213,6 +250,26 @@ class MionClientRequest {
|
|
|
213
250
|
return `${this.options.baseURL}:${id}`;
|
|
214
251
|
}
|
|
215
252
|
}
|
|
253
|
+
function buildFetchOptions(url, serialized, headersFromParams, options, isOptimistic, isQuery, signal) {
|
|
254
|
+
if (!isOptimistic && isQuery && serialized.contentType.includes("json")) {
|
|
255
|
+
const encoded = toBase64Url(serialized.body), testUrl = new URL(url.pathname + url.search, url.origin);
|
|
256
|
+
if (testUrl.searchParams.set("data", encoded), testUrl.toString().length <= MAX_GET_URL_LENGTH)
|
|
257
|
+
return url.searchParams.set("data", encoded), {
|
|
258
|
+
...options.fetchOptions,
|
|
259
|
+
method: "GET",
|
|
260
|
+
headers: { ...options.fetchOptions.headers, ...headersFromParams },
|
|
261
|
+
body: void 0,
|
|
262
|
+
signal
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
return {
|
|
266
|
+
...options.fetchOptions,
|
|
267
|
+
method: "POST",
|
|
268
|
+
headers: { ...options.fetchOptions.headers, ...headersFromParams, "Content-Type": serialized.contentType },
|
|
269
|
+
body: serialized.body,
|
|
270
|
+
signal
|
|
271
|
+
};
|
|
272
|
+
}
|
|
216
273
|
function extractRequestHeaders(req) {
|
|
217
274
|
const headers = {}, subRequestIds = Object.keys(req.subRequestList);
|
|
218
275
|
for (let i = 0; i < subRequestIds.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sources":["../../../src/request.ts"],"sourcesContent":["/* ########\n * 2023 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport type {ResponseBody} from '@mionjs/router';\nimport {ClientOptions, HSubRequest, SubRequest, RSubRequest, RequestErrors, PrefilledMiddleFnsCache} from './types.ts';\nimport type {RunTypeError, RoutesFlowQuery, RoutesFlowMapping} from '@mionjs/core';\nimport {RpcError, isRpcError, routesCache, MION_ROUTES, HandlerType, HeadersSubset, toBase64Url} from '@mionjs/core';\nimport {getRoutePath} from '@mionjs/core';\nimport {fetchRemoteMethodsMetadata} from './lib/clientMethodsMetadata.ts';\nimport {validateSubRequests} from './lib/validation.ts';\nimport {serializeRequestBody, deserializeResponseBody} from './lib/serializer.ts';\nimport {ROUTES_FLOW_KEY, MAX_GET_URL_LENGTH} from './constants.ts';\n\nexport class MionClientRequest<RR extends RSubRequest<any>, MiddleFnRequestsList extends HSubRequest<any>[]> {\n readonly path: string;\n readonly requestId: string;\n readonly subRequestList: {[key: string]: SubRequest<any>} = {};\n response: Response | undefined;\n\n constructor(\n public readonly options: ClientOptions,\n private readonly prefilledMiddleFnsCache: PrefilledMiddleFnsCache,\n public readonly route?: RR,\n public readonly middleFns?: MiddleFnRequestsList,\n /** Array of routesFlow subrequests when executing a routesFlow */\n public readonly workflowSubRequests?: RSubRequest<any>[]\n ) {\n if (workflowSubRequests && workflowSubRequests.length > 0) {\n const routePaths = workflowSubRequests.map((sr) => getRoutePath(sr.pointer, this.options));\n const query = buildRoutesFlowQuery(routePaths, workflowSubRequests);\n const flowPath = getRoutePath([ROUTES_FLOW_KEY], this.options);\n this.path = `${flowPath}?data=${toBase64Url(JSON.stringify(query))}`;\n this.requestId = 'mion-routes-flow';\n workflowSubRequests.forEach((sr) => this.addSubRequest(sr));\n } else {\n this.path = route ? getRoutePath(route.pointer, this.options) : 'no-route';\n this.requestId = route ? route.id : 'no-route';\n if (route) this.addSubRequest(route);\n }\n if (middleFns) middleFns.forEach((middleFn) => this.addSubRequest(middleFn));\n }\n\n /** Calls a remote route */\n async call(): Promise<ResponseBody> {\n const errors: RequestErrors = new Map();\n\n try {\n const subRequestIds = Object.keys(this.subRequestList);\n await fetchRemoteMethodsMetadata(subRequestIds, this.options);\n\n this.restorePrefilledMiddleFns(errors);\n if (errors.size) return Promise.reject(errors);\n\n validateSubRequests(subRequestIds, this, errors);\n if (errors.size) return Promise.reject(errors);\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n\n try {\n const serialized = serializeRequestBody(this);\n const headersFromParams = extractRequestHeaders(this);\n\n const url = new URL(this.path, this.options.baseURL);\n let fetchOptions: RequestInit;\n\n if (this.isQueryRoute() && serialized.contentType.includes('json')) {\n const encoded = toBase64Url(serialized.body as string);\n const testUrl = new URL(this.path, this.options.baseURL);\n testUrl.searchParams.set('data', encoded);\n\n if (testUrl.toString().length <= MAX_GET_URL_LENGTH) {\n url.searchParams.set('data', encoded);\n fetchOptions = {\n ...this.options.fetchOptions,\n method: 'GET',\n headers: {...this.options.fetchOptions.headers, ...headersFromParams},\n body: undefined,\n };\n } else {\n fetchOptions = {\n ...this.options.fetchOptions,\n method: 'POST',\n headers: {\n ...this.options.fetchOptions.headers,\n ...headersFromParams,\n 'Content-Type': serialized.contentType,\n },\n body: serialized.body as BodyInit,\n };\n }\n } else {\n fetchOptions = {\n ...this.options.fetchOptions,\n method: 'POST',\n headers: {...this.options.fetchOptions.headers, ...headersFromParams, 'Content-Type': serialized.contentType},\n body: serialized.body as BodyInit,\n };\n }\n this.response = await fetch(url, fetchOptions);\n } catch (error: any) {\n this.onError(error, 'Error executing request', errors);\n return Promise.reject(errors);\n }\n\n try {\n const deserialized = await deserializeResponseBody(this.response);\n\n if (MION_ROUTES.platformError in deserialized) {\n const platformError = deserialized[MION_ROUTES.platformError];\n Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {\n methodMeta.isResolved = true;\n methodMeta.error = platformError as RpcError<string>;\n errors.set(id, platformError as RpcError<string>);\n });\n return Promise.reject(errors);\n }\n\n Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {\n const resp = this.getResponseValueFromBodyOrHeader(id, deserialized, (this.response as Response).headers);\n methodMeta.isResolved = true;\n if (isRpcError(resp)) {\n methodMeta.error = resp;\n errors.set(id, resp);\n } else {\n methodMeta.resolvedValue = resp;\n }\n });\n\n Object.entries(deserialized).forEach(([id, value]) => {\n if (!(id in this.subRequestList) && isRpcError(value)) {\n errors.set(id, value);\n }\n });\n\n if (errors.size) return Promise.reject(errors);\n return deserialized;\n } catch (error) {\n this.onError(error, 'Error parsing response', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Validate params */\n async validateParams(subReqList?: SubRequest<any>[]): Promise<RunTypeError[]> {\n if (subReqList) subReqList.forEach((subRequest) => this.addSubRequest(subRequest));\n const errors: RequestErrors = new Map();\n try {\n const subRequestIds = Object.keys(this.subRequestList);\n await fetchRemoteMethodsMetadata(subRequestIds, this.options);\n validateSubRequests(subRequestIds, this, errors, false);\n return Object.values(this.subRequestList)\n .map((subRequest) => subRequest.error?.errorData || [])\n .flat();\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Prefills and stores SubRequest */\n async prefill(subReqList?: SubRequest<any>[]): Promise<void> {\n if (subReqList) subReqList.forEach((subRequest) => this.addSubRequest(subRequest));\n const errors: RequestErrors = new Map();\n try {\n const subRequestIds = Object.keys(this.subRequestList);\n await fetchRemoteMethodsMetadata(subRequestIds, this.options);\n\n validateSubRequests(subRequestIds, this, errors, false);\n if (errors.size) return Promise.reject(errors);\n\n serializeRequestBody(this);\n\n this.storePrefilledMiddleFns(errors);\n if (errors.size) return Promise.reject(errors);\n\n return;\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Removes Prefills and stores SubRequest */\n async removePrefill(subRequests?: SubRequest<any>[]): Promise<void> {\n if (subRequests) subRequests.forEach((subRequest) => this.addSubRequest(subRequest));\n this.removePrefilledMiddleFns();\n }\n\n addSubRequest(subRequest: SubRequest<any>) {\n if (subRequest.isResolved) throw new Error(`SubRequest ${subRequest.id} is already resolved`);\n this.subRequestList[subRequest.id] = subRequest;\n }\n\n private onError(error: any, stageMessage: string, errors: RequestErrors): void {\n if (isRpcError(error)) {\n errors.set(this.requestId, error);\n return;\n }\n const message = error?.message ? `${stageMessage}: ${error.message}` : `${stageMessage}: Unknown Error`;\n errors.set(\n this.requestId,\n new RpcError({\n type: error?.name || 'unknown-error',\n publicMessage: message,\n originalError: error instanceof Error ? error : undefined,\n })\n );\n }\n\n private getResponseValueFromBodyOrHeader(id: string, respBody: ResponseBody, headers: Headers): any {\n const headersSubset = reconstructHeadersSubsetFromResponse(id, headers);\n if (headersSubset) return headersSubset;\n return respBody[id];\n }\n\n private restorePrefilledMiddleFns(errors: RequestErrors): void {\n if (this.workflowSubRequests && this.workflowSubRequests.length > 0) {\n this.restorePrefilledMiddleFnsForWorkflow(errors);\n return;\n }\n\n const methodMeta = routesCache.getMetadata(this.requestId);\n if (!methodMeta) {\n errors.set(\n this.requestId,\n new RpcError({\n type: 'route-metadata-not-found',\n publicMessage: `Metadata for Route '${this.requestId} not found.'.`,\n })\n );\n return;\n }\n const missingIds = methodMeta.middleFnIds?.filter((id) => !!id && this.requestId !== id) || [];\n missingIds.forEach((id) => {\n const subRequest = this.subRequestList[id];\n if (subRequest) return;\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n const cachedSubRequest = this.prefilledMiddleFnsCache.get(cacheKey);\n if (cachedSubRequest) {\n const clonedSubRequest: SubRequest<any> = {\n ...cachedSubRequest,\n isResolved: false,\n resolvedValue: undefined,\n error: undefined,\n };\n this.addSubRequest(clonedSubRequest);\n }\n });\n }\n\n /** Restore prefilled middleFns for all routes in a routesFlow, deduplicating by ID */\n private restorePrefilledMiddleFnsForWorkflow(errors: RequestErrors): void {\n const workflowRouteIds = new Set(this.workflowSubRequests!.map((sr) => sr.id));\n\n for (const routeSubRequest of this.workflowSubRequests!) {\n const methodMeta = routesCache.getMetadata(routeSubRequest.id);\n if (!methodMeta) {\n errors.set(\n routeSubRequest.id,\n new RpcError({\n type: 'route-metadata-not-found',\n publicMessage: `Metadata for Route '${routeSubRequest.id}' not found.`,\n })\n );\n continue;\n }\n const missingIds = methodMeta.middleFnIds?.filter((id) => !!id && !workflowRouteIds.has(id)) || [];\n missingIds.forEach((id) => {\n const subRequest = this.subRequestList[id];\n if (subRequest) return;\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n const cachedSubRequest = this.prefilledMiddleFnsCache.get(cacheKey);\n if (cachedSubRequest) {\n const clonedSubRequest: SubRequest<any> = {\n ...cachedSubRequest,\n isResolved: false,\n resolvedValue: undefined,\n error: undefined,\n };\n this.addSubRequest(clonedSubRequest);\n }\n });\n }\n }\n\n private storePrefilledMiddleFns(errors: RequestErrors): void {\n Object.keys(this.subRequestList).forEach((id) => {\n const subRequest = this.subRequestList[id];\n const methodMeta = routesCache.getMetadata(id);\n if (!methodMeta) throw new Error(`Remote method ${id} not found.`);\n if (methodMeta.type === HandlerType.route) {\n errors.set(\n id,\n new RpcError({\n type: 'routes-cant-be-prefilled',\n publicMessage: `Remote method ${id} is a route and can't be prefilled.`,\n })\n );\n return;\n }\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n this.prefilledMiddleFnsCache.set(cacheKey, subRequest);\n });\n }\n\n private removePrefilledMiddleFns(): void {\n Object.keys(this.subRequestList).forEach((id) => {\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n this.prefilledMiddleFnsCache.delete(cacheKey);\n });\n }\n\n /** Returns true if the route is a query (isMutation === false) and not a routesFlow */\n private isQueryRoute(): boolean {\n if (this.workflowSubRequests) return false;\n const meta = routesCache.getMetadata(this.requestId);\n // strict false value required for queries\n return meta?.options?.isMutation === false;\n }\n\n private getPrefilledMiddleFnCacheKey(id: string): string {\n return `${this.options.baseURL}:${id}`;\n }\n}\n\n/** Extracts headers from HeadersSubset params in headersFn methods */\nfunction extractRequestHeaders(req: MionClientRequest<any, any>): Record<string, string> {\n const headers: Record<string, string> = {};\n const subRequestIds = Object.keys(req.subRequestList);\n\n for (let i = 0; i < subRequestIds.length; i++) {\n const id = subRequestIds[i];\n const subRequest = req.subRequestList[id];\n if (!subRequest) continue;\n\n const method = routesCache.getMetadata(id);\n if (!method || method.type !== HandlerType.headersMiddleFn || !method.headersParam) continue;\n\n const params = subRequest.params;\n const extracted = extractHeadersFromParams(params);\n Object.assign(headers, extracted);\n }\n\n return headers;\n}\n\n/** Extracts headers from a HeadersSubset parameter */\nfunction extractHeadersFromParams(params: any[]): Record<string, string> {\n if (!params || params.length === 0) {\n throw new RpcError({\n type: 'missing-headers-param',\n publicMessage: 'HeadersFn requires a HeadersSubset parameter.',\n });\n }\n\n const firstParam = params[0];\n\n if (firstParam instanceof HeadersSubset) {\n return firstParam.headers as Record<string, string>;\n }\n\n if (firstParam && typeof firstParam === 'object' && 'headers' in firstParam && typeof firstParam.headers === 'object') {\n return firstParam.headers as Record<string, string>;\n }\n\n throw new RpcError({\n type: 'invalid-headers-param',\n publicMessage: 'HeadersFn first parameter must be a HeadersSubset instance or object with headers property.',\n });\n}\n\n/** Reconstructs a HeadersSubset from HTTP response headers for methods that return HeadersSubset */\nfunction reconstructHeadersSubsetFromResponse(\n methodId: string,\n responseHeaders: Headers\n): HeadersSubset<string, string> | undefined {\n const method = routesCache.getMetadata(methodId);\n\n if (!method?.headersReturn?.headerNames || method.headersReturn.headerNames.length === 0) {\n return undefined;\n }\n\n const headerNames = method.headersReturn.headerNames;\n const headersMap: Record<string, string> = {};\n\n for (const name of headerNames) {\n const value = responseHeaders.get(name);\n if (value !== undefined && value !== null) {\n headersMap[name] = value;\n }\n }\n\n if (Object.keys(headersMap).length > 0) {\n return new HeadersSubset(headersMap);\n }\n\n return undefined;\n}\n\n/** Builds a RoutesFlowQuery from route paths and subrequests, collecting any mapFrom mappings */\nfunction buildRoutesFlowQuery(routePaths: string[], workflowSubRequests: RSubRequest<any>[]): RoutesFlowQuery {\n const allMappings: RoutesFlowMapping[] = [];\n for (const sr of workflowSubRequests) {\n // Duck-type check for mappings array (avoids circular import of MionSubRequest)\n const mappings = (sr as any).mappings;\n if (Array.isArray(mappings) && mappings.length > 0) {\n for (const ref of mappings) {\n allMappings.push({\n fromId: ref.fromRequestId,\n toId: ref.toRequestId,\n bodyHash: ref.bodyHash,\n paramIndex: ref.paramIndex,\n });\n }\n }\n }\n return {\n routes: routePaths,\n mappings: allMappings.length > 0 ? allMappings : undefined,\n };\n}\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request.js","sources":["../../../src/request.ts"],"sourcesContent":["/* ########\n * 2023 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport type {ResponseBody} from '@mionjs/router';\nimport {\n ClientOptions,\n MiddlewareSubRequest,\n SubRequest,\n RouteSubRequest,\n RequestErrors,\n PrefilledMiddleFnsCache,\n} from './types.ts';\nimport type {RunTypeError, RoutesFlowQuery, RoutesFlowMapping} from '@mionjs/core';\nimport {RpcError, isRpcError, routesCache, MION_ROUTES, HandlerType, HeadersSubset, toBase64Url} from '@mionjs/core';\nimport type {SerializerMode} from '@mionjs/core';\nimport {getRoutePath} from '@mionjs/core';\nimport {fetchRemoteMethodsMetadata} from './lib/fetchRemoteMethodsMetadata.ts';\nimport {createMetadataSubRequest} from './lib/clientMethodsMetadata.ts';\nimport {validateSubRequests} from './lib/validation.ts';\nimport {serializeRequestBody, deserializeResponseBody} from './lib/serializer.ts';\nimport {ROUTES_FLOW_KEY, MAX_GET_URL_LENGTH} from './constants.ts';\n\nexport class MionClientRequest<RR extends RouteSubRequest<any>, MiddleFnRequestsList extends MiddlewareSubRequest<any>[]> {\n readonly path: string;\n readonly requestId: string;\n readonly subRequestList: {[key: string]: SubRequest<any>} = {};\n response: Response | undefined;\n\n constructor(\n public readonly options: ClientOptions,\n private readonly prefilledMiddleFnsCache: PrefilledMiddleFnsCache,\n public readonly route?: RR,\n public readonly middleFns?: MiddleFnRequestsList,\n /** Array of routesFlow subrequests when executing a routesFlow */\n public readonly workflowSubRequests?: RouteSubRequest<any>[],\n /** Composed abort signal for this request */\n public readonly signal?: AbortSignal\n ) {\n if (workflowSubRequests && workflowSubRequests.length > 0) {\n const routePaths = workflowSubRequests.map((sr) => getRoutePath(sr.pointer, this.options));\n const query = buildRoutesFlowQuery(routePaths, workflowSubRequests);\n const flowPath = getRoutePath([ROUTES_FLOW_KEY], this.options);\n this.path = `${flowPath}?data=${toBase64Url(JSON.stringify(query))}`;\n this.requestId = 'mion-routes-flow';\n workflowSubRequests.forEach((sr) => this.addSubRequest(sr));\n } else {\n this.path = route ? getRoutePath(route.pointer, this.options) : 'no-route';\n this.requestId = route ? route.id : 'no-route';\n if (route) this.addSubRequest(route);\n }\n if (middleFns) middleFns.forEach((middleFn) => this.addSubRequest(middleFn));\n }\n\n /** Calls a remote route */\n async call(): Promise<ResponseBody> {\n if (this.signal?.aborted) {\n const errors: RequestErrors = new Map();\n this.onError(\n this.signal.reason ?? new DOMException('This operation was aborted', 'AbortError'),\n 'Request aborted',\n errors\n );\n return Promise.reject(errors);\n }\n return this.makeCall(this.options.serializer);\n }\n\n /** Call flow that auto-detects missing metadata and uses optimistic serialization when needed */\n private async makeCall(originalSerializer: SerializerMode, skipOptimistic?: boolean): Promise<ResponseBody> {\n const errors: RequestErrors = new Map();\n const subRequestIds = Object.keys(this.subRequestList);\n const allCached = subRequestIds.every((id) => routesCache.hasMetadata(id));\n const isOptimistic = !allCached && !skipOptimistic;\n\n try {\n if (isOptimistic) {\n (this.options as any).serializer = 'optimistic';\n this.restorePrefilledMiddleFns();\n // Add metadata subrequest (after prefilled restore so we include all IDs)\n const allSubRequestIds = Object.keys(this.subRequestList);\n this.addSubRequest(createMetadataSubRequest(allSubRequestIds));\n } else {\n (this.options as any).serializer = originalSerializer;\n await fetchRemoteMethodsMetadata(subRequestIds, this.options, this.signal);\n this.restorePrefilledMiddleFns(errors);\n if (errors.size) return Promise.reject(errors);\n validateSubRequests(subRequestIds, this, errors);\n if (errors.size) return Promise.reject(errors);\n }\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n\n try {\n let serialized: ReturnType<typeof serializeRequestBody>;\n try {\n serialized = serializeRequestBody(this);\n } catch (serializeError) {\n if (isOptimistic) {\n // JSON.stringify failed → fall back to standard, will fetch metadata\n delete this.subRequestList[MION_ROUTES.methodsMetadata];\n return this.makeCall(originalSerializer, true);\n }\n throw serializeError;\n }\n\n const headersFromParams = extractRequestHeaders(this);\n const url = new URL(this.path, this.options.baseURL);\n const fetchOptions = buildFetchOptions(\n url,\n serialized,\n headersFromParams,\n this.options,\n isOptimistic,\n this.isQueryRoute(),\n this.signal\n );\n this.response = await fetch(url, fetchOptions);\n } catch (error: any) {\n this.onError(error, 'Error executing request', errors);\n return Promise.reject(errors);\n }\n\n try {\n // If the signal already aborted while fetch was in flight, don't try to read a possibly\n // truncated response body — surface the abort directly.\n if (this.signal?.aborted) {\n this.onError(this.signal.reason, 'Request aborted', errors);\n return Promise.reject(errors);\n }\n const deserialized = await deserializeResponseBody(this.response, this.options);\n if (this.handlePlatformError(deserialized, errors)) return Promise.reject(errors);\n\n // Never retry an aborted request — the user explicitly canceled it.\n if (isOptimistic && !this.signal?.aborted && this.shouldRetryWithProperSerialization(deserialized)) {\n return this.retryWithProperSerialization(originalSerializer);\n }\n\n this.resolveSubRequests(deserialized, errors, isOptimistic ? MION_ROUTES.methodsMetadata : undefined);\n if (errors.size) return Promise.reject(errors);\n return deserialized;\n } catch (error) {\n this.onError(error, 'Error parsing response', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Checks if the response contains errors that require retry with proper JIT serialization */\n private shouldRetryWithProperSerialization(deserialized: ResponseBody): boolean {\n return Object.values(deserialized).some(\n (value) =>\n isRpcError(value) &&\n (value.type === 'serialization-error' ||\n value.type === 'validation-error' ||\n value.type === 'parsing-json-request-error')\n );\n }\n\n /** Retries the request with proper JIT serialization after metadata has been cached */\n private async retryWithProperSerialization(originalSerializer: SerializerMode): Promise<ResponseBody> {\n delete this.subRequestList[MION_ROUTES.methodsMetadata];\n Object.values(this.subRequestList).forEach((sr) => {\n sr.isResolved = false;\n sr.resolvedValue = undefined;\n sr.error = undefined;\n });\n return this.makeCall(originalSerializer);\n }\n\n /** Validate params */\n async validateParams(subReqList?: SubRequest<any>[]): Promise<RunTypeError[]> {\n if (subReqList) subReqList.forEach((subRequest) => this.addSubRequest(subRequest));\n const errors: RequestErrors = new Map();\n try {\n const subRequestIds = Object.keys(this.subRequestList);\n await fetchRemoteMethodsMetadata(subRequestIds, this.options);\n validateSubRequests(subRequestIds, this, errors, false);\n return Object.values(this.subRequestList)\n .map((subRequest) => subRequest.error?.errorData || [])\n .flat();\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Prefills and stores SubRequest */\n async prefill(subReqList?: SubRequest<any>[]): Promise<void> {\n if (subReqList) subReqList.forEach((subRequest) => this.addSubRequest(subRequest));\n const errors: RequestErrors = new Map();\n try {\n const subRequestIds = Object.keys(this.subRequestList);\n await fetchRemoteMethodsMetadata(subRequestIds, this.options);\n\n validateSubRequests(subRequestIds, this, errors, false);\n if (errors.size) return Promise.reject(errors);\n\n serializeRequestBody(this);\n\n this.storePrefilledMiddleFns(errors);\n if (errors.size) return Promise.reject(errors);\n\n return;\n } catch (error: any) {\n this.onError(error, 'Error preparing request', errors);\n return Promise.reject(errors);\n }\n }\n\n /** Removes Prefills and stores SubRequest */\n async removePrefill(subRequests?: SubRequest<any>[]): Promise<void> {\n if (subRequests) subRequests.forEach((subRequest) => this.addSubRequest(subRequest));\n this.removePrefilledMiddleFns();\n }\n\n addSubRequest(subRequest: SubRequest<any>) {\n if (subRequest.isResolved) throw new Error(`SubRequest ${subRequest.id} is already resolved`);\n this.subRequestList[subRequest.id] = subRequest;\n }\n\n /** Checks for platform-level errors and propagates them to all subrequests. Returns true if a platform error was found */\n private handlePlatformError(deserialized: ResponseBody, errors: RequestErrors): boolean {\n if (!(MION_ROUTES.platformError in deserialized)) return false;\n const platformError = deserialized[MION_ROUTES.platformError];\n Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {\n methodMeta.isResolved = true;\n methodMeta.error = platformError as RpcError<string>;\n errors.set(id, platformError as RpcError<string>);\n });\n return true;\n }\n\n /** Resolves sub request values from the deserialized response body and collects errors */\n private resolveSubRequests(deserialized: ResponseBody, errors: RequestErrors, skipId?: string): void {\n Object.entries(this.subRequestList).forEach(([id, methodMeta]) => {\n if (id === skipId) return;\n const resp = this.getResponseValueFromBodyOrHeader(id, deserialized, (this.response as Response).headers);\n methodMeta.isResolved = true;\n if (isRpcError(resp)) {\n methodMeta.error = resp;\n errors.set(id, resp);\n } else {\n methodMeta.resolvedValue = resp;\n }\n });\n\n Object.entries(deserialized).forEach(([id, value]) => {\n if (!(id in this.subRequestList) && isRpcError(value)) {\n errors.set(id, value);\n }\n });\n }\n\n private onError(error: any, stageMessage: string, errors: RequestErrors): void {\n // Detect abort/timeout via signal.reason FIRST. We must do this before the isRpcError early return\n // because errors that surface from later stages (deserialization, retry, etc.) may already be\n // wrapped as RpcError but the user-facing reason is still abort/timeout.\n const reason = this.signal?.aborted ? this.signal.reason : undefined;\n if (reason instanceof DOMException) {\n if (reason.name === 'TimeoutError') {\n errors.set(\n this.requestId,\n new RpcError({\n type: 'request-timeout',\n publicMessage: 'Request timed out',\n originalError: error instanceof Error ? error : undefined,\n })\n );\n return;\n }\n if (reason.name === 'AbortError') {\n errors.set(\n this.requestId,\n new RpcError({\n type: 'request-aborted',\n publicMessage: 'Request was aborted',\n originalError: error instanceof Error ? error : undefined,\n })\n );\n return;\n }\n }\n if (isRpcError(error)) {\n errors.set(this.requestId, error);\n return;\n }\n const message = error?.message ? `${stageMessage}: ${error.message}` : `${stageMessage}: Unknown Error`;\n errors.set(\n this.requestId,\n new RpcError({\n type: error?.name || 'unknown-error',\n publicMessage: message,\n originalError: error instanceof Error ? error : undefined,\n })\n );\n }\n\n private getResponseValueFromBodyOrHeader(id: string, respBody: ResponseBody, headers: Headers): any {\n const headersSubset = reconstructHeadersSubsetFromResponse(id, headers);\n if (headersSubset) return headersSubset;\n return respBody[id];\n }\n\n /** When errors is omitted, silently skips routes without cached metadata (used by optimistic flow) */\n private restorePrefilledMiddleFns(errors?: RequestErrors): void {\n if (this.workflowSubRequests && this.workflowSubRequests.length > 0) {\n this.restorePrefilledMiddleFnsForWorkflow(errors);\n return;\n }\n\n const methodMeta = routesCache.getMetadata(this.requestId);\n if (!methodMeta) {\n if (errors) {\n errors.set(\n this.requestId,\n new RpcError({\n type: 'route-metadata-not-found',\n publicMessage: `Metadata for Route '${this.requestId} not found.'.`,\n })\n );\n }\n return;\n }\n const missingIds = methodMeta.middleFnIds?.filter((id) => !!id && this.requestId !== id) || [];\n missingIds.forEach((id) => {\n const subRequest = this.subRequestList[id];\n if (subRequest) return;\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n const cachedSubRequest = this.prefilledMiddleFnsCache.get(cacheKey);\n if (cachedSubRequest) {\n const clonedSubRequest: SubRequest<any> = {\n ...cachedSubRequest,\n isResolved: false,\n resolvedValue: undefined,\n error: undefined,\n };\n this.addSubRequest(clonedSubRequest);\n }\n });\n }\n\n /** Restore prefilled middleFns for all routes in a routesFlow, deduplicating by ID */\n private restorePrefilledMiddleFnsForWorkflow(errors?: RequestErrors): void {\n const workflowRouteIds = new Set(this.workflowSubRequests!.map((sr) => sr.id));\n\n for (const routeSubRequest of this.workflowSubRequests!) {\n const methodMeta = routesCache.getMetadata(routeSubRequest.id);\n if (!methodMeta) {\n if (errors) {\n errors.set(\n routeSubRequest.id,\n new RpcError({\n type: 'route-metadata-not-found',\n publicMessage: `Metadata for Route '${routeSubRequest.id}' not found.`,\n })\n );\n }\n continue;\n }\n const missingIds = methodMeta.middleFnIds?.filter((id) => !!id && !workflowRouteIds.has(id)) || [];\n missingIds.forEach((id) => {\n const subRequest = this.subRequestList[id];\n if (subRequest) return;\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n const cachedSubRequest = this.prefilledMiddleFnsCache.get(cacheKey);\n if (cachedSubRequest) {\n const clonedSubRequest: SubRequest<any> = {\n ...cachedSubRequest,\n isResolved: false,\n resolvedValue: undefined,\n error: undefined,\n };\n this.addSubRequest(clonedSubRequest);\n }\n });\n }\n }\n\n private storePrefilledMiddleFns(errors: RequestErrors): void {\n Object.keys(this.subRequestList).forEach((id) => {\n const subRequest = this.subRequestList[id];\n const methodMeta = routesCache.getMetadata(id);\n if (!methodMeta) throw new Error(`Remote method ${id} not found.`);\n if (methodMeta.type === HandlerType.route) {\n errors.set(\n id,\n new RpcError({\n type: 'routes-cant-be-prefilled',\n publicMessage: `Remote method ${id} is a route and can't be prefilled.`,\n })\n );\n return;\n }\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n this.prefilledMiddleFnsCache.set(cacheKey, subRequest);\n });\n }\n\n private removePrefilledMiddleFns(): void {\n Object.keys(this.subRequestList).forEach((id) => {\n const cacheKey = this.getPrefilledMiddleFnCacheKey(id);\n this.prefilledMiddleFnsCache.delete(cacheKey);\n });\n }\n\n /** Returns true if the route is a query (isMutation === false) and not a routesFlow */\n private isQueryRoute(): boolean {\n if (this.workflowSubRequests) return false;\n const meta = routesCache.getMetadata(this.requestId);\n // strict false value required for queries\n return meta?.options?.isMutation === false;\n }\n\n private getPrefilledMiddleFnCacheKey(id: string): string {\n return `${this.options.baseURL}:${id}`;\n }\n}\n\n/**\n * Builds the RequestInit options for the fetch call, choosing between GET and POST:\n * - GET (query): Used for non-mutation routes (isMutation === false) with JSON serialization,\n * where the base64url-encoded body fits within the URL length limit. The serialized data is\n * sent as a `?data=` query parameter, with no request body.\n * - POST (mutation/route call): Used for all other cases: mutations, optimistic requests,\n * routesFlow calls, non-JSON serializers, or when the GET URL would exceed MAX_GET_URL_LENGTH.\n * The serialized data is sent in the request body with the appropriate Content-Type header.\n */\nfunction buildFetchOptions(\n url: URL,\n serialized: ReturnType<typeof serializeRequestBody>,\n headersFromParams: Record<string, string>,\n options: ClientOptions,\n isOptimistic: boolean,\n isQuery: boolean,\n signal?: AbortSignal\n): RequestInit {\n if (!isOptimistic && isQuery && serialized.contentType.includes('json')) {\n const encoded = toBase64Url(serialized.body as string);\n const testUrl = new URL(url.pathname + url.search, url.origin);\n testUrl.searchParams.set('data', encoded);\n\n if (testUrl.toString().length <= MAX_GET_URL_LENGTH) {\n url.searchParams.set('data', encoded);\n return {\n ...options.fetchOptions,\n method: 'GET',\n headers: {...options.fetchOptions.headers, ...headersFromParams},\n body: undefined,\n signal,\n };\n }\n }\n\n return {\n ...options.fetchOptions,\n method: 'POST',\n headers: {...options.fetchOptions.headers, ...headersFromParams, 'Content-Type': serialized.contentType},\n body: serialized.body as BodyInit,\n signal,\n };\n}\n\n/** Extracts headers from HeadersSubset params in headersFn methods */\nfunction extractRequestHeaders(req: MionClientRequest<any, any>): Record<string, string> {\n const headers: Record<string, string> = {};\n const subRequestIds = Object.keys(req.subRequestList);\n\n for (let i = 0; i < subRequestIds.length; i++) {\n const id = subRequestIds[i];\n const subRequest = req.subRequestList[id];\n if (!subRequest) continue;\n\n const method = routesCache.getMetadata(id);\n if (!method || method.type !== HandlerType.headersMiddleFn || !method.headersParam) continue;\n\n const params = subRequest.params;\n const extracted = extractHeadersFromParams(params);\n Object.assign(headers, extracted);\n }\n\n return headers;\n}\n\n/** Extracts headers from a HeadersSubset parameter */\nfunction extractHeadersFromParams(params: any[]): Record<string, string> {\n if (!params || params.length === 0) {\n throw new RpcError({\n type: 'missing-headers-param',\n publicMessage: 'HeadersFn requires a HeadersSubset parameter.',\n });\n }\n\n const firstParam = params[0];\n\n if (firstParam instanceof HeadersSubset) {\n return firstParam.headers as Record<string, string>;\n }\n\n if (firstParam && typeof firstParam === 'object' && 'headers' in firstParam && typeof firstParam.headers === 'object') {\n return firstParam.headers as Record<string, string>;\n }\n\n throw new RpcError({\n type: 'invalid-headers-param',\n publicMessage: 'HeadersFn first parameter must be a HeadersSubset instance or object with headers property.',\n });\n}\n\n/** Reconstructs a HeadersSubset from HTTP response headers for methods that return HeadersSubset */\nfunction reconstructHeadersSubsetFromResponse(\n methodId: string,\n responseHeaders: Headers\n): HeadersSubset<string, string> | undefined {\n const method = routesCache.getMetadata(methodId);\n\n if (!method?.headersReturn?.headerNames || method.headersReturn.headerNames.length === 0) {\n return undefined;\n }\n\n const headerNames = method.headersReturn.headerNames;\n const headersMap: Record<string, string> = {};\n\n for (const name of headerNames) {\n const value = responseHeaders.get(name);\n if (value !== undefined && value !== null) {\n headersMap[name] = value;\n }\n }\n\n if (Object.keys(headersMap).length > 0) {\n return new HeadersSubset(headersMap);\n }\n\n return undefined;\n}\n\n/** Builds a RoutesFlowQuery from route paths and subrequests, collecting any mapFrom mappings */\nfunction buildRoutesFlowQuery(routePaths: string[], workflowSubRequests: RouteSubRequest<any>[]): RoutesFlowQuery {\n const allMappings: RoutesFlowMapping[] = [];\n for (const sr of workflowSubRequests) {\n // Duck-type check for mappings array (avoids circular import of MionSubRequest)\n const mappings = (sr as any).mappings;\n if (Array.isArray(mappings) && mappings.length > 0) {\n for (const ref of mappings) {\n allMappings.push({\n fromId: ref.fromRequestId,\n toId: ref.toRequestId,\n bodyHash: ref.bodyHash,\n paramIndex: ref.paramIndex,\n });\n }\n }\n }\n return {\n routes: routePaths,\n mappings: allMappings.length > 0 ? allMappings : undefined,\n };\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RouteSubRequest, RoutesFlowBuilder, SubRequest } from './types.ts';
|
|
2
2
|
import { MapFromServerFnRef } from '@mionjs/core';
|
|
3
|
-
export declare function routesFlow<Routes extends
|
|
3
|
+
export declare function routesFlow<Routes extends RouteSubRequest<any>[]>(routeSubRequests: [...Routes]): RoutesFlowBuilder<Routes>;
|
|
4
4
|
export declare const mapFromSymbol: unique symbol;
|
|
5
5
|
export declare function mapFrom<FromSR extends SubRequest<any>, MappedInput>(source: FromSR, mapper: (value: FromSR['resolvedValue']) => MappedInput, bodyHash?: string): MapFromServerFnRef<(value: FromSR['resolvedValue']) => MappedInput>;
|
|
6
6
|
export declare function isMapFromRef(ref: any): ref is MapFromServerFnRef<any>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PURE_SERVER_FN_NAMESPACE, RpcError } from "@mionjs/core";
|
|
2
|
-
|
|
2
|
+
function routesFlow(routeSubRequests) {
|
|
3
3
|
if (!routeSubRequests || routeSubRequests.length === 0)
|
|
4
4
|
throw new RpcError({
|
|
5
5
|
type: "routesFlow-empty-routes",
|
|
@@ -18,10 +18,14 @@ async function routesFlow(routeSubRequests, middleFns) {
|
|
|
18
18
|
type: "routesFlow-client-mismatch",
|
|
19
19
|
publicMessage: `All subrequests in a routesFlow must use the same client instance. Subrequest at index ${i} has a different client.`
|
|
20
20
|
});
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
return {
|
|
22
|
+
async call(setup) {
|
|
23
|
+
const middleFns = setup?.middleFns ?? {}, [results, errors, middleFnResults, middleFnErrors] = await client.execute(void 0, routeSubRequests, middleFns, setup?.signal, setup?.timeout), emptyResults = routeSubRequests.map(() => {
|
|
24
|
+
}), emptyErrors = routeSubRequests.map(() => {
|
|
25
|
+
});
|
|
26
|
+
return [results ?? emptyResults, errors ?? emptyErrors, middleFnResults, middleFnErrors];
|
|
27
|
+
}
|
|
28
|
+
};
|
|
25
29
|
}
|
|
26
30
|
const mapFromSymbol = /* @__PURE__ */ Symbol("MapFromServerFnRef");
|
|
27
31
|
function mapFrom(source, mapper, bodyHash) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routesFlow.js","sources":["../../../src/routesFlow.ts"],"sourcesContent":["/* ########\n * 2025 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {PURE_SERVER_FN_NAMESPACE, RpcError} from '@mionjs/core';\nimport type {
|
|
1
|
+
{"version":3,"file":"routesFlow.js","sources":["../../../src/routesFlow.ts"],"sourcesContent":["/* ########\n * 2025 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {PURE_SERVER_FN_NAMESPACE, RpcError} from '@mionjs/core';\nimport type {MiddlewareSubRequest, RouteSubRequest, RoutesFlowBuilder, SubRequest} from './types.ts';\nimport type {MionSubRequest} from './subRequest.ts';\nimport {MapFromServerFnRef} from '@mionjs/core';\n\n/** Creates a RoutesFlowBuilder for deferred execution of multiple routes in a single HTTP request */\nexport function routesFlow<Routes extends RouteSubRequest<any>[]>(routeSubRequests: [...Routes]): RoutesFlowBuilder<Routes> {\n if (!routeSubRequests || routeSubRequests.length === 0) {\n throw new RpcError({\n type: 'routesFlow-empty-routes',\n publicMessage: 'RoutesFlow requires at least one route subrequest.',\n });\n }\n\n const firstSubRequest = routeSubRequests[0] as MionSubRequest;\n if (!firstSubRequest.client) {\n throw new RpcError({\n type: 'routesFlow-missing-client',\n publicMessage: 'Could not extract MionClient from subrequest. Ensure subrequests are created via routes proxy.',\n });\n }\n\n const client = firstSubRequest.client;\n\n // Validate all subrequests use the same client instance\n for (let i = 1; i < routeSubRequests.length; i++) {\n const subRequest = routeSubRequests[i] as MionSubRequest;\n if (subRequest.client !== client) {\n throw new RpcError({\n type: 'routesFlow-client-mismatch',\n publicMessage: `All subrequests in a routesFlow must use the same client instance. Subrequest at index ${i} has a different client.`,\n });\n }\n }\n\n return {\n async call(setup?: {middleFns?: Record<string, MiddlewareSubRequest<any>>; signal?: AbortSignal; timeout?: number}) {\n const middleFns = setup?.middleFns ?? {};\n const [results, errors, middleFnResults, middleFnErrors] = await client.execute(\n undefined,\n routeSubRequests as any,\n middleFns as any,\n setup?.signal,\n setup?.timeout\n );\n const emptyResults = routeSubRequests.map(() => undefined);\n const emptyErrors = routeSubRequests.map(() => undefined);\n return [results ?? emptyResults, errors ?? emptyErrors, middleFnResults, middleFnErrors] as any;\n },\n };\n}\n\nexport const mapFromSymbol = Symbol('MapFromServerFnRef');\n\n// ╔══════════════════════════════════════════════════════════════════════════════╗\n// ║ WARNING: This function's call signature is parsed by the mion vite plugin ║\n// ║ at build time (see devtools/src/vite-plugin/extractPureFn.ts). ║\n// ║ Do NOT rename, change the parameter order, or modify the function ║\n// ║ signature without updating the corresponding AST extraction and ║\n// ║ transformer logic in @mionjs/devtools. ║\n// ╚══════════════════════════════════════════════════════════════════════════════╝\n/**\n * Maps the output of one route SubRequest to the input of another within a routesFlow.\n * The mapper function must be pure (same rules as pureServerFn).\n * The bodyHash is injected at build time by the mion vite plugin.\n */\n\nexport function mapFrom<FromSR extends SubRequest<any>, MappedInput>(\n source: FromSR,\n mapper: (value: FromSR['resolvedValue']) => MappedInput,\n bodyHash?: string // injected by mion vite plugin\n): MapFromServerFnRef<(value: FromSR['resolvedValue']) => MappedInput> {\n // Important: bodyHash is injected at build time by mion vite plugin\n if (!bodyHash) throw new Error('mapFrom() requires mion vite plugin transform to inject bodyHash');\n const ref: MapFromServerFnRef<(value: FromSR['resolvedValue']) => MappedInput> = {\n mapFromSymbol,\n namespace: PURE_SERVER_FN_NAMESPACE,\n fnName: bodyHash,\n bodyHash,\n pureFn: mapper,\n isFactory: false,\n fromRequestId: source.id,\n toRequestId: '',\n paramIndex: -1, // set by MionSubRequest constructor when passed as a parameter\n type() {\n return ref as unknown as MappedInput;\n },\n };\n return ref;\n}\n\nexport function isMapFromRef(ref: any): ref is MapFromServerFnRef<any> {\n return ref && ref.mapFromSymbol === mapFromSymbol;\n}\n"],"names":[],"mappings":";AAaM,SAAU,WAAkD,kBAA6B;AAC3F,MAAI,CAAC,oBAAoB,iBAAiB,WAAW;AACjD,UAAM,IAAI,SAAS;AAAA,MACf,MAAM;AAAA,MACN,eAAe;AAAA,IAAA,CAClB;AAGL,QAAM,kBAAkB,iBAAiB,CAAC;AAC1C,MAAI,CAAC,gBAAgB;AACjB,UAAM,IAAI,SAAS;AAAA,MACf,MAAM;AAAA,MACN,eAAe;AAAA,IAAA,CAClB;AAGL,QAAM,SAAS,gBAAgB;AAG/B,WAAS,IAAI,GAAG,IAAI,iBAAiB,QAAQ;AAEzC,QADmB,iBAAiB,CAAC,EACtB,WAAW;AACtB,YAAM,IAAI,SAAS;AAAA,QACf,MAAM;AAAA,QACN,eAAe,0FAA0F,CAAC;AAAA,MAAA,CAC7G;AAIT,SAAO;AAAA,IACH,MAAM,KAAK,OAAuG;AAC9G,YAAM,YAAY,OAAO,aAAa,CAAA,GAChC,CAAC,SAAS,QAAQ,iBAAiB,cAAc,IAAI,MAAM,OAAO,QACpE,QACA,kBACA,WACA,OAAO,QACP,OAAO,OAAO,GAEZ,eAAe,iBAAiB,IAAI,MAAA;AAAA,OAAe,GACnD,cAAc,iBAAiB,IAAI,MAAA;AAAA,OAAe;AACxD,aAAO,CAAC,WAAW,cAAc,UAAU,aAAa,iBAAiB,cAAc;AAAA,IAC3F;AAAA,EAAA;AAER;AAEO,MAAM,uCAAuB,oBAAoB;AAelD,SAAU,QACZ,QACA,QACA;AAGA,MAAI,CAAC;AAAU,UAAM,IAAI,MAAM,kEAAkE;AACjG,QAAM,MAA2E;AAAA,IAC7E;AAAA,IACA,WAAW;AAAA,IACX,QAAQ;AAAA,IACR;AAAA,IACA,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,eAAe,OAAO;AAAA,IACtB,aAAa;AAAA,IACb,YAAY;AAAA;AAAA,IACZ,OAAI;AACA,aAAO;AAAA,IACX;AAAA,EAAA;AAEJ,SAAO;AACX;AAEM,SAAU,aAAa,KAAQ;AACjC,SAAO,OAAO,IAAI,kBAAkB;AACxC;"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { RpcError, RunTypeError, MapFromServerFnRef } from '@mionjs/core';
|
|
2
|
-
import {
|
|
2
|
+
import { CallSetup, MiddlewareSubRequest, RequestErrors, RouteSubRequest, SubRequest } from './types.ts';
|
|
3
3
|
import { MionClient } from './client.ts';
|
|
4
4
|
import { TypedEvent } from './lib/typedEvent.ts';
|
|
5
|
-
export declare class MionSubRequest<S = any, E extends RpcError<string, any> = any> implements
|
|
5
|
+
export declare class MionSubRequest<S = any, E extends RpcError<string, any> = any> implements RouteSubRequest<any>, MiddlewareSubRequest<any> {
|
|
6
6
|
readonly client: MionClient;
|
|
7
7
|
pointer: string[];
|
|
8
8
|
id: string;
|
|
@@ -15,9 +15,8 @@ export declare class MionSubRequest<S = any, E extends RpcError<string, any> = a
|
|
|
15
15
|
constructor(parentProps: string[], handlerId: string, argArray: any[], client: MionClient);
|
|
16
16
|
prefill(): TypedEvent<S, E>;
|
|
17
17
|
removePrefill(): Promise<void>;
|
|
18
|
-
call(): Promise<
|
|
19
|
-
|
|
20
|
-
callWithWorkflow<OtherRoutes extends RSubRequest<any>[], H extends Record<string, HSubRequest<any>>>(otherRoutes: [...OtherRoutes], middleFns?: H): Promise<WorkflowResult<[RSubRequest<any>, ...OtherRoutes], H>>;
|
|
18
|
+
call(setup?: CallSetup<any, any>): Promise<any>;
|
|
19
|
+
private executeWithOtherRoutes;
|
|
21
20
|
typeErrors(): Promise<RunTypeError[]>;
|
|
22
21
|
}
|
|
23
22
|
export declare function findSubRequestError(subRequest: SubRequest<any>, errors: RequestErrors): RpcError<string>;
|
|
@@ -25,22 +25,16 @@ class MionSubRequest {
|
|
|
25
25
|
removePrefill() {
|
|
26
26
|
return this.client.handlersRegistry.clearHandlers(this.id), this.client.removePrefill(this);
|
|
27
27
|
}
|
|
28
|
-
/** Calls a remote route
|
|
29
|
-
call() {
|
|
30
|
-
|
|
28
|
+
/** Calls a remote route with optional setup (middleFns, otherRoutes, signal, timeout) */
|
|
29
|
+
call(setup) {
|
|
30
|
+
const signal = setup?.signal, timeout = setup?.timeout;
|
|
31
|
+
return !setup || !setup.otherRoutes && !setup.middleFns ? this.client.execute(this, void 0, void 0, signal, timeout) : setup.otherRoutes && setup.otherRoutes.length > 0 ? this.executeWithOtherRoutes(setup.otherRoutes, setup.middleFns, signal, timeout) : this.client.execute(this, void 0, setup.middleFns, signal, timeout);
|
|
31
32
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
if (Object.keys(middleFns).length === 0)
|
|
35
|
-
throw new Error("callWithMiddleFns requires at least one middleFn. Use call() instead for requests without middleFns.");
|
|
36
|
-
return this.client.executeCallWithMiddleFns(this, middleFns);
|
|
37
|
-
}
|
|
38
|
-
/** Calls this route as part of a routesFlow with other routes in a single HTTP request */
|
|
39
|
-
async callWithWorkflow(otherRoutes, middleFns) {
|
|
40
|
-
const allRoutes = [this, ...otherRoutes], [results, errors, middleFnResults, middleFnErrors] = await this.client.executeCallWithWorkflow(allRoutes, middleFns ?? {}), emptyResults = allRoutes.map(() => {
|
|
33
|
+
async executeWithOtherRoutes(otherRoutes, middleFns, signal, timeout) {
|
|
34
|
+
const allRoutes = [this, ...otherRoutes], [results, errors, mfR, mfE] = await this.client.execute(void 0, allRoutes, middleFns ?? {}, signal, timeout), emptyResults = allRoutes.map(() => {
|
|
41
35
|
}), emptyErrors = allRoutes.map(() => {
|
|
42
36
|
});
|
|
43
|
-
return [results ?? emptyResults, errors ?? emptyErrors,
|
|
37
|
+
return [results ?? emptyResults, errors ?? emptyErrors, mfR, mfE];
|
|
44
38
|
}
|
|
45
39
|
/** Validates parameters and returns type errors */
|
|
46
40
|
typeErrors() {
|