@skylandnpm/octopus-proxy 0.1.39 → 0.1.40

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

@@ -12359,8 +12359,8 @@ var ScreenLockError = class extends Error {
 var nativeErrors = {
   permission: "\u8BF7\u5728 Proxy \u4E3B\u673A\u201C\u7CFB\u7EDF\u8BBE\u7F6E \u2192 \u9690\u79C1\u4E0E\u5B89\u5168\u6027 \u2192 \u8F85\u52A9\u529F\u80FD\u201D\u4E2D\u6388\u6743\u5B9E\u9645\u8FD0\u884C Proxy \u7684\u7A0B\u5E8F\uFF0C\u5E76\u91CD\u542F Proxy\u3002",
   session: "\u65E0\u6CD5\u8BBF\u95EE Proxy \u7528\u6237\u7684\u6D3B\u52A8\u56FE\u5F62\u4F1A\u8BDD\uFF1B\u4E0D\u652F\u6301\u767B\u5F55\u524D\u3001FileVault \u542F\u52A8\u89E3\u9501\u6216\u5207\u6362\u5230\u5176\u4ED6\u7528\u6237\u7684\u5C4F\u5E55\u3002",
-  focus: "\u5DF2\u5524\u9192\u9501\u5C4F\u754C\u9762\uFF0C\u4F46\u7CFB\u7EDF\u672A\u63D0\u4F9B\u53EF\u8BBF\u95EE\u7684\u5BC6\u7801\u8F93\u5165\u6846\u3002\u8BF7\u786E\u8BA4 Proxy \u670D\u52A1\u7684\u8F85\u52A9\u529F\u80FD\u6388\u6743\u5DF2\u751F\u6548\u5E76\u91CD\u542F\u670D\u52A1\uFF1B\u82E5\u4ECD\u5931\u8D25\uFF0C\u8BF7\u63D0\u4F9B macOS \u7248\u672C\u4EE5\u68C0\u67E5\u9501\u5C4F\u754C\u9762\u517C\u5BB9\u6027\u3002",
-  changed: "\u4E3B\u673A\u9501\u5C4F\u72B6\u6001\u6216\u5BC6\u7801\u8F93\u5165\u7126\u70B9\u5DF2\u53D8\u5316\uFF0C\u5DF2\u505C\u6B62\u8F93\u5165\uFF0C\u8BF7\u91CD\u8BD5\u3002",
+  focus: "\u65E0\u6CD5\u5411\u4E3B\u673A\u9501\u5C4F\u754C\u9762\u53D1\u9001\u5524\u9192\u6309\u952E\uFF0C\u5C1A\u672A\u8F93\u5165\u5BC6\u7801\u3002\u8BF7\u68C0\u67E5\u4E3B\u673A\u6D3B\u52A8\u56FE\u5F62\u4F1A\u8BDD\u540E\u91CD\u8BD5\u3002",
+  changed: "\u4E3B\u673A\u9501\u5C4F\u72B6\u6001\u6216\u6D3B\u52A8\u4F1A\u8BDD\u5DF2\u53D8\u5316\uFF0C\u5DF2\u505C\u6B62\u8F93\u5165\uFF0C\u8BF7\u91CD\u8BD5\u3002",
   timeout: "\u4E3B\u673A\u5C4F\u5E55\u4ECD\u9501\u5B9A\uFF0C\u7CFB\u7EDF\u672A\u63A5\u53D7\u89E3\u9501\u8F93\u5165\uFF1B\u8BF7\u68C0\u67E5\u8F85\u52A9\u529F\u80FD\u6743\u9650\u548C\u9501\u5C4F\u754C\u9762\u540E\u91CD\u8BD5\u3002",
   password: "\u4E3B\u673A\u5BC6\u7801\u683C\u5F0F\u65E0\u6548\u3002"
 };

package/dist/cli.js

@@ -28,7 +28,7 @@ import {
   runDaemon,
   supportedPlatform,
   systemdUnitPath
-} from "./chunk-BYXUILAK.js";
+} from "./chunk-OXA2S7UY.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-BYXUILAK.js";
+} from "./chunk-OXA2S7UY.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/native/screen-unlock-macos.m

@@ -57,142 +57,6 @@ static pid_t loginWindowPID(void) {
   return cached;
 }
 
