@instantdb/core 0.22.96-experimental.drewh-ts-target.20761590091.1 → 0.22.97-experimental.bump-next-cia.20761479934.1

package/dist/commonjs/Reactor.js

@@ -32,6 +32,26 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -76,10 +96,10 @@ const STATUS = {
     CLOSED: 'closed',
     ERRORED: 'errored',
 };
-const QUERY_ONCE_TIMEOUT = 30_000;
-const PENDING_TX_CLEANUP_TIMEOUT = 30_000;
+const QUERY_ONCE_TIMEOUT = 30000;
+const PENDING_TX_CLEANUP_TIMEOUT = 30000;
 const PENDING_MUTATION_CLEANUP_THRESHOLD = 200;
-const ONE_MIN_MS = 1_000 * 60;
+const ONE_MIN_MS = 1000 * 60;
 const defaultConfig = {
     apiURI: 'https://api.instantdb.com',
     websocketURI: 'wss://api.instantdb.com/runtime/session',
@@ -128,15 +148,13 @@ const ignoreLogging = {
  * @returns {QuerySub}
  */
 function querySubFromStorage(x, useDateObjects) {
+    var _a;
     const v = typeof x === 'string' ? JSON.parse(x) : x;
-    if (v?.result?.store) {
+    if ((_a = v === null || v === void 0 ? void 0 : v.result) === null || _a === void 0 ? void 0 : _a.store) {
         const attrsStore = s.attrsStoreFromJSON(v.result.attrsStore, v.result.store);
         if (attrsStore) {
             const storeJSON = v.result.store;
-            v.result.store = s.fromJSON(attrsStore, {
-                ...storeJSON,
-                useDateObjects: useDateObjects,
-            });
+            v.result.store = s.fromJSON(attrsStore, Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
             v.result.attrsStore = attrsStore;
         }
     }
@@ -149,15 +167,11 @@ function querySubFromStorage(x, useDateObjects) {
  * @returns QuerySubInStorage
  */
 function querySubToStorage(_key, sub) {
-    const { result, ...rest } = sub;
+    const { result } = sub, rest = __rest(sub, ["result"]);
     const jsonSub = /** @type {import('./reactorTypes.ts').QuerySubInStorage} */ (rest);
     if (result) {
         /** @type {import('./reactorTypes.ts').QuerySubResultInStorage} */
-        const jsonResult = {
-            ...result,
-            store: s.toJSON(result.store),
-            attrsStore: result.attrsStore.toJSON(),
-        };
+        const jsonResult = Object.assign(Object.assign({}, result), { store: s.toJSON(result.store), attrsStore: result.attrsStore.toJSON() });
         jsonSub.result = jsonResult;
     }
     return jsonSub;
@@ -179,8 +193,8 @@ function kvToStorage(key, x) {
     }
 }
 function onMergeQuerySub(_k, storageSub, inMemorySub) {
-    const storageResult = storageSub?.result;
-    const memoryResult = inMemorySub?.result;
+    const storageResult = storageSub === null || storageSub === void 0 ? void 0 : storageSub.result;
+    const memoryResult = inMemorySub === null || inMemorySub === void 0 ? void 0 : inMemorySub.result;
     if (storageResult && !memoryResult && inMemorySub) {
         inMemorySub.result = storageResult;
     }
@@ -202,72 +216,241 @@ function sortedMutationEntries(entries) {
  * @template {import('./presence.ts').RoomSchemaShape} [RoomSchema = {}]
  */
 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_ts_1.default, NetworkListener = WindowNetworkListener_js_1.default, 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 = (0, weakHash_ts_1.default)(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 ((0, object_js_1.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) {
+                (0, transactionValidation_ts_1.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 = (0, id_ts_1.default)();
+            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_js_1.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((0, id_ts_1.default)(), {
+                    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 = { ...defaultConfig, ...config };
-        this.queryCacheLimit = this.config.queryCacheLimit ?? 10;
+        this.config = Object.assign(Object.assign({}, defaultConfig), config);
+        this.queryCacheLimit = (_a = this.config.queryCacheLimit) !== null && _a !== void 0 ? _a : 10;
         this._pendingTxCleanupTimeout =
-            this.config.pendingTxCleanupTimeout ?? PENDING_TX_CLEANUP_TIMEOUT;
+            (_b = this.config.pendingTxCleanupTimeout) !== null && _b !== void 0 ? _b : PENDING_TX_CLEANUP_TIMEOUT;
         this._pendingMutationCleanupThreshold =
-            this.config.pendingMutationCleanupThreshold ??
-                PENDING_MUTATION_CLEANUP_THRESHOLD;
+            (_c = this.config.pendingMutationCleanupThreshold) !== null && _c !== void 0 ? _c : PENDING_MUTATION_CLEANUP_THRESHOLD;
         this._log = (0, log_ts_1.default)(config.verbose || flags.devBackend || flags.instantLogs, () => this._reactorStats());
-        this.versions = { ...(versions || {}), '@instantdb/core': version_ts_1.default };
+        this.versions = Object.assign(Object.assign({}, (versions || {})), { '@instantdb/core': version_ts_1.default });
         if (this.config.schema) {
             this._linkIndex = (0, linkIndex_ts_1.createLinkIndex)(this.config.schema);
         }
@@ -284,17 +467,18 @@ class Reactor {
         }
         if (typeof BroadcastChannel === 'function') {
             this._broadcastChannel = new BroadcastChannel('@instantdb');
-            this._broadcastChannel.addEventListener('message', async (e) => {
+            this._broadcastChannel.addEventListener('message', (e) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 try {
-                    if (e.data?.type === 'auth') {
-                        const res = await this.getCurrentUser();
+                    if (((_a = e.data) === null || _a === void 0 ? void 0 : _a.type) === 'auth') {
+                        const res = yield this.getCurrentUser();
                         this.updateUser(res.user);
                     }
                 }
                 catch (e) {
                     this._log.error('[error] handle broadcast channel', e);
                 }
-            });
+            }));
         }
         this._initStorage(Storage);
         this._syncTable = new SyncTable_ts_1.SyncTable(this._trySendAuthed.bind(this), new Storage(this.config.appId, 'syncSubs'), {
@@ -307,10 +491,10 @@ class Reactor {
         this.getCurrentUser().then((userInfo) => {
             this.syncUserToEndpoint(userInfo.user);
         });
-        setInterval(async () => {
-            const currentUser = await this.getCurrentUser();
+        setInterval(() => __awaiter(this, void 0, void 0, function* () {
+            const currentUser = yield this.getCurrentUser();
             this.syncUserToEndpoint(currentUser.user);
-        }, ONE_MIN_MS);
+        }), ONE_MIN_MS);
         NetworkListener.getIsOnline().then((isOnline) => {
             this._isOnline = isOnline;
             this._startSocket();
@@ -344,11 +528,7 @@ class Reactor {
         return this.attrs;
     }
     updateSchema(schema) {
-        this.config = {
-            ...this.config,
-            schema: schema,
-            cardinalityInference: Boolean(schema),
-        };
+        this.config = Object.assign(Object.assign({}, this.config), { schema: schema, cardinalityInference: Boolean(schema) });
         this._linkIndex = schema ? (0, linkIndex_ts_1.createLinkIndex)(this.config.schema) : null;
     }
     _reactorStats() {
@@ -370,14 +550,14 @@ class Reactor {
             serialize: querySubToStorage,
             parse: (_key, x) => querySubFromStorage(x, this.config.useDateObjects),
             // objectSize
-            objectSize: (x) => x?.result?.store?.triples?.length ?? 0,
+            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; },
             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: 1_000_000, // 1 million triples
+                maxSize: 1000000, // 1 million triples
             },
         });
         this.querySubs.onKeyLoaded = (k) => this._onQuerySubLoaded(k);
@@ -423,7 +603,7 @@ 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', { status, eventId, ...errorMsg });
+            console.error('Mutation failed', Object.assign({ status, eventId }, errorMsg));
         }
         if (!dfd) {
             return;
@@ -433,16 +613,16 @@ class Reactor {
         }
         else {
             // Check if error comes from server or client
-            if (errorMsg?.type) {
-                const { status, ...body } = errorMsg;
+            if (errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.type) {
+                const { status } = errorMsg, body = __rest(errorMsg, ["status"]);
                 dfd.reject(new fetch_ts_1.InstantAPIError({
                     // @ts-expect-error body.type is not constant typed
                     body,
-                    status: status ?? 0,
+                    status: status !== null && status !== void 0 ? status : 0,
                 }));
             }
             else {
-                dfd.reject(new InstantError_ts_1.InstantError(errorMsg?.message || 'Unknown error', errorMsg?.hint));
+                dfd.reject(new InstantError_ts_1.InstantError((errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.message) || 'Unknown error', errorMsg === null || errorMsg === void 0 ? void 0 : errorMsg.hint));
             }
         }
     }
@@ -451,28 +631,9 @@ 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) {
-        const enqueuedUserPresence = this._presence[roomId]?.result?.user;
+        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 enqueuedBroadcasts = this._broadcastQueue[roomId];
         this._broadcastQueue[roomId] = [];
         if (enqueuedUserPresence) {
@@ -517,6 +678,7 @@ 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
@@ -535,7 +697,7 @@ class Reactor {
                 // which item is us
                 this._sessionId = msg['session-id'];
                 for (const roomId of Object.keys(this._rooms)) {
-                    const enqueuedUserPresence = this._presence[roomId]?.result?.user;
+                    const enqueuedUserPresence = (_b = (_a = this._presence[roomId]) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.user;
                     this._tryJoinRoom(roomId, enqueuedUserPresence);
                 }
                 break;
@@ -550,8 +712,8 @@ class Reactor {
                 if (!this._hasQueryListeners() && !this.querySubs.currentValue[hash]) {
                     break;
                 }
-                const pageInfo = result?.[0]?.data?.['page-info'];
-                const aggregate = result?.[0]?.data?.['aggregate'];
+                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 triples = (0, instaqlResult_js_1.extractTriples)(result);
                 const attrsStore = this.ensureAttrs();
                 const store = s.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
@@ -608,6 +770,7 @@ 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 = (0, weakHash_ts_1.default)(q);
@@ -615,8 +778,8 @@ 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 = result?.[0]?.data?.['page-info'];
-                    const aggregate = result?.[0]?.data?.['aggregate'];
+                    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'];
                     return {
                         q,
                         hash,
@@ -657,11 +820,7 @@ class Reactor {
                 }
                 // update pendingMutation with server-side tx-id
                 this._updatePendingMutations((prev) => {
-                    prev.set(eventId, {
-                        ...prev.get(eventId),
-                        'tx-id': txId,
-                        confirmed: Date.now(),
-                    });
+                    prev.set(eventId, Object.assign(Object.assign({}, prev.get(eventId)), { 'tx-id': txId, confirmed: Date.now() }));
                 });
                 const newAttrs = [];
                 for (const step of prevMutation['tx-steps']) {
@@ -735,11 +894,13 @@ class Reactor {
         }
     }
     _pendingMutations() {
-        return this.kv.currentValue.pendingMutations ?? new Map();
+        var _a;
+        return (_a = this.kv.currentValue.pendingMutations) !== null && _a !== void 0 ? _a : new Map();
     }
     _updatePendingMutations(f) {
         this.kv.updateInPlace((prev) => {
-            const muts = prev.pendingMutations ?? new Map();
+            var _a;
+            const muts = (_a = prev.pendingMutations) !== null && _a !== void 0 ? _a : new Map();
             prev.pendingMutations = muts;
             f(muts);
         });
@@ -768,6 +929,7 @@ 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
@@ -783,18 +945,18 @@ class Reactor {
             this._handleMutationError('error', eventId, msg);
             return;
         }
-        if (msg['original-event']?.hasOwnProperty('q') &&
-            msg['original-event']?.op === 'add-query') {
-            const q = msg['original-event']?.q;
+        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;
             const hash = (0, weakHash_ts_1.default)(q);
             this.notifyQueryError((0, weakHash_ts_1.default)(q), errorMessage);
             this.notifyQueryOnceError(q, hash, eventId, errorMessage);
             return;
         }
-        const isInitError = msg['original-event']?.op === 'init';
+        const isInitError = ((_d = msg['original-event']) === null || _d === void 0 ? void 0 : _d.op) === 'init';
         if (isInitError) {
             if (msg.type === 'record-not-found' &&
-                msg.hint?.['record-type'] === 'app-user') {
+                ((_e = msg.hint) === null || _e === void 0 ? void 0 : _e['record-type']) === 'app-user') {
                 // User has been logged out
                 this.changeCurrentUser(null);
                 return;
@@ -804,17 +966,17 @@ class Reactor {
             this.notifyAll();
             return;
         }
-        if (msg['original-event']?.op === 'resync-table') {
+        if (((_f = msg['original-event']) === null || _f === void 0 ? void 0 : _f.op) === 'resync-table') {
             this._syncTable.onResyncError(msg);
             return;
         }
-        if (msg['original-event']?.op === 'start-sync') {
+        if (((_g = msg['original-event']) === null || _g === void 0 ? void 0 : _g.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 = { ...msg };
+        const errorObj = Object.assign({}, msg);
         delete errorObj.message;
         delete errorObj.hint;
         console.error(msg.message, errorObj);
@@ -823,7 +985,8 @@ class Reactor {
         }
     }
     notifyQueryOnceError(q, hash, eventId, e) {
-        const r = this.queryOnceDfds[hash]?.find((r) => r.eventId === eventId);
+        var _a;
+        const r = (_a = this.queryOnceDfds[hash]) === null || _a === void 0 ? void 0 : _a.find((r) => r.eventId === eventId);
         if (!r)
             return;
         r.dfd.reject(e);
@@ -836,12 +999,6 @@ class Reactor {
         }, {}), this._linkIndex);
         this.notifyAttrsSubs();
     }
-    // ---------------------------
-    // Queries
-    getPreviousResult = (q) => {
-        const hash = (0, weakHash_ts_1.default)(q);
-        return this.dataForQuery(hash)?.data;
-    };
     _startQuerySub(q, hash) {
         const eventId = (0, id_ts_1.default)();
         this.querySubs.updateInPlace((prev) => {
@@ -865,18 +1022,19 @@ class Reactor {
      *  Returns an unsubscribe function
      */
     subscribeQuery(q, cb, opts) {
+        var _a;
         if (!this.config.disableValidation) {
             (0, queryValidation_ts_1.validateQuery)(q, this.config.schema);
         }
         if (opts && 'ruleParams' in opts) {
-            q = { $$ruleParams: opts['ruleParams'], ...q };
+            q = Object.assign({ $$ruleParams: opts['ruleParams'] }, q);
         }
         const hash = (0, weakHash_ts_1.default)(q);
         const prevResult = this.getPreviousResult(q);
         if (prevResult) {
             cb(prevResult);
         }
-        this.queryCbs[hash] = this.queryCbs[hash] ?? [];
+        this.queryCbs[hash] = (_a = this.queryCbs[hash]) !== null && _a !== void 0 ? _a : [];
         this.queryCbs[hash].push({ q, cb });
         this._startQuerySub(q, hash);
         return () => {
@@ -884,11 +1042,12 @@ class Reactor {
         };
     }
     queryOnce(q, opts) {
+        var _a;
         if (!this.config.disableValidation) {
             (0, queryValidation_ts_1.validateQuery)(q, this.config.schema);
         }
         if (opts && 'ruleParams' in opts) {
-            q = { $$ruleParams: opts['ruleParams'], ...q };
+            q = Object.assign({ $$ruleParams: opts['ruleParams'] }, q);
         }
         const dfd = new Deferred_js_1.Deferred();
         if (!this._isOnline) {
@@ -901,7 +1060,7 @@ class Reactor {
         }
         const hash = (0, weakHash_ts_1.default)(q);
         const eventId = this._startQuerySub(q, hash);
-        this.queryOnceDfds[hash] = this.queryOnceDfds[hash] ?? [];
+        this.queryOnceDfds[hash] = (_a = this.queryOnceDfds[hash]) !== null && _a !== void 0 ? _a : [];
         this.queryOnceDfds[hash].push({ q, dfd, eventId });
         setTimeout(() => dfd.reject(new Error('Query timed out')), QUERY_ONCE_TIMEOUT);
         return dfd.promise;
@@ -919,7 +1078,8 @@ class Reactor {
         this._cleanupQuery(q, hash);
     }
     _hasQueryListeners(hash) {
-        return !!(this.queryCbs[hash]?.length || this.queryOnceDfds[hash]?.length);
+        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));
     }
     _cleanupQuery(q, hash) {
         const hasListeners = this._hasQueryListeners(hash);
@@ -1011,10 +1171,7 @@ class Reactor {
         };
         const rewritten = new Map();
         for (const [k, mut] of muts.entries()) {
-            rewritten.set(k, {
-                ...mut,
-                'tx-steps': rewriteTxSteps(mut['tx-steps'], mut['tx-id']),
-            });
+            rewritten.set(k, Object.assign(Object.assign({}, mut), { 'tx-steps': rewriteTxSteps(mut['tx-steps'], mut['tx-id']) }));
         }
         if (!mappingChanged) {
             return muts;
@@ -1030,6 +1187,7 @@ 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
@@ -1042,15 +1200,15 @@ class Reactor {
             }
             else if (_action === 'update-attr' &&
                 attr.id &&
-                this.attrs?.getAttr(attr.id)) {
-                const fullAttr = { ...this.attrs.getAttr(attr.id), ...attr };
+                ((_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);
                 pendingAttrs.push(fullAttr);
             }
         }
         if (!deletedAttrIds.size && !pendingAttrs.length) {
             return this.attrs || new s.AttrsStoreClass({}, this._linkIndex);
         }
-        const attrs = { ...(this.attrs?.attrs || {}) };
+        const attrs = Object.assign({}, (((_b = this.attrs) === null || _b === void 0 ? void 0 : _b.attrs) || {}));
         for (const attr of pendingAttrs) {
             attrs[attr.id] = attr;
         }
@@ -1104,30 +1262,6 @@ 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 ((0, object_js_1.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) => {
@@ -1143,54 +1277,11 @@ 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) {
-            (0, transactionValidation_ts_1.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 = (0, id_ts_1.default)();
-        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_js_1.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;
-        this._transport?.close();
+        (_a = this._transport) === null || _a === void 0 ? void 0 : _a.close();
     }
     /**
      * Sends mutation to server and schedules a timeout to cancel it if
@@ -1263,8 +1354,8 @@ class Reactor {
     _cleanupPendingMutationsQueries() {
         let minProcessedTxId = Number.MAX_SAFE_INTEGER;
         for (const { result } of Object.values(this.querySubs.currentValue)) {
-            if (result?.processedTxId) {
-                minProcessedTxId = Math.min(minProcessedTxId, result?.processedTxId);
+            if (result === null || result === void 0 ? void 0 : result.processedTxId) {
+                minProcessedTxId = Math.min(minProcessedTxId, result === null || result === void 0 ? void 0 : result.processedTxId);
             }
         }
         this._updatePendingMutations((prev) => {
@@ -1317,96 +1408,8 @@ class Reactor {
                 this._inFlightMutationEventIds.clear();
             }
         }
-        this._transport.send({ 'client-event-id': eventId, ...msg });
+        this._transport.send(Object.assign({ '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((0, id_ts_1.default)(), {
-                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
@@ -1435,7 +1438,7 @@ class Reactor {
         this._transport.onclose = this._transportOnClose;
         this._transport.onerror = this._transportOnError;
         this._log.info('[socket][start]', this._transport.id);
-        if (prevTransport?.isOpen()) {
+        if (prevTransport === null || prevTransport === void 0 ? void 0 : prevTransport.isOpen()) {
             // When the network dies, it doesn't always mean that our
             // socket connection will fire a close event.
             //
@@ -1456,22 +1459,24 @@ class Reactor {
      * Note: If the user deletes their local storage, this id will change.
      *
      */
-    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 = (0, id_ts_1.default)();
-        this.kv.updateInPlace((prev) => {
-            if (prev[k])
-                return;
-            prev[k] = newId;
+    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 = (0, id_ts_1.default)();
+            this.kv.updateInPlace((prev) => {
+                if (prev[k])
+                    return;
+                prev[k] = newId;
+            });
+            return yield this.kv.waitForKeyToLoad(k);
         });
-        return await this.kv.waitForKeyToLoad(k);
     }
     // ----
     // Auth
@@ -1506,13 +1511,14 @@ 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' &&
-                            e.destination?.url === startUrl) {
+                            ((_a = e.destination) === null || _a === void 0 ? void 0 : _a.url) === startUrl) {
                             history.replaceState(history.state, '', newPath);
                         }
                     }
@@ -1526,52 +1532,57 @@ class Reactor {
      *
      * @returns Promise<null | {error: {message: string}}>
      */
-    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) {
+    _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;
+            }
             this._replaceUrlAfterOAuth();
-            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
+            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 null;
             }
-            const message = e?.body?.message || 'Error logging in.';
-            return { error: { message } };
-        }
+            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 } };
+            }
+        });
     }
-    async _waitForOAuthCallbackResponse() {
-        return await this._oauthCallbackResponse;
+    _waitForOAuthCallbackResponse() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._oauthCallbackResponse;
+        });
     }
     __subscribeMutationErrors(cb) {
         this.mutationErrorCbs.push(cb);
@@ -1598,12 +1609,14 @@ class Reactor {
             this.authCbs = this.authCbs.filter((x) => x !== cb);
         };
     }
-    async getAuth() {
-        const { user, error } = await this.getCurrentUser();
-        if (error) {
-            throw new InstantError_ts_1.InstantError('Could not get current user: ' + error.message);
-        }
-        return user;
+    getAuth() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { user, error } = yield this.getCurrentUser();
+            if (error) {
+                throw new InstantError_ts_1.InstantError('Could not get current user: ' + error.message);
+            }
+            return user;
+        });
     }
     subscribeConnectionStatus(cb) {
         this.connectionStatusCbs.push(cb);
@@ -1635,89 +1648,99 @@ class Reactor {
     notifyConnectionStatusSubs(status) {
         this.connectionStatusCbs.forEach((cb) => cb(status));
     }
-    async setCurrentUser(user) {
-        this.kv.updateInPlace((prev) => {
-            prev[currentUserKey] = user;
+    setCurrentUser(user) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.kv.updateInPlace((prev) => {
+                prev[currentUserKey] = user;
+            });
+            yield this.kv.waitForKeyToLoad(currentUserKey);
         });
-        await this.kv.waitForKeyToLoad(currentUserKey);
     }
     getCurrentUserCached() {
         return this._currentUserCached;
     }
-    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' },
-            };
-        }
+    _getCurrentUser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const user = yield this.kv.waitForKeyToLoad(currentUserKey);
+            return typeof user === 'string' ? JSON.parse(user) : user;
+        });
     }
-    async _hasCurrentUser() {
-        const user = await this.kv.waitForKeyToLoad(currentUserKey);
-        return typeof user === 'string' ? JSON.parse(user) != null : user != null;
+    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 changeCurrentUser(newUser) {
-        const { user: oldUser } = await this.getCurrentUser();
-        if ((0, object_js_1.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);
-        }
+    _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 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);
-        }
+    changeCurrentUser(newUser) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const { user: oldUser } = yield this.getCurrentUser();
+            if ((0, object_js_1.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);
+            }
+        });
+    }
+    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);
+            }
+        });
     }
     updateUser(newUser) {
         this.syncUserToEndpoint(newUser);
         const newV = { error: undefined, user: newUser };
-        this._currentUserCached = { isLoading: false, ...newV };
+        this._currentUserCached = Object.assign({ isLoading: false }, newV);
         this._dataForQueryCache = {};
         this.querySubs.updateInPlace((prev) => {
             Object.keys(prev).forEach((k) => {
@@ -1736,38 +1759,46 @@ class Reactor {
             email: email,
         });
     }
-    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,
+    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;
         });
-        await this.changeCurrentUser(res.user);
-        return res;
     }
-    async signInWithCustomToken(authToken) {
-        const res = await authAPI.verifyRefreshToken({
-            apiURI: this.config.apiURI,
-            appId: this.config.appId,
-            refreshToken: authToken,
+    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;
         });
-        await this.changeCurrentUser(res.user);
-        return res;
     }
-    async signInAsGuest() {
-        const res = await authAPI.signInAsGuest({
-            apiURI: this.config.apiURI,
-            appId: this.config.appId,
+    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;
         });
-        await this.changeCurrentUser(res.user);
-        return res;
     }
     potentiallyInvalidateToken(currentUser, opts) {
-        const refreshToken = currentUser?.user?.refresh_token;
+        var _a;
+        const refreshToken = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.user) === null || _a === void 0 ? void 0 : _a.refresh_token;
         if (!refreshToken) {
             return;
         }
@@ -1787,10 +1818,12 @@ class Reactor {
         })
             .catch((e) => { });
     }
-    async signOut(opts) {
-        const currentUser = await this.getCurrentUser();
-        this.potentiallyInvalidateToken(currentUser, opts);
-        await this.changeCurrentUser(null);
+    signOut(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const currentUser = yield this.getCurrentUser();
+            this.potentiallyInvalidateToken(currentUser, opts);
+            yield this.changeCurrentUser(null);
+        });
     }
     /**
      * Creates an OAuth authorization URL.
@@ -1809,18 +1842,21 @@ 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.
      */
-    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,
+    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;
         });
-        await this.changeCurrentUser(res.user);
-        return res;
     }
     issuerURI() {
         const { apiURI, appId } = this.config;
@@ -1832,19 +1868,22 @@ 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
      */
-    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,
+    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;
         });
-        await this.changeCurrentUser(res.user);
-        return res;
     }
     // --------
     // Rooms
