Merge pull request #3342 from crowbartools/v5

5.65.0-beta2 Release

Author: zunderscore

grunt/pack.js

@@ -55,6 +55,7 @@ module.exports = function (grunt) {
         '--out="./dist/pack"',
         '--arch=x64',
         `--electronVersion=${version}`,
+        '--asar',
         '--prune',
         '--overwrite',
         '--version-string.ProductName="Firebot v5"',

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "firebotv5",
-    "version": "5.65.0-beta1",
+    "version": "5.65.0-beta2",
     "description": "Powerful all-in-one bot for Twitch streamers.",
     "main": "build/main.js",
     "scripts": {
@@ -27,15 +27,15 @@
         "@types/angular": "^1.8.4",
         "@types/archiver": "^6.0.3",
         "@types/escape-html": "^1.0.4",
-        "@types/express": "^5.0.3",
+        "@types/express": "^5.0.5",
         "@types/luxon": "^3.7.1",
         "@types/node": "^22.18.0",
         "@types/roll": "^1.2.3",
         "@types/sprintf-js": "^1.1.4",
         "@types/unzipper": "^0.10.11",
         "@types/yargs-parser": "^21.0.3",
         "@typescript-eslint/parser": "^8.46.0",
-        "electron": "^39.1.0",
+        "electron": "^39.2.4",
         "electron-installer-dmg": "^5.0.1",
         "electron-winstaller": "^5.4.0",
         "eslint": "^9.37.0",
@@ -54,10 +54,10 @@
     "dependencies": {
         "@aws-sdk/client-polly": "^3.26.0",
         "@seald-io/nedb": "^4.0.4",
-        "@twurple/api": "^7.4.0",
-        "@twurple/auth": "^7.4.0",
-        "@twurple/chat": "^7.4.0",
-        "@twurple/eventsub-ws": "^7.4.0",
+        "@twurple/api": "^8.0.2",
+        "@twurple/auth": "^8.0.2",
+        "@twurple/chat": "^8.0.2",
+        "@twurple/eventsub-ws": "^8.0.2",
         "@types/tinycolor2": "^1.4.6",
         "@zunderscore/elgato-light-control": "^1.2.0",
         "angular": "^1.8.0",
@@ -75,10 +75,8 @@
         "angular-ui-sortable": "^0.18.0",
         "angular-ui-validate": "^1.2.3",
         "angularjs-color-picker": "^3.4.8",
-        "angularjs-scroll-glue": "^2.2.0",
         "angularjs-slider": "^6.7.0",
         "archiver": "^7.0.1",
-        "body-parser": "^1.19.0",
         "client-oauth2": "^4.3.3",
         "cm-resize": "^1.0.1",
         "codemirror": "^5.59.1",
@@ -90,7 +88,6 @@
         "deepmerge": "^4.2.2",
         "dompurify": "^3.3.0",
         "ejs": "^3.1.10",
-        "electron-oauth2": "^3.0.0",
         "electron-regedit": "^2.0.0",
         "electron-window-state": "^5.0.3",
         "escape-html": "^1.0.3",
@@ -99,7 +96,7 @@
         "expressionish": "github:SReject/expressionish#d277e5d959e5b0cdf50a38a182016752a0de9dd6",
         "extra-life-ts": "^0.4.0",
         "firebot-nutjs": "github:crowbartools/firebot-nutjs#f52581d4c4426cf7f4dcc2b0d26cf56777e115f8",
-        "form-data": "^4.0.0",
+        "form-data": "^4.0.5",
         "fs-extra": "^11.2.0",
         "fuse.js": "^7.1.0",
         "glob": "^10.3.10",
@@ -115,7 +112,6 @@
         "node-json-db": "^1.4.1",
         "node-xlsx": "^0.24.0",
         "obs-websocket-js": "^5.0.6",
-        "request": "^2.85.0",
         "roll": "^1.2.0",
         "sanitize-filename": "^1.6.3",
         "socket.io-client": "^2.3.0",

package.json

@@ -1,4 +1,4 @@
-import type { Event } from "electron";
+import type { BrowserWindow, Event } from "electron";
 import logger from "../../../logwrapper";
 
 export async function secondInstance(event: Event, argv: string[]) {
@@ -10,7 +10,7 @@ export async function secondInstance(event: Event, argv: string[]) {
     try {
         logger.debug("Second instance detected, focusing main window.");
 
-        const { mainWindow } = await import("../window-management");
+        const mainWindow = globalThis.mainWindow as BrowserWindow;
         if (mainWindow) {
             if (!mainWindow.isVisible()) {
                 mainWindow.show();

src/backend/app-management/electron/events/second-instance.ts

@@ -193,11 +193,8 @@ export async function whenReady() {
     builtinGameLoader.loadGames();
 
     windowManagement.updateSplashScreenStatus("Loading custom variables...");
-    const { SettingsManager } = await import("../../../common/settings-manager");
-    if (SettingsManager.getSetting("PersistCustomVariables")) {
-        const { CustomVariableManager } = await import("../../../common/custom-variable-manager");
-        CustomVariableManager.loadVariablesFromFile();
-    }
+    const { CustomVariableManager } = await import("../../../common/custom-variable-manager");
+    CustomVariableManager.loadVariablesFromFile();
 
     windowManagement.updateSplashScreenStatus("Loading sort tags...");
     const { SortTagManager } = await import("../../../sort-tags/sort-tag-manager");

src/backend/app-management/electron/events/when-ready.ts

@@ -22,9 +22,7 @@ export async function windowsAllClosed() {
     HotkeyManager.unregisterAllHotkeys();
 
     // Persist custom variables
-    if (SettingsManager.getSetting("PersistCustomVariables")) {
-        CustomVariableManager.persistVariablesToFile();
-    }
+    CustomVariableManager.persistVariablesToFile();
 
     // Set all users to offline
     await viewerOnlineStatusManager.setAllViewersOffline();

src/backend/app-management/electron/events/windows-all-closed.ts

@@ -70,7 +70,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             firebotChatMessage.customRewardId = HIGHLIGHT_MESSAGE_REWARD_ID;
             firebotChatMessage.reward = {
                 id: HIGHLIGHT_MESSAGE_REWARD_ID,
-                name: "Highlight Message",
+                name: "Highlight My Message",
                 cost: 0,
                 imageUrl: "https://static-cdn.jtvnw.net/automatic-reward-images/highlight-4.png"
             };

src/backend/chat/chat-listeners/twitch-chat-listeners.js

@@ -1,18 +1,6 @@
-import Fuse from "fuse.js";
-
+import { AccountAccess } from "../../../../common/account-access";
 import logger from "../../../../logwrapper";
 
-interface SteamCacheItem {
-    appid: number;
-    name: string;
-}
-
-interface SteamAppList {
-    applist: {
-        apps: SteamCacheItem[]
-    }
-}
-
 interface SteamAppDetails {
     name: string;
     short_description: string;
@@ -50,34 +38,9 @@ interface FirebotSteamGameDetails {
     url: string;
 }
 
-class SteamCacheManager {
-    private _steamCache: SteamCacheItem[] = [];
-
-    async cacheSteamLibrary(): Promise<boolean> {
-        if (this._steamCache.length > 0) {
-            logger.debug('Steam library is still cached. No need to pull again.');
-            return false;
-        }
-
-        logger.debug('Refreshing Steam library cache');
-        const url = "https://api.steampowered.com/ISteamApps/GetAppList/v2/";
-        try {
-            const response = await (await fetch(url)).json() as SteamAppList;
-
-            if (response?.applist?.apps != null) {
-                this._steamCache = response.applist.apps;
-                return true;
-            }
-
-            return false;
-        } catch (error) {
-            logger.error("Unable to get Steam library from Steam API.", error.message);
-            return false;
-        }
-    }
-
+class SteamManager {
     async getSteamGameDetails(requestedGame: string, countryCode?: string) {
-        const appId = await this.getAppIdFromSteamCache(requestedGame);
+        const appId = await this.getAppIdFromGameName(requestedGame);
         if (appId == null) {
             logger.debug('Could not retrieve app id for Steam search.');
             return null;
@@ -116,25 +79,30 @@ class SteamCacheManager {
         return gameDetails;
     }
 
-    private async getAppIdFromSteamCache(requestedGame: string): Promise<number> {
-        // Try to cache library if we don't have one yet.
-        if (this._steamCache.length === 0) {
-            const cacheSuccess = await this.cacheSteamLibrary();
+    private async getAppIdFromGameName(gameName: string): Promise<number> {
+        const streamer = AccountAccess.getAccounts().streamer;
 
-            if (!cacheSuccess) {
-                return null;
-            }
+        if (!streamer?.loggedIn) {
+            return null;
         }
+        try {
+            const response = await fetch(`https://api.crowbar.tools/v1/steam/find-app-id?search=${encodeURIComponent(gameName)}`, {
+                method: "GET",
+                headers: {
+                    'User-Agent': 'Firebot V5 - https://firebot.app',
+                    'Authorization': `Bearer ${streamer.auth.access_token}`
+                }
+            });
 
-        // Now, let's search the app list and get the closest result.
-        const searchOptions = {
-            keys: ['name'],
-            id: 'appid'
-        };
-        const fuse = new Fuse(this._steamCache, searchOptions);
+            if (response?.ok) {
+                const data = await response.json() as { appId: number | null };
+                return data.appId;
+            }
+        } catch (error) {
+            logger.error('Steam app ID fetch failed.', (error as Error).message);
+        }
 
-        const search = fuse.search(requestedGame);
-        return search[0]?.item?.appid;
+        return null;
     }
 
     private async getSteamAppDetails(appId: number, countryCode?: string): Promise<Partial<SteamAppDetails>> {
@@ -163,6 +131,6 @@ class SteamCacheManager {
     }
 }
 
-const steamCacheManager = new SteamCacheManager();
+const steamCacheManager = new SteamManager();
 
 export = steamCacheManager;

src/backend/chat/commands/builtin/steam/steam-access.ts

@@ -33,7 +33,7 @@ export const SteamSystemCommand: SystemCommand<{
             countryCode: {
                 type: "string",
                 title: "Country Code (Optional)",
-                tip: "A two-letter ISO-3166 country code. Examples: US, CA, SE, NO",
+                tip: "A two-letter [ISO-3166](https://wikipedia.org/wiki/List_of_ISO_3166_country_codes) country code. Examples: US, CA, SE, NO",
                 default: ""
             }
         }

src/backend/chat/commands/builtin/steam/steam.ts

@@ -6,7 +6,6 @@ import { AccountAccess } from "../../common/account-access";
 import { CommandManager } from "./command-manager";
 import effectRunner from "../../common/effect-runner";
 import chatHelpers from "../chat-helpers";
-import twitchStreamInfoManager from "../../streaming-platforms/twitch/stream-info-manager";
 import frontendCommunicator from "../../common/frontend-communicator";
 import logger from "../../logwrapper";
 
@@ -99,10 +98,6 @@ class CommandRunner {
     }
 
     private execute(command: CommandDefinition, userCommand: UserCommand, firebotChatMessage?: FirebotChatMessage, manual = false) {
-        if (command.onlyTriggerWhenChannelIsLive && !twitchStreamInfoManager.streamInfo.isLive && !manual) {
-            return;
-        }
-
         let effects = command.effects;
         if (command.subCommands && command.subCommands.length > 0 && userCommand.subcommandId != null) {
             if (userCommand.subcommandId === "fallback-subcommand" && command.fallbackSubcommand) {