tinybase 5.0.0-beta.12 → 5.0.0-beta.14

package/lib/debug/synchronizers/synchronizer-local.js

@@ -1,8 +1,6 @@
 const EMPTY_STRING = '';
-const strCharCodeAt = (str, position) => str.charCodeAt(position);
 
 const promise = Promise;
-const mathMax = Math.max;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -11,6 +9,8 @@ const size = (arrayOrString) => arrayOrString.length;
 const promiseNew = (resolver) => new promise(resolver);
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
+const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -55,22 +55,11 @@ const mapSet = (map, key, value) =>
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
-  } else {
-    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
-const textEncoder = new globalThis.TextEncoder();
-const getHash = (value) => {
-  let hash = 2166136261;
-  arrayForEach(textEncoder.encode(value), (char) => {
-    hash ^= char;
-    hash +=
-      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
-  });
-  return hash >>> 0;
-};
+new globalThis.TextEncoder();
 
 const newStamp = (value, time) => (time ? [value, time] : [value]);
 const getLatestTime = (time1, time2) =>
@@ -80,7 +69,7 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
 const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && 'getMergeableContent' in store
+  supportedStoreType > 1 && 'merge' in store
     ? [
         1,
         store.getMergeableContent,
@@ -262,77 +251,19 @@ const createCustomPersister = (
 };
 
 const MASK6 = 63;
-const SHIFT36 = 2 ** 36;
-const SHIFT30 = 2 ** 30;
-const SHIFT24 = 2 ** 24;
-const SHIFT18 = 2 ** 18;
-const SHIFT12 = 2 ** 12;
-const SHIFT6 = 2 ** 6;
-const toB64 = (num) => String.fromCharCode(48 + (num & MASK6));
-const fromB64 = (str, pos) => strCharCodeAt(str, pos) - 48;
-const encodeHlc = (logicalTime42, counter24, clientHash30) =>
-  toB64(logicalTime42 / SHIFT36) +
-  toB64(logicalTime42 / SHIFT30) +
-  toB64(logicalTime42 / SHIFT24) +
-  toB64(logicalTime42 / SHIFT18) +
-  toB64(logicalTime42 / SHIFT12) +
-  toB64(logicalTime42 / SHIFT6) +
-  toB64(logicalTime42) +
-  toB64(counter24 / SHIFT18) +
-  toB64(counter24 / SHIFT12) +
-  toB64(counter24 / SHIFT6) +
-  toB64(counter24) +
-  toB64(clientHash30 / SHIFT24) +
-  toB64(clientHash30 / SHIFT18) +
-  toB64(clientHash30 / SHIFT12) +
-  toB64(clientHash30 / SHIFT6) +
-  toB64(clientHash30);
-const decodeHlc = (hlc16) => [
-  fromB64(hlc16, 0) * SHIFT36 +
-    fromB64(hlc16, 1) * SHIFT30 +
-    fromB64(hlc16, 2) * SHIFT24 +
-    fromB64(hlc16, 3) * SHIFT18 +
-    fromB64(hlc16, 4) * SHIFT12 +
-    fromB64(hlc16, 5) * SHIFT6 +
-    fromB64(hlc16, 6),
-  fromB64(hlc16, 7) * SHIFT18 +
-    fromB64(hlc16, 8) * SHIFT12 +
-    fromB64(hlc16, 9) * SHIFT6 +
-    fromB64(hlc16, 10),
-  fromB64(hlc16, 11) * SHIFT24 +
-    fromB64(hlc16, 12) * SHIFT18 +
-    fromB64(hlc16, 13) * SHIFT12 +
-    fromB64(hlc16, 14) * SHIFT6 +
-    fromB64(hlc16, 15),
-];
-const getHlcFunctions = (uniqueId) => {
-  let logicalTime = 0;
-  let lastCounter = -1;
-  const uniqueIdHash = getHash(uniqueId);
-  const getHlc = () => {
-    seenHlc();
-    return encodeHlc(logicalTime, ++lastCounter, uniqueIdHash);
-  };
-  const seenHlc = (hlc) => {
-    const previousLogicalTime = logicalTime;
-    const [remoteLogicalTime, remoteCounter] =
-      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      globalThis.HLC_TIME ?? Date.now(),
-    );
-    lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
-          ? mathMax(lastCounter, remoteCounter)
-          : lastCounter
-        : logicalTime == remoteLogicalTime
-          ? remoteCounter
-          : -1;
-  };
-  return [getHlc, seenHlc];
-};
+const ENCODE =
+  '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
+    EMPTY_STRING,
+  );
+mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
+const encode = (num) => ENCODE[num & MASK6];
+
+const getUniqueId = (length = 16) =>
+  arrayReduce(
+    crypto.getRandomValues(new Uint8Array(length)),
+    (uniqueId, number) => uniqueId + encode(number),
+    '',
+  );
 
 const RESPONSE = 0;
 const GET_CONTENT_HASHES = 1;
