npm - bun-dev-server - Versions diffs - 0.5.0 → 0.6.0 - Mend

bun-dev-server 0.5.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/bunServeConfig.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { type BuildConfig, type TLSOptions } from "bun";
-export interface BunDevServerConfig extends Partial<BunDevServerSocketConfig> {
+export interface BunDevServerConfig extends Partial<BunServeConfig> {
     port: number;
     buildConfig: BuildConfig;
     watchDir: string;
@@ -14,6 +14,7 @@ export interface BunDevServerConfig extends Partial<BunDevServerSocketConfig> {
     manifestName?: string;
     manifestWithHash?: boolean;
     hotReload?: "plugin" | "footer";
+    logRequests?: boolean;
     reloadOnChange?: boolean;
     /**
      * The path to the directory to serve files from.
@@ -25,8 +26,9 @@ export interface BunDevServerConfig extends Partial<BunDevServerSocketConfig> {
     serveOutputEjs?: string;
     serveOutputHtml?: string;
 }
-export interface BunDevServerSocketConfig {
+export interface BunServeConfig {
     port: number;
     tls?: TLSOptions;
     websocketPath?: string;
+    static?: Record<`/${string}`, Response>;
 }

package/dist/index.js CHANGED Viewed

@@ -966,7 +966,7 @@ var indexHTMLTemplate_default = `<!DOCTYPE html>\r
 `;
 // src/server.ts
-import { watch, readdir, exists, readFile as readFile2 } from "fs/promises";
+import { watch, readdir, access, readFile as readFile2, constants } from "fs/promises";
 // src/bunClientHmr.ts
 function hotReload() {
@@ -1187,82 +1187,27 @@ async function startBunDevServer(serverConfig) {
     port: finalConfig.port,
     development: true,
     tls: finalConfig.tls,
+    static: {
+      "/favicon.ico": withCORSHeaders(new Response("", { status: 404 })),
+      ...finalConfig.static
+    },
     async fetch(req, server) {
       if (req.method === "OPTIONS") {
-        const response = new Response("", { status: 200 });
-        augumentHeaders(req, response);
-        return response;
-      }
-      if (req.url.toLowerCase().endsWith("/favicon.ico")) {
-        const response = new Response("", { status: 404 });
-        augumentHeaders(req, response);
-        return response;
+        finalConfig.logRequests && console.log(`${200} ${req.url} OPTIONS`);
+        return withCORSHeaders(new Response("", { status: 200 }), req);
       }
       if (req.url.toLowerCase().endsWith(finalConfig.websocketPath)) {
+        finalConfig.logRequests && console.log(`${req.url} Socket Upgrade`);
         if (server.upgrade(req)) {
           return;
         }
       }
       const url = new URL(req.url);
-      const requestPath = url.pathname;
-      const objThere = await exists(destinationPath + requestPath);
-      let isDirectory = false;
-      if (objThere) {
-        try {
-          await readFile2(destinationPath + requestPath);
-        } catch (e) {
-          if (e.code === "EISDIR") {
-            isDirectory = true;
-          } else {
-            throw e;
-          }
-        }
-      } else {
-        const response = new Response("", { status: 404 });
-        augumentHeaders(req, response);
-        return response;
-      }
-      if (!isDirectory) {
-        try {
-          const fl = Bun.file(destinationPath + requestPath);
-          const response = new Response(fl);
-          augumentHeaders(req, response);
-          return response;
-        } catch (e) {
-          if (e.code === "ENOENT") {
-            const response = new Response("", { status: 404 });
-            augumentHeaders(req, response);
-            return response;
-          } else {
-            throw e;
-          }
-        }
-      }
-      try {
-        const allEntries = await readdir(destinationPath + requestPath, {
-          withFileTypes: true
-        });
-        const dirs = allEntries.filter((entry) => entry.isDirectory()).map((entry) => {
-          return {
-            requestPath: requestPath === "/" ? "" : requestPath,
-            name: entry.name
-          };
-        });
-        const files = allEntries.filter((entry) => entry.isFile()).map((entry) => {
-          return {
-            requestPath: requestPath === "/" ? "" : requestPath,
-            name: entry.name
-          };
-        });
-        const rnd = import_ejs.render(finalConfig.serveOutputEjs, { dirs, files });
-        const response = new Response(rnd, { headers: { "Content-Type": "text/html" } });
-        augumentHeaders(req, response);
-        return response;
-      } catch {
-        const response = new Response("Not Found", { status: 404 });
-        augumentHeaders(req, response);
-        return response;
+      let requestPath = url.pathname;
+      if (requestPath.toLowerCase() === "/index.html") {
+        requestPath = "/";
       }
+      return handlePathRequest(requestPath, req, finalConfig, destinationPath);
     },
     websocket: {
       open(ws) {
@@ -1294,6 +1239,11 @@ var debouncedbuildAndNotify = import_debounce.default(async (finalConfig, destin
     bunServer.publish("message", JSON.stringify({ type: "reload" }));
   }
 }, watchDelay, { immediate: true });
+function handleErrorResponse(req, err) {
+  const msg = `Error while processing request ${req.url}`;
+  console.error(msg, err);
+  return withCORSHeaders(new Response(msg, { status: 500 }), req);
+}
 function publishOutputLogs(bunServer, output, event) {
   output.logs.forEach(console.log);
   bunServer.publish("message", JSON.stringify({ type: "message", message: `[Bun HMR] ${event.filename} ${event.eventType}` }));
@@ -1320,10 +1270,11 @@ function publishIndexHTML(destinationPath, template, output, _event) {
   }
   Bun.write(destinationPath + "/index.html", import_ejs.render(template, { hashedImports }));
 }
-function augumentHeaders(request, response) {
-  response.headers.set("Access-Control-Allow-Origin", request.headers.get("origin") ?? "*");
-  response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+function withCORSHeaders(response, request) {
+  response.headers.set("Access-Control-Allow-Origin", request?.headers.get("origin") ?? "*");
+  response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
   response.headers.set("Access-Control-Allow-Credentials", "true");
+  return response;
 }
 async function cleanDirectory(dst) {
   const { stderr, exitCode } = await $2`rm -rf ${dst}/*`.nothrow();
@@ -1347,6 +1298,74 @@ function convertBytes(bytes) {
   }
   return (bytes / Math.pow(1024, i)).toFixed(1) + " " + sizes[i];
 }
+async function handlePathRequest(requestPath, req, finalConfig, destinationPath) {
+  const fsPath = destinationPath + requestPath;
+  const objThere = await checkObjectExists(fsPath, req);
+  let isDirectory = false;
+  if (objThere) {
+    try {
+      await readFile2(fsPath);
+    } catch (e) {
+      if (e.code === "EISDIR") {
+        isDirectory = true;
+      } else {
+        throw e;
+      }
+    }
+  } else {
+    finalConfig.logRequests && console.log(`${404} ${req.url}`);
+    return withCORSHeaders(new Response("", { status: 404 }), req);
+  }
+  if (!isDirectory) {
+    try {
+      const fl = Bun.file(fsPath);
+      finalConfig.logRequests && console.log(`${200} ${req.url}`);
+      return withCORSHeaders(new Response(fl), req);
+    } catch (e) {
+      if (e?.code === "ENOENT") {
+        finalConfig.logRequests && console.log(`${404} ${req.url}`);
+        return withCORSHeaders(new Response("", { status: 404 }), req);
+      } else {
+        return handleErrorResponse(req, e);
+      }
+    }
+  }
+  try {
+    const allEntries = await readdir(fsPath, {
+      withFileTypes: true
+    });
+    const dirs = allEntries.filter((entry) => entry.isDirectory()).map((entry) => {
+      return {
+        requestPath: requestPath === "/" ? "" : requestPath,
+        name: entry.name
+      };
+    });
+    const files = allEntries.filter((entry) => entry.isFile()).map((entry) => {
+      return {
+        requestPath: requestPath === "/" ? "" : requestPath,
+        name: entry.name
+      };
+    });
+    const rnd = import_ejs.render(finalConfig.serveOutputEjs, { dirs, files });
+    finalConfig.logRequests && console.log(`${200} ${req.url}`);
+    return withCORSHeaders(new Response(rnd, { headers: { "Content-Type": "text/html" } }), req);
+  } catch (err) {
+    return handleErrorResponse(req, err);
+  }
+}
+async function checkObjectExists(fsPath, req) {
+  try {
+    await access(fsPath, constants.R_OK);
+    return true;
+  } catch (e) {
+    if (e?.code === "ENOENT") {
+      return false;
+    }
+    const msg = `Error while accessing path ${fsPath}`;
+    console.error(msg, e);
+    return false;
+  }
+}
 export {
   startBunDevServer,
   getBunHMRFooter,

package/package.json CHANGED Viewed

@@ -21,18 +21,18 @@
   "exports": {
     ".": "./dist/index.js"
   },
-  "version": "0.5.0",
+  "version": "0.6.0",
   "module": "index.ts",
   "type": "module",
   "license": "MIT",
   "scripts": {
-    "serve": "bun --hot ./serve.ts"
+    "build": "bun run ./build.ts"
   },
   "devDependencies": {
     "@types/bun": "latest"
   },
   "peerDependencies": {
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
     "@types/ejs": "^3.1.5",