@skylandnpm/octopus-proxy 0.1.57 → 0.1.58

package/dist/{chunk-YFY544PH.js → chunk-AOBRAQCJ.js}

@@ -12,7 +12,7 @@ import {
   probeRemote,
   remoteSessionBudget,
   z
-} from "./chunk-XIJKEY4L.js";
+} from "./chunk-GS3Q6EU5.js";
 
 // ../../node_modules/.pnpm/ajv@8.17.1/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({

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

@@ -4257,7 +4257,7 @@ 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 flags = ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "VideoToolbox", "-framework", "ImageIO"];
+      const flags = ["-O2", "-fobjc-arc", "-mmacosx-version-min=12.3", "-framework", "Foundation", "-framework", "AppKit", "-framework", "ScreenCaptureKit", "-framework", "CoreMedia", "-framework", "CoreVideo", "-framework", "VideoToolbox", "-framework", "ImageIO", "-framework", "IOKit"];
       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;
@@ -4465,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", "-framework", "IOKit"] : ["-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", "-framework", "VideoToolbox"] : ["-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;

package/dist/cli.js

@@ -34,13 +34,13 @@ import {
   supportedPlatform,
   systemdUnitPath,
   toolSearchDirs
-} from "./chunk-YFY544PH.js";
+} from "./chunk-AOBRAQCJ.js";
 import {
   DESKTOP_PERMISSION_GUIDANCE,
   PlatformDesktop,
   checkDesktop,
   requestDesktopPermission
-} from "./chunk-XIJKEY4L.js";
+} from "./chunk-GS3Q6EU5.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-YFY544PH.js";
-import "./chunk-XIJKEY4L.js";
+} from "./chunk-AOBRAQCJ.js";
+import "./chunk-GS3Q6EU5.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-XIJKEY4L.js";
+} from "./chunk-GS3Q6EU5.js";
 
 // src/remote-worker.ts
 import rtc from "@roamhq/wrtc";

package/native/desktop-macos.m

@@ -2,6 +2,9 @@
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
 #import <ImageIO/ImageIO.h>
 #import <VideoToolbox/VideoToolbox.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
+#include <dlfcn.h>
+#include <unistd.h>
 
 static BOOL finished = NO;
 static int resultCode = 1;
@@ -39,6 +42,41 @@ static BOOL saveImage(CGImageRef image, NSString *path) {
   return saved;
 }
 
