@mideind/netskrafl-react 1.0.0-beta.9 → 1.0.1

package/dist/esm/index.js

@@ -31,6 +31,27 @@ const DEFAULT_STATE = {
     uiLandscape: false,
     runningLocal: false,
 };
+const makeServerUrls = (backendUrl, movesUrl) => {
+    // If the last character of the url is a slash, cut it off,
+    // since path URLs always start with a slash
+    const cleanupUrl = (url) => {
+        if (url.length > 0 && url[url.length - 1] === "/") {
+            url = url.slice(0, -1);
+        }
+        return url;
+    };
+    return {
+        serverUrl: cleanupUrl(backendUrl),
+        movesUrl: cleanupUrl(movesUrl),
+    };
+};
+const makeGlobalState = (overrides) => {
+    const state = {
+        ...DEFAULT_STATE,
+        ...overrides,
+    };
+    return { ...state, ...makeServerUrls(state.serverUrl, state.movesUrl) };
+};
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -2187,53 +2208,485 @@ function requireMithril () {
 var mithrilExports = requireMithril();
 var m = /*@__PURE__*/getDefaultExportFromCjs(mithrilExports);
 
-let BACKEND_SERVER_PREFIX = "http://127.0.0.1:3000"; // Default for development
-let MOVES_SERVER_PREFIX = "https://moves-dot-explo-dev.appspot.com"; // Default for development
-let MOVES_ACCESS_KEY = "None";
-const setServerUrl = (backendUrl, movesUrl, movesAccessKey) => {
-    // If the last character of the url is a slash, cut it off,
-    // since path URLs always start with a slash
-    const cleanupUrl = (url) => {
-        if (url.length > 0 && url[url.length - 1] === "/") {
-            url = url.slice(0, -1);
-        }
-        return url;
-    };
-    if (backendUrl)
-        BACKEND_SERVER_PREFIX = cleanupUrl(backendUrl);
-    if (movesUrl)
-        MOVES_SERVER_PREFIX = cleanupUrl(movesUrl);
-    if (movesAccessKey)
-        MOVES_ACCESS_KEY = movesAccessKey;
-};
-const serverUrl = (path) => {
-    return `${BACKEND_SERVER_PREFIX}${path}`;
+const serverUrl = (state, path) => {
+    return `${state.serverUrl}${path}`;
 };
-const request = (options) => {
-    // Call the default service on the Google App Engine backend
+// Export a non-authenticated request for use by login.ts to avoid circular dependency
+const requestWithoutAuth = (state, options) => {
     return m.request({
         withCredentials: true,
         ...options,
-        url: serverUrl(options.url),
+        url: serverUrl(state, options.url),
     });
 };
-const requestMoves = (options) => {
-    // Call the moves service on the Google App Engine backend
-    const url = `${MOVES_SERVER_PREFIX}${options.url}`;
-    const headers = {
-        "Content-Type": "application/json; charset=UTF-8",
-        Authorization: `Bearer ${MOVES_ACCESS_KEY}`,
-        ...options === null || options === void 0 ? void 0 : options.headers,
-    };
-    return m.request({
-        withCredentials: false,
-        method: "POST",
-        ...options,
-        url,
-        headers,
-    });
+
+/*
+
+  i8n.ts
+
+  Single page UI for Netskrafl/Explo using the Mithril library
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjálmur Þorsteinsson
+
+  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
+
+
+  This module contains internationalization (i18n) utility functions,
+  allowing for translation of displayed text between languages.
+
+  Text messages for individual locales are loaded from the
+  /static/assets/messages.json file, which is fetched from the server.
+
+*/
+// Current exact user locale and fallback locale ("en" for "en_US"/"en_GB"/...)
+// This is overwritten in setLocale()
+let currentLocale = "is_IS";
+let currentFallback = "is";
+// Regex that matches embedded interpolations such as "Welcome, {username}!"
+// Interpolation identifiers should only contain ASCII characters, digits and '_'
+const rex = /{\s*(\w+)\s*}/g;
+let messages = {};
+let messagesLoaded = false;
+function hasAnyTranslation(msgs, locale) {
+    // Return true if any translation is available for the given locale
+    for (let key in msgs) {
+        if (msgs[key][locale] !== undefined)
+            return true;
+    }
+    return false;
+}
+function setLocale(locale, msgs) {
+    // Set the current i18n locale and fallback
+    currentLocale = locale;
+    currentFallback = locale.split("_")[0];
+    // For unsupported locales, i.e. locales that have no
+    // translations available for them, fall back to English (U.S.).
+    if (!hasAnyTranslation(msgs, currentLocale) && !hasAnyTranslation(msgs, currentFallback)) {
+        currentLocale = "en_US";
+        currentFallback = "en";
+    }
+    // Flatten the Messages structure, enabling long strings
+    // to be represented as string arrays in the messages.json file
+    messages = {};
+    for (let key in msgs) {
+        for (let lc in msgs[key]) {
+            let s = msgs[key][lc];
+            if (Array.isArray(s))
+                s = s.join("");
+            if (messages[key] === undefined)
+                messages[key] = {};
+            // If the string s contains HTML markup of the form <tag>...</tag>,
+            // convert it into a list of Mithril Vnode children corresponding to
+            // the text and the tags
+            if (s.match(/<[a-z]+>/)) {
+                // Looks like the string contains HTML markup
+                const vnodes = [];
+                let i = 0;
+                let tagMatch = null;
+                while (i < s.length && (tagMatch = s.slice(i).match(/<[a-z]+>/)) && tagMatch.index !== undefined) {
+                    // Found what looks like an HTML tag
+                    // Calculate the index of the enclosed text within s
+                    const tag = tagMatch[0];
+                    let j = i + tagMatch.index + tag.length;
+                    // Find the end tag
+                    let end = s.indexOf("</" + tag.slice(1), j);
+                    if (end < 0) {
+                        // No end tag - skip past this weirdness
+                        i = j;
+                        continue;
+                    }
+                    // Add the text preceding the tag
+                    if (tagMatch.index > 0)
+                        vnodes.push(s.slice(i, i + tagMatch.index));
+                    // Create the Mithril node corresponding to the tag and the enclosed text
+                    // and add it to the list
+                    vnodes.push(m(tag.slice(1, -1), s.slice(j, end)));
+                    // Advance the index past the end of the tag
+                    i = end + tag.length + 1;
+                }
+                // Push the final text part, if any
+                if (i < s.length)
+                    vnodes.push(s.slice(i));
+                // Reassign s to the list of vnodes
+                s = vnodes;
+            }
+            messages[key][lc] = s;
+        }
+    }
+    messagesLoaded = true;
+}
+async function loadMessages(state, locale) {
+    // Load the internationalization message JSON file from the server
+    // and set the user's locale
+    try {
+        const messages = await requestWithoutAuth(state, {
+            method: "GET",
+            url: "/static/assets/messages.json",
+            withCredentials: false, // Cookies are not allowed for CORS request
+        });
+        setLocale(locale, messages);
+    }
+    catch (_a) {
+        setLocale(locale, {});
+    }
+}
+function t(key, ips = {}) {
+    // Main text translation function, supporting interpolation
+    // and HTML tag substitution
+    const msgDict = messages[key];
+    if (msgDict === undefined)
+        // No dictionary for this key - may actually be a missing entry
+        return messagesLoaded ? key : "";
+    // Lookup exact locale, then fallback, then resort to returning the key
+    const message = msgDict[currentLocale] || msgDict[currentFallback] || key;
+    // If we have an interpolation object, do the interpolation first
+    return Object.keys(ips).length ? interpolate(message, ips) : message;
+}
+function ts(key, ips = {}) {
+    // String translation function, supporting interpolation
+    // but not HTML tag substitution
+    const msgDict = messages[key];
+    if (msgDict === undefined)
+        // No dictionary for this key - may actually be a missing entry
+        return messagesLoaded ? key : "";
+    // Lookup exact locale, then fallback, then resort to returning the key
+    const message = msgDict[currentLocale] || msgDict[currentFallback] || key;
+    if (typeof message != "string")
+        // This is actually an error - the client should be calling t() instead
+        return "";
+    // If we have an interpolation object, do the interpolation first
+    return Object.keys(ips).length ? interpolate_string(message, ips) : message;
+}
+function mt(cls, children) {
+    // Wrapper for the Mithril m() function that auto-translates
+    // string and array arguments
+    if (typeof children == "string") {
+        return m(cls, t(children));
+    }
+    if (Array.isArray(children)) {
+        return m(cls, children.map((item) => (typeof item == "string") ? t(item) : item));
+    }
+    return m(cls, children);
+}
+function interpolate(message, ips) {
+    // Replace interpolation placeholders with their corresponding values
+    if (typeof message == "string") {
+        return message.replace(rex, (match, key) => ips[key] || match);
+    }
+    if (Array.isArray(message)) {
+        return message.map((item) => interpolate(item, ips));
+    }
+    return message;
+}
+function interpolate_string(message, ips) {
+    // Replace interpolation placeholders with their corresponding values
+    return message.replace(rex, (match, key) => ips[key] || match);
+}
+
+/*
+
+  Types.ts
+
+  Common type definitions for the Explo/Netskrafl user interface
+
+  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
+
+*/
+// Global constants
+const RACK_SIZE = 7;
+const ROWIDS = "ABCDEFGHIJKLMNO";
+const BOARD_SIZE = ROWIDS.length;
+const EXTRA_WIDE_LETTERS = "q";
+const WIDE_LETTERS = "zxmæ";
+const ZOOM_FACTOR = 1.5;
+const ERROR_MESSAGES = {
+    // Translations are found in /static/assets/messages.json
+    1: "Enginn stafur lagður niður",
+    2: "Fyrsta orð verður að liggja um byrjunarreitinn",
+    3: "Orð verður að vera samfellt á borðinu",
+    4: "Orð verður að tengjast orði sem fyrir er",
+    5: "Reitur þegar upptekinn",
+    6: "Ekki má vera eyða í orði",
+    7: "word_not_found",
+    8: "word_not_found",
+    9: "Of margir stafir lagðir niður",
+    10: "Stafur er ekki í rekkanum",
+    11: "Of fáir stafir eftir, skipting ekki leyfð",
+    12: "Of mörgum stöfum skipt",
+    13: "Leik vantar á borðið - notið F5/Refresh",
+    14: "Notandi ekki innskráður - notið F5/Refresh",
+    15: "Rangur eða óþekktur notandi",
+    16: "Viðureign finnst ekki",
+    17: "Viðureign er ekki utan tímamarka",
+    18: "Netþjónn gat ekki tekið við leiknum - reyndu aftur",
+    19: "Véfenging er ekki möguleg í þessari viðureign",
+    20: "Síðasti leikur er ekki véfengjanlegur",
+    21: "Aðeins véfenging eða pass leyfileg",
+    "server": "Netþjónn gat ekki tekið við leiknum - reyndu aftur"
 };
 
+/*
+
+  Util.ts
+
+    Utility functions for the Explo/Netskrafl user interface
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjálmur Þorsteinsson
+
+  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
+
+  The following code is based on
+  https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events/Pinch_zoom_gestures
+
+*/
+// Global vars to cache event state
+var evCache = [];
+var origDistance = -1;
+const PINCH_THRESHOLD = 10; // Minimum pinch movement
+var hasZoomed = false;
+// Old-style (non-single-page) game URL prefix
+const BOARD_PREFIX = "/board?game=";
+const BOARD_PREFIX_LEN = BOARD_PREFIX.length;
+function addPinchZoom(attrs, funcZoomIn, funcZoomOut) {
+    // Install event handlers for the pointer target
+    attrs.onpointerdown = pointerdown_handler;
+    attrs.onpointermove = pointermove_handler.bind(null, funcZoomIn, funcZoomOut);
+    // Use same handler for pointer{up,cancel,out,leave} events since
+    // the semantics for these events - in this app - are the same.
+    attrs.onpointerup = pointerup_handler;
+    attrs.onpointercancel = pointerup_handler;
+    attrs.onpointerout = pointerup_handler;
+    attrs.onpointerleave = pointerup_handler;
+}
+function pointerdown_handler(ev) {
+    // The pointerdown event signals the start of a touch interaction.
+    // This event is cached to support 2-finger gestures
+    evCache.push(ev);
+}
+function pointermove_handler(funcZoomIn, funcZoomOut, ev) {
+    // This function implements a 2-pointer horizontal pinch/zoom gesture. 
+    //
+    // If the distance between the two pointers has increased (zoom in), 
+    // the target element's background is changed to "pink" and if the 
+    // distance is decreasing (zoom out), the color is changed to "lightblue".
+    //
+    // Find this event in the cache and update its record with this event
+    for (let i = 0; i < evCache.length; i++) {
+        if (ev.pointerId === evCache[i].pointerId) {
+            evCache[i] = ev;
+            break;
+        }
+    }
+    // If two pointers are down, check for pinch gestures
+    if (evCache.length == 2) {
+        // Calculate the distance between the two pointers
+        const curDistance = Math.sqrt(Math.pow(evCache[0].clientX - evCache[1].clientX, 2) +
+            Math.pow(evCache[0].clientY - evCache[1].clientY, 2));
+        if (origDistance > 0) {
+            if (curDistance - origDistance >= PINCH_THRESHOLD) {
+                // The distance between the two pointers has increased
+                if (!hasZoomed)
+                    funcZoomIn();
+                hasZoomed = true;
+            }
+            else if (origDistance - curDistance >= PINCH_THRESHOLD) {
+                // The distance between the two pointers has decreased
+                if (!hasZoomed)
+                    funcZoomOut();
+                hasZoomed = true;
+            }
+        }
+        else if (origDistance < 0) {
+            // Note the original difference between two pointers
+            origDistance = curDistance;
+            hasZoomed = false;
+        }
+    }
+}
+function pointerup_handler(ev) {
+    // Remove this pointer from the cache and reset the target's
+    // background and border
+    remove_event(ev);
+    // If the number of pointers down is less than two then reset diff tracker
+    if (evCache.length < 2) {
+        origDistance = -1;
+    }
+}
+function remove_event(ev) {
+    // Remove this event from the target's cache
+    for (let i = 0; i < evCache.length; i++) {
+        if (evCache[i].pointerId === ev.pointerId) {
+            evCache.splice(i, 1);
+            break;
+        }
+    }
+}
+function buttonOver(ev) {
+    const clist = ev.currentTarget.classList;
+    if (clist !== undefined && !clist.contains("disabled"))
+        clist.add("over");
+    ev.redraw = false;
+}
+function buttonOut(ev) {
+    const clist = ev.currentTarget.classList;
+    if (clist !== undefined)
+        clist.remove("over");
+    ev.redraw = false;
+}
+// Glyphicon utility function: inserts a glyphicon span
+function glyph(icon, attrs, grayed) {
+    return m("span.glyphicon.glyphicon-" + icon + (grayed ? ".grayed" : ""), attrs);
+}
+function glyphGrayed(icon, attrs) {
+    return m("span.glyphicon.glyphicon-" + icon + ".grayed", attrs);
+}
+// Utility function: inserts non-breaking space
+function nbsp(n) {
+    return m.trust("&nbsp;");
+}
+// Utility functions
+function escapeHtml(string) {
+    /* Utility function to properly encode a string into HTML */
+    const entityMap = {
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': '&quot;',
+        "'": '&#39;',
+        "/": '&#x2F;'
+    };
+    return String(string).replace(/[&<>"'/]/g, (s) => { var _a; return (_a = entityMap[s]) !== null && _a !== void 0 ? _a : ""; });
+}
+function getUrlVars(url) {
+    // Get values from a URL query string
+    const hashes = url.split('&');
+    const vars = {};
+    for (let i = 0; i < hashes.length; i++) {
+        const hash = hashes[i].split('=');
+        if (hash.length == 2)
+            vars[hash[0]] = decodeURIComponent(hash[1]);
+    }
+    return vars;
+}
+function getInput(id) {
+    // Return the current value of a text input field
+    const elem = document.getElementById(id);
+    return elem.value;
+}
+function setInput(id, val) {
+    // Set the current value of a text input field
+    const elem = document.getElementById(id);
+    elem.value = val;
+}
+function playAudio(elemId) {
+    // Play an audio file
+    const sound = document.getElementById(elemId);
+    if (sound)
+        sound.play();
+}
+function arrayEqual(a, b) {
+    // Return true if arrays a and b are equal
+    if (a.length != b.length)
+        return false;
+    for (let i = 0; i < a.length; i++)
+        if (a[i] != b[i])
+            return false;
+    return true;
+}
+function gameUrl(url) {
+    // Convert old-style game URL to new-style single-page URL
+    // The URL format is "/board?game=ed27b9f0-d429-11eb-8bc7-d43d7ee303b2&zombie=1"
+    if (url.slice(0, BOARD_PREFIX_LEN) == BOARD_PREFIX)
+        // Cut off "/board?game="
+        url = url.slice(BOARD_PREFIX_LEN);
+    // Isolate the game UUID
+    const uuid = url.slice(0, 36);
+    // Isolate the other parameters, if any
+    let params = url.slice(36);
+    // Start parameter section of URL with a ? sign
+    if (params.length > 0 && params.charAt(0) == "&")
+        params = "?" + params.slice(1);
+    // Return the single-page URL, to be consumed by m.route.Link()
+    return "/game/" + uuid + params;
+}
+function scrollMovelistToBottom() {
+    // If the length of the move list has changed,
+    // scroll the last move into view
+    let movelist = document.querySelectorAll("div.movelist .move");
+    if (!movelist || !movelist.length)
+        return;
+    let target = movelist[movelist.length - 1];
+    let parent = target.parentNode;
+    let len = parent.getAttribute("data-len");
+    let intLen = (!len) ? 0 : parseInt(len);
+    if (movelist.length > intLen) {
+        // The list has grown since we last updated it:
+        // scroll to the bottom and mark its length
+        parent.scrollTop = target.offsetTop;
+    }
+    parent.setAttribute("data-len", movelist.length.toString());
+}
+function coord(row, col, vertical = false) {
+    // Return the co-ordinate string for the given 0-based row and col
+    if (row < 0 || row >= BOARD_SIZE || col < 0 || col >= BOARD_SIZE)
+        return null;
+    // Horizontal moves have the row letter first
+    // Vertical moves have the column number first
+    return vertical ? `${col + 1}${ROWIDS[row]}` : `${ROWIDS[row]}${col + 1}`;
+}
+function toVector(co) {
+    // Convert a co-ordinate string to a 0-based row, col and direction vector
+    var dx = 0, dy = 0;
+    var col = 0;
+    var row = ROWIDS.indexOf(co[0]);
+    if (row >= 0) {
+        /* Horizontal move */
+        col = parseInt(co.slice(1)) - 1;
+        dx = 1;
+    }
+    else {
+        /* Vertical move */
+        row = ROWIDS.indexOf(co.slice(-1));
+        col = parseInt(co) - 1;
+        dy = 1;
+    }
+    return { col: col, row: row, dx: dx, dy: dy };
+}
+function valueOrK(value, breakpoint = 10000) {
+    // Return a numeric value as a string, but in kilos (thousands)
+    // if it exceeds a breakpoint, in that case suffixed by "K"
+    const sign = value < 0 ? "-" : "";
+    value = Math.abs(value);
+    if (value < breakpoint)
+        return `${sign}${value}`;
+    value = Math.round(value / 1000);
+    return `${sign}${value}K`;
+}
+// SalesCloud stuff
+function doRegisterSalesCloud(i, s, o, g, r, a, m) {
+    i.SalesCloudObject = r;
+    i[r] = i[r] || function () { (i[r].q = i[r].q || []).push(arguments); };
+    i[r].l = 1 * new Date();
+    a = s.createElement(o);
+    m = s.getElementsByTagName(o)[0];
+    a.src = g;
+    m.parentNode.insertBefore(a, m);
+}
+function registerSalesCloud() {
+    doRegisterSalesCloud(window, document, 'script', 'https://cdn.salescloud.is/js/salescloud.min.js', 'salescloud');
+}
+
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -26559,33 +27012,46 @@ let database;
 let analytics;
 function initFirebase(state) {
     try {
-        const projectId = state.projectId;
+        const { projectId, firebaseAPIKey, databaseURL, firebaseSenderId, firebaseAppId, measurementId } = state;
         const firebaseOptions = {
             projectId,
-            apiKey: state.firebaseAPIKey,
+            apiKey: firebaseAPIKey,
             authDomain: `${projectId}.firebaseapp.com`,
-            databaseURL: state.databaseURL,
+            databaseURL,
             storageBucket: `${projectId}.firebasestorage.app`,
-            messagingSenderId: state.firebaseSenderId,
-            appId: state.firebaseAppId,
-            measurementId: state.measurementId,
+            messagingSenderId: firebaseSenderId,
+            appId: firebaseAppId,
+            measurementId,
         };
-        app = initializeApp(firebaseOptions, "netskrafl");
+        app = initializeApp(firebaseOptions, projectId);
         if (!app) {
             console.error("Failed to initialize Firebase");
+            return false;
         }
     }
     catch (e) {
         console.error("Failed to initialize Firebase", e);
+        return false;
+    }
+    return true;
+}
+function isFirebaseAuthenticated(state) {
+    // Check if Firebase is currently authenticated
+    // If auth is not initialized but state is provided, try to initialize
+    if (!auth) {
+        if (!app)
+            initFirebase(state);
+        if (app)
+            auth = getAuth(app);
     }
+    if (!auth)
+        return false;
+    return auth.currentUser !== null;
 }
 async function loginFirebase(state, firebaseToken, onLoginFunc) {
-    if (!app)
-        initFirebase(state);
-    if (!app)
+    if (!app && !initFirebase(state))
         return;
-    const userId = state.userId;
-    const locale = state.locale;
+    const { userId, locale, projectId, loginMethod } = state;
     auth = getAuth(app);
     if (!auth) {
         console.error("Failed to initialize Firebase Auth");
@@ -26598,16 +27064,16 @@ async function loginFirebase(state, firebaseToken, onLoginFunc) {
                 // For new users, log an additional signup event
                 if (state.newUser) {
                     logEvent("sign_up", {
-                        locale: state.locale,
-                        method: state.loginMethod,
-                        userid: state.userId
+                        locale,
+                        method: loginMethod,
+                        userid: userId
                     });
                 }
                 // And always log a login event
                 logEvent("login", {
-                    locale: state.locale,
-                    method: state.loginMethod,
-                    userid: state.userId
+                    locale,
+                    method: loginMethod,
+                    userid: userId
                 });
             }
         });
@@ -26622,7 +27088,7 @@ async function loginFirebase(state, firebaseToken, onLoginFunc) {
     if (!analytics) {
         console.error("Failed to initialize Firebase Analytics");
     }
-    initPresence(state.projectId, userId, locale);
+    initPresence(projectId, userId, locale);
 }
 function initPresence(projectId, userId, locale) {
     // Ensure that this user connection is recorded in Firebase
@@ -26679,473 +27145,6 @@ function logEvent(ev, params) {
     logEvent$2(analytics, ev, params);
 }
 
-/*
-
-  i8n.ts
-
-  Single page UI for Netskrafl/Explo using the Mithril library
-
-  Copyright (C) 2025 Miðeind ehf.
-  Author: Vilhjálmur Þorsteinsson
-
-  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
-
-
-  This module contains internationalization (i18n) utility functions,
-  allowing for translation of displayed text between languages.
-
-  Text messages for individual locales are loaded from the
-  /static/assets/messages.json file, which is fetched from the server.
-
-*/
-// Current exact user locale and fallback locale ("en" for "en_US"/"en_GB"/...)
-// This is overwritten in setLocale()
-let currentLocale = "is_IS";
-let currentFallback = "is";
-// Regex that matches embedded interpolations such as "Welcome, {username}!"
-// Interpolation identifiers should only contain ASCII characters, digits and '_'
-const rex = /{\s*(\w+)\s*}/g;
-let messages = {};
-let messagesLoaded = false;
-function hasAnyTranslation(msgs, locale) {
-    // Return true if any translation is available for the given locale
-    for (let key in msgs) {
-        if (msgs[key][locale] !== undefined)
-            return true;
-    }
-    return false;
-}
-function setLocale(locale, msgs) {
-    // Set the current i18n locale and fallback
-    currentLocale = locale;
-    currentFallback = locale.split("_")[0];
-    // For unsupported locales, i.e. locales that have no
-    // translations available for them, fall back to English (U.S.).
-    if (!hasAnyTranslation(msgs, currentLocale) && !hasAnyTranslation(msgs, currentFallback)) {
-        currentLocale = "en_US";
-        currentFallback = "en";
-    }
-    // Flatten the Messages structure, enabling long strings
-    // to be represented as string arrays in the messages.json file
-    messages = {};
-    for (let key in msgs) {
-        for (let lc in msgs[key]) {
-            let s = msgs[key][lc];
-            if (Array.isArray(s))
-                s = s.join("");
-            if (messages[key] === undefined)
-                messages[key] = {};
-            // If the string s contains HTML markup of the form <tag>...</tag>,
-            // convert it into a list of Mithril Vnode children corresponding to
-            // the text and the tags
-            if (s.match(/<[a-z]+>/)) {
-                // Looks like the string contains HTML markup
-                const vnodes = [];
-                let i = 0;
-                let tagMatch = null;
-                while (i < s.length && (tagMatch = s.slice(i).match(/<[a-z]+>/)) && tagMatch.index !== undefined) {
-                    // Found what looks like an HTML tag
-                    // Calculate the index of the enclosed text within s
-                    const tag = tagMatch[0];
-                    let j = i + tagMatch.index + tag.length;
-                    // Find the end tag
-                    let end = s.indexOf("</" + tag.slice(1), j);
-                    if (end < 0) {
-                        // No end tag - skip past this weirdness
-                        i = j;
-                        continue;
-                    }
-                    // Add the text preceding the tag
-                    if (tagMatch.index > 0)
-                        vnodes.push(s.slice(i, i + tagMatch.index));
-                    // Create the Mithril node corresponding to the tag and the enclosed text
-                    // and add it to the list
-                    vnodes.push(m(tag.slice(1, -1), s.slice(j, end)));
-                    // Advance the index past the end of the tag
-                    i = end + tag.length + 1;
-                }
-                // Push the final text part, if any
-                if (i < s.length)
-                    vnodes.push(s.slice(i));
-                // Reassign s to the list of vnodes
-                s = vnodes;
-            }
-            messages[key][lc] = s;
-        }
-    }
-    messagesLoaded = true;
-}
-async function loadMessages(locale) {
-    // Load the internationalization message JSON file from the server
-    // and set the user's locale
-    try {
-        const messages = await request({
-            method: "GET",
-            url: "/static/assets/messages.json",
-            withCredentials: false, // Cookies are not allowed for CORS request
-        });
-        setLocale(locale, messages);
-    }
-    catch (_a) {
-        setLocale(locale, {});
-    }
-}
-function t(key, ips = {}) {
-    // Main text translation function, supporting interpolation
-    // and HTML tag substitution
-    const msgDict = messages[key];
-    if (msgDict === undefined)
-        // No dictionary for this key - may actually be a missing entry
-        return messagesLoaded ? key : "";
-    // Lookup exact locale, then fallback, then resort to returning the key
-    const message = msgDict[currentLocale] || msgDict[currentFallback] || key;
-    // If we have an interpolation object, do the interpolation first
-    return Object.keys(ips).length ? interpolate(message, ips) : message;
-}
-function ts(key, ips = {}) {
-    // String translation function, supporting interpolation
-    // but not HTML tag substitution
-    const msgDict = messages[key];
-    if (msgDict === undefined)
-        // No dictionary for this key - may actually be a missing entry
-        return messagesLoaded ? key : "";
-    // Lookup exact locale, then fallback, then resort to returning the key
-    const message = msgDict[currentLocale] || msgDict[currentFallback] || key;
-    if (typeof message != "string")
-        // This is actually an error - the client should be calling t() instead
-        return "";
-    // If we have an interpolation object, do the interpolation first
-    return Object.keys(ips).length ? interpolate_string(message, ips) : message;
-}
-function mt(cls, children) {
-    // Wrapper for the Mithril m() function that auto-translates
-    // string and array arguments
-    if (typeof children == "string") {
-        return m(cls, t(children));
-    }
-    if (Array.isArray(children)) {
-        return m(cls, children.map((item) => (typeof item == "string") ? t(item) : item));
-    }
-    return m(cls, children);
-}
-function interpolate(message, ips) {
-    // Replace interpolation placeholders with their corresponding values
-    if (typeof message == "string") {
-        return message.replace(rex, (match, key) => ips[key] || match);
-    }
-    if (Array.isArray(message)) {
-        return message.map((item) => interpolate(item, ips));
-    }
-    return message;
-}
-function interpolate_string(message, ips) {
-    // Replace interpolation placeholders with their corresponding values
-    return message.replace(rex, (match, key) => ips[key] || match);
-}
-
-/*
-
-  Types.ts
-
-  Common type definitions for the Explo/Netskrafl user interface
-
-  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
-
-*/
-// Global constants
-const RACK_SIZE = 7;
-const ROWIDS = "ABCDEFGHIJKLMNO";
-const BOARD_SIZE = ROWIDS.length;
-const EXTRA_WIDE_LETTERS = "q";
-const WIDE_LETTERS = "zxmæ";
-const ZOOM_FACTOR = 1.5;
-const ERROR_MESSAGES = {
-    // Translations are found in /static/assets/messages.json
-    1: "Enginn stafur lagður niður",
-    2: "Fyrsta orð verður að liggja um byrjunarreitinn",
-    3: "Orð verður að vera samfellt á borðinu",
-    4: "Orð verður að tengjast orði sem fyrir er",
-    5: "Reitur þegar upptekinn",
-    6: "Ekki má vera eyða í orði",
-    7: "word_not_found",
-    8: "word_not_found",
-    9: "Of margir stafir lagðir niður",
-    10: "Stafur er ekki í rekkanum",
-    11: "Of fáir stafir eftir, skipting ekki leyfð",
-    12: "Of mörgum stöfum skipt",
-    13: "Leik vantar á borðið - notið F5/Refresh",
-    14: "Notandi ekki innskráður - notið F5/Refresh",
-    15: "Rangur eða óþekktur notandi",
-    16: "Viðureign finnst ekki",
-    17: "Viðureign er ekki utan tímamarka",
-    18: "Netþjónn gat ekki tekið við leiknum - reyndu aftur",
-    19: "Véfenging er ekki möguleg í þessari viðureign",
-    20: "Síðasti leikur er ekki véfengjanlegur",
-    21: "Aðeins véfenging eða pass leyfileg",
-    "server": "Netþjónn gat ekki tekið við leiknum - reyndu aftur"
-};
-
-/*
-
-  Util.ts
-
-    Utility functions for the Explo/Netskrafl user interface
-
-  Copyright (C) 2025 Miðeind ehf.
-  Author: Vilhjálmur Þorsteinsson
-
-  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
-
-  The following code is based on
-  https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events/Pinch_zoom_gestures
-
-*/
-// Global vars to cache event state
-var evCache = [];
-var origDistance = -1;
-const PINCH_THRESHOLD = 10; // Minimum pinch movement
-var hasZoomed = false;
-// Old-style (non-single-page) game URL prefix
-const BOARD_PREFIX = "/board?game=";
-const BOARD_PREFIX_LEN = BOARD_PREFIX.length;
-function addPinchZoom(attrs, funcZoomIn, funcZoomOut) {
-    // Install event handlers for the pointer target
-    attrs.onpointerdown = pointerdown_handler;
-    attrs.onpointermove = pointermove_handler.bind(null, funcZoomIn, funcZoomOut);
-    // Use same handler for pointer{up,cancel,out,leave} events since
-    // the semantics for these events - in this app - are the same.
-    attrs.onpointerup = pointerup_handler;
-    attrs.onpointercancel = pointerup_handler;
-    attrs.onpointerout = pointerup_handler;
-    attrs.onpointerleave = pointerup_handler;
-}
-function pointerdown_handler(ev) {
-    // The pointerdown event signals the start of a touch interaction.
-    // This event is cached to support 2-finger gestures
-    evCache.push(ev);
-}
-function pointermove_handler(funcZoomIn, funcZoomOut, ev) {
-    // This function implements a 2-pointer horizontal pinch/zoom gesture. 
-    //
-    // If the distance between the two pointers has increased (zoom in), 
-    // the target element's background is changed to "pink" and if the 
-    // distance is decreasing (zoom out), the color is changed to "lightblue".
-    //
-    // Find this event in the cache and update its record with this event
-    for (let i = 0; i < evCache.length; i++) {
-        if (ev.pointerId === evCache[i].pointerId) {
-            evCache[i] = ev;
-            break;
-        }
-    }
-    // If two pointers are down, check for pinch gestures
-    if (evCache.length == 2) {
-        // Calculate the distance between the two pointers
-        const curDistance = Math.sqrt(Math.pow(evCache[0].clientX - evCache[1].clientX, 2) +
-            Math.pow(evCache[0].clientY - evCache[1].clientY, 2));
-        if (origDistance > 0) {
-            if (curDistance - origDistance >= PINCH_THRESHOLD) {
-                // The distance between the two pointers has increased
-                if (!hasZoomed)
-                    funcZoomIn();
-                hasZoomed = true;
-            }
-            else if (origDistance - curDistance >= PINCH_THRESHOLD) {
-                // The distance between the two pointers has decreased
-                if (!hasZoomed)
-                    funcZoomOut();
-                hasZoomed = true;
-            }
-        }
-        else if (origDistance < 0) {
-            // Note the original difference between two pointers
-            origDistance = curDistance;
-            hasZoomed = false;
-        }
-    }
-}
-function pointerup_handler(ev) {
-    // Remove this pointer from the cache and reset the target's
-    // background and border
-    remove_event(ev);
-    // If the number of pointers down is less than two then reset diff tracker
-    if (evCache.length < 2) {
-        origDistance = -1;
-    }
-}
-function remove_event(ev) {
-    // Remove this event from the target's cache
-    for (let i = 0; i < evCache.length; i++) {
-        if (evCache[i].pointerId === ev.pointerId) {
-            evCache.splice(i, 1);
-            break;
-        }
-    }
-}
-function buttonOver(ev) {
-    const clist = ev.currentTarget.classList;
-    if (clist !== undefined && !clist.contains("disabled"))
-        clist.add("over");
-    ev.redraw = false;
-}
-function buttonOut(ev) {
-    const clist = ev.currentTarget.classList;
-    if (clist !== undefined)
-        clist.remove("over");
-    ev.redraw = false;
-}
-// Glyphicon utility function: inserts a glyphicon span
-function glyph(icon, attrs, grayed) {
-    return m("span.glyphicon.glyphicon-" + icon + (grayed ? ".grayed" : ""), attrs);
-}
-function glyphGrayed(icon, attrs) {
-    return m("span.glyphicon.glyphicon-" + icon + ".grayed", attrs);
-}
-// Utility function: inserts non-breaking space
-function nbsp(n) {
-    return m.trust("&nbsp;");
-}
-// Utility functions
-function escapeHtml(string) {
-    /* Utility function to properly encode a string into HTML */
-    const entityMap = {
-        "&": "&amp;",
-        "<": "&lt;",
-        ">": "&gt;",
-        '"': '&quot;',
-        "'": '&#39;',
-        "/": '&#x2F;'
-    };
-    return String(string).replace(/[&<>"'/]/g, (s) => { var _a; return (_a = entityMap[s]) !== null && _a !== void 0 ? _a : ""; });
-}
-function getUrlVars(url) {
-    // Get values from a URL query string
-    const hashes = url.split('&');
-    const vars = {};
-    for (let i = 0; i < hashes.length; i++) {
-        const hash = hashes[i].split('=');
-        if (hash.length == 2)
-            vars[hash[0]] = decodeURIComponent(hash[1]);
-    }
-    return vars;
-}
-function getInput(id) {
-    // Return the current value of a text input field
-    const elem = document.getElementById(id);
-    return elem.value;
-}
-function setInput(id, val) {
-    // Set the current value of a text input field
-    const elem = document.getElementById(id);
-    elem.value = val;
-}
-function playAudio(elemId) {
-    // Play an audio file
-    const sound = document.getElementById(elemId);
-    if (sound)
-        sound.play();
-}
-function arrayEqual(a, b) {
-    // Return true if arrays a and b are equal
-    if (a.length != b.length)
-        return false;
-    for (let i = 0; i < a.length; i++)
-        if (a[i] != b[i])
-            return false;
-    return true;
-}
-function gameUrl(url) {
-    // Convert old-style game URL to new-style single-page URL
-    // The URL format is "/board?game=ed27b9f0-d429-11eb-8bc7-d43d7ee303b2&zombie=1"
-    if (url.slice(0, BOARD_PREFIX_LEN) == BOARD_PREFIX)
-        // Cut off "/board?game="
-        url = url.slice(BOARD_PREFIX_LEN);
-    // Isolate the game UUID
-    const uuid = url.slice(0, 36);
-    // Isolate the other parameters, if any
-    let params = url.slice(36);
-    // Start parameter section of URL with a ? sign
-    if (params.length > 0 && params.charAt(0) == "&")
-        params = "?" + params.slice(1);
-    // Return the single-page URL, to be consumed by m.route.Link()
-    return "/game/" + uuid + params;
-}
-function scrollMovelistToBottom() {
-    // If the length of the move list has changed,
-    // scroll the last move into view
-    let movelist = document.querySelectorAll("div.movelist .move");
-    if (!movelist || !movelist.length)
-        return;
-    let target = movelist[movelist.length - 1];
-    let parent = target.parentNode;
-    let len = parent.getAttribute("data-len");
-    let intLen = (!len) ? 0 : parseInt(len);
-    if (movelist.length > intLen) {
-        // The list has grown since we last updated it:
-        // scroll to the bottom and mark its length
-        parent.scrollTop = target.offsetTop;
-    }
-    parent.setAttribute("data-len", movelist.length.toString());
-}
-function coord(row, col, vertical = false) {
-    // Return the co-ordinate string for the given 0-based row and col
-    if (row < 0 || row >= BOARD_SIZE || col < 0 || col >= BOARD_SIZE)
-        return null;
-    // Horizontal moves have the row letter first
-    // Vertical moves have the column number first
-    return vertical ? `${col + 1}${ROWIDS[row]}` : `${ROWIDS[row]}${col + 1}`;
-}
-function toVector(co) {
-    // Convert a co-ordinate string to a 0-based row, col and direction vector
-    var dx = 0, dy = 0;
-    var col = 0;
-    var row = ROWIDS.indexOf(co[0]);
-    if (row >= 0) {
-        /* Horizontal move */
-        col = parseInt(co.slice(1)) - 1;
-        dx = 1;
-    }
-    else {
-        /* Vertical move */
-        row = ROWIDS.indexOf(co.slice(-1));
-        col = parseInt(co) - 1;
-        dy = 1;
-    }
-    return { col: col, row: row, dx: dx, dy: dy };
-}
-function valueOrK(value, breakpoint = 10000) {
-    // Return a numeric value as a string, but in kilos (thousands)
-    // if it exceeds a breakpoint, in that case suffixed by "K"
-    const sign = value < 0 ? "-" : "";
-    value = Math.abs(value);
-    if (value < breakpoint)
-        return `${sign}${value}`;
-    value = Math.round(value / 1000);
-    return `${sign}${value}K`;
-}
-// SalesCloud stuff
-function doRegisterSalesCloud(i, s, o, g, r, a, m) {
-    i.SalesCloudObject = r;
-    i[r] = i[r] || function () { (i[r].q = i[r].q || []).push(arguments); };
-    i[r].l = 1 * new Date();
-    a = s.createElement(o);
-    m = s.getElementsByTagName(o)[0];
-    a.src = g;
-    m.parentNode.insertBefore(a, m);
-}
-function registerSalesCloud() {
-    doRegisterSalesCloud(window, document, 'script', 'https://cdn.salescloud.is/js/salescloud.min.js', 'salescloud');
-}
-
 /*
 
   Logo.ts
@@ -27255,7 +27254,7 @@ const NetskraflLegend = (initialVnode) => {
         m.redraw();
     }
     return {
-        oncreate: () => {
+        oninit: () => {
             if (msStepTime && ival === 0) {
                 ival = setInterval(doStep, msStepTime);
             }
@@ -27310,10 +27309,197 @@ const AnimatedNetskraflLogo = (initialVnode) => {
     };
 };
 
+/*
+
+  Login.ts
+
+  Login UI for Metskrafl using the Mithril library
+
+  Copyright (C) 2025 Miðeind ehf.
+  Author: Vilhjálmur Þorsteinsson
+
+  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
+
+  This UI is built on top of Mithril (https://mithril.js.org), a lightweight,
+  straightforward JavaScript single-page reactive UI library.
+
+*/
+const loginUserByEmail = async (state) => {
+    // Call the /login_malstadur endpoint on the server
+    // to log in the user with the given email and token.
+    // The token is a standard HS256-encoded JWT with aud "netskrafl"
+    // and iss typically "malstadur".
+    const { userEmail, userNick, userFullname, token } = state;
+    return requestWithoutAuth(state, {
+        method: "POST",
+        url: "/login_malstadur",
+        body: { email: userEmail, nickname: userNick, fullname: userFullname, token }
+    });
+};
+const LoginError = {
+    view: (vnode) => {
+        return m("div.error", {
+            style: { visibility: "visible" }
+        }, vnode.children);
+    }
+};
+const LoginForm = (initialVnode) => {
+    const loginUrl = initialVnode.attrs.loginUrl;
+    let loginInProgress = false;
+    function doLogin(ev) {
+        loginInProgress = true;
+        ev.preventDefault();
+        window.location.href = loginUrl;
+    }
+    return {
+        view: () => {
+            return m.fragment({}, [
+                // This is visible on large screens
+                m("div.loginform-large", [
+                    m(NetskraflLogoOnly, {
+                        className: "login-logo",
+                        width: 200,
+                    }),
+                    m(NetskraflLegend, {
+                        className: "login-legend",
+                        width: 600,
+                        msStepTime: 0
+                    }),
+                    mt("div.welcome", "welcome_0"),
+                    mt("div.welcome", "welcome_1"),
+                    mt("div.welcome", "welcome_2"),
+                    m("div.login-btn-large", { onclick: doLogin }, loginInProgress ? t("Skrái þig inn...") : [
+                        t("Innskrá") + " ", m("span.glyphicon.glyphicon-play")
+                    ])
+                ]),
+                // This is visible on small screens
+                m("div.loginform-small", [
+                    m(NetskraflLogoOnly, {
+                        className: "login-logo",
+                        width: 160,
+                    }),
+                    m(NetskraflLegend, {
+                        className: "login-legend",
+                        width: 650,
+                        msStepTime: 0
+                    }),
+                    m("div.login-btn-small", { onclick: doLogin }, loginInProgress ? t("Skrái þig inn...") : t("Innskrá"))
+                ])
+            ]);
+        }
+    };
+};
+
+// Global state for authentication
+let authPromise = null;
+// Custom error class for authentication failures
+class AuthenticationError extends Error {
+    constructor() {
+        super("Authentication required");
+        this.name = "AuthenticationError";
+    }
+}
+// Internal function to ensure authentication
+const ensureAuthenticated = async (state) => {
+    // If login is already in progress, wait for it to complete
+    if (authPromise) {
+        await authPromise;
+        return;
+    }
+    // Start new login attempt (either forced by 401 or needed for Firebase)
+    authPromise = loginUserByEmail(state);
+    try {
+        const result = await authPromise;
+        if (result.status === "expired") {
+            // Token has expired, notify the React component if callback is set
+            state.tokenExpired && state.tokenExpired();
+            throw new Error("Token expired");
+        }
+        else if (result.status !== "success") {
+            throw new Error(`Authentication failed: ${result.message || result.status}`);
+        }
+        // Success: Log in to Firebase with the token passed from the server
+        await loginFirebase(state, result.firebase_token);
+    }
+    finally {
+        // Reset the promise so future 401s can trigger a new login
+        authPromise = null;
+    }
+};
+// Internal authenticated request function
+const authenticatedRequest = async (state, options, retries = 0) => {
+    // Before making the request, check if Firebase needs authentication
+    // This handles the case where the user returns with a valid backend cookie but expired Firebase auth
+    if (!retries && !isFirebaseAuthenticated(state)) {
+        // Firebase is not authenticated, ensure authentication before making the request
+        await ensureAuthenticated(state);
+    }
+    try {
+        // Make the actual request
+        // console.log("Making authenticated request to", options.url);
+        return await m.request({
+            withCredentials: true,
+            ...options,
+            url: serverUrl(state, options.url),
+            extract: (xhr) => {
+                // Check for 401 Unauthorized
+                if (xhr.status === 401) {
+                    // console.log("Received 401 Unauthorized, triggering re-authentication");
+                    throw new AuthenticationError();
+                }
+                // Handle empty responses
+                if (!xhr.responseText) {
+                    return null;
+                }
+                // Parse JSON response
+                try {
+                    return JSON.parse(xhr.responseText);
+                }
+                catch (e) {
+                    // If JSON parsing fails, return the raw text
+                    return xhr.responseText;
+                }
+            }
+        });
+    }
+    catch (error) {
+        if (error instanceof AuthenticationError && !retries) {
+            // Backend returned 401, perform full authentication and retry (force=true)
+            await ensureAuthenticated(state);
+            // Retry the original request
+            return authenticatedRequest(state, options, retries + 1);
+        }
+        // Re-throw other errors
+        throw error;
+    }
+};
+const request = (state, options) => {
+    // Enhanced request with automatic authentication handling
+    return authenticatedRequest(state, options);
+};
+const requestMoves = (state, options) => {
+    // Call the moves service on the Google App Engine backend
+    const url = `${state.movesUrl}${options.url}`;
+    const headers = {
+        "Content-Type": "application/json; charset=UTF-8",
+        Authorization: `Bearer ${state.movesAccessKey}`,
+        ...options === null || options === void 0 ? void 0 : options.headers,
+    };
+    return m.request({
+        withCredentials: false,
+        method: "POST",
+        ...options,
+        url,
+        headers,
+    });
+};
+
 const SPINNER_INITIAL_DELAY = 800; // milliseconds
 const Spinner = {
     // Show a spinner wait box, after an initial delay
-    oncreate: (vnode) => {
+    oninit: (vnode) => {
         vnode.state.show = false;
         vnode.state.ival = setTimeout(() => {
             vnode.state.show = true;
@@ -27426,11 +27612,12 @@ const OnlinePresence = (initialVnode) => {
     const askServer = attrs.online === undefined;
     const id = attrs.id;
     const userId = attrs.userId;
+    const state = attrs.state;
     let loading = false;
     async function _update() {
         if (askServer && !loading) {
             loading = true;
-            const json = await request({
+            const json = await request(state, {
                 method: "POST",
                 url: "/onlinecheck",
                 body: { user: userId }
@@ -27440,7 +27627,7 @@ const OnlinePresence = (initialVnode) => {
         }
     }
     return {
-        oncreate: _update,
+        oninit: _update,
         view: (vnode) => {
             var _a, _b;
             if (!askServer)
@@ -27706,6 +27893,7 @@ const WaitDialog = (initialVnode) => {
     const attrs = initialVnode.attrs;
     const view = attrs.view;
     const model = view.model;
+    const state = model.state;
     const duration = attrs.duration;
     const oppId = attrs.oppId;
     const key = attrs.challengeKey;
@@ -27721,9 +27909,9 @@ const WaitDialog = (initialVnode) => {
     async function updateOnline() {
         // Initiate an online check on the opponent
         try {
-            if (!oppId || !key)
+            if (!oppId || !key || !state)
                 return;
-            const json = await request({
+            const json = await request(state, {
                 method: "POST",
                 url: "/initwait",
                 body: { opp: oppId, key }
@@ -27739,8 +27927,10 @@ const WaitDialog = (initialVnode) => {
     }
     async function cancelWait() {
         // Cancel a pending wait for a timed game
+        if (!state)
+            return;
         try {
-            await request({
+            await request(state, {
                 method: "POST",
                 url: "/cancelwait",
                 body: {
@@ -27774,11 +27964,13 @@ const WaitDialog = (initialVnode) => {
     return {
         oncreate,
         view: () => {
+            if (!state)
+                return null;
             return m(".modal-dialog", { id: "wait-dialog", style: { visibility: "visible" } }, m(".ui-widget.ui-widget-content.ui-corner-all", { "id": "wait-form" }, [
                 m(".chall-hdr", m("table", m("tbody", m("tr", [
                     m("td", m("h1.chall-icon", glyph("time"))),
                     m("td.l-border", [
-                        m(OnlinePresence, { id: "chall-online", userId: oppId, online: oppOnline }),
+                        m(OnlinePresence, { id: "chall-online", userId: oppId, online: oppOnline, state }),
                         m("h1", oppNick),
                         m("h2", oppName)
                     ])
@@ -27821,6 +28013,7 @@ const AcceptDialog = (initialVnode) => {
     // is linked up with her opponent and a new game is started
     const attrs = initialVnode.attrs;
     const view = attrs.view;
+    const state = view.model.state;
     const oppId = attrs.oppId;
     const key = attrs.challengeKey;
     let oppNick = attrs.oppNick;
@@ -27828,11 +28021,11 @@ const AcceptDialog = (initialVnode) => {
     let loading = false;
     async function waitCheck() {
         // Initiate a wait status check on the opponent
-        if (loading)
+        if (loading || !state)
             return; // Already checking
         loading = true;
         try {
-            const json = await request({
+            const json = await request(state, {
                 method: "POST",
                 url: "/waitcheck",
                 body: { user: oppId, key }
@@ -27855,7 +28048,7 @@ const AcceptDialog = (initialVnode) => {
         }
     }
     return {
-        oncreate: waitCheck,
+        oninit: waitCheck,
         view: () => {
             return m(".modal-dialog", { id: "accept-dialog", style: { visibility: "visible" } }, m(".ui-widget.ui-widget-content.ui-corner-all", { id: "accept-form" }, [
                 m(".chall-hdr", m("table", m("tbody", m("tr", [
@@ -28040,87 +28233,6 @@ const FriendCancelConfirmDialog = (initialVnode) => {
     };
 };
 
-/*
-
-  Login.ts
-
-  Login UI for Metskrafl using the Mithril library
-
-  Copyright (C) 2025 Miðeind ehf.
-  Author: Vilhjálmur Þorsteinsson
-
-  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
-
-  This UI is built on top of Mithril (https://mithril.js.org), a lightweight,
-  straightforward JavaScript single-page reactive UI library.
-
-*/
-const loginUserByEmail = async (email, nickname, fullname, token) => {
-    // Call the /login_malstadur endpoint on the server
-    // to log in the user with the given email and token.
-    // The token is a standard HS256-encoded JWT with aud "netskrafl"
-    // and iss typically "malstadur".
-    return request({
-        method: "POST",
-        url: "/login_malstadur",
-        body: { email, nickname, fullname, token }
-    });
-};
-const LoginError = {
-    view: (vnode) => {
-        var _a;
-        return m("div.error", { style: { visibility: "visible" } }, ((_a = vnode.attrs) === null || _a === void 0 ? void 0 : _a.message) || "Error logging in");
-    }
-};
-const LoginForm = (initialVnode) => {
-    const loginUrl = initialVnode.attrs.loginUrl;
-    let loginInProgress = false;
-    function doLogin(ev) {
-        loginInProgress = true;
-        ev.preventDefault();
-        window.location.href = loginUrl;
-    }
-    return {
-        view: () => {
-            return m.fragment({}, [
-                // This is visible on large screens
-                m("div.loginform-large", [
-                    m(NetskraflLogoOnly, {
-                        className: "login-logo",
-                        width: 200,
-                    }),
-                    m(NetskraflLegend, {
-                        className: "login-legend",
-                        width: 600,
-                        msStepTime: 0
-                    }),
-                    mt("div.welcome", "welcome_0"),
-                    mt("div.welcome", "welcome_1"),
-                    mt("div.welcome", "welcome_2"),
-                    m("div.login-btn-large", { onclick: doLogin }, loginInProgress ? t("Skrái þig inn...") : [
-                        t("Innskrá") + " ", m("span.glyphicon.glyphicon-play")
-                    ])
-                ]),
-                // This is visible on small screens
-                m("div.loginform-small", [
-                    m(NetskraflLogoOnly, {
-                        className: "login-logo",
-                        width: 160,
-                    }),
-                    m(NetskraflLegend, {
-                        className: "login-legend",
-                        width: 650,
-                        msStepTime: 0
-                    }),
-                    m("div.login-btn-small", { onclick: doLogin }, loginInProgress ? t("Skrái þig inn...") : t("Innskrá"))
-                ])
-            ]);
-        }
-    };
-};
-
 /*
 
   ChallengeDialog.ts
@@ -28151,7 +28263,11 @@ const ChallengeDialog = () => {
                 m(".chall-hdr", m("table", m("tbody", m("tr", [
                     m("td", m("h1.chall-icon", glyph("hand-right"))),
                     m("td.l-border", [
-                        m(OnlinePresence, { id: "chall-online", userId: item.userid }),
+                        m(OnlinePresence, {
+                            id: "chall-online",
+                            userId: item.userid,
+                            state,
+                        }),
                         m("h1", item.nick),
                         m("h2", item.fullname)
                     ])
@@ -29467,7 +29583,7 @@ const PromoDialog = (initialVnode) => {
             initFunc();
     }
     return {
-        oncreate: _fetchContent,
+        oninit: _fetchContent,
         view: (vnode) => {
             let initFunc = vnode.attrs.initFunc;
             return m(".modal-dialog", { id: "promo-dialog", style: { visibility: "visible" } }, m(".ui-widget.ui-widget-content.ui-corner-all", { id: "promo-form", className: "promo-" + vnode.attrs.kind }, m("div", {
@@ -29539,7 +29655,7 @@ const UserInfoDialog = (initialVnode) => {
         }
     }
     return {
-        oncreate: (vnode) => {
+        oninit: (vnode) => {
             _updateRecentList(vnode);
             _updateStats(vnode);
         },
@@ -30529,7 +30645,9 @@ const Board = (initialVnode) => {
             const scale = view.boardScale || 1.0;
             let attrs = {};
             // Add handlers for pinch zoom functionality
-            addPinchZoom(attrs, view.zoomIn, view.zoomOut);
+            // Note: resist the temptation to pass zoomIn/zoomOut directly,
+            // as that would not bind the 'this' pointer correctly
+            addPinchZoom(attrs, () => view.zoomIn(), () => view.zoomOut());
             if (scale !== 1.0)
                 attrs.style = `transform: scale(${scale})`;
             return m(".board", { id: "board-parent" }, m("table.board", attrs, m("tbody", allrows())));
@@ -30707,7 +30825,7 @@ const Chat = (initialVnode) => {
     const { view } = initialVnode.attrs;
     const model = view.model;
     const game = model.game;
-    model.state;
+    const state = model.state;
     function decodeTimestamp(ts) {
         // Parse and split an ISO timestamp string, formatted as YYYY-MM-DD HH:MM:SS
         return {
@@ -30764,7 +30882,7 @@ const Chat = (initialVnode) => {
         for (const emoticon of EMOTICONS)
             if (str.indexOf(emoticon.icon) >= 0) {
                 // The string contains the emoticon: prepare to replace all occurrences
-                const imgUrl = serverUrl(emoticon.image);
+                const imgUrl = serverUrl(state, emoticon.image);
                 const img = `<img src='${imgUrl}' height='32' width='32'>`;
                 // Re the following trick, see https://stackoverflow.com/questions/1144783/
                 // replacing-all-occurrences-of-a-string-in-javascript
@@ -31915,13 +32033,13 @@ class View {
                 views.push(this.vwLogin());
                 break;
             case "loginerror":
-                views.push(m(LoginError));
+                views.push(m(LoginError, { key: "login-error" }, t("Villa við innskráningu")));
                 break;
             case "main":
-                views.push(m(Main, { view: this }));
+                views.push(m(Main, { key: "main", view: this }));
                 break;
             case "game":
-                views.push(m(GameView, { view: this }));
+                views.push(m(GameView, { key: "game", view: this }));
                 break;
             case "review":
                 const n = vwReview(this);
@@ -31929,7 +32047,7 @@ class View {
                 break;
             case "thanks":
                 // Display a thank-you dialog on top of the normal main screen
-                views.push(m(Main, { view: this }));
+                views.push(m(Main, { key: "main", view: this }));
                 // Be careful to add the Thanks dialog only once to the stack
                 if (!this.dialogStack.length)
                     this.showThanks();
@@ -31940,7 +32058,7 @@ class View {
                 views.push(this.vwHelp(parseInt(m.route.param("tab") || ""), parseInt(m.route.param("faq") || "")));
                 break;
             default:
-                return [m("div", t("Þessi vefslóð er ekki rétt"))];
+                return [m("div", { key: "error" }, t("Þessi vefslóð er ekki rétt"))];
         }
         // Push any open dialogs
         for (const dialog of this.dialogStack) {
@@ -31955,7 +32073,7 @@ class View {
         }
         // Overlay a spinner, if active
         if (model.spinners)
-            views.push(m(Spinner));
+            views.push(m(Spinner, { key: "spinner" }));
         return views;
     }
     // Dialog support
@@ -32036,7 +32154,7 @@ class View {
     zoomOut() {
         if (this.boardScale !== 1.0) {
             this.boardScale = 1.0;
-            setTimeout(this.resetScale);
+            setTimeout(() => this.resetScale());
         }
     }
     resetScale() {
@@ -32083,7 +32201,7 @@ class View {
             // 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
-            setTimeout(this.resetScale);
+            setTimeout(() => this.resetScale());
             return;
         }
         const tp = game.tilesPlaced();
@@ -32177,7 +32295,7 @@ class View {
             }
         }
         // Output literal HTML obtained from rawhelp.html on the server
-        return m.fragment({}, [
+        return m.fragment({ key: "help" }, [
             m(LeftLogo),
             m(UserId, { view: this }),
             this.vwTabsFromHtml(model.helpHTML || "", "tabs", tabNumber, wireQuestions),
@@ -32223,6 +32341,7 @@ class View {
             vnode.dom.querySelector("#nickname").focus();
         }
         return m(".modal-dialog", {
+            key: "userprefs",
             id: "user-dialog",
             oncreate: initFocus
             // onupdate: initFocus
@@ -32304,11 +32423,12 @@ class View {
             model.loadUser(true); // Activate spinner while loading
         if (!model.user)
             // Nothing to edit (the spinner should be showing in this case)
-            return m.fragment({}, []);
+            return m.fragment({ key: "userprefs-empty" }, []);
         return this.vwUserPrefsDialog();
     }
     vwUserInfo(args) {
         return m(UserInfoDialog, {
+            key: "userinfodialog-" + args.userid,
             view: this,
             userid: args.userid,
             nick: args.nick,
@@ -32317,6 +32437,7 @@ class View {
     }
     vwPromo(args) {
         return m(PromoDialog, {
+            key: "promo-" + args.kind,
             view: this,
             kind: args.kind,
             initFunc: args.initFunc
@@ -32324,6 +32445,7 @@ class View {
     }
     vwWait(args) {
         return m(WaitDialog, {
+            key: "wait-" + args.challengeKey,
             view: this,
             oppId: args.oppId,
             oppNick: args.oppNick,
@@ -32334,6 +32456,7 @@ class View {
     }
     vwAccept(args) {
         return m(AcceptDialog, {
+            key: "accept-" + args.challengeKey,
             view: this,
             oppId: args.oppId,
             oppNick: args.oppNick,
@@ -32344,7 +32467,7 @@ class View {
         var _a;
         const model = this.model;
         const loginUrl = ((_a = model.state) === null || _a === void 0 ? void 0 : _a.loginUrl) || "";
-        return m(LoginForm, { loginUrl });
+        return m(LoginForm, { key: "login", loginUrl });
     }
     vwDialogs() {
         // Show prompt dialogs below game board, if any
@@ -32423,12 +32546,12 @@ class View {
 View.dialogViews = {
     userprefs: (view) => view.vwUserPrefs(),
     userinfo: (view, args) => view.vwUserInfo(args),
-    challenge: (view, args) => m(ChallengeDialog, { view, item: args }),
+    challenge: (view, args) => m(ChallengeDialog, { key: "challenge-" + args.item.challenge_key, view, item: args }),
     promo: (view, args) => view.vwPromo(args),
-    friend: (view) => m(FriendPromoteDialog, { view }),
-    thanks: (view) => m(FriendThanksDialog, { view }),
-    cancel: (view) => m(FriendCancelDialog, { view }),
-    confirm: (view) => m(FriendCancelConfirmDialog, { view }),
+    friend: (view) => m(FriendPromoteDialog, { key: "friend", view }),
+    thanks: (view) => m(FriendThanksDialog, { key: "thanks", view }),
+    cancel: (view) => m(FriendCancelDialog, { key: "cancel", view }),
+    confirm: (view) => m(FriendCancelConfirmDialog, { key: "confirm", view }),
     wait: (view, args) => view.vwWait(args),
     accept: (view, args) => view.vwAccept(args)
 };
@@ -32466,7 +32589,7 @@ class WordChecker {
             }
         }
     }
-    async checkWords(locale, words) {
+    async checkWords(state, locale, words) {
         // Return true if all words are valid in the given locale,
         // or false otherwise. Lookups are cached for efficiency.
         let cache = this.wordCheckCache[locale];
@@ -32494,7 +32617,7 @@ class WordChecker {
         }
         // We need a server roundtrip
         try {
-            const response = await requestMoves({
+            const response = await requestMoves(state, {
                 url: "/wordcheck",
                 body: {
                     locale,
@@ -32724,7 +32847,7 @@ const BOARD = {
     }
 };
 class BaseGame {
-    constructor(uuid, board_type = "standard") {
+    constructor(uuid, state, board_type = "standard") {
         // Basic game properties that don't change while the game is underway
         this.locale = "is_IS";
         this.alphabet = "";
@@ -32758,6 +32881,7 @@ class BaseGame {
         this.board_type = board_type;
         this.startSquare = START_SQUARE[board_type];
         this.startCoord = START_COORD[board_type];
+        this.state = state;
     }
     // Default init method that can be overridden
     init() {
@@ -32998,7 +33122,7 @@ class BaseGame {
             if (!this.manual) {
                 // This is not a manual-wordcheck game:
                 // Check the word that has been laid down
-                const found = await wordChecker.checkWords(this.locale, scoreResult.words);
+                const found = await wordChecker.checkWords(this.state, this.locale, scoreResult.words);
                 this.wordGood = found;
                 this.wordBad = !found;
             }
@@ -33261,10 +33385,10 @@ const MAX_OVERTIME = 10 * 60.0;
 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, maxOvertime) {
+    constructor(uuid, srvGame, moveListener, state, maxOvertime) {
         var _a;
         // Call parent constructor
-        super(uuid); // Default board_type: "standard"
+        super(uuid, state); // Default board_type: "standard"
         // A class that represents a Netskrafl game instance on the client
         // Netskrafl-specific properties
         this.userid = ["", ""];
@@ -33521,7 +33645,7 @@ class Game extends BaseGame {
         try {
             if (!this.uuid)
                 return;
-            const result = await request({
+            const result = await request(this.state, {
                 method: "POST",
                 url: "/gamestate",
                 body: { game: this.uuid } // !!! FIXME: Add delete_zombie parameter
@@ -33724,7 +33848,7 @@ class Game extends BaseGame {
         this.chatLoading = true;
         this.messages = [];
         try {
-            const result = await request({
+            const result = await request(this.state, {
                 method: "POST",
                 url: "/chatload",
                 body: { channel: "game:" + this.uuid }
@@ -33750,7 +33874,7 @@ class Game extends BaseGame {
         // Load statistics about a game
         this.stats = undefined; // Error/in-progress status
         try {
-            const json = await request({
+            const json = await request(this.state, {
                 method: "POST",
                 url: "/gamestats",
                 body: { game: this.uuid }
@@ -33770,7 +33894,7 @@ class Game extends BaseGame {
     async sendMessage(msg) {
         // Send a chat message
         try {
-            await request({
+            await request(this.state, {
                 method: "POST",
                 url: "/chatmsg",
                 body: { channel: "game:" + this.uuid, msg: msg }
@@ -33972,10 +34096,10 @@ class Game extends BaseGame {
         // Send a move to the server
         this.moveInProgress = true;
         try {
-            const result = await request({
+            const result = await request(this.state, {
                 method: "POST",
                 url: "/submitmove",
-                body: { moves: moves, mcount: this.moves.length, uuid: this.uuid }
+                body: { moves: moves, mcount: this.moves.length, uuid: this.uuid },
             });
             // The update() function also handles error results
             this.update(result);
@@ -34001,7 +34125,7 @@ class Game extends BaseGame {
         // Force resignation by a tardy opponent
         this.moveInProgress = true;
         try {
-            const result = await request({
+            const result = await request(this.state, {
                 method: "POST",
                 url: "/forceresign",
                 body: { mcount: this.moves.length, game: this.uuid }
@@ -34125,7 +34249,10 @@ const HOT_WARM_BOUNDARY_RATIO = 0.6;
 const WARM_COLD_BOUNDARY_RATIO = 0.3;
 class Riddle extends BaseGame {
     constructor(uuid, date, model) {
-        super(uuid);
+        if (!model.state) {
+            throw new Error("No global state in Riddle constructor");
+        }
+        super(uuid, model.state);
         // Scoring properties, static
         this.bestPossibleScore = 0;
         this.warmBoundary = 0;
@@ -34166,9 +34293,12 @@ class Riddle extends BaseGame {
     async load(date, locale) {
         this.date = date;
         this.locale = locale;
+        const { state } = this;
         try {
+            if (!state)
+                throw new Error("No global state in Riddle.load");
             // Request riddle data from server (HTTP API call)
-            const response = await request({
+            const response = await request(state, {
                 method: "POST",
                 url: "/gatadagsins/riddle",
                 body: { date, locale }
@@ -34196,11 +34326,11 @@ class Riddle extends BaseGame {
         }
     }
     async submitRiddleWord(move) {
-        const { state } = this.model;
+        const { state } = this;
         if (!state || !state.userId)
             return;
         try {
-            await request({
+            await request(state, {
                 method: "POST",
                 url: "/gatadagsins/submit",
                 body: {
@@ -34480,8 +34610,6 @@ function getSettings() {
 }
 class Model {
     constructor(settings, state) {
-        // A class for the underlying data model, displayed by the current view
-        this.state = null;
         this.paths = [];
         // The routeName will be "login", "main", "game"...
         this.routeName = undefined;
@@ -34540,7 +34668,54 @@ class Model {
         this.isExplo = state.isExplo;
         this.maxFreeGames = state.isExplo ? MAX_FREE_EXPLO : MAX_FREE_NETSKRAFL;
         // Load localized text messages from the messages.json file
-        loadMessages(state.locale);
+        loadMessages(state, state.locale);
+    }
+    // Simple POST request with JSON body (most common case)
+    async post(url, body) {
+        if (!this.state) {
+            throw new Error("Model state is not initialized");
+        }
+        return request(this.state, {
+            method: "POST",
+            url,
+            body
+        });
+    }
+    // GET request for HTML/text content
+    async getText(url) {
+        if (!this.state) {
+            throw new Error("Model state is not initialized");
+        }
+        return request(this.state, {
+            method: "GET",
+            url,
+            responseType: "text",
+            deserialize: (str) => str
+        });
+    }
+    // POST request that returns text/HTML
+    async postText(url, body) {
+        if (!this.state) {
+            throw new Error("Model state is not initialized");
+        }
+        return request(this.state, {
+            method: "POST",
+            url,
+            body,
+            responseType: "text",
+            deserialize: (str) => str
+        });
+    }
+    // Request to the moves service
+    async postMoves(body) {
+        if (!this.state) {
+            throw new Error("Model state is not initialized");
+        }
+        return requestMoves(this.state, {
+            method: "POST",
+            url: "/moves",
+            body
+        });
     }
     async loadGame(uuid, funcComplete, deleteZombie = false) {
         var _a;
@@ -34559,20 +34734,16 @@ class Model {
             this.highlightedMove = null;
             if (!uuid)
                 return; // Should not happen
-            const result = await request({
-                method: "POST",
-                url: "/gamestate",
-                body: {
-                    game: uuid,
-                    delete_zombie: deleteZombie
-                }
+            const result = await this.post("/gamestate", {
+                game: uuid,
+                delete_zombie: deleteZombie
             });
             if (!(result === null || result === void 0 ? void 0 : 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, ((_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, ((_a = this.state) === null || _a === void 0 ? void 0 : _a.runningLocal) ? DEBUG_OVERTIME : MAX_OVERTIME);
                 // Successfully loaded: call the completion function, if given
                 // (this usually attaches the Firebase event listener)
                 funcComplete && funcComplete();
@@ -34595,11 +34766,7 @@ class Model {
         this.numChallenges = 0;
         this.oppReady = 0;
         try {
-            const json = await request({
-                method: "POST",
-                url: "/allgamelists",
-                body: { zombie: includeZombies, count: 40 }
-            });
+            const json = await this.post("/allgamelists", { zombie: includeZombies, count: 40 });
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.gameList = [];
@@ -34641,11 +34808,7 @@ class Model {
         this.numGames = 0;
         this.spinners++;
         try {
-            const json = await request({
-                method: "POST",
-                url: "/gamelist",
-                body: { zombie: includeZombies }
-            });
+            const json = await this.post("/gamelist", { zombie: includeZombies });
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.gameList = [];
@@ -34675,10 +34838,7 @@ class Model {
         this.oppReady = 0;
         this.spinners++; // Show spinner while loading
         try {
-            const json = await request({
-                method: "POST",
-                url: "/challengelist"
-            });
+            const json = await this.post("/challengelist");
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.challengeList = [];
@@ -34712,11 +34872,7 @@ class Model {
         this.recentList = [];
         this.spinners++; // Show spinner while loading
         try {
-            const json = await request({
-                method: "POST",
-                url: "/recentlist",
-                body: { versus: null, count: 40 }
-            });
+            const json = await this.post("/recentlist", { versus: null, count: 40 });
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.recentList = [];
@@ -34735,11 +34891,7 @@ class Model {
     }
     async loadUserRecentList(userid, versus, readyFunc) {
         // Load the list of recent games for the given user
-        const json = await request({
-            method: "POST",
-            url: "/recentlist",
-            body: { user: userid, versus: versus, count: 40 }
-        });
+        const json = await this.post("/recentlist", { user: userid, versus: versus, count: 40 });
         readyFunc(json);
     }
     async loadUserList(criteria) {
@@ -34757,11 +34909,7 @@ class Model {
         const url = "/userlist";
         const body = criteria;
         try {
-            const json = await request({
-                method: "POST",
-                url,
-                body,
-            });
+            const json = await this.post(url, body);
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.userList = [];
@@ -34783,11 +34931,7 @@ class Model {
         const url = "/rating";
         const body = { kind: spec };
         try {
-            const json = await request({
-                method: "POST",
-                url,
-                body,
-            });
+            const json = await this.post(url, body);
             if (!json || json.result !== 0) {
                 // An error occurred
                 this.eloRatingList = [];
@@ -34806,11 +34950,7 @@ class Model {
         // Load statistics for the current user
         this.ownStats = {};
         try {
-            const json = await request({
-                method: "POST",
-                url: "/userstats",
-                body: {} // Current user is implicit
-            });
+            const json = await this.post("/userstats", {});
             if (!json || json.result !== 0) {
                 // An error occurred
                 return;
@@ -34823,11 +34963,7 @@ class Model {
     async loadUserStats(userid, readyFunc) {
         // Load statistics for the given user
         try {
-            const json = await request({
-                method: "POST",
-                url: "/userstats",
-                body: { user: userid }
-            });
+            const json = await this.post("/userstats", { user: userid });
             readyFunc(json);
         }
         catch (e) {
@@ -34837,13 +34973,7 @@ class Model {
     async loadPromoContent(key, readyFunc) {
         // Load HTML content for promo dialog
         try {
-            const html = await request({
-                method: "POST",
-                url: "/promo",
-                body: { key: key },
-                responseType: "text",
-                deserialize: (str) => str
-            });
+            const html = await this.postText("/promo", { key: key });
             readyFunc(html);
         }
         catch (e) {
@@ -34892,11 +35022,7 @@ class Model {
                 rack,
                 limit: NUM_BEST_MOVES,
             };
-            const json = await requestMoves({
-                method: "POST",
-                url: "/moves",
-                body: rq,
-            });
+            const json = await this.postMoves(rq);
             this.highlightedMove = null;
             if (!json || json.moves === undefined) {
                 // Something unexpected going on
@@ -34931,12 +35057,7 @@ class Model {
             return; // Already loaded
         try {
             const locale = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
-            const result = await request({
-                method: "GET",
-                url: "/rawhelp?version=malstadur&locale=" + locale,
-                responseType: "text",
-                deserialize: (str) => str
-            });
+            const result = await this.getText("/rawhelp?version=malstadur&locale=" + locale);
             this.helpHTML = result;
         }
         catch (e) {
@@ -34951,12 +35072,7 @@ class Model {
             return; // Already loaded
         try {
             const locale = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
-            const result = await request({
-                method: "GET",
-                url: "/friend?locale=" + locale,
-                responseType: "text",
-                deserialize: (str) => str
-            });
+            const result = await this.getText("/friend?locale=" + locale);
             this.friendHTML = result;
         }
         catch (e) {
@@ -34972,10 +35088,7 @@ class Model {
             this.spinners++;
         }
         try {
-            const result = await request({
-                method: "POST",
-                url: "/loaduserprefs",
-            });
+            const result = await this.post("/loaduserprefs");
             if (!result || !result.ok) {
                 this.user = null;
                 this.userErrors = null;
@@ -35002,11 +35115,7 @@ class Model {
         if (!user)
             return;
         try {
-            const result = await request({
-                method: "POST",
-                url: "/saveuserprefs",
-                body: user
-            });
+            const result = await this.post("/saveuserprefs", user);
             if (result === null || result === void 0 ? void 0 : result.ok) {
                 // User preferences modified successfully on the server:
                 // update the state variables that we're caching
@@ -35420,8 +35529,10 @@ class Actions {
     }
     async markFavorite(userId, status) {
         // Mark or de-mark a user as a favorite
+        if (!this.model.state)
+            return;
         try {
-            await request({
+            await request(this.model.state, {
                 method: "POST",
                 url: "/favorite",
                 body: { destuser: userId, action: status ? "add" : "delete" }
@@ -35439,8 +35550,10 @@ class Actions {
     async handleChallenge(parameters) {
         var _a;
         // Reject or retract a challenge
+        if (!this.model.state)
+            return;
         try {
-            const json = await request({
+            const json = await request(this.model.state, {
                 method: "POST",
                 url: "/challenge",
                 body: parameters
@@ -35495,6 +35608,8 @@ class 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;
         try {
             const rqBody = { opp: oppid, rev: reverse };
             if (this.model.isExplo) {
@@ -35507,7 +35622,7 @@ class Actions {
                 url: "/initgame",
                 body: rqBody
             };
-            const json = await request(rq);
+            const json = await request(this.model.state, rq);
             if (json === null || json === void 0 ? void 0 : json.ok) {
                 // Log the new game event
                 const locale = ((_a = this.model.state) === null || _a === void 0 ? void 0 : _a.locale) || "is_IS";
@@ -35573,8 +35688,10 @@ class Actions {
     // User Preference Management Actions
     async setUserPref(pref) {
         // Set a user preference on the server
+        if (!this.model.state)
+            return;
         try {
-            await request({
+            await request(this.model.state, {
                 method: "POST",
                 url: "/setuserpref",
                 body: pref
@@ -35591,7 +35708,7 @@ class Actions {
         if (!user || !state)
             return false;
         try {
-            const json = await request({
+            const json = await request(state, {
                 method: "POST",
                 url: "/cancelplan",
                 body: {}
@@ -35709,41 +35826,25 @@ async function main$1(state, container) {
         console.error("No container element found");
         return "error";
     }
-    // Set up Netskrafl backend server URLs
-    setServerUrl(state.serverUrl, state.movesUrl, state.movesAccessKey);
     try {
-        const loginData = await loginUserByEmail(state.userEmail, state.userNick, state.userFullname, state.token);
-        if (loginData.status === "expired") {
-            // The current Málstaður JWT has expired;
-            // we need to obtain a new one
-            return "expired";
-        }
-        if (loginData.status === "success") {
-            state.userId = loginData.user_id;
-            // Use the nickname from the server, if available
-            state.userNick = loginData.nickname || state.userNick;
-            // Log in to Firebase with the token passed from the server
-            await loginFirebase(state, loginData.firebase_token);
-            // Everything looks OK:
-            // Create the model, actions and view objects in proper sequence
-            const settings = getSettings();
-            const model = new Model(settings, state);
-            const actions = new Actions(model);
-            const view = new View(actions);
-            // Run the Mithril router
-            const routeResolver = createRouteResolver(actions, view);
-            m.route(container, settings.defaultRoute, routeResolver);
-            return "success";
-        }
+        // Skip initial login - authentication will happen lazily on first API call
+        // Create the model, actions and view objects in proper sequence
+        const settings = getSettings();
+        const model = new Model(settings, state);
+        const actions = new Actions(model);
+        const view = new View(actions);
+        // Run the Mithril router
+        const routeResolver = createRouteResolver(actions, view);
+        m.route(container, settings.defaultRoute, routeResolver);
     }
     catch (e) {
-        console.error("Exception during login: ", e);
+        console.error("Exception during initialization: ", e);
+        return "error";
     }
-    m.mount(container, LoginError);
-    return "error";
+    return "success";
 }
 
-const mountForUser$1 = async (state, tokenExpired) => {
+const mountForUser$1 = async (state) => {
     // Return a DOM tree containing a mounted Netskrafl UI
     // for the user specified in the state object
     const { userEmail } = state;
@@ -35771,18 +35872,12 @@ const mountForUser$1 = async (state, tokenExpired) => {
         root.className = "netskrafl-user";
         return root;
     }
-    else if (loginResult === "expired") {
-        // We need a new token from the Málstaður backend
-        root.className = "netskrafl-expired";
-        tokenExpired && tokenExpired(); // This causes a reload of the component
-        return root;
-    }
     // console.error("Failed to mount Netskrafl UI for user", userEmail);
     throw new Error("Failed to mount Netskrafl UI");
 };
 const NetskraflImpl = ({ state, tokenExpired }) => {
     const ref = React.createRef();
-    const completeState = { ...DEFAULT_STATE, ...state };
+    const completeState = makeGlobalState({ ...state, tokenExpired });
     const { userEmail } = completeState;
     /*
     useEffect(() => {
@@ -35815,7 +35910,7 @@ const NetskraflImpl = ({ state, tokenExpired }) => {
             return;
         }
         try {
-            mountForUser$1(completeState, tokenExpired).then((div) => {
+            mountForUser$1(completeState).then((div) => {
                 // Attach the div as a child of the container
                 // instead of any previous children
                 const container = ref.current;
@@ -36375,44 +36470,28 @@ async function main(state, container) {
         console.error("No container element found");
         return "error";
     }
-    // Set up Netskrafl backend server URLs
-    setServerUrl(state.serverUrl, state.movesUrl, state.movesAccessKey);
     try {
-        const loginData = await loginUserByEmail(state.userEmail, state.userNick, state.userFullname, state.token);
-        if (loginData.status === "expired") {
-            // The current Málstaður JWT has expired;
-            // we need to obtain a new one
-            return "expired";
-        }
-        if (loginData.status === "success") {
-            state.userId = loginData.user_id;
-            // Use the nickname from the server, if available
-            state.userNick = loginData.nickname || state.userNick;
-            // Log in to Firebase with the token passed from the server
-            await loginFirebase(state, loginData.firebase_token);
-            // Everything looks OK:
-            // Create the model, view and actions objects
-            const settings = getSettings();
-            const model = new Model(settings, state);
-            const actions = new Actions(model);
-            const view = new View(actions);
-            const today = new Date().toISOString().split("T")[0];
-            const locale = state.locale || "is_IS";
-            // Mount the Gáta Dagsins UI using an anonymous closure component
-            m.mount(container, {
-                view: () => m(GataDagsins$1, { view, date: today, locale }),
-            });
-            return "success";
-        }
+        // Skip initial login - authentication will happen lazily on first API call
+        // Create the model, view and actions objects
+        const settings = getSettings();
+        const model = new Model(settings, state);
+        const actions = new Actions(model);
+        const view = new View(actions);
+        const today = new Date().toISOString().split("T")[0];
+        const locale = state.locale || "is_IS";
+        // Mount the Gáta Dagsins UI using an anonymous closure component
+        m.mount(container, {
+            view: () => m(GataDagsins$1, { view, date: today, locale }),
+        });
     }
     catch (e) {
-        console.error("Exception during login: ", e);
+        console.error("Exception during initialization: ", e);
+        return "error";
     }
-    m.mount(container, LoginError);
-    return "error";
+    return "success";
 }
 
-const mountForUser = async (state, tokenExpired) => {
+const mountForUser = async (state) => {
     // Return a DOM tree containing a mounted Gáta Dagsins UI
     // for the user specified in the state object
     const { userEmail } = state;
@@ -36440,18 +36519,12 @@ const mountForUser = async (state, tokenExpired) => {
         root.className = "gatadagsins-user";
         return root;
     }
-    else if (loginResult === "expired") {
-        // We need a new token from the Málstaður backend
-        root.className = "gatadagsins-expired";
-        tokenExpired && tokenExpired(); // This causes a reload of the component
-        return root;
-    }
     // console.error("Failed to mount Gáta Dagsins UI for user", userEmail);
     throw new Error("Failed to mount Gáta Dagsins UI");
 };
 const GataDagsinsImpl = ({ state, tokenExpired }) => {
     const ref = React.createRef();
-    const completeState = { ...DEFAULT_STATE, ...state };
+    const completeState = makeGlobalState({ ...state, tokenExpired });
     const { userEmail } = completeState;
     useEffect(() => {
         var _a;
@@ -36469,7 +36542,7 @@ const GataDagsinsImpl = ({ state, tokenExpired }) => {
             return;
         }
         try {
-            mountForUser(completeState, tokenExpired).then((div) => {
+            mountForUser(completeState).then((div) => {
                 // Attach the div as a child of the container
                 // instead of any previous children
                 const container = ref.current;