@@ -1877,9 +1916,10 @@ class Reactor {
         };
     }
     _cleanupRoom(roomId) {
-        if (!this._presence[roomId]?.handlers?.length &&
-            !Object.keys(this._broadcastSubs[roomId] ?? {}).length) {
-            const isConnected = this._rooms[roomId]?.isConnected;
+        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;
             delete this._rooms[roomId];
             delete this._presence[roomId];
             delete this._broadcastSubs[roomId];
@@ -1899,11 +1939,7 @@ class Reactor {
         const presence = this._presence[roomId];
         if (!room || !presence || !presence.result)
             return null;
-        return {
-            ...(0, presence_ts_1.buildPresenceSlice)(presence.result, opts, this._sessionId),
-            isLoading: !room.isConnected,
-            error: room.error,
-        };
+        return Object.assign(Object.assign({}, (0, presence_ts_1.buildPresenceSlice)(presence.result, opts, this._sessionId)), { isLoading: !room.isConnected, error: room.error });
     }
     // TODO: look into typing again
     publishPresence(roomType, roomId, partialData) {
@@ -1913,10 +1949,7 @@ class Reactor {
             return;
         }
         presence.result = presence.result || {};
-        const data = {
-            ...presence.result.user,
-            ...partialData,
-        };
+        const data = Object.assign(Object.assign({}, presence.result.user), partialData);
         presence.result.user = data;
         if (!room.isConnected) {
             return;
@@ -1951,19 +1984,21 @@ class Reactor {
         // Note: initialData is deprecated.
         // Keeping here for backwards compatibility
         opts.initialPresence || opts.initialData);
-        const handler = { ...opts, roomId, cb, prev: null };
+        const handler = Object.assign(Object.assign({}, 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 =
-                this._presence[roomId]?.handlers?.filter((x) => x !== handler) ?? [];
+                (_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 : [];
             leaveRoom();
         };
     }
     _notifyPresenceSubs(roomId) {
-        this._presence[roomId]?.handlers?.forEach((handler) => {
+        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._notifyPresenceSub(roomId, handler);
         });
     }
@@ -1979,9 +2014,10 @@ class Reactor {
         handler.cb(slice);
     }
     _patchPresencePeers(roomId, edits) {
-        const peers = this._presence[roomId]?.result?.peers || {};
+        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) || {};
         let sessions = Object.fromEntries(Object.entries(peers).map(([k, v]) => [k, { data: v }]));
-        const myPresence = this._presence[roomId]?.result;
+        const myPresence = (_c = this._presence[roomId]) === null || _c === void 0 ? void 0 : _c.result;
         const newSessions = (0, mutative_1.create)(sessions, (draft) => {
             for (let [path, op, value] of edits) {
                 switch (op) {
@@ -2002,7 +2038,7 @@ class Reactor {
         this._setPresencePeers(roomId, newSessions);
     }
     _setPresencePeers(roomId, data) {
-        const sessions = { ...data };
+        const sessions = Object.assign({}, 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]));
@@ -2013,12 +2049,13 @@ class Reactor {
     // --------
     // Broadcast
     publishTopic({ roomType, roomId, topic, data }) {
+        var _a;
         const room = this._rooms[roomId];
         if (!room) {
             return;
         }
         if (!room.isConnected) {
-            this._broadcastQueue[roomId] = this._broadcastQueue[roomId] ?? [];
+            this._broadcastQueue[roomId] = (_a = this._broadcastQueue[roomId]) !== null && _a !== void 0 ? _a : [];
             this._broadcastQueue[roomId].push({ topic, roomType, data });
             return;
         }
@@ -2049,64 +2086,71 @@ class Reactor {
         };
     }
     _notifyBroadcastSubs(room, topic, msg) {
-        this._broadcastSubs?.[room]?.[topic]?.forEach((cb) => {
-            const data = msg.data?.data;
+        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;
             const peer = msg.data['peer-id'] === this._sessionId
-                ? this._presence[room]?.result?.user
-                : this._presence[room]?.result?.peers?.[msg.data['peer-id']];
+                ? (_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']];
             return cb(data, peer);
         });
     }
     // --------
     // Storage
-    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,
+    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 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,
+    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;
         });
-        return result;
     }
     // Deprecated Storage API (Jan 2025)
     // ---------------------------------
-    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,
+    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;
         });
-        const isSuccess = await StorageApi.upload(url, file);
-        return isSuccess;
     }
-    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,
+    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;
         });
-        return url;
     }
 }
 exports.default = Reactor;