tool-db 2.5.3 → 2.5.5

package/lib/messageHandlers/handleQuery.ts

@@ -1,25 +1,30 @@
-import { ToolDb, QueryAckMessage, QueryMessage } from "..";
-
-export default function handleQuery(
-  this: ToolDb,
-  message: QueryMessage,
-  remotePeerId: string
-) {
-  this.store
-    .query(message.key)
-    .then((keys) => {
-      this.network.sendToClientId(remotePeerId, {
-        type: "queryAck",
-        id: message.id,
-        to: [],
-        keys,
-      } as QueryAckMessage);
-    })
-    .catch((e) => {
-      // do nothing
-    });
-
-  if (this.options.server) {
-    this.network.sendToAll(message, true);
-  }
-}
+import { ToolDb, QueryAckMessage, QueryMessage } from "..";
+
+export default function handleQuery(
+  this: ToolDb,
+  message: QueryMessage,
+  remotePeerId: string
+) {
+  this.store
+    .query(message.key)
+    .then((keys) => {
+      this.network.sendToClientId(remotePeerId, {
+        type: "queryAck",
+        id: message.id,
+        to: [],
+        keys,
+      } as QueryAckMessage);
+    })
+    .catch((e) => {
+      // do nothing
+    });
+
+  if (this.options.server) {
+    const finalMessage: QueryMessage = {
+      ...message,
+      to: [...message.to, remotePeerId],
+    };
+
+    this.network.sendToAll(finalMessage, true);
+  }
+}

package/lib/messageHandlers/handleSubscribe.ts

@@ -1,46 +1,46 @@
-import { ToolDb, PutMessage, SubscribeMessage } from "..";
-
-export default function handleSubscribe(
-  this: ToolDb,
-  message: SubscribeMessage,
-  remotePeerId: string
-) {
-  const subId = remotePeerId + "-" + message.key;
-  if (!this.subscriptions.includes(subId)) {
-    this.subscriptions.push(subId);
-
-    this.addKeyListener(message.key, (msg) => {
-      if (remotePeerId) {
-        // We do not reply to the socket directly
-        // instead we use the client id, in case the socket reconnects
-        const newMsg: PutMessage = {
-          data: msg,
-          id: message.id,
-          type: "put",
-          to: [],
-        };
-        this.network.sendToClientId(remotePeerId, newMsg);
-      }
-    });
-  }
-
-  // basically the exact same as GET, below
-  this.store
-    .get(message.key)
-    .then((data) => {
-      try {
-        const oldData: PutMessage = {
-          data: JSON.parse(data),
-          id: message.id,
-          type: "put",
-          to: [],
-        };
-        this.network.sendToClientId(remotePeerId, oldData);
-      } catch (e) {
-        // do nothing
-      }
-    })
-    .catch((e) => {
-      // do nothing
-    });
-}
+import { ToolDb, PutMessage, SubscribeMessage } from "..";
+
+export default function handleSubscribe(
+  this: ToolDb,
+  message: SubscribeMessage,
+  remotePeerId: string
+) {
+  const subId = remotePeerId + "-" + message.key;
+  if (!this.subscriptions.includes(subId)) {
+    this.subscriptions.push(subId);
+
+    this.addKeyListener(message.key, (msg) => {
+      if (remotePeerId) {
+        // We do not reply to the socket directly
+        // instead we use the client id, in case the socket reconnects
+        const newMsg: PutMessage = {
+          data: msg,
+          id: message.id,
+          type: "put",
+          to: [],
+        };
+        this.network.sendToClientId(remotePeerId, newMsg);
+      }
+    });
+  }
+
+  // basically the exact same as GET, below
+  this.store
+    .get(message.key)
+    .then((data) => {
+      try {
+        const oldData: PutMessage = {
+          data: JSON.parse(data),
+          id: message.id,
+          type: "put",
+          to: [],
+        };
+        this.network.sendToClientId(remotePeerId, oldData);
+      } catch (e) {
+        // do nothing
+      }
+    })
+    .catch((e) => {
+      // do nothing
+    });
+}

package/lib/server.ts

@@ -1,7 +1,7 @@
-import { ToolDb } from ".";
-
-console.log("Starting server..");
-const server = new ToolDb({
-  port: 8080,
-  server: true,
-});
+import { ToolDb } from ".";
+
+console.log("Starting server..");
+const server = new ToolDb({
+  port: 8080,
+  server: true,
+});

package/lib/shared.ts

@@ -1,5 +1,5 @@
-const shared = {
-  toolDb: undefined,
-} as any;
-
-export default shared;
+const shared = {
+  toolDb: undefined,
+} as any;
+
+export default shared;

