prostgles-client 4.0.364 → 4.0.366

package/dist/SyncedTable/createSync.d.ts

@@ -1,10 +1,9 @@
-import { type AnyObject } from "prostgles-types";
 import { WAL } from "prostgles-types/dist/WAL";
-import { type SyncedTableOptions } from "./SyncedTable";
 import type { Socket } from "socket.io-client";
+import { type SyncedTableOptions } from "./SyncedTable";
 export declare const createSync: (socket: Socket, options: Omit<SyncedTableOptions, "onReady">) => Promise<{
-    sync: <T extends AnyObject = AnyObject>(onChange: import("./SyncedTable").MultiChangeListener<T>, handlesOnData?: boolean) => import("./SyncedTable").MultiSyncHandles<T>;
-    syncOne: <T extends AnyObject = AnyObject, Full extends boolean = false>(idObj: Partial<T>, onChange: import("./SyncedTable").SingleChangeListener<T, Full>, handlesOnData?: boolean) => import("./SyncedTable").SingleSyncHandles<T, Full>;
+    sync: <T extends import("prostgles-types").AnyObject = import("prostgles-types").AnyObject>(onChange: import("./SyncedTable").MultiChangeListener<T>, handlesOnData?: boolean) => import("./SyncedTable").MultiSyncHandles<T>;
+    syncOne: <T extends import("prostgles-types").AnyObject = import("prostgles-types").AnyObject, Full extends boolean = false>(idObj: Partial<T>, onChange: import("./SyncedTable").SingleChangeListener<T, Full>, handlesOnData?: boolean) => import("./SyncedTable").SingleSyncHandles<T, Full>;
     notifyWal: WAL;
 }>;
 //# sourceMappingURL=createSync.d.ts.map

package/dist/SyncedTable/createSync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSync.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/createSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAIf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,GAAG,EAAgB,MAAM,0BAA0B,CAAC;AAI7D,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,SAAS,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC;;;;EAkO5F,CAAC"}
+{"version":3,"file":"createSync.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/createSync.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAgB,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI/C,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,SAAS,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC;;;;EAyO5F,CAAC"}

package/dist/SyncedTable/createSync.js

