Move to pnpm to fix builds

* chore: Major refactoring

Still needs a massive go-over because there shouldn't be anything referencing tauri in any of the workspaces except the original one. Process manager has been refactored as an example

Signed-off-by: quexeky <git@quexeky.dev>

* fix: Remote tauri dependency from process

Signed-off-by: quexeky <git@quexeky.dev>

* refactor: Improvements to src-tauri

Signed-off-by: quexeky <git@quexeky.dev>

* refactor: Builds, but some logic still left to move back

Signed-off-by: quexeky <git@quexeky.dev>

* refactor: Finish refactor

Signed-off-by: quexeky <git@quexeky.dev>

* chore: Run cargo clippy && cargo fmt

Signed-off-by: quexeky <git@quexeky.dev>

* refactor: Move everything into src-tauri

Signed-off-by: quexeky <git@quexeky.dev>

---------

Signed-off-by: quexeky <git@quexeky.dev>

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: 'publish'
+name: "publish"
 
 on:
   workflow_dispatch: {}
@@ -18,16 +18,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+          - platform: "macos-14" # for Arm based macs (M1 and above).
-            args: '--target aarch64-apple-darwin'
+            args: "--target aarch64-apple-darwin"
-          - platform: 'macos-latest' # for Intel based macs.
+          - platform: "macos-14" # for Intel based macs.
-            args: '--target x86_64-apple-darwin'
+            args: "--target x86_64-apple-darwin"
-          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
+          - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
-            args: ''
+            args: ""
-          - platform: 'ubuntu-22.04-arm'
+          - platform: "ubuntu-22.04-arm"
-            args: '--target aarch64-unknown-linux-gnu'
+            args: "--target aarch64-unknown-linux-gnu"
-          - platform: 'windows-latest'
+          - platform: "windows-latest"
-            args: ''
+            args: ""
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -36,16 +36,29 @@ jobs:
           submodules: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+          run_install: false
+
       - name: setup node
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
+          cache: pnpm
+
 
       - name: install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
         with:
           # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+          targets: ${{ matrix.platform == 'macos-14' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
 
       - name: install dependencies (ubuntu only)
         if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above.
@@ -54,9 +67,8 @@ jobs:
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils
         # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
 
-
       - name: Import Apple Developer Certificate
-        if: matrix.platform == 'macos-latest'
+        if: matrix.platform == 'macos-14'
         env:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -68,17 +80,29 @@ jobs:
           security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -t 3600 -u build.keychain
 
-          curl https://droposs.org/drop.crt --output drop.pem
+
-          sudo security authorizationdb write com.apple.trust-settings.user allow
+          echo "Created keychain"
-          security add-trusted-cert -r trustRoot -k build.keychain -p codeSign -u -1 drop.pem
+
-          sudo security authorizationdb remove com.apple.trust-settings.user
+          curl https://droposs.org/drop.der --output drop.der
+
+          # swiftc libs/appletrust/add-certificate.swift
+          # ./add-certificate drop.der
+          # rm add-certificate
+
+          # echo "Added certificate to keychain using swift util"
+
+          ## Script is equivalent to:
+          sudo security authorizationdb write com.apple.trust-settings.admin allow
+          sudo security add-trusted-cert -d -r trustRoot -k build.keychain -p codeSign -u -1 drop.der
+          sudo security authorizationdb remove com.apple.trust-settings.admin
 
           security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+          echo "Imported certificate"
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
           security find-identity -v -p codesigning build.keychain
 
       - name: Verify Certificate
-        if: matrix.platform == 'macos-latest'
+        if: matrix.platform == 'macos-14'
         run: |
           CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Drop OSS")
           CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
@@ -86,7 +110,7 @@ jobs:
           echo "Certificate imported. Using identity: $CERT_ID"
 
       - name: install frontend dependencies
-        run: yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: pnpm install # change this to npm, pnpm or bun depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
@@ -97,8 +121,8 @@ jobs:
           NO_STRIP: true
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: 'Auto-release v__VERSION__'
+          releaseName: "Auto-release v__VERSION__"
-          releaseBody: 'See the assets to download this version and install. This release was created automatically.'
+          releaseBody: "See the assets to download this version and install. This release was created automatically."
           releaseDraft: false
           prerelease: true
           args: ${{ matrix.args }}

.gitlab-ci-local/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

Cargo.toml