package/lib/toolDbAnonSignIn.ts

@@ -1,5 +1,5 @@
-import { ToolDb } from ".";
-
-export default function toolDbAnonSignIn(this: ToolDb): void {
-  this.userAccount.anonUser();
-}
+import { ToolDb } from ".";
+
+export default function toolDbAnonSignIn(this: ToolDb): void {
+  this.userAccount.anonUser();
+}

package/lib/toolDbClientOnMessage.ts

@@ -1,75 +1,79 @@
-import { ToolDb, ToolDbMessage } from ".";
-
-export default function toolDbClientOnMessage(
-  this: ToolDb,
-  message: ToolDbMessage,
-  remotePeerId: string
-) {
-  if (!this.processedIds[message.type]) {
-    this.processedIds[message.type] = [];
-  }
-  if (this.processedIds[message.type].includes(message.id)) {
-    // this.logger(
-    //   `Already processed this message > ${message.type} from ${remotePeerId}`
-    // );
-    return;
-  }
-
-  this.emit("message", message, remotePeerId);
-
-  this.processedIds[message.type].push(message.id);
-
-  this.logger(`Got message ${message.type} from ${remotePeerId}`);
-  this.logger(message);
-
-  // Check if we are listening for this ID
-  if (message.id) {
-    const msgId = message.id;
-    if (this._idListeners[msgId]) {
-      this._idListeners[msgId](message);
-      this.removeIdListener(msgId);
-    }
-  }
-
-  if (message === undefined || message.type === undefined) {
-    this.logger("Message is invalid!", message, typeof message);
-    return;
-  }
-
-  switch (message.type) {
-    case "ping":
-      this.handlePing(message, remotePeerId);
-      break;
-
-    case "pong":
-      this.handlePong(message, remotePeerId);
-      break;
-
-    case "subscribe":
-      this.handleSubscribe(message, remotePeerId);
-      break;
-
-    case "get":
-      this.handleGet(message, remotePeerId);
-      break;
-
-    case "put":
-      this.handlePut(message, remotePeerId);
-      break;
-
-    case "crdtPut":
-      this.handleCrdtPut(message, remotePeerId);
-      break;
-
-    case "crdtGet":
-      this.handleCrdtGet(message, remotePeerId);
-      break;
-
-    case "query":
-      this.handleQuery(message, remotePeerId);
-      break;
-
-    default:
-      break;
-  }
-}
+import { ToolDb, ToolDbMessage } from ".";
+
+export default function toolDbClientOnMessage(
+  this: ToolDb,
+  message: ToolDbMessage,
+  remotePeerId: string
+) {
+  if (!this.processedIds[message.type]) {
+    this.processedIds[message.type] = [];
+  }
+  if (this.processedIds[message.type].includes(message.id)) {
+    // this.logger(
+    //   `Already processed this message > ${message.type} from ${remotePeerId}`
+    // );
+    return;
+  }
+
+  this.emit("message", message, remotePeerId);
+
+  this.processedIds[message.type].push(message.id);
+
+  this.logger(`Got message ${message.type} from ${remotePeerId}`);
+  this.logger(message);
+
+  // Check if we are listening for this ID
+  if (message.id) {
+    const msgId = message.id;
+    if (this._idListeners[msgId]) {
+      this._idListeners[msgId](message);
+      this.removeIdListener(msgId);
+    }
+  }
+
+  if (message === undefined || message.type === undefined) {
+    this.logger("Message is invalid!", message, typeof message);
+    return;
+  }
+
+  switch (message.type) {
+    case "ping":
+      this.handlePing(message, remotePeerId);
+      break;
+
+    case "pong":
+      this.handlePong(message, remotePeerId);
+      break;
+
+    case "subscribe":
+      this.handleSubscribe(message, remotePeerId);
+      break;
+
+    case "get":
+      this.handleGet(message, remotePeerId);
+      break;
+
+    case "put":
+      this.handlePut(message, remotePeerId);
+      break;
+
+    case "crdtPut":
+      this.handleCrdtPut(message, remotePeerId);
+      break;
+
+    case "crdtGet":
+      this.handleCrdtGet(message, remotePeerId);
+      break;
+
+    case "query":
+      this.handleQuery(message, remotePeerId);
+      break;
+
+    case "function":
+      this.handleFunction(message, remotePeerId);
+      break;
+
+    default:
+      break;
+  }
+}

package/lib/toolDbCrdtGet.ts

