prostgles-server 3.0.153 → 3.0.155

package/lib/PubSubManager/notifListener.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.notifListener = void 0;
+const PubSubManager_1 = require("./PubSubManager");
+/* Relay relevant data to relevant subscriptions */
+async function notifListener(data) {
+    const str = data.payload;
+    if (!str) {
+        console.error("Unexpected Empty notif");
+        return;
+    }
+    const dataArr = str.split(PubSubManager_1.PubSubManager.DELIMITER);
+    const notifType = dataArr[0];
+    (0, PubSubManager_1.log)(str);
+    if (notifType === this.NOTIF_TYPE.schema) {
+        if (this.onSchemaChange) {
+            const [_, command, _event_type, query] = dataArr;
+            if (query) {
+                this.onSchemaChange({ command, query });
+            }
+        }
+        return;
+    }
+    if (notifType !== this.NOTIF_TYPE.data) {
+        console.error("Unexpected notif type: ", notifType);
+        return;
+    }
+    if (dataArr.length < 3) {
+        throw "notifListener: dataArr length < 3";
+    }
+    const [_, table_name, op_name, condition_ids_str] = dataArr;
+    // const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
+    // const conditions: string[] = triggers.map(t => t.condition);
+    (0, PubSubManager_1.log)("notifListener", dataArr.join("__"));
+    /* Trigger error */
+    if (condition_ids_str?.startsWith("error") &&
+        this._triggers?.[table_name]?.length) {
+        const pref = "INTERNAL ERROR";
+        console.error(`${pref}: condition_ids_str: ${condition_ids_str}`);
+        this._triggers[table_name].map(c => {
+            const subs = this.getSubs(table_name, c);
+            subs.map(s => {
+                this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
+            });
+        });
+        /* Trigger ok */
+    }
+    else if (condition_ids_str?.split(",").length &&
+        condition_ids_str?.split(",").every((c) => Number.isInteger(+c)) &&
+        this._triggers?.[table_name]?.length) {
+        const idxs = condition_ids_str.split(",").map(v => +v);
+        const conditions = this._triggers[table_name].filter((c, i) => idxs.includes(i));
+        (0, PubSubManager_1.log)("notifListener", { table_name, op_name, condition_ids_str, conditions }, this._triggers[table_name]);
+        conditions.map(condition => {
+            const subs = this.getSubs(table_name, condition);
+            const syncs = this.getSyncs(table_name, condition);
+            (0, PubSubManager_1.log)("notifListener", { table_name, condition, subs, syncs });
+            syncs.map((s) => {
+                this.syncData(s, undefined, "trigger");
+            });
+            /* Throttle the subscriptions */
+            subs.forEach(sub => {
+                sub.triggers.forEach(trg => {
+                    if (this.dbo[trg.table_name] &&
+                        sub.is_ready &&
+                        (sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
+                        const throttle = sub.throttle || 0;
+                        if (sub.last_throttled <= Date.now() - throttle) {
+                            /* It is assumed the policy was checked before this point */
+                            this.pushSubData(sub);
+                            // sub.last_throttled = Date.now();
+                        }
+                        else if (!sub.is_throttling) {
+                            (0, PubSubManager_1.log)("throttling sub");
+                            sub.is_throttling = setTimeout(() => {
+                                (0, PubSubManager_1.log)("throttling finished. pushSubData...");
+                                sub.is_throttling = null;
+                                this.pushSubData(sub);
+                            }, throttle); // sub.throttle);
+                        }
+                    }
+                });
+            });
+        });
+        /* Trigger unknown issue */
+    }
+    else {
+        // if(!this._triggers || !this._triggers[table_name] || !this._triggers[table_name].length){
+        //     console.warn(190, "Trigger sub not found. DROPPING TRIGGER", table_name, condition_ids_str, this._triggers);
+        //     this.dropTrigger(table_name);
+        // } else {
+        // }
+        console.warn(190, "Trigger sub issue: ", table_name, condition_ids_str, this._triggers);
+    }
+}
+exports.notifListener = notifListener;

package/lib/PubSubManager/notifListener.ts

@@ -0,0 +1,122 @@
+import { log, PubSubManager } from "./PubSubManager";
+
+/* Relay relevant data to relevant subscriptions */
+export async function notifListener(this: PubSubManager, data: { payload: string }) {
+  const str = data.payload;
+
+  if (!str) {
+    console.error("Unexpected Empty notif")
+    return;
+  }
+
+  const dataArr = str.split(PubSubManager.DELIMITER);
+  const notifType = dataArr[0];
+
+  log(str);
+
+  if (notifType === this.NOTIF_TYPE.schema) {
+    if (this.onSchemaChange) {
+      const [_, command, _event_type, query] = dataArr;
+
+      if (query) {
+        this.onSchemaChange({ command, query })
+      }
+    }
+
+    return;
+  }
+
+  if (notifType !== this.NOTIF_TYPE.data) {
+    console.error("Unexpected notif type: ", notifType);
+    return;
+  }
+
+  if (dataArr.length < 3) {
+    throw "notifListener: dataArr length < 3"
+  }
+
+  const [_, table_name, op_name, condition_ids_str] = dataArr;
+
+  // const triggers = await this.db.any("SELECT * FROM prostgles.triggers WHERE table_name = $1 AND id IN ($2:csv)", [table_name, condition_ids_str.split(",").map(v => +v)]);
+  // const conditions: string[] = triggers.map(t => t.condition);
+  log("notifListener", dataArr.join("__"))
+
+  /* Trigger error */
+  if (
+    condition_ids_str?.startsWith("error") &&
+    this._triggers?.[table_name]?.length
+  ) {
+    const pref = "INTERNAL ERROR";
+    console.error(`${pref}: condition_ids_str: ${condition_ids_str}`)
+    this._triggers[table_name]!.map(c => {
+      const subs = this.getSubs(table_name, c);
+      subs.map(s => {
+        this.pushSubData(s, pref + ". Check server logs. Schema might have changed");
+      })
+    });
+
+    /* Trigger ok */
+  } else if (
+    condition_ids_str?.split(",").length &&
+    condition_ids_str?.split(",").every((c: string) => Number.isInteger(+c)) &&
+    this._triggers?.[table_name]?.length
+  ) {
+
+
+    const idxs = condition_ids_str.split(",").map(v => +v);
+    const conditions = this._triggers[table_name]!.filter((c, i) => idxs.includes(i))
+
+    log("notifListener", { table_name, op_name, condition_ids_str, conditions }, this._triggers[table_name]);
+
+    conditions.map(condition => {
+
+      const subs = this.getSubs(table_name, condition);
+      const syncs = this.getSyncs(table_name, condition);
+
+      log("notifListener", { table_name, condition, subs, syncs })
+
+      syncs.map((s) => {
+        this.syncData(s, undefined, "trigger");
+      });
+
+      /* Throttle the subscriptions */
+      subs.forEach(sub => {
+        sub.triggers.forEach(trg => {
+          if (
+            this.dbo[trg.table_name] &&
+            sub.is_ready &&
+            (sub.socket_id && this.sockets[sub.socket_id]) || sub.func
+          ) {
+            const throttle = sub.throttle || 0;
+            if (sub.last_throttled <= Date.now() - throttle) {
+  
+              /* It is assumed the policy was checked before this point */
+              this.pushSubData(sub);
+              // sub.last_throttled = Date.now();
+            } else if (!sub.is_throttling) {
+  
+  
+              log("throttling sub")
+              sub.is_throttling = setTimeout(() => {
+                log("throttling finished. pushSubData...")
+                sub.is_throttling = null;
+                this.pushSubData(sub);
+              }, throttle);// sub.throttle);
+            }
+          }
+        });
+      });
+
+    });
+
+    /* Trigger unknown issue */
+  } else {
+
+    // if(!this._triggers || !this._triggers[table_name] || !this._triggers[table_name].length){
+    //     console.warn(190, "Trigger sub not found. DROPPING TRIGGER", table_name, condition_ids_str, this._triggers);
+    //     this.dropTrigger(table_name);
+    // } else {
+    // }
+    console.warn(190, "Trigger sub issue: ", table_name, condition_ids_str, this._triggers);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.153",
+  "version": "3.0.155",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     "start": "tsc --watch",
     "build": "tsc",
     "lint": "eslint . --ext .ts --quiet --fix",
-    "test": "npm run lint && rm -rf ./node_modules/* && npm i && tsc && cd tests/ && ./test.sh"
+    "test": "rm -rf ./node_modules/* && npm i && npm run lint && tsc && cd tests/ && ./test.sh"
   },
   "repository": {
     "type": "git",

package/tests/client/PID.txt

@@ -1 +1 @@
-39332
+51927

package/tests/client/tsconfig.json

@@ -10,7 +10,8 @@
 		// "rootDir": ".",
 		// "declaration": true,
 		// "declarationMap": true,
-		"keyofStringsOnly": true
+		"keyofStringsOnly": true,
+		"skipLibCheck": false
 	},
 	"exclude": [
 		"dist"

package/tests/client_only_queries.js

@@ -123,7 +123,7 @@ async function client_only(db, auth, log, methods, tableSchema) {
                         /** 2 second delay to account for client-server clock drift */
                         setTimeout(async () => {
                             // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
-                            sP.unsubscribe();
+                            await sP.unsubscribe();
                             log(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
                             const dLastUpdated = Math.max(...p10.map(v => +v.last_updated));
                             const last_updated = Date.now();

package/tests/client_only_queries.ts

@@ -146,7 +146,7 @@ export default async function client_only(db: Required<DBHandlerClient>, auth: A
 
             // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
     
-            sP.unsubscribe();
+            await sP.unsubscribe();
             log(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
             const dLastUpdated = Math.max(...p10.map(v => +v.last_updated))
             const last_updated = Date.now();

package/tests/isomorphic_queries.ts

@@ -371,7 +371,7 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
     await db.various.update!({ id: 99 }, { name: "zz3zz2" });
     await db.various.update!({ id: 99 }, { name: "zz3zz3" });
   }, { timeout: 4000 });
-
+  
   await tryRunP("subscribeOne with throttle", async (resolve, reject) => {
     await db.various.insert!({ id: 99 });
     const start = Date.now(); // name: "zz3zz" 

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.152",
+      "version": "3.0.154",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.272.0",

package/tests/server/tsconfig.json

@@ -11,7 +11,8 @@
     "moduleResolution": "node",
 		"declaration": true,
 		"declarationMap": true,
-		"keyofStringsOnly": true
+		"keyofStringsOnly": true,
+		"skipLibCheck": false
 	},
 	"exclude": [
 		"dist",