wip bundle as helper

Author: martykan

packages/suite-data/files/bin/bluetooth/TrezorBluetooth.app/Contents/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>trezor-bluetooth</string>
+	<key>CFBundleIconFile</key>
+	<string>AppIcon</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.trezor.TrezorBtleMac</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>TrezorBtleMac</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.1.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>0.1.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>13.0</string>
+  <key>LSUIElement</key>
+  <true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>This app requires Bluetooth access to communicate with Trezor devices.</string>
+</dict>
+</plist>

packages/transport-bluetooth/TrezorBluetooth.app/Contents/MacOS/trezor-bluetooth renamed to packages/suite-data/files/bin/bluetooth/TrezorBluetooth.app/Contents/MacOS/trezor-bluetooth

@@ -0,0 +1 @@
+APPL????

packages/suite-data/files/bin/bluetooth/TrezorBluetooth.app/Contents/PkgInfo

@@ -248,11 +248,11 @@ export abstract class BaseProcess {
         await this.start();
     }
 
-    private onError(err: Error) {
+    public onError(err: Error) {
         this.logger.error(this.logTopic, err.message);
     }
 
-    private onExit(code: number | null) {
+    public onExit(code: number | null) {
         this.logger.info(
             this.logTopic,
             `Exited, code: ${code ?? 'N/A'} (Stopped: ${b2t(this.stopped)})`,

packages/transport-bluetooth/TrezorBluetooth.app/Contents/_CodeSignature/CodeResources renamed to packages/suite-data/files/bin/bluetooth/TrezorBluetooth.app/Contents/_CodeSignature/CodeResources

@@ -1,4 +1,8 @@
+import { spawn } from 'child_process';
+import path from 'path';
+
 import { isDevEnv } from '@suite-common/suite-utils';
+import { isMacOs } from '@trezor/env-utils';
 
 import { BaseProcess, Status } from './BaseProcess';
 import { getSwitchValue } from '../process-switches';
@@ -62,6 +66,29 @@ export class BluetoothProcess extends BaseProcess {
             process.env.RUST_BACKTRACE = '1';
         }
 
-        return super.start(['-p', this.port.toString()]);
+        if (!isMacOs()) {
+            return super.start(['-p', this.port.toString()]);
+        }
+
+        return new Promise<void>(resolve => {
+            // Launch macos helper
+            const helperPath = path.join(
+                global.resourcesPath,
+                '..',
+                'Helpers',
+                'TrezorBluetooth.app',
+            );
+            this.logger.info(this.logTopic, `Launching macOS helper: ${helperPath}`);
+            const process = spawn('/usr/bin/open', [
+                '-n',
+                helperPath,
+                '--args',
+                '-p',
+                this.port.toString(),
+            ]);
+            process.on('error', err => super.onError(err));
+            process.on('close', code => super.onExit(code));
+            resolve();
+        });
     }
 }

packages/suite-desktop-core/src/libs/processes/BaseProcess.ts

@@ -81,6 +81,7 @@ module.exports = {
         oneClick: false,
     },
     mac: {
+        binaries: [],
         files: ['entitlements.mac.inherit.plist'],
         extraResources: [
             {
@@ -100,6 +101,12 @@ module.exports = {
                 to: 'bin/bluetooth',
             },
         ],
+        extraFiles: [
+            {
+                from: 'build/static/bin/bluetooth/TrezorBluetooth.app',
+                to: 'Helpers/TrezorBluetooth.app',
+            },
+        ],
         icon: 'build/static/images/desktop/512x512.icns',
         artifactName: 'Trezor-Suite-${version}-mac-${arch}.${ext}',
         hardenedRuntime: true,

packages/suite-desktop-core/src/libs/processes/BluetoothProcess.ts

@@ -1,4 +1,4 @@
 cargo build
-cp target/debug/trezor-bluetooth TrezorBluetooth.app/Contents/MacOS
-#codesign --deep --force --sign - TrezorBluetooth.app
-codesign --deep --force --sign "Apple Development: Tomas Martykan (Z45W4655Y2)" --entitlements entitlements.plist TrezorBluetooth.app/
+cp target/debug/trezor-bluetooth ../suite-data/files/bin/bluetooth/TrezorBluetooth.app/Contents/MacOS
+codesign --deep --force --sign "Apple Development: Tomas Martykan (Z45W4655Y2)" --entitlements entitlements.plist ../suite-data/files/bin/bluetooth/TrezorBluetooth.app/
+codesign -dvvv --entitlements - ../suite-data/files/bin/bluetooth/TrezorBluetooth.app