@skylandnpm/octopus-proxy 0.1.40 → 0.1.41

package/dist/{chunk-OXA2S7UY.js → chunk-WSL4LYYW.js}

@@ -12467,12 +12467,12 @@ var PlatformScreenLock = class {
       if (signal.aborted) throw new ScreenLockError("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u5C4F\u5E55\u89E3\u9501\u5DF2\u53D6\u6D88\u3002");
     };
     check();
-    if (!password || Buffer.byteLength(password) > 1024 || /[\x00-\x1f\x7f]/.test(password)) throw new ScreenLockError("\u4E3B\u673A\u5BC6\u7801\u683C\u5F0F\u65E0\u6548\u3002");
-    if (Date.now() < this.blockedUntil) throw new ScreenLockError("\u5BC6\u7801\u9A8C\u8BC1\u5931\u8D25\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7B49\u5F85 30 \u79D2\u540E\u91CD\u8BD5\u3002");
     const status = await this.status();
     check();
     if (!status.locked) return status;
     if (!status.canUnlock) throw new ScreenLockError(status.message ?? "\u4E3B\u673A\u4E0D\u652F\u6301\u5C4F\u5E55\u89E3\u9501\u3002");
+    if (!password || Buffer.byteLength(password) > 1024 || /[\x00-\x1f\x7f]/.test(password)) throw new ScreenLockError("\u4E3B\u673A\u5BC6\u7801\u683C\u5F0F\u65E0\u6548\u3002");
+    if (Date.now() < this.blockedUntil) throw new ScreenLockError("\u5BC6\u7801\u9A8C\u8BC1\u5931\u8D25\u6B21\u6570\u8FC7\u591A\uFF0C\u8BF7\u7B49\u5F85 30 \u79D2\u540E\u91CD\u8BD5\u3002");
     let valid;
     try {
       valid = await this.authenticate(this.stateDirectory, this.account.username, password);
@@ -12489,6 +12489,10 @@ var PlatformScreenLock = class {
     }
     this.failures = 0;
     if (this.system === "darwin") {
+      const current = await this.status();
+      check();
+      if (!current.locked) return current;
+      if (!current.canUnlock) throw new ScreenLockError(current.message ?? "\u4E3B\u673A\u4E0D\u652F\u6301\u5C4F\u5E55\u89E3\u9501\u3002");
       const helper = await this.macHelper();
       check();
       const bytes = Buffer.from(password, "utf8"), input = Buffer.alloc(bytes.length + 2);
@@ -12507,7 +12511,8 @@ var PlatformScreenLock = class {
     }
     const session = await this.linuxSession(signal);
     check();
-    if (session.locked) await this.execute("loginctl", ["--no-ask-password", "unlock-session", session.id], void 0, signal);
+    if (!session.locked) return { ...status, locked: false };
+    await this.execute("loginctl", ["--no-ask-password", "unlock-session", session.id], void 0, signal);
     for (let i = 0; i < 20; i++) {
       check();
       const current = await this.linuxSession(signal);

package/dist/cli.js

@@ -28,7 +28,7 @@ import {
   runDaemon,
   supportedPlatform,
   systemdUnitPath
-} from "./chunk-OXA2S7UY.js";
+} from "./chunk-WSL4LYYW.js";
 
 // src/cli.ts
 import { spawn as spawn2 } from "node:child_process";

package/dist/main.js

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

package/native/desktop-macos.m

@@ -29,6 +29,39 @@ static NSDictionary *displayInfo(CGDirectDisplayID displayId) {
            @"width": @(CGDisplayPixelsWide(displayId)), @"height": @(CGDisplayPixelsHigh(displayId))};
 }
 
+static BOOL saveImage(CGImageRef image, NSString *path) {
+  if (!image) return NO;
+  CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:path], CFSTR("public.png"), 1, NULL);
+  if (!destination) return NO;
+  CGImageDestinationAddImage(destination, image, NULL);
+  BOOL saved = CGImageDestinationFinalize(destination);
+  CFRelease(destination);
+  return saved;
+}
+
+static void finishImage(BOOL saved) {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (finished) return;
+    if (saved) { resultCode = 0; finished = YES; }
+    else fail(@"无法保存桌面 PNG 截图，请检查 Proxy 状态目录。" );
+  });
+}
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
+static void captureImage(SCContentFilter *filter, SCStreamConfiguration *configuration, NSString *path) API_AVAILABLE(macos(14.0));
+static void captureImage(SCContentFilter *filter, SCStreamConfiguration *configuration, NSString *path) {
+  // A stream may start successfully without delivering frames while the screen
+  // is locked. The screenshot API completes a single capture without that wait.
+  [SCScreenshotManager captureImageWithFilter:filter configuration:configuration completionHandler:^(CGImageRef image, NSError *error) {
+    if (error || !image) {
+      dispatch_async(dispatch_get_main_queue(), ^{ if (!finished) fail(permissionMessage()); });
+      return;
+    }
+    finishImage(saveImage(image, path));
+  }];
+}
+#endif
+
 @interface DesktopFrame : NSObject <SCStreamOutput, SCStreamDelegate>
 @property(nonatomic, strong) SCStream *stream;
 @property(nonatomic, copy) NSString *path;
