@mideind/netskrafl-react 1.7.1 → 1.8.0

package/dist/esm/index.js

@@ -10,7 +10,7 @@ const DEFAULT_STATE = {
     measurementId: "",
     account: "",
     userEmail: "",
-    userId: "",
+    netskraflUserId: "",
     userNick: "",
     userFullname: "",
     locale: "is_IS",
@@ -74,8 +74,8 @@ const saveAuthSettings = (settings) => {
         // Only add optional fields if they are defined
         if (settings.account !== undefined)
             filteredSettings.account = settings.account;
-        if (settings.userId !== undefined)
-            filteredSettings.userId = settings.userId;
+        if (settings.netskraflUserId !== undefined)
+            filteredSettings.netskraflUserId = settings.netskraflUserId;
         if (settings.userNick !== undefined)
             filteredSettings.userNick = settings.userNick;
         if (settings.firebaseApiKey !== undefined)
@@ -130,7 +130,6 @@ const clearAuthSettings = () => {
 };
 // Apply persisted settings to a GlobalState object
 const applyPersistedSettings = (state) => {
-    var _a, _b, _c, _d, _e, _f;
     const persisted = loadAuthSettings();
     if (!persisted) {
         return state;
@@ -146,18 +145,18 @@ const applyPersistedSettings = (state) => {
     return {
         ...state,
         // Only apply persisted values if current values are defaults
-        account: state.account || persisted.account || state.userId, // Use userId as fallback
-        userId: state.userId || persisted.userId || state.userId,
+        account: persisted.account || state.account || state.netskraflUserId,
+        netskraflUserId: persisted.netskraflUserId || state.netskraflUserId,
         // userNick is special: the container provides a "guess", but the backend login
         // returns the authoritative nickname, which should persist across re-initializations
         userNick: persisted.userNick || state.userNick,
         firebaseApiKey: state.firebaseApiKey || persisted.firebaseApiKey || state.firebaseApiKey,
-        beginner: (_a = persisted.beginner) !== null && _a !== void 0 ? _a : state.beginner,
-        fairPlay: (_b = persisted.fairPlay) !== null && _b !== void 0 ? _b : state.fairPlay,
-        ready: (_c = persisted.ready) !== null && _c !== void 0 ? _c : state.ready,
-        readyTimed: (_d = persisted.readyTimed) !== null && _d !== void 0 ? _d : state.readyTimed,
-        audio: (_e = persisted.audio) !== null && _e !== void 0 ? _e : state.audio,
-        fanfare: (_f = persisted.fanfare) !== null && _f !== void 0 ? _f : state.fanfare,
+        beginner: persisted.beginner ?? state.beginner,
+        fairPlay: persisted.fairPlay ?? state.fairPlay,
+        ready: persisted.ready ?? state.ready,
+        readyTimed: persisted.readyTimed ?? state.readyTimed,
+        audio: persisted.audio ?? state.audio,
+        fanfare: persisted.fanfare ?? state.fanfare,
     };
 };
 
@@ -2437,7 +2436,7 @@ async function loadMessages(state, locale) {
         });
         setLocale(locale, messages);
     }
-    catch (_a) {
+    catch {
         setLocale(locale, {});
     }
 }
@@ -2801,7 +2800,7 @@ function escapeHtml(string) {
         "'": ''',
         "/": '/'
     };
-    return String(string).replace(/[&<>"'/]/g, (s) => { var _a; return (_a = entityMap[s]) !== null && _a !== void 0 ? _a : ""; });
+    return String(string).replace(/[&<>"'/]/g, (s) => entityMap[s] ?? "");
 }
 function getUrlVars(url) {
     // Get values from a URL query string
@@ -2938,6 +2937,8 @@ const loginUserByEmail = async (state) => {
     });
 };
 
+const getDefaultsFromPostinstall = () => (undefined);
+
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -3486,7 +3487,8 @@ const getDefaultsFromCookie = () => {
  */
 const getDefaults = () => {
     try {
-        return (getDefaultsFromGlobal() ||
+        return (getDefaultsFromPostinstall() ||
+            getDefaultsFromGlobal() ||
             getDefaultsFromEnvVariable() ||
             getDefaultsFromCookie());
     }
@@ -3507,7 +3509,7 @@ const getDefaults = () => {
  * @returns a URL host formatted like `127.0.0.1:9999` or `[::1]:4000` if available
  * @public
  */
-const getDefaultEmulatorHost = (productName) => { var _a, _b; return (_b = (_a = getDefaults()) === null || _a === void 0 ? void 0 : _a.emulatorHosts) === null || _b === void 0 ? void 0 : _b[productName]; };
+const getDefaultEmulatorHost = (productName) => getDefaults()?.emulatorHosts?.[productName];
 /**
  * Returns emulator hostname and port stored in the __FIREBASE_DEFAULTS__ object
  * for the given product.
@@ -3537,13 +3539,13 @@ const getDefaultEmulatorHostnameAndPort = (productName) => {
  * Returns Firebase app config stored in the __FIREBASE_DEFAULTS__ object.
  * @public
  */
-const getDefaultAppConfig = () => { var _a; return (_a = getDefaults()) === null || _a === void 0 ? void 0 : _a.config; };
+const getDefaultAppConfig = () => getDefaults()?.config;
 /**
  * Returns an experimental setting on the __FIREBASE_DEFAULTS__ object (properties
  * prefixed by "_")
  * @public
  */
-const getExperimentalSetting = (name) => { var _a; return (_a = getDefaults()) === null || _a === void 0 ? void 0 : _a[`_${name}`]; };
+const getExperimentalSetting = (name) => getDefaults()?.[`_${name}`];
 
 /**
  * @license
@@ -3600,6 +3602,53 @@ class Deferred {
     }
 }
 
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Checks whether host is a cloud workstation or not.
+ * @public
+ */
+function isCloudWorkstation(url) {
+    // `isCloudWorkstation` is called without protocol in certain connect*Emulator functions
+    // In HTTP request builders, it's called with the protocol.
+    // If called with protocol prefix, it's a valid URL, so we extract the hostname
+    // If called without, we assume the string is the hostname.
+    try {
+        const host = url.startsWith('http://') || url.startsWith('https://')
+            ? new URL(url).hostname
+            : url;
+        return host.endsWith('.cloudworkstations.dev');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Makes a fetch request to the given server.
+ * Mostly used for forwarding cookies in Firebase Studio.
+ * @public
+ */
+async function pingServer(endpoint) {
+    const result = await fetch(endpoint, {
+        credentials: 'include'
+    });
+    return result.ok;
+}
+
 /**
  * @license
  * Copyright 2021 Google LLC
@@ -3631,12 +3680,22 @@ function createMockUserToken(token, projectId) {
     if (!sub) {
         throw new Error("mockUserToken must contain 'sub' or 'user_id' field!");
     }
-    const payload = Object.assign({ 
+    const payload = {
         // Set all required fields to decent defaults
-        iss: `https://securetoken.google.com/${project}`, aud: project, iat, exp: iat + 3600, auth_time: iat, sub, user_id: sub, firebase: {
+        iss: `https://securetoken.google.com/${project}`,
+        aud: project,
+        iat,
+        exp: iat + 3600,
+        auth_time: iat,
+        sub,
+        user_id: sub,
+        firebase: {
             sign_in_provider: 'custom',
             identities: {}
-        } }, token);
+        },
+        // Override with user options
+        ...token
+    };
     // Unsecured JWTs use the empty string as a signature.
     const signature = '';
     return [
@@ -3645,6 +3704,152 @@ function createMockUserToken(token, projectId) {
         signature
     ].join('.');
 }
+const emulatorStatus = {};
+// Checks whether any products are running on an emulator
+function getEmulatorSummary() {
+    const summary = {
+        prod: [],
+        emulator: []
+    };
+    for (const key of Object.keys(emulatorStatus)) {
+        if (emulatorStatus[key]) {
+            summary.emulator.push(key);
+        }
+        else {
+            summary.prod.push(key);
+        }
+    }
+    return summary;
+}
+function getOrCreateEl(id) {
+    let parentDiv = document.getElementById(id);
+    let created = false;
+    if (!parentDiv) {
+        parentDiv = document.createElement('div');
+        parentDiv.setAttribute('id', id);
+        created = true;
+    }
+    return { created, element: parentDiv };
+}
+let previouslyDismissed = false;
+/**
+ * Updates Emulator Banner. Primarily used for Firebase Studio
+ * @param name
+ * @param isRunningEmulator
+ * @public
+ */
+function updateEmulatorBanner(name, isRunningEmulator) {
+    if (typeof window === 'undefined' ||
+        typeof document === 'undefined' ||
+        !isCloudWorkstation(window.location.host) ||
+        emulatorStatus[name] === isRunningEmulator ||
+        emulatorStatus[name] || // If already set to use emulator, can't go back to prod.
+        previouslyDismissed) {
+        return;
+    }
+    emulatorStatus[name] = isRunningEmulator;
+    function prefixedId(id) {
+        return `__firebase__banner__${id}`;
+    }
+    const bannerId = '__firebase__banner';
+    const summary = getEmulatorSummary();
+    const showError = summary.prod.length > 0;
+    function tearDown() {
+        const element = document.getElementById(bannerId);
+        if (element) {
+            element.remove();
+        }
+    }
+    function setupBannerStyles(bannerEl) {
+        bannerEl.style.display = 'flex';
+        bannerEl.style.background = '#7faaf0';
+        bannerEl.style.position = 'fixed';
+        bannerEl.style.bottom = '5px';
+        bannerEl.style.left = '5px';
+        bannerEl.style.padding = '.5em';
+        bannerEl.style.borderRadius = '5px';
+        bannerEl.style.alignItems = 'center';
+    }
+    function setupIconStyles(prependIcon, iconId) {
+        prependIcon.setAttribute('width', '24');
+        prependIcon.setAttribute('id', iconId);
+        prependIcon.setAttribute('height', '24');
+        prependIcon.setAttribute('viewBox', '0 0 24 24');
+        prependIcon.setAttribute('fill', 'none');
+        prependIcon.style.marginLeft = '-6px';
+    }
+    function setupCloseBtn() {
+        const closeBtn = document.createElement('span');
+        closeBtn.style.cursor = 'pointer';
+        closeBtn.style.marginLeft = '16px';
+        closeBtn.style.fontSize = '24px';
+        closeBtn.innerHTML = ' &times;';
+        closeBtn.onclick = () => {
+            previouslyDismissed = true;
+            tearDown();
+        };
+        return closeBtn;
+    }
+    function setupLinkStyles(learnMoreLink, learnMoreId) {
+        learnMoreLink.setAttribute('id', learnMoreId);
+        learnMoreLink.innerText = 'Learn more';
+        learnMoreLink.href =
+            'https://firebase.google.com/docs/studio/preview-apps#preview-backend';
+        learnMoreLink.setAttribute('target', '__blank');
+        learnMoreLink.style.paddingLeft = '5px';
+        learnMoreLink.style.textDecoration = 'underline';
+    }
+    function setupDom() {
+        const banner = getOrCreateEl(bannerId);
+        const firebaseTextId = prefixedId('text');
+        const firebaseText = document.getElementById(firebaseTextId) || document.createElement('span');
+        const learnMoreId = prefixedId('learnmore');
+        const learnMoreLink = document.getElementById(learnMoreId) ||
+            document.createElement('a');
+        const prependIconId = prefixedId('preprendIcon');
+        const prependIcon = document.getElementById(prependIconId) ||
+            document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+        if (banner.created) {
+            // update styles
+            const bannerEl = banner.element;
+            setupBannerStyles(bannerEl);
+            setupLinkStyles(learnMoreLink, learnMoreId);
+            const closeBtn = setupCloseBtn();
+            setupIconStyles(prependIcon, prependIconId);
+            bannerEl.append(prependIcon, firebaseText, learnMoreLink, closeBtn);
+            document.body.appendChild(bannerEl);
+        }
+        if (showError) {
+            firebaseText.innerText = `Preview backend disconnected.`;
+            prependIcon.innerHTML = `<g clip-path="url(#clip0_6013_33858)">
+<path d="M4.8 17.6L12 5.6L19.2 17.6H4.8ZM6.91667 16.4H17.0833L12 7.93333L6.91667 16.4ZM12 15.6C12.1667 15.6 12.3056 15.5444 12.4167 15.4333C12.5389 15.3111 12.6 15.1667 12.6 15C12.6 14.8333 12.5389 14.6944 12.4167 14.5833C12.3056 14.4611 12.1667 14.4 12 14.4C11.8333 14.4 11.6889 14.4611 11.5667 14.5833C11.4556 14.6944 11.4 14.8333 11.4 15C11.4 15.1667 11.4556 15.3111 11.5667 15.4333C11.6889 15.5444 11.8333 15.6 12 15.6ZM11.4 13.6H12.6V10.4H11.4V13.6Z" fill="#212121"/>
+</g>
+<defs>
+<clipPath id="clip0_6013_33858">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>`;
+        }
+        else {
+            prependIcon.innerHTML = `<g clip-path="url(#clip0_6083_34804)">
+<path d="M11.4 15.2H12.6V11.2H11.4V15.2ZM12 10C12.1667 10 12.3056 9.94444 12.4167 9.83333C12.5389 9.71111 12.6 9.56667 12.6 9.4C12.6 9.23333 12.5389 9.09444 12.4167 8.98333C12.3056 8.86111 12.1667 8.8 12 8.8C11.8333 8.8 11.6889 8.86111 11.5667 8.98333C11.4556 9.09444 11.4 9.23333 11.4 9.4C11.4 9.56667 11.4556 9.71111 11.5667 9.83333C11.6889 9.94444 11.8333 10 12 10ZM12 18.4C11.1222 18.4 10.2944 18.2333 9.51667 17.9C8.73889 17.5667 8.05556 17.1111 7.46667 16.5333C6.88889 15.9444 6.43333 15.2611 6.1 14.4833C5.76667 13.7056 5.6 12.8778 5.6 12C5.6 11.1111 5.76667 10.2833 6.1 9.51667C6.43333 8.73889 6.88889 8.06111 7.46667 7.48333C8.05556 6.89444 8.73889 6.43333 9.51667 6.1C10.2944 5.76667 11.1222 5.6 12 5.6C12.8889 5.6 13.7167 5.76667 14.4833 6.1C15.2611 6.43333 15.9389 6.89444 16.5167 7.48333C17.1056 8.06111 17.5667 8.73889 17.9 9.51667C18.2333 10.2833 18.4 11.1111 18.4 12C18.4 12.8778 18.2333 13.7056 17.9 14.4833C17.5667 15.2611 17.1056 15.9444 16.5167 16.5333C15.9389 17.1111 15.2611 17.5667 14.4833 17.9C13.7167 18.2333 12.8889 18.4 12 18.4ZM12 17.2C13.4444 17.2 14.6722 16.6944 15.6833 15.6833C16.6944 14.6722 17.2 13.4444 17.2 12C17.2 10.5556 16.6944 9.32778 15.6833 8.31667C14.6722 7.30555 13.4444 6.8 12 6.8C10.5556 6.8 9.32778 7.30555 8.31667 8.31667C7.30556 9.32778 6.8 10.5556 6.8 12C6.8 13.4444 7.30556 14.6722 8.31667 15.6833C9.32778 16.6944 10.5556 17.2 12 17.2Z" fill="#212121"/>
+</g>
+<defs>
+<clipPath id="clip0_6083_34804">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>`;
+            firebaseText.innerText = 'Preview backend running in this workspace.';
+        }
+        firebaseText.setAttribute('id', firebaseTextId);
+    }
+    if (document.readyState === 'loading') {
+        window.addEventListener('DOMContentLoaded', setupDom);
+    }
+    else {
+        setupDom();
+    }
+}
 
 /**
  * @license
@@ -3762,8 +3967,7 @@ function validateIndexedDBOpenable() {
                 preExist = false;
             };
             request.onerror = () => {
-                var _a;
-                reject(((_a = request.error) === null || _a === void 0 ? void 0 : _a.message) || '');
+                reject(request.error?.message || '');
             };
         }
         catch (error) {
@@ -4865,10 +5069,9 @@ class Provider {
         return this.instancesDeferred.get(normalizedIdentifier).promise;
     }
     getImmediate(options) {
-        var _a;
         // if multipleInstances is not supported, use the default name
-        const normalizedIdentifier = this.normalizeInstanceIdentifier(options === null || options === void 0 ? void 0 : options.identifier);
-        const optional = (_a = options === null || options === void 0 ? void 0 : options.optional) !== null && _a !== void 0 ? _a : false;
+        const normalizedIdentifier = this.normalizeInstanceIdentifier(options?.identifier);
+        const optional = options?.optional ?? false;
         if (this.isInitialized(normalizedIdentifier) ||
             this.shouldAutoInitialize()) {
             try {
@@ -5000,9 +5203,9 @@ class Provider {
      * @returns a function to unregister the callback
      */
     onInit(callback, identifier) {
-        var _a;
         const normalizedIdentifier = this.normalizeInstanceIdentifier(identifier);
-        const existingCallbacks = (_a = this.onInitCallbacks.get(normalizedIdentifier)) !== null && _a !== void 0 ? _a : new Set();
+        const existingCallbacks = this.onInitCallbacks.get(normalizedIdentifier) ??
+            new Set();
         existingCallbacks.add(callback);
         this.onInitCallbacks.set(normalizedIdentifier, existingCallbacks);
         const existingInstance = this.instances.get(normalizedIdentifier);
@@ -5026,7 +5229,7 @@ class Provider {
             try {
                 callback(instance, identifier);
             }
-            catch (_a) {
+            catch {
                 // ignore errors in the onInit callback
             }
         }
@@ -5055,7 +5258,7 @@ class Provider {
                 try {
                     this.component.onInstanceCreated(this.container, instanceIdentifier, instance);
                 }
-                catch (_a) {
+                catch {
                     // ignore errors in the onInstanceCreatedCallback
                 }
             }
@@ -5622,11 +5825,11 @@ class PlatformLoggerServiceImpl {
  */
 function isVersionServiceProvider(provider) {
     const component = provider.getComponent();
-    return (component === null || component === void 0 ? void 0 : component.type) === "VERSION" /* ComponentType.VERSION */;
+    return component?.type === "VERSION" /* ComponentType.VERSION */;
 }
 
 const name$q = "@firebase/app";
-const version$1$1 = "0.10.16";
+const version$1$1 = "0.14.5";
 
 /**
  * @license
@@ -5692,12 +5895,12 @@ const name$4$1 = "@firebase/storage-compat";
 
 const name$3$1 = "@firebase/firestore";
 
-const name$2$1 = "@firebase/vertexai";
+const name$2$1 = "@firebase/ai";
 
 const name$1$1 = "@firebase/firestore-compat";
 
 const name$r = "firebase";
-const version$5 = "11.0.2";
+const version$5 = "12.5.0";
 
 /**
  * @license
@@ -5846,6 +6049,9 @@ function _getProvider(app, name) {
  * @internal
  */
 function _isFirebaseServerApp(obj) {
+    if (obj === null || obj === undefined) {
+        return false;
+    }
     return obj.settings !== undefined;
 }
 
@@ -5904,8 +6110,8 @@ const ERROR_FACTORY$2 = new ErrorFactory('app', 'Firebase', ERRORS$1);
 class FirebaseAppImpl {
     constructor(options, config, container) {
         this._isDeleted = false;
-        this._options = Object.assign({}, options);
-        this._config = Object.assign({}, config);
+        this._options = { ...options };
+        this._config = { ...config };
         this._name = config.name;
         this._automaticDataCollectionEnabled =
             config.automaticDataCollectionEnabled;
@@ -5980,7 +6186,11 @@ function initializeApp(_options, rawConfig = {}) {
         const name = rawConfig;
         rawConfig = { name };
     }
-    const config = Object.assign({ name: DEFAULT_ENTRY_NAME, automaticDataCollectionEnabled: false }, rawConfig);
+    const config = {
+        name: DEFAULT_ENTRY_NAME,
+        automaticDataCollectionEnabled: true,
+        ...rawConfig
+    };
     const name = config.name;
     if (typeof name !== 'string' || !name) {
         throw ERROR_FACTORY$2.create("bad-app-name" /* AppError.BAD_APP_NAME */, {
@@ -6058,10 +6268,9 @@ function getApp(name = DEFAULT_ENTRY_NAME) {
  * @public
  */
 function registerVersion(libraryKeyOrName, version, variant) {
-    var _a;
     // TODO: We can use this check to whitelist strings when/if we set up
     // a good whitelist system.
-    let library = (_a = PLATFORM_LOG_STRING[libraryKeyOrName]) !== null && _a !== void 0 ? _a : libraryKeyOrName;
+    let library = PLATFORM_LOG_STRING[libraryKeyOrName] ?? libraryKeyOrName;
     if (variant) {
         library += `-${variant}`;
     }
@@ -6152,7 +6361,7 @@ async function readHeartbeatsFromIndexedDB(app) {
         }
         else {
             const idbGetError = ERROR_FACTORY$2.create("idb-get" /* AppError.IDB_GET */, {
-                originalErrorMessage: e === null || e === void 0 ? void 0 : e.message
+                originalErrorMessage: e?.message
             });
             logger$2.warn(idbGetError.message);
         }
@@ -6172,7 +6381,7 @@ async function writeHeartbeatsToIndexedDB(app, heartbeatObject) {
         }
         else {
             const idbGetError = ERROR_FACTORY$2.create("idb-set" /* AppError.IDB_WRITE */, {
-                originalErrorMessage: e === null || e === void 0 ? void 0 : e.message
+                originalErrorMessage: e?.message
             });
             logger$2.warn(idbGetError.message);
         }
@@ -6199,8 +6408,7 @@ function computeKey(app) {
  * limitations under the License.
  */
 const MAX_HEADER_BYTES = 1024;
-// 30 days
-const STORED_HEARTBEAT_RETENTION_MAX_MILLIS = 30 * 24 * 60 * 60 * 1000;
+const MAX_NUM_STORED_HEARTBEATS = 30;
 class HeartbeatServiceImpl {
     constructor(container) {
         this.container = container;
@@ -6229,7 +6437,6 @@ class HeartbeatServiceImpl {
      * already logged, subsequent calls to this function in the same day will be ignored.
      */
     async triggerHeartbeat() {
-        var _a, _b;
         try {
             const platformLogger = this.container
                 .getProvider('platform-logger')
@@ -6238,10 +6445,10 @@ class HeartbeatServiceImpl {
             // service, not the browser user agent.
             const agent = platformLogger.getPlatformInfoString();
             const date = getUTCDateString();
-            if (((_a = this._heartbeatsCache) === null || _a === void 0 ? void 0 : _a.heartbeats) == null) {
+            if (this._heartbeatsCache?.heartbeats == null) {
                 this._heartbeatsCache = await this._heartbeatsCachePromise;
                 // If we failed to construct a heartbeats cache, then return immediately.
-                if (((_b = this._heartbeatsCache) === null || _b === void 0 ? void 0 : _b.heartbeats) == null) {
+                if (this._heartbeatsCache?.heartbeats == null) {
                     return;
                 }
             }
@@ -6254,14 +6461,13 @@ class HeartbeatServiceImpl {
             else {
                 // There is no entry for this date. Create one.
                 this._heartbeatsCache.heartbeats.push({ date, agent });
+                // If the number of stored heartbeats exceeds the maximum number of stored heartbeats, remove the heartbeat with the earliest date.
+                // Since this is executed each time a heartbeat is pushed, the limit can only be exceeded by one, so only one needs to be removed.
+                if (this._heartbeatsCache.heartbeats.length > MAX_NUM_STORED_HEARTBEATS) {
+                    const earliestHeartbeatIdx = getEarliestHeartbeatIdx(this._heartbeatsCache.heartbeats);
+                    this._heartbeatsCache.heartbeats.splice(earliestHeartbeatIdx, 1);
+                }
             }
-            // Remove entries older than 30 days.
-            this._heartbeatsCache.heartbeats =
-                this._heartbeatsCache.heartbeats.filter(singleDateHeartbeat => {
-                    const hbTimestamp = new Date(singleDateHeartbeat.date).valueOf();
-                    const now = Date.now();
-                    return now - hbTimestamp <= STORED_HEARTBEAT_RETENTION_MAX_MILLIS;
-                });
             return this._storage.overwrite(this._heartbeatsCache);
         }
         catch (e) {
@@ -6276,13 +6482,12 @@ class HeartbeatServiceImpl {
      * returns an empty string.
      */
     async getHeartbeatsHeader() {
-        var _a;
         try {
             if (this._heartbeatsCache === null) {
                 await this._heartbeatsCachePromise;
             }
             // If it's still null or the array is empty, there is no data to send.
-            if (((_a = this._heartbeatsCache) === null || _a === void 0 ? void 0 : _a.heartbeats) == null ||
+            if (this._heartbeatsCache?.heartbeats == null ||
                 this._heartbeatsCache.heartbeats.length === 0) {
                 return '';
             }
@@ -6383,7 +6588,7 @@ class HeartbeatStorageImpl {
         }
         else {
             const idbHeartbeatObject = await readHeartbeatsFromIndexedDB(this.app);
-            if (idbHeartbeatObject === null || idbHeartbeatObject === void 0 ? void 0 : idbHeartbeatObject.heartbeats) {
+            if (idbHeartbeatObject?.heartbeats) {
                 return idbHeartbeatObject;
             }
             else {
@@ -6393,7 +6598,6 @@ class HeartbeatStorageImpl {
     }
     // overwrite the storage with the provided heartbeats
     async overwrite(heartbeatsObject) {
-        var _a;
         const canUseIndexedDB = await this._canUseIndexedDBPromise;
         if (!canUseIndexedDB) {
             return;
@@ -6401,14 +6605,14 @@ class HeartbeatStorageImpl {
         else {
             const existingHeartbeatsObject = await this.read();
             return writeHeartbeatsToIndexedDB(this.app, {
-                lastSentHeartbeatDate: (_a = heartbeatsObject.lastSentHeartbeatDate) !== null && _a !== void 0 ? _a : existingHeartbeatsObject.lastSentHeartbeatDate,
+                lastSentHeartbeatDate: heartbeatsObject.lastSentHeartbeatDate ??
+                    existingHeartbeatsObject.lastSentHeartbeatDate,
                 heartbeats: heartbeatsObject.heartbeats
             });
         }
     }
     // add heartbeats
     async add(heartbeatsObject) {
-        var _a;
         const canUseIndexedDB = await this._canUseIndexedDBPromise;
         if (!canUseIndexedDB) {
             return;
@@ -6416,7 +6620,8 @@ class HeartbeatStorageImpl {
         else {
             const existingHeartbeatsObject = await this.read();
             return writeHeartbeatsToIndexedDB(this.app, {
-                lastSentHeartbeatDate: (_a = heartbeatsObject.lastSentHeartbeatDate) !== null && _a !== void 0 ? _a : existingHeartbeatsObject.lastSentHeartbeatDate,
+                lastSentHeartbeatDate: heartbeatsObject.lastSentHeartbeatDate ??
+                    existingHeartbeatsObject.lastSentHeartbeatDate,
                 heartbeats: [
                     ...existingHeartbeatsObject.heartbeats,
                     ...heartbeatsObject.heartbeats
@@ -6436,6 +6641,24 @@ function countBytes(heartbeatsCache) {
     // heartbeatsCache wrapper properties
     JSON.stringify({ version: 2, heartbeats: heartbeatsCache })).length;
 }
+/**
+ * Returns the index of the heartbeat with the earliest date.
+ * If the heartbeats array is empty, -1 is returned.
+ */
+function getEarliestHeartbeatIdx(heartbeats) {
+    if (heartbeats.length === 0) {
+        return -1;
+    }
+    let earliestHeartbeatIdx = 0;
+    let earliestHeartbeatDate = heartbeats[0].date;
+    for (let i = 1; i < heartbeats.length; i++) {
+        if (heartbeats[i].date < earliestHeartbeatDate) {
+            earliestHeartbeatDate = heartbeats[i].date;
+            earliestHeartbeatIdx = i;
+        }
+    }
+    return earliestHeartbeatIdx;
+}
 
 /**
  * @license
@@ -6458,8 +6681,8 @@ function registerCoreComponents(variant) {
     _registerComponent(new Component('heartbeat', container => new HeartbeatServiceImpl(container), "PRIVATE" /* ComponentType.PRIVATE */));
     // Register `app` package.
     registerVersion(name$q, version$1$1, variant);
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name$q, version$1$1, 'esm2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name$q, version$1$1, 'esm2020');
     // Register platform SDK identifier (no version).
     registerVersion('fire-js', '');
 }
@@ -6473,7 +6696,7 @@ function registerCoreComponents(variant) {
 registerCoreComponents('');
 
 var name$4 = "firebase";
-var version$4 = "11.0.2";
+var version$4 = "12.5.0";
 
 /**
  * @license
@@ -6494,7 +6717,7 @@ var version$4 = "11.0.2";
 registerVersion(name$4, version$4, 'app');
 
 const name$3 = "@firebase/installations";
-const version$3 = "0.6.11";
+const version$3 = "0.6.19";
 
 /**
  * @license
@@ -6755,7 +6978,7 @@ function generateFid() {
         const fid = encode(fidByteArray);
         return VALID_FID_PATTERN.test(fid) ? fid : INVALID_FID;
     }
-    catch (_a) {
+    catch {
         // FID generation errored
         return INVALID_FID;
     }
@@ -7242,7 +7465,10 @@ function updateAuthTokenRequest(appConfig) {
         }
         const oldAuthToken = oldEntry.authToken;
         if (hasAuthTokenRequestTimedOut(oldAuthToken)) {
-            return Object.assign(Object.assign({}, oldEntry), { authToken: { requestStatus: 0 /* RequestStatus.NOT_STARTED */ } });
+            return {
+                ...oldEntry,
+                authToken: { requestStatus: 0 /* RequestStatus.NOT_STARTED */ }
+            };
         }
         return oldEntry;
     });
@@ -7250,7 +7476,10 @@ function updateAuthTokenRequest(appConfig) {
 async function fetchAuthTokenFromServer(installations, installationEntry) {
     try {
         const authToken = await generateAuthTokenRequest(installations, installationEntry);
-        const updatedInstallationEntry = Object.assign(Object.assign({}, installationEntry), { authToken });
+        const updatedInstallationEntry = {
+            ...installationEntry,
+            authToken
+        };
         await set$1(installations.appConfig, updatedInstallationEntry);
         return authToken;
     }
@@ -7262,7 +7491,10 @@ async function fetchAuthTokenFromServer(installations, installationEntry) {
             await remove$1(installations.appConfig);
         }
         else {
-            const updatedInstallationEntry = Object.assign(Object.assign({}, installationEntry), { authToken: { requestStatus: 0 /* RequestStatus.NOT_STARTED */ } });
+            const updatedInstallationEntry = {
+                ...installationEntry,
+                authToken: { requestStatus: 0 /* RequestStatus.NOT_STARTED */ }
+            };
             await set$1(installations.appConfig, updatedInstallationEntry);
         }
         throw e;
@@ -7287,7 +7519,10 @@ function makeAuthTokenRequestInProgressEntry(oldEntry) {
         requestStatus: 1 /* RequestStatus.IN_PROGRESS */,
         requestTime: Date.now()
     };
-    return Object.assign(Object.assign({}, oldEntry), { authToken: inProgressAuthToken });
+    return {
+        ...oldEntry,
+        authToken: inProgressAuthToken
+    };
 }
 function hasAuthTokenRequestTimedOut(authToken) {
     return (authToken.requestStatus === 1 /* RequestStatus.IN_PROGRESS */ &&
@@ -7472,8 +7707,8 @@ function registerInstallations() {
  */
 registerInstallations();
 registerVersion(name$3, version$3);
-// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-registerVersion(name$3, version$3, 'esm2017');
+// BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+registerVersion(name$3, version$3, 'esm2020');
 
 /**
  * @license
@@ -7633,7 +7868,7 @@ function insertScriptTag(dataLayerName, measurementId) {
     // without fid. We will initialize ga-id using gtag (config) command together with fid.
     const gtagScriptURL = `${GTAG_URL}?l=${dataLayerName}&id=${measurementId}`;
     script.src = trustedTypesPolicy
-        ? trustedTypesPolicy === null || trustedTypesPolicy === void 0 ? void 0 : trustedTypesPolicy.createScriptURL(gtagScriptURL)
+        ? trustedTypesPolicy?.createScriptURL(gtagScriptURL)
         : gtagScriptURL;
     script.async = true;
     document.head.appendChild(script);
@@ -7919,7 +8154,6 @@ function getHeaders(apiKey) {
  * @param app Firebase app to fetch config for.
  */
 async function fetchDynamicConfig(appFields) {
-    var _a;
     const { appId, apiKey } = appFields;
     const request = {
         method: 'GET',
@@ -7932,7 +8166,7 @@ async function fetchDynamicConfig(appFields) {
         try {
             // Try to get any error message text from server response.
             const jsonResponse = (await response.json());
-            if ((_a = jsonResponse.error) === null || _a === void 0 ? void 0 : _a.message) {
+            if (jsonResponse.error?.message) {
                 errorMessage = jsonResponse.error.message;
             }
         }
@@ -7983,7 +8217,6 @@ retryData = defaultRetryData, timeoutMillis) {
  */
 async function attemptFetchDynamicConfigWithRetry(appFields, { throttleEndTimeMillis, backoffCount }, signal, retryData = defaultRetryData // for testing
 ) {
-    var _a;
     const { appId, measurementId } = appFields;
     // Starts with a (potentially zero) timeout to support resumption from stored state.
     // Ensures the throttle end time is honored if the last attempt timed out.
@@ -7995,7 +8228,7 @@ async function attemptFetchDynamicConfigWithRetry(appFields, { throttleEndTimeMi
         if (measurementId) {
             logger$1.warn(`Timed out fetching this Firebase app's measurement ID from the server.` +
                 ` Falling back to the measurement ID ${measurementId}` +
-                ` provided in the "measurementId" field in the local Firebase config. [${e === null || e === void 0 ? void 0 : e.message}]`);
+                ` provided in the "measurementId" field in the local Firebase config. [${e?.message}]`);
             return { appId, measurementId };
         }
         throw e;
@@ -8013,14 +8246,14 @@ async function attemptFetchDynamicConfigWithRetry(appFields, { throttleEndTimeMi
             if (measurementId) {
                 logger$1.warn(`Failed to fetch this Firebase app's measurement ID from the server.` +
                     ` Falling back to the measurement ID ${measurementId}` +
-                    ` provided in the "measurementId" field in the local Firebase config. [${error === null || error === void 0 ? void 0 : error.message}]`);
+                    ` provided in the "measurementId" field in the local Firebase config. [${error?.message}]`);
                 return { appId, measurementId };
             }
             else {
                 throw e;
             }
         }
-        const backoffMillis = Number((_a = error === null || error === void 0 ? void 0 : error.customData) === null || _a === void 0 ? void 0 : _a.httpStatus) === 503
+        const backoffMillis = Number(error?.customData?.httpStatus) === 503
             ? calculateBackoffMillis(backoffCount, retryData.intervalMillis, LONG_RETRY_FACTOR)
             : calculateBackoffMillis(backoffCount, retryData.intervalMillis);
         // Increments backoff state.
@@ -8108,10 +8341,37 @@ async function logEvent$1(gtagFunction, initializationPromise, eventName, eventP
     }
     else {
         const measurementId = await initializationPromise;
-        const params = Object.assign(Object.assign({}, eventParams), { 'send_to': measurementId });
+        const params = {
+            ...eventParams,
+            'send_to': measurementId
+        };
         gtagFunction("event" /* GtagCommand.EVENT */, eventName, params);
     }
 }
+/**
+ * Set all other user properties other than user_id and screen_name.
+ *
+ * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
+ * @param properties Map of user properties to set
+ */
+async function setUserProperties$1(gtagFunction, initializationPromise, properties, options) {
+    if (options && options.global) {
+        const flatProperties = {};
+        for (const key of Object.keys(properties)) {
+            // use dot notation for merge behavior in gtag.js
+            flatProperties[`user_properties.${key}`] = properties[key];
+        }
+        gtagFunction("set" /* GtagCommand.SET */, flatProperties);
+        return Promise.resolve();
+    }
+    else {
+        const measurementId = await initializationPromise;
+        gtagFunction("config" /* GtagCommand.CONFIG */, measurementId, {
+            update: true,
+            'user_properties': properties
+        });
+    }
+}
 
 /**
  * @license
@@ -8142,7 +8402,7 @@ async function validateIndexedDB() {
         }
         catch (e) {
             logger$1.warn(ERROR_FACTORY.create("indexeddb-unavailable" /* AnalyticsError.INDEXEDDB_UNAVAILABLE */, {
-                errorInfo: e === null || e === void 0 ? void 0 : e.toString()
+                errorInfo: e?.toString()
             }).message);
             return false;
         }
@@ -8163,7 +8423,6 @@ async function validateIndexedDB() {
  * @returns Measurement ID.
  */
 async function _initializeAnalytics(app, dynamicConfigPromisesList, measurementIdToAppId, installations, gtagCore, dataLayerName, options) {
-    var _a;
     const dynamicConfigPromise = fetchDynamicConfigWithRetry(app);
     // Once fetched, map measurementIds to appId, for ease of lookup in wrapped gtag function.
     dynamicConfigPromise
@@ -8205,7 +8464,7 @@ async function _initializeAnalytics(app, dynamicConfigPromisesList, measurementI
     gtagCore('js', new Date());
     // User config added first. We don't want users to accidentally overwrite
     // base Firebase config properties.
-    const configProperties = (_a = options === null || options === void 0 ? void 0 : options.config) !== null && _a !== void 0 ? _a : {};
+    const configProperties = options?.config ?? {};
     // guard against developers accidentally setting properties with prefix `firebase_`
     configProperties[ORIGIN_KEY] = 'firebase';
     configProperties.update = true;
@@ -8393,6 +8652,15 @@ function initializeAnalytics(app, options = {}) {
     const analyticsInstance = analyticsProvider.initialize({ options });
     return analyticsInstance;
 }
+/**
+ * Use gtag `config` command to set all params specified.
+ *
+ * @public
+ */
+function setUserProperties(analyticsInstance, properties, options) {
+    analyticsInstance = getModularInstance(analyticsInstance);
+    setUserProperties$1(wrappedGtagFunction, initializationPromisesMap[analyticsInstance.app.options.appId], properties, options).catch(e => logger$1.error(e));
+}
 /**
  * Sends a Google Analytics event with given `eventParams`. This method
  * automatically associates this logged event with this Firebase web
@@ -8410,7 +8678,7 @@ function logEvent$2(analyticsInstance, eventName, eventParams, options) {
 }
 
 const name$2 = "@firebase/analytics";
-const version$2 = "0.10.10";
+const version$2 = "0.10.19";
 
 /**
  * The Firebase Analytics Web SDK.
@@ -8429,13 +8697,14 @@ function registerAnalytics() {
     }, "PUBLIC" /* ComponentType.PUBLIC */));
     _registerComponent(new Component('analytics-internal', internalFactory, "PRIVATE" /* ComponentType.PRIVATE */));
     registerVersion(name$2, version$2);
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name$2, version$2, 'esm2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name$2, version$2, 'esm2020');
     function internalFactory(container) {
         try {
             const analytics = container.getProvider(ANALYTICS_TYPE).getImmediate();
             return {
-                logEvent: (eventName, eventParams, options) => logEvent$2(analytics, eventName, eventParams, options)
+                logEvent: (eventName, eventParams, options) => logEvent$2(analytics, eventName, eventParams, options),
+                setUserProperties: (properties, options) => setUserProperties(analytics, properties, options)
             };
         }
         catch (e) {
@@ -8447,40 +8716,6 @@ function registerAnalytics() {
 }
 registerAnalytics();
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
-
-
-function __rest(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;
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 function _prodErrorMap() {
     // We will include this one message in the prod error map since by the very
     // nature of this error, developers will never be able to see the message
@@ -8552,7 +8787,10 @@ function _createError(authOrCode, ...rest) {
     return createErrorInternal(authOrCode, ...rest);
 }
 function _errorWithCustomMessage(auth, code, message) {
-    const errorMap = Object.assign(Object.assign({}, prodErrorMap()), { [code]: message });
+    const errorMap = {
+        ...prodErrorMap(),
+        [code]: message
+    };
     const factory = new ErrorFactory('auth', 'Firebase', errorMap);
     return factory.create(code, {
         appName: auth.name
@@ -8623,15 +8861,13 @@ function debugAssert(assertion, message) {
  * limitations under the License.
  */
 function _getCurrentUrl() {
-    var _a;
-    return (typeof self !== 'undefined' && ((_a = self.location) === null || _a === void 0 ? void 0 : _a.href)) || '';
+    return (typeof self !== 'undefined' && self.location?.href) || '';
 }
 function _isHttpOrHttps() {
     return _getCurrentScheme() === 'http:' || _getCurrentScheme() === 'https:';
 }
 function _getCurrentScheme() {
-    var _a;
-    return (typeof self !== 'undefined' && ((_a = self.location) === null || _a === void 0 ? void 0 : _a.protocol)) || null;
+    return (typeof self !== 'undefined' && self.location?.protocol) || null;
 }
 
 /**
@@ -8934,10 +9170,21 @@ const SERVER_ERROR_MAP = {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const CookieAuthProxiedEndpoints = [
+    "/v1/accounts:signInWithCustomToken" /* Endpoint.SIGN_IN_WITH_CUSTOM_TOKEN */,
+    "/v1/accounts:signInWithEmailLink" /* Endpoint.SIGN_IN_WITH_EMAIL_LINK */,
+    "/v1/accounts:signInWithIdp" /* Endpoint.SIGN_IN_WITH_IDP */,
+    "/v1/accounts:signInWithPassword" /* Endpoint.SIGN_IN_WITH_PASSWORD */,
+    "/v1/accounts:signInWithPhoneNumber" /* Endpoint.SIGN_IN_WITH_PHONE_NUMBER */,
+    "/v1/token" /* Endpoint.TOKEN */
+];
 const DEFAULT_API_TIMEOUT_MS = new Delay(30000, 60000);
 function _addTidIfNecessary(auth, request) {
     if (auth.tenantId && !request.tenantId) {
-        return Object.assign(Object.assign({}, request), { tenantId: auth.tenantId });
+        return {
+            ...request,
+            tenantId: auth.tenantId
+        };
     }
     return request;
 }
@@ -8955,14 +9202,20 @@ async function _performApiRequest(auth, method, path, request, customErrorMap =
                 };
             }
         }
-        const query = querystring(Object.assign({ key: auth.config.apiKey }, params)).slice(1);
+        const query = querystring({
+            key: auth.config.apiKey,
+            ...params
+        }).slice(1);
         const headers = await auth._getAdditionalHeaders();
         headers["Content-Type" /* HttpHeader.CONTENT_TYPE */] = 'application/json';
         if (auth.languageCode) {
             headers["X-Firebase-Locale" /* HttpHeader.X_FIREBASE_LOCALE */] = auth.languageCode;
         }
-        const fetchArgs = Object.assign({ method,
-            headers }, body);
+        const fetchArgs = {
+            method,
+            headers,
+            ...body
+        };
         /* Security-conscious server-side frameworks tend to have built in mitigations for referrer
            problems". See the Cloudflare GitHub issue #487: Error: The 'referrerPolicy' field on
            'RequestInitializerDict' is not implemented."
@@ -8970,12 +9223,15 @@ async function _performApiRequest(auth, method, path, request, customErrorMap =
         if (!isCloudflareWorker()) {
             fetchArgs.referrerPolicy = 'no-referrer';
         }
-        return FetchProvider.fetch()(_getFinalTarget(auth, auth.config.apiHost, path, query), fetchArgs);
+        if (auth.emulatorConfig && isCloudWorkstation(auth.emulatorConfig.host)) {
+            fetchArgs.credentials = 'include';
+        }
+        return FetchProvider.fetch()(await _getFinalTarget(auth, auth.config.apiHost, path, query), fetchArgs);
     });
 }
 async function _performFetchWithErrorHandling(auth, customErrorMap, fetchFn) {
     auth._canInitEmulator = false;
-    const errorMap = Object.assign(Object.assign({}, SERVER_ERROR_MAP), customErrorMap);
+    const errorMap = { ...SERVER_ERROR_MAP, ...customErrorMap };
     try {
         const networkTimeout = new NetworkTimeout(auth);
         const response = await Promise.race([
@@ -9035,12 +9291,25 @@ async function _performSignInRequest(auth, method, path, request, customErrorMap
     }
     return serverResponse;
 }
-function _getFinalTarget(auth, host, path, query) {
+async function _getFinalTarget(auth, host, path, query) {
     const base = `${host}${path}?${query}`;
-    if (!auth.config.emulator) {
-        return `${auth.config.apiScheme}://${base}`;
-    }
-    return _emulatorUrl(auth.config, base);
+    const authInternal = auth;
+    const finalTarget = authInternal.config.emulator
+        ? _emulatorUrl(auth.config, base)
+        : `${auth.config.apiScheme}://${base}`;
+    // Cookie auth works by MiTMing the signIn and token endpoints from the developer's backend,
+    // saving the idToken and refreshToken into cookies, and then redacting the refreshToken
+    // from the response
+    if (CookieAuthProxiedEndpoints.includes(path)) {
+        // Persistence manager is async, we need to await it. We can't just wait for auth initialized
+        // here since auth initialization calls this function.
+        await authInternal._persistenceManagerAvailable;
+        if (authInternal._getPersistenceType() === "COOKIE" /* PersistenceType.COOKIE */) {
+            const cookiePersistence = authInternal._getPersistence();
+            return cookiePersistence._getFinalTarget(finalTarget).toString();
+        }
+    }
+    return finalTarget;
 }
 class NetworkTimeout {
     clearNetworkTimeout() {
@@ -9150,7 +9419,7 @@ async function getIdTokenResult(user, forceRefresh = false) {
     const claims = _parseToken(token);
     _assert(claims && claims.exp && claims.auth_time && claims.iat, userInternal.auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
     const firebase = typeof claims.firebase === 'object' ? claims.firebase : undefined;
-    const signInProvider = firebase === null || firebase === void 0 ? void 0 : firebase['sign_in_provider'];
+    const signInProvider = firebase?.['sign_in_provider'];
     return {
         claims,
         token,
@@ -9158,7 +9427,7 @@ async function getIdTokenResult(user, forceRefresh = false) {
         issuedAtTime: utcTimestampToDateString(secondsStringToMilliseconds(claims.iat)),
         expirationTime: utcTimestampToDateString(secondsStringToMilliseconds(claims.exp)),
         signInProvider: signInProvider || null,
-        signInSecondFactor: (firebase === null || firebase === void 0 ? void 0 : firebase['sign_in_second_factor']) || null
+        signInSecondFactor: firebase?.['sign_in_second_factor'] || null
     };
 }
 function secondsStringToMilliseconds(seconds) {
@@ -9181,7 +9450,7 @@ function _parseToken(token) {
         return JSON.parse(decoded);
     }
     catch (e) {
-        _logError('Caught error parsing JWT payload as JSON', e === null || e === void 0 ? void 0 : e.toString());
+        _logError('Caught error parsing JWT payload as JSON', e?.toString());
         return null;
     }
 }
@@ -9277,7 +9546,6 @@ class ProactiveRefresh {
         }
     }
     getInterval(wasError) {
-        var _a;
         if (wasError) {
             const interval = this.errorBackoff;
             this.errorBackoff = Math.min(this.errorBackoff * 2, 960000 /* Duration.RETRY_BACKOFF_MAX */);
@@ -9286,7 +9554,7 @@ class ProactiveRefresh {
         else {
             // Reset the error backoff
             this.errorBackoff = 30000 /* Duration.RETRY_BACKOFF_MIN */;
-            const expTime = (_a = this.user.stsTokenManager.expirationTime) !== null && _a !== void 0 ? _a : 0;
+            const expTime = this.user.stsTokenManager.expirationTime ?? 0;
             const interval = expTime - Date.now() - 300000 /* Duration.OFFSET */;
             return Math.max(0, interval);
         }
@@ -9307,7 +9575,7 @@ class ProactiveRefresh {
         }
         catch (e) {
             // Only retry on network errors
-            if ((e === null || e === void 0 ? void 0 : e.code) ===
+            if (e?.code ===
                 `auth/${"network-request-failed" /* AuthErrorCode.NETWORK_REQUEST_FAILED */}`) {
                 this.schedule(/* wasError */ true);
             }
@@ -9373,14 +9641,13 @@ class UserMetadata {
  * limitations under the License.
  */
 async function _reloadWithoutSaving(user) {
-    var _a;
     const auth = user.auth;
     const idToken = await user.getIdToken();
     const response = await _logoutIfInvalidated(user, getAccountInfo(auth, { idToken }));
-    _assert(response === null || response === void 0 ? void 0 : response.users.length, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
+    _assert(response?.users.length, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
     const coreAccount = response.users[0];
     user._notifyReloadListener(coreAccount);
-    const newProviderData = ((_a = coreAccount.providerUserInfo) === null || _a === void 0 ? void 0 : _a.length)
+    const newProviderData = coreAccount.providerUserInfo?.length
         ? extractProviderData(coreAccount.providerUserInfo)
         : [];
     const providerData = mergeProviderData(user.providerData, newProviderData);
@@ -9390,7 +9657,7 @@ async function _reloadWithoutSaving(user) {
     // On the other hand, if it was not anonymous before, it should never be
     // considered anonymous now.
     const oldIsAnonymous = user.isAnonymous;
-    const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !(providerData === null || providerData === void 0 ? void 0 : providerData.length);
+    const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !providerData?.length;
     const isAnonymous = !oldIsAnonymous ? false : newIsAnonymous;
     const updates = {
         uid: coreAccount.localId,
@@ -9427,8 +9694,7 @@ function mergeProviderData(original, newData) {
     return [...deduped, ...newData];
 }
 function extractProviderData(providers) {
-    return providers.map((_a) => {
-        var { providerId } = _a, provider = __rest(_a, ["providerId"]);
+    return providers.map(({ providerId, ...provider }) => {
         return {
             providerId,
             uid: provider.rawId || '',
@@ -9463,14 +9729,19 @@ async function requestStsToken(auth, refreshToken) {
             'refresh_token': refreshToken
         }).slice(1);
         const { tokenApiHost, apiKey } = auth.config;
-        const url = _getFinalTarget(auth, tokenApiHost, "/v1/token" /* Endpoint.TOKEN */, `key=${apiKey}`);
+        const url = await _getFinalTarget(auth, tokenApiHost, "/v1/token" /* Endpoint.TOKEN */, `key=${apiKey}`);
         const headers = await auth._getAdditionalHeaders();
         headers["Content-Type" /* HttpHeader.CONTENT_TYPE */] = 'application/x-www-form-urlencoded';
-        return FetchProvider.fetch()(url, {
+        const options = {
             method: "POST" /* HttpMethod.POST */,
             headers,
             body
-        });
+        };
+        if (auth.emulatorConfig &&
+            isCloudWorkstation(auth.emulatorConfig.host)) {
+            options.credentials = 'include';
+        }
+        return FetchProvider.fetch()(url, options);
     });
     // The response comes back in snake_case. Convert to camel:
     return {
@@ -9615,8 +9886,7 @@ function assertStringOrUndefined(assertion, appName) {
     _assert(typeof assertion === 'string' || typeof assertion === 'undefined', "internal-error" /* AuthErrorCode.INTERNAL_ERROR */, { appName });
 }
 class UserImpl {
-    constructor(_a) {
-        var { uid, auth, stsTokenManager } = _a, opt = __rest(_a, ["uid", "auth", "stsTokenManager"]);
+    constructor({ uid, auth, stsTokenManager, ...opt }) {
         // For the user object, provider is always Firebase.
         this.providerId = "firebase" /* ProviderId.FIREBASE */;
         this.proactiveRefresh = new ProactiveRefresh(this);
@@ -9664,12 +9934,16 @@ class UserImpl {
         this.phoneNumber = user.phoneNumber;
         this.isAnonymous = user.isAnonymous;
         this.tenantId = user.tenantId;
-        this.providerData = user.providerData.map(userInfo => (Object.assign({}, userInfo)));
+        this.providerData = user.providerData.map(userInfo => ({ ...userInfo }));
         this.metadata._copy(user.metadata);
         this.stsTokenManager._assign(user.stsTokenManager);
     }
     _clone(auth) {
-        const newUser = new UserImpl(Object.assign(Object.assign({}, this), { auth, stsTokenManager: this.stsTokenManager._clone() }));
+        const newUser = new UserImpl({
+            ...this,
+            auth,
+            stsTokenManager: this.stsTokenManager._clone()
+        });
         newUser.metadata._copy(this.metadata);
         return newUser;
     }
@@ -9724,26 +9998,40 @@ class UserImpl {
         return this.auth.signOut();
     }
     toJSON() {
-        return Object.assign(Object.assign({ uid: this.uid, email: this.email || undefined, emailVerified: this.emailVerified, displayName: this.displayName || undefined, isAnonymous: this.isAnonymous, photoURL: this.photoURL || undefined, phoneNumber: this.phoneNumber || undefined, tenantId: this.tenantId || undefined, providerData: this.providerData.map(userInfo => (Object.assign({}, userInfo))), stsTokenManager: this.stsTokenManager.toJSON(), 
+        return {
+            uid: this.uid,
+            email: this.email || undefined,
+            emailVerified: this.emailVerified,
+            displayName: this.displayName || undefined,
+            isAnonymous: this.isAnonymous,
+            photoURL: this.photoURL || undefined,
+            phoneNumber: this.phoneNumber || undefined,
+            tenantId: this.tenantId || undefined,
+            providerData: this.providerData.map(userInfo => ({ ...userInfo })),
+            stsTokenManager: this.stsTokenManager.toJSON(),
             // Redirect event ID must be maintained in case there is a pending
             // redirect event.
-            _redirectEventId: this._redirectEventId }, this.metadata.toJSON()), { 
+            _redirectEventId: this._redirectEventId,
+            ...this.metadata.toJSON(),
             // Required for compatibility with the legacy SDK (go/firebase-auth-sdk-persistence-parsing):
-            apiKey: this.auth.config.apiKey, appName: this.auth.name });
+            apiKey: this.auth.config.apiKey,
+            appName: this.auth.name
+            // Missing authDomain will be tolerated by the legacy SDK.
+            // stsTokenManager.apiKey isn't actually required (despite the legacy SDK persisting it).
+        };
     }
     get refreshToken() {
         return this.stsTokenManager.refreshToken || '';
     }
     static _fromJSON(auth, object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const displayName = (_a = object.displayName) !== null && _a !== void 0 ? _a : undefined;
-        const email = (_b = object.email) !== null && _b !== void 0 ? _b : undefined;
-        const phoneNumber = (_c = object.phoneNumber) !== null && _c !== void 0 ? _c : undefined;
-        const photoURL = (_d = object.photoURL) !== null && _d !== void 0 ? _d : undefined;
-        const tenantId = (_e = object.tenantId) !== null && _e !== void 0 ? _e : undefined;
-        const _redirectEventId = (_f = object._redirectEventId) !== null && _f !== void 0 ? _f : undefined;
-        const createdAt = (_g = object.createdAt) !== null && _g !== void 0 ? _g : undefined;
-        const lastLoginAt = (_h = object.lastLoginAt) !== null && _h !== void 0 ? _h : undefined;
+        const displayName = object.displayName ?? undefined;
+        const email = object.email ?? undefined;
+        const phoneNumber = object.phoneNumber ?? undefined;
+        const photoURL = object.photoURL ?? undefined;
+        const tenantId = object.tenantId ?? undefined;
+        const _redirectEventId = object._redirectEventId ?? undefined;
+        const createdAt = object.createdAt ?? undefined;
+        const lastLoginAt = object.lastLoginAt ?? undefined;
         const { uid, emailVerified, isAnonymous, providerData, stsTokenManager: plainObjectTokenManager } = object;
         _assert(uid && plainObjectTokenManager, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
         const stsTokenManager = StsTokenManager.fromJSON(this.name, plainObjectTokenManager);
@@ -9773,7 +10061,7 @@ class UserImpl {
             lastLoginAt
         });
         if (providerData && Array.isArray(providerData)) {
-            user.providerData = providerData.map(userInfo => (Object.assign({}, userInfo)));
+            user.providerData = providerData.map(userInfo => ({ ...userInfo }));
         }
         if (_redirectEventId) {
             user._redirectEventId = _redirectEventId;
@@ -9810,7 +10098,7 @@ class UserImpl {
         const providerData = coreAccount.providerUserInfo !== undefined
             ? extractProviderData(coreAccount.providerUserInfo)
             : [];
-        const isAnonymous = !(coreAccount.email && coreAccount.passwordHash) && !(providerData === null || providerData === void 0 ? void 0 : providerData.length);
+        const isAnonymous = !(coreAccount.email && coreAccount.passwordHash) && !providerData?.length;
         const stsTokenManager = new StsTokenManager();
         stsTokenManager.updateFromIdToken(idToken);
         // Initialize the Firebase Auth user.
@@ -9832,7 +10120,7 @@ class UserImpl {
             providerData,
             metadata: new UserMetadata(coreAccount.createdAt, coreAccount.lastLoginAt),
             isAnonymous: !(coreAccount.email && coreAccount.passwordHash) &&
-                !(providerData === null || providerData === void 0 ? void 0 : providerData.length)
+                !providerData?.length
         };
         Object.assign(user, updates);
         return user;
@@ -9954,7 +10242,17 @@ class PersistenceUserManager {
     }
     async getCurrentUser() {
         const blob = await this.persistence._get(this.fullUserKey);
-        return blob ? UserImpl._fromJSON(this.auth, blob) : null;
+        if (!blob) {
+            return null;
+        }
+        if (typeof blob === 'string') {
+            const response = await getAccountInfo(this.auth, { idToken: blob }).catch(() => undefined);
+            if (!response) {
+                return null;
+            }
+            return UserImpl._fromGetAccountInfoResponse(this.auth, response, blob);
+        }
+        return UserImpl._fromJSON(this.auth, blob);
     }
     removeCurrentUser() {
         return this.persistence._remove(this.fullUserKey);
@@ -10001,7 +10299,19 @@ class PersistenceUserManager {
             try {
                 const blob = await persistence._get(key);
                 if (blob) {
-                    const user = UserImpl._fromJSON(auth, blob); // throws for unparsable blob (wrong format)
+                    let user;
+                    if (typeof blob === 'string') {
+                        const response = await getAccountInfo(auth, {
+                            idToken: blob
+                        }).catch(() => undefined);
+                        if (!response) {
+                            break;
+                        }
+                        user = await UserImpl._fromGetAccountInfoResponse(auth, response, blob);
+                    }
+                    else {
+                        user = UserImpl._fromJSON(auth, blob); // throws for unparsable blob (wrong format)
+                    }
                     if (persistence !== selectedPersistence) {
                         userToMigrate = user;
                     }
@@ -10009,7 +10319,7 @@ class PersistenceUserManager {
                     break;
                 }
             }
-            catch (_a) { }
+            catch { }
         }
         // If we find the user in a persistence that does support migration, use
         // that migration path (of only persistences that support migration)
@@ -10032,7 +10342,7 @@ class PersistenceUserManager {
                 try {
                     await persistence._remove(key);
                 }
-                catch (_a) { }
+                catch { }
             }
         }));
         return new PersistenceUserManager(selectedPersistence, auth, userKey);
@@ -10102,7 +10412,7 @@ function _getBrowserName(userAgent) {
         // Most modern browsers have name/version at end of user agent string.
         const re = /([a-zA-Z\d\.]+)\/[a-zA-Z\d\.]*$/;
         const matches = userAgent.match(re);
-        if ((matches === null || matches === void 0 ? void 0 : matches.length) === 2) {
+        if (matches?.length === 2) {
             return matches[1];
         }
     }
@@ -10138,8 +10448,7 @@ function _isIOS(ua = getUA()) {
         (/macintosh/i.test(ua) && /mobile/i.test(ua)));
 }
 function _isIOSStandalone(ua = getUA()) {
-    var _a;
-    return _isIOS(ua) && !!((_a = window.navigator) === null || _a === void 0 ? void 0 : _a.standalone);
+    return _isIOS(ua) && !!window.navigator?.standalone;
 }
 function _isIE10() {
     return isIE() && document.documentMode === 10;
@@ -10270,7 +10579,7 @@ class AuthMiddlewareQueue {
                 }
             }
             throw this.auth._errorFactory.create("login-blocked" /* AuthErrorCode.LOGIN_BLOCKED */, {
-                originalMessage: e === null || e === void 0 ? void 0 : e.message
+                originalMessage: e?.message
             });
         }
     }
@@ -10328,13 +10637,12 @@ const MINIMUM_MIN_PASSWORD_LENGTH = 6;
  */
 class PasswordPolicyImpl {
     constructor(response) {
-        var _a, _b, _c, _d;
         // Only include custom strength options defined in the response.
         const responseOptions = response.customStrengthOptions;
         this.customStrengthOptions = {};
         // TODO: Remove once the backend is updated to include the minimum min password length instead of undefined when there is no minimum length set.
         this.customStrengthOptions.minPasswordLength =
-            (_a = responseOptions.minPasswordLength) !== null && _a !== void 0 ? _a : MINIMUM_MIN_PASSWORD_LENGTH;
+            responseOptions.minPasswordLength ?? MINIMUM_MIN_PASSWORD_LENGTH;
         if (responseOptions.maxPasswordLength) {
             this.customStrengthOptions.maxPasswordLength =
                 responseOptions.maxPasswordLength;
@@ -10361,12 +10669,11 @@ class PasswordPolicyImpl {
         }
         // Use an empty string if no non-alphanumeric characters are specified in the response.
         this.allowedNonAlphanumericCharacters =
-            (_c = (_b = response.allowedNonAlphanumericCharacters) === null || _b === void 0 ? void 0 : _b.join('')) !== null && _c !== void 0 ? _c : '';
-        this.forceUpgradeOnSignin = (_d = response.forceUpgradeOnSignin) !== null && _d !== void 0 ? _d : false;
+            response.allowedNonAlphanumericCharacters?.join('') ?? '';
+        this.forceUpgradeOnSignin = response.forceUpgradeOnSignin ?? false;
         this.schemaVersion = response.schemaVersion;
     }
     validatePassword(password) {
-        var _a, _b, _c, _d, _e, _f;
         const status = {
             isValid: true,
             passwordPolicy: this
@@ -10375,12 +10682,12 @@ class PasswordPolicyImpl {
         this.validatePasswordLengthOptions(password, status);
         this.validatePasswordCharacterOptions(password, status);
         // Combine the status into single isValid property.
-        status.isValid && (status.isValid = (_a = status.meetsMinPasswordLength) !== null && _a !== void 0 ? _a : true);
-        status.isValid && (status.isValid = (_b = status.meetsMaxPasswordLength) !== null && _b !== void 0 ? _b : true);
-        status.isValid && (status.isValid = (_c = status.containsLowercaseLetter) !== null && _c !== void 0 ? _c : true);
-        status.isValid && (status.isValid = (_d = status.containsUppercaseLetter) !== null && _d !== void 0 ? _d : true);
-        status.isValid && (status.isValid = (_e = status.containsNumericCharacter) !== null && _e !== void 0 ? _e : true);
-        status.isValid && (status.isValid = (_f = status.containsNonAlphanumericCharacter) !== null && _f !== void 0 ? _f : true);
+        status.isValid && (status.isValid = status.meetsMinPasswordLength ?? true);
+        status.isValid && (status.isValid = status.meetsMaxPasswordLength ?? true);
+        status.isValid && (status.isValid = status.containsLowercaseLetter ?? true);
+        status.isValid && (status.isValid = status.containsUppercaseLetter ?? true);
+        status.isValid && (status.isValid = status.containsNumericCharacter ?? true);
+        status.isValid && (status.isValid = status.containsNonAlphanumericCharacter ?? true);
         return status;
     }
     /**
@@ -10495,6 +10802,7 @@ class AuthImpl {
         this._tenantRecaptchaConfigs = {};
         this._projectPasswordPolicy = null;
         this._tenantPasswordPolicies = {};
+        this._resolvePersistenceManagerAvailable = undefined;
         // Tracks the last notified UID for state change listeners to prevent
         // repeated calls to the callbacks. Undefined means it's never been
         // called, whereas null means it's been called with a signed out user
@@ -10505,6 +10813,9 @@ class AuthImpl {
         this.frameworks = [];
         this.name = app.name;
         this.clientVersion = config.sdkClientVersion;
+        // TODO(jamesdaniels) explore less hacky way to do this, cookie authentication needs
+        // persistenceMananger to be available. see _getFinalTarget for more context
+        this._persistenceManagerAvailable = new Promise(resolve => (this._resolvePersistenceManagerAvailable = resolve));
     }
     _initializeWithPersistence(persistenceHierarchy, popupRedirectResolver) {
         if (popupRedirectResolver) {
@@ -10513,17 +10824,17 @@ class AuthImpl {
         // Have to check for app deletion throughout initialization (after each
         // promise resolution)
         this._initializationPromise = this.queue(async () => {
-            var _a, _b;
             if (this._deleted) {
                 return;
             }
             this.persistenceManager = await PersistenceUserManager.create(this, persistenceHierarchy);
+            this._resolvePersistenceManagerAvailable?.();
             if (this._deleted) {
                 return;
             }
             // Initialize the resolver early if necessary (only applicable to web:
             // this will cause the iframe to load immediately in certain cases)
-            if ((_a = this._popupRedirectResolver) === null || _a === void 0 ? void 0 : _a._shouldInitProactively) {
+            if (this._popupRedirectResolver?._shouldInitProactively) {
                 // If this fails, don't halt auth loading
                 try {
                     await this._popupRedirectResolver._initialize(this);
@@ -10533,7 +10844,7 @@ class AuthImpl {
                 }
             }
             await this.initializeCurrentUser(popupRedirectResolver);
-            this.lastNotifiedUid = ((_b = this.currentUser) === null || _b === void 0 ? void 0 : _b.uid) || null;
+            this.lastNotifiedUid = this.currentUser?.uid || null;
             if (this._deleted) {
                 return;
             }
@@ -10578,7 +10889,6 @@ class AuthImpl {
         }
     }
     async initializeCurrentUser(popupRedirectResolver) {
-        var _a;
         if (_isFirebaseServerApp(this.app)) {
             const idToken = this.app.settings.authIdToken;
             if (idToken) {
@@ -10598,15 +10908,15 @@ class AuthImpl {
         let needsTocheckMiddleware = false;
         if (popupRedirectResolver && this.config.authDomain) {
             await this.getOrInitRedirectPersistenceManager();
-            const redirectUserEventId = (_a = this.redirectUser) === null || _a === void 0 ? void 0 : _a._redirectEventId;
-            const storedUserEventId = futureCurrentUser === null || futureCurrentUser === void 0 ? void 0 : futureCurrentUser._redirectEventId;
+            const redirectUserEventId = this.redirectUser?._redirectEventId;
+            const storedUserEventId = futureCurrentUser?._redirectEventId;
             const result = await this.tryRedirectSignIn(popupRedirectResolver);
             // If the stored user (i.e. the old "currentUser") has a redirectId that
             // matches the redirect user, then we want to initially sign in with the
             // new user object from result.
             // TODO(samgho): More thoroughly test all of this
             if ((!redirectUserEventId || redirectUserEventId === storedUserEventId) &&
-                (result === null || result === void 0 ? void 0 : result.user)) {
+                result?.user) {
                 futureCurrentUser = result.user;
                 needsTocheckMiddleware = true;
             }
@@ -10681,7 +10991,7 @@ class AuthImpl {
             await _reloadWithoutSaving(user);
         }
         catch (e) {
-            if ((e === null || e === void 0 ? void 0 : e.code) !==
+            if (e?.code !==
                 `auth/${"network-request-failed" /* AuthErrorCode.NETWORK_REQUEST_FAILED */}`) {
                 // Something's wrong with the user's token. Log them out and remove
                 // them from storage
@@ -10787,9 +11097,12 @@ class AuthImpl {
             this._tenantPasswordPolicies[this.tenantId] = passwordPolicy;
         }
     }
-    _getPersistence() {
+    _getPersistenceType() {
         return this.assertedPersistence.persistence.type;
     }
+    _getPersistence() {
+        return this.assertedPersistence.persistence;
+    }
     _updateErrorMap(errorMap) {
         this._errorFactory = new ErrorFactory('auth', 'Firebase', errorMap());
     }
@@ -10835,12 +11148,11 @@ class AuthImpl {
         }
     }
     toJSON() {
-        var _a;
         return {
             apiKey: this.config.apiKey,
             authDomain: this.config.authDomain,
             appName: this.name,
-            currentUser: (_a = this._currentUser) === null || _a === void 0 ? void 0 : _a.toJSON()
+            currentUser: this._currentUser?.toJSON()
         };
     }
     async _setRedirectUser(user, popupRedirectResolver) {
@@ -10861,16 +11173,15 @@ class AuthImpl {
         return this.redirectPersistenceManager;
     }
     async _redirectUserForId(id) {
-        var _a, _b;
         // Make sure we've cleared any pending persistence actions if we're not in
         // the initializer
         if (this._isInitialized) {
             await this.queue(async () => { });
         }
-        if (((_a = this._currentUser) === null || _a === void 0 ? void 0 : _a._redirectEventId) === id) {
+        if (this._currentUser?._redirectEventId === id) {
             return this._currentUser;
         }
-        if (((_b = this.redirectUser) === null || _b === void 0 ? void 0 : _b._redirectEventId) === id) {
+        if (this.redirectUser?._redirectEventId === id) {
             return this.redirectUser;
         }
         return null;
@@ -10906,12 +11217,11 @@ class AuthImpl {
         return this.currentUser;
     }
     notifyAuthListeners() {
-        var _a, _b;
         if (!this._isInitialized) {
             return;
         }
         this.idTokenSubscription.next(this.currentUser);
-        const currentUid = (_b = (_a = this.currentUser) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null;
+        const currentUid = this.currentUser?.uid ?? null;
         if (this.lastNotifiedUid !== currentUid) {
             this.lastNotifiedUid = currentUid;
             this.authStateSubscription.next(this.currentUser);
@@ -10996,7 +11306,6 @@ class AuthImpl {
         return this.frameworks;
     }
     async _getAdditionalHeaders() {
-        var _a;
         // Additional headers on every request
         const headers = {
             ["X-Client-Version" /* HttpHeader.X_CLIENT_VERSION */]: this.clientVersion
@@ -11005,10 +11314,11 @@ class AuthImpl {
             headers["X-Firebase-gmpid" /* HttpHeader.X_FIREBASE_GMPID */] = this.app.options.appId;
         }
         // If the heartbeat service exists, add the heartbeat string
-        const heartbeatsHeader = await ((_a = this.heartbeatServiceProvider
+        const heartbeatsHeader = await this.heartbeatServiceProvider
             .getImmediate({
             optional: true
-        })) === null || _a === void 0 ? void 0 : _a.getHeartbeatsHeader());
+        })
+            ?.getHeartbeatsHeader();
         if (heartbeatsHeader) {
             headers["X-Firebase-Client" /* HttpHeader.X_FIREBASE_CLIENT */] = heartbeatsHeader;
         }
@@ -11020,17 +11330,20 @@ class AuthImpl {
         return headers;
     }
     async _getAppCheckToken() {
-        var _a;
-        const appCheckTokenResult = await ((_a = this.appCheckServiceProvider
-            .getImmediate({ optional: true })) === null || _a === void 0 ? void 0 : _a.getToken());
-        if (appCheckTokenResult === null || appCheckTokenResult === void 0 ? void 0 : appCheckTokenResult.error) {
+        if (_isFirebaseServerApp(this.app) && this.app.settings.appCheckToken) {
+            return this.app.settings.appCheckToken;
+        }
+        const appCheckTokenResult = await this.appCheckServiceProvider
+            .getImmediate({ optional: true })
+            ?.getToken();
+        if (appCheckTokenResult?.error) {
             // Context: appCheck.getToken() will never throw even if an error happened.
             // In the error case, a dummy token will be returned along with an error field describing
             // the error. In general, we shouldn't care about the error condition and just use
             // the token (actual or dummy) to send requests.
             _logWarn(`Error while retrieving App Check token: ${appCheckTokenResult.error}`);
         }
-        return appCheckTokenResult === null || appCheckTokenResult === void 0 ? void 0 : appCheckTokenResult.token;
+        return appCheckTokenResult?.token;
     }
 }
 /**
@@ -11138,7 +11451,7 @@ function initializeAuth(app, deps) {
     if (provider.isInitialized()) {
         const auth = provider.getImmediate();
         const initialOptions = provider.getOptions();
-        if (deepEqual(initialOptions, deps !== null && deps !== void 0 ? deps : {})) {
+        if (deepEqual(initialOptions, deps ?? {})) {
             return auth;
         }
         else {
@@ -11149,15 +11462,15 @@ function initializeAuth(app, deps) {
     return auth;
 }
 function _initializeAuthInstance(auth, deps) {
-    const persistence = (deps === null || deps === void 0 ? void 0 : deps.persistence) || [];
+    const persistence = deps?.persistence || [];
     const hierarchy = (Array.isArray(persistence) ? persistence : [persistence]).map(_getInstance);
-    if (deps === null || deps === void 0 ? void 0 : deps.errorMap) {
+    if (deps?.errorMap) {
         auth._updateErrorMap(deps.errorMap);
     }
     // This promise is intended to float; auth initialization happens in the
     // background, meanwhile the auth object may be used by the app.
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    auth._initializeWithPersistence(hierarchy, deps === null || deps === void 0 ? void 0 : deps.popupRedirectResolver);
+    auth._initializeWithPersistence(hierarchy, deps?.popupRedirectResolver);
 }
 
 /**
@@ -11184,22 +11497,41 @@ function _initializeAuthInstance(auth, deps) {
  */
 function connectAuthEmulator(auth, url, options) {
     const authInternal = _castAuth(auth);
-    _assert(authInternal._canInitEmulator, authInternal, "emulator-config-failed" /* AuthErrorCode.EMULATOR_CONFIG_FAILED */);
     _assert(/^https?:\/\//.test(url), authInternal, "invalid-emulator-scheme" /* AuthErrorCode.INVALID_EMULATOR_SCHEME */);
-    const disableWarnings = !!(void 0 );
+    const disableWarnings = !!options?.disableWarnings;
     const protocol = extractProtocol(url);
     const { host, port } = extractHostAndPort(url);
     const portStr = port === null ? '' : `:${port}`;
     // Always replace path with "/" (even if input url had no path at all, or had a different one).
-    authInternal.config.emulator = { url: `${protocol}//${host}${portStr}/` };
-    authInternal.settings.appVerificationDisabledForTesting = true;
-    authInternal.emulatorConfig = Object.freeze({
+    const emulator = { url: `${protocol}//${host}${portStr}/` };
+    const emulatorConfig = Object.freeze({
         host,
         port,
         protocol: protocol.replace(':', ''),
         options: Object.freeze({ disableWarnings })
     });
-    {
+    // There are a few scenarios to guard against if the Auth instance has already started:
+    if (!authInternal._canInitEmulator) {
+        // Applications may not initialize the emulator for the first time if Auth has already started
+        // to make network requests.
+        _assert(authInternal.config.emulator && authInternal.emulatorConfig, authInternal, "emulator-config-failed" /* AuthErrorCode.EMULATOR_CONFIG_FAILED */);
+        // Applications may not alter the configuration of the emulator (aka pass a different config)
+        // once Auth has started to make network requests.
+        _assert(deepEqual(emulator, authInternal.config.emulator) &&
+            deepEqual(emulatorConfig, authInternal.emulatorConfig), authInternal, "emulator-config-failed" /* AuthErrorCode.EMULATOR_CONFIG_FAILED */);
+        // It's valid, however, to invoke connectAuthEmulator() after Auth has started making
+        // connections, so long as the config matches the existing config. This results in a no-op.
+        return;
+    }
+    authInternal.config.emulator = emulator;
+    authInternal.emulatorConfig = emulatorConfig;
+    authInternal.settings.appVerificationDisabledForTesting = true;
+    // Workaround to get cookies in Firebase Studio
+    if (isCloudWorkstation(host)) {
+        void pingServer(`${protocol}//${host}${portStr}`);
+        updateEmulatorBanner('Auth', true);
+    }
+    else {
         emitEmulatorWarning();
     }
 }
@@ -11438,7 +11770,7 @@ class OAuthCredential extends AuthCredential {
      */
     static fromJSON(json) {
         const obj = typeof json === 'string' ? JSON.parse(json) : json;
-        const { providerId, signInMethod } = obj, rest = __rest(obj, ["providerId", "signInMethod"]);
+        const { providerId, signInMethod, ...rest } = obj;
         if (!providerId || !signInMethod) {
             return null;
         }
@@ -11715,7 +12047,7 @@ class FacebookAuthProvider extends BaseOAuthProvider {
         try {
             return FacebookAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -11837,7 +12169,7 @@ class GoogleAuthProvider extends BaseOAuthProvider {
         try {
             return GoogleAuthProvider.credential(oauthIdToken, oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -11948,7 +12280,7 @@ class GithubAuthProvider extends BaseOAuthProvider {
         try {
             return GithubAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -12059,7 +12391,7 @@ class TwitterAuthProvider extends BaseOAuthProvider {
         try {
             return TwitterAuthProvider.credential(oauthAccessToken, oauthTokenSecret);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -12142,7 +12474,6 @@ function providerIdForResponse(response) {
  */
 class MultiFactorError extends FirebaseError {
     constructor(auth, error, operationType, user) {
-        var _a;
         super(error.code, error.message);
         this.operationType = operationType;
         this.user = user;
@@ -12150,7 +12481,7 @@ class MultiFactorError extends FirebaseError {
         Object.setPrototypeOf(this, MultiFactorError.prototype);
         this.customData = {
             appName: auth.name,
-            tenantId: (_a = auth.tenantId) !== null && _a !== void 0 ? _a : undefined,
+            tenantId: auth.tenantId ?? undefined,
             _serverResponse: error.customData._serverResponse,
             operationType
         };
@@ -12208,7 +12539,7 @@ async function _reauthenticate(user, credential, bypassAuthState = false) {
     }
     catch (e) {
         // Convert user deleted error into user mismatch
-        if ((e === null || e === void 0 ? void 0 : e.code) === `auth/${"user-not-found" /* AuthErrorCode.USER_DELETED */}`) {
+        if (e?.code === `auth/${"user-not-found" /* AuthErrorCode.USER_DELETED */}`) {
             _fail(auth, "user-mismatch" /* AuthErrorCode.USER_MISMATCH */);
         }
         throw e;
@@ -12398,7 +12729,7 @@ class BrowserPersistenceClass {
             this.storage.removeItem(STORAGE_AVAILABLE_KEY);
             return Promise.resolve(true);
         }
-        catch (_a) {
+        catch {
             return Promise.resolve(false);
         }
     }
@@ -12739,7 +13070,7 @@ class Receiver {
         const messageEvent = event;
         const { eventId, eventType, data } = messageEvent.data;
         const handlers = this.handlersMap[eventType];
-        if (!(handlers === null || handlers === void 0 ? void 0 : handlers.size)) {
+        if (!handlers?.size) {
             return;
         }
         messageEvent.ports[0].postMessage({
@@ -12975,20 +13306,19 @@ function _isWorker() {
         typeof _window()['importScripts'] === 'function');
 }
 async function _getActiveServiceWorker() {
-    if (!(navigator === null || navigator === void 0 ? void 0 : navigator.serviceWorker)) {
+    if (!navigator?.serviceWorker) {
         return null;
     }
     try {
         const registration = await navigator.serviceWorker.ready;
         return registration.active;
     }
-    catch (_a) {
+    catch {
         return null;
     }
 }
 function _getServiceWorkerController() {
-    var _a;
-    return ((_a = navigator === null || navigator === void 0 ? void 0 : navigator.serviceWorker) === null || _a === void 0 ? void 0 : _a.controller) || null;
+    return navigator?.serviceWorker?.controller || null;
 }
 function _getWorkerGlobalScope() {
     return _isWorker() ? self : null;
@@ -13171,7 +13501,6 @@ class IndexedDBLocalPersistence {
      * may not resolve.
      */
     async initializeSender() {
-        var _a, _b;
         // Check to see if there's an active service worker.
         this.activeServiceWorker = await _getActiveServiceWorker();
         if (!this.activeServiceWorker) {
@@ -13183,8 +13512,8 @@ class IndexedDBLocalPersistence {
         if (!results) {
             return;
         }
-        if (((_a = results[0]) === null || _a === void 0 ? void 0 : _a.fulfilled) &&
-            ((_b = results[0]) === null || _b === void 0 ? void 0 : _b.value.includes("keyChanged" /* _EventType.KEY_CHANGED */))) {
+        if (results[0]?.fulfilled &&
+            results[0]?.value.includes("keyChanged" /* _EventType.KEY_CHANGED */)) {
             this.serviceWorkerReceiverAvailable = true;
         }
     }
@@ -13210,7 +13539,7 @@ class IndexedDBLocalPersistence {
                 ? 800 /* _TimeoutDuration.LONG_ACK */
                 : 50 /* _TimeoutDuration.ACK */);
         }
-        catch (_a) {
+        catch {
             // This is a best effort approach. Ignore errors.
         }
     }
@@ -13224,7 +13553,7 @@ class IndexedDBLocalPersistence {
             await _deleteObject(db, STORAGE_AVAILABLE_KEY);
             return true;
         }
-        catch (_a) { }
+        catch { }
         return false;
     }
     async _withPendingWrite(write) {
@@ -13594,8 +13923,7 @@ class PopupOperation extends AbstractPopupRedirectOperation {
         this.pollUserCancellation();
     }
     get eventId() {
-        var _a;
-        return ((_a = this.authWindow) === null || _a === void 0 ? void 0 : _a.associatedEvent) || null;
+        return this.authWindow?.associatedEvent || null;
     }
     cancel() {
         this.reject(_createError(this.auth, "cancelled-popup-request" /* AuthErrorCode.EXPIRED_POPUP_REQUEST */));
@@ -13613,8 +13941,7 @@ class PopupOperation extends AbstractPopupRedirectOperation {
     }
     pollUserCancellation() {
         const poll = () => {
-            var _a, _b;
-            if ((_b = (_a = this.authWindow) === null || _a === void 0 ? void 0 : _a.window) === null || _b === void 0 ? void 0 : _b.closed) {
+            if (this.authWindow?.window?.closed) {
                 // Make sure that there is sufficient time for whatever action to
                 // complete. The window could have closed but the sign in network
                 // call could still be in flight. This is specifically true for
@@ -13814,9 +14141,8 @@ class AuthEventManager {
         return handled;
     }
     sendToConsumer(event, consumer) {
-        var _a;
         if (event.error && !isNullRedirectEvent(event)) {
-            const code = ((_a = event.error.code) === null || _a === void 0 ? void 0 : _a.split('auth/')[1]) ||
+            const code = event.error.code?.split('auth/')[1] ||
                 "internal-error" /* AuthErrorCode.INTERNAL_ERROR */;
             consumer.onError(_createError(this.auth, code));
         }
@@ -13846,7 +14172,7 @@ function eventUid(e) {
 }
 function isNullRedirectEvent({ type, error }) {
     return (type === "unknown" /* AuthEventType.UNKNOWN */ &&
-        (error === null || error === void 0 ? void 0 : error.code) === `auth/${"no-auth-event" /* AuthErrorCode.NO_AUTH_EVENT */}`);
+        error?.code === `auth/${"no-auth-event" /* AuthErrorCode.NO_AUTH_EVENT */}`);
 }
 function isRedirectEvent(event) {
     switch (event.type) {
@@ -13911,7 +14237,7 @@ async function _validateOrigin(auth) {
                 return;
             }
         }
-        catch (_a) {
+        catch {
             // Do nothing if there's a URL error; just continue searching
         }
     }
@@ -13974,7 +14300,7 @@ function resetUnloadedGapiModules() {
     // Get gapix.beacon context.
     const beacon = _window().___jsl;
     // Get current hint.
-    if (beacon === null || beacon === void 0 ? void 0 : beacon.H) {
+    if (beacon?.H) {
         // Get gapi hint.
         for (const hint of Object.keys(beacon.H)) {
             // Requested modules.
@@ -13995,7 +14321,6 @@ function resetUnloadedGapiModules() {
 }
 function loadGapi(auth) {
     return new Promise((resolve, reject) => {
-        var _a, _b, _c;
         // Function to run when gapi.load is ready.
         function loadGapiIframe() {
             // The developer may have tried to previously run gapi.load and failed.
@@ -14018,11 +14343,11 @@ function loadGapi(auth) {
                 timeout: NETWORK_TIMEOUT.get()
             });
         }
-        if ((_b = (_a = _window().gapi) === null || _a === void 0 ? void 0 : _a.iframes) === null || _b === void 0 ? void 0 : _b.Iframe) {
+        if (_window().gapi?.iframes?.Iframe) {
             // If gapi.iframes.Iframe available, resolve.
             resolve(gapi.iframes.getContext());
         }
-        else if (!!((_c = _window().gapi) === null || _c === void 0 ? void 0 : _c.load)) {
+        else if (!!_window().gapi?.load) {
             // Gapi loader ready, load gapi.iframes.
             loadGapiIframe();
         }
@@ -14195,8 +14520,13 @@ function _open(auth, url, name, width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT)
     const top = Math.max((window.screen.availHeight - height) / 2, 0).toString();
     const left = Math.max((window.screen.availWidth - width) / 2, 0).toString();
     let target = '';
-    const options = Object.assign(Object.assign({}, BASE_POPUP_OPTIONS), { width: width.toString(), height: height.toString(), top,
-        left });
+    const options = {
+        ...BASE_POPUP_OPTIONS,
+        width: width.toString(),
+        height: height.toString(),
+        top,
+        left
+    };
     // Chrome iOS 7 and 8 is returning an undefined popup win when target is
     // specified, even though the popup is not necessarily blocked.
     const ua = getUA().toLowerCase();
@@ -14356,8 +14686,7 @@ class BrowserPopupRedirectResolver {
     // Wrapping in async even though we don't await anywhere in order
     // to make sure errors are raised as promise rejections
     async _openPopup(auth, provider, authType, eventId) {
-        var _a;
-        debugAssert((_a = this.eventManagers[auth._key()]) === null || _a === void 0 ? void 0 : _a.manager, '_initialize() not called before _openPopup()');
+        debugAssert(this.eventManagers[auth._key()]?.manager, '_initialize() not called before _openPopup()');
         const url = await _getRedirectUrl(auth, provider, authType, _getCurrentUrl(), eventId);
         return _open(auth, url, _generateEventId());
     }
@@ -14392,7 +14721,7 @@ class BrowserPopupRedirectResolver {
         const iframe = await _openIframe(auth);
         const manager = new AuthEventManager(auth);
         iframe.register('authEvent', (iframeEvent) => {
-            _assert(iframeEvent === null || iframeEvent === void 0 ? void 0 : iframeEvent.authEvent, auth, "invalid-auth-event" /* AuthErrorCode.INVALID_AUTH_EVENT */);
+            _assert(iframeEvent?.authEvent, auth, "invalid-auth-event" /* AuthErrorCode.INVALID_AUTH_EVENT */);
             // TODO: Consider splitting redirect and popup events earlier on
             const handled = manager.onEvent(iframeEvent.authEvent);
             return { status: handled ? "ACK" /* GapiOutcome.ACK */ : "ERROR" /* GapiOutcome.ERROR */ };
@@ -14404,8 +14733,7 @@ class BrowserPopupRedirectResolver {
     _isIframeWebStorageSupported(auth, cb) {
         const iframe = this.iframes[auth._key()];
         iframe.send(WEB_STORAGE_SUPPORT_KEY, { type: WEB_STORAGE_SUPPORT_KEY }, result => {
-            var _a;
-            const isSupported = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a[WEB_STORAGE_SUPPORT_KEY];
+            const isSupported = result?.[0]?.[WEB_STORAGE_SUPPORT_KEY];
             if (isSupported !== undefined) {
                 cb(!!isSupported);
             }
@@ -14436,7 +14764,7 @@ class BrowserPopupRedirectResolver {
 const browserPopupRedirectResolver = BrowserPopupRedirectResolver;
 
 var name$1 = "@firebase/auth";
-var version$1 = "1.8.1";
+var version$1 = "1.11.1";
 
 /**
  * @license
@@ -14460,9 +14788,8 @@ class AuthInterop {
         this.internalListeners = new Map();
     }
     getUid() {
-        var _a;
         this.assertAuthConfigured();
-        return ((_a = this.auth.currentUser) === null || _a === void 0 ? void 0 : _a.uid) || null;
+        return this.auth.currentUser?.uid || null;
     }
     async getToken(forceRefresh) {
         this.assertAuthConfigured();
@@ -14479,7 +14806,7 @@ class AuthInterop {
             return;
         }
         const unsubscribe = this.auth.onIdTokenChanged(user => {
-            listener((user === null || user === void 0 ? void 0 : user.stsTokenManager.accessToken) || null);
+            listener(user?.stsTokenManager.accessToken || null);
         });
         this.internalListeners.set(listener, unsubscribe);
         this.updateProactiveRefresh();
@@ -14578,8 +14905,8 @@ function registerAuth(clientPlatform) {
         return (auth => new AuthInterop(auth))(auth);
     }, "PRIVATE" /* ComponentType.PRIVATE */).setInstantiationMode("EXPLICIT" /* InstantiationMode.EXPLICIT */));
     registerVersion(name$1, version$1, getVersionForPlatform(clientPlatform));
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name$1, version$1, 'esm2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name$1, version$1, 'esm2020');
 }
 
 /**
@@ -14609,7 +14936,7 @@ const mintCookieFactory = (url) => async (user) => {
         return;
     }
     // Specifically trip null => undefined when logged out, to delete any existing cookie
-    const idToken = idTokenResult === null || idTokenResult === void 0 ? void 0 : idTokenResult.token;
+    const idToken = idTokenResult?.token;
     if (lastPostedIdToken === idToken) {
         return;
     }
@@ -14664,8 +14991,7 @@ function getAuth(app = getApp()) {
     return auth;
 }
 function getScriptParentElement() {
-    var _a, _b;
-    return (_b = (_a = document.getElementsByTagName('head')) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : document;
+    return document.getElementsByTagName('head')?.[0] ?? document;
 }
 _setExternalJSProvider({
     loadJS(url) {
@@ -14691,7 +15017,7 @@ _setExternalJSProvider({
 registerAuth("Browser" /* ClientPlatform.BROWSER */);
 
 const name = "@firebase/database";
-const version = "1.0.10";
+const version = "1.1.0";
 
 /**
  * @license
@@ -15388,15 +15714,24 @@ const setTimeoutNonBlocking = function (fn, time) {
  * Abstraction around AppCheck's token fetching capabilities.
  */
 class AppCheckTokenProvider {
-    constructor(appName_, appCheckProvider) {
-        this.appName_ = appName_;
+    constructor(app, appCheckProvider) {
         this.appCheckProvider = appCheckProvider;
-        this.appCheck = appCheckProvider === null || appCheckProvider === void 0 ? void 0 : appCheckProvider.getImmediate({ optional: true });
+        this.appName = app.name;
+        if (_isFirebaseServerApp(app) && app.settings.appCheckToken) {
+            this.serverAppAppCheckToken = app.settings.appCheckToken;
+        }
+        this.appCheck = appCheckProvider?.getImmediate({ optional: true });
         if (!this.appCheck) {
-            appCheckProvider === null || appCheckProvider === void 0 ? void 0 : appCheckProvider.get().then(appCheck => (this.appCheck = appCheck));
+            appCheckProvider?.get().then(appCheck => (this.appCheck = appCheck));
         }
     }
     getToken(forceRefresh) {
+        if (this.serverAppAppCheckToken) {
+            if (forceRefresh) {
+                throw new Error('Attempted reuse of `FirebaseServerApp.appCheckToken` after previous usage failed.');
+            }
+            return Promise.resolve({ token: this.serverAppAppCheckToken });
+        }
         if (!this.appCheck) {
             return new Promise((resolve, reject) => {
                 // Support delayed initialization of FirebaseAppCheck. This allows our
@@ -15416,11 +15751,12 @@ class AppCheckTokenProvider {
         return this.appCheck.getToken(forceRefresh);
     }
     addTokenChangeListener(listener) {
-        var _a;
-        (_a = this.appCheckProvider) === null || _a === void 0 ? void 0 : _a.get().then(appCheck => appCheck.addTokenListener(listener));
+        this.appCheckProvider
+            ?.get()
+            .then(appCheck => appCheck.addTokenListener(listener));
     }
     notifyForInvalidToken() {
-        warn(`Provided AppCheck credentials for the app named "${this.appName_}" ` +
+        warn(`Provided AppCheck credentials for the app named "${this.appName}" ` +
             'are invalid. This usually indicates your app was not initialized correctly.');
     }
 }
@@ -15606,7 +15942,7 @@ class RepoInfo {
      * @param nodeAdmin - Whether this instance uses Admin SDK credentials
      * @param persistenceKey - Override the default session persistence storage key
      */
-    constructor(host, secure, namespace, webSocketOnly, nodeAdmin = false, persistenceKey = '', includeNamespaceInQueryParams = false, isUsingEmulator = false) {
+    constructor(host, secure, namespace, webSocketOnly, nodeAdmin = false, persistenceKey = '', includeNamespaceInQueryParams = false, isUsingEmulator = false, emulatorOptions = null) {
         this.secure = secure;
         this.namespace = namespace;
         this.webSocketOnly = webSocketOnly;
@@ -15614,6 +15950,7 @@ class RepoInfo {
         this.persistenceKey = persistenceKey;
         this.includeNamespaceInQueryParams = includeNamespaceInQueryParams;
         this.isUsingEmulator = isUsingEmulator;
+        this.emulatorOptions = emulatorOptions;
         this._host = host.toLowerCase();
         this._domain = this._host.substr(this._host.indexOf('.') + 1);
         this.internalHost =
@@ -17100,7 +17437,9 @@ class Connection {
         if (MESSAGE_DATA in controlData) {
             const payload = controlData[MESSAGE_DATA];
             if (cmd === SERVER_HELLO) {
-                const handshakePayload = Object.assign({}, payload);
+                const handshakePayload = {
+                    ...payload
+                };
                 if (this.repoInfo_.isUsingEmulator) {
                     // Upon connecting, the emulator will pass the hostname that it's aware of, but we prefer the user's set hostname via `connectDatabaseEmulator` over what the emulator passes.
                     handshakePayload.h = this.repoInfo_.host;
@@ -18366,7 +18705,7 @@ class PersistentConnection extends ServerActions {
                 }
                 this.lastConnectionEstablishedTime_ = null;
             }
-            const timeSinceLastConnectAttempt = new Date().getTime() - this.lastConnectionAttemptTime_;
+            const timeSinceLastConnectAttempt = Math.max(0, new Date().getTime() - this.lastConnectionAttemptTime_);
             let reconnectDelay = Math.max(0, this.reconnectDelay_ - timeSinceLastConnectAttempt);
             reconnectDelay = Math.random() * reconnectDelay;
             this.log_('Trying to reconnect in ' + reconnectDelay + 'ms');
@@ -19908,9 +20247,9 @@ class IndexMap {
             newIndex = fallbackObject;
         }
         const indexName = indexDefinition.toString();
-        const newIndexSet = Object.assign({}, this.indexSet_);
+        const newIndexSet = { ...this.indexSet_ };
         newIndexSet[indexName] = indexDefinition;
-        const newIndexes = Object.assign({}, this.indexes_);
+        const newIndexes = { ...this.indexes_ };
         newIndexes[indexName] = newIndex;
         return new IndexMap(newIndexes, newIndexSet);
     }
@@ -21639,7 +21978,7 @@ class StatsListener {
     }
     get() {
         const newStats = this.collection_.get();
-        const delta = Object.assign({}, newStats);
+        const delta = { ...newStats };
         if (this.last_) {
             each(this.last_, (stat, value) => {
                 delta[stat] = delta[stat] - value;
@@ -27123,10 +27462,13 @@ let useRestClient = false;
 /**
  * Update an existing `Repo` in place to point to a new host/port.
  */
-function repoManagerApplyEmulatorSettings(repo, host, port, tokenProvider) {
-    repo.repoInfo_ = new RepoInfo(`${host}:${port}`, 
-    /* secure= */ false, repo.repoInfo_.namespace, repo.repoInfo_.webSocketOnly, repo.repoInfo_.nodeAdmin, repo.repoInfo_.persistenceKey, repo.repoInfo_.includeNamespaceInQueryParams, 
-    /*isUsingEmulator=*/ true);
+function repoManagerApplyEmulatorSettings(repo, hostAndPort, emulatorOptions, tokenProvider) {
+    const portIndex = hostAndPort.lastIndexOf(':');
+    const host = hostAndPort.substring(0, portIndex);
+    const useSsl = isCloudWorkstation(host);
+    repo.repoInfo_ = new RepoInfo(hostAndPort, 
+    /* secure= */ useSsl, repo.repoInfo_.namespace, repo.repoInfo_.webSocketOnly, repo.repoInfo_.nodeAdmin, repo.repoInfo_.persistenceKey, repo.repoInfo_.includeNamespaceInQueryParams, 
+    /*isUsingEmulator=*/ true, emulatorOptions);
     if (tokenProvider) {
         repo.authTokenProvider_ = tokenProvider;
     }
@@ -27165,7 +27507,7 @@ function repoManagerDatabaseFromApp(app, authProvider, appCheckProvider, url, no
         fatal('Database URL must point to the root of a Firebase Database ' +
             '(not including a child path).');
     }
-    const repo = repoManagerCreateRepo(repoInfo, app, authTokenProvider, new AppCheckTokenProvider(app.name, appCheckProvider));
+    const repo = repoManagerCreateRepo(repoInfo, app, authTokenProvider, new AppCheckTokenProvider(app, appCheckProvider));
     return new Database(repo, app);
 }
 /**
@@ -27281,10 +27623,17 @@ function getDatabase(app = getApp(), url) {
 function connectDatabaseEmulator(db, host, port, options = {}) {
     db = getModularInstance(db);
     db._checkNotDeleted('useEmulator');
+    const hostAndPort = `${host}:${port}`;
+    const repo = db._repoInternal;
     if (db._instanceStarted) {
-        fatal('Cannot call useEmulator() after instance has already been initialized.');
+        // If the instance has already been started, then silenty fail if this function is called again
+        // with the same parameters. If the parameters differ then assert.
+        if (hostAndPort === db._repoInternal.repoInfo_.host &&
+            deepEqual(options, repo.repoInfo_.emulatorOptions)) {
+            return;
+        }
+        fatal('connectDatabaseEmulator() cannot initialize or alter the emulator configuration after the database instance has started.');
     }
-    const repo = db._repoInternal;
     let tokenProvider = undefined;
     if (repo.repoInfo_.nodeAdmin) {
         if (options.mockUserToken) {
@@ -27298,8 +27647,13 @@ function connectDatabaseEmulator(db, host, port, options = {}) {
             : createMockUserToken(options.mockUserToken, db.app.options.projectId);
         tokenProvider = new EmulatorTokenProvider(token);
     }
+    // Workaround to get cookies in Firebase Studio
+    if (isCloudWorkstation(host)) {
+        void pingServer(host);
+        updateEmulatorBanner('Database', true);
+    }
     // Modify the repo to apply emulator settings
-    repoManagerApplyEmulatorSettings(repo, host, port, tokenProvider);
+    repoManagerApplyEmulatorSettings(repo, hostAndPort, options, tokenProvider);
 }
 
 /**
@@ -27327,8 +27681,8 @@ function registerDatabase(variant) {
         return repoManagerDatabaseFromApp(app, authProvider, appCheckProvider, url);
     }, "PUBLIC" /* ComponentType.PUBLIC */).setMultipleInstances(true));
     registerVersion(name, version, variant);
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name, version, 'esm2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name, version, 'esm2020');
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 PersistentConnection.prototype.simpleListen = function (pathString, onComplete) {
@@ -27370,12 +27724,11 @@ let databaseReadyQueue = [];
  * Execute all queued callbacks now that database is ready
  */
 function flushDatabaseReadyQueue(state) {
-    var _a;
     const queue = [...databaseReadyQueue];
     databaseReadyQueue = []; // Clear queue before executing to avoid re-queuing
     queue.forEach(callback => callback());
     // Also notify the global callback if set
-    (_a = state.onFirebaseReady) === null || _a === void 0 ? void 0 : _a.call(state);
+    state.onFirebaseReady?.();
 }
 function initFirebase(state) {
     try {
@@ -27439,7 +27792,7 @@ function isFirebaseAuthenticated(state) {
 async function loginFirebase(state, firebaseToken, onLoginFunc) {
     if (!app && !initFirebase(state))
         return;
-    const { userId, locale, projectId, loginMethod } = state;
+    const { netskraflUserId, locale, projectId, loginMethod } = state;
     auth = getAuth(app);
     if (!auth) {
         console.error("Failed to initialize Firebase Auth");
@@ -27454,14 +27807,14 @@ async function loginFirebase(state, firebaseToken, onLoginFunc) {
                     logEvent("sign_up", {
                         locale,
                         method: loginMethod,
-                        userid: userId
+                        userid: netskraflUserId
                     });
                 }
                 // And always log a login event
                 logEvent("login", {
                     locale,
                     method: loginMethod,
-                    userid: userId
+                    userid: netskraflUserId
                 });
             }
         });
@@ -27480,7 +27833,7 @@ async function loginFirebase(state, firebaseToken, onLoginFunc) {
     if (!analytics) {
         console.error("Failed to initialize Firebase Analytics");
     }
-    initPresence(projectId, userId, locale);
+    initPresence(projectId, netskraflUserId, locale);
 }
 function initPresence(projectId, userId, locale) {
     // Ensure that this user connection is recorded in Firebase
@@ -27643,7 +27996,6 @@ const checkCircuitBreakerReset = () => {
  * - Request deduplication: Only one login attempt at a time
  */
 const ensureAuthenticated = async (state) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     // Check and potentially reset circuit breaker
     checkCircuitBreakerReset();
     // Circuit breaker check - fail fast if too many recent failures
@@ -27708,22 +28060,22 @@ const ensureAuthenticated = async (state) => {
             // Success! Update global state and persist authentication
             // ========================================================================
             // Update the user's ID to the internal one used by the backend and Firebase
-            state.userId = result.user_id || state.userId;
-            state.account = result.account || state.userId;
+            state.netskraflUserId = result.user_id || state.netskraflUserId;
+            state.account = result.account || state.netskraflUserId;
             state.userNick = result.nickname || state.userNick;
             state.firebaseApiKey = result.firebase_api_key || state.firebaseApiKey;
             // Load state flags and preferences
-            state.beginner = (_b = (_a = result.prefs) === null || _a === void 0 ? void 0 : _a.beginner) !== null && _b !== void 0 ? _b : true;
-            state.fairPlay = (_d = (_c = result.prefs) === null || _c === void 0 ? void 0 : _c.fairplay) !== null && _d !== void 0 ? _d : false;
-            state.ready = (_f = (_e = result.prefs) === null || _e === void 0 ? void 0 : _e.ready) !== null && _f !== void 0 ? _f : true;
-            state.readyTimed = (_h = (_g = result.prefs) === null || _g === void 0 ? void 0 : _g.ready_timed) !== null && _h !== void 0 ? _h : true;
-            state.audio = (_k = (_j = result.prefs) === null || _j === void 0 ? void 0 : _j.audio) !== null && _k !== void 0 ? _k : false;
-            state.fanfare = (_m = (_l = result.prefs) === null || _l === void 0 ? void 0 : _l.fanfare) !== null && _m !== void 0 ? _m : false;
-            state.hasPaid = (_p = (_o = result.prefs) === null || _o === void 0 ? void 0 : _o.haspaid) !== null && _p !== void 0 ? _p : false;
+            state.beginner = result.prefs?.beginner ?? true;
+            state.fairPlay = result.prefs?.fairplay ?? false;
+            state.ready = result.prefs?.ready ?? true;
+            state.readyTimed = result.prefs?.ready_timed ?? true;
+            state.audio = result.prefs?.audio ?? false;
+            state.fanfare = result.prefs?.fanfare ?? false;
+            state.hasPaid = result.prefs?.haspaid ?? false;
             // Save authentication settings to sessionStorage
             saveAuthSettings({
                 userEmail: state.userEmail,
-                userId: state.userId,
+                netskraflUserId: state.netskraflUserId,
                 userNick: state.userNick,
                 firebaseApiKey: state.firebaseApiKey,
                 beginner: state.beginner,
@@ -27821,7 +28173,7 @@ const requestMoves = (state, options) => {
     const headers = {
         "Content-Type": "application/json; charset=UTF-8",
         Authorization: `Bearer ${state.movesAccessKey}`,
-        ...options === null || options === void 0 ? void 0 : options.headers,
+        ...options?.headers,
     };
     return m.request({
         withCredentials: false,
@@ -28057,10 +28409,9 @@ const OnlinePresence = {
 const UserId = {
     // User identifier at top right, opens user preferences
     view: (vnode) => {
-        var _a;
         const view = vnode.attrs.view;
         const model = view.model;
-        if (!((_a = model.state) === null || _a === void 0 ? void 0 : _a.userId))
+        if (!model.state?.netskraflUserId)
             // Don't show the button if there is no logged-in user
             return "";
         return m(".userid", {
@@ -28073,13 +28424,25 @@ const UserId = {
         }, [glyph("address-book"), nbsp(), model.state.userNick]);
     }
 };
+const ProModeIndicator = {
+    // Display a Pro Mode (Keppnishamur) indicator using a lightbulb glyph
+    // If header is true, always show grayed with title
+    // Otherwise, the lightbulb is grayed if manual mode is not enabled
+    view: (vnode) => {
+        const { manual, header } = vnode.attrs;
+        const title = ts("Keppnishamur");
+        // Regular case: show grayed if not manual mode
+        const highlight = (manual === true) && !header;
+        const glyphAttrs = (highlight || header) ? { title } : {};
+        return m("span.list-manual", glyphAttrs, glyph("lightbulb", undefined, !highlight));
+    }
+};
 const MultiSelection = (initialVnode) => {
     // A multiple-selection div where users can click on child nodes
     // to select them, giving them an addional selection class,
     // typically .selected
-    var _a, _b;
-    let sel = (_a = initialVnode.attrs.initialSelection) !== null && _a !== void 0 ? _a : 0;
-    const defaultClass = (_b = initialVnode.attrs.defaultClass) !== null && _b !== void 0 ? _b : "";
+    let sel = initialVnode.attrs.initialSelection ?? 0;
+    const defaultClass = initialVnode.attrs.defaultClass ?? "";
     const selectedClass = initialVnode.attrs.selectedClass || "selected";
     return {
         view: (vnode) => {
@@ -28126,10 +28489,9 @@ const HeaderLogo = {
 };
 const Toggler = () => {
     function doToggle(togglerId, funcToggle) {
-        var _a, _b;
         // Perform the toggling, on a mouse click or keyboard input (space bar)
-        const cls1 = (_a = document.querySelector("#" + togglerId + " #opt1")) === null || _a === void 0 ? void 0 : _a.classList;
-        const cls2 = (_b = document.querySelector("#" + togglerId + " #opt2")) === null || _b === void 0 ? void 0 : _b.classList;
+        const cls1 = document.querySelector("#" + togglerId + " #opt1")?.classList;
+        const cls2 = document.querySelector("#" + togglerId + " #opt2")?.classList;
         cls1 && cls1.toggle("selected");
         cls2 && cls2.toggle("selected");
         if (funcToggle !== undefined && cls2)
@@ -28183,19 +28545,16 @@ const TogglerReady = (initialVnode) => {
         }
     }
     return {
-        view: () => {
-            var _a, _b;
-            return m(Toggler, {
-                id: "ready",
-                state: (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.ready) !== null && _b !== void 0 ? _b : false,
-                tabindex: 2,
-                opt1: nbsp(),
-                opt2: glyph("thumbs-up"),
-                funcToggle: toggleFunc,
-                small: true,
-                title: ts("Tek við áskorunum!"),
-            });
-        }
+        view: () => m(Toggler, {
+            id: "ready",
+            state: model.state?.ready ?? false,
+            tabindex: 2,
+            opt1: nbsp(),
+            opt2: glyph("thumbs-up"),
+            funcToggle: toggleFunc,
+            small: true,
+            title: ts("Tek við áskorunum!"),
+        })
     };
 };
 const TogglerReadyTimed = (initialVnode) => {
@@ -28210,19 +28569,16 @@ const TogglerReadyTimed = (initialVnode) => {
         }
     }
     return {
-        view: () => {
-            var _a, _b;
-            return m(Toggler, {
-                id: "timed",
-                state: (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.readyTimed) !== null && _b !== void 0 ? _b : false,
-                tabindex: 3,
-                opt1: nbsp(),
-                opt2: glyph("time"),
-                funcToggle: toggleFunc,
-                small: true,
-                title: ts("Til í viðureign með klukku!"),
-            });
-        }
+        view: () => m(Toggler, {
+            id: "timed",
+            state: model.state?.readyTimed ?? false,
+            tabindex: 3,
+            opt1: nbsp(),
+            opt2: glyph("time"),
+            funcToggle: toggleFunc,
+            small: true,
+            title: ts("Til í viðureign með klukku!"),
+        })
     };
 };
 const TogglerAudio = (initialVnode) => {
@@ -28317,7 +28673,6 @@ const WaitDialog = {
         state.firebasePath = "";
     },
     oncreate: (vnode) => {
-        var _a, _b;
         // Note: we must use a two-step initialization here,
         // calling oninit() first and then oncreate(), since calls to
         // m.redraw() - explicit or implicit via m.request() - from within
@@ -28327,7 +28682,7 @@ const WaitDialog = {
         const { view, oppId, challengeKey: key } = attrs;
         const { model } = view;
         const globalState = model.state;
-        const userId = (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : "";
+        const userId = model.state?.netskraflUserId ?? "";
         if (!userId || !oppId)
             return; // Should not happen
         state.firebasePath = `user/${userId}/wait/${oppId}`;
@@ -28366,12 +28721,11 @@ const WaitDialog = {
         });
     },
     view: (vnode) => {
-        var _a, _b;
         const { attrs, state } = vnode;
         const { view, oppId, duration, challengeKey: key, oppNick, oppName } = attrs;
         const { model } = view;
         const globalState = model.state;
-        const userId = (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : "";
+        const userId = model.state?.netskraflUserId ?? "";
         if (!globalState)
             return null;
         const cancelWait = async () => {
@@ -28453,7 +28807,7 @@ const AcceptDialog = {
                 url: "/waitcheck",
                 body: { user: oppId, key }
             });
-            if (json === null || json === void 0 ? void 0 : json.waiting) {
+            if (json?.waiting) {
                 // Both players are now ready: Start the timed game.
                 // The newGame() call switches to a new route (/game),
                 // and all open dialogs are thereby closed automatically.
@@ -28516,12 +28870,11 @@ class WordChecker {
         this.wordCheckCache = {};
     }
     ingestTwoLetterWords(locale, twoLetterWords) {
-        var _a;
         // Initialize the cache with a list of known two-letter words
         // The two-letter word list contains a list of entries where each
         // entry is an initial letter followed by a list of two-letter words
         // starting with that letter.
-        const cache = (_a = this.wordCheckCache[locale]) !== null && _a !== void 0 ? _a : (this.wordCheckCache[locale] = {});
+        const cache = this.wordCheckCache[locale] ?? (this.wordCheckCache[locale] = {});
         for (const [/* firstLetter */ , wordList] of twoLetterWords) {
             for (const word of wordList) {
                 cache[word] = true;
@@ -28564,7 +28917,7 @@ class WordChecker {
                     words,
                 }
             });
-            if ((response === null || response === void 0 ? void 0 : response.word) === words[0] && (response === null || response === void 0 ? void 0 : response.valid)) {
+            if (response?.word === words[0] && response?.valid) {
                 // Looks like a valid response
                 if (!cache) {
                     // We didn't already have a cache for this locale
@@ -29207,7 +29560,6 @@ class BaseGame {
         return c ? this.tiles[c] || null : null;
     }
     saveTiles() {
-        var _a;
         // Save the current unglued tile configuration to local storage
         let tp = [];
         const tilesPlaced = this.tilesPlaced();
@@ -29222,7 +29574,7 @@ class BaseGame {
             if (sq in this.tiles)
                 tp.push({ sq, tile: this.tiles[sq].tile });
         }
-        (_a = this.localStorage) === null || _a === void 0 ? void 0 : _a.saveTiles(tp);
+        this.localStorage?.saveTiles(tp);
     }
     ;
     restoreTiles(savedTiles) {
@@ -29326,7 +29678,6 @@ const DEBUG_OVERTIME = 1 * 60.0;
 const GAME_OVER = 99; // Error code corresponding to the Error class in skraflmechanics.py
 class Game extends BaseGame {
     constructor(uuid, srvGame, moveListener, state, maxOvertime) {
-        var _a;
         // Call parent constructor
         super(uuid, state); // Default board_type: "standard"
         // A class that represents a Netskrafl game instance on the client
@@ -29389,7 +29740,7 @@ class Game extends BaseGame {
             return;
         }
         // Load previously saved tile positions from local storage, if any
-        let savedTiles = ((_a = this.localStorage) === null || _a === void 0 ? void 0 : _a.loadTiles()) || [];
+        let savedTiles = this.localStorage?.loadTiles() || [];
         this.init(srvGame);
         // Put tiles in the same position as they were when the player left the game
         this.restoreTiles(savedTiles);
@@ -29595,7 +29946,7 @@ class Game extends BaseGame {
                 url: "/gamestate",
                 body: { game: this.uuid } // !!! FIXME: Add delete_zombie parameter
             });
-            if (!(result === null || result === void 0 ? void 0 : result.ok)) {
+            if (!result?.ok) {
                 // console.log("Game " + uuid + " could not be loaded");
             }
             else {
@@ -29939,8 +30290,7 @@ class Game extends BaseGame {
         this.rack = rack;
     }
     rackAtMove(moveIndex) {
-        var _a;
-        const numRacks = ((_a = this.racks) === null || _a === void 0 ? void 0 : _a.length) || 0;
+        const numRacks = this.racks?.length || 0;
         if (!numRacks)
             return "";
         return this.racks[moveIndex >= numRacks ? numRacks - 1 : moveIndex];
@@ -30423,8 +30773,8 @@ class Riddle extends BaseGame {
                 // Initialize word checker
                 wordChecker.ingestTwoLetterWords(this.locale, this.two_letter_words[0]);
                 // Load persisted player moves from localStorage
-                if (state.userId) {
-                    const persistedMoves = RiddlePersistence.loadLocalMoves(state.userId, date);
+                if (state.netskraflUserId) {
+                    const persistedMoves = RiddlePersistence.loadLocalMoves(state.netskraflUserId, date);
                     if (persistedMoves.length > 0) {
                         // Convert from IPlayerMove to RiddleWord format, preserving timestamps
                         this.playerMoves = persistedMoves.map(move => ({
@@ -30447,7 +30797,7 @@ class Riddle extends BaseGame {
     }
     async submitRiddleWord(move) {
         const { state } = this;
-        if (!state || !state.userId)
+        if (!state || !state.netskraflUserId)
             return;
         try {
             await request(state, {
@@ -30456,9 +30806,9 @@ class Riddle extends BaseGame {
                 body: {
                     date: this.date,
                     locale: this.locale,
-                    userId: state.userId,
+                    userId: state.netskraflUserId,
                     groupId: state.userGroupId || null,
-                    userDisplayName: state.userFullname || state.userNick || state.userId,
+                    userDisplayName: state.userFullname || state.userNick || "",
                     move,
                 }
             });
@@ -30508,7 +30858,7 @@ class Riddle extends BaseGame {
         if (!move)
             return;
         const { state } = this;
-        if (!state || !state.userId)
+        if (!state || !state.netskraflUserId)
             return;
         // Save all moves to localStorage (local backup/cache)
         // Convert RiddleWord[] to IPlayerMove[] for persistence
@@ -30518,7 +30868,7 @@ class Riddle extends BaseGame {
             coord: m.coord,
             timestamp: m.timestamp
         }));
-        RiddlePersistence.saveLocalMoves(state.userId, this.date, movesToSave);
+        RiddlePersistence.saveLocalMoves(state.netskraflUserId, this.date, movesToSave);
         // If the move does not improve the personal best, we're done
         if (move.score <= this.personalBestScore)
             return;
@@ -30848,7 +31198,6 @@ class Model {
         });
     }
     async loadGame(uuid, funcComplete, deleteZombie = false) {
-        var _a;
         // Fetch a Netskrafl game state from the server, given the game's UUID.
         // If deleteZombie is true, we are loading a zombie game for
         // inspection, so we tell the server to remove the zombie marker.
@@ -30868,12 +31217,12 @@ class Model {
                 game: uuid,
                 delete_zombie: deleteZombie
             });
-            if (!(result === null || result === void 0 ? void 0 : result.ok)) {
+            if (!result?.ok) {
                 // console.log("Game " + uuid + " could not be loaded");
             }
             else {
                 // Create a new game instance and load the state into it
-                this.game = new Game(uuid, result.game, this, this.state, ((_a = this.state) === null || _a === void 0 ? void 0 : _a.runningLocal) ? DEBUG_OVERTIME : MAX_OVERTIME);
+                this.game = new Game(uuid, result.game, this, this.state, this.state?.runningLocal ? DEBUG_OVERTIME : MAX_OVERTIME);
                 // Successfully loaded: call the completion function, if given
                 // (this usually attaches the Firebase event listener)
                 funcComplete && funcComplete();
@@ -31180,13 +31529,12 @@ class Model {
         }
     }
     async loadHelp() {
-        var _a;
         // Load the help screen HTML from the server
         // (this is done the first time the help is displayed)
         if (this.helpHTML !== null)
             return; // Already loaded
         try {
-            const locale = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
+            const locale = this.state?.locale || "is_IS";
             const result = await this.getText("/rawhelp?version=malstadur&locale=" + locale);
             this.helpHTML = result;
         }
@@ -31231,7 +31579,7 @@ class Model {
             return;
         try {
             const result = await this.post("/saveuserprefs", user);
-            if (result === null || result === void 0 ? void 0 : result.ok) {
+            if (result?.ok) {
                 // User preferences modified successfully on the server:
                 // update the state variables that we're caching
                 const state = this.state;
@@ -31263,10 +31611,9 @@ class Model {
         }
     }
     addChatMessage(game, from_userid, msg, ts) {
-        var _a, _b;
         // Add a chat message to the game's chat message list
         if (this.game && this.game.uuid == game) {
-            const userId = (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : "";
+            const userId = this.state?.netskraflUserId ?? "";
             this.game.addChatMessage(from_userid, msg, ts, from_userid == userId);
             // Returning true triggers a redraw
             return true;
@@ -31326,10 +31673,9 @@ class Model {
         }
     }
     notifyGameWon() {
-        var _a;
         // The user just won a game:
         // play the "you-win" audio if fanfare is enabled
-        if ((_a = this.user) === null || _a === void 0 ? void 0 : _a.fanfare) {
+        if (this.user?.fanfare) {
             playAudio(this.state, "you-win");
         }
     }
@@ -31420,7 +31766,7 @@ const FriendPromoteDialog = (initialVnode) => {
                     onclick: (ev) => {
                         ev.preventDefault();
                         logEvent("click_friend", {
-                            userid: state.userId, locale: state.locale
+                            userid: state.netskraflUserId, locale: state.locale
                         });
                         // Navigate to the container-supplied subscription URL
                         window.location.href = state.subscriptionUrl;
@@ -31488,7 +31834,7 @@ const ChallengeDialog = () => {
                             m("div", { id: 'chall-15', tabindex: 3 }, [glyph("time"), t("2 x 15 mínútur")]),
                             m("div", { id: 'chall-20', tabindex: 4 }, [glyph("time"), t("2 x 20 mínútur")]),
                             m("div", { id: 'chall-25', tabindex: 5 }, [glyph("time"), t("2 x 25 mínútur")]),
-                            (state === null || state === void 0 ? void 0 : state.runningLocal) ? // !!! TODO Debugging aid
+                            state?.runningLocal ? // !!! TODO Debugging aid
                                 m("div", { id: 'chall-3', tabindex: 6 }, [glyph("time"), t("2 x 3 mínútur")])
                                 :
                                     m("div", { id: 'chall-30', tabindex: 6 }, [glyph("time"), t("2 x 30 mínútur")])
@@ -31534,9 +31880,8 @@ const ChallengeDialog = () => {
                     title: ts("Skora á"),
                     tabindex: 9,
                     onclick: (ev) => {
-                        var _a, _b;
                         // Issue a new challenge
-                        let duration = (_b = (_a = document.querySelector("div.chall-time.selected")) === null || _a === void 0 ? void 0 : _a.id.slice(6)) !== null && _b !== void 0 ? _b : "0";
+                        let duration = document.querySelector("div.chall-time.selected")?.id.slice(6) ?? "0";
                         if (duration === "none")
                             duration = 0;
                         else
@@ -31579,7 +31924,7 @@ const RecentList = () => {
         function durationDescription() {
             // Format the game duration
             let duration = "";
-            if (!item.duration) {
+            if (!item.prefs?.duration) {
                 // Regular (non-timed) game
                 if (item.days || item.hours || item.minutes) {
                     if (item.days > 1)
@@ -31608,7 +31953,7 @@ const RecentList = () => {
                 // This was a timed game
                 duration = [
                     m("span.timed-btn", { title: ts('Viðureign með klukku') }),
-                    " 2 x " + item.duration + ts(" mínútur")
+                    " 2 x " + item.prefs.duration + ts(" mínútur")
                 ];
             }
             return duration;
@@ -31658,7 +32003,7 @@ const RecentList = () => {
             m("div.list-elo-adj", eloAdjHuman),
             m("div.list-elo-adj", eloAdj),
             m("span.list-duration", durationDescription()),
-            m("span.list-manual", item.manual ? { title: ts("Keppnishamur") } : {}, glyph("lightbulb", undefined, !item.manual))
+            m(ProModeIndicator, { manual: item.prefs?.manual })
         ]));
     }
     return {
@@ -31669,6 +32014,295 @@ const RecentList = () => {
     };
 };
 
+/*
+
+  Gamelist.ts
+
+  List of games in progress display component
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjalmur Thorsteinsson
+
+  The Creative Commons Attribution-NonCommercial 4.0
+  International Public License (CC-BY-NC 4.0) applies to this software.
+  For further information, see https://github.com/mideind/Netskrafl
+
+*/
+const Hint = {
+    view: (vnode) => {
+        const { loadingGameList, loadingAllLists, gameList } = vnode.attrs;
+        // Show some help if the user has no games in progress
+        if (loadingGameList || loadingAllLists || (gameList !== null && gameList.length > 0))
+            // Either we have games in progress or the game list is being loaded
+            return "";
+        return m(".hint", { style: { display: "block" } }, [
+            m("p", [
+                "Ef þig vantar einhvern til að skrafla við, veldu flipann ",
+                m(m.route.Link, { href: "/main?tab=2" }, [glyph("user"), nbsp(), "Andstæðingar"]),
+                " og skoraðu á tölvuþjarka - ",
+                glyph("cog"), nbsp(), m("b", "Amlóða"),
+                ", ",
+                glyph("cog"), nbsp(), m("b", "Miðlung"),
+                " eða ",
+                glyph("cog"), nbsp(), m("b", "Fullsterkan"),
+                " - eða veldu þér annan leikmann úr stafrófs\u00ADlistunum " + // Soft hyphen
+                    " sem þar er að finna til að skora á."
+            ]),
+            m("p", [
+                "Þú stofnar áskorun með því að smella á bendi-teiknið ",
+                glyph("hand-right", { style: { "margin-left": "6px", "margin-right": "6px" } }),
+                " vinstra megin við nafn andstæðingsins."
+            ]),
+            m("p", "Tölvuþjarkarnir eru ætíð reiðubúnir að skrafla og viðureign við þá " +
+                " hefst strax. Aðrir leikmenn þurfa að samþykkja áskorun áður en viðureign hefst."),
+            m("p.no-mobile-block", [
+                m(m.route.Link, { href: "/help" }, "Hjálp"),
+                " má fá með því að smella á bláa ",
+                glyph("info-sign"), nbsp(), "-", nbsp(),
+                "teiknið hér til vinstri."
+            ]),
+            m("p.no-mobile-block", "Þú kemst alltaf aftur í þessa aðalsíðu með því að smella á " +
+                "örvarmerkið efst vinstra megin við skraflborðið.")
+        ]);
+    }
+};
+const GameListEntry = () => {
+    // Generate a list item about a game in progress (or recently finished)
+    function vwOpp(item) {
+        const arg = item.oppid === null ? [glyph("cog"), nbsp(), item.opp] : item.opp;
+        return m("span.list-opp", { title: item.fullname }, arg);
+    }
+    function vwTurn(item) {
+        let turnText = "";
+        let flagClass = "";
+        if (item.my_turn) {
+            turnText = ts("Þú átt leik");
+        }
+        else if (item.zombie) {
+            turnText = ts("Viðureign lokið");
+            flagClass = ".zombie";
+        }
+        else {
+            // {opponent}'s move
+            turnText = ts("opp_move", { opponent: item.opp });
+            flagClass = ".grayed";
+        }
+        return m("span.list-myturn", m("span.glyphicon.glyphicon-flag" + flagClass, { title: turnText }));
+    }
+    function vwOverdue(item) {
+        if (item.overdue)
+            return glyph("hourglass", { title: item.my_turn ? "Er að renna út á tíma" : "Getur þvingað fram uppgjöf" });
+        return glyphGrayed("hourglass");
+    }
+    function vwTileCount(item) {
+        const winLose = item.sc0 < item.sc1 ? ".losing" : "";
+        return m(".tilecount", m(".tc" + winLose, { style: { width: item.tile_count.toString() + "%" } }));
+    }
+    return {
+        view: (vnode) => {
+            const { view, item, i } = vnode.attrs;
+            return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
+                m(m.route.Link, { href: gameUrl(item.url) }, [
+                    vwTurn(item),
+                    m("span.list-overdue", vwOverdue(item)),
+                    m("span.list-ts-short", item.ts),
+                    vwOpp(item)
+                ]),
+                m(UserInfoButton, {
+                    view,
+                    item: { userid: item.oppid, nick: item.opp, fullname: item.fullname },
+                }),
+                m("span.list-s0", item.sc0),
+                m("span.list-colon", ":"),
+                m("span.list-s1", item.sc1),
+                m("span.list-tc", vwTileCount(item)),
+                m(ProModeIndicator, { manual: item.prefs?.manual })
+            ]);
+        }
+    };
+};
+const GameList = () => {
+    // Shows a list of games in progress, obtained from view.model.gameList
+    return {
+        view: (vnode) => {
+            const { view, id } = vnode.attrs;
+            const { model } = view;
+            const { gameList, loadingGameList, loadingAllLists } = model;
+            // Trigger loading of game list if needed
+            if (gameList === null)
+                model.loadGameList();
+            return [
+                m(".listitem.listheader", [
+                    m("span.list-myturn", glyphGrayed("flag", { title: ts('Átt þú leik?') })),
+                    m("span.list-overdue", glyphGrayed("hourglass", { title: ts('Langt frá síðasta leik?') })),
+                    mt("span.list-ts-short", "Síðasti leikur"),
+                    mt("span.list-opp", "Andstæðingur"),
+                    mt("span.list-info-hdr", "Ferill"),
+                    mt("span.list-scorehdr", "Staða"),
+                    mt("span.list-tc", "Framvinda"),
+                    m(ProModeIndicator, { header: true }),
+                ]),
+                m("div", { id }, !gameList ? "" : gameList.map((item, i) => m(GameListEntry, { view, item, i }))),
+                m(Hint, { loadingGameList, loadingAllLists, gameList }),
+            ];
+        }
+    };
+};
+
+/*
+
+  Challengelist.ts
+
+  List of challenges (received and sent) display component
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjalmur Thorsteinsson
+
+  The Creative Commons Attribution-NonCommercial 4.0
+  International Public License (CC-BY-NC 4.0) applies to this software.
+  For further information, see https://github.com/mideind/Netskrafl
+
+*/
+const ChallengeListEntry = (initialVnode) => {
+    // Generate a list item about a pending challenge (issued or received)
+    const { view, item, i } = initialVnode.attrs;
+    const { model } = view;
+    function challengeDescription(json) {
+        /* Return a human-readable string describing a challenge
+        according to the enclosed preferences */
+        if (!json || json.duration === undefined || json.duration === 0)
+            /* Normal unbounded (untimed) game */
+            return t("Venjuleg ótímabundin viðureign");
+        return t("with_clock", { duration: json.duration.toString() });
+    }
+    function markChallenge(ev) {
+        // Clicked the icon at the beginning of the line,
+        // to decline a received challenge or retract an issued challenge
+        ev.preventDefault();
+        if (item.received) {
+            view.actions.declineChallenge(item.userid, item.key);
+        }
+        else {
+            view.actions.retractChallenge(item.userid, item.key);
+        }
+    }
+    function clickChallenge(ev) {
+        // Clicked the hotspot area to accept a received challenge
+        ev.preventDefault();
+        if (!model.moreGamesAllowed()) {
+            // User must be a friend to be able to accept more challenges
+            const state = model.state;
+            if (state) {
+                logEvent("hit_game_limit", {
+                    userid: state.netskraflUserId,
+                    locale: state.locale,
+                    limit: model.maxFreeGames
+                });
+            }
+            // Promote a subscription to Netskrafl/Explo
+            view.showFriendPromo();
+            return;
+        }
+        if (item.received) {
+            if (item.prefs && item.prefs.duration !== undefined && item.prefs.duration > 0)
+                // Timed game: display a modal wait dialog
+                view.pushDialog("wait", {
+                    oppId: item.userid,
+                    oppNick: item.opp,
+                    oppName: item.fullname,
+                    duration: item.prefs.duration,
+                    challengeKey: item.key,
+                });
+            else
+                // Ask the server to create a new game and route to it
+                view.actions.startNewGame(item.userid, false);
+        }
+        else {
+            // Clicking on a sent challenge, i.e. a timed game
+            // where the opponent is waiting and ready to start
+            view.showAcceptDialog(item.userid, item.opp, item.key);
+        }
+    }
+    return {
+        view: () => {
+            const oppReady = !item.received && item.opp_ready &&
+                item.prefs && item.prefs.duration !== undefined &&
+                item.prefs.duration > 0;
+            const clickable = item.received || oppReady;
+            const descr = challengeDescription(item.prefs);
+            return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
+                m("span.list-ch", { onclick: markChallenge }, item.received ?
+                    glyph("thumbs-down", { title: ts("Hafna") })
+                    :
+                        glyph("hand-right", { title: ts("Afturkalla") })),
+                m(clickable ? "a.flex" : "span.flex", clickable ? {
+                    href: "#",
+                    onclick: clickChallenge,
+                    class: oppReady ? "opp-ready" : ""
+                } : {}, [
+                    m("span.list-ts", item.ts),
+                    m("span.list-nick", { title: item.fullname }, item.opp),
+                    m("span.list-chall", [
+                        item.prefs.fairplay ? m("span.fairplay-btn", { title: ts("Án hjálpartækja") }) : "",
+                        item.prefs.manual ? m("span.manual-btn", { title: ts("Keppnishamur") }) : "",
+                        descr
+                    ])
+                ]),
+                m(UserInfoButton, {
+                    view,
+                    item: {
+                        userid: item.userid,
+                        nick: item.opp,
+                        fullname: item.fullname,
+                    }
+                }),
+            ]);
+        }
+    };
+};
+const ChallengeList = {
+    // Shows a list of challenges (received or sent), obtained from view.model.challengeList
+    view: (vnode) => {
+        const { view, showReceived } = vnode.attrs;
+        const { model } = view;
+        if (!model.state)
+            return [];
+        // Trigger loading of challenge list if needed
+        if (model.challengeList === null)
+            model.loadChallengeList();
+        let cList = [];
+        if (model.challengeList)
+            cList = showReceived ?
+                model.challengeList.filter((item) => item.received) :
+                model.challengeList.filter((item) => !item.received);
+        const listContent = m("div", { id: showReceived ? 'chall-received' : 'chall-sent' }, cList.map((item, i) => m(ChallengeListEntry, { view, item, i })));
+        if (showReceived)
+            // Challenges received
+            return [
+                m(".listitem.listheader", [
+                    m("span.list-icon", glyphGrayed("thumbs-down", { title: ts('Hafna') })),
+                    mt("span.list-ts", "Hvenær"),
+                    mt("span.list-nick", "Áskorandi"),
+                    mt("span.list-chall", "Hvernig"),
+                    mt("span.list-info-hdr", "Ferill"),
+                ]),
+                listContent
+            ];
+        else
+            // Challenges sent
+            return [
+                m(".listitem.listheader", [
+                    m("span.list-icon", glyphGrayed("hand-right", { title: ts('Afturkalla') })),
+                    mt("span.list-ts", "Hvenær"),
+                    mt("span.list-nick", "Andstæðingur"),
+                    mt("span.list-chall", "Hvernig"),
+                    mt("span.list-info-hdr", "Ferill"),
+                ]),
+                listContent
+            ];
+    }
+};
+
 /*
 
   EloPage.ts
@@ -31764,7 +32398,6 @@ const EloList = (initialVnode) => {
         view: (vnode) => {
             function itemize(item, i) {
                 // Generate a list item about a user in an Elo ranking table
-                var _a;
                 const isRobot = item.userid.indexOf("robot-") === 0;
                 function rankStr(rank, ref) {
                     // Return a rank string or dash if no rank or not meaningful
@@ -31775,7 +32408,7 @@ const EloList = (initialVnode) => {
                 }
                 let nick = item.nick;
                 let ch = m("span.list-ch", nbsp());
-                const userId = (_a = state === null || state === void 0 ? void 0 : state.userId) !== null && _a !== void 0 ? _a : "";
+                const userId = state?.netskraflUserId ?? "";
                 if (item.userid != userId && !item.inactive) {
                     ch = m(ChallengeButton, { view: outerView, item });
                 }
@@ -31809,6 +32442,135 @@ const EloList = (initialVnode) => {
     };
 };
 
+/*
+
+  Userlist.ts
+
+  User list display component
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjalmur Thorsteinsson
+
+  The Creative Commons Attribution-NonCommercial 4.0
+  International Public License (CC-BY-NC 4.0) applies to this software.
+  For further information, see https://github.com/mideind/Netskrafl
+
+*/
+const UserList = () => {
+    // Shows a list of users, obtained from view.model.userList
+    function itemize(view, item, i) {
+        // Generate a list item about a user
+        const isRobot = item.userid.indexOf("robot-") === 0;
+        let fullname = [];
+        // Online and accepting challenges
+        if (item.ready && !isRobot) {
+            fullname.push(m("span.ready-btn", { title: ts("Álínis og tekur við áskorunum") }));
+            fullname.push(nbsp());
+        }
+        // Willing to accept challenges for timed games
+        if (item.ready_timed) {
+            fullname.push(m("span.timed-btn", { title: ts("Til í viðureign með klukku") }));
+            fullname.push(nbsp());
+        }
+        // Fair play commitment
+        if (item.fairplay) {
+            fullname.push(m("span.fairplay-btn", { title: ts("Skraflar án hjálpartækja") }));
+            fullname.push(nbsp());
+        }
+        fullname.push(item.fullname);
+        function fav() {
+            if (isRobot)
+                return m("span.list-fav", { style: { cursor: "default" } }, glyph("star-empty"));
+            return m("span.list-fav", {
+                title: ts("Uppáhald"),
+                onclick: (ev) => {
+                    view.actions.toggleFavorite(item.userid, item.fav);
+                    item.fav = !item.fav;
+                    ev.preventDefault();
+                }
+            }, glyph(item.fav ? "star" : "star-empty"));
+        }
+        function userLink() {
+            if (isRobot)
+                return m("a", {
+                    href: "",
+                    onclick: (ev) => {
+                        // Start a new game against the robot
+                        view.actions.startRobotGame(item.userid);
+                        ev.preventDefault();
+                    }
+                }, [
+                    m("span.list-nick", [glyph("cog"), nbsp(), item.nick]),
+                    m("span.list-fullname-robot", fullname)
+                ]);
+            else
+                return [
+                    m("span.list-nick", item.nick),
+                    m("span.list-fullname", fullname),
+                    m("span.list-human-elo", item.human_elo)
+                ];
+        }
+        return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
+            m(ChallengeButton, { view, item }),
+            fav(),
+            userLink(),
+            m(UserInfoButton, { view, item }),
+        ]);
+    }
+    return {
+        view: (vnode) => {
+            const { view, id } = vnode.attrs;
+            const { model } = view;
+            // The type of list to show; by default it's 'robots'
+            const query = model.userListCriteria?.query ?? "";
+            const spec = model.userListCriteria?.spec ?? "";
+            const loadingElo = model.eloRatingSpec === undefined;
+            const listType = query || "robots";
+            if (listType === "elo" || loadingElo)
+                // Show Elo list
+                return [
+                    m(EloPage, {
+                        id: "elolist",
+                        view: view,
+                        spec: model.eloRatingSpec ?? null,
+                        key: "elopage",
+                    })
+                ];
+            // Show normal user list
+            let list = [];
+            if (model.userList === undefined) ;
+            else if (model.userList === null || query !== listType) {
+                view.actions.loadUsersByType(listType, true);
+            }
+            else {
+                list = model.userList;
+            }
+            const nothingFound = list.length === 0 && listType === "search" && spec !== "";
+            const robotList = listType === "robots";
+            return [
+                m(".listitem.listheader", [
+                    m("span.list-ch", glyphGrayed("hand-right", { title: ts('Skora á') })),
+                    m("span.list-fav", glyph("star-empty", { title: ts('Uppáhald') })),
+                    mt("span.list-nick", "Einkenni"),
+                    mt("span.list-fullname", "Nafn og merki"),
+                    robotList ? "" : mt("span.list-human-elo[id='usr-list-elo']", "Elo"),
+                    robotList ? "" : mt("span.list-info-hdr[id='usr-list-info']", "Ferill"),
+                ]),
+                m("div", { id }, list.map((item, i) => itemize(view, item, i))),
+                // Show indicator if search didn't find any users matching the criteria
+                nothingFound ?
+                    m("div", { id: "user-no-match", style: { display: "block" } }, [
+                        glyph("search"),
+                        " ",
+                        m("span", { id: "search-prefix" }, spec),
+                        t(" finnst ekki")
+                    ])
+                    : undefined
+            ];
+        }
+    };
+};
+
 /*
 
   Statsdisplay.ts
@@ -31835,7 +32597,6 @@ const StatsDisplay = () => {
     }
     return {
         view: (vnode) => {
-            var _a, _b;
             // Display statistics about this user
             var s = vnode.attrs.ownStats;
             var winRatio = 0, winRatioHuman = 0;
@@ -31860,13 +32621,13 @@ const StatsDisplay = () => {
                     m(".option.small" + (sel === 2 ? ".selected" : ""), { id: 'opt2' }, glyph("cog"))
                 ]),
                 sel === 1 ? m("div", { id: 'own-stats-human', className: 'stats-box', style: { display: "inline-block" } }, [
-                    m(".stats-fig", { title: ts('Elo-stig') }, s ? vwStat((_a = s.locale_elo) === null || _a === void 0 ? void 0 : _a.human_elo, "crown") : ""),
+                    m(".stats-fig", { title: ts('Elo-stig') }, s ? vwStat(s.locale_elo?.human_elo, "crown") : ""),
                     m(".stats-fig.stats-games", { title: ts('Fjöldi viðureigna') }, s ? vwStat(s.human_games, "th") : ""),
                     m(".stats-fig.stats-win-ratio", { title: ts('Vinningshlutfall') }, vwStat(winRatioHuman, "bookmark", "%")),
                     m(".stats-fig.stats-avg-score", { title: ts('Meðalstigafjöldi') }, vwStat(avgScoreHuman, "dashboard"))
                 ]) : "",
                 sel === 2 ? m("div", { id: 'own-stats-all', className: 'stats-box', style: { display: "inline-block" } }, [
-                    m(".stats-fig", { title: ts("Elo-stig") }, s ? vwStat((_b = s.locale_elo) === null || _b === void 0 ? void 0 : _b.elo, "crown") : ""),
+                    m(".stats-fig", { title: ts("Elo-stig") }, s ? vwStat(s.locale_elo?.elo, "crown") : ""),
                     m(".stats-fig.stats-games", { title: ts('Fjöldi viðureigna') }, s ? vwStat(s.games, "th") : ""),
                     m(".stats-fig.stats-win-ratio", { title: ts('Vinningshlutfall') }, vwStat(winRatio, "bookmark", "%")),
                     m(".stats-fig.stats-avg-score", { title: ts('Meðalstigafjöldi') }, vwStat(avgScore, "dashboard"))
@@ -31898,7 +32659,6 @@ const SearchButton = (initialVnode) => {
     let spec = ""; // The current search pattern
     let promise = undefined;
     function newSearch() {
-        var _a, _b;
         // There may have been a change of search parameters: react
         if (promise !== undefined) {
             // There was a previous promise, now obsolete: make it
@@ -31906,13 +32666,13 @@ const SearchButton = (initialVnode) => {
             promise.result = false;
             promise = undefined;
         }
-        let sel = ((_a = model.userListCriteria) === null || _a === void 0 ? void 0 : _a.query) || "robots";
+        let sel = model.userListCriteria?.query || "robots";
         if (sel !== "search") {
             // Not already in a search: load the user list immediately
             view.actions.searchUsers(spec, true);
             return;
         }
-        if (spec === ((_b = model.userListCriteria) === null || _b === void 0 ? void 0 : _b.spec))
+        if (spec === model.userListCriteria?.spec)
             // We're already looking at the same search spec: done
             return;
         // We're changing the search spec.
@@ -31944,18 +32704,16 @@ const SearchButton = (initialVnode) => {
     }
     return {
         view: () => {
-            var _a;
-            const sel = ((_a = model.userListCriteria) === null || _a === void 0 ? void 0 : _a.query) || "robots";
+            const sel = model.userListCriteria?.query || "robots";
             return m(".user-cat[id='user-search']", [
                 glyph("search", {
                     id: 'search',
                     className: (sel == "search" ? "shown" : ""),
                     onclick: () => {
-                        var _a;
                         // Reset the search pattern when clicking the search icon
                         spec = "";
                         newSearch();
-                        (_a = document.getElementById("search-id")) === null || _a === void 0 ? void 0 : _a.focus();
+                        document.getElementById("search-id")?.focus();
                     }
                 }),
                 nbsp(),
@@ -32058,8 +32816,7 @@ function makeTabs(view, id, createFunc, wireHrefs, vnode) {
             ev.preventDefault();
         };
         const clickUserPrefs = (ev) => {
-            var _a;
-            if ((_a = model === null || model === void 0 ? void 0 : model.state) === null || _a === void 0 ? void 0 : _a.userId)
+            if (model?.state?.netskraflUserId)
                 // Don't show the userprefs if no user logged in
                 view.pushDialog("userprefs");
             ev.preventDefault();
@@ -32109,8 +32866,7 @@ function updateTabVisibility(vnode) {
     const selected = vnode.state.selected;
     const lis = vnode.state.lis;
     vnode.state.ids.map((id, i) => {
-        var _a;
-        (_a = document.getElementById(id)) === null || _a === void 0 ? void 0 : _a.setAttribute("style", "display: " +
+        document.getElementById(id)?.setAttribute("style", "display: " +
             (i == selected ? "block" : "none"));
         lis[i].classList.toggle("ui-tabs-active", i === selected);
         lis[i].classList.toggle("ui-state-active", i === selected);
@@ -32194,551 +32950,219 @@ const BestDisplay = () => {
   For further information, see https://github.com/mideind/Netskrafl
 
 */
-const Main = () => {
-    // Main screen with tabs
-    function vwMainTabs(view) {
-        const model = view.model;
-        function vwMainTabHeader() {
-            const numGames = model.numGames;
-            const numChallenges = model.numChallenges;
-            return [
-                m(HeaderLogo, { hidden: true }),
-                m("ul", [
-                    m("li", m("a[href='#tabs-1']", [
-                        glyph("th"), m("span.tab-legend", t("Viðureignir")),
-                        m("span", {
-                            id: 'numgames',
-                            style: numGames ? 'display: inline-block' : ''
-                        }, numGames)
-                    ])),
-                    m("li", m("a[href='#tabs-2']", [
-                        glyph("hand-right"), m("span.tab-legend", t("Áskoranir")),
-                        // Blink if we have timed games where the opponent is ready
-                        m("span" + (model.oppReady ? ".opp-ready" : ""), {
-                            id: "numchallenges",
-                            style: numChallenges ? 'display: inline-block' : ''
-                        }, numChallenges)
-                    ])),
-                    m("li", m("a[href='#tabs-3']", [glyph("user"), m("span.tab-legend", t("Andstæðingar"))])),
-                    m("li.no-mobile-list", m("a[href='#tabs-4']", [glyph("bookmark"), m("span.tab-legend", t("Ferill"))]))
-                ])
-            ];
-        }
-        function vwGamelist() {
-            function vwList() {
-                function viewGameList() {
-                    if (!model.gameList)
-                        return "";
-                    return model.gameList.map((item, i) => {
-                        // Show a list item about a game in progress (or recently finished)
-                        function vwOpp() {
-                            let arg = item.oppid === null ? [glyph("cog"), nbsp(), item.opp] : item.opp;
-                            return m("span.list-opp", { title: item.fullname }, arg);
-                        }
-                        function vwTurn() {
-                            let turnText = "";
-                            let flagClass = "";
-                            if (item.my_turn) {
-                                turnText = ts("Þú átt leik");
-                            }
-                            else if (item.zombie) {
-                                turnText = ts("Viðureign lokið");
-                                flagClass = ".zombie";
-                            }
-                            else {
-                                // {opponent}'s move
-                                turnText = ts("opp_move", { opponent: item.opp });
-                                flagClass = ".grayed";
-                            }
-                            return m("span.list-myturn", m("span.glyphicon.glyphicon-flag" + flagClass, { title: turnText }));
-                        }
-                        function vwOverdue() {
-                            if (item.overdue)
-                                return glyph("hourglass", { title: item.my_turn ? "Er að renna út á tíma" : "Getur þvingað fram uppgjöf" });
-                            return glyphGrayed("hourglass");
-                        }
-                        function vwTileCount() {
-                            const winLose = item.sc0 < item.sc1 ? ".losing" : "";
-                            return m(".tilecount", m(".tc" + winLose, { style: { width: item.tile_count.toString() + "%" } }));
-                        }
-                        return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
-                            m(m.route.Link, { href: gameUrl(item.url) }, [
-                                vwTurn(),
-                                m("span.list-overdue", vwOverdue()),
-                                m("span.list-ts-short", item.ts),
-                                vwOpp()
-                            ]),
-                            m(UserInfoButton, {
-                                view,
-                                item: { userid: item.oppid, nick: item.opp, fullname: item.fullname },
-                            }),
-                            m("span.list-s0", item.sc0),
-                            m("span.list-colon", ":"),
-                            m("span.list-s1", item.sc1),
-                            m("span.list-tc", vwTileCount()),
-                            m("span.list-manual", item.manual
-                                ? glyph("lightbulb", { title: ts("Keppnishamur") })
-                                : glyphGrayed("lightbulb"))
-                        ]);
-                    });
-                }
-                if (model.gameList === null)
-                    model.loadGameList();
-                return m("div", { id: 'gamelist' }, viewGameList());
-            }
-            function vwHint() {
-                // Show some help if the user has no games in progress
-                if (model.loadingGameList
-                    || model.loadingAllLists
-                    || (model.gameList !== null && model.gameList.length > 0))
-                    // Either we have games in progress or the game list is being loaded
-                    return "";
-                return m(".hint", { style: { display: "block" } }, [
-                    m("p", [
-                        "Ef þig vantar einhvern til að skrafla við, veldu flipann ",
-                        m(m.route.Link, { href: "/main?tab=2" }, [glyph("user"), nbsp(), "Andstæðingar"]),
-                        " og skoraðu á tölvuþjarka - ",
-                        glyph("cog"), nbsp(), m("b", "Amlóða"),
-                        ", ",
-                        glyph("cog"), nbsp(), m("b", "Miðlung"),
-                        " eða ",
-                        glyph("cog"), nbsp(), m("b", "Fullsterkan"),
-                        " - eða veldu þér annan leikmann úr stafrófs\u00ADlistunum " + // Soft hyphen
-                            " sem þar er að finna til að skora á."
-                    ]),
-                    m("p", [
-                        "Þú stofnar áskorun með því að smella á bendi-teiknið ",
-                        glyph("hand-right", { style: { "margin-left": "6px", "margin-right": "6px" } }),
-                        " vinstra megin við nafn andstæðingsins."
-                    ]),
-                    m("p", "Tölvuþjarkarnir eru ætíð reiðubúnir að skrafla og viðureign við þá " +
-                        " hefst strax. Aðrir leikmenn þurfa að samþykkja áskorun áður en viðureign hefst."),
-                    m("p.no-mobile-block", [
-                        m(m.route.Link, { href: "/help" }, "Hjálp"),
-                        " má fá með því að smella á bláa ",
-                        glyph("info-sign"), nbsp(), "-", nbsp(),
-                        "teiknið hér til vinstri."
-                    ]),
-                    m("p.no-mobile-block", "Þú kemst alltaf aftur í þessa aðalsíðu með því að smella á " +
-                        "örvarmerkið efst vinstra megin við skraflborðið.")
-                ]);
-            }
-            return [
-                m(".listitem.listheader", [
-                    m("span.list-myturn", glyphGrayed("flag", { title: ts('Átt þú leik?') })),
-                    m("span.list-overdue", glyphGrayed("hourglass", { title: ts('Langt frá síðasta leik?') })),
-                    mt("span.list-ts-short", "Síðasti leikur"),
-                    mt("span.list-opp", "Andstæðingur"),
-                    mt("span.list-info-hdr", "Ferill"),
-                    mt("span.list-scorehdr", "Staða"),
-                    mt("span.list-tc", "Framvinda"),
-                    m("span.list-manual", glyphGrayed("lightbulb", { title: ts('Keppnishamur') }))
-                ]),
-                vwList(),
-                vwHint()
-            ];
-        }
-        function vwChallenges(showReceived) {
-            function vwList() {
-                if (!model.state)
-                    return undefined;
-                const state = model.state;
-                function itemize(item, i) {
-                    // Generate a list item about a pending challenge (issued or received)
-                    function challengeDescription(json) {
-                        /* Return a human-readable string describing a challenge
-                            according to the enclosed preferences */
-                        if (!json || json.duration === undefined || json.duration === 0)
-                            /* Normal unbounded (untimed) game */
-                            return t("Venjuleg ótímabundin viðureign");
-                        return t("with_clock", { duration: json.duration.toString() });
-                    }
-                    function markChallenge(ev) {
-                        // Clicked the icon at the beginning of the line,
-                        // to decline a received challenge or retract an issued challenge
-                        ev.preventDefault();
-                        if (item.received) {
-                            view.actions.declineChallenge(item.userid, item.key);
-                        }
-                        else {
-                            view.actions.retractChallenge(item.userid, item.key);
-                        }
-                    }
-                    function clickChallenge(ev) {
-                        // Clicked the hotspot area to accept a received challenge
-                        ev.preventDefault();
-                        if (!model.moreGamesAllowed()) {
-                            // User must be a friend to be able to accept more challenges
-                            logEvent("hit_game_limit", {
-                                userid: state.userId,
-                                locale: state.locale,
-                                limit: model.maxFreeGames
-                            });
-                            // Promote a subscription to Netskrafl/Explo
-                            view.showFriendPromo();
-                            return;
-                        }
-                        if (item.received) {
-                            if (item.prefs && item.prefs.duration !== undefined && item.prefs.duration > 0)
-                                // Timed game: display a modal wait dialog
-                                view.pushDialog("wait", {
-                                    oppId: item.userid,
-                                    oppNick: item.opp,
-                                    oppName: item.fullname,
-                                    duration: item.prefs.duration,
-                                    challengeKey: item.key,
-                                });
-                            else
-                                // Ask the server to create a new game and route to it
-                                view.actions.startNewGame(item.userid, false);
-                        }
-                        else {
-                            // Clicking on a sent challenge, i.e. a timed game
-                            // where the opponent is waiting and ready to start
-                            view.showAcceptDialog(item.userid, item.opp, item.key);
-                        }
-                    }
-                    const oppReady = !item.received && item.opp_ready &&
-                        item.prefs && item.prefs.duration !== undefined &&
-                        item.prefs.duration > 0;
-                    const clickable = item.received || oppReady;
-                    const descr = challengeDescription(item.prefs);
-                    return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
-                        m("span.list-ch", { onclick: markChallenge }, item.received ?
-                            glyph("thumbs-down", { title: ts("Hafna") })
-                            :
-                                glyph("hand-right", { title: ts("Afturkalla") })),
-                        m(clickable ? "a.flex" : "span.flex", clickable ? {
-                            href: "#",
-                            onclick: clickChallenge,
-                            class: oppReady ? "opp-ready" : ""
-                        } : {}, [
-                            m("span.list-ts", item.ts),
-                            m("span.list-nick", { title: item.fullname }, item.opp),
-                            m("span.list-chall", [
-                                item.prefs.fairplay ? m("span.fairplay-btn", { title: ts("Án hjálpartækja") }) : "",
-                                item.prefs.manual ? m("span.manual-btn", { title: ts("Keppnishamur") }) : "",
-                                descr
-                            ])
-                        ]),
-                        m(UserInfoButton, {
-                            view,
-                            item: {
-                                userid: item.userid,
-                                nick: item.opp,
-                                fullname: item.fullname,
-                            }
-                        }),
-                    ]);
-                }
-                let cList = [];
-                if (model.challengeList)
-                    cList = showReceived ?
-                        model.challengeList.filter((item) => item.received) :
-                        model.challengeList.filter((item) => !item.received);
-                return m("div", {
-                    id: showReceived ? 'chall-received' : 'chall-sent',
-                    oninit: () => {
-                        if (model.challengeList === null)
-                            model.loadChallengeList();
-                    }
-                }, cList.map(itemize));
-            }
-            const n = vwList();
-            if (!n)
-                return [];
-            if (showReceived)
-                // Challenges received
-                return [
-                    m(".listitem.listheader", [
-                        m("span.list-icon", glyphGrayed("thumbs-down", { title: ts('Hafna') })),
-                        mt("span.list-ts", "Hvenær"),
-                        mt("span.list-nick", "Áskorandi"),
-                        mt("span.list-chall", "Hvernig"),
-                        mt("span.list-info-hdr", "Ferill"),
-                    ]),
-                    n
-                ];
-            else
-                // Challenges sent
-                return [
-                    m(".listitem.listheader", [
-                        m("span.list-icon", glyphGrayed("hand-right", { title: ts('Afturkalla') })),
-                        mt("span.list-ts", "Hvenær"),
-                        mt("span.list-nick", "Andstæðingur"),
-                        mt("span.list-chall", "Hvernig"),
-                        mt("span.list-info-hdr", "Ferill"),
-                    ]),
-                    n
-                ];
-        }
-        function vwRecentList() {
-            function vwList() {
-                if (model.recentList === null)
-                    model.loadRecentList();
-                return m(RecentList, {
-                    view,
-                    id: "recentlist",
-                    recentList: model.recentList || [],
-                });
-            }
-            return [
-                m(".listitem.listheader", [
-                    m("span.list-win", glyphGrayed("bookmark", { title: ts('Sigur') })),
-                    mt("span.list-ts-short", "Viðureign lauk"),
-                    mt("span.list-nick", "Andstæðingur"),
-                    mt("span.list-scorehdr", "Úrslit"),
-                    m("span.list-elo-hdr", [
-                        m("span.glyphicon.glyphicon-user.elo-hdr-left", { title: ts('Mennskir andstæðingar') }),
-                        t("Elo"),
-                        m("span.glyphicon.glyphicon-cog.elo-hdr-right", { title: ts('Allir andstæðingar') })
-                    ]),
-                    mt("span.list-duration", "Lengd"),
-                    m("span.list-manual", glyphGrayed("lightbulb", { title: ts('Keppnishamur') }))
+// Local components for MainTabs
+const MainTabHeader = {
+    // Tab navigation headers with game/challenge counts
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        const { model } = view;
+        const { numGames, numChallenges } = model;
+        return [
+            m(HeaderLogo, { hidden: true }),
+            m("ul", [
+                m("li", m("a[href='#tabs-1']", [
+                    glyph("th"), m("span.tab-legend", t("Viðureignir")),
+                    m("span", {
+                        id: 'numgames',
+                        style: numGames ? 'display: inline-block' : ''
+                    }, numGames)
+                ])),
+                m("li", m("a[href='#tabs-2']", [
+                    glyph("hand-right"), m("span.tab-legend", t("Áskoranir")),
+                    // Blink if we have timed games where the opponent is ready
+                    m("span" + (model.oppReady ? ".opp-ready" : ""), {
+                        id: "numchallenges",
+                        style: numChallenges ? 'display: inline-block' : ''
+                    }, numChallenges)
+                ])),
+                m("li", m("a[href='#tabs-3']", [glyph("user"), m("span.tab-legend", t("Andstæðingar"))])),
+                m("li.no-mobile-list", m("a[href='#tabs-4']", [glyph("bookmark"), m("span.tab-legend", t("Ferill"))]))
+            ])
+        ];
+    }
+};
+const RecentListWithHeader = {
+    // Recent games list with header
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        const { model } = view;
+        if (model.recentList === null)
+            model.loadRecentList();
+        return [
+            m(".listitem.listheader", [
+                m("span.list-win", glyphGrayed("bookmark", { title: ts('Sigur') })),
+                mt("span.list-ts-short", "Viðureign lauk"),
+                mt("span.list-nick", "Andstæðingur"),
+                mt("span.list-scorehdr", "Úrslit"),
+                m("span.list-elo-hdr", [
+                    m("span.glyphicon.glyphicon-user.elo-hdr-left", { title: ts('Mennskir andstæðingar') }),
+                    t("Elo"),
+                    m("span.glyphicon.glyphicon-cog.elo-hdr-right", { title: ts('Allir andstæðingar') })
                 ]),
-                vwList()
-            ];
-        }
-        function vwUserButton(id, icon, text) {
-            var _a;
-            // Select the type of user list (robots, fav, alike, elo)
-            const sel = ((_a = model.userListCriteria) === null || _a === void 0 ? void 0 : _a.query) || "robots";
-            return m("span", {
-                className: (id === sel ? "shown" : ""),
-                id: id,
-                onclick: (ev) => {
-                    if (id === "elo") {
-                        // Load Elo rating list, defaulting to the human-only rating
-                        model.userListCriteria = { query: "elo", spec: "human" };
-                        model.userList = null;
-                        view.actions.withSpinner(() => model.loadEloRatingList("human"));
-                    }
-                    else {
-                        // Load user list
-                        view.actions.loadUsersByType(id, true);
-                        model.eloRatingSpec = null;
-                        model.eloRatingList = null;
-                    }
-                    ev.preventDefault();
+                mt("span.list-duration", "Lengd"),
+                m(ProModeIndicator, { header: true })
+            ]),
+            m(RecentList, { view, id: "recentlist", recentList: model.recentList || [] })
+        ];
+    }
+};
+const UserButton = {
+    // User list type button (robots, fav, alike, elo)
+    view: (vnode) => {
+        const { view, buttonId, icon, text } = vnode.attrs;
+        const { model } = view;
+        const sel = model.userListCriteria?.query || "robots";
+        return m("span", {
+            className: (buttonId === sel ? "shown" : ""),
+            id: buttonId,
+            onclick: (ev) => {
+                if (buttonId === "elo") {
+                    // Load Elo rating list, defaulting to the human-only rating
+                    model.userListCriteria = { query: "elo", spec: "human" };
+                    model.userList = null;
+                    view.actions.withSpinner(() => model.loadEloRatingList("human"));
                 }
-            }, [glyph(icon, { style: { padding: 0 } }), nbsp(), text]);
-        }
-        function vwUserList() {
-            var _a, _b, _c, _d, _e;
-            function vwList(list) {
-                function itemize(item, i) {
-                    // Generate a list item about a user
-                    const isRobot = item.userid.indexOf("robot-") === 0;
-                    let fullname = [];
-                    // Online and accepting challenges
-                    if (item.ready && !isRobot) {
-                        fullname.push(m("span.ready-btn", { title: ts("Álínis og tekur við áskorunum") }));
-                        fullname.push(nbsp());
-                    }
-                    // Willing to accept challenges for timed games
-                    if (item.ready_timed) {
-                        fullname.push(m("span.timed-btn", { title: ts("Til í viðureign með klukku") }));
-                        fullname.push(nbsp());
-                    }
-                    // Fair play commitment
-                    if (item.fairplay) {
-                        fullname.push(m("span.fairplay-btn", { title: ts("Skraflar án hjálpartækja") }));
-                        fullname.push(nbsp());
-                    }
-                    fullname.push(item.fullname);
-                    function fav() {
-                        if (isRobot)
-                            return m("span.list-fav", { style: { cursor: "default" } }, glyph("star-empty"));
-                        return m("span.list-fav", {
-                            title: ts("Uppáhald"),
-                            onclick: (ev) => {
-                                view.actions.toggleFavorite(item.userid, item.fav);
-                                item.fav = !item.fav;
-                                ev.preventDefault();
-                            }
-                        }, glyph(item.fav ? "star" : "star-empty"));
-                    }
-                    function userLink() {
-                        if (isRobot)
-                            return m("a", {
-                                href: "",
-                                onclick: (ev) => {
-                                    // Start a new game against the robot
-                                    view.actions.startRobotGame(item.userid);
-                                    ev.preventDefault();
-                                }
-                            }, [
-                                m("span.list-nick", [glyph("cog"), nbsp(), item.nick]),
-                                m("span.list-fullname-robot", fullname)
-                            ]);
-                        else
-                            return m.fragment({}, [
-                                m("span.list-nick", item.nick),
-                                m("span.list-fullname", fullname),
-                                m("span.list-human-elo", item.human_elo)
-                            ]);
-                    }
-                    return m(".listitem" + (i % 2 === 0 ? ".oddlist" : ".evenlist"), [
-                        m(ChallengeButton, { view, item }),
-                        fav(),
-                        userLink(),
-                        m(UserInfoButton, { view, item }),
-                    ]);
+                else {
+                    // Load user list
+                    view.actions.loadUsersByType(buttonId, true);
+                    model.eloRatingSpec = null;
+                    model.eloRatingList = null;
                 }
-                return m("div", { id: "userlist" }, list.map(itemize));
-            }
-            // The type of list to show; by default it's 'robots'
-            const query = (_b = (_a = model.userListCriteria) === null || _a === void 0 ? void 0 : _a.query) !== null && _b !== void 0 ? _b : "";
-            const spec = (_d = (_c = model.userListCriteria) === null || _c === void 0 ? void 0 : _c.spec) !== null && _d !== void 0 ? _d : "";
-            const loadingElo = model.eloRatingSpec === undefined;
-            const listType = query || "robots";
-            if (listType === "elo" || loadingElo)
-                // Show Elo list
-                return [
-                    m(EloPage, {
-                        id: "elolist",
-                        view: view,
-                        spec: (_e = model.eloRatingSpec) !== null && _e !== void 0 ? _e : null,
-                        key: "elopage",
-                    })
-                ];
-            // Show normal user list
-            let list = [];
-            if (model.userList === undefined) ;
-            else if (model.userList === null || query !== listType) {
-                view.actions.loadUsersByType(listType, true);
-            }
-            else {
-                list = model.userList;
+                ev.preventDefault();
             }
-            const nothingFound = list.length === 0 && listType === "search" && spec !== "";
-            const robotList = listType === "robots";
-            return [
-                m(".listitem.listheader", [
-                    m("span.list-ch", glyphGrayed("hand-right", { title: ts('Skora á') })),
-                    m("span.list-fav", glyph("star-empty", { title: ts('Uppáhald') })),
-                    mt("span.list-nick", "Einkenni"),
-                    mt("span.list-fullname", "Nafn og merki"),
-                    robotList ? "" : mt("span.list-human-elo[id='usr-list-elo']", "Elo"),
-                    robotList ? "" : mt("span.list-info-hdr[id='usr-list-info']", "Ferill"),
-                ]),
-                vwList(list),
-                // Show indicator if search didn't find any users matching the criteria
-                nothingFound ?
-                    m("div", { id: "user-no-match", style: { display: "block" } }, [
-                        glyph("search"),
-                        " ",
-                        m("span", { id: "search-prefix" }, spec),
-                        t(" finnst ekki")
-                    ])
-                    : undefined
-            ];
-        }
-        function vwStats() {
-            // View the user's own statistics summary
-            const ownStats = model.ownStats;
-            if (ownStats === null)
-                model.loadOwnStats();
-            return ownStats && m(StatsDisplay, { view, id: 'own-stats', ownStats });
-        }
-        function vwBest() {
-            // View the user's own best game and word scores
-            const ownStats = model.ownStats;
-            if (ownStats === null)
-                model.loadOwnStats();
-            return ownStats && m(BestDisplay, { id: 'own-best', ownStats, myself: true });
-        }
-        function tab1() {
-            // Ongoing games
-            return m("div", { id: 'tabs-1' }, [
-                mt("p.no-mobile-block", [
-                    mt("strong", "Viðureignir sem standa yfir"),
-                    "click_on_game", // "Click on a game to view it and make a move if"
-                    glyph("flag"),
-                    " þú átt leik"
-                ]),
-                vwGamelist()
-            ]);
-        }
-        function tab2() {
-            // Challenges received and sent
-            return m("div", { id: 'tabs-2' }, [
-                mt("p.no-mobile-block", [
-                    mt("strong", "Skorað á þig"),
-                    "click_on_challenge", // "Click on a challenge to accept it and start a game, or on"
-                    glyph("thumbs-down", { style: { "margin-left": "6px", "margin-right": "6px" } }),
-                    " til að hafna henni"
-                ]),
-                vwChallenges(true),
-                mt("p.no-mobile-block", [
-                    mt("strong", "Þú skorar á aðra"),
-                    " - smelltu á ",
-                    glyph("hand-right", { style: { "margin-left": "6px", "margin-right": "6px" } }),
-                    " til að afturkalla áskorun"
-                ]),
-                vwChallenges(false)
-            ]);
-        }
-        function tab3() {
-            // Opponent lists
-            return m("div", { id: 'tabs-3' }, [
-                m("div", { id: 'initials' }, [
-                    m(".user-cat[id='user-headings']", [
-                        vwUserButton("robots", "cog", ts("Þjarkar")),
-                        " ",
-                        vwUserButton("fav", "star", ts("Uppáhalds")),
-                        " ",
-                        vwUserButton("live", "flash", ts("Álínis")),
-                        " ",
-                        vwUserButton("alike", "resize-small", ts("Svipaðir")),
-                        " ",
-                        vwUserButton("elo", "crown", ts("Topp 100"))
-                    ]),
-                    m(SearchButton, { view })
-                ]),
-                vwUserList()
-            ]);
-        }
-        function tab4() {
-            // Recent games and statistics
-            return m("div", { id: 'tabs-4' }, [
-                vwStats(),
-                vwBest(),
-                mt("p.no-mobile-block", [
-                    mt("strong", "Nýlegar viðureignir þínar"),
-                    "click_to_review" // "Click on a game to review it"
+        }, [glyph(icon, { style: { padding: 0 } }), nbsp(), text]);
+    }
+};
+const OwnStats = {
+    // User's own statistics summary
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        const { model } = view;
+        const { ownStats } = model;
+        if (ownStats === null)
+            model.loadOwnStats();
+        return ownStats ? m(StatsDisplay, { view, id: 'own-stats', ownStats }) : null;
+    }
+};
+const OwnBest = {
+    // User's own best game and word scores
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        const { model } = view;
+        const { ownStats } = model;
+        if (ownStats === null)
+            model.loadOwnStats();
+        return ownStats ? m(BestDisplay, { id: 'own-best', ownStats, myself: true }) : null;
+    }
+};
+const Tab1 = {
+    // Ongoing games tab
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        return m("div", { id: 'tabs-1' }, [
+            mt("p.no-mobile-block", [
+                mt("strong", "Viðureignir sem standa yfir"),
+                "click_on_game", // "Click on a game to view it and make a move if"
+                glyph("flag"),
+                " þú átt leik"
+            ]),
+            m(GameList, { view, id: 'gamelist' })
+        ]);
+    }
+};
+const Tab2 = {
+    // Challenges received and sent tab
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        return m("div", { id: 'tabs-2' }, [
+            mt("p.no-mobile-block", [
+                mt("strong", "Skorað á þig"),
+                "click_on_challenge", // "Click on a challenge to accept it and start a game, or on"
+                glyph("thumbs-down", { style: { "margin-left": "6px", "margin-right": "6px" } }),
+                " til að hafna henni"
+            ]),
+            m(ChallengeList, { view, showReceived: true }),
+            mt("p.no-mobile-block", [
+                mt("strong", "Þú skorar á aðra"),
+                " - smelltu á ",
+                glyph("hand-right", { style: { "margin-left": "6px", "margin-right": "6px" } }),
+                " til að afturkalla áskorun"
+            ]),
+            m(ChallengeList, { view, showReceived: false })
+        ]);
+    }
+};
+const Tab3 = {
+    // Opponent lists tab
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        return m("div", { id: 'tabs-3' }, [
+            m("div", { id: 'initials' }, [
+                m(".user-cat[id='user-headings']", [
+                    m(UserButton, { view, buttonId: "robots", icon: "cog", text: ts("Þjarkar") }),
+                    " ",
+                    m(UserButton, { view, buttonId: "fav", icon: "star", text: ts("Uppáhalds") }),
+                    " ",
+                    m(UserButton, { view, buttonId: "live", icon: "flash", text: ts("Álínis") }),
+                    " ",
+                    m(UserButton, { view, buttonId: "alike", icon: "resize-small", text: ts("Svipaðir") }),
+                    " ",
+                    m(UserButton, { view, buttonId: "elo", icon: "crown", text: ts("Topp 100") })
                 ]),
-                vwRecentList()
-            ]);
-        }
+                m(SearchButton, { view })
+            ]),
+            m(UserList, { view, id: 'userlist' })
+        ]);
+    }
+};
+const Tab4 = {
+    // Recent games and statistics tab
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        return m("div", { id: 'tabs-4' }, [
+            m(OwnStats, { view }),
+            m(OwnBest, { view }),
+            mt("p.no-mobile-block", [
+                mt("strong", "Nýlegar viðureignir þínar"),
+                "click_to_review" // "Click on a game to review it"
+            ]),
+            m(RecentListWithHeader, { view })
+        ]);
+    }
+};
+const MainTabs = {
+    // Main tabs component containing all tabs and their content
+    view: (vnode) => {
+        const { view } = vnode.attrs;
         return m(".tabbed-page", m("div", { id: 'main-tabs' }, [
-            vwMainTabHeader(),
+            m(MainTabHeader, { view }),
             m("div.tab-scroll-area", [
-                tab1(),
-                tab2(),
-                tab4(),
-                tab3(),
+                m(Tab1, { view }),
+                m(Tab2, { view }),
+                m(Tab4, { view }),
+                m(Tab3, { view }),
             ]),
         ]));
     }
-    return {
-        view: (vnode) => {
-            const view = vnode.attrs.view;
-            return m.fragment({}, [
-                m(LeftLogo, { hidden: true }), // No legend, scale up by 50%
-                m(UserId, { view }),
-                m(Info),
-                m(TogglerReady, { view }),
-                m(TogglerReadyTimed, { view }),
-                m("div", {
-                    oncreate: (vnode) => {
-                        makeTabs(view, "main-tabs", undefined, false, vnode);
-                    },
-                    onupdate: updateSelection
-                }, vwMainTabs(view)),
-            ]);
-        }
-    };
+};
+const Main = {
+    // Main screen with tabs
+    view: (vnode) => {
+        const { view } = vnode.attrs;
+        return [
+            m(LeftLogo, { hidden: true }), // No legend, scale up by 50%
+            m(UserId, { view }),
+            m(Info),
+            m(TogglerReady, { view }),
+            m(TogglerReadyTimed, { view }),
+            m("div", {
+                oncreate: (vnode) => {
+                    makeTabs(view, "main-tabs", undefined, false, vnode);
+                },
+                onupdate: updateSelection
+            }, m(MainTabs, { view })),
+        ];
+    }
 };
 
 /*
@@ -32771,13 +33195,12 @@ const _updateStats = (attrs, state) => {
     });
 };
 const _updateRecentList = (attrs, state) => {
-    var _a, _b;
     // Fetch the recent game list of the given user
     if (state.loadingRecentList)
         return;
     state.loadingRecentList = true;
     const { model } = attrs.view;
-    model.loadUserRecentList(attrs.userid, state.versusAll ? null : (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : "", (json) => {
+    model.loadUserRecentList(attrs.userid, state.versusAll ? null : model.state?.netskraflUserId ?? "", (json) => {
         if (json && json.result === 0)
             state.recentList = json.recentlist;
         else
@@ -32832,10 +33255,9 @@ const UserInfoDialog = {
                 m(".usr-info-fav", {
                     title: ts('Uppáhald'),
                     onclick: (ev) => {
-                        var _a;
                         // Toggle the favorite setting
                         ev.preventDefault();
-                        view.actions.toggleFavorite(vnode.attrs.userid, (_a = stats.favorite) !== null && _a !== void 0 ? _a : false);
+                        view.actions.toggleFavorite(vnode.attrs.userid, stats.favorite ?? false);
                         stats.favorite = !stats.favorite;
                     }
                 }, stats.favorite ? glyph("star") : glyph("star-empty"))
@@ -32865,7 +33287,7 @@ const UserInfoDialog = {
                     m("span.glyphicon.glyphicon-cog.elo-hdr-right", { title: ts('Allir andstæðingar') })
                 ]),
                 mt("span.list-duration", "Lengd"),
-                m("span.list-manual", glyphGrayed("lightbulb", { title: ts('Keppnishamur') }))
+                m(ProModeIndicator, { header: true })
             ]),
             m(RecentList, { view, id: 'usr-recent', recentList }), // Recent game list
             m(StatsDisplay, { view, id: 'usr-stats', ownStats: stats }),
@@ -32904,8 +33326,7 @@ const UserPrefsDialog = (initialVnode) => {
             m(".errinput", [glyph("arrow-up"), nbsp(), err[propname] || ""]) : "";
     }
     function getToggle(elemId) {
-        var _a;
-        const cls2 = (_a = document.querySelector("#" + elemId + "-toggler #opt2")) === null || _a === void 0 ? void 0 : _a.classList;
+        const cls2 = document.querySelector("#" + elemId + "-toggler #opt2")?.classList;
         if (!cls2)
             return false;
         return cls2.contains("selected");
@@ -33016,7 +33437,7 @@ const UserPrefsDialog = (initialVnode) => {
                             // Open the container's subscription page
                             ev.preventDefault();
                             logEvent("click_friend", {
-                                userid: state.userId, locale: state.locale
+                                userid: state.netskraflUserId, locale: state.locale
                             });
                             // Navigate to the container-supplied URL
                             window.location.href = state.subscriptionUrl;
@@ -33452,7 +33873,7 @@ const Buttons = {
             sc && r.push(sc);
         }
         // Is the server processing a move?
-        if (game === null || game === void 0 ? void 0 : game.moveInProgress) {
+        if (game?.moveInProgress) {
             r.push(m(".waitmove", m(".animated-waitmove", m(AnimatedNetskraflLogo, {
                 withCircle: false,
             }))));
@@ -33494,7 +33915,6 @@ class DragManager {
         return (p.x >= rect.left) && (p.x < rect.right) && (p.y >= rect.top) && (p.y < rect.bottom);
     }
     constructor(e, dropHandler) {
-        var _a, _b;
         this.parentElement = null;
         this.parentRect = null;
         this.offsetX = 0;
@@ -33515,7 +33935,7 @@ class DragManager {
         this.draggedElement = dragged;
         this.dropHandler = dropHandler;
         this.parentElement = dragged.parentElement;
-        this.parentRect = (_b = (_a = this.parentElement) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect()) !== null && _b !== void 0 ? _b : null;
+        this.parentRect = this.parentElement?.getBoundingClientRect() ?? null;
         // Find out the bounding rectangle of the element
         // before starting to apply modifications
         const rect = dragged.getBoundingClientRect();
@@ -33873,7 +34293,6 @@ const DropTargetSquare = {
 const RackTiles = {
     // A rack of 7 tiles (tiles only, no buttons)
     view: (vnode) => {
-        var _a;
         const { view, game, review } = vnode.attrs;
         // If review==true, this is a review rack
         // that is not a drop target and whose color reflects the
@@ -33882,7 +34301,7 @@ const RackTiles = {
             return undefined;
         const { model } = view;
         let r = [];
-        const reviewMove = (_a = model.reviewMove) !== null && _a !== void 0 ? _a : 0;
+        const reviewMove = model.reviewMove ?? 0;
         // Avoid flicker when paging through game review screen,
         // as model.reviewMove becomes undefined or 0 while we
         // are fetching the next move to display
@@ -34076,8 +34495,7 @@ const PlayerName = (initialVnode) => {
     const { view } = initialVnode.attrs;
     const model = view.model;
     function lookAtPlayer(game, ev, player, side) {
-        var _a;
-        if (!((_a = model.state) === null || _a === void 0 ? void 0 : _a.uiFullscreen))
+        if (!(model.state?.uiFullscreen))
             // Don't do anything on mobile, and allow the click
             // to propagate to the parent
             return;
@@ -34292,14 +34710,13 @@ const Chat = (initialVnode) => {
         return str;
     }
     function chatMessages() {
-        var _a, _b;
         let r = [];
-        if ((game === null || game === void 0 ? void 0 : game.chatLoading) || !(game === null || game === void 0 ? void 0 : game.messages))
+        if (game?.chatLoading || !game?.messages)
             return r;
         var key = 0;
-        const userId = (_b = (_a = model.state) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : "";
+        const userId = model.state?.netskraflUserId ?? "";
         for (const msg of game.messages) {
-            let p = player !== null && player !== void 0 ? player : 0;
+            let p = player ?? 0;
             if (msg.from_userid != userId)
                 p = 1 - p;
             const mTs = makeTimestamp(msg.ts, key);
@@ -34337,13 +34754,13 @@ const Chat = (initialVnode) => {
             setInput("msg", "");
         }
     }
-    const numMessages = (game === null || game === void 0 ? void 0 : game.messages) ? game.messages.length : 0;
+    const numMessages = game?.messages ? game.messages.length : 0;
     return {
         view: () => m(".chat-container", {
             style: "z-index: 6" // Appear on top of board on mobile
             // key: uuid
         }, [
-            m(".chat-area" + ((game === null || game === void 0 ? void 0 : game.showClock()) ? ".with-clock" : ""), {
+            m(".chat-area" + (game?.showClock() ? ".with-clock" : ""), {
                 id: 'chat-area',
                 // Make sure that we see the bottom-most chat message
                 oncreate: scrollChatToBottom,
@@ -34433,7 +34850,7 @@ const MoveListItem = (initialVnode) => {
                     else {
                         // Show a friend promotion dialog
                         logEvent("click_review", {
-                            userid: state.userId, locale: state.locale
+                            userid: state.netskraflUserId, locale: state.locale
                         });
                         view.showFriendPromo();
                     }
@@ -34617,7 +35034,7 @@ const Movelist = (initialVnode) => {
                 onupdate: () => { setTimeout(scrollMovelistToBottom); }
             }, movelist()),
             // Show the bag here on mobile
-            (state === null || state === void 0 ? void 0 : state.uiFullscreen) ? "" : m(Bag, { bag, newbag })
+            state?.uiFullscreen ? "" : m(Bag, { bag, newbag })
         ])
     };
 };
@@ -34788,7 +35205,7 @@ const RightColumn = (initialVnode) => {
                 break;
         }
         const tabgrp = m(TabGroup, { view });
-        return m(".right-area" + ((game === null || game === void 0 ? void 0 : game.showClock()) ? ".with-clock" : ""), component ? [tabgrp, component] : [tabgrp]);
+        return m(".right-area" + (game?.showClock() ? ".with-clock" : ""), component ? [tabgrp, component] : [tabgrp]);
     }
     return {
         view: () => m(".rightcol", [
@@ -34879,14 +35296,14 @@ const GameView = {
                 m(RightColumn, { view }),
                 m(BoardArea, { view, game }),
                 // The bag is visible in fullscreen
-                (state === null || state === void 0 ? void 0 : state.uiFullscreen) ? m(Bag, { bag: bag, newbag: newbag }) : "",
+                state?.uiFullscreen ? m(Bag, { bag: bag, newbag: newbag }) : "",
                 game.askingForBlank ? m(BlankDialog, { game }) : ""
             ]),
             // The left margin stuff: back button, square color help, info/help button
             // These elements appear after the game container, since we want
             // them to be above it in the z-order
             m(LeftLogo),
-            (state === null || state === void 0 ? void 0 : state.beginner) ? m(Beginner, { view, showClose: true }) : "",
+            state?.beginner ? m(Beginner, { view, showClose: true }) : "",
             m(Info),
         ]);
     }
@@ -35097,7 +35514,6 @@ const vwBestMove = (view, moveIndex, bestMoveIndex, move, info) => {
     }
 };
 const vwScoreReview = (view, moveIndex) => {
-    var _a;
     // Shows the score of the current move within a game review screen
     const game = view.model.game;
     if (!game)
@@ -35111,7 +35527,7 @@ const vwScoreReview = (view, moveIndex) => {
         return undefined;
     let sc = [".score"];
     if (moveIndex > 0) {
-        if (moveIndex % 2 === ((_a = game.player) !== null && _a !== void 0 ? _a : 0))
+        if (moveIndex % 2 === (game.player ?? 0))
             // Opponent's move
             sc.push("opponent");
         else
@@ -35259,12 +35675,11 @@ const vwStatsReview = (view) => {
     ]);
 };
 const vwButtonsReview = (view, moveIndex) => {
-    var _a, _b;
     // The navigation buttons below the board on the review screen
     const model = view.model;
     const game = model.game;
-    const numMoves = (_a = game === null || game === void 0 ? void 0 : game.moves.length) !== null && _a !== void 0 ? _a : 0;
-    const gameUuid = (_b = game === null || game === void 0 ? void 0 : game.uuid) !== null && _b !== void 0 ? _b : "";
+    const numMoves = game?.moves.length ?? 0;
+    const gameUuid = game?.uuid ?? "";
     let r = [];
     if (!gameUuid)
         return r;
@@ -35337,13 +35752,12 @@ const Review = (initialVnode) => {
     }
     return {
         view: () => {
-            var _a;
             let r = [];
             const { model } = view;
             const { game } = model;
             if (game) {
                 // Create a list of major elements that we're showing
-                const moveIndex = (_a = model.reviewMove) !== null && _a !== void 0 ? _a : 0;
+                const moveIndex = model.reviewMove ?? 0;
                 const bestMoves = model.bestMoves || [];
                 r.push(vwRightColumn(game, moveIndex, bestMoves));
                 r.push(m(BoardReview, { view, moveIndex }));
@@ -35498,12 +35912,11 @@ class View {
         this.actions.hideSpinner();
     }
     notifyMediaChange() {
-        var _a, _b;
         // The view is changing, between mobile and fullscreen
         // and/or between portrait and landscape: ensure that
         // we don't end up with a selected game tab that is not visible
         const model = this.model;
-        if (((_a = model.state) === null || _a === void 0 ? void 0 : _a.uiFullscreen) || ((_b = model.state) === null || _b === void 0 ? void 0 : _b.uiLandscape)) {
+        if (model.state?.uiFullscreen || model.state?.uiLandscape) {
             // In this case, there is no board tab:
             // show the movelist
             if (this.setSelectedTab("movelist"))
@@ -35540,7 +35953,7 @@ class View {
         }
         this.boardScale = 1.0;
         const boardParent = document.getElementById("board-parent");
-        const board = boardParent === null || boardParent === void 0 ? void 0 : boardParent.children[0];
+        const board = boardParent?.children[0];
         if (board) {
             board.style.transition = 'none';
             board.style.transform = `translate(0px, 0px) scale(1)`;
@@ -35549,7 +35962,6 @@ class View {
             boardParent.scrollTo(0, 0);
     }
     updateScale() {
-        var _a;
         const model = this.model;
         // Use either the regular game or the riddle (Gáta Dagsins)
         const game = model.game || model.riddle;
@@ -35560,7 +35972,7 @@ class View {
             // taking clamping into account to ensure that the board always fills
             // the viewport.
             const boardParent = document.getElementById("board-parent");
-            const board = boardParent === null || boardParent === void 0 ? void 0 : boardParent.children[0];
+            const board = boardParent?.children[0];
             if (!board || !boardParent)
                 return;
             const offset = 3;
@@ -35570,7 +35982,7 @@ class View {
             const c = coord(row, col);
             // board.style.transform = `translate(0, 0) scale(1.0)`;
             const el = document.getElementById("sq_" + c);
-            const elRect = el === null || el === void 0 ? void 0 : el.getBoundingClientRect();
+            const elRect = el?.getBoundingClientRect();
             const boardRect = boardParent.getBoundingClientRect();
             if (elRect && boardRect) {
                 // Get the dimensions of the scrollable area
@@ -35612,7 +36024,7 @@ class View {
                 }, 350);
             }
         };
-        if (!game || ((_a = model.state) === null || _a === void 0 ? void 0 : _a.uiFullscreen) || game.moveInProgress) {
+        if (!game || model.state?.uiFullscreen || game.moveInProgress) {
             // No game or we're in full screen mode: always 100% scale
             // Also, as soon as a move is being processed by the server, we zoom out
             this.boardScale = 1.0; // Needs to be done before setTimeout() call
@@ -35669,12 +36081,10 @@ class View {
         function wireQuestions(vnode) {
             // Clicking on a question brings the corresponding answer into view
             // This is achieved by wiring up all contained a[href="#faq-*"] links
-            var _a;
             function showAnswer(ev, href) {
-                var _a;
                 // this points to the vnode
                 vnode.state.selected = 1; // FAQ tab
-                (_a = vnode.dom.querySelector(href)) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
+                vnode.dom.querySelector(href)?.scrollIntoView();
                 ev.preventDefault();
             }
             const anchors = vnode.dom.querySelectorAll("a");
@@ -35688,7 +36098,7 @@ class View {
                 // Go to the FAQ tab and scroll the requested question into view
                 selectTab(vnode, 1);
                 vnode.state.selected = 1; // FAQ tab
-                (_a = vnode.dom.querySelector("#faq-" + faqNumber.toString())) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
+                vnode.dom.querySelector("#faq-" + faqNumber.toString())?.scrollIntoView();
             }
         }
         // Output literal HTML obtained from rawhelp.html on the server
@@ -35766,14 +36176,13 @@ class Actions {
         // when view is available
     }
     onNavigateTo(routeName, params, view) {
-        var _a, _b;
         // We have navigated to a new route
         // If navigating to something other than help,
         // we need to have a logged-in user
         const model = this.model;
         model.routeName = routeName;
         model.params = params;
-        const uuid = (_a = params.uuid) !== null && _a !== void 0 ? _a : "";
+        const uuid = params.uuid ?? "";
         if (routeName == "game") {
             // New game route: initiate loading of the game into the model
             if (model.game !== null) {
@@ -35783,10 +36192,9 @@ class Actions {
             const deleteZombie = params.zombie === "1";
             // Load the game, and attach it to the Firebase listener once it's loaded
             model.loadGame(uuid, () => {
-                var _a;
                 this.attachListenerToGame(uuid, view);
                 setTimeout(scrollMovelistToBottom);
-                if (!((_a = model.state) === null || _a === void 0 ? void 0 : _a.uiFullscreen))
+                if (!model.state?.uiFullscreen)
                     // Mobile UI: show board tab
                     view.setSelectedTab("board");
             }, deleteZombie);
@@ -35814,10 +36222,9 @@ class Actions {
                 // Different game than we had before: load it, and then
                 // fetch the best moves
                 model.loadGame(uuid, () => {
-                    var _a;
                     model.loadBestMoves(move);
                     setTimeout(scrollMovelistToBottom);
-                    if (!((_a = model.state) === null || _a === void 0 ? void 0 : _a.uiFullscreen))
+                    if (!model.state?.uiFullscreen)
                         // Mobile UI: show board tab
                         view.setSelectedTab("board");
                 });
@@ -35835,7 +36242,7 @@ class Actions {
                 model.game.cleanup();
                 model.game = null;
             }
-            const locale = ((_b = model.state) === null || _b === void 0 ? void 0 : _b.locale) || "is_IS";
+            const locale = model.state?.locale || "is_IS";
             if (routeName == "help") {
                 // Make sure that the help HTML is loaded upon first use
                 model.loadHelp();
@@ -35867,7 +36274,6 @@ class Actions {
         this.model.handleUserMoveMessage(json, firstAttach);
     }
     onChatMessage(json, firstAttach, view) {
-        var _a;
         // Handle an incoming chat message
         if (firstAttach) ;
         else {
@@ -35879,7 +36285,7 @@ class Actions {
                 // - User has audio enabled
                 // - Message is from opponent (not from current user)
                 const { state } = this.model;
-                const userId = (_a = state.userId) !== null && _a !== void 0 ? _a : "";
+                const userId = state.netskraflUserId ?? "";
                 if (state.audio && json.from_userid !== userId) {
                     playAudio(state, "new-msg");
                 }
@@ -35983,26 +36389,26 @@ class Actions {
     }
     attachListenerToUser() {
         const state = this.model.state;
-        // console.log(`attachListenerToUser(): userId=${state?.userId}`);
-        if (!state || !state.userId)
+        // console.log(`attachListenerToUser(): netskraflUserId=${state?.netskraflUserId}`);
+        if (!state || !state.netskraflUserId)
             return;
         // Listen to challenge and move notifications separately
-        attachFirebaseListener(`user/${state.userId}/challenge`, (json, firstAttach) => this.onUserChallengeMessage(json, firstAttach));
-        attachFirebaseListener(`user/${state.userId}/move`, (json, firstAttach) => this.onUserMoveMessage(json, firstAttach));
+        attachFirebaseListener(`user/${state.netskraflUserId}/challenge`, (json, firstAttach) => this.onUserChallengeMessage(json, firstAttach));
+        attachFirebaseListener(`user/${state.netskraflUserId}/move`, (json, firstAttach) => this.onUserMoveMessage(json, firstAttach));
     }
     detachListenerFromUser() {
         // Stop listening to Firebase notifications for the current user
         const state = this.model.state;
-        // console.log(`detachListenerFromUser(): userId=${state?.userId}`);
-        if (state && state.userId)
-            detachFirebaseListener('user/' + state.userId);
+        // console.log(`detachListenerFromUser(): netskraflUserId=${state?.netskraflUserId}`);
+        if (state && state.netskraflUserId)
+            detachFirebaseListener('user/' + state.netskraflUserId);
     }
     attachListenerToGame(uuid, view) {
         // Listen to Firebase events on the /game/[gameId]/[userId] path
         const state = this.model.state;
         if (!uuid || !state)
             return;
-        const basepath = `game/${uuid}/${state.userId}/`;
+        const basepath = `game/${uuid}/${state.netskraflUserId}/`;
         // New moves
         attachFirebaseListener(basepath + "move", (json, firstAttach) => this.onMoveMessage(json, firstAttach));
         // New chat messages
@@ -36013,7 +36419,7 @@ class Actions {
         const state = this.model.state;
         if (!uuid || !state)
             return;
-        const basepath = `game/${uuid}/${state.userId}/`;
+        const basepath = `game/${uuid}/${state.netskraflUserId}/`;
         detachFirebaseListener(basepath + "move");
         detachFirebaseListener(basepath + "chat");
     }
@@ -36038,7 +36444,6 @@ class Actions {
     }
     // Challenge Management Actions
     async handleChallenge(parameters) {
-        var _a;
         // Reject or retract a challenge
         if (!this.model.state)
             return;
@@ -36048,9 +36453,9 @@ class Actions {
                 url: "/challenge",
                 body: parameters
             });
-            if ((json === null || json === void 0 ? void 0 : json.result) === 0) {
+            if (json?.result === 0) {
                 // Log the change of challenge status (issue/decline/retract/accept)
-                const locale = ((_a = this.model.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
+                const locale = this.model.state?.locale || "is_IS";
                 var p = { locale };
                 if (parameters.duration !== undefined)
                     p.duration = parameters.duration;
@@ -36096,7 +36501,6 @@ class Actions {
     }
     // Game Management Actions
     async startNewGame(oppid, reverse = false) {
-        var _a;
         // Ask the server to initiate a new game against the given opponent
         if (!this.model.state)
             return;
@@ -36113,9 +36517,9 @@ class Actions {
                 body: rqBody
             };
             const json = await request(this.model.state, rq);
-            if (json === null || json === void 0 ? void 0 : json.ok) {
+            if (json?.ok) {
                 // Log the new game event
-                const locale = ((_a = this.model.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
+                const locale = this.model.state?.locale || "is_IS";
                 logEvent("new_game", {
                     uuid: json.uuid,
                     timed: reverse,
@@ -36205,14 +36609,14 @@ class Actions {
                 url: "/cancelplan",
                 body: {}
             });
-            if (json === null || json === void 0 ? void 0 : json.ok) {
+            if (json?.ok) {
                 // Successfully cancelled: immediately update the friend and hasPaid state
                 user.friend = false;
                 state.hasPaid = false;
                 state.plan = "";
                 // Log a friendship cancellation event
                 logEvent("cancel_plan", {
-                    userid: state.userId,
+                    userid: state.netskraflUserId,
                     locale: state.locale,
                     // Add plan identifiers here
                     plan: "friend"
@@ -36231,29 +36635,29 @@ class Actions {
         // Listen to global best score
         attachFirebaseListener(basePath + "best", (json, firstAttach) => this.onRiddleGlobalScoreUpdate(json, firstAttach));
         // Listen to group scores (if user has a group)
-        if (state === null || state === void 0 ? void 0 : state.userGroupId) {
+        if (state?.userGroupId) {
             attachFirebaseListener(basePath + `group/${state.userGroupId}/best`, (json, firstAttach) => this.onRiddleGroupScoreUpdate(json, firstAttach));
         }
         // Listen to global leaderboard
         attachFirebaseListener(basePath + "leaders", (json, firstAttach) => this.onLeaderboardUpdate(json, firstAttach));
         // Listen to user stats (if user is logged in)
-        if (state === null || state === void 0 ? void 0 : state.userId) {
-            attachFirebaseListener(`gatadagsins/users/${locale}/${state.userId}/stats`, (json, firstAttach) => this.onUserStatsUpdate(json, firstAttach));
+        if (state?.netskraflUserId) {
+            attachFirebaseListener(`gatadagsins/users/${locale}/${state.netskraflUserId}/stats`, (json, firstAttach) => this.onUserStatsUpdate(json, firstAttach));
             // Listen to personal best move (entire achievement object)
-            attachFirebaseListener(basePath + `achievements/${state.userId}`, (json, firstAttach) => this.onPersonalBestScoreUpdate(json, firstAttach));
+            attachFirebaseListener(basePath + `achievements/${state.netskraflUserId}`, (json, firstAttach) => this.onPersonalBestScoreUpdate(json, firstAttach));
         }
     }
     detachListenerFromRiddle(date, locale) {
         const { state } = this.model;
         const basePath = `gatadagsins/${date}/${locale}/`;
         detachFirebaseListener(basePath + "best");
-        if (state === null || state === void 0 ? void 0 : state.userGroupId) {
+        if (state?.userGroupId) {
             detachFirebaseListener(basePath + `group/${state.userGroupId}/best`);
         }
         detachFirebaseListener(basePath + "leaders");
-        if (state === null || state === void 0 ? void 0 : state.userId) {
-            detachFirebaseListener(`gatadagsins/users/${locale}/${state.userId}/stats`);
-            detachFirebaseListener(basePath + `achievements/${state.userId}`);
+        if (state?.netskraflUserId) {
+            detachFirebaseListener(`gatadagsins/users/${locale}/${state.netskraflUserId}/stats`);
+            detachFirebaseListener(basePath + `achievements/${state.netskraflUserId}`);
         }
     }
     onRiddleGlobalScoreUpdate(json, firstAttach) {
@@ -36461,7 +36865,6 @@ const NetskraflImpl = ({ state, tokenExpired }) => {
     }, []);
     */
     useEffect(() => {
-        var _a;
         // Load the Netskrafl (Mithril) UI for a new user
         if (!userEmail)
             return;
@@ -36471,7 +36874,7 @@ const NetskraflImpl = ({ state, tokenExpired }) => {
             return;
         }
         const elemId = `netskrafl-user-${userEmail}`;
-        if (((_a = container.firstElementChild) === null || _a === void 0 ? void 0 : _a.id) === elemId) {
+        if (container.firstElementChild?.id === elemId) {
             // The Netskrafl UI is already correctly mounted
             return;
         }
@@ -36497,8 +36900,8 @@ const NetskraflImpl = ({ state, tokenExpired }) => {
             // when the component is unmounted
             // console.log("Dismounting Netskrafl UI for user", userEmail);
             const container = document.getElementById("netskrafl-container");
-            const div = container === null || container === void 0 ? void 0 : container.firstElementChild;
-            if ((div === null || div === void 0 ? void 0 : div.id) === elemId) {
+            const div = container?.firstElementChild;
+            if (div?.id === elemId) {
                 document.body.appendChild(div);
             }
         };
@@ -37139,7 +37542,7 @@ const RightSideTabs = () => {
                 return m(".gatadagsins-right-side-tabs", "");
             }
             // Check if current user is on the leaderboard
-            const currentUserId = (state === null || state === void 0 ? void 0 : state.userId) || "";
+            const currentUserId = state?.netskraflUserId || "";
             const isOnLeaderboard = leaderboard && leaderboard.some(entry => entry.userId === currentUserId);
             const tabs = [
                 { id: "performance", label: ts("Frammistaða"), iconGlyph: "dashboard" },
@@ -37178,7 +37581,7 @@ const RightSideTabs = () => {
                     // Leaderboard tab
                     activeTab === "leaderboard" ? m(LeaderboardView, {
                         leaderboard: view.model.leaderboard || [],
-                        currentUserId: (state === null || state === void 0 ? void 0 : state.userId) || "",
+                        currentUserId: state?.netskraflUserId || "",
                         date: riddle.date,
                         loading: false
                     }) : null
@@ -37355,7 +37758,7 @@ const StatsModal = () => {
                 return null;
             }
             // Check if current user is on the leaderboard
-            const currentUserId = (state === null || state === void 0 ? void 0 : state.userId) || "";
+            const currentUserId = state?.netskraflUserId || "";
             const isOnLeaderboard = leaderboard && leaderboard.some(entry => entry.userId === currentUserId);
             const tabs = [
                 { id: "stats", label: ts("Tölfræði"), iconGlyph: "stats" },
@@ -37401,7 +37804,7 @@ const StatsModal = () => {
                             }) : null,
                             activeTab === "leaderboard" ? m(LeaderboardView, {
                                 leaderboard: view.model.leaderboard || [],
-                                currentUserId: (state === null || state === void 0 ? void 0 : state.userId) || "",
+                                currentUserId: state?.netskraflUserId || "",
                                 date: riddle.date,
                                 loading: false
                             }) : null
@@ -37429,8 +37832,7 @@ const StatsModal = () => {
 */
 const MAX_MOVES_TO_DISPLAY = 10;
 const currentMoveState = (riddle) => {
-    var _a, _b, _c;
-    const thisPlayer = ((_a = riddle.model.state) === null || _a === void 0 ? void 0 : _a.userId) || "";
+    const thisPlayer = riddle.model.state?.netskraflUserId || "";
     const { bestPossibleScore, // The highest score achievable for this riddle
     globalBestScore, // The best score achieved by any player
     groupBestScore, // The best score achieved within the player's group
@@ -37451,7 +37853,7 @@ const currentMoveState = (riddle) => {
     // Check whether we need to add or annotate the global best score
     if (globalBestScore && globalBestScore.score > 0) {
         const { score, word, coord } = globalBestScore;
-        if (((_c = (_b = selectedMoves[0]) === null || _b === void 0 ? void 0 : _b.score) !== null && _c !== void 0 ? _c : 0) >= score) {
+        if ((selectedMoves[0]?.score ?? 0) >= score) {
             // This player has made a move that scores the same
             // or better as the top score: mark the move
             selectedMoves[0].isGlobalBestScore = true;
@@ -37493,7 +37895,6 @@ const GataDagsins$1 = () => {
             showStatsModal = false;
         },
         view: (vnode) => {
-            var _a;
             const { view } = vnode.attrs;
             const { model } = view;
             const { riddle } = model;
@@ -37528,7 +37929,7 @@ const GataDagsins$1 = () => {
                     // These elements appear after the main container for proper z-order
                     // m(LeftLogo), // Currently no need for the logo for Gáta Dagsins
                     // Show the Beginner component if the user is a beginner
-                    ((_a = model.state) === null || _a === void 0 ? void 0 : _a.beginner) ? m(Beginner, { view, showClose: false }) : "",
+                    model.state?.beginner ? m(Beginner, { view, showClose: false }) : "",
                     // Custom Info button for GataDagsins that shows help dialog
                     m(".info", { title: ts("Upplýsingar og hjálp") }, m("a.iconlink", { href: "#", onclick: (e) => { e.preventDefault(); toggleHelp(); } }, glyph("info-sign"))),
                     // Help dialog and backdrop
@@ -37637,7 +38038,6 @@ const GataDagsinsImpl = ({ state, tokenExpired }) => {
     const completeState = makeGlobalState({ ...state, tokenExpired });
     const { userEmail } = completeState;
     useEffect(() => {
-        var _a;
         // Load the Gáta Dagsins (Mithril) UI for a new user
         if (!userEmail)
             return;
@@ -37647,7 +38047,7 @@ const GataDagsinsImpl = ({ state, tokenExpired }) => {
             return;
         }
         const elemId = `gatadagsins-user-${userEmail}`;
-        if (((_a = container.firstElementChild) === null || _a === void 0 ? void 0 : _a.id) === elemId) {
+        if (container.firstElementChild?.id === elemId) {
             // The Gáta Dagsins UI is already correctly mounted
             return;
         }
@@ -37673,8 +38073,8 @@ const GataDagsinsImpl = ({ state, tokenExpired }) => {
             // when the component is unmounted
             // console.log("Dismounting Gáta Dagsins UI for user", userEmail);
             const container = document.getElementById("gatadagsins-container");
-            const div = container === null || container === void 0 ? void 0 : container.firstElementChild;
-            if ((div === null || div === void 0 ? void 0 : div.id) === elemId) {
+            const div = container?.firstElementChild;
+            if (div?.id === elemId) {
                 document.body.appendChild(div);
             }
         };