openzoo 0.29.6 → 0.29.8

package/lib/cursorbackend.js

@@ -26,7 +26,7 @@
  * content-type and answer in kind: bare message for connect unary proto, enveloped
  * + trailers for grpc-web. Both are handled below.
  */
-import https from 'node:https';
+import http2 from 'node:http2';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -172,17 +172,19 @@ function respond(req, res, method, models) {
 export function startCursorBackend({ port = 8443, models, log = () => {} } = {}) {
   const { cert, key } = ensureCert(log);
   let conns = 0;
-  // HTTP/1.1 ONLY, but with ALPN advertising http/1.1. Two measured facts drove
-  // this: (1) with NO ALPN the client aborts with ERR_SSL_NO_APPLICATION_PROTOCOL
-  // — it requires the server to name a protocol; (2) when we offered h2, the
-  // editor's h2 connections RESET (ECONNRESET wall) while its h1 calls completed
-  // (requests #1-5). Connect-RPC and gRPC-web both work over h1, so we advertise
-  // ONLY http/1.1: the client negotiates it and every call completes.
-  const server = https.createServer(
+  // SERVE BOTH h2 AND h1. An earlier build forced h1-only after concluding the
+  // editor's h2 connections reset — but that log was the STALE 8443 backend the
+  // pf redirect was still intercepting, not this server, so the conclusion was
+  // contaminated. Measured cleanly now: some editor connections offer ONLY h2
+  // (ERR_SSL_NO_APPLICATION_PROTOCOL when we advertise just h1), so we must
+  // negotiate both. allowHTTP1 keeps the h1 fetch() calls (stripe/updates)
+  // working; ALPN h2 first satisfies the Connect gRPC client.
+  const server = http2.createSecureServer(
     {
       cert: fs.readFileSync(cert),
       key: fs.readFileSync(key),
-      ALPNProtocols: ['http/1.1'],
+      allowHTTP1: true,
+      ALPNProtocols: ['h2', 'http/1.1'],
       SNICallback: (servername, cb) => { log(`cursor-tls: <- ClientHello SNI=${servername}`); cb(null); },
     },
     async (req, res) => {

package/lib/hosts.js

@@ -161,9 +161,16 @@ export function bindBackend443(modelsPath, logPath, log = console.log) {
   // broken one kept answering — the reason a fix looked like it never landed.
   // We SIGKILL by name AND by whoever holds 443, poll until the port is actually
   // free (up to ~5s), then start the new one.
+  // FLUSH THE OLD pfctl 443->8443 REDIRECT FIRST. Versions 0.29.0-0.29.2 installed
+  // a pf anchor that redirects 443 to a stale user-process backend on 8443. While
+  // that rule is loaded, pf intercepts 443 BEFORE our new root bind ever sees it,
+  // so every fix looked like it never landed. Flush the anchor + kill 8443 + kill
+  // 443 by name and by port, wait for both to free, THEN bind.
+  const flushPf = process.platform === 'darwin' ? 'pfctl -a openzoo -F all 2>/dev/null; ' : '';
   const ok = privileged(
-    `pkill -9 -f 'cursor-backend.js' 2>/dev/null; `
-    + `for p in $(lsof -nP -iTCP:443 -sTCP:LISTEN -t 2>/dev/null); do kill -9 "$p" 2>/dev/null; done; `
+    flushPf
+    + `pkill -9 -f 'cursor-backend.js' 2>/dev/null; `
+    + `for p in $(lsof -nP -iTCP:443 -sTCP:LISTEN -t 2>/dev/null) $(lsof -nP -iTCP:8443 -sTCP:LISTEN -t 2>/dev/null); do kill -9 "$p" 2>/dev/null; done; `
     + `for i in 1 2 3 4 5 6 7 8 9 10; do lsof -nP -iTCP:443 -sTCP:LISTEN -t >/dev/null 2>&1 || break; sleep 0.5; done; `
     + `nohup '${node}' '${script}' 443 '${modelsPath}' '${logPath}' >/dev/null 2>&1 & `
     + 'sleep 1; true',
@@ -173,5 +180,10 @@ export function bindBackend443(modelsPath, logPath, log = console.log) {
 
 export function unbindBackend443() {
   if (WIN) return { ok: false, manual: true };
-  return { ok: privileged("pkill -f 'cursor-backend.js' 2>/dev/null; true") };
+  const flushPf = process.platform === 'darwin' ? 'pfctl -a openzoo -F all 2>/dev/null; ' : '';
+  return { ok: privileged(
+    flushPf
+    + "pkill -9 -f 'cursor-backend.js' 2>/dev/null; "
+    + 'for p in $(lsof -nP -iTCP:8443 -sTCP:LISTEN -t 2>/dev/null); do kill -9 "$p" 2>/dev/null; done; true',
+  ) };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.29.6",
+  "version": "0.29.8",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",