Improve app and add more install options (and fix old .dmg files)

.github/workflows/build-and-release.yml

@@ -31,6 +31,9 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Build (ia32)
+        run: npm run build -- --arch ia32
+
       - name: Build (x64)
         run: npm run build -- --arch x64
 
@@ -49,6 +52,8 @@ jobs:
       - name: Generate checksum
         run: |
           sha256sum dist/*.AppImage > dist/sha256sum.txt
+          sha256sum dist/*.deb >> dist/sha256sum.txt
+          sha256sum dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload Linux Artifacts
         uses: actions/upload-artifact@v4
@@ -57,6 +62,8 @@ jobs:
           name: linux-artifacts
           path: |
             dist/*.AppImage
+            dist/*.deb
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
@@ -64,7 +71,6 @@ jobs:
     name: Build bsky-desktop (Windows)
     runs-on: windows-latest
     env:
-      ext: "exe"
       GITHUB_TOKEN: ${{ secrets.GHT }}
 
     steps:
@@ -79,6 +85,9 @@ jobs:
       - name: Install dependencies
         run: npm install
       
+      - name: Build (ia32)
+        run: npm run build -- --arch ia32
+
       - name: Build (x64)
         run: npm run build -- --arch x64
       
@@ -88,6 +97,9 @@ jobs:
       - name: Generate checksum
         run: |
           sha256sum dist/*.exe > dist/sha256sum.txt
+          sha256sum dist/*.msi >> dist/sha256sum.txt
+          sha256sum dist/*.appx >> dist/sha256sum.txt
+          sha256sum dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload Windows Artifacts
         uses: actions/upload-artifact@v4
@@ -96,6 +108,9 @@ jobs:
           name: windows-artifacts
           path: |
             dist/*.exe
+            dist/*.msi
+            dist/*.appx
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
@@ -103,7 +118,6 @@ jobs:
     name: Build bsky-desktop (macOS)
     runs-on: macos-latest
     env:
-      ext: "dmg"
       GITHUB_TOKEN: ${{ secrets.GHT }}
 
     steps:
@@ -127,6 +141,8 @@ jobs:
       - name: Generate checksum
         run: |
           shasum -a 256 dist/*.dmg > dist/sha256sum.txt
+          shasum -a 256 dist/*.pkg >> dist/sha256sum.txt
+          shasum -a 256 dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload macOS Artifacts
         uses: actions/upload-artifact@v4
@@ -135,6 +151,8 @@ jobs:
           name: macos-artifacts
           path: |
             dist/*.dmg
+            dist/*.pkg
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
@@ -189,8 +207,15 @@ jobs:
           generate_release_notes: true
           files: |
             dist/linux/*.AppImage
+            dist/linux/*.deb
+            dist/linux/*.zip
             dist/windows/*.exe
+            dist/windows/*.msi
+            dist/windows/*.appx
+            dist/windows/*.zip
             dist/macos/*.dmg
+            dist/macos/*.pkg
+            dist/macos/*.zip
             sha256sums.txt
 
   aur:

README.md

@@ -14,6 +14,20 @@ Bsky Desktop is an Electron-based application for Bsky that allows users to mana
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/bskydesktop.svg?columns=4&exclude_unsupported=1)](https://repology.org/project/bskydesktop/versions)
 
+#### Windows install options:
+- Zip (x64, arm64, ia32)
+- Setup (exe, msi, appx) (x64, arm64, ia32)
+
+#### Mac install options:
+- Zip (x64, arm64)
+- Dmg (x64, arm64)
+- Pkg (x64, arm64)
+
+#### Linux install options:
+- Zip (x64, arm64, ia32)
+- AppImage (x64, arm64, ia32)
+- Deb (x64, arm64, ia32)
+
 ### Build Instructions for Bsky Desktop
 
 To build and run Bsky Desktop locally, follow these steps:

build-app.js

@@ -1,116 +0,0 @@
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs/promises');
-const process = require('process');
-const packageJson = require('./package.json');
-
-// Electron builder:
-const electronBuilderPath = path.join('node_modules', 'electron-builder', 'cli.js');
-
-// Parse command-line arguments:
-const supportedPlatforms = ['win', 'mac', 'linux', 'mwl'];
-const supportedArchitectures = ['x64', 'armv7l', 'arm64', 'ia32', 'universal'];
-const args = process.argv.slice(2);
-const carch = args.includes('--arch') ? args[args.indexOf('--arch') + 1] : null;
-const cplatform = args.includes('--platform') ? args[args.indexOf('--platform') + 1] : null;
-const pack = args.includes('--pack') || null;
-
-let platform, arch, build_args;
-
-//console.log(supportedPlatforms, supportedArchitectures, cplatform, carch);
-
-// Platform Name:
-if (cplatform == null) {
-    switch (process.platform) {
-        case "win32":
-            platform = "win";
-            break;
-        case "darwin":
-            platform = "mac";
-            break;
-        case "linux":
-            platform = "linux";
-            break;
-        default:
-            platform = "mwl"; // Build for all
-            break;
-    }
-} else {
-    if (!supportedPlatforms.includes(cplatform)) {
-        console.error(`Invalid platform specified. Supported platforms: ${supportedPlatforms.join(', ')}`);
-        process.exit(1);
-    }
-    platform = cplatform;
-}
-
-// Platform Arch:
-if (carch == null) {
-    arch = process.arch === "arm" ? "armv7l" : process.arch;
-} else {
-    arch = carch;
-    if (!supportedArchitectures.includes(arch)) {
-        console.error(`Invalid arch specified. Supported architectures: ${supportedArchitectures.join(', ')}`);
-        process.exit(1);
-    }
-}
-
-// Generate artifact name:
-const artifactname = `${packageJson.build.productName}-${packageJson.version}-${platform}-${arch}`;
-
-(async () => {
-    try {
-        // Additional build arguments: (started wiht --eb-nmehere)
-        const additionalArgs = args.filter((arg, index) => arg.startsWith('--eb-') && index % 2 !== 0);
-
-        // CLI Args:
-        build_args = [
-            electronBuilderPath,
-            `--${platform}`,
-            `--${arch}`,
-            `-c.artifactName="${artifactname}.\${ext}"`,
-        ];
-
-        // If additional args are present:
-        if (additionalArgs.length > 0) {
-            build_args.push(...additionalArgs);
-        }
-
-        // If pack is true:
-        if (pack) {
-            build_args.push(`--dir`);
-        }
-
-        // Make CLI:
-        const cli = `node ${build_args.join(' ')}`;
-
-        console.info(`CLI: ${cli}`);
-        console.info(`Building ${artifactname}`);
-        const process = spawn(cli, { shell: true });
-
-        // Log stdout as it comes
-        process.stdout.on('data', (data) => {
-            console.log(data.toString().trim());
-        });
-
-        // Log stderr as it comes
-        process.stderr.on('data', (data) => {
-            console.error(data.toString().trim());
-        });
-
-        // Handle process exit
-        process.on('close', (code) => {
-            if (code === 0) {
-                console.info(`Build completed successfully!`);
-            } else {
-                console.error(`Process exited with code ${code}`);
-            }
-        });
-
-        process.on('error', (error) => {
-            console.error(`Failed to start process: ${error.message}`);
-        });
-    } catch (error) {
-        console.error('An error occurred:', error);
-        process.exit(1);
-    }
-})();

build/build-app.js

@@ -0,0 +1,104 @@
+const path = require('path');
+const process = require('process');
+const builder = require('electron-builder');
+const { Platform, Arch } = builder;
+
+// Parse command-line arguments
+const supportedPlatforms = ['win', 'mac', 'linux'];
+const supportedArchitectures = ['x64', 'armv7l', 'arm64', 'ia32', 'universal'];
+const args = process.argv.slice(2);
+const carch = args.includes('--arch') ? args[args.indexOf('--arch') + 1] : null;
+const cplatform = args.includes('--platform') ? args[args.indexOf('--platform') + 1] : null;
+const pack = args.includes('--pack');  // Keep track of --pack as a boolean flag
+
+// Determine platform
+let platform;
+if (!cplatform) {
+    platform = process.platform === 'win32' ? 'win' :
+        process.platform === 'darwin' ? 'mac' :
+            process.platform === 'linux' ? 'linux' : null;
+} else if (!supportedPlatforms.includes(cplatform)) {
+    console.error(`Invalid platform specified. Supported platforms: ${supportedPlatforms.join(', ')}`);
+    process.exit(1);
+} else {
+    platform = cplatform;
+}
+
+// Determine architecture
+let arch = carch || (process.arch === 'arm' ? 'armv7l' : process.arch);
+if (!supportedArchitectures.includes(arch)) {
+    console.error(`Invalid architecture specified. Supported architectures: ${supportedArchitectures.join(', ')}`);
+    process.exit(1);
+}
+
+// Map platform and architecture to electron-builder enums
+const platformEnum = {
+    win: Platform.WINDOWS,
+    mac: Platform.MAC,
+    linux: Platform.LINUX
+}[platform];
+
+const archEnum = {
+    x64: Arch.x64,
+    armv7l: Arch.armv7l,
+    arm64: Arch.arm64,
+    ia32: Arch.ia32,
+    universal: Arch.universal
+}[arch];
+
+// Additional build arguments: (starting with --eb-)
+const buildArgs = args.filter((arg) => arg.startsWith('--eb-'));
+
+// If additional args are present, add them to the buildArgs array
+if (buildArgs.length > 0) {
+    console.log('Additional build arguments:', buildArgs);
+}
+
+// If pack is true, add --dir to buildArgs
+if (pack) {
+    buildArgs.push('--dir');
+}
+
+// Read build-config.json
+const buildConfigPath = path.join(__dirname, 'build-config.json');
+let buildConfig;
+try {
+    buildConfig = require(buildConfigPath);
+} catch (err) {
+    console.error(`Failed to read build-config.json: ${err.message}`);
+    process.exit(1);
+}
+
+// Generate artifact name
+const packageJson = require('../package.json');
+const artifactName = `${buildConfig.productName}-${packageJson.version}-${platform}-${arch}.\${ext}`;
+
+// Electron Builder configuration
+/**
+ * @type {import('electron-builder').Configuration}
+ */
+const options = {
+    artifactName,
+    nsis: {
+        deleteAppDataOnUninstall: true,
+        oneClick: true,
+        perMachine: false
+    },
+    dmg: {
+        contents: [
+            { type: 'file', x: 255, y: 85 },
+            { type: 'link', path: '/Applications', x: 253, y: 325 }
+        ]
+    },
+    ...buildConfig
+};
+
+// Build process
+builder.build({
+    targets: platformEnum.createTarget(null, archEnum),
+    config: options
+}).then(result => {
+    console.log("Build completed:", JSON.stringify(result, null, 2));
+}).catch(error => {
+    console.error("Build failed:", error);
+});

