prostgles-server 4.2.60 → 4.2.62

package/lib/PubSubManager/addSync.ts

@@ -1,6 +1,5 @@
 import { find, tryCatch } from "prostgles-types/dist/util";
-import { BasicCallback, parseCondition, PubSubManager } from "./PubSubManager";
-import { AddSyncParams, DEFAULT_SYNC_BATCH_SIZE } from "./PubSubManager";
+import { AddSyncParams, BasicCallback, DEFAULT_SYNC_BATCH_SIZE, PubSubManager, parseCondition } from "./PubSubManager";
 
 /**
  * Returns a sync channel
@@ -8,6 +7,7 @@ import { AddSyncParams, DEFAULT_SYNC_BATCH_SIZE } from "./PubSubManager";
  */
 export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
 
+  const sid = this.dboBuilder.prostgles.authHandler?.getSIDNoError({ socket: syncParams.socket });
   const res = await tryCatch(async () => {
 
     const {
@@ -18,7 +18,6 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
     const conditionParsed = parseCondition(condition);
     if (!socket || !table_info) throw "socket or table_info missing";
     
-    
     const { name: table_name } = table_info;
     const channel_name = `${this.socketChannelPreffix}.${table_name}.${JSON.stringify(filter)}.sync`;
     
@@ -33,12 +32,12 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
         filter,
         condition: conditionParsed,
         synced_field,
+        sid,
         id_fields,
         allow_delete,
         table_rules,
         throttle: Math.max(throttle || 0, table_rules?.sync?.throttle || 0),
         batch_size: table_rules?.sync?.batch_size || DEFAULT_SYNC_BATCH_SIZE,
-        // last_throttled: 0,
         socket_id: socket.id,
         is_sync: true,
         last_synced: 0,
@@ -65,7 +64,9 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
             socketId: socket.id, 
             tableName: table_name, 
             condition,
-            connectedSocketIds: this.connectedSocketIds,  
+            sid,
+            connectedSocketIds: this.connectedSocketIds,
+            duration: -1,
           });
           socket.removeAllListeners(channel_name);
           socket.removeAllListeners(unsyncChn);
@@ -100,23 +101,14 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
               4. Upsert data.data | deleted     on(data.data | data.deleted)
           */
 
-          // if(data.data){
-          //     console.error("THIS SHOUKD NEVER FIRE !! NEW DATA FROM SYNC");
-          //     this.upsertClientData(newSync, data.data);
-          // } else 
           if (data.onSyncRequest) {
-            // console.log("syncData from socket")
             this.syncData(newSync, data.onSyncRequest, "client");
 
-            // console.log("onSyncRequest ", socket._user)
           } else {
             console.error("Unexpected sync request data from client: ", data)
           }
         });
 
-        // socket.emit(channel_name, { onSyncRequest: true }, (response) => {
-        //     console.log(response)
-        // });
       } else {
         console.warn("UNCLOSED DUPLICATE SYNC FOUND", existing.channel_name);
       }
@@ -124,9 +116,6 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
       return newSync;
     };
 
-
-    // const { min_id, max_id, count, max_synced } = params;
-
     upsertSync();
 
     await this.addTrigger({ table_name, condition: conditionParsed }, undefined, socket);
@@ -143,6 +132,7 @@ export async function addSync(this: PubSubManager, syncParams: AddSyncParams) {
     connectedSocketIds: this.connectedSocketIds,
     duration: res.duration,
     error: res.error,
+    sid,
   });
 
   if(res.error !== undefined) throw res.error;

package/lib/SyncReplication.ts

