@instantdb/core 0.22.155 → 0.22.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instantdb/core",
-  "version": "0.22.155",
+  "version": "0.22.156",
   "description": "Instant's core local abstraction",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/core",
   "repository": {
@@ -56,7 +56,7 @@
   "dependencies": {
     "mutative": "^1.0.10",
     "uuid": "^11.1.0",
-    "@instantdb/version": "0.22.155"
+    "@instantdb/version": "0.22.156"
   },
   "scripts": {
     "test": "vitest",

package/src/InstantError.ts

@@ -1,9 +1,13 @@
 export class InstantError extends Error {
   hint?: unknown;
+  traceId?: string;
 
-  constructor(message: string, hint?: unknown) {
+  constructor(message: string, hint?: unknown, traceId?: string) {
     super(message);
     this.hint = hint;
+    if (traceId) {
+      this.traceId = traceId;
+    }
 
     const actualProto = new.target.prototype;
     if (Object.setPrototypeOf) {

package/src/Reactor.js

@@ -41,6 +41,7 @@ import { InstantStream } from './Stream.ts';
 /** @typedef {import('./reactorTypes.ts').QuerySubInStorage} QuerySubInStorage */
 /** @typedef {import('./clientTypes.ts').User} User */
 /** @typedef {import('./clientTypes.ts').AuthState} AuthState */
+/** @typedef {import('./framework.ts').FrameworkClient} FrameworkClient */
 
 export const STATUS = {
   CONNECTING: 'connecting',
@@ -272,6 +273,8 @@ export default class Reactor {
   _pendingTxCleanupTimeout;
   _pendingMutationCleanupThreshold;
   _inFlightMutationEventIds = new Set();
+  /** @type FrameworkClient | null */
+  _frameworkClient = null;
 
   constructor(
     config,
@@ -406,6 +409,15 @@ export default class Reactor {
     }
   }
 
+  getFrameworkClient() {
+    return this._frameworkClient;
+  }
+
+  /** @param {FrameworkClient} client  */
+  setFrameworkClient(client) {
+    this._frameworkClient = client;
+  }
+
   ensureAttrs() {
     if (!this.attrs) {
       throw new Error('attrs have not loaded.');
@@ -2105,6 +2117,9 @@ export default class Reactor {
       // bother updating
       return;
     }
+
+    // Clear any data in the framework client
+    this._frameworkClient = null;
     await this.setCurrentUser(newUser);
     // We need to remove all `result` from querySubs,
     // as they are no longer valid for the new user

package/src/framework.ts

@@ -3,8 +3,10 @@
 // The class is generic so that it can be a good starting off point to make other ssr adapters.
 import {
   coerceQuery,
+  InstantAPIError,
   InstantCoreDatabase,
   InstantDBAttr,
+  InstantError,
   weakHash,
 } from './index.ts';
 import * as s from './store.js';
@@ -109,6 +111,67 @@ export class FrameworkClient {
     }
   };
 
+  public removeCachedQueryResult = (queryHash: string) => {
+    this.resultMap.delete(queryHash);
+  };
+
+  // Run a query on the client and return a promise with the result
+  public queryClient = (
+    query_: any,
+    opts?: { ruleParams: RuleParams },
+  ): Promise<QueryPromise> => {
+    const { hash, query } = this.hashQuery(query_, opts);
+
+    let resolve;
+    let reject;
+
+    const promise: Promise<QueryPromise> = new Promise(
+      (resolvePromise, rejectPromise) => {
+        resolve = resolvePromise;
+        reject = rejectPromise;
+      },
+    );
+
+    let entry = {
+      status: 'pending' as 'pending' | 'success' | 'error',
+      type: 'session' as 'http' | 'session',
+      data: undefined as any,
+      error: undefined as any,
+      promise: promise as any,
+    };
+
+    let unsub: null | (() => void) = null;
+    let unsubImmediately = false;
+
+    unsub = this.db.subscribeQuery(query, (res) => {
+      if (res.error) {
+        entry.status = 'error';
+        entry.error = res.error;
+        entry.promise = null;
+        reject(res.error);
+      } else {
+        entry.status = 'success';
+        entry.data = res;
+        entry.promise = null;
+        resolve(res);
+      }
+      if (unsub !== null) {
+        unsub();
+      } else {
+        unsubImmediately;
+      }
+    });
+
+    // We may have gotten the result inside of subscribeQuery before
+    // we defined the `unsub` function
+    if (unsubImmediately) {
+      unsub();
+    }
+
+    this.resultMap.set(hash, entry);
+    return promise;
+  };
+
   // creates an entry in the results map
   // and returns the same thing added to the map
   public query = (
@@ -282,7 +345,19 @@ export class FrameworkClient {
       );
 
       if (!response.ok) {
-        throw new Error('Error getting triples from server');
+        try {
+          const data = await response.json();
+          if ('message' in data) {
+            throw new InstantAPIError({ body: data, status: response.status });
+          } else {
+            throw new Error('Error getting triples from server');
+          }
+        } catch (e) {
+          if (e instanceof InstantError) {
+            throw e;
+          }
+          throw new Error('Error getting triples from server');
+        }
       }
 
       const data = await response.json();
@@ -307,6 +382,9 @@ export class FrameworkClient {
         pageInfo,
       };
     } catch (err: any) {
+      if (err instanceof InstantError) {
+        throw err;
+      }
       const errWithMessage = new Error(
         'Error getting triples from framework client',
       );

package/src/utils/fetch.ts

@@ -86,7 +86,7 @@ export class InstantAPIError extends InstantError {
   constructor(error: InstantIssue) {
     // Create a descriptive message based on the error
     const message = error.body?.message || `API Error (${error.status})`;
-    super(message, (error.body as any).hint);
+    super(message, (error.body as any).hint, (error.body as any)['trace-id']);
 
     const actualProto = new.target.prototype;
     if (Object.setPrototypeOf) {