convex 1.24.5 → 1.24.7-alpha.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "convex",
   "description": "Client for the Convex Cloud",
-  "version": "1.24.5",
+  "version": "1.24.7-alpha.0",
   "author": "Convex, Inc. <no-reply@convex.dev>",
   "homepage": "https://convex.dev",
   "repository": {

package/src/browser/sync/web_socket_manager.ts

@@ -253,7 +253,13 @@ export class WebSocketManager {
         }
         this.logger.log(msg);
       }
-      this.scheduleReconnect();
+      if (event.reason?.includes("SubscriptionsWorkerFullError")) {
+        this.scheduleReconnect("SubscriptionsWorkerFullError");
+      } else if (event.reason?.includes("TooManyConcurrentRequests")) {
+        this.scheduleReconnect("TooManyConcurrentRequests");
+      } else {
+        this.scheduleReconnect("unknown");
+      }
       return;
     };
   }
@@ -320,9 +326,15 @@ export class WebSocketManager {
     }, this.serverInactivityThreshold);
   }
 
-  private scheduleReconnect() {
+  private scheduleReconnect(
+    reason:
+      | "client"
+      | "unknown"
+      | "SubscriptionsWorkerFullError"
+      | "TooManyConcurrentRequests",
+  ) {
     this.socket = { state: "disconnected" };
-    const backoff = this.nextBackoff();
+    const backoff = this.nextBackoff(reason);
     this.logger.log(`Attempting reconnect in ${backoff}ms`);
     setTimeout(() => this.connect(), backoff);
   }
@@ -345,7 +357,7 @@ export class WebSocketManager {
         this.lastCloseReason = closeReason;
         // Close the old socket asynchronously, we'll open a new socket in reconnect.
         void this.close();
-        this.scheduleReconnect();
+        this.scheduleReconnect("client");
         return;
       }
       default: {
@@ -543,8 +555,20 @@ export class WebSocketManager {
     this.logger.logVerbose(message);
   }
 
-  private nextBackoff(): number {
-    const baseBackoff = this.initialBackoff * Math.pow(2, this.retries);
+  private nextBackoff(
+    reason:
+      | "client"
+      | "unknown"
+      | "SubscriptionsWorkerFullError"
+      | "TooManyConcurrentRequests",
+  ): number {
+    const initialBackoff =
+      reason === "SubscriptionsWorkerFullError"
+        ? 3000
+        : reason === "TooManyConcurrentRequests"
+          ? 3000
+          : this.initialBackoff;
+    const baseBackoff = initialBackoff * Math.pow(2, this.retries);
     this.retries += 1;
     const actualBackoff = Math.min(baseBackoff, this.maxBackoff);
     const jitter = actualBackoff * (Math.random() - 0.5);

package/src/cli/lib/deployApi/types.ts

@@ -3,23 +3,28 @@ import { z } from "zod";
 export const reference = z.string();
 export type Reference = z.infer<typeof reference>;
 
-// passthrough for backward compat, auth was passthrough before custom JWTs were added
+// These validators parse the response from the backend so although
+// they roughly correspond with convex/auth.config.ts providers they
+// have been processed.
+
+// Passthrough so old CLIs can operate on new backend formats.
 const Oidc = z
   .object({
     applicationID: z.string(),
     domain: z.string(),
   })
   .passthrough();
+const CustomJwt = z
+  .object({
+    type: z.literal("customJwt"),
+    applicationID: z.string().nullable(),
+    issuer: z.string(),
+    jwks: z.string(),
+    algorithm: z.string(),
+  })
+  .passthrough();
 
-const CustomJwt = z.object({
-  type: z.literal("customJwt"),
-  applicationID: z.optional(z.string()),
-  issuer: z.string(),
-  jwks: z.string(),
-  algorithm: z.string(),
-});
-
-export const authInfo = z.union([Oidc, CustomJwt]);
+export const authInfo = z.union([CustomJwt, Oidc]);
 
 export type AuthInfo = z.infer<typeof authInfo>;
 

package/src/index.ts

@@ -1 +1 @@
-export const version = "1.24.5";
+export const version = "1.24.7-alpha.0";