@@ -49,23 +82,11 @@ static NSDictionary *displayInfo(CGDirectDisplayID displayId) {
   self.received = YES;
   CGImageRef image = NULL;
   OSStatus conversion = VTCreateCGImageFromCVPixelBuffer(pixel, NULL, &image);
-  BOOL saved = NO;
-  if (conversion == noErr && image) {
-    CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:self.path], CFSTR("public.png"), 1, NULL);
-    if (destination) {
-      CGImageDestinationAddImage(destination, image, NULL);
-      saved = CGImageDestinationFinalize(destination);
-      CFRelease(destination);
-    }
-    CGImageRelease(image);
-  }
-  [stream stopCaptureWithCompletionHandler:^(NSError *error) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (finished) return;
-      if (saved) { resultCode = 0; finished = YES; }
-      else fail(@"无法保存桌面 PNG 截图，请检查 Proxy 状态目录。" );
-    });
-  }];
+  BOOL saved = conversion == noErr && saveImage(image, self.path);
+  if (image) CGImageRelease(image);
+  // Stopping a stream is cleanup; a saved PNG must not depend on its callback.
+  [stream stopCaptureWithCompletionHandler:nil];
+  finishImage(saved);
 }
 @end
 
@@ -121,6 +142,12 @@ int main(int argc, const char *argv[]) {
         configuration.showsCursor = YES;
         configuration.queueDepth = 3;
         configuration.minimumFrameInterval = CMTimeMake(1, 30);
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
+        if (@available(macOS 14.0, *)) {
+          captureImage(filter, configuration, frame.path);
+          return;
+        }
+#endif
         frame.stream = [[SCStream alloc] initWithFilter:filter configuration:configuration delegate:frame];
         NSError *outputError = nil;
         if (![frame.stream addStreamOutput:frame type:SCStreamOutputTypeScreen sampleHandlerQueue:dispatch_queue_create("octopus.desktop.frame", DISPATCH_QUEUE_SERIAL) error:&outputError]) {

package/native/screen-unlock-macos.m

@@ -63,25 +63,22 @@ static BOOL key(CGKeyCode code, CGEventFlags flags, const UniChar *text, size_t
   if (!down || !up) { if (down) CFRelease(down); if (up) CFRelease(up); return NO; }
   CGEventSetFlags(down, flags); CGEventSetFlags(up, flags);
   if (text) { CGEventKeyboardSetUnicodeString(down, length, text); CGEventKeyboardSetUnicodeString(up, length, text); }
-  CGEventPost(kCGHIDEventTap, down); CGEventPost(kCGHIDEventTap, up);
+  CGEventPost(kCGHIDEventTap, down);
+  usleep(50000);
+  CGEventPost(kCGHIDEventTap, up);
   CFRelease(down); CFRelease(up);
-  usleep(20000);
+  usleep(50000);
   return YES;
 }
 
-// The locked console owns keyboard input. Space reveals the password prompt,
-// and Backspace removes that Space if the field was already visible. Do not
-// depend on loginwindow exposing an Accessibility tree (some versions do not).
+// Space reveals and focuses the locked console's password prompt. Allow the
+// transition to finish before typing; no Accessibility discovery is required.
 static BOOL wakePasswordPrompt(void) {
-  const CGKeyCode keys[] = {56, 49, 51};
-  const useconds_t settle[] = {1000000, 500000, 200000};
-  for (int i = 0; i < 3; i++) {
-    BOOL locked = NO;
-    if (!lockState(&locked)) return NO;
-    if (!locked) return YES;
-    if (!key(keys[i], 0, NULL, 0)) return NO;
-    usleep(settle[i]);
-  }
+  BOOL locked = NO;
+  if (!lockState(&locked)) return NO;
+  if (!locked) return YES;
+  if (!key(49, 0, NULL, 0)) return NO;
+  usleep(1000000);
   return YES;
 }
 
@@ -92,7 +89,7 @@ static BOOL lockedKey(CGKeyCode code, CGEventFlags flags, const UniChar *text, s
 
 static void printDiagnostics(BOOL locked) {
   // Read-only; no wake, focus, field contents, screenshots, or input events.
-  printf("{\"locked\":%s,\"canUnlock\":%s,\"loginwindowFound\":%s,\"inputMethod\":\"space-backspace\"}",
+  printf("{\"locked\":%s,\"canUnlock\":%s,\"loginwindowFound\":%s,\"inputMethod\":\"space-password\"}",
     locked ? "true" : "false", AXIsProcessTrusted() && CGPreflightPostEventAccess() ? "true" : "false",
     loginWindowPID() ? "true" : "false");
 }
@@ -118,8 +115,6 @@ int main(int argc, const char *argv[]) {
     if (!lockState(&locked)) return fail("session");
     // Saver dismissal, Touch ID or a manual unlock may finish during wake.
     if (!locked) { printStatus(NO); return 0; }
-    if (!lockedKey(0, kCGEventFlagMaskCommand, NULL, 0) ||
-        !lockedKey(51, 0, NULL, 0)) return fail("changed");
     UniChar characters[1024] = {0};
     NSUInteger length = password.length;
     if (length > 1024) return fail("password");

package/package.json

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