🚑 Fixes

Author: i1u5

.github/workflows/deploy.yml

@@ -2,9 +2,6 @@ name: CI
 on:
   repository_dispatch:
   push:
-    paths:
-      - '!*'
-      - 'src/**'
     branches:
       - master
 jobs:
@@ -22,27 +19,19 @@ jobs:
           echo "::set-output name=productName::$(node -p -e "require('./package.json').productName")"
           echo "::set-output name=version::$(node -p -e "require('./package.json').version")"
       - name: Install Dependencies
-        run: yarn
-      - name: Compile TypeScript
-        run: yarn run init
-      - name: Install Distributable Modules
-        run: yarn run dist
-      - name: Build Packages
         run: |
-          jq -c '.version = "${{ steps.info.outputs.version }}-${{ steps.info.outputs.timestamp }}"' ./dist/app/package.json > tmp.$$.json && mv tmp.$$.json ./dist/app/package.json
-          yarn run build
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          yarn install
+          yarn run dist
+      - name: Building
+        run: yarn run build
       - name: Publish
         run: |
-          curl -T ./dist/app/dist/${{ steps.info.outputs.productName }}.deb -udoomlerd:${{ secrets.BT_KEY }} "https://api.bintray.com/content/premid/debian-ubuntu/premid/${{ steps.info.outputs.version }}.${{ steps.info.outputs.timestamp }}/pool/nightly/p/premid_${{ steps.info.outputs.version }}.${{ steps.info.outputs.timestamp }}_amd64.deb;deb_distribution=nightly;deb_component=main;deb_architecture=amd64;publish=1"
-          curl -T ./dist/app/dist/${{ steps.info.outputs.productName }}.rpm -udoomlerd:${{ secrets.BT_KEY }} "https://api.bintray.com/content/premid/redhat-nightly/premid/${{ steps.info.outputs.version }}.${{ steps.info.outputs.timestamp }}/main/premid-${{ steps.info.outputs.version }}.${{ steps.info.outputs.timestamp }}.x86_64.rpm;publish=1"
+          curl -T ./dist/app/dist/${{ steps.info.outputs.productName }}.deb -udoomlerd:${{ secrets.BT_KEY }} "https://api.bintray.com/content/premid/debian-ubuntu/premid/${{ steps.info.outputs.version }}-${{ steps.info.outputs.timestamp }}/pool/nightly/p/premid_${{ steps.info.outputs.version }}-${{ steps.info.outputs.timestamp }}_amd64.deb;deb_distribution=nightly;deb_component=main;deb_architecture=amd64;publish=1"
+          curl -T ./dist/app/dist/${{ steps.info.outputs.productName }}.rpm -udoomlerd:${{ secrets.BT_KEY }} "https://api.bintray.com/content/premid/redhat-nightly/premid/${{ steps.info.outputs.version }}-${{ steps.info.outputs.timestamp }}/main/premid-${{ steps.info.outputs.version }}.${{ steps.info.outputs.timestamp }}.x86_64.rpm;publish=1"
       - name: Build AppImage
         run: |
           jq -c '.productName = "PreMiD Portable"' ./dist/app/package.json > tmp.$$.json && mv tmp.$$.json ./dist/app/package.json
           yarn run build:n-appimage
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
@@ -68,15 +57,11 @@ jobs:
           echo "::set-output name=productName::$(node -p -e "require('./package.json').productName")"
           echo "::set-output name=version::$(node -p -e "require('./package.json').version")"
       - name: Install Dependencies
-        run: yarn
-      - name: Compile TypeScript
-        run: yarn run init
-      - name: Install Distributable Modules
-        run: yarn run dist
-      - name: Build Packages
+        run: |
+          yarn install
+          yarn run dist
+      - name: Building
         run: yarn run build
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish
         run: |
           curl -T ./dist/app/dist/${{ steps.info.outputs.productName }}.deb -udoomlerd:${{ secrets.BT_KEY }} "https://api.bintray.com/content/premid/debian-ubuntu/premid/${{ steps.info.outputs.version }}/pool/stable/p/premid_${{ steps.info.outputs.version }}_amd64.deb;deb_distribution=stable;deb_component=main;deb_architecture=amd64;publish=1"

.gitignore

@@ -1,18 +1,14 @@
-# local dist files
 node_modules
+out
 dist
-src/yarn.lock
-src/package.json
-
-# MacOS-generated files
-.DS_Store
+tmp
 
-# local VSCode files
 .vscode
-.history
+.env
 
-# Yarn logs
-*.log
+src/package-lock.json
+src/yarn.lock
+src/package.json
 
-# Super secure files
-.env
+*.app
+*.js

.prettierignore

@@ -0,0 +1 @@
+* @doomlerd

.prettierrc.json

