@skylandnpm/octopus-proxy 0.1.65 → 0.1.66

package/dist/{chunk-6RJKEA3I.js → chunk-IV5ZGRAM.js}

@@ -12,7 +12,7 @@ import {
   probeRemote,
   remoteSessionBudget,
   z
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // ../../node_modules/.pnpm/ajv@8.17.1/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -13921,17 +13921,30 @@ var TerminalManager = class {
 import { execFile as execFile6 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 import { userInfo as userInfo4 } from "node:os";
+import { lstat as lstat3 } from "node:fs/promises";
 var exec = promisify6(execFile6);
 var PlatformDesktopSession = class {
-  constructor(system = process.platform, environment = process.env, execute3 = async (args) => (await exec("loginctl", ["--no-ask-password", ...args], { timeout: 5e3, maxBuffer: 16384 })).stdout, account = userInfo4()) {
+  constructor(x11Session = "logind", system = process.platform, environment = process.env, execute3 = async (args) => (await exec("loginctl", ["--no-ask-password", ...args], { timeout: 5e3, maxBuffer: 16384 })).stdout, account = userInfo4(), inspectSocket = lstat3) {
+    this.x11Session = x11Session;
     this.system = system;
     this.environment = environment;
     this.execute = execute3;
     this.account = account;
+    this.inspectSocket = inspectSocket;
   }
   async sessionIdentity() {
     if (this.system === "darwin") return String(this.account.uid);
     if (this.system !== "linux") throw new Error("\u6B64\u5E73\u53F0\u4E0D\u652F\u6301\u8FDC\u7A0B\u684C\u9762\u4F1A\u8BDD");
+    if (this.x11Session === "standalone") {
+      const display = /^(?:unix)?:([0-9]+)(?:\.([0-9]+))?$/.exec(this.environment.DISPLAY ?? "");
+      if (!display || this.account.uid === 0 || this.environment.WAYLAND_DISPLAY || this.environment.XDG_SESSION_TYPE === "wayland") throw new Error("\u72EC\u7ACB X11 \u8FDC\u63A7\u9700\u8981\u975E root \u7528\u6237\u548C\u672C\u5730 DISPLAY\uFF08\u5982 :99\uFF09\uFF0C\u4E0D\u652F\u6301 Wayland \u6216\u8FDC\u7A0B X11");
+      const path = `/tmp/.X11-unix/X${Number(display[1])}`;
+      const socket = await this.inspectSocket(path).catch(() => {
+        throw new Error(`\u72EC\u7ACB X11 socket \u4E0D\u53EF\u7528\uFF1A${path}\uFF1B\u8BF7\u5148\u542F\u52A8 Xvfb/\u684C\u9762\u670D\u52A1`);
+      });
+      if (!socket.isSocket()) throw new Error(`\u72EC\u7ACB X11 \u8DEF\u5F84\u4E0D\u662F socket\uFF1A${path}`);
+      return `x11:${this.account.uid}:${Number(display[1])}.${Number(display[2] ?? 0)}:${socket.dev}:${socket.ino}:${socket.ctimeMs}`;
+    }
     const ids = this.environment.XDG_SESSION_ID ? [this.environment.XDG_SESSION_ID] : (await this.execute(["list-sessions", "--no-legend"])).trim().split("\n").map((line) => line.trim().split(/\s+/)[0]).filter(Boolean);
     const sessions = [];
     for (const id of ids) {
@@ -14044,6 +14057,7 @@ var RemoteManager = class {
       const permissions = await this.probe(this.host.stateDirectory, this.config);
       const lockUnsupported = permissions.locked === true && permissions.lockCapture === false;
       const available = permissions.session && permissions.capture && permissions.input && !lockUnsupported;
+      if (available) await this.desktopSession.sessionIdentity();
       return { ...base, available, permissions, ...!available ? { message: lockUnsupported ? "\u9501\u5C4F\u8FDC\u63A7\u9700\u8981 macOS 14 \u53CA\u4EE5\u4E0A\u53CA\u65B0\u7248 Xcode Command Line Tools\uFF1B\u5F53\u524D\u4E3B\u673A\u8BF7\u5148\u672C\u5730\u89E3\u9501" : "\u8BF7\u68C0\u67E5\u4E3B\u673A\u56FE\u5F62\u4F1A\u8BDD\uFF0C\u5E76\u4E3A\u5B9E\u9645\u8FD0\u884C Proxy \u7684\u7A0B\u5E8F\u6388\u6743\u5C4F\u5E55\u5F55\u5236\u548C\u8F85\u52A9\u529F\u80FD" } : {} };
     } catch (error) {
       return { ...base, available: false, message: error instanceof Error ? error.message : "\u8FDC\u63A7\u4F9D\u8D56\u4E0D\u53EF\u7528" };
@@ -14369,7 +14383,7 @@ async function runDaemon(configPath, authenticate = verifyHostPassword) {
     secureChat?.publish(projectId, event, data);
   }
   const terminals = new TerminalManager(workspace, (owner, project, event, data) => secureChat?.sendTo(owner, project, event, data));
-  const desktopBackend = new PlatformDesktop(config.stateDirectory), desktopSession = new PlatformDesktopSession();
+  const desktopBackend = new PlatformDesktop(config.stateDirectory), desktopSession = new PlatformDesktopSession(config.desktopRemote?.x11Session);
   const desktop = new DesktopManager(desktopBackend);
   const remote = new RemoteManager(
     config,

package/dist/{chunk-GS3Q6EU5.js → chunk-UFLXQ4HQ.js}

@@ -4104,7 +4104,8 @@ var RemoteConfigSchema = z.object({
   stunUrls: z.array(stunUrl).min(1).max(4).optional(),
   totalBitrate: z.number().int().min(1e5).max(REMOTE_DEFAULTS.totalBitrate).default(REMOTE_DEFAULTS.totalBitrate),
   videoMaxBitrate: z.number().int().min(5e4).max(REMOTE_DEFAULTS.videoMaxBitrate).default(REMOTE_DEFAULTS.videoMaxBitrate),
-  ffmpeg: z.string().min(1).default("ffmpeg")
+  ffmpeg: z.string().min(1).default("ffmpeg"),
+  x11Session: z.enum(["logind", "standalone"]).default("logind")
 }).strict().refine((c) => c.videoMaxBitrate <= c.totalBitrate * 0.8, "\u89C6\u9891\u989D\u5EA6\u4E0D\u5F97\u8D85\u8FC7\u603B\u9884\u7B97\u7684 80%");
 function remoteSessionBudget(config, quality, legacy = false) {
   const profile = legacy ? REMOTE_LEGACY_PROFILE : REMOTE_QUALITY_PROFILES[quality];
@@ -4456,8 +4457,12 @@ import { join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 var exec = promisify2(execFile2);
-function supportedRemotePlatform(system = process.platform, arch = process.arch, env = process.env) {
-  return system === "darwin" && ["arm64", "x64"].includes(arch) || system === "linux" && arch === "x64" && !!env.DISPLAY && !env.WAYLAND_DISPLAY && env.XDG_SESSION_TYPE !== "wayland";
+function remotePlatformError(system = process.platform, arch = process.arch, env = process.env) {
+  if (!["darwin", "linux"].includes(system) || !["arm64", "x64"].includes(arch)) return `\u8FDC\u63A7\u4E0D\u652F\u6301\u5F53\u524D\u5E73\u53F0 ${system}/${arch}\uFF1B\u9700\u8981 macOS 12.3+ \u6216 Linux X11\uFF08x64/ARM64\uFF09`;
+  if (system === "linux") {
+    if (env.WAYLAND_DISPLAY || env.XDG_SESSION_TYPE === "wayland") return "\u8FDC\u63A7\u6682\u4E0D\u652F\u6301 Wayland\uFF0C\u8BF7\u4F7F\u7528 X11 \u684C\u9762\u4F1A\u8BDD";
+    if (!env.DISPLAY) return "Proxy \u672A\u8FDE\u63A5 X11 \u56FE\u5F62\u4F1A\u8BDD\uFF1B\u8BF7\u4E3A\u5B9E\u9645\u8FD0\u884C Proxy \u7684\u670D\u52A1\u8BBE\u7F6E\u684C\u9762\u7528\u6237\u7684 DISPLAY \u548C XAUTHORITY\uFF0C\u5BB9\u5668\u4E2D\u8BF7\u5148\u542F\u52A8 Xvfb/\u684C\u9762\u670D\u52A1";
+  }
 }
 async function ensureRemoteHelper(stateDirectory) {
   await mkdir2(stateDirectory, { recursive: true, mode: 448 });
@@ -4485,7 +4490,8 @@ async function ensureRemoteHelper(stateDirectory) {
   }
 }
 async function probeRemote(stateDirectory, config) {
-  if (!supportedRemotePlatform()) throw new Error("\u8FDC\u63A7\u9996\u7248\u652F\u6301 macOS 12.3+ \u4E0E Linux X11 x64\uFF1BWayland\u3001\u65E0\u56FE\u5F62\u4F1A\u8BDD\u6682\u4E0D\u652F\u6301");
+  const platformError = remotePlatformError();
+  if (platformError) throw new Error(platformError);
   await import("@roamhq/wrtc").catch(() => {
     throw new Error("WebRTC \u539F\u751F\u4F9D\u8D56\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u65B0\u5B89\u88C5\u65B0\u7248 Proxy");
   });

package/dist/cli.js

@@ -35,13 +35,13 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-6RJKEA3I.js";
+} from "./chunk-IV5ZGRAM.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,
   checkDesktop,
   requestDesktopPermission
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";
@@ -364,7 +364,7 @@ async function runDoctor(opts) {
   }
   if (config) {
     results.push(...await checkDesktop(config.stateDirectory));
-    const remote = new RemoteManager(config, new PlatformDesktop(config.stateDirectory), new PlatformDesktopSession(), () => {
+    const remote = new RemoteManager(config, new PlatformDesktop(config.stateDirectory), new PlatformDesktopSession(config.desktopRemote?.x11Session), () => {
     }, () => false);
     try {
       const status = await remote.status();

package/dist/main.js

@@ -2,8 +2,8 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-6RJKEA3I.js";
-import "./chunk-GS3Q6EU5.js";
+} from "./chunk-IV5ZGRAM.js";
+import "./chunk-UFLXQ4HQ.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/dist/remote-worker.js

@@ -14,7 +14,7 @@ import {
   remoteResolutionTiers,
   remoteSessionBudget,
   terminateNative
-} from "./chunk-GS3Q6EU5.js";
+} from "./chunk-UFLXQ4HQ.js";
 
 // src/remote-worker.ts
 import rtc from "@roamhq/wrtc";

package/package.json

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