@artenx/dshb 0.1.32 → 0.1.34

package/lib/{ssh-transport-B2oNDs0D.d.ts → ssh-transport-C7povM0s.d.ts}

@@ -70,6 +70,46 @@ declare class SyncSshTransport {
   private fetchDataOperation;
   private requestHandshake;
 }
+interface SyncRemoteProbeDraft {
+  host: string;
+  port: number;
+  username: string;
+  authKind: 'password' | 'key';
+}
+interface SyncRemoteProbeProfile {
+  name: string;
+  dshbInstalled: boolean;
+  home: string;
+}
+interface SyncRemoteProbeHandshake {
+  port: number;
+  instanceId: string;
+}
+interface SyncRemoteProbeResult {
+  homes: string[];
+  profiles: SyncRemoteProbeProfile[];
+  /** 握手命中的全部端口（同机多实例时可能有多个；配置端口的命中排最前）。 */
+  handshakes: SyncRemoteProbeHandshake[];
+  webPort?: number;
+  instanceId?: string;
+  processHints: string[];
+  hostKeyFingerprint: string;
+}
+declare const REMOTE_PROBE_BEGIN_MARKER = "DSHB_PROBE_BEGIN";
+declare const REMOTE_PROBE_END_MARKER = "DSHB_PROBE_END";
+/**
+ * 生成远端发现脚本：纯 POSIX sh + 远端 node（DSH 所在机器必然有 node）。
+ * 三个动作：① 多候选定位 DSH_HOME（含桌面版常见路径）；② 列出 profiles 及
+ * dshb 安装标记；③ 握手探测真实 Web 端口（仅远端回环，桌面版 127.0.0.1:3080
+ * 即可命中）。输出以 BEGIN/END 标记包裹，逐行 "key value"。
+ */
+declare function buildRemoteProbeScript(dshHome?: string, preferredWebPort?: number): string;
+/** 解析探测输出：仅在 BEGIN/END 标记之间取行，容忍未知行。 */
+declare function parseRemoteProbeOutput(output: string, hostKeyFingerprint: string, preferredWebPort?: number): SyncRemoteProbeResult;
+declare class SyncRemoteProbe {
+  /** 探测远端：SSH 登录 + 单次 exec 发现脚本；主机密钥自动接受（只读发现，指纹随结果返回）。 */
+  probeRemote(draft: SyncRemoteProbeDraft, secrets: SyncPeerSecrets, preferredWebPort?: number): Promise<SyncRemoteProbeResult>;
+}
 //#endregion
-export { SyncSshProbeError as a, buildSyncSshConnectConfig as c, SyncSshErrorCategory as i, SyncRemoteNodeManifest as n, SyncSshSession as o, SyncSessionDeltaPrefixError as r, SyncSshTransport as s, SyncRemoteHandshake as t };
-//# sourceMappingURL=ssh-transport-B2oNDs0D.d.ts.map
+export { parseRemoteProbeOutput as _, SyncRemoteProbe as a, SyncRemoteProbeProfile as c, SyncSshErrorCategory as d, SyncSshProbeError as f, buildSyncSshConnectConfig as g, buildRemoteProbeScript as h, SyncRemoteNodeManifest as i, SyncRemoteProbeResult as l, SyncSshTransport as m, REMOTE_PROBE_END_MARKER as n, SyncRemoteProbeDraft as o, SyncSshSession as p, SyncRemoteHandshake as r, SyncRemoteProbeHandshake as s, REMOTE_PROBE_BEGIN_MARKER as t, SyncSessionDeltaPrefixError as u };
+//# sourceMappingURL=ssh-transport-C7povM0s.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artenx/dshb",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Routes DSH filesystem, shell, subprocess, and PTY operations to local, SSH, and Docker execution nodes, with a node registry, an authentication gate, a mobile-aware management UI, and per-workspace custom project instructions.",
   "type": "module",
   "main": "lib/index.js",
