@artenx/dshb 0.1.1 → 0.1.3

package/lib/core/index.js

@@ -5,7 +5,10 @@ import { NodeRegistry } from "./node-registry.js";
 import { testNode } from "./test.js";
 import { registerNodeRoutes, registerSshConfigRoutes } from "./routes.js";
 import { registerRemoteDownloadRoutes, registerWorkspaceRoutes } from "./workspaces.js";
+import { sharedWorkspaceInstructionStore } from "./workspace-instructions.js";
+import { registerWorkspaceInstructionRoutes } from "./workspace-instruction-routes.js";
 import { WorkspaceBindingsStore } from "./workspace-bindings.js";
+import { a as registerWorkspaceInstructionInjector } from "../workspace-instruction-context-CxUldQkP.js";
 //#region src/core/index.ts
 const name = "dshb-core";
 const inject = ["webServer", "credentials"];
@@ -22,6 +25,8 @@ function apply(ctx) {
 	registerSshConfigRoutes(ctx, knownHosts);
 	registerWorkspaceRoutes(ctx, registry, bindings);
 	registerRemoteDownloadRoutes(ctx, registry, bindings);
+	registerWorkspaceInstructionRoutes(ctx, sharedWorkspaceInstructionStore());
+	registerWorkspaceInstructionInjector(ctx);
 	warmupWorlds(ctx, registry, bindings);
 	startHeartbeat(ctx, registry);
 	reprovisionDockerNodes(ctx, registry);

package/lib/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/core/index.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport { sharedWorldResolver } from '../router/resolve.js'\nimport type {} from '@deepseek-ai/dsh-host-webserver'\nimport { sharedAuditLogger } from './audit.js'\nimport { KnownHostsStore } from './known-hosts.js'\nimport { NodeRegistry } from './node-registry.js'\nimport { registerNodeRoutes, registerSshConfigRoutes } from './routes.js'\nimport { registerWorkspaceRoutes, registerRemoteDownloadRoutes } from './workspaces.js'\nimport { testNode, type DockerNodeTester, type SshHandshakeTester } from './test.js'\nimport { WorkspaceBindingsStore } from './workspace-bindings.js'\n\nexport const name = 'dshb-core'\n\nexport const inject = ['webServer', 'credentials']\n\nexport function apply(ctx: Context): void {\n  const knownHosts = new KnownHostsStore()\n  const registry = new NodeRegistry(ctx)\n  const bindings = new WorkspaceBindingsStore()\n  ctx.provide('nodeRegistry', registry)\n  ctx.provide('knownHosts', knownHosts)\n  ctx.provide('workspaceBindings', bindings)\n  ctx.provide('dshbAudit', sharedAuditLogger())\n  sharedWorldResolver().setBindings(bindings)\n  void registerNodeRoutes(ctx, registry)\n  void registerSshConfigRoutes(ctx, knownHosts)\n  void registerWorkspaceRoutes(ctx, registry, bindings)\n  void registerRemoteDownloadRoutes(ctx, registry, bindings)\n  warmupWorlds(ctx, registry, bindings)\n  startHeartbeat(ctx, registry)\n  reprovisionDockerNodes(ctx, registry)\n}\n\nconst HEARTBEAT_MS = 5 * 60 * 1000\n\nfunction startHeartbeat(ctx: Context, registry: NodeRegistry): void {\n  const tick = async (): Promise<void> => {\n    const sshTester = ctx.get('dshbSshPool') as SshHandshakeTester | undefined\n    const dockerTester = ctx.get('dshbDockerTester') as DockerNodeTester | undefined\n    for (const node of registry.list()) {\n      try {\n        await testNode(registry, node.id, sshTester, undefined, dockerTester)\n      } catch {\n        // 单节点心跳失败不影响其他节点\n      }\n    }\n  }\n  const timer = setInterval(() => void tick(), HEARTBEAT_MS)\n  ctx.effect(() => () => clearInterval(timer))\n  setImmediate(() => void tick())\n}\n\nfunction reprovisionDockerNodes(ctx: Context, registry: NodeRegistry): void {\n  setImmediate(() => {\n    void (async () => {\n      const provisioner = ctx.get('dshbDockerProvisioner') as { provision(nodeId: string): Promise<unknown> } | undefined\n      if (!provisioner) return\n      for (const node of registry.list()) {\n        if (node.type !== 'local-docker' && node.type !== 'remote-docker') continue\n        if (!node.docker?.image) continue\n        if (node.docker?.containerId) continue\n        try {\n          await provisioner.provision(node.id)\n        } catch {\n          // 失败已记录到 provisionStatuses\n        }\n      }\n    })()\n  })\n}\n\ninterface WarmupWorldsLike {\n  ensure(nodeId: string): Promise<{ ensureDir(path: string): Promise<void> } | undefined>\n}\n\nfunction warmupWorlds(ctx: Context, registry: NodeRegistry, bindings: WorkspaceBindingsStore): void {\n  setImmediate(() => {\n    void (async () => {\n      for (const b of bindings.list()) {\n        const node = registry.get(b.nodeId)\n        if (!node || node.type === 'local-host') continue\n        try {\n          const isDocker = node.type === 'local-docker' || node.type === 'remote-docker'\n          const worlds = isDocker\n            ? (ctx.get('dshbDockerWorldsGeneric') as WarmupWorldsLike | undefined)\n            : (ctx.get('dshbWorlds') as WarmupWorldsLike | undefined)\n          if (!worlds) continue\n          const world = await worlds.ensure(b.nodeId)\n          if (world) await world.ensureDir(b.remotePath)\n        } catch {\n          // 预热失败不应阻塞启动；运行时可再次 ensure\n        }\n      }\n    })()\n  })\n}\n"],"mappings":";;;;;;;;;AAWA,MAAa,OAAO;AAEpB,MAAa,SAAS,CAAC,aAAa,aAAa;AAEjD,SAAgB,MAAM,KAAoB;CACxC,MAAM,aAAa,IAAI,gBAAgB;CACvC,MAAM,WAAW,IAAI,aAAa,GAAG;CACrC,MAAM,WAAW,IAAI,uBAAuB;CAC5C,IAAI,QAAQ,gBAAgB,QAAQ;CACpC,IAAI,QAAQ,cAAc,UAAU;CACpC,IAAI,QAAQ,qBAAqB,QAAQ;CACzC,IAAI,QAAQ,aAAa,kBAAkB,CAAC;CAC5C,oBAAoB,CAAC,CAAC,YAAY,QAAQ;CAC1C,mBAAwB,KAAK,QAAQ;CACrC,wBAA6B,KAAK,UAAU;CAC5C,wBAA6B,KAAK,UAAU,QAAQ;CACpD,6BAAkC,KAAK,UAAU,QAAQ;CACzD,aAAa,KAAK,UAAU,QAAQ;CACpC,eAAe,KAAK,QAAQ;CAC5B,uBAAuB,KAAK,QAAQ;AACtC;AAEA,MAAM,eAAe;AAErB,SAAS,eAAe,KAAc,UAA8B;CAClE,MAAM,OAAO,YAA2B;EACtC,MAAM,YAAY,IAAI,IAAI,aAAa;EACvC,MAAM,eAAe,IAAI,IAAI,kBAAkB;EAC/C,KAAK,MAAM,QAAQ,SAAS,KAAK,GAC/B,IAAI;GACF,MAAM,SAAS,UAAU,KAAK,IAAI,WAAW,KAAA,GAAW,YAAY;EACtE,QAAQ,CAER;CAEJ;CACA,MAAM,QAAQ,kBAAkB,KAAK,KAAK,GAAG,YAAY;CACzD,IAAI,mBAAmB,cAAc,KAAK,CAAC;CAC3C,mBAAmB,KAAK,KAAK,CAAC;AAChC;AAEA,SAAS,uBAAuB,KAAc,UAA8B;CAC1E,mBAAmB;EACjB,CAAM,YAAY;GAChB,MAAM,cAAc,IAAI,IAAI,uBAAuB;GACnD,IAAI,CAAC,aAAa;GAClB,KAAK,MAAM,QAAQ,SAAS,KAAK,GAAG;IAClC,IAAI,KAAK,SAAS,kBAAkB,KAAK,SAAS,iBAAiB;IACnE,IAAI,CAAC,KAAK,QAAQ,OAAO;IACzB,IAAI,KAAK,QAAQ,aAAa;IAC9B,IAAI;KACF,MAAM,YAAY,UAAU,KAAK,EAAE;IACrC,QAAQ,CAER;GACF;EACF,EAAA,CAAG;CACL,CAAC;AACH;AAMA,SAAS,aAAa,KAAc,UAAwB,UAAwC;CAClG,mBAAmB;EACjB,CAAM,YAAY;GAChB,KAAK,MAAM,KAAK,SAAS,KAAK,GAAG;IAC/B,MAAM,OAAO,SAAS,IAAI,EAAE,MAAM;IAClC,IAAI,CAAC,QAAQ,KAAK,SAAS,cAAc;IACzC,IAAI;KAEF,MAAM,SADW,KAAK,SAAS,kBAAkB,KAAK,SAAS,kBAE1D,IAAI,IAAI,yBAAyB,IACjC,IAAI,IAAI,YAAY;KACzB,IAAI,CAAC,QAAQ;KACb,MAAM,QAAQ,MAAM,OAAO,OAAO,EAAE,MAAM;KAC1C,IAAI,OAAO,MAAM,MAAM,UAAU,EAAE,UAAU;IAC/C,QAAQ,CAER;GACF;EACF,EAAA,CAAG;CACL,CAAC;AACH"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/core/index.ts"],"sourcesContent":["import type { Context } from '@deepseek-ai/cordis'\nimport { sharedWorldResolver } from '../router/resolve.js'\nimport type {} from '@deepseek-ai/dsh-host-webserver'\nimport { sharedAuditLogger } from './audit.js'\nimport { KnownHostsStore } from './known-hosts.js'\nimport { NodeRegistry } from './node-registry.js'\nimport { registerNodeRoutes, registerSshConfigRoutes } from './routes.js'\nimport { registerWorkspaceRoutes, registerRemoteDownloadRoutes } from './workspaces.js'\nimport { registerWorkspaceInstructionRoutes } from './workspace-instruction-routes.js'\nimport { testNode, type DockerNodeTester, type SshHandshakeTester } from './test.js'\nimport { WorkspaceBindingsStore } from './workspace-bindings.js'\nimport { sharedWorkspaceInstructionStore } from './workspace-instructions.js'\nimport { registerWorkspaceInstructionInjector } from './workspace-instruction-context.js'\n\nexport const name = 'dshb-core'\n\nexport const inject = ['webServer', 'credentials']\n\nexport function apply(ctx: Context): void {\n  const knownHosts = new KnownHostsStore()\n  const registry = new NodeRegistry(ctx)\n  const bindings = new WorkspaceBindingsStore()\n  ctx.provide('nodeRegistry', registry)\n  ctx.provide('knownHosts', knownHosts)\n  ctx.provide('workspaceBindings', bindings)\n  ctx.provide('dshbAudit', sharedAuditLogger())\n  sharedWorldResolver().setBindings(bindings)\n  void registerNodeRoutes(ctx, registry)\n  void registerSshConfigRoutes(ctx, knownHosts)\n  void registerWorkspaceRoutes(ctx, registry, bindings)\n  void registerRemoteDownloadRoutes(ctx, registry, bindings)\n  void registerWorkspaceInstructionRoutes(ctx, sharedWorkspaceInstructionStore())\n  registerWorkspaceInstructionInjector(ctx)\n  warmupWorlds(ctx, registry, bindings)\n  startHeartbeat(ctx, registry)\n  reprovisionDockerNodes(ctx, registry)\n}\n\nconst HEARTBEAT_MS = 5 * 60 * 1000\n\nfunction startHeartbeat(ctx: Context, registry: NodeRegistry): void {\n  const tick = async (): Promise<void> => {\n    const sshTester = ctx.get('dshbSshPool') as SshHandshakeTester | undefined\n    const dockerTester = ctx.get('dshbDockerTester') as DockerNodeTester | undefined\n    for (const node of registry.list()) {\n      try {\n        await testNode(registry, node.id, sshTester, undefined, dockerTester)\n      } catch {\n        // 单节点心跳失败不影响其他节点\n      }\n    }\n  }\n  const timer = setInterval(() => void tick(), HEARTBEAT_MS)\n  ctx.effect(() => () => clearInterval(timer))\n  setImmediate(() => void tick())\n}\n\nfunction reprovisionDockerNodes(ctx: Context, registry: NodeRegistry): void {\n  setImmediate(() => {\n    void (async () => {\n      const provisioner = ctx.get('dshbDockerProvisioner') as { provision(nodeId: string): Promise<unknown> } | undefined\n      if (!provisioner) return\n      for (const node of registry.list()) {\n        if (node.type !== 'local-docker' && node.type !== 'remote-docker') continue\n        if (!node.docker?.image) continue\n        if (node.docker?.containerId) continue\n        try {\n          await provisioner.provision(node.id)\n        } catch {\n          // 失败已记录到 provisionStatuses\n        }\n      }\n    })()\n  })\n}\n\ninterface WarmupWorldsLike {\n  ensure(nodeId: string): Promise<{ ensureDir(path: string): Promise<void> } | undefined>\n}\n\nfunction warmupWorlds(ctx: Context, registry: NodeRegistry, bindings: WorkspaceBindingsStore): void {\n  setImmediate(() => {\n    void (async () => {\n      for (const b of bindings.list()) {\n        const node = registry.get(b.nodeId)\n        if (!node || node.type === 'local-host') continue\n        try {\n          const isDocker = node.type === 'local-docker' || node.type === 'remote-docker'\n          const worlds = isDocker\n            ? (ctx.get('dshbDockerWorldsGeneric') as WarmupWorldsLike | undefined)\n            : (ctx.get('dshbWorlds') as WarmupWorldsLike | undefined)\n          if (!worlds) continue\n          const world = await worlds.ensure(b.nodeId)\n          if (world) await world.ensureDir(b.remotePath)\n        } catch {\n          // 预热失败不应阻塞启动；运行时可再次 ensure\n        }\n      }\n    })()\n  })\n}\n"],"mappings":";;;;;;;;;;;;AAcA,MAAa,OAAO;AAEpB,MAAa,SAAS,CAAC,aAAa,aAAa;AAEjD,SAAgB,MAAM,KAAoB;CACxC,MAAM,aAAa,IAAI,gBAAgB;CACvC,MAAM,WAAW,IAAI,aAAa,GAAG;CACrC,MAAM,WAAW,IAAI,uBAAuB;CAC5C,IAAI,QAAQ,gBAAgB,QAAQ;CACpC,IAAI,QAAQ,cAAc,UAAU;CACpC,IAAI,QAAQ,qBAAqB,QAAQ;CACzC,IAAI,QAAQ,aAAa,kBAAkB,CAAC;CAC5C,oBAAoB,CAAC,CAAC,YAAY,QAAQ;CAC1C,mBAAwB,KAAK,QAAQ;CACrC,wBAA6B,KAAK,UAAU;CAC5C,wBAA6B,KAAK,UAAU,QAAQ;CACpD,6BAAkC,KAAK,UAAU,QAAQ;CACzD,mCAAwC,KAAK,gCAAgC,CAAC;CAC9E,qCAAqC,GAAG;CACxC,aAAa,KAAK,UAAU,QAAQ;CACpC,eAAe,KAAK,QAAQ;CAC5B,uBAAuB,KAAK,QAAQ;AACtC;AAEA,MAAM,eAAe;AAErB,SAAS,eAAe,KAAc,UAA8B;CAClE,MAAM,OAAO,YAA2B;EACtC,MAAM,YAAY,IAAI,IAAI,aAAa;EACvC,MAAM,eAAe,IAAI,IAAI,kBAAkB;EAC/C,KAAK,MAAM,QAAQ,SAAS,KAAK,GAC/B,IAAI;GACF,MAAM,SAAS,UAAU,KAAK,IAAI,WAAW,KAAA,GAAW,YAAY;EACtE,QAAQ,CAER;CAEJ;CACA,MAAM,QAAQ,kBAAkB,KAAK,KAAK,GAAG,YAAY;CACzD,IAAI,mBAAmB,cAAc,KAAK,CAAC;CAC3C,mBAAmB,KAAK,KAAK,CAAC;AAChC;AAEA,SAAS,uBAAuB,KAAc,UAA8B;CAC1E,mBAAmB;EACjB,CAAM,YAAY;GAChB,MAAM,cAAc,IAAI,IAAI,uBAAuB;GACnD,IAAI,CAAC,aAAa;GAClB,KAAK,MAAM,QAAQ,SAAS,KAAK,GAAG;IAClC,IAAI,KAAK,SAAS,kBAAkB,KAAK,SAAS,iBAAiB;IACnE,IAAI,CAAC,KAAK,QAAQ,OAAO;IACzB,IAAI,KAAK,QAAQ,aAAa;IAC9B,IAAI;KACF,MAAM,YAAY,UAAU,KAAK,EAAE;IACrC,QAAQ,CAER;GACF;EACF,EAAA,CAAG;CACL,CAAC;AACH;AAMA,SAAS,aAAa,KAAc,UAAwB,UAAwC;CAClG,mBAAmB;EACjB,CAAM,YAAY;GAChB,KAAK,MAAM,KAAK,SAAS,KAAK,GAAG;IAC/B,MAAM,OAAO,SAAS,IAAI,EAAE,MAAM;IAClC,IAAI,CAAC,QAAQ,KAAK,SAAS,cAAc;IACzC,IAAI;KAEF,MAAM,SADW,KAAK,SAAS,kBAAkB,KAAK,SAAS,kBAE1D,IAAI,IAAI,yBAAyB,IACjC,IAAI,IAAI,YAAY;KACzB,IAAI,CAAC,QAAQ;KACb,MAAM,QAAQ,MAAM,OAAO,OAAO,EAAE,MAAM;KAC1C,IAAI,OAAO,MAAM,MAAM,UAAU,EAAE,UAAU;IAC/C,QAAQ,CAER;GACF;EACF,EAAA,CAAG;CACL,CAAC;AACH"}