@radishbot/sdk 0.5.0 → 0.6.0

package/dist/index.js

@@ -34,161 +34,153 @@ var add_logs_batch_reducer_default = {
   entries: __t2.string()
 };
 
-// src/module_bindings/check_timeouts_reducer.ts
+// src/module_bindings/create_root_flow_reducer.ts
 import {
   t as __t3
 } from "spacetimedb";
-var check_timeouts_reducer_default = {
-  keyHash: __t3.string()
+var create_root_flow_reducer_default = {
+  keyHash: __t3.string(),
+  runId: __t3.string(),
+  timeoutSeconds: __t3.u64(),
+  exportToken: __t3.string(),
+  release: __t3.string()
 };
 
-// src/module_bindings/create_root_flow_reducer.ts
+// src/module_bindings/create_sub_flow_reducer.ts
 import {
   t as __t4
 } from "spacetimedb";
-var create_root_flow_reducer_default = {
+var create_sub_flow_reducer_default = {
   keyHash: __t4.string(),
-  runId: __t4.string(),
+  parentFlowId: __t4.u64(),
+  name: __t4.string(),
   timeoutSeconds: __t4.u64(),
-  exportToken: __t4.string(),
-  release: __t4.string()
+  exportToken: __t4.string()
 };
 
-// src/module_bindings/create_sub_flow_reducer.ts
+// src/module_bindings/finish_action_reducer.ts
 import {
   t as __t5
 } from "spacetimedb";
-var create_sub_flow_reducer_default = {
+var finish_action_reducer_default = {
   keyHash: __t5.string(),
-  parentFlowId: __t5.u64(),
-  name: __t5.string(),
-  timeoutSeconds: __t5.u64(),
-  exportToken: __t5.string()
+  actionId: __t5.u64(),
+  status: __t5.string()
 };
 
-// src/module_bindings/finish_action_reducer.ts
+// src/module_bindings/finish_flow_reducer.ts
 import {
   t as __t6
 } from "spacetimedb";
-var finish_action_reducer_default = {
+var finish_flow_reducer_default = {
   keyHash: __t6.string(),
-  actionId: __t6.u64(),
-  status: __t6.string()
+  flowId: __t6.u64(),
+  status: __t6.string(),
+  errorMessage: __t6.string()
 };
 
-// src/module_bindings/finish_flow_reducer.ts
+// src/module_bindings/register_key_reducer.ts
 import {
   t as __t7
 } from "spacetimedb";
-var finish_flow_reducer_default = {
+var register_key_reducer_default = {
   keyHash: __t7.string(),
-  flowId: __t7.u64(),
-  status: __t7.string(),
-  errorMessage: __t7.string()
+  label: __t7.string(),
+  retentionDays: __t7.u64()
 };
 
-// src/module_bindings/register_key_reducer.ts
+// src/module_bindings/start_action_reducer.ts
 import {
   t as __t8
 } from "spacetimedb";
-var register_key_reducer_default = {
+var start_action_reducer_default = {
   keyHash: __t8.string(),
-  label: __t8.string(),
-  retentionDays: __t8.u64()
+  flowId: __t8.u64(),
+  name: __t8.string()
 };
 
-// src/module_bindings/start_action_reducer.ts
+// src/module_bindings/update_error_group_status_reducer.ts
 import {
   t as __t9
 } from "spacetimedb";
-var start_action_reducer_default = {
+var update_error_group_status_reducer_default = {
   keyHash: __t9.string(),
-  flowId: __t9.u64(),
-  name: __t9.string()
+  errorGroupId: __t9.u64(),
+  status: __t9.string()
 };
 
-// src/module_bindings/update_error_group_status_reducer.ts
+// src/module_bindings/action_table.ts
 import {
   t as __t10
 } from "spacetimedb";
-var update_error_group_status_reducer_default = {
-  keyHash: __t10.string(),
-  errorGroupId: __t10.u64(),
-  status: __t10.string()
-};
+var action_table_default = __t10.row({
+  id: __t10.u64().primaryKey(),
+  flowId: __t10.u64().name("flow_id"),
+  name: __t10.string(),
+  status: __t10.string(),
+  createdAt: __t10.timestamp().name("created_at"),
+  finishedAt: __t10.u64().name("finished_at")
+});
 
-// src/module_bindings/action_table.ts
+// src/module_bindings/api_key_table.ts
 import {
   t as __t11
 } from "spacetimedb";
-var action_table_default = __t11.row({
-  id: __t11.u64().primaryKey(),
-  flowId: __t11.u64().name("flow_id"),
-  name: __t11.string(),
-  status: __t11.string(),
-  createdAt: __t11.timestamp().name("created_at"),
-  finishedAt: __t11.u64().name("finished_at")
+var api_key_table_default = __t11.row({
+  keyHash: __t11.string().primaryKey().name("key_hash"),
+  label: __t11.string(),
+  retentionDays: __t11.u64().name("retention_days"),
+  createdAt: __t11.timestamp().name("created_at")
 });
 
-// src/module_bindings/api_key_table.ts
+// src/module_bindings/error_group_table.ts
 import {
   t as __t12
 } from "spacetimedb";
-var api_key_table_default = __t12.row({
-  keyHash: __t12.string().primaryKey().name("key_hash"),
-  label: __t12.string(),
-  retentionDays: __t12.u64().name("retention_days"),
-  createdAt: __t12.timestamp().name("created_at")
+var error_group_table_default = __t12.row({
+  id: __t12.u64().primaryKey(),
+  keyHash: __t12.string().name("key_hash"),
+  fingerprint: __t12.string(),
+  message: __t12.string(),
+  path: __t12.string(),
+  release: __t12.string(),
+  count: __t12.u64(),
+  status: __t12.string(),
+  firstSeenAt: __t12.timestamp().name("first_seen_at"),
+  lastSeenAt: __t12.u64().name("last_seen_at"),
+  lastFlowId: __t12.u64().name("last_flow_id")
 });
 
-// src/module_bindings/error_group_table.ts
+// src/module_bindings/flow_table.ts
 import {
   t as __t13
 } from "spacetimedb";
-var error_group_table_default = __t13.row({
+var flow_table_default = __t13.row({
   id: __t13.u64().primaryKey(),
   keyHash: __t13.string().name("key_hash"),
-  fingerprint: __t13.string(),
-  message: __t13.string(),
+  runId: __t13.string().name("run_id"),
+  parentFlowId: __t13.u64().name("parent_flow_id"),
+  name: __t13.string(),
   path: __t13.string(),
-  release: __t13.string(),
-  count: __t13.u64(),
   status: __t13.string(),
-  firstSeenAt: __t13.timestamp().name("first_seen_at"),
-  lastSeenAt: __t13.u64().name("last_seen_at"),
-  lastFlowId: __t13.u64().name("last_flow_id")
+  release: __t13.string(),
+  timeoutSeconds: __t13.u64().name("timeout_seconds"),
+  createdAt: __t13.timestamp().name("created_at"),
+  finishedAt: __t13.u64().name("finished_at"),
+  exportToken: __t13.string().name("export_token")
 });
 
-// src/module_bindings/flow_table.ts
+// src/module_bindings/log_entry_table.ts
 import {
   t as __t14
 } from "spacetimedb";
-var flow_table_default = __t14.row({
+var log_entry_table_default = __t14.row({
   id: __t14.u64().primaryKey(),
-  keyHash: __t14.string().name("key_hash"),
-  runId: __t14.string().name("run_id"),
-  parentFlowId: __t14.u64().name("parent_flow_id"),
-  name: __t14.string(),
-  path: __t14.string(),
-  status: __t14.string(),
-  release: __t14.string(),
-  timeoutSeconds: __t14.u64().name("timeout_seconds"),
-  createdAt: __t14.timestamp().name("created_at"),
-  finishedAt: __t14.u64().name("finished_at"),
-  exportToken: __t14.string().name("export_token")
-});
-
-// src/module_bindings/log_entry_table.ts
-import {
-  t as __t15
-} from "spacetimedb";
-var log_entry_table_default = __t15.row({
-  id: __t15.u64().primaryKey(),
-  flowId: __t15.u64().name("flow_id"),
-  level: __t15.string(),
-  message: __t15.string(),
-  data: __t15.string(),
-  createdAt: __t15.timestamp().name("created_at")
+  flowId: __t14.u64().name("flow_id"),
+  level: __t14.string(),
+  message: __t14.string(),
+  data: __t14.string(),
+  createdAt: __t14.timestamp().name("created_at")
 });
 
 // src/module_bindings/index.ts
@@ -257,7 +249,7 @@ var tablesSchema = __schema({
     ]
   }, log_entry_table_default)
 });
-var reducersSchema = __reducers(__reducerSchema("add_log", add_log_reducer_default), __reducerSchema("add_logs_batch", add_logs_batch_reducer_default), __reducerSchema("check_timeouts", check_timeouts_reducer_default), __reducerSchema("create_root_flow", create_root_flow_reducer_default), __reducerSchema("create_sub_flow", create_sub_flow_reducer_default), __reducerSchema("finish_action", finish_action_reducer_default), __reducerSchema("finish_flow", finish_flow_reducer_default), __reducerSchema("register_key", register_key_reducer_default), __reducerSchema("start_action", start_action_reducer_default), __reducerSchema("update_error_group_status", update_error_group_status_reducer_default));
+var reducersSchema = __reducers(__reducerSchema("add_log", add_log_reducer_default), __reducerSchema("add_logs_batch", add_logs_batch_reducer_default), __reducerSchema("create_root_flow", create_root_flow_reducer_default), __reducerSchema("create_sub_flow", create_sub_flow_reducer_default), __reducerSchema("finish_action", finish_action_reducer_default), __reducerSchema("finish_flow", finish_flow_reducer_default), __reducerSchema("register_key", register_key_reducer_default), __reducerSchema("start_action", start_action_reducer_default), __reducerSchema("update_error_group_status", update_error_group_status_reducer_default));
 var proceduresSchema = __procedures();
 var REMOTE_MODULE = {
   versionInfo: {
@@ -291,7 +283,6 @@ class SdkConnection {
   _dbName;
   _conn = null;
   _connectPromise = null;
-  _timeoutInterval = null;
   _keyHash = null;
   _flowWaiters = new Map;
   constructor(host, dbName) {
@@ -311,12 +302,7 @@ class SdkConnection {
         this._conn = c;
         c.subscriptionBuilder().onApplied(() => {
           resolve(c);
-        }).subscribeToAllTables();
-        this._timeoutInterval = setInterval(() => {
-          if (this._keyHash) {
-            c.reducers.checkTimeouts({ keyHash: this._keyHash });
-          }
-        }, 30000);
+        }).subscribe([`SELECT * FROM flow WHERE key_hash = '${this._keyHash}'`]);
       }).onConnectError((_ctx, err) => {
         reject(new Error(`SpacetimeDB connection failed: ${err}`));
       }).build();
@@ -360,10 +346,6 @@ class SdkConnection {
     });
   }
   disconnect() {
-    if (this._timeoutInterval) {
-      clearInterval(this._timeoutInterval);
-      this._timeoutInterval = null;
-    }
     if (this._conn) {
       this._conn.disconnect();
       this._conn = null;
@@ -668,9 +650,6 @@ async function RL(secretKey, options = {}) {
   try {
     sdk.conn.reducers.registerKey({ keyHash, label, retentionDays: BigInt(retentionDays) });
   } catch {}
-  try {
-    sdk.conn.reducers.checkTimeouts({ keyHash });
-  } catch {}
   const root = new Flow(sdk, keyHash, 0n, "/", 0, release, runId);
   root._create();
   return root;

package/package.json

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

package/src/cli.ts

@@ -144,24 +144,16 @@ function connect(
       .onConnect((c, _identity, _token) => {
         c.subscriptionBuilder()
           .onApplied(() => {
-            const flows = () => {
-              const result: any[] = [];
-              for (const f of c.db.flow.iter()) if (f.keyHash === keyHash) result.push(f);
-              return result;
-            };
-            const logs = () => {
-              const result: any[] = [];
-              for (const l of c.db.logEntry.iter()) result.push(l);
-              return result;
-            };
-            const errorGroups = () => {
-              const result: any[] = [];
-              for (const g of c.db.errorGroup.iter()) if (g.keyHash === keyHash) result.push(g);
-              return result;
-            };
+            const flows = () => [...c.db.flow.iter()];
+            const logs = () => [...c.db.logEntry.iter()];
+            const errorGroups = () => [...c.db.errorGroup.iter()];
             resolve({ conn: c, flows, logs, errorGroups });
           })
-          .subscribeToAllTables();
+          .subscribe([
+            `SELECT * FROM flow WHERE key_hash = '${keyHash}'`,
+            `SELECT * FROM log_entry WHERE flow_id IN (SELECT id FROM flow WHERE key_hash = '${keyHash}')`,
+            `SELECT * FROM error_group WHERE key_hash = '${keyHash}'`,
+          ]);
       })
       .onConnectError((_ctx, err) => reject(new Error(`Connection failed: ${err}`)))
       .build();
@@ -360,12 +352,15 @@ async function cmdTail(keyHash: string) {
           .onApplied(() => {
             // Seed known flows and seen logs
             for (const f of c.db.flow.iter()) {
-              if (f.keyHash === keyHash) flowNames.set(f.id, f.name === "/" ? "root" : f.name);
+              flowNames.set(f.id, f.name === "/" ? "root" : f.name);
             }
             for (const l of c.db.logEntry.iter()) seen.add(l.id);
             resolve(c);
           })
-          .subscribeToAllTables();
+          .subscribe([
+            `SELECT * FROM flow WHERE key_hash = '${keyHash}'`,
+            `SELECT * FROM log_entry WHERE flow_id IN (SELECT id FROM flow WHERE key_hash = '${keyHash}')`,
+          ]);
       })
       .onConnectError((_ctx, err) => reject(new Error(`Connection failed: ${err}`)))
       .build();
@@ -373,9 +368,9 @@ async function cmdTail(keyHash: string) {
 
   // Poll for new logs
   setInterval(() => {
-    // Update flow names
+    // Update flow names (subscription already filters by key)
     for (const f of conn.db.flow.iter()) {
-      if (f.keyHash === keyHash && !flowNames.has(f.id)) {
+      if (!flowNames.has(f.id)) {
         flowNames.set(f.id, f.name === "/" ? "root" : f.name);
       }
     }
@@ -383,11 +378,8 @@ async function cmdTail(keyHash: string) {
     const newLogs: any[] = [];
     for (const l of conn.db.logEntry.iter()) {
       if (!seen.has(l.id) && l.level !== "flow" && l.level !== "action") {
-        // Only show logs belonging to this key's flows
-        if (flowNames.has(l.flowId)) {
-          seen.add(l.id);
-          newLogs.push(l);
-        }
+        seen.add(l.id);
+        newLogs.push(l);
       }
     }
 

package/src/connection.ts

@@ -2,14 +2,13 @@
  * SpacetimeDB connection wrapper for the Radish SDK.
  * Uses the generated bindings + SpacetimeDB WebSocket client.
  */
-import { DbConnection as StdbConnection } from './module_bindings';
+import { DbConnection as StdbConnection } from "./module_bindings";
 
 export class SdkConnection {
   private _host: string;
   private _dbName: string;
   private _conn: StdbConnection | null = null;
   private _connectPromise: Promise<StdbConnection> | null = null;
-  private _timeoutInterval: ReturnType<typeof setInterval> | null = null;
   private _keyHash: string | null = null;
 
   // Callbacks waiting for flow creation by exportToken
@@ -35,19 +34,12 @@ export class SdkConnection {
         .onConnect((c, _identity, _token) => {
           this._conn = c;
 
-          // Subscribe to flow table to detect newly created flows
+          // Only subscribe to flows for this key (needed to resolve flow IDs)
           c.subscriptionBuilder()
             .onApplied(() => {
               resolve(c);
             })
-            .subscribeToAllTables();
-
-          // Periodic timeout check (every 30s)
-          this._timeoutInterval = setInterval(() => {
-            if (this._keyHash) {
-              c.reducers.checkTimeouts({ keyHash: this._keyHash });
-            }
-          }, 30_000);
+            .subscribe([`SELECT * FROM flow WHERE key_hash = '${this._keyHash}'`]);
         })
         .onConnectError((_ctx, err) => {
           reject(new Error(`SpacetimeDB connection failed: ${err}`));
@@ -59,7 +51,7 @@ export class SdkConnection {
   }
 
   get conn(): StdbConnection {
-    if (!this._conn) throw new Error('Not connected');
+    if (!this._conn) throw new Error("Not connected");
     return this._conn;
   }
 
@@ -67,10 +59,7 @@ export class SdkConnection {
    * 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> {
+  async createFlowAndResolveId(reducerCall: () => void, exportToken: string): Promise<bigint> {
     const conn = this.conn;
 
     // Check if flow already exists (from a previous subscription update)
@@ -112,10 +101,6 @@ export class SdkConnection {
   }
 
   disconnect(): void {
-    if (this._timeoutInterval) {
-      clearInterval(this._timeoutInterval);
-      this._timeoutInterval = null;
-    }
     if (this._conn) {
       this._conn.disconnect();
       this._conn = null;

package/src/index.ts

@@ -398,13 +398,6 @@ export async function RL(secretKey: string, options: RLOptions = {}): Promise<Fl
     // Already registered
   }
 
-  // Check for timed-out flows (fire-and-forget)
-  try {
-    sdk.conn.reducers.checkTimeouts({ keyHash });
-  } catch {
-    // Non-critical
-  }
-
   // 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

package/src/module_bindings/index.ts

@@ -36,7 +36,6 @@ import {
 // Import all reducer arg schemas
 import AddLogReducer from "./add_log_reducer";
 import AddLogsBatchReducer from "./add_logs_batch_reducer";
-import CheckTimeoutsReducer from "./check_timeouts_reducer";
 import CreateRootFlowReducer from "./create_root_flow_reducer";
 import CreateSubFlowReducer from "./create_sub_flow_reducer";
 import FinishActionReducer from "./finish_action_reducer";
@@ -127,7 +126,6 @@ const tablesSchema = __schema({
 const reducersSchema = __reducers(
   __reducerSchema("add_log", AddLogReducer),
   __reducerSchema("add_logs_batch", AddLogsBatchReducer),
-  __reducerSchema("check_timeouts", CheckTimeoutsReducer),
   __reducerSchema("create_root_flow", CreateRootFlowReducer),
   __reducerSchema("create_sub_flow", CreateSubFlowReducer),
   __reducerSchema("finish_action", FinishActionReducer),

package/src/module_bindings/types/reducers.ts

@@ -8,7 +8,6 @@ import { type Infer as __Infer } from "spacetimedb";
 // Import all reducer arg schemas
 import AddLogReducer from "../add_log_reducer";
 import AddLogsBatchReducer from "../add_logs_batch_reducer";
-import CheckTimeoutsReducer from "../check_timeouts_reducer";
 import CreateRootFlowReducer from "../create_root_flow_reducer";
 import CreateSubFlowReducer from "../create_sub_flow_reducer";
 import FinishActionReducer from "../finish_action_reducer";
@@ -19,7 +18,6 @@ import UpdateErrorGroupStatusReducer from "../update_error_group_status_reducer"
 
 export type AddLogParams = __Infer<typeof AddLogReducer>;
 export type AddLogsBatchParams = __Infer<typeof AddLogsBatchReducer>;
-export type CheckTimeoutsParams = __Infer<typeof CheckTimeoutsReducer>;
 export type CreateRootFlowParams = __Infer<typeof CreateRootFlowReducer>;
 export type CreateSubFlowParams = __Infer<typeof CreateSubFlowReducer>;
 export type FinishActionParams = __Infer<typeof FinishActionReducer>;

package/src/module_bindings/types.ts

@@ -75,3 +75,9 @@ export const LogEntry = __t.object("LogEntry", {
 });
 export type LogEntry = __Infer<typeof LogEntry>;
 
+export const TimeoutJob = __t.object("TimeoutJob", {
+  scheduledId: __t.u64(),
+  scheduledAt: __t.scheduleAt(),
+});
+export type TimeoutJob = __Infer<typeof TimeoutJob>;
+

package/src/module_bindings/check_timeouts_reducer.ts

@@ -1,15 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from "spacetimedb";
-
-export default {
-  keyHash: __t.string(),
-};