@byearlybird/starling 0.7.1 → 0.8.0

package/dist/index.js

@@ -141,16 +141,21 @@ const processDocument = (doc, process) => {
 
 //#endregion
 //#region src/eventstamp.ts
-const encodeEventstamp = (timestampMs, counter) => {
-	return `${new Date(timestampMs).toISOString()}|${counter.toString(16).padStart(8, "0")}`;
+const generateNonce = () => {
+	return Math.random().toString(16).slice(2, 6).padStart(4, "0");
+};
+const encodeEventstamp = (timestampMs, counter, nonce) => {
+	return `${new Date(timestampMs).toISOString()}|${counter.toString(16).padStart(4, "0")}|${nonce}`;
 };
 const decodeEventstamp = (eventstamp) => {
-	const pipeIndex = eventstamp.indexOf("|");
-	const isoString = eventstamp.slice(0, pipeIndex);
-	const hexCounter = eventstamp.slice(pipeIndex + 1);
+	const parts = eventstamp.split("|");
+	const isoString = parts[0];
+	const hexCounter = parts[1];
+	const nonce = parts[2];
 	return {
 		timestampMs: new Date(isoString).getTime(),
-		counter: parseInt(hexCounter, 16)
+		counter: parseInt(hexCounter, 16),
+		nonce
 	};
 };
 
@@ -159,23 +164,29 @@ const decodeEventstamp = (eventstamp) => {
 const createClock = () => {
 	let counter = 0;
 	let lastMs = Date.now();
+	let lastNonce = generateNonce();
 	return {
 		now: () => {
 			const wallMs = Date.now();
 			if (wallMs > lastMs) {
 				lastMs = wallMs;
 				counter = 0;
-			} else counter++;
-			return encodeEventstamp(lastMs, counter);
+				lastNonce = generateNonce();
+			} else {
+				counter++;
+				lastNonce = generateNonce();
+			}
+			return encodeEventstamp(lastMs, counter, lastNonce);
 		},
 		latest() {
-			return encodeEventstamp(lastMs, counter);
+			return encodeEventstamp(lastMs, counter, lastNonce);
 		},
 		forward(eventstamp) {
 			if (eventstamp > this.latest()) {
 				const newer = decodeEventstamp(eventstamp);
 				lastMs = newer.timestampMs;
 				counter = newer.counter;
+				lastNonce = newer.nonce;
 			}
 		}
 	};

package/dist/plugin-unstorage.d.ts

@@ -10,6 +10,7 @@ type UnstorageConfig = {
   pollIntervalMs?: number;
   onBeforeSet?: UnstorageOnBeforeSet;
   onAfterGet?: UnstorageOnAfterGet;
+  skip?: () => boolean;
 };
 declare const unstoragePlugin: <T>(key: string, storage: Storage<StoreSnapshot>, config?: UnstorageConfig) => Plugin<T>;
 //#endregion

package/dist/plugin-unstorage.js

@@ -1,6 +1,6 @@
 //#region src/plugins/unstorage/plugin.ts
 const unstoragePlugin = (key, storage, config = {}) => {
-	const { debounceMs = 0, pollIntervalMs, onBeforeSet, onAfterGet } = config;
+	const { debounceMs = 0, pollIntervalMs, onBeforeSet, onAfterGet, skip } = config;
 	let debounceTimer = null;
 	let pollInterval = null;
 	let store = null;
@@ -11,6 +11,7 @@ const unstoragePlugin = (key, storage, config = {}) => {
 		await storage.set(key, persisted);
 	};
 	const schedulePersist = () => {
+		if (skip?.()) return;
 		const runPersist = () => {
 			debounceTimer = null;
 			persistSnapshot();
@@ -23,8 +24,8 @@ const unstoragePlugin = (key, storage, config = {}) => {
 		debounceTimer = setTimeout(runPersist, debounceMs);
 	};
 	const pollStorage = async () => {
-		console.log("poll");
 		if (!store) return;
+		if (skip?.()) return;
 		const persisted = await storage.get(key);
 		if (!persisted) return;
 		const data = onAfterGet !== void 0 ? await onAfterGet(persisted) : persisted;
@@ -32,7 +33,7 @@ const unstoragePlugin = (key, storage, config = {}) => {
 		store.forwardClock(data.latestEventstamp);
 		store.begin((tx) => {
 			for (const doc of data.docs) tx.merge(doc);
-		}, { silent: true });
+		});
 	};
 	return { hooks: {
 		onInit: async (s) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@byearlybird/starling",
-	"version": "0.7.1",
+	"version": "0.8.0",
 	"type": "module",
 	"license": "MIT",
 	"main": "./dist/index.js",