@radishbot/sdk 0.7.2 → 0.8.1

package/src/index.ts

@@ -85,7 +85,6 @@ function generateToken(): string {
 export class Flow {
   private _sdk: SdkConnection;
   private _keyHash: string;
-  private _id: bigint | null = null;
   private _exportToken: string;
   private _ready: Promise<void>;
   private _resolveReady!: () => void;
@@ -93,7 +92,7 @@ export class Flow {
   private _flushScheduled = false;
   private _isReady = false;
   private _finished = false;
-  private _parentId: bigint;
+  private _parentExportToken: string | null;
   private _name: string;
   private _timeoutSeconds: bigint;
   private _release: string;
@@ -103,7 +102,7 @@ export class Flow {
   constructor(
     sdk: SdkConnection,
     keyHash: string,
-    parentId: bigint,
+    parentExportToken: string | null,
     name: string,
     timeoutSeconds: number,
     release: string = "",
@@ -111,7 +110,7 @@ export class Flow {
   ) {
     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;
@@ -122,45 +121,33 @@ export class Flow {
     });
   }
 
-  /** @internal */
-  async _create(): Promise<void> {
+  /** @internal — fire-and-forget: sends creation reducer, resolves immediately */
+  _create(): void {
     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,
-            runId: this._runId,
-            timeoutSeconds,
-            exportToken,
-            release: this._release,
-          }),
-        exportToken,
-      );
-      this._id = id;
+
+    if (this._parentExportToken === null) {
+      conn.reducers.createRootFlow({
+        keyHash: this._keyHash,
+        runId: this._runId,
+        timeoutSeconds: this._timeoutSeconds,
+        exportToken: this._exportToken,
+        release: this._release,
+      });
     } 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,
+      });
     }
+
+    // Ready immediately — server processes messages in order,
+    // so any subsequent reducers run after the creation above
     this._isReady = true;
     this._resolveReady();
-    this._drain(); // flush any logs queued before ready
+    this._drain();
   }
 
   /** Max pending logs before oldest are dropped (prevents memory issues at high volume) */
