Fix Apple Silicon ffprobe packaging

Author: Back

.github/workflows/release-installers.yml

@@ -9,7 +9,7 @@ on:
       tag:
         description: "Release tag to upload installers to"
         required: true
-        default: "v1.0.2"
+        default: "v1.0.3"
 
 permissions:
   contents: write
@@ -52,6 +52,11 @@ jobs:
       - run: npm ci
       - run: npm run build
       - run: npx electron-builder --mac dmg pkg --arm64 --config.directories.output=release-upload
+      - name: Verify macOS bundled binaries
+        run: |
+          file "release-upload/mac-arm64/DL Studio.app/Contents/Resources/bin/ffmpeg"
+          file "release-upload/mac-arm64/DL Studio.app/Contents/Resources/bin/ffprobe-arm64" | tee /tmp/ffprobe-file.txt
+          grep -q "Mach-O 64-bit executable arm64" /tmp/ffprobe-file.txt
       - name: Upload macOS assets
         env:
           GH_TOKEN: ${{ github.token }}

Mac/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dl-studio-mac",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "description": "Desktop batch video downsampler for macOS.",
   "main": "src/main/main.js",
@@ -24,6 +24,7 @@
     "electron": "^34.1.1",
     "electron-builder": "^25.1.8",
     "ffmpeg-static": "^5.2.0",
+    "@ffprobe-installer/ffprobe": "^2.1.2",
     "ffprobe-static": "^3.1.0",
     "lucide-react": "^0.475.0",
     "react": "^19.0.0",
@@ -52,7 +53,7 @@
         "to": "bin/ffmpeg"
       },
       {
-        "from": "node_modules/ffprobe-static/bin/darwin/arm64/ffprobe",
+        "from": "node_modules/@ffprobe-installer/darwin-arm64/ffprobe",
         "to": "bin/ffprobe-arm64"
       },
       {
@@ -90,5 +91,8 @@
       "artifactName": "DL-Studio-Mac-${version}-${arch}.${ext}",
       "installLocation": "/Applications"
     }
+  },
+  "dependencies": {
+    "@ffprobe-installer/ffprobe": "^2.1.2"
   }
 }

Mac/package.json

@@ -18,6 +18,13 @@ assert.equal(packageJson.author, "DL Studio");
 assert.equal(packageJson.build.productName, "DL Studio");
 assert.equal(packageLock.name, "dl-studio-mac");
 assert.equal(packageLock.packages[""].name, "dl-studio-mac");
+assert.match(packageJson.devDependencies["@ffprobe-installer/ffprobe"], /^\^2\.1\.2/);
+assert.ok(
+  packageJson.build.extraResources.some(
+    (entry) => entry.from === "node_modules/@ffprobe-installer/darwin-arm64/ffprobe" && entry.to === "bin/ffprobe-arm64"
+  ),
+  "macOS arm64 builds must bundle the real Apple Silicon ffprobe binary"
+);
 assert.match(indexHtml, /<title>DL Studio<\/title>/);
 
 assert.match(main, /const APP_NAME = "DL Studio"/);
@@ -42,6 +49,7 @@ assert.match(main, /function uploadInferaVideo/);
 assert.match(main, /const activeUploadRequests = new Map/);
 assert.match(main, /function normalizeUploadTimestamp/);
 assert.match(main, /function normalizeUploadDuration/);
+assert.match(main, /require\("@ffprobe-installer\/ffprobe"\)\.path/);
 assert.match(main, /Math\.round\(timestamp\)/);
 assert.match(main, /function emitUploadProgress/);
 assert.match(main, /infera:upload-progress/);

Mac/scripts/app-shell.test.cjs

@@ -601,6 +601,10 @@ function getBundledBinary(name) {
     return require("ffmpeg-static");
   }
 
+  if (process.arch === "arm64") {
+    return require("@ffprobe-installer/ffprobe").path;
+  }
+
   return require("ffprobe-static").path;
 }
 

Mac/src/main/main.js

@@ -1,6 +1,6 @@
 {
   "name": "dl-studio-windows",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "description": "Desktop batch video downsampler for Windows.",
   "main": "src/main/main.js",