@@ -1,9 +1,12 @@
 {
   "name": "premid",
   "productName": "PreMiD",
-  "author": "Jack 'DooMLorD' W. <doomlordcs@gmail.com> (https://github.com/doomlerd)",
+  "author": "Florian 'Timeraa' Metz <me@timeraa.dev> (https://github.com/timeraa)",
+  "contributors": [
+    "Jack 'DooMLorD' W. <doomlordcs@gmail.com> (https://github.com/doomlerd)"
+  ],
   "description": "Discord Rich Presence for web services",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "repository": {
     "type": "git",
     "url": "git://github.com/PreMiD/Linux.git"
@@ -17,19 +20,19 @@
     "init": "tsc && devScript --copyOnly",
     "start": "electron dist/app/.",
     "dev": "devScript",
-    "dist": "cd dist/app/ && yarn install",
-    "build": "electron-builder --project ./dist/app/ -p never",
+    "dist": "tsc && devScript --copyOnly && cd dist/app/ && yarn install",
+    "build": "electron-builder --project ./dist/app/",
     "build:appimage": "electron-builder --project ./dist/app/ build -l AppImage --x64 -p onTagOrDraft",
     "build:n-appimage": "electron-builder --project ./dist/app/ build -l AppImage --x64 -p never"
   },
   "build": {
     "appId": "com.PreMiD.app",
     "copyright": "PreMiD Org",
     "linux": {
+      "maintainer": "Jack 'DooMLorD' W. <doomlordcs@gmail.com> (https://github.com/doomlerd)",
       "category": "Utility",
       "artifactName": "${productName}.${ext}",
       "icon": "assets/appIcon.icns",
-      "executableName": "premid",
       "target": [
         "tar.gz",
         "deb",
@@ -38,12 +41,7 @@
       "extraFiles": [
         "assets/premid.desktop",
         "assets/appIcon.png"
-      ],
-      "desktop": {
-        "GenericName": "Discord RPC",
-        "Categories": "Utility;",
-        "Actions": "StoreURL;ContributorsURL;Debug;Kill;\n\n[Desktop Action StoreURL]\nType=Link\nURL=https://premid.app/store\nName=Presence Store\n\n[Desktop Action ContributorsURL]\nType=Link\nURL=https://premid.app/contributors\nName=Acknowledgments\n\n[Desktop Action Debug]\nTerminal=true\nName=Open in Terminal\n\n[Desktop Action Kill]\nExec=killall -3 premid\nName=Quit"
-      }
+      ]
     },
     "publish": [
       {
@@ -58,22 +56,19 @@
   "devDependencies": {
     "@timeraa/devscript": "Timeraa/DevScript",
     "@types/auto-launch": "5.0.1",
-    "@types/discord-rpc": "3.0.3",
-    "@types/node": "13.13.5",
+    "@types/discord-rpc": "3.0.2",
+    "@types/node": "13.9.3",
     "@types/socket.io": "2.1.4",
-    "@typescript-eslint/eslint-plugin": "2.31.0",
-    "@typescript-eslint/parser": "2.31.0",
-    "electron": "^7.1.11",
-    "electron-builder": "22.6.0",
-    "eslint": "7.0.0",
+    "electron": "8.2.0",
+    "electron-builder": "22.4.1",
     "typescript": "3.8.3"
   },
   "dependencies": {
     "auto-launch": "5.0.5",
     "discord-rpc": "github:discordjs/RPC",
     "electron-store": "5.1.1",
-    "electron-updater": "4.3.1",
+    "electron-updater": "4.2.5",
     "socket.io": "2.3.0",
-    "source-map-support": "0.5.19"
+    "source-map-support": "0.5.16"
   }
 }

CODEOWNERS

@@ -1,28 +1,8 @@
 [Desktop Entry]
-Type=Application
 Name=PreMiD
-GenericName=Discord RPC
+GenericName=PreMiD
 Comment=Discord Rich Presence for web services
-Icon=premid
 Exec=/usr/bin/premid
 Terminal=false
-Actions=StoreURL;ContributorsURL;Debug;Kill;
-Categories=Utility;
-
-[Desktop Action StoreURL]
-Type=Link
-URL=https://premid.app/store
-Name=Presence Store
-
-[Desktop Action ContributorsURL]
-Type=Link
-URL=https://premid.app/contributors
-Name=Acknowledgments
-
-[Desktop Action Debug]
-Terminal=true
-Name=Open in Terminal
-
-[Desktop Action Kill]
-Exec=killall -3 premid
-Name=Quit
+Type=Application
+Icon=premid.png

package.json

@@ -6,35 +6,35 @@ import { update as initAutoLaunch } from "./managers/launchManager";
 import { TrayManager } from "./managers/trayManager";
 import { checkForUpdate } from "./util/updateChecker";
 
-let singleInstanceLock: boolean;
-//* Attempt locking to a single instance if app is in production
-if (app.isPackaged) singleInstanceLock = app.requestSingleInstanceLock();
 export let trayManager: TrayManager;
 
-app.on("ready", async () => {
-  if (!singleInstanceLock && app.isPackaged) return app.exit();
-
+//* When app is ready
+export let updateCheckerInterval = null;
+app.whenReady().then(async () => {
   trayManager = new TrayManager();
 
-  initAutoLaunch();
+  await initAutoLaunch();
   await initSocket();
 
   if (app.isPackaged && app.name.includes("Portable")) {
     await checkForUpdate(true);
-    setInterval(() => {
+    updateCheckerInterval = setInterval(() => {
       checkForUpdate(true);
     }, 15 * 1000 * 60);
   }
 });
 
+//* If second instance started, close old one
+app.on("second-instance", () => app.exit(0));
+
 //* Send errors from app to extension
-process.on("unhandledRejection", (rejection) => {
+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) => {
+process.on("uncaughtException", err => {
   dialog.showErrorBox(err.name, err.stack);
-  app.quit();
+  app.exit(0);
 });