dsh-proxy-routing 0.4.1

package/lib/shell-router.js

@@ -0,0 +1,201 @@
+// lib/shell-router.js — 每次执行的 shell 路由：
+// tools/execute 处建立独立 ALS 上下文，symbol registry 包装 ctx.subprocess 的
+// spawn/spawnTerminal，仅对"处于 shell 上下文且 Agent 路由为 profile"的调用
+// 克隆 spec 并追加显式代理环境；不写 process.env、不改调用方对象。
+// 持久 shell 创建时记录策略代际，状态据此报告 stale/current。
+import { shellStore } from "./als.js";
+import { proxyUrl, mergeNoProxyEnv } from "./proxy-env.js";
+import { resolveAgentRoute } from "./routes.js";
+
+const SPAWN_REGISTRY = Symbol.for("dsh-proxy-routing.subprocess-registry");
+
+export const PROXY_OVERLAY_KEYS = Object.freeze([
+  "HTTP_PROXY",
+  "HTTPS_PROXY",
+  "ALL_PROXY",
+  "http_proxy",
+  "https_proxy",
+  "all_proxy",
+  "NO_PROXY",
+  "no_proxy",
+]);
+
+/**
+ * 计算一次执行的代理环境覆盖：
+ * - profile 路由 → 全部别名 + 合并 ambient/configured/loopback 的 NO_PROXY
+ * - direct/缺省 → null（不加任何覆盖，保留子进程提供方的环境基线）
+ * ambient 只读采样 host process.env，绝不写入。
+ */
+export function shellOverlay(route, { ambient = process.env } = {}) {
+  if (!route || route.kind !== "profile") return null;
+  const url = proxyUrl(route.profile);
+  const noProxy = mergeNoProxyEnv(ambient, route.profile.noProxy ?? []);
+  const value = noProxy.join(",");
+  return {
+    HTTP_PROXY: url,
+    HTTPS_PROXY: url,
+    ALL_PROXY: url,
+    http_proxy: url,
+    https_proxy: url,
+    all_proxy: url,
+    NO_PROXY: value,
+    no_proxy: value,
+  };
+}
+
+function registry() {
+  let reg = globalThis[SPAWN_REGISTRY];
+  if (!reg) {
+    reg = { owners: new Map(), wrapped: false, wrapper: undefined, original: undefined };
+    Object.defineProperty(globalThis, SPAWN_REGISTRY, { value: reg, configurable: true, writable: true });
+  }
+  return reg;
+}
+
+export class ShellRouter {
+  /**
+   * @param {object} deps
+   * @param {()=>object} deps.getAgentRoute 当前 Agent 路由快照
+   * @param {()=>number} deps.getRevision 当前配置修订号
+   */
+  constructor({ getAgentRoute, getRevision }) {
+    this.name = "shell-router";
+    this.token = Symbol("shell-router-owner");
+    this.getAgentRoute = getAgentRoute;
+    this.getRevision = getRevision;
+    this.generation = 0; // 策略代际：Agent 路由变化时自增
+    this.lastAgentRoute = null;
+    this.persistentShells = new Set(); // {handle, agentId, generation, revision}
+  }
+
+  // ------------------------------------------------------------- ControlPlane 参与者
+
+  prepare({ next, prev }) {
+    return { next, prev };
+  }
+
+  commit({ next, prev }) {
+    const nextRoute = safeRoute(next);
+    const prevRoute = safeRoute(prev);
+    if (JSON.stringify(nextRoute) !== JSON.stringify(prevRoute)) {
+      this.generation += 1;
+    }
+  }
+
+  finalize() {}
+  rollback() {}
+  dispose() {
+    this.unwrap();
+    this.disposeExecute?.();
+    this.disposeExecute = undefined;
+    this.persistentShells.clear();
+  }
+
+  // ------------------------------------------------------------- 注册
+
+  register(ctx) {
+    this.ctx = ctx;
+    this.disposeExecute = ctx.on?.("tools/execute", (exec, next) => {
+      const store = {
+        route: this.getAgentRoute(),
+        revision: this.getRevision(),
+        generation: this.generation,
+        agent: exec?.agent?.id ?? null,
+      };
+      return shellStore.run(store, () => next());
+    }, { prepend: true });
+    this.wrapSubprocess();
+  }
+
+  wrapSubprocess() {
+    const svc = this.ctx?.subprocess;
+    if (!svc) return;
+    const reg = registry();
+    if (reg.owners.has(this.token)) return;
+    reg.owners.set(this.token, {});
+    if (!reg.wrapped) {
+      reg.original = { spawn: svc.spawn, spawnTerminal: svc.spawnTerminal };
+      const wrapper = {
+        spawn: (spec) => this.dispatchSpawn(svc, spec),
+        spawnTerminal: (spec) => this.dispatchTerminal(svc, spec),
+      };
+      svc.spawn = wrapper.spawn;
+      svc.spawnTerminal = wrapper.spawnTerminal;
+      reg.wrapper = wrapper;
+      reg.wrapped = true;
+    }
+  }
+
+  unwrap() {
+    const reg = registry();
+    reg.owners.delete(this.token);
+    const svc = this.ctx?.subprocess;
+    if (reg.owners.size === 0 && reg.wrapped && svc) {
+      if (svc.spawn === reg.wrapper?.spawn) svc.spawn = reg.original.spawn;
+      if (svc.spawnTerminal === reg.wrapper?.spawnTerminal) svc.spawnTerminal = reg.original.spawnTerminal;
+      reg.wrapped = false;
+      reg.wrapper = undefined;
+      reg.original = undefined;
+    }
+  }
+
+  // ------------------------------------------------------------- 派发
+
+  /** 带覆盖的 spec：克隆 + 追加 overlay（overlay 优先于现有 env 项）。 */
+  applyOverlay(spec, overlay) {
+    if (!overlay) return spec;
+    return { ...spec, env: { ...(spec.env || {}), ...overlay } };
+  }
+
+  dispatchSpawn(svc, spec) {
+    const store = shellStore.getStore();
+    const overlay = store ? shellOverlay(store.route) : null;
+    return regOriginal(svc, "spawn").call(svc, this.applyOverlay(spec, overlay));
+  }
+
+  async dispatchTerminal(svc, spec) {
+    const store = shellStore.getStore();
+    const overlay = store ? shellOverlay(store.route) : null;
+    const handle = await regOriginal(svc, "spawnTerminal").call(svc, this.applyOverlay(spec, overlay));
+    if (store) {
+      const entry = {
+        handle,
+        agentId: store.agent,
+        generation: store.generation,
+        revision: store.revision,
+      };
+      this.persistentShells.add(entry);
+      handle.done?.then(
+        () => this.persistentShells.delete(entry),
+        () => this.persistentShells.delete(entry),
+      );
+    }
+    return handle;
+  }
+
+  /** 当前 Agent 的持久 shell 状态（status 用）：stale / current / unknown。 */
+  shellStatus() {
+    const current = this.generation;
+    const shells = [...this.persistentShells].map((s) => ({
+      agentId: s.agentId,
+      generation: s.generation,
+      current: s.generation === current,
+      stale: s.generation < current,
+      revision: s.revision,
+    }));
+    return { generation: current, shells };
+  }
+}
+
+function regOriginal(svc, method) {
+  const reg = registry();
+  return reg.original?.[method] ?? svc[method];
+}
+
+function safeRoute(canonical) {
+  try {
+    return resolveAgentRoute(canonical);
+  } catch {
+    return Object.freeze({ kind: "direct" });
+  }
+}

