prostgles-server 4.2.545 → 4.2.546

package/lib/PubSubManager/SyncReplication/syncData.ts

@@ -59,7 +59,7 @@ export async function syncData(
       tableName: sync.table_name,
       sid: sync.sid,
       source,
-      ...pickKeys(sync, ["socket_id", "condition", "last_synced", "is_syncing"]),
+      ...pickKeys(sync, ["socket_id", "condition", "lr", "is_syncing"]),
       lr: JSON.stringify(sync.lr),
       connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map((s) => s.id),
       localParams: undefined,
@@ -111,11 +111,13 @@ export async function syncData(
       sync.is_syncing = true;
     },
     onSend: async (data) => {
-      const res = await upsertData(data);
+      const res = await upsertData(data, "WAL");
       return res;
     },
-    onSendEnd: (batch) => {
-      updateSyncLR(batch);
+    onSendEnd: (batch, _, error) => {
+      if (error === undefined) {
+        updateSyncLR(batch);
+      }
       sync.is_syncing = false;
 
       /**
@@ -126,13 +128,13 @@ export async function syncData(
   });
 
   /* Debounce sync requests */
-  if (!sync.wal.isSending() && sync.is_syncing) {
-    this.syncTimeout ??= setTimeout(() => {
-      this.syncTimeout = undefined;
-      void this.syncData(sync, undefined, source);
-    }, throttle);
-    return;
-  }
+  // if (!sync.wal.isSending() && sync.is_syncing) {
+  //   this.syncTimeout ??= setTimeout(() => {
+  //     this.syncTimeout = undefined;
+  //     void this.syncData(sync, undefined, source);
+  //   }, throttle);
+  //   return;
+  // }
 
   /**
    * Express data sent from a client that has already been synced
@@ -170,8 +172,8 @@ export async function syncData(
 
     /* Make sure trigger is not firing on freshly synced data */
     if (!rowsFullyMatch(sync.lr, s_lr)) {
-      from_synced = sync.last_synced;
-      await logSyncData("sync.last_synced");
+      from_synced = Number(sync.lr[synced_field]);
+      await logSyncData("sync.lr");
     } else {
       await logSyncData("rowsFullyMatch");
     }
@@ -189,7 +191,7 @@ export async function syncData(
     await logSyncData("nothingToSync");
   }
 
-  await pushData([], true);
+  await pushData({ state: "synced" });
 
   sync.is_syncing = false;
 }

package/lib/TableConfig/TableConfig.ts

@@ -537,7 +537,7 @@ export default class TableConfigurator {
   ): Promise<AnyObject> => {
     const tableHook = this.config[tableHandler.name]?.hooks?.getPreInsertRow;
     if (tableHandler.is_media) {
-      return uploadFile.bind(tableHandler)(args) as Promise<AnyObject>;
+      return uploadFile.bind(tableHandler)(args);
     }
     if (tableHook) {
       return tableHook(args);

package/lib/runClientRequest.ts

@@ -169,7 +169,7 @@ export const clientCanRunSqlRequest = async function (
     const allowedToRunSQL =
       publishParams &&
       (await (
-        this.opts.publishRawSQL as undefined | ((params: PublishParams) => Awaitable<boolean | "*">)
+        this.opts.publishRawSQL
       )?.(publishParams));
     return allowedToRunSQL === true || allowedToRunSQL === "*";
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.545",
+  "version": "4.2.546",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.21.0",
     "pg-cursor": "^2.20.0",
     "pg-promise": "^12.6.2",
-    "prostgles-types": "^4.0.263"
+    "prostgles-types": "^4.0.264"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",