prostgles-client 4.0.310 → 4.0.312

package/dist/getDbHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAMlB,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAC;AAKnC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,8GAQf,IAAI;;CAwNN,CAAC"}
+{"version":3,"file":"getDbHandler.d.ts","sourceRoot":"","sources":["../lib/getDbHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAMlB,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,2BAA2B,CAAC;AAKnC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAC;IAC7B,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAO,WAAW,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;IAC/C,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,CAAC;AAIF,eAAO,MAAM,KAAK,8GAQf,IAAI;;CAuNN,CAAC"}

package/dist/getDbHandler.js

@@ -125,18 +125,18 @@ const getDB = ({ schema, tableSchema, onDebug, syncedTable, syncHandler, subscri
                     (0, useSubscribe_1.useSubscribe)(subFunc, command === SUBONE, filter, options, hookOptions);
                 }
                 if (command === SUBONE || !subscribeCommands.includes(SUBONE)) {
-                    dboTable[SUBONE] = async function (param1, param2, onChange, onError) {
+                    dboTable[SUBONE] = async function (param1, param2, onChange) {
                         await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({
                             type: "table",
                             command: "getSync",
                             tableName,
-                            data: { param1, param2, onChange, onError },
+                            data: { param1, param2, onChange },
                         }));
-                        checkSubscriptionArgs(param1, param2, onChange, onError);
+                        checkSubscriptionArgs(param1, param2, onChange);
                         const onChangeOne = (rows) => {
                             onChange(rows[0]);
                         };
-                        return subscriptionHandler.addSub(db, { tableName, command, param1, param2 }, onChangeOne, onError);
+                        return subscriptionHandler.addSub(db, { tableName, command, param1, param2 }, onChangeOne);
                     };
                 }
             }

package/dist/getSubscriptionHandler.d.ts

@@ -1,10 +1,13 @@
-import { type SubscriptionChannels, type SubscriptionHandler } from "prostgles-types";
+import { type AnyObject, type SubscriptionChannels, type SubscriptionHandler } from "prostgles-types";
 import { type AnyFunction, type CoreParams, type InitOptions } from "./prostgles";
+type OnChange = (data: AnyObject[], err?: any) => void;
 export type Subscription = CoreParams & {
     lastData: any;
-    onCall: AnyFunction;
-    handlers: AnyFunction[];
-    errorHandlers: (AnyFunction | undefined)[];
+    onCall: (data: {
+        data: AnyObject[];
+        err?: unknown;
+    }) => void;
+    handlers: OnChange[];
     unsubChannel: string;
     reAttach: () => Promise<void>;
 };

package/dist/getSubscriptionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSubscriptionHandler.d.ts","sourceRoot":"","sources":["../lib/getSubscriptionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAEzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAS,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzF,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,aAAa,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,sBAAsB,aAAc,KAAK,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;kBAkF/E,GAAG,UACA,UAAU,YACR,WAAW,aACV,WAAW,KACrB,QAAQ,mBAAmB,CAAC;;4DA1B5B,UAAU,KAAG,QAAQ,oBAAoB,CAAC;gCAzC9B,MAAM,gBACL,MAAM,WACX,WAAW,KACnB,QAAQ,IAAI,CAAC;;CA4MjB,CAAC"}
+{"version":3,"file":"getSubscriptionHandler.d.ts","sourceRoot":"","sources":["../lib/getSubscriptionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAEzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAS,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzF,KAAK,QAAQ,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7D,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,sBAAsB,aAAc,KAAK,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC;kBAkF/E,GAAG,UACA,UAAU,YACR,WAAW,aACV,WAAW,KACrB,QAAQ,mBAAmB,CAAC;;4DA1B5B,UAAU,KAAG,QAAQ,oBAAoB,CAAC;gCAzC9B,MAAM,gBACL,MAAM,WACX,WAAW,KACnB,QAAQ,IAAI,CAAC;;CAoMjB,CAAC"}

package/dist/getSubscriptionHandler.js

@@ -71,12 +71,12 @@ const getSubscriptionHandler = (initOpts) => {
      */
     const addSubQueuer = new FunctionQueuer_1.FunctionQueuer(_addSub, ([_, { tableName }]) => tableName);
     const addSub = async (dbo, params, onChange, _onError) => {
-        return addSubQueuer.run([dbo, params, onChange, _onError]);
+        return addSubQueuer.run([dbo, params, onChange]);
     };
     /**
      * Do NOT use concurrently
      */
-    async function _addSub(dbo, { tableName, command, param1, param2 }, onChange, _onError) {
+    async function _addSub(dbo, { tableName, command, param1, param2 }, onChange) {
         const makeHandler = (channelName, unsubChannel) => {
             const unsubscribe = function () {
                 return _unsubscribe(channelName, unsubChannel, onChange);
@@ -110,7 +110,6 @@ const getSubscriptionHandler = (initOpts) => {
         if (existing) {
             const existingCh = existing[0];
             existing[1].handlers.push(onChange);
-            existing[1].errorHandlers.push(_onError);
             setTimeout(() => {
                 var _a, _b;
                 if ((_a = subscriptions[existingCh]) === null || _a === void 0 ? void 0 : _a.lastData) {
@@ -125,34 +124,29 @@ const getSubscriptionHandler = (initOpts) => {
             param1,
             param2,
         });
-        const onCall = function (data) {
+        const onCall = function (subData) {
             /* TO DO: confirm receiving data or server will unsubscribe */
             // if(cb) cb(true);
             const sub = subscriptions[channelName];
+            const { data, err } = subData;
             if (sub) {
-                if (data.data) {
+                if (data !== undefined || err !== undefined) {
                     sub.lastData = data.data;
                     sub.handlers.forEach((h) => {
-                        h(data.data);
-                    });
-                }
-                else if (data.err) {
-                    sub.errorHandlers.forEach((h) => {
-                        h === null || h === void 0 ? void 0 : h(data.err);
+                        if (err !== undefined) {
+                            console.error(`Error within running subscription \n ${channelName}`, err);
+                        }
+                        h(data, err);
                     });
                 }
                 else {
-                    console.error("INTERNAL ERROR: Unexpected data format from subscription: ", data);
+                    console.error("INTERNAL ERROR: Unexpected data format from subscription: ", subData);
                 }
             }
             else {
                 console.warn("Orphaned subscription: ", channelName);
             }
         };
-        const onError = _onError ||
-            function (err) {
-                console.error(`Uncaught error within running subscription \n ${channelName}`, err);
-            };
         socket.on(channelName, onCall);
         subscriptions[channelName] = {
             lastData: undefined,
@@ -163,7 +157,6 @@ const getSubscriptionHandler = (initOpts) => {
             onCall,
             unsubChannel: channelNameUnsubscribe,
             handlers: [onChange],
-            errorHandlers: [onError],
             reAttach: async () => {
                 await removeServerSub(channelNameUnsubscribe).catch(console.error);
                 await addServerSub({ tableName, command, param1, param2 });
@@ -185,7 +178,7 @@ const getSubscriptionHandler = (initOpts) => {
             }
             catch (err) {
                 console.error("There was an issue reconnecting old subscriptions", err, s);
-                Object.values(s.errorHandlers).forEach((h) => h === null || h === void 0 ? void 0 : h(err));
+                s.onCall({ data: [], err });
             }
         }
         await (onDebug === null || onDebug === void 0 ? void 0 : onDebug({ type: "subscriptions", command: "reAttachAll.end", subscriptions }));