From 34a48ed6a9cd60a9837a9a3a47c318ccc105f9f6 Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Tue, 4 Jan 2022 18:26:36 +0200
Subject: [PATCH] 2.0.0 beta 4 - added Discord RPC feature - fixed
 `Cache.get()` hot cache debug output

---
 public/locales/de-de.yaml        |  4 ++
 public/locales/en-us.yaml        |  4 ++
 public/locales/ru-ru.yaml        |  4 ++
 src/defaultSettings.ts           | 36 +++++++++++++++--
 src/index.svelte                 | 67 ++++++++++++++++++++------------
 src/pages/index.ts               | 33 ----------------
 src/ts/Launcher.ts               | 45 ++++++++++++++++++++-
 src/ts/core/Cache.ts             |  2 +-
 src/ts/core/DiscordRPC.ts        |  5 +--
 src/ts/launcher/states/Launch.ts |  8 +++-
 src/ts/neutralino/Process.ts     |  2 +-
 11 files changed, 143 insertions(+), 67 deletions(-)

diff --git a/public/locales/de-de.yaml b/public/locales/de-de.yaml
index 050c4fa..5a81487 100644
--- a/public/locales/de-de.yaml
+++ b/public/locales/de-de.yaml
@@ -6,6 +6,10 @@ splash:
     - Paimon am ärgern...
     - Versuche Yae zu ziehen...
 
+# Launcher window
+launcher:
+  predownload: Pre-download the game
+
 # Einstellungs Fenster
 settings:
   # General
diff --git a/public/locales/en-us.yaml b/public/locales/en-us.yaml
index 78548b3..5348bf6 100644
--- a/public/locales/en-us.yaml
+++ b/public/locales/en-us.yaml
@@ -6,6 +6,10 @@ splash:
     - Bullying Paimon...
     - Pulling for Yae...
 
+# Launcher window
+launcher:
+  predownload: Pre-download the game
+
 # Settings window
 settings:
   # General
diff --git a/public/locales/ru-ru.yaml b/public/locales/ru-ru.yaml
index 9a9c4bb..b385c86 100644
--- a/public/locales/ru-ru.yaml
+++ b/public/locales/ru-ru.yaml
@@ -6,6 +6,10 @@ splash:
     - Издеваемся над Паймон...
     - Пытаемся получить Яэ...
 
+# Окна лаунчера
+launcher:
+  predownload: Предзагрузить обновление
+
 # Окно настроек
 settings:
   # Основное
