Fix browser x64 detection

cross-org · Mar 7, 2024 · 02129e9 · 02129e9
1 parent e560c87
commit 02129e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@cross/runtime",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "exports": "./mod.ts",
   "fmt": {
     "lineWidth": 200,

diff --git a/mod.ts b/mod.ts
@@ -313,13 +313,17 @@ export function getCurrentArchitecture(): Architecture {
       const userAgent = navigator.userAgent;
       // @ts-ignore Cross Runtime
       const platform = navigator.platform;
-      // Clues for x86/x64
-      if (platform.indexOf("Win64") !== -1 || platform.indexOf("x64") !== -1) {
+
+      if (platform.indexOf("Win64") !== -1 || platform.indexOf("x64") !== -1 || platform.indexOf("x86_64") !== -1) {
+        return Architecture.x64;
+      } else if (platform.indexOf("Win32") !== -1 || (platform.indexOf("x86") !== -1 && platform.indexOf("x86_64") === -1)) {
+        return Architecture.x86;
+      } else if (userAgent.indexOf("Win64") !== -1 || userAgent.indexOf("x64") !== -1 || userAgent.indexOf("x86_64") !== -1) {
         return Architecture.x64;
-      } else if (platform.indexOf("Win32") !== -1 || platform.indexOf("x86") !== -1) {
+      } else if (userAgent.indexOf("Win32") !== -1 || (userAgent.indexOf("x86") !== -1 && userAgent.indexOf("x86_64") === -1)) {
         return Architecture.x86;
       }
-      // Clues for ARM
+
       if (userAgent.indexOf("arm64") !== -1) {
         return Architecture.arm64;
       } else if (userAgent.indexOf("arm") !== -1) {