build/build-config.json

@@ -0,0 +1,55 @@
+{
+    "appId": "com.oxmc.bskyDesktop",
+    "productName": "bskyDesktop",
+    "asarUnpack": [
+        "./node_modules/node-notifier/**/*"
+    ],
+    "removePackageScripts": true,
+    "mac": {
+        "target": [
+            "dmg",
+            "pkg",
+            "zip"
+        ],
+        "icon": "src/ui/images/mac.icns",
+        "category": "Network"
+    },
+    "pkg": {
+        "installLocation": "/Applications",
+        "allowAnywhere": true,
+        "allowCurrentUserHome": true,
+        "allowRootDirectory": true,
+        "isVersionChecked": true,
+        "isRelocatable": false,
+        "overwriteAction": "upgrade"
+    },
+    "linux": {
+        "target": [
+            "appimage",
+            "deb",
+            "zip"
+        ],
+        "icon": "src/ui/images/icons",
+        "category": "Network"
+    },
+    "win": {
+        "target": [
+            "nsis",
+            "appx",
+            "msi",
+            "zip"
+        ],
+        "icon": "src/ui/images/logo.ico"
+    },
+    "appx": {
+        "identityName": "BskyDesktop"
+    },
+    "protocols": [
+        {
+            "name": "bsky",
+            "schemes": [
+                "bsky"
+            ]
+        }
+    ]
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bsky-desktop",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "A desktop app of bsky.app",
     "main": "src/app/main.js",
     "scripts": {
@@ -8,26 +8,12 @@
         "pack": "electron-builder --dir",
         "dist": "electron-builder",
         "rebuild": "electron-rebuild",
-        "build": "node ./build-app.js"
+        "build": "node ./build/build-app.js"
     },
     "author": {
         "name": "oxmc",
         "email": "oxmc7769.mail@gmail.com"
     },
-    "contributors": [
-        {
-            "name": "oxmc",
-            "email": "contact@oxmc.is-a.dev"
-        },
-        {
-            "name": "PlOszukiwaczDEV",
-            "email": "ploszukiwacz1@duck.com"
-        },
-        {
-            "name": "GizzyUwU",
-            "email": "me@gizzy.pro"
-        }
-    ],
     "license": "AGPL-3.0-only",
     "devDependencies": {
         "electron": "^29.4.6",
@@ -45,52 +31,5 @@
         "semver": "^7.6.3",
         "usercss-meta": "^0.12.0",
         "v8-compile-cache": "^2.3.0"
-    },
-    "build": {
-        "appId": "com.oxmc.bskyDesktop",
-        "productName": "bskyDesktop",
-        "asarUnpack": [
-            "./node_modules/node-notifier/**/*"
-        ],
-        "artifactName": "bsky-desktop.${ext}",
-        "mac": {
-            "target": [
-                "dmg",
-                "pkg"
-            ],
-            "icon": "build/icons/mac-icon.icns",
-            "category": "Network"
-        },
-        "pkg": {
-            "scripts": "build/mac-pkg/scripts",
-            "installLocation": "/Applications",
-            "allowAnywhere": true,
-            "allowCurrentUserHome": true,
-            "allowRootDirectory": true,
-            "isVersionChecked": true,
-            "isRelocatable": false,
-            "overwriteAction": "upgrade"
-        },
-        "linux": {
-            "target": [
-                "appimage"
-            ],
-            "icon": "src/ui/images/icons",
-            "category": "Network"
-        },
-        "win": {
-            "target": [
-                "nsis"
-            ],
-            "icon": "src/ui/images/logo.ico"
-        },
-        "protocols": [
-            {
-                "name": "bsky",
-                "schemes": [
-                    "bsky"
-                ]
-            }
-        ]
     }
 }