diff --git a/src/defaultSettings.ts b/src/defaultSettings.ts
index b373a51..a1ef5b3 100644
--- a/src/defaultSettings.ts
+++ b/src/defaultSettings.ts
@@ -77,9 +77,39 @@ promisify(async () => {
              */
             enabled: false,
 
-            // todo
-            texts: {
-                idk: true
+            /**
+             * RPC settings
+             */
+            fields: {
+                /**
+                 * Launcher title
+                 */
+                title: 'An Anime Game Launcher',
+
+                /**
+                 * Small messages after title
+                 */
+                state: {
+                    /**
+                     * Message showed when you're in game
+                     */
+                    'in-launcher': 'Playing the game',
+
+                    /**
+                     * Message showed when you're in launcher
+                     */
+                    'in-game': 'Preparing to launch'
+                },
+
+                /**
+                 * RPC icon name
+                 */
+                icon: 'launcher',
+
+                /**
+                 * Should it display amount of spent time or not
+                 */
+                timer: true
             }
         },
 
diff --git a/src/index.svelte b/src/index.svelte
index 5365342..91dfed8 100644
--- a/src/index.svelte
+++ b/src/index.svelte
@@ -4,6 +4,7 @@
 
 <script lang="ts">
     import { onMount } from 'svelte';
+    import { _, locale } from 'svelte-i18n';
 
     import Window from './ts/neutralino/Window';
 
@@ -11,11 +12,21 @@
     import constants from './ts/Constants';
     import Game from './ts/Game';
     import Background from './ts/launcher/Background';
+    import Archive from './ts/core/Archive';
+    import Debug from './ts/core/Debug';
+    import Downloader from './ts/core/Downloader';
+    import IPC from './ts/core/IPC';
 
     import Gear from './assets/images/gear.png';
     import GearActive from './assets/images/gear-active.png';
     import Download from './assets/images/cloud-download.png';
-    import DiscordRPC from './ts/core/DiscordRPC';
+
+    constants.paths.launcherDir.then((dir) => {
+        Neutralino.filesystem.getStats(dir)
+            .catch(() => Neutralino.filesystem.createDirectory(dir));
+    });
+
+    const launcher = new Launcher(onMount);
 
     Neutralino.events.on('ready', () => {
         Window.open('splash', {
@@ -27,12 +38,36 @@
         });
     });
 
-    constants.paths.launcherDir.then((dir) => {
-        Neutralino.filesystem.getStats(dir)
-            .catch(() => Neutralino.filesystem.createDirectory(dir));
-    });
+    Neutralino.events.on('windowClose', () => {
+        Downloader.closeStreams(true);
+        Archive.closeStreams(true);
 
-    const launcher = new Launcher(onMount);
+        constants.paths.launcherDir.then(async (path) => {
+            const time = new Date;
+
+            await IPC.purge();
+
+            if (launcher.rpc)
+                await launcher.rpc.stop(true);
+
+            Neutralino.filesystem.getStats(`${path}/logs`)
+                .then(() => saveLog())
+                .catch(async () => {
+                    await Neutralino.filesystem.createDirectory(`${path}/logs`);
+
+                    saveLog();
+                });
+
+            const saveLog = async () => {
+                const log = Debug.get().join("\r\n");
+
+                if (log != '')
+                    await Neutralino.filesystem.writeFile(`${path}/logs/${time.getDate()}-${time.getMonth() + 1}-${time.getFullYear()}-${time.getHours()}-${time.getMinutes()}-${time.getSeconds()}.log`, log);
+
+                Neutralino.app.exit();
+            };
+        });
+    });
 
     // Do some stuff when all the content will be loaded
     onMount(() => {
@@ -40,25 +75,9 @@
          * Update launcher's title
          */
         Game.latest.then((game) => {
-            Window.current.setTitle(`${constants.placeholders.uppercase.full} Linux Launcher - ${game.version}`);
+            Window.current.setTitle(`${constants.placeholders.uppercase.full} Linux Launcher - ${game.version} (beta revision)`);
         });
 
-        /*const rpc = new DiscordRPC({
-            id: '901534333360304168',
-            details: 'Aboba',
-            state: 'Amogus',
-            icon: {
-                large: 'kleegame'
-            },
-            time: {
-                start: Math.round(Date.now() / 1000)
-            }
-        });
-
-        setTimeout(() => {
-            rpc.stop(true);
-        }, 10000);*/
-
         /**
          * Add some events to some elements
          */
@@ -105,7 +124,7 @@
         <img src={GearActive} class="active" alt="Settings">
     </div>
     
-    <button class="button hint--left hint--small" aria-label="Pre-download the game" id="predownload">
+    <button class="button hint--left hint--small" aria-label="{typeof $locale === 'string' ? $_('launcher.predownload') : ''}" id="predownload">
         <img src={Download} alt="Download" />
     </button>
 
diff --git a/src/pages/index.ts b/src/pages/index.ts
index a620c40..4f2fb95 100644
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -1,10 +1,5 @@
 import '../i18n';
 import App from '../index.svelte';
-import constants from '../ts/Constants';
-import Archive from '../ts/core/Archive';
-import Debug from '../ts/core/Debug';
-import Downloader from '../ts/core/Downloader';
-import IPC from '../ts/core/IPC';
 
 declare const Neutralino;
 
@@ -12,34 +7,6 @@ Neutralino.init();
 
 Neutralino.events.on('ready', () => import('../defaultSettings'));
 
-Neutralino.events.on('windowClose', () => {
-    Downloader.closeStreams(true);
-    Archive.closeStreams(true);
-
-    constants.paths.launcherDir.then(async (path) => {
-        const time = new Date;
-
-        await IPC.purge();
-
-        Neutralino.filesystem.getStats(`${path}/logs`)
-            .then(() => saveLog())
-            .catch(async () => {
-                await Neutralino.filesystem.createDirectory(`${path}/logs`);
-
-                saveLog();
-            });
-
-        const saveLog = async () => {
-            const log = Debug.get().join("\r\n");
-
-            if (log != '')
-                await Neutralino.filesystem.writeFile(`${path}/logs/${time.getDate()}-${time.getMonth() + 1}-${time.getFullYear()}-${time.getHours()}-${time.getMinutes()}-${time.getSeconds()}.log`, log);
-
-            Neutralino.app.exit();
-        };
-    });
-});
-
 const app = new App({
     target: document.getElementById('app')!
 });
diff --git a/src/ts/Launcher.ts b/src/ts/Launcher.ts
index 264fcb0..6b3ead1 100644
--- a/src/ts/Launcher.ts
+++ b/src/ts/Launcher.ts
@@ -8,16 +8,20 @@ import ProgressBar from './launcher/ProgressBar';
 import State from './launcher/State';
 import Debug from './core/Debug';
 import IPC from './core/IPC';
+import DiscordRPC from './core/DiscordRPC';
 
 export default class Launcher
 {
     public state?: State;
     public progressBar?: ProgressBar;
+    public rpc?: DiscordRPC;
 
     protected settingsMenu?: Process;
 
     public constructor(onMount)
     {
+        this.updateDiscordRPC('in-launcher');
+
         onMount(() => {
             this.progressBar = new ProgressBar(this);
             this.state = new State(this);
@@ -38,7 +42,7 @@ export default class Launcher
                     title: 'Settings',
                     width: 900,
                     height: 600,
-                    enableInspector: true,
+                    // enableInspector: true,
                     exitProcessOnClose: false
                 });
 
@@ -83,4 +87,43 @@ export default class Launcher
             resolve(`https://${constants.placeholders.lowercase.first}.${constants.placeholders.lowercase.company}.com/launcher/10/${await Configs.get('lang.launcher')}?api_url=https%3A%2F%2Fapi-os-takumi.${constants.placeholders.lowercase.company}.com%2Fhk4e_global&key=gcStgarh&prev=false`);
         });
     }
+
+    /**
+     * Update Discord RPC notification if it is enabled
+     */
+    public updateDiscordRPC(state: 'in-launcher' | 'in-game'): Promise<void>
+    {
+        return new Promise((resolve) => {
+            Configs.get('discord').then((discord) => {
+                // @ts-expect-error
+                if (discord.enabled)
+                {
+                    if (this.rpc)
+                        this.rpc.stop(true);
+                    
+                    this.rpc = new DiscordRPC({
+                        id: '901534333360304168',
+    
+                        // @ts-expect-error
+                        details: discord.fields.title,
+    
+                        // @ts-expect-error
+                        state: discord.fields.state[state],
+    
+                        icon: {
+                            // @ts-expect-error
+                            large: discord.fields.icon
+                        },
+    
+                        time: {
+                            // @ts-expect-error
+                            start: discord.fields.time ? Math.round(Date.now() / 1000) : 0
+                        }
+                    });
+    
+                    resolve();
+                }
+            });
+        });
+    }
 };
diff --git a/src/ts/core/Cache.ts b/src/ts/core/Cache.ts
index a5db8c6..ff1c23b 100644
--- a/src/ts/core/Cache.ts
+++ b/src/ts/core/Cache.ts
@@ -29,7 +29,7 @@ export default class Cache
                     message: [
                         `Resolved ${this.cache[name].expired ? 'expired' : 'unexpired'} hot cache record`,
                         `[name] ${name}`,
-                        `[value]: ${this.cache[name].value}`
+                        `[value]: ${JSON.stringify(this.cache[name].value)}`
                     ]
                 });
 
