skybridge 0.0.0-dev.ff4b4a2 → 0.0.0-dev.ffe77e9

package/dist/server/tunnel-proxy-router.test.js

@@ -0,0 +1,229 @@
+import { EventEmitter } from "node:events";
+import http from "node:http";
+import { Readable } from "node:stream";
+import express from "express";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { startTunnelControlServer } from "../cli/tunnel-control-server.js";
+import { createTunnelProxyRouter } from "./tunnel-proxy-router.js";
+function makeFakeChild() {
+    const child = new EventEmitter();
+    child.stdout = new Readable({ read() { } });
+    child.stderr = new Readable({ read() { } });
+    child.kill = vi.fn(() => true);
+    return child;
+}
+async function listen(handler) {
+    const server = http.createServer(handler);
+    await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+    const port = server.address().port;
+    return { port, server };
+}
+const cleanups = [];
+afterEach(async () => {
+    while (cleanups.length > 0) {
+        const cleanup = cleanups.pop();
+        if (cleanup) {
+            await cleanup();
+        }
+    }
+});
+async function startProxy(controlPort) {
+    const app = express();
+    app.use(createTunnelProxyRouter(controlPort));
+    const { port, server } = await listen(app);
+    cleanups.push(() => new Promise((resolve) => {
+        server.closeAllConnections?.();
+        server.close(() => resolve());
+    }));
+    return { port, server };
+}
+async function startControl() {
+    const child = makeFakeChild();
+    const control = await startTunnelControlServer(() => 3000, {
+        spawn: () => child,
+    });
+    cleanups.push(() => control.close());
+    return { control, child };
+}
+describe("createTunnelProxyRouter", () => {
+    describe("POST /__skybridge/tunnel", () => {
+        it("forwards to upstream and returns the upstream JSON", async () => {
+            const { control } = await startControl();
+            const { port } = await startProxy(control.port);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(200);
+            expect(res.headers.get("content-type")).toMatch(/application\/json/);
+            expect(await res.json()).toEqual({
+                status: "starting",
+                message: "Starting tunnel…",
+            });
+            expect(control.manager.getState().status).toBe("starting");
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            // Pick a port nothing is listening on by starting+stopping a server.
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            expect(res.status).toBe(502);
+            const body = (await res.json());
+            expect(body.status).toBe("error");
+            expect(typeof body.message).toBe("string");
+        });
+    });
+    describe("DELETE /__skybridge/tunnel", () => {
+        it("forwards to upstream and returns the upstream JSON", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            // First start the tunnel so DELETE has something to stop.
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "DELETE",
+            });
+            expect(res.status).toBe(200);
+            expect(await res.json()).toEqual({ status: "idle" });
+            expect(child.kill).toHaveBeenCalled();
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "DELETE",
+            });
+            expect(res.status).toBe(502);
+        });
+    });
+    describe("GET /__skybridge/tunnel/events", () => {
+        it("pipes the upstream SSE stream through to the client", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            // Get the manager into a known state so the initial SSE frame is
+            // deterministic.
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            expect(res.status).toBe(200);
+            expect(res.headers.get("content-type")).toMatch(/text\/event-stream/);
+            expect(res.headers.get("cache-control")).toMatch(/no-cache/);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            const { value } = await reader.read();
+            const chunk = new TextDecoder().decode(value);
+            expect(chunk).toContain("event: state");
+            expect(chunk).toContain('"status":"connected"');
+            expect(chunk).toContain('"url":"https://abc.tunnel.example"');
+            await reader.cancel();
+        });
+        it("forwards subsequent state changes through the SSE stream", async () => {
+            const { control, child } = await startControl();
+            const { port } = await startProxy(control.port);
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            const decoder = new TextDecoder();
+            // Drain the initial "starting" frame.
+            const first = await reader.read();
+            expect(decoder.decode(first.value)).toContain('"status":"starting"');
+            // Now drive a state change on the manager and read the next frame.
+            child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
+            let combined = "";
+            // Reads may chunk arbitrarily, so accumulate until we see the connected
+            // event or hit a sane cap.
+            for (let i = 0; i < 5; i++) {
+                const { value, done } = await reader.read();
+                if (done) {
+                    break;
+                }
+                combined += decoder.decode(value);
+                if (combined.includes('"status":"connected"')) {
+                    break;
+                }
+            }
+            expect(combined).toContain('"status":"connected"');
+            expect(combined).toContain('"url":"https://abc.tunnel.example"');
+            await reader.cancel();
+        });
+        it("returns 502 when upstream is unavailable", async () => {
+            const probe = http.createServer();
+            await new Promise((resolve) => probe.listen(0, "127.0.0.1", resolve));
+            const deadPort = probe.address().port;
+            await new Promise((resolve) => probe.close(() => resolve()));
+            const { port } = await startProxy(deadPort);
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            expect(res.status).toBe(502);
+            const body = (await res.json());
+            expect(body.status).toBe("error");
+        });
+        it("aborts the upstream connection when the proxy server is closed mid-stream", async () => {
+            const { control } = await startControl();
+            const { port, server } = await startProxy(control.port);
+            await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {
+                method: "POST",
+            });
+            // Snapshot the manager's listener counts before the SSE subscription so
+            // we can verify the proxy disconnected from upstream after shutdown.
+            const baseStateListeners = control.manager.listenerCount("state");
+            const baseActivityListeners = control.manager.listenerCount("activity");
+            const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel/events`);
+            const body = res.body;
+            if (!body) {
+                throw new Error("expected response body");
+            }
+            const reader = body.getReader();
+            // Drain the first frame to confirm the stream is live and the upstream
+            // SSE handler has subscribed to the manager.
+            await reader.read();
+            expect(control.manager.listenerCount("state")).toBe(baseStateListeners + 1);
+            // Close the proxy server, destroying in-flight responses. The proxy's
+            // req.on("close", ...) should fire and abort the upstream fetch.
+            server.closeAllConnections?.();
+            await new Promise((resolve) => server.close(() => resolve()));
+            // The client-side stream is dead — drain or fail, either is acceptable.
+            try {
+                while (true) {
+                    const { done } = await reader.read();
+                    if (done) {
+                        break;
+                    }
+                }
+            }
+            catch {
+                // expected: socket terminated when proxy server was destroyed
+            }
+            // Wait briefly for the upstream's req.on("close") to fire, then assert
+            // the manager listeners were detached. This is the load-bearing
+            // verification: it proves the proxy's AbortController propagated and
+            // upstream cleaned up its SSE subscription.
+            const start = Date.now();
+            while (control.manager.listenerCount("state") > baseStateListeners &&
+                Date.now() - start < 1000) {
+                await new Promise((r) => setTimeout(r, 20));
+            }
+            expect(control.manager.listenerCount("state")).toBe(baseStateListeners);
+            expect(control.manager.listenerCount("activity")).toBe(baseActivityListeners);
+        });
+    });
+});
+//# sourceMappingURL=tunnel-proxy-router.test.js.map

package/dist/server/tunnel-proxy-router.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tunnel-proxy-router.test.js","sourceRoot":"","sources":["../../src/server/tunnel-proxy-router.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { EventEmitter } from \"node:events\";\nimport http from \"node:http\";\nimport { Readable } from \"node:stream\";\nimport express from \"express\";\nimport { afterEach, describe, expect, it, vi } from \"vitest\";\nimport { startTunnelControlServer } from \"../cli/tunnel-control-server.js\";\nimport { createTunnelProxyRouter } from \"./tunnel-proxy-router.js\";\n\ntype FakeChild = EventEmitter & {\n  stdout: Readable;\n  stderr: Readable;\n  kill: ReturnType<typeof vi.fn<() => boolean>>;\n};\n\nfunction makeFakeChild(): FakeChild {\n  const child = new EventEmitter() as FakeChild;\n  child.stdout = new Readable({ read() {} });\n  child.stderr = new Readable({ read() {} });\n  child.kill = vi.fn<() => boolean>(() => true);\n  return child;\n}\n\nasync function listen(handler: http.RequestListener) {\n  const server = http.createServer(handler);\n  await new Promise<void>((resolve) => server.listen(0, \"127.0.0.1\", resolve));\n  const port = (server.address() as { port: number }).port;\n  return { port, server };\n}\n\ntype Cleanup = () => Promise<void> | void;\nconst cleanups: Cleanup[] = [];\n\nafterEach(async () => {\n  while (cleanups.length > 0) {\n    const cleanup = cleanups.pop();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n});\n\nasync function startProxy(controlPort: number) {\n  const app = express();\n  app.use(createTunnelProxyRouter(controlPort));\n  const { port, server } = await listen(app);\n  cleanups.push(\n    () =>\n      new Promise<void>((resolve) => {\n        server.closeAllConnections?.();\n        server.close(() => resolve());\n      }),\n  );\n  return { port, server };\n}\n\nasync function startControl() {\n  const child = makeFakeChild();\n  const control = await startTunnelControlServer(() => 3000, {\n    spawn: () => child,\n  });\n  cleanups.push(() => control.close());\n  return { control, child };\n}\n\ndescribe(\"createTunnelProxyRouter\", () => {\n  describe(\"POST /__skybridge/tunnel\", () => {\n    it(\"forwards to upstream and returns the upstream JSON\", async () => {\n      const { control } = await startControl();\n      const { port } = await startProxy(control.port);\n\n      const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n\n      expect(res.status).toBe(200);\n      expect(res.headers.get(\"content-type\")).toMatch(/application\\/json/);\n      expect(await res.json()).toEqual({\n        status: \"starting\",\n        message: \"Starting tunnel…\",\n      });\n      expect(control.manager.getState().status).toBe(\"starting\");\n    });\n\n    it(\"returns 502 when upstream is unavailable\", async () => {\n      // Pick a port nothing is listening on by starting+stopping a server.\n      const probe = http.createServer();\n      await new Promise<void>((resolve) =>\n        probe.listen(0, \"127.0.0.1\", resolve),\n      );\n      const deadPort = (probe.address() as { port: number }).port;\n      await new Promise<void>((resolve) => probe.close(() => resolve()));\n\n      const { port } = await startProxy(deadPort);\n\n      const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n      expect(res.status).toBe(502);\n      const body = (await res.json()) as { status: string; message: string };\n      expect(body.status).toBe(\"error\");\n      expect(typeof body.message).toBe(\"string\");\n    });\n  });\n\n  describe(\"DELETE /__skybridge/tunnel\", () => {\n    it(\"forwards to upstream and returns the upstream JSON\", async () => {\n      const { control, child } = await startControl();\n      const { port } = await startProxy(control.port);\n\n      // First start the tunnel so DELETE has something to stop.\n      await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n\n      const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"DELETE\",\n      });\n\n      expect(res.status).toBe(200);\n      expect(await res.json()).toEqual({ status: \"idle\" });\n      expect(child.kill).toHaveBeenCalled();\n    });\n\n    it(\"returns 502 when upstream is unavailable\", async () => {\n      const probe = http.createServer();\n      await new Promise<void>((resolve) =>\n        probe.listen(0, \"127.0.0.1\", resolve),\n      );\n      const deadPort = (probe.address() as { port: number }).port;\n      await new Promise<void>((resolve) => probe.close(() => resolve()));\n\n      const { port } = await startProxy(deadPort);\n\n      const res = await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"DELETE\",\n      });\n      expect(res.status).toBe(502);\n    });\n  });\n\n  describe(\"GET /__skybridge/tunnel/events\", () => {\n    it(\"pipes the upstream SSE stream through to the client\", async () => {\n      const { control, child } = await startControl();\n      const { port } = await startProxy(control.port);\n\n      // Get the manager into a known state so the initial SSE frame is\n      // deterministic.\n      await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n      child.stdout.emit(\n        \"data\",\n        Buffer.from(\n          \"Forwarding: https://abc.tunnel.example -> http://localhost:3000\\n\",\n        ),\n      );\n\n      const res = await fetch(\n        `http://127.0.0.1:${port}/__skybridge/tunnel/events`,\n      );\n\n      expect(res.status).toBe(200);\n      expect(res.headers.get(\"content-type\")).toMatch(/text\\/event-stream/);\n      expect(res.headers.get(\"cache-control\")).toMatch(/no-cache/);\n\n      const body = res.body;\n      if (!body) {\n        throw new Error(\"expected response body\");\n      }\n      const reader = body.getReader();\n      const { value } = await reader.read();\n      const chunk = new TextDecoder().decode(value);\n\n      expect(chunk).toContain(\"event: state\");\n      expect(chunk).toContain('\"status\":\"connected\"');\n      expect(chunk).toContain('\"url\":\"https://abc.tunnel.example\"');\n\n      await reader.cancel();\n    });\n\n    it(\"forwards subsequent state changes through the SSE stream\", async () => {\n      const { control, child } = await startControl();\n      const { port } = await startProxy(control.port);\n\n      await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n\n      const res = await fetch(\n        `http://127.0.0.1:${port}/__skybridge/tunnel/events`,\n      );\n      const body = res.body;\n      if (!body) {\n        throw new Error(\"expected response body\");\n      }\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n\n      // Drain the initial \"starting\" frame.\n      const first = await reader.read();\n      expect(decoder.decode(first.value)).toContain('\"status\":\"starting\"');\n\n      // Now drive a state change on the manager and read the next frame.\n      child.stdout.emit(\n        \"data\",\n        Buffer.from(\n          \"Forwarding: https://abc.tunnel.example -> http://localhost:3000\\n\",\n        ),\n      );\n\n      let combined = \"\";\n      // Reads may chunk arbitrarily, so accumulate until we see the connected\n      // event or hit a sane cap.\n      for (let i = 0; i < 5; i++) {\n        const { value, done } = await reader.read();\n        if (done) {\n          break;\n        }\n        combined += decoder.decode(value);\n        if (combined.includes('\"status\":\"connected\"')) {\n          break;\n        }\n      }\n      expect(combined).toContain('\"status\":\"connected\"');\n      expect(combined).toContain('\"url\":\"https://abc.tunnel.example\"');\n\n      await reader.cancel();\n    });\n\n    it(\"returns 502 when upstream is unavailable\", async () => {\n      const probe = http.createServer();\n      await new Promise<void>((resolve) =>\n        probe.listen(0, \"127.0.0.1\", resolve),\n      );\n      const deadPort = (probe.address() as { port: number }).port;\n      await new Promise<void>((resolve) => probe.close(() => resolve()));\n\n      const { port } = await startProxy(deadPort);\n\n      const res = await fetch(\n        `http://127.0.0.1:${port}/__skybridge/tunnel/events`,\n      );\n      expect(res.status).toBe(502);\n      const body = (await res.json()) as { status: string };\n      expect(body.status).toBe(\"error\");\n    });\n\n    it(\"aborts the upstream connection when the proxy server is closed mid-stream\", async () => {\n      const { control } = await startControl();\n      const { port, server } = await startProxy(control.port);\n\n      await fetch(`http://127.0.0.1:${port}/__skybridge/tunnel`, {\n        method: \"POST\",\n      });\n\n      // Snapshot the manager's listener counts before the SSE subscription so\n      // we can verify the proxy disconnected from upstream after shutdown.\n      const baseStateListeners = control.manager.listenerCount(\"state\");\n      const baseActivityListeners = control.manager.listenerCount(\"activity\");\n\n      const res = await fetch(\n        `http://127.0.0.1:${port}/__skybridge/tunnel/events`,\n      );\n      const body = res.body;\n      if (!body) {\n        throw new Error(\"expected response body\");\n      }\n      const reader = body.getReader();\n      // Drain the first frame to confirm the stream is live and the upstream\n      // SSE handler has subscribed to the manager.\n      await reader.read();\n      expect(control.manager.listenerCount(\"state\")).toBe(\n        baseStateListeners + 1,\n      );\n\n      // Close the proxy server, destroying in-flight responses. The proxy's\n      // req.on(\"close\", ...) should fire and abort the upstream fetch.\n      server.closeAllConnections?.();\n      await new Promise<void>((resolve) => server.close(() => resolve()));\n\n      // The client-side stream is dead — drain or fail, either is acceptable.\n      try {\n        while (true) {\n          const { done } = await reader.read();\n          if (done) {\n            break;\n          }\n        }\n      } catch {\n        // expected: socket terminated when proxy server was destroyed\n      }\n\n      // Wait briefly for the upstream's req.on(\"close\") to fire, then assert\n      // the manager listeners were detached. This is the load-bearing\n      // verification: it proves the proxy's AbortController propagated and\n      // upstream cleaned up its SSE subscription.\n      const start = Date.now();\n      while (\n        control.manager.listenerCount(\"state\") > baseStateListeners &&\n        Date.now() - start < 1000\n      ) {\n        await new Promise((r) => setTimeout(r, 20));\n      }\n      expect(control.manager.listenerCount(\"state\")).toBe(baseStateListeners);\n      expect(control.manager.listenerCount(\"activity\")).toBe(\n        baseActivityListeners,\n      );\n    });\n  });\n});\n"]}

package/dist/server/viewsDevServer.d.ts

@@ -0,0 +1,14 @@
+import type http from "node:http";
+import { type Router } from "express";
+/**
+ * Vite dev-server middleware for view assets.
+ *
+ * MUST be mounted at the Express app root so Vite can intercept
+ * `/@vite/client`, `/@react-refresh`, and `/_skybridge/view/...` imports:
+ *
+ *   const app = express();
+ *   if (env.NODE_ENV !== "production") {
+ *     app.use(await viewsDevServer(httpServer));
+ *   }
+ */
+export declare const viewsDevServer: (httpServer: http.Server) => Promise<Router>;

package/dist/server/viewsDevServer.js

@@ -0,0 +1,45 @@
+import path from "node:path";
+import cors from "cors";
+import express, {} from "express";
+import { assetBaseUrlTransformPlugin } from "./asset-base-url-transform-plugin.js";
+/**
+ * Vite dev-server middleware for view assets.
+ *
+ * MUST be mounted at the Express app root so Vite can intercept
+ * `/@vite/client`, `/@react-refresh`, and `/_skybridge/view/...` imports:
+ *
+ *   const app = express();
+ *   if (env.NODE_ENV !== "production") {
+ *     app.use(await viewsDevServer(httpServer));
+ *   }
+ */
+export const viewsDevServer = async (httpServer) => {
+    const router = express.Router();
+    const { createServer, loadConfigFromFile } = await import("vite");
+    const root = process.cwd();
+    const configFile = path.join(root, "vite.config.ts");
+    const configResult = await loadConfigFromFile({ command: "serve", mode: "development" }, configFile, root);
+    const { build, preview, plugins: userPlugins = [], ...devConfig } = configResult?.config || {};
+    const vite = await createServer({
+        ...devConfig,
+        // Pass `false` so Vite skips re-resolving a config file — we already
+        // loaded and spread the user's config above.
+        configFile: false,
+        appType: "custom",
+        server: {
+            allowedHosts: true,
+            middlewareMode: true,
+            hmr: {
+                server: httpServer,
+            },
+        },
+        root,
+        // optimizeDeps is set by the skybridge Vite plugin (entries + include)
+        // so it can derive the view glob from `viewsDir`.
+        plugins: [...userPlugins, assetBaseUrlTransformPlugin()],
+    });
+    router.use(cors());
+    router.use("/", vite.middlewares);
+    return router;
+};
+//# sourceMappingURL=viewsDevServer.js.map

package/dist/server/viewsDevServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewsDevServer.js","sourceRoot":"","sources":["../../src/server/viewsDevServer.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAEnF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,UAAuB,EACN,EAAE;IACnB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,EAAE,YAAY,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAElE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EACzC,UAAU,EACV,IAAI,CACL,CAAC;IAEF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,OAAO,EAAE,WAAW,GAAG,EAAE,EACzB,GAAG,SAAS,EACb,GAAG,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC;IAE/B,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC;QAC9B,GAAG,SAAS;QACZ,qEAAqE;QACrE,6CAA6C;QAC7C,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE;YACN,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;YACpB,GAAG,EAAE;gBACH,MAAM,EAAE,UAAU;aACnB;SACF;QACD,IAAI;QACJ,uEAAuE;QACvE,kDAAkD;QAClD,OAAO,EAAE,CAAC,GAAG,WAAW,EAAE,2BAA2B,EAAE,CAAC;KACzD,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","sourcesContent":["import type http from \"node:http\";\nimport path from \"node:path\";\nimport cors from \"cors\";\nimport express, { type Router } from \"express\";\nimport { assetBaseUrlTransformPlugin } from \"./asset-base-url-transform-plugin.js\";\n\n/**\n * Vite dev-server middleware for view assets.\n *\n * MUST be mounted at the Express app root so Vite can intercept\n * `/@vite/client`, `/@react-refresh`, and `/_skybridge/view/...` imports:\n *\n *   const app = express();\n *   if (env.NODE_ENV !== \"production\") {\n *     app.use(await viewsDevServer(httpServer));\n *   }\n */\nexport const viewsDevServer = async (\n  httpServer: http.Server,\n): Promise<Router> => {\n  const router = express.Router();\n\n  const { createServer, loadConfigFromFile } = await import(\"vite\");\n\n  const root = process.cwd();\n  const configFile = path.join(root, \"vite.config.ts\");\n\n  const configResult = await loadConfigFromFile(\n    { command: \"serve\", mode: \"development\" },\n    configFile,\n    root,\n  );\n\n  const {\n    build,\n    preview,\n    plugins: userPlugins = [],\n    ...devConfig\n  } = configResult?.config || {};\n\n  const vite = await createServer({\n    ...devConfig,\n    // Pass `false` so Vite skips re-resolving a config file — we already\n    // loaded and spread the user's config above.\n    configFile: false,\n    appType: \"custom\",\n    server: {\n      allowedHosts: true,\n      middlewareMode: true,\n      hmr: {\n        server: httpServer,\n      },\n    },\n    root,\n    // optimizeDeps is set by the skybridge Vite plugin (entries + include)\n    // so it can derive the view glob from `viewsDir`.\n    plugins: [...userPlugins, assetBaseUrlTransformPlugin()],\n  });\n\n  router.use(cors());\n  router.use(\"/\", vite.middlewares);\n\n  return router;\n};\n"]}

