cry-synced-db-client 0.1.9 → 0.1.10

package/dist/db/SyncedDb.d.ts

@@ -36,6 +36,8 @@ export declare class SyncedDb implements I_SyncedDb {
     private restUploadTimer?;
     /** Flag za preprečitev loopa - če je true, ne schedulamo REST uploada */
     private isUploadingToRest;
+    /** Promise ki se resolva ko se REST upload konča (za sync await) */
+    private restUploadPromise?;
     /** Timer za avtomatsko sinhronizacijo */
     private autoSyncTimer?;
     /** Unikatni ID te instance za detekcijo loopback */
@@ -44,7 +46,7 @@ export declare class SyncedDb implements I_SyncedDb {
     init(): Promise<void>;
     close(): Promise<void>;
     isOnline(): boolean;
-    setOnline(online: boolean): void;
+    setOnline(online: boolean): Promise<void>;
     /**
      * Prisilno preide v offline stanje in pokliče callback če je nastavljen
      */

package/dist/index.js

@@ -286,6 +286,7 @@ class SyncedDb {
   beforeUnloadHandler;
   restUploadTimer;
   isUploadingToRest = false;
+  restUploadPromise;
   autoSyncTimer;
   updaterId;
   constructor(config) {
@@ -354,12 +355,10 @@ class SyncedDb {
   isOnline() {
     return this.online;
   }
-  setOnline(online) {
+  async setOnline(online) {
     const wasOffline = !this.online;
     if (online && wasOffline && this.initialized) {
-      this.tryGoOnline().catch((err) => {
-        console.error("Failed to go online:", err);
-      });
+      await this.tryGoOnline();
     } else {
       this.online = online;
       if (!online) {
@@ -653,6 +652,13 @@ class SyncedDb {
     let sentCount = 0;
     let conflictsResolved = 0;
     try {
+      if (this.restUploadTimer) {
+        clearTimeout(this.restUploadTimer);
+        this.restUploadTimer = undefined;
+      }
+      if (this.restUploadPromise) {
+        await this.restUploadPromise;
+      }
       await this.flushAllPendingChanges();
       const syncSpecs = [];
       const configMap = new Map;
@@ -928,12 +934,18 @@ class SyncedDb {
       return;
     }
     this.isUploadingToRest = true;
+    let resolveUpload;
+    this.restUploadPromise = new Promise((resolve) => {
+      resolveUpload = resolve;
+    });
     try {
       await this.uploadDirtyItems();
     } catch (err) {
       console.error("REST upload failed:", err);
     } finally {
       this.isUploadingToRest = false;
+      resolveUpload();
+      this.restUploadPromise = undefined;
     }
   }
   async flushAllPendingChanges() {
@@ -981,7 +993,11 @@ class SyncedDb {
     const results = await this.withSyncTimeout(this.restInterface.updateCollections(collectionBatches), "updateCollections");
     let sentCount = 0;
     for (const result of results) {
-      const { results: { updatedIds, deletedIds } } = result;
+      const { results: { insertedIds, updatedIds, deletedIds } } = result;
+      for (const id of insertedIds) {
+        await this.dexieDb.save(collection, id, { _dirty: false });
+        sentCount++;
+      }
       for (const id of updatedIds) {
         await this.dexieDb.save(collection, id, { _dirty: false });
         sentCount++;
@@ -1168,10 +1184,17 @@ class SyncedDb {
     }
     let sentCount = 0;
     for (const result of results) {
-      const { collection, results: { updatedIds, deletedIds, errors } } = result;
+      const { collection, results: { insertedIds, updatedIds, deletedIds, errors } } = result;
       const dirtyData = dirtyItemsMap.get(collection);
       if (!dirtyData)
         continue;
+      for (const id of insertedIds) {
+        const item = dirtyData.updates.find((u) => String(u._id) === String(id));
+        if (item) {
+          await this.dexieDb.save(collection, id, { _dirty: false });
+          sentCount++;
+        }
+      }
       for (const id of updatedIds) {
         const item = dirtyData.updates.find((u) => String(u._id) === String(id));
         if (item) {

package/dist/types/I_RestInterface.d.ts

@@ -54,6 +54,8 @@ export type CollectionUpdateRequest<T> = {
 export type CollectionUpdateResult = {
     collection: string;
     results: {
+        /** IDs of records actually inserted */
+        insertedIds: Id[];
         /** IDs of records actually updated */
         updatedIds: Id[];
         /** IDs of records actually deleted */

package/dist/types/I_SyncedDb.d.ts

@@ -183,8 +183,8 @@ export interface I_SyncedDb {
     close(): Promise<void>;
     /** Ali je povezan na server */
     isOnline(): boolean;
-    /** Nastavi online/offline status */
-    setOnline(online: boolean): void;
+    /** Nastavi online/offline status. Returns a promise when going online. */
+    setOnline(online: boolean): Promise<void>;
     /** Poišče objekt po ID-ju */
     findById<T extends DbEntity>(collection: string, id: Id): Promise<T | null>;
     /** Poišče objekte po ID-jih */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",