Merge pull request #664 from ririxidev/patch-1

🐛 Fix TSC errors with Promise

.devScript.json

@@ -1,3 +0,0 @@
-{
-  "outDir": "dist/app"
-}

.github/FUNDING.yml

@@ -1,12 +1,5 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: Timeraa
 patreon: Timeraa
-open_collective: premid
-ko_fi: timeraa
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZU8Q766ACS2WS&lc=US
+ko_fi: Timeraa

.github/ISSUE_TEMPLATE/service_request.md

@@ -1,16 +0,0 @@
----
-name: Service request
-about: Suggest Rich Presence support for a website
----
-
-**What's the name of the service?**
-Ex. www.youtube.com | YouTube
-
-**What should the Presence display?**
-Informations about the current video
-
-**Why do you want support for this service?**
-Tell us why you want to have support for this website. Please don't just tell us "I use it all the time"
-
-**Are you able to provide an image for the service? (512x512 minimum)**
-If you can provide the logo pls paste a link in here or the image

.github/workflows/deploy.yml

@@ -26,9 +26,9 @@ jobs:
           node util/zip dist ${{ matrix.os }}.zip --zip
       - name: Upload bundle
         env:
-          SSHHOST: ${{ secrets.SSHHOST }}
-          SSHUSERNAME: ${{ secrets.SSHUSERNAME }}
-          SSHPASSWORD: ${{ secrets.SSHPASSWORD }}
+          SSHHOST: ${{ secrets.MAIN_HOST }}
+          SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
+          SSHKEY: ${{ secrets.SSH_KEY }}
         run: |
           tsc util/uploadFile util/zip
           node util/uploadFile ${{ matrix.os }}.zip /home/PreMiD/download/util/${{ matrix.os }}.zip
@@ -40,15 +40,15 @@ jobs:
       - uses: actions/setup-node@master
       - name: Install dependencies
         run: |
-          npm i
-          npm i -g typescript
+          sudo npm i
+          sudo npm i -g typescript
       - name: Download InstallBuilder
         run: |
-          wget https://clients.bitrock.com/installbuilder/installbuilder-enterprise-19.10.0-linux-x64-installer.run
-          chmod u+x installbuilder-enterprise-19.10.0-linux-x64-installer.run
+          wget https://clients.bitrock.com/installbuilder/installbuilder-enterprise-20.12.0-linux-x64-installer.run
+          chmod u+x installbuilder-enterprise-20.12.0-linux-x64-installer.run
       - name: Install InstallBuilder
         run: |
-          ./installbuilder-enterprise-19.10.0-linux-x64-installer.run --installer-language en --prefix ./installbuilder --mode unattended
+          ./installbuilder-enterprise-20.12.0-linux-x64-installer.run --installer-language en --prefix ./installbuilder --mode unattended
           echo "${{ secrets.IBLICENSE }}" > ./installbuilder/license.xml
       - name: Prepare Upgrade Installer
         run: |
@@ -62,20 +62,19 @@ jobs:
           installbuilder/bin/builder build installer_assets/PreMiD-Upgrade.xml windows
       - name: Upload files
         env:
-          SSHHOST: ${{ secrets.SSHHOST }}
-          SSHUSERNAME: ${{ secrets.SSHUSERNAME }}
-          SSHPASSWORD: ${{ secrets.SSHPASSWORD }}
+          SSHHOST: ${{ secrets.MAIN_HOST }}
+          SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
+          SSHKEY: ${{ secrets.SSH_KEY }}
         run: |
           tsc util/uploadFile util/zip
-          node util/uploadFile installer_assets/update.ini /home/PreMiD/download/util/update.ini
           node util/uploadFile dist/installer/upgrader.exe /home/PreMiD/download/upgrader.exe
           node util/uploadFile dist/installer/upgrader.app.zip /home/PreMiD/download/util/upgrader.app.zip
       - name: Finalize build
         uses: appleboy/ssh-action@master
         with:
-          host: ${{ secrets.SSHHOST }}
-          username: ${{ secrets.SSHUSERNAME }}
-          password: ${{ secrets.SSHPASSWORD }}
+          host: ${{ secrets.MAIN_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
           script: |
             cd /home/PreMiD/download/util
             unzip upgrader.app.zip
@@ -83,10 +82,6 @@ jobs:
             mv upgrader.app.tgz ../
             rm -rf upgrader.app upgrader.app.zip
             unzip windows-latest.zip
-            cp updater.exe windows-latest/PreMiD-win32-x64/updater.exe
-            cp update.ini windows-latest/PreMiD-win32-x64/update.ini
-            cp updater.exe windows-latest/PreMiD-win32-ia32/updater.exe
-            cp update.ini windows-latest/PreMiD-win32-ia32/update.ini
             cd windows-latest/PreMiD-win32-x64/
             zip -r ../../PreMiD-win32-x64.zip .
             mv ../../PreMiD-win32-x64.zip /home/PreMiD/download/
@@ -96,8 +91,6 @@ jobs:
             cd ../..
             rm -rf windows-latest windows-latest.zip
             unzip macOS-latest.zip
-            cp -r updater.app macOS-latest/PreMiD-darwin-x64/updater.app
-            cp update.ini macOS-latest/PreMiD-darwin-x64/update.ini
             cd macOS-latest/PreMiD-darwin-x64/
             zip -r ../../PreMiD-darwin-x64.zip .
             mv ../../PreMiD-darwin-x64.zip /home/PreMiD/download/

.gitignore

@@ -5,6 +5,10 @@ tmp
 
 .vscode
 .env
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+.pnp.*
 
 src/package-lock.json
 src/package.json
@@ -13,4 +17,4 @@ src/update.ini
 *.exe
 *.app
 *.xml.backup
-*.js
+*.js

README.md

@@ -11,8 +11,6 @@
 ![Chrome Web Store](https://img.shields.io/chrome-web-store/v/agjnjboanicjcpenljmaaigopkgdnihi?label=Extension&style=for-the-badge)
 [![Chrome Web Store](https://img.shields.io/chrome-web-store/d/agjnjboanicjcpenljmaaigopkgdnihi.svg?label=Chrome&logo=google%20chrome&logoColor=white&colorA=4285F4&style=for-the-badge)](https://chrome.google.com/webstore/detail/premid/agjnjboanicjcpenljmaaigopkgdnihi)
 ![Website](https://img.shields.io/website?down_message=offline&label=PreMiD.app&style=for-the-badge&up_message=online&url=https%3A%2F%2Fpremid.app)
-![Twitter Follow](https://img.shields.io/twitter/follow/PreMiDapp?label=PreMiD&style=social)
-![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/premid?label=PreMiD&style=social)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD?ref=badge_shield)
 
 <img src=".github/example.png" draggable="false"><br>
@@ -30,7 +28,7 @@
 
 # Installation/Troubleshooting
 
-### Installation instructions, Troubleshooting guides etc. can be found in our [**Wiki**](https://wiki.premid.app).
+### Installation instructions, Troubleshooting guides etc. can be located at our [**docs**](https://docs.premid.app).
 
 # Support us
 
@@ -38,11 +36,11 @@
     <a target="_blank" href="https://www.patreon.com/bePatron?u=4610890" data-patreon-widget-type="become-patron-button" title="Support me on Patreon!">
       <img height="75px" draggable="false" src=".github/Patreon.png">
     </a>
-    <a target="_blank" href="https://discord.gg/WvfVZ8T" title="Join our Discord!">
-      <img height="75px" draggable="false" src="https://discordapp.com/api/guilds/493130730549805057/widget.png?style=banner2" alt="Join my Discord!">
+    <a target="_blank" href="https://discord.premid.app/" title="Join our Discord!">
+		<img  src="https://discordapp.com/api/guilds/493130730549805057/widget.png?style=banner2" height="76px" draggable="false" alt="Join our Discord!">
     </a>
   </div>
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FPreMiD%2FPreMiD?ref=badge_large)

installer_assets/PreMiD-Upgrade.xml

@@ -5,7 +5,6 @@
     <installerFilename>upgrader.${platform_exec_suffix}</installerFilename>
     <debugLevel>0</debugLevel>
     <licenseFile>../LICENSE</licenseFile>
-    <wrapLicenseFileText>0</wrapLicenseFileText>
     <leftImage>leftSide.png</leftImage>
     <logoImage>logo.png</logoImage>
     <splashImage>logo.png</splashImage>
@@ -22,22 +21,6 @@
                     <destination>${installdir}</destination>
                     <name>programfiles</name>
                     <platforms>all</platforms>
-                    <shortcutList>
-                        <shortcut>
-                            <comment>Uninstall</comment>
-                            <exec>${installdir}/${uninstallerName}</exec>
-                            <icon></icon>
-                            <name>Uninstall ${product_fullname}</name>
-                            <path>${installdir}</path>
-                            <platforms>all</platforms>
-                            <runAsAdmin>0</runAsAdmin>
-                            <runInTerminal>0</runInTerminal>
-                            <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
-                            <windowsExecArgs></windowsExecArgs>
-                            <windowsIcon></windowsIcon>
-                            <windowsPath>${installdir}</windowsPath>
-                        </shortcut>
-                    </shortcutList>
                 </folder>
                 <folder>
                     <description>Program Files</description>
@@ -96,16 +79,104 @@
     </componentList>
     <initializationActionList>
         <setInstallerVariable>
-            <name>project.installationType</name>
-            <value>upgrade</value>
+            <name>installdir</name>
+            <persist>1</persist>
+            <value>${windows_folder_appdata}/PreMiD</value>
             <ruleList>
-                <fileExists>
-                    <path>${installdir}</path>
-                </fileExists>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable>
+            <name>installdir</name>
+            <persist>1</persist>
+            <value>${platform_install_prefix}/PreMiD</value>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
             </ruleList>
         </setInstallerVariable>
     </initializationActionList>
-    <preInstallationActionList>
+    <readyToInstallActionList>
+        <actionGroup>
+            <customErrorMessage>Couldn't download release... Try again later.</customErrorMessage>
+            <progressText>Downloading latest release...</progressText>
+            <actionList>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <width>450</width>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-win32-x64.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-x64</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-win32-ia32.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-x86</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-darwin-x64.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>osx</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+            </actionList>
+        </actionGroup>
+        <actionGroup>
+            <actionList>
+                <!-- Remove the old ARP Entry
+ Get the old version -->
+                <registryGet>
+                    <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
+                    <name>Version</name>
+                    <variable>oldVersion</variable>
+                </registryGet>
+
+                <!-- Delete the old ARP registry keys -->
+                <registryDelete>
+                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${project.fullName} ${oldVersion}</key>
+                    <name></name>
+                </registryDelete>
+                <registryDelete>
+                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Management\ARPCache\${project.fullName} ${oldVersion}</key>
+                    <name></name>
+                </registryDelete>
+            </actionList>
+            <ruleList>
+                <platformTest type="windows"/>
+                <isTrue value="${isUpgradeMode}"/>
+            </ruleList>
+        </actionGroup>
         <actionGroup>
             <progressText>Killing ${product_fullname}...</progressText>
             <actionList>
@@ -137,73 +208,10 @@
                 </runProgram>
             </actionList>
         </actionGroup>
-    </preInstallationActionList>
-    <readyToInstallActionList>
-        <actionGroup>
-            <actionList>
-                <!-- Remove the old ARP Entry
- Get the old version -->
-                <registryGet>
-                    <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
-                    <name>Version</name>
-                    <variable>oldVersion</variable>
-                </registryGet>
-
-                <!-- Delete the old ARP registry keys -->
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${project.fullName} ${oldVersion}</key>
-                    <name></name>
-                </registryDelete>
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Management\ARPCache\${project.fullName} ${oldVersion}</key>
-                    <name></name>
-                </registryDelete>
-            </actionList>
-            <ruleList>
-                <platformTest type="windows"/>
-                <isTrue value="${isUpgradeMode}"/>
-            </ruleList>
-        </actionGroup>
-        <actionGroup>
-            <customErrorMessage>Couldn't download release... Try again later.</customErrorMessage>
-            <progressText>Downloading latest release...</progressText>
-            <actionList>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-win32-x64.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>windows-x64</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-win32-x86.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>windows-x86</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-darwin-x64.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>osx</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-            </actionList>
-        </actionGroup>
     </readyToInstallActionList>
     <postInstallationActionList>
         <unzip>
-            <addToUninstaller>0</addToUninstaller>
+            <addToUninstaller>1</addToUninstaller>
             <destinationDirectory>${installdir}</destinationDirectory>
             <progressText>Extracting release...</progressText>
             <zipFile>${system_temp_directory}/PreMiD-release.zip</zipFile>
@@ -212,46 +220,6 @@
             <addContents>1</addContents>
             <files>${installdir}/</files>
         </addDirectoriesToUninstaller>
-        <registrySet>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-            <name>update_url</name>
-            <progressText>Adding Extension (Chrome only)</progressText>
-            <type>REG_SZ</type>
-            <value>https://clients2.google.com/service/update2/crx</value>
-            <wowMode>64</wowMode>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </registrySet>
-        <runProgram>
-            <abortOnError>0</abortOnError>
-            <program>PreMiD.exe</program>
-            <programArguments>&amp;</programArguments>
-            <progressText>Launching PreMiD...</progressText>
-            <showMessageOnError>0</showMessageOnError>
-            <workingDirectory>${installdir}</workingDirectory>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </runProgram>
-        <runProgram>
-            <abortOnError>0</abortOnError>
-            <program>open</program>
-            <programArguments>${installdir}/PreMiD.app</programArguments>
-            <progressText>Launching PreMiD...</progressText>
-            <runAs>${env(USER)}</runAs>
-            <showMessageOnError>0</showMessageOnError>
-            <useMSDOSPath>0</useMSDOSPath>
-            <ruleList>
-                <platformTest>
-                    <type>osx</type>
-                </platformTest>
-            </ruleList>
-        </runProgram>
     </postInstallationActionList>
     <preUninstallationActionList>
         <actionGroup>
@@ -286,38 +254,10 @@
             </actionList>
         </actionGroup>
     </preUninstallationActionList>
-    <postUninstallationActionList>
-        <actionGroup>
-            <actionList>
-                <showQuestion>
-                    <default>yes</default>
-                    <text>Uninstall browser extension?</text>
-                    <variable>removeExtension</variable>
-                </showQuestion>
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-                    <name></name>
-                    <ruleList>
-                        <isTrue>
-                            <value>${removeExtension}</value>
-                        </isTrue>
-                    </ruleList>
-                </registryDelete>
-            </actionList>
-            <ruleList>
-                <registryTest>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-                    <logic>exists</logic>
-                    <name></name>
-                    <wowMode>64</wowMode>
-                </registryTest>
-            </ruleList>
-        </actionGroup>
-    </postUninstallationActionList>
-    <checkForUpdates>1</checkForUpdates>
     <compressionAlgorithm>lzham-ultra</compressionAlgorithm>
     <createOsxBundleZip>1</createOsxBundleZip>
     <defaultInstallationMode>unattended</defaultInstallationMode>
+    <deleteOnExit>1</deleteOnExit>
     <description>Rich Presence for web services.</description>
     <disableSplashScreen>1</disableSplashScreen>
     <enableRollback>0</enableRollback>
@@ -338,13 +278,15 @@
     <readmeFileEncoding>utf-8</readmeFileEncoding>
     <removeLogFile>1</removeLogFile>
     <removeUninstallationLogFile>1</removeUninstallationLogFile>
+    <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
     <saveRelativePaths>1</saveRelativePaths>
     <summary>Rich Presence for web services.</summary>
-    <updateInformationURL>https://api.premid.app/app/update</updateInformationURL>
+    <unattendedModeUI>minimalWithDialogs</unattendedModeUI>
     <vendor>Timeraa</vendor>
-    <versionId>200</versionId>
+    <width>625</width>
     <windowsExecutableIcon>appIcon.ico</windowsExecutableIcon>
     <windowsResourceFileDescription>Rich Presence for web services.</windowsResourceFileDescription>
+    <windowsResourceFileVersion>${product_version}</windowsResourceFileVersion>
     <windowsUninstallerExecutableIcon>appIcon.ico</windowsUninstallerExecutableIcon>
     <licenseFileList>
         <licenseFile>
@@ -354,19 +296,6 @@
         </licenseFile>
     </licenseFileList>
     <parameterList>
-        <directoryParameter>
-            <name>installdir</name>
-            <description>Installer.Parameter.installdir.description</description>
-            <explanation>Installer.Parameter.installdir.explanation</explanation>
-            <value></value>
-            <default>${platform_install_prefix}/${product_shortname}</default>
-            <allowEmptyValue>0</allowEmptyValue>
-            <ask>yes</ask>
-            <cliOptionName>prefix</cliOptionName>
-            <mustBeWritable>yes</mustBeWritable>
-            <mustExist>0</mustExist>
-            <width>40</width>
-        </directoryParameter>
         <parameterGroup>
             <name>post_install_page</name>
             <title>Installation Finished</title>
@@ -396,11 +325,6 @@
                     <value>true</value>
                     <default>true</default>
                     <displayStyle>checkbox-left</displayStyle>
-                    <ruleList>
-                        <platformTest>
-                            <type>windows</type>
-                        </platformTest>
-                    </ruleList>
                 </booleanParameter>
                 <labelParameter>
                     <name>extra</name>
@@ -438,6 +362,39 @@
                         </quickLaunchShortcut>
                     </shortcutList>
                 </createShortcuts>
+                <runProgram>
+                    <abortOnError>0</abortOnError>
+                    <program>PreMiD.exe</program>
+                    <programArguments>&amp;</programArguments>
+                    <progressText>Launching PreMiD...</progressText>
+                    <showMessageOnError>0</showMessageOnError>
+                    <workingDirectory>${installdir}</workingDirectory>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows</type>
+                        </platformTest>
+                        <isTrue>
+                            <value>${launchApp}</value>
+                        </isTrue>
+                    </ruleList>
+                </runProgram>
+                <runProgram>
+                    <abortOnError>0</abortOnError>
+                    <program>open</program>
+                    <programArguments>${installdir}/PreMiD.app</programArguments>
+                    <progressText>Launching PreMiD...</progressText>
+                    <runAs>${env(USER)}</runAs>
+                    <showMessageOnError>0</showMessageOnError>
+                    <useMSDOSPath>0</useMSDOSPath>
+                    <ruleList>
+                        <platformTest>
+                            <type>osx</type>
+                        </platformTest>
+                        <isTrue>
+                            <value>${launchApp}</value>
+                        </isTrue>
+                    </ruleList>
+                </runProgram>
                 <launchBrowser>
                     <url>https://premid.app/store</url>
                     <ruleList>

installer_assets/PreMiD.xml

@@ -21,22 +21,6 @@
                     <destination>${installdir}</destination>
                     <name>programfiles</name>
                     <platforms>all</platforms>
-                    <shortcutList>
-                        <shortcut>
-                            <comment>Uninstall</comment>
-                            <exec>${installdir}/${uninstallerName}</exec>
-                            <icon></icon>
-                            <name>Uninstall ${product_fullname}</name>
-                            <path>${installdir}</path>
-                            <platforms>all</platforms>
-                            <runAsAdmin>0</runAsAdmin>
-                            <runInTerminal>0</runInTerminal>
-                            <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
-                            <windowsExecArgs></windowsExecArgs>
-                            <windowsIcon></windowsIcon>
-                            <windowsPath>${installdir}</windowsPath>
-                        </shortcut>
-                    </shortcutList>
                 </folder>
                 <folder>
                     <description>Program Files</description>
@@ -93,7 +77,106 @@
             </startMenuShortcutList>
         </component>
     </componentList>
-    <preInstallationActionList>
+    <initializationActionList>
+        <setInstallerVariable>
+            <name>installdir</name>
+            <persist>1</persist>
+            <value>${windows_folder_appdata}/PreMiD</value>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable>
+            <name>installdir</name>
+            <persist>1</persist>
+            <value>${platform_install_prefix}/PreMiD</value>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </setInstallerVariable>
+    </initializationActionList>
+    <readyToInstallActionList>
+        <actionGroup>
+            <customErrorMessage>Couldn't download release... Try again later.</customErrorMessage>
+            <progressText>Downloading latest release...</progressText>
+            <actionList>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <width>450</width>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-win32-x64.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-x64</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-win32-ia32.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-x86</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+                <showProgressDialog>
+                    <title>Downloading latest release...</title>
+                    <actionList>
+                        <httpGet>
+                            <customErrorMessage>${platform_name}</customErrorMessage>
+                            <filename>${system_temp_directory}/PreMiD-release.zip</filename>
+                            <url>https://github.com/PreMiD/PreMiD/releases/latest/download/PreMiD-darwin-x64.zip</url>
+                        </httpGet>
+                    </actionList>
+                    <ruleList>
+                        <platformTest>
+                            <type>osx</type>
+                        </platformTest>
+                    </ruleList>
+                </showProgressDialog>
+            </actionList>
+        </actionGroup>
+        <actionGroup>
+            <actionList>
+                <!-- Remove the old ARP Entry
+ Get the old version -->
+                <registryGet>
+                    <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
+                    <name>Version</name>
+                    <variable>oldVersion</variable>
+                </registryGet>
+
+                <!-- Delete the old ARP registry keys -->
+                <registryDelete>
+                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${project.fullName} ${oldVersion}</key>
+                    <name></name>
+                </registryDelete>
+                <registryDelete>
+                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Management\ARPCache\${project.fullName} ${oldVersion}</key>
+                    <name></name>
+                </registryDelete>
+            </actionList>
+            <ruleList>
+                <platformTest type="windows"/>
+                <isTrue value="${isUpgradeMode}"/>
+            </ruleList>
+        </actionGroup>
         <actionGroup>
             <progressText>Killing ${product_fullname}...</progressText>
             <actionList>
@@ -125,73 +208,10 @@
                 </runProgram>
             </actionList>
         </actionGroup>
-    </preInstallationActionList>
-    <readyToInstallActionList>
-        <actionGroup>
-            <actionList>
-                <!-- Remove the old ARP Entry
- Get the old version -->
-                <registryGet>
-                    <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
-                    <name>Version</name>
-                    <variable>oldVersion</variable>
-                </registryGet>
-
-                <!-- Delete the old ARP registry keys -->
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${project.fullName} ${oldVersion}</key>
-                    <name></name>
-                </registryDelete>
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Management\ARPCache\${project.fullName} ${oldVersion}</key>
-                    <name></name>
-                </registryDelete>
-            </actionList>
-            <ruleList>
-                <platformTest type="windows"/>
-                <isTrue value="${isUpgradeMode}"/>
-            </ruleList>
-        </actionGroup>
-        <actionGroup>
-            <customErrorMessage>Couldn't download release... Try again later.</customErrorMessage>
-            <progressText>Downloading latest release...</progressText>
-            <actionList>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-win32-x64.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>windows-x64</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-win32-x86.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>windows-x86</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-                <httpGet>
-                    <customErrorMessage>${platform_name}</customErrorMessage>
-                    <filename>${system_temp_directory}/PreMiD-release.zip</filename>
-                    <url>https://dl.premid.app/PreMiD-darwin-x64.zip</url>
-                    <ruleList>
-                        <platformTest>
-                            <type>osx</type>
-                        </platformTest>
-                    </ruleList>
-                </httpGet>
-            </actionList>
-        </actionGroup>
     </readyToInstallActionList>
     <postInstallationActionList>
         <unzip>
-            <addToUninstaller>0</addToUninstaller>
+            <addToUninstaller>1</addToUninstaller>
             <destinationDirectory>${installdir}</destinationDirectory>
             <progressText>Extracting release...</progressText>
             <zipFile>${system_temp_directory}/PreMiD-release.zip</zipFile>
@@ -200,19 +220,6 @@
             <addContents>1</addContents>
             <files>${installdir}/</files>
         </addDirectoriesToUninstaller>
-        <registrySet>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-            <name>update_url</name>
-            <progressText>Adding Extension (Chrome only)</progressText>
-            <type>REG_SZ</type>
-            <value>https://clients2.google.com/service/update2/crx</value>
-            <wowMode>64</wowMode>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </registrySet>
     </postInstallationActionList>
     <preUninstallationActionList>
         <actionGroup>
@@ -247,36 +254,9 @@
             </actionList>
         </actionGroup>
     </preUninstallationActionList>
-    <postUninstallationActionList>
-        <actionGroup>
-            <actionList>
-                <showQuestion>
-                    <default>yes</default>
-                    <text>Uninstall browser extension?</text>
-                    <variable>removeExtension</variable>
-                </showQuestion>
-                <registryDelete>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-                    <name></name>
-                    <ruleList>
-                        <isTrue>
-                            <value>${removeExtension}</value>
-                        </isTrue>
-                    </ruleList>
-                </registryDelete>
-            </actionList>
-            <ruleList>
-                <registryTest>
-                    <key>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\agjnjboanicjcpenljmaaigopkgdnihi</key>
-                    <logic>exists</logic>
-                    <name></name>
-                    <wowMode>64</wowMode>
-                </registryTest>
-            </ruleList>
-        </actionGroup>
-    </postUninstallationActionList>
     <compressionAlgorithm>lzham-ultra</compressionAlgorithm>
     <createOsxBundleZip>1</createOsxBundleZip>
+    <deleteOnExit>1</deleteOnExit>
     <description>Rich Presence for web services.</description>
     <disableSplashScreen>1</disableSplashScreen>
     <enableRollback>0</enableRollback>
@@ -296,11 +276,13 @@
     <readmeFileEncoding>utf-8</readmeFileEncoding>
     <removeLogFile>1</removeLogFile>
     <removeUninstallationLogFile>1</removeUninstallationLogFile>
+    <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
     <saveRelativePaths>1</saveRelativePaths>
     <summary>Rich Presence for web services.</summary>
     <vendor>Timeraa</vendor>
     <windowsExecutableIcon>appIcon.ico</windowsExecutableIcon>
     <windowsResourceFileDescription>Rich Presence for web services.</windowsResourceFileDescription>
+    <windowsResourceFileVersion>${product_version}</windowsResourceFileVersion>
     <windowsUninstallerExecutableIcon>appIcon.ico</windowsUninstallerExecutableIcon>
     <licenseFileList>
         <licenseFile>
@@ -310,19 +292,6 @@
         </licenseFile>
     </licenseFileList>
     <parameterList>
-        <directoryParameter>
-            <name>installdir</name>
-            <description>Installer.Parameter.installdir.description</description>
-            <explanation>Installer.Parameter.installdir.explanation</explanation>
-            <value></value>
-            <default>${platform_install_prefix}/${product_shortname}</default>
-            <allowEmptyValue>0</allowEmptyValue>
-            <ask>yes</ask>
-            <cliOptionName>prefix</cliOptionName>
-            <mustBeWritable>yes</mustBeWritable>
-            <mustExist>0</mustExist>
-            <width>40</width>
-        </directoryParameter>
         <parameterGroup>
             <name>post_install_page</name>
             <title>Installation Finished</title>

installer_assets/update.ini

@@ -1,6 +0,0 @@
-[Update]
-
-url=https://api.premid.app/app/update/
-version_id=?
-check_for_updates=1
-update_download_location=${installer_directory}

installer_assets/updater.xml

@@ -1,13 +0,0 @@
-<autoUpdateProject>
-    <fullName>PreMiD</fullName>
-    <shortName>PreMiD</shortName>
-    <vendor>Timeraa</vendor>
-    <version>2.0</version>
-    <singleInstanceCheck>1</singleInstanceCheck>
-    <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
-    <enableSslSupport>1</enableSslSupport>
-    <outputDirectory>../dist/app/</outputDirectory>
-    <installerFilename>updater.${platform_exec_suffix}</installerFilename>
-    <osxPlatforms>osx-intel osx-x86_64</osxPlatforms>
-    <createOsxBundleZip>1</createOsxBundleZip>
-</autoUpdateProject>

package.json

@@ -1,55 +1,56 @@
 {
 	"name": "premid",
 	"productName": "PreMiD",
-	"description": "Discord Rich Presence for websites.",
-	"version": "2.0.6",
+	"description": "Discord Rich Presence for web services.",
+	"version": "2.2.0",
 	"repository": "https://github.com/PreMiD/PreMiD",
 	"scripts": {
 		"init": "tsc --skipLibCheck && tsc pkg util/prepare util/zip && devScript --copyOnly",
-		"start": "electron dist/app/.",
-		"dev": "devScript",
+		"start": "electron dist/app/. --unhandled-rejections=strict",
+		"dev": "devscript --depCheck",
 		"pkg": "rimraf dist && tsc --skipLibCheck && devScript --copyOnly && cd dist/app/ && yarn && cd ../../ && node pkg",
 		"deploy": "tsc --skipLibCheck .github/deploy && cd .github && node deploy.js"
 	},
-	"license": "MIT",
+	"license": "MPL-2.0",
 	"devDependencies": {
-		"@timeraa/devscript": "Timeraa/DevScript",
-		"@types/archiver": "3.0.0",
+		"@types/archiver": "5.1.0",
 		"@types/auto-launch": "5.0.1",
-		"@types/discord-rpc": "3.0.2",
-		"@types/electron-packager": "14.0.0",
-		"@types/fs-extra": "8.0.1",
+		"@types/discord-rpc": "3.0.4",
+		"@types/fs-extra": "9.0.7",
 		"@types/ini": "1.3.30",
-		"@types/node": "13.5.0",
-		"@types/prompts": "2.0.3",
+		"@types/node": "14.14.31",
+		"@types/prompts": "2.0.9",
 		"@types/request-promise-native": "1.0.17",
-		"@types/rimraf": "2.0.3",
-		"@types/socket.io": "2.1.4",
-		"@types/ssh2-sftp-client": "4.1.2",
-		"@types/unzipper": "^0.10.1",
-		"archiver": "3.1.1",
-		"chalk": "3.0.0",
-		"electron": "7.1.10",
-		"electron-packager": "14.2.0",
-		"fast-glob": "3.1.1",
-		"fs-extra": "8.1.0",
-		"ini": "1.3.5",
-		"nodemon": "2.0.2",
-		"ora": "4.0.3",
-		"prompts": "2.3.0",
-		"rimraf": "3.0.0",
-		"source-map-support": "0.5.16",
-		"ssh2-sftp-client": "5.0.2",
-		"typescript": "3.7.5",
-		"unzipper": "0.10.7",
-		"yarn": "1.21.1"
+		"@types/rimraf": "3.0.0",
+		"@types/socket.io": "2.1.13",
+		"@types/ssh2-sftp-client": "5.3.1",
+		"@types/unzipper": "^0.10.3",
+		"archiver": "5.2.0",
+		"chalk": "4.1.0",
+		"electron": "11.3.0",
+		"electron-packager": "15.2.0",
+		"fast-glob": "3.2.5",
+		"fs-extra": "9.1.0",
+		"nodemon": "2.0.7",
+		"ora": "5.3.0",
+		"prompts": "2.4.0",
+		"rimraf": "3.0.2",
+		"ssh2-sftp-client": "6.0.1",
+		"ts-devscript": "^3.0.3",
+		"typescript": "4.1.5",
+		"unzipper": "0.10.11",
+		"yarn": "1.22.10"
 	},
 	"dependencies": {
 		"auto-launch": "5.0.5",
-		"axios": "0.19.2",
+		"axios": "0.21.1",
+		"chokidar": "3.5.1",
 		"discord-rpc": "github:discordjs/RPC",
-		"electron-store": "5.1.0",
-		"socket.io": "2.3.0",
-		"sudo-prompt": "9.1.1"
+		"electron-store": "7.0.2",
+		"socket.io": "3.1.1",
+		"source-map-support": "^0.5.19"
+	},
+	"devScript": {
+		"out": "dist/app"
 	}
 }

pkg.ts

@@ -1,18 +1,12 @@
 import * as electronPackager from "electron-packager";
-import { platform, arch } from "os";
-import { existsSync, readFileSync, writeFileSync, copyFileSync } from "fs";
-import { resolve } from "path";
-import { exec } from "child_process";
-import { removeSync } from "fs-extra";
-import { parse, stringify } from "ini";
+import { platform } from "os";
 import * as prompts from "prompts";
 import * as ora from "ora";
 
 (async () => {
 	let response = {
 		os: "current",
-		arch: "all",
-		installer: false
+		arch: "all"
 	};
 
 	if (process.env.NODE_ENV !== "DePloY")
@@ -82,11 +76,6 @@ import * as ora from "ora";
 						value: "win32"
 					}
 				]
-			},
-			{
-				name: "installer",
-				type: "confirm",
-				message: "Updater?"
 			}
 		]);
 
@@ -104,19 +93,6 @@ import * as ora from "ora";
 	if (["ia32", "x64"].includes(response.arch) || platform() === "win32")
 		icon = "./installer_assets/appIcon.ico";
 
-	if (existsSync("./dist/app/update.ini")) removeSync("./dist/app/update.ini");
-	if (existsSync("./dist/app/updater.app"))
-		removeSync("./dist/app/updater.app");
-	if (existsSync("./dist/app/updater.exe"))
-		removeSync("./dist/app/updater.exe");
-
-	let versionId = "0" + require("./package.json").version.replace(/[.]/g, ""),
-		updateIni = parse(readFileSync("./installer_assets/update.ini", "utf-8"));
-
-	updateIni.Update.version_id = versionId;
-
-	writeFileSync("./dist/app/update.ini", stringify(updateIni));
-
 	let spinner = ora("Packaging app").start(),
 		packagingOptions: electronPackager.Options = {
 			dir: "./dist/app",
@@ -129,6 +105,7 @@ import * as ora from "ora";
 			appCategoryType: "Utilities",
 			appCopyright: `Timeraa 2018-${new Date().getFullYear()}`,
 			prune: true,
+			asar: true,
 			// @ts-ignore
 			arch: response.arch,
 			// @ts-ignore
@@ -138,63 +115,9 @@ import * as ora from "ora";
 	if (response.arch === "current") delete packagingOptions.arch;
 	if (response.os === "current") delete packagingOptions.platform;
 
-	// @ts-ignore
 	electronPackager(packagingOptions).then(() => {
-		if (!response.installer) {
-			spinner.text = "Done!";
-			spinner.succeed();
-			process.exit();
-		}
-
-		let bitRockUpdater = "";
-
-		if (platform() === "win32") {
-			bitRockUpdater = resolve(
-				"C:/Program Files (x86)/BitRock InstallBuilder Enterprise 19.12.0/autoupdate/bin/customize.exe"
-			);
-		}
-
-		if (platform() === "darwin") {
-			bitRockUpdater = resolve(
-				"/Applications/Installbuilder/autoupdate/bin/customize.sh"
-			);
-		}
-
-		if (!existsSync(bitRockUpdater)) {
-			spinner.fail("Bitrock installation not found.");
-			process.exit();
-		}
-
-		spinner.text = "Building updater";
-
-		let updater = exec(
-			`"${bitRockUpdater}" build installer_assets/updater.xml ${
-				platform() === "win32" ? "windows" : "osx"
-			}`
-		);
-
-		updater.once("exit", (code, signal) => {
-			if (![0, 1].includes(code)) {
-				spinner.fail(`Updater failed with code ${code}: ${signal}`);
-				process.exit();
-			}
-
-			copyFileSync(
-				"./dist/app/update.ini",
-				`./dist/PreMiD-${
-					response.os === "current" ? platform() : response.os
-				}-${response.arch === "current" ? arch() : response.arch}/update.ini`
-			);
-
-			copyFileSync(
-				"./dist/app/updater.exe",
-				`./dist/PreMiD-${
-					response.os === "current" ? platform() : response.os
-				}-${response.arch === "current" ? arch() : response.arch}/updater.exe`
-			);
-
-			spinner.succeed();
-			process.exit();
-		});
+		spinner.text = "Done!";
+		spinner.succeed();
+		process.exit();
 	});
 })();

src/assets/tray/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Слой_1" data-name="Слой 1" viewBox="0 0 512 512"><defs><style>.cls-1{fill:#fff;fill-rule:evenodd}</style></defs><title>pmd_logo_1</title><path d="M459.17,105H52.83a30.35,30.35,0,0,0-30.34,30.34V376.66A30.35,30.35,0,0,0,52.83,407H459.17a30.35,30.35,0,0,0,30.34-30.34V135.34A30.35,30.35,0,0,0,459.17,105Zm-185,94.4a13.93,13.93,0,0,1,9.9-4.11h90.29a14,14,0,0,1,0,28H284a14,14,0,0,1-9.9-23.91Zm-63.64,63.11L92.14,330.83a7.51,7.51,0,0,1-11.27-6.51V187.68a7.51,7.51,0,0,1,11.27-6.51l118.34,68.32A7.52,7.52,0,0,1,210.48,262.51ZM441.81,312.6a13.93,13.93,0,0,1-9.9,4.11H284a14,14,0,0,1,0-28H431.91a14,14,0,0,1,9.9,23.91Zm0-46.7a13.93,13.93,0,0,1-9.9,4.11H284a14,14,0,0,1,0-28H431.91a14,14,0,0,1,9.9,23.91Z" class="cls-1"/></svg>

src/index.ts

@@ -1,44 +1,34 @@
-import { app, dialog } from "electron";
-//* Source .map support if devEnv
-if (!app.isPackaged) require("source-map-support").install();
+import "source-map-support/register";
 
-import { init as initSocket, socket } from "./managers/socketManager";
-import { init as initTray } from "./managers/trayManager";
-import { update as initAutoLaunch } from "./managers/launchManager";
+import { app } from "electron";
 import { platform } from "os";
+
+import { update as initAutoLaunch } from "./managers/launchManager";
+import { init as initSocket } from "./managers/socketManager";
+import { TrayManager } from "./managers/trayManager";
 import { checkForUpdate } from "./util/updateChecker";
 
+export let trayManager: TrayManager;
+
 //* Define and set it to null
 //* Set AppUserModelId for task manager etc
 //* When app is ready
 export let updateCheckerInterval = null;
+
+//* Attempt to get lock to prevent multiple instances of PreMiD from running
+let singleInstanceLock = app.requestSingleInstanceLock();
+
+//* Application already running?
+if (!singleInstanceLock) app.quit();
+
 app.setAppUserModelId("Timeraa.PreMiD");
 app.whenReady().then(async () => {
-	//* Init auto launch
-	//* Check for updates > Update and relaunch
-	//* Init socket
-	//* init application tray icon
-	//* If app is packaged, run an update check every 15 mins
-	initAutoLaunch();
-	await Promise.all([checkForUpdate(true), initSocket(), initTray()]);
+	trayManager = new TrayManager();
+
+	await Promise.all([checkForUpdate(true), initAutoLaunch(), initSocket()]);
+
 	app.isPackaged
 		? (updateCheckerInterval = setInterval(checkForUpdate, 15 * 1000 * 60))
 		: undefined;
 	if (platform() === "darwin") app.dock.hide();
 });
-
-//* If second instance started, close old one
-app.on("second-instance", () => app.exit(0));
-
-//* Send errors from app to extension
-process.on("unhandledRejection", rejection => {
-	console.error(rejection);
-	if (socket && socket.connected) socket.emit("unhandledRejection", rejection);
-});
-
-// TODO Find better way to log
-process.on("uncaughtException", err => {
-	console.error(err.stack);
-	dialog.showErrorBox(err.name, err.stack);
-	app.exit(0);
-});

src/managers/discordManager.ts

@@ -1,35 +1,95 @@
 import { Client } from "discord-rpc";
 import { app } from "electron";
-import { platform } from "os";
-import { tray } from "./trayManager";
+
+import { trayManager } from "../";
+//* Import custom types
+import PresenceData from "../../@types/PreMiD/PresenceData";
 import { info } from "../util/debug";
 
-//* Import custom types
-import Presence from "../../@types/PreMiD/Presence";
-import PresenceData from "../../@types/PreMiD/PresenceData";
+export let rpcClients: Array<RPCClient> = [];
 
-//* Define Presence array
-let loggedInPresences: Array<Presence> = [];
+class RPCClient {
+	clientId: string;
+	currentPresence: PresenceData;
+	client: Client;
+	clientReady: boolean = false;
+
+	constructor(clientId: string) {
+		rpcClients.push(this);
+
+		this.clientId = clientId;
+		this.client = new Client({
+			transport: "ipc"
+		});
+
+		this.client.once("ready", () => {
+			this.clientReady = true;
+			this.setActivity();
+		});
+		this.client.once(
+			// @ts-ignore
+			"disconnected",
+			() =>
+				(rpcClients = rpcClients.filter(
+					client => client.clientId !== this.clientId
+				))
+		);
+
+		this.client.login({ clientId: this.clientId }).catch(() => this.destroy());
+
+		info(`Create RPC client (${this.clientId})`);
+	}
+
+	setActivity(presenceData?: PresenceData) {
+		presenceData = presenceData ? presenceData : this.currentPresence;
+
+		if (!this.clientReady || !presenceData) return;
+
+		if (presenceData.trayTitle)
+			trayManager.tray.setTitle(presenceData.trayTitle);
+
+		this.client
+			.setActivity(presenceData.presenceData)
+			.catch(() => this.destroy());
+		info("setActivity");
+	}
+
+	clearActivity() {
+		this.currentPresence = null;
+
+		if (!this.clientReady) return;
+
+		this.client.clearActivity().catch(() => this.destroy());
+		trayManager.tray.setTitle("");
+	}
+
+	async destroy() {
+		try {
+			info(`Destroy RPC client (${this.clientId})`);
+			if (this.clientReady) {
+				this.client.clearActivity();
+				this.client.destroy();
+			}
+
+			trayManager.tray.setTitle("");
+			rpcClients = rpcClients.filter(
+				client => client.clientId !== this.clientId
+			);
+		} catch (err) {}
+	}
+}
 
 /**
  * Sets the user's activity
  * @param presence PresenceData to set activity
  */
 export function setActivity(presence: PresenceData) {
-  //* If platform is darwin (Mac OS) set trayTitle if theres one
-  //* Check if theres an active RPC connection that we can use
-  //* If we have one, use it
-  //* Else create one and use it
-  //* Show debug
-  if (platform() === "darwin" && presence.trayTitle)
-    tray.setTitle(presence.trayTitle);
-  let rpc = loggedInPresences.find(p => p.clientId === presence.clientId);
-  if (rpc) rpc.rpc.setActivity(presence.presenceData).catch(destroy);
-  else
-    loginPresence(presence.clientId).then(p =>
-      p.rpc.setActivity(presence.presenceData).catch(destroy)
-    );
-  info("setActivity");
+	let client = rpcClients.find(c => c.clientId === presence.clientId);
+
+	if (!client) {
+		client = new RPCClient(presence.clientId);
+		client.currentPresence = presence;
+	} else client.setActivity(presence);
 }
 
 /**
@@ -37,82 +97,27 @@ export function setActivity(presence: PresenceData) {
  * @param clientId clientId of presence to clear
  */
 export function clearActivity(clientId: string = undefined) {
-  //* Clear tray title
-  //* If clientId set
-  //* Else map through presences and clear them
-  //* Show Debug
-  if (platform() === "darwin") tray.setTitle("");
-  if (clientId) {
-    //* Check if this presence is logged in
-    //* If it is clear its activity
-    //* Return to prevent further actions
-    let pTC = loggedInPresences.find(p => p.clientId === clientId);
-    if (pTC) pTC.rpc.clearActivity().catch(destroy);
-    return;
-  }
-  loggedInPresences.map(p => p.rpc.clearActivity().catch(destroy));
-  info("clearActivity");
+	info("clearActivity");
+
+	if (clientId) {
+		let client = rpcClients.find(c => c.clientId === clientId);
+		client.clearActivity();
+	} else rpcClients.forEach(c => c.clearActivity());
 }
 
-/**
- * Create RPC connection to discord
- * @param clientId client ID of presence
- */
-function loginPresence(clientId: string) {
-  //* Return promise that will resolve to either Presence or null
-  return new Promise<Presence>((resolve, reject) => {
-    //* Create presence object
-    //* Add presence to object
-    //* Try login with client id
-    //* Once RPC connection is ready
-    //* Destroy all clients when Discord closed (My issue #42)
-    let presence: Presence = {
-      clientId: clientId,
-      rpc: new Client({ transport: "ipc" }),
-      ready: false
-    };
-    loggedInPresences.push(presence);
-    presence.rpc.login({ clientId: clientId }).catch(() => {
-      //* If couldn't log in remove it from loggedInPresences
-      //* Reject promise
-      loggedInPresences = loggedInPresences.filter(
-        p => p.clientId !== presence.clientId
-      );
-      reject();
-    });
-    presence.rpc.once("ready", () => {
-      //* Update status
-      //* Resolve with presence
-      presence.ready = true;
-      resolve(presence);
-    });
-    // @ts-ignore
-    presence.rpc.once("disconnected", destroy);
-  });
+export async function getDiscordUser() {
+	return new Promise((resolve, reject) => {
+		const c = new Client({ transport: "ipc" });
+
+		c.login({
+			clientId: "503557087041683458"
+		})
+			.then(({ user }) => c.destroy().then(() => resolve(user)))
+			.catch(reject);
+	});
 }
 
-/**
- * Destroys all rpc connections
- */
-export function destroy() {
-  //* Clear tray title
-  //* Map through loggedInPresences and destroy their rpcs
-  //* Set loggedInPresences to new Array
-  //* Return the promise
-  if (platform() === "darwin" && typeof tray !== "undefined") tray.setTitle("");
-  let res = Promise.all(
-    loggedInPresences.map((presence: Presence) =>
-      presence.rpc.destroy().catch(() => {})
-    )
-  );
-  loggedInPresences = [];
-  return res;
-}
-
-//* if app will quit
-app.once("will-quit", () => {
-  //* Show debug
-  //* Destroy all connections
-  info("Closing rpc connections");
-  destroy();
-});
+app.once(
+	"will-quit",
+	async () => await Promise.all(rpcClients.map(c => c.destroy()))
+);

src/managers/launchManager.ts

@@ -5,25 +5,25 @@ import { info } from "../util/debug";
 
 //* Create autoLaunch object
 let autoLaunch = new AutoLaunch({
-  name: app.name,
-  isHidden: true
+	name: app.name,
+	isHidden: true
 });
 
 /**
  * Updates autoLaunch
  */
 export async function update() {
-  //* If app not packaged return
-  //* Either enable/disable autolaunch
-  if (!app.isPackaged) {
-    //* Show debug
-    //* Return
-    info("Skipping autoLaunch.");
-    return;
-  }
-  if (settings.get("autoLaunch", true))
-    //* Enable if not enabled
-    autoLaunch.enable();
-  //* Disable if enabled
-  else autoLaunch.disable();
+	//* If app not packaged return
+	//* Either enable/disable autolaunch
+	if (!app.isPackaged) {
+		//* Show debug
+		//* Return
+		info("Skipping autoLaunch.");
+		return;
+	}
+	if (settings.get("autoLaunch", true))
+		//* Enable if not enabled
+		autoLaunch.enable();
+	//* Disable if enabled
+	else autoLaunch.disable();
 }

src/managers/presenceDevManager.ts

@@ -1,77 +1,82 @@
-import { readdirSync, readFileSync, unwatchFile, watchFile } from "fs";
-import { dialog } from "electron";
+import { readdirSync, readFileSync, unwatchFile } from "fs";
+import { dialog, app } from "electron";
 import { socket } from "./socketManager";
 import { extname } from "path";
 import { info } from "../util/debug";
 
+import chokidar from "chokidar";
+
 let presenceDevWatchedFiles = [],
-  currWatchPath = "";
+	currWatchPath = "",
+	currWatcher: chokidar.FSWatcher = null;
 
 export async function watchDir(path: string) {
-  //* Read dir
-  //* Set currWatchDir
-  //* Set watched files to files
-  //* Add file watcher to each file
-  let files = await readdirSync(path);
-  currWatchPath = path + "/";
-  presenceDevWatchedFiles = files;
-  presenceDevWatchedFiles.map(f => {
-    //* Watch file
-    //* ReadFiles
-    watchFile(currWatchPath + f, { interval: 250 }, async () => {
-      //* Read dir
-      //* ReadFiles
-      files = await readdirSync(path);
-      readFiles(files, path);
-    });
-  });
-  readFiles(files, path);
+	currWatchPath = path + "/";
+	let files = readdirSync(path);
+
+	if (currWatcher) await currWatcher.close();
+
+	currWatcher = chokidar.watch(currWatchPath, {
+		ignoreInitial: true,
+		ignored: ["*.ts"]
+	});
+
+	currWatcher.on("all", eventName => {
+		files = readdirSync(currWatchPath);
+
+		console.log(eventName, currWatchPath, files);
+
+		readFiles(files, currWatchPath);
+	});
+
+	readFiles(files, path);
 }
 
 async function readFiles(files, path) {
-  //* Send files to extension
-  socket.emit("localPresence", {
-    files: await Promise.all(
-      files.map(f => {
-        if (extname(f) === ".json")
-          return {
-            file: f,
-            contents: JSON.parse(readFileSync(`${path}/${f}`).toString())
-          };
-        else if (extname(f) === ".js")
-          return {
-            file: f,
-            contents: readFileSync(`${path}/${f}`).toString()
-          };
-        else return;
-      })
-    )
-  });
+	//* Send files to extension
+	socket.emit("localPresence", {
+		files: await Promise.all(
+			files.map(f => {
+				if (extname(f) === ".json")
+					return {
+						file: f,
+						contents: JSON.parse(readFileSync(`${path}/${f}`).toString())
+					};
+				else if (extname(f) === ".js")
+					return {
+						file: f,
+						contents: readFileSync(`${path}/${f}`).toString()
+					};
+				else return;
+			})
+		)
+	});
 }
 
 export async function openFileDialog() {
-  //* Open file dialog
-  //* If user cancels
-  //* Unwatch all still watched files
-  //* Watch directory
-  let oDialog = await dialog.showOpenDialog(null, {
-    title: "Select Presence Folder",
-    message:
-      "Please select the folder that contains the presence you want to load.\n(metadata.json, presence.js, iframe.js)",
-    buttonLabel: "Load Presence",
-    properties: ["openDirectory"]
-  });
-  if (oDialog.canceled) {
-    //* Show debug
-    //* return
-    info("Presence load canceled.");
-    return;
-  }
-  info(`Watching ${oDialog.filePaths[0]}`);
-  if (presenceDevWatchedFiles.length > 0)
-    await Promise.all(
-      presenceDevWatchedFiles.map(f => unwatchFile(currWatchPath + f))
-    );
+	//* Open file dialog
+	//* If user cancels
+	//* Unwatch all still watched files
+	//* Watch directory
+	app.focus();
+	let oDialog = await dialog.showOpenDialog(null, {
+		title: "Select Presence Folder",
+		message:
+			"Please select the folder that contains the presence you want to load.\n(metadata.json, presence.js, iframe.js)",
+		buttonLabel: "Load Presence",
+		properties: ["openDirectory"]
+	});
+	if (oDialog.canceled) {
+		//* Show debug
+		//* return
+		info("Presence load canceled.");
+		return;
+	}
+	info(`Watching ${oDialog.filePaths[0]}`);
+	if (presenceDevWatchedFiles.length > 0)
+		await Promise.all(
+			presenceDevWatchedFiles.map(f => unwatchFile(currWatchPath + f))
+		);
 
-  watchDir(oDialog.filePaths[0]);
+	watchDir(oDialog.filePaths[0]);
 }

src/managers/settingsManager.ts

@@ -1,17 +1,17 @@
 import ElectronStore from "electron-store";
-import { tray } from "./trayManager";
 import { update as updateAutoLaunch } from "./launchManager";
 import { platform } from "os";
 import { info } from "../util/debug";
 
 //* Import custom types
 import ExtensionSettings from "../../@types/PreMiD/ExtensionSettings";
+import { trayManager } from "..";
 
 //* Export and set default settings
 export let settings = new ElectronStore({
-  defaults: {
-    autoLaunch: true
-  }
+	defaults: {
+		autoLaunch: true
+	}
 });
 
 /**
@@ -19,15 +19,15 @@ export let settings = new ElectronStore({
  * @param extensionSettings Settings from extension
  */
 export function update(extensionSettings: ExtensionSettings) {
-  //* Show debug
-  //* remove title if disabled
-  //* Update autolaunch if updated
-  //* Save Settings
-  info("Updated settings");
-  if (!extensionSettings.titleMenubar && platform() === "darwin")
-    tray.setTitle("");
-  if (settings.get("autoLaunch") != extensionSettings.autoLaunch) {
-    settings.set("autoLaunch", extensionSettings.autoLaunch);
-    updateAutoLaunch();
-  }
+	//* Show debug
+	//* remove title if disabled
+	//* Update autolaunch if updated
+	//* Save Settings
+	info("Updated settings");
+	if (!extensionSettings.titleMenubar && platform() === "darwin")
+		trayManager.tray.setTitle("");
+	if (settings.get("autoLaunch") != extensionSettings.autoLaunch) {
+		settings.set("autoLaunch", extensionSettings.autoLaunch);
+		updateAutoLaunch();
+	}
 }

src/managers/socketManager.ts

@@ -1,77 +1,89 @@
-import socketIo from "socket.io";
-import { createServer, Server } from "http";
 import { app, dialog } from "electron";
-import { success, error } from "../util/debug";
-import { update as updateSettings } from "./settingsManager";
+import { createServer, Server } from "http";
+import socketIo from "socket.io";
+
+import { trayManager } from "../";
+import { error, success } from "../util/debug";
+import { clearActivity, getDiscordUser, rpcClients, setActivity } from "./discordManager";
 import { openFileDialog } from "./presenceDevManager";
-import { setActivity, clearActivity, destroy } from "./discordManager";
+import { update as updateSettings } from "./settingsManager";
 
 export let io: socketIo.Server;
 export let socket: socketIo.Socket;
 export let server: Server;
+export let connected: boolean = false;
 
 export function init() {
-  return new Promise(resolve => {
-    //* Create server
-    //* create SocketIo server, don't server client
-    //* Try to listen to port 3020
-    //* If that fails/some other error happens run socketError
-    //* If someone connects to socket socketConnection
-    server = createServer();
-    io = socketIo(server, { serveClient: false });
-    server.listen(3020, () => {
-      //* Resolve promise
-      //* Debug info
-      resolve();
-      success("Opened socket");
-    });
-    server.on("error", socketError);
-    io.on("connection", socketConnection);
-  });
+	return new Promise<void>(resolve => {
+		//* Create server
+		//* create SocketIo server, don't server client
+		//* Try to listen to port 3020
+		//* If that fails/some other error happens run socketError
+		//* If someone connects to socket socketConnection
+		server = createServer();
+		io = new socketIo.Server(server, {
+			serveClient: false,
+			allowEIO3: true,
+			cors: { origin: "*" }
+		});
+		server.listen(3020, () => {
+			//* Resolve promise
+			//* Debug info
+			resolve();
+			success("Opened socket");
+		});
+		server.on("error", socketError);
+		io.on("connection", socketConnection);
+	});
 }
 
 function socketConnection(cSocket: socketIo.Socket) {
-  //* Show debug
-  //* Set exported socket letiable to current socket
-  //* Handle setActivity event
-  //* Handle clearActivity event
-  //* Handle settingsUpdate
-  //* Handle presenceDev
-  //* Handle version request
-  //* Once socket user disconnects run cleanup
-  success("Socket connection");
-  socket = cSocket;
-  socket.on("setActivity", setActivity);
-  socket.on("clearActivity", clearActivity);
-  socket.on("settingUpdate", updateSettings);
-  socket.on("selectLocalPresence", openFileDialog);
-  socket.on("getVersion", () =>
-    socket.emit("receiveVersion", app.getVersion().replace(/[\D]/g, ""))
-  );
-  socket.once("disconnect", () => {
-    //* Show debug
-    //* Destroy all open RPC connections
-    error("Socket disconnection.");
-    destroy();
-  });
+	//* Show debug
+	//* Set exported socket letiable to current socket
+	//* Handle setActivity event
+	//* Handle clearActivity event
+	//* Handle settingsUpdate
+	//* Handle presenceDev
+	//* Handle version request
+	//* Once socket user disconnects run cleanup
+	success("Socket connection");
+	socket = cSocket;
+	getDiscordUser()
+		.then(user => socket.emit("discordUser", user))
+		.catch(_ => socket.emit("discordUser", null));
+	socket.on("setActivity", setActivity);
+	socket.on("clearActivity", clearActivity);
+	socket.on("settingUpdate", updateSettings);
+	socket.on("selectLocalPresence", openFileDialog);
+	socket.on("getVersion", () =>
+		socket.emit("receiveVersion", app.getVersion().replace(/[\D]/g, ""))
+	);
+	socket.once("disconnect", () => {
+		connected = false;
+		trayManager.update();
+		//* Show debug
+		//* Destroy all open RPC connections
+		error("Socket disconnection.");
+		rpcClients.forEach(c => c.destroy());
+	});
+	connected = true;
+	trayManager.update();
 }
 
 //* Runs on socket errors
 function socketError(e: any) {
-  //* Show debug
-  //* If port in use
-  error(e.message);
-  if (e.code === "EADDRINUSE") {
-    //* Focus app
-    //* Show error dialog
-    //* Exit app afterwards
-    app.focus();
-    dialog.showErrorBox(
-      "Oh noes! Port error...",
-      `${app.name} could not bind to port ${
-        e.port
-      }.\nIs ${app.name} running already?`
-    );
-    app.quit();
-  }
+	//* Show debug
+	//* If port in use
+	error(e.message);
+	if (e.code === "EADDRINUSE") {
+		//* Focus app
+		//* Show error dialog
+		//* Exit app afterwards
+		app.focus();
+		dialog.showErrorBox(
+			"Oh noes! Port error...",
+			`${app.name} could not bind to port ${e.port}.\nIs ${app.name} running already?`
+		);
+		app.quit();
+	}
 }

src/managers/trayManager.ts

@@ -1,26 +1,85 @@
-import { Menu, Tray } from "electron";
+import { app, Menu, shell, Tray } from "electron";
+import { platform } from "os";
 import { join } from "path";
 
-//* Export tray
-//* Export trayContextMenu
-export let tray: Tray;
-export let trayContextMenu = Menu.buildFromTemplate([
-  {
-    role: "quit"
-  }
-]);
+import { trayManager } from "../";
+import { checkForUpdate, update, updateAvailable } from "../util/updateChecker";
+import { connected } from "./socketManager";
 
-/**
- * Create tray
- */
-export function init() {
-  //* Return promise resolves to Tray
-  return new Promise<Tray>(function(resolve) {
-    //* Create Tray
-    //* Set its context menu
-    //* Resolve promise
-    tray = new Tray(join(__dirname, "../assets/tray/IconTemplate.png"));
-    tray.setContextMenu(trayContextMenu);
-    resolve(tray);
-  });
+let trayIcon;
+
+switch (platform()) {
+	case "darwin":
+		trayIcon = join(__dirname, "../assets/tray/IconTemplate.png");
+		break;
+	case "win32":
+		trayIcon = join(__dirname, "../assets/tray/Icon.ico");
+		break;
+	default:
+		trayIcon = join(__dirname, "../assets/tray/Icon@4x.png");
+		break;
 }
+
+export class TrayManager {
+	tray: Tray;
+
+	constructor() {
+		this.tray = new Tray(trayIcon);
+		this.tray.setToolTip(app.name);
+
+		this.tray.on("right-click", () => this.update());
+	}
+
+	update() {
+		this.tray.setContextMenu(
+			Menu.buildFromTemplate([
+				{
+					icon:
+						platform() === "darwin"
+							? join(__dirname, "../assets/tray/IconTemplate.png")
+							: join(__dirname, "../assets/tray/Icon@4x.png"),
+					label: `${app.name} v${app.getVersion()}`,
+					enabled: false
+				},
+				{
+					id: "connectInfo",
+					label: `Extension - ${connected ? "Connected" : "Not connected"}`,
+					enabled: false
+				},
+				{
+					type: "separator"
+				},
+				{
+					label: "Presence Store",
+					click: () => shell.openExternal("https://premid.app/store")
+				},
+				{
+					type: "separator"
+				},
+				{
+					label: `Update ${app.name}!`,
+					visible: updateAvailable,
+					click: () => update()
+				},
+				{
+					label: "Check for Updates",
+					click: () => checkForUpdate(false, true),
+					visible: !updateAvailable
+				},
+				{
+					label: "Contributors",
+					click: () => shell.openExternal("https://premid.app/contributors")
+				},
+				{
+					type: "separator"
+				},
+				{
+					label: `Quit ${app.name}`,
+					role: "quit"
+				}
+			])
+		);
+	}
+}
+
+app.once("quit", () => trayManager?.tray.destroy());

src/util/debug.ts

@@ -5,28 +5,28 @@ if (!app.isPackaged) var chalk = require("chalk");
  * Show info message in console
  * */
 export function info(message: string) {
-  //* Return if app packaged
-  //* Show debug
-  if (app.isPackaged) return;
-  console.log(`${chalk.bgBlue(chalk.white("  INFO   "))} ${message}`);
+	//* Return if app packaged
+	//* Show debug
+	if (app.isPackaged) return;
+	console.log(`${chalk.bgBlue(chalk.white("  INFO   "))} ${message}`);
 }
 
 /**
  * Show success message in console
  * */
 export function success(message: string) {
-  //* Return if app packaged
-  //* Show debug
-  if (app.isPackaged) return;
-  console.log(`${chalk.bgGreen(" SUCCESS ")} ${message}`);
+	//* Return if app packaged
+	//* Show debug
+	if (app.isPackaged) return;
+	console.log(`${chalk.bgGreen(" SUCCESS ")} ${message}`);
 }
 
 /**
  * Show error message in console
  * */
 export function error(message: string) {
-  //* Return if app packaged
-  //* Show debug
-  if (app.isPackaged) return;
-  console.log(`${chalk.bgRed("  ERROR  ")} ${message}`);
+	//* Return if app packaged
+	//* Show debug
+	if (app.isPackaged) return;
+	console.log(`${chalk.bgRed("  ERROR  ")} ${message}`);
 }

src/util/updateChecker.ts

@@ -1,28 +1,17 @@
 import { exec } from "child_process";
 import { resolve } from "path";
 import { error, info } from "./debug";
-import { trayContextMenu } from "../managers/trayManager";
-import { MenuItem, app, dialog } from "electron";
-import { tray } from "../managers/trayManager";
+import { app, dialog, shell } from "electron";
 import { platform } from "os";
-import sudoPrompt from "sudo-prompt";
 import axios from "axios";
 import { Notification } from "electron";
+import { trayManager } from "..";
+import { createWriteStream, existsSync, unlinkSync } from "fs";
 
-let updaterPath: string;
-//* Resolve paths for each OS
-switch (platform()) {
-	case "darwin":
-		updaterPath = resolve(
-			`${app.getAppPath()}../../../../../updater.app/Contents/MacOS/installbuilder.sh`
-		);
-		break;
-	case "win32":
-		updaterPath = resolve(`${app.getAppPath()}../../../updater.exe`);
-		break;
-}
+export let updateAvailable = false;
+let initialNotification = true;
 
-export async function checkForUpdate(autoUpdate = false) {
+export async function checkForUpdate(autoUpdate = false, manual = false) {
 	//* Skip Update checker if unsupported OS / not packaged
 	if (!app.isPackaged || !["darwin", "win32"].includes(platform())) {
 		//* Show debug
@@ -31,85 +20,95 @@ export async function checkForUpdate(autoUpdate = false) {
 		return;
 	}
 
-	try {
-		let latestAppVersion = (
-			await axios.get("https://api.premid.app/v2/versions")
-		).data.app;
-		if (app.getVersion() >= latestAppVersion) return;
-		if (autoUpdate) {
-			update();
-			return;
-		}
-	} catch (err) {
-		error(err);
-	}
+	axios
+		.get("https://api.premid.app/v2/versions")
+		.then(({ data }) => {
+			if (!data?.app) return;
 
-	let updateNotification = new Notification({
-		title: "Update available!",
-		body: "A new version of PreMiD is available! Click here to update."
+			const latestAppVersion = data.app;
+
+			if (app.getVersion() >= latestAppVersion) {
+				if (manual)
+					dialog.showMessageBox(null, {
+						message: "There are currently no updates available.",
+						type: "info"
+					});
+				return;
+			}
+
+			if (autoUpdate) {
+				updateTray();
+				update();
+				return;
+			}
+
+			if (initialNotification) {
+				const updateNotification = new Notification({
+					title: "Update available!",
+					body: "A new version of PreMiD is available! Click here to update."
+				});
+
+				updateNotification.once("click", update);
+				updateNotification.show();
+				updateTray();
+
+				initialNotification = false;
+			}
+		})
+		.catch(err => {
+			error(err.message);
+		});
+}
+
+export async function update() {
+	if (!["win32", "darwin"].includes(platform())) return;
+	const updaterPath = resolve(
+		app.getPath("temp"),
+		`PreMiD-Updater${
+			platform() === "win32" ? ".exe" : ".app/Contents/MacOS/installbuilder.sh"
+		}`
+	);
+
+	if (existsSync(updaterPath)) unlinkSync(updaterPath);
+	if (existsSync(resolve(app.getPath("temp"), "PreMiD-release.zip")))
+		unlinkSync(resolve(app.getPath("temp"), "PreMiD-release.zip"));
+
+	const response = await axios({
+		url: `http://dl.premid.app/upgrader${
+			platform() === "win32" ? ".exe" : ".app"
+		}`,
+		method: "GET",
+		responseType: "stream"
 	});
 
-	updateNotification.once("click", update);
+	const writer = createWriteStream(updaterPath);
+	response.data.pipe(writer);
 
-	updateNotification.show();
-
-	addTray();
+	new Promise((resolve, reject) => {
+		writer.on("finish", resolve);
+		writer.on("error", reject);
+	})
+		.then(() => exec(updaterPath, errorHandler))
+		.catch(errorHandler);
 }
 
-export function update() {
-	if (platform() === "darwin") {
-		exec(
-			`\"${updaterPath}\" --mode unattended --unattendedmodebehavior download`,
-			() => {
-				dialog.showErrorBox(
-					"Error while updating",
-					`${app.name} was unable to update itself. Please try again later.`
-				);
-			}
-		);
-		return;
-	}
-
-	sudoPrompt.exec(
-		`\"${updaterPath}\" --mode unattended --unattendedmodebehavior download`,
-		{
-			name: app.name,
-			icns: "assets/appIcon.icns"
-		},
-		err => {
-			// @ts-ignore
-			if (err.message === "User did not grant permission.") {
-				// @ts-ignore
-				error(err.message);
-				addTray();
-			} else
-				dialog.showErrorBox(
-					"Error while updating",
-					// @ts-ignore
-					`${app.name} was unable to update itself. Please try again later.\n\nError: ${err.message}`
-				);
-		}
-	);
+function errorHandler(err: Error) {
+	dialog
+		.showMessageBox({
+			title: `Error while updating ${app.name}`,
+			message: `If this error persists reinstall the app.`,
+			detail: err.message,
+			buttons: ["Okay", "Reinstall Application"],
+			type: "error"
+		})
+		.then(value => {
+			if (value.response === 1)
+				shell.openExternal("https://premid.app/downloads");
+		});
+	updateTray();
 }
 
-function addTray() {
-	if (trayContextMenu.items.length < 3) {
-		trayContextMenu.insert(
-			0,
-			new MenuItem({
-				label: "Update available!",
-				click() {
-					update();
-				}
-			})
-		);
-
-		trayContextMenu.insert(
-			1,
-			new MenuItem({
-				type: "separator"
-			})
-		);
-		tray.setContextMenu(trayContextMenu);
-	}
+function updateTray() {
+	updateAvailable = true;
+	trayManager.update();
 }

tsconfig.json

@@ -2,13 +2,18 @@
 	"compilerOptions": {
 		"module": "commonjs",
 		"target": "es2018",
+		"moduleResolution": "node",
 		"inlineSourceMap": true,
 		"outDir": "dist/app",
 		"removeComments": true,
-		"esModuleInterop": true
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"noUnusedParameters": true,
+		"noUnusedLocals": true
 	},
 	"include": ["src/**/*"],
 	"exclude": [
+		"**/node_modules/",
 		"pkg.ts",
 		"util/**/*",
 		"installer_assets/builder.ts",

util/prepare.ts

@@ -1,17 +1,7 @@
 import { readFileSync, writeFileSync } from "fs";
-import { parse, stringify } from "ini";
 
 let file = readFileSync("installer_assets/PreMiD-Upgrade.xml", "utf-8");
 
 file = file.replace("VERSION", require("../package.json").version);
 
 writeFileSync("installer_assets/PreMiD-Upgrade.xml", file);
-
-let versionId = (require("../package.json").version as string)
-		.replace(/[.]/g, "")
-		.padStart(4, "0"),
-	updateIni = parse(readFileSync("installer_assets/update.ini", "utf-8"));
-
-updateIni.Update.version_id = versionId;
-
-writeFileSync("installer_assets/update.ini", stringify(updateIni));

util/uploadFile.ts

@@ -5,8 +5,8 @@ let sftp = new Client();
 sftp
 	.connect({
 		host: process.env.SSHHOST,
-		username: process.env.SSHUSERNAME,
-		password: process.env.SSHPASSWORD
+		username: process.env.SSH_USERNAME,
+		privateKey: process.env.SSH_KEY
 	})
 	.then(async () => {
 		sftp