package/dist/test/utils.d.ts

@@ -1,15 +1,12 @@
 import { type MockInstance } from "vitest";
 import { McpServer } from "../server/server.js";
-/**
- * Creates a real McpServer instance for testing
- */
 export declare function createMockMcpServer(): {
     server: McpServer;
     mockRegisterResource: MockInstance<McpServer["registerResource"]>;
-    mockRegisterTool: MockInstance<McpServer["registerTool"]>;
+    mockRegisterTool: MockInstance;
 };
 export declare function createTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
-    "search-voyage": import("../server/server.js").ToolDef<{
+    "search-trip": import("../server/server.js").ToolDef<{
         destination: string;
         departureDate?: string | undefined;
         maxPrice?: number | undefined;
@@ -30,9 +27,9 @@ export declare function createTestServer(): McpServer<Record<never, import("../s
         images: string[];
     }, unknown>;
 } & {
-    "no-input-widget": import("../server/server.js").ToolDef<{}, {}, unknown>;
+    "no-input-view": import("../server/server.js").ToolDef<{}, {}, unknown>;
 } & {
-    "inferred-output-widget": import("../server/server.js").ToolDef<{
+    "inferred-output-view": import("../server/server.js").ToolDef<{
         query: string;
     }, {
         inferredResults: {
@@ -60,7 +57,7 @@ export declare function createTestServer(): McpServer<Record<never, import("../s
         fetchedAt: string;
     }, unknown>;
 } & {
-    "widget-with-metadata": import("../server/server.js").ToolDef<{
+    "view-with-metadata": import("../server/server.js").ToolDef<{
         resourceId: string;
     }, {
         data: {
@@ -82,7 +79,7 @@ export declare function createTestServer(): McpServer<Record<never, import("../s
         source: string;
     }>;
 } & {
-    "widget-with-mixed-returns": import("../server/server.js").ToolDef<{
+    "view-with-mixed-returns": import("../server/server.js").ToolDef<{
         shouldSucceed: boolean;
     }, {
         error: string;
@@ -96,7 +93,7 @@ export declare function createTestServer(): McpServer<Record<never, import("../s
     }>;
 }>;
 export declare function createMinimalTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
-    "search-voyage": import("../server/server.js").ToolDef<{
+    "search-trip": import("../server/server.js").ToolDef<{
         destination: string;
     }, {
         results: {
@@ -105,7 +102,7 @@ export declare function createMinimalTestServer(): McpServer<Record<never, impor
     }, unknown>;
 }>;
 export declare function createInterfaceTestServer(): McpServer<Record<never, import("../server/server.js").ToolDef<unknown, unknown, unknown>> & {
-    "interface-widget": import("../server/server.js").ToolDef<{
+    "interface-view": import("../server/server.js").ToolDef<{
         id: string;
     }, {
         itemName: string;
@@ -115,21 +112,16 @@ export declare function createInterfaceTestServer(): McpServer<Record<never, imp
         version: number;
     }>;
 }>;
-/**
- * Mock extra parameter for resource callback
- */
-export declare function createMockExtra(host: string): {
+export declare function createMockExtra(host: string, options?: {
+    headers?: Record<string, string | string[]>;
+    url?: URL | string;
+}): {
     requestInfo: {
+        url?: string | URL | undefined;
         headers: {
             host: string;
         };
     };
 };
-/**
- * Sets up environment variables for testing
- */
 export declare function setTestEnv(env: Record<string, string>): void;
-/**
- * Resets environment variables
- */
 export declare function resetTestEnv(): void;

package/dist/test/utils.js

@@ -1,18 +1,14 @@
+import { McpServer as McpServerBase } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { vi } from "vitest";
 import * as z from "zod";
 import { McpServer } from "../server/server.js";
-/**
- * Creates a real McpServer instance for testing
- */
 export function createMockMcpServer() {
-    // Create a real McpServer instance
     const server = new McpServer({
         name: "alpic-openai-app",
         version: "0.0.1",
     }, { capabilities: {} });
-    // Mock the underlying methods to track calls
     const mockRegisterResource = vi.spyOn(server, "registerResource");
-    const mockRegisterTool = vi.spyOn(server, "registerTool");
+    const mockRegisterTool = vi.spyOn(McpServerBase.prototype, "registerTool");
     return {
         server,
         mockRegisterResource,
@@ -21,8 +17,9 @@ export function createMockMcpServer() {
 }
 export function createTestServer() {
     return new McpServer({ name: "test-app", version: "1.0.0" }, {})
-        .registerWidget("search-voyage", {}, {
-        description: "Search for voyages",
+        .registerTool({
+        name: "search-trip",
+        description: "Search for trips",
         inputSchema: {
             destination: z.string(),
             departureDate: z.string().optional(),
@@ -36,6 +33,7 @@ export function createTestServer() {
             })),
             totalCount: z.number(),
         },
+        view: { component: "search-trip" },
     }, async ({ destination }) => {
         return {
             content: [{ type: "text", text: `Found trips to ${destination}` }],
@@ -45,7 +43,8 @@ export function createTestServer() {
             },
         };
     })
-        .registerWidget("get-trip-details", {}, {
+        .registerTool({
+        name: "get-trip-details",
         description: "Get trip details",
         inputSchema: {
             tripId: z.string(),
@@ -55,6 +54,7 @@ export function createTestServer() {
             description: z.string(),
             images: z.array(z.string()),
         },
+        view: { component: "get-trip-details" },
     }, async ({ tripId }) => {
         return {
             content: [{ type: "text", text: `Details for ${tripId}` }],
@@ -65,21 +65,25 @@ export function createTestServer() {
             },
         };
     })
-        .registerWidget("no-input-widget", {}, {
-        description: "Widget with no input",
+        .registerTool({
+        name: "no-input-view",
+        description: "View with no input",
         inputSchema: {},
         outputSchema: {},
+        view: { component: "no-input-view" },
     }, async () => {
         return {
             content: [{ type: "text", text: "No input needed" }],
             structuredContent: {},
         };
     })
-        .registerWidget("inferred-output-widget", {}, {
-        description: "Widget with output inferred from callback",
+        .registerTool({
+        name: "inferred-output-view",
+        description: "View with output inferred from callback",
         inputSchema: {
             query: z.string(),
         },
+        view: { component: "inferred-output-view" },
     }, async ({ query }) => {
         return {
             content: [{ type: "text", text: `Query: ${query}` }],
@@ -89,7 +93,8 @@ export function createTestServer() {
             },
         };
     })
-        .registerTool("calculate-price", {
+        .registerTool({
+        name: "calculate-price",
         description: "Calculate trip price",
         inputSchema: {
             tripId: z.string(),
@@ -108,7 +113,8 @@ export function createTestServer() {
             },
         };
     })
-        .registerTool("inferred-tool", {
+        .registerTool({
+        name: "inferred-tool",
         description: "Tool with output inferred from callback",
         inputSchema: {
             itemId: z.string(),
@@ -122,11 +128,13 @@ export function createTestServer() {
             },
         };
     })
-        .registerWidget("widget-with-metadata", {}, {
-        description: "Widget that returns response metadata",
+        .registerTool({
+        name: "view-with-metadata",
+        description: "View that returns response metadata",
         inputSchema: {
             resourceId: z.string(),
         },
+        view: { component: "view-with-metadata" },
     }, async ({ resourceId }) => {
         return {
             content: [{ type: "text", text: `Resource: ${resourceId}` }],
@@ -140,7 +148,8 @@ export function createTestServer() {
             },
         };
     })
-        .registerTool("tool-with-metadata", {
+        .registerTool({
+        name: "tool-with-metadata",
         description: "Tool that returns response metadata",
         inputSchema: {
             query: z.string(),
@@ -157,20 +166,20 @@ export function createTestServer() {
             },
         };
     })
-        .registerWidget("widget-with-mixed-returns", {}, {
-        description: "Widget with mixed return paths (some with _meta, some without)",
+        .registerTool({
+        name: "view-with-mixed-returns",
+        description: "View with mixed return paths (some with _meta, some without)",
         inputSchema: {
             shouldSucceed: z.boolean(),
         },
+        view: { component: "view-with-mixed-returns" },
     }, async ({ shouldSucceed }) => {
         if (!shouldSucceed) {
-            // Error path - no _meta
             return {
                 content: [{ type: "text", text: "Error occurred" }],
                 structuredContent: { error: "Something went wrong" },
             };
         }
-        // Success path - has _meta
         return {
             content: [{ type: "text", text: "Success" }],
             structuredContent: { data: "result" },
@@ -182,14 +191,16 @@ export function createTestServer() {
     });
 }
 export function createMinimalTestServer() {
-    return new McpServer({ name: "test-app", version: "1.0.0" }, {}).registerWidget("search-voyage", {}, {
-        description: "Search for voyages",
+    return new McpServer({ name: "test-app", version: "1.0.0" }, {}).registerTool({
+        name: "search-trip",
+        description: "Search for trips",
         inputSchema: {
             destination: z.string(),
         },
         outputSchema: {
             results: z.array(z.object({ id: z.string() })),
         },
+        view: { component: "search-trip" },
     }, async ({ destination }) => {
         return {
             content: [{ type: "text", text: `Found trips to ${destination}` }],
@@ -198,11 +209,13 @@ export function createMinimalTestServer() {
     });
 }
 export function createInterfaceTestServer() {
-    return new McpServer({ name: "interface-test-app", version: "1.0.0" }, {}).registerWidget("interface-widget", {}, {
-        description: "Widget with interface-typed output",
+    return new McpServer({ name: "interface-test-app", version: "1.0.0" }, {}).registerTool({
+        name: "interface-view",
+        description: "View with interface-typed output",
         inputSchema: {
             id: z.string(),
         },
+        view: { component: "interface-view" },
     }, async ({ id }) => {
         return {
             content: [{ type: "text", text: `Item ${id}` }],
@@ -217,25 +230,17 @@ export function createInterfaceTestServer() {
         };
     });
 }
-/**
- * Mock extra parameter for resource callback
- */
-export function createMockExtra(host) {
+export function createMockExtra(host, options) {
     return {
         requestInfo: {
-            headers: { host },
+            headers: { host, ...(options?.headers ?? {}) },
+            ...(options?.url ? { url: options.url } : {}),
         },
     };
 }
-/**
- * Sets up environment variables for testing
- */
 export function setTestEnv(env) {
     Object.assign(process.env, env);
 }
-/**
- * Resets environment variables
- */
 export function resetTestEnv() {
     delete process.env.NODE_ENV;
 }