supastash 0.1.13 → 0.1.15

package/dist/hooks/supastashData/fetchCalls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchCalls.d.ts","sourceRoot":"","sources":["../../../src/hooks/supastashData/fetchCalls.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE,wBAAgB,UAAU,CAAC,CAAC,EAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAC3B,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC;;;;;EAsEtC"}
+{"version":3,"file":"fetchCalls.d.ts","sourceRoot":"","sources":["../../../src/hooks/supastashData/fetchCalls.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKjE,wBAAgB,UAAU,CAAC,CAAC,EAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAC3B,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC;;;;;EAyEtC"}

package/dist/hooks/supastashData/fetchCalls.js

@@ -23,6 +23,9 @@ export function fetchCalls(table, options, initialized) {
                 pull: onInsertAndUpdate,
             });
         }
+        return () => {
+            tableFilters.delete(table);
+        };
     }, []);
     const fetch = async () => {
         if (!cancelled.current) {

package/dist/hooks/supastashData/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/supastashData/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAWxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EACtC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,eAAoB,GAC5B,mBAAmB,CAAC,CAAC,CAAC,CA2ExB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/supastashData/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAUxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EACtC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,eAAoB,GAC5B,mBAAmB,CAAC,CAAC,CAAC,CA+ExB"}

package/dist/hooks/supastashData/index.js

@@ -6,7 +6,6 @@ import useRealtimeData from "../../utils/fetchData/realTimeCall";
 import useDataState from "./dataState";
 import useEventQueues from "./eventQueues";
 import { fetchCalls } from "./fetchCalls";
-import { unregisterSub } from "./registerSub";
 const tableSubscriptions = new Map();
 /**
  * @description
@@ -64,31 +63,35 @@ const tableSubscriptions = new Map();
 export function useSupastashData(table, options = {}) {
     const { filter, lazy = false, flushIntervalMs = 100, shouldFetch = true, realtime = true, } = options;
     const hasTriggeredRef = useRef(false);
+    const unsub = useRef(null);
     const { dataMap, data, groupedBy, } = useDataState(table);
     const queueHandler = useEventQueues(table, options, flushIntervalMs);
     const { triggerRefresh, trigger, cancel, initialFetchAndSync } = fetchCalls(table, options, hasTriggeredRef);
+    const subKey = useMemo(() => `${table}:${buildFilterString(filter)}`, [table, filter]);
     useEffect(() => {
         if (!shouldFetch || (lazy && !hasTriggeredRef.current))
             return;
-        const subKey = `${table}:${buildFilterString(filter)}`;
         if (!tableSubscriptions.get(subKey)) {
             tableSubscriptions.set(subKey, true);
             initialFetchAndSync();
-            const unsub = AppState.addEventListener("change", (state) => {
+            unsub.current = AppState.addEventListener("change", (state) => {
                 if (state === "active") {
                     initialFetchAndSync();
                 }
             });
             supastashEventBus.on(`refresh:${table}`, triggerRefresh);
             supastashEventBus.on(`refresh:all`, triggerRefresh);
-            return () => {
-                supastashEventBus.off?.(`refresh:${table}`, triggerRefresh);
-                supastashEventBus.off?.(`refresh:all`, triggerRefresh);
-                unsub.remove();
-                unregisterSub(table, filter);
-            };
         }
-    }, [lazy, shouldFetch]);
+        else {
+            initialFetchAndSync();
+        }
+        return () => {
+            supastashEventBus.off?.(`refresh:${table}`, triggerRefresh);
+            supastashEventBus.off?.(`refresh:all`, triggerRefresh);
+            unsub.current?.remove();
+            tableSubscriptions.delete(subKey);
+        };
+    }, [lazy, shouldFetch, subKey]);
     // TEMP
     useRealtimeData(table, queueHandler, options, hasTriggeredRef.current, realtime);
     return useMemo(() => ({

package/dist/hooks/supastashLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supastashLogic.d.ts","sourceRoot":"","sources":["../../src/hooks/supastashLogic.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAQrE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,IAAI,mBAAmB,CA6DlD"}
+{"version":3,"file":"supastashLogic.d.ts","sourceRoot":"","sources":["../../src/hooks/supastashLogic.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAQrE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,IAAI,mBAAmB,CAsElD"}

package/dist/hooks/supastashLogic.js

@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import { getSupastashConfig } from "../core/config";
 import { supastashDbErrorMsg } from "../db/dbErrorMsg";
 import { useSyncEngine } from "../hooks/syncEngine";
-import { logError } from "../utils/logs";
+import { logError, logWarn } from "../utils/logs";
 import { createDeletedStatusTable, createSyncStatusTable, } from "../utils/schema/createSyncStatus";
 import { supabaseClientErr } from "../utils/supabaseClientErr";
 /**
@@ -25,6 +25,7 @@ export function useSupastash() {
     const [dbReady, setDbReady] = useState(false);
     const initialized = useRef(false);
     const config = getSupastashConfig();
+    const { startSync, stopSync } = useSyncEngine();
     if (!config.sqliteClient || !config.sqliteClientType) {
         logError(`
       [Supastash] ${supastashDbErrorMsg}`);
@@ -48,25 +49,34 @@ export function useSupastash() {
         initialized.current = true;
         async function init() {
             try {
-                // Create tables
+                // Create supastash metadata tables
                 await createSyncStatusTable();
                 await createDeletedStatusTable();
                 // On schema init
                 if (config.onSchemaInit) {
                     await config.onSchemaInit();
                 }
-                setDbReady(true);
             }
             catch (error) {
                 logError(`[Supastash] Error initializing: ${error}`);
             }
+            finally {
+                setDbReady(true);
+            }
         }
         init();
+        return () => {
+            initialized.current = false;
+        };
     }, []);
-    const { startSync, stopSync } = useSyncEngine();
     useEffect(() => {
         if (dbReady) {
-            startSync();
+            try {
+                startSync();
+            }
+            catch (error) {
+                logWarn(`[Supastash] Error starting sync: ${error}`);
+            }
         }
         return () => {
             stopSync();

package/dist/utils/fetchData/fetchLocalData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLocalData.d.ts","sourceRoot":"","sources":["../../../src/utils/fetchData/fetchLocalData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA0DtD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,OAAc,EAC3B,KAAK,GAAE,MAAY,EACnB,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAC1B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC;IACT,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,SAAS,EAAE;SACR,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;KAC9C,CAAC;CACH,GAAG,IAAI,CAAC,CA6ER"}
+{"version":3,"file":"fetchLocalData.d.ts","sourceRoot":"","sources":["../../../src/utils/fetchData/fetchLocalData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAyDtD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,OAAc,EAC3B,KAAK,GAAE,MAAY,EACnB,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAC1B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC;IACT,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,SAAS,EAAE;SACR,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;KAC9C,CAAC;CACH,GAAG,IAAI,CAAC,CA6ER"}

package/dist/utils/fetchData/fetchLocalData.js

@@ -36,7 +36,6 @@ function getNewVersion(table) {
     debounceMap.set(table, timeout);
 }
 const timesFetched = new Map();
-let lastFetched = new Map();
 /**
  * Fetches the local data from the database
  * @param table - The table name to fetch from
@@ -48,7 +47,7 @@ export async function fetchLocalData(table, shouldFetch = true, limit = 200, ext
     if (!shouldFetch || fetchingPromises.has(table))
         return null;
     timesFetched.set(table, (timesFetched.get(table) || 0) + 1);
-    if ((timesFetched.get(table) || 0) > 50) {
+    if ((timesFetched.get(table) || 0) > 150) {
         log(`[Supastash] Fetching data for ${table} (times fetched: ${timesFetched.get(table)})`);
         timesFetched.delete(table);
     }

package/dist/utils/fetchData/realTimeCall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realTimeCall.d.ts","sourceRoot":"","sources":["../../../src/utils/fetchData/realTimeCall.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOjE,QAAA,MAAM,eAAe,GACnB,OAAO,MAAM,EACb,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,EAC5D,SAAS,eAAe,EACxB,aAAa,OAAO,EACpB,UAAU,OAAO,SA0ClB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"realTimeCall.d.ts","sourceRoot":"","sources":["../../../src/utils/fetchData/realTimeCall.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOjE,QAAA,MAAM,eAAe,GACnB,OAAO,MAAM,EACb,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,EAC5D,SAAS,eAAe,EACxB,aAAa,OAAO,EACpB,UAAU,OAAO,SA6ClB,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/utils/fetchData/realTimeCall.js

@@ -30,8 +30,11 @@ const useRealtimeData = (table, queueHandler, options, initialized, realtime) =>
         })
             .subscribe();
         return () => {
-            supabase.removeChannel(subscription);
+            hasRegistered.delete(subKey);
+            if (subscription) {
+                supabase.removeChannel(subscription);
+            }
         };
-    }, [table, lazy, initialized, realtime, shouldFetch]);
+    }, [table, lazy, initialized, realtime, shouldFetch, subKey]);
 };
 export default useRealtimeData;

package/dist/utils/schema/createSyncStatus.js

@@ -5,11 +5,11 @@ import { getSupastashDb } from "../../db/dbInitializer";
 export async function createSyncStatusTable() {
     const db = await getSupastashDb();
     const sql = `CREATE TABLE IF NOT EXISTS supastash_sync_status (
-    table_name TEXT NOT NULL,
+    table_name TEXT PRIMARY KEY,
     last_synced_at TEXT NOT NULL
   );`;
     const sql2 = `CREATE TABLE IF NOT EXISTS supastash_last_created (
-    table_name TEXT NOT NULL,
+    table_name TEXT PRIMARY KEY,
     last_created_at TEXT NOT NULL
   );`;
     await db.execAsync(sql);
@@ -21,7 +21,7 @@ export async function createSyncStatusTable() {
 export async function createDeletedStatusTable() {
     const db = await getSupastashDb();
     const sql = `CREATE TABLE IF NOT EXISTS supastash_deleted_status (
-    table_name TEXT NOT NULL,
+    table_name TEXT PRIMARY KEY,
     last_deleted_at TEXT DEFAULT NULL
   );`;
     await db.execAsync(sql);

package/dist/utils/sync/pullFromRemote/pullData.d.ts

@@ -6,4 +6,6 @@ import { RealtimeFilter } from "../../../types/realtimeData.types";
  * @returns The data from the table
  */
 export declare function pullData(table: string, filter?: RealtimeFilter): Promise<PayloadData[] | null>;
+export declare function getMaxCreatedDate(data: PayloadData[]): string | null;
+export declare function getMaxUpdatedDate(data: PayloadData[]): string | null;
 //# sourceMappingURL=pullData.d.ts.map

package/dist/utils/sync/pullFromRemote/pullData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pullData.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/pullData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AA2BnE;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAmF/B"}
+{"version":3,"file":"pullData.d.ts","sourceRoot":"","sources":["../../../../src/utils/sync/pullFromRemote/pullData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AA2BnE;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAqH/B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,IAAI,CAgBpE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,GAAG,IAAI,CAgBpE"}

package/dist/utils/sync/pullFromRemote/pullData.js

@@ -1,5 +1,5 @@
 import { getSupastashConfig } from "../../../core/config";
-import log from "../../logs";
+import log, { logWarn } from "../../logs";
 import { supabaseClientErr } from "../../supabaseClientErr";
 import { getLastCreatedInfo, updateLastCreatedInfo, } from "./getLastCreatedInfo";
 import { getLastPulledInfo, updateLastPulledInfo } from "./getLastPulledInfo";
@@ -30,10 +30,16 @@ export async function pullData(table, filter) {
     const supabase = getSupastashConfig().supabaseClient;
     if (!supabase)
         throw new Error(`No supabase client found: ${supabaseClientErr}`);
-    let filteredQuery = supabase
+    let filteredLastCreatedQuery = supabase
         .from(table)
         .select("*")
-        .or(`created_at.gte.${lastCreatedAt},updated_at.gte.${lastSyncedAt}`)
+        .gte("created_at", lastCreatedAt || RANDOM_OLD_DATE)
+        .is("deleted_at", null)
+        .order("updated_at", { ascending: false, nullsFirst: false });
+    let filteredLastSyncedQuery = supabase
+        .from(table)
+        .select("*")
+        .gte("updated_at", lastSyncedAt || RANDOM_OLD_DATE)
         .is("deleted_at", null)
         .order("updated_at", { ascending: false, nullsFirst: false });
     if (filter &&
@@ -51,14 +57,27 @@ export async function pullData(table, filter) {
         validOperators.has(filter.operator) &&
         filter.column &&
         isValidValue) {
-        filteredQuery = filteredQuery[filter.operator](filter.column, filter.value);
+        filteredLastCreatedQuery = filteredLastCreatedQuery[filter.operator](filter.column, filter.value);
+        filteredLastSyncedQuery = filteredLastSyncedQuery[filter.operator](filter.column, filter.value);
     }
     // Fetch records where created_at >= lastCreatedAt OR updated_at >= lastSyncedAt
-    const { data, error } = await filteredQuery;
-    if (error) {
-        log(`[Supastash] Error fetching from ${table}:`, error.message);
+    const { data: lastCreatedData, error: lastCreatedError, } = await filteredLastCreatedQuery;
+    const { data: lastSyncedData, error: lastSyncedError, } = await filteredLastSyncedQuery;
+    if (lastCreatedError || lastSyncedError) {
+        log(`[Supastash] Error fetching from ${table}:`, lastCreatedError?.message || lastSyncedError?.message);
         return null;
     }
+    const allRows = [...(lastCreatedData ?? []), ...(lastSyncedData ?? [])];
+    const merged = {};
+    for (const row of allRows) {
+        if (!row.id) {
+            logWarn(`[Supastash] Skipped row without id from "${table}":`, row);
+            continue;
+        }
+        const id = row.id;
+        merged[id] = row;
+    }
+    const data = Object.values(merged);
     if (!data || data.length === 0) {
         timesPulled.set(table, (timesPulled.get(table) || 0) + 1);
         if ((timesPulled.get(table) || 0) >= DEFAULT_MAX_PULL_ATTEMPTS) {
@@ -71,7 +90,8 @@ export async function pullData(table, filter) {
     }
     log(`Received ${data.length} updates for ${table}`);
     // Update the sync status tables with the latest timestamps
-    const { createdMaxDate, updatedMaxDate } = getMaxDate(data);
+    const createdMaxDate = getMaxCreatedDate(lastCreatedData ?? []);
+    const updatedMaxDate = getMaxUpdatedDate(lastSyncedData ?? []);
     if (updatedMaxDate) {
         await updateLastPulledInfo(table, updatedMaxDate);
     }
@@ -80,23 +100,35 @@ export async function pullData(table, filter) {
     }
     return data;
 }
-function getMaxDate(data) {
-    let createdMaxDate = RANDOM_OLD_DATE;
-    let updatedMaxDate = RANDOM_OLD_DATE;
+export function getMaxCreatedDate(data) {
+    if (!data || data.length === 0)
+        return null;
     const createdColumn = "created_at";
-    const updatedColumn = "updated_at";
+    let maxDate = RANDOM_OLD_DATE;
     for (const item of data) {
         const createdValue = item[createdColumn];
-        const updatedValue = item[updatedColumn];
         if (typeof createdValue === "string" && !isNaN(Date.parse(createdValue))) {
-            createdMaxDate = new Date(Math.max(new Date(createdMaxDate).getTime(), new Date(createdValue).getTime())).toISOString();
+            const createdTime = new Date(createdValue).getTime();
+            if (createdTime > new Date(maxDate).getTime()) {
+                maxDate = new Date(createdTime).toISOString();
+            }
         }
+    }
+    return maxDate === RANDOM_OLD_DATE ? null : maxDate;
+}
+export function getMaxUpdatedDate(data) {
+    if (!data || data.length === 0)
+        return null;
+    const updatedColumn = "updated_at";
+    let maxDate = RANDOM_OLD_DATE;
+    for (const item of data) {
+        const updatedValue = item[updatedColumn];
         if (typeof updatedValue === "string" && !isNaN(Date.parse(updatedValue))) {
-            updatedMaxDate = new Date(Math.max(new Date(updatedMaxDate).getTime(), new Date(updatedValue).getTime())).toISOString();
+            const updatedTime = new Date(updatedValue).getTime();
+            if (updatedTime > new Date(maxDate).getTime()) {
+                maxDate = new Date(updatedTime).toISOString();
+            }
         }
     }
-    return {
-        createdMaxDate: createdMaxDate === RANDOM_OLD_DATE ? null : createdMaxDate,
-        updatedMaxDate: updatedMaxDate === RANDOM_OLD_DATE ? null : updatedMaxDate,
-    };
+    return maxDate === RANDOM_OLD_DATE ? null : maxDate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supastash",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",