Marker online update

Mikael Turøy · Mikael Turøy · commit c803f9788e21 · 2022-03-17T13:15:27.000+01:00
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "@types/react": "^16.9.48",
     "@types/react-dom": "^16.9.8",
     "class-transformer": "^0.4.0",
+    "cross-fetch": "^3.1.5",
     "electron-updater": "^4.3.9",
     "js-yaml": "^3.13.1",
     "lodash.isequal": "^4.5.0",
diff --git a/src/components/Configuration.tsx b/src/components/Configuration.tsx
@@ -49,7 +49,8 @@ class App extends React.Component<IProps, IState> {
           </Section>
           <Section title="Overlay">
             <Checkbox setting={getSetting(this.state.settings, 'Check for new versions', "overlaySettings.checkForUpdates", true)} />
-            <Checkbox setting={getSetting(this.state.settings, 'Automatically update to new versions', "overlaySettings.autoUpdate", true)}/>
+            <Checkbox setting={getSetting(this.state.settings, 'Automatically update to new versions', "overlaySettings.autoUpdate", true)} />
+            <Checkbox setting={getSetting(this.state.settings, 'Automatically update markers to new versions on start', "overlaySettings.checkForMarkerUpdates", true)}/>
           </Section>
           <Section title="Development" expanded={false}>
             <Section title="Dev tools">
diff --git a/src/components/Markers.tsx b/src/components/Markers.tsx
@@ -29,7 +29,7 @@ class App extends React.Component<IProps, IState>{
   }
 
   componentWillUnmount() {
-    ipcRenderer.removeAllListeners([IPC.Settings.Set]);
+    ipcRenderer.removeAllListeners(IPC.Settings.Set);
   }
 
   settingsListener(event: any, data: ISettings) {
diff --git a/src/components/SearchMarkers.tsx b/src/components/SearchMarkers.tsx
@@ -71,6 +71,7 @@ class App extends React.Component<IProps, IState> {
         };
         this.settingsListener = this.settingsListener.bind(this);
         this.search = this.search.bind(this);
+        this.handleSelect = this.handleSelect.bind(this);
         ipcRenderer.on(IPC.Settings.Set, this.settingsListener);
         ipcRenderer.send(IPC.Settings.Get, true);
       }
diff --git a/src/components/window/CheckBox.tsx b/src/components/window/CheckBox.tsx
@@ -19,7 +19,7 @@ function IconCheckbox(props: IProps) {
     let icon = props.checked ? checkedIcon : unCheckedIcon;
 
     return (
-        <span className="button" onClick={() => props.toggleCheck(!props.checked)} title={props.popup}>
+        <span className="button text-nowrap" onClick={() => props.toggleCheck(!props.checked)} title={props.popup}>
             <FontAwesomeIcon icon={icon} className="mr-2" style={{width: "1em"}}/>
             {props.name}
             {props.children}
diff --git a/src/shared/interfaces/settings/IMarkerGroupSettings.ts b/src/shared/interfaces/settings/IMarkerGroupSettings.ts
@@ -9,6 +9,8 @@ export interface IMarkerGroupSettings {
   color: string;
   description: string;
   id: string;
+  version?: string;
+  updateurl?: string;
   markers: IMarkerMapSettings;
   defaultNamePlate: INamePlateSetting;
 
diff --git a/src/shared/interfaces/settings/IOverlaySettings.ts b/src/shared/interfaces/settings/IOverlaySettings.ts
@@ -1,4 +1,5 @@
 export interface IOverlaySettings {
     checkForUpdates: boolean;
     autoUpdate: boolean;
+    checkForMarkerUpdates: boolean;
 }
diff --git a/src/shared/models/settings/MarkerGroupSettings.ts b/src/shared/models/settings/MarkerGroupSettings.ts
@@ -3,11 +3,23 @@ import { IMarkerMapSettings } from "../../interfaces/settings/IMarkerMapSettings
 import { IMarkerSettings } from "../../interfaces/settings/IMarkerSettings";
 import { INamePlateSetting } from "../../interfaces/settings/INamePlateSetting";
 import { NamePlateSetting } from "./NamePlateSetting";
-import { Type } from 'class-transformer';
+import { Type, deserialize } from 'class-transformer';
+import fetch from 'cross-fetch'
 
 const { v4: uuidv4 } = require('uuid');
 
+export interface IUpdateAvailable {
+    version?: string;
+    url?: string;
+    updateAvailable: boolean;
+    markerid: string;
+}
+
 export class MarkerGroupSettings implements IMarkerGroupSettings {
+    static fromJson(json: string) {
+        return deserialize(MarkerGroupSettings, json);
+    }
+
     AddMarker(marker: IMarkerSettings, map: string): void {
         if (!this.markers[map]) {
             this.markers[map] = [];
@@ -22,26 +34,64 @@ export class MarkerGroupSettings implements IMarkerGroupSettings {
                 delete this.markers[map];
             }
         }
-        
     }
 
     name: string = "New Marker Group";
     active: boolean = true;
     icon: string = "marker1.webp";
     color: string = "#ffffff";
-    id: string;
+    id!: string;
+    updateurl?: string | undefined;
+    version?: string | undefined;
     markers: IMarkerMapSettings = {};
     description: string = "";
 
     @Type(() => NamePlateSetting)
     defaultNamePlate: INamePlateSetting = new NamePlateSetting();
 
     ToJSON(): string {
+        this.version = new Date().toISOString();
         return JSON.stringify(this);
     }
 
-    constructor() {
+    createId(): void {
         this.id = uuidv4();
     }
+
+    constructor() {
+        this.createId();
+    }
     
+    async CheckForUpdates(): Promise<IUpdateAvailable> {
+        if (this.updateurl) {
+            console.log("Checking for updates for " + this.id + " at " + this.updateurl);
+            try {
+                var response = await fetch(this.updateurl);
+            } catch (error) {
+                console.log("Error fetching update url for " + this.id + ": " + error);
+                return { updateAvailable: false, markerid: this.id };
+            }
+            
+            if (!response?.ok) {
+                console.log("Failed to check for updates for " + this.id + " at " + this.updateurl);
+                const message = `An error has occured: ${response?.status}`;
+                throw new Error(message);
+            }
+            var json = (await response.json()) as any;
+            if (json.url && json.version && json.version !== this.version) {
+                console.log("Update found for " + this.id + " at " + json.url);
+                return {
+                    updateAvailable: true,
+                    version: json.version,
+                    url: json.url,
+                    markerid: this.id
+                }
+            } else {
+                console.log("No update found for " + this.id);
+                return {updateAvailable: false, markerid: this.id};
+            }
+        }
+        return {updateAvailable: false, markerid: this.id};
+    }
+
 }
diff --git a/src/shared/models/settings/OverlaySettings.ts b/src/shared/models/settings/OverlaySettings.ts
@@ -3,4 +3,5 @@ import { IOverlaySettings } from "../../interfaces/settings/IOverlaySettings";
 export class OverlaySettings implements IOverlaySettings {
     checkForUpdates: boolean = true;
     autoUpdate: boolean = true;
+    checkForMarkerUpdates: boolean = true;
 }
diff --git a/src/shared/models/settings/Settings.ts b/src/shared/models/settings/Settings.ts
@@ -1,13 +1,14 @@
 import { IRuntimeSettings, ISettings } from "../../interfaces/settings";
 import { IRenderSettings } from "../../interfaces/settings/IRenderSettings";
 import { IRenderData } from "../../interfaces/render/renderdata";
-import { MarkerGroupSettings } from "./MarkerGroupSettings";
+import { IUpdateAvailable, MarkerGroupSettings } from "./MarkerGroupSettings";
 import { RenderSettings } from "./RenderSettings";
 import { deserialize, Type } from 'class-transformer';
 import { IPositionMarker, MarkerType } from "../../interfaces/render/marker";
 import { IVideoData } from "../../interfaces/datatransfer/IVideoData";
 import { IOverlaySettings } from "../../interfaces/settings/IOverlaySettings";
 import { OverlaySettings } from "./OverlaySettings";
+import fetch from 'cross-fetch'
 
 const fs = require('fs');
 
@@ -38,11 +39,6 @@ export class Settings implements ISettings {
         }));
     }
 
-    addMarkerGroupFromJson(json: string): void {
-        var instance = deserialize(MarkerGroupSettings, json);
-        this.addMarkerGroup(instance);
-    }
-
     static loadConfig(filename: string): Settings {
         if (fs.existsSync(filename)) {
             let data = fs.readFileSync(filename);
@@ -58,8 +54,25 @@ export class Settings implements ISettings {
         this.runtimeData.map = mapId;
     }
 
-    addMarkerGroup(markerGroup: MarkerGroupSettings): void {
+    getMarkerGroupIndexById(id: string): number | null {
+        let markid = this.marks.findIndex(m => m.id === id);
+        if (markid === -1) {
+            return null;
+        }
+        return markid;
+    }
+
+    addMarkerGroup(markerGroup: MarkerGroupSettings, forceReplace: boolean = false): boolean {
+        var existing = this.getMarkerGroupIndexById(markerGroup.id);
+        if ( existing !== null) {
+            if (forceReplace) {
+                this.removeMarkerGroup(existing);
+            } else {
+                return false;
+            }
+        }
         this.marks.push(markerGroup);
+        return true;
     }
 
     removeMarkerGroup(index: number): void {
@@ -70,6 +83,37 @@ export class Settings implements ISettings {
         return this.marks[index];
     }
 
+    getMarkerGroupById(id: string): MarkerGroupSettings | null {
+        let markid = this.marks.findIndex(m => m.id === id);
+        if (markid === -1) {
+            return null;
+        }
+        return this.marks[markid];
+    }
+
+    async CheckForMarkerUpdates() {
+        console.log("Checking for marker updates");
+        const asyncRes = await Promise.allSettled(this.marks.map(async (markerGroup) => { return await markerGroup.CheckForUpdates(); }));
+        (asyncRes.filter(res => res.status === 'fulfilled') as PromiseFulfilledResult<IUpdateAvailable>[]).map(res => res.value).forEach(async res => {
+            if (res.updateAvailable && res.url) {
+                try {
+                    var response = await fetch(res.url);
+                } catch (e) {
+                    console.log("Error fetching marker update! "+ e);
+                    return;
+                }
+                if (!response?.ok) {
+                    console.log("Failed to fetch update for " + res.markerid + " at " + res.url);
+                    const message = `An error has occured: ${response?.status}`;
+                    throw new Error(message);
+                }
+                var json = MarkerGroupSettings.fromJson(await response.text());
+                this.addMarkerGroup(json, true);  
+                console.log("Updated marker " + res.markerid);
+            }
+        });
+    }
+
     // Translate marker data from settings to render ready data
     createRenderData(MapId: string): IRenderData {
         let data: IRenderData = { markers: [] };
diff --git a/ts_static/electron_main.ts b/ts_static/electron_main.ts
@@ -11,6 +11,7 @@ import { LoadMarkerPacksFromCommandLine, InitSettings } from './electron_main_pa
 import { createConfigButtonWindow, createRenderWindow, getConfigButtonWindow, getRenderWindow } from './electron_main_parts/windows';
 import { SetupBackgroundService } from './electron_main_parts/background_service';
 import { IPC } from '../src/shared/IPC';
+import { Settings } from '../src/shared/models/settings/Settings';
 
 // If we're in wrong folder, we need to change folder to the app's folder
 if (!fs.existsSync("gw2data/WebSocketServerNetFramework.exe")) {
@@ -26,7 +27,7 @@ if (!gotTheLock) {
     // Someone tried to run a second instance
     LoadMarkerPacksFromCommandLine(commandLine, workingDirectory);
   });
-  InitSettings();
+  var settings = InitSettings();
   LoadMarkerPacksFromCommandLine(process.argv, process.cwd());
 }
 
@@ -46,6 +47,9 @@ function onGameStarted() {
   createConfigButtonWindow();
   InitializeMouseMove();
   InitAutoUpdate();
+  if (settings.overlaySettings.checkForMarkerUpdates) {
+    settings.CheckForMarkerUpdates();
+  }
 }
 
 function onReady() {
diff --git a/ts_static/electron_main_parts/settings.ts b/ts_static/electron_main_parts/settings.ts
@@ -11,6 +11,7 @@ import { getLastPosition, getMapId } from "./position_data";
 import { getRenderWindow, getWindows as getOpenWindows } from "./windows";
 import { IPC } from '../../src/shared/IPC';
 
+
 var objectPath = require("object-path");
 const { app, ipcMain, dialog } = require('electron')
 const fs = require('fs');
@@ -25,7 +26,6 @@ export function InitSettings(): Settings {
     console.log("Settings file: " + configFile);
 
     SETTINGS = Settings.loadConfig(configFile);
-
     return SETTINGS;
 }
 
@@ -42,18 +42,19 @@ export function LoadMarkerPacksFromCommandLine(argv: string[], workingDirectory:
             if (fs.existsSync(argv[i]) && fs.statSync(argv[i]).isFile()) {
                 log("Main", "Loading marker file: " + argv[i]);
                 let data = fs.readFileSync(argv[i]);
-                GetSettings().addMarkerGroupFromJson(data);
+                let markergroup = MarkerGroupSettings.fromJson(data.toString());
+                AddNewMarkerGroupWithDialog(markergroup);
             }
             // Check if starts with emtp:
             else if (argv[i].startsWith("emtp:")) {
                 log("Main", "Loading marker URL: " + argv[i]);
                 //Load data from url
                 let url = argv[i].substring(5);
                 let data = fs.readFileSync(url);
-                GetSettings().addMarkerGroupFromJson(data);
+                let markergroup = MarkerGroupSettings.fromJson(data.toString());
+                AddNewMarkerGroupWithDialog(markergroup);
             }
         }
-        configUpdated();
     }
 }
 
@@ -105,6 +106,27 @@ ipcMain.on(IPC.Settings.Get, (event, arg) => {
     event.sender.send(IPC.Settings.Set, SETTINGS);
 })
 
+async function AddNewMarkerGroupWithDialog(group: MarkerGroupSettings) {
+    if (!SETTINGS.addMarkerGroup(group)) {
+        log("Main", "Marker group already exists");
+        let result = await dialog.showMessageBox({
+            type: 'question',
+            buttons: ['Cancel', 'Replace', 'Keep both'],
+            message: `Marker group "${group.name}" already exists. What do you want to do?`,
+        });
+        if (result.response == 0) {
+            return;
+        }
+        else if (result.response == 1) { // Replace
+            SETTINGS.addMarkerGroup(group, true);
+        }
+        else if (result.response == 2) { // Keep both
+            SETTINGS.getMarkerGroupById(group.id).createId();
+            SETTINGS.addMarkerGroup(group);
+        }
+    }
+    configUpdated();
+}
 
 ipcMain.on(IPC.Marker.SaveGroup, (event, arg) => {
     log("savemarkergroup", arg);
@@ -124,8 +146,7 @@ ipcMain.on(IPC.Marker.SaveGroup, (event, arg) => {
 })
 
 ipcMain.on(IPC.Marker.LoadJson, (event, arg) => {
-    SETTINGS.addMarkerGroup(arg);
-    configUpdated();
+    AddNewMarkerGroupWithDialog(arg);
 });
 
 ipcMain.on(IPC.Marker.LoadGroup, (event, arg) => {
@@ -138,8 +159,8 @@ ipcMain.on(IPC.Marker.LoadGroup, (event, arg) => {
     }).then((result) => {
         if (result.canceled) { return; }
         let data = fs.readFileSync(result.filePaths[0]);
-        SETTINGS.addMarkerGroupFromJson(data);
-        configUpdated();
+        let markergroup = MarkerGroupSettings.fromJson(data.toString());
+        AddNewMarkerGroupWithDialog(markergroup);
     }).catch(err => {
         log("MAIN", "Loadfile error:" + err);
     })
diff --git a/ts_static/render/VideoMarker.ts b/ts_static/render/VideoMarker.ts
@@ -25,7 +25,7 @@ export class MovieManager {
     this.video = document.getElementById('player_html5_api') as HTMLVideoElement;
     this.video.crossOrigin = "anonymous";
     this.vTexture = new THREE.VideoTexture(this.video);
-    this.vMaterial = new THREE.MeshBasicMaterial({ map: this.vTexture, side: THREE.DoubleSide });
+    this.vMaterial = new THREE.MeshBasicMaterial({ map: this.vTexture, side: THREE.FrontSide });
 
     this.video.onended = () => {
       this.Stop();
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class App extends React.Component<IProps, IState>{`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`componentWillUnmount() {`
`32`		`- ipcRenderer.removeAllListeners([IPC.Settings.Set]);`
	`32`	`+ ipcRenderer.removeAllListeners(IPC.Settings.Set);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`settingsListener(event: any, data: ISettings) {`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ class App extends React.Component<IProps, IState> {`
`71`	`71`	`};`
`72`	`72`	`this.settingsListener = this.settingsListener.bind(this);`
`73`	`73`	`this.search = this.search.bind(this);`
	`74`	`+ this.handleSelect = this.handleSelect.bind(this);`
`74`	`75`	`ipcRenderer.on(IPC.Settings.Set, this.settingsListener);`
`75`	`76`	`ipcRenderer.send(IPC.Settings.Get, true);`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export interface IOverlaySettings {`
`2`	`2`	`checkForUpdates: boolean;`
`3`	`3`	`autoUpdate: boolean;`
	`4`	`+ checkForMarkerUpdates: boolean;`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ import { IOverlaySettings } from "../../interfaces/settings/IOverlaySettings";`
`3`	`3`	`export class OverlaySettings implements IOverlaySettings {`
`4`	`4`	`checkForUpdates: boolean = true;`
`5`	`5`	`autoUpdate: boolean = true;`
	`6`	`+ checkForMarkerUpdates: boolean = true;`
`6`	`7`	`}`