convex 1.16.6 → 1.17.0-alpha.0

package/dist/browser.bundle.js

@@ -28,7 +28,7 @@ var convex = (() => {
   });
 
   // src/index.ts
-  var version = "1.16.6";
+  var version = "1.17.0-alpha.0";
 
   // src/values/base64.ts
   var base64_exports = {};
@@ -190,8 +190,8 @@ var convex = (() => {
   var ZERO = BigInt("0");
   var EIGHT = BigInt("8");
   var TWOFIFTYSIX = BigInt("256");
-  function isSpecial(n) {
-    return Number.isNaN(n) || !Number.isFinite(n) || Object.is(n, -0);
+  function isSpecial(n2) {
+    return Number.isNaN(n2) || !Number.isFinite(n2) || Object.is(n2, -0);
   }
   function slowBigIntToBase64(value) {
     if (value < ZERO) {
@@ -1690,10 +1690,10 @@ var convex = (() => {
           return Promise.resolve();
         case "connecting": {
           const ws = this.socket.ws;
-          return new Promise((r) => {
+          return new Promise((r2) => {
             ws.onclose = () => {
               this._logVerbose("Closed after connecting");
-              r();
+              r2();
             };
             ws.onopen = () => {
               this._logVerbose("Opened after connecting");
@@ -1704,9 +1704,9 @@ var convex = (() => {
         case "ready": {
           this._logVerbose("ws.close called");
           const ws = this.socket.ws;
-          const result = new Promise((r) => {
+          const result = new Promise((r2) => {
             ws.onclose = () => {
-              r();
+              r2();
             };
           });
           ws.close();
@@ -1847,66 +1847,61 @@ var convex = (() => {
   }
   function uuidv4() {
     return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-      const r = Math.random() * 16 | 0, v = c === "x" ? r : r & 3 | 8;
+      const r2 = Math.random() * 16 | 0, v = c === "x" ? r2 : r2 & 3 | 8;
       return v.toString(16);
     });
   }
 
-  // ../common/temp/node_modules/.pnpm/jwt-decode@4.0.0/node_modules/jwt-decode/build/esm/index.js
-  var InvalidTokenError = class extends Error {
-  };
-  InvalidTokenError.prototype.name = "InvalidTokenError";
-  function b64DecodeUnicode(str) {
-    return decodeURIComponent(atob(str).replace(/(.)/g, (m, p) => {
-      let code2 = p.charCodeAt(0).toString(16).toUpperCase();
-      if (code2.length < 2) {
-        code2 = "0" + code2;
-      }
-      return "%" + code2;
-    }));
+  // ../common/temp/node_modules/.pnpm/jwt-decode@3.1.2/node_modules/jwt-decode/build/jwt-decode.esm.js
+  function e(e2) {
+    this.message = e2;
   }
-  function base64UrlDecode(str) {
-    let output = str.replace(/-/g, "+").replace(/_/g, "/");
-    switch (output.length % 4) {
+  e.prototype = new Error(), e.prototype.name = "InvalidCharacterError";
+  var r = "undefined" != typeof window && window.atob && window.atob.bind(window) || function(r2) {
+    var t2 = String(r2).replace(/=+$/, "");
+    if (t2.length % 4 == 1) throw new e("'atob' failed: The string to be decoded is not correctly encoded.");
+    for (var n2, o2, a = 0, i = 0, c = ""; o2 = t2.charAt(i++); ~o2 && (n2 = a % 4 ? 64 * n2 + o2 : o2, a++ % 4) ? c += String.fromCharCode(255 & n2 >> (-2 * a & 6)) : 0) o2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o2);
+    return c;
+  };
+  function t(e2) {
+    var t2 = e2.replace(/-/g, "+").replace(/_/g, "/");
+    switch (t2.length % 4) {
       case 0:
         break;
       case 2:
-        output += "==";
+        t2 += "==";
         break;
       case 3:
-        output += "=";
+        t2 += "=";
         break;
       default:
-        throw new Error("base64 string is not of the correct length");
+        throw "Illegal base64url string!";
     }
     try {
-      return b64DecodeUnicode(output);
-    } catch (err) {
-      return atob(output);
+      return function(e3) {
+        return decodeURIComponent(r(e3).replace(/(.)/g, function(e4, r2) {
+          var t3 = r2.charCodeAt(0).toString(16).toUpperCase();
+          return t3.length < 2 && (t3 = "0" + t3), "%" + t3;
+        }));
+      }(t2);
+    } catch (e3) {
+      return r(t2);
     }
   }
-  function jwtDecode(token, options) {
-    if (typeof token !== "string") {
-      throw new InvalidTokenError("Invalid token specified: must be a string");
-    }
-    options || (options = {});
-    const pos = options.header === true ? 0 : 1;
-    const part = token.split(".")[pos];
-    if (typeof part !== "string") {
-      throw new InvalidTokenError(`Invalid token specified: missing part #${pos + 1}`);
-    }
-    let decoded;
-    try {
-      decoded = base64UrlDecode(part);
-    } catch (e) {
-      throw new InvalidTokenError(`Invalid token specified: invalid base64 for part #${pos + 1} (${e.message})`);
-    }
+  function n(e2) {
+    this.message = e2;
+  }
+  function o(e2, r2) {
+    if ("string" != typeof e2) throw new n("Invalid token specified");
+    var o2 = true === (r2 = r2 || {}).header ? 0 : 1;
     try {
-      return JSON.parse(decoded);
-    } catch (e) {
-      throw new InvalidTokenError(`Invalid token specified: invalid json for part #${pos + 1} (${e.message})`);
+      return JSON.parse(t(e2.split(".")[o2]));
+    } catch (e3) {
+      throw new n("Invalid token specified: " + e3.message);
     }
   }
+  n.prototype = new Error(), n.prototype.name = "InvalidTokenError";
+  var jwt_decode_esm_default = o;
 
   // src/browser/sync/authentication_manager.ts
   var MAXIMUM_REFRESH_DELAY = 20 * 24 * 60 * 60 * 1e3;
@@ -1926,23 +1921,17 @@ var convex = (() => {
     // Passed down by BaseClient, sends a message to the server
     clearAuth;
     logger;
-    constructor(syncState, {
-      authenticate,
-      stopSocket,
-      restartSocket,
-      pauseSocket,
-      resumeSocket,
-      clearAuth,
-      logger
-    }) {
+    refreshTokenLeewaySeconds;
+    constructor(syncState, callbacks, config) {
       this.syncState = syncState;
-      this.authenticate = authenticate;
-      this.stopSocket = stopSocket;
-      this.restartSocket = restartSocket;
-      this.pauseSocket = pauseSocket;
-      this.resumeSocket = resumeSocket;
-      this.clearAuth = clearAuth;
-      this.logger = logger;
+      this.authenticate = callbacks.authenticate;
+      this.stopSocket = callbacks.stopSocket;
+      this.restartSocket = callbacks.restartSocket;
+      this.pauseSocket = callbacks.pauseSocket;
+      this.resumeSocket = callbacks.resumeSocket;
+      this.clearAuth = callbacks.clearAuth;
+      this.logger = config.logger;
+      this.refreshTokenLeewaySeconds = config.refreshTokenLeewaySeconds;
     }
     async setConfig(fetchToken, onChange) {
       this.resetAuthState();
@@ -2117,17 +2106,23 @@ var convex = (() => {
         );
         return;
       }
-      const leewaySeconds = 2;
-      const delay = Math.min(
-        MAXIMUM_REFRESH_DELAY,
-        (exp - iat - leewaySeconds) * 1e3
-      );
-      if (delay <= 0) {
+      const tokenValiditySeconds = exp - iat;
+      if (tokenValiditySeconds <= 2) {
         this.logger.error(
           "Auth token does not live long enough, cannot refetch the token"
         );
         return;
       }
+      let delay = Math.min(
+        MAXIMUM_REFRESH_DELAY,
+        (tokenValiditySeconds - this.refreshTokenLeewaySeconds) * 1e3
+      );
+      if (delay <= 0) {
+        this.logger.warn(
+          `Refetching auth token immediately, configured leeway ${this.refreshTokenLeewaySeconds}s is larger than the token's lifetime ${tokenValiditySeconds}s`
+        );
+        delay = 0;
+      }
       const refetchTokenTimeoutId = setTimeout(() => {
         void this.refetchToken();
       }, delay);
@@ -2170,10 +2165,10 @@ var convex = (() => {
     }
     decodeToken(token) {
       try {
-        return jwtDecode(token);
-      } catch (e) {
+        return jwt_decode_esm_default(token);
+      } catch (e2) {
         this._logVerbose(
-          `Error decoding token: ${e instanceof Error ? e.message : "Unknown error"}`
+          `Error decoding token: ${e2 instanceof Error ? e2.message : "Unknown error"}`
         );
         return null;
       }
@@ -2247,6 +2242,7 @@ var convex = (() => {
         validateDeploymentUrl(address);
       }
       options = { ...options };
+      const authRefreshTokenLeewaySeconds = options.authRefreshTokenLeewaySeconds ?? 2;
       let webSocketConstructor = options.webSocketConstructor;
       if (!webSocketConstructor && typeof WebSocket === "undefined") {
         throw new Error(
@@ -2278,23 +2274,29 @@ var convex = (() => {
         this.logger
       );
       this.requestManager = new RequestManager(this.logger);
-      this.authenticationManager = new AuthenticationManager(this.state, {
-        authenticate: (token) => {
-          const message = this.state.setAuth(token);
-          this.webSocketManager.sendMessage(message);
-        },
-        stopSocket: () => this.webSocketManager.stop(),
-        restartSocket: () => this.webSocketManager.restart(),
-        pauseSocket: () => {
-          this.webSocketManager.pause();
-          this.state.pause();
-        },
-        resumeSocket: () => this.webSocketManager.resume(),
-        clearAuth: () => {
-          this.clearAuth();
+      this.authenticationManager = new AuthenticationManager(
+        this.state,
+        {
+          authenticate: (token) => {
+            const message = this.state.setAuth(token);
+            this.webSocketManager.sendMessage(message);
+          },
+          stopSocket: () => this.webSocketManager.stop(),
+          restartSocket: () => this.webSocketManager.restart(),
+          pauseSocket: () => {
+            this.webSocketManager.pause();
+            this.state.pause();
+          },
+          resumeSocket: () => this.webSocketManager.resume(),
+          clearAuth: () => {
+            this.clearAuth();
+          }
         },
-        logger: this.logger
-      });
+        {
+          logger: this.logger,
+          refreshTokenLeewaySeconds: authRefreshTokenLeewaySeconds
+        }
+      );
       this.optimisticQueryResults = new OptimisticQueryResults();
       this.onTransition = onTransition;
       this._nextRequestId = 0;
@@ -2307,11 +2309,11 @@ var convex = (() => {
           );
         }
       } else if (unsavedChangesWarning !== false) {
-        window.addEventListener("beforeunload", (e) => {
+        window.addEventListener("beforeunload", (e2) => {
           if (this.requestManager.hasIncompleteRequests()) {
-            e.preventDefault();
+            e2.preventDefault();
             const confirmationMessage = "Are you sure you want to leave? Your changes may not be saved.";
-            (e || window.event).returnValue = confirmationMessage;
+            (e2 || window.event).returnValue = confirmationMessage;
             return confirmationMessage;
           }
         });
@@ -3002,9 +3004,9 @@ var convex = (() => {
             unsubscribe();
             resolve(value2);
           },
-          (e) => {
+          (e2) => {
             unsubscribe();
-            reject(e);
+            reject(e2);
           }
         );
       });