Merge pull request #22 from jakejarvis/detect-arm

index.d.ts

@@ -1,4 +1,3 @@
-
-declare function arch(): 'x64' | 'x86';
+declare function arch(): 'x64' | 'x86' | 'arm64';
 
 export = arch;

index.js

@@ -17,10 +17,15 @@ module.exports = function arch () {
   }
 
   /**
-   * All recent versions of Mac OS are 64-bit.
+   * On macOS, we need to detect if x64 Node is running because the CPU is truly
+   * an Intel chip, or if it's running on Apple Silicon via Rosetta 2:
+   * https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment
    */
   if (process.platform === 'darwin') {
-    return 'x64'
+    var nativeArm = process.arch === 'arm64'
+    var rosettaArm = cp.execSync('sysctl -in sysctl.proc_translated', { encoding: 'utf8' }) === '1\n'
+
+    return (nativeArm || rosettaArm) ? 'arm64' : 'x64'
   }
 
   /**

test/basic.js

@@ -1,8 +1,8 @@
 var arch = require('../')
 var test = require('tape')
 
-test('returns x86 or x64', function (t) {
+test('returns a valid architecture', function (t) {
   var str = arch()
-  t.ok(str === 'x86' || str === 'x64')
+  t.ok(str === 'x86' || str === 'x64' || str === 'arm64')
   t.end()
 })