prostgles-server 2.0.219 → 2.0.222

package/dist/AuthHandler.d.ts

@@ -1,3 +1,4 @@
+import { Request, Response } from "express";
 import { AnyObject } from "prostgles-types";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
@@ -10,22 +11,8 @@ declare type AuthSocketSchema = {
     logout?: boolean;
     pathGuard?: boolean;
 };
-declare type ExpressReq = {
-    body?: AnyObject;
-    query?: AnyObject;
-    cookies?: AnyObject;
-    params?: AnyObject;
-    path: string;
-    originalUrl: string;
-};
-declare type ExpressRes = {
-    status: (code: number) => ({
-        json: (response: AnyObject) => any;
-    });
-    cookie: (name: string, value: string, options: AnyObject) => any;
-    sendFile: (filepath: string) => void;
-    redirect: (url: string) => void;
-};
+declare type ExpressReq = Request;
+declare type ExpressRes = Response;
 export declare type BasicSession = {
     /** Must be hard to bruteforce */
     sid: string;
@@ -75,7 +62,11 @@ export declare type Auth<S = void> = {
         /**
          * Will be called after a GET request is authorised
          */
-        onGetRequestOK?: (req: ExpressReq, res: ExpressRes) => any;
+        onGetRequestOK?: (req: ExpressReq, res: ExpressRes, params: {
+            db: DB;
+            dbo: DBOFullyTyped<S>;
+            getUser: () => Promise<AnyObject | undefined>;
+        }) => any;
         /**
          * Name of get url parameter used in redirecting user after successful login. Defaults to returnURL
          */

package/dist/AuthHandler.d.ts.map

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

package/dist/AuthHandler.js

@@ -301,9 +301,7 @@ class AuthHandler {
                                 res.redirect("/");
                                 return;
                             }
-                            if (onGetRequestOK) {
-                                onGetRequestOK(req, res);
-                            }
+                            onGetRequestOK?.(req, res, { getUser: () => getUser(clientReq), dbo: this.dbo, db: this.db });
                         }
                         catch (error) {
                             console.error(error);

package/dist/AuthHandler.js.map

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

package/dist/FileManager.d.ts

@@ -91,7 +91,7 @@ export default class FileManager {
         dissallowedExtensions?: Array<ALLOWED_EXTENSION>;
         imageOptions?: ImageOptions;
     }) => Promise<UploadedItem>;
-    private getFileURL;
+    getFileS3URL(fileName: string, expiresInSeconds?: number): Promise<string | undefined>;
     private parseSQLIdentifier;
     getColInfo: (args: {
         tableName: string;

package/dist/FileManager.d.ts.map

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

package/dist/FileManager.js

@@ -49,7 +49,7 @@ class FileManager {
                         onError?.(err);
                     });
                     let lastProgress = Date.now();
-                    const throttle = 3000;
+                    const throttle = 1000;
                     if (onProgress) {
                         passThrough.on('data', function (chunk) {
                             loaded += chunk.length;
@@ -318,7 +318,7 @@ class FileManager {
                             const expires = +(media.signed_url_expires || 0);
                             const EXPIRES = Date.now() + HOUR;
                             if (!url || expires < EXPIRES) {
-                                url = await this.getFileURL(media.name, 60 * 60);
+                                url = await this.getFileS3URL(media.name, 60 * 60);
                                 await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
                             }
                             res.redirect(url);
@@ -526,7 +526,7 @@ class FileManager {
             }
         });
     }
-    async getFileURL(fileName, expiresInSeconds = 30 * 60) {
+    async getFileS3URL(fileName, expiresInSeconds = 30 * 60) {
         const params = {
             Bucket: this.config.bucket,
             Key: fileName,

package/dist/FileManager.js.map

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

package/lib/AuthHandler.d.ts

@@ -1,3 +1,4 @@
+import { Request, Response } from "express";
 import { AnyObject } from "prostgles-types";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
@@ -10,22 +11,8 @@ declare type AuthSocketSchema = {
     logout?: boolean;
     pathGuard?: boolean;
 };
-declare type ExpressReq = {
-    body?: AnyObject;
-    query?: AnyObject;
-    cookies?: AnyObject;
-    params?: AnyObject;
-    path: string;
-    originalUrl: string;
-};
-declare type ExpressRes = {
-    status: (code: number) => ({
-        json: (response: AnyObject) => any;
-    });
-    cookie: (name: string, value: string, options: AnyObject) => any;
-    sendFile: (filepath: string) => void;
-    redirect: (url: string) => void;
-};
+declare type ExpressReq = Request;
+declare type ExpressRes = Response;
 export declare type BasicSession = {
     /** Must be hard to bruteforce */
     sid: string;
@@ -75,7 +62,11 @@ export declare type Auth<S = void> = {
         /**
          * Will be called after a GET request is authorised
          */
-        onGetRequestOK?: (req: ExpressReq, res: ExpressRes) => any;
+        onGetRequestOK?: (req: ExpressReq, res: ExpressRes, params: {
+            db: DB;
+            dbo: DBOFullyTyped<S>;
+            getUser: () => Promise<AnyObject | undefined>;
+        }) => any;
         /**
          * Name of get url parameter used in redirecting user after successful login. Defaults to returnURL
          */

package/lib/AuthHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["AuthHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AuthHandler.d.ts","sourceRoot":"","sources":["AuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAoE,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,aAAK,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACnC,aAAK,gBAAgB,GAAG;IACtB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,aAAK,UAAU,GAAG,OAAO,CAAC;AAS1B,aAAK,UAAU,GAAG,QAAQ,CAAC;AAQ3B,oBAAY,YAAY,GAAG;IAEzB,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAC;IAEZ,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAC;CAEjB,CAAC;AACF,oBAAY,iBAAiB,GAAG;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,UAAU,CAAA;CAAE,CAAA;AACzE,oBAAY,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,aAAa,CAAC,EAAE;QACd;;WAEG;QACH,GAAG,EAAE,GAAG,CAAC;QAET;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB;;WAEG;QACH,aAAa,CAAC,EAAE,SAAS,CAAC;QAE1B;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QAExB;;WAEG;QACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;QAEjC;;WAEG;QACH,cAAc,CAAC,EAAE,CACf,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,EACf,MAAM,EAAE;YAAE,EAAE,EAAE,EAAE,CAAC;YAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;YAAC,OAAO,EAAE,MAAM,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAA;SAAE,KACrF,GAAG,CAAC;QAET;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB,UAAU,CAAC,EAAE;YAEX;;eAEG;YACH,KAAK,CAAC,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;SAChG,CAAA;KAEF,CAAA;IAED,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,iBAAiB,KAAK,SAAS,CAAC;QAExG;;WAEG;QACH,IAAI,EAAE,SAAS,CAAC;QAEhB;;WAEG;QACH,UAAU,EAAE,SAAS,CAAC;KAEvB,GAAG,SAAS,CAAC,CAAC;IAEf,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;IACxG,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;IACrG,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC;IAEpF;;OAEG;IACH,YAAY,CAAC,EAAE;QACb,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC,CAAA;KAChG,CAAA;CACF,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IACtB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;gBAEX,SAAS,EAAE,SAAS;IAYhC,WAAW,QAAS,MAAM,GAAG,SAAS,YAIrC;IAED,YAAY,UAAW,MAAM,GAAG,SAAS,mBAAmB,MAAM,aAKjE;IAED,WAAW,aAAc,MAAM,aAU9B;IAED,OAAO,CAAC,8BAA8B,CAuBrC;IAED,OAAO,cAAqB,iBAAiB,KAAG,QAAQ,SAAS,GAAG,SAAS,CAAC,CAc7E;IAEK,IAAI;IAuIV,aAAa,+DA8BZ;IAED,cAAc,WAAkB,SAAS,KAAG,QAAQ,YAAY,CAAC,CAqBhE;IAGD;;;;;OAKG;IACH,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;IAgC9C,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAoD1G,oBAAoB,WAAY,YAAY,WAAW,YAAY,KAAG,OAAO,CAS5E;IAED,cAAc,WAAkB,YAAY,KAAG,QAAQ,gBAAgB,CAAC,CA0EvE;CACF"}

package/lib/AuthHandler.js

@@ -301,9 +301,7 @@ class AuthHandler {
                                 res.redirect("/");
                                 return;
                             }
-                            if (onGetRequestOK) {
-                                onGetRequestOK(req, res);
-                            }
+                            onGetRequestOK?.(req, res, { getUser: () => getUser(clientReq), dbo: this.dbo, db: this.db });
                         }
                         catch (error) {
                             console.error(error);

package/lib/AuthHandler.ts

@@ -1,3 +1,4 @@
+import { Request, Response } from "express";
 import { AnyObject, AuthGuardLocation, AuthGuardLocationResponse, CHANNELS, DBSchema } from "prostgles-types";
 import { LocalParams, PRGLIOSocket } from "./DboBuilder";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
@@ -11,20 +12,22 @@ type AuthSocketSchema = {
   pathGuard?: boolean;
 };
 
-type ExpressReq = {
-  body?: AnyObject;
-  query?: AnyObject;
-  cookies?: AnyObject;
-  params?: AnyObject;
-  path: string;
-  originalUrl: string;
-}
-type ExpressRes = {
-  status: (code: number) => ({ json: (response: AnyObject) => any; });
-  cookie: (name: string, value: string, options: AnyObject) => any;
-  sendFile: (filepath: string) => void;
-  redirect: (url: string) => void;
-}
+type ExpressReq = Request;//<ParamsDictionar, any, any, QueryString.ParsedQs, Record<string, any>>
+//  {
+//   body?: AnyObject;
+//   query?: AnyObject;
+//   cookies?: AnyObject;
+//   params?: AnyObject;
+//   path: string;
+//   originalUrl: string;
+// }
+type ExpressRes = Response;
+// {
+//   status: (code: number) => ({ json: (response: AnyObject) => any; });
+//   cookie: (name: string, value: string, options: AnyObject) => any;
+//   sendFile: (filepath: string) => void;
+//   redirect: (url: string) => void;
+// }
 
 export type BasicSession = {
 
@@ -82,7 +85,11 @@ export type Auth<S = void> = {
     /**
      * Will be called after a GET request is authorised
      */
-    onGetRequestOK?: (req: ExpressReq, res: ExpressRes) => any;
+    onGetRequestOK?: (
+      req: ExpressReq, 
+      res: ExpressRes, 
+      params: { db: DB, dbo: DBOFullyTyped<S>; getUser: () => Promise<AnyObject | undefined> }
+    ) => any;
 
     /**
      * Name of get url parameter used in redirecting user after successful login. Defaults to returnURL
@@ -196,7 +203,7 @@ export default class AuthHandler {
         httpOnly: true, // The cookie only accessible by the web server
         //signed: true // Indicates if the cookie should be signed
       }
-      const cookieOpts = { ...options, secure: true, sameSite: "strict", ...(this.opts?.expressConfig?.cookieOptions || {}) };
+      const cookieOpts = { ...options, secure: true, sameSite: "strict" as "strict", ...(this.opts?.expressConfig?.cookieOptions || {}) };
       const cookieData = sid;
       if(!this.sidKeyName || !this.returnURL) throw "sidKeyName or returnURL missing"
       res.cookie(this.sidKeyName, cookieData, cookieOpts);
@@ -346,9 +353,7 @@ export default class AuthHandler {
                 return;
               }
 
-              if (onGetRequestOK) {
-                onGetRequestOK(req, res)
-              }
+              onGetRequestOK?.(req, res, { getUser: () => getUser(clientReq), dbo: this.dbo, db: this.db })
 
             } catch (error) {
               console.error(error);
@@ -600,7 +605,7 @@ export default class AuthHandler {
  */
 function getReturnUrl(req: ExpressReq, name?: string) {
   if (req?.query?.returnURL && name) {
-    return decodeURIComponent(req?.query?.[name]);
+    return decodeURIComponent(req?.query?.[name] as string);
   }
   return null;
 }

package/lib/FileManager.d.ts

@@ -91,7 +91,7 @@ export default class FileManager {
         dissallowedExtensions?: Array<ALLOWED_EXTENSION>;
         imageOptions?: ImageOptions;
     }) => Promise<UploadedItem>;
-    private getFileURL;
+    getFileS3URL(fileName: string, expiresInSeconds?: number): Promise<string>;
     private parseSQLIdentifier;
     getColInfo: (args: {
         tableName: string;

package/lib/FileManager.d.ts.map

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

package/lib/FileManager.js

@@ -75,7 +75,7 @@ class FileManager {
                         onError?.(err);
                     });
                     let lastProgress = Date.now();
-                    const throttle = 3000;
+                    const throttle = 1000;
                     if (onProgress) {
                         passThrough.on('data', function (chunk) {
                             loaded += chunk.length;
@@ -344,7 +344,7 @@ class FileManager {
                             const expires = +(media.signed_url_expires || 0);
                             const EXPIRES = Date.now() + HOUR;
                             if (!url || expires < EXPIRES) {
-                                url = await this.getFileURL(media.name, 60 * 60);
+                                url = await this.getFileS3URL(media.name, 60 * 60);
                                 await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
                             }
                             res.redirect(url);
@@ -552,7 +552,7 @@ class FileManager {
             }
         });
     }
-    async getFileURL(fileName, expiresInSeconds = 30 * 60) {
+    async getFileS3URL(fileName, expiresInSeconds = 30 * 60) {
         const params = {
             Bucket: this.config.bucket,
             Key: fileName,

package/lib/FileManager.ts

@@ -269,7 +269,7 @@ export default class FileManager {
         });
 
         let lastProgress = Date.now();
-        const throttle = 3000;
+        const throttle = 1000;
         if(onProgress){
           passThrough.on('data', function(chunk){
             loaded += chunk.length;
@@ -440,7 +440,7 @@ export default class FileManager {
     return res
   }
 
-  private async getFileURL(fileName: string, expiresInSeconds: number = 30 * 60){
+  async getFileS3URL(fileName: string, expiresInSeconds: number = 30 * 60){
     const params = {
       Bucket: (this.config as S3Config).bucket, 
       Key: fileName,
@@ -661,7 +661,7 @@ export default class FileManager {
             
             const EXPIRES = Date.now() + HOUR;
             if(!url || expires < EXPIRES){
-              url = await this.getFileURL(media.name, 60 * 60);
+              url = await this.getFileS3URL(media.name, 60 * 60);
               await mediaTable.update({ name }, { signed_url: url, signed_url_expires: EXPIRES });
             }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.219",
+  "version": "2.0.222",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,6 +25,7 @@
   "homepage": "https://github.com/prostgles/prostgles-server-js#readme",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.121.0",
+    "@types/express": "^4.17.13",
     "aws-sdk": "^2.1168.0",
     "bluebird": "^3.7.2",
     "file-type": "^17.1.3",

package/tests/client/PID.txt

@@ -1 +1 @@
-30671
+42890

package/tests/server/package-lock.json

@@ -21,10 +21,11 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.218",
+      "version": "2.0.221",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
+        "@types/express": "^4.17.13",
         "aws-sdk": "^2.1168.0",
         "bluebird": "^3.7.2",
         "file-type": "^17.1.3",
@@ -1365,6 +1366,7 @@
         "@aws-sdk/client-s3": "^3.121.0",
         "@aws-sdk/types": "^3.110.0",
         "@types/bluebird": "^3.5.36",
+        "@types/express": "^4.17.13",
         "@types/node": "^18.0.3",
         "@types/sharp": "^0.30.4",
         "aws-sdk": "^2.1168.0",