@skylandnpm/octopus-proxy 0.1.49 → 0.1.51

package/dist/{chunk-AIAW33NC.js → chunk-55TEBVWY.js}

@@ -12,7 +12,7 @@ import {
   probeRemote,
   remoteSessionBudget,
   z
-} from "./chunk-PPH4OB7Y.js";
+} from "./chunk-XIJKEY4L.js";
 
 // ../../node_modules/.pnpm/ajv@8.17.1/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -13152,6 +13152,7 @@ import { randomUUID as randomUUID15 } from "node:crypto";
 import { access as access2, stat as stat9 } from "node:fs/promises";
 import { constants as constants5 } from "node:fs";
 import { platform as platform3, userInfo as userInfo3 } from "node:os";
+import { delimiter } from "node:path";
 import * as pty from "node-pty";
 
 // src/terminal-support.ts
@@ -13234,6 +13235,15 @@ var TerminalManager = class {
       }
       const { helper } = await ensureTerminalSupport();
       const id = randomUUID15();
+      const path = [
+        process.env.PATH,
+        "/usr/bin",
+        "/bin",
+        "/usr/sbin",
+        "/sbin",
+        "/usr/local/bin",
+        ...platform3() === "darwin" ? ["/opt/homebrew/bin"] : []
+      ].filter(Boolean).join(delimiter);
       let terminalProcess;
       try {
         terminalProcess = pty.spawn(shell, [], {
@@ -13241,7 +13251,7 @@ var TerminalManager = class {
           cols: 80,
           rows: 24,
           cwd,
-          env: { PATH: process.env.PATH || "/usr/bin:/bin", HOME: userInfo3().homedir, TERM: "xterm-256color", USER: userInfo3().username }
+          env: { PATH: path, HOME: userInfo3().homedir, TERM: "xterm-256color", USER: userInfo3().username }
         });
       } catch (error) {
         throw new Error(`\u7EC8\u7AEF\u542F\u52A8\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}\uFF08shell=${shell}\uFF0Ccwd=${cwd}${helper ? `\uFF0Chelper=${helper}` : ""}\uFF0C${process.platform}/${process.arch}\uFF0CNode ${process.version}\uFF09\uFF1B\u8BF7\u5728 Proxy \u4E3B\u673A\u8FD0\u884C octopus-proxy doctor --fix \u68C0\u67E5`);

package/dist/{chunk-PPH4OB7Y.js → chunk-XIJKEY4L.js}

@@ -4187,7 +4187,7 @@ function assertLgplFFmpeg(output) {
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { createHash, randomUUID } from "node:crypto";
-import { chmod, mkdir, mkdtemp, readFile, rename, rm, stat } from "node:fs/promises";
+import { chmod, mkdir, mkdtemp, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 var DESKTOP_IMAGE_LIMIT = 20 * 1024 * 1024;
@@ -4257,16 +4257,20 @@ var PlatformDesktop = class {
       await mkdir(this.stateDirectory, { recursive: true, mode: 448 });
       const target = join(this.stateDirectory, "octopus-desktop-capture");
       const source = fileURLToPath(new URL("../native/desktop-macos.m", import.meta.url));
-      const sourceInfo = await stat(source), existing = await stat(target).catch(() => null);
-      if (existing?.isFile() && existing.mtimeMs >= sourceInfo.mtimeMs && (existing.mode & 63) === 0) return target;
-      const temporary = `${target}.${randomUUID()}`;
+      const flags = ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "VideoToolbox", "-framework", "ImageIO"];
+      const fingerprint = createHash("sha256").update(await readFile(source)).update(JSON.stringify([process.arch, flags])).digest("hex");
+      const stamp = `${target}.sha256`, existing = await stat(target).catch(() => null);
+      if (existing?.isFile() && (existing.mode & 63) === 0 && await readFile(stamp, "utf8").catch(() => "") === fingerprint) return target;
+      const temporary = `${target}.${randomUUID()}`, temporaryStamp = `${temporary}.sha256`;
       try {
-        await this.execute("/usr/bin/clang", ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "VideoToolbox", "-framework", "ImageIO", source, "-o", temporary]);
+        await this.execute("/usr/bin/clang", [...flags, source, "-o", temporary]);
         await chmod(temporary, 448);
+        await writeFile(temporaryStamp, fingerprint, { mode: 384 });
         await rename(temporary, target);
+        await rename(temporaryStamp, stamp);
         return target;
       } finally {
-        await rm(temporary, { force: true });
+        await Promise.all([rm(temporary, { force: true }), rm(temporaryStamp, { force: true })]);
       }
     })();
     this.helper.catch(() => {
@@ -4447,7 +4451,7 @@ var DesktopManager = class {
 // src/remote-native.ts
 import { execFile as execFile2, spawn } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
-import { chmod as chmod2, mkdir as mkdir2, readFile as readFile2, rename as rename2, rm as rm2, stat as stat2, writeFile } from "node:fs/promises";
+import { chmod as chmod2, mkdir as mkdir2, readFile as readFile2, rename as rename2, rm as rm2, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
@@ -4461,7 +4465,7 @@ async function ensureRemoteHelper(stateDirectory) {
   const source = fileURLToPath2(new URL(mac ? "../native/remote-macos.m" : "../native/remote-x11.c", import.meta.url));
   const target = join2(stateDirectory, "octopus-remote-desktop");
   const stamp = `${target}.sha256`;
-  const flags = mac ? ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "ApplicationServices", "-framework", "Carbon"] : ["-O2", "-lX11", "-lXtst"];
+  const flags = mac ? ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "ApplicationServices", "-framework", "Carbon", "-framework", "IOKit"] : ["-O2", "-lX11", "-lXtst"];
   const fingerprint = createHash2("sha256").update(await readFile2(source)).update(JSON.stringify([process.platform, process.arch, flags])).digest("hex");
   const existing = await stat2(target).catch(() => void 0);
   if (existing?.isFile() && (existing.mode & 63) === 0 && await readFile2(stamp, "utf8").catch(() => "") === fingerprint) return target;
@@ -4470,7 +4474,7 @@ async function ensureRemoteHelper(stateDirectory) {
   try {
     await exec(mac ? "/usr/bin/clang" : "cc", args, { timeout: 6e4, maxBuffer: 16384 });
     await chmod2(temporary, 448);
-    await writeFile(temporaryStamp, fingerprint, { mode: 384 });
+    await writeFile2(temporaryStamp, fingerprint, { mode: 384 });
     await rename2(temporary, target);
     await rename2(temporaryStamp, stamp);
     return target;

package/dist/cli.js

@@ -31,13 +31,13 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-AIAW33NC.js";
+} from "./chunk-55TEBVWY.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,
   checkDesktop,
   requestDesktopPermission
-} from "./chunk-PPH4OB7Y.js";
+} from "./chunk-XIJKEY4L.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";

package/dist/main.js

@@ -2,8 +2,8 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-AIAW33NC.js";
-import "./chunk-PPH4OB7Y.js";
+} from "./chunk-55TEBVWY.js";
+import "./chunk-XIJKEY4L.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-PPH4OB7Y.js";
+} from "./chunk-XIJKEY4L.js";
 
 // src/remote-worker.ts
 import rtc from "@roamhq/wrtc";

package/native/desktop-macos.m

@@ -106,7 +106,9 @@ int main(int argc, const char *argv[]) {
       if (argc == 2 && strcmp(argv[1], "list") == 0) {
         CGDirectDisplayID ids[64];
         uint32_t count = 0;
-        if (CGGetActiveDisplayList(64, ids, &count) != kCGErrorSuccess) {
+        // Sleeping displays are still connected and must remain selectable so
+        // an authenticated remote connection can wake them with user input.
+        if (CGGetOnlineDisplayList(64, ids, &count) != kCGErrorSuccess) {
           fail(@"无法读取活动显示器，请检查 Proxy 是否运行在已登录的图形桌面会话中。" );
           return 1;
         }

package/native/remote-macos.m

@@ -3,6 +3,7 @@
 #import <ApplicationServices/ApplicationServices.h>
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
 #import <Carbon/Carbon.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -17,6 +18,8 @@ static NSMutableSet<NSNumber *> *heldKeys;
 static BOOL heldButtons[3];
 static double lastPing;
 static pid_t parentPID;
+static IOPMAssertionID activityAssertion = kIOPMNullAssertionID;
+static double lastActivity;
 static void signalStop(int signal) { stopping = 1; }
 static BOOL sessionPresent(void) {
   NSDictionary *s = CFBridgingRelease(CGSessionCopyCurrentDictionary());
@@ -29,6 +32,19 @@ static BOOL screenLocked(void) {
   return [s[@"CGSSessionScreenIsLocked"] boolValue];
 }
 static BOOL inputOK(void) { return AXIsProcessTrusted() && CGPreflightPostEventAccess() && sessionPresent(); }
+// Quartz events can fill the password field without marking the console user
+// active. loginwindow then times out its activity check and reports a bad
+// password. Declare activity on connection and real console input, never on
+// capture/pings. This also wakes a sleeping connected display.
+static void userActivity(void) {
+  double now=NSProcessInfo.processInfo.systemUptime;
+  if(activityAssertion!=kIOPMNullAssertionID && now-lastActivity<1) return;
+  if(IOPMAssertionDeclareUserActivity(CFSTR("Octopus remote console input"),kIOPMUserActiveLocal,&activityAssertion)==kIOReturnSuccess) lastActivity=now;
+}
+static void releaseActivity(void) {
+  if(activityAssertion!=kIOPMNullAssertionID) IOPMAssertionRelease(activityAssertion);
+  activityAssertion=kIOPMNullAssertionID; lastActivity=0;
+}
 static void emit(NSDictionary *value) {
   NSData *data = [NSJSONSerialization dataWithJSONObject:value options:0 error:NULL];
   if (!data) return;
@@ -205,15 +221,18 @@ static void command(NSString *line,RemoteStream *capture) {
   }
   if (([op isEqual:@"pointer"] && parts.count==3) || ([op isEqual:@"button"] && parts.count==5) || ([op isEqual:@"wheel"] && parts.count==5)) {
     position(parts[1].doubleValue,parts[2].doubleValue);
-    if ([op isEqual:@"button"]) { int button=parts[3].intValue; if(button<0 || button>2) { stopping=1; return; } heldButtons[button]=parts[4].boolValue; mouseEvent(mouseType(button,heldButtons[button]),mouseButton(button)); }
+    if ([op isEqual:@"button"] && (parts[3].intValue<0 || parts[3].intValue>2)) { stopping=1; return; }
+    userActivity();
+    if ([op isEqual:@"button"]) { int button=parts[3].intValue; heldButtons[button]=parts[4].boolValue; mouseEvent(mouseType(button,heldButtons[button]),mouseButton(button)); }
     else if ([op isEqual:@"wheel"]) { mouseEvent(kCGEventMouseMoved,kCGMouseButtonLeft); CGEventRef e=CGEventCreateScrollWheelEvent(NULL,kCGScrollEventUnitPixel,2,-parts[4].intValue,-parts[3].intValue); if(e) { CGEventSetFlags(e,flags()); CGEventPost(kCGHIDEventTap,e); CFRelease(e); } }
     else { CGEventType type=heldButtons[0]?kCGEventLeftMouseDragged:heldButtons[2]?kCGEventRightMouseDragged:heldButtons[1]?kCGEventOtherMouseDragged:kCGEventMouseMoved; mouseEvent(type,heldButtons[2]?kCGMouseButtonRight:heldButtons[1]?kCGMouseButtonCenter:kCGMouseButtonLeft); }
-  } else if ([op isEqual:@"key"] && parts.count==3) { NSNumber *key=keyCodes()[parts[1]]; if(key) keyEvent(key.unsignedShortValue,parts[2].boolValue); }
+  } else if ([op isEqual:@"key"] && parts.count==3) { NSNumber *key=keyCodes()[parts[1]]; if(key) { userActivity(); keyEvent(key.unsignedShortValue,parts[2].boolValue); } }
   else if (([op isEqual:@"text"] && parts.count==3) || ([op isEqual:@"password"] && parts.count==2)) {
     BOOL password=[op isEqual:@"password"];
     NSData *data=[[NSData alloc] initWithBase64EncodedString:parts[password ? 1 : 2] options:0]; NSString *text=[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     if(!text || data.length>(password ? 1024 : 16384) || (password && (!data.length || [text rangeOfCharacterFromSet:NSCharacterSet.controlCharacterSet].location!=NSNotFound))) { stopping=1; return; }
     if(password && !screenLocked()) { emit(@{@"kind":@"input-error"}); return; }
+    if(text.length) userActivity();
     releaseAll();
     for(NSUInteger i=0;i<text.length;) {
       if(!inputOK()) { stopping=1; return; }
@@ -252,9 +271,15 @@ int main(int argc,const char *argv[]) {
         emit(@{@"capture":@(CGPreflightScreenCaptureAccess()),@"input":@((BOOL)(AXIsProcessTrusted() && CGPreflightPostEventAccess())),@"session":@(sessionPresent()),@"locked":@(screenLocked()),@"lockCapture":@(lockCapture)}); return 0;
       }
       if(argc!=6 || strcmp(argv[1],"serve")!=0 || !inputOK() || !CGPreflightScreenCaptureAccess()) return 1;
-      displayID=(CGDirectDisplayID)strtoul(argv[2],NULL,10); bounds=CGDisplayBounds(displayID);
+      displayID=(CGDirectDisplayID)strtoul(argv[2],NULL,10);
       int w=atoi(argv[3]),h=atoi(argv[4]),fps=atoi(argv[5]);
-      if(!CGDisplayIsActive(displayID) || w<2 || h<2 || w>3840 || h>2160 || w%2 || h%2 || fps<1 || fps>30) return 1;
+      if(!CGDisplayIsOnline(displayID) || w<2 || h<2 || w>3840 || h>2160 || w%2 || h%2 || fps<1 || fps>30) return 1;
+      userActivity();
+      NSDate *wakeDeadline=[NSDate dateWithTimeIntervalSinceNow:2];
+      while(!CGDisplayIsActive(displayID) && CGDisplayIsOnline(displayID) && inputOK() && wakeDeadline.timeIntervalSinceNow>0)
+        [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.02]];
+      if(!CGDisplayIsActive(displayID) || !inputOK()) { releaseActivity(); return 1; }
+      bounds=CGDisplayBounds(displayID);
       heldKeys=[NSMutableSet set]; cursor=bounds.origin; parentPID=getppid(); lastPing=NSDate.date.timeIntervalSince1970;
       signal(SIGTERM,signalStop); signal(SIGINT,signalStop); signal(SIGPIPE,signalStop);
       fcntl(STDIN_FILENO,F_SETFL,O_NONBLOCK);
@@ -279,7 +304,7 @@ int main(int argc,const char *argv[]) {
       NSMutableData *incoming=[NSMutableData data];
       while(!stopping) {
         @autoreleasepool {
-          if(getppid()!=parentPID || NSDate.date.timeIntervalSince1970-lastPing>15 || !inputOK() || !CGPreflightScreenCaptureAccess() || !CGDisplayIsActive(displayID) || !CGRectEqualToRect(bounds,CGDisplayBounds(displayID))) break;
+          if(getppid()!=parentPID || NSDate.date.timeIntervalSince1970-lastPing>15 || !inputOK() || !CGPreflightScreenCaptureAccess() || !CGDisplayIsOnline(displayID) || !CGRectEqualToRect(bounds,CGDisplayBounds(displayID))) break;
           if(screenLocked()) [capture captureLockedFrame];
           else if(capture.streamStopped && capture.stream) {
             capture.streamStopped=NO;
@@ -297,7 +322,7 @@ int main(int argc,const char *argv[]) {
           [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
         }
       }
-      stopping=1; releaseAll(); [capture.stream stopCaptureWithCompletionHandler:nil]; return 0;
+      stopping=1; releaseAll(); releaseActivity(); [capture.stream stopCaptureWithCompletionHandler:nil]; return 0;
     }
     return 1;
   }

package/package.json

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