src/app/contributors.json

@@ -0,0 +1,17 @@
+[
+    {
+        "name": "oxmc",
+        "email": "contact@oxmc.is-a.dev",
+        "url": "https://oxmc.is-a.dev"
+    },
+    {
+        "name": "PlOszukiwaczDEV",
+        "email": "ploszukiwacz1@duck.com",
+        "url": "https://ploszukiwacz.pl"
+    },
+    {
+        "name": "GizzyUwU",
+        "email": "me@gizzy.pro",
+        "url": "https://gizzy.pro"
+    }
+]

src/app/discord-rpc/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 devsnek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/app/discord-rpc/client.js

@@ -0,0 +1,660 @@
+'use strict';
+
+const EventEmitter = require('events');
+const { setTimeout, clearTimeout } = require('timers');
+const fetch = require('node-fetch');
+const transports = require('./transports');
+const { RPCCommands, RPCEvents, RelationshipTypes } = require('./constants');
+const { pid: getPid, uuid } = require('./util');
+
+function subKey(event, args) {
+  return `${event}${JSON.stringify(args)}`;
+}
+
+/**
+ * @typedef {RPCClientOptions}
+ * @extends {ClientOptions}
+ * @prop {string} transport RPC transport. one of `ipc` or `websocket`
+ */
+
+/**
+ * The main hub for interacting with Discord RPC
+ * @extends {BaseClient}
+ */
+class RPCClient extends EventEmitter {
+  /**
+   * @param {RPCClientOptions} [options] Options for the client.
+   * You must provide a transport
+   */
+  constructor(options = {}) {
+    super();
+
+    this.options = options;
+
+    this.accessToken = null;
+    this.clientId = null;
+
+    /**
+     * Application used in this client
+     * @type {?ClientApplication}
+     */
+    this.application = null;
+
+    /**
+     * User used in this application
+     * @type {?User}
+     */
+    this.user = null;
+
+    const Transport = transports[options.transport];
+    if (!Transport) {
+      throw new TypeError('RPC_INVALID_TRANSPORT', options.transport);
+    }
+
+    this.fetch = (method, path, { data, query } = {}) =>
+      fetch(`${this.fetch.endpoint}${path}${query ? new URLSearchParams(query) : ''}`, {
+        method,
+        body: data,
+        headers: {
+          Authorization: `Bearer ${this.accessToken}`,
+        },
+      }).then(async (r) => {
+        const body = await r.json();
+        if (!r.ok) {
+          const e = new Error(r.status);
+          e.body = body;
+          throw e;
+        }
+        return body;
+      });
+
+    this.fetch.endpoint = 'https://discord.com/api';
+
+    /**
+     * Raw transport userd
+     * @type {RPCTransport}
+     * @private
+     */
+    this.transport = new Transport(this);
+    this.transport.on('message', this._onRpcMessage.bind(this));
+
+    /**
+     * Map of nonces being expected from the transport
+     * @type {Map}
+     * @private
+     */
+    this._expecting = new Map();
+
+    this._connectPromise = undefined;
+  }
+
+  /**
+   * Search and connect to RPC
+   */
+  connect(clientId) {
+    if (this._connectPromise) {
+      return this._connectPromise;
+    }
+    this._connectPromise = new Promise((resolve, reject) => {
+      this.clientId = clientId;
+      const timeout = setTimeout(() => reject(new Error('RPC_CONNECTION_TIMEOUT')), 10e3);
+      timeout.unref();
+      this.once('connected', () => {
+        clearTimeout(timeout);
+        resolve(this);
+      });
+      this.transport.once('close', () => {
+        this._expecting.forEach((e) => {
+          e.reject(new Error('connection closed'));
+        });
+        this.emit('disconnected');
+        reject(new Error('connection closed'));
+      });
+      this.transport.connect().catch(reject);
+    });
+    return this._connectPromise;
+  }
+
+  /**
+   * @typedef {RPCLoginOptions}
+   * @param {string} clientId Client ID
+   * @param {string} [clientSecret] Client secret
+   * @param {string} [accessToken] Access token
+   * @param {string} [rpcToken] RPC token
+   * @param {string} [tokenEndpoint] Token endpoint
+   * @param {string[]} [scopes] Scopes to authorize with
+   */
+
+  /**
+   * Performs authentication flow. Automatically calls Client#connect if needed.
+   * @param {RPCLoginOptions} options Options for authentication.
+   * At least one property must be provided to perform login.
+   * @example client.login({ clientId: '1234567', clientSecret: 'abcdef123' });
+   * @returns {Promise<RPCClient>}
+   */
+  async login(options = {}) {
+    let { clientId, accessToken } = options;
+    await this.connect(clientId);
+    if (!options.scopes) {
+      this.emit('ready');
+      return this;
+    }
+    if (!accessToken) {
+      accessToken = await this.authorize(options);
+    }
+    return this.authenticate(accessToken);
+  }
+
+  /**
+   * Request
+   * @param {string} cmd Command
+   * @param {Object} [args={}] Arguments
+   * @param {string} [evt] Event
+   * @returns {Promise}
+   * @private
+   */
+  request(cmd, args, evt) {
+    return new Promise((resolve, reject) => {
+      const nonce = uuid();
+      this.transport.send({ cmd, args, evt, nonce });
+      this._expecting.set(nonce, { resolve, reject });
+    });
+  }
+
+  /**
+   * Message handler
+   * @param {Object} message message
+   * @private
+   */
+  _onRpcMessage(message) {
+    if (message.cmd === RPCCommands.DISPATCH && message.evt === RPCEvents.READY) {
+      if (message.data.user) {
+        this.user = message.data.user;
+      }
+      this.emit('connected');
+    } else if (this._expecting.has(message.nonce)) {
+      const { resolve, reject } = this._expecting.get(message.nonce);
+      if (message.evt === 'ERROR') {
+        const e = new Error(message.data.message);
+        e.code = message.data.code;
+        e.data = message.data;
+        reject(e);
+      } else {
+        resolve(message.data);
+      }
+      this._expecting.delete(message.nonce);
+    } else {
+      this.emit(message.evt, message.data);
+    }
+  }
+
+  /**
+   * Authorize
+   * @param {Object} options options
+   * @returns {Promise}
+   * @private
+   */
+  async authorize({ scopes, clientSecret, rpcToken, redirectUri, prompt } = {}) {
+    if (clientSecret && rpcToken === true) {
+      const body = await this.fetch('POST', '/oauth2/token/rpc', {
+        data: new URLSearchParams({
+          client_id: this.clientId,
+          client_secret: clientSecret,
+        }),
+      });
+      rpcToken = body.rpc_token;
+    }
+
+    const { code } = await this.request('AUTHORIZE', {
+      scopes,
+      client_id: this.clientId,
+      prompt,
+      rpc_token: rpcToken,
+    });
+
+    const response = await this.fetch('POST', '/oauth2/token', {
+      data: new URLSearchParams({
+        client_id: this.clientId,
+        client_secret: clientSecret,
+        code,
+        grant_type: 'authorization_code',
+        redirect_uri: redirectUri,
+      }),
+    });
+
+    return response.access_token;
+  }
+
+  /**
+   * Authenticate
+   * @param {string} accessToken access token
+   * @returns {Promise}
+   * @private
+   */
+  authenticate(accessToken) {
+    return this.request('AUTHENTICATE', { access_token: accessToken })
+      .then(({ application, user }) => {
+        this.accessToken = accessToken;
+        this.application = application;
+        this.user = user;
+        this.emit('ready');
+        return this;
+      });
+  }
+
+
+  /**
+   * Fetch a guild
+   * @param {Snowflake} id Guild ID
+   * @param {number} [timeout] Timeout request
+   * @returns {Promise<Guild>}
+   */
+  getGuild(id, timeout) {
+    return this.request(RPCCommands.GET_GUILD, { guild_id: id, timeout });
+  }
+
+  /**
+   * Fetch all guilds
+   * @param {number} [timeout] Timeout request
+   * @returns {Promise<Collection<Snowflake, Guild>>}
+   */
+  getGuilds(timeout) {
+    return this.request(RPCCommands.GET_GUILDS, { timeout });
+  }
+
+  /**
+   * Get a channel
+   * @param {Snowflake} id Channel ID
+   * @param {number} [timeout] Timeout request
+   * @returns {Promise<Channel>}
+   */
+  getChannel(id, timeout) {
+    return this.request(RPCCommands.GET_CHANNEL, { channel_id: id, timeout });
+  }
+
+  /**
+   * Get all channels
+   * @param {Snowflake} [id] Guild ID
+   * @param {number} [timeout] Timeout request
+   * @returns {Promise<Collection<Snowflake, Channel>>}
+   */
+  async getChannels(id, timeout) {
+    const { channels } = await this.request(RPCCommands.GET_CHANNELS, {
+      timeout,
+      guild_id: id,
+    });
+    return channels;
+  }
+
+  /**
+   * @typedef {CertifiedDevice}
+   * @prop {string} type One of `AUDIO_INPUT`, `AUDIO_OUTPUT`, `VIDEO_INPUT`
+   * @prop {string} uuid This device's Windows UUID
+   * @prop {object} vendor Vendor information
+   * @prop {string} vendor.name Vendor's name
+   * @prop {string} vendor.url Vendor's url
+   * @prop {object} model Model information
+   * @prop {string} model.name Model's name
+   * @prop {string} model.url Model's url
+   * @prop {string[]} related Array of related product's Windows UUIDs
+   * @prop {boolean} echoCancellation If the device has echo cancellation
+   * @prop {boolean} noiseSuppression If the device has noise suppression
+   * @prop {boolean} automaticGainControl If the device has automatic gain control
+   * @prop {boolean} hardwareMute If the device has a hardware mute
+   */
+
+  /**
+   * Tell discord which devices are certified
+   * @param {CertifiedDevice[]} devices Certified devices to send to discord
+   * @returns {Promise}
+   */
+  setCertifiedDevices(devices) {
+    return this.request(RPCCommands.SET_CERTIFIED_DEVICES, {
+      devices: devices.map((d) => ({
+        type: d.type,
+        id: d.uuid,
+        vendor: d.vendor,
+        model: d.model,
+        related: d.related,
+        echo_cancellation: d.echoCancellation,
+        noise_suppression: d.noiseSuppression,
+        automatic_gain_control: d.automaticGainControl,
+        hardware_mute: d.hardwareMute,
+      })),
+    });
+  }
+
+  /**
+   * @typedef {UserVoiceSettings}
+   * @prop {Snowflake} id ID of the user these settings apply to
+   * @prop {?Object} [pan] Pan settings, an object with `left` and `right` set between
+   * 0.0 and 1.0, inclusive
+   * @prop {?number} [volume=100] The volume
+   * @prop {bool} [mute] If the user is muted
+   */
+
+  /**
+   * Set the voice settings for a user, by id
+   * @param {Snowflake} id ID of the user to set
+   * @param {UserVoiceSettings} settings Settings
+   * @returns {Promise}
+   */
+  setUserVoiceSettings(id, settings) {
+    return this.request(RPCCommands.SET_USER_VOICE_SETTINGS, {
+      user_id: id,
+      pan: settings.pan,
+      mute: settings.mute,
+      volume: settings.volume,
+    });
+  }
+
+  /**
+   * Move the user to a voice channel
+   * @param {Snowflake} id ID of the voice channel
+   * @param {Object} [options] Options
+   * @param {number} [options.timeout] Timeout for the command
+   * @param {boolean} [options.force] Force this move. This should only be done if you
+   * have explicit permission from the user.
+   * @returns {Promise}
+   */
+  selectVoiceChannel(id, { timeout, force = false } = {}) {
+    return this.request(RPCCommands.SELECT_VOICE_CHANNEL, { channel_id: id, timeout, force });
+  }
+
+  /**
+   * Move the user to a text channel
+   * @param {Snowflake} id ID of the voice channel
+   * @param {Object} [options] Options
+   * @param {number} [options.timeout] Timeout for the command
+   * have explicit permission from the user.
+   * @returns {Promise}
+   */
+  selectTextChannel(id, { timeout } = {}) {
+    return this.request(RPCCommands.SELECT_TEXT_CHANNEL, { channel_id: id, timeout });
+  }
+
+  /**
+   * Get current voice settings
+   * @returns {Promise}
+   */
+  getVoiceSettings() {
+    return this.request(RPCCommands.GET_VOICE_SETTINGS)
+      .then((s) => ({
+        automaticGainControl: s.automatic_gain_control,
+        echoCancellation: s.echo_cancellation,
+        noiseSuppression: s.noise_suppression,
+        qos: s.qos,
+        silenceWarning: s.silence_warning,
+        deaf: s.deaf,
+        mute: s.mute,
+        input: {
+          availableDevices: s.input.available_devices,
+          device: s.input.device_id,
+          volume: s.input.volume,
+        },
+        output: {
+          availableDevices: s.output.available_devices,
+          device: s.output.device_id,
+          volume: s.output.volume,
+        },
+        mode: {
+          type: s.mode.type,
+          autoThreshold: s.mode.auto_threshold,
+          threshold: s.mode.threshold,
+          shortcut: s.mode.shortcut,
+          delay: s.mode.delay,
+        },
+      }));
+  }
+
+  /**
+   * Set current voice settings, overriding the current settings until this session disconnects.
+   * This also locks the settings for any other rpc sessions which may be connected.
+   * @param {Object} args Settings
+   * @returns {Promise}
+   */
+  setVoiceSettings(args) {
+    return this.request(RPCCommands.SET_VOICE_SETTINGS, {
+      automatic_gain_control: args.automaticGainControl,
+      echo_cancellation: args.echoCancellation,
+      noise_suppression: args.noiseSuppression,
+      qos: args.qos,
+      silence_warning: args.silenceWarning,
+      deaf: args.deaf,
+      mute: args.mute,
+      input: args.input ? {
+        device_id: args.input.device,
+        volume: args.input.volume,
+      } : undefined,
+      output: args.output ? {
+        device_id: args.output.device,
+        volume: args.output.volume,
+      } : undefined,
+      mode: args.mode ? {
+        type: args.mode.type,
+        auto_threshold: args.mode.autoThreshold,
+        threshold: args.mode.threshold,
+        shortcut: args.mode.shortcut,
+        delay: args.mode.delay,
+      } : undefined,
+    });
+  }
+
+  /**
+   * Capture a shortcut using the client
+   * The callback takes (key, stop) where `stop` is a function that will stop capturing.
+   * This `stop` function must be called before disconnecting or else the user will have
+   * to restart their client.
+   * @param {Function} callback Callback handling keys
+   * @returns {Promise<Function>}
+   */
+  captureShortcut(callback) {
+    const subid = subKey(RPCEvents.CAPTURE_SHORTCUT_CHANGE);
+    const stop = () => {
+      this._subscriptions.delete(subid);
+      return this.request(RPCCommands.CAPTURE_SHORTCUT, { action: 'STOP' });
+    };
+    this._subscriptions.set(subid, ({ shortcut }) => {
+      callback(shortcut, stop);
+    });
+    return this.request(RPCCommands.CAPTURE_SHORTCUT, { action: 'START' })
+      .then(() => stop);
+  }
+
+  /**
+   * Sets the presence for the logged in user.
+   * @param {object} args The rich presence to pass.
+   * @param {number} [pid] The application's process ID. Defaults to the executing process' PID.
+   * @returns {Promise}
+   */
+  setActivity(args = {}, pid = getPid()) {
+    let timestamps;
+    let assets;
+    let party;
+    let secrets;
+    if (args.startTimestamp || args.endTimestamp) {
+      timestamps = {
+        start: args.startTimestamp,
+        end: args.endTimestamp,
+      };
+      if (timestamps.start instanceof Date) {
+        timestamps.start = Math.round(timestamps.start.getTime());
+      }
+      if (timestamps.end instanceof Date) {
+        timestamps.end = Math.round(timestamps.end.getTime());
+      }
+      if (timestamps.start > 2147483647000) {
+        throw new RangeError('timestamps.start must fit into a unix timestamp');
+      }
+      if (timestamps.end > 2147483647000) {
+        throw new RangeError('timestamps.end must fit into a unix timestamp');
+      }
+    }
+    if (
+      args.largeImageKey || args.largeImageText
+      || args.smallImageKey || args.smallImageText
+    ) {
+      assets = {
+        large_image: args.largeImageKey,
+        large_text: args.largeImageText,
+        small_image: args.smallImageKey,
+        small_text: args.smallImageText,
+      };
+    }
+    if (args.partySize || args.partyId || args.partyMax) {
+      party = { id: args.partyId };
+      if (args.partySize || args.partyMax) {
+        party.size = [args.partySize, args.partyMax];
+      }
+    }
+    if (args.matchSecret || args.joinSecret || args.spectateSecret) {
+      secrets = {
+        match: args.matchSecret,
+        join: args.joinSecret,
+        spectate: args.spectateSecret,
+      };
+    }
+
+    return this.request(RPCCommands.SET_ACTIVITY, {
+      pid,
+      activity: {
+        state: args.state,
+        details: args.details,
+        timestamps,
+        assets,
+        party,
+        secrets,
+        buttons: args.buttons,
+        instance: !!args.instance,
+      },
+    });
+  }
+
+  /**
+   * Clears the currently set presence, if any. This will hide the "Playing X" message
+   * displayed below the user's name.
+   * @param {number} [pid] The application's process ID. Defaults to the executing process' PID.
+   * @returns {Promise}
+   */
+  clearActivity(pid = getPid()) {
+    return this.request(RPCCommands.SET_ACTIVITY, {
+      pid,
+    });
+  }
+
+  /**
+   * Invite a user to join the game the RPC user is currently playing
+   * @param {User} user The user to invite
+   * @returns {Promise}
+   */
+  sendJoinInvite(user) {
+    return this.request(RPCCommands.SEND_ACTIVITY_JOIN_INVITE, {
+      user_id: user.id || user,
+    });
+  }
+
+  /**
+   * Request to join the game the user is playing
+   * @param {User} user The user whose game you want to request to join
+   * @returns {Promise}
+   */
+  sendJoinRequest(user) {
+    return this.request(RPCCommands.SEND_ACTIVITY_JOIN_REQUEST, {
+      user_id: user.id || user,
+    });
+  }
+
+  /**
+   * Reject a join request from a user
+   * @param {User} user The user whose request you wish to reject
+   * @returns {Promise}
+   */
+  closeJoinRequest(user) {
+    return this.request(RPCCommands.CLOSE_ACTIVITY_JOIN_REQUEST, {
+      user_id: user.id || user,
+    });
+  }
+
+  createLobby(type, capacity, metadata) {
+    return this.request(RPCCommands.CREATE_LOBBY, {
+      type,
+      capacity,
+      metadata,
+    });
+  }
+
+  updateLobby(lobby, { type, owner, capacity, metadata } = {}) {
+    return this.request(RPCCommands.UPDATE_LOBBY, {
+      id: lobby.id || lobby,
+      type,
+      owner_id: (owner && owner.id) || owner,
+      capacity,
+      metadata,
+    });
+  }
+
+  deleteLobby(lobby) {
+    return this.request(RPCCommands.DELETE_LOBBY, {
+      id: lobby.id || lobby,
+    });
+  }
+
+  connectToLobby(id, secret) {
+    return this.request(RPCCommands.CONNECT_TO_LOBBY, {
+      id,
+      secret,
+    });
+  }
+
+  sendToLobby(lobby, data) {
+    return this.request(RPCCommands.SEND_TO_LOBBY, {
+      id: lobby.id || lobby,
+      data,
+    });
+  }
+
+  disconnectFromLobby(lobby) {
+    return this.request(RPCCommands.DISCONNECT_FROM_LOBBY, {
+      id: lobby.id || lobby,
+    });
+  }
+
+  updateLobbyMember(lobby, user, metadata) {
+    return this.request(RPCCommands.UPDATE_LOBBY_MEMBER, {
+      lobby_id: lobby.id || lobby,
+      user_id: user.id || user,
+      metadata,
+    });
+  }
+
+  getRelationships() {
+    const types = Object.keys(RelationshipTypes);
+    return this.request(RPCCommands.GET_RELATIONSHIPS)
+      .then((o) => o.relationships.map((r) => ({
+        ...r,
+        type: types[r.type],
+      })));
+  }
+
+  /**
+   * Subscribe to an event
+   * @param {string} event Name of event e.g. `MESSAGE_CREATE`
+   * @param {Object} [args] Args for event e.g. `{ channel_id: '1234' }`
+   * @returns {Promise<Object>}
+   */
+  async subscribe(event, args) {
+    await this.request(RPCCommands.SUBSCRIBE, args, event);
+    return {
+      unsubscribe: () => this.request(RPCCommands.UNSUBSCRIBE, args, event),
+    };
+  }
+
+  /**
+   * Destroy the client
+   */
+  async destroy() {
+    await this.transport.close();
+  }
+}
+
+module.exports = RPCClient;

