merge from upstream

.github/workflows/meta.yml

@@ -7,7 +7,7 @@ on:
     workflow_dispatch:
 
 permissions:
-  contents: write
+    contents: write
 
 jobs:
     update:
@@ -26,17 +26,13 @@ jobs:
               run: pnpm i
 
             - name: Update metainfo
-              run: pnpm updateMeta
+              run: pnpm generateMeta
 
             - name: Commit and merge in changes
               run: |
                   git config user.name "github-actions[bot]"
                   git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-                  gh release upload "${{ github.event.release.tag_name }}" meta/dev.vencord.Vesktop.metainfo.xml
-
-                  git add meta/dev.vencord.Vesktop.metainfo.xml
-                  git commit -m "metainfo: add entry for ${{ github.event.release.tag_name }}"
-                  git push origin HEAD:main
+                  gh release upload "${{ github.event.release.tag_name }}" dist/dev.vencord.Vesktop.metainfo.xml
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -17,7 +17,7 @@ Vesktop is a custom Discord desktop app
 
 ## Installing
 
-Visit https://vesktop.vencord.dev/install
+Visit https://vesktop.dev/install
 
 ## Building from Source
 
@@ -47,3 +47,14 @@ pnpm package --linux pacman
 # Or package to a directory only
 pnpm package:dir
 ```
+
+## Building LibVesktop from Source
+
+This is a small C++ helper library Vesktop uses on Linux to emit D-Bus events. By default, prebuilt binaries for x64 and arm64 are used.
+
+If you want to build it from source:
+1. Install build dependencies:
+    - Debian/Ubuntu: `apt install build-essential python3 curl pkg-config libglib2.0-dev`
+    - Fedora: `dnf install @c-development @development-tools python3 curl pkgconf-pkg-config glib2-devel`
+2. Run `pnpm buildLibVesktop`
+3. From now on, building Vesktop will use your own build

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vesktop",
-    "version": "1.5.8",
+    "version": "1.6.1",
     "private": true,
     "description": "Vesktop is a custom Discord desktop app",
     "keywords": [],
@@ -11,6 +11,7 @@
     "scripts": {
         "build": "tsx scripts/build/build.mts",
         "build:dev": "pnpm build --dev",
+        "buildLibVesktop": "pnpm -C packages/libvesktop install && pnpm -C packages/libvesktop run build",
         "package": "pnpm build && electron-builder",
         "package:dir": "pnpm build && electron-builder --dir",
         "lint": "eslint",
@@ -21,7 +22,7 @@
         "test": "pnpm lint && pnpm testTypes",
         "testTypes": "tsc --noEmit",
         "watch": "pnpm build --watch",
-        "updateMeta": "tsx scripts/utils/updateMeta.mts",
+        "generateMeta": "tsx scripts/utils/generateMeta.mts",
         "updateArrpcDB": "node ./node_modules/arrpc/update_db.js",
         "postinstall": "pnpm updateArrpcDB"
     },
@@ -35,28 +36,29 @@
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^5.1.0",
-        "@types/node": "^24.0.10",
-        "@types/react": "18.3.1",
-        "@vencord/types": "^1.11.5",
-        "dotenv": "^16.5.0",
-        "electron": "^37.2.0",
+        "@stylistic/eslint-plugin": "^5.5.0",
+        "@types/node": "^24.9.1",
+        "@types/react": "19.2.1",
+        "@vencord/types": "^1.13.2",
+        "dotenv": "^17.2.3",
+        "electron": "^39.0.0",
         "electron-builder": "^26.0.12",
-        "esbuild": "^0.25.5",
-        "eslint": "^9.30.1",
+        "esbuild": "^0.25.11",
+        "eslint": "^9.38.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.5.1",
+        "eslint-plugin-prettier": "^5.5.4",
         "eslint-plugin-simple-header": "^1.2.2",
         "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
+        "eslint-plugin-unused-imports": "^4.3.0",
+        "libvesktop": "link:packages/libvesktop",
         "prettier": "^3.6.2",
         "source-map-support": "^0.5.21",
-        "tsx": "^4.20.3",
-        "type-fest": "^4.41.0",
-        "typescript": "^5.8.3",
-        "typescript-eslint": "^8.35.1",
-        "xml-formatter": "^3.6.6"
+        "tsx": "^4.20.6",
+        "type-fest": "^5.1.0",
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.46.2",
+        "xml-formatter": "^3.6.7"
     },
     "packageManager": "[email protected]",
     "engines": {
@@ -66,6 +68,7 @@
     "build": {
         "appId": "dev.vencord.vesktop",
         "productName": "Vesktop",
+        "executableName": "vesktop",
         "files": [
             "!*",
             "!node_modules",
@@ -80,9 +83,10 @@
                 "discord"
             ]
         },
-        "beforePack": "scripts/build/sandboxFix.js",
+        "beforePack": "scripts/build/beforePack.mjs",
+        "afterPack": "scripts/build/afterPack.mjs",
         "linux": {
-            "icon": "build/icon.icns",
+            "icon": "build/icon.svg",
             "category": "Network",
             "maintainer": "[email protected]",
             "target": [
@@ -142,7 +146,8 @@
                 "NSMicrophoneUsageDescription": "This app needs access to the microphone",
                 "NSCameraUsageDescription": "This app needs access to the camera",
                 "com.apple.security.device.audio-input": true,
-                "com.apple.security.device.camera": true
+                "com.apple.security.device.camera": true,
+                "CFBundleIconName": "Icon"
             },
             "notarize": true
         },
@@ -172,6 +177,7 @@
             "oneClick": false
         },
         "win": {
+            "icon": "build/icon.ico",
             "target": [
                 {
                     "target": "nsis",

packages/libvesktop/.gitignore

@@ -0,0 +1 @@
+build

packages/libvesktop/Dockerfile

@@ -0,0 +1,19 @@
+# Dockerfile for building both x64 and arm64 on an old distro for maximum compatibility.
+
+#  ubuntu20 is dead but debian11 is still supported for now
+FROM debian:11
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN dpkg --add-architecture arm64
+
+RUN apt-get update && apt-get install -y \
+    build-essential python3 curl pkg-config \
+    g++-aarch64-linux-gnu libglib2.0-dev:amd64 libglib2.0-dev:arm64 \
+    ca-certificates \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+ && apt-get update && apt-get install -y nodejs \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /src

packages/libvesktop/binding.gyp

@@ -0,0 +1,19 @@
+{
+  "targets": [
+    {
+      "target_name": "libvesktop",
+      "sources": [ "src/libvesktop.cc" ],
+      "include_dirs": [
+        "<!@(node -p \"require('node-addon-api').include\")"
+      ],
+      "cflags_cc": [
+        "<!(pkg-config --cflags glib-2.0 gio-2.0)",
+        "-O3"
+      ],
+      "libraries": [
+        "<!@(pkg-config  --libs-only-l --libs-only-other glib-2.0 gio-2.0)"
+      ],
+      "cflags_cc!": ["-fno-exceptions"],
+    }
+  ]
+}

packages/libvesktop/build.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+docker build -t libvesktop-builder -f Dockerfile .
+
+docker run --rm -v "$PWD":/src -w /src libvesktop-builder bash -c "
+  set -e
+
+  echo '=== Building x64 ==='
+  npx node-gyp rebuild --arch=x64
+  mv build/Release/vesktop.node prebuilds/vesktop-x64.node
+
+  echo '=== Building arm64 ==='
+  export CXX=aarch64-linux-gnu-g++
+  npx node-gyp rebuild --arch=arm64
+  mv build/Release/vesktop.node prebuilds/vesktop-arm64.node
+"

packages/libvesktop/index.d.ts

@@ -0,0 +1,3 @@
+export function getAccentColor(): number | null;
+export function requestBackground(autoStart: boolean, commandLine: string[]): boolean;
+export function updateUnityLauncherCount(count: number): boolean;

packages/libvesktop/package.json

@@ -0,0 +1,14 @@
+{
+    "name": "libvesktop",
+    "main": "build/Release/vesktop.node",
+    "types": "index.d.ts",
+    "devDependencies": {
+        "node-addon-api": "^8.5.0",
+        "node-gyp": "^11.4.2"
+    },
+    "scripts": {
+        "build": "node-gyp configure build",
+        "clean": "node-gyp clean",
+        "test": "npm run build && node test.js"
+    }
+}