tool-db 2.5.0 → 2.5.3

package/lib/crdt/mapCrdt.ts

@@ -1,119 +1,119 @@
-import { BaseCrdt, CRDT_MAP } from "..";
-
-export type MapOperations = "SET" | "DEL";
-
-export interface ChangeMapBase<T> {
-  t: MapOperations;
-  a: string;
-  k: string;
-  i: number;
-}
-
-export interface SetMapChange<T> extends ChangeMapBase<T> {
-  t: "SET";
-  v: T;
-}
-
-export interface DelMapChange<T> extends ChangeMapBase<T> {
-  t: "DEL";
-}
-
-export type MapChanges<T> = SetMapChange<T> | DelMapChange<T>;
-
-export class MapCrdt<T> extends BaseCrdt<T, MapChanges<T>, Record<string, T>> {
-  public type = CRDT_MAP;
-
-  private _changes: MapChanges<T>[] = [];
-
-  private _author = "";
-
-  private _value: Record<string, T> = {};
-
-  private _keyIndex: Record<string, number> = {};
-
-  private _lastUpdateSize: number = 0;
-
-  constructor(author: string, changes?: MapChanges<T>[]) {
-    super();
-    this._author = author;
-    if (changes) {
-      this.mergeChanges(changes);
-    }
-
-    this.calculate();
-  }
-
-  changesSort(a: MapChanges<T>, b: MapChanges<T>) {
-    if (a.i < b.i) return -1;
-    if (a.i > b.i) return 1;
-    if (a.t === "SET" && b.t === "DEL") return -1;
-    if (a.t === "DEL" && b.t === "SET") return 1;
-    if (a.a < b.a) return -1;
-    if (a.a > b.a) return 1;
-    return 0; // Should never be equal!
-  }
-
-  calculate() {
-    const temp: Record<string, T> = {};
-    // Only update if we have new changes
-    if (Object.values(this._changes).length !== this._lastUpdateSize) {
-      this._changes.sort(this.changesSort).forEach((change) => {
-        // Here we apply the model properties
-        // Since this is a KV store we dont need much logic,
-        // except for the sorting of the changes. Then we just apply them.
-        if (change.t === "SET") {
-          temp[change.k] = change.v;
-        } else if (change.t === "DEL") {
-          delete temp[change.k];
-        }
-        this._keyIndex[change.k] = change.i;
-      });
-      this._lastUpdateSize = Object.values(temp).length;
-      this._value = temp;
-    }
-  }
-
-  get value(): Record<string, T> {
-    this.calculate();
-    return this._value;
-  }
-
-  public mergeChanges(newChanges: MapChanges<T>[]) {
-    newChanges.forEach((change) => {
-      // Filter by author and index
-      const filtered = this._changes.filter(
-        (c) => c.i === change.i && c.a === change.a && c.t === change.t
-      );
-      // Only add if there are not matches
-      if (filtered.length === 0) {
-        this._changes.push(change);
-      }
-    });
-    this.calculate();
-  }
-
-  public getChanges(): MapChanges<T>[] {
-    return this._changes;
-  }
-
-  public SET(key: string, value: T) {
-    this._keyIndex[key] = (this._keyIndex[key] || 0) + 1;
-    this._changes.push({
-      t: "SET",
-      k: key,
-      a: this._author,
-      v: value,
-      i: this._keyIndex[key],
-    });
-  }
-
-  public DEL(key: string) {
-    this._keyIndex[key] = (this._keyIndex[key] || 0) + 1;
-    this._changes.push({
-      t: "DEL",
-      k: key,
-      a: this._author,
-      i: this._keyIndex[key],
-    });
-  }
-}
+import { BaseCrdt, CRDT_MAP } from "..";
+
+export type MapOperations = "SET" | "DEL";
+
+export interface ChangeMapBase<T> {
+  t: MapOperations;
+  a: string;
+  k: string;
+  i: number;
+}
+
+export interface SetMapChange<T> extends ChangeMapBase<T> {
+  t: "SET";
+  v: T;
+}
+
+export interface DelMapChange<T> extends ChangeMapBase<T> {
+  t: "DEL";
+}
+
+export type MapChanges<T> = SetMapChange<T> | DelMapChange<T>;
+
+export class MapCrdt<T> extends BaseCrdt<T, MapChanges<T>, Record<string, T>> {
+  public type = CRDT_MAP;
+
+  private _changes: MapChanges<T>[] = [];
+
+  private _author = "";
+
+  private _value: Record<string, T> = {};
+
+  private _keyIndex: Record<string, number> = {};
+
+  private _lastUpdateSize: number = 0;
+
+  constructor(author: string, changes?: MapChanges<T>[]) {
+    super();
+    this._author = author;
+    if (changes) {
+      this.mergeChanges(changes);
+    }
+
+    this.calculate();
+  }
+
+  changesSort(a: MapChanges<T>, b: MapChanges<T>) {
+    if (a.i < b.i) return -1;
+    if (a.i > b.i) return 1;
+    if (a.t === "SET" && b.t === "DEL") return -1;
+    if (a.t === "DEL" && b.t === "SET") return 1;
+    if (a.a < b.a) return -1;
+    if (a.a > b.a) return 1;
+    return 0; // Should never be equal!
+  }
+
+  calculate() {
+    const temp: Record<string, T> = {};
+    // Only update if we have new changes
+    if (Object.values(this._changes).length !== this._lastUpdateSize) {
+      this._changes.sort(this.changesSort).forEach((change) => {
+        // Here we apply the model properties
+        // Since this is a KV store we dont need much logic,
+        // except for the sorting of the changes. Then we just apply them.
+        if (change.t === "SET") {
+          temp[change.k] = change.v;
+        } else if (change.t === "DEL") {
+          delete temp[change.k];
+        }
+        this._keyIndex[change.k] = change.i;
+      });
+      this._lastUpdateSize = Object.values(temp).length;
+      this._value = temp;
+    }
+  }
+
+  get value(): Record<string, T> {
+    this.calculate();
+    return this._value;
+  }
+
+  public mergeChanges(newChanges: MapChanges<T>[]) {
+    newChanges.forEach((change) => {
+      // Filter by author and index
+      const filtered = this._changes.filter(
+        (c) => c.i === change.i && c.a === change.a && c.t === change.t
+      );
+      // Only add if there are not matches
+      if (filtered.length === 0) {
+        this._changes.push(change);
+      }
+    });
+    this.calculate();
+  }
+
+  public getChanges(): MapChanges<T>[] {
+    return this._changes;
+  }
+
+  public SET(key: string, value: T) {
+    this._keyIndex[key] = (this._keyIndex[key] || 0) + 1;
+    this._changes.push({
+      t: "SET",
+      k: key,
+      a: this._author,
+      v: value,
+      i: this._keyIndex[key],
+    });
+  }
+
+  public DEL(key: string) {
+    this._keyIndex[key] = (this._keyIndex[key] || 0) + 1;
+    this._changes.push({
+      t: "DEL",
+      k: key,
+      a: this._author,
+      i: this._keyIndex[key],
+    });
+  }
+}