@@ -15,12 +15,18 @@ const createSync = async (socket, options) => {
         console.error("Sync internal error: ", err);
     };
     const onSyncRequest = (syncBatchParams) => {
-        let clientSyncInfo = { c_lr: undefined, c_fr: undefined, c_count: 0 };
+        let clientSyncInfo = {
+            state: "syncing",
+            c_lr: undefined,
+            c_fr: undefined,
+            c_count: 0,
+        };
         const batch = store.getBatch(syncBatchParams);
         const firstRow = batch[0];
         const lastRow = batch[batch.length - 1];
         if (firstRow && lastRow) {
             clientSyncInfo = {
+                state: "syncing",
                 c_fr: store.getRowSyncObj(firstRow),
                 c_lr: store.getRowSyncObj(lastRow),
                 c_count: batch.length,
@@ -35,14 +41,14 @@ const createSync = async (socket, options) => {
         // }
         const data = store.getBatch(syncBatchParams);
         await onDebug({ command: "onPullRequest", data: { syncBatchParams, data } });
-        return { data };
+        return { data, success: true };
     };
     const onUpdates = async (onUpdatesParams) => {
         await onDebug({ command: "onUpdates", data: { onUpdatesParams } });
-        if ("err" in onUpdatesParams && onUpdatesParams.err) {
+        if (onUpdatesParams.state === "error" && onUpdatesParams.err) {
             onError(onUpdatesParams.err);
         }
-        else if ("isSynced" in onUpdatesParams && onUpdatesParams.isSynced && !state.isSynced) {
+        else if (onUpdatesParams.state === "synced" && onUpdatesParams.isSynced && !state.isSynced) {
             state.isSynced = onUpdatesParams.isSynced;
             const items = store.getItems().map((d) => ({ ...d }));
             store.setItems([]);
@@ -65,7 +71,7 @@ const createSync = async (socket, options) => {
         else {
             console.error("Unexpected onUpdates");
         }
-        return true;
+        return { success: true };
     };
     const opts = {
         id_fields,
@@ -185,12 +191,12 @@ const createSync = async (socket, options) => {
     };
     const subscriptionManager = (0, createSyncSubscriptionManager_1.createSyncSubscriptionManager)({ id_fields, synced_field }, store, stateUtils, upsert);
     store.setItems(dbSync.syncInfo.data);
-    if (!dbSync.syncInfo.isSynced) {
-        dbSync.syncData();
-    }
-    else {
-        state.isSynced = true;
-    }
+    /** TODO */
+    // if (!dbSync.syncInfo.isSynced) {
+    dbSync.syncData();
+    // } else {
+    //   state.isSynced = true;
+    // }
     return subscriptionManager;
 };
 exports.createSync = createSync;

package/dist/SyncedTable/createSyncStateUtils.d.ts

@@ -1,8 +1,8 @@
-import { type ClientSyncHandles } from "prostgles-types";
+import { ReplicationProtocol, type ClientSyncHandles } from "prostgles-types";
 import type { Socket } from "socket.io-client";
 import { type SyncDebugEvent } from "../prostgles";
 import type { SyncedTableOptions } from "./SyncedTable";
-export declare const createSyncStateUtils: (socket: Socket, options: Omit<SyncedTableOptions, "onReady">) => {
+export declare const createSyncStateUtils: (socket: Socket, options: SyncedTableOptions) => {
     state: {
         isSynced: boolean;
     };
@@ -14,12 +14,16 @@ export declare const createSyncStateUtils: (socket: Socket, options: Omit<Synced
     columns: import("prostgles-types").ValidatedColumnInfo[];
     _syncInfo: import("prostgles-types").SyncTableInfo;
     initializeSync: (handles: ClientSyncHandles) => Promise<{
-        syncInfo: import("prostgles-types").SyncConfig & {
-            data: import("prostgles-types").AnyObject[];
-            isSynced: boolean;
-        };
+        syncInfo: import("prostgles-types").JSONB.GetObjectType<{
+            readonly id_fields: "string[]";
+            readonly synced_field: "string";
+            readonly channelName: "string";
+            readonly data: "any[]";
+            readonly isSynced: "boolean";
+        }>;
         unsync: () => Promise<unknown>;
         syncData: (data?: import("prostgles-types").AnyObject[], deleted?: import("prostgles-types").AnyObject[], cb?: (err?: any) => void) => void;
+        handlers: ReplicationProtocol.OutgoingHandlers<"client">;
     }>;
     filter: import("prostgles-types").EqualityFilter<import("prostgles-types").AnyObject>;
     select: import("prostgles-types").FieldFilter;

package/dist/SyncedTable/createSyncStateUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSyncStateUtils.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/createSyncStateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,KAAK,EAAe,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAErE,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,MAAM,EACd,SAAS,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC;;;;mBAKtB,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;;;;;;;8BAyBrD,iBAAiB;;;;;;2HA6HuuB,CAAC;;;;;CADjyB,CAAC"}
+{"version":3,"file":"createSyncStateUtils.d.ts","sourceRoot":"","sources":["../../lib/SyncedTable/createSyncStateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,EACnB,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAe,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAErE,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,EAAE,SAAS,kBAAkB;;;;mBAIxD,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;;;;;;;8BAyBrD,iBAAiB;;;;;;;;;2HAuHqtB,CAAC;;;;;;CAD/wB,CAAC"}

package/dist/SyncedTable/createSyncStateUtils.js

@@ -38,76 +38,74 @@ const createSyncStateUtils = (socket, options) => {
                     console.error(err);
                     reject(err);
                 }
-                else if (syncInfo) {
-                    // const { channelName } = syncInfo;
-                    // socket.emit(
-                    //   channelName,
-                    //   { onSyncRequest: handles.onSyncRequest({}) },
-                    //   (response: any) => {
-                    //     console.log(response);
-                    //   },
-                    // );
+                else {
                     resolve(syncInfo);
                 }
             });
         });
-        const onCall = function (data, cb) {
-            /*
-              Client will:
-              1. Send last_synced     on(onSyncRequest)
-              2. Send data >= server_synced   on(onPullRequest)
-              3. Send data on CRUD    emit(data.data)
-              4. Upsert data.data     on(data.data)
-            */
-            if (!data)
-                return;
-            const { onUpdates, onSyncRequest, onPullRequest } = handles;
-            onDebug({
-                command: data.data ? "onUpdates"
-                    : data.onSyncRequest ? "onSyncRequest"
-                        : "onPullRequest",
-                data,
-            });
-            if (data.data) {
-                Promise.resolve(onUpdates(data))
-                    .then(() => {
-                    cb({ ok: true });
-                })
-                    .catch((err) => {
-                    cb({ err });
-                });
-            }
-            else if (data.onSyncRequest) {
-                Promise.resolve(onSyncRequest(data.onSyncRequest))
-                    .then((res) => cb({ onSyncRequest: res }))
-                    .catch((err) => {
-                    cb({ err });
-                });
-            }
-            else if (data.onPullRequest) {
-                Promise.resolve(onPullRequest(data.onPullRequest))
-                    .then((result) => {
-                    cb(result);
-                })
-                    .catch((err) => {
-                    cb({ err });
-                });
-            }
-            else {
-                console.log("unexpected response");
-            }
-        };
-        socket.on(channelName, onCall);
-        const syncData = function (data, deleted, cb) {
-            socket.emit(channelName, {
-                onSyncRequest: {
-                    ...handles.onSyncRequest({}),
-                    ...{ data },
-                    ...{ deleted },
-                },
-            }, !cb ? null : ((response) => {
-                cb(response);
-            }));
+        const handlers = prostgles_types_1.ReplicationProtocol.getClientHandlers(channelName, socket, {
+            PullRequest: handles.onPullRequest,
+            ServerSyncRequest: handles.onSyncRequest,
+            UpdateRequest: handles.onUpdates,
+        });
+        // const onCall = function (data: any | undefined, cb: AnyFunction) {
+        //   /*
+        //     Client will:
+        //     1. Send last_synced     on(onSyncRequest)
+        //     2. Send data >= server_synced   on(onPullRequest)
+        //     3. Send data on CRUD    emit(data.data)
+        //     4. Upsert data.data     on(data.data)
+        //   */
+        //   if (!data) {
+        //     return;
+        //   }
+        //   const { onUpdates, onSyncRequest, onPullRequest } = handles;
+        //   onDebug({
+        //     command:
+        //       data.data ? "onUpdates"
+        //       : data.onSyncRequest ? "onSyncRequest"
+        //       : "onPullRequest",
+        //     data,
+        //   });
+        //   if (data.data) {
+        //     Promise.resolve(onUpdates(data))
+        //       .then(() => {
+        //         cb({ ok: true });
+        //       })
+        //       .catch((err) => {
+        //         cb({ err });
+        //       });
+        //   } else if (data.onSyncRequest) {
+        //     Promise.resolve(onSyncRequest(data.onSyncRequest))
+        //       .then((res) => cb({ onSyncRequest: res }))
+        //       .catch((err) => {
+        //         cb({ err });
+        //       });
+        //   } else if (data.onPullRequest) {
+        //     Promise.resolve(onPullRequest(data.onPullRequest))
+        //       .then((result) => {
+        //         cb(result);
+        //       })
+        //       .catch((err) => {
+        //         cb({ err });
+        //       });
+        //   } else {
+        //     console.log("unexpected response");
+        //   }
+        // };
+        // socket.on(channelName, onCall);
+        const syncData = async (data) => {
+            const { c_count, c_fr, c_lr } = await handles.onSyncRequest({});
+            handlers.ClientSyncRequest(data && c_fr && c_lr ?
+                { state: "syncing-data", c_count, c_fr, c_lr, data }
+                : { state: "syncing", c_count, c_fr, c_lr });
+            // socket.emit(channelName, {
+            //   onSyncRequest: {
+            //     ...handles.onSyncRequest({}),
+            //     ...{ data },
+            //     ...{ deleted },
+            //   },
+            // });
         };
         const unsync = () => {
             return new Promise((resolve, reject) => {
@@ -117,10 +115,10 @@ const createSyncStateUtils = (socket, options) => {
                     else
                         resolve(res);
                 });
-                socket.removeListener(channelName, onCall);
+                socket.removeAllListeners(channelName);
             });
         };
-        return { syncInfo, unsync, syncData };
+        return { syncInfo, unsync, syncData, handlers };
     };
     return {
         state,