@cortexkit/aft-bridge 0.55.0 → 0.56.0
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/bash-hints.d.ts +8 -0
- package/dist/bash-hints.d.ts.map +1 -1
- package/dist/bash-hints.js +19 -1
- package/dist/bash-hints.js.map +1 -1
- package/dist/bash-host-fallback.d.ts +3 -11
- package/dist/bash-host-fallback.d.ts.map +1 -1
- package/dist/bash-host-fallback.js +40 -18
- package/dist/bash-host-fallback.js.map +1 -1
- package/dist/bridge.d.ts +4 -3
- package/dist/bridge.d.ts.map +1 -1
- package/dist/bridge.js +18 -14
- package/dist/bridge.js.map +1 -1
- package/dist/error-contract.d.ts +13 -2
- package/dist/error-contract.d.ts.map +1 -1
- package/dist/error-contract.js +54 -11
- package/dist/error-contract.js.map +1 -1
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/location-lifecycle.d.ts +48 -0
- package/dist/location-lifecycle.d.ts.map +1 -0
- package/dist/location-lifecycle.js +238 -0
- package/dist/location-lifecycle.js.map +1 -0
- package/dist/npm-resolver.d.ts +1 -1
- package/dist/npm-resolver.d.ts.map +1 -1
- package/dist/npm-resolver.js +11 -9
- package/dist/npm-resolver.js.map +1 -1
- package/dist/onnx-runtime.d.ts.map +1 -1
- package/dist/onnx-runtime.js +6 -1
- package/dist/onnx-runtime.js.map +1 -1
- package/dist/path-aliases.d.ts.map +1 -1
- package/dist/path-aliases.js +27 -3
- package/dist/path-aliases.js.map +1 -1
- package/dist/path-env.d.ts +18 -0
- package/dist/path-env.d.ts.map +1 -0
- package/dist/path-env.js +37 -0
- package/dist/path-env.js.map +1 -0
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +7 -0
- package/dist/paths.js.map +1 -1
- package/dist/project-identity.d.ts +7 -0
- package/dist/project-identity.d.ts.map +1 -1
- package/dist/project-identity.js +23 -10
- package/dist/project-identity.js.map +1 -1
- package/dist/protocol.d.ts +14 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/resolver.d.ts +1 -0
- package/dist/resolver.d.ts.map +1 -1
- package/dist/resolver.js +14 -0
- package/dist/resolver.js.map +1 -1
- package/dist/revivable-transport.d.ts +2 -1
- package/dist/revivable-transport.d.ts.map +1 -1
- package/dist/revivable-transport.js +6 -3
- package/dist/revivable-transport.js.map +1 -1
- package/dist/storage-paths.d.ts +21 -4
- package/dist/storage-paths.d.ts.map +1 -1
- package/dist/storage-paths.js +55 -24
- package/dist/storage-paths.js.map +1 -1
- package/dist/subc-transport.d.ts +4 -2
- package/dist/subc-transport.d.ts.map +1 -1
- package/dist/subc-transport.js +57 -24
- package/dist/subc-transport.js.map +1 -1
- package/dist/transport-factory.d.ts.map +1 -1
- package/dist/transport-factory.js +10 -0
- package/dist/transport-factory.js.map +1 -1
- package/dist/transport.d.ts +2 -1
- package/dist/transport.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-paths.d.ts","sourceRoot":"","sources":["../src/storage-paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage-paths.d.ts","sourceRoot":"","sources":["../src/storage-paths.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC;AAClD,MAAM,MAAM,wBAAwB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,wBAAwB,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAmBD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAexE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAQxF;AAED,2EAA2E;AAC3E,wBAAgB,2BAA2B,CAAC,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAMpF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,GAAE,kBAAuB,GAC/B,MAAM,CAQR;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,GAAE,kBAAuB,GAC/B,MAAM,CAER"}
|
package/dist/storage-paths.js
CHANGED
|
@@ -1,55 +1,86 @@
|
|
|
1
1
|
import { homedir } from "node:os";
|
|
2
2
|
import { join, resolve } from "node:path";
|
|
3
|
-
function
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
return process.env.HOME || homedir();
|
|
3
|
+
function environmentValue(context, name) {
|
|
4
|
+
const value = (context.lookup ?? ((key) => process.env[key]))(name);
|
|
5
|
+
return value !== undefined && value.length > 0 ? value : undefined;
|
|
7
6
|
}
|
|
8
|
-
function
|
|
9
|
-
|
|
7
|
+
function storagePlatform(context) {
|
|
8
|
+
return context.platform ?? (process.platform === "win32" ? "windows" : "other");
|
|
9
|
+
}
|
|
10
|
+
function homeDir(context) {
|
|
11
|
+
const configured = storagePlatform(context) === "windows"
|
|
12
|
+
? (environmentValue(context, "USERPROFILE") ?? environmentValue(context, "HOME"))
|
|
13
|
+
: (environmentValue(context, "HOME") ?? environmentValue(context, "USERPROFILE"));
|
|
14
|
+
return configured ?? context.fallbackHome ?? homedir();
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Resolve the CortexKit data-home ladder before appending a module directory.
|
|
18
|
+
*
|
|
19
|
+
* Last re-derived 2026-09-06 against subconscious d5e09914b0791a66f2a5a00a9bb3422860ade95e:
|
|
20
|
+
* compare ordered variables, platform gates, and empty-value guards with
|
|
21
|
+
* `subc-core/src/daemon_config.rs::default_data_home`, resolve named constants,
|
|
22
|
+
* then preserve the documented Windows cache-class divergence.
|
|
23
|
+
*/
|
|
24
|
+
export function resolveDataHome(context = {}) {
|
|
25
|
+
const xdg = environmentValue(context, "XDG_DATA_HOME");
|
|
10
26
|
if (xdg)
|
|
11
27
|
return xdg;
|
|
12
|
-
if (
|
|
13
|
-
|
|
28
|
+
if (storagePlatform(context) === "windows") {
|
|
29
|
+
// AFT stores indexes, backups, and checkpoints here.
|
|
30
|
+
// cache-class storage; stable for existing installs.
|
|
31
|
+
// Do not move this shipped ladder to Roaming.
|
|
32
|
+
const localAppData = environmentValue(context, "LOCALAPPDATA");
|
|
33
|
+
if (localAppData)
|
|
34
|
+
return localAppData;
|
|
35
|
+
const userProfile = environmentValue(context, "USERPROFILE");
|
|
36
|
+
if (userProfile)
|
|
37
|
+
return join(userProfile, "AppData", "Local");
|
|
14
38
|
}
|
|
15
|
-
|
|
39
|
+
const home = environmentValue(context, "HOME");
|
|
40
|
+
if (home)
|
|
41
|
+
return join(home, ".local", "share");
|
|
42
|
+
return join(".local", "share");
|
|
16
43
|
}
|
|
17
44
|
/**
|
|
18
45
|
* Expand the supported storage-root spellings and anchor them to this process's
|
|
19
46
|
* cwd. Every caller receives one absolute spelling, so a bridge and a plugin
|
|
20
47
|
* cannot select different roots merely because their cwd differs.
|
|
21
48
|
*/
|
|
22
|
-
export function resolveStoragePath(raw) {
|
|
49
|
+
export function resolveStoragePath(raw, context = {}) {
|
|
23
50
|
let expanded = raw;
|
|
24
51
|
if (raw === "~") {
|
|
25
|
-
expanded = homeDir();
|
|
52
|
+
expanded = homeDir(context);
|
|
26
53
|
}
|
|
27
54
|
else if (raw.startsWith("~/") || raw.startsWith("~\\")) {
|
|
28
|
-
expanded = join(homeDir(), raw.slice(2));
|
|
55
|
+
expanded = join(homeDir(context), raw.slice(2));
|
|
29
56
|
}
|
|
30
|
-
return resolve(expanded);
|
|
57
|
+
return resolve(context.currentDirectory ?? process.cwd(), expanded);
|
|
31
58
|
}
|
|
32
59
|
/** Resolve the shared CortexKit storage root used by every plugin host. */
|
|
33
|
-
export function resolveCortexKitStorageRoot() {
|
|
34
|
-
const override =
|
|
60
|
+
export function resolveCortexKitStorageRoot(context = {}) {
|
|
61
|
+
const override = environmentValue(context, "AFT_STORAGE_DIR");
|
|
35
62
|
if (override)
|
|
36
|
-
return resolveStoragePath(override);
|
|
37
|
-
|
|
63
|
+
return resolveStoragePath(override, context);
|
|
64
|
+
const legacyCache = environmentValue(context, "AFT_CACHE_DIR");
|
|
65
|
+
if (legacyCache)
|
|
66
|
+
return join(resolveStoragePath(legacyCache, context), "aft");
|
|
67
|
+
return resolveStoragePath(join(resolveDataHome(context), "cortexkit", "aft"), context);
|
|
38
68
|
}
|
|
39
69
|
/**
|
|
40
70
|
* Resolve a process-state storage root. AFT_STORAGE_DIR is checked here rather
|
|
41
71
|
* than at injection time so it wins over a stale or plugin-injected wire value.
|
|
42
72
|
*/
|
|
43
|
-
export function resolveAftStorageRoot(configuredRoot) {
|
|
44
|
-
if (
|
|
45
|
-
return resolveCortexKitStorageRoot();
|
|
73
|
+
export function resolveAftStorageRoot(configuredRoot, context = {}) {
|
|
74
|
+
if (environmentValue(context, "AFT_STORAGE_DIR")) {
|
|
75
|
+
return resolveCortexKitStorageRoot(context);
|
|
76
|
+
}
|
|
46
77
|
// Explicit process-state paths are caller-owned; preserve their spelling so
|
|
47
78
|
// every downstream read/write uses the exact configured root.
|
|
48
|
-
if (configuredRoot)
|
|
79
|
+
if (configuredRoot !== undefined && configuredRoot.length > 0)
|
|
49
80
|
return configuredRoot;
|
|
50
|
-
return resolveCortexKitStorageRoot();
|
|
81
|
+
return resolveCortexKitStorageRoot(context);
|
|
51
82
|
}
|
|
52
|
-
export function resolveAftLogPath(filename, configuredRoot) {
|
|
53
|
-
return join(resolveAftStorageRoot(configuredRoot), "logs", filename);
|
|
83
|
+
export function resolveAftLogPath(filename, configuredRoot, context = {}) {
|
|
84
|
+
return join(resolveAftStorageRoot(configuredRoot, context), "logs", filename);
|
|
54
85
|
}
|
|
55
86
|
//# sourceMappingURL=storage-paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-paths.js","sourceRoot":"","sources":["../src/storage-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-paths.js","sourceRoot":"","sources":["../src/storage-paths.ts"],"names":[],"mappings":"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"}
|
package/dist/subc-transport.d.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* published plugin dist; it is never a published runtime dependency.
|
|
18
18
|
*/
|
|
19
19
|
import type { RouteHandle } from "@cortexkit/subc-client";
|
|
20
|
-
import { type BindIdentity, type ConsumerIdentity, type RequestOptions, type RouteTarget, SubcCallError } from "@cortexkit/subc-client";
|
|
20
|
+
import { type BindIdentity, type ConsumerIdentity, type RequestOptions, type RouteTarget, SubcCallError, SubcError } from "@cortexkit/subc-client";
|
|
21
21
|
import type { StatusSnapshot } from "./bridge.js";
|
|
22
22
|
import { type CanonicalRootPath, type ConcretePoolId, type LifecycleEvent, type LifecyclePoolRegistration, type LifecyclePoolRegistrationOptions, LifecycleRegistry, type RootGeneration } from "./lifecycle-registry.js";
|
|
23
23
|
import type { AftProjectTransport, AftTransportOptions, AftTransportPool, ToolCallArguments, ToolCallOptions, ToolCallResult } from "./transport.js";
|
|
@@ -25,6 +25,8 @@ import type { AftProjectTransport, AftTransportOptions, AftTransportPool, ToolCa
|
|
|
25
25
|
export declare class SubcTransportShuttingDownError extends SubcCallError {
|
|
26
26
|
constructor();
|
|
27
27
|
}
|
|
28
|
+
/** True when subc-client rejected locally because its connection was already closed. */
|
|
29
|
+
export declare function isSubcClientClosedError(error: unknown): error is SubcError;
|
|
28
30
|
/** A held-open event subscription — the slice of subc-client's Subscription we use. */
|
|
29
31
|
export interface SubcSubscriptionLike {
|
|
30
32
|
/** Cancel the subscription (sends Cancel; idempotent); the provider unwinds with StreamEnd. */
|
|
@@ -341,7 +343,7 @@ export declare class SubcTransportPool implements AftTransportPool {
|
|
|
341
343
|
private isReapInduced;
|
|
342
344
|
private annotateReapError;
|
|
343
345
|
/** Open or reuse a route while guarding every lifecycle boundary. */
|
|
344
|
-
routeRequest(identity: BindIdentity, body: Record<string, unknown>, timeoutMs?: number, onProgress?: RequestOptions["onProgress"], expectedGeneration?: RootGeneration): Promise<unknown>;
|
|
346
|
+
routeRequest(identity: BindIdentity, body: Record<string, unknown>, timeoutMs?: number, onProgress?: RequestOptions["onProgress"], expectedGeneration?: RootGeneration, abortSignal?: AbortSignal): Promise<unknown>;
|
|
345
347
|
/**
|
|
346
348
|
* Hold a restart burst behind one growing timer before reopening an unknown
|
|
347
349
|
* route. The resend remains bounded to one attempt, while a successful resend
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subc-transport.d.ts","sourceRoot":"","sources":["../src/subc-transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subc-transport.d.ts","sourceRoot":"","sources":["../src/subc-transport.ts"],"names":[],"mappings":"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"}
|
package/dist/subc-transport.js
CHANGED
|
@@ -29,6 +29,13 @@ export class SubcTransportShuttingDownError extends SubcCallError {
|
|
|
29
29
|
this.name = "SubcTransportShuttingDownError";
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
+
/** True when subc-client rejected locally because its connection was already closed. */
|
|
33
|
+
export function isSubcClientClosedError(error) {
|
|
34
|
+
return error instanceof SubcError && error.message === "client closed";
|
|
35
|
+
}
|
|
36
|
+
function isConsumerReconnectRequired(error) {
|
|
37
|
+
return isConsumerReconnectTransient(error) || isSubcClientClosedError(error);
|
|
38
|
+
}
|
|
32
39
|
/** The subc module id AFT registers under (matches the daemon manifest). */
|
|
33
40
|
const AFT_MODULE_ID = "aft";
|
|
34
41
|
/**
|
|
@@ -297,7 +304,7 @@ class BgSubscription {
|
|
|
297
304
|
this.onDormant();
|
|
298
305
|
return;
|
|
299
306
|
}
|
|
300
|
-
if (
|
|
307
|
+
if (isConsumerReconnectRequired(err))
|
|
301
308
|
this.dropClient(client);
|
|
302
309
|
if (!reconnecting)
|
|
303
310
|
beginReconnect();
|
|
@@ -363,7 +370,7 @@ class BgSubscription {
|
|
|
363
370
|
giveUp("stopped");
|
|
364
371
|
return;
|
|
365
372
|
}
|
|
366
|
-
if (
|
|
373
|
+
if (isConsumerReconnectRequired(err))
|
|
367
374
|
this.dropClient(client);
|
|
368
375
|
if (Date.now() - subscribedAt >= BG_STABLE_MS)
|
|
369
376
|
backoffAttempt = 0;
|
|
@@ -430,6 +437,11 @@ function safeCloseRoute(client, route) {
|
|
|
430
437
|
// synchronous throw (e.g. closing a route on an already-closed client) — ignore
|
|
431
438
|
}
|
|
432
439
|
}
|
|
440
|
+
function abortedRequestError() {
|
|
441
|
+
const error = new Error("AFT request aborted by host cancellation");
|
|
442
|
+
error.name = "AbortError";
|
|
443
|
+
return error;
|
|
444
|
+
}
|
|
433
445
|
/**
|
|
434
446
|
* A route open that resolved AFTER its session was torn down (closeSession /
|
|
435
447
|
* shutdown / client swap). The caller's request can't proceed, but this is an
|
|
@@ -520,14 +532,14 @@ class SubcTransport {
|
|
|
520
532
|
}
|
|
521
533
|
async toolCall(sessionId, name, rawArgs = {}, options) {
|
|
522
534
|
this.assertCurrent();
|
|
523
|
-
const { preview, timeoutMs, onProgress } = this.splitOptions(options);
|
|
535
|
+
const { preview, timeoutMs, onProgress, abortSignal } = this.splitOptions(options);
|
|
524
536
|
const body = { name, arguments: rawArgs };
|
|
525
537
|
const editSlotSurvives = this.pool.getEditSlotSurvives();
|
|
526
538
|
if (editSlotSurvives !== undefined)
|
|
527
539
|
body.edit_slot_survives = editSlotSurvives;
|
|
528
540
|
if (preview === true)
|
|
529
541
|
body.preview = true;
|
|
530
|
-
const reply = await this.pool.routeRequest(this.identityFor(sessionId), body, timeoutMs, onProgress, this.generation);
|
|
542
|
+
const reply = await this.pool.routeRequest(this.identityFor(sessionId), body, timeoutMs, onProgress, this.generation, abortSignal);
|
|
531
543
|
return reliftReply(reply);
|
|
532
544
|
}
|
|
533
545
|
/**
|
|
@@ -545,13 +557,13 @@ class SubcTransport {
|
|
|
545
557
|
if (LOCALLY_SATISFIED_COMMANDS.has(command)) {
|
|
546
558
|
return { success: true, command, subc_local: true };
|
|
547
559
|
}
|
|
548
|
-
const { timeoutMs, onProgress } = this.splitOptions(options);
|
|
560
|
+
const { timeoutMs, onProgress, abortSignal } = this.splitOptions(options);
|
|
549
561
|
const session = typeof params.session_id === "string" ? params.session_id : undefined;
|
|
550
562
|
const body = { name: command, arguments: params };
|
|
551
563
|
const editSlotSurvives = this.pool.getEditSlotSurvives();
|
|
552
564
|
if (editSlotSurvives !== undefined)
|
|
553
565
|
body.edit_slot_survives = editSlotSurvives;
|
|
554
|
-
const reply = await this.pool.routeRequest(this.identityFor(session), body, timeoutMs, onProgress, this.generation);
|
|
566
|
+
const reply = await this.pool.routeRequest(this.identityFor(session), body, timeoutMs, onProgress, this.generation, abortSignal);
|
|
555
567
|
return reliftReply(reply);
|
|
556
568
|
}
|
|
557
569
|
splitOptions(options) {
|
|
@@ -564,7 +576,7 @@ class SubcTransport {
|
|
|
564
576
|
// default unary deadline while the command keeps running module-side.
|
|
565
577
|
const timeoutMs = options.transportTimeoutMs ?? options.timeoutMs;
|
|
566
578
|
const onProgress = options.onProgress;
|
|
567
|
-
return { preview, timeoutMs, onProgress };
|
|
579
|
+
return { preview, timeoutMs, onProgress, abortSignal: options.abortSignal };
|
|
568
580
|
}
|
|
569
581
|
}
|
|
570
582
|
/**
|
|
@@ -1102,7 +1114,7 @@ export class SubcTransportPool {
|
|
|
1102
1114
|
return this.rootReapedError(record);
|
|
1103
1115
|
}
|
|
1104
1116
|
/** Open or reuse a route while guarding every lifecycle boundary. */
|
|
1105
|
-
async routeRequest(identity, body, timeoutMs, onProgress, expectedGeneration) {
|
|
1117
|
+
async routeRequest(identity, body, timeoutMs, onProgress, expectedGeneration, abortSignal) {
|
|
1106
1118
|
const root = asCanonicalRootPath(identity.project_root);
|
|
1107
1119
|
let generation = expectedGeneration;
|
|
1108
1120
|
if (this.lifecycleEnabled()) {
|
|
@@ -1136,7 +1148,7 @@ export class SubcTransportPool {
|
|
|
1136
1148
|
throw this.annotateReapError(error, record);
|
|
1137
1149
|
if (error instanceof RouteTornDownError)
|
|
1138
1150
|
throw error;
|
|
1139
|
-
if (
|
|
1151
|
+
if (isConsumerReconnectRequired(error) &&
|
|
1140
1152
|
this.isCurrentSession(key, record) &&
|
|
1141
1153
|
this.client === client) {
|
|
1142
1154
|
this.dropClient(client);
|
|
@@ -1172,11 +1184,13 @@ export class SubcTransportPool {
|
|
|
1172
1184
|
};
|
|
1173
1185
|
const handleRequestFailure = (error, entry) => {
|
|
1174
1186
|
clearRouteEntry(entry);
|
|
1187
|
+
if (error instanceof Error && error.name === "AbortError")
|
|
1188
|
+
return;
|
|
1175
1189
|
if (!this.isCurrentSession(key, record) ||
|
|
1176
1190
|
this.client !== client ||
|
|
1177
1191
|
this.isReapInduced(record))
|
|
1178
1192
|
return;
|
|
1179
|
-
if (
|
|
1193
|
+
if (isConsumerReconnectRequired(error)) {
|
|
1180
1194
|
this.transportFailures = 0;
|
|
1181
1195
|
this.dropClient(client);
|
|
1182
1196
|
return;
|
|
@@ -1187,25 +1201,44 @@ export class SubcTransportPool {
|
|
|
1187
1201
|
this.dropClient(client);
|
|
1188
1202
|
}
|
|
1189
1203
|
};
|
|
1190
|
-
const requestOnRoute = async (route) => {
|
|
1204
|
+
const requestOnRoute = async (route, entry) => {
|
|
1191
1205
|
this.assertRecordLive(record);
|
|
1192
|
-
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1197
|
-
|
|
1206
|
+
if (abortSignal?.aborted) {
|
|
1207
|
+
clearRouteEntry(entry);
|
|
1208
|
+
throw abortedRequestError();
|
|
1209
|
+
}
|
|
1210
|
+
let rejectAbort;
|
|
1211
|
+
const aborted = new Promise((_resolve, reject) => {
|
|
1212
|
+
rejectAbort = reject;
|
|
1213
|
+
});
|
|
1214
|
+
const onAbort = () => {
|
|
1215
|
+
clearRouteEntry(entry);
|
|
1216
|
+
rejectAbort?.(abortedRequestError());
|
|
1217
|
+
};
|
|
1218
|
+
abortSignal?.addEventListener("abort", onAbort, { once: true });
|
|
1219
|
+
try {
|
|
1220
|
+
const request = client.request(route, body, { timeoutMs, onProgress });
|
|
1221
|
+
const reply = abortSignal ? await Promise.race([request, aborted]) : await request;
|
|
1222
|
+
// A legacy closeSession may intentionally let an already-delivered reply
|
|
1223
|
+
// settle. It must not mutate shared state or recreate a subscription.
|
|
1224
|
+
if (!this.isCurrentSession(key, record)) {
|
|
1225
|
+
if (this.isReapInduced(record))
|
|
1226
|
+
throw this.rootReapedError(record);
|
|
1227
|
+
return reply;
|
|
1228
|
+
}
|
|
1229
|
+
this.assertGeneration(record.canonicalRoot, record.generation, "request_completion");
|
|
1230
|
+
if (this.client === client)
|
|
1231
|
+
this.transportFailures = 0;
|
|
1232
|
+
this.ensureBgSubscription(identity, record);
|
|
1198
1233
|
return reply;
|
|
1199
1234
|
}
|
|
1200
|
-
|
|
1201
|
-
|
|
1202
|
-
|
|
1203
|
-
this.ensureBgSubscription(identity, record);
|
|
1204
|
-
return reply;
|
|
1235
|
+
finally {
|
|
1236
|
+
abortSignal?.removeEventListener("abort", onAbort);
|
|
1237
|
+
}
|
|
1205
1238
|
};
|
|
1206
1239
|
let routeAndEntry = await openRouteAfterReloadWindow();
|
|
1207
1240
|
try {
|
|
1208
|
-
return await requestOnRoute(routeAndEntry.route);
|
|
1241
|
+
return await requestOnRoute(routeAndEntry.route, routeAndEntry.entry);
|
|
1209
1242
|
}
|
|
1210
1243
|
catch (error) {
|
|
1211
1244
|
if (this.isReapInduced(record))
|
|
@@ -1217,7 +1250,7 @@ export class SubcTransportPool {
|
|
|
1217
1250
|
await this.waitForRouteReopenBackoff().wait;
|
|
1218
1251
|
routeAndEntry = await openRouteAfterReloadWindow();
|
|
1219
1252
|
try {
|
|
1220
|
-
const reply = await requestOnRoute(routeAndEntry.route);
|
|
1253
|
+
const reply = await requestOnRoute(routeAndEntry.route, routeAndEntry.entry);
|
|
1221
1254
|
this.resetRouteReopenBackoff();
|
|
1222
1255
|
return reply;
|
|
1223
1256
|
}
|