@@ -1,14 +0,0 @@
-[workspace]
-members = [
-    "client",
-    "database",
-    "src-tauri",
-    "process",
-    "remote",
-    "utils",
-    "cloud_saves",
-    "download_manager",
-    "games",
-]
-
-resolver = "3"

build.mjs

@@ -40,10 +40,10 @@ for (const view of views) {
   process.chdir(`./${view}`);
 
   loggerChild.info(`Install deps for "${view}"`);
-  await spawn("yarn");
+  await spawn("pnpm install");
 
   loggerChild.info(`Building "${view}"`);
-  await spawn("yarn build", {
+  await spawn("pnpm run build", {
     env: { ...process.env, NUXT_APP_BASE_URL: `/${view}/` },
   });
 

libs/appletrust/add-certificate.swift

@@ -0,0 +1,72 @@
+import Foundation
+import Security
+
+enum SecurityError: Error {
+    case generalError
+}
+
+func deleteCertificateFromKeyChain(_ certificateLabel: String) -> Bool {
+    let delQuery: [NSString: Any] = [
+        kSecClass: kSecClassCertificate,
+        kSecAttrLabel: certificateLabel,
+    ]
+    let delStatus: OSStatus = SecItemDelete(delQuery as CFDictionary)
+
+    return delStatus == errSecSuccess
+}
+
+func saveCertificateToKeyChain(_ certificate: SecCertificate, certificateLabel: String) throws {
+    SecKeychainSetPreferenceDomain(SecPreferencesDomain.system)
+    deleteCertificateFromKeyChain(certificateLabel)
+
+    let setQuery: [NSString: AnyObject] = [
+        kSecClass: kSecClassCertificate,
+        kSecValueRef: certificate,
+        kSecAttrLabel: certificateLabel as AnyObject,
+        kSecAttrAccessible: kSecAttrAccessibleWhenUnlocked,
+        kSecAttrCanSign: true as AnyObject,
+    ]
+    let addStatus: OSStatus = SecItemAdd(setQuery as CFDictionary, nil)
+
+    guard addStatus == errSecSuccess else {
+        throw SecurityError.generalError
+    }
+
+    var status = SecTrustSettingsSetTrustSettings(certificate, SecTrustSettingsDomain.admin, nil)
+}
+
+func getCertificateFromString(stringData: String) throws -> SecCertificate {
+    if let data = NSData(base64Encoded: stringData, options: NSData.Base64DecodingOptions.ignoreUnknownCharacters) {
+        if let certificate = SecCertificateCreateWithData(kCFAllocatorDefault, data) {
+            return certificate
+        }
+    }
+    throw SecurityError.generalError
+}
+
+if CommandLine.arguments.count != 2 {
+    print("Usage: \(CommandLine.arguments[0]) [cert.file]")
+    print("Usage: \(CommandLine.arguments[0]) --version")
+    exit(1)
+}
+
+if (CommandLine.arguments[1] == "--version") {
+    let version = "dev"
+    print(version)
+    exit(0)
+} else {
+    let fileURL = URL(fileURLWithPath: CommandLine.arguments[1])
+    do {
+        let certData = try Data(contentsOf: fileURL)
+        let certificate = SecCertificateCreateWithData(nil, certData as CFData)
+        if certificate != nil {
+            try? saveCertificateToKeyChain(certificate!, certificateLabel: "DropOSS")
+            exit(0)
+        } else {
+            print("ERROR: Unknown error while reading the \(CommandLine.arguments[1]) file.")
+        }
+    } catch {
+        print("ERROR: Unexpected error while reading the \(CommandLine.arguments[1]) file. \(error)")
+    }
+}
+exit(1)

main/nuxt.config.ts

@@ -12,6 +12,7 @@ export default defineNuxtConfig({
   css: ["~/assets/main.scss"],
 
   ssr: false,
+  devtools: false,
 
   extends: [["../libs/drop-base"]],
 

main/package.json

@@ -1,7 +1,7 @@
 {
   "name": "view",
   "private": true,
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "scripts": {
     "build": "nuxt generate",
@@ -14,6 +14,8 @@
     "@heroicons/vue": "^2.1.5",
     "@nuxtjs/tailwindcss": "^6.12.2",
     "@tauri-apps/api": "^2.7.0",
+    "@tauri-apps/plugin-os": "^2.3.2",
+    "@tauri-apps/plugin-shell": "^2.3.3",
     "koa": "^2.16.1",
     "markdown-it": "^14.1.0",
     "micromark": "^4.0.1",
@@ -32,6 +34,5 @@
     "tailwindcss": "^3.4.13",
     "typescript": "^5.8.3",
     "vue-tsc": "^2.2.10"
-  },
+  }
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

main/pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - esbuild

nvidia-prop-dev.sh

@@ -1 +1 @@
-WEBKIT_DISABLE_DMABUF_RENDERER=1 yarn tauri dev
+WEBKIT_DISABLE_DMABUF_RENDERER=1 pnpm tauri dev

optimize-appimage.sh

@@ -3,7 +3,7 @@
 ARCH=$(uname -m)
 
 # build tauri apps
-# NO_STRIP=true yarn tauri build -- --verbose
+# NO_STRIP=true pnpm tauri build -- --verbose
 
 # unpack appimage
 APPIMAGE=$(ls ./src-tauri/target/release/bundle/appimage/*.AppImage)

package.json

@@ -7,17 +7,11 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "^2.7.0",
-    "@tauri-apps/plugin-deep-link": "^2.4.1",
-    "@tauri-apps/plugin-dialog": "^2.3.2",
-    "@tauri-apps/plugin-opener": "^2.4.0",
-    "@tauri-apps/plugin-os": "^2.3.0",
-    "@tauri-apps/plugin-shell": "^2.3.0",
     "pino": "^9.7.0",
     "pino-pretty": "^13.1.1",
     "tauri": "^0.15.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.7.1"
+    "@tauri-apps/cli": "^2.9.4"
   }
 }

pnpm-workspace.yaml

@@ -0,0 +1,21 @@
+onlyBuiltDependencies:
+  - sharp
+
+overrides:
+  cross-spawn@<6.0.6: '>=6.0.6'
+  cross-spawn@>=7.0.0 <7.0.5: '>=7.0.5'
+  form-data@<2.5.4: '>=2.5.4'
+  got@<11.8.5: '>=11.8.5'
+  http-cache-semantics@<4.1.1: '>=4.1.1'
+  lodash@<4.17.21: '>=4.17.21'
+  lodash@>=4.0.0 <4.17.21: '>=4.17.21'
+  minimist@>=1.0.0 <1.2.6: '>=1.2.6'
+  nth-check@<2.0.1: '>=2.0.1'
+  semver-regex@<3.1.3: '>=3.1.3'
+  semver-regex@<3.1.4: '>=3.1.4'
+  semver@>=7.0.0 <7.5.2: '>=7.5.2'
+  sharp@<0.30.5: '>=0.30.5'
+  sharp@<0.32.6: '>=0.32.6'
+  tmp@<=0.2.3: '>=0.2.4'
+  tough-cookie@<4.1.3: '>=4.1.3'
+  trim-newlines@<3.0.1: '>=3.0.1'

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drop-app"
-version = "0.3.3"
+version = "0.3.4"
 description = "The client application for the open-source, self-hosted game distribution platform Drop"
 authors = ["Drop OSS"]
 edition = "2024"
@@ -80,20 +80,20 @@ bytes = "1.10.1"
 
 
 # Workspaces
-client = { version = "0.1.0", path = "../client" }
+client = { version = "0.1.0", path = "./client" }
-database = { path = "../database" }
+database = { path = "./database" }
-process = { path = "../process" }
+process = { path = "./process" }
-remote = { version = "0.1.0", path = "../remote" }
+remote = { version = "0.1.0", path = "./remote" }
-utils = { path = "../utils" }
+utils = { path = "./utils" }
-games = { version = "0.1.0", path = "../games" }
+games = { version = "0.1.0", path = "./games" }
-download_manager = { version = "0.1.0", path = "../download_manager" }
+download_manager = { version = "0.1.0", path = "./download_manager" }
 
 [dependencies.dynfmt]
 version = "0.1.5"
 features = ["curly"]
 
 [dependencies.tauri]
-version = "2.7.0"
+version = "2.9.3"
 features = ["protocol-asset", "tray-icon"]
 
 [dependencies.tokio]
@@ -137,3 +137,18 @@ features = ["derive", "rc"]
 lto = true
 codegen-units = 1
 panic = 'abort'
+
+
+[workspace]
+members = [
+    "client",
+    "database",
+    "process",
+    "remote",
+    "utils",
+    "cloud_saves",
+    "download_manager",
+    "games",
+]
+
+resolver = "3"

src-tauri/cloud_saves/src/backup_manager.rs

@@ -27,7 +27,7 @@ impl BackupManager<'_> {
             current_platform: Platform::Windows,
 
             #[cfg(target_os = "macos")]
-            current_platform: Platform::MacOs,
+            current_platform: Platform::macOS,
 
             #[cfg(target_os = "linux")]
             current_platform: Platform::Linux,
@@ -43,7 +43,7 @@ impl BackupManager<'_> {
                     &LinuxBackupManager {} as &(dyn BackupHandler + Sync + Send),
                 ),
                 (
-                    (Platform::MacOs, Platform::MacOs),
+                    (Platform::macOS, Platform::macOS),
                     &MacBackupManager {} as &(dyn BackupHandler + Sync + Send),
                 ),
             ]),

src-tauri/database/src/platform.rs

@@ -4,20 +4,20 @@ use serde::{Deserialize, Serialize};
 pub enum Platform {
     Windows,
     Linux,
-    MacOs,
+    macOS,
 }
 
 impl Platform {
     #[cfg(target_os = "windows")]
     pub const HOST: Platform = Self::Windows;
     #[cfg(target_os = "macos")]
-    pub const HOST: Platform = Self::MacOs;
+    pub const HOST: Platform = Self::macOS;
     #[cfg(target_os = "linux")]
     pub const HOST: Platform = Self::Linux;
 
     pub fn is_case_sensitive(&self) -> bool {
         match self {
-            Self::Windows | Self::MacOs => false,
+            Self::Windows | Self::macOS => false,
             Self::Linux => true,
         }
     }
@@ -28,7 +28,7 @@ impl From<&str> for Platform {
         match value.to_lowercase().trim() {
             "windows" => Self::Windows,
             "linux" => Self::Linux,
-            "mac" | "macos" => Self::MacOs,
+            "mac" | "macos" => Self::macOS,
             _ => unimplemented!(),
         }
     }
@@ -39,7 +39,7 @@ impl From<whoami::Platform> for Platform {
         match value {
             whoami::Platform::Windows => Platform::Windows,
             whoami::Platform::Linux => Platform::Linux,
-            whoami::Platform::MacOS => Platform::MacOs,
+            whoami::Platform::MacOS => Platform::macOS,
             platform => unimplemented!("Playform {} is not supported", platform),
         }
     }

src-tauri/games/src/downloads/download_logic.rs

@@ -39,7 +39,8 @@ impl DropWriter<File> {
             .write(true)
             .create(true)
             .truncate(false)
-            .open(&path)?;
+            .open(&path)
+            .inspect_err(|_v| warn!("failed to open {}", path.display()))?;
         Ok(Self {
             destination: BufWriter::with_capacity(1024 * 1024, destination),
             hasher: Context::new(),
@@ -122,7 +123,7 @@ impl<'a> DropDownloadPipeline<'a, Response, File> {
                     .source
                     .read(&mut copy_buffer[0..size])
                     .inspect_err(|_| {
-                        info!("got error from {}", drop.filename);
+                        warn!("got error from {}", drop.filename);
                     })?;
                 remaining -= size;
                 last_bump += size;
@@ -272,7 +273,12 @@ pub fn download_game_bucket(
     #[cfg(unix)]
     {
         for drop in bucket.drops.iter() {
-            let permissions = Permissions::from_mode(drop.permissions);
+            let permission = if drop.permissions == 0 {
+                0o744
+            } else {
+                drop.permissions
+            };
+            let permissions = Permissions::from_mode(permission);
             set_permissions(drop.path.clone(), permissions)
                 .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
         }

src-tauri/process/src/process_manager.rs

@@ -54,7 +54,7 @@ impl ProcessManager<'_> {
             current_platform: Platform::Windows,
 
             #[cfg(target_os = "macos")]
-            current_platform: Platform::MacOs,
+            current_platform: Platform::macOS,
 
             #[cfg(target_os = "linux")]
             current_platform: Platform::Linux,
@@ -72,7 +72,7 @@ impl ProcessManager<'_> {
                     &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
                 (
-                    (Platform::MacOs, Platform::MacOs),
+                    (Platform::macOS, Platform::macOS),
                     &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
                 (

src-tauri/tauri.conf.json

@@ -1,12 +1,12 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Drop Desktop Client",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "identifier": "dev.drop.client",
   "build": {
-    "beforeDevCommand": "yarn --cwd main dev --port 1432",
+    "beforeDevCommand": "pnpm run -C main dev --port 1432",
     "devUrl": "http://localhost:1432/",
-    "beforeBuildCommand": "yarn build",
+    "beforeBuildCommand": "pnpm build",
     "frontendDist": "../.output"
   },
   "app": {