src/app/discord-rpc/constants.js

@@ -0,0 +1,178 @@
+'use strict';
+
+function keyMirror(arr) {
+  const tmp = {};
+  for (const value of arr) {
+    tmp[value] = value;
+  }
+  return tmp;
+}
+
+
+exports.browser = typeof window !== 'undefined';
+
+exports.RPCCommands = keyMirror([
+  'DISPATCH',
+  'AUTHORIZE',
+  'AUTHENTICATE',
+  'GET_GUILD',
+  'GET_GUILDS',
+  'GET_CHANNEL',
+  'GET_CHANNELS',
+  'CREATE_CHANNEL_INVITE',
+  'GET_RELATIONSHIPS',
+  'GET_USER',
+  'SUBSCRIBE',
+  'UNSUBSCRIBE',
+  'SET_USER_VOICE_SETTINGS',
+  'SET_USER_VOICE_SETTINGS_2',
+  'SELECT_VOICE_CHANNEL',
+  'GET_SELECTED_VOICE_CHANNEL',
+  'SELECT_TEXT_CHANNEL',
+  'GET_VOICE_SETTINGS',
+  'SET_VOICE_SETTINGS_2',
+  'SET_VOICE_SETTINGS',
+  'CAPTURE_SHORTCUT',
+  'SET_ACTIVITY',
+  'SEND_ACTIVITY_JOIN_INVITE',
+  'CLOSE_ACTIVITY_JOIN_REQUEST',
+  'ACTIVITY_INVITE_USER',
+  'ACCEPT_ACTIVITY_INVITE',
+  'INVITE_BROWSER',
+  'DEEP_LINK',
+  'CONNECTIONS_CALLBACK',
+  'BRAINTREE_POPUP_BRIDGE_CALLBACK',
+  'GIFT_CODE_BROWSER',
+  'GUILD_TEMPLATE_BROWSER',
+  'OVERLAY',
+  'BROWSER_HANDOFF',
+  'SET_CERTIFIED_DEVICES',
+  'GET_IMAGE',
+  'CREATE_LOBBY',
+  'UPDATE_LOBBY',
+  'DELETE_LOBBY',
+  'UPDATE_LOBBY_MEMBER',
+  'CONNECT_TO_LOBBY',
+  'DISCONNECT_FROM_LOBBY',
+  'SEND_TO_LOBBY',
+  'SEARCH_LOBBIES',
+  'CONNECT_TO_LOBBY_VOICE',
+  'DISCONNECT_FROM_LOBBY_VOICE',
+  'SET_OVERLAY_LOCKED',
+  'OPEN_OVERLAY_ACTIVITY_INVITE',
+  'OPEN_OVERLAY_GUILD_INVITE',
+  'OPEN_OVERLAY_VOICE_SETTINGS',
+  'VALIDATE_APPLICATION',
+  'GET_ENTITLEMENT_TICKET',
+  'GET_APPLICATION_TICKET',
+  'START_PURCHASE',
+  'GET_SKUS',
+  'GET_ENTITLEMENTS',
+  'GET_NETWORKING_CONFIG',
+  'NETWORKING_SYSTEM_METRICS',
+  'NETWORKING_PEER_METRICS',
+  'NETWORKING_CREATE_TOKEN',
+  'SET_USER_ACHIEVEMENT',
+  'GET_USER_ACHIEVEMENTS',
+]);
+
+exports.RPCEvents = keyMirror([
+  'CURRENT_USER_UPDATE',
+  'GUILD_STATUS',
+  'GUILD_CREATE',
+  'CHANNEL_CREATE',
+  'RELATIONSHIP_UPDATE',
+  'VOICE_CHANNEL_SELECT',
+  'VOICE_STATE_CREATE',
+  'VOICE_STATE_DELETE',
+  'VOICE_STATE_UPDATE',
+  'VOICE_SETTINGS_UPDATE',
+  'VOICE_SETTINGS_UPDATE_2',
+  'VOICE_CONNECTION_STATUS',
+  'SPEAKING_START',
+  'SPEAKING_STOP',
+  'GAME_JOIN',
+  'GAME_SPECTATE',
+  'ACTIVITY_JOIN',
+  'ACTIVITY_JOIN_REQUEST',
+  'ACTIVITY_SPECTATE',
+  'ACTIVITY_INVITE',
+  'NOTIFICATION_CREATE',
+  'MESSAGE_CREATE',
+  'MESSAGE_UPDATE',
+  'MESSAGE_DELETE',
+  'LOBBY_DELETE',
+  'LOBBY_UPDATE',
+  'LOBBY_MEMBER_CONNECT',
+  'LOBBY_MEMBER_DISCONNECT',
+  'LOBBY_MEMBER_UPDATE',
+  'LOBBY_MESSAGE',
+  'CAPTURE_SHORTCUT_CHANGE',
+  'OVERLAY',
+  'OVERLAY_UPDATE',
+  'ENTITLEMENT_CREATE',
+  'ENTITLEMENT_DELETE',
+  'USER_ACHIEVEMENT_UPDATE',
+  'READY',
+  'ERROR',
+]);
+
+exports.RPCErrors = {
+  CAPTURE_SHORTCUT_ALREADY_LISTENING: 5004,
+  GET_GUILD_TIMED_OUT: 5002,
+  INVALID_ACTIVITY_JOIN_REQUEST: 4012,
+  INVALID_ACTIVITY_SECRET: 5005,
+  INVALID_CHANNEL: 4005,
+  INVALID_CLIENTID: 4007,
+  INVALID_COMMAND: 4002,
+  INVALID_ENTITLEMENT: 4015,
+  INVALID_EVENT: 4004,
+  INVALID_GIFT_CODE: 4016,
+  INVALID_GUILD: 4003,
+  INVALID_INVITE: 4011,
+  INVALID_LOBBY: 4013,
+  INVALID_LOBBY_SECRET: 4014,
+  INVALID_ORIGIN: 4008,
+  INVALID_PAYLOAD: 4000,
+  INVALID_PERMISSIONS: 4006,
+  INVALID_TOKEN: 4009,
+  INVALID_USER: 4010,
+  LOBBY_FULL: 5007,
+  NO_ELIGIBLE_ACTIVITY: 5006,
+  OAUTH2_ERROR: 5000,
+  PURCHASE_CANCELED: 5008,
+  PURCHASE_ERROR: 5009,
+  RATE_LIMITED: 5011,
+  SELECT_CHANNEL_TIMED_OUT: 5001,
+  SELECT_VOICE_FORCE_REQUIRED: 5003,
+  SERVICE_UNAVAILABLE: 1001,
+  TRANSACTION_ABORTED: 1002,
+  UNAUTHORIZED_FOR_ACHIEVEMENT: 5010,
+  UNKNOWN_ERROR: 1000,
+};
+
+exports.RPCCloseCodes = {
+  CLOSE_NORMAL: 1000,
+  CLOSE_UNSUPPORTED: 1003,
+  CLOSE_ABNORMAL: 1006,
+  INVALID_CLIENTID: 4000,
+  INVALID_ORIGIN: 4001,
+  RATELIMITED: 4002,
+  TOKEN_REVOKED: 4003,
+  INVALID_VERSION: 4004,
+  INVALID_ENCODING: 4005,
+};
+
+exports.LobbyTypes = {
+  PRIVATE: 1,
+  PUBLIC: 2,
+};
+
+exports.RelationshipTypes = {
+  NONE: 0,
+  FRIEND: 1,
+  BLOCKED: 2,
+  PENDING_INCOMING: 3,
+  PENDING_OUTGOING: 4,
+  IMPLICIT: 5,
+};