package/lib/status.js

@@ -0,0 +1,61 @@
+// lib/status.js — 公开状态投影（脱敏；凭据值永不出现）
+import { publicSnapshot } from "./config.js";
+
+/** 渲染一条路由：direct 或 profile（仅脱敏端点，hasUsername/hasPassword）。 */
+export function renderRoute(route, canonical) {
+  if (!route || route.kind === "direct") return { kind: "direct" };
+  const profile = canonical.profiles.find((p) => p.id === route.profileId);
+  return {
+    kind: "profile",
+    profileId: route.profileId,
+    ...(profile
+      ? {
+          endpoint: {
+            protocol: profile.protocol,
+            host: profile.host,
+            port: profile.port,
+            hasUsername: Boolean(profile.username),
+            hasPassword: Boolean(profile.password),
+          },
+        }
+      : {}),
+  };
+}
+
+/**
+ * 组装 net_proxy_status 使用的公开状态。
+ * @param {object} deps
+ * @param {object} deps.canonical 当前 canonical
+ * @param {number} deps.revision 公开修订号
+ * @param {object} [deps.migration] 迁移元数据 {from, configured}
+ * @param {object} [deps.fetchRouter] FetchRouter 实例（暴露 ownerCount/owned）
+ * @param {object} [deps.shellRouter] ShellRouter 实例
+ */
+export function buildStatus({ canonical, revision, migration, fetchRouter, shellRouter }) {
+  const pub = publicSnapshot(canonical);
+  return {
+    revision,
+    migration: migration ? { from: migration.from, configured: Boolean(migration.configured) } : null,
+    profiles: pub.profiles,
+    agent: {
+      route: renderRoute(canonical.bindings.agent, canonical),
+      generation: shellRouter?.generation ?? 0,
+    },
+    providers: pub.bindings.providers,
+    gateway: pub.gateway,
+    fetchRouter: {
+      owned: Boolean(fetchRouter?.owned()),
+      owners: fetchRouter?.ownerCount() ?? 0,
+    },
+    shell: shellRouter
+      ? {
+          generation: shellRouter.generation,
+          persistentShells: shellRouter.shellStatus().shells.map((s) => ({
+            agentId: s.agentId,
+            stale: s.stale,
+            current: s.current,
+          })),
+        }
+      : null,
+  };
+}