@@ -1,82 +1,83 @@
-import { textRandom, BaseCrdt, ToolDb, CrdtPutMessage } from ".";
-
-/**
- * Triggers a GET request to other peers. If the data is available locally it will return that instead.
- * @param key key of the data
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
- * @param timeout Max time to wait for remote.
- * @returns Promise<Data>
- */
-export default function toolDbCrdtGet<T = any>(
-  this: ToolDb,
-  key: string,
-  crdt: BaseCrdt<T, any, any>,
-  userNamespaced = false,
-  timeoutMs = 1000
-): Promise<CrdtPutMessage<T> | null> {
-  return new Promise((resolve, reject) => {
-    if (userNamespaced && this.userAccount.getAddress() === undefined) {
-      reject(new Error("You are not authorized yet!"));
-      return;
-    }
-    const finalKey = userNamespaced
-      ? `:${this.userAccount.getAddress()}.${key}`
-      : key;
-    this.logger("CRDT GET", finalKey);
-
-    const msgId = textRandom(10);
-
-    const cancelTimeout = setTimeout(() => {
-      this.store
-        .get(finalKey)
-        .then((data) => {
-          try {
-            const message = JSON.parse(data);
-            crdt.mergeChanges(message.v);
-
-            this.emit("data", message);
-            resolve(message);
-          } catch (e) {
-            resolve(null);
-          }
-        })
-        .catch((e) => reject(null));
-    }, timeoutMs);
-
-    this.addIdListener(msgId, (msg) => {
-      this.logger("GET RECV", finalKey);
-
-      clearTimeout(cancelTimeout);
-      if (msg.type === "crdtPut") {
-        crdt.mergeChanges(msg.data.v);
-        resolve(msg);
-      }
-    });
-
-    this.store
-      .get(finalKey)
-      .then((data) => {
-        try {
-          const msg = JSON.parse(data);
-          clearTimeout(cancelTimeout);
-          this.removeIdListener(msgId);
-          crdt.mergeChanges(msg.v);
-          this.emit("data", msg);
-          resolve(msg);
-        } catch (e) {
-          // do nothing
-        }
-      })
-      .catch(() => {
-        // do nothing
-      });
-
-    // Do get
-    this.network.sendToAll({
-      type: "crdtGet",
-      to: [],
-      key: finalKey,
-      id: msgId,
-    });
-  });
-}
+import { textRandom, BaseCrdt, ToolDb, CrdtPutMessage } from ".";
+
+/**
+ * Triggers a GET request to other peers. If the data is available locally it will return that instead.
+ * @param key key of the data
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
+ * @param timeout Max time to wait for remote.
+ * @returns Promise<Data>
+ */
+export default function toolDbCrdtGet<T = any>(
+  this: ToolDb,
+  key: string,
+  crdt: BaseCrdt<T, any, any>,
+  userNamespaced = false,
+  timeoutMs = 1000,
+  to?: string[]
+): Promise<CrdtPutMessage<T> | null> {
+  return new Promise((resolve, reject) => {
+    if (userNamespaced && this.userAccount.getAddress() === undefined) {
+      reject(new Error("You are not authorized yet!"));
+      return;
+    }
+    const finalKey = userNamespaced
+      ? `:${this.userAccount.getAddress()}.${key}`
+      : key;
+    this.logger("CRDT GET", finalKey);
+
+    const msgId = textRandom(10);
+
+    const cancelTimeout = setTimeout(() => {
+      this.store
+        .get(finalKey)
+        .then((data) => {
+          try {
+            const message = JSON.parse(data);
+            crdt.mergeChanges(message.v);
+
+            this.emit("data", message);
+            resolve(message);
+          } catch (e) {
+            resolve(null);
+          }
+        })
+        .catch((e) => reject(null));
+    }, timeoutMs);
+
+    this.addIdListener(msgId, (msg) => {
+      this.logger("GET RECV", finalKey);
+
+      clearTimeout(cancelTimeout);
+      if (msg.type === "crdtPut") {
+        crdt.mergeChanges(msg.data.v);
+        resolve(msg);
+      }
+    });
+
+    this.store
+      .get(finalKey)
+      .then((data) => {
+        try {
+          const msg = JSON.parse(data);
+          clearTimeout(cancelTimeout);
+          this.removeIdListener(msgId);
+          crdt.mergeChanges(msg.v);
+          this.emit("data", msg);
+          resolve(msg);
+        } catch (e) {
+          // do nothing
+        }
+      })
+      .catch(() => {
+        // do nothing
+      });
+
+    // Do get
+    this.network.sendToAll({
+      type: "crdtGet",
+      to: to || [],
+      key: finalKey,
+      id: msgId,
+    });
+  });
+}

package/lib/toolDbCrdtPut.ts