src/app/discord-rpc/index.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const util = require('./util');
+
+module.exports = {
+  Client: require('./client'),
+  register(id) {
+    return util.register(`discord-${id}`);
+  },
+};

src/app/discord-rpc/transports/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  ipc: require('./ipc'),
+  websocket: require('./websocket'),
+};

src/app/discord-rpc/transports/ipc.js

@@ -0,0 +1,173 @@
+'use strict';
+
+const net = require('net');
+const EventEmitter = require('events');
+const fetch = require('node-fetch');
+const { uuid } = require('../util');
+
+const OPCodes = {
+  HANDSHAKE: 0,
+  FRAME: 1,
+  CLOSE: 2,
+  PING: 3,
+  PONG: 4,
+};
+
+function getIPCPath(id) {
+  if (process.platform === 'win32') {
+    return `\\\\?\\pipe\\discord-ipc-${id}`;
+  }
+  const { env: { XDG_RUNTIME_DIR, TMPDIR, TMP, TEMP } } = process;
+  const prefix = XDG_RUNTIME_DIR || TMPDIR || TMP || TEMP || '/tmp';
+  return `${prefix.replace(/\/$/, '')}/discord-ipc-${id}`;
+}
+
+function getIPC(id = 0) {
+  return new Promise((resolve, reject) => {
+    const path = getIPCPath(id);
+    const onerror = () => {
+      if (id < 10) {
+        resolve(getIPC(id + 1));
+      } else {
+        reject(new Error('Could not connect'));
+      }
+    };
+    const sock = net.createConnection(path, () => {
+      sock.removeListener('error', onerror);
+      resolve(sock);
+    });
+    sock.once('error', onerror);
+  });
+}
+
+async function findEndpoint(tries = 0) {
+  if (tries > 30) {
+    throw new Error('Could not find endpoint');
+  }
+  const endpoint = `http://127.0.0.1:${6463 + (tries % 10)}`;
+  try {
+    const r = await fetch(endpoint);
+    if (r.status === 404) {
+      return endpoint;
+    }
+    return findEndpoint(tries + 1);
+  } catch (e) {
+    return findEndpoint(tries + 1);
+  }
+}
+
+function encode(op, data) {
+  data = JSON.stringify(data);
+  const len = Buffer.byteLength(data);
+  const packet = Buffer.alloc(8 + len);
+  packet.writeInt32LE(op, 0);
+  packet.writeInt32LE(len, 4);
+  packet.write(data, 8, len);
+  return packet;
+}
+
+const working = {
+  full: '',
+  op: undefined,
+};
+
+function decode(socket, callback) {
+  const packet = socket.read();
+  if (!packet) {
+    return;
+  }
+
+  let { op } = working;
+  let raw;
+  if (working.full === '') {
+    op = working.op = packet.readInt32LE(0);
+    const len = packet.readInt32LE(4);
+    raw = packet.slice(8, len + 8);
+  } else {
+    raw = packet.toString();
+  }
+
+  try {
+    const data = JSON.parse(working.full + raw);
+    callback({ op, data }); // eslint-disable-line callback-return
+    working.full = '';
+    working.op = undefined;
+  } catch (err) {
+    working.full += raw;
+  }
+
+  decode(socket, callback);
+}
+
+class IPCTransport extends EventEmitter {
+  constructor(client) {
+    super();
+    this.client = client;
+    this.socket = null;
+  }
+
+  async connect() {
+    const socket = this.socket = await getIPC();
+    socket.on('close', this.onClose.bind(this));
+    socket.on('error', this.onClose.bind(this));
+    this.emit('open');
+    socket.write(encode(OPCodes.HANDSHAKE, {
+      v: 1,
+      client_id: this.client.clientId,
+    }));
+    socket.pause();
+    socket.on('readable', () => {
+      decode(socket, ({ op, data }) => {
+        switch (op) {
+          case OPCodes.PING:
+            this.send(data, OPCodes.PONG);
+            break;
+          case OPCodes.FRAME:
+            if (!data) {
+              return;
+            }
+            if (data.cmd === 'AUTHORIZE' && data.evt !== 'ERROR') {
+              findEndpoint()
+                .then((endpoint) => {
+                  this.client.request.endpoint = endpoint;
+                })
+                .catch((e) => {
+                  this.client.emit('error', e);
+                });
+            }
+            this.emit('message', data);
+            break;
+          case OPCodes.CLOSE:
+            this.emit('close', data);
+            break;
+          default:
+            break;
+        }
+      });
+    });
+  }
+
+  onClose(e) {
+    this.emit('close', e);
+  }
+
+  send(data, op = OPCodes.FRAME) {
+    this.socket.write(encode(op, data));
+  }
+
+  async close() {
+    return new Promise((r) => {
+      this.once('close', r);
+      this.send({}, OPCodes.CLOSE);
+      this.socket.end();
+    });
+  }
+
+  ping() {
+    this.send(uuid(), OPCodes.PING);
+  }
+}
+
+module.exports = IPCTransport;
+module.exports.encode = encode;
+module.exports.decode = decode;

