velocious 1.0.635 → 1.0.636

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.635",
+  "version": "1.0.636",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

package/src/frontend-models/base.js

@@ -1554,6 +1554,30 @@ class FrontendModelEventSubscription {
     return JSON.stringify(this.subscriptionParams())
   }
 
+  /**
+   * Runs register class callback.
+   * @template {FrontendModelModelEventCallbackEntry | FrontendModelDestroyEventCallbackEntry} T
+   * @param {Set<T>} callbacks - Callback set for the event type.
+   * @param {T} entry - Callback entry.
+   * @returns {Promise<() => void>} - Unsubscribe callback.
+   */
+  async registerClassCallback(callbacks, entry) {
+    callbacks.add(entry)
+
+    try {
+      await this.ensureSubscribed()
+    } catch (error) {
+      callbacks.delete(entry)
+      this.maybeTeardown()
+      throw error
+    }
+
+    return () => {
+      callbacks.delete(entry)
+      this.maybeTeardown()
+    }
+  }
+
   /**
    * Runs ensure subscribed.
    * @returns {Promise<void>} */
@@ -1599,14 +1623,6 @@ class FrontendModelEventSubscription {
           this.readyPromise = null
           this.subscriptionParamsKey = null
           this.instanceListeners.clear()
-
-          const hasCallbacks = this.classCreateCallbacks.size > 0
-            || this.classUpdateCallbacks.size > 0
-            || this.classDestroyCallbacks.size > 0
-
-          if (hasCallbacks && client.autoReconnect) {
-            void this.ensureSubscribed()
-          }
         }
       })
       await this.channelHandle.ready
@@ -3710,13 +3726,7 @@ export default class FrontendModelBase {
     const sub = ensureFrontendModelEventSubscription(this, frontendModelRequestContext())
     const entry = {callback, ...frontendModelEventOptionsPayload(this, options)}
 
-    sub.classCreateCallbacks.add(entry)
-    await sub.ensureSubscribed()
-
-    return () => {
-      sub.classCreateCallbacks.delete(entry)
-      sub.maybeTeardown()
-    }
+    return await sub.registerClassCallback(sub.classCreateCallbacks, entry)
   }
 
   /**
@@ -3730,13 +3740,7 @@ export default class FrontendModelBase {
     const sub = ensureFrontendModelEventSubscription(this, frontendModelRequestContext())
     const entry = {callback, ...frontendModelEventOptionsPayload(this, options)}
 
-    sub.classUpdateCallbacks.add(entry)
-    await sub.ensureSubscribed()
-
-    return () => {
-      sub.classUpdateCallbacks.delete(entry)
-      sub.maybeTeardown()
-    }
+    return await sub.registerClassCallback(sub.classUpdateCallbacks, entry)
   }
 
   /**
@@ -3752,13 +3756,7 @@ export default class FrontendModelBase {
     const sub = ensureFrontendModelEventSubscription(this, frontendModelRequestContext())
     const entry = {callback}
 
-    sub.classDestroyCallbacks.add(entry)
-    await sub.ensureSubscribed()
-
-    return () => {
-      sub.classDestroyCallbacks.delete(entry)
-      sub.maybeTeardown()
-    }
+    return await sub.registerClassCallback(sub.classDestroyCallbacks, entry)
   }
 
   /**