@radishbot/sdk 0.7.2 → 0.8.1

package/dist/index.js

@@ -18,7 +18,7 @@ import {
 } from "spacetimedb";
 var add_log_reducer_default = {
   keyHash: __t.string(),
-  flowId: __t.u64(),
+  exportToken: __t.string(),
   level: __t.string(),
   message: __t.string(),
   data: __t.string()
@@ -30,7 +30,7 @@ import {
 } from "spacetimedb";
 var add_logs_batch_reducer_default = {
   keyHash: __t2.string(),
-  flowId: __t2.u64(),
+  exportToken: __t2.string(),
   entries: __t2.string()
 };
 
@@ -52,7 +52,7 @@ import {
 } from "spacetimedb";
 var create_sub_flow_reducer_default = {
   keyHash: __t4.string(),
-  parentFlowId: __t4.u64(),
+  parentExportToken: __t4.string(),
   name: __t4.string(),
   timeoutSeconds: __t4.u64(),
   exportToken: __t4.string()
@@ -74,7 +74,7 @@ import {
 } from "spacetimedb";
 var finish_flow_reducer_default = {
   keyHash: __t6.string(),
-  flowId: __t6.u64(),
+  exportToken: __t6.string(),
   status: __t6.string(),
   errorMessage: __t6.string()
 };
@@ -95,7 +95,7 @@ import {
 } from "spacetimedb";
 var start_action_reducer_default = {
   keyHash: __t8.string(),
-  flowId: __t8.u64(),
+  exportToken: __t8.string(),
   name: __t8.string()
 };
 
@@ -283,15 +283,10 @@ class SdkConnection {
   _dbName;
   _conn = null;
   _connectPromise = null;
-  _keyHash = null;
-  _flowWaiters = new Map;
   constructor(host, dbName) {
     this._host = host;
     this._dbName = dbName;
   }
-  setKeyHash(keyHash) {
-    this._keyHash = keyHash;
-  }
   async connect() {
     if (this._conn)
       return this._conn;
@@ -300,14 +295,7 @@ class SdkConnection {
     this._connectPromise = new Promise((resolve, reject) => {
       DbConnection.builder().withUri(this._host).withDatabaseName(this._dbName).onConnect((c, _identity, _token) => {
         this._conn = c;
-        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}'`]);
+        resolve(c);
       }).onConnectError((_ctx, err) => {
         reject(new Error(`SpacetimeDB connection failed: ${err}`));
       }).build();
@@ -319,47 +307,6 @@ class SdkConnection {
       throw new Error("Not connected");
     return this._conn;
   }
-  async createFlowAndResolveId(reducerCall, exportToken) {
-    const conn = this.conn;
-    for (const f of conn.db.flow.iter()) {
-      if (f.exportToken === exportToken)
-        return f.id;
-    }
-    return new Promise((resolve, reject) => {
-      let resolved = false;
-      this._flowWaiters.set(exportToken, (id) => {
-        if (!resolved) {
-          resolved = true;
-          clearInterval(interval);
-          resolve(id);
-        }
-      });
-      reducerCall();
-      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;
-          }
-        }
-      }, 100);
-      setTimeout(() => {
-        if (!resolved) {
-          resolved = true;
-          clearInterval(interval);
-          this._flowWaiters.delete(exportToken);
-          reject(new Error(`Flow creation timed out for token ${exportToken}`));
-        }
-      }, 15000);
-    });
-  }
   disconnect() {
     if (this._conn) {
       this._conn.disconnect();
@@ -441,7 +388,6 @@ function generateToken() {
 class Flow {
   _sdk;
   _keyHash;
-  _id = null;
   _exportToken;
   _ready;
   _resolveReady;
@@ -449,15 +395,15 @@ class Flow {
   _flushScheduled = false;
   _isReady = false;
   _finished = false;
-  _parentId;
+  _parentExportToken;
   _name;
   _timeoutSeconds;
   _release;
   _runId;
-  constructor(sdk, keyHash, parentId, name, timeoutSeconds, release = "", runId = "") {
+  constructor(sdk, keyHash, parentExportToken, name, timeoutSeconds, release = "", runId = "") {
     this._sdk = sdk;
     this._keyHash = keyHash;
-    this._parentId = parentId;
+    this._parentExportToken = parentExportToken;
     this._name = name;
     this._timeoutSeconds = !timeoutSeconds || timeoutSeconds === Infinity ? 0n : BigInt(timeoutSeconds);
     this._release = release;
@@ -467,31 +413,24 @@ class Flow {
       this._resolveReady = resolve;
     });
   }
-  async _create() {
+  _create() {
     const conn = this._sdk.conn;
-    const exportToken = this._exportToken;
-    const keyHash = this._keyHash;
-    const timeoutSeconds = this._timeoutSeconds;
-    if (this._parentId === 0n) {
-      const id = await this._sdk.createFlowAndResolveId(() => conn.reducers.createRootFlow({
-        keyHash,
+    if (this._parentExportToken === null) {
+      conn.reducers.createRootFlow({
+        keyHash: this._keyHash,
         runId: this._runId,
-        timeoutSeconds,
-        exportToken,
+        timeoutSeconds: this._timeoutSeconds,
+        exportToken: this._exportToken,
         release: this._release
-      }), exportToken);
-      this._id = id;
+      });
     } else {
-      const parentFlowId = this._parentId;
-      const name = this._name;
-      const id = await this._sdk.createFlowAndResolveId(() => conn.reducers.createSubFlow({
-        keyHash,
-        parentFlowId,
-        name,
-        timeoutSeconds,
-        exportToken
-      }), exportToken);
-      this._id = id;
+      conn.reducers.createSubFlow({
+        keyHash: this._keyHash,
+        parentExportToken: this._parentExportToken,
+        name: this._name,
+        timeoutSeconds: this._timeoutSeconds,
+        exportToken: this._exportToken
+      });
     }
     this._isReady = true;
     this._resolveReady();
@@ -500,7 +439,7 @@ class Flow {
   static MAX_PENDING = 1e4;
   log(message, data, level = "info") {
     if (this._finished) {
-      console.warn(`[radish] Cannot log to finished flow`);
+      _origConsole.warn(`[radish] Cannot log to finished flow`);
       return this;
     }
     if (this._pendingLogs.length >= Flow.MAX_PENDING) {
@@ -528,9 +467,8 @@ class Flow {
     return this.log(message, data, "debug");
   }
   action(name, timeoutSeconds = 100) {
-    const child = new Flow(this._sdk, this._keyHash, 0n, name, timeoutSeconds, this._release, this._runId);
+    const child = new Flow(this._sdk, this._keyHash, this._exportToken, name, timeoutSeconds, this._release, this._runId);
     this._ready.then(() => {
-      child._parentId = this._id;
       child._create();
     });
     return child;
@@ -561,7 +499,7 @@ class Flow {
     this._finished = true;
     this._sdk.conn.reducers.finishFlow({
       keyHash: this._keyHash,
-      flowId: this._id,
+      exportToken: this._exportToken,
       status: "finished",
       errorMessage: ""
     });
@@ -576,7 +514,7 @@ class Flow {
     this._finished = true;
     this._sdk.conn.reducers.finishFlow({
       keyHash: this._keyHash,
-      flowId: this._id,
+      exportToken: this._exportToken,
       status: "error",
       errorMessage
     });
@@ -584,19 +522,16 @@ class Flow {
   get runId() {
     return this._runId;
   }
-  async exportID() {
-    await this._ready;
+  get token() {
+    return this._exportToken;
+  }
+  exportID() {
     return JSON.stringify({
-      flowId: this._id.toString(),
       exportToken: this._exportToken,
       keyHash: this._keyHash,
       runId: this._runId
     });
   }
-  async getId() {
-    await this._ready;
-    return this._id;
-  }
   disconnect() {
     this._sdk.disconnect();
   }
@@ -623,7 +558,7 @@ class Flow {
       const e = batch[0];
       conn.reducers.addLog({
         keyHash: this._keyHash,
-        flowId: this._id,
+        exportToken: this._exportToken,
         level: e.level,
         message: e.message,
         data: e.data
@@ -631,7 +566,7 @@ class Flow {
     } else {
       conn.reducers.addLogsBatch({
         keyHash: this._keyHash,
-        flowId: this._id,
+        exportToken: this._exportToken,
         entries: JSON.stringify(batch)
       });
     }
@@ -656,16 +591,13 @@ async function RL(secretKey, options = {}) {
   const retentionDays = parseRetention(retention);
   const keyHash = await hashKey(secretKey);
   const sdk = new SdkConnection(host, dbName);
-  sdk.setKeyHash(keyHash);
   try {
     await sdk.connect();
   } catch (e) {
     throw new Error(`Failed to connect to Radish (${host}/${dbName}): ${e instanceof Error ? e.message : e}`);
   }
-  try {
-    sdk.conn.reducers.registerKey({ keyHash, label, retentionDays: BigInt(retentionDays) });
-  } catch {}
-  const root = new Flow(sdk, keyHash, 0n, "/", 0, release, runId);
+  sdk.conn.reducers.registerKey({ keyHash, label, retentionDays: BigInt(retentionDays) });
+  const root = new Flow(sdk, keyHash, null, "/", 0, release, runId);
   root._create();
   return root;
 }
@@ -678,9 +610,9 @@ async function restoreFlow(secretKey, exportedId, options = {}) {
   }
   const sdk = new SdkConnection(host, dbName);
   await sdk.connect();
-  const flow = new Flow(sdk, keyHash, 0n, "restored", 100, "", parsed.runId || "");
-  flow._id = BigInt(parsed.flowId);
+  const flow = new Flow(sdk, keyHash, null, "restored", 100, "", parsed.runId || "");
   flow._exportToken = parsed.exportToken;
+  flow._isReady = true;
   flow._resolveReady();
   return flow;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radishbot/sdk",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     }
   },
   "bin": {
-    "radish": "./src/cli.ts"
+    "radish": "./dist/cli.js"
   },
   "files": [
     "src",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "bun build ./src/index.ts --outdir dist --target node --format esm --external spacetimedb --external ws",
+    "build": "bun build ./src/index.ts --outdir dist --target node --format esm --external spacetimedb --external ws && bun build ./src/cli.ts --outfile dist/cli.js --target node --format esm --external spacetimedb --external ws",
     "prepublishOnly": "bun run build",
     "cli": "bun run ./src/cli.ts"
   },

package/src/cli.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 /**
  * Radish CLI — inspect flows and logs from the terminal.
  *

package/src/connection.ts

@@ -1,6 +1,6 @@
 /**
  * SpacetimeDB connection wrapper for the Radish SDK.
- * Uses the generated bindings + SpacetimeDB WebSocket client.
+ * No subscription needed — all operations use exportToken (fire-and-forget reducers).
  */
 import { DbConnection as StdbConnection } from "./module_bindings";
 
@@ -9,20 +9,12 @@ export class SdkConnection {
   private _dbName: string;
   private _conn: StdbConnection | null = null;
   private _connectPromise: Promise<StdbConnection> | null = null;
-  private _keyHash: string | null = null;
-
-  // Callbacks waiting for flow creation by exportToken
-  private _flowWaiters = new Map<string, (id: bigint) => void>();
 
   constructor(host: string, dbName: string) {
     this._host = host;
     this._dbName = dbName;
   }
 
-  setKeyHash(keyHash: string): void {
-    this._keyHash = keyHash;
-  }
-
   async connect(): Promise<StdbConnection> {
     if (this._conn) return this._conn;
     if (this._connectPromise) return this._connectPromise;
@@ -33,19 +25,7 @@ export class SdkConnection {
         .withDatabaseName(this._dbName)
         .onConnect((c, _identity, _token) => {
           this._conn = c;
-
-          // 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}'`]);
+          resolve(c);
         })
         .onConnectError((_ctx, err) => {
           reject(new Error(`SpacetimeDB connection failed: ${err}`));
@@ -61,62 +41,6 @@ export class SdkConnection {
     return this._conn;
   }
 
-  /**
-   * Call a reducer and wait for the flow to appear in the subscription.
-   * Returns the server-assigned flow ID.
-   */
-  async createFlowAndResolveId(reducerCall: () => void, exportToken: string): Promise<bigint> {
-    const conn = this.conn;
-
-    // Check if flow already exists (from a previous subscription update)
-    for (const f of conn.db.flow.iter()) {
-      if (f.exportToken === exportToken) return f.id;
-    }
-
-    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();
-
-      // 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;
-          }
-        }
-      }, 100);
-
-      // Timeout after 15 seconds (properly rejects the promise)
-      setTimeout(() => {
-        if (!resolved) {
-          resolved = true;
-          clearInterval(interval);
-          this._flowWaiters.delete(exportToken);
-          reject(new Error(`Flow creation timed out for token ${exportToken}`));
-        }
-      }, 15_000);
-    });
-  }
-
   disconnect(): void {
     if (this._conn) {
       this._conn.disconnect();