prostgles-server 4.0.1 → 4.0.3

package/lib/PubSubManager/addSub.js

@@ -5,13 +5,13 @@ const PubSubManager_1 = require("./PubSubManager");
 /* Must return a channel for socket */
 /* The distinct list of {table_name, condition} must have a corresponding trigger in the database */
 async function addSub(subscriptionParams) {
-    const { socket, func, table_rules, filter = {}, params = {}, condition = "", throttle = 0, //subOne = false, 
+    const { socket, localFuncs, table_rules, filter = {}, params = {}, condition = "", throttle = 0, //subOne = false, 
     viewOptions, table_info, } = subscriptionParams || {};
     const table_name = table_info.name;
-    if (!socket && !func) {
+    if (!socket && !localFuncs) {
         throw "socket AND func missing";
     }
-    if (socket && func) {
+    if (socket && localFuncs) {
         throw "addSub: cannot have socket AND func";
     }
     let validated_throttle = subscriptionParams.throttle || 10;
@@ -23,17 +23,15 @@ async function addSub(subscriptionParams) {
         validated_throttle = throttle;
     }
     const channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
-    const result = {
-        channelName: channel_name,
-        channelNameReady: channel_name + ".ready",
-        channelNameUnsubscribe: channel_name + ".unsubscribe"
+    const mainTrigger = {
+        table_name: table_name,
+        condition: (0, PubSubManager_1.parseCondition)(condition),
+        is_related: false,
     };
-    this.upsertSocket(socket);
-    // const upsertSub = _upsertSub.bind(this);
     const newSub = {
         channel_name,
         filter,
-        func,
+        localFuncs,
         params,
         last_throttled: 0,
         socket,
@@ -44,13 +42,21 @@ async function addSub(subscriptionParams) {
         table_rules,
         throttle: validated_throttle,
         triggers: [
-            {
-                table_name: table_name,
-                condition: (0, PubSubManager_1.parseCondition)(condition),
-                is_related: false,
-            }
+            mainTrigger
         ]
     };
+    const result = {
+        channelName: channel_name,
+        channelNameReady: channel_name + ".ready",
+        channelNameUnsubscribe: channel_name + ".unsubscribe"
+    };
+    const [matchingSub] = this.getSubs(mainTrigger.table_name, mainTrigger.condition, newSub);
+    if (matchingSub) {
+        console.error("Trying to add a duplicate sub for: ", channel_name);
+        return result;
+    }
+    this.upsertSocket(socket);
+    // const upsertSub = _upsertSub.bind(this);
     if (viewOptions) {
         for await (const relatedTable of viewOptions.relatedTables) {
             const relatedSub = {
@@ -62,7 +68,7 @@ async function addSub(subscriptionParams) {
             await this.addTrigger(relatedSub, viewOptions);
         }
     }
-    if (func) {
+    if (localFuncs) {
         this.pushSubData(newSub);
     }
     else if (socket) {

package/lib/PubSubManager/addSub.ts

@@ -9,16 +9,16 @@ type AddSubscriptionParams = SubscriptionParams & {
 /* The distinct list of {table_name, condition} must have a corresponding trigger in the database */
 export async function addSub(this: PubSubManager, subscriptionParams: Omit<AddSubscriptionParams, "channel_name" | "parentSubParams">): Promise<SubscriptionChannels> {
   const {
-    socket, func, table_rules, filter = {},
+    socket, localFuncs, table_rules, filter = {},
     params = {}, condition = "", throttle = 0,  //subOne = false, 
     viewOptions, table_info,
   } = subscriptionParams || {};
   const table_name = table_info.name;
 
-  if (!socket && !func) {
+  if (!socket && !localFuncs) {
     throw "socket AND func missing";
   }
-  if (socket && func) {
+  if (socket && localFuncs) {
     throw "addSub: cannot have socket AND func";
   }
 
@@ -32,20 +32,16 @@ export async function addSub(this: PubSubManager, subscriptionParams: Omit<AddSu
   }
 
   const channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.${JSON.stringify(params)}.${"m"}.sub`;
-  const result: SubscriptionChannels = {
-    channelName: channel_name,
-    channelNameReady: channel_name + ".ready",
-    channelNameUnsubscribe: channel_name + ".unsubscribe"
-  }
-
-  this.upsertSocket(socket);
-
-  // const upsertSub = _upsertSub.bind(this);
+  const mainTrigger = {
+    table_name: table_name,
+    condition: parseCondition(condition),
+    is_related: false,
+  } as const;
 
   const newSub: Subscription = {
     channel_name,
     filter,
-    func,
+    localFuncs,
     params,
     last_throttled: 0,
     socket,
@@ -56,14 +52,26 @@ export async function addSub(this: PubSubManager, subscriptionParams: Omit<AddSu
     table_rules,
     throttle: validated_throttle,
     triggers: [
-      {
-        table_name: table_name,
-        condition: parseCondition(condition),
-        is_related: false,
-      }
+      mainTrigger
     ]
   }
 
+  const result: SubscriptionChannels = {
+    channelName: channel_name,
+    channelNameReady: channel_name + ".ready",
+    channelNameUnsubscribe: channel_name + ".unsubscribe"
+  }
+
+  const [matchingSub] = this.getSubs(mainTrigger.table_name, mainTrigger.condition, newSub);
+  if(matchingSub){
+    console.error("Trying to add a duplicate sub for: ", channel_name);
+    return result;
+  }
+
+  this.upsertSocket(socket);
+
+  // const upsertSub = _upsertSub.bind(this);
+
   if(viewOptions){
     for await(const relatedTable of viewOptions.relatedTables){
       const relatedSub = {
@@ -79,7 +87,7 @@ export async function addSub(this: PubSubManager, subscriptionParams: Omit<AddSu
 
   }
 
-  if(func){
+  if(localFuncs){
     this.pushSubData(newSub);
 
   } else if (socket) {

package/lib/PubSubManager/notifListener.js

@@ -65,7 +65,7 @@ async function notifListener(data) {
                 sub.triggers.forEach(trg => {
                     if (this.dbo[trg.table_name] &&
                         sub.is_ready &&
-                        (sub.socket_id && this.sockets[sub.socket_id]) || sub.func) {
+                        (sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs) {
                         const throttle = sub.throttle || 0;
                         if (sub.last_throttled <= Date.now() - throttle) {
                             /* It is assumed the policy was checked before this point */

package/lib/PubSubManager/notifListener.ts

@@ -87,7 +87,7 @@ export async function notifListener(this: PubSubManager, data: { payload: string
           if (
             this.dbo[trg.table_name] &&
             sub.is_ready &&
-            (sub.socket_id && this.sockets[sub.socket_id]) || sub.func
+            (sub.socket_id && this.sockets[sub.socket_id]) || sub.localFuncs
           ) {
             const throttle = sub.throttle || 0;
             if (sub.last_throttled <= Date.now() - throttle) {

package/lib/PubSubManager/pushSubData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushSubData.d.ts","sourceRoot":"","sources":["pushSubData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEnE,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,GAAG,oBA4ClF"}
+{"version":3,"file":"pushSubData.d.ts","sourceRoot":"","sources":["pushSubData.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEnE,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,GAAG,oBAgDlF"}

package/lib/PubSubManager/pushSubData.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushSubData = void 0;
+const subscribe_1 = require("../DboBuilder/subscribe");
 const PubSubManager_1 = require("./PubSubManager");
 async function pushSubData(sub, err) {
     if (!sub)
         throw "pushSubData: invalid sub";
-    const { socket_id, channel_name, func } = sub; //, subOne = false 
+    const { socket_id, channel_name } = sub; //, subOne = false 
+    const localFuncs = (0, subscribe_1.parseLocalFuncs)(sub.localFuncs);
     sub.last_throttled = Date.now();
     if (err) {
         if (socket_id) {
@@ -26,8 +28,8 @@ async function pushSubData(sub, err) {
                   { data }, (cb)=> { console.log(cb) });
                 */
             }
-            else if (func) {
-                func(data);
+            else if (localFuncs) {
+                localFuncs.onData(data);
                 resolve(data);
             }
             sub.last_throttled = Date.now();
@@ -37,8 +39,11 @@ async function pushSubData(sub, err) {
             if (socket_id && this.sockets[socket_id]) {
                 this.sockets[socket_id].emit(channel_name, { err: errObj });
             }
-            else if (func) {
-                func({ err: errObj });
+            else if (localFuncs) {
+                if (!localFuncs.onError) {
+                    console.error("Uncaught subscription error", err);
+                }
+                localFuncs.onError?.(errObj);
             }
             reject(errObj);
         }

package/lib/PubSubManager/pushSubData.ts

@@ -1,9 +1,11 @@
+import { parseLocalFuncs } from "../DboBuilder/subscribe";
 import { log, PubSubManager, Subscription } from "./PubSubManager";
 
 export async function pushSubData(this: PubSubManager, sub: Subscription, err?: any) {
   if (!sub) throw "pushSubData: invalid sub";
 
-  const { socket_id, channel_name, func } = sub;  //, subOne = false 
+  const { socket_id, channel_name } = sub;  //, subOne = false 
+  const localFuncs = parseLocalFuncs(sub.localFuncs);
   sub.last_throttled = Date.now();
 
   if (err) {
@@ -28,8 +30,8 @@ export async function pushSubData(this: PubSubManager, sub: Subscription, err?:
         /* TO DO: confirm receiving data or server will unsubscribe
           { data }, (cb)=> { console.log(cb) });
         */
-      } else if (func) {
-        func(data);
+      } else if (localFuncs) {
+        localFuncs.onData(data);
         resolve(data);
       }
       sub.last_throttled = Date.now();
@@ -38,8 +40,11 @@ export async function pushSubData(this: PubSubManager, sub: Subscription, err?:
       const errObj = { _err_msg: err.toString(), err };
       if (socket_id && this.sockets[socket_id]) {
         this.sockets[socket_id].emit(channel_name, { err: errObj });
-      } else if (func) {
-        func({ err: errObj });
+      } else if (localFuncs) {
+        if(!localFuncs.onError){
+          console.error("Uncaught subscription error", err);
+        }
+        localFuncs.onError?.(errObj);
       }
       reject(errObj);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-27418
+56545

package/tests/server/package-lock.json

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