feat: add arm64 build support

.github/workflows/nodejs.yml

@@ -22,14 +22,15 @@ jobs:
       run: |
         npm ci
         npm run build --if-present
+        npm run build:arm64 --if-present
         npm test
       env:
         CI: true
 
   build_linux:
     name: build_linux
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 12
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -48,18 +49,19 @@ jobs:
         sudo apt-get update
         sudo apt-get install --no-install-recommends -y libopenjp2-tools rpm bsdtar snapcraft
     - name: npm install, build, and test
-      timeout-minutes: 12
+      timeout-minutes: 24
       run: |
         npm ci
         npm run build --if-present
+        npm run build:arm64 --if-present
         npm test
       env:
         CI: true
 
   build_windows:
     name: build_windows
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 12
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -79,9 +81,10 @@ jobs:
       env:
         CI: true
     - name: npm build
-      timeout-minutes: 12
+      timeout-minutes: 24
       run: |
         npm run build --if-present
+        npm run build:arm64 --if-present
       env:
         CI: true
     - name: npm test

.gitignore

@@ -50,4 +50,7 @@ dist/
 
 # F**k you macOS
 .DS_store
+._*
 
+#Editor config
+.nova

app.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, nativeImage, shell } = require('electron')
+const { app, BrowserWindow, ipcMain, nativeImage, screen, shell } = require('electron')
 const path = require('path-extra')
 
 // Environment
