@arcote.tech/arc 0.0.17 → 0.0.19

package/dist/index.js

@@ -177,8 +177,8 @@ class ArcIndexedItemsQuery extends ArcManyItemsQuery {
   checkItem(item) {
     if (!super.checkItem(item))
       return false;
-    const notCorrect = Object.entries(this.data).find(([key, value]) => item[key] !== value);
-    if (notCorrect)
+    const correct = Object.entries(this.data).every(([key, value]) => item[key] === value);
+    if (!correct)
       return false;
     return true;
   }
@@ -1210,9 +1210,7 @@ class RTCClient {
   reconnectAttempts = 0;
   maxReconnectAttempts = 5;
   syncProgressCallback;
-  syncResolve;
   syncPromise = null;
-  pendingStoreChanges = [];
   constructor(storage) {
     this.storage = storage;
   }
@@ -1220,13 +1218,54 @@ class RTCClient {
     if (this.syncPromise)
       return this.syncPromise;
     this.syncProgressCallback = progressCallback;
-    this.syncPromise = new Promise((resolve) => {
-      this.syncResolve = resolve;
-      this.connect();
-    });
+    this.syncPromise = this.performSync();
     return this.syncPromise;
   }
-  async connect() {
+  async performSync() {
+    this.connectWebSocket();
+    const arcState = await this.storage.getStore("state").findById("$arc", (a) => a);
+    const response = await fetch(`/ws/sync?lastSync=${arcState?.lastSyncDate || ""}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (!response.ok) {
+      throw new Error("Sync failed");
+    }
+    const { results, syncDate } = await response.json();
+    const pendingStoreChanges = [];
+    for (const { store, items } of results) {
+      this.syncProgressCallback?.({ store, size: items.length });
+      const storeState = this.storage.getStore(store);
+      if (!storeState) {
+        console.error(`Store ${store} not found`);
+        continue;
+      }
+      const changes = items.map((item) => {
+        if (item.deleted) {
+          return {
+            type: "delete",
+            id: item._id
+          };
+        }
+        return {
+          type: "set",
+          data: item
+        };
+      });
+      pendingStoreChanges.push(storeState.applyChanges(changes));
+    }
+    await Promise.all(pendingStoreChanges);
+    const stateStorage = this.storage.getStore("state");
+    await stateStorage.applyChanges([
+      {
+        type: "set",
+        data: { _id: "$arc", lastSyncDate: syncDate }
+      }
+    ]);
+  }
+  async connectWebSocket() {
     this._socket = new WebSocket(`wss://${window.location.host}/ws`);
     this.openSocket = new Promise((resolve) => {
       this._socket.addEventListener("open", () => {
@@ -1234,7 +1273,6 @@ class RTCClient {
         resolve(this._socket);
       });
     });
-    const arcState = await this.storage.getStore("state").findById("$arc", (a) => a);
     this._socket.addEventListener("message", (e) => {
       this.onMessage(JSON.parse(e.data));
     });
@@ -1243,17 +1281,13 @@ class RTCClient {
       console.error("WebSocket closed", e);
       this.reconnect();
     });
-    this.sendMessage({
-      type: "sync",
-      lastDate: arcState?.lastSyncDate || null
-    });
   }
   reconnect() {
     if (this.reconnectAttempts < this.maxReconnectAttempts) {
       const timeout = Math.pow(2, this.reconnectAttempts) * 1000;
       setTimeout(() => {
         this.reconnectAttempts++;
-        this.connect();
+        this.connectWebSocket();
       }, timeout);
     } else {
       console.error("Max reconnect attempts reached. Giving up.");
@@ -1267,44 +1301,6 @@ class RTCClient {
   }
   onMessage(message) {
     switch (message.type) {
-      case "sync-result":
-        {
-          const { store, items } = message;
-          this.syncProgressCallback?.({ store, size: items.length });
-          const storeState = this.storage.getStore(store);
-          if (!storeState) {
-            console.error(`Store ${store} not found`);
-            return;
-          }
-          const changes = items.map((item) => {
-            if (item.deleted) {
-              return {
-                type: "delete",
-                id: item._id
-              };
-            }
-            return {
-              type: "set",
-              data: item
-            };
-          });
-          this.pendingStoreChanges.push(storeState.applyChanges(changes));
-        }
-        break;
-      case "sync-done":
-        Promise.all(this.pendingStoreChanges).then(() => {
-          const stateStorage = this.storage.getStore("state");
-          stateStorage.applyChanges([
-            {
-              type: "set",
-              data: { _id: "$arc", lastSyncDate: message.date }
-            }
-          ]).then(() => {
-            this.pendingStoreChanges = [];
-            this.syncResolve?.();
-          });
-        });
-        break;
       case "state-changes":
         this.storage.applyChanges(message.changes);
         break;

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "Arc is a framework designed to align code closely with business logic, streamlining development and enhancing productivity.",