@instantdb/core 0.22.97 → 0.22.98-experimental.drewh-ts-target.20762041587.1

package/dist/esm/Reactor.js

@@ -1,23 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 // @ts-check
 import weakHash from "./utils/weakHash.js";
 import instaql from "./instaql.js";
@@ -58,10 +38,10 @@ const STATUS = {
     CLOSED: 'closed',
     ERRORED: 'errored',
 };
-const QUERY_ONCE_TIMEOUT = 30000;
-const PENDING_TX_CLEANUP_TIMEOUT = 30000;
+const QUERY_ONCE_TIMEOUT = 30_000;
+const PENDING_TX_CLEANUP_TIMEOUT = 30_000;
 const PENDING_MUTATION_CLEANUP_THRESHOLD = 200;
-const ONE_MIN_MS = 1000 * 60;
+const ONE_MIN_MS = 1_000 * 60;
 const defaultConfig = {
     apiURI: 'https://api.instantdb.com',
     websocketURI: 'wss://api.instantdb.com/runtime/session',
@@ -110,13 +90,15 @@ const ignoreLogging = {
  * @returns {QuerySub}
  */
 function querySubFromStorage(x, useDateObjects) {
-    var _a;
     const v = typeof x === 'string' ? JSON.parse(x) : x;
-    if ((_a = v === null || v === void 0 ? void 0 : v.result) === null || _a === void 0 ? void 0 : _a.store) {
+    if (v?.result?.store) {
         const attrsStore = s.attrsStoreFromJSON(v.result.attrsStore, v.result.store);
         if (attrsStore) {
             const storeJSON = v.result.store;
-            v.result.store = s.fromJSON(attrsStore, Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
+            v.result.store = s.fromJSON(attrsStore, {
+                ...storeJSON,
+                useDateObjects: useDateObjects,
+            });
             v.result.attrsStore = attrsStore;
         }
     }
@@ -129,11 +111,15 @@ function querySubFromStorage(x, useDateObjects) {
  * @returns QuerySubInStorage
  */
 function querySubToStorage(_key, sub) {
-    const { result } = sub, rest = __rest(sub, ["result"]);
+    const { result, ...rest } = sub;
     const jsonSub = /** @type {import('./reactorTypes.ts').QuerySubInStorage} */ (rest);
     if (result) {
         /** @type {import('./reactorTypes.ts').QuerySubResultInStorage} */
-        const jsonResult = Object.assign(Object.assign({}, result), { store: s.toJSON(result.store), attrsStore: result.attrsStore.toJSON() });
+        const jsonResult = {
+            ...result,
+            store: s.toJSON(result.store),
+            attrsStore: result.attrsStore.toJSON(),
+        };
         jsonSub.result = jsonResult;
     }
     return jsonSub;
@@ -155,8 +141,8 @@ function kvToStorage(key, x) {
     }
 }
 function onMergeQuerySub(_k, storageSub, inMemorySub) {
-    const storageResult = storageSub === null || storageSub === void 0 ? void 0 : storageSub.result;
-    const memoryResult = inMemorySub === null || inMemorySub === void 0 ? void 0 : inMemorySub.result;
+    const storageResult = storageSub?.result;
+    const memoryResult = inMemorySub?.result;
     if (storageResult && !memoryResult && inMemorySub) {
         inMemorySub.result = storageResult;
     }
@@ -178,241 +164,72 @@ function sortedMutationEntries(entries) {
  * @template {import('./presence.ts').RoomSchemaShape} [RoomSchema = {}]
  */
 export default class Reactor {
+    /** @type {s.AttrsStore | undefined} */
+    attrs;
+    _isOnline = true;
+    _isShutdown = false;
+    status = STATUS.CONNECTING;
+    /** @type {PersistedObject<string, QuerySub, QuerySubInStorage>} */
+    querySubs;
+    /** @type {PersistedObject} */
+    kv;
+    /** @type {SyncTable} */
+    _syncTable;
+    /** @type {Record<string, Array<{ q: any, cb: (data: any) => any }>>} */
+    queryCbs = {};
+    /** @type {Record<string, Array<{ q: any, eventId: string, dfd: Deferred }>>} */
+    queryOnceDfds = {};
+    authCbs = [];
+    attrsCbs = [];
+    mutationErrorCbs = [];
+    connectionStatusCbs = [];
+    config;
+    mutationDeferredStore = new Map();
+    _reconnectTimeoutId = null;
+    _reconnectTimeoutMs = 0;
+    /** @type {Connection} */
+    _transport;
+    /** @type {TransportType} */
+    _transportType = 'ws';
+    /** @type {EventSourceConstructor} */
+    _EventSource;
+    /** @type {boolean | null} */
+    _wsOk = null;
+    _localIdPromises = {};
+    _errorMessage = null;
+    /** @type {Promise<null | {error: {message: string}}> | null}**/
+    _oauthCallbackResponse = null;
+    /** @type {null | import('./utils/linkIndex.ts').LinkIndex}} */
+    _linkIndex = null;
+    /** @type BroadcastChannel | undefined */
+    _broadcastChannel;
+    /** @type {Record<string, {isConnected: boolean; error: any}>} */
+    _rooms = {};
+    /** @type {Record<string, boolean>} */
+    _roomsPendingLeave = {};
+    _presence = {};
+    _broadcastQueue = [];
+    _broadcastSubs = {};
+    /** @type {{isLoading: boolean; error: any | undefined, user: any | undefined}} */
+    _currentUserCached = { isLoading: true, error: undefined, user: undefined };
+    _beforeUnloadCbs = [];
+    _dataForQueryCache = {};
+    /** @type {Logger} */
+    _log;
+    _pendingTxCleanupTimeout;
+    _pendingMutationCleanupThreshold;
+    _inFlightMutationEventIds = new Set();
     constructor(config, Storage = IndexedDBStorage, NetworkListener = WindowNetworkListener, versions, EventSourceConstructor) {
-        var _a, _b, _c;
-        this._isOnline = true;
-        this._isShutdown = false;
-        this.status = STATUS.CONNECTING;
-        /** @type {Record<string, Array<{ q: any, cb: (data: any) => any }>>} */
-        this.queryCbs = {};
-        /** @type {Record<string, Array<{ q: any, eventId: string, dfd: Deferred }>>} */
-        this.queryOnceDfds = {};
-        this.authCbs = [];
-        this.attrsCbs = [];
-        this.mutationErrorCbs = [];
-        this.connectionStatusCbs = [];
-        this.mutationDeferredStore = new Map();
-        this._reconnectTimeoutId = null;
-        this._reconnectTimeoutMs = 0;
-        /** @type {TransportType} */
-        this._transportType = 'ws';
-        /** @type {boolean | null} */
-        this._wsOk = null;
-        this._localIdPromises = {};
-        this._errorMessage = null;
-        /** @type {Promise<null | {error: {message: string}}> | null}**/
-        this._oauthCallbackResponse = null;
-        /** @type {null | import('./utils/linkIndex.ts').LinkIndex}} */
-        this._linkIndex = null;
-        /** @type {Record<string, {isConnected: boolean; error: any}>} */
-        this._rooms = {};
-        /** @type {Record<string, boolean>} */
-        this._roomsPendingLeave = {};
-        this._presence = {};
-        this._broadcastQueue = [];
-        this._broadcastSubs = {};
-        /** @type {{isLoading: boolean; error: any | undefined, user: any | undefined}} */
-        this._currentUserCached = { isLoading: true, error: undefined, user: undefined };
-        this._beforeUnloadCbs = [];
-        this._dataForQueryCache = {};
-        this._inFlightMutationEventIds = new Set();
-        this._onMergeKv = (key, storageV, inMemoryV) => {
-            var _a, _b;
-            switch (key) {
-                case 'pendingMutations': {
-                    const storageEntries = (_a = storageV === null || storageV === void 0 ? void 0 : storageV.entries()) !== null && _a !== void 0 ? _a : [];
-                    const inMemoryEntries = (_b = inMemoryV === null || inMemoryV === void 0 ? void 0 : inMemoryV.entries()) !== null && _b !== void 0 ? _b : [];
-                    const muts = new Map([...storageEntries, ...inMemoryEntries]);
-                    const rewrittenStorageMuts = storageV
-                        ? this._rewriteMutationsSorted(this.attrs, storageV)
-                        : [];
-                    rewrittenStorageMuts.forEach(([k, mut]) => {
-                        var _a;
-                        if (!((_a = inMemoryV === null || inMemoryV === void 0 ? void 0 : inMemoryV.pendingMutations) === null || _a === void 0 ? void 0 : _a.has(k)) && !mut['tx-id']) {
-                            this._sendMutation(k, mut);
-                        }
-                    });
-                    return muts;
-                }
-                default:
-                    return inMemoryV || storageV;
-            }
-        };
-        // ---------------------------
-        // Queries
-        this.getPreviousResult = (q) => {
-            var _a;
-            const hash = weakHash(q);
-            return (_a = this.dataForQuery(hash)) === null || _a === void 0 ? void 0 : _a.data;
-        };
-        /** Re-run instaql and call all callbacks with new data */
-        this.notifyOne = (hash) => {
-            var _a, _b;
-            const cbs = (_a = this.queryCbs[hash]) !== null && _a !== void 0 ? _a : [];
-            const prevData = (_b = this._dataForQueryCache[hash]) === null || _b === void 0 ? void 0 : _b.data;
-            const resp = this.dataForQuery(hash);
-            if (!(resp === null || resp === void 0 ? void 0 : resp.data))
-                return;
-            this._dataForQueryCache[hash] = resp;
-            if (areObjectsDeepEqual(resp.data, prevData))
-                return;
-            cbs.forEach((r) => r.cb(resp.data));
-        };
-        this.notifyOneQueryOnce = (hash) => {
-            var _a, _b;
-            const dfds = (_a = this.queryOnceDfds[hash]) !== null && _a !== void 0 ? _a : [];
-            const data = (_b = this.dataForQuery(hash)) === null || _b === void 0 ? void 0 : _b.data;
-            dfds.forEach((r) => {
-                this._completeQueryOnce(r.q, hash, r.dfd);
-                r.dfd.resolve(data);
-            });
-        };
-        this.notifyQueryError = (hash, error) => {
-            const cbs = this.queryCbs[hash] || [];
-            cbs.forEach((r) => r.cb({ error }));
-        };
-        /** Applies transactions locally and sends transact message to server */
-        this.pushTx = (chunks) => {
-            // Throws if transactions are invalid
-            if (!this.config.disableValidation) {
-                validateTransactions(chunks, this.config.schema);
-            }
-            try {
-                const txSteps = instaml.transform({
-                    attrsStore: this.optimisticAttrs(),
-                    schema: this.config.schema,
-                    stores: Object.values(this.querySubs.currentValue).map((sub) => { var _a; return (_a = sub === null || sub === void 0 ? void 0 : sub.result) === null || _a === void 0 ? void 0 : _a.store; }),
-                    useDateObjects: this.config.useDateObjects,
-                }, chunks);
-                return this.pushOps(txSteps);
-            }
-            catch (e) {
-                return this.pushOps([], e);
-            }
-        };
-        /**
-         * @param {*} txSteps
-         * @param {*} [error]
-         * @returns
-         */
-        this.pushOps = (txSteps, error) => {
-            const eventId = uuid();
-            const mutations = [...this._pendingMutations().values()];
-            const order = Math.max(0, ...mutations.map((mut) => mut.order || 0)) + 1;
-            const mutation = {
-                op: 'transact',
-                'tx-steps': txSteps,
-                created: Date.now(),
-                error,
-                order,
-            };
-            this._updatePendingMutations((prev) => {
-                prev.set(eventId, mutation);
-            });
-            const dfd = new Deferred();
-            this.mutationDeferredStore.set(eventId, dfd);
-            this._sendMutation(eventId, mutation);
-            this.notifyAll();
-            return dfd.promise;
-        };
-        this._transportOnOpen = (e) => {
-            const targetTransport = e.target;
-            if (this._transport !== targetTransport) {
-                this._log.info('[socket][open]', targetTransport.id, 'skip; this is no longer the current transport');
-                return;
-            }
-            this._log.info('[socket][open]', this._transport.id);
-            this._setStatus(STATUS.OPENED);
-            this.getCurrentUser()
-                .then((resp) => {
-                var _a;
-                this._trySend(uuid(), {
-                    op: 'init',
-                    'app-id': this.config.appId,
-                    'refresh-token': (_a = resp.user) === null || _a === void 0 ? void 0 : _a['refresh_token'],
-                    versions: this.versions,
-                    // If an admin token is provided for an app, we will
-                    // skip all permission checks. This is an advanced feature,
-                    // to let users write internal tools
-                    // This option is not exposed in `Config`, as it's
-                    // not ready for prime time
-                    '__admin-token': this.config.__adminToken,
-                });
-            })
-                .catch((e) => {
-                this._log.error('[socket][error]', targetTransport.id, e);
-            });
-        };
-        this._transportOnMessage = (e) => {
-            const targetTransport = e.target;
-            const m = e.message;
-            if (this._transport !== targetTransport) {
-                this._log.info('[socket][message]', targetTransport.id, m, 'skip; this is no longer the current transport');
-                return;
-            }
-            if (!this._wsOk && targetTransport.type === 'ws') {
-                this._wsOk = true;
-            }
-            // Try to reconnect via websocket the next time we connect
-            this._transportType = 'ws';
-            if (Array.isArray(e.message)) {
-                for (const msg of e.message) {
-                    this._handleReceive(targetTransport.id, msg);
-                }
-            }
-            else {
-                this._handleReceive(targetTransport.id, e.message);
-            }
-        };
-        this._transportOnError = (e) => {
-            const targetTransport = e.target;
-            if (this._transport !== targetTransport) {
-                this._log.info('[socket][error]', targetTransport.id, 'skip; this is no longer the current transport');
-                return;
-            }
-            this._log.error('[socket][error]', targetTransport.id, e);
-        };
-        this._scheduleReconnect = () => {
-            // If we couldn't connect with a websocket last time, try sse
-            if (!this._wsOk && this._transportType !== 'sse') {
-                this._transportType = 'sse';
-                this._reconnectTimeoutMs = 0;
-            }
-            setTimeout(() => {
-                this._reconnectTimeoutMs = Math.min(this._reconnectTimeoutMs + 1000, 10000);
-                if (!this._isOnline) {
-                    this._log.info('[socket][close]', this._transport.id, 'we are offline, no need to start socket');
-                    return;
-                }
-                this._startSocket();
-            }, this._reconnectTimeoutMs);
-        };
-        this._transportOnClose = (e) => {
-            const targetTransport = e.target;
-            if (this._transport !== targetTransport) {
-                this._log.info('[socket][close]', targetTransport.id, 'skip; this is no longer the current transport');
-                return;
-            }
-            this._setStatus(STATUS.CLOSED);
-            for (const room of Object.values(this._rooms)) {
-                room.isConnected = false;
-            }
-            if (this._isShutdown) {
-                this._log.info('[socket][close]', targetTransport.id, 'Reactor has been shut down and will not reconnect');
-                return;
-            }
-            this._log.info('[socket][close]', targetTransport.id, 'schedule reconnect, ms =', this._reconnectTimeoutMs);
-            this._scheduleReconnect();
-        };
         this._EventSource = EventSourceConstructor;
-        this.config = Object.assign(Object.assign({}, defaultConfig), config);
-        this.queryCacheLimit = (_a = this.config.queryCacheLimit) !== null && _a !== void 0 ? _a : 10;
+        this.config = { ...defaultConfig, ...config };
+        this.queryCacheLimit = this.config.queryCacheLimit ?? 10;
         this._pendingTxCleanupTimeout =
-            (_b = this.config.pendingTxCleanupTimeout) !== null && _b !== void 0 ? _b : PENDING_TX_CLEANUP_TIMEOUT;
+            this.config.pendingTxCleanupTimeout ?? PENDING_TX_CLEANUP_TIMEOUT;
         this._pendingMutationCleanupThreshold =
-            (_c = this.config.pendingMutationCleanupThreshold) !== null && _c !== void 0 ? _c : PENDING_MUTATION_CLEANUP_THRESHOLD;
+            this.config.pendingMutationCleanupThreshold ??
+                PENDING_MUTATION_CLEANUP_THRESHOLD;
         this._log = createLogger(config.verbose || flags.devBackend || flags.instantLogs, () => this._reactorStats());
-        this.versions = Object.assign(Object.assign({}, (versions || {})), { '@instantdb/core': version });
+        this.versions = { ...(versions || {}), '@instantdb/core': version };
         if (this.config.schema) {
             this._linkIndex = createLinkIndex(this.config.schema);
         }
@@ -429,18 +246,17 @@ export default class Reactor {
         }
         if (typeof BroadcastChannel === 'function') {
             this._broadcastChannel = new BroadcastChannel('@instantdb');
-            this._broadcastChannel.addEventListener('message', (e) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
+            this._broadcastChannel.addEventListener('message', async (e) => {
                 try {
-                    if (((_a = e.data) === null || _a === void 0 ? void 0 : _a.type) === 'auth') {
-                        const res = yield this.getCurrentUser();
+                    if (e.data?.type === 'auth') {
+                        const res = await this.getCurrentUser();
                         this.updateUser(res.user);
                     }
                 }
                 catch (e) {
                     this._log.error('[error] handle broadcast channel', e);
                 }
-            }));
+            });
         }
         this._initStorage(Storage);
         this._syncTable = new SyncTable(this._trySendAuthed.bind(this), new Storage(this.config.appId, 'syncSubs'), {
@@ -453,10 +269,10 @@ export default class Reactor {
         this.getCurrentUser().then((userInfo) => {
             this.syncUserToEndpoint(userInfo.user);
         });
-        setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            const currentUser = yield this.getCurrentUser();
+        setInterval(async () => {
+            const currentUser = await this.getCurrentUser();
             this.syncUserToEndpoint(currentUser.user);
-        }), ONE_MIN_MS);
+        }, ONE_MIN_MS);
         NetworkListener.getIsOnline().then((isOnline) => {
             this._isOnline = isOnline;
             this._startSocket();
@@ -490,7 +306,11 @@ export default class Reactor {
         return this.attrs;
     }
     updateSchema(schema) {
-        this.config = Object.assign(Object.assign({}, this.config), { schema: schema, cardinalityInference: Boolean(schema) });
+        this.config = {
+            ...this.config,
+            schema: schema,
+            cardinalityInference: Boolean(schema),
+        };
         this._linkIndex = schema ? createLinkIndex(this.config.schema) : null;
     }
     _reactorStats() {
@@ -512,14 +332,14 @@ export default class Reactor {
             serialize: querySubToStorage,
             parse: (_key, x) => querySubFromStorage(x, this.config.useDateObjects),
             // objectSize
-            objectSize: (x) => { var _a, _b, _c, _d; return (_d = (_c = (_b = (_a = x === null || x === void 0 ? void 0 : x.result) === null || _a === void 0 ? void 0 : _a.store) === null || _b === void 0 ? void 0 : _b.triples) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0; },
+            objectSize: (x) => x?.result?.store?.triples?.length ?? 0,
             logger: this._log,
             preloadEntryCount: 10,
             gc: {
                 maxAgeMs: 1000 * 60 * 60 * 24 * 7 * 52, // 1 year
                 maxEntries: 1000,
                 // Size of each query is the number of triples
-                maxSize: 1000000, // 1 million triples
+                maxSize: 1_000_000, // 1 million triples
             },
         });
         this.querySubs.onKeyLoaded = (k) => this._onQuerySubLoaded(k);
@@ -565,7 +385,7 @@ export default class Reactor {
         const ok = status !== 'error' && status !== 'timeout';
         if (!dfd && !ok) {
             // console.erroring here, as there are no listeners to let know
-            console.error('Mutation failed', Object.assign({ status, eventId }, errorMsg));
+            console.error('Mutation failed', { status, eventId, ...errorMsg });
         }
         if (!dfd) {
             return;
@@ -575,16 +395,16 @@ export default class Reactor {
         }
         else {
             // Check if error comes from server or client
-            if (errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.type) {
-                const { status } = errorMsg, body = __rest(errorMsg, ["status"]);
+            if (errorMsg?.type) {
+                const { status, ...body } = errorMsg;
                 dfd.reject(new InstantAPIError({
                     // @ts-expect-error body.type is not constant typed
                     body,
-                    status: status !== null && status !== void 0 ? status : 0,
+                    status: status ?? 0,
                 }));
             }
             else {
-                dfd.reject(new InstantError((errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.message) || 'Unknown error', errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.hint));
+                dfd.reject(new InstantError(errorMsg?.message || 'Unknown error', errorMsg?.hint));
             }
         }
     }
@@ -593,9 +413,28 @@ export default class Reactor {
         this._errorMessage = err;
         this.notifyConnectionStatusSubs(status);
     }
+    _onMergeKv = (key, storageV, inMemoryV) => {
+        switch (key) {
+            case 'pendingMutations': {
+                const storageEntries = storageV?.entries() ?? [];
+                const inMemoryEntries = inMemoryV?.entries() ?? [];
+                const muts = new Map([...storageEntries, ...inMemoryEntries]);
+                const rewrittenStorageMuts = storageV
+                    ? this._rewriteMutationsSorted(this.attrs, storageV)
+                    : [];
+                rewrittenStorageMuts.forEach(([k, mut]) => {
+                    if (!inMemoryV?.pendingMutations?.has(k) && !mut['tx-id']) {
+                        this._sendMutation(k, mut);
+                    }
+                });
+                return muts;
+            }
+            default:
+                return inMemoryV || storageV;
+        }
+    };
     _flushEnqueuedRoomData(roomId) {
-        var _a, _b;
-        const enqueuedUserPresence = (_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.user;
+        const enqueuedUserPresence = this._presence[roomId]?.result?.user;
         const enqueuedBroadcasts = this._broadcastQueue[roomId];
         this._broadcastQueue[roomId] = [];
         if (enqueuedUserPresence) {
@@ -640,7 +479,6 @@ export default class Reactor {
         this._cleanupPendingMutationsTimeout();
     }
     _handleReceive(connId, msg) {
-        var _a, _b, _c, _d, _e, _f;
         // opt-out, enabled by default if schema
         const enableCardinalityInference = Boolean(this.config.schema) &&
             ('cardinalityInference' in this.config
@@ -659,7 +497,7 @@ export default class Reactor {
                 // which item is us
                 this._sessionId = msg['session-id'];
                 for (const roomId of Object.keys(this._rooms)) {
-                    const enqueuedUserPresence = (_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.user;
+                    const enqueuedUserPresence = this._presence[roomId]?.result?.user;
                     this._tryJoinRoom(roomId, enqueuedUserPresence);
                 }
                 break;
@@ -674,8 +512,8 @@ export default class Reactor {
                 if (!this._hasQueryListeners() && !this.querySubs.currentValue[hash]) {
                     break;
                 }
-                const pageInfo = (_d = (_c = result === null || result === void 0 ? void 0 : result[0]) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d['page-info'];
-                const aggregate = (_f = (_e = result === null || result === void 0 ? void 0 : result[0]) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f['aggregate'];
+                const pageInfo = result?.[0]?.data?.['page-info'];
+                const aggregate = result?.[0]?.data?.['aggregate'];
                 const triples = extractTriples(result);
                 const attrsStore = this.ensureAttrs();
                 const store = s.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
@@ -732,7 +570,6 @@ export default class Reactor {
                 }
                 const mutations = sortedMutationEntries(rewrittenMutations.entries());
                 const updates = computations.map((x) => {
-                    var _a, _b, _c, _d;
                     const q = x['instaql-query'];
                     const result = x['instaql-result'];
                     const hash = weakHash(q);
@@ -740,8 +577,8 @@ export default class Reactor {
                     const attrsStore = this.ensureAttrs();
                     const store = s.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
                     const { store: newStore, attrsStore: newAttrsStore } = this._applyOptimisticUpdates(store, attrsStore, mutations, processedTxId);
-                    const pageInfo = (_b = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b['page-info'];
-                    const aggregate = (_d = (_c = result === null || result === void 0 ? void 0 : result[0]) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d['aggregate'];
+                    const pageInfo = result?.[0]?.data?.['page-info'];
+                    const aggregate = result?.[0]?.data?.['aggregate'];
                     return {
                         q,
                         hash,
@@ -782,7 +619,11 @@ export default class Reactor {
                 }
                 // update pendingMutation with server-side tx-id
                 this._updatePendingMutations((prev) => {
-                    prev.set(eventId, Object.assign(Object.assign({}, prev.get(eventId)), { 'tx-id': txId, confirmed: Date.now() }));
+                    prev.set(eventId, {
+                        ...prev.get(eventId),
+                        'tx-id': txId,
+                        confirmed: Date.now(),
+                    });
                 });
                 const newAttrs = [];
                 for (const step of prevMutation['tx-steps']) {
@@ -856,13 +697,11 @@ export default class Reactor {
         }
     }
     _pendingMutations() {
-        var _a;
-        return (_a = this.kv.currentValue.pendingMutations) !== null && _a !== void 0 ? _a : new Map();
+        return this.kv.currentValue.pendingMutations ?? new Map();
     }
     _updatePendingMutations(f) {
         this.kv.updateInPlace((prev) => {
-            var _a;
-            const muts = (_a = prev.pendingMutations) !== null && _a !== void 0 ? _a : new Map();
+            const muts = prev.pendingMutations ?? new Map();
             prev.pendingMutations = muts;
             f(muts);
         });
@@ -891,7 +730,6 @@ export default class Reactor {
         }
     }
     _handleReceiveError(msg) {
-        var _a, _b, _c, _d, _e, _f, _g;
         console.log('error', msg);
         const eventId = msg['client-event-id'];
         // This might not be a mutation, but it can't hurt to delete it
@@ -907,18 +745,18 @@ export default class Reactor {
             this._handleMutationError('error', eventId, msg);
             return;
         }
-        if (((_a = msg['original-event']) === null || _a === void 0 ? void 0 : _a.hasOwnProperty('q')) &&
-            ((_b = msg['original-event']) === null || _b === void 0 ? void 0 : _b.op) === 'add-query') {
-            const q = (_c = msg['original-event']) === null || _c === void 0 ? void 0 : _c.q;
+        if (msg['original-event']?.hasOwnProperty('q') &&
+            msg['original-event']?.op === 'add-query') {
+            const q = msg['original-event']?.q;
             const hash = weakHash(q);
             this.notifyQueryError(weakHash(q), errorMessage);
             this.notifyQueryOnceError(q, hash, eventId, errorMessage);
             return;
         }
-        const isInitError = ((_d = msg['original-event']) === null || _d === void 0 ? void 0 : _d.op) === 'init';
+        const isInitError = msg['original-event']?.op === 'init';
         if (isInitError) {
             if (msg.type === 'record-not-found' &&
-                ((_e = msg.hint) === null || _e === void 0 ? void 0 : _e['record-type']) === 'app-user') {
+                msg.hint?.['record-type'] === 'app-user') {
                 // User has been logged out
                 this.changeCurrentUser(null);
                 return;
@@ -928,17 +766,17 @@ export default class Reactor {
             this.notifyAll();
             return;
         }
-        if (((_f = msg['original-event']) === null || _f === void 0 ? void 0 : _f.op) === 'resync-table') {
+        if (msg['original-event']?.op === 'resync-table') {
             this._syncTable.onResyncError(msg);
             return;
         }
-        if (((_g = msg['original-event']) === null || _g === void 0 ? void 0 : _g.op) === 'start-sync') {
+        if (msg['original-event']?.op === 'start-sync') {
             this._syncTable.onStartSyncError(msg);
             return;
         }
         // We've caught some error which has no corresponding listener.
         // Let's console.error to let the user know.
-        const errorObj = Object.assign({}, msg);
+        const errorObj = { ...msg };
         delete errorObj.message;
         delete errorObj.hint;
         console.error(msg.message, errorObj);
@@ -947,8 +785,7 @@ export default class Reactor {
         }
     }
     notifyQueryOnceError(q, hash, eventId, e) {
-        var _a;
-        const r = (_a = this.queryOnceDfds[hash]) === null || _a === void 0 ? void 0 : _a.find((r) => r.eventId === eventId);
+        const r = this.queryOnceDfds[hash]?.find((r) => r.eventId === eventId);
         if (!r)
             return;
         r.dfd.reject(e);
@@ -961,6 +798,12 @@ export default class Reactor {
         }, {}), this._linkIndex);
         this.notifyAttrsSubs();
     }
+    // ---------------------------
+    // Queries
+    getPreviousResult = (q) => {
+        const hash = weakHash(q);
+        return this.dataForQuery(hash)?.data;
+    };
     _startQuerySub(q, hash) {
         const eventId = uuid();
         this.querySubs.updateInPlace((prev) => {
@@ -984,19 +827,18 @@ export default class Reactor {
      *  Returns an unsubscribe function
      */
     subscribeQuery(q, cb, opts) {
-        var _a;
         if (!this.config.disableValidation) {
             validateQuery(q, this.config.schema);
         }
         if (opts && 'ruleParams' in opts) {
-            q = Object.assign({ $$ruleParams: opts['ruleParams'] }, q);
+            q = { $$ruleParams: opts['ruleParams'], ...q };
         }
         const hash = weakHash(q);
         const prevResult = this.getPreviousResult(q);
         if (prevResult) {
             cb(prevResult);
         }
-        this.queryCbs[hash] = (_a = this.queryCbs[hash]) !== null && _a !== void 0 ? _a : [];
+        this.queryCbs[hash] = this.queryCbs[hash] ?? [];
         this.queryCbs[hash].push({ q, cb });
         this._startQuerySub(q, hash);
         return () => {
@@ -1004,12 +846,11 @@ export default class Reactor {
         };
     }
     queryOnce(q, opts) {
-        var _a;
         if (!this.config.disableValidation) {
             validateQuery(q, this.config.schema);
         }
         if (opts && 'ruleParams' in opts) {
-            q = Object.assign({ $$ruleParams: opts['ruleParams'] }, q);
+            q = { $$ruleParams: opts['ruleParams'], ...q };
         }
         const dfd = new Deferred();
         if (!this._isOnline) {
@@ -1022,7 +863,7 @@ export default class Reactor {
         }
         const hash = weakHash(q);
         const eventId = this._startQuerySub(q, hash);
-        this.queryOnceDfds[hash] = (_a = this.queryOnceDfds[hash]) !== null && _a !== void 0 ? _a : [];
+        this.queryOnceDfds[hash] = this.queryOnceDfds[hash] ?? [];
         this.queryOnceDfds[hash].push({ q, dfd, eventId });
         setTimeout(() => dfd.reject(new Error('Query timed out')), QUERY_ONCE_TIMEOUT);
         return dfd.promise;
@@ -1040,8 +881,7 @@ export default class Reactor {
         this._cleanupQuery(q, hash);
     }
     _hasQueryListeners(hash) {
-        var _a, _b;
-        return !!(((_a = this.queryCbs[hash]) === null || _a === void 0 ? void 0 : _a.length) || ((_b = this.queryOnceDfds[hash]) === null || _b === void 0 ? void 0 : _b.length));
+        return !!(this.queryCbs[hash]?.length || this.queryOnceDfds[hash]?.length);
     }
     _cleanupQuery(q, hash) {
         const hasListeners = this._hasQueryListeners(hash);
@@ -1133,7 +973,10 @@ export default class Reactor {
         };
         const rewritten = new Map();
         for (const [k, mut] of muts.entries()) {
-            rewritten.set(k, Object.assign(Object.assign({}, mut), { 'tx-steps': rewriteTxSteps(mut['tx-steps'], mut['tx-id']) }));
+            rewritten.set(k, {
+                ...mut,
+                'tx-steps': rewriteTxSteps(mut['tx-steps'], mut['tx-id']),
+            });
         }
         if (!mappingChanged) {
             return muts;
@@ -1149,7 +992,6 @@ export default class Reactor {
      * @returns {s.AttrsStore}
      */
     optimisticAttrs() {
-        var _a, _b;
         const pendingMutationSteps = [...this._pendingMutations().values()] // hack due to Map()
             .flatMap((x) => x['tx-steps']);
         const deletedAttrIds = new Set(pendingMutationSteps
@@ -1162,15 +1004,15 @@ export default class Reactor {
             }
             else if (_action === 'update-attr' &&
                 attr.id &&
-                ((_a = this.attrs) === null || _a === void 0 ? void 0 : _a.getAttr(attr.id))) {
-                const fullAttr = Object.assign(Object.assign({}, this.attrs.getAttr(attr.id)), attr);
+                this.attrs?.getAttr(attr.id)) {
+                const fullAttr = { ...this.attrs.getAttr(attr.id), ...attr };
                 pendingAttrs.push(fullAttr);
             }
         }
         if (!deletedAttrIds.size && !pendingAttrs.length) {
             return this.attrs || new s.AttrsStoreClass({}, this._linkIndex);
         }
-        const attrs = Object.assign({}, (((_b = this.attrs) === null || _b === void 0 ? void 0 : _b.attrs) || {}));
+        const attrs = { ...(this.attrs?.attrs || {}) };
         for (const attr of pendingAttrs) {
             attrs[attr.id] = attr;
         }
@@ -1224,6 +1066,30 @@ export default class Reactor {
         }
         return { store, attrsStore };
     }
+    /** Re-run instaql and call all callbacks with new data */
+    notifyOne = (hash) => {
+        const cbs = this.queryCbs[hash] ?? [];
+        const prevData = this._dataForQueryCache[hash]?.data;
+        const resp = this.dataForQuery(hash);
+        if (!resp?.data)
+            return;
+        this._dataForQueryCache[hash] = resp;
+        if (areObjectsDeepEqual(resp.data, prevData))
+            return;
+        cbs.forEach((r) => r.cb(resp.data));
+    };
+    notifyOneQueryOnce = (hash) => {
+        const dfds = this.queryOnceDfds[hash] ?? [];
+        const data = this.dataForQuery(hash)?.data;
+        dfds.forEach((r) => {
+            this._completeQueryOnce(r.q, hash, r.dfd);
+            r.dfd.resolve(data);
+        });
+    };
+    notifyQueryError = (hash, error) => {
+        const cbs = this.queryCbs[hash] || [];
+        cbs.forEach((r) => r.cb({ error }));
+    };
     /** Re-compute all subscriptions */
     notifyAll() {
         Object.keys(this.queryCbs).forEach((hash) => {
@@ -1239,11 +1105,54 @@ export default class Reactor {
             .then(() => this.notifyAll())
             .catch(() => this.notifyAll());
     }
+    /** Applies transactions locally and sends transact message to server */
+    pushTx = (chunks) => {
+        // Throws if transactions are invalid
+        if (!this.config.disableValidation) {
+            validateTransactions(chunks, this.config.schema);
+        }
+        try {
+            const txSteps = instaml.transform({
+                attrsStore: this.optimisticAttrs(),
+                schema: this.config.schema,
+                stores: Object.values(this.querySubs.currentValue).map((sub) => sub?.result?.store),
+                useDateObjects: this.config.useDateObjects,
+            }, chunks);
+            return this.pushOps(txSteps);
+        }
+        catch (e) {
+            return this.pushOps([], e);
+        }
+    };
+    /**
+     * @param {*} txSteps
+     * @param {*} [error]
+     * @returns
+     */
+    pushOps = (txSteps, error) => {
+        const eventId = uuid();
+        const mutations = [...this._pendingMutations().values()];
+        const order = Math.max(0, ...mutations.map((mut) => mut.order || 0)) + 1;
+        const mutation = {
+            op: 'transact',
+            'tx-steps': txSteps,
+            created: Date.now(),
+            error,
+            order,
+        };
+        this._updatePendingMutations((prev) => {
+            prev.set(eventId, mutation);
+        });
+        const dfd = new Deferred();
+        this.mutationDeferredStore.set(eventId, dfd);
+        this._sendMutation(eventId, mutation);
+        this.notifyAll();
+        return dfd.promise;
+    };
     shutdown() {
-        var _a;
         this._log.info('[shutdown]', this.config.appId);
         this._isShutdown = true;
-        (_a = this._transport) === null || _a === void 0 ? void 0 : _a.close();
+        this._transport?.close();
     }
     /**
      * Sends mutation to server and schedules a timeout to cancel it if
@@ -1316,8 +1225,8 @@ export default class Reactor {
     _cleanupPendingMutationsQueries() {
         let minProcessedTxId = Number.MAX_SAFE_INTEGER;
         for (const { result } of Object.values(this.querySubs.currentValue)) {
-            if (result === null || result === void 0 ? void 0 : result.processedTxId) {
-                minProcessedTxId = Math.min(minProcessedTxId, result === null || result === void 0 ? void 0 : result.processedTxId);
+            if (result?.processedTxId) {
+                minProcessedTxId = Math.min(minProcessedTxId, result?.processedTxId);
             }
         }
         this._updatePendingMutations((prev) => {
@@ -1370,8 +1279,96 @@ export default class Reactor {
                 this._inFlightMutationEventIds.clear();
             }
         }
-        this._transport.send(Object.assign({ 'client-event-id': eventId }, msg));
+        this._transport.send({ 'client-event-id': eventId, ...msg });
     }
+    _transportOnOpen = (e) => {
+        const targetTransport = e.target;
+        if (this._transport !== targetTransport) {
+            this._log.info('[socket][open]', targetTransport.id, 'skip; this is no longer the current transport');
+            return;
+        }
+        this._log.info('[socket][open]', this._transport.id);
+        this._setStatus(STATUS.OPENED);
+        this.getCurrentUser()
+            .then((resp) => {
+            this._trySend(uuid(), {
+                op: 'init',
+                'app-id': this.config.appId,
+                'refresh-token': resp.user?.['refresh_token'],
+                versions: this.versions,
+                // If an admin token is provided for an app, we will
+                // skip all permission checks. This is an advanced feature,
+                // to let users write internal tools
+                // This option is not exposed in `Config`, as it's
+                // not ready for prime time
+                '__admin-token': this.config.__adminToken,
+            });
+        })
+            .catch((e) => {
+            this._log.error('[socket][error]', targetTransport.id, e);
+        });
+    };
+    _transportOnMessage = (e) => {
+        const targetTransport = e.target;
+        const m = e.message;
+        if (this._transport !== targetTransport) {
+            this._log.info('[socket][message]', targetTransport.id, m, 'skip; this is no longer the current transport');
+            return;
+        }
+        if (!this._wsOk && targetTransport.type === 'ws') {
+            this._wsOk = true;
+        }
+        // Try to reconnect via websocket the next time we connect
+        this._transportType = 'ws';
+        if (Array.isArray(e.message)) {
+            for (const msg of e.message) {
+                this._handleReceive(targetTransport.id, msg);
+            }
+        }
+        else {
+            this._handleReceive(targetTransport.id, e.message);
+        }
+    };
+    _transportOnError = (e) => {
+        const targetTransport = e.target;
+        if (this._transport !== targetTransport) {
+            this._log.info('[socket][error]', targetTransport.id, 'skip; this is no longer the current transport');
+            return;
+        }
+        this._log.error('[socket][error]', targetTransport.id, e);
+    };
+    _scheduleReconnect = () => {
+        // If we couldn't connect with a websocket last time, try sse
+        if (!this._wsOk && this._transportType !== 'sse') {
+            this._transportType = 'sse';
+            this._reconnectTimeoutMs = 0;
+        }
+        setTimeout(() => {
+            this._reconnectTimeoutMs = Math.min(this._reconnectTimeoutMs + 1000, 10000);
+            if (!this._isOnline) {
+                this._log.info('[socket][close]', this._transport.id, 'we are offline, no need to start socket');
+                return;
+            }
+            this._startSocket();
+        }, this._reconnectTimeoutMs);
+    };
+    _transportOnClose = (e) => {
+        const targetTransport = e.target;
+        if (this._transport !== targetTransport) {
+            this._log.info('[socket][close]', targetTransport.id, 'skip; this is no longer the current transport');
+            return;
+        }
+        this._setStatus(STATUS.CLOSED);
+        for (const room of Object.values(this._rooms)) {
+            room.isConnected = false;
+        }
+        if (this._isShutdown) {
+            this._log.info('[socket][close]', targetTransport.id, 'Reactor has been shut down and will not reconnect');
+            return;
+        }
+        this._log.info('[socket][close]', targetTransport.id, 'schedule reconnect, ms =', this._reconnectTimeoutMs);
+        this._scheduleReconnect();
+    };
     _startSocket() {
         // Reset whether we support websockets each time we connect
         // new networks may not support websockets
@@ -1400,7 +1397,7 @@ export default class Reactor {
         this._transport.onclose = this._transportOnClose;
         this._transport.onerror = this._transportOnError;
         this._log.info('[socket][start]', this._transport.id);
-        if (prevTransport === null || prevTransport === void 0 ? void 0 : prevTransport.isOpen()) {
+        if (prevTransport?.isOpen()) {
             // When the network dies, it doesn't always mean that our
             // socket connection will fire a close event.
             //
@@ -1421,24 +1418,22 @@ export default class Reactor {
      * Note: If the user deletes their local storage, this id will change.
      *
      */
-    getLocalId(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const k = `localToken_${name}`;
-            if (this.kv.currentValue[k]) {
-                return this.kv.currentValue[k];
-            }
-            const current = yield this.kv.waitForKeyToLoad(k);
-            if (current) {
-                return current;
-            }
-            const newId = uuid();
-            this.kv.updateInPlace((prev) => {
-                if (prev[k])
-                    return;
-                prev[k] = newId;
-            });
-            return yield this.kv.waitForKeyToLoad(k);
+    async getLocalId(name) {
+        const k = `localToken_${name}`;
+        if (this.kv.currentValue[k]) {
+            return this.kv.currentValue[k];
+        }
+        const current = await this.kv.waitForKeyToLoad(k);
+        if (current) {
+            return current;
+        }
+        const newId = uuid();
+        this.kv.updateInPlace((prev) => {
+            if (prev[k])
+                return;
+            prev[k] = newId;
         });
+        return await this.kv.waitForKeyToLoad(k);
     }
     // ----
     // Auth
@@ -1473,14 +1468,13 @@ export default class Reactor {
                 // The next.js app router will reset the URL when the router loads.
                 // This puts it back after the router loads.
                 const listener = (e) => {
-                    var _a;
                     if (!ran) {
                         ran = true;
                         // @ts-ignore (waiting for ts support)
                         navigation.removeEventListener('navigate', listener);
                         if (!e.userInitiated &&
                             e.navigationType === 'replace' &&
-                            ((_a = e.destination) === null || _a === void 0 ? void 0 : _a.url) === startUrl) {
+                            e.destination?.url === startUrl) {
                             history.replaceState(history.state, '', newPath);
                         }
                     }
@@ -1494,57 +1488,52 @@ export default class Reactor {
      *
      * @returns Promise<null | {error: {message: string}}>
      */
-    _oauthLoginInit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            if (typeof window === 'undefined' ||
-                typeof window.location === 'undefined' ||
-                typeof URLSearchParams === 'undefined') {
-                return null;
-            }
-            const params = new URLSearchParams(window.location.search);
-            if (!params.get(OAUTH_REDIRECT_PARAM)) {
-                return null;
-            }
-            const error = params.get('error');
-            if (error) {
-                this._replaceUrlAfterOAuth();
-                return { error: { message: error } };
-            }
-            const code = params.get('code');
-            if (!code) {
-                return null;
-            }
+    async _oauthLoginInit() {
+        if (typeof window === 'undefined' ||
+            typeof window.location === 'undefined' ||
+            typeof URLSearchParams === 'undefined') {
+            return null;
+        }
+        const params = new URLSearchParams(window.location.search);
+        if (!params.get(OAUTH_REDIRECT_PARAM)) {
+            return null;
+        }
+        const error = params.get('error');
+        if (error) {
             this._replaceUrlAfterOAuth();
-            try {
-                const currentUser = yield this._getCurrentUser();
-                const isGuest = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.type) === 'guest';
-                const { user } = yield authAPI.exchangeCodeForToken({
-                    apiURI: this.config.apiURI,
-                    appId: this.config.appId,
-                    code,
-                    refreshToken: isGuest ? currentUser.refresh_token : undefined,
-                });
-                this.setCurrentUser(user);
+            return { error: { message: error } };
+        }
+        const code = params.get('code');
+        if (!code) {
+            return null;
+        }
+        this._replaceUrlAfterOAuth();
+        try {
+            const currentUser = await this._getCurrentUser();
+            const isGuest = currentUser?.type === 'guest';
+            const { user } = await authAPI.exchangeCodeForToken({
+                apiURI: this.config.apiURI,
+                appId: this.config.appId,
+                code,
+                refreshToken: isGuest ? currentUser.refresh_token : undefined,
+            });
+            this.setCurrentUser(user);
+            return null;
+        }
+        catch (e) {
+            if (e?.body?.type === 'record-not-found' &&
+                e?.body?.hint?.['record-type'] === 'app-oauth-code' &&
+                (await this._hasCurrentUser())) {
+                // We probably just weren't able to clean up the URL, so
+                // let's just ignore this error
                 return null;
             }
-            catch (e) {
-                if (((_a = e === null || e === void 0 ? void 0 : e.body) === null || _a === void 0 ? void 0 : _a.type) === 'record-not-found' &&
-                    ((_c = (_b = e === null || e === void 0 ? void 0 : e.body) === null || _b === void 0 ? void 0 : _b.hint) === null || _c === void 0 ? void 0 : _c['record-type']) === 'app-oauth-code' &&
-                    (yield this._hasCurrentUser())) {
-                    // We probably just weren't able to clean up the URL, so
-                    // let's just ignore this error
-                    return null;
-                }
-                const message = ((_d = e === null || e === void 0 ? void 0 : e.body) === null || _d === void 0 ? void 0 : _d.message) || 'Error logging in.';
-                return { error: { message } };
-            }
-        });
+            const message = e?.body?.message || 'Error logging in.';
+            return { error: { message } };
+        }
     }
-    _waitForOAuthCallbackResponse() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._oauthCallbackResponse;
-        });
+    async _waitForOAuthCallbackResponse() {
+        return await this._oauthCallbackResponse;
     }
     __subscribeMutationErrors(cb) {
         this.mutationErrorCbs.push(cb);
@@ -1571,14 +1560,12 @@ export default class Reactor {
             this.authCbs = this.authCbs.filter((x) => x !== cb);
         };
     }
-    getAuth() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { user, error } = yield this.getCurrentUser();
-            if (error) {
-                throw new InstantError('Could not get current user: ' + error.message);
-            }
-            return user;
-        });
+    async getAuth() {
+        const { user, error } = await this.getCurrentUser();
+        if (error) {
+            throw new InstantError('Could not get current user: ' + error.message);
+        }
+        return user;
     }
     subscribeConnectionStatus(cb) {
         this.connectionStatusCbs.push(cb);
@@ -1610,99 +1597,89 @@ export default class Reactor {
     notifyConnectionStatusSubs(status) {
         this.connectionStatusCbs.forEach((cb) => cb(status));
     }
-    setCurrentUser(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.kv.updateInPlace((prev) => {
-                prev[currentUserKey] = user;
-            });
-            yield this.kv.waitForKeyToLoad(currentUserKey);
+    async setCurrentUser(user) {
+        this.kv.updateInPlace((prev) => {
+            prev[currentUserKey] = user;
         });
+        await this.kv.waitForKeyToLoad(currentUserKey);
     }
     getCurrentUserCached() {
         return this._currentUserCached;
     }
-    _getCurrentUser() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this.kv.waitForKeyToLoad(currentUserKey);
-            return typeof user === 'string' ? JSON.parse(user) : user;
-        });
-    }
-    getCurrentUser() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const oauthResp = yield this._waitForOAuthCallbackResponse();
-            if (oauthResp === null || oauthResp === void 0 ? void 0 : oauthResp.error) {
-                const errorV = { error: oauthResp.error, user: undefined };
-                this._currentUserCached = Object.assign({ isLoading: false }, errorV);
-                return errorV;
-            }
-            try {
-                const user = yield this._getCurrentUser();
-                const userV = { user: user, error: undefined };
-                this._currentUserCached = Object.assign({ isLoading: false }, userV);
-                return userV;
-            }
-            catch (e) {
-                return {
-                    user: undefined,
-                    isLoading: false,
-                    error: { message: (e === null || e === void 0 ? void 0 : e.message) || 'Error loading user' },
-                };
-            }
-        });
+    async _getCurrentUser() {
+        const user = await this.kv.waitForKeyToLoad(currentUserKey);
+        return typeof user === 'string' ? JSON.parse(user) : user;
+    }
+    async getCurrentUser() {
+        const oauthResp = await this._waitForOAuthCallbackResponse();
+        if (oauthResp?.error) {
+            const errorV = { error: oauthResp.error, user: undefined };
+            this._currentUserCached = { isLoading: false, ...errorV };
+            return errorV;
+        }
+        try {
+            const user = await this._getCurrentUser();
+            const userV = { user: user, error: undefined };
+            this._currentUserCached = {
+                isLoading: false,
+                ...userV,
+            };
+            return userV;
+        }
+        catch (e) {
+            return {
+                user: undefined,
+                isLoading: false,
+                error: { message: e?.message || 'Error loading user' },
+            };
+        }
     }
-    _hasCurrentUser() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this.kv.waitForKeyToLoad(currentUserKey);
-            return typeof user === 'string' ? JSON.parse(user) != null : user != null;
-        });
+    async _hasCurrentUser() {
+        const user = await this.kv.waitForKeyToLoad(currentUserKey);
+        return typeof user === 'string' ? JSON.parse(user) != null : user != null;
     }
-    changeCurrentUser(newUser) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { user: oldUser } = yield this.getCurrentUser();
-            if (areObjectsDeepEqual(oldUser, newUser)) {
-                // We were already logged in as the newUser, don't
-                // bother updating
-                return;
-            }
-            yield this.setCurrentUser(newUser);
-            // We need to remove all `result` from querySubs,
-            // as they are no longer valid for the new user
-            this.updateUser(newUser);
-            try {
-                (_a = this._broadcastChannel) === null || _a === void 0 ? void 0 : _a.postMessage({ type: 'auth' });
-            }
-            catch (error) {
-                console.error('Error posting message to broadcast channel', error);
-            }
-        });
+    async changeCurrentUser(newUser) {
+        const { user: oldUser } = await this.getCurrentUser();
+        if (areObjectsDeepEqual(oldUser, newUser)) {
+            // We were already logged in as the newUser, don't
+            // bother updating
+            return;
+        }
+        await this.setCurrentUser(newUser);
+        // We need to remove all `result` from querySubs,
+        // as they are no longer valid for the new user
+        this.updateUser(newUser);
+        try {
+            this._broadcastChannel?.postMessage({ type: 'auth' });
+        }
+        catch (error) {
+            console.error('Error posting message to broadcast channel', error);
+        }
     }
-    syncUserToEndpoint(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.config.firstPartyPath)
-                return;
-            try {
-                fetch(this.config.firstPartyPath + '/', {
-                    method: 'POST',
-                    body: JSON.stringify({
-                        type: 'sync-user',
-                        appId: this.config.appId,
-                        user: user,
-                    }),
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                });
-            }
-            catch (error) {
-                this._log.error('Error syncing user with external endpoint', error);
-            }
-        });
+    async syncUserToEndpoint(user) {
+        if (!this.config.firstPartyPath)
+            return;
+        try {
+            fetch(this.config.firstPartyPath + '/', {
+                method: 'POST',
+                body: JSON.stringify({
+                    type: 'sync-user',
+                    appId: this.config.appId,
+                    user: user,
+                }),
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+        catch (error) {
+            this._log.error('Error syncing user with external endpoint', error);
+        }
     }
     updateUser(newUser) {
         this.syncUserToEndpoint(newUser);
         const newV = { error: undefined, user: newUser };
-        this._currentUserCached = Object.assign({ isLoading: false }, newV);
+        this._currentUserCached = { isLoading: false, ...newV };
         this._dataForQueryCache = {};
         this.querySubs.updateInPlace((prev) => {
             Object.keys(prev).forEach((k) => {
@@ -1721,46 +1698,38 @@ export default class Reactor {
             email: email,
         });
     }
-    signInWithMagicCode(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ email, code }) {
-            var _b;
-            const currentUser = yield this.getCurrentUser();
-            const isGuest = ((_b = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _b === void 0 ? void 0 : _b.type) === 'guest';
-            const res = yield authAPI.verifyMagicCode({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                email,
-                code,
-                refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
-            });
-            yield this.changeCurrentUser(res.user);
-            return res;
+    async signInWithMagicCode({ email, code }) {
+        const currentUser = await this.getCurrentUser();
+        const isGuest = currentUser?.user?.type === 'guest';
+        const res = await authAPI.verifyMagicCode({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            email,
+            code,
+            refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
         });
+        await this.changeCurrentUser(res.user);
+        return res;
     }
-    signInWithCustomToken(authToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield authAPI.verifyRefreshToken({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                refreshToken: authToken,
-            });
-            yield this.changeCurrentUser(res.user);
-            return res;
+    async signInWithCustomToken(authToken) {
+        const res = await authAPI.verifyRefreshToken({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            refreshToken: authToken,
         });
+        await this.changeCurrentUser(res.user);
+        return res;
     }
-    signInAsGuest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield authAPI.signInAsGuest({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-            });
-            yield this.changeCurrentUser(res.user);
-            return res;
+    async signInAsGuest() {
+        const res = await authAPI.signInAsGuest({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
         });
+        await this.changeCurrentUser(res.user);
+        return res;
     }
     potentiallyInvalidateToken(currentUser, opts) {
-        var _a;
-        const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
+        const refreshToken = currentUser?.user?.refresh_token;
         if (!refreshToken) {
             return;
         }
@@ -1780,12 +1749,10 @@ export default class Reactor {
         })
             .catch((e) => { });
     }
-    signOut(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const currentUser = yield this.getCurrentUser();
-            this.potentiallyInvalidateToken(currentUser, opts);
-            yield this.changeCurrentUser(null);
-        });
+    async signOut(opts) {
+        const currentUser = await this.getCurrentUser();
+        this.potentiallyInvalidateToken(currentUser, opts);
+        await this.changeCurrentUser(null);
     }
     /**
      * Creates an OAuth authorization URL.
@@ -1804,21 +1771,18 @@ export default class Reactor {
      * @param {string} params.code - The code received from the OAuth service.
      * @param {string} [params.codeVerifier] - The code verifier used to generate the code challenge.
      */
-    exchangeCodeForToken(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ code, codeVerifier }) {
-            var _b;
-            const currentUser = yield this.getCurrentUser();
-            const isGuest = ((_b = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _b === void 0 ? void 0 : _b.type) === 'guest';
-            const res = yield authAPI.exchangeCodeForToken({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                code: code,
-                codeVerifier,
-                refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
-            });
-            yield this.changeCurrentUser(res.user);
-            return res;
+    async exchangeCodeForToken({ code, codeVerifier }) {
+        const currentUser = await this.getCurrentUser();
+        const isGuest = currentUser?.user?.type === 'guest';
+        const res = await authAPI.exchangeCodeForToken({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            code: code,
+            codeVerifier,
+            refreshToken: isGuest ? currentUser.user.refresh_token : undefined,
         });
+        await this.changeCurrentUser(res.user);
+        return res;
     }
     issuerURI() {
         const { apiURI, appId } = this.config;
@@ -1830,22 +1794,19 @@ export default class Reactor {
      * @param {string} params.idToken - The id_token from the external service
      * @param {string | null | undefined} [params.nonce] - The nonce used when requesting the id_token from the external service
      */
-    signInWithIdToken(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ idToken, clientName, nonce }) {
-            var _b;
-            const currentUser = yield this.getCurrentUser();
-            const refreshToken = (_b = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _b === void 0 ? void 0 : _b.refresh_token;
-            const res = yield authAPI.signInWithIdToken({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                idToken,
-                clientName,
-                nonce,
-                refreshToken,
-            });
-            yield this.changeCurrentUser(res.user);
-            return res;
+    async signInWithIdToken({ idToken, clientName, nonce }) {
+        const currentUser = await this.getCurrentUser();
+        const refreshToken = currentUser?.user?.refresh_token;
+        const res = await authAPI.signInWithIdToken({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            idToken,
+            clientName,
+            nonce,
+            refreshToken,
         });
+        await this.changeCurrentUser(res.user);
+        return res;
     }
     // --------
     // Rooms
@@ -1878,10 +1839,9 @@ export default class Reactor {
         };
     }
     _cleanupRoom(roomId) {
-        var _a, _b, _c, _d;
-        if (!((_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.handlers) === null || _b === void 0 ? void 0 : _b.length) &&
-            !Object.keys((_c = this._broadcastSubs[roomId]) !== null && _c !== void 0 ? _c : {}).length) {
-            const isConnected = (_d = this._rooms[roomId]) === null || _d === void 0 ? void 0 : _d.isConnected;
+        if (!this._presence[roomId]?.handlers?.length &&
+            !Object.keys(this._broadcastSubs[roomId] ?? {}).length) {
+            const isConnected = this._rooms[roomId]?.isConnected;
             delete this._rooms[roomId];
             delete this._presence[roomId];
             delete this._broadcastSubs[roomId];
@@ -1901,7 +1861,11 @@ export default class Reactor {
         const presence = this._presence[roomId];
         if (!room || !presence || !presence.result)
             return null;
-        return Object.assign(Object.assign({}, buildPresenceSlice(presence.result, opts, this._sessionId)), { isLoading: !room.isConnected, error: room.error });
+        return {
+            ...buildPresenceSlice(presence.result, opts, this._sessionId),
+            isLoading: !room.isConnected,
+            error: room.error,
+        };
     }
     // TODO: look into typing again
     publishPresence(roomType, roomId, partialData) {
@@ -1911,7 +1875,10 @@ export default class Reactor {
             return;
         }
         presence.result = presence.result || {};
-        const data = Object.assign(Object.assign({}, presence.result.user), partialData);
+        const data = {
+            ...presence.result.user,
+            ...partialData,
+        };
         presence.result.user = data;
         if (!room.isConnected) {
             return;
@@ -1946,21 +1913,19 @@ export default class Reactor {
         // Note: initialData is deprecated.
         // Keeping here for backwards compatibility
         opts.initialPresence || opts.initialData);
-        const handler = Object.assign(Object.assign({}, opts), { roomId, cb, prev: null });
+        const handler = { ...opts, roomId, cb, prev: null };
         this._presence[roomId] = this._presence[roomId] || {};
         this._presence[roomId].handlers = this._presence[roomId].handlers || [];
         this._presence[roomId].handlers.push(handler);
         this._notifyPresenceSub(roomId, handler);
         return () => {
-            var _a, _b, _c;
             this._presence[roomId].handlers =
-                (_c = (_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.handlers) === null || _b === void 0 ? void 0 : _b.filter((x) => x !== handler)) !== null && _c !== void 0 ? _c : [];
+                this._presence[roomId]?.handlers?.filter((x) => x !== handler) ?? [];
             leaveRoom();
         };
     }
     _notifyPresenceSubs(roomId) {
-        var _a, _b;
-        (_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.handlers) === null || _b === void 0 ? void 0 : _b.forEach((handler) => {
+        this._presence[roomId]?.handlers?.forEach((handler) => {
             this._notifyPresenceSub(roomId, handler);
         });
     }
@@ -1976,10 +1941,9 @@ export default class Reactor {
         handler.cb(slice);
     }
     _patchPresencePeers(roomId, edits) {
-        var _a, _b, _c;
-        const peers = ((_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.peers) || {};
+        const peers = this._presence[roomId]?.result?.peers || {};
         let sessions = Object.fromEntries(Object.entries(peers).map(([k, v]) => [k, { data: v }]));
-        const myPresence = (_c = this._presence[roomId]) === null || _c === void 0 ? void 0 : _c.result;
+        const myPresence = this._presence[roomId]?.result;
         const newSessions = create(sessions, (draft) => {
             for (let [path, op, value] of edits) {
                 switch (op) {
@@ -2000,7 +1964,7 @@ export default class Reactor {
         this._setPresencePeers(roomId, newSessions);
     }
     _setPresencePeers(roomId, data) {
-        const sessions = Object.assign({}, data);
+        const sessions = { ...data };
         // no need to keep track of `user`
         delete sessions[this._sessionId];
         const peers = Object.fromEntries(Object.entries(sessions).map(([k, v]) => [k, v.data]));
@@ -2011,13 +1975,12 @@ export default class Reactor {
     // --------
     // Broadcast
     publishTopic({ roomType, roomId, topic, data }) {
-        var _a;
         const room = this._rooms[roomId];
         if (!room) {
             return;
         }
         if (!room.isConnected) {
-            this._broadcastQueue[roomId] = (_a = this._broadcastQueue[roomId]) !== null && _a !== void 0 ? _a : [];
+            this._broadcastQueue[roomId] = this._broadcastQueue[roomId] ?? [];
             this._broadcastQueue[roomId].push({ topic, roomType, data });
             return;
         }
@@ -2048,71 +2011,64 @@ export default class Reactor {
         };
     }
     _notifyBroadcastSubs(room, topic, msg) {
-        var _a, _b, _c;
-        (_c = (_b = (_a = this._broadcastSubs) === null || _a === void 0 ? void 0 : _a[room]) === null || _b === void 0 ? void 0 : _b[topic]) === null || _c === void 0 ? void 0 : _c.forEach((cb) => {
-            var _a, _b, _c, _d, _e, _f;
-            const data = (_a = msg.data) === null || _a === void 0 ? void 0 : _a.data;
+        this._broadcastSubs?.[room]?.[topic]?.forEach((cb) => {
+            const data = msg.data?.data;
             const peer = msg.data['peer-id'] === this._sessionId
-                ? (_c = (_b = this._presence[room]) === null || _b === void 0 ? void 0 : _b.result) === null || _c === void 0 ? void 0 : _c.user
-                : (_f = (_e = (_d = this._presence[room]) === null || _d === void 0 ? void 0 : _d.result) === null || _e === void 0 ? void 0 : _e.peers) === null || _f === void 0 ? void 0 : _f[msg.data['peer-id']];
+                ? this._presence[room]?.result?.user
+                : this._presence[room]?.result?.peers?.[msg.data['peer-id']];
             return cb(data, peer);
         });
     }
     // --------
     // Storage
-    uploadFile(path, file, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const currentUser = yield this.getCurrentUser();
-            const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
-            return StorageApi.uploadFile(Object.assign(Object.assign({}, opts), { apiURI: this.config.apiURI, appId: this.config.appId, path: path, file, refreshToken: refreshToken }));
+    async uploadFile(path, file, opts) {
+        const currentUser = await this.getCurrentUser();
+        const refreshToken = currentUser?.user?.refresh_token;
+        return StorageApi.uploadFile({
+            ...opts,
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            path: path,
+            file,
+            refreshToken: refreshToken,
         });
     }
-    deleteFile(path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const currentUser = yield this.getCurrentUser();
-            const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
-            const result = yield StorageApi.deleteFile({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                path,
-                refreshToken: refreshToken,
-            });
-            return result;
+    async deleteFile(path) {
+        const currentUser = await this.getCurrentUser();
+        const refreshToken = currentUser?.user?.refresh_token;
+        const result = await StorageApi.deleteFile({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            path,
+            refreshToken: refreshToken,
         });
+        return result;
     }
     // Deprecated Storage API (Jan 2025)
     // ---------------------------------
-    upload(path, file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const currentUser = yield this.getCurrentUser();
-            const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
-            const fileName = path || file.name;
-            const url = yield StorageApi.getSignedUploadUrl({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                fileName: fileName,
-                refreshToken: refreshToken,
-            });
-            const isSuccess = yield StorageApi.upload(url, file);
-            return isSuccess;
+    async upload(path, file) {
+        const currentUser = await this.getCurrentUser();
+        const refreshToken = currentUser?.user?.refresh_token;
+        const fileName = path || file.name;
+        const url = await StorageApi.getSignedUploadUrl({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            fileName: fileName,
+            refreshToken: refreshToken,
         });
+        const isSuccess = await StorageApi.upload(url, file);
+        return isSuccess;
     }
-    getDownloadUrl(path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const currentUser = yield this.getCurrentUser();
-            const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
-            const url = yield StorageApi.getDownloadUrl({
-                apiURI: this.config.apiURI,
-                appId: this.config.appId,
-                path: path,
-                refreshToken: refreshToken,
-            });
-            return url;
+    async getDownloadUrl(path) {
+        const currentUser = await this.getCurrentUser();
+        const refreshToken = currentUser?.user?.refresh_token;
+        const url = await StorageApi.getDownloadUrl({
+            apiURI: this.config.apiURI,
+            appId: this.config.appId,
+            path: path,
+            refreshToken: refreshToken,
         });
+        return url;
     }
 }
 //# sourceMappingURL=Reactor.js.map