prostgles-server 4.2.227 → 4.2.229

package/lib/PubSubManager/PubSubManager.ts

@@ -194,7 +194,7 @@ export class PubSubManager {
   private constructor(dboBuilder: DboBuilder) {
     this.dboBuilder = dboBuilder;
 
-    this._log({
+    void this._log({
       type: "syncOrSub",
       command: "postgresNotifListenManager.create",
       duration: 0,
@@ -207,13 +207,13 @@ export class PubSubManager {
   appCheck?: ReturnType<typeof setInterval>;
 
   destroyed = false;
-  destroy = () => {
+  destroy = async () => {
     this.destroyed = true;
     if (this.appCheck) {
       clearInterval(this.appCheck);
     }
-    this.postgresNotifListenManager?.destroy();
-    this._log({
+    await this.postgresNotifListenManager?.destroy();
+    await this._log({
       type: "syncOrSub",
       command: "postgresNotifListenManager.destroy",
       duration: 0,
@@ -393,7 +393,7 @@ export class PubSubManager {
 
         delete this.sockets[socket.id];
 
-        this._log({
+        void this._log({
           type: "sync",
           command: "upsertSocket.disconnect",
           tableName: "",

package/lib/PubSubManager/addSub.ts

@@ -111,7 +111,7 @@ export async function addSub(
      * Socket clients are not affected as they need to confirm they are ready to receive data
      */
     result.sendFirstData = () => {
-      this.pushSubData(newSub);
+      void this.pushSubData(newSub);
     };
   } else if (socket) {
     const removeListeners = () => {
@@ -122,7 +122,7 @@ export async function addSub(
     removeListeners();
 
     socket.once(result.channelNameReady, () => {
-      this.pushSubData(newSub);
+      void this.pushSubData(newSub);
     });
     socket.once(result.channelNameUnsubscribe, (_data: any, cb: BasicCallback) => {
       const res = "ok";
@@ -130,7 +130,7 @@ export async function addSub(
         const isMatch = s.socket?.id === socket.id && s.channel_name === channel_name;
         return !isMatch;
       });
-      this._log({
+      void this._log({
         type: "syncOrSub",
         command: "unsubscribe",
         channel_name,

package/lib/PubSubManager/addSync.ts

@@ -1,4 +1,4 @@
-import { find, tryCatchV2 } from "prostgles-types/dist/util";
+import { find, tryCatchV2 } from "prostgles-types";
 import {
   AddSyncParams,
   BasicCallback,
@@ -69,7 +69,7 @@ export async function addSync(
         const unsyncChn = channelName + "unsync";
         socket.removeAllListeners(unsyncChn);
         socket.once(unsyncChn, (_data: any, cb: BasicCallback) => {
-          this._log({
+          void this._log({
             type: "sync",
             command: "unsync",
             socketId: socket.id,
@@ -113,7 +113,7 @@ export async function addSync(
           */
 
           if (data.onSyncRequest) {
-            this.syncData(newSync, data.onSyncRequest, "client");
+            void this.syncData(newSync, data.onSyncRequest, "client");
           } else {
             console.error("Unexpected sync request data from client: ", data);
           }

package/lib/PubSubManager/notifListener.ts

@@ -94,7 +94,7 @@ export async function notifListener(this: PubSubManager, data: { payload: string
     tableTriggerConditions.map(({ condition }) => {
       const subs = this.getTriggerSubs(table_name, condition);
       subs.map((s) => {
-        this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
+        void this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
       });
     });
 
@@ -129,7 +129,7 @@ export async function notifListener(this: PubSubManager, data: { payload: string
           [table_name, orphanedTableConditions, this.appId]
         )
         .then(() => {
-          this.refreshTriggers();
+          return this.refreshTriggers();
         })
         .catch((e) => {
           console.error("Error deleting orphaned triggers", e);
@@ -144,7 +144,7 @@ export async function notifListener(this: PubSubManager, data: { payload: string
       );
 
       syncs.map((s) => {
-        this.syncData(s, undefined, "trigger");
+        void this.syncData(s, undefined, "trigger");
       });
 
       /* Throttle the subscriptions */
@@ -162,14 +162,14 @@ export async function notifListener(this: PubSubManager, data: { payload: string
           sub.last_throttled = Date.now();
 
           /* It is assumed the policy was checked before this point */
-          this.pushSubData(sub);
+          void this.pushSubData(sub);
         } else if (!sub.is_throttling) {
           log("throttling sub");
           sub.is_throttling = setTimeout(() => {
             log("throttling finished. pushSubData...");
             sub.is_throttling = null;
             sub.last_throttled = Date.now();
-            this.pushSubData(sub);
+            void this.pushSubData(sub);
           }, throttle);
         }
       });

package/lib/PubSubManager/pushSubData.ts

@@ -8,7 +8,7 @@ export async function pushSubData(this: PubSubManager, sub: Subscription, err?:
   const onLog = (
     state: Extract<EventTypes.SyncOrSub, { type: "syncOrSub"; command: "pushSubData" }>["state"]
   ) => {
-    this._log({
+    void this._log({
       type: "syncOrSub",
       command: "pushSubData",
       channel_name: sub.channel_name,

package/lib/SchemaWatch/SchemaWatch.ts

@@ -69,7 +69,7 @@ export class SchemaWatch {
       log("Schema changed");
       const { query, command } = event;
 
-      this.dboBuilder.cacheDBTypes(true);
+      void this.dboBuilder.cacheDBTypes(true);
       if (typeof watchSchema === "function") {
         /* Only call the provided func */
         watchSchema(event);
@@ -84,7 +84,7 @@ export class SchemaWatch {
       } else {
         /* Full re-init. Sockets must reconnect */
         console.log("watchSchema: Full re-initialisation", { query });
-        this.dboBuilder.prostgles.init(onReady as any, {
+        void this.dboBuilder.prostgles.init(onReady as any, {
           type: "schema change",
           query,
           command,

package/lib/SyncReplication.ts

@@ -572,7 +572,7 @@ export async function syncData(
         /**
          * After all data was inserted request SyncInfo from client and sync again if necessary
          */
-        this.syncData(sync, undefined, source);
+        void this.syncData(sync, undefined, source);
       },
     });
   }
@@ -584,7 +584,7 @@ export async function syncData(
       this.syncTimeout = setTimeout(() => {
         this.syncTimeout = undefined;
         // console.log("SYNC FROM TIMEOUT")
-        this.syncData(sync, undefined, source);
+        void this.syncData(sync, undefined, source);
       }, throttle);
     }
     // console.log("SYNC THROTTLE")

package/lib/TableConfig/initTableConfig.ts

@@ -27,7 +27,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
     }
     q = `/* ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID} */ \n\n` + q;
     queryHistory.push(q);
-    this.prostgles.opts.onLog?.({
+    await this.prostgles.opts.onLog?.({
       type: "debug",
       command: "TableConfig.runQueries.start",
       data: { q },
@@ -39,7 +39,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
       failedQueries.push({ query: q, error: err });
       return Promise.reject(err);
     });
-    this.prostgles.opts.onLog?.({
+    await this.prostgles.opts.onLog?.({
       type: "debug",
       command: "TableConfig.runQueries.end",
       duration: Date.now() - now,
@@ -377,7 +377,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
     if (!this.prevInitQueryHistory) {
       this.prevInitQueryHistory = queryHistory;
     } else if (this.prevInitQueryHistory.join() !== queryHistory.join()) {
-      this.prostgles.init(this.prostgles.opts.onReady as any, {
+      void this.prostgles.init(this.prostgles.opts.onReady as any, {
         type: "TableConfig",
       });
     } else {
@@ -389,5 +389,5 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
   }
 
   await this.prostgles.refreshDBO();
-  this.setTableOnMounts();
+  await this.setTableOnMounts();
 };

package/lib/initProstgles.ts

@@ -237,7 +237,7 @@ export const initProstgles = async function (
           }
         }
         this.fileManager?.destroy();
-        this.dboBuilder.destroy();
+        await this.dboBuilder.destroy();
         this.authHandler?.destroy();
         await this.tableConfigurator?.destroy();
         this.dbo = undefined;

package/lib/onSocketConnected.ts

@@ -72,7 +72,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
       this.dbEventsManager?.removeNotify(undefined, socket);
       this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
       this.dboBuilder.queryStreamer.onDisconnect(socket.id);
-      this.opts.onLog?.({
+      void this.opts.onLog?.({
         type: "disconnect",
         sid: this.authHandler?.getSID({ socket }),
         socketId: socket.id,
@@ -84,7 +84,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
           if (!this.authHandler) throw "authHandler missing";
           return await this.authHandler.getSidAndUserFromRequest({ socket });
         };
-        this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
+        void this.opts.onSocketDisconnect({ socket, dbo: dbo as DBOFullyTyped, db, getUser });
       }
     });
 
@@ -116,7 +116,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
       }
     );
 
-    this.pushSocketSchema(socket);
+    await this.pushSocketSchema(socket);
   } catch (e) {
     console.trace("setSocketEvents: ", e);
   }

package/lib/typeTests/dboTypeCheck.ts

@@ -37,7 +37,7 @@ export const testDboTypes = () => {
         orderBy: {
           id: 1,
         },
-      },
+      }
     );
 
     r[0]?.id;
@@ -46,34 +46,34 @@ export const testDboTypes = () => {
     r[0]?.bad_col;
 
     const tr2 = {} as ViewHandler<DBSchema2["tr2"]["columns"], DBSchema2>;
-    tr2.find(
+    void tr2.find(
       {},
       {
         select: { id: 1 },
         orderBy: { tr1_id: 1 },
-      },
+      }
     );
 
-    tr2.find(
+    void tr2.find(
       {},
       {
         //@ts-expect-error
         select: { bad_col: 1 },
-      },
+      }
     );
 
-    tr2.find(
+    void tr2.find(
       {},
       {
         //@ts-expect-error
         orderBy: { bad_col: 1 },
-      },
+      }
     );
 
-    (await db.items2.find(
-      {},
-      { select: { items_id: 1 }, returnType: "values" },
-    )) satisfies (number | null)[];
+    (await db.items2.find({}, { select: { items_id: 1 }, returnType: "values" })) satisfies (
+      | number
+      | null
+    )[];
 
     const publish: Publish<DBGeneratedSchema> = {
       items: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.227",
+  "version": "4.2.229",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,7 @@
     "pg": "^8.11.5",
     "pg-cursor": "^2.11.0",
     "pg-promise": "^11.9.1",
-    "prostgles-types": "^4.0.143"
+    "prostgles-types": "^4.0.145"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

package/dist/Auth/endpoints/setConfirmEmailRequestHandler.d.ts

@@ -1,5 +0,0 @@
-import e from "express";
-import { AuthHandler } from "../AuthHandler";
-import { SignupWithEmailAndPassword } from "../AuthTypes";
-export declare function setConfirmEmailRequestHandler(this: AuthHandler, emailAuthConfig: SignupWithEmailAndPassword, app: e.Express): void;
-//# sourceMappingURL=setConfirmEmailRequestHandler.d.ts.map

package/dist/Auth/endpoints/setConfirmEmailRequestHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setConfirmEmailRequestHandler.d.ts","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,OAAO,EAA0B,WAAW,EAAmB,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAI1D,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,WAAW,EACjB,eAAe,EAAE,0BAA0B,EAC3C,GAAG,EAAE,CAAC,CAAC,OAAO,QAqDf"}

package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConfirmEmailRequestHandler = void 0;
-const AuthHandler_1 = require("../AuthHandler");
-const getClientRequestIPsInfo_1 = require("../utils/getClientRequestIPsInfo");
-const throttledReject_1 = require("../utils/throttledReject");
-function setConfirmEmailRequestHandler(emailAuthConfig, app) {
-    const requestHandler = async (req, res) => {
-        const { email, code } = req.query;
-        try {
-            if (!email || typeof email !== "string") {
-                return res.send({
-                    success: false,
-                    code: "something-went-wrong",
-                    message: "Email query param missing/invalid",
-                });
-            }
-            if (!code || typeof code !== "string") {
-                return res.send({
-                    success: false,
-                    code: "something-went-wrong",
-                    message: "Email confirmation code query param missing/invalid",
-                });
-            }
-            const clientInfo = (0, getClientRequestIPsInfo_1.getClientRequestIPsInfo)({ httpReq: req });
-            const response = await (0, throttledReject_1.throttledAuthCall)(async () => emailAuthConfig.onEmailConfirmation({
-                code,
-                email,
-                clientInfo,
-                req,
-            }));
-            if (!response.success) {
-                return res.status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST).json(response);
-            }
-            /**
-             * This approach requires correct handling in setCatchAllRequestHandler to not redirect user.type=public res.redirect("/");
-             */
-            if (response.redirect_to) {
-                return res.redirect(response.redirect_to);
-            }
-            res.json(response);
-        }
-        catch (_e) {
-            res
-                .status(AuthHandler_1.HTTP_FAIL_CODES.BAD_REQUEST)
-                .json({ success: false, code: "server-error", message: "Failed to confirm email" });
-        }
-    };
-    app.get(AuthHandler_1.AUTH_ROUTES_AND_PARAMS.confirmEmail, requestHandler);
-}
-exports.setConfirmEmailRequestHandler = setConfirmEmailRequestHandler;
-//# sourceMappingURL=setConfirmEmailRequestHandler.js.map

package/dist/Auth/endpoints/setConfirmEmailRequestHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setConfirmEmailRequestHandler.js","sourceRoot":"","sources":["../../../lib/Auth/endpoints/setConfirmEmailRequestHandler.ts"],"names":[],"mappings":";;;AAGA,gDAAsF;AAEtF,8EAA2E;AAC3E,8DAA6D;AAE7D,SAAgB,6BAA6B,CAE3C,eAA2C,EAC3C,GAAc;IAEd,MAAM,cAAc,GAAG,KAAK,EAC1B,GAAY,EACZ,GAGC,EACD,EAAE;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,mCAAmC;iBAC7C,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,GAAG,CAAC,IAAI,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,OAAO,EAAE,qDAAqD;iBAC/D,CAAC,CAAC;YACL,CAAC;YACD,MAAM,UAAU,GAAG,IAAA,iDAAuB,EAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAiB,EAAC,KAAK,IAAI,EAAE,CAClD,eAAe,CAAC,mBAAmB,CAAC;gBAClC,IAAI;gBACJ,KAAK;gBACL,UAAU;gBACV,GAAG;aACJ,CAAC,CACH,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChE,CAAC;YAED;;eAEG;YACH,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,GAAG;iBACA,MAAM,CAAC,6BAAe,CAAC,WAAW,CAAC;iBACnC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,oCAAsB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AAC/D,CAAC;AAxDD,sEAwDC"}

package/lib/Auth/endpoints/setConfirmEmailRequestHandler.ts

@@ -1,65 +0,0 @@
-import type { Request, Response } from "express";
-import e from "express";
-import { AuthResponse } from "prostgles-types";
-import { AUTH_ROUTES_AND_PARAMS, AuthHandler, HTTP_FAIL_CODES } from "../AuthHandler";
-import { SignupWithEmailAndPassword } from "../AuthTypes";
-import { getClientRequestIPsInfo } from "../utils/getClientRequestIPsInfo";
-import { throttledAuthCall } from "../utils/throttledReject";
-
-export function setConfirmEmailRequestHandler(
-  this: AuthHandler,
-  emailAuthConfig: SignupWithEmailAndPassword,
-  app: e.Express
-) {
-  const requestHandler = async (
-    req: Request,
-    res: Response<
-      | AuthResponse.PasswordRegisterEmailConfirmationSuccess
-      | AuthResponse.PasswordRegisterEmailConfirmationFailure
-    >
-  ) => {
-    const { email, code } = req.query;
-    try {
-      if (!email || typeof email !== "string") {
-        return res.send({
-          success: false,
-          code: "something-went-wrong",
-          message: "Email query param missing/invalid",
-        });
-      }
-      if (!code || typeof code !== "string") {
-        return res.send({
-          success: false,
-          code: "something-went-wrong",
-          message: "Email confirmation code query param missing/invalid",
-        });
-      }
-      const clientInfo = getClientRequestIPsInfo({ httpReq: req });
-      const response = await throttledAuthCall(async () =>
-        emailAuthConfig.onEmailConfirmation({
-          code,
-          email,
-          clientInfo,
-          req,
-        })
-      );
-      if (!response.success) {
-        return res.status(HTTP_FAIL_CODES.BAD_REQUEST).json(response);
-      }
-
-      /**
-       * This approach requires correct handling in setCatchAllRequestHandler to not redirect user.type=public res.redirect("/");
-       */
-      if (response.redirect_to) {
-        return res.redirect(response.redirect_to);
-      }
-      res.json(response);
-    } catch (_e) {
-      res
-        .status(HTTP_FAIL_CODES.BAD_REQUEST)
-        .json({ success: false, code: "server-error", message: "Failed to confirm email" });
-    }
-  };
-
-  app.get(AUTH_ROUTES_AND_PARAMS.confirmEmail, requestHandler);
-}