diff --git a/src/ts/core/DiscordRPC.ts b/src/ts/core/DiscordRPC.ts
index 2a5feab..f062e2b 100644
--- a/src/ts/core/DiscordRPC.ts
+++ b/src/ts/core/DiscordRPC.ts
@@ -1,6 +1,7 @@
-import Process from '../neutralino/Process';
 import type { Params } from '../types/DiscordRPC';
 
+import Process from '../neutralino/Process';
+
 declare const NL_CWD;
 
 export default class DiscordRPC
@@ -49,8 +50,6 @@ export default class DiscordRPC
      */
     public stop(forced: boolean = false): Promise<void>
     {
-        console.log(this.process);
-        
         return this.process!.kill(forced);
     }
 };
diff --git a/src/ts/launcher/states/Launch.ts b/src/ts/launcher/states/Launch.ts
index 57b96d3..141d88a 100644
--- a/src/ts/launcher/states/Launch.ts
+++ b/src/ts/launcher/states/Launch.ts
@@ -1,3 +1,5 @@
+import type Launcher from '../../Launcher';
+
 import Configs from '../../Configs';
 import constants from '../../Constants';
 import { DebugThread } from '../../core/Debug';
@@ -11,7 +13,7 @@ import Baal from '../../../assets/images/baal64-transparent.png';
 
 declare const Neutralino;
 
-export default (): Promise<void> => {
+export default (launcher: Launcher): Promise<void> => {
     return new Promise(async (resolve) => {
         const debugThread = new DebugThread('State/Launch', 'Starting the game');
 
@@ -35,6 +37,8 @@ export default (): Promise<void> => {
         {
             Window.current.hide();
 
+            launcher.updateDiscordRPC('in-game');
+
             /**
              * Selecting wine executable
              */
@@ -128,6 +132,8 @@ export default (): Promise<void> => {
 
                 Window.current.show();
 
+                launcher.updateDiscordRPC('in-launcher');
+
                 // TODO
 
                 resolve();
diff --git a/src/ts/neutralino/Process.ts b/src/ts/neutralino/Process.ts
index 84e2e95..0c1ba47 100644
--- a/src/ts/neutralino/Process.ts
+++ b/src/ts/neutralino/Process.ts
@@ -191,7 +191,7 @@ class Process
             }
 
             // Set output redirection to the temp file
-            command = `${command} > "${this.addSlashes(tmpFile)}" 2>&1 </dev/null`;
+            command = `${command} > "${this.addSlashes(tmpFile)}" 2>&1 &`;
 
             // Set current working directory
             if (options.cwd)