diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1493398..34d41f8 100644 --- a/.github/workflows/release.yml +++ b/.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-14" # for Arm based macs (M1 and above). - args: "--target aarch64-apple-darwin" - - platform: "macos-14" # for Intel based macs. - args: "--target x86_64-apple-darwin" - - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. - args: "" - - platform: "ubuntu-22.04-arm" - args: "--target aarch64-unknown-linux-gnu" - - platform: "windows-latest" - args: "" + - platform: 'macos-latest' # for Arm based macs (M1 and above). + args: '--target aarch64-apple-darwin' + - platform: 'macos-latest' # for Intel based macs. + args: '--target x86_64-apple-darwin' + - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04. + args: '' + - platform: 'ubuntu-22.04-arm' + args: '--target aarch64-unknown-linux-gnu' + - platform: 'windows-latest' + args: '' runs-on: ${{ matrix.platform }} steps: @@ -36,29 +36,16 @@ 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-14' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - - - name: Rust cache - uses: swatinem/rust-cache@v2 - with: - workspaces: './src-tauri -> target' + targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - 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. @@ -67,8 +54,9 @@ 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-14' + if: matrix.platform == 'macos-latest' env: APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} @@ -79,30 +67,18 @@ jobs: security default-keychain -s build.keychain security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain security set-keychain-settings -t 3600 -u build.keychain - - - echo "Created keychain" - - 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 + + curl https://droposs.org/drop.crt --output drop.pem + sudo security authorizationdb write com.apple.trust-settings.user allow + security add-trusted-cert -r trustRoot -k build.keychain -p codeSign -u -1 drop.pem + sudo security authorizationdb remove com.apple.trust-settings.user 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-14' + if: matrix.platform == 'macos-latest' run: | CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Drop OSS") CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}') @@ -110,7 +86,7 @@ jobs: echo "Certificate imported. Using identity: $CERT_ID" - name: install frontend dependencies - run: pnpm install # change this to npm, pnpm or bun depending on which one you use. + run: yarn install # change this to npm, pnpm or bun depending on which one you use. - uses: tauri-apps/tauri-action@v0 env: @@ -121,8 +97,8 @@ jobs: NO_STRIP: true with: tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. - releaseName: "Auto-release v__VERSION__" - releaseBody: "See the assets to download this version and install. This release was created automatically." + releaseName: 'Auto-release v__VERSION__' + releaseBody: 'See the assets to download this version and install. This release was created automatically.' releaseDraft: false prerelease: true - args: ${{ matrix.args }} + args: ${{ matrix.args }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index b2300d2..c60be72 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,4 @@ src-tauri/flamegraph.svg src-tauri/perf* /*.AppImage -/squashfs-root - -/target/ +/squashfs-root \ No newline at end of file diff --git a/.gitlab-ci-local/.gitignore b/.gitlab-ci-local/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/.gitlab-ci-local/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/README.md b/README.md index 662712b..f66cea8 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,29 @@ -# Drop Desktop Client +# Drop App -The Drop Desktop Client is the companion app for [Drop](https://github.com/Drop-OSS/drop). It is the official & intended way to download and play games on your Drop server. +Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI. -## Internals +## Running +Before setting up the drop app, be sure that you have a server set up. +The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart) -It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI. +## Current features +Currently supported are the following features: +- Signin (with custom server) +- Database registering & recovery +- Dynamic library fetching from server +- Installing & uninstalling games +- Download progress monitoring +- Launching / playing games ## Development -Before setting up a development environemnt, be sure that you have a server set up. The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart). -Then, install dependencies with `yarn`. This'll install the custom builder's dependencies. Then, check everything works properly with `yarn tauri build`. +Install dependencies with `yarn` -Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh` +Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh` To manually specify the logging level, add the environment variable `RUST_LOG=[debug, info, warn, error]` to `yarn tauri dev`: e.g. `RUST_LOG=debug yarn tauri dev` ## Contributing -Check out the contributing guide on our Developer Docs: [Drop Developer Docs - Contributing](https://developer.droposs.org/contributing). +Check the original [Drop repo](https://github.com/Drop-OSS/drop/blob/main/CONTRIBUTING.md) for contributing guidelines. \ No newline at end of file diff --git a/build.mjs b/build.mjs index 68d5a18..c4846f1 100644 --- a/build.mjs +++ b/build.mjs @@ -21,13 +21,6 @@ async function spawn(exec, opts) { }); } -const expectedLibs = ["drop-base/package.json"]; - -for (const lib of expectedLibs) { - const path = `./libs/${lib}`; - if (!fs.existsSync(path)) throw `Missing "${expectedLibs}". Run "git submodule update --init --recursive"`; -} - const views = fs.readdirSync(".").filter((view) => { const expectedPath = `./${view}/package.json`; return fs.existsSync(expectedPath); @@ -40,10 +33,10 @@ for (const view of views) { process.chdir(`./${view}`); loggerChild.info(`Install deps for "${view}"`); - await spawn("pnpm install"); + await spawn("yarn"); loggerChild.info(`Building "${view}"`); - await spawn("pnpm run build", { + await spawn("yarn build", { env: { ...process.env, NUXT_APP_BASE_URL: `/${view}/` }, }); diff --git a/libs/appletrust/add-certificate.swift b/libs/appletrust/add-certificate.swift deleted file mode 100644 index 8ed6601..0000000 --- a/libs/appletrust/add-certificate.swift +++ /dev/null @@ -1,72 +0,0 @@ -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) \ No newline at end of file diff --git a/main/app.vue b/main/app.vue index 5ae90e1..7d4165f 100644 --- a/main/app.vue +++ b/main/app.vue @@ -1,5 +1,5 @@ - - diff --git a/main/components/LibrarySearch.vue b/main/components/LibrarySearch.vue index 20aa055..be9129b 100644 --- a/main/components/LibrarySearch.vue +++ b/main/components/LibrarySearch.vue @@ -1,119 +1,55 @@ diff --git a/main/components/OfflineHeaderWidget.vue b/main/components/OfflineHeaderWidget.vue index a22320e..a17ec5d 100644 --- a/main/components/OfflineHeaderWidget.vue +++ b/main/components/OfflineHeaderWidget.vue @@ -1,15 +1,9 @@ diff --git a/main/composables/downloads.ts b/main/composables/downloads.ts index 741b1f1..d75c46f 100644 --- a/main/composables/downloads.ts +++ b/main/composables/downloads.ts @@ -32,19 +32,3 @@ listen("update_stats", (event) => { const stats = useStatsState(); stats.value = event.payload as StatsState; }); - -export const useDownloadHistory = () => useState>('history', () => []); - -export function formatKilobytes(bytes: number): string { - const units = ["K", "M", "G", "T", "P"]; - let value = bytes; - let unitIndex = 0; - const scalar = 1000; - - while (value >= scalar && unitIndex < units.length - 1) { - value /= scalar; - unitIndex++; - } - - return `${value.toFixed(1)} ${units[unitIndex]}`; -} \ No newline at end of file diff --git a/main/composables/game.ts b/main/composables/game.ts index 9de4f33..71319bd 100644 --- a/main/composables/game.ts +++ b/main/composables/game.ts @@ -43,18 +43,19 @@ export const useGame = async (gameId: string) => { gameStatusRegistry[gameId] = ref(parseStatus(data.status)); listen(`update_game/${gameId}`, (event) => { + console.log(event); const payload: { status: SerializedGameStatus; version?: GameVersion; } = event.payload as any; gameStatusRegistry[gameId].value = parseStatus(payload.status); - + /** * I am not super happy about this. - * + * * This will mean that we will still have a version assigned if we have a game installed then uninstall it. * It is necessary because a flag to check if we should overwrite seems excessive, and this function gets called - * on transient state updates. + * on transient state updates. */ if (payload.version) { gameRegistry[gameId].version = payload.version; @@ -71,23 +72,3 @@ export const useGame = async (gameId: string) => { export type FrontendGameConfiguration = { launchString: string; }; - -export type LaunchResult = - | { result: "Success" } - | { result: "InstallRequired"; data: [string, string] }; - -export type VersionOption = { - versionId: string; - displayName?: string; - versionPath: string; - platform: string; - size: number; - requiredContent: Array<{ - gameId: string; - versionId: string; - name: string; - iconObjectId: string; - shortDescription: string; - size: number; - }>; -}; diff --git a/main/composables/use-object.ts b/main/composables/use-object.ts index 642fd66..c9c15a0 100644 --- a/main/composables/use-object.ts +++ b/main/composables/use-object.ts @@ -1,5 +1,5 @@ import { convertFileSrc } from "@tauri-apps/api/core"; -export const useObject = (id: string) => { +export const useObject = async (id: string) => { return convertFileSrc(id, "object"); }; diff --git a/main/nuxt.config.ts b/main/nuxt.config.ts index bbc3b40..8ee30e8 100644 --- a/main/nuxt.config.ts +++ b/main/nuxt.config.ts @@ -12,7 +12,6 @@ export default defineNuxtConfig({ css: ["~/assets/main.scss"], ssr: false, - devtools: false, extends: [["../libs/drop-base"]], diff --git a/main/package.json b/main/package.json index b5780dc..78f9361 100644 --- a/main/package.json +++ b/main/package.json @@ -1,7 +1,7 @@ { "name": "view", "private": true, - "version": "0.3.4", + "version": "0.3.3", "type": "module", "scripts": { "build": "nuxt generate", @@ -13,9 +13,7 @@ "@headlessui/vue": "^1.7.23", "@heroicons/vue": "^2.1.5", "@nuxtjs/tailwindcss": "^6.12.2", - "@tauri-apps/api": "^2.9.1", - "@tauri-apps/plugin-os": "^2.3.2", - "@tauri-apps/plugin-shell": "^2.3.3", + "@tauri-apps/api": "^2.7.0", "koa": "^2.16.1", "markdown-it": "^14.1.0", "micromark": "^4.0.1", @@ -34,5 +32,6 @@ "tailwindcss": "^3.4.13", "typescript": "^5.8.3", "vue-tsc": "^2.2.10" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue index e5a40f8..5fc30fc 100644 --- a/main/pages/library/[id]/index.vue +++ b/main/pages/library/[id]/index.vue @@ -170,8 +170,8 @@ -
-
+
+
Version {{ - currentVersionOption.displayName || - currentVersionOption.versionPath - }} + >{{ versionOptions[installVersionIndex].versionName }} on - {{ currentVersionOption.platform }} ({{ - formatKilobytes( - currentVersionOption.size / 1024 - ) - }}B) @@ -230,12 +223,8 @@ : 'font-normal', 'block truncate', ]" - >{{ version.displayName || version.versionPath }} on - {{ version.platform }} ({{ - formatKilobytes( - versionOptions[installVersionIndex].size / 1024 - ) - }}B){{ version.versionName }} on + {{ version.platform }}
- -
-
-
-

- Install additional dependencies? -

-

- This game requires additional content to run. Click the components - to automatically queue for download. -

-
-
    -
  • + Install to -
    - -
    -

    - -

    -

    - {{ content.shortDescription }} -

    -
    -
    -
    - -
    -
    • -
+
  • + {{ dir }} + + + +
    • + + + +
    +
    + Add more install directories in + + + Settings + +
    +
    -
    +
    @@ -407,48 +392,6 @@ - - - - -