Merge pull request #19 from OmegaRogue/pull-request-no-injection

1.5.1

.github/workflows/build.yml

@@ -37,8 +37,9 @@ jobs:
 
       - name: Rename output files
         run: |
-          mv out/make/deb/x64/vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb ./vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb
-          mv out/make/rpm/x64/vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm ./vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm
+          tag=${{ github.event.release.tag_name }}
+          mv out/make/deb/x64/vtt-desktop-client_${tag//-/\~}_amd64.deb ./vtt-desktop-client_${{ github.event.release.tag_name }}_amd64.deb
+          mv out/make/rpm/x64/vtt-desktop-client-${tag//-/.}-1.x86_64.rpm ./vtt-desktop-client-${{ github.event.release.tag_name }}-1.x86_64.rpm
           mv out/make/zip/linux/x64/vtt-desktop-client-linux-x64-${{ github.event.release.tag_name }}.zip ./vtt-desktop-client-linux-x64-${{ github.event.release.tag_name }}.zip
       - name: Archive production artifacts
         uses: actions/upload-artifact@v2

.github/workflows/fork.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "1.*"
+      - "!1.*-*"
 jobs:
   fork:
     if: github.repository_owner == 'OmegaRogue'

Makefile

@@ -0,0 +1,7 @@
+.PHONY: build
+
+export VERSION
+build:
+	yarn install
+	if [ -z $${$VERSION+x} ]; then yarn version --no-git-tag-version --new-version $$VERSION;fi
+	yarn run electron-forge make --platform linux --targets '@electron-forge/maker-zip'

README.md

@@ -2,6 +2,38 @@
 
 wiki https://wiki.theripper93.com/free/vtt-desktop-client
 
+## Differences between this and theripper93's player client
+
+| Feature                                      | [theripper93](https://github.com/theripper93/fvtt-player-client) | omegarogue |
+|----------------------------------------------|:----------------------------------------------------------------:|:----------:|
+| Back to server select button in setup screen |                                ✔️                                |     ✔️     |
+| Back to server select button in login screen |                             ✔️    ️                              |     ✔️     |
+| Back to server select button in game         |                                ❌                                 |     ✔️     |
+
+## Customization
+
+You can pre-configure and customize the client by editing the `config.json` file.
+From where the executable is located,
+you can find the `config.json` file by navigating to the `resources/app` folder.
+You can edit the file with any text editor.
+
+Example config:
+
+```json
+{
+  "games": [
+    {
+      "name": "This is the name of my game",
+      "url": "https://www.nintendo.com/games/detail/the-legend-of-zelda-breath-of-the-wild-switch"
+    }
+  ],
+  "background": "https://images2.alphacoders.com/123/123862.jpg",
+  "backgroundColor": "#000000",
+  "textColor": "white",
+  "accentColor": "green"
+}
+```
+
 ## Getting data from `localStorage` to put into `config.json`
 
 ```js

index.html

@@ -97,6 +97,10 @@
                 <label for="clear-cache-on-close">Clear Cache on close</label>
                 <input id="clear-cache-on-close" class="no-text" type="checkbox">
             </div>
+            <div class="insecure-ssl-field field">
+                <label for="clear-cache-on-close">Ignore Certificate errors</label>
+                <input class="no-text" id="insecure-ssl" type="checkbox">
+            </div>
             <div class="button-group">
                 <button id="clear-cache">Clear Cache</button>
                 <button id="save-app-config">Save</button>
@@ -109,9 +113,7 @@ <h3>Put this in your <code>config.json</code> file to include it installation-wi
             <button onclick="copyText()">Copy</button>
             <button onclick="toggleExportConfig()">Close</button>
             <script>
-                const gamesList = JSON.parse(window.localStorage.getItem("gameList") || "[]");
-                const appConfig = JSON.parse(window.localStorage.getItem("appConfig") || "{}");
-                const config = {...appConfig, games: gamesList};
+                const config = await window.api.localAppConfig();
                 code = document.getElementById("export-text");
                 const text = JSON.stringify(config, null, 4);
                 txt = document.createTextNode(text);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vtt-desktop-client",
-  "packageManager": "yarn@3.3.1",
-  "version": "1.4.4",
+  "packageManager": "yarn@1.22.19",
+  "version": "1.5.0",
   "license": "MIT",
   "description": "VTT Desktop Client",
   "main": ".vite/build/main.js",
@@ -27,18 +27,16 @@
     "@electron-forge/maker-squirrel": "^7.2.0",
     "@electron-forge/maker-zip": "^7.2.0",
     "@electron-forge/plugin-auto-unpack-natives": "^7.2.0",
-    "@electron-forge/plugin-local-electron": "^7.2.0",
     "@electron-forge/plugin-vite": "^7.2.0",
     "@types/node": "^20.11.5",
     "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.19.0",
-    "electron": "^28.1.4",
+    "electron": "^25.9.8",
     "electron-builder": "^24.9.1",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "yarn-upgrade-all": "^0.7.2"
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "start": "electron-forge start",
@@ -48,7 +46,8 @@
     "make:linux": "electron-forge make --platform linux",
     "make:windows": "electron-forge make --platform win32",
     "make:macos": "electron-forge make --platform darwin",
-    "lint": "eslint --ext .ts,.tsx ."
+    "lint": "eslint --ext .ts,.tsx .",
+    "make:linuxpkg": "electron-forge make --platform linux --targets '@electron-forge/maker-zip'"
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.0"

src/main.ts

@@ -1,6 +1,6 @@
 // noinspection ES6MissingAwait,JSIgnoredPromiseFromCall
 
-import {app, BrowserWindow, ipcMain, safeStorage,} from 'electron';
+import {app, BrowserWindow, ipcMain, safeStorage, session} from 'electron';
 import path from 'path';
 import fs from 'fs';
 
@@ -44,16 +44,29 @@ if (!isSingleInstance) {
 
 const windowsData = {} as WindowsData;
 
+let partitionId: number = 0;
+
+function getSession(): Electron.Session {
+    const partitionIdTemp = partitionId;
+    partitionId++
+    if (partitionIdTemp == 0)
+        return session.defaultSession;
+    return session.fromPartition(`persist:${partitionIdTemp}`, {cache: true});
+}
+
 // let win: BrowserWindow;
 
 function createWindow(): BrowserWindow {
+    const localSession = getSession();
     let window = new BrowserWindow({
         show: false, width: 800, height: 600, webPreferences: {
             preload: path.join(__dirname, "preload.js"),
             nodeIntegration: false,
             contextIsolation: true,
-            webgl: true
+            webgl: true,
+            session: localSession
         },
+
     });
 
     // Fix Popouts
@@ -212,17 +225,34 @@ ipcMain.handle("get-user-data", (_, gameId: GameId) => getLoginDetails(gameId))
 
 ipcMain.handle("app-version", () => app.getVersion())
 
-ipcMain.handle("app-config", () => {
+function getAppConfig(): AppConfig {
     try {
         const json = fs.readFileSync(path.join(app.getAppPath(), "config.json")).toString();
-        const appConfig = JSON.parse(json) as AppConfig;
+        let appConfig = JSON.parse(json) as AppConfig;
         if (appConfig.ignoreCertificateErrors) {
             app.commandLine.appendSwitch("ignore-certificate-errors");
         }
+        const userData = getUserData();
+        appConfig = {...appConfig, ...userData.app};
         return appConfig;
     } catch (e) {
         return {} as AppConfig;
     }
+}
+
+ipcMain.on("save-app-config", (_e, data: AppConfig) => {
+    const currentData = getUserData();
+    currentData.app = {...currentData.app, ...data};
+    fs.writeFileSync(path.join(app.getPath("userData"), "userData.json"), JSON.stringify(currentData));
+});
+ipcMain.handle("app-config", getAppConfig);
+ipcMain.handle("local-app-config", () => {
+    try {
+        const userData = getUserData();
+        return userData.app ?? {} as AppConfig;
+    } catch (e) {
+        return {} as AppConfig;
+    }
 });
 
 ipcMain.handle("select-path", (e) => {
@@ -250,7 +280,6 @@ ipcMain.on("return-select", (e) => {
 });
 
 
-
 app.on('activate', (_, hasVisibleWindows) => {
     if (!hasVisibleWindows) {
         createWindow();

src/preload.ts

@@ -30,12 +30,14 @@ export type ContextBridgeApi = {
     userData: (gameId: string | number) => Promise<GameUserDataDecrypted>;
     appVersion: () => Promise<string>;
     appConfig: () => Promise<AppConfig>;
+    localAppConfig: () => Promise<AppConfig>;
     cachePath: () => Promise<string>;
     setCachePath: (cachePath: string) => void;
     returnToServerSelect: () => void;
     saveUserData: (data: SaveUserData) => void;
     openGame: (id: number | string) => void;
     clearCache: () => void;
+    saveAppConfig: (data: AppConfig) => void;
 }
 const exposedApi: ContextBridgeApi = {
     // request(channel: RequestChannels, ...args: unknown[]): Promise<unknown> {
@@ -54,6 +56,9 @@ const exposedApi: ContextBridgeApi = {
     appConfig() {
         return ipcRenderer.invoke("app-config") as Promise<AppConfig>;
     },
+    localAppConfig() {
+        return ipcRenderer.invoke("local-app-config") as Promise<AppConfig>;
+    },
     appVersion() {
         return ipcRenderer.invoke("app-version") as Promise<string>;
     },
@@ -75,6 +80,9 @@ const exposedApi: ContextBridgeApi = {
     setCachePath(cachePath: string) {
         ipcRenderer.send("cache-path", cachePath);
     },
+    saveAppConfig(data: AppConfig) {
+        ipcRenderer.send("save-app-config", data);
+    }
 
 
 }