-static CFTypeRef copyAttribute(AXUIElementRef element, CFStringRef attribute) {
-  CFTypeRef value = NULL;
-  AXUIElementSetMessagingTimeout(element, 0.1);
-  if (AXUIElementCopyAttributeValue(element, attribute, &value) != kAXErrorSuccess) {
-    if (value) CFRelease(value);
-    return NULL;
-  }
-  return value;
-}
-
-static BOOL isSecureField(AXUIElementRef field) {
-  if (!field || CFGetTypeID(field) != AXUIElementGetTypeID()) return NO;
-  pid_t pid = 0;
-  if (AXUIElementGetPid(field, &pid) != kAXErrorSuccess || !isLoginWindow(pid)) return NO;
-  CFTypeRef role = copyAttribute(field, kAXRoleAttribute);
-  CFTypeRef subrole = copyAttribute(field, kAXSubroleAttribute);
-  BOOL secure = (subrole && CFEqual(subrole, kAXSecureTextFieldSubrole)) ||
-      (role && CFEqual(role, kAXSecureTextFieldSubrole));
-  if (role) CFRelease(role);
-  if (subrole) CFRelease(subrole);
-  CFTypeRef enabled = copyAttribute(field, kAXEnabledAttribute);
-  if (enabled && CFEqual(enabled, kCFBooleanFalse)) secure = NO;
-  if (enabled) CFRelease(enabled);
-  CFTypeRef hidden = copyAttribute(field, CFSTR("AXHidden"));
-  if (hidden && CFEqual(hidden, kCFBooleanTrue)) secure = NO;
-  if (hidden) CFRelease(hidden);
-  return secure;
-}
-
-static AXUIElementRef copySecureFocus(AXUIElementRef root) {
-  CFTypeRef focused = copyAttribute(root, kAXFocusedUIElementAttribute);
-  if (focused && isSecureField((AXUIElementRef)focused)) return (AXUIElementRef)focused;
-  if (focused) CFRelease(focused);
-  return NULL;
-}
-
-static void collectSecureFields(AXUIElementRef root, CFMutableArrayRef fields,
-    CFMutableSetRef visited, int depth, CFAbsoluteTime deadline) {
-  if (!root || CFGetTypeID(root) != AXUIElementGetTypeID() || depth > 10 ||
-      CFSetGetCount(visited) >= 128 || CFAbsoluteTimeGetCurrent() >= deadline || CFSetContainsValue(visited, root)) return;
-  CFSetAddValue(visited, root);
-  if (isSecureField(root)) { CFArrayAppendValue(fields, root); return; }
-  // Some loginwindow versions expose windows separately from AXChildren.
-  CFStringRef attributes[] = { kAXChildrenAttribute, kAXWindowsAttribute };
-  for (int i = 0; i < 2; i++) {
-    CFTypeRef children = copyAttribute(root, attributes[i]);
-    if (children && CFGetTypeID(children) == CFArrayGetTypeID()) {
-      for (CFIndex j = 0; j < CFArrayGetCount(children); j++)
-        collectSecureFields((AXUIElementRef)CFArrayGetValueAtIndex(children, j), fields, visited, depth + 1, deadline);
-    }
-    if (children) CFRelease(children);
-  }
-}
-
-static CFArrayRef copySecureFields(AXUIElementRef app) {
-  CFMutableArrayRef fields = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
-  CFMutableSetRef visited = CFSetCreateMutable(NULL, 0, &kCFTypeSetCallBacks);
-  collectSecureFields(app, fields, visited, 0, CFAbsoluteTimeGetCurrent() + 2);
-  CFRelease(visited);
-  return fields;
-}
-
-static AXUIElementRef passwordFocus(void) {
-  AXUIElementRef system = AXUIElementCreateSystemWide();
-  AXUIElementRef field = copySecureFocus(system);
-  CFRelease(system);
-  if (field) return field;
-  pid_t pid = loginWindowPID();
-  if (!pid) return NULL;
-  AXUIElementRef app = AXUIElementCreateApplication(pid);
-  field = copySecureFocus(app);
-  if (!field) {
-    // A locked console can lack the system-wide focused element while the
-    // password field itself or loginwindow still reports its local focus.
-    CFArrayRef fields = copySecureFields(app);
-    for (CFIndex i = 0; i < CFArrayGetCount(fields); i++) {
-      AXUIElementRef candidate = (AXUIElementRef)CFArrayGetValueAtIndex(fields, i);
-      CFTypeRef focused = copyAttribute(candidate, kAXFocusedAttribute);
-      BOOL active = focused && CFEqual(focused, kCFBooleanTrue);
-      if (focused) CFRelease(focused);
-      if (!active) continue;
-      if (field) { CFRelease(field); field = NULL; break; }
-      field = (AXUIElementRef)CFRetain(candidate);
-    }
-    CFRelease(fields);
-  }
-  CFRelease(app);
-  return field;
-}
-
-static AXUIElementRef focusPasswordField(void) {
-  BOOL locked = NO;
-  if (!lockState(&locked) || !locked) return NULL;
-  AXUIElementRef focused = passwordFocus();
-  if (focused) return focused;
-  pid_t pid = loginWindowPID();
-  if (!pid) return NULL;
-  AXUIElementRef app = AXUIElementCreateApplication(pid);
-  CFArrayRef fields = copySecureFields(app);
-  CFRelease(app);
-  // Never guess between multiple password fields or use a generic text field.
-  if (CFArrayGetCount(fields) != 1) { CFRelease(fields); return NULL; }
-  AXUIElementRef field = (AXUIElementRef)CFArrayGetValueAtIndex(fields, 0);
-  if (!lockState(&locked) || !locked || !isSecureField(field)) { CFRelease(fields); return NULL; }
-  AXError activated = AXUIElementSetAttributeValue(field, kAXFocusedAttribute, kCFBooleanTrue);
-  if (activated != kAXErrorSuccess) AXUIElementPerformAction(field, kAXPressAction);
-  usleep(50000);
-  focused = passwordFocus();
-  if (focused && !CFEqual(field, focused)) { CFRelease(focused); focused = NULL; }
-  CFRelease(fields);
-  return focused;
-}
-
-static BOOL stillFocused(AXUIElementRef field) {
-  BOOL locked = NO;
-  if (!lockState(&locked) || !locked || !isSecureField(field)) return NO;
-  AXUIElementRef system = AXUIElementCreateSystemWide();
-  AXUIElementRef current = copySecureFocus(system);
-  CFRelease(system);
-  if (!current) {
-    pid_t pid = 0;
-    if (AXUIElementGetPid(field, &pid) != kAXErrorSuccess) return NO;
-    AXUIElementRef app = AXUIElementCreateApplication(pid);
-    current = copySecureFocus(app);
-    CFRelease(app);
-  }
-  BOOL same = current && CFEqual(current, field);
-  if (current) { CFRelease(current); return same; }
-  // Avoid traversing the entire AX tree per character on systems that only
-  // expose field-local focus. A false or unavailable focus is never accepted.
-  CFTypeRef focused = copyAttribute(field, kAXFocusedAttribute);
-  same = focused && CFEqual(focused, kCFBooleanTrue);
-  if (focused) CFRelease(focused);
-  return same;
-}
-
 static BOOL key(CGKeyCode code, CGEventFlags flags, const UniChar *text, size_t length) {
   CGEventRef down = CGEventCreateKeyboardEvent(NULL, code, true);
   CGEventRef up = CGEventCreateKeyboardEvent(NULL, code, false);
@@ -205,34 +69,32 @@ static BOOL key(CGKeyCode code, CGEventFlags flags, const UniChar *text, size_t
   return YES;
 }
 
-static void printDiagnostics(BOOL locked) {
-  // Read-only diagnostics deliberately omit window titles, field values, and
-  // screenshots. Running this command never wakes, focuses, or types anything.
-  pid_t pid = loginWindowPID();
-  AXUIElementRef system = AXUIElementCreateSystemWide();
-  CFTypeRef global = NULL;
-  AXError globalError = AXUIElementCopyAttributeValue(system, kAXFocusedUIElementAttribute, &global);
-  CFRelease(system);
-  BOOL globalSecure = global && isSecureField((AXUIElementRef)global);
-  if (global) CFRelease(global);
-  AXError appError = kAXErrorNoValue;
-  CFIndex count = 0;
-  BOOL appSecure = NO;
-  if (pid && AXIsProcessTrusted()) {
-    AXUIElementRef app = AXUIElementCreateApplication(pid);
-    AXUIElementSetMessagingTimeout(app, 0.1);
-    CFTypeRef local = NULL;
-    appError = AXUIElementCopyAttributeValue(app, kAXFocusedUIElementAttribute, &local);
-    appSecure = local && isSecureField((AXUIElementRef)local);
-    if (local) CFRelease(local);
-    CFArrayRef fields = copySecureFields(app);
-    count = CFArrayGetCount(fields);
-    CFRelease(fields); CFRelease(app);
+// 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).
+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]);
   }
