@openacp/cli 2026.402.3 → 2026.402.5

package/dist/index.d.ts

@@ -31,7 +31,7 @@ type LoggingConfig = z.infer<typeof LoggingSchema>;
 declare const TunnelSchema: z.ZodDefault<z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
     port: z.ZodDefault<z.ZodNumber>;
-    provider: z.ZodDefault<z.ZodEnum<["cloudflare", "ngrok", "bore", "tailscale"]>>;
+    provider: z.ZodDefault<z.ZodEnum<["openacp", "cloudflare", "ngrok", "bore", "tailscale"]>>;
     options: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     maxUserTunnels: z.ZodDefault<z.ZodNumber>;
     storeTtlMinutes: z.ZodDefault<z.ZodNumber>;
@@ -46,10 +46,10 @@ declare const TunnelSchema: z.ZodDefault<z.ZodObject<{
         token?: string | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
+    provider: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale";
     options: Record<string, unknown>;
     enabled: boolean;
     port: number;
-    provider: "cloudflare" | "ngrok" | "bore" | "tailscale";
     maxUserTunnels: number;
     storeTtlMinutes: number;
     auth: {
@@ -57,10 +57,10 @@ declare const TunnelSchema: z.ZodDefault<z.ZodObject<{
         token?: string | undefined;
     };
 }, {
+    provider?: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
     options?: Record<string, unknown> | undefined;
     enabled?: boolean | undefined;
     port?: number | undefined;
-    provider?: "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
     maxUserTunnels?: number | undefined;
     storeTtlMinutes?: number | undefined;
     auth?: {
@@ -215,7 +215,7 @@ declare const ConfigSchema: z.ZodObject<{
     tunnel: z.ZodDefault<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         port: z.ZodDefault<z.ZodNumber>;
-        provider: z.ZodDefault<z.ZodEnum<["cloudflare", "ngrok", "bore", "tailscale"]>>;
+        provider: z.ZodDefault<z.ZodEnum<["openacp", "cloudflare", "ngrok", "bore", "tailscale"]>>;
         options: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
         maxUserTunnels: z.ZodDefault<z.ZodNumber>;
         storeTtlMinutes: z.ZodDefault<z.ZodNumber>;
@@ -230,10 +230,10 @@ declare const ConfigSchema: z.ZodObject<{
             token?: string | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
+        provider: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale";
         options: Record<string, unknown>;
         enabled: boolean;
         port: number;
-        provider: "cloudflare" | "ngrok" | "bore" | "tailscale";
         maxUserTunnels: number;
         storeTtlMinutes: number;
         auth: {
@@ -241,10 +241,10 @@ declare const ConfigSchema: z.ZodObject<{
             token?: string | undefined;
         };
     }, {
+        provider?: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
         options?: Record<string, unknown> | undefined;
         enabled?: boolean | undefined;
         port?: number | undefined;
-        provider?: "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
         maxUserTunnels?: number | undefined;
         storeTtlMinutes?: number | undefined;
         auth?: {
@@ -383,10 +383,10 @@ declare const ConfigSchema: z.ZodObject<{
         workingDirectory?: string | undefined;
     }>;
     tunnel: {
+        provider: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale";
         options: Record<string, unknown>;
         enabled: boolean;
         port: number;
-        provider: "cloudflare" | "ngrok" | "bore" | "tailscale";
         maxUserTunnels: number;
         storeTtlMinutes: number;
         auth: {
@@ -468,10 +468,10 @@ declare const ConfigSchema: z.ZodObject<{
         workingDirectory?: string | undefined;
     }> | undefined;
     tunnel?: {
+        provider?: "openacp" | "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
         options?: Record<string, unknown> | undefined;
         enabled?: boolean | undefined;
         port?: number | undefined;
-        provider?: "cloudflare" | "ngrok" | "bore" | "tailscale" | undefined;
         maxUserTunnels?: number | undefined;
         storeTtlMinutes?: number | undefined;
         auth?: {
@@ -1711,7 +1711,7 @@ declare class TunnelService {
     private config;
     private apiPort;
     private startError;
-    constructor(config: TunnelConfig, registryPath?: string, binDir?: string);
+    constructor(config: TunnelConfig, registryPath?: string, binDir?: string, storage?: PluginStorage);
     start(apiPort: number): Promise<string>;
     stop(): Promise<void>;
     addTunnel(port: number, opts?: {

package/dist/index.js

@@ -431,6 +431,17 @@ var init_config_migrations = __esm({
           }
           return changed;
         }
+      },
+      {
+        name: "migrate-tunnel-provider-to-openacp",
+        apply(raw) {
+          const tunnel = raw.tunnel;
+          if (!tunnel) return false;
+          if (tunnel.provider !== "cloudflare") return false;
+          tunnel.provider = "openacp";
+          log2.info("Migrated tunnel provider: cloudflare \u2192 openacp (OpenACP managed tunnel)");
+          return true;
+        }
       }
     ];
   }
@@ -641,7 +652,7 @@ var init_config = __esm({
     TunnelSchema = z.object({
       enabled: z.boolean().default(false),
       port: z.number().default(3100),
-      provider: z.enum(["cloudflare", "ngrok", "bore", "tailscale"]).default("cloudflare"),
+      provider: z.enum(["openacp", "cloudflare", "ngrok", "bore", "tailscale"]).default("openacp"),
       options: z.record(z.string(), z.unknown()).default({}),
       maxUserTunnels: z.number().default(5),
       storeTtlMinutes: z.number().default(60),
@@ -739,7 +750,7 @@ var init_config = __esm({
       tunnel: {
         enabled: true,
         port: 3100,
-        provider: "cloudflare",
+        provider: "openacp",
         options: {},
         storeTtlMinutes: 60,
         auth: { enabled: false }
@@ -2004,7 +2015,6 @@ var init_auth = __esm({
 
 // src/plugins/api-server/server.ts
 import Fastify from "fastify";
-import fastifyCors from "@fastify/cors";
 import fastifySwagger from "@fastify/swagger";
 import fastifySwaggerUi from "@fastify/swagger-ui";
 import fastifyRateLimit from "@fastify/rate-limit";
@@ -2013,16 +2023,17 @@ async function createApiServer(options) {
   const app = Fastify({ logger: options.logger ?? false, forceCloseConnections: true });
   app.setValidatorCompiler(validatorCompiler);
   app.setSerializerCompiler(serializerCompiler);
-  await app.register(fastifyCors, {
-    origin: (origin, cb) => {
-      if (!origin || origin.startsWith("http://localhost") || origin.startsWith("http://127.0.0.1")) {
-        cb(null, true);
-      } else {
-        cb(null, false);
-      }
-    },
-    methods: ["GET", "HEAD", "PUT", "PATCH", "POST", "DELETE", "OPTIONS"],
-    credentials: true
+  app.addHook("onRequest", async (request, reply) => {
+    const origin = request.headers.origin;
+    if (origin) {
+      reply.header("Access-Control-Allow-Origin", origin);
+      reply.header("Access-Control-Allow-Credentials", "true");
+    }
+    if (request.method === "OPTIONS") {
+      reply.header("Access-Control-Allow-Methods", "GET,HEAD,PUT,PATCH,POST,DELETE,OPTIONS");
+      reply.header("Access-Control-Allow-Headers", "Content-Type, Authorization");
+      reply.status(204).send();
+    }
   });
   await app.register(fastifyRateLimit, { max: 100, timeWindow: "1 minute" });
   await app.register(fastifySwagger, {
@@ -2059,15 +2070,14 @@ async function createApiServer(options) {
     },
     async start() {
       await app.ready();
-      const maxRetries = 10;
       let port = options.port;
-      for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      while (port <= 65535) {
         try {
           const address = await app.listen({ port, host: options.host });
           const url = new URL(address);
           return { port: Number(url.port), host: url.hostname };
         } catch (err) {
-          if (err?.code === "EADDRINUSE" && attempt < maxRetries && port < 65535) {
+          if (err?.code === "EADDRINUSE" && port < 65535) {
             console.log(`[api-server] Port ${port} in use, trying ${port + 1}...`);
             port++;
             continue;
@@ -2075,7 +2085,7 @@ async function createApiServer(options) {
           throw err;
         }
       }
-      throw new Error(`All ports ${options.port}-${port} in use`);
+      throw new Error("No available ports found");
     },
     async stop() {
       await app.close();
@@ -2152,28 +2162,34 @@ var init_sse_manager = __esm({
             },
             sessions: stats
           });
-        }, 3e4);
+        }, 15e3);
       }
       handleRequest(req, res) {
         const parsedUrl = new URL(req.url || "", "http://localhost");
         const sessionFilter = parsedUrl.searchParams.get("sessionId");
+        console.log(`[sse] new connection from origin=${req.headers.origin ?? "none"} filter=${sessionFilter ?? "none"} total=${this.sseConnections.size + 1}`);
         const origin = req.headers.origin;
         const corsHeaders = {
           "Content-Type": "text/event-stream",
-          "Cache-Control": "no-cache",
-          Connection: "keep-alive"
+          "Cache-Control": "no-cache, no-transform",
+          Connection: "keep-alive",
+          // Disable buffering in Nginx/Cloudflare/other reverse proxies
+          "X-Accel-Buffering": "no"
         };
-        if (origin && (origin.startsWith("http://localhost") || origin.startsWith("http://127.0.0.1"))) {
+        if (origin) {
           corsHeaders["Access-Control-Allow-Origin"] = origin;
           corsHeaders["Access-Control-Allow-Credentials"] = "true";
         }
+        res.socket?.setNoDelay(true);
         res.writeHead(200, corsHeaders);
         res.flushHeaders();
+        res.write(": connected\n\n");
         res.sessionFilter = sessionFilter ?? void 0;
         this.sseConnections.add(res);
         const cleanup = () => {
           this.sseConnections.delete(res);
           this.sseCleanupHandlers.delete(res);
+          console.log(`[sse] connection closed, remaining=${this.sseConnections.size}`);
         };
         this.sseCleanupHandlers.set(res, cleanup);
         req.on("close", cleanup);