refactor: deduplicate code to reuse logic & add title on login screen

Author: Reeyuki

webos-desktop/public/app-list.json

@@ -209,7 +209,6 @@
   "raft",
   "redball4",
   "remotehostapp",
-  "replitapp",
   "repo",
   "rhythmsapp",
   "roads",
@@ -266,7 +265,6 @@
   "swordssouls",
   "systemappsapp",
   "tabs",
-  "talkingben",
   "tanktrouble",
   "taskmanagerapp",
   "tattletail",

webos-desktop/src/3d/GameCaseManager.js

@@ -590,6 +590,7 @@ export class GameCaseManager {
   }
 
   startGameMode(gameState) {
+    const THREE = this.THREE;
     this.setGameMode(true, gameState);
     for (const gameCase of this.gameCases) {
       if (gameCase.shelved) {

webos-desktop/src/3d/RoomRenderer.js

@@ -1394,6 +1394,7 @@ export class RoomRenderer {
   }
 
   setQuality(level) {
+    const THREE = this.THREE;
     const isUltra = level === "ultra";
     const isHigh = level === "high" || isUltra;
     const isLow = level === "low";

webos-desktop/src/3d/editor/SceneSerializer.js

@@ -1,6 +1,6 @@
-import { os } from "../../os/index.js";
+import { os, StorageKeys } from "../../framework.js";
 
-const STORAGE_KEY = "rm3d_roomLayout";
+const STORAGE_KEY = StorageKeys.room3dRoomLayout;
 
 export class SceneSerializer {
   serialize(furnitureManager, decorManager) {

webos-desktop/src/SessionManager.js

@@ -7,8 +7,8 @@ import { YUKIOS_VERSION } from "./apps/about.js";
 import { resolveAvatarUrl } from "./shared/avatarResolver.js";
 import { $ } from "./shared/domUtils.js";
 import { renderLiveStats } from "./shared/liveStats.js";
-import { resolveAppId } from "./utils/utils.js";
-import { StorageKeys, os, brand } from "./framework.js";
+import { resolveAppId, generateUUID, timeAgo } from "./utils/utils.js";
+import { StorageKeys, os, brand, wasRandomYuriTrigger } from "./framework.js";
 import { KeybindManager } from "./keybindManager.js";
 import { applyTheme } from "./settings/settingsApply.js";
 import { taskbarPositionManager } from "./desktopui/taskbarPositionManager.js";
@@ -22,13 +22,6 @@ import { applyTilingSettings, disableTilingSettings } from "./modes/tiling/sessi
 import { applyChromeOsSettings, disableChromeOsSettings } from "./modes/chromeos/session.js";
 import { showDonationPopup } from "./donationPopup.js";
 import { getRecentNews } from "./apps/news.js";
-function generateUUID() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = (Math.random() * 16) | 0;
-    const v = c === "x" ? r : (r & 0x3) | 0x8;
-    return v.toString(16);
-  });
-}
 
 export class SessionManager {
   constructor(os) {
@@ -215,6 +208,7 @@ export class SessionManager {
       <div class="session-wallpaper"></div>
       <div class="session-background"></div>
       <div class="session-content${state === "locked" ? "" : " extra-hidden"}">
+        <div class="session-brand">${brand("YukiOS")}</div>
         <div class="session-time">${timeStr}</div>
         <div class="session-date">${dateStr}</div>
 
@@ -523,17 +517,7 @@ export class SessionManager {
   }
 
   formatTimeAgo(date) {
-    const now = new Date();
-    const diffMs = now - date;
-    const diffMins = Math.floor(diffMs / 60000);
-    const diffHours = Math.floor(diffMs / 3600000);
-    const diffDays = Math.floor(diffMs / 86400000);
-
-    if (diffMins < 1) return "Just now";
-    if (diffMins < 60) return `${diffMins}m ago`;
-    if (diffHours < 24) return `${diffHours}h ago`;
-    if (diffDays < 7) return `${diffDays}d ago`;
-    return date.toLocaleDateString();
+    return timeAgo(date);
   }
 
   async applySessionWallpaper(container) {
@@ -1078,6 +1062,13 @@ export class SessionManager {
     }
 
     os.events.emit(BusEvents.SESSION_INITIALIZED, this.currentSession);
+    if (wasRandomYuriTrigger()) {
+      os.notify.send("YuriOS", "Random chance triggered YuriOS! Pink mode has appeared.", {
+        type: "info",
+        duration: 6000,
+        icon: "fas fa-heart"
+      });
+    }
     liveActivityManager.init();
 
     if (this.selectedSession === "Yuki Mac Desktop") {

webos-desktop/src/StorageKeys.js

@@ -247,5 +247,16 @@ export const StorageKeys = {
   chromeOsShelfPosition: "yukiOS_chrome_os_shelf_position",
   chromeOsShelfAutoHide: "yukiOS_chrome_os_shelf_autohide",
   chromeOsClock24h: "yukiOS_chrome_os_clock_24h",
-  chromeOsShelfPinnedItems: "yukiOS_chrome_os_shelf_pinned_items"
+  chromeOsShelfPinnedItems: "yukiOS_chrome_os_shelf_pinned_items",
+  aiMemory: "yuki_ai_memory",
+  aiChatHistory: "yuki_ai_chathistory",
+  aiPreferences: "yuki_ai_preferences",
+  weatherUserLocation: "wx_user_location",
+  weatherCachePrefix: "yukiOS_weather_",
+  analyticsQueue: "yuki_analytics_queue",
+  robloxSettings: "roblox_settings",
+  settingsDisplayName: "settings:displayName",
+  room3dStoragePrefix: "rm3d_",
+  room3dAchievements: "rm3d_achievements",
+  room3dRoomLayout: "rm3d_roomLayout"
 };

webos-desktop/src/achievements.js

@@ -653,24 +653,30 @@ export class AchievementsApp extends BaseApp {
 
     document.body.appendChild(popup);
 
-    popup.addEventListener("click", () => os.app.launch("achievementsApp"));
+    const dismissPopup = () => {
+      if (!popup.isConnected) return;
+      popup.remove();
+      this.isShowingAchievement = false;
+      this.processQueue();
+    };
+
+    let hideTimer;
+    popup.addEventListener("click", () => {
+      clearTimeout(hideTimer);
+      dismissPopup();
+      os.app.launch("achievementsApp");
+    });
 
     setTimeout(() => popup.classList.add("achievement-popup--show"), 10);
 
     const displayDuration = 4000;
-    const delayBetween = 500;
 
-    setTimeout(() => {
+    hideTimer = setTimeout(() => {
       popup.classList.remove("achievement-popup--show");
       popup.classList.add("achievement-popup--hide");
 
       setTimeout(() => {
-        popup.remove();
-
-        setTimeout(() => {
-          this.isShowingAchievement = false;
-          this.processQueue();
-        }, delayBetween);
+        dismissPopup();
       }, 600);
     }, displayDuration);
   }

webos-desktop/src/analytics.js

@@ -1,7 +1,7 @@
 import { os, $ } from "./framework.js";
 import { StorageKeys } from "./StorageKeys.js";
 
-const ANALYTICS_QUEUE_KEY = "yuki_analytics_queue";
+const ANALYTICS_QUEUE_KEY = StorageKeys.analyticsQueue;
 import { parseBool } from "./utils/utils.js";
 
 const ENDPOINT_BASE = "https://analytics.liventcord-a60.workers.dev";

webos-desktop/src/appLauncher.js

@@ -7,7 +7,7 @@ import { initializeAppGrid, tryGetIcon, trackRecentlyUsed } from "./desktopui/st
 const IFRAME_ATTRS =
   'style="width:100%;height:100%;border:none;" allow="autoplay; fullscreen; clipboard-write; encrypted-media; picture-in-picture" sandbox="allow-forms allow-downloads allow-modals allow-pointer-lock allow-popups allow-same-origin allow-scripts allow-top-navigation-by-user-activation"';
 import { getLibraryUrl } from "./shared/cdnConfig.js";
-import { StorageKeys, os, brand } from "./framework.js";
+import { StorageKeys, os, brand, yuriPageTitle } from "./framework.js";
 import { parseBool } from "./utils/utils.js";
 import {
   fetchHtmlAsBlobUrl,
@@ -551,12 +551,10 @@ player.load("${swfPath}");
         const isGame = this.isTransparencyBlocked(appId, { type });
         const gameIcon = this.appMap[appId]?.icon || "fas fa-gamepad";
         const resolvedGameIcon = resolveIconUrl(gameIcon);
-        const gameIconHtml =
-          resolvedGameIcon.startsWith("fas ") ||
-          resolvedGameIcon.startsWith("fab ") ||
-          resolvedGameIcon.startsWith("far ")
-            ? `<i class="${resolvedGameIcon}" style="margin-right:6px;font-size:16px;vertical-align:middle;"></i>`
-            : `<img src="${resolvedGameIcon}" style="width:20px;height:20px;margin-right:6px;vertical-align:middle;object-fit:contain;">`;
+        const gameIconHtml = this.buildWindowIconHtml(resolvedGameIcon, {
+          margin: "6px",
+          iconVerticalAlign: true
+        });
 
         if (window.electronAPI) {
           let nativeWidth = 1280;
@@ -609,13 +607,12 @@ player.load("${swfPath}");
           : "";
 
         win.innerHTML = `
-          <div class="window-header">
-            <span>${gameIconHtml}${displayTitle}</span>
-            <div class="window-header-actions">
-              ${overlayBtnHtml}
-              ${os.window.getWindowControls(resolvedSource, true)}
-            </div>
-          </div>
+          ${this.buildWindowHeaderMarkup(
+            gameIconHtml,
+            displayTitle,
+            overlayBtnHtml,
+            os.window.getWindowControls(resolvedSource, true)
+          )}
           <div class="window-content" style="width:100%; height:100%; overflow:hidden; display:flex; align-items:center; justify-content:center; background:#1a1a1a;">
             <div class="modern-loader">
               <div class="loader-dots">
@@ -702,10 +699,32 @@ player.load("${swfPath}");
     return !(appMeta.type === "system" || this.TRANSPARENCY_ALLOWED_APP_IDS.has(appId));
   }
 
+  buildWindowIconHtml(resolvedIcon, options = {}) {
+    const { margin = "8px", iconVerticalAlign = false } = options;
+    const isFontIcon =
+      resolvedIcon.startsWith("fas ") || resolvedIcon.startsWith("fab ") || resolvedIcon.startsWith("far ");
+    const vertAlignStyle = iconVerticalAlign ? "vertical-align:middle;" : "";
+    return isFontIcon
+      ? `<i class="${resolvedIcon}" style="margin-right:${margin};font-size:16px;${vertAlignStyle}"></i>`
+      : `<img src="${resolvedIcon}" style="width:20px;height:20px;margin-right:${margin};vertical-align:middle;object-fit:contain;">`;
+  }
+
+  buildWindowHeaderMarkup(iconHtml, title, overlayBtnHtml, controlsHtml) {
+    return `
+      <div class="window-header">
+        <span>${iconHtml}${title}</span>
+        <div class="window-header-actions">
+          ${overlayBtnHtml}
+          ${controlsHtml}
+        </div>
+      </div>
+    `;
+  }
+
   createWindow(id, title, contentHtml, externalUrl = null, appId = null, appMeta = {}) {
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.has("game") && appId) {
-      document.title = sanitizeTitle(title);
+      document.title = yuriPageTitle() || sanitizeTitle(title);
       document.head.insertAdjacentHTML(
         "beforeend",
         `<style>
@@ -751,23 +770,14 @@ player.load("${swfPath}");
     });
 
     const resolvedIcon = resolveIconUrl(icon);
-    const iconHtml =
-      resolvedIcon.startsWith("fas ") || resolvedIcon.startsWith("fab ") || resolvedIcon.startsWith("far ")
-        ? `<i class="${resolvedIcon}" style="margin-right:8px;font-size:16px;"></i>`
-        : `<img src="${resolvedIcon}" style="width:20px;height:20px;margin-right:8px;vertical-align:middle;object-fit:contain;">`;
+    const iconHtml = this.buildWindowIconHtml(resolvedIcon, { margin: "8px" });
 
     const overlayBtnHtml = isGame
       ? `<button class="overlay-open-btn" title="Steam Overlay (Shift+Tab)"><i class="fab fa-steam"></i></button>`
       : "";
 
     win.innerHTML = `
-      <div class="window-header">
-        <span>${iconHtml}${title}</span>
-        <div class="window-header-actions">
-          ${overlayBtnHtml}
-          ${os.window.getWindowControls(externalUrl, true)}
-        </div>
-      </div>
+      ${this.buildWindowHeaderMarkup(iconHtml, title, overlayBtnHtml, os.window.getWindowControls(externalUrl, true))}
       <div class="window-content" style="width:100%; height:100%; overflow:hidden;">${contentHtml}</div>
     `;
 

webos-desktop/src/apps/RemoteHostApp.js

@@ -10,7 +10,6 @@ const SIGNALING_BASE = "wss://yukios-remote-signaling.liventcord-a60.workers.dev
 export class RemoteHostApp extends BaseApp {
   constructor(services) {
     super(services);
-    this.openWindows = new Set();
     this.hostStreaming = false;
     this.hostRoomCode = null;
     this.hostConnState = "idle";
@@ -20,7 +19,7 @@ export class RemoteHostApp extends BaseApp {
 
   async open(opts = {}) {
     const winId = "remote-host";
-    if (this.openWindows.has(winId)) return;
+    if (this.hasOpenWindow(winId)) return;
 
     const isElectron = typeof window.electronAPI !== "undefined";
 
@@ -165,7 +164,7 @@ export class RemoteHostApp extends BaseApp {
       </div>
     `;
 
-    this.openWindows.add(winId);
+    this.trackWindow(winId, win);
     this.win = win;
     this.winId = winId;
 
@@ -609,7 +608,7 @@ export class RemoteHostApp extends BaseApp {
   }
 
   onClose(winId) {
-    this.openWindows.delete(winId);
+    this.untrackWindow(winId);
     if (this.hostStatusInterval) {
       clearInterval(this.hostStatusInterval);
       this.hostStatusInterval = null;