package/lib/index.ts

@@ -1,42 +1,42 @@
-export { default as proofOfWork } from "./utils/proofOfWork";
-export { default as sha1 } from "./utils/sha1";
-export { default as sha256 } from "./utils/sha256";
-export { default as uniq } from "./utils/uniq";
-
-export { default as randomAnimal } from "./utils/randomAnimal";
-export { default as verifyMessage } from "./utils/verifyMessage";
-export { default as getPeerSignature } from "./utils/getPeerSignature";
-export { default as verifyPeer } from "./utils/verifyPeer";
-export { default as textRandom } from "./utils/textRandom";
-
-export { default as catchReturn } from "./utils/catchReturn";
-
-export { default as stringToArrayBuffer } from "./utils/encoding/stringToArrayBuffer";
-export { default as arrayBufferToString } from "./utils/encoding/arrayBufferToString";
-
-export { default as arrayBufferToHex } from "./utils/encoding/arrayBufferToHex";
-export { default as hexToArrayBuffer } from "./utils/encoding/hexToArrayBuffer";
-export { default as hexToString } from "./utils/encoding/hexToString";
-export { default as hexToUint8 } from "./utils/encoding/hexToUint8";
-
-export { default as ToolDbNetworkAdapter } from "./adapters-base/networkAdapter";
-export { default as ToolDbStorageAdapter } from "./adapters-base/storageAdapter";
-export { default as ToolDbUserAdapter } from "./adapters-base/userAdapter";
-
-export * from "./types/tooldb";
-export * from "./types/message";
-export * from "./crdt/baseCrdt";
-export * from "./crdt/counterCrdt";
-export * from "./crdt/listCrdt";
-export * from "./crdt/mapCrdt";
-
-export { default as handleSubscribe } from "./messageHandlers/handleSubscribe";
-export { default as handleCrdtGet } from "./messageHandlers/handleCrdtGet";
-export { default as handleCrdtPut } from "./messageHandlers/handleCrdtPut";
-export { default as handleQuery } from "./messageHandlers/handleQuery";
-export { default as handlePing } from "./messageHandlers/handlePing";
-export { default as handlePong } from "./messageHandlers/handlePong";
-export { default as handleGet } from "./messageHandlers/handleGet";
-export { default as handlePut } from "./messageHandlers/handlePut";
-
-export { default as ToolDb } from "./tooldb";
+export { default as proofOfWork } from "./utils/proofOfWork";
+export { default as sha1 } from "./utils/sha1";
+export { default as sha256 } from "./utils/sha256";
+export { default as uniq } from "./utils/uniq";
+
+export { default as randomAnimal } from "./utils/randomAnimal";
+export { default as verifyMessage } from "./utils/verifyMessage";
+export { default as getPeerSignature } from "./utils/getPeerSignature";
+export { default as verifyPeer } from "./utils/verifyPeer";
+export { default as textRandom } from "./utils/textRandom";
+
+export { default as catchReturn } from "./utils/catchReturn";
+
+export { default as stringToArrayBuffer } from "./utils/encoding/stringToArrayBuffer";
+export { default as arrayBufferToString } from "./utils/encoding/arrayBufferToString";
+
+export { default as arrayBufferToHex } from "./utils/encoding/arrayBufferToHex";
+export { default as hexToArrayBuffer } from "./utils/encoding/hexToArrayBuffer";
+export { default as hexToString } from "./utils/encoding/hexToString";
+export { default as hexToUint8 } from "./utils/encoding/hexToUint8";
+
+export { default as ToolDbNetworkAdapter } from "./adapters-base/networkAdapter";
+export { default as ToolDbStorageAdapter } from "./adapters-base/storageAdapter";
+export { default as ToolDbUserAdapter } from "./adapters-base/userAdapter";
+
+export * from "./types/tooldb";
+export * from "./types/message";
+export * from "./crdt/baseCrdt";
+export * from "./crdt/counterCrdt";
+export * from "./crdt/listCrdt";
+export * from "./crdt/mapCrdt";
+
+export { default as handleSubscribe } from "./messageHandlers/handleSubscribe";
+export { default as handleCrdtGet } from "./messageHandlers/handleCrdtGet";
+export { default as handleCrdtPut } from "./messageHandlers/handleCrdtPut";
+export { default as handleQuery } from "./messageHandlers/handleQuery";
+export { default as handlePing } from "./messageHandlers/handlePing";
+export { default as handlePong } from "./messageHandlers/handlePong";
+export { default as handleGet } from "./messageHandlers/handleGet";
+export { default as handlePut } from "./messageHandlers/handlePut";
+
+export { default as ToolDb } from "./tooldb";