@@ -194,6 +194,7 @@ app.on('ready', () => {
       nativeWindowOpen: true,
       zoomFactor: config.get('poi.appearance.zoom', 1),
       enableRemoteModule: true,
+      contextIsolation: false,
       // experimentalFeatures: true,
     },
     backgroundColor: '#00000000',
@@ -231,6 +232,22 @@ app.on('ready', () => {
     mainWindow = null
   })
 
+  //display config
+  const handleScreenStatusChange = () => {
+    mainWindow.webContents.send('screen-status-changed', screen.getAllDisplays())
+  }
+  ipcMain.on('displays::get-all', (e) => {
+    e.returnValue = screen.getAllDisplays()
+  })
+  ipcMain.on('displays::remove-all-listeners', () => {
+    screen.removeListener('display-added', handleScreenStatusChange)
+    screen.removeListener('display-removed', handleScreenStatusChange)
+    screen.removeListener('display-metrics-changed', handleScreenStatusChange)
+  })
+  screen.addListener('display-added', handleScreenStatusChange)
+  screen.addListener('display-removed', handleScreenStatusChange)
+  screen.addListener('display-metrics-changed', handleScreenStatusChange)
+
   // devtool
   if (dbg.isEnabled() && config.get('poi.devtool.enable', false)) {
     require('./lib/devtool')

appveyor.yml

@@ -22,6 +22,7 @@ install:
 
 build_script:
   - npm run build
+  - npm run build:arm64
   - .\node_modules\.bin\gulp build_plugins
 
 artifacts:

build-arm64.yaml

@@ -0,0 +1,59 @@
+directories:
+  output: dist
+  buildResources: build
+  app: app_compiled
+appId: org.poooi.poi
+asar: true
+npmRebuild: false
+mac:
+  publish: []
+  icon: assets/icons/poi.icns
+  category: public.app-category.games
+  provisioningProfile: poi.provisionprofile
+  target:
+    - target: default
+      arch:
+        - arm64
+dmg:
+  contents:
+    - x: 410
+      'y': 220
+      type: link
+      path: /Applications
+    - x: 130
+      'y': 220
+      type: file
+win:
+  publish: []
+  icon: assets/icons/poi.ico
+  target:
+    - target: nsis
+      arch:
+        - arm64
+    - target: 7z
+      arch:
+        - arm64
+nsis:
+  artifactName: 'poi-setup-${version}-arm64.${ext}'
+  oneClick: false
+  allowToChangeInstallationDirectory: true
+  multiLanguageInstaller: true
+linux:
+  publish: []
+  target:
+    - target: 7z
+      arch:
+        - arm64
+    - target: deb
+      arch:
+      -   arm64
+    - target: rpm
+      arch:
+        - arm64
+    - target: pacman
+      arch:
+        - arm64
+    - target: AppImage
+      arch:
+        - arm64
+  icon: assets/icons

build/azure-pipeline-steps.yml

@@ -24,6 +24,10 @@ steps:
     npm run build
   displayName: 'npm build'
 
+- script: |
+    npm run build:arm64
+  displayName: 'npm build:arm64'
+
 - script: |
     npm test
   displayName: 'npm test'

lib/touchbar.es

@@ -22,14 +22,14 @@ export const sendEscKey = () => {
 
 // buttons
 const devtools = new TouchBarButton({
-  icon: getIcon('terminal'),
+  icon: getIcon('console'),
   click: () => {
     mainWindow.openDevTools({ mode: 'detach' })
   },
 })
 
 const screenshot = new TouchBarButton({
-  icon: getIcon('camera-retro'),
+  icon: getIcon('camera'),
   click: () => {
     mainWindow.webContents.send('touchbar', 'screenshot')
   },
@@ -43,21 +43,21 @@ const volume = new TouchBarButton({
 })
 
 const cachedir = new TouchBarButton({
-  icon: getIcon('bolt'),
+  icon: getIcon('social-media'),
   click: () => {
     mainWindow.webContents.send('touchbar', 'cachedir')
   },
 })
 
 const screenshotdir = new TouchBarButton({
-  icon: getIcon('photo'),
+  icon: getIcon('media'),
   click: () => {
     mainWindow.webContents.send('touchbar', 'screenshotdir')
   },
 })
 
 const adjust = new TouchBarButton({
-  icon: getIcon('arrows-alt'),
+  icon: getIcon('fullscreen'),
   click: () => {
     mainWindow.webContents.send('touchbar', 'adjust')
   },
@@ -71,7 +71,7 @@ const refresh = new TouchBarButton({
 })
 
 const edit = new TouchBarButton({
-  icon: config.get('poi.layout.editable') ? getIcon('pen-square') : getIcon('edit'),
+  icon: config.get('poi.layout.editable') ? getIcon('unlock') : getIcon('lock'),
   click: () => {
     mainWindow.webContents.send('touchbar', 'edit')
   },
@@ -93,9 +93,24 @@ const spacer2 = new TouchBarSpacer({
 })
 
 //popover
-const popover = new TouchBarPopover({
-  items: [devtools, screenshot, volume, cachedir, screenshotdir, adjust, edit, refresh],
+//touchBar popover is not working for electron 11 at the moment, refer: https://github.com/electron/electron/issues/26615
+//const popover = new TouchBarPopover({
+//  items: [devtools, screenshot, volume, cachedir, screenshotdir, adjust, edit, refresh],
+//  icon: getIcon('angle-right'),
+//})
+
+const openPopover = new TouchBarButton({
   icon: getIcon('angle-right'),
+  click: () => {
+    mainWindow.setTouchBar(popoverTouchbar)
+  },
+})
+
+const closePopover = new TouchBarButton({
+  icon: getIcon('angle-left'),
+  click: () => {
+    renderMainTouchbar()
+  },
 })
 
 //tab-switching
@@ -153,14 +168,21 @@ export const toggleRefreshConfirm = (btn1, btn2) => {
 
 //main-touchbar
 const mainTouchbar = new TouchBar({
-  items: [devtools, screenshot, volume, popover, spacer1, tabs, spacer2, refresh],
+  items: [devtools, screenshot, volume, openPopover, spacer1, tabs, spacer2, refresh],
+  escapeItem: poibutton,
+})
+
+const popoverTouchbar = new TouchBar({
+  items: [devtools, screenshot, volume, cachedir, screenshotdir, adjust, edit, closePopover],
   escapeItem: poibutton,
 })
 
 //Change Volume or Edit btn
 export const updateTouchbarInfoIcons = () => {
-  edit.icon = config.get('poi.layout.editable') ? getIcon('pen-square') : getIcon('edit')
+  edit.icon = config.get('poi.layout.editable') ? getIcon('unlock') : getIcon('lock')
   volume.icon = config.get('poi.content.muted') ? getIcon('volume-off') : getIcon('volume-up')
+  //TouchBar icon will not auto update on recent macOS
+  renderMainTouchbar()
 }
 
 //Tab switching initialization

lib/utils.es

@@ -99,6 +99,7 @@ export function stopNavigateAndHandleNewWindow(id) {
           options.webPreferences.webSecurity = false
         }
         if (frameName.startsWith('plugin[gpuinfo]')) {
+          options = {}
           options.backgroundColor = '#FFFFFFFF'
         }
         if (url.startsWith('chrome')) {
@@ -120,7 +121,13 @@ export function stopNavigateAndHandleNewWindow(id) {
             sandbox: true,
           },
         }
-        e.newGuest = new BrowserWindow(options)
+        const win = new BrowserWindow(options)
+        if (frameName.startsWith('plugin[gpuinfo]')) {
+          win.setBounds({ width: 640, height: 480 })
+          win.center()
+          win.loadURL('chrome://gpu')
+        }
+        e.newGuest = win
       }
     })
 }