zastro-websockets-node 9.5.2-3 → 9.5.3-1

package/dist/serve-app.js

@@ -1,5 +1,28 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+import { createReadStream } from "node:fs";
+import path from "node:path";
+import { Readable } from "node:stream";
 import { NodeApp } from "astro/app/node";
+import { resolveClientDir } from "./shared.js";
+async function readErrorPageFromDisk(client, status) {
+  const filePaths = [`${status}.html`, `${status}/index.html`];
+  for (const filePath of filePaths) {
+    const fullPath = path.join(client, filePath);
+    try {
+      const stream = createReadStream(fullPath);
+      await new Promise((resolve, reject) => {
+        stream.once("open", () => resolve());
+        stream.once("error", reject);
+      });
+      const webStream = Readable.toWeb(stream);
+      return new Response(webStream, {
+        headers: { "Content-Type": "text/html; charset=utf-8" }
+      });
+    } catch {
+    }
+  }
+  return void 0;
+}
 function createAppHandler(app, options) {
   const als = new AsyncLocalStorage();
   const logger = app.getAdapterLogger();
@@ -8,13 +31,25 @@ function createAppHandler(app, options) {
     logger.error(`Unhandled rejection while rendering ${requestUrl}`);
     console.error(reason);
   });
-  const originUrl = options.experimentalErrorPageHost ? new URL(options.experimentalErrorPageHost) : void 0;
-  const prerenderedErrorPageFetch = originUrl ? (url) => {
-    const errorPageUrl = new URL(url);
-    errorPageUrl.protocol = originUrl.protocol;
-    errorPageUrl.host = originUrl.host;
-    return fetch(errorPageUrl);
-  } : void 0;
+  const client = resolveClientDir(options);
+  const prerenderedErrorPageFetch = async (url) => {
+    if (url.includes("/404")) {
+      const response = await readErrorPageFromDisk(client, 404);
+      if (response) return response;
+    }
+    if (url.includes("/500")) {
+      const response = await readErrorPageFromDisk(client, 500);
+      if (response) return response;
+    }
+    if (options.experimentalErrorPageHost) {
+      const originUrl = new URL(options.experimentalErrorPageHost);
+      const errorPageUrl = new URL(url);
+      errorPageUrl.protocol = originUrl.protocol;
+      errorPageUrl.host = originUrl.host;
+      return fetch(errorPageUrl);
+    }
+    return new Response(null, { status: 404 });
+  };
   return async (req, res, next, locals = {}) => {
     let request;
     try {

package/dist/serve-static.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import url from "node:url";
 import { hasFileExtension, isInternalPath } from "@astrojs/internal-helpers/path";
 import send from "send";
+import { resolveClientDir } from "./shared.js";
 function createStaticHandler(app, options) {
   const client = resolveClientDir(options);
   return (req, res, ssr) => {
@@ -90,26 +90,9 @@ function createStaticHandler(app, options) {
     }
   };
 }
-function resolveClientDir(options) {
-  const clientURLRaw = new URL(options.client);
-  const serverURLRaw = new URL(options.server);
-  const rel = path.relative(url.fileURLToPath(serverURLRaw), url.fileURLToPath(clientURLRaw));
-  const serverFolder = path.basename(options.server);
-  let serverEntryFolderURL = path.dirname(import.meta.url);
-  while (!serverEntryFolderURL.endsWith(serverFolder)) {
-    serverEntryFolderURL = path.dirname(serverEntryFolderURL);
-  }
-  const serverEntryURL = serverEntryFolderURL + "/entry.mjs";
-  const clientURL = new URL(appendForwardSlash(rel), serverEntryURL);
-  const client = url.fileURLToPath(clientURL);
-  return client;
-}
 function prependForwardSlash(pth) {
   return pth.startsWith("/") ? pth : "/" + pth;
 }
-function appendForwardSlash(pth) {
-  return pth.endsWith("/") ? pth : pth + "/";
-}
 export {
   createStaticHandler
 };

package/dist/shared.d.ts

@@ -1 +1,9 @@
+import type { Options } from './types.js';
 export declare const STATIC_HEADERS_FILE = "_experimentalHeaders.json";
+/**
+ * Resolves the client directory path at runtime.
+ *
+ * At build time, we know the relative path between server and client directories.
+ * At runtime, we need to find the actual location based on where the server entry is running.
+ */
+export declare function resolveClientDir(options: Options): string;

package/dist/shared.js

@@ -1,4 +1,21 @@
+import path from "node:path";
+import url from "node:url";
+import { appendForwardSlash } from "@astrojs/internal-helpers/path";
 const STATIC_HEADERS_FILE = "_experimentalHeaders.json";
+function resolveClientDir(options) {
+  const clientURLRaw = new URL(options.client);
+  const serverURLRaw = new URL(options.server);
+  const rel = path.relative(url.fileURLToPath(serverURLRaw), url.fileURLToPath(clientURLRaw));
+  const serverFolder = path.basename(options.server);
+  let serverEntryFolderURL = path.dirname(import.meta.url);
+  while (!serverEntryFolderURL.endsWith(serverFolder)) {
+    serverEntryFolderURL = path.dirname(serverEntryFolderURL);
+  }
+  const serverEntryURL = serverEntryFolderURL + "/entry.mjs";
+  const clientURL = new URL(appendForwardSlash(rel), serverEntryURL);
+  return url.fileURLToPath(clientURL);
+}
 export {
-  STATIC_HEADERS_FILE
+  STATIC_HEADERS_FILE,
+  resolveClientDir
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zastro-websockets-node",
   "description": "Deploy your site to a Node.js server with WebSocket support",
-  "version": "9.5.2-3",
+  "version": "9.5.3-1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "Zach Handley <zach@zachhandley.com>",