@skylandnpm/octopus-proxy 0.1.31 → 0.1.33

package/dist/{chunk-KDOXN43O.js → chunk-2RX5VSBS.js}

@@ -11664,6 +11664,10 @@ async function loadConfig(path, options = {}) {
   }
 }
 
+// src/version.ts
+import { readFileSync } from "node:fs";
+var proxyVersion = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
+
 // src/host-identity.ts
 import { execFile } from "node:child_process";
 import { createHash, randomUUID, X509Certificate } from "node:crypto";
@@ -12509,6 +12513,7 @@ var Artifacts = class {
 import WebSocket from "ws";
 import { Duplex } from "node:stream";
 import { createPublicKey, randomUUID as randomUUID7, verify } from "node:crypto";
+import { userInfo as userInfo2 } from "node:os";
 import { TLSSocket, createSecureContext } from "node:tls";
 
 // src/host-auth.ts
@@ -12646,6 +12651,7 @@ var SecureChat = class {
   eventBytes = 0;
   stopping = false;
   context;
+  serviceAccount = userInfo2().username;
   timer;
   start() {
     this.connect();
@@ -12681,7 +12687,11 @@ var SecureChat = class {
     if (this.stopping) return;
     const url = new URL("/ws/proxy-chat", this.config.hubUrl);
     url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-    const socket = new WebSocket(url, { headers: { Authorization: `SecretKey ${this.config.secretKey}`, "X-Octopus-Bot-Id": this.config.botId }, maxPayload: 1024 * 1024 });
+    const socket = new WebSocket(url, { headers: {
+      Authorization: `SecretKey ${this.config.secretKey}`,
+      "X-Octopus-Bot-Id": this.config.botId,
+      "X-Octopus-Proxy-Version": proxyVersion
+    }, maxPayload: 1024 * 1024 });
     this.outer = socket;
     let lastPong = Date.now();
     const heartbeat = setInterval(() => {
@@ -12736,7 +12746,7 @@ var SecureChat = class {
         return;
       }
       const exporter = tls.exportKeyingMaterial(32, "EXPORTER-octopus-device-v1", Buffer.from(this.config.botId));
-      sendJson(tls, { type: "auth.challenge", botId: this.config.botId, tunnelId: id, exporter: exporter.toString("base64") });
+      sendJson(tls, { type: "auth.challenge", botId: this.config.botId, tunnelId: id, exporter: exporter.toString("base64"), serviceAccount: this.serviceAccount });
     });
     tls.on("data", (chunk) => this.receivePlaintext(id, Buffer.from(chunk)));
     tls.on("error", () => this.closeSession(id));
@@ -12785,7 +12795,7 @@ var SecureChat = class {
         const exporter = session.tls.exportKeyingMaterial(32, "EXPORTER-octopus-device-v1", Buffer.from(this.config.botId)).toString("base64");
         const proof = Buffer.from(`${this.config.botId}\0${id}\0${exporter}`);
         if (!verify(null, proof, createPublicKey({ key: Buffer.concat([ED25519_SPKI, key]), format: "der", type: "spki" }), signature)) throw new Error("Invalid device proof");
-        const valid = await this.authenticate(this.config.stateDirectory, String(message.username ?? ""), String(message.password ?? ""));
+        const valid = await this.authenticate(this.config.stateDirectory, this.serviceAccount, String(message.password ?? ""));
         if (!valid) throw new Error("Host authentication failed");
         if (this.sessions.get(id) !== session) return;
         session.authenticated = true;
@@ -17147,7 +17157,7 @@ var ProjectRegistry = class {
 import { randomUUID as randomUUID15 } from "node:crypto";
 import { access } from "node:fs/promises";
 import { constants as constants4 } from "node:fs";
-import { platform as platform3, userInfo as userInfo2 } from "node:os";
+import { platform as platform3, userInfo as userInfo3 } from "node:os";
 import * as pty from "node-pty";
 var TerminalManager = class {
   constructor(workspace, emit) {
@@ -17178,7 +17188,7 @@ var TerminalManager = class {
         cols: 80,
         rows: 24,
         cwd,
-        env: { PATH: process.env.PATH || "/usr/bin:/bin", HOME: userInfo2().homedir, TERM: "xterm-256color", USER: userInfo2().username }
+        env: { PATH: process.env.PATH || "/usr/bin:/bin", HOME: userInfo3().homedir, TERM: "xterm-256color", USER: userInfo3().username }
       });
       const terminal2 = { id, project, owner, process: terminalProcess, history: "" };
       this.terminals.set(id, terminal2);
@@ -17349,6 +17359,7 @@ export {
   atomicJson,
   Uploads,
   ensureHostAuth,
+  proxyVersion,
   ensureHostIdentity,
   createRuntime,
   createAdapter,

package/dist/cli.js

@@ -19,11 +19,12 @@ import {
   launchdLogPath,
   launchdPlistPath,
   loadConfig,
+  proxyVersion,
   resolveConfigPath,
   runDaemon,
   supportedPlatform,
   systemdUnitPath
-} from "./chunk-KDOXN43O.js";
+} from "./chunk-2RX5VSBS.js";
 
 // src/cli.ts
 import { spawn } from "node:child_process";
@@ -699,10 +700,6 @@ async function manageProjects(configPath2, remove) {
   }
 }
 
-// src/version.ts
-import { readFileSync } from "node:fs";
-var proxyVersion = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
-
 // src/cli.ts
 var USAGE = `octopus-proxy \u2014 Octopus \u4E3B\u673A\u4EE3\u7406
 

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-KDOXN43O.js";
+} from "./chunk-2RX5VSBS.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {