@arcote.tech/arc 0.0.20 → 0.0.22

package/dist/collection/queries/abstract-many-items.d.ts

@@ -5,7 +5,7 @@ import { ArcCollectionQuery } from "./abstract-collection-query";
 export declare class QueryCollectionResult<C extends ArcCollectionAny> {
     private result;
     constructor(result: CollectionItem<C>[]);
-    get(id: util.GetType<C["id"]>): ({
+    get(id: util.GetType<C["id"]> | null): ({
         _id: string;
     } & ReturnType<C["deserialize"]> extends infer T ? { [KeyType in keyof T]: ({
         _id: string;

package/dist/data-storage/data-storage-forked.d.ts

@@ -9,7 +9,7 @@ export declare class ForkedDataStorage extends DataStorage {
     getReadWriteTransaction(): Promise<ReadWriteTransaction>;
     getStore<Item extends {
         _id: string;
-    }>(storeName: string, deserialize?: (data: any) => Item): StoreState<Item>;
+    }>(storeName: string): StoreState<Item>;
     fork(): ForkedDataStorage;
     merge(): Promise<void>;
 }

package/dist/data-storage/data-storage.abstract.d.ts

@@ -5,7 +5,7 @@ import type { StoreState } from "./store-state.abstract";
 export declare abstract class DataStorage {
     abstract getStore<Item extends {
         _id: string;
-    }>(storeName: string, deserialize?: (data: any) => Item): StoreState<Item>;
+    }>(storeName: string): StoreState<Item>;
     abstract fork(): ForkedDataStorage;
     abstract getReadTransaction(): Promise<ReadTransaction>;
     abstract getReadWriteTransaction(): Promise<ReadWriteTransaction>;

package/dist/data-storage/store-state-fork.d.ts

@@ -6,7 +6,7 @@ export declare class ForkedStoreState<Item extends {
     master: StoreState<Item>;
     protected changedItems: Map<string, Item | null>;
     changes: StoreStateChange<Item>[];
-    constructor(storeName: string, dataStorage: DataStorage, master: StoreState<Item>, deserialize?: (data: any) => Item);
+    constructor(storeName: string, dataStorage: DataStorage, master: StoreState<Item>);
     applyChangeAndReturnEvent(change: StoreStateChange<Item>): Promise<{
         from: Item | null;
         to: Item | null;

package/dist/data-storage/store-state.abstract.d.ts

@@ -5,7 +5,7 @@ export declare abstract class StoreState<Item extends {
 }> {
     storeName: string;
     protected dataStorage: DataStorage;
-    protected deserialize?: ((data: any) => Item) | undefined;
+    deserialize?: ((data: any) => Item) | undefined;
     protected listeners: Map<QueryListenerCallback<Item>, QueryListener<Item>>;
     constructor(storeName: string, dataStorage: DataStorage, deserialize?: ((data: any) => Item) | undefined);
     abstract applyChange(change: StoreStateChange<Item>): Promise<{

package/dist/index.js

@@ -55,7 +55,7 @@ class QueryCollectionResult {
     this.result = result;
   }
   get(id) {
-    return this.result.find((r) => r._id === id);
+    return id ? this.result.find((r) => r._id === id) : undefined;
   }
   map(callbackfn) {
     return this.result.map(callbackfn);
@@ -358,7 +358,7 @@ class ArcIndexedCollection extends ArcCollection {
         if (!(name in this.indexes)) {
           throw new Error(`Index "${name}" not found in collection "${this.name}"`);
         }
-        return (data) => dataStorage.getStore(this.name, this.deserialize.bind(this)).findByIndex(name, data);
+        return (data) => dataStorage.getStore(this.name).findByIndex(name, data);
       }
     });
   }
@@ -490,7 +490,7 @@ class StoreState {
     this.deserialize = deserialize;
   }
   fork() {
-    return new ForkedStoreState(this.storeName, this.dataStorage, this, this.deserialize);
+    return new ForkedStoreState(this.storeName, this.dataStorage, this);
   }
   async set(item) {
     const change = {
@@ -543,8 +543,8 @@ class ForkedStoreState extends StoreState {
   master;
   changedItems = new Map;
   changes = [];
-  constructor(storeName, dataStorage, master, deserialize) {
-    super(storeName, dataStorage, deserialize);
+  constructor(storeName, dataStorage, master) {
+    super(storeName, dataStorage, master.deserialize);
     this.master = master;
   }
   async applyChangeAndReturnEvent(change) {
@@ -677,11 +677,11 @@ class ForkedDataStorage extends DataStorage {
   getReadWriteTransaction() {
     return this.master.getReadWriteTransaction();
   }
-  getStore(storeName, deserialize) {
+  getStore(storeName) {
     if (this.stores.has(storeName))
       return this.stores.get(storeName);
-    const masterStorage = this.master.getStore(storeName, deserialize);
-    const storage = new ForkedStoreState(storeName, this, masterStorage, deserialize);
+    const masterStorage = this.master.getStore(storeName);
+    const storage = new ForkedStoreState(storeName, this, masterStorage);
     this.stores.set(storeName, storage);
     return storage;
   }
@@ -693,7 +693,6 @@ class ForkedDataStorage extends DataStorage {
       store: store.storeName,
       changes: store.changes
     }));
-    console.log(changes);
     await this.master.commitChanges(changes);
   }
 }
@@ -736,7 +735,6 @@ class MasterStoreState extends StoreState {
     if (change.type === "modify") {
       const existing = await transaction.findById(this.storeName, change.id);
       const updated = existing ? deepMerge(existing, change.data) : { _id: change.id, ...change.data };
-      console.log("updated", updated);
       await transaction.set(this.storeName, updated);
       const item = this.deserialize ? this.deserialize(updated) : updated;
       this.items.set(change.id, item);
@@ -1209,14 +1207,16 @@ class ArcStringEnum extends ArcAbstract {
 // rtc/client.ts
 class RTCClient {
   storage;
+  token;
   _socket;
   openSocket;
   reconnectAttempts = 0;
   maxReconnectAttempts = 5;
   syncProgressCallback;
   syncPromise = null;
-  constructor(storage) {
+  constructor(storage, token) {
     this.storage = storage;
+    this.token = token;
   }
   async sync(progressCallback) {
     if (this.syncPromise)
@@ -1231,7 +1231,8 @@ class RTCClient {
     const response = await fetch(`/ws/sync?lastSync=${arcState?.lastSyncDate || ""}`, {
       method: "GET",
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${this.token}`
       }
     });
     if (!response.ok) {
@@ -1239,28 +1240,18 @@ class RTCClient {
     }
     const { results, syncDate } = await response.json();
     const pendingStoreChanges = [];
+    const transaction = await this.storage.getReadWriteTransaction();
     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) => {
+      for (const item of items) {
         if (item.deleted) {
-          return {
-            type: "delete",
-            id: item._id
-          };
+          await transaction.remove(store, item._id);
+        } else {
+          await transaction.set(store, item);
         }
-        return {
-          type: "set",
-          data: item
-        };
-      });
-      pendingStoreChanges.push(storeState.applyChanges(changes));
+      }
     }
-    await Promise.all(pendingStoreChanges);
+    await transaction.commit();
     const stateStorage = this.storage.getStore("state");
     await stateStorage.applyChanges([
       {
@@ -1270,7 +1261,7 @@ class RTCClient {
     ]);
   }
   async connectWebSocket() {
-    this._socket = new WebSocket(`wss://${window.location.host}/ws`);
+    this._socket = new WebSocket(`wss://${window.location.host}/ws?token=${this.token}`);
     this.openSocket = new Promise((resolve) => {
       this._socket.addEventListener("open", () => {
         this.reconnectAttempts = 0;
@@ -1317,8 +1308,8 @@ class RTCClient {
     socket.send(JSON.stringify(message));
   }
 }
-var rtcClientFactory = (storage) => {
-  return new RTCClient(storage);
+var rtcClientFactory = (token) => (storage) => {
+  return new RTCClient(storage, token);
 };
 // state/query.ts
 class ArcStateQuery extends ArcQuery {

package/dist/rtc/client.d.ts

@@ -1,3 +1,3 @@
 import type { RealTimeCommunicationAdapterFactory } from "./rtc";
-export declare const rtcClientFactory: RealTimeCommunicationAdapterFactory;
+export declare const rtcClientFactory: (token: string) => RealTimeCommunicationAdapterFactory;
 //# sourceMappingURL=client.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "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.",