@haibun/web-server-express 1.28.2 → 1.28.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@haibun/web-server-express",
   "type": "module",
-  "version": "1.28.2",
+  "version": "1.28.3",
   "description": "",
   "main": "build/web-server-stepper.js",
   "files": [
@@ -20,13 +20,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@haibun/core": "1.28.2",
-    "@haibun/domain-webpage": "1.28.2",
+    "@haibun/core": "1.28.3",
+    "@haibun/domain-webpage": "1.28.3",
     "cookie-parser": "^1.4.5",
     "express": "^4.17.1"
   },
   "devDependencies": {
-    "@haibun/web-http": "1.28.2",
+    "@haibun/web-http": "1.28.3",
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.15"
   },

package/build/server-express.d.ts

@@ -1,28 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import http from 'http';
-import { RequestHandler } from 'express';
-import { IWebServer, TRouteTypes } from './defs.js';
-import { ILogger } from '@haibun/core/build/lib/interfaces/logger.js';
-export declare const DEFAULT_PORT = 8123;
-export declare class ServerExpress implements IWebServer {
-    logger: ILogger;
-    static listening: boolean;
-    listener?: http.Server;
-    app: import("express-serve-static-core").Express;
-    static mounted: {
-        get: {};
-        post: {};
-    };
-    base: string;
-    port: number;
-    constructor(logger: ILogger, base: string, port?: number);
-    use(middleware: RequestHandler): void;
-    listen(): Promise<unknown>;
-    addRoute(type: TRouteTypes, path: string, route: RequestHandler): Promise<void>;
-    private addMounted;
-    addStaticFolder(relativeFolder: string, mountAt?: string): Promise<void>;
-    addKnownStaticFolder(folder: string, mountAt?: string): Promise<void>;
-    private doAddStaticFolder;
-    checkMountBadOrMounted(type: string, loc: string, what: string): void;
-    close(): Promise<void>;
-}

package/build/server-express.js

@@ -1,99 +0,0 @@
-import { statSync, existsSync } from 'fs';
-import express from 'express';
-import cookieParser from 'cookie-parser';
-export const DEFAULT_PORT = 8123;
-export class ServerExpress {
-    logger;
-    static listening = false;
-    listener;
-    app = express();
-    static mounted = { get: {}, post: {} };
-    base;
-    port;
-    constructor(logger, base, port = DEFAULT_PORT) {
-        this.logger = logger;
-        this.base = base;
-        this.port = port;
-        this.app.use(cookieParser());
-        this.app.use(express.json({ limit: '50mb' }));
-    }
-    use(middleware) {
-        this.app.use(middleware);
-    }
-    listen() {
-        return new Promise((resolve, reject) => {
-            if (!ServerExpress.listening) {
-                try {
-                    this.listener = this.app.listen(this.port, () => {
-                        this.logger.log(`Server listening on port: ${this.port}`);
-                        ServerExpress.listening = true;
-                        this.logger.log('express listening');
-                        resolve('started');
-                    });
-                }
-                catch (e) {
-                    console.error(e);
-                    reject(e);
-                }
-            }
-            else {
-                this.logger.log('express already listening');
-                resolve('already listening');
-            }
-        });
-    }
-    async addRoute(type, path, route) {
-        if (type !== 'get' && type !== 'post') {
-            throw Error(`invalid route type ${type}`);
-        }
-        this.checkMountBadOrMounted(type, path, route.toString());
-        this.logger.log(`adding ${type} route from ${path}`);
-        this.app[type](path, route);
-        await this.addMounted(type, path, route.toString());
-    }
-    async addMounted(type, path, what) {
-        ServerExpress.mounted[type][path] = what;
-        if (!this.listener) {
-            await this.listen();
-        }
-    }
-    // add a static folder restricted to relative paths from files
-    async addStaticFolder(relativeFolder, mountAt = '/') {
-        const folder = [this.base, relativeFolder].join('/');
-        await this.doAddStaticFolder(folder, mountAt);
-    }
-    // add a static folder at any path
-    async addKnownStaticFolder(folder, mountAt = '/') {
-        await this.doAddStaticFolder(folder, mountAt);
-    }
-    async doAddStaticFolder(folder, mountAt = '/') {
-        this.checkMountBadOrMounted('get', mountAt, folder);
-        if (!existsSync(folder)) {
-            throw Error(`"${folder}" doesn't exist`);
-        }
-        const stat = statSync(folder);
-        if (!stat.isDirectory()) {
-            throw Error(`"${folder}" is not a directory`);
-        }
-        this.app.use(mountAt, express.static(folder));
-        await this.addMounted('get', mountAt, folder);
-        this.logger.info(`serving files from ${folder} at ${mountAt}`);
-        return;
-    }
-    checkMountBadOrMounted(type, loc, what) {
-        if (loc !== loc.replace(/[^a-zA-Z-0-9/-_]/g, '')) {
-            throw Error(`mount folder ${loc} has illegal characters`);
-        }
-        const alreadyMounted = ServerExpress.mounted[type][loc] || Object.keys(ServerExpress.mounted[type]).find((m) => m.startsWith(`${loc}/`));
-        if (alreadyMounted) {
-            throw Error(`cannot mount ${type} ${what} at ${loc}, ${alreadyMounted} is already mounted}`);
-        }
-    }
-    async close() {
-        this.logger.info('closing server');
-        this.listener?.close();
-        ServerExpress.mounted = { get: {}, post: {} };
-        ServerExpress.listening = false;
-    }
-}
-//# sourceMappingURL=server-express.js.map

package/build/server-express.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}

package/build/server-express.test.d.ts

@@ -1 +0,0 @@
-export {};

package/build/server-express.test.js

@@ -1,17 +0,0 @@
-import { ServerExpress } from "./server-express.js";
-import TestLogger from '@haibun/core/build/lib/TestLogger.js';
-describe('mounts', () => {
-    it.only('mounts a route', () => {
-        const tl = new TestLogger();
-        const se = new ServerExpress(tl, '/', 8999);
-        se.listen = async () => 'started';
-        expect(() => se.addRoute('get', '/', () => undefined)).not.toThrow();
-    });
-    it('fails to double mount a route', () => {
-        const tl = new TestLogger();
-        const se = new ServerExpress(tl, '/', 8999);
-        se.listen = async () => 'started';
-        expect(() => se.addRoute('get', '/', () => undefined)).toThrow();
-    });
-});
-//# sourceMappingURL=server-express.test.js.map