@entity-access/server-pages 1.0.28 → 1.0.30

package/.vscode/settings.json

@@ -42,6 +42,7 @@
         "mailparser",
         "Millis",
         "mutler",
+        "Navi",
         "neurospeech",
         "nvarchar",
         "PGDATABASE",

package/dist/Content.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Response } from "express";
 import XNode from "./html/XNode.js";
 import { LocalFile } from "./core/LocalFile.js";
 import SessionUser from "./core/SessionUser.js";
+import { WrappedResponse } from "./core/Wrapped.js";
 export interface IPageResult {
-    send(res: Response): Promise<any>;
+    send(res: WrappedResponse): Promise<any>;
 }
 export declare class TempFileResult implements IPageResult {
     private file;
@@ -14,7 +14,7 @@ export declare class TempFileResult implements IPageResult {
     etag: boolean;
     immutable: boolean;
     constructor(file: LocalFile, { contentDisposition, cacheControl, maxAge, etag, immutable }?: Partial<TempFileResult>);
-    send(res: Response<any, Record<string, any>>): Promise<void>;
+    send(res: WrappedResponse): Promise<void>;
 }
 export declare class FileResult implements IPageResult {
     private filePath;
@@ -25,13 +25,13 @@ export declare class FileResult implements IPageResult {
     immutable: boolean;
     private fileName;
     constructor(filePath: string, { contentDisposition, cacheControl, maxAge, etag, immutable }?: Partial<FileResult>);
-    send(res: Response<any, Record<string, any>>): Promise<void>;
+    send(res: WrappedResponse): Promise<void>;
 }
 export declare class Redirect implements IPageResult {
     location: string;
     status: number;
     constructor(location: string, status?: number);
-    send(res: Response): Promise<void>;
+    send(res: WrappedResponse): Promise<void>;
 }
 export default class Content implements IPageResult {
     static json(json: any, status?: number): Content;
@@ -41,6 +41,6 @@ export default class Content implements IPageResult {
     contentType: string;
     body: string | Buffer | Blob | XNode;
     private constructor();
-    send(res: Response, user?: SessionUser): Promise<void>;
+    send(res: WrappedResponse, user?: SessionUser): Promise<void>;
 }
 //# sourceMappingURL=Content.d.ts.map

package/dist/Content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../src/Content.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAEhD,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrC;AAED,qBAAa,cAAe,YAAW,WAAW;IAQ1C,OAAO,CAAC,IAAI;IANT,kBAAkB,EAAE,QAAQ,GAAG,YAAY,CAAY;IACvD,YAAY,UAAQ;IACpB,MAAM,SAAW;IACjB,IAAI,UAAS;IACb,SAAS,UAAS;gBAEb,IAAI,EAAE,SAAS,EACvB,EACI,kBAA6B,EAC7B,YAAmB,EACnB,MAAgB,EAChB,IAAY,EACZ,SAAiB,EACpB,GAAE,OAAO,CAAC,cAAc,CAAM;IASnC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAuB/C;AAED,qBAAa,UAAW,YAAW,WAAW;IAStC,OAAO,CAAC,QAAQ;IAPb,kBAAkB,EAAE,QAAQ,GAAG,YAAY,CAAY;IACvD,YAAY,UAAQ;IACpB,MAAM,SAAW;IACjB,IAAI,UAAS;IACb,SAAS,UAAS;IACzB,OAAO,CAAC,QAAQ,CAAC;gBAEL,QAAQ,EAAE,MAAM,EACxB,EACI,kBAA6B,EAC7B,YAAmB,EACnB,MAAgB,EAChB,IAAY,EACZ,SAAiB,EACpB,GAAE,OAAO,CAAC,UAAU,CAAM;IAW/B,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAmB/C;AAED,qBAAa,QAAS,YAAW,WAAW;IAErB,QAAQ,EAAE,MAAM;IAAS,MAAM;gBAA/B,QAAQ,EAAE,MAAM,EAAS,MAAM,SAAM;IAIlD,IAAI,CAAC,GAAG,EAAE,QAAQ;CAI3B;AAED,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,WAAW;WAEjC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,SAAM;WAQ5B,IAAI,CAAC,IAAI,KAAA,EAAE,MAAM,SAAM;WAQvB,MAAM,CAChB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC;IAMnB,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,MAAM,CAAC;IAEpB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;IAE5C,OAAO;IAOM,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,WAAW;CA2BtD"}
+{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../src/Content.tsx"],"names":[],"mappings":";AAEA,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC5C;AAED,qBAAa,cAAe,YAAW,WAAW;IAQ1C,OAAO,CAAC,IAAI;IANT,kBAAkB,EAAE,QAAQ,GAAG,YAAY,CAAY;IACvD,YAAY,UAAQ;IACpB,MAAM,SAAW;IACjB,IAAI,UAAS;IACb,SAAS,UAAS;gBAEb,IAAI,EAAE,SAAS,EACvB,EACI,kBAA6B,EAC7B,YAAmB,EACnB,MAAgB,EAChB,IAAY,EACZ,SAAiB,EACpB,GAAE,OAAO,CAAC,cAAc,CAAM;IASnC,IAAI,CAAC,GAAG,EAAE,eAAe;CAe5B;AAED,qBAAa,UAAW,YAAW,WAAW;IAStC,OAAO,CAAC,QAAQ;IAPb,kBAAkB,EAAE,QAAQ,GAAG,YAAY,CAAY;IACvD,YAAY,UAAQ;IACpB,MAAM,SAAW;IACjB,IAAI,UAAS;IACb,SAAS,UAAS;IACzB,OAAO,CAAC,QAAQ,CAAC;gBAEL,QAAQ,EAAE,MAAM,EACxB,EACI,kBAA6B,EAC7B,YAAmB,EACnB,MAAgB,EAChB,IAAY,EACZ,SAAiB,EACpB,GAAE,OAAO,CAAC,UAAU,CAAM;IAW/B,IAAI,CAAC,GAAG,EAAE,eAAe;CAY5B;AAED,qBAAa,QAAS,YAAW,WAAW;IAErB,QAAQ,EAAE,MAAM;IAAS,MAAM;gBAA/B,QAAQ,EAAE,MAAM,EAAS,MAAM,SAAM;IAIlD,IAAI,CAAC,GAAG,EAAE,eAAe;CAIlC;AAED,MAAM,CAAC,OAAO,OAAO,OAAQ,YAAW,WAAW;WAEjC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,SAAM;WAQ5B,IAAI,CAAC,IAAI,KAAA,EAAE,MAAM,SAAM;WAQvB,MAAM,CAChB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC;IAMnB,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,MAAM,CAAC;IAEpB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;IAE5C,OAAO;IAOM,IAAI,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,WAAW;CA2B7D"}

package/dist/Content.js

@@ -15,25 +15,17 @@ export class TempFileResult {
         this.immutable = immutable;
     }
     send(res) {
-        return new Promise((resolve, reject) => {
-            res = res.header("content-disposition", `${this.contentDisposition};filename=${encodeURIComponent(this.file.fileName)}`);
-            res.sendFile(this.file.path, {
-                headers: {
-                    "content-type": this.file.contentType
-                },
-                acceptRanges: true,
-                cacheControl: this.cacheControl,
-                maxAge: this.maxAge,
-                etag: this.etag,
-                immutable: this.immutable,
-                lastModified: false
-            }, (error) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve();
-            });
+        res.setHeader("content-disposition", `${this.contentDisposition};filename=${encodeURIComponent(this.file.fileName)}`);
+        return res.sendFile(this.file.path, {
+            headers: {
+                "content-type": this.file.contentType
+            },
+            acceptRanges: true,
+            cacheControl: this.cacheControl,
+            maxAge: this.maxAge,
+            etag: this.etag,
+            immutable: this.immutable,
+            lastModified: false
         });
     }
 }
@@ -54,21 +46,13 @@ export class FileResult {
         this.fileName = parsed.base;
     }
     send(res) {
-        return new Promise((resolve, reject) => {
-            res = res.header("content-disposition", `${this.contentDisposition};filename=${encodeURIComponent(this.fileName)}`);
-            res.sendFile(this.filePath, {
-                acceptRanges: true,
-                cacheControl: this.cacheControl,
-                maxAge: this.maxAge,
-                etag: this.etag,
-                immutable: this.immutable
-            }, (error) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve();
-            });
+        res.setHeader("content-disposition", `${this.contentDisposition};filename=${encodeURIComponent(this.fileName)}`);
+        return res.sendFile(this.filePath, {
+            acceptRanges: true,
+            cacheControl: this.cacheControl,
+            maxAge: this.maxAge,
+            etag: this.etag,
+            immutable: this.immutable
         });
     }
 }
@@ -78,7 +62,7 @@ export class Redirect {
         this.status = status;
     }
     async send(res) {
-        res.redirect(this.status, this.location);
+        return res.sendRedirect(this.location);
     }
 }
 export default class Content {
@@ -107,8 +91,8 @@ export default class Content {
     }
     async send(res, user) {
         const { status, body, contentType } = this;
-        const r = res.setHeader("content-type", contentType)
-            .status(status);
+        res.setHeader("content-type", contentType);
+        res.statusCode = status;
         if (typeof body === "string") {
             if (status >= 300) {
                 const u = user ? `User: ${user.userID},${user.userName}` : "User: Anonymous";

package/dist/Content.js.map

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

package/dist/Page.d.ts

@@ -2,49 +2,15 @@
 import Content, { IPageResult, Redirect } from "./Content.js";
 import { LocalFile } from "./core/LocalFile.js";
 import SessionUser from "./core/SessionUser.js";
+import { WrappedRequest, WrappedResponse } from "./core/Wrapped.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 export declare const isPage: unique symbol;
 export interface IRouteCheck {
+    scope: ServiceProvider;
     method: string;
     current: string;
     path: string[];
-    sessionUser: SessionUser;
-    params: any;
-}
-export interface IPageContext {
-    /**
-     * path till the current folder where this page is located, including the name of current folder itself.
-     */
-    currentPath: string[];
-    /**
-     * Path to the next children to be precessed.
-     */
-    childPath: string[];
-    /**
-     * Query string if associated, empty object is always present.
-     */
-    query: any;
-    body: any;
-    url: string;
-    signal: AbortSignal;
-    /**
-     * Request
-     */
-    /**
-     * Response
-     */
-    /**
-     * Request method
-     */
-    method: string;
-    /**
-     * Currently logged in user
-     */
-    sessionUser: SessionUser;
-    /**
-     * Actual file path of the page
-     */
-    filePath: string;
-    disposables: Disposable[];
+    request: WrappedRequest;
 }
 export interface IFormData {
     fields: {
@@ -55,14 +21,19 @@ export interface IFormData {
 /**
  * Page should not contain any reference to underlying request/response objects.
  */
-export default class Page implements IPageContext {
+export default class Page {
     static [isPage]: boolean;
     /**
      * This static method determines if the path can be handled by this page or not.
      * @param pageContext page related items
      * @returns true if it can handle the path, default is true
      */
-    static canHandle(pageContext: IRouteCheck): boolean;
+    static canHandle(pageContext: IRouteCheck): boolean | Promise<boolean>;
+    request: WrappedRequest;
+    response: WrappedResponse;
+    get params(): {
+        [key: string]: string;
+    };
     signal: AbortSignal;
     currentPath: string[];
     childPath: string[];

package/dist/Page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../src/Page.tsx"],"names":[],"mappings":";AAGA,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG9D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAEhD,eAAO,MAAM,MAAM,eAAmB,CAAC;AAGvC,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IAOpB;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX,IAAI,EAAE,GAAG,CAAC;IAEV,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAC,WAAW,CAAC;IACnB;;OAEG;IAEH;;OAEG;IAGH;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;IAEzB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IACjC,KAAK,EAAE,SAAS,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAK,YAAW,YAAY;IAE7C,MAAM,CAAC,CAAC,MAAM,CAAC,UAAQ;IAGvB;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW;IAIzC,MAAM,EAAE,WAAW,CAAC;IAEpB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,KAAK,EAAE,GAAG,CAAC;IAEX,IAAI,EAAE,GAAG,CAAC;IAEV,GAAG,EAAE,MAAM,CAAC;IAMZ,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,WAAW,CAAC;IAEzB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,MAAM,CAAC;IAErB,WAAW,EAAE,UAAU,EAAE,CAAM;IAE/B,OAAO,CAAC,eAAe,CAAC;;IAMxB,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAIpD,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAqClC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAM,EAAE,WAAW,SAAc;IAIvE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,SAAI;IAOjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAInC,SAAS,CAAC,QAAQ,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAchD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,SAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAczE"}
+{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../src/Page.tsx"],"names":[],"mappings":";AAGA,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,eAAO,MAAM,MAAM,eAAmB,CAAC;AAGvC,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IACjC,KAAK,EAAE,SAAS,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IAErB,MAAM,CAAC,CAAC,MAAM,CAAC,UAAQ;IAGvB;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,GAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE,OAAO,EAAE,cAAc,CAAC;IAExB,QAAQ,EAAE,eAAe,CAAC;IAE1B,IAAI,MAAM;;MAET;IAED,MAAM,EAAE,WAAW,CAAC;IAEpB,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB,KAAK,EAAE,GAAG,CAAC;IAEX,IAAI,EAAE,GAAG,CAAC;IAEV,GAAG,EAAE,MAAM,CAAC;IAMZ,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,WAAW,CAAC;IAEzB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,MAAM,CAAC;IAErB,WAAW,EAAE,UAAU,EAAE,CAAM;IAE/B,OAAO,CAAC,eAAe,CAAqB;;IAM5C,GAAG,CAAC,MAAM,EAAE,GAAG,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAIpD,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAqClC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAM,EAAE,WAAW,SAAc;IAIvE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,SAAI;IAOjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAInC,SAAS,CAAC,QAAQ,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAchD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA,EAAE,MAAM,SAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAczE"}

package/dist/Page.js

@@ -17,6 +17,9 @@ class Page {
     static canHandle(pageContext) {
         return true;
     }
+    get params() {
+        return this.request?.query;
+    }
     constructor() {
         this.disposables = [];
         this.cacheControl = "no-cache, no-store, max-age=0";
@@ -25,13 +28,13 @@ class Page {
         return this.notFound();
     }
     readFormData() {
-        this.formDataPromise ??= (async () => {
+        return this.formDataPromise ??= (async () => {
             let tempFolder;
             const result = {
                 fields: {},
                 files: []
             };
-            const req = this.req;
+            const req = this.request;
             const bb = busboy({ headers: req.headers, defParamCharset: "utf8" });
             const tasks = [];
             await new Promise((resolve, reject) => {
@@ -55,7 +58,6 @@ class Page {
             await Promise.all(tasks);
             return result;
         })();
-        return this.formDataPromise;
     }
     content(body, status = 200, contentType = "text/html") {
         return Content.create({ body, status, contentType });

package/dist/Page.js.map

@@ -1 +1 @@
-{"version":3,"file":"Page.js","sourceRoot":"","sources":["../src/Page.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,OAAO,EAAE,EAAe,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI9D,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAG9C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAoEvC;;GAEG;AACH,MAAqB,IAAI;IAKrB;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAwB;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAmCD;QAJA,gBAAW,GAAiB,EAAE,CAAC;QAK3B,IAAI,CAAC,YAAY,GAAG,+BAA+B,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,MAAW;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,YAAY;QACR,IAAI,CAAC,eAAe,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,IAAI,UAAsB,CAAC;YAC3B,MAAM,MAAM,GAAc;gBACtB,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,EAAE;aACZ,CAAC;YACF,MAAM,GAAG,GAAI,IAAY,CAAC,GAAc,CAAC;YACzC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAG,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAElC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBAC3B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBAChC,CAAC,CAAC,CAAC;gBAEH,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;oBAC/B,IAAG,CAAC,UAAU,EAAE,CAAC;wBACb,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;wBAC9B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACtC,CAAC;oBACD,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACxD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;wBACnC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC,CAAC;gBACR,CAAC,CAAC,CAAC;gBACH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACvB,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAGS,OAAO,CAAC,IAAY,EAAE,MAAM,GAAG,GAAG,EAAE,WAAW,GAAG,WAAW;QACnE,OAAO,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IACzD,CAAC;IAES,IAAI,CAAC,CAAM,EAAE,MAAM,GAAG,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM;YAClB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC;YACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC1D,CAAC;IAES,QAAQ,CAAC,QAAgB;QAC/B,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAES,QAAQ;QACd,OAAO,OAAO,CAAC,IAAI,CAAC,aAAC,YAAY;YACzB;gBACI,wCAAwB,CACrB;YACP;;gBAEI;oBAAM,IAAI,CAAC,GAAG;iCAAiB,CAC5B,CACI,EACf,GAAG,CACN,CAAC;IACN,CAAC;IAES,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;QACrC,OAAO,OAAO,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,aAAC,YAAY;gBACX;oBACI,2CAA2B,CACxB;gBACP;;oBAEI,0BAAM,KAAK,CAAC,KAAK,IAAI,KAAK,CAAO,CAC9B,CACI;YACnB,MAAM;SACT,CAAC,CAAC;IACP,CAAC;;KApIO,MAAM;AAAP,QAAQ,GAAG,IAAI,AAAP,CAAQ;eAFN,IAAI"}
+{"version":3,"file":"Page.js","sourceRoot":"","sources":["../src/Page.tsx"],"names":[],"mappings":"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"}

package/dist/ServerPages.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import { Request, Response } from "express";
 import * as http from "http";
+import * as http2 from "http2";
+import { SecureContext } from "node:tls";
 export default class ServerPages {
     static create(globalServiceProvider?: ServiceProvider): ServerPages;
     private root;
@@ -16,10 +19,13 @@ export default class ServerPages {
      * All services should be registered before calling build
      * @param app Express App
      */
-    build(app?: import("express-serve-static-core").Express, { createSocketService, port }?: {
+    build({ createSocketService, port, protocol, disableHttp2Warning, SNICallback }: {
         createSocketService?: boolean;
-        port?: number;
-    }): Promise<http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>>;
-    protected process(req: Request, resp: Response): Promise<void>;
+        port: number;
+        disableHttp2Warning?: boolean;
+        protocol: "http" | "http2" | "https2";
+        SNICallback: (servername: string, cb: (err: Error | null, ctx?: SecureContext) => void) => void;
+    }): Promise<http2.Http2Server | http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>>;
+    protected process(req: any, resp: any): Promise<void>;
 }
 //# sourceMappingURL=ServerPages.d.ts.map

package/dist/ServerPages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerPages.d.ts","sourceRoot":"","sources":["../src/ServerPages.ts"],"names":[],"mappings":";AACA,OAAO,EAAqB,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAWrD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAI7B,MAAM,CAAC,OAAO,OAAO,WAAW;WAEd,MAAM,CAAC,qBAAqB,GAAE,eAAuC;IAKnF,OAAO,CAAC,IAAI,CAA8B;IAE1C;;;;OAIG;IACI,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAY;IASlD,oBAAoB;IAI3B;;;OAGG;IACU,KAAK,CAAC,GAAG,8CAAY,EAAE,EAAE,mBAA0B,EAAE,IAAS,EAAE;;;KAAK;cA4BlE,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ;CA+EvD"}
+{"version":3,"file":"ServerPages.d.ts","sourceRoot":"","sources":["../src/ServerPages.ts"],"names":[],"mappings":";;;AACA,OAAO,EAAqB,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAOhG,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,aAAa,EAAuB,MAAM,UAAU,CAAC;AAI9D,MAAM,CAAC,OAAO,OAAO,WAAW;WAEd,MAAM,CAAC,qBAAqB,GAAE,eAAuC;IAKnF,OAAO,CAAC,IAAI,CAA8B;IAE1C;;;;OAIG;IACI,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAY;IASlD,oBAAoB;IAI3B;;;OAGG;IACU,KAAK,CAAC,EACf,mBAA0B,EAC1B,IAAW,EACX,QAAiB,EACjB,mBAA2B,EAC3B,WAAW,EACd,EAAC;QACE,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC;QACb,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;QACtC,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,aAAa,KAAK,IAAI,KAAK,IAAI,CAAA;KAClG;cAsDe,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;CAgF9C"}

package/dist/ServerPages.js

@@ -45,18 +45,18 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
 });
 /* eslint-disable no-console */
 import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import express from "express";
 import Page from "./Page.js";
 import Content from "./Content.js";
-import SessionUser from "./core/SessionUser.js";
 import RouteTree from "./core/RouteTree.js";
-import CookieService from "./services/CookieService.js";
-import cookieParser from "cookie-parser";
-import bodyParser from "body-parser";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
 import { Server } from "socket.io";
+import * as http from "http";
+import * as http2 from "http2";
 import SocketService from "./socket/SocketService.js";
+import { Wrapped } from "./core/Wrapped.js";
+import { createSecureContext } from "node:tls";
+import { SelfSigned } from "./ssl/SelfSigned.js";
 RegisterSingleton;
 export default class ServerPages {
     constructor() {
@@ -86,12 +86,9 @@ export default class ServerPages {
      * All services should be registered before calling build
      * @param app Express App
      */
-    async build(app = express(), { createSocketService = true, port = 80 } = {}) {
+    async build({ createSocketService = true, port = 8080, protocol = "http", disableHttp2Warning = false, SNICallback }) {
         try {
-            // etag must be set by individual request processors if needed.
-            app.set("etag", false);
-            app.use(cookieParser());
-            app.use(bodyParser.json());
+            let httpServer = null;
             let socketServer = null;
             if (createSocketService) {
                 socketServer = new Server();
@@ -99,13 +96,38 @@ export default class ServerPages {
                 ss.attach(socketServer);
                 await ss.init();
             }
-            app.all(/./, (req, res, next) => this.process(req, res).then(next, next));
-            return new Promise((resolve, reject) => {
-                const server = app.listen(port, () => {
-                    resolve(server);
+            switch (protocol) {
+                case "http":
+                    httpServer = http.createServer((req, res) => this.process(req, res));
+                    break;
+                case "https2":
+                    let sc = null;
+                    SNICallback ??= (name, cb) => {
+                        if (sc) {
+                            return cb(null, sc);
+                        }
+                        const { key, cert } = SelfSigned.setupSelfSigned();
+                        sc = createSecureContext({ key, cert });
+                        cb(null, sc);
+                    };
+                    httpServer = http2.createSecureServer({
+                        SNICallback
+                    }, (req, res) => this.process(req, res));
+                    break;
+                case "http2":
+                    httpServer = http2.createSecureServer({}, (req, res) => this.process(req, res));
+                    if (!disableHttp2Warning) {
+                        console.warn("Http2 without SSL should not be used in production");
+                    }
+                    break;
+            }
+            await new Promise((resolve, reject) => {
+                const server = httpServer.listen(port, () => {
+                    resolve();
                 });
                 socketServer?.attach(server);
             });
+            return httpServer;
         }
         catch (error) {
             console.error(error);
@@ -113,84 +135,83 @@ export default class ServerPages {
         return null;
     }
     async process(req, resp) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
+        req = Wrapped.request(req);
+        resp = Wrapped.response(req, resp);
+        req.response = resp;
+        if (req.processed) {
+            return;
+        }
+        req.processed = true;
         try {
-            if (req.processed) {
-                return;
-            }
-            req.processed = true;
-            // defaulting to no cache
-            // static content delivery should override this
-            resp.setHeader("cache-control", "no-cache");
-            const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
-            let sent = false;
-            const acceptJson = req.accepts().some((s) => /\/json$/i.test(s));
+            const env_1 = { stack: [], error: void 0, hasError: false };
             try {
-                const cookieService = scope.resolve(CookieService);
+                // defaulting to no cache
+                // static content delivery should override this
+                resp.setHeader("cache-control", "no-cache");
+                const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
+                let sent = false;
+                const acceptJson = req.accepts().some((s) => /\/json$/i.test(s));
                 try {
-                    await cookieService.createSessionUser(req, resp);
+                    const path = req.path.split("/").filter((x) => x);
+                    const method = req.method;
+                    const { pageClass, childPath } = (await this.root.getRoute({
+                        scope,
+                        method,
+                        current: "",
+                        path,
+                        request: req
+                    })) ?? {
+                        pageClass: Page,
+                        childPath: path
+                    };
+                    const page = scope.create(pageClass);
+                    page.method = method;
+                    page.childPath = childPath;
+                    page.request = req;
+                    page.response = resp;
+                    const content = await page.all(page.params);
+                    resp.setHeader("cache-control", page.cacheControl);
+                    resp.removeHeader("etag");
+                    sent = true;
+                    await content.send(resp);
                 }
                 catch (error) {
-                    console.error(error);
-                }
-                const sessionUser = req.user;
-                scope.add(SessionUser, sessionUser);
-                const path = req.path.split("/").filter((x) => x);
-                const method = req.method;
-                const params = { ...req.params, ...req.query, ...req.body ?? {} };
-                const { pageClass, childPath } = (await this.root.getRoute({
-                    method,
-                    current: "",
-                    path,
-                    params,
-                    sessionUser
-                })) ?? {
-                    pageClass: Page,
-                    childPath: path
-                };
-                const page = scope.create(pageClass);
-                page.method = method;
-                page.childPath = childPath;
-                page.body = req.body;
-                page.query = req.query;
-                page.sessionUser = sessionUser;
-                page.req = req;
-                page.res = resp;
-                const content = await page.all(params);
-                resp.setHeader("cache-control", page.cacheControl);
-                resp.removeHeader("etag");
-                sent = true;
-                await content.send(resp);
-            }
-            catch (error) {
-                if (!sent) {
-                    try {
-                        if (acceptJson || error.errorModel) {
-                            await Content.json({
-                                ...error.errorModel ?? {},
-                                message: error.message ?? error,
-                                detail: error.stack ?? error,
-                            }, 500).send(resp);
-                            return;
+                    if (!sent) {
+                        try {
+                            if (acceptJson || error.errorModel) {
+                                await Content.json({
+                                    ...error.errorModel ?? {},
+                                    message: error.message ?? error,
+                                    detail: error.stack ?? error,
+                                }, 500).send(resp);
+                                return;
+                            }
+                            const content = Content.html(`<!DOCTYPE html>\n<html><body><pre>Server Error for ${req.url}\r\n${error?.stack ?? error}</pre></body></html>`, 500);
+                            await content.send(resp);
                         }
-                        const content = Content.html(`<!DOCTYPE html>\n<html><body><pre>Server Error for ${req.url}\r\n${error?.stack ?? error}</pre></body></html>`, 500);
-                        await content.send(resp);
-                    }
-                    catch (e1) {
-                        resp.send(e1.stack ?? e1);
-                        console.error(e1);
+                        catch (e1) {
+                            resp.send(e1.stack ?? e1, 500);
+                            console.error(e1);
+                        }
+                        return;
                     }
-                    return;
+                    console.error(error);
                 }
-                console.error(error);
             }
-        }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
+            catch (e_1) {
+                env_1.error = e_1;
+                env_1.hasError = true;
+            }
+            finally {
+                __disposeResources(env_1);
+            }
         }
         finally {
-            __disposeResources(env_1);
+            if (Array.isArray(req.disposables)) {
+                for (const iterator of req.disposables) {
+                    iterator[Symbol.dispose]?.();
+                }
+            }
         }
     }
 }

package/dist/ServerPages.js.map

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

package/dist/core/LocalFile.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import internal, { Stream } from "stream";
+import internal, { Stream, Writable } from "stream";
 export declare class LocalFile {
     readonly path: string;
     private onDispose?;
@@ -15,6 +15,7 @@ export declare class LocalFile {
     appendLine(line: string): Promise<this>;
     readAsText(): Promise<string>;
     readAsBuffer(): Promise<Buffer>;
+    writeTo(writable: Writable, start?: number, end?: number): Promise<unknown>;
     delete(): Promise<void>;
     writeAllText(text: string): Promise<void>;
     writeAll(buffer: string | Buffer | internal.Readable | Stream): Promise<void>;