@radishbot/sdk 0.6.0 → 0.7.0

package/dist/index.js

@@ -298,11 +298,16 @@ class SdkConnection {
     if (this._connectPromise)
       return this._connectPromise;
     this._connectPromise = new Promise((resolve, reject) => {
-      const conn = DbConnection.builder().withUri(this._host).withDatabaseName(this._dbName).onConnect((c, _identity, _token) => {
+      DbConnection.builder().withUri(this._host).withDatabaseName(this._dbName).onConnect((c, _identity, _token) => {
         this._conn = c;
-        c.subscriptionBuilder().onApplied(() => {
-          resolve(c);
-        }).subscribe([`SELECT * FROM flow WHERE key_hash = '${this._keyHash}'`]);
+        c.db.flow.onInsert((_ctx, row) => {
+          const waiter = this._flowWaiters.get(row.exportToken);
+          if (waiter) {
+            this._flowWaiters.delete(row.exportToken);
+            waiter(row.id);
+          }
+        });
+        c.subscriptionBuilder().onApplied(() => resolve(c)).subscribeToAll();
       }).onConnectError((_ctx, err) => {
         reject(new Error(`SpacetimeDB connection failed: ${err}`));
       }).build();
@@ -320,29 +325,39 @@ class SdkConnection {
       if (f.exportToken === exportToken)
         return f.id;
     }
-    return new Promise((resolve) => {
-      this._flowWaiters.set(exportToken, resolve);
+    return new Promise((resolve, reject) => {
+      let resolved = false;
+      this._flowWaiters.set(exportToken, (id) => {
+        if (!resolved) {
+          resolved = true;
+          clearInterval(interval);
+          resolve(id);
+        }
+      });
       reducerCall();
-      const check = () => {
+      const interval = setInterval(() => {
+        if (resolved) {
+          clearInterval(interval);
+          return;
+        }
         for (const f of conn.db.flow.iter()) {
           if (f.exportToken === exportToken) {
+            resolved = true;
+            clearInterval(interval);
             this._flowWaiters.delete(exportToken);
             resolve(f.id);
-            return true;
+            return;
           }
         }
-        return false;
-      };
-      let attempts = 0;
-      const interval = setInterval(() => {
-        if (check() || attempts++ > 100) {
+      }, 100);
+      setTimeout(() => {
+        if (!resolved) {
+          resolved = true;
           clearInterval(interval);
-          if (attempts > 100) {
-            this._flowWaiters.delete(exportToken);
-            throw new Error(`Flow creation timed out for token ${exportToken}`);
-          }
+          this._flowWaiters.delete(exportToken);
+          reject(new Error(`Flow creation timed out for token ${exportToken}`));
         }
-      }, 100);
+      }, 15000);
     });
   }
   disconnect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radishbot/sdk",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/connection.ts

@@ -28,18 +28,24 @@ export class SdkConnection {
     if (this._connectPromise) return this._connectPromise;
 
     this._connectPromise = new Promise<StdbConnection>((resolve, reject) => {
-      const conn = StdbConnection.builder()
+      StdbConnection.builder()
         .withUri(this._host)
         .withDatabaseName(this._dbName)
         .onConnect((c, _identity, _token) => {
           this._conn = c;
 
-          // Only subscribe to flows for this key (needed to resolve flow IDs)
+          // Resolve flow waiters immediately when new flows arrive
+          c.db.flow.onInsert((_ctx, row) => {
+            const waiter = this._flowWaiters.get(row.exportToken);
+            if (waiter) {
+              this._flowWaiters.delete(row.exportToken);
+              waiter(row.id);
+            }
+          });
+
           c.subscriptionBuilder()
-            .onApplied(() => {
-              resolve(c);
-            })
-            .subscribe([`SELECT * FROM flow WHERE key_hash = '${this._keyHash}'`]);
+            .onApplied(() => resolve(c))
+            .subscribeToAll();
         })
         .onConnectError((_ctx, err) => {
           reject(new Error(`SpacetimeDB connection failed: ${err}`));
@@ -67,36 +73,47 @@ export class SdkConnection {
       if (f.exportToken === exportToken) return f.id;
     }
 
-    return new Promise<bigint>((resolve) => {
-      // Set up watcher
-      this._flowWaiters.set(exportToken, resolve);
+    return new Promise<bigint>((resolve, reject) => {
+      let resolved = false;
+
+      // Register waiter — triggered by onInsert handler in connect()
+      this._flowWaiters.set(exportToken, (id) => {
+        if (!resolved) {
+          resolved = true;
+          clearInterval(interval);
+          resolve(id);
+        }
+      });
 
       // Call the reducer
       reducerCall();
 
-      // Also poll in case subscription update was missed
-      const check = () => {
+      // Poll as fallback in case onInsert fires before waiter is registered
+      const interval = setInterval(() => {
+        if (resolved) {
+          clearInterval(interval);
+          return;
+        }
         for (const f of conn.db.flow.iter()) {
           if (f.exportToken === exportToken) {
+            resolved = true;
+            clearInterval(interval);
             this._flowWaiters.delete(exportToken);
             resolve(f.id);
-            return true;
+            return;
           }
         }
-        return false;
-      };
+      }, 100);
 
-      // Poll every 100ms for up to 10 seconds
-      let attempts = 0;
-      const interval = setInterval(() => {
-        if (check() || attempts++ > 100) {
+      // Timeout after 15 seconds (properly rejects the promise)
+      setTimeout(() => {
+        if (!resolved) {
+          resolved = true;
           clearInterval(interval);
-          if (attempts > 100) {
-            this._flowWaiters.delete(exportToken);
-            throw new Error(`Flow creation timed out for token ${exportToken}`);
-          }
+          this._flowWaiters.delete(exportToken);
+          reject(new Error(`Flow creation timed out for token ${exportToken}`));
         }
-      }, 100);
+      }, 15_000);
     });
   }