@pooflabs/core 0.0.32 → 0.0.34

package/dist/index.mjs

@@ -119,10 +119,14 @@ class WebSessionManager {
                     const newObj = JSON.parse(newSession);
                     return { address: newObj.address, session: newObj };
                 }
+                // Refresh failed — clear stale session to prevent retry loops
+                this.clearSession();
                 return null;
             }
         }
         catch (err) {
+            // Token decode or refresh failed — clear stale session to prevent retry loops
+            this.clearSession();
             return null;
         }
         return { address: sessionObj.address, session: sessionObj };
@@ -3046,15 +3050,30 @@ class ServerSessionManager {
     constructor() {
         /* Private cache (lives for the life of the process) */
         this.session = null;
+        /* Coalesce concurrent getSession() calls into a single in-flight request */
+        this.pendingSession = null;
     }
     /* ---------------------------------------------- *
      * GET (lazy-fetch)
      * ---------------------------------------------- */
     async getSession() {
-        if (this.session === null) {
-            this.session = await createSession();
+        if (this.session !== null) {
+            return this.session;
+        }
+        // If a session creation is already in-flight, reuse that promise
+        // instead of firing a second concurrent request.
+        if (this.pendingSession !== null) {
+            return this.pendingSession;
         }
-        return this.session;
+        this.pendingSession = createSession()
+            .then((session) => {
+            this.session = session;
+            return session;
+        })
+            .finally(() => {
+            this.pendingSession = null;
+        });
+        return this.pendingSession;
     }
     /* ---------------------------------------------- *
      * STORE  (overwrites the cached value)
@@ -3067,6 +3086,7 @@ class ServerSessionManager {
      * ---------------------------------------------- */
     clearSession() {
         this.session = null;
+        this.pendingSession = null;
     }
     /* ---------------------------------------------- *
      * QUICK helpers
@@ -3369,6 +3389,150 @@ function hashForKey$1(value) {
     }
     return h.toString(36);
 }
+/**
+ * Validates that a field name is a safe identifier (alphanumeric, underscores, dots for nested paths).
+ * Prevents prompt injection via crafted field names.
+ */
+function validateFieldName(field) {
+    if (!/^[a-zA-Z0-9_.]+$/.test(field)) {
+        throw new Error(`Invalid field name "${field}". Field names must only contain letters, numbers, underscores, and dots.`);
+    }
+}
+/**
+ * Parses a raw aggregation result (e.g. [{ count: 42 }] or [{ _id: null, total: 100 }])
+ * into a single numeric value.
+ */
+function parseAggregateValue(result) {
+    if (typeof result === 'number')
+        return result;
+    if (Array.isArray(result)) {
+        if (result.length === 0)
+            return 0;
+        // Multiple elements — not a collapsed aggregate result
+        if (result.length > 1) {
+            throw new Error(`Unexpected aggregate result: got array with ${result.length} elements. The AI may have returned full documents instead of an aggregation.`);
+        }
+        const first = result[0];
+        if (typeof first === 'number')
+            return first;
+        if (first && typeof first === 'object') {
+            // $count stage returns { count: N }
+            if (typeof first.count === 'number')
+                return first.count;
+            // $group stage returns { _id: null, result: N } — expect _id + one numeric field
+            const numericEntries = Object.entries(first).filter(([key, val]) => key !== '_id' && typeof val === 'number');
+            if (numericEntries.length === 1)
+                return numericEntries[0][1];
+        }
+        // Avoid leaking document contents into error messages
+        const shape = first && typeof first === 'object' ? `{${Object.keys(first).join(', ')}}` : String(first);
+        throw new Error(`Unexpected aggregate result shape: ${shape}. Expected {count: N} or {_id: null, <field>: N}.`);
+    }
+    if (result && typeof result === 'object' && typeof result.count === 'number') {
+        return result.count;
+    }
+    throw new Error(`Unexpected aggregate result type: ${typeof result}. Expected a number, array, or object with a count field.`);
+}
+/**
+ * Count items in a collection path. Returns a numeric result.
+ *
+ * This uses the AI query engine with a count-specific prompt prefix,
+ * so TaroBase will generate a $count aggregation pipeline and return
+ * just the count rather than full documents.
+ *
+ * IMPORTANT: This only works for collections where the read policy is "true".
+ * If the read policy requires per-document checks, the server will return
+ * an error because aggregate counts cannot be performed without pulling all
+ * documents for access control evaluation.
+ *
+ * @param path - Collection path (e.g., "posts", "users/abc/comments")
+ * @param opts - Optional filter prompt and overrides
+ * @returns AggregateResult with the count value
+ */
+async function count(path, opts = {}) {
+    const prefix = 'Return ONLY the total count of matching documents. Use the $count stage to produce a field named "count". Do NOT return the documents themselves.';
+    const fullPrompt = opts.prompt
+        ? `${prefix} Filter: ${opts.prompt}`
+        : prefix;
+    const result = await get(path, { prompt: fullPrompt, bypassCache: true, _overrides: opts._overrides });
+    return { value: parseAggregateValue(result) };
+}
+/**
+ * Run an aggregate operation on a collection path. Returns a numeric result.
+ *
+ * Supported operations:
+ * - count: Total number of documents
+ * - uniqueCount: Number of distinct values for a field
+ * - sum: Sum of a numeric field
+ * - avg: Average of a numeric field
+ * - min: Minimum value of a numeric field
+ * - max: Maximum value of a numeric field
+ *
+ * IMPORTANT: This only works for collections where the read policy is "true".
+ * If the read policy requires per-document checks, the server will return
+ * an error because aggregate operations cannot be performed without pulling
+ * all documents for access control evaluation.
+ *
+ * @param path - Collection path (e.g., "posts", "users/abc/comments")
+ * @param operation - The aggregate operation to perform
+ * @param opts - Options including optional filter prompt and field name
+ * @returns AggregateResult with the computed numeric value
+ */
+async function aggregate(path, operation, opts = {}) {
+    let prefix;
+    switch (operation) {
+        case 'count':
+            prefix = 'Return ONLY the total count of matching documents. Use the $count stage to produce a field named "count". Do NOT return the documents themselves.';
+            break;
+        case 'uniqueCount':
+            if (!opts.field)
+                throw new Error('aggregate "uniqueCount" requires a field option');
+            validateFieldName(opts.field);
+            prefix = `Return ONLY the count of unique/distinct values of the "${opts.field}" field. Use $group with _id set to "$${opts.field}" then $count to produce a field named "count". Do NOT return the documents themselves.`;
+            break;
+        case 'sum':
+            if (!opts.field)
+                throw new Error('aggregate "sum" requires a field option');
+            validateFieldName(opts.field);
+            prefix = `Return ONLY the sum of the "${opts.field}" field across all matching documents. Use $group with _id: null and result: { $sum: "$${opts.field}" }. Do NOT return the documents themselves.`;
+            break;
+        case 'avg':
+            if (!opts.field)
+                throw new Error('aggregate "avg" requires a field option');
+            validateFieldName(opts.field);
+            prefix = `Return ONLY the average of the "${opts.field}" field across all matching documents. Use $group with _id: null and result: { $avg: "$${opts.field}" }. Do NOT return the documents themselves.`;
+            break;
+        case 'min':
+            if (!opts.field)
+                throw new Error('aggregate "min" requires a field option');
+            validateFieldName(opts.field);
+            prefix = `Return ONLY the minimum value of the "${opts.field}" field across all matching documents. Use $group with _id: null and result: { $min: "$${opts.field}" }. Do NOT return the documents themselves.`;
+            break;
+        case 'max':
+            if (!opts.field)
+                throw new Error('aggregate "max" requires a field option');
+            validateFieldName(opts.field);
+            prefix = `Return ONLY the maximum value of the "${opts.field}" field across all matching documents. Use $group with _id: null and result: { $max: "$${opts.field}" }. Do NOT return the documents themselves.`;
+            break;
+        default:
+            throw new Error(`Unsupported aggregate operation: ${operation}`);
+    }
+    const fullPrompt = opts.prompt
+        ? `${prefix} Filter: ${opts.prompt}`
+        : prefix;
+    const result = await get(path, { prompt: fullPrompt, bypassCache: true, _overrides: opts._overrides });
+    // For uniqueCount, the AI may return $group results without the final $count
+    // stage, producing [{_id: "val1"}, {_id: "val2"}, ...]. Verify elements look
+    // like $group output (only _id key) before using array length as the count.
+    if (operation === 'uniqueCount' && Array.isArray(result) && result.length > 1) {
+        const looksLikeGroupOutput = result.every((el) => el && typeof el === 'object' && Object.keys(el).length === 1 && '_id' in el);
+        if (looksLikeGroupOutput) {
+            return { value: result.length };
+        }
+        throw new Error(`Unexpected uniqueCount result: got ${result.length} elements that don't match $group output shape.`);
+    }
+    return { value: parseAggregateValue(result) };
+}
 async function get(path, opts = {}) {
     try {
         let normalizedPath = path.startsWith("/") ? path.slice(1) : path;
@@ -3829,13 +3993,15 @@ async function syncItems(paths, options) {
 const connections = new Map();
 const responseCache = new Map();
 const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
-const TOKEN_REFRESH_BUFFER = 5 * 60 * 1000; // Refresh token 5 minutes before expiry
+const TOKEN_REFRESH_BUFFER = 10 * 60 * 1000; // Refresh token 10 minutes before expiry
+const TOKEN_CHECK_INTERVAL = 5 * 60 * 1000; // Check token freshness every 5 minutes
 // ============ WebSocket Config ============
 const BASE_MIN_RECONNECT_DELAY_MS = 1000;
 const MIN_RECONNECT_DELAY_JITTER_MS = 1000;
 const MAX_RECONNECT_DELAY_MS = 300000;
 const RECONNECT_DELAY_GROW_FACTOR = 1.8;
-const MIN_BROWSER_RECONNECT_INTERVAL_MS = 30000;
+const MIN_BROWSER_RECONNECT_INTERVAL_MS = 5000;
+const MAX_AUTH_REFRESH_RETRIES = 5;
 const WS_CONFIG = {
     // Keep retrying indefinitely so long outages recover without page refresh.
     maxRetries: Infinity,
@@ -3890,29 +4056,53 @@ function getTokenExpirationTime(token) {
         return null;
     }
 }
-function scheduleTokenRefresh(connection, token) {
+function scheduleTokenRefresh(connection, isServer) {
     // Clear any existing timer
     if (connection.tokenRefreshTimer) {
-        clearTimeout(connection.tokenRefreshTimer);
+        clearInterval(connection.tokenRefreshTimer);
         connection.tokenRefreshTimer = null;
     }
-    if (!token) {
-        return; // No token = unauthenticated, no refresh needed
-    }
-    const expirationTime = getTokenExpirationTime(token);
-    if (!expirationTime) {
-        return; // Can't parse expiration
-    }
-    const refreshTime = expirationTime - TOKEN_REFRESH_BUFFER;
-    const delay = refreshTime - Date.now();
-    if (delay <= 0) {
-        // Token already expired or about to expire, reconnect immediately
-        reconnectWithNewAuthV2();
-        return;
-    }
-    connection.tokenRefreshTimer = setTimeout(() => {
-        reconnectWithNewAuthV2();
-    }, delay);
+    // Periodic check: every TOKEN_CHECK_INTERVAL, check if the token needs refreshing.
+    // This replaces the old single setTimeout approach which was unreliable for long
+    // delays (browsers throttle/suspend timers in background tabs).
+    connection.tokenRefreshTimer = setInterval(async () => {
+        try {
+            const currentToken = await getIdToken(isServer);
+            if (!currentToken)
+                return; // Unauthenticated, nothing to refresh
+            const expirationTime = getTokenExpirationTime(currentToken);
+            if (!expirationTime)
+                return;
+            const timeUntilExpiry = expirationTime - Date.now();
+            if (timeUntilExpiry <= TOKEN_REFRESH_BUFFER) {
+                console.info('[WS v2] Token expiring soon, proactively refreshing and reconnecting');
+                // Refresh the token directly rather than going through getFreshAuthToken(),
+                // which only refreshes when the token is within 60s of expiry. We want to
+                // refresh as soon as we enter the buffer window to avoid unnecessary reconnects.
+                try {
+                    const currentRefreshToken = await getRefreshToken(isServer);
+                    if (!currentRefreshToken) {
+                        console.warn('[WS v2] No refresh token available for proactive refresh');
+                        return;
+                    }
+                    const refreshData = await refreshSession(currentRefreshToken);
+                    if (refreshData && refreshData.idToken && refreshData.accessToken) {
+                        await updateIdTokenAndAccessToken(refreshData.idToken, refreshData.accessToken, isServer);
+                        reconnectWithNewAuthV2();
+                    }
+                    else {
+                        console.warn('[WS v2] Proactive token refresh returned incomplete data');
+                    }
+                }
+                catch (refreshError) {
+                    console.warn('[WS v2] Proactive token refresh failed, will retry next interval:', refreshError);
+                }
+            }
+        }
+        catch (error) {
+            console.error('[WS v2] Error in periodic token check:', error);
+        }
+    }, TOKEN_CHECK_INTERVAL);
 }
 async function getFreshAuthToken(isServer) {
     const currentToken = await getIdToken(isServer);
@@ -3922,10 +4112,12 @@ async function getFreshAuthToken(isServer) {
     if (!isTokenExpired(currentToken)) {
         return currentToken;
     }
+    // Token is expired — attempt refresh
     try {
         const refreshToken = await getRefreshToken(isServer);
         if (!refreshToken) {
-            return currentToken;
+            console.warn('[WS v2] Token expired but no refresh token available');
+            return null;
         }
         const refreshData = await refreshSession(refreshToken);
         if (refreshData && refreshData.idToken && refreshData.accessToken) {
@@ -3936,7 +4128,11 @@ async function getFreshAuthToken(isServer) {
     catch (error) {
         console.error('[WS v2] Error refreshing token:', error);
     }
-    return currentToken;
+    // Return null instead of the expired token to prevent infinite 401 reconnect storms.
+    // The server accepts unauthenticated connections; auth-required subscriptions will
+    // receive per-subscription errors via onError callbacks.
+    console.warn('[WS v2] Token refresh failed, connecting without auth to prevent reconnect storm');
+    return null;
 }
 function hasDisconnectedActiveConnections() {
     for (const connection of connections.values()) {
@@ -4000,6 +4196,9 @@ async function getOrCreateConnection(appId, isServer) {
         isConnected: false,
         appId,
         tokenRefreshTimer: null,
+        lastMessageAt: Date.now(),
+        keepaliveTimer: null,
+        consecutiveAuthFailures: 0,
     };
     connections.set(appId, connection);
     // URL provider for reconnection with fresh tokens
@@ -4025,6 +4224,22 @@ async function getOrCreateConnection(appId, isServer) {
         const authToken = await getFreshAuthToken(isServer);
         if (authToken) {
             wsUrl.searchParams.append('authorization', authToken);
+            // Successful token acquisition — reset failure counter
+            connection.consecutiveAuthFailures = 0;
+        }
+        else {
+            // Check if user WAS authenticated (had a token that expired).
+            // If so, retry with exponential backoff before falling back to unauthenticated.
+            const expiredToken = await getIdToken(isServer);
+            if (expiredToken && isTokenExpired(expiredToken)) {
+                connection.consecutiveAuthFailures++;
+                if (connection.consecutiveAuthFailures <= MAX_AUTH_REFRESH_RETRIES) {
+                    console.warn(`[WS v2] Auth refresh failed (attempt ${connection.consecutiveAuthFailures}/${MAX_AUTH_REFRESH_RETRIES}), retrying with backoff`);
+                    throw new Error('Auth token refresh failed, retrying with backoff');
+                }
+                console.warn('[WS v2] Auth refresh retries exhausted, falling back to unauthenticated connection');
+            }
+            // No token at all (never authenticated) or retries exhausted — connect without auth
         }
         return wsUrl.toString();
     };
@@ -4036,18 +4251,34 @@ async function getOrCreateConnection(appId, isServer) {
     ws.addEventListener('open', () => {
         connection.isConnecting = false;
         connection.isConnected = true;
-        // Schedule token refresh before expiry
-        (async () => {
-            const token = await getIdToken(isServer);
-            scheduleTokenRefresh(connection, token);
-        })();
+        connection.lastMessageAt = Date.now();
+        connection.consecutiveAuthFailures = 0;
+        // Schedule periodic token freshness checks
+        scheduleTokenRefresh(connection, isServer);
         // Re-subscribe to all existing subscriptions after reconnect
         for (const sub of connection.subscriptions.values()) {
+            sub.lastData = undefined;
             sendSubscribe(connection, sub);
         }
+        // Start keepalive detection — if no messages for 90s, force reconnect
+        if (connection.keepaliveTimer) {
+            clearInterval(connection.keepaliveTimer);
+        }
+        connection.keepaliveTimer = setInterval(() => {
+            var _a;
+            if (Date.now() - connection.lastMessageAt > 90000) {
+                console.warn('[WS v2] No messages received for 90s, forcing reconnect');
+                if (connection.keepaliveTimer) {
+                    clearInterval(connection.keepaliveTimer);
+                    connection.keepaliveTimer = null;
+                }
+                (_a = connection.ws) === null || _a === void 0 ? void 0 : _a.reconnect();
+            }
+        }, 30000);
     });
     // Handle incoming messages
     ws.addEventListener('message', (event) => {
+        connection.lastMessageAt = Date.now();
         try {
             const message = JSON.parse(event.data);
             handleServerMessage(connection, message);
@@ -4059,20 +4290,22 @@ async function getOrCreateConnection(appId, isServer) {
     // Handle errors
     ws.addEventListener('error', (event) => {
         console.error('[WS v2] WebSocket error:', event);
-        // Reject all pending subscriptions
-        for (const [id, pending] of connection.pendingSubscriptions) {
+        for (const [, pending] of connection.pendingSubscriptions) {
             pending.reject(new Error('WebSocket error'));
-            connection.pendingSubscriptions.delete(id);
         }
+        connection.pendingSubscriptions.clear();
     });
     // Handle close
     ws.addEventListener('close', () => {
         connection.isConnected = false;
-        // Clear token refresh timer
         if (connection.tokenRefreshTimer) {
-            clearTimeout(connection.tokenRefreshTimer);
+            clearInterval(connection.tokenRefreshTimer);
             connection.tokenRefreshTimer = null;
         }
+        if (connection.keepaliveTimer) {
+            clearInterval(connection.keepaliveTimer);
+            connection.keepaliveTimer = null;
+        }
     });
     return connection;
 }
@@ -4272,9 +4505,7 @@ async function subscribeV2(path, subscriptionOptions) {
             await subscriptionPromise;
         }
         catch (error) {
-            // Remove subscription on error
-            connection.subscriptions.delete(subscriptionId);
-            throw error;
+            console.warn('[WS v2] Subscription confirmation failed, keeping for reconnect recovery:', error);
         }
     }
     // Return unsubscribe function
@@ -4314,7 +4545,7 @@ async function removeCallbackFromSubscription(connection, subscriptionId, callba
     if (connection.subscriptions.size === 0 && connection.ws) {
         // Clear token refresh timer
         if (connection.tokenRefreshTimer) {
-            clearTimeout(connection.tokenRefreshTimer);
+            clearInterval(connection.tokenRefreshTimer);
             connection.tokenRefreshTimer = null;
         }
         connection.ws.close();
@@ -4330,7 +4561,7 @@ async function closeAllSubscriptionsV2() {
     for (const [appId, connection] of connections) {
         // Clear token refresh timer
         if (connection.tokenRefreshTimer) {
-            clearTimeout(connection.tokenRefreshTimer);
+            clearInterval(connection.tokenRefreshTimer);
             connection.tokenRefreshTimer = null;
         }
         if (connection.ws) {
@@ -4390,8 +4621,6 @@ async function reconnectWithNewAuthV2() {
         if (!connection.ws) {
             continue;
         }
-        // Reject any pending subscriptions - they'll need to be retried after reconnect
-        // This prevents hanging promises during auth transitions
         for (const [, pending] of connection.pendingSubscriptions) {
             pending.reject(new Error('Connection reconnecting due to auth change'));
         }
@@ -4401,6 +4630,8 @@ async function reconnectWithNewAuthV2() {
             pending.resolve();
         }
         connection.pendingUnsubscriptions.clear();
+        // Reset auth failure counter — this is a proactive reconnect (login, token refresh)
+        connection.consecutiveAuthFailures = 0;
         // Close the WebSocket (this triggers reconnection in ReconnectingWebSocket)
         // We use reconnect() which will close and re-open with fresh URL (including new token)
         try {
@@ -4483,5 +4714,5 @@ async function reconnectWithNewAuth() {
     return reconnectWithNewAuthV2();
 }
 
-export { ServerSessionManager, WebSessionManager, buildSetDocumentsTransaction, clearCache, closeAllSubscriptions, convertRemainingAccounts, createSessionWithPrivy, createSessionWithSignature, genAuthNonce, genSolanaMessage, get, getCachedData, getConfig, getFiles, getIdToken, init, reconnectWithNewAuth, refreshSession, runExpression, runExpressionMany, runQuery, runQueryMany, set, setFile, setMany, signAndSubmitTransaction, signMessage, signSessionCreateMessage, signTransaction, subscribe };
+export { ServerSessionManager, WebSessionManager, aggregate, buildSetDocumentsTransaction, clearCache, closeAllSubscriptions, convertRemainingAccounts, count, createSessionWithPrivy, createSessionWithSignature, genAuthNonce, genSolanaMessage, get, getCachedData, getConfig, getFiles, getIdToken, init, reconnectWithNewAuth, refreshSession, runExpression, runExpressionMany, runQuery, runQueryMany, set, setFile, setMany, signAndSubmitTransaction, signMessage, signSessionCreateMessage, signTransaction, subscribe };
 //# sourceMappingURL=index.mjs.map