src/app/discord-rpc/transports/websocket.js

@@ -0,0 +1,77 @@
+'use strict';
+
+const EventEmitter = require('events');
+const { browser } = require('../constants');
+
+// eslint-disable-next-line
+const WebSocket = browser ? window.WebSocket : require('ws');
+
+const pack = (d) => JSON.stringify(d);
+const unpack = (s) => JSON.parse(s);
+
+class WebSocketTransport extends EventEmitter {
+  constructor(client) {
+    super();
+    this.client = client;
+    this.ws = null;
+    this.tries = 0;
+  }
+
+  async connect() {
+    const port = 6463 + (this.tries % 10);
+    this.tries += 1;
+
+    this.ws = new WebSocket(
+      `ws://127.0.0.1:${port}/?v=1&client_id=${this.client.clientId}`,
+      browser ? undefined : { origin: this.client.options.origin },
+    );
+    this.ws.onopen = this.onOpen.bind(this);
+    this.ws.onclose = this.onClose.bind(this);
+    this.ws.onerror = this.onError.bind(this);
+    this.ws.onmessage = this.onMessage.bind(this);
+  }
+
+  onOpen() {
+    this.emit('open');
+  }
+
+  onClose(event) {
+    if (!event.wasClean) {
+      return;
+    }
+    this.emit('close', event);
+  }
+
+  onError(event) {
+    try {
+      this.ws.close();
+    } catch {} // eslint-disable-line no-empty
+
+    if (this.tries > 20) {
+      this.emit('error', event.error);
+    } else {
+      setTimeout(() => {
+        this.connect();
+      }, 250);
+    }
+  }
+
+  onMessage(event) {
+    this.emit('message', unpack(event.data));
+  }
+
+  send(data) {
+    this.ws.send(pack(data));
+  }
+
+  ping() {} // eslint-disable-line no-empty-function
+
+  close() {
+    return new Promise((r) => {
+      this.once('close', r);
+      this.ws.close();
+    });
+  }
+}
+
+module.exports = WebSocketTransport;