@@ -8,7 +8,6 @@
   "exports": {
     ".": "./lib/index.js",
     "./auth": "./lib/auth/index.js",
-    "./auth/startup": "./lib/auth/startup.js",
     "./auth/decorate-webserver": "./lib/auth/decorate-webserver.js",
     "./auth/loopback": "./lib/auth/loopback.js",
     "./auth/loopback-compat": "./lib/auth/loopback-compat.js",
@@ -83,8 +82,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "lib",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "lib"
   ],
   "dsh": {
     "bundle": {
@@ -180,5 +179,8 @@
   "homepage": "https://github.com/Artenx/dsh-honeybee#readme",
   "bugs": {
     "url": "https://github.com/Artenx/dsh-honeybee/issues"
+  },
+  "bin": {
+    "dshb-auth-reset": "./lib/auth/reset-cli.js"
   }
 }

package/lib/auth/startup.d.ts

@@ -1,15 +0,0 @@
-import { Context } from "@deepseek-ai/cordis";
-//#region src/auth/startup.d.ts
-declare const name = "web-startup";
-declare const inject: string[];
-declare const WEB_STARTUP_SERVICE = "webStartup";
-interface WebStartupValues {
-  openBrowser: boolean;
-  host?: string;
-  port?: number;
-  trustedHosts: string[];
-}
-declare function apply(ctx: Context): void;
-//#endregion
-export { WEB_STARTUP_SERVICE, WebStartupValues, apply, inject, name };
-//# sourceMappingURL=startup.d.ts.map

package/lib/auth/startup.js

@@ -1,68 +0,0 @@
-import { sanitizeUsername, sharedCredentialStore } from "./credentials.js";
-import { Command } from "commander";
-import { parseCmdline } from "@deepseek-ai/dsh-cmdline";
-//#region src/auth/startup.ts
-const name = "web-startup";
-const inject = ["cmdlineArgs"];
-const WEB_STARTUP_SERVICE = "webStartup";
-function runAuthReset(args) {
-	const store = sharedCredentialStore();
-	if (!store.isInitialized()) {
-		console.error("auth-reset: 尚未初始化管理员账号");
-		process.exit(1);
-	}
-	let password;
-	let username;
-	for (let i = 1; i < args.length; i++) if (args[i] === "--password") password = args[++i];
-	else if (args[i] === "--username") username = args[++i];
-	if (password === void 0 && username === void 0) {
-		console.error("auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>");
-		process.exit(1);
-	}
-	if (password !== void 0 && password.length < 8) {
-		console.error("auth-reset: 密码至少 8 个字符");
-		process.exit(1);
-	}
-	if (username !== void 0) {
-		username = sanitizeUsername(username);
-		if (!username) {
-			console.error("auth-reset: 用户名不能为空");
-			process.exit(1);
-		}
-	}
-	if (password !== void 0) store.changePassword(username ?? store.username, password);
-	else store.changeUsername(username);
-	console.log("auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废");
-	process.exit(0);
-}
-function webCommand() {
-	return new Command().name("dsh --profile web").description("Serve the DeepSeek Harness UI.").helpOption("-h, --help", "show this help").option("--host <host>", "bind host").option("--no-open", "do not open the UI in the default browser").option("--port <port>", "listen port; pass 0 to let the OS pick a free one").option("--trusted-host <authority...>", "extra authority the /api browser-trust fence accepts (host or host:port; repeatable)").addHelpText("after", `
-Examples:
-  dsh --profile web                          serve on the composed host and port
-  dsh --profile web --no-open                serve without opening a browser (desktop app ignores this)
-  dsh --profile web --port 8080              serve on another port
-  dsh --profile web --host 0.0.0.0           serve on all interfaces (DSHB: auth plugin guards access)
-  dsh --profile web auth-reset --password <新密码>   reset admin credentials and revoke all sessions
-`);
-}
-function apply(ctx) {
-	const args = ctx.cmdlineArgs?.get() ?? [];
-	if (args[0] === "auth-reset") runAuthReset(args);
-	const program = webCommand();
-	program.action(() => {
-		const options = program.opts();
-		if (options.port !== void 0 && !/^\d+$/.test(options.port)) program.error(`error: --port must be a number, got ${JSON.stringify(options.port)}`);
-		const values = {
-			openBrowser: options.open,
-			...options.host !== void 0 && { host: options.host },
-			...options.port !== void 0 && { port: Number(options.port) },
-			trustedHosts: options.trustedHost ?? []
-		};
-		ctx.provide(WEB_STARTUP_SERVICE, values);
-	});
-	parseCmdline(ctx, program);
-}
-//#endregion
-export { WEB_STARTUP_SERVICE, apply, inject, name };
-
-//# sourceMappingURL=startup.js.map

package/lib/auth/startup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"startup.js","names":[],"sources":["../../src/auth/startup.ts"],"sourcesContent":["import { Command } from 'commander'\nimport { parseCmdline } from '@deepseek-ai/dsh-cmdline'\nimport type { Context } from '@deepseek-ai/cordis'\nimport { sanitizeUsername, sharedCredentialStore } from './credentials.js'\n\nexport const name = 'web-startup'\n\nexport const inject = ['cmdlineArgs']\n\nexport const WEB_STARTUP_SERVICE = 'webStartup'\n\nexport interface WebStartupValues {\n  openBrowser: boolean\n  host?: string\n  port?: number\n  trustedHosts: string[]\n}\n\nfunction runAuthReset(args: readonly string[]): never {\n  const store = sharedCredentialStore()\n  if (!store.isInitialized()) {\n    console.error('auth-reset: 尚未初始化管理员账号')\n    process.exit(1)\n  }\n  let password: string | undefined\n  let username: string | undefined\n  for (let i = 1; i < args.length; i++) {\n    if (args[i] === '--password') password = args[++i]\n    else if (args[i] === '--username') username = args[++i]\n  }\n  if (password === undefined && username === undefined) {\n    console.error('auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>')\n    process.exit(1)\n  }\n  if (password !== undefined && password.length < 8) {\n    console.error('auth-reset: 密码至少 8 个字符')\n    process.exit(1)\n  }\n  if (username !== undefined) {\n    username = sanitizeUsername(username)\n    if (!username) {\n      console.error('auth-reset: 用户名不能为空')\n      process.exit(1)\n    }\n  }\n  if (password !== undefined) store.changePassword(username ?? store.username!, password)\n  else store.changeUsername(username!)\n  console.log('auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废')\n  process.exit(0)\n}\n\nfunction webCommand(): Command {\n  return new Command()\n    .name('dsh --profile web')\n    .description('Serve the DeepSeek Harness UI.')\n    .helpOption('-h, --help', 'show this help')\n    .option('--host <host>', 'bind host')\n    .option('--no-open', 'do not open the UI in the default browser')\n    .option('--port <port>', 'listen port; pass 0 to let the OS pick a free one')\n    .option(\n      '--trusted-host <authority...>',\n      'extra authority the /api browser-trust fence accepts (host or host:port; repeatable)',\n    )\n    .addHelpText(\n      'after',\n      `\nExamples:\n  dsh --profile web                          serve on the composed host and port\n  dsh --profile web --no-open                serve without opening a browser (desktop app ignores this)\n  dsh --profile web --port 8080              serve on another port\n  dsh --profile web --host 0.0.0.0           serve on all interfaces (DSHB: auth plugin guards access)\n  dsh --profile web auth-reset --password <新密码>   reset admin credentials and revoke all sessions\n`,\n    )\n}\n\nexport function apply(ctx: Context): void {\n  const args = ctx.cmdlineArgs?.get() ?? []\n  if (args[0] === 'auth-reset') runAuthReset(args)\n  const program = webCommand()\n  program.action(() => {\n    const options = program.opts()\n    if (options.port !== undefined && !/^\\d+$/.test(options.port)) {\n      program.error(`error: --port must be a number, got ${JSON.stringify(options.port)}`)\n    }\n    const values: WebStartupValues = {\n      openBrowser: options.open,\n      ...(options.host !== undefined && { host: options.host }),\n      ...(options.port !== undefined && { port: Number(options.port) }),\n      trustedHosts: options.trustedHost ?? [],\n    }\n    ctx.provide(WEB_STARTUP_SERVICE, values)\n  })\n  parseCmdline(ctx, program)\n}\n"],"mappings":";;;;AAKA,MAAa,OAAO;AAEpB,MAAa,SAAS,CAAC,aAAa;AAEpC,MAAa,sBAAsB;AASnC,SAAS,aAAa,MAAgC;CACpD,MAAM,QAAQ,sBAAsB;CACpC,IAAI,CAAC,MAAM,cAAc,GAAG;EAC1B,QAAQ,MAAM,wBAAwB;EACtC,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI;CACJ,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAC/B,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;MAC3C,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;CAEvD,IAAI,aAAa,KAAA,KAAa,aAAa,KAAA,GAAW;EACpD,QAAQ,MAAM,uDAAuD;EACrE,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,KAAa,SAAS,SAAS,GAAG;EACjD,QAAQ,MAAM,wBAAwB;EACtC,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,GAAW;EAC1B,WAAW,iBAAiB,QAAQ;EACpC,IAAI,CAAC,UAAU;GACb,QAAQ,MAAM,qBAAqB;GACnC,QAAQ,KAAK,CAAC;EAChB;CACF;CACA,IAAI,aAAa,KAAA,GAAW,MAAM,eAAe,YAAY,MAAM,UAAW,QAAQ;MACjF,MAAM,eAAe,QAAS;CACnC,QAAQ,IAAI,oCAAoC;CAChD,QAAQ,KAAK,CAAC;AAChB;AAEA,SAAS,aAAsB;CAC7B,OAAO,IAAI,QAAQ,CAAC,CACjB,KAAK,mBAAmB,CAAC,CACzB,YAAY,gCAAgC,CAAC,CAC7C,WAAW,cAAc,gBAAgB,CAAC,CAC1C,OAAO,iBAAiB,WAAW,CAAC,CACpC,OAAO,aAAa,2CAA2C,CAAC,CAChE,OAAO,iBAAiB,mDAAmD,CAAC,CAC5E,OACC,iCACA,sFACF,CAAC,CACA,YACC,SACA;;;;;;;CAQF;AACJ;AAEA,SAAgB,MAAM,KAAoB;CACxC,MAAM,OAAO,IAAI,aAAa,IAAI,KAAK,CAAC;CACxC,IAAI,KAAK,OAAO,cAAc,aAAa,IAAI;CAC/C,MAAM,UAAU,WAAW;CAC3B,QAAQ,aAAa;EACnB,MAAM,UAAU,QAAQ,KAAK;EAC7B,IAAI,QAAQ,SAAS,KAAA,KAAa,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAC1D,QAAQ,MAAM,uCAAuC,KAAK,UAAU,QAAQ,IAAI,GAAG;EAErF,MAAM,SAA2B;GAC/B,aAAa,QAAQ;GACrB,GAAI,QAAQ,SAAS,KAAA,KAAa,EAAE,MAAM,QAAQ,KAAK;GACvD,GAAI,QAAQ,SAAS,KAAA,KAAa,EAAE,MAAM,OAAO,QAAQ,IAAI,EAAE;GAC/D,cAAc,QAAQ,eAAe,CAAC;EACxC;EACA,IAAI,QAAQ,qBAAqB,MAAM;CACzC,CAAC;CACD,aAAa,KAAK,OAAO;AAC3B"}