Battery level support

.gitignore

@@ -110,4 +110,11 @@ dist
 build/
 
 # IntelliJ
-.idea
+.idea
+
+# Yarn Lock file
+yarn.lock
+
+# vscode files
+.vscode/
+.vscode/settings.json

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "librazermacos"]
 	path = librazermacos
-	url = https://github.com/1kc/librazermacos.git
+	url = [email protected]:1kc/librazermacos.git
+[submodule "iohook"]
+	path = iohook
+	url = https://github.com/overcurrent/iohook

README.md

@@ -10,7 +10,7 @@
 - **Supporting Razer devices** Keyboards, mice, mouse mats, eGPUs and blade laptops
 - **Custom color picking** Choose your own colors for static, reactive and starlight effects
 - **Persistent color settings** Color effects are saved to onboard memory
-- **Works on the latest macOS** Including Intel and Apple Silicon. There are no plans from Razer to further support macOS ([source](https://support.razer.com/articles/1543762911))
+- **Works on the latest macOS** Including Intel and Apple Silicon. There are no current plans from Razer to support macOS ([source](https://mysupport.razer.com/app/answers/detail/a_id/1381/kw/macOS))
 
 ## Download
 
@@ -33,53 +33,171 @@ Please see FAQ section below if color changes are not working, otherwise open a
 - 💻 Blade laptop
 - 🔊 Speakers
 - 🍺 Mug
+- ⭐️ And More
 
 For a complete list of supported devices, please see [openrazer](https://openrazer.github.io).
 
 Confirmed working for:
 
 Keyboards:
 
+- Razer Anansi
 - Razer BlackWidow 2019
+- Razer BlackWidow Chroma
+- Razer BlackWidow Chroma Tournament Edition
+- Razer BlackWidow Chroma V2
 - Razer BlackWidow Elite
-- Razer BlackWidow Chroma v2
-- Razer Ornata Chroma
+- Razer BlackWidow Essential
+- Razer BlackWidow Lite
+- Razer BlackWidow Overwatch
+- Razer BlackWidow Stealth
+- Razer BlackWidow Stealth Edition
+- Razer BlackWidow Ultimate 2012
+- Razer BlackWidow Ultimate 2013
+- Razer BlackWidow Ultimate 2016
+- Razer BlackWidow V3
+- Razer BlackWidow V3 Mini Hyperspeed
+- Razer BlackWidow V3 Pro (wired)
+- Razer BlackWidow V3 TK
+- Razer BlackWidow X Chroma
+- Razer BlackWidow X Chroma Tournament Edition
+- Razer BlackWidow X Chroma Ultimate
+- Razer Cynosa Chroma
+- Razer Cynosa Lite
+- Razer Cynosa V2
+- Razer Deathstalker Chroma
+- Razer Deathstalker Expert
 - Razer Huntsman
 - Razer Huntsman Elite
-- Razer Huntsman TE
-- Razer Cynosa V2
-- Razer Ornata V2
+- Razer Huntsman Mini
+- Razer Huntsman Mini (JP)
+- Razer Huntsman Tournament Edition
+- Razer Huntsman V2
+- Razer Huntsman V2 TKL
+- Razer Huntsman V2 Analog
+- Razer Nostromo
+- Razer Orbweaver
+- Razer Orbweaver Chroma
+- Razer Ornata
+- Razer Ornata Chroma
+- Razer Ornata Chroma V2
+- Razer Tartarus
+- Razer Tartarus Chroma
+- Razer Tartarus V2
 
 Mice:
 
-- Razer Deathadder Elite
-- Razer DeathAdder V2
-- Death Adder V2 Pro (wired and wireless)
-- Razer Razer Lancehead Wireless
-- Razer Viper Ultimate Wireless
+- Razer Abyssus 
+- Razer Abyssus 1800
+- Razer Abyssus 2000
+- Razer Abyssus Elite DVA Edition
+- Razer Abyssus Essential
+- Razer Abyssus V2 (under older mouse effects)
+- Razer Basilisk
+- Razer Basilisk Essential
 - Razer Basilisk Ultimate
 - Razer Basilisk V2
-- Razer Abyssus V2 (under older mouse effects)
-- Razer Razer DeathAdder 2013 (under older mouse effects)
+- Razer Basilisk V3
+- Razer DeathAdder 3 5G
+- Razer DeathAdder 1800
+- Razer DeathAdder 2013 (under older mouse effects)
+- Razer DeathAdder 3500
+- Razer DeathAdder Chroma
+- Razer DeathAdder Elite
+- Razer DeathAdder Essential
+- Razer DeathAdder Essential White Edition
+- Razer DeathAdder Essential (2021)
+- Razer DeathAdder V2
+- Razer DeathAdder V2 Mini
+- Razer DeathAdder V2 Pro (wired and wireless)
+- Razer Diamondback Chroma
+- Razer Imperator
+- Razer Lancehead Tournament Edition
+- Razer Lancehead Wired
+- Razer Lancehead Wireless (and wired)
+- Razer Mamba 2012 (wired and wireless)
+- Razer Mamba Elite
+- Razer Mamba Tournament Edition
+- Razer Mamba Wired
+- Razer Mamba Wireless (and wired)
+- Razer Naga 2012
+- Razer Naga 2014
+- Razer Naga Chroma
+- Razer Naga Hex
+- Razer Naga Hex Red
+- Razer Naga Hex V2
+- Razer Naga Left Handed 2020
+- Razer Naga Pro (wired and wireless)
 - Razer Naga Trinity
+- Razer Orochi 2011
+- Razer Orochi 2013
+- Razer Orochi Chroma
+- Razer Ouroboros
+- Razer Taipan
+- Razer Viper
+- Razer Viper 8KHz
+- Razer Viper Mini
+- Razer Viper Ultimate (wired and wireless)
 
 Mouse mats:
 
-- Razer Goliathus Extended
+- Razer Firefly
+- Razer Firefly Hyperflux
 - Razer Firefly V2
+- Razer Goliathus Chroma
+- Razer Goliathus Chroma Extended
 
-Laptops:
+e-GPUs:
 
-- Razer Blade Advanced 2018
+- Razer Core X Chroma
 
-Headphones:
+Headphones and stand:
 
+- Razer Base Station V2 Chroma
+- Razer Kraken
+- Razer Kraken 7.1
+- Razer Kraken 7.1 (Alternate)
+- Razer Kraken Kitty Edition
+- Razer Kraken Ultimate
 - Razer Kraken V2
 
+Laptops:
+
+- Razer Blade 2018
+- Razer Blade 2019 Advanced
+- Razer Blade 2018 Base
+- Razer Blade 2019 Base
+- Razer Blade 2018 Mercury
+- Razer Blade Late-2016
+- Razer Blade Mid-2019 Mercury
+- Razer Blade Pro 2017
+- Razer Blade Pro 2017 Full HD
+- Razer Blade Pro Late-2016
+- Razer Blade Stealth
+- Razer Blade Stealth 2019
+- Razer Blade Stealth Late-2016
+- Razer Blade Stealth Mid-2017
+- Razer Blade Stealth Late-2017
+- Razer Blade Stealth Late-2019
+- Razer Blade Studio Edition 2019
+- Razer Blade QHD
+
+Speakers:
+
+- Razer Nommo Chroma
+- Razer Nommo Pro
+
+Mugs: 
+
+- Razer Chroma Mug
+- Razer Chroma Base
+- Razer Chroma HDK
+
 Accessories:
 
-- Razer Base Station V2
 - Razer Mouse Bungee V3 Chroma
+- Razer Mouse Charging Dock
+- Razer Thunderbolt 4 Dock Chroma
 
 Please feel free to open pull requests for new devices you have tested.
 
@@ -91,7 +209,7 @@ A: It is possible that a wrong on-board keyboard profile has been selected. Chan
 
 Q: Menu says "No device found".
 
-A: Use the "Refresh Device List" option.
+A: Use the "Refresh Device List" option, which can be found when pressing the Razer OS icon on the top menu bar.
 
 Q: How do I customize and rebind keys?
 
@@ -107,6 +225,16 @@ Ongoing new device support will be provided on a volunteer contribution basis, a
 
 Ensure xcode command line tools are installed,
 
+If you have a paid Apple Developer account, edit `release.sh` with your details.
+
+ Afterwards, to automatically build, sign, and/or notarize (if applicable,) run in Terminal: `./release.sh`
+
+ Ad-hoc signing will be used if account information is left empty.
+
+
+
+ Or build manually:
+
 Install node package dependencies:
 
     yarn
@@ -123,6 +251,10 @@ For building a distribution ready app and dmg:
 
     yarn dist
 
+Sign the universal package before moving to /Applications folder with ad-hoc signing:
+
+    codesign -s - --deep --force ./dist/mac-universal/Razer\ macOS.app
+
 ## Implementation
 
 Project includes both hardware drivers and user interface.

binding.gyp

@@ -17,13 +17,19 @@
           '-framework CoreFoundation'
       ],
       'xcode_settings': {
-          'VALID_ARCHS': 'arm64e x86_64',
+          'VALID_ARCHS': 'arm64 x86_64',
           'ONLY_ACTIVE_ARCH': 'NO',
           'OTHER_CODE_SIGN_FLAGS': 'timestamp --options=runtime',
           'CLANG_CXX_LIBRARY': 'libc++',
-          'MACOSX_DEPLOYMENT_TARGET': '11.0',
+          'MACOSX_DEPLOYMENT_TARGET': '12.0.1',
           'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+          'OTHER_CFLAGS': [
+              '-arch x86_64',
+              '-arch arm64'
+          ],
           'OTHER_LDFLAGS': [
+              '-arch x86_64',
+              '-arch arm64',
               '-framework IOKit',
               '-framework CoreFoundation'
           ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "razer-macos",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Open source color effects manager for Razer peripherals on macOS",
   "license": "GPL-2.0-only",
   "main": "src/main/index.js",
@@ -16,7 +16,7 @@
   "dependencies": {
     "dot-prop": "^5.3.0",
     "electron-json-storage": "^4.2.0",
-    "iohook": "^0.9.3",
+    "iohook": "file:./iohook",
     "node-addon-api": "^1.0.0",
     "node-forge": "^0.10.0",
     "react": "^16.13.1",
@@ -25,15 +25,17 @@
     "react-select": "^3.2.0",
     "react-slider": "^1.1.2",
     "react-tabs": "^3.1.2",
-    "source-map-support": "^0.5.12",
+    "source-map-support": "^0.5.19",
     "tinycolor2": "^1.4.2"
   },
   "devDependencies": {
-    "@babel/preset-react": "^7.9.4",
+    "@babel/preset-react": "^7.14.5",
     "babel-loader": "^8.1.0",
-    "electron": "^11.2.2",
-    "electron-builder": "^22.11.11",
+    "electron": "^11.5.0",
+    "electron-builder": "^23.3.3",
+    "electron-builder-notarize": "^1.5.0",
     "electron-webpack": "^2.8.2",
+    "@electron/universal": "^1.2.1",
     "mini-css-extract-plugin": "^0.9.0",
     "native-ext-loader": "^2.3.0",
     "node-gyp": "^8.2.0",
@@ -55,19 +57,14 @@
   },
   "gypfile": true,
   "build": {
-    "appId": "com.electron.razer-macos",
+    "appId": "br.art.code.razer-macos",
     "productName": "Razer macOS",
     "nodeGypRebuild": true,
-    "asar": true,
-    "files": [
-      "package.json",
-      "build",
-      "node_modules"
-    ],
     "directories": {
       "output": "dist",
       "buildResources": "resources"
     },
+    "afterSign": "electron-builder-notarize",
     "mac": {
       "category": "public.app-category.developer-tools",
       "icon": "icon.icns",
@@ -77,8 +74,7 @@
         {
           "target": "dmg",
           "arch": [
-            "arm64",
-            "x64"
+            "universal"
           ]
         }
       ]
@@ -92,8 +88,7 @@
       "darwin"
     ],
     "arches": [
-      "arm64",
-      "x64"
+      "x64", "arm64"
     ]
   }
 }

release.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [[ -z $APPLE_ID]]
+then
+  export APPLE_ID=""
+  export APPLE_ID_PASSWORD=""
+  export APPLE_ID_SET="TRUE"
+fi
+
+yarn clean
+rm -rf ./node_modules ./dist
+
+yarn
+
+yarn dist
+
+if [[ -z $APPLE_ID ]]
+then
+  codesign -s - --deep --force ./dist/mac-universal/Razer\ macOS.app
+fi
+
+if [[ -z $APPLE_ID_SET]]
+then;
+else
+  unset APPLE_ID
+  unset APPLE_ID_PASSWORD
+  unset APPLE_ID_SET
+fi