Implemented the new mutable subscriptions API (#135)

* Implemented the new subscriptions API

* Fixed the ../index thing

* Fixed the ../index thing for realz

* Fixes for Timestamp and TimeDuration

* Better error handling

* Fixed rebase issues

* lint

* Reduce diff

* lint

Author: cloutiertyler

examples/quickstart-chat/src/App.tsx

@@ -1,6 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import './App.css';
-import { DBConnection, EventContext, Message, User } from './module_bindings';
+import {
+  DBConnection,
+  ErrorContext,
+  EventContext,
+  Message,
+  User,
+} from './module_bindings';
 import { Identity } from '@clockworklabs/spacetimedb-sdk';
 
 export type PrettyMessage = {
@@ -85,6 +91,21 @@ function App() {
   const [conn, setConn] = useState<DBConnection | null>(null);
 
   useEffect(() => {
+    const subscribeToQueries = (conn: DBConnection, queries: string[]) => {
+      let count = 0;
+      for (const query of queries) {
+        conn
+          ?.subscriptionBuilder()
+          .onApplied(() => {
+            count++;
+            if (count === queries.length) {
+              console.log('SDK client cache initialized.');
+            }
+          })
+          .subscribe(query);
+      }
+    };
+
     const onConnect = (
       conn: DBConnection,
       identity: Identity,
@@ -100,20 +121,16 @@ function App() {
       conn.reducers.onSendMessage(() => {
         console.log('Message sent.');
       });
-      conn
-        .subscriptionBuilder()
-        .onApplied(() => {
-          console.log('SDK client cache initialized.');
-        })
-        .subscribe(['SELECT * FROM message', 'SELECT * FROM user']);
+
+      subscribeToQueries(conn, ['SELECT * FROM message', 'SELECT * FROM user']);
     };
 
     const onDisconnect = () => {
       console.log('Disconnected from SpacetimeDB');
       setConnected(false);
     };
 
-    const onConnectError = (_conn: DBConnection, err: Error) => {
+    const onConnectError = (_ctx: ErrorContext, err: Error) => {
       console.log('Error connecting to SpacetimeDB:', err);
     };
 

examples/quickstart-chat/src/module_bindings/index.ts

@@ -224,11 +224,16 @@ export class DBConnection extends DBConnectionImpl<
   RemoteReducers,
   SetReducerFlags
 > {
-  static builder = (): DBConnectionBuilder<DBConnection> => {
-    return new DBConnectionBuilder<DBConnection>(
-      REMOTE_MODULE,
-      (imp: DBConnectionImpl) => imp as DBConnection
-    );
+  static builder = (): DBConnectionBuilder<
+    DBConnection,
+    ErrorContext,
+    SubscriptionEventContex
+  > => {
+    return new DBConnectionBuilder<
+      DBConnection,
+      ErrorContext,
+      SubscriptionEventContex
+    >(REMOTE_MODULE, (imp: DBConnectionImpl) => imp as DBConnection);
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);

packages/sdk/README.md

@@ -40,7 +40,7 @@ const connection = DBConnection.builder()
       identity.toHexString()
     );
 
-    connection.subscriptionBuilder().subscribe(['SELECT * FROM player']);
+    connection.subscriptionBuilder().subscribe('SELECT * FROM player');
   })
   .withToken('TOKEN')
   .build();

packages/sdk/src/algebraic_type.ts

@@ -1,3 +1,4 @@
+import { TimeDuration, Timestamp } from '.';
 import { ConnectionId } from './connection_id';
 import type BinaryReader from './binary_reader';
 import type BinaryWriter from './binary_writer';
@@ -162,9 +163,17 @@ export class ProductType {
     }
   };
 
-  deserialize = (reader: BinaryReader): object => {
+  deserialize = (reader: BinaryReader): any => {
     let result: { [key: string]: any } = {};
     if (this.elements.length === 1) {
+      if (this.elements[0].name === '__time_duration_micros__') {
+        return new TimeDuration(reader.readI64());
+      }
+
+      if (this.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
+        return new Timestamp(reader.readI64());
+      }
+
       if (this.elements[0].name === '__identity__') {
         return new Identity(reader.readU256());
       }
@@ -347,28 +356,29 @@ export class AlgebraicType {
       new ProductTypeElement('__identity__', this.createU256Type()),
     ]);
   }
+
   static createConnectionIdType(): AlgebraicType {
     return this.createProductType([
       new ProductTypeElement('__connection_id__', this.createU128Type()),
     ]);
   }
+
   static createScheduleAtType(): AlgebraicType {
     return ScheduleAt.getAlgebraicType();
   }
+
   static createTimestampType(): AlgebraicType {
-    return AlgebraicType.createProductType([
+    return this.createProductType([
       new ProductTypeElement(
         '__timestamp_micros_since_unix_epoch__',
-        AlgebraicType.createI64Type()
+        this.createI64Type()
       ),
     ]);
   }
+
   static createTimeDurationType(): AlgebraicType {
-    return AlgebraicType.createProductType([
-      new ProductTypeElement(
-        '__time_duration_micros__',
-        AlgebraicType.createI64Type()
-      ),
+    return this.createProductType([
+      new ProductTypeElement('__time_duration_micros__', this.createI64Type()),
     ]);
   }
 

packages/sdk/src/client_api/index.ts

@@ -89,7 +89,7 @@ export { Unsubscribe };
 import { UnsubscribeApplied } from './unsubscribe_applied_type.ts';
 export { UnsubscribeApplied };
 import { UpdateStatus } from './update_status_type.ts';
-export { UpdateStatus };
+export { UpdateStatus, Timestamp };
 
 const REMOTE_MODULE = {
   tables: {},