src/app/discord-rpc/util.js

@@ -0,0 +1,50 @@
+'use strict';
+
+let register;
+try {
+  const { app } = require('electron');
+  register = app.setAsDefaultProtocolClient.bind(app);
+} catch (err) {
+  try {
+    register = require('register-scheme');
+  } catch (e) {} // eslint-disable-line no-empty
+}
+
+if (typeof register !== 'function') {
+  register = () => false;
+}
+
+function pid() {
+  if (typeof process !== 'undefined') {
+    return process.pid;
+  }
+  return null;
+}
+
+const uuid4122 = () => {
+  let uuid = '';
+  for (let i = 0; i < 32; i += 1) {
+    if (i === 8 || i === 12 || i === 16 || i === 20) {
+      uuid += '-';
+    }
+    let n;
+    if (i === 12) {
+      n = 4;
+    } else {
+      const random = Math.random() * 16 | 0;
+      if (i === 16) {
+        n = (random & 3) | 0;
+      } else {
+        n = random;
+      }
+    }
+    uuid += n.toString(16);
+  }
+  return uuid;
+};
+
+module.exports = {
+  pid,
+  register,
+  uuid: uuid4122,
+};

src/app/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, BrowserView, globalShortcut, ipcMain, Tray, Menu, protocol, session } = require("electron");
+const { app, BrowserWindow, BrowserView, globalShortcut, ipcMain, Tray, Menu, protocol, session, dialog } = require("electron");
 const electronremote = require("@electron/remote/main");
 //const asar = require('@electron/asar');
 const windowStateKeeper = require("electron-window-state");
