@instantdb/core 0.22.144 → 0.22.145

package/package.json

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

package/src/Reactor.js

@@ -39,6 +39,8 @@ import { InstantStream } from './Stream.ts';
 /** @typedef {import('./Connection.ts').EventSourceConstructor} EventSourceConstructor */
 /** @typedef {import('./reactorTypes.ts').QuerySub} QuerySub */
 /** @typedef {import('./reactorTypes.ts').QuerySubInStorage} QuerySubInStorage */
+/** @typedef {import('./clientTypes.ts').User} User */
+/** @typedef {import('./clientTypes.ts').AuthState} AuthState */
 
 export const STATUS = {
   CONNECTING: 'connecting',
@@ -320,7 +322,9 @@ export default class Reactor {
       this._broadcastChannel.addEventListener('message', async (e) => {
         try {
           if (e.data?.type === 'auth') {
-            const res = await this.getCurrentUser();
+            const res = await this.getCurrentUser({
+              forceReadFromStorage: true,
+            });
             await this.updateUser(res.user).catch((error) => {
               this._log.error('[error] update user', error);
             });
@@ -1995,7 +1999,7 @@ export default class Reactor {
     if (error) {
       throw new InstantError('Could not get current user: ' + error.message);
     }
-    return user;
+    return user ?? null;
   }
 
   subscribeConnectionStatus(cb) {
@@ -2049,26 +2053,37 @@ export default class Reactor {
     return this._currentUserCached;
   }
 
-  async _getCurrentUser() {
+  /**
+   * @param {{ forceReadFromStorage?: boolean }} [opts]
+   * @returns {Promise<User | undefined>}
+   */
+  async _getCurrentUser(opts) {
+    if (opts?.forceReadFromStorage) {
+      await this.kv.unloadKey(currentUserKey);
+    }
     const user = await this.kv.waitForKeyToLoad(currentUserKey);
     return typeof user === 'string' ? JSON.parse(user) : user;
   }
 
-  async getCurrentUser() {
+  /**
+   * @param {{ forceReadFromStorage?: boolean }} [opts]
+   * @returns {Promise<AuthState>}
+   */
+  async getCurrentUser(opts) {
     const oauthResp = await this._waitForOAuthCallbackResponse();
     if (oauthResp?.error) {
       const errorV = { error: oauthResp.error, user: undefined };
       this._currentUserCached = { isLoading: false, ...errorV };
-      return errorV;
+      return this._currentUserCached;
     }
     try {
-      const user = await this._getCurrentUser();
+      const user = await this._getCurrentUser(opts);
       const userV = { user: user, error: undefined };
       this._currentUserCached = {
         isLoading: false,
         ...userV,
       };
-      return userV;
+      return this._currentUserCached;
     } catch (e) {
       return {
         user: undefined,
@@ -2096,6 +2111,9 @@ export default class Reactor {
     await this.updateUser(newUser);
 
     try {
+      // Make sure everything is written to storage before we tell the
+      // other tab to refetch
+      await this.kv.flush();
       this._broadcastChannel?.postMessage({ type: 'auth' });
     } catch (error) {
       console.error('Error posting message to broadcast channel', error);
@@ -2158,7 +2176,7 @@ export default class Reactor {
       appId: this.config.appId,
       email,
       code,
-      refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
+      refreshToken: isGuest ? currentUser?.user?.refresh_token : undefined,
     });
     await this.changeCurrentUser(res.user);
     return res;
@@ -2237,7 +2255,7 @@ export default class Reactor {
       appId: this.config.appId,
       code: code,
       codeVerifier,
-      refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
+      refreshToken: isGuest ? currentUser?.user?.refresh_token : undefined,
     });
     await this.changeCurrentUser(res.user);
     return res;