+// The public Quartz snapshot API is used only on 12.3–13, where SCStream can
+// stall at the lock screen. Resolve it lazily: newer macOS removed this API.
+static BOOL legacyLockedSession(void) {
+  NSDictionary *s = CFBridgingRelease(CGSessionCopyCurrentDictionary());
+  return [s[@"CGSSessionScreenIsLocked"] boolValue] &&
+    [s[(__bridge NSString *)kCGSessionOnConsoleKey] boolValue] &&
+    [s[(__bridge NSString *)kCGSessionLoginDoneKey] boolValue] &&
+    [s[(__bridge NSString *)kCGSessionUserIDKey] isKindOfClass:NSNumber.class] &&
+    [s[(__bridge NSString *)kCGSessionUserIDKey] unsignedIntValue] == getuid();
+}
+static int saveLegacyLock(CGDirectDisplayID display, NSString *path, CGImageRef (*snapshot)(CGDirectDisplayID)) {
+  if (!snapshot || !legacyLockedSession() || !CGPreflightScreenCaptureAccess() || !CGDisplayIsOnline(display)) return 1;
+  // Sleeping displays return NULL. An explicit screenshot request may wake
+  // the display; the system still owns the lock and validates any password.
+  IOPMAssertionID assertion = kIOPMNullAssertionID;
+  IOPMAssertionDeclareUserActivity(CFSTR("Octopus desktop screenshot"), kIOPMUserActiveLocal, &assertion);
+  NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:2];
+  CGImageRef image = NULL;
+  while (deadline.timeIntervalSinceNow > 0 && legacyLockedSession() && CGPreflightScreenCaptureAccess()) {
+    image = snapshot(display);
+    if (image) break;
+    [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.05]];
+  }
+  BOOL saved = image && legacyLockedSession() && CGPreflightScreenCaptureAccess() && saveImage(image, path);
+  if (image) CGImageRelease(image);
+  if (assertion != kIOPMNullAssertionID) IOPMAssertionRelease(assertion);
+  return saved ? 0 : 1;
+}
+static int captureLegacyLock(CGDirectDisplayID display, NSString *path) {
+  if (@available(macOS 14.0, *)) return -1;
+  if (!legacyLockedSession()) return -1;
+  (void)NSScreen.screens;
+  return saveLegacyLock(display, path, dlsym(RTLD_DEFAULT, "CGDisplayCreateImage"));
+}
+
 static void finishImage(BOOL saved) {
   dispatch_async(dispatch_get_main_queue(), ^{
     if (finished) return;
@@ -131,6 +169,11 @@ int main(int argc, const char *argv[]) {
       }
       DesktopFrame *frame = [DesktopFrame new];
       frame.path = [NSString stringWithUTF8String:argv[3]];
+      int legacy = captureLegacyLock((CGDirectDisplayID)requested, frame.path);
+      if (legacy >= 0) {
+        if (legacy) fail(@"无法捕获当前用户的锁屏画面，请检查图形会话和屏幕录制权限。" );
+        return legacy;
+      }
       [SCShareableContent getShareableContentExcludingDesktopWindows:NO onScreenWindowsOnly:YES completionHandler:^(SCShareableContent *content, NSError *error) {
         if (error || !content) { dispatch_async(dispatch_get_main_queue(), ^{ fail(permissionMessage()); }); return; }
         SCDisplay *display = nil;

package/native/remote-macos.m

@@ -4,6 +4,8 @@
 #import <ScreenCaptureKit/ScreenCaptureKit.h>
 #import <Carbon/Carbon.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>
+#import <VideoToolbox/VideoToolbox.h>
+#include <dlfcn.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -32,6 +34,11 @@ static BOOL screenLocked(void) {
   return [s[@"CGSSessionScreenIsLocked"] boolValue];
 }
 static BOOL inputOK(void) { return AXIsProcessTrusted() && CGPreflightPostEventAccess() && sessionPresent(); }
+typedef CGImageRef (*LegacySnapshot)(CGDirectDisplayID);
+static LegacySnapshot legacySnapshot(void) {
+  if (@available(macOS 14.0,*)) return NULL;
+  return (LegacySnapshot)dlsym(RTLD_DEFAULT,"CGDisplayCreateImage");
+}
 // 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
@@ -122,15 +129,26 @@ static BOOL writeAll(int fd,const void *data,size_t length) {
 @property(nonatomic) double snapshotStarted, lastSnapshot;
 - (void)consumeSample:(CMSampleBufferRef)sampleBuffer;
 - (void)captureLockedFrame;
+- (void)captureLegacyLockedFrame;
+- (void)captureLegacyLockedFrameWithSnapshot:(LegacySnapshot)snapshot;
+- (void)releaseLegacyDisplay;
 @property(nonatomic,strong) NSData *pendingFrame;
 @property(nonatomic,strong) dispatch_queue_t writerQueue;
 @property(nonatomic) BOOL writing;
+@property(nonatomic) IOPMAssertionID legacyDisplayAssertion;
 @end
 @implementation RemoteStream
 - (instancetype)init {
   if ((self=[super init])) self.writerQueue=dispatch_queue_create("octopus.remote.writer",DISPATCH_QUEUE_SERIAL);
   return self;
 }
+- (void)dealloc {
+  if(_legacyDisplayAssertion!=kIOPMNullAssertionID) IOPMAssertionRelease(_legacyDisplayAssertion);
+}
+- (void)releaseLegacyDisplay {
+  if(_legacyDisplayAssertion!=kIOPMNullAssertionID) IOPMAssertionRelease(_legacyDisplayAssertion);
+  _legacyDisplayAssertion=kIOPMNullAssertionID;
+}
 - (void)stream:(SCStream *)stream didStopWithError:(NSError *)error {
   dispatch_async(dispatch_get_main_queue(), ^{
     self.streamStopped=YES;
@@ -158,7 +176,60 @@ static BOOL writeAll(int fd,const void *data,size_t length) {
     return;
   }
 #endif
-  stopping=1;
+  [self captureLegacyLockedFrame];
+}
+- (void)captureLegacyLockedFrame {
+  [self captureLegacyLockedFrameWithSnapshot:legacySnapshot()];
+}
+- (void)captureLegacyLockedFrameWithSnapshot:(LegacySnapshot)snapshot {
+  if(!snapshot) { stopping=1; return; }
+  double now=NSDate.date.timeIntervalSince1970;
+  if(!self.configuration || now-self.lastSnapshot<fmax(.2,CMTimeGetSeconds(self.configuration.minimumFrameInterval))) return;
+  self.lastSnapshot=now;
+  if(stopping || !inputOK() || !CGPreflightScreenCaptureAccess() || !screenLocked()) return;
+  // Ventura's loginwindow sleeps the display ~30 s after connection, at which
+  // point Quartz returns NULL. Keep it visible only for this remote session.
+  // This power assertion does not generate input or dismiss the system lock.
+  if(self.legacyDisplayAssertion==kIOPMNullAssertionID &&
+     IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep,kIOPMAssertionLevelOn,
+       CFSTR("Octopus locked remote display"),&_legacyDisplayAssertion)!=kIOReturnSuccess) { stopping=1; return; }
+  CGImageRef image=snapshot(displayID);
+  if(!image) {
+    if(!self.snapshotStarted) self.snapshotStarted=now;
+    if(now-self.snapshotStarted>2) stopping=1;
+    return;
+  }
+  self.snapshotStarted=0;
+  size_t w=self.configuration.width,h=self.configuration.height;
+  if(!w || !h || w>3840 || h>2160 || w%2 || h%2) { CGImageRelease(image); stopping=1; return; }
+  CVPixelBufferRef rgb=NULL,yuv=NULL;
+  VTPixelTransferSessionRef transfer=NULL;
+  CGContextRef context=NULL;
+  CGColorSpaceRef color=CGColorSpaceCreateDeviceRGB();
+  BOOL converted=NO;
+  if(CVPixelBufferCreate(NULL,w,h,kCVPixelFormatType_32BGRA,NULL,&rgb)==kCVReturnSuccess &&
+     CVPixelBufferCreate(NULL,w,h,kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,NULL,&yuv)==kCVReturnSuccess) {
+    CVPixelBufferLockBaseAddress(rgb,0);
+    context=CGBitmapContextCreate(CVPixelBufferGetBaseAddress(rgb),w,h,8,CVPixelBufferGetBytesPerRow(rgb),color,kCGImageAlphaNoneSkipFirst|kCGBitmapByteOrder32Little);
+    if(context) CGContextDrawImage(context,CGRectMake(0,0,w,h),image);
+    CVPixelBufferUnlockBaseAddress(rgb,0);
+    if(context && VTPixelTransferSessionCreate(NULL,&transfer)==noErr)
+      converted=VTPixelTransferSessionTransferImage(transfer,rgb,yuv)==noErr;
+  }
+  if(converted && !stopping && inputOK() && CGPreflightScreenCaptureAccess() && screenLocked()) {
+    CMVideoFormatDescriptionRef format=NULL; CMSampleBufferRef sample=NULL;
+    CMSampleTimingInfo timing={kCMTimeInvalid,kCMTimeZero,kCMTimeInvalid};
+    if(CMVideoFormatDescriptionCreateForImageBuffer(NULL,yuv,&format)==noErr &&
+       CMSampleBufferCreateReadyWithImageBuffer(NULL,yuv,format,&timing,&sample)==noErr) [self consumeSample:sample];
+    else stopping=1;
+    if(sample) CFRelease(sample);
+    if(format) CFRelease(format);
+  } else if(!converted) stopping=1;
+  if(context) CGContextRelease(context);
+  if(transfer) CFRelease(transfer);
+  if(rgb) CFRelease(rgb);
+  if(yuv) CFRelease(yuv);
+  CGColorSpaceRelease(color); CGImageRelease(image);
 }
 - (void)stream:(SCStream *)stream didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer ofType:(SCStreamOutputType)type {
   if (stopping || type!=SCStreamOutputTypeScreen || !CMSampleBufferIsValid(sampleBuffer)) return;
@@ -264,7 +335,7 @@ int main(int argc,const char *argv[]) {
   @autoreleasepool {
     if (@available(macOS 12.3,*)) {
       if(argc==2 && strcmp(argv[1],"check")==0) {
-        BOOL lockCapture=NO;
+        BOOL lockCapture=legacySnapshot()!=NULL;
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
         if(@available(macOS 14.0,*)) lockCapture=YES;
 #endif
@@ -313,7 +384,9 @@ int main(int argc,const char *argv[]) {
       while(!stopping) {
         @autoreleasepool {
           if(getppid()!=parentPID || NSDate.date.timeIntervalSince1970-lastPing>15 || !inputOK() || !CGPreflightScreenCaptureAccess() || !CGDisplayIsOnline(displayID) || !CGRectEqualToRect(bounds,CGDisplayBounds(displayID))) break;
-          if(screenLocked()) [capture captureLockedFrame];
+          BOOL locked=screenLocked();
+          if(!locked && capture.legacyDisplayAssertion!=kIOPMNullAssertionID) [capture releaseLegacyDisplay];
+          if(locked) [capture captureLockedFrame];
           else if(capture.streamStopped && capture.stream) {
             capture.streamStopped=NO;
             [capture.stream startCaptureWithCompletionHandler:^(NSError *e) { if(e) stopping=1; }];
@@ -330,7 +403,7 @@ int main(int argc,const char *argv[]) {
           [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
         }
       }
-      stopping=1; releaseAll(); releaseActivity(); [capture.stream stopCaptureWithCompletionHandler:nil]; return 0;
+      stopping=1; releaseAll(); releaseActivity(); [capture releaseLegacyDisplay]; [capture.stream stopCaptureWithCompletionHandler:nil]; return 0;
     }
     return 1;
   }

package/package.json

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