Add macOS packaging and maccan support

Author: haoruizhou

.github/workflows/kvaser-bridge-build.yml

@@ -23,10 +23,10 @@ jobs:
         include:
           - os: windows-latest
             artifact_name: kvaser-bridge-windows
-            binary_name: kvaser-bridge.exe
+            release_asset: kvaser-bridge-windows.exe
           - os: macos-latest
             artifact_name: kvaser-bridge-macos
-            binary_name: kvaser-bridge
+            release_asset: kvaser-bridge-macos.app.zip
 
     steps:
       - name: Checkout code
@@ -49,11 +49,25 @@ jobs:
           [[ -f build.spec ]] || { echo 'Missing kvaser-bridge/build.spec in repository checkout.'; exit 1; }
           pyinstaller --clean --noconfirm build.spec
 
+      - name: Prepare Windows release asset
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Copy-Item -Path "kvaser-bridge/dist/kvaser-bridge.exe" -Destination "kvaser-bridge/dist/kvaser-bridge-windows.exe" -Force
+
+      - name: Package macOS app bundle
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          cd kvaser-bridge/dist
+          [[ -d kvaser-bridge.app ]] || { echo 'Expected macOS app bundle not found.'; exit 1; }
+          ditto -c -k --sequesterRsrc --keepParent kvaser-bridge.app kvaser-bridge-macos.app.zip
+
       - name: Upload binary artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact_name }}
-          path: kvaser-bridge/dist/${{ matrix.binary_name }}
+          path: kvaser-bridge/dist/${{ matrix.release_asset }}
           if-no-files-found: error
           retention-days: 30
 
@@ -128,8 +142,8 @@ jobs:
         shell: bash
         run: |
           gh release upload "${{ steps.meta.outputs.tag }}" \
-            release-assets/kvaser-bridge-macos/kvaser-bridge \
-            release-assets/kvaser-bridge-windows/kvaser-bridge.exe \
+            release-assets/kvaser-bridge-macos/kvaser-bridge-macos.app.zip \
+            release-assets/kvaser-bridge-windows/kvaser-bridge-windows.exe \
             --clobber
 
   attach-release-assets:
@@ -150,5 +164,5 @@ jobs:
         with:
           tag_name: ${{ github.event_name == 'release' && github.event.release.tag_name || inputs.release_tag }}
           files: |
-            release-assets/kvaser-bridge-macos/kvaser-bridge
-            release-assets/kvaser-bridge-windows/kvaser-bridge.exe
+            release-assets/kvaser-bridge-macos/kvaser-bridge-macos.app.zip
+            release-assets/kvaser-bridge-windows/kvaser-bridge-windows.exe

kvaser-bridge/build.spec

@@ -11,6 +11,7 @@
 import platform
 
 is_windows = platform.system() == 'Windows'
+is_macos = platform.system() == 'Darwin'
 
 a = Analysis(
     ['src/main.py'],
@@ -21,6 +22,7 @@ a = Analysis(
     ],
     hiddenimports=[
         'can.interfaces.kvaser',
+        'can.interfaces.maccan',
     ],
     hookspath=[],
     runtime_hooks=[],
@@ -39,6 +41,14 @@ exe = EXE(
     debug=False,
     strip=False,
     upx=True,
-    console=not is_windows,
+    console=not (is_windows or is_macos),
     onefile=True,
 )
+
+if is_macos:
+    app = BUNDLE(
+        exe,
+        name='kvaser-bridge.app',
+        icon=None,
+        bundle_identifier='org.westernformularacing.kvaserbridge',
+    )

kvaser-bridge/src/bridge.py

@@ -24,6 +24,11 @@
 import websockets
 from websockets.server import serve
 
+
+def open_maccan_bus(channel, bitrate: int) -> can.BusABC:
+    """Open a CAN bus via the maccan interface (macOS, Peak USB adapter)."""
+    return can.interface.Bus(interface='maccan', channel=channel, bitrate=bitrate)
+
 import config
 
 # TLS cert/key: bundled with PyInstaller (sys._MEIPASS) or alongside this file