textbrowser 0.43.0 → 0.45.1

package/CHANGES.md

@@ -1,4 +1,20 @@
-# textbrowser CHANGES
+# CHANGES to `textbrowser`
+
+## 0.45.1
+
+- fix: issue with `next`
+
+## 0.45.0
+
+- fix: proper use of `await`
+- fix: avoid extra problematic static server call
+- fix: allow for empty router
+- fix: allow fall-through to express if http server fails to match
+- fix: pass on `next` to express
+
+## 0.44.0
+
+- fix: allow passing on if middleware does not match
 
 ## 0.43.0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "textbrowser",
-  "version": "0.43.0",
+  "version": "0.45.1",
   "description": "Multilinear text browser",
   "type": "module",
   "main": "dist/index-es.min.js",

package/server/main.js

@@ -122,27 +122,53 @@ const srv = http.createServer(async (req, res) => {
       }
       fileServer.serve(req, res);
     };
+
+    const next = function () {
+      req.addListener('end', staticServer).resume();
+    };
+
+    /**
+     * @returns {Promise<void>}
+     */
+    const runHttpServer = async function () {
+      // eslint-disable-next-line no-unsanitized/method -- Site-specified plugin
+      const server = (await import(userParams.httpServer)).default();
+      return await server(
+        req,
+        res,
+        // For express, we'll first give a chance to other static servers
+        //  they might supply
+        userParams.expressServer ? () => {
+          // Empty
+        } : next
+      );
+    };
     if (userParams.expressServer) {
       // eslint-disable-next-line no-unsanitized/method -- Site-specified plugin
       const app = (await import(userParams.expressServer)).default();
 
-      if (userParams.httpServer && !app._router.stack.some(({regexp}) => {
+      if (userParams.httpServer && (!app._router || !app._router.stack.some(({regexp}) => {
         // Hack to ignore middleware like jsonParser (and hopefully
         //   not get any other)
         return regexp.source !== '^\\/?(?=\\/|$)' && regexp.test(req.url);
-      })) {
-        // eslint-disable-next-line no-unsanitized/method -- Site-specified plugin
-        const server = (await import(userParams.httpServer)).default();
-        server(req, res);
+      }))) {
+        await runHttpServer();
+        app(req, res, () => {
+          // Empty
+        });
         return;
       }
 
-      app.get('*', staticServer);
-      app(req, res);
+      // app.get('*', staticServer);
+      app(req, res, next);
 
+      return;
+    } else if (userParams.httpServer) {
+      await runHttpServer();
       return;
     }
-    req.addListener('end', staticServer).resume();
+
+    next();
     /*
     res.writeHead(404, {'Content-Type': 'text/html'});
     res.end('<h1>File not found</h1>');