@@ -354,7 +285,6 @@ const createCustomSynchronizer = (
   let persisterListener;
   let sends = 0;
   let receives = 0;
-  const [getHlc] = getHlcFunctions(store.getId());
   const pendingRequests = mapNew();
   onReceive((fromClientId, requestId, messageType, messageBody) => {
     {
@@ -399,7 +329,7 @@ const createCustomSynchronizer = (
   });
   const request = async (toClientId, messageType, messageBody = EMPTY_STRING) =>
     promiseNew((resolve, reject) => {
-      const requestId = getHlc();
+      const requestId = getUniqueId();
       const timeout = setTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -533,7 +463,7 @@ const createCustomSynchronizer = (
 
 const clients = mapNew();
 const createLocalSynchronizer = (store, onIgnoredError) => {
-  const clientId = '' + Math.random();
+  const clientId = getUniqueId();
   const send = (toClientId, requestId, messageType, messageBody) => {
     setTimeout(
       () =>

package/lib/debug/synchronizers/synchronizer-ws-client.js

@@ -1,9 +1,7 @@
 const EMPTY_STRING = '';
 const UTF8 = 'utf8';
-const strCharCodeAt = (str, position) => str.charCodeAt(position);
 
 const promise = Promise;
-const mathMax = Math.max;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -13,6 +11,8 @@ const size = (arrayOrString) => arrayOrString.length;
 const promiseNew = (resolver) => new promise(resolver);
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
+const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -66,22 +66,11 @@ const mapSet = (map, key, value) =>
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
-  } else {
-    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
-const textEncoder = new globalThis.TextEncoder();
-const getHash = (value) => {
-  let hash = 2166136261;
-  arrayForEach(textEncoder.encode(value), (char) => {
-    hash ^= char;
-    hash +=
-      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
-  });
-  return hash >>> 0;
-};
+new globalThis.TextEncoder();
 
 const newStamp = (value, time) => (time ? [value, time] : [value]);
 const getLatestTime = (time1, time2) =>
@@ -91,7 +80,7 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
 const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && 'getMergeableContent' in store
+  supportedStoreType > 1 && 'merge' in store
     ? [
         1,
         store.getMergeableContent,
@@ -273,77 +262,19 @@ const createCustomPersister = (
 };
 
 const MASK6 = 63;
-const SHIFT36 = 2 ** 36;
-const SHIFT30 = 2 ** 30;
-const SHIFT24 = 2 ** 24;
-const SHIFT18 = 2 ** 18;
-const SHIFT12 = 2 ** 12;
-const SHIFT6 = 2 ** 6;
-const toB64 = (num) => String.fromCharCode(48 + (num & MASK6));
-const fromB64 = (str, pos) => strCharCodeAt(str, pos) - 48;
-const encodeHlc = (logicalTime42, counter24, clientHash30) =>
-  toB64(logicalTime42 / SHIFT36) +
-  toB64(logicalTime42 / SHIFT30) +
-  toB64(logicalTime42 / SHIFT24) +
-  toB64(logicalTime42 / SHIFT18) +
-  toB64(logicalTime42 / SHIFT12) +
-  toB64(logicalTime42 / SHIFT6) +
-  toB64(logicalTime42) +
-  toB64(counter24 / SHIFT18) +
-  toB64(counter24 / SHIFT12) +
-  toB64(counter24 / SHIFT6) +
-  toB64(counter24) +
-  toB64(clientHash30 / SHIFT24) +
-  toB64(clientHash30 / SHIFT18) +
-  toB64(clientHash30 / SHIFT12) +
-  toB64(clientHash30 / SHIFT6) +
-  toB64(clientHash30);
-const decodeHlc = (hlc16) => [
-  fromB64(hlc16, 0) * SHIFT36 +
-    fromB64(hlc16, 1) * SHIFT30 +
-    fromB64(hlc16, 2) * SHIFT24 +
-    fromB64(hlc16, 3) * SHIFT18 +
-    fromB64(hlc16, 4) * SHIFT12 +
-    fromB64(hlc16, 5) * SHIFT6 +
-    fromB64(hlc16, 6),
-  fromB64(hlc16, 7) * SHIFT18 +
-    fromB64(hlc16, 8) * SHIFT12 +
-    fromB64(hlc16, 9) * SHIFT6 +
-    fromB64(hlc16, 10),
-  fromB64(hlc16, 11) * SHIFT24 +
-    fromB64(hlc16, 12) * SHIFT18 +
-    fromB64(hlc16, 13) * SHIFT12 +
-    fromB64(hlc16, 14) * SHIFT6 +
-    fromB64(hlc16, 15),
-];
-const getHlcFunctions = (uniqueId) => {
-  let logicalTime = 0;
-  let lastCounter = -1;
-  const uniqueIdHash = getHash(uniqueId);
-  const getHlc = () => {
-    seenHlc();
-    return encodeHlc(logicalTime, ++lastCounter, uniqueIdHash);
-  };
-  const seenHlc = (hlc) => {
-    const previousLogicalTime = logicalTime;
-    const [remoteLogicalTime, remoteCounter] =
-      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      globalThis.HLC_TIME ?? Date.now(),
-    );
-    lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
-          ? mathMax(lastCounter, remoteCounter)
-          : lastCounter
-        : logicalTime == remoteLogicalTime
-          ? remoteCounter
-          : -1;
-  };
-  return [getHlc, seenHlc];
-};
+const ENCODE =
+  '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
+    EMPTY_STRING,
+  );
+mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
+const encode = (num) => ENCODE[num & MASK6];
+
+const getUniqueId = (length = 16) =>
+  arrayReduce(
+    crypto.getRandomValues(new Uint8Array(length)),
+    (uniqueId, number) => uniqueId + encode(number),
+    '',
+  );
 
 const RESPONSE = 0;
 const GET_CONTENT_HASHES = 1;
@@ -365,7 +296,6 @@ const createCustomSynchronizer = (
   let persisterListener;
   let sends = 0;
   let receives = 0;
-  const [getHlc] = getHlcFunctions(store.getId());
   const pendingRequests = mapNew();
   onReceive((fromClientId, requestId, messageType, messageBody) => {
     {
@@ -410,7 +340,7 @@ const createCustomSynchronizer = (
   });
   const request = async (toClientId, messageType, messageBody = EMPTY_STRING) =>
     promiseNew((resolve, reject) => {
-      const requestId = getHlc();
+      const requestId = getUniqueId();
       const timeout = setTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(

package/lib/debug/synchronizers.js

@@ -1,8 +1,6 @@
 const EMPTY_STRING = '';
-const strCharCodeAt = (str, position) => str.charCodeAt(position);
 
 const promise = Promise;
-const mathMax = Math.max;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -11,6 +9,8 @@ const size = (arrayOrString) => arrayOrString.length;
 const promiseNew = (resolver) => new promise(resolver);
 
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
+const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -52,22 +52,11 @@ const mapSet = (map, key, value) =>
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
-  } else {
-    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
-const textEncoder = new globalThis.TextEncoder();
-const getHash = (value) => {
-  let hash = 2166136261;
-  arrayForEach(textEncoder.encode(value), (char) => {
-    hash ^= char;
-    hash +=
-      (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
-  });
-  return hash >>> 0;
-};
+new globalThis.TextEncoder();
 
 const newStamp = (value, time) => (time ? [value, time] : [value]);
 const getLatestTime = (time1, time2) =>
@@ -77,7 +66,7 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
 const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && 'getMergeableContent' in store
+  supportedStoreType > 1 && 'merge' in store
     ? [
         1,
         store.getMergeableContent,
@@ -259,77 +248,19 @@ const createCustomPersister = (
 };
 
 const MASK6 = 63;
-const SHIFT36 = 2 ** 36;
-const SHIFT30 = 2 ** 30;
-const SHIFT24 = 2 ** 24;
-const SHIFT18 = 2 ** 18;
-const SHIFT12 = 2 ** 12;
-const SHIFT6 = 2 ** 6;
-const toB64 = (num) => String.fromCharCode(48 + (num & MASK6));
-const fromB64 = (str, pos) => strCharCodeAt(str, pos) - 48;
-const encodeHlc = (logicalTime42, counter24, clientHash30) =>
-  toB64(logicalTime42 / SHIFT36) +
-  toB64(logicalTime42 / SHIFT30) +
-  toB64(logicalTime42 / SHIFT24) +
-  toB64(logicalTime42 / SHIFT18) +
-  toB64(logicalTime42 / SHIFT12) +
-  toB64(logicalTime42 / SHIFT6) +
-  toB64(logicalTime42) +
-  toB64(counter24 / SHIFT18) +
-  toB64(counter24 / SHIFT12) +
-  toB64(counter24 / SHIFT6) +
-  toB64(counter24) +
-  toB64(clientHash30 / SHIFT24) +
-  toB64(clientHash30 / SHIFT18) +
-  toB64(clientHash30 / SHIFT12) +
-  toB64(clientHash30 / SHIFT6) +
-  toB64(clientHash30);
-const decodeHlc = (hlc16) => [
-  fromB64(hlc16, 0) * SHIFT36 +
-    fromB64(hlc16, 1) * SHIFT30 +
-    fromB64(hlc16, 2) * SHIFT24 +
-    fromB64(hlc16, 3) * SHIFT18 +
-    fromB64(hlc16, 4) * SHIFT12 +
-    fromB64(hlc16, 5) * SHIFT6 +
-    fromB64(hlc16, 6),
-  fromB64(hlc16, 7) * SHIFT18 +
-    fromB64(hlc16, 8) * SHIFT12 +
-    fromB64(hlc16, 9) * SHIFT6 +
-    fromB64(hlc16, 10),
-  fromB64(hlc16, 11) * SHIFT24 +
-    fromB64(hlc16, 12) * SHIFT18 +
-    fromB64(hlc16, 13) * SHIFT12 +
-    fromB64(hlc16, 14) * SHIFT6 +
-    fromB64(hlc16, 15),
-];
-const getHlcFunctions = (uniqueId) => {
-  let logicalTime = 0;
-  let lastCounter = -1;
-  const uniqueIdHash = getHash(uniqueId);
-  const getHlc = () => {
-    seenHlc();
-    return encodeHlc(logicalTime, ++lastCounter, uniqueIdHash);
-  };
-  const seenHlc = (hlc) => {
-    const previousLogicalTime = logicalTime;
-    const [remoteLogicalTime, remoteCounter] =
-      isUndefined(hlc) || hlc == '' ? [0, 0] : decodeHlc(hlc);
-    logicalTime = mathMax(
-      previousLogicalTime,
-      remoteLogicalTime,
-      globalThis.HLC_TIME ?? Date.now(),
-    );
-    lastCounter =
-      logicalTime == previousLogicalTime
-        ? logicalTime == remoteLogicalTime
-          ? mathMax(lastCounter, remoteCounter)
-          : lastCounter
-        : logicalTime == remoteLogicalTime
-          ? remoteCounter
-          : -1;
-  };
-  return [getHlc, seenHlc];
-};
+const ENCODE =
+  '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
+    EMPTY_STRING,
+  );
+mapNew(arrayMap(ENCODE, (char, index) => [char, index]));
+const encode = (num) => ENCODE[num & MASK6];
+
+const getUniqueId = (length = 16) =>
+  arrayReduce(
+    crypto.getRandomValues(new Uint8Array(length)),
+    (uniqueId, number) => uniqueId + encode(number),
+    '',
+  );
 
 const RESPONSE = 0;
 const GET_CONTENT_HASHES = 1;
@@ -351,7 +282,6 @@ const createCustomSynchronizer = (
   let persisterListener;
   let sends = 0;
   let receives = 0;
-  const [getHlc] = getHlcFunctions(store.getId());
   const pendingRequests = mapNew();
   onReceive((fromClientId, requestId, messageType, messageBody) => {
     {
@@ -396,7 +326,7 @@ const createCustomSynchronizer = (
   });
   const request = async (toClientId, messageType, messageBody = EMPTY_STRING) =>
     promiseNew((resolve, reject) => {
-      const requestId = getHlc();
+      const requestId = getUniqueId();
       const timeout = setTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(