tool-db 2.5.6 → 2.6.2

package/lib/messageHandlers/handleCrdtPut.ts

@@ -38,73 +38,83 @@ export default function handleCrdtPut(
       this.store
         .get(finalMessage.data.k)
         .then((oldData) => {
-          try {
-            const parsedOldData: VerificationData<any> = JSON.parse(oldData);
+          if (oldData) {
+            try {
+              const parsedOldData: VerificationData<any> = JSON.parse(oldData);
 
-            let newMessage = finalMessage;
+              let newMessage = finalMessage;
 
-            // Merge old document with new data incoming and save it
-            // Add handles for all kinds of CRDT we add
-            let oldDoc:
-              | MapCrdt<any>
-              | ListCrdt<any>
-              | CounterCrdt<any>
-              | undefined;
+              // Merge old document with new data incoming and save it
+              // Add handles for all kinds of CRDT we add
+              let oldDoc:
+                | MapCrdt<any>
+                | ListCrdt<any>
+                | CounterCrdt<any>
+                | undefined;
 
-            if (parsedOldData.c === CRDT_MAP) {
-              oldDoc = new MapCrdt(
-                this.userAccount.getAddress() || "",
-                parsedOldData.v
-              );
-            }
+              if (parsedOldData.c === CRDT_MAP) {
+                oldDoc = new MapCrdt(
+                  this.userAccount.getAddress() || "",
+                  parsedOldData.v
+                );
+              }
 
-            if (parsedOldData.c === CRDT_LIST) {
-              oldDoc = new ListCrdt(
-                this.userAccount.getAddress() || "",
-                parsedOldData.v
-              );
-            }
+              if (parsedOldData.c === CRDT_LIST) {
+                oldDoc = new ListCrdt(
+                  this.userAccount.getAddress() || "",
+                  parsedOldData.v
+                );
+              }
 
-            if (parsedOldData.c === CRDT_COUNTER) {
-              oldDoc = new CounterCrdt(
-                this.userAccount.getAddress() || "",
-                parsedOldData.v
-              );
-            }
+              if (parsedOldData.c === CRDT_COUNTER) {
+                oldDoc = new CounterCrdt(
+                  this.userAccount.getAddress() || "",
+                  parsedOldData.v
+                );
+              }
 
-            let changesMerged:
-              | MapChanges<any>[]
-              | ListChanges<any>[]
-              | CounterChanges[] = [];
+              let changesMerged:
+                | MapChanges<any>[]
+                | ListChanges<any>[]
+                | CounterChanges[] = [];
 
-            if (oldDoc) {
-              oldDoc.mergeChanges(finalMessage.data.v);
-              changesMerged = oldDoc.getChanges();
-            }
-            newMessage = {
-              ...finalMessage,
-            };
-            newMessage.data.v = changesMerged;
+              if (oldDoc) {
+                oldDoc.mergeChanges(finalMessage.data.v);
+                changesMerged = oldDoc.getChanges();
+              }
+              newMessage = {
+                ...finalMessage,
+              };
+              newMessage.data.v = changesMerged;
 
-            if (parsedOldData.t < finalMessage.data.t) {
-              const key = newMessage.data.k;
-              this.triggerKeyListener(key, newMessage.data);
-              this.store
-                .put(newMessage.data.k, JSON.stringify(newMessage.data))
-                .catch((e) => {
-                  // do nothing
-                });
-            } else {
-              const key = message.data.k;
-              this.triggerKeyListener(key, parsedOldData);
+              if (parsedOldData.t < finalMessage.data.t) {
+                const key = newMessage.data.k;
+                this.triggerKeyListener(key, newMessage.data);
+                this.store
+                  .put(newMessage.data.k, JSON.stringify(newMessage.data))
+                  .catch((e) => {
+                    // do nothing
+                  });
+              } else {
+                const key = message.data.k;
+                this.triggerKeyListener(key, parsedOldData);
+              }
+              // } else {
+              //   this.logger(
+              //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
+              //   );
+              // }
+            } catch (e) {
+              this.logger("Couldnt parse crdt data", oldData, e);
             }
-            // } else {
-            //   this.logger(
-            //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
-            //   );
-            // }
-          } catch (e) {
-            this.logger("Couldnt parse crdt data", oldData, e);
+          } else {
+            const key = finalMessage.data.k;
+            this.triggerKeyListener(key, finalMessage.data);
+            this.store
+              .put(finalMessage.data.k, JSON.stringify(finalMessage.data))
+              .catch((e) => {
+                this.logger("Couldnt insert crdt data", e);
+              });
           }
         })
         .catch((e) => {

package/lib/messageHandlers/handleFunction.ts

@@ -22,7 +22,7 @@ export default function handleFunction(
         })
         .catch((e) => {
           const messageReturn: FunctionReturnMessage = {
-            return: JSON.stringify(e),
+            return: e.toString(),
             type: "functionReturn",
             id: message.id,
             code: "ERR",

package/lib/messageHandlers/handlePong.ts

@@ -11,19 +11,26 @@ export default function handlePong(
   }
 
   message.servers.forEach((peer) => {
-    verifyPeer(this, peer).then((verified) => {
-      // Verify integrity and topic
-      if (verified && peer.topic === this.options.topic) {
-        // Add this peer to our list of peers
-        const filteredPeers = this.serverPeers.filter(
-          (p) => p.address === peer.address
-        );
-        if (filteredPeers.length === 0 && peer.host && peer.port) {
-          // Add this peer to the list
-          this.serverPeers.push(peer);
+    // Check for duplicates first (synchronously) to avoid race conditions
+    const filteredPeers = this.serverPeers.filter(
+      (p) => p.address === peer.address
+    );
+    
+    if (filteredPeers.length === 0 && peer.host && peer.port) {
+      verifyPeer(this, peer).then((verified) => {
+        // Verify integrity and topic
+        if (verified && peer.topic === this.options.topic) {
+          // Double-check for duplicates after async verification
+          const recheck = this.serverPeers.filter(
+            (p) => p.address === peer.address
+          );
+          if (recheck.length === 0) {
+            // Add this peer to the list
+            this.serverPeers.push(peer);
+          }
         }
-      }
-    });
+      });
+    }
   });
 
   this.onPeerConnect(this.peerAccount.getAddress() || "");

package/lib/toolDbAnonSignIn.ts

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

package/lib/toolDbCrdtGet.ts

@@ -41,7 +41,7 @@ export default function toolDbCrdtGet<T = any>(
             resolve(null);
           }
         })
-        .catch((e) => reject(null));
+        .catch((e) => resolve(null));
     }, timeoutMs);
 
     this.addIdListener(msgId, (msg) => {

package/lib/toolDbKeysSignIn.ts

@@ -1,16 +1,13 @@
 import { ToolDb, randomAnimal } from ".";
 
-export default function toolDbKeysSignIn(
+export default async function toolDbKeysSignIn(
   this: ToolDb,
   privateKey: string,
   username?: string
 ): Promise<unknown> {
   if (!this.userAccount) return Promise.resolve(undefined);
 
-  return this.userAccount
-    .getAccountFromPrivate(privateKey)
-    .then((newAccount) => {
-      this.userAccount.setUser(newAccount, username || randomAnimal());
-      return newAccount;
-    });
+  const newAccount = await this.userAccount.getAccountFromPrivate(privateKey);
+  await this.userAccount.setUser(newAccount, username || randomAnimal());
+  return newAccount;
 }

package/lib/toolDbQueryKeys.ts

@@ -27,14 +27,18 @@ export default function toolDbQueryKeys(
     let foundKeys: string[] = [];
     let timeout: NodeJS.Timeout | undefined;
 
+    let gotLocalKeys = false;
+
     this.store
       .query(finalKey)
       .then((localKeys) => {
         foundKeys = [...foundKeys, ...localKeys];
+        gotLocalKeys = true;
         timeout = setTimeout(finishListening, timeoutMs);
       })
       .catch((e) => {
-        // do nothing
+        gotLocalKeys = true;
+        timeout = setTimeout(finishListening, timeoutMs);
       });
 
     const finishListening = () => {
@@ -50,7 +54,9 @@ export default function toolDbQueryKeys(
         if (timeout) {
           clearTimeout(timeout);
         }
-        timeout = setTimeout(finishListening, timeoutMs);
+        if (gotLocalKeys) {
+          timeout = setTimeout(finishListening, timeoutMs);
+        }
       }
     });
 

package/lib/toolDbSignIn.ts

@@ -7,7 +7,7 @@ export default function toolDbSignIn(
   to?: string[]
 ): Promise<unknown | undefined> {
   return new Promise((resolve, reject) => {
-    this.getData<unknown>(`==${user}`, false, 5000, to).then((_user) => {
+    this.getData<unknown>(`==${user}`, false, 2000, to).then((_user) => {
       if (!_user) {
         reject("Could not find user");
         return;
@@ -16,17 +16,22 @@ export default function toolDbSignIn(
       try {
         this.userAccount
           .decryptAccount(_user, sha256(password))
-          .then((newAccount) => {
-            this.userAccount.setUser(
+          .then(async (newAccount) => {
+            await this.userAccount.setUser(
               newAccount,
               user || `Anonymous ${randomAnimal()}`
             );
 
             resolve(_user);
+          })
+          .catch((e) => {
+            reject(e);
           });
       } catch (e) {
         reject(e);
       }
+    }).catch((e) => {
+      reject(e);
     });
   });
 }

package/lib/toolDbSignUp.ts

@@ -25,7 +25,7 @@ export default async function toolDbSignUp(
               userData
             )}${account.getAddress()}${timestamp}`;
 
-            proofOfWork(userDataString, 0)
+            proofOfWork(userDataString, this.options.pow)
               .then(({ hash, nonce }) => {
                 account.signData(hash).then((signature) => {
                   const signupMessage: VerificationData = {

package/lib/tooldb.ts

@@ -320,8 +320,8 @@ export default class ToolDb extends EventEmitter {
       .then((val) => {
         this.peerAccount
           .decryptAccount(JSON.parse(val), DEFAULT_KEYS)
-          .then((a) => {
-            this.peerAccount.setUser(a, randomAnimal());
+          .then(async (a) => {
+            await this.peerAccount.setUser(a, randomAnimal());
           })
           .finally(() => {
             this.emit("init", this.userAccount.getAddress());

package/lib/types/tooldb.ts

@@ -46,9 +46,10 @@ export interface ToolDbOptions {
    */
   wait: number;
   /**
-   * Port to listen incoming connections (server only)
+   * Proof of work difficulty (number of leading zeroes required).
+   * Set to null to bypass POW calculations entirely (useful for testing/CI).
    */
-  pow: number;
+  pow: number | null;
   /**
    * Whether we are a server or not
    */

package/lib/utils/encoding/arrayBufferToString.ts

@@ -1,8 +1,4 @@
-export default function arrayBufferToString(arr: ArrayBuffer) {
-  const byteArray = new Uint8Array(arr);
-  let byteString = "";
-  for (let i = 0; i < byteArray.byteLength; i += 1) {
-    byteString += String.fromCodePoint(byteArray[i]);
-  }
-  return byteString;
+export default function arrayBufferToString(arr: ArrayBuffer): string {
+  const decoder = new TextDecoder();
+  return decoder.decode(arr);
 }

package/lib/utils/encoding/base64ToUint8.ts

@@ -0,0 +1,13 @@
+import fromBase64 from "./fromBase64";
+
+export default function base64ToUint8(based: string): Uint8Array {
+  const str = fromBase64(based);
+
+  const buf = new ArrayBuffer(str.length);
+  const bufView = new Uint8Array(buf);
+  for (let i = 0, strLen = str.length; i < strLen; i += 1) {
+    bufView[i] = str.charCodeAt(i);
+  }
+  return bufView;
+}
+

package/lib/utils/encoding/fromBase64.ts

@@ -0,0 +1,4 @@
+export default function fromBase64(str: string) {
+  return decodeURIComponent(escape(global.atob(str)));
+}
+

package/lib/utils/encoding/stringToArrayBuffer.ts

@@ -1,8 +1,4 @@
-export default function stringToArrayBuffer(str: string) {
-  const buf = new ArrayBuffer(str.length);
-  const bufView = new Uint8Array(buf);
-  for (let i = 0, strLen = str.length; i < strLen; i += 1) {
-    bufView[i] = str.charCodeAt(i);
-  }
-  return buf;
+export default function stringToArrayBuffer(str: string): ArrayBuffer {
+  const encoder = new TextEncoder();
+  return encoder.encode(str).buffer;
 }

package/lib/utils/encoding/toBase64.ts

@@ -0,0 +1,4 @@
+export default function toBase64(str: string) {
+  return global.btoa(unescape(encodeURIComponent(str)));
+}
+

package/lib/utils/encoding/uint8ToBase64.ts

@@ -0,0 +1,11 @@
+import toBase64 from "./toBase64";
+
+export default function uint8ToBase64(byteArray: Uint8Array): string {
+  let byteString = "";
+  for (let i = 0; i < byteArray.byteLength; i += 1) {
+    byteString += String.fromCodePoint(byteArray[i]);
+  }
+
+  return toBase64(byteString);
+}
+

package/lib/utils/generateGroupKey.ts

@@ -0,0 +1,11 @@
+import arrayBufferToHex from "./encoding/arrayBufferToHex";
+
+/**
+ * Generate a random 256-bit symmetric key for group encryption.
+ * Returns the key as a hex string for easy storage and transmission.
+ */
+export default function generateGroupKey(): string {
+  const key = crypto.getRandomValues(new Uint8Array(32));
+  return arrayBufferToHex(key.buffer);
+}
+

package/lib/utils/proofOfWork.ts

@@ -1,10 +1,25 @@
 import { sha256 } from "..";
 
+/**
+ * Calculates proof of work by finding a nonce that produces a hash
+ * with the required number of leading zeroes.
+ * @param value The value to hash
+ * @param difficulty Number of leading zeroes required. Pass null to skip POW entirely.
+ * @returns Promise with nonce and hash
+ */
 export default function proofOfWork(
   value: string,
-  difficulty: number
+  difficulty: number | null
 ): Promise<{ nonce: number; hash: string }> {
   return new Promise((resolve) => {
+    // When difficulty is null, skip POW calculation entirely
+    // Just return hash with nonce 0 (useful for testing/CI)
+    if (difficulty === null || difficulty === 0) {
+      const hash = sha256(`${value}0`);
+      resolve({ nonce: 0, hash });
+      return;
+    }
+
     let nonce = 0;
     let hash = sha256(`${value}${nonce}`);
     while (hash.substring(0, difficulty) !== Array(difficulty + 1).join("0")) {

package/lib/utils/verifyMessage.ts

@@ -9,7 +9,7 @@ import { ToolDb, VerifyResult, VerificationData, sha256 } from "..";
 export default async function verifyMessage<T>(
   this: ToolDb,
   msg: Partial<VerificationData<T>>,
-  pow = 0
+  pow: number | null = 0
 ): Promise<VerifyResult> {
   // this.logger("verify: ", msg);
   const strData = JSON.stringify(msg.v);
@@ -66,8 +66,8 @@ export default async function verifyMessage<T>(
   // Verify hash and nonce (adjust zeroes for difficulty of the network)
   // While this POW does not enforce security per-se, it does make it harder
   // for attackers to spam the network, and could be adjusted by peers.
-  // Disabled for now because it is painful on large requests
-  if (pow > 0) {
+  // When pow is null, skip POW verification entirely (useful for testing/CI)
+  if (pow !== null && pow > 0) {
     if (msg.h.slice(0, pow) !== new Array(pow).fill("0").join("")) {
       // this.logger("No valid hash (no pow)");
       return VerifyResult.NoProofOfWork;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tool-db",
-  "version": "2.5.6",
+  "version": "2.6.2",
   "description": "A decentralized database model for federated p2p networks.n",
   "author": "Manwe <manuel.etchegaray7@gmail.com>",
   "homepage": "https://github.com/Manwe-777/tool-db#readme",
@@ -28,5 +28,5 @@
     "typescript": "^4.7.4",
     "uglify-js": "^3.16.2"
   },
-  "gitHead": "ca8b876dcf1e78ad92d9369961d7479e07df0954"
+  "gitHead": "d1ce553320888c1c5f0b99d6e7c06580cb4dadfd"
 }