@@ -169,10 +156,9 @@ export class Flow {
   /** Log a message with optional data */
   log(message: string, data?: unknown, level: LogLevel = "info"): this {
     if (this._finished) {
-      console.warn(`[radish] Cannot log to finished flow`);
+      _origConsole.warn(`[radish] Cannot log to finished flow`);
       return this;
     }
-    // Drop oldest logs if buffer is full (backpressure)
     if (this._pendingLogs.length >= Flow.MAX_PENDING) {
       const dropped = this._pendingLogs.length - Flow.MAX_PENDING + 1;
       this._pendingLogs.splice(0, dropped);
@@ -199,11 +185,18 @@ export class Flow {
     return this.log(message, data, "debug");
   }
 
-  /** Create a sub-action. Returns immediately — creation runs in background. */
+  /** Create a sub-flow. Returns immediately — creation runs in background. */
   action(name: string, timeoutSeconds = 100): Flow {
-    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 as any)._parentId = this._id!;
       child._create();
     });
     return child;
@@ -235,11 +228,11 @@ export class Flow {
   /** Finish this flow successfully */
   async finish(): Promise<void> {
     await this._ready;
-    this._drain(); // sync flush — sends over same WS, ordering preserved
+    this._drain();
     this._finished = true;
     this._sdk.conn.reducers.finishFlow({
       keyHash: this._keyHash,
-      flowId: this._id!,
+      exportToken: this._exportToken,
       status: "finished",
       errorMessage: "",
     });
@@ -256,7 +249,7 @@ export class Flow {
     this._finished = true;
     this._sdk.conn.reducers.finishFlow({
       keyHash: this._keyHash,
-      flowId: this._id!,
+      exportToken: this._exportToken,
       status: "error",
       errorMessage,
     });
@@ -267,23 +260,20 @@ export class Flow {
     return this._runId;
   }
 
+  /** Get the export token for this flow */
+  get token(): string {
+    return this._exportToken;
+  }
+
   /** Export this flow's handle for restoration in another context */
-  async exportID(): Promise<string> {
-    await this._ready;
+  exportID(): string {
     return JSON.stringify({
-      flowId: this._id!.toString(),
       exportToken: this._exportToken,
       keyHash: this._keyHash,
       runId: this._runId,
     });
   }
 
-  /** Get the resolved server-assigned flow ID */
-  async getId(): Promise<bigint> {
-    await this._ready;
-    return this._id!;
-  }
-
   /** Disconnect the underlying SpacetimeDB connection */
   disconnect(): void {
     this._sdk.disconnect();
@@ -292,7 +282,6 @@ export class Flow {
   /** Finish the flow and disconnect */
   async finishAndDisconnect(): Promise<void> {
     await this.finish();
-    // Small delay to allow the finish reducer to be sent
     await new Promise((r) => setTimeout(r, 100));
     this.disconnect();
   }
@@ -317,7 +306,7 @@ export 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,
@@ -325,7 +314,7 @@ export class Flow {
     } else {
       conn.reducers.addLogsBatch({
         keyHash: this._keyHash,
-        flowId: this._id!,
+        exportToken: this._exportToken,
         entries: JSON.stringify(batch),
       });
     }
@@ -339,7 +328,6 @@ export interface RLOptions {
   defaultTimeout?: number;
   release?: string;
   retention?: string;
-  /** Run ID — groups flows across processes. Auto-generated if not provided. */
   runId?: string;
 }
 
@@ -350,24 +338,18 @@ function parseRetention(retention: string): number {
 }
 
 /**
- * Create a Radish Logger instance. Returns the root action.
+ * Create a Radish Logger instance. Returns the root flow.
  *
  * ```ts
  * const root = await RL('my-secret-key');
  *
- * // Auto-managed — auto-finish on return, auto-error on throw
  * await root.a('request', async (req) => {
  *   console.log('GET /api/users');
  *   const rows = await req.a('db_query', () => db.query('SELECT ...'));
  *   console.log('Done', { count: rows.length });
  * });
  *
- * // Manual — when you need more control
- * const ws = root.action('websocket');
- * ws.info('Connected');
- * await ws.finish();
- *
- * await root.finish();
+ * await root.finishAndDisconnect();
  * ```
  */
 export async function RL(secretKey: string, options: RLOptions = {}): Promise<Flow> {
@@ -384,7 +366,6 @@ export async function RL(secretKey: string, options: RLOptions = {}): Promise<Fl
   const retentionDays = parseRetention(retention);
   const keyHash = await hashKey(secretKey);
   const sdk = new SdkConnection(host, dbName);
-  sdk.setKeyHash(keyHash);
   try {
     await sdk.connect();
   } catch (e) {
@@ -392,15 +373,11 @@ export async function RL(secretKey: string, options: RLOptions = {}): Promise<Fl
   }
 
   // Register key (idempotent — updates retention if changed)
-  try {
-    sdk.conn.reducers.registerKey({ keyHash, label, retentionDays: BigInt(retentionDays) });
-  } catch {
-    // Already registered
-  }
+  sdk.conn.reducers.registerKey({ keyHash, label, retentionDays: BigInt(retentionDays) });
 
-  // Root flow — creation runs in background, logs queue until ready
-  const root = new Flow(sdk, keyHash, 0n, "/", 0, release, runId);
-  root._create(); // fire-and-forget — resolves _ready when server assigns ID
+  // Root flow — fire-and-forget, ready immediately
+  const root = new Flow(sdk, keyHash, null, "/", 0, release, runId);
+  root._create();
   return root;
 }
 
@@ -417,9 +394,9 @@ export async function restoreFlow(secretKey: string, exportedId: string, options
   const sdk = new SdkConnection(host, dbName);
   await sdk.connect();
 
-  const flow = new Flow(sdk, keyHash, 0n, "restored", 100, "", parsed.runId || "");
-  (flow as any)._id = BigInt(parsed.flowId);
+  const flow = new Flow(sdk, keyHash, null, "restored", 100, "", parsed.runId || "");
   (flow as any)._exportToken = parsed.exportToken;
+  (flow as any)._isReady = true;
   (flow as any)._resolveReady();
   return flow;
 }

package/src/module_bindings/add_log_reducer.ts

@@ -12,7 +12,7 @@ import {
 
 export default {
   keyHash: __t.string(),
-  flowId: __t.u64(),
+  exportToken: __t.string(),
   level: __t.string(),
   message: __t.string(),
   data: __t.string(),

package/src/module_bindings/add_logs_batch_reducer.ts

@@ -12,6 +12,6 @@ import {
 
 export default {
   keyHash: __t.string(),
-  flowId: __t.u64(),
+  exportToken: __t.string(),
   entries: __t.string(),
 };

package/src/module_bindings/create_sub_flow_reducer.ts

@@ -12,7 +12,7 @@ import {
 
 export default {
   keyHash: __t.string(),
-  parentFlowId: __t.u64(),
+  parentExportToken: __t.string(),
   name: __t.string(),
   timeoutSeconds: __t.u64(),
   exportToken: __t.string(),

package/src/module_bindings/finish_flow_reducer.ts

@@ -12,7 +12,7 @@ import {
 
 export default {
   keyHash: __t.string(),
-  flowId: __t.u64(),
+  exportToken: __t.string(),
   status: __t.string(),
   errorMessage: __t.string(),
 };

package/src/module_bindings/start_action_reducer.ts

@@ -12,6 +12,6 @@ import {
 
 export default {
   keyHash: __t.string(),
-  flowId: __t.u64(),
+  exportToken: __t.string(),
   name: __t.string(),
 };