@@ -50,11 +50,14 @@ export async function syncData (this: PubSubManager, sync: SyncParams, clientDat
     type: "sync",
     command: "syncData", 
     tableName: sync.table_name,
+    sid: sync.sid,
     source,
     ...pickKeys(sync, ["socket_id", "condition", "last_synced", "is_syncing"]),
     lr: JSON.stringify(sync.lr),
     connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map(s => s.id),
-    localParams: undefined 
+    localParams: undefined,
+    duration: -1,
+    socketId: sync.socket_id
   });
 
   const {
@@ -193,16 +196,8 @@ export async function syncData (this: PubSubManager, sync: SyncParams, clientDat
      */
     upsertData = async (data: AnyObject[]) => {
       
-      await this._log({ 
-        type: "sync", 
-        command: "upsertData", 
-        tableName: sync.table_name, 
-        rows: data.length, 
-        socketId: socket_id,
-        connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map(s => s.id)
-      });
-
-      return this.dboBuilder.getTX(async (dbTX) => {
+      const start = Date.now();
+      const result = await this.dboBuilder.getTX(async (dbTX) => {
         const tbl = dbTX[table_name] as TableHandler;
         const existingData = await tbl.find(
           { $or: data.map(d => pickKeys(d, id_fields)) },
@@ -247,26 +242,32 @@ export async function syncData (this: PubSubManager, sync: SyncParams, clientDat
         log(`upsertData: inserted( ${inserts.length} )    updated( ${updates.length} )     total( ${data.length} ) \n last insert ${JSON.stringify(inserts.at(-1))} \n last update ${JSON.stringify(updates.at(-1))}`);
         return { inserted: inserts.length, updated: updates.length, total: data.length };
       })
-        .catch(err => {
-          console.trace("Something went wrong with syncing to server: \n ->", err, data.length, id_fields);
-          return Promise.reject("Something went wrong with syncing to server: ")
-        });
-    },
+      .catch(err => {
+        console.trace("Something went wrong with syncing to server: \n ->", err, data.length, id_fields);
+        return Promise.reject("Something went wrong with syncing to server: ")
+      });
 
-    /**
-     * Pushes the given data to client
-     * @param isSynced = true if 
-     */
-    pushData = async (data?: AnyObject[], isSynced = false, err: any = null) => {
       await this._log({ 
         type: "sync", 
-        command: "pushData", 
+        command: "upsertData", 
         tableName: sync.table_name, 
-        rows: data?.length ?? 0, 
+        rows: data.length, 
         socketId: socket_id,
+        sid: sync.sid,
+        duration: Date.now() - start,
         connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map(s => s.id)
       });
-      return new Promise((resolve, reject) => {
+
+      return result;
+    },
+
+    /**
+     * Pushes the given data to client
+     * @param isSynced = true if 
+     */
+    pushData = async (data?: AnyObject[], isSynced = false, err: any = null) => {
+      const start = Date.now();
+      const result = await new Promise((resolve, reject) => {
         socket.emit(channel_name, { data, isSynced }, (resp?: { ok: boolean }) => {
 
           if (resp && resp.ok) {
@@ -278,6 +279,19 @@ export async function syncData (this: PubSubManager, sync: SyncParams, clientDat
           }
         });
       });
+
+      await this._log({ 
+        type: "sync", 
+        command: "pushData", 
+        tableName: sync.table_name, 
+        rows: data?.length ?? 0, 
+        socketId: socket_id,
+        duration: Date.now() - start,
+        sid: sync.sid,
+        connectedSocketIds: this.dboBuilder.prostgles.connectedSockets.map(s => s.id)
+      });
+
+      return result;
     },
 
     /**

package/lib/initProstgles.ts

@@ -2,7 +2,7 @@ import * as promise from "bluebird";
 import * as pgPromise from "pg-promise";
 import pg from "pg-promise/typescript/pg-subset";
 import { isEmpty, pickKeys } from "prostgles-types";
-import AuthHandler from "./AuthHandler";
+import { AuthHandler } from "./AuthHandler";
 import { DBEventsManager } from "./DBEventsManager";
 import { DBOFullyTyped } from "./DBSchemaBuilder";
 import { DBHandlerServer, Prostgles, ProstglesInitOptions, getIsSuperUser } from "./Prostgles";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.60",
+  "version": "4.2.62",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,7 +43,7 @@
     "pg-cursor": "^2.10.5",
     "pg-promise": "^11.6.0",
     "prostgles-client": "^4.0.53",
-    "prostgles-types": "^4.0.85"
+    "prostgles-types": "^4.0.86"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.36",

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "4.2.59",
+      "version": "4.2.61",
       "license": "MIT",
       "dependencies": {
         "bluebird": "^3.7.2",
@@ -32,7 +32,7 @@
         "pg-cursor": "^2.10.5",
         "pg-promise": "^11.6.0",
         "prostgles-client": "^4.0.53",
-        "prostgles-types": "^4.0.85"
+        "prostgles-types": "^4.0.86"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.36",
@@ -1548,7 +1548,7 @@
         "pg-cursor": "^2.10.5",
         "pg-promise": "^11.6.0",
         "prostgles-client": "^4.0.53",
-        "prostgles-types": "^4.0.85",
+        "prostgles-types": "^4.0.86",
         "typescript": "^5.3.3"
       }
     },