@@ -1,77 +1,78 @@
-import {
-  ToolDb,
-  CrdtPutMessage,
-  textRandom,
-  VerificationData,
-  proofOfWork,
-  BaseCrdt,
-} from ".";
-
-/**
- * Triggers a PUT request to other peers.
- * @param key key where we want to put the data at.
- * @param value Data we want to any (any type)
- * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
- * @returns Promise<Data | null>
- */
-export default function toolDbCrdtPut<T = any>(
-  this: ToolDb,
-  key: string,
-  crdt: BaseCrdt<T, any, any>,
-  userNamespaced = false
-): Promise<CrdtPutMessage | null> {
-  return new Promise((resolve, reject) => {
-    if (key.includes(".")) {
-      // Dots are used as a delimitator character between bublic keys and the key of the user's data
-      reject(new Error(`Key cannot include dots!; ${key}`));
-      return;
-    }
-
-    if (!this.userAccount.getAddress()) {
-      reject(new Error("You need to log in before you can PUT."));
-      return;
-    }
-
-    const timestamp = new Date().getTime();
-
-    const crdtChanges = crdt.getChanges();
-
-    const encodedData = JSON.stringify(crdtChanges);
-
-    const dataString = `${encodedData}${this.userAccount.getAddress()}${timestamp}`;
-
-    // WORK
-    proofOfWork(dataString, this.options.pow)
-      .then(({ hash, nonce }) => {
-        this.userAccount.signData(hash).then((signature) => {
-          if (signature && this.userAccount.getAddress()) {
-            // Compose the message
-            const data: VerificationData<any> = {
-              k: userNamespaced
-                ? `:${this.userAccount.getAddress()}.${key}`
-                : key,
-              a: this.userAccount.getAddress() || "",
-              n: nonce,
-              t: timestamp,
-              h: hash,
-              s: signature,
-              v: crdtChanges,
-              c: crdt.type,
-            };
-
-            this.logger("PUT CRDT", key, data);
-
-            const finalMessage: CrdtPutMessage<any> = {
-              type: "crdtPut",
-              id: textRandom(10),
-              to: [],
-              data,
-            };
-            this.network.sendToAll(finalMessage);
-            resolve(finalMessage);
-          }
-        });
-      })
-      .catch(reject);
-  });
-}
+import {
+  ToolDb,
+  CrdtPutMessage,
+  textRandom,
+  VerificationData,
+  proofOfWork,
+  BaseCrdt,
+} from ".";
+
+/**
+ * Triggers a PUT request to other peers.
+ * @param key key where we want to put the data at.
+ * @param value Data we want to any (any type)
+ * @param userNamespaced If this key bolongs to a user or its public. Making it private will enforce validation for our address and signatures.
+ * @returns Promise<Data | null>
+ */
+export default function toolDbCrdtPut<T = any>(
+  this: ToolDb,
+  key: string,
+  crdt: BaseCrdt<T, any, any>,
+  userNamespaced = false,
+  to?: string[]
+): Promise<CrdtPutMessage | null> {
+  return new Promise((resolve, reject) => {
+    if (key.includes(".")) {
+      // Dots are used as a delimitator character between bublic keys and the key of the user's data
+      reject(new Error(`Key cannot include dots!; ${key}`));
+      return;
+    }
+
+    if (!this.userAccount.getAddress()) {
+      reject(new Error("You need to log in before you can PUT."));
+      return;
+    }
+
+    const timestamp = new Date().getTime();
+
+    const crdtChanges = crdt.getChanges();
+
+    const encodedData = JSON.stringify(crdtChanges);
+
+    const dataString = `${encodedData}${this.userAccount.getAddress()}${timestamp}`;
+
+    // WORK
+    proofOfWork(dataString, this.options.pow)
+      .then(({ hash, nonce }) => {
+        this.userAccount.signData(hash).then((signature) => {
+          if (signature && this.userAccount.getAddress()) {
+            // Compose the message
+            const data: VerificationData<any> = {
+              k: userNamespaced
+                ? `:${this.userAccount.getAddress()}.${key}`
+                : key,
+              a: this.userAccount.getAddress() || "",
+              n: nonce,
+              t: timestamp,
+              h: hash,
+              s: signature,
+              v: crdtChanges,
+              c: crdt.type,
+            };
+
+            this.logger("PUT CRDT", key, data);
+
+            const finalMessage: CrdtPutMessage<any> = {
+              type: "crdtPut",
+              id: textRandom(10),
+              to: to || [],
+              data,
+            };
+            this.network.sendToAll(finalMessage);
+            resolve(finalMessage);
+          }
+        });
+      })
+      .catch(reject);
+  });
+}