spacetimedb 2.0.0 → 2.0.1

package/dist/vue/useTable.d.ts

@@ -1,6 +1,7 @@
 import { type DeepReadonly, type Ref } from 'vue';
 import type { RowType, UntypedTableDef } from '../lib/table';
 import type { Prettify } from '../lib/type_util';
+import { type Query } from '../lib/query';
 export interface UseTableCallbacks<RowType> {
     onInsert?: (row: RowType) => void;
     onDelete?: (row: RowType) => void;
@@ -17,9 +18,7 @@ export interface UseTableCallbacks<RowType> {
  * @param callbacks - Optional callbacks for row insert, delete, and update events.
  * @returns A tuple of [rows, isReady].
  */
-export declare function useTable<TableDef extends UntypedTableDef>(query: {
-    toSql(): string;
-} & Record<string, any>, callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>): [
+export declare function useTable<TableDef extends UntypedTableDef>(query: Query<TableDef>, callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>): [
     DeepReadonly<Ref<readonly Prettify<RowType<TableDef>>[]>>,
     DeepReadonly<Ref<boolean>>
 ];

package/dist/vue/useTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.d.ts","sourceRoot":"","sources":["../../src/vue/useTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,GAAG,EACT,MAAM,KAAK,CAAC;AAKb,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAQjD,MAAM,WAAW,iBAAiB,CAAC,OAAO;IACxC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACvD;AAkBD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,SAAS,eAAe,EACvD,KAAK,EAAE;IAAE,KAAK,IAAI,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChD,SAAS,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GACzD;IACD,YAAY,CAAC,GAAG,CAAC,SAAS,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACzD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CAC3B,CAqKA"}
+{"version":3,"file":"useTable.d.ts","sourceRoot":"","sources":["../../src/vue/useTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,GAAG,EACT,MAAM,KAAK,CAAC;AAKb,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,KAAK,KAAK,EAMX,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,iBAAiB,CAAC,OAAO;IACxC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACvD;AAkBD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,SAAS,eAAe,EACvD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EACtB,SAAS,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GACzD;IACD,YAAY,CAAC,GAAG,CAAC,SAAS,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACzD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CAC3B,CAqKA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacetimedb",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "API and ABI bindings for the SpacetimeDB TypeScript module library",
   "homepage": "https://github.com/clockworklabs/SpacetimeDB#readme",
   "bugs": {

package/src/sdk/db_connection_impl.ts

@@ -712,6 +712,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
       }
       case 'SubscriptionError': {
         const querySetId = serverMessage.value.querySetId.id;
+        const requestId = serverMessage.value.requestId;
         const error = Error(serverMessage.value.error);
         const event: Event<never> = {
           id: this.#nextEventId(),
@@ -723,6 +724,19 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
           ...eventContext,
           event: error,
         };
+
+        // If the requestId isn't set, that means we already applied the subscription.
+        // Since we don't know how to remove the relevant rows from our table cache, we need
+        // to kill the connection. Once we have per-query storage, this won't be fatal.
+        if (requestId == null) {
+          stdbLogger(
+            'error',
+            `Disconnecting due to error for a previously applied subscription: ${serverMessage.value.error}`
+          );
+          this.disconnect();
+          break;
+        }
+
         const subscription =
           this.#subscriptionManager.subscriptions.get(querySetId);
         if (subscription) {
@@ -740,7 +754,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
       case 'TransactionUpdate': {
         const event: Event<never> = {
           id: this.#nextEventId(),
-          tag: 'UnknownTransaction',
+          tag: 'Transaction',
         };
         const eventContext = this.#makeEventContext(event);
         const callbacks = this.#applyTransactionUpdates(
@@ -777,7 +791,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
               }
             : {
                 id: eventId,
-                tag: 'UnknownTransaction',
+                tag: 'Transaction',
               };
           const eventContext = this.#makeEventContext(event as any);
 

package/src/sdk/event.ts

@@ -14,5 +14,5 @@ export type Event<Reducer extends ReducerEventInfo> = WithId &
     | { tag: 'SubscribeApplied' }
     | { tag: 'UnsubscribeApplied' }
     | { tag: 'Error'; value: Error }
-    | { tag: 'UnknownTransaction' }
+    | { tag: 'Transaction' }
   );

package/src/sdk/websocket_test_adapter.ts

@@ -27,6 +27,7 @@ class WebsocketTestAdapter {
 
   close(): void {
     this.closed = true;
+    this.onclose?.({ code: 1000, reason: 'normal closure', wasClean: true });
   }
 
   acceptConnection(): void {

package/src/server/procedures.ts

@@ -101,12 +101,13 @@ function registerProcedure<
   Ret extends TypeBuilder<any, any>,
 >(
   ctx: SchemaInner,
-  name: string,
+  exportName: string,
   params: Params,
   ret: Ret,
-  fn: ProcedureFn<S, Params, Ret>
+  fn: ProcedureFn<S, Params, Ret>,
+  opts?: ProcedureOpts
 ) {
-  ctx.defineFunction(name);
+  ctx.defineFunction(exportName);
   const paramsType: ProductType = {
     elements: Object.entries(params).map(([n, c]) => ({
       name: n,
@@ -118,12 +119,21 @@ function registerProcedure<
   const returnType = ctx.registerTypesRecursively(ret).algebraicType;
 
   ctx.moduleDef.procedures.push({
-    sourceName: name,
+    sourceName: exportName,
     params: paramsType,
     returnType,
     visibility: FunctionVisibility.ClientCallable,
   });
 
+  if (opts?.name != null) {
+    ctx.moduleDef.explicitNames.entries.push({
+      tag: 'Function',
+      value: {
+        sourceName: exportName,
+        canonicalName: opts.name,
+      },
+    });
+  }
   const { typespace } = ctx;
 
   ctx.procedures.push({

package/src/server/reducers.ts

@@ -31,15 +31,13 @@ export function makeReducerExport<
   fn: Reducer<any, any>,
   lifecycle?: Lifecycle
 ): ReducerExport<S, Params> {
-  const name = opts?.name;
-
   const reducerExport: ReducerExport<S, Params> = (...args) => fn(...args);
   reducerExport[exportContext] = ctx;
   reducerExport[registerExport] = (ctx, exportName) => {
-    registerReducer(ctx, name ?? exportName, params, fn, lifecycle);
+    registerReducer(ctx, exportName, params, fn, opts, lifecycle);
     ctx.functionExports.set(
       reducerExport as ReducerExport<any, any>,
-      name ?? exportName
+      exportName
     );
   };
 
@@ -56,19 +54,20 @@ export function makeReducerExport<
  */
 export function registerReducer(
   ctx: SchemaInner,
-  name: string,
+  exportName: string,
   params: RowObj | RowBuilder<RowObj>,
   fn: Reducer<any, any>,
+  opts?: ReducerOpts,
   lifecycle?: Lifecycle
 ): void {
-  ctx.defineFunction(name);
+  ctx.defineFunction(exportName);
 
   if (!(params instanceof RowBuilder)) {
     params = new RowBuilder(params);
   }
 
   if (params.typeName === undefined) {
-    params.typeName = toPascalCase(name);
+    params.typeName = toPascalCase(exportName);
   }
 
   const ref = ctx.registerTypesRecursively(params);
@@ -76,7 +75,7 @@ export function registerReducer(
   const isLifecycle = lifecycle != null;
 
   ctx.moduleDef.reducers.push({
-    sourceName: name,
+    sourceName: exportName,
     params: paramsType,
     //ModuleDef validation code is responsible to mark private reducers
     visibility: FunctionVisibility.ClientCallable,
@@ -85,17 +84,27 @@ export function registerReducer(
     errReturnType: AlgebraicType.String,
   });
 
+  if (opts?.name != null) {
+    ctx.moduleDef.explicitNames.entries.push({
+      tag: 'Function',
+      value: {
+        sourceName: exportName,
+        canonicalName: opts.name,
+      },
+    });
+  }
+
   if (isLifecycle) {
     ctx.moduleDef.lifeCycleReducers.push({
       lifecycleSpec: lifecycle,
-      functionName: name,
+      functionName: exportName,
     });
   }
 
   // If the function isn't named (e.g. `function foobar() {}`), give it the same
   // name as the reducer so that it's clear what it is in in backtraces.
   if (!fn.name) {
-    Object.defineProperty(fn, 'name', { value: name, writable: false });
+    Object.defineProperty(fn, 'name', { value: exportName, writable: false });
   }
 
   ctx.reducers.push(fn);

package/src/server/rng.ts

@@ -4,12 +4,6 @@ import { unsafeUniformIntDistribution } from 'pure-rand/distribution/UnsafeUnifo
 import { xoroshiro128plus } from 'pure-rand/generator/XoroShiro';
 import type { Timestamp } from '../lib/timestamp';
 
-declare global {
-  interface Math {
-    random(): never;
-  }
-}
-
 type IntArray =
   | Int8Array
   | Uint8Array

package/src/svelte/useTable.ts

@@ -10,6 +10,8 @@ import {
   evaluateBooleanExpr,
   getQueryAccessorName,
   getQueryWhereClause,
+  type Query,
+  toSql,
 } from '../lib/query';
 
 export interface UseTableCallbacks<RowType> {
@@ -46,13 +48,13 @@ function classifyMembership(
  * @returns A tuple of [rows, isReady].
  */
 export function useTable<TableDef extends UntypedTableDef>(
-  query: { toSql(): string } & Record<string, any>,
+  query: Query<TableDef>,
   callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>
 ): [Readable<readonly Prettify<RowType<TableDef>>[]>, Readable<boolean>] {
   type Row = RowType<TableDef>;
   const accessorName = getQueryAccessorName(query);
   const whereExpr = getQueryWhereClause(query);
-  const querySql = query.toSql();
+  const querySql = toSql(query);
 
   let connectionStore;
   try {

package/src/vue/useTable.ts

@@ -14,7 +14,9 @@ import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 import type { RowType, UntypedTableDef } from '../lib/table';
 import type { Prettify } from '../lib/type_util';
 import {
+  type Query,
   type BooleanExpr,
+  toSql,
   evaluateBooleanExpr,
   getQueryAccessorName,
   getQueryWhereClause,
@@ -54,7 +56,7 @@ function classifyMembership(
  * @returns A tuple of [rows, isReady].
  */
 export function useTable<TableDef extends UntypedTableDef>(
-  query: { toSql(): string } & Record<string, any>,
+  query: Query<TableDef>,
   callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>
 ): [
   DeepReadonly<Ref<readonly Prettify<RowType<TableDef>>[]>>,
@@ -63,7 +65,7 @@ export function useTable<TableDef extends UntypedTableDef>(
   type Row = RowType<TableDef>;
   const accessorName = getQueryAccessorName(query);
   const whereExpr = getQueryWhereClause(query);
-  const querySql = query.toSql();
+  const querySql = toSql(query);
 
   let conn;
   try {