fix: support latest electron builder default macOS release names

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/asset-platform.js

@@ -1,11 +1,9 @@
 const { PLATFORM_ARCH } = require("./constants");
 
 const assetPlatform = (fileName) => {
-  if (/.*(mac|darwin|osx).*(-arm).*\.zip/i.test(fileName)) {
-    return PLATFORM_ARCH.DARWIN_ARM64;
-  }
-
-  if (/.*(mac|darwin|osx).*\.zip/i.test(fileName) && !/arm64/.test(fileName)) {
+  if (/.*(mac|darwin|osx).*\.zip/i.test(fileName)) {
+    if (/universal/.test(fileName)) return PLATFORM_ARCH.DARWIN_UNIVERSAL;
+    if (/arm64/.test(fileName)) return PLATFORM_ARCH.DARWIN_ARM64;
     return PLATFORM_ARCH.DARWIN_X64;
   }
 

src/updates.js

@@ -95,16 +95,27 @@ class Updates {
   }
 
   async handleUpdate(res, account, repository, platform, version) {
-    const latest = await this.cachedGetLatest(
+    let latest = await this.cachedGetLatest(
       account,
       repository,
       platform,
       version
     );
 
+    const latestUniversal = await this.cachedGetLatest(
+      account,
+      repository,
+      PLATFORM_ARCH.DARWIN_UNIVERSAL,
+      version
+    );
+
+    if (!latest && latestUniversal) {
+      latest = latestUniversal;
+    }
+
     if (!latest) {
       const message = platform.includes(PLATFORM.DARWIN)
-        ? "No updates found (needs asset matching *(mac|darwin|osx).*(-arm).*.zip in public repository)"
+        ? "No updates found (needs asset matching *(mac|darwin|osx).*.zip in public repository)"
         : "No updates found (needs asset containing win32-{x64,ia32,arm64} or .exe in public repository)";
       notFound(res, message);
     } else if (semver.lte(latest.version, version)) {

test/asset-platform.test.js

@@ -28,10 +28,27 @@ test("assetPlatform() matches the right platform", (t) => {
       name: "Electron.Fiddle-darwin-arm64-0.27.3.zip",
       platform: PLATFORM_ARCH.DARWIN_ARM64,
     },
+    {
+      name: "Electron.Fiddle-0.27.3-arm64-mac.zip",
+      platform: PLATFORM_ARCH.DARWIN_ARM64,
+    },
     {
       name: "Electron.Fiddle-darwin-x64-0.27.3.zip",
       platform: PLATFORM_ARCH.DARWIN_X64,
     },
+    // Electron Builder
+    {
+      name: "Electron-Builder-1.2.3-mac.zip",
+      platform: PLATFORM_ARCH.DARWIN_X64,
+    },
+    {
+      name: "Electron-Builder-1.2.3-universal-mac.zip",
+      platform: PLATFORM_ARCH.DARWIN_UNIVERSAL,
+    },
+    {
+      name: "Electron-Builder-1.2.3-arm64-mac.zip",
+      platform: PLATFORM_ARCH.DARWIN_ARM64,
+    },
   ];
 
   for (const release of releases) {

test/update.test.js

@@ -346,15 +346,15 @@ test("Updates", async (t) => {
         let body = await res.text();
         t.equal(
           body,
-          "No updates found (needs asset matching *(mac|darwin|osx).*(-arm).*.zip in public repository)"
+          "No updates found (needs asset matching *(mac|darwin|osx).*.zip in public repository)"
         );
 
         res = await fetch(`${address}/owner/repo-win32-zip/darwin/0.0.0`);
         t.equal(res.status, 404);
         body = await res.text();
         t.equal(
           body,
-          "No updates found (needs asset matching *(mac|darwin|osx).*(-arm).*.zip in public repository)"
+          "No updates found (needs asset matching *(mac|darwin|osx).*.zip in public repository)"
         );
       });
     });