package/lib/logger.ts

@@ -1,30 +1,30 @@
-import { ToolDb, sha1 } from ".";
-
-export default function logger(
-  this: ToolDb,
-  arg0: any,
-  arg1?: any,
-  arg2?: any,
-  arg3?: any,
-  arg4?: any,
-  arg5?: any
-) {
-  if (this.options.debug) {
-    const isNode = typeof window === "undefined";
-    const title = isNode
-      ? this.options.storageName
-      : "%c" + this.options.storageName;
-
-    const style = isNode
-      ? ""
-      : "background: #" +
-        sha1(this.options.storageName).slice(-6) +
-        "; padding: 2px; color: black";
-
-    console.log(
-      title,
-      style,
-      ...[arg0, arg1, arg2, arg3, arg4, arg4, arg5].slice(0, arguments.length)
-    );
-  }
-}
+import { ToolDb, sha1 } from ".";
+
+export default function logger(
+  this: ToolDb,
+  arg0: any,
+  arg1?: any,
+  arg2?: any,
+  arg3?: any,
+  arg4?: any,
+  arg5?: any
+) {
+  if (this.options.debug) {
+    const isNode = typeof window === "undefined";
+    const title = isNode
+      ? this.options.storageName
+      : "%c" + this.options.storageName;
+
+    const style = isNode
+      ? ""
+      : "background: #" +
+        sha1(this.options.storageName).slice(-6) +
+        "; padding: 2px; color: black";
+
+    console.log(
+      title,
+      style,
+      ...[arg0, arg1, arg2, arg3, arg4, arg4, arg5].slice(0, arguments.length)
+    );
+  }
+}

package/lib/messageHandlers/handleCrdtGet.ts

@@ -1,29 +1,29 @@
-import { ToolDb, CrdtGetMessage, CrdtPutMessage } from "..";
-
-export default function handleCrdtGet(
-  this: ToolDb,
-  message: CrdtGetMessage,
-  remotePeerId: string
-) {
-  this.store
-    .get(message.key)
-    .then((data) => {
-      try {
-        // Use the id of the get so the other client knows we are replying
-        const oldData = {
-          type: "crdtPut",
-          data: JSON.parse(data),
-          to: [],
-          id: message.id,
-        } as CrdtPutMessage;
-        this.network.sendToClientId(remotePeerId, oldData);
-      } catch (e) {
-        // socket.send(data);
-        // do nothing
-      }
-    })
-    .catch((e) => {
-      this.logger("Local key not found, relay", JSON.stringify(message));
-      this.network.sendToAll(message, false);
-    });
-}
+import { ToolDb, CrdtGetMessage, CrdtPutMessage } from "..";
+
+export default function handleCrdtGet(
+  this: ToolDb,
+  message: CrdtGetMessage,
+  remotePeerId: string
+) {
+  this.store
+    .get(message.key)
+    .then((data) => {
+      try {
+        // Use the id of the get so the other client knows we are replying
+        const oldData = {
+          type: "crdtPut",
+          data: JSON.parse(data),
+          to: [],
+          id: message.id,
+        } as CrdtPutMessage;
+        this.network.sendToClientId(remotePeerId, oldData);
+      } catch (e) {
+        // socket.send(data);
+        // do nothing
+      }
+    })
+    .catch((e) => {
+      this.logger("Local key not found, relay", JSON.stringify(message));
+      this.network.sendToAll(message, false);
+    });
+}