@@ -16,6 +16,14 @@ const os = require("os");
 require('v8-compile-cache');
 
 const packageJson = require(path.join(__dirname, '..', '..', 'package.json'));
+const contributors = require(path.join(__dirname, 'contributors.json'));
+
+// Check if app is ran from the installer dmg (macOS)
+if (process.platform === 'darwin' && app.isPackaged && app.isInApplicationsFolder()) {
+  // Creeate a dialog to ask the user to move the app to the Applications folder
+  dialog.showErrorBox('Move to Applications folder', 'Please move the app to the Applications folder to ensure it works correctly.');
+  app.quit();
+};
 
 // isUpdaing:
 global.isUpdating = false;
@@ -102,7 +110,7 @@ if (fs.existsSync(logFile) && !fs.existsSync(path.join(global.paths.data, 'lockf
     fs.renameSync(logFile, path.join(global.paths.data, `${logFileName}.${mtime.toISOString().split('T')[0]}.log`));
   };
 };
-logger.log("Starting Bsky Desktop");
+logger.log(`Starting Bsky Desktop v${packageJson.version} on ${os.platform()} ${os.arch()}`);
 
 // Create data directory if it does not exist:
 if (!fs.existsSync(global.paths.data)) {
@@ -302,7 +310,7 @@ function showAboutWindow() {
     //open_devtools: process.env.NODE_ENV !== 'production',
     use_version_info: [
       ['Application Version', `${global.appInfo.version}`],
-      ['Contributors', packageJson.contributors.map((contributor) => contributor.name).join(', ')],
+      ['Contributors', contributors.map((contributor) => contributor.name).join(', ')],
     ],
     license: `MIT, GPL-2.0, GPL-3.0, ${global.appInfo.license}`,
   });
@@ -310,7 +318,7 @@ function showAboutWindow() {
 
 function createTray() {
   logger.log("Creating Tray");
-  const tray = new Tray(path.join(global.paths.app, 'ui', 'images', 'logo.png'));
+  const tray = new Tray(path.join(global.paths.app, 'ui', 'images', 'icons', '32x32.png'));
   tray.setToolTip('Bsky Desktop');
   tray.setContextMenu(Menu.buildFromTemplate([
     { label: global.appInfo.name, enabled: false },
@@ -550,13 +558,13 @@ app.whenReady().then(() => {
             const cssContent = fs.readFileSync(cssFile, 'utf-8');
             const result = await userStyles.parseCSS(cssContent);
 
-            logger.info(`Loaded userstyle: ${result.metadata.name}`);
+            logger.info(`Loading userstyle: ${result.metadata.name}`);
 
             // Compile the userstyle
             const compiled = await userStyles.compileStyle(result.css, result.metadata);
 
             // Check if the site 'bsky.app' is defined
-            if (compiled.sites && compiled.sites['bsky.app']) {
+            if (compiled.sites?.['bsky.app']) {
               // Apply the userstyle to the PageView
               await PageView.webContents.insertCSS(compiled.sites['bsky.app']);
 

src/app/utils/auto-update.js

@@ -80,7 +80,7 @@ function asarUpdate() {
 
 function checkForUpdates() {
     // Current system information
-    logger.log('Current system information:', sys.platform, sys.getVersion());
+    logger.log('Current system information:', sys.platform, sys.getVersion(), sys.arch);
 
     // Check if the current system is Windows
     if (sys.isWin()) {

src/ui/images/loading.svg

@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin:auto;display:block;" width="150px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-        <circle cx="50" cy="50" r="30" stroke="#2B87D3" stroke-width="10" fill="none"></circle>
+  <circle cx="50" cy="50" r="30" stroke="#2B87D3" stroke-width="10" fill="none"></circle>
-        <circle cx="50" cy="50" r="30" stroke="#0C396A" stroke-width="8" stroke-linecap="round" fill="none">
+  <circle cx="50" cy="50" r="30" stroke="#0C396A" stroke-width="8" stroke-linecap="round" fill="none">
-          <animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 50 50;180 50 50;720 50 50" keyTimes="0;0.5;1"></animateTransform>
+    <animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 50 50;180 50 50;720 50 50" keyTimes="0;0.5;1"></animateTransform>
-          <animate attributeName="stroke-dasharray" repeatCount="indefinite" dur="1s" values="18.84955592153876 169.64600329384882;94.2477796076938 94.24777960769377;18.84955592153876 169.64600329384882" keyTimes="0;0.5;1"></animate>
+    <animate attributeName="stroke-dasharray" repeatCount="indefinite" dur="1s" values="18.84955592153876 169.64600329384882;94.2477796076938 94.24777960769377;18.84955592153876 169.64600329384882" keyTimes="0;0.5;1"></animate>
-        </circle>
+  </circle>
-      </svg>
+</svg>

src/ui/images/spinner.svg

@@ -0,0 +1,7 @@
+<svg class="spinner" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" width="60" height="60" style="box-sizing: border-box; padding: 3px; overflow: visible; color: #0071c2;">
+  <circle cx="60" cy="60" r="50" fill="none" stroke="currentColor" stroke-width="6" stroke-linecap="round" style="transform-origin: center;">
+    <animateTransform attributeName="transform" type="rotate" values="-90;810" keyTimes="0;1" dur="2s" repeatCount="indefinite"></animateTransform>
+    <animate attributeName="stroke-dashoffset" values="0%;0%;-157.080%" calcMode="spline" keySplines="0.61, 1, 0.88, 1; 0.12, 0, 0.39, 0" keyTimes="0;0.5;1" dur="2s" repeatCount="indefinite"></animate>
+    <animate attributeName="stroke-dasharray" values="0% 314.159%;157.080% 157.080%;0% 314.159%" calcMode="spline" keySplines="0.61, 1, 0.88, 1; 0.12, 0, 0.39, 0" keyTimes="0;0.5;1" dur="2s" repeatCount="indefinite"></animate>
+  </circle>
+</svg>