-  printf("{\"locked\":%s,\"canUnlock\":%s,\"loginwindowFound\":%s,\"globalFocusError\":%d,\"globalSecureFocus\":%s,\"applicationFocusError\":%d,\"applicationSecureFocus\":%s,\"secureFieldCount\":%ld}",
+  return YES;
+}
+
+static BOOL lockedKey(CGKeyCode code, CGEventFlags flags, const UniChar *text, size_t length) {
+  BOOL locked = NO;
+  return lockState(&locked) && locked && key(code, flags, text, length);
+}
+
+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\"}",
     locked ? "true" : "false", AXIsProcessTrusted() && CGPreflightPostEventAccess() ? "true" : "false",
-    pid ? "true" : "false", globalError, globalSecure ? "true" : "false", appError,
-    appSecure ? "true" : "false", (long)count);
+    loginWindowPID() ? "true" : "false");
 }
 
 int main(int argc, const char *argv[]) {
@@ -252,42 +114,27 @@ int main(int argc, const char *argv[]) {
     NSString *password = [[NSString alloc] initWithBytes:bytes length:count encoding:NSUTF8StringEncoding];
     wipe(bytes, sizeof(bytes));
     if (!password || [password rangeOfCharacterFromSet:NSCharacterSet.controlCharacterSet].location != NSNotFound) return fail("password");
-    // A non-text key wakes the password prompt. Never type a secret into an
-    // arbitrary app, username field, clipboard, or a blind screen coordinate.
-    if (!lockState(&locked) || !locked) return fail("changed");
-    if (!key(56, 0, NULL, 0)) return fail("focus");
-    AXUIElementRef field = NULL;
-    field = focusPasswordField();
-    // Shift wakes the display but can leave the clock/wallpaper layer visible.
-    // Space reveals the sign-in controls without submitting a password.
-    if (!field) {
-      if (!lockState(&locked) || !locked) return fail("changed");
-      if (!key(49, 0, NULL, 0)) return fail("focus");
-      NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:6];
-      while (!field && deadline.timeIntervalSinceNow > 0) {
-        usleep(100000);
-        field = focusPasswordField();
-      }
-    }
-    if (!field) return fail("focus");
-    if (!stillFocused(field) || !key(0, kCGEventFlagMaskCommand, NULL, 0) ||
-        !stillFocused(field) || !key(51, 0, NULL, 0)) { CFRelease(field); return fail("changed"); }
+    if (!wakePasswordPrompt()) return fail(lockState(&locked) ? "focus" : "session");
+    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) { CFRelease(field); return fail("password"); }
+    if (length > 1024) return fail("password");
     [password getCharacters:characters range:NSMakeRange(0, length)];
     password = nil;
     BOOL sent = YES;
-    // One Unicode scalar per event avoids event-string truncation. Check the
-    // secure loginwindow focus and console lock immediately before each event.
+    // One Unicode scalar per event avoids event-string truncation. Verify the
+    // same user's locked console immediately before every password event.
     for (NSUInteger i = 0; i < length;) {
       NSUInteger units = CFStringIsSurrogateHighCharacter(characters[i]) && i + 1 < length && CFStringIsSurrogateLowCharacter(characters[i + 1]) ? 2 : 1;
-      if (!stillFocused(field) || !key(0, 0, &characters[i], units)) { sent = NO; break; }
+      if (!lockedKey(0, 0, &characters[i], units)) { sent = NO; break; }
       i += units;
     }
     wipe(characters, sizeof(characters));
-    if (!sent || !stillFocused(field) || !key(36, 0, NULL, 0)) { CFRelease(field); return fail("changed"); }
-    CFRelease(field);
+    if (!sent || !lockedKey(36, 0, NULL, 0)) return fail("changed");
     for (int i = 0; i < 50; i++) {
       usleep(100000);
       if (!lockState(&locked)) return fail("session");

package/package.json

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