zastro-websockets-cloudflare 12.6.0 → 12.6.12-10

package/dist/entrypoints/image-endpoint.js

@@ -1,3 +1,6 @@
+import { imageConfig } from "astro:assets";
+import { isRemotePath } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 const prerender = false;
 const GET = (ctx) => {
   const href = ctx.url.searchParams.get("href");
@@ -7,7 +10,18 @@ const GET = (ctx) => {
       statusText: "Missing 'href' query parameter"
     });
   }
-  return fetch(new URL(href, ctx.url.origin));
+  if (isRemotePath(href)) {
+    if (isRemoteAllowed(href, imageConfig) === false) {
+      return new Response("Forbidden", { status: 403 });
+    } else {
+      return Response.redirect(href, 302);
+    }
+  }
+  const proxied = new URL(href, ctx.url.origin);
+  if (proxied.origin !== ctx.url.origin) {
+    return new Response("Forbidden", { status: 403 });
+  }
+  return fetch(proxied);
 };
 export {
   GET,

package/dist/entrypoints/image-service.js

@@ -15,9 +15,9 @@ const service = {
     if (isESMImportedImage(options.src)) {
       imageSource = options.src.src;
     } else if (isRemoteAllowed(options.src, imageConfig)) {
-      imageSource = String(options.src);
+      imageSource = options.src;
     } else {
-      return String(options.src);
+      return options.src;
     }
     const imageEndpoint = joinPaths(
       // @ts-expect-error Can't recognise import.meta.env

package/dist/entrypoints/server.d.ts

@@ -5,7 +5,6 @@ type Env = {
     ASSETS: {
         fetch: (req: Request | string) => Promise<Response>;
     };
-    ASTRO_STUDIO_APP_TOKEN?: string;
 };
 export declare function createExports(manifest: SSRManifest): {
     default: {

package/dist/index.d.ts

@@ -91,4 +91,22 @@ export type Options = {
         namedExports?: string[];
     };
 };
+declare global {
+    namespace App {
+        interface Locals {
+            isUpgradeRequest?: boolean;
+            upgradeWebSocket?: () => {
+                socket: import('./websocket/websocket.js').WebSocket;
+                response: Response;
+            };
+            runtime?: {
+                env: any;
+                cf: any;
+                ctx: any;
+                caches: any;
+                waitUntil: (promise: Promise<any>) => void;
+            };
+        }
+    }
+}
 export default function createIntegration(args?: Options): AstroIntegration;

package/dist/index.js

@@ -2,7 +2,7 @@ import { createReadStream } from "node:fs";
 import { appendFile, stat } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { pathToFileURL } from "node:url";
 import {
   appendForwardSlash,
   prependForwardSlash,
@@ -39,6 +39,7 @@ function createIntegration(args) {
     args?.cloudflareModules ?? true
   );
   let _routes;
+  const SESSION_KV_BINDING_NAME = args?.sessionKVBindingName ?? "SESSION";
   return {
     name: "zastro-websockets-cloudflare",
     hooks: {
@@ -48,34 +49,21 @@ function createIntegration(args) {
         updateConfig,
         logger,
         addWatchFile,
-        addMiddleware,
-        createCodegenDir
+        addMiddleware
       }) => {
         let session = config.session;
-        const isBuild = command === "build";
         if (!session?.driver) {
-          const sessionDir = isBuild ? void 0 : createCodegenDir();
-          const bindingName = args?.sessionKVBindingName ?? "SESSION";
-          if (isBuild) {
-            logger.info(
-              `Enabling sessions with Cloudflare KV for production with the "${bindingName}" KV binding.`
-            );
-            logger.info(
-              `If you see the error "Invalid binding \`${bindingName}\`" in your build output, you need to add the binding to your wrangler config file.`
-            );
-          }
-          session = isBuild ? {
+          logger.info(
+            `Enabling sessions with Cloudflare KV with the "${SESSION_KV_BINDING_NAME}" KV binding.`
+          );
+          logger.info(
+            `If you see the error "Invalid binding \`${SESSION_KV_BINDING_NAME}\`" in your build output, you need to add the binding to your wrangler config file.`
+          );
+          session = {
             ...session,
             driver: "cloudflare-kv-binding",
             options: {
-              binding: bindingName,
-              ...session?.options
-            }
-          } : {
-            ...session,
-            driver: "fs-lite",
-            options: {
-              base: fileURLToPath(new URL("sessions", sessionDir)),
+              binding: SESSION_KV_BINDING_NAME,
               ...session?.options
             }
           };
@@ -122,12 +110,7 @@ function createIntegration(args) {
       "astro:routes:resolved": ({ routes }) => {
         _routes = routes;
       },
-      "astro:config:done": ({ setAdapter, config, buildOutput, logger }) => {
-        if (buildOutput === "static") {
-          logger.warn(
-            "[@astrojs/cloudflare] This adapter is intended to be used with server rendered pages, which this project does not contain any of. As such, this adapter is unnecessary."
-          );
-        }
+      "astro:config:done": ({ setAdapter, config, buildOutput }) => {
         _config = config;
         finalBuildOutput = buildOutput;
         let customWorkerEntryPoint;
@@ -142,7 +125,7 @@ function createIntegration(args) {
         setAdapter({
           name: "zastro-websockets-cloudflare",
           serverEntrypoint: customWorkerEntryPoint ?? "zastro-websockets-cloudflare/entrypoints/server.js",
-          exports: args?.workerEntryPoint?.namedExports ? ["default", ...args.workerEntryPoint.namedExports] : ["default"],
+          exports: [.../* @__PURE__ */ new Set(["default", ...args?.workerEntryPoint?.namedExports ?? []])],
           adapterFeatures: {
             edgeMiddleware: false,
             buildOutput: "server"
@@ -170,6 +153,8 @@ function createIntegration(args) {
             await platformProxy.dispose();
           });
           setProcessEnv(_config, platformProxy.env);
+          globalThis.__env__ ??= {};
+          globalThis.__env__[SESSION_KV_BINDING_NAME] = platformProxy.env[SESSION_KV_BINDING_NAME];
           const clientLocalsSymbol = Symbol.for("astro.locals");
           server.middlewares.use(async function middleware(req, _res, next) {
             Reflect.set(req, clientLocalsSymbol, {
@@ -222,9 +207,7 @@ function createIntegration(args) {
           vite.define = {
             "process.env": "process.env",
             // Allows the request handler to know what the binding name is
-            "globalThis.__ASTRO_SESSION_BINDING_NAME": JSON.stringify(
-              args?.sessionKVBindingName ?? "SESSION"
-            ),
+            "globalThis.__ASTRO_SESSION_BINDING_NAME": JSON.stringify(SESSION_KV_BINDING_NAME),
             ...vite.define
           };
         }

package/dist/utils/assets.js

@@ -1,49 +1,5 @@
 import { isRemotePath } from "@astrojs/internal-helpers/path";
-function matchHostname(url, hostname, allowWildcard) {
-  if (!hostname) {
-    return true;
-  }
-  if (!allowWildcard || !hostname.startsWith("*")) {
-    return hostname === url.hostname;
-  }
-  if (hostname.startsWith("**.")) {
-    const slicedHostname = hostname.slice(2);
-    return slicedHostname !== url.hostname && url.hostname.endsWith(slicedHostname);
-  }
-  if (hostname.startsWith("*.")) {
-    const slicedHostname = hostname.slice(1);
-    const additionalSubdomains = url.hostname.replace(slicedHostname, "").split(".").filter(Boolean);
-    return additionalSubdomains.length === 1;
-  }
-  return false;
-}
-function matchPort(url, port) {
-  return !port || port === url.port;
-}
-function matchProtocol(url, protocol) {
-  return !protocol || protocol === url.protocol.slice(0, -1);
-}
-function matchPathname(url, pathname, allowWildcard) {
-  if (!pathname) {
-    return true;
-  }
-  if (!allowWildcard || !pathname.endsWith("*")) {
-    return pathname === url.pathname;
-  }
-  if (pathname.endsWith("/**")) {
-    const slicedPathname = pathname.slice(0, -2);
-    return slicedPathname !== url.pathname && url.pathname.startsWith(slicedPathname);
-  }
-  if (pathname.endsWith("/*")) {
-    const slicedPathname = pathname.slice(0, -1);
-    const additionalPathChunks = url.pathname.replace(slicedPathname, "").split("/").filter(Boolean);
-    return additionalPathChunks.length === 1;
-  }
-  return false;
-}
-function matchPattern(url, remotePattern) {
-  return matchProtocol(url, remotePattern.protocol) && matchHostname(url, remotePattern.hostname, true) && matchPort(url, remotePattern.port) && matchPathname(url, remotePattern.pathname, true);
-}
+import { matchHostname, matchPattern } from "@astrojs/internal-helpers/remote";
 function isRemoteAllowed(src, {
   domains = [],
   remotePatterns = []

package/dist/utils/handler.d.ts

@@ -6,7 +6,6 @@ type Env = {
     ASSETS: {
         fetch: (req: Request | string) => Promise<Response>;
     };
-    ASTRO_STUDIO_APP_TOKEN?: string;
 };
 export interface Runtime<T extends object = object> {
     runtime: {

package/dist/utils/handler.js

@@ -20,11 +20,6 @@ async function handle(manifest, app, request, env, context) {
     }
   }
   Reflect.set(request, Symbol.for("astro.clientAddress"), request.headers.get("cf-connecting-ip"));
-  process.env.ASTRO_STUDIO_APP_TOKEN ??= (() => {
-    if (typeof env.ASTRO_STUDIO_APP_TOKEN === "string") {
-      return env.ASTRO_STUDIO_APP_TOKEN;
-    }
-  })();
   const locals = {
     runtime: {
       env,

package/dist/websocket/middleware.js

@@ -9,15 +9,12 @@ const onRequest = async function cloudflareWebSocketMiddleware(context, next) {
     }
     const webSocketPair = new WebSocketPair();
     const [client, server] = [webSocketPair[0], webSocketPair[1]];
+    server.accept();
     const socket = new WebSocket(request.url);
     attach(socket, server);
     const response = new Response(null, {
       status: 101,
       statusText: "Switching Protocols",
-      headers: {
-        "Upgrade": "websocket",
-        "Connection": "Upgrade"
-      },
       webSocket: client
     });
     return { socket, response };

package/dist/websocket/server.js

@@ -8,6 +8,7 @@ function createWebSocketHandler(app) {
     }
     const webSocketPair = new WebSocketPair();
     const [client, server] = [webSocketPair[0], webSocketPair[1]];
+    server.accept();
     const response = await app.render(request, {
       locals: {
         isUpgradeRequest: true,
@@ -17,10 +18,6 @@ function createWebSocketHandler(app) {
           const upgradeResponse = new Response(null, {
             status: 101,
             statusText: "Switching Protocols",
-            headers: {
-              "Upgrade": "websocket",
-              "Connection": "Upgrade"
-            },
             webSocket: client
           });
           return { socket, response: upgradeResponse };
@@ -34,15 +31,10 @@ function createWebSocketHandler(app) {
         }
       }
     });
-    if (response.status === 101 && response.headers.get("upgrade") === "websocket") {
-      server.accept();
+    if (response.status === 101) {
       return new Response(null, {
         status: 101,
         statusText: "Switching Protocols",
-        headers: {
-          "Upgrade": "websocket",
-          "Connection": "Upgrade"
-        },
         webSocket: client
       });
     }

package/dist/websocket/websocket.d.ts

@@ -6,17 +6,16 @@ export interface WebSocketUpgrade {
     response: Response;
 }
 export declare class WebSocket extends EventTarget {
-    private _ws;
+    static readonly CONNECTING: 0;
+    static readonly OPEN: 1;
+    static readonly CLOSING: 2;
+    static readonly CLOSED: 3;
     private _readyState;
     private _binaryType;
     private _url;
     private _protocol;
     private _extensions;
-    private _bufferedAmount;
-    static readonly CONNECTING: 0;
-    static readonly OPEN: 1;
-    static readonly CLOSING: 2;
-    static readonly CLOSED: 3;
+    private _ws;
     readonly CONNECTING: 0;
     readonly OPEN: 1;
     readonly CLOSING: 2;

package/dist/websocket/websocket.js

@@ -1,16 +1,15 @@
 class WebSocket extends EventTarget {
-  _ws;
-  _readyState = 0;
-  // Use numeric literal instead of static property
-  _binaryType = "blob";
-  _url = "";
-  _protocol = "";
-  _extensions = "";
-  _bufferedAmount = 0;
   static CONNECTING = 0;
   static OPEN = 1;
   static CLOSING = 2;
   static CLOSED = 3;
+  // CloudFlare doesn't use private fields - use simple approach
+  _readyState = WebSocket.CONNECTING;
+  _binaryType = "blob";
+  _url = "";
+  _protocol = "";
+  _extensions = "";
+  _ws;
   // Instance constants
   CONNECTING = 0;
   OPEN = 1;
@@ -32,7 +31,7 @@ class WebSocket extends EventTarget {
     return this._readyState;
   }
   get bufferedAmount() {
-    return this._bufferedAmount;
+    return 0;
   }
   get extensions() {
     return this._extensions;
@@ -53,11 +52,6 @@ class WebSocket extends EventTarget {
     this._readyState = WebSocket.CLOSING;
     if (this._ws) {
       this._ws.close(code, reason);
-    } else {
-      this._readyState = WebSocket.CLOSED;
-      const event = new CloseEvent("close", { code: code || 1e3, reason: reason || "", wasClean: true });
-      this.onclose?.(event);
-      this.dispatchEvent(event);
     }
   }
   send(data) {
@@ -65,11 +59,7 @@ class WebSocket extends EventTarget {
       throw new Error("WebSocket is not open");
     }
     if (this._ws) {
-      if (data instanceof Blob) {
-        data.arrayBuffer().then((buffer) => this._ws.send(buffer));
-      } else {
-        this._ws.send(data);
-      }
+      this._ws.send(data);
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zastro-websockets-cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages with WebSocket support",
-  "version": "12.6.0",
+  "version": "12.6.12-10",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "Zach Handley <zach@zachhandley.com>",
@@ -23,20 +23,23 @@
     "./image-endpoint": "./dist/entrypoints/image-endpoint.js",
     "./handler": "./dist/utils/handler.js",
     "./package.json": "./package.json",
-    "./websocket": "./dist/websocket/index.js"
+    "./websocket": "./dist/websocket/index.js",
+    "./websocket/middleware.js": "./dist/websocket/middleware.js",
+    "./websocket/websocket.js": "./dist/websocket/websocket.js",
+    "./websocket/server.js": "./dist/websocket/server.js"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@astrojs/internal-helpers": "^0.6.1",
+    "@astrojs/internal-helpers": "^0.7.5",
     "@astrojs/underscore-redirects": "^1.0.0",
-    "@cloudflare/workers-types": "^4.20250507.0",
-    "tinyglobby": "^0.2.13",
-    "vite": "^6.3.5",
-    "wrangler": "^4.14.1"
+    "@cloudflare/workers-types": "^4.20260116.0",
+    "tinyglobby": "^0.2.15",
+    "vite": "^6.4.1",
+    "wrangler": "4.59.2"
   },
   "peerDependencies": {
-    "astro": "^5.0.0"
+    "astro": "^5.7.0"
   }
 }