refactor(desktop): remove restic bridge

.github/workflows/desktop-release.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           fetch-depth: 0
-          ref: ${{ github.ref }}
+          ref: ${{ inputs.release_tag }}
 
       - name: Install dependencies
         uses: "./.github/actions/install-dependencies"
@@ -94,7 +94,7 @@ jobs:
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           fetch-depth: 0
-          ref: ${{ github.ref }}
+          ref: ${{ inputs.release_tag }}
 
       - name: Install dependencies
         uses: "./.github/actions/install-dependencies"

apps/desktop/electron/desktop-runtime.ts

@@ -5,7 +5,6 @@ import fs from "node:fs/promises";
 import net from "node:net";
 import path from "node:path";
 import { toMessage } from "@zerobyte/core/utils";
-import { startResticBridge } from "./restic/bridge";
 
 type DesktopDirs = {
 	dataDir: string;
@@ -155,27 +154,20 @@ export const startDesktopRuntime = async (
 	const url = `http://127.0.0.1:${port}`;
 	const launchSecret = crypto.randomBytes(32).toString("hex");
 	let stopped = false;
-	let stopResticBridge: (() => void) | null = null;
 	let command = "bunx";
 	let args = ["--bun", "vite", "--host", "127.0.0.1", "--port", String(port), "--strictPort"];
 	let cwd = process.env.ZEROBYTE_REPO_ROOT ?? path.resolve(process.cwd(), "../..");
 	const env = { ...createServerEnv(port, dirs, url, launchSecret), NODE_ENV: "development" };
 
 	if (app.isPackaged) {
 		const binDir = path.join(dirs.resourcesDir, "bin");
-		const resticBridge = await startResticBridge({
-			realResticCommand: path.join(binDir, "restic"),
-			launchSecret,
-		});
-		stopResticBridge = resticBridge.stop;
 		command = path.join(binDir, "bun");
 		args = [path.join(dirs.resourcesDir, ".output", "server", "index.mjs")];
 		cwd = dirs.resourcesDir;
 		Object.assign(env, {
 			NODE_ENV: "production",
 			MIGRATIONS_PATH: path.join(dirs.resourcesDir, "assets", "migrations"),
-			RESTIC_COMMAND: path.join(binDir, "zerobyte-restic.ts"),
-			ZEROBYTE_DESKTOP_RESTIC_BRIDGE_URL: resticBridge.url,
+			RESTIC_COMMAND: path.join(binDir, "restic"),
 			PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
 		});
 	}
@@ -204,14 +196,12 @@ export const startDesktopRuntime = async (
 			launchSecret,
 			stop: () => {
 				stopped = true;
-				stopResticBridge?.();
 				serverProcess.kill("SIGTERM");
 			},
 		};
 	} catch (error) {
 		stopped = true;
 		serverProcess.off("exit", handleServerExit);
-		stopResticBridge?.();
 		serverProcess.kill("SIGTERM");
 		throw error;
 	}

apps/desktop/fastlane/Fastfile

@@ -72,14 +72,14 @@ def app_store_api_key
 end
 
 def mas_build_number
-	explicit_build_number = env_value("ZEROBYTE_BUILD_NUMBER")
+	explicit_build_number = env_value("ZEROBYTE_BUILD_NUMBER", "BUILD_NUMBER")
 	return explicit_build_number if explicit_build_number
 
 	run_number = env_value("GITHUB_RUN_NUMBER")
 	run_attempt = env_value("GITHUB_RUN_ATTEMPT")
 	return [run_number, run_attempt].compact.join(".") if run_number
 
-	UI.user_error!("Set ZEROBYTE_BUILD_NUMBER or GITHUB_RUN_NUMBER.")
+	UI.user_error!("Set ZEROBYTE_BUILD_NUMBER, BUILD_NUMBER, or GITHUB_RUN_NUMBER.")
 end
 
 platform :mac do

apps/desktop/fastlane/README.md

@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Mac
+
+### mac build_mas
+
+```sh
+[bundle exec] fastlane mac build_mas
+```
+
+Build the signed Mac App Store package
+
+### mac upload_testflight
+
+```sh
+[bundle exec] fastlane mac upload_testflight
+```
+
+Upload the latest signed Mac App Store package to App Store Connect
+
+### mac beta
+
+```sh
+[bundle exec] fastlane mac beta
+```
+
+Build and upload the Mac App Store package to App Store Connect
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

apps/desktop/scripts/prepare-runtime.ts

@@ -177,5 +177,4 @@ await fs.mkdir(downloadsDir, { recursive: true });
 await stageApp();
 await stageBun();
 await stageRestic();
-await installExecutable(path.join(desktopDir, "electron", "restic", "wrapper.ts"), "zerobyte-restic.ts");
 await stageShoutrrr();