fixes

CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2021-06-10
+
+### Added
+
+- [macOS] Pause on Mic/Camera
+
+## [1.2.0] - 2021-06-01
+
+### Added
+
+- Progress bar
+
+## [1.1.2] - 2021-05-31
+
+### Fixed
+
+- Bug with update window when banner is currently open
+
 ## [1.1.1] - 2021-05-28
 
 ### Added

package.json

@@ -11,7 +11,7 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.1.1",
+  "version": "1.3.0",
   "main": "./dist/back/index.js",
   "scripts": {
     "start": "electron .",
@@ -23,7 +23,8 @@
     "build": "run-s build:*",
     "pack": "electron-builder -mwl",
     "pack:dev": "electron-builder -m dir && open ./out/mac/UnPixel.app",
-    "dist": "rm -rf .parcel-cache dist && run-s build pack"
+    "dist": "run-s clean build pack",
+    "clean": "rm -rf .parcel-cache dist out"
   },
   "browserslist": [
     "last 2 Chrome versions"
@@ -59,10 +60,10 @@
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "@types/semver": "^7.3.4",
-    "electron": "^12.0.0",
+    "electron": "^11",
     "electron-builder": "^22.10.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "next",
+    "parcel": "^2.0.0-beta.3.1",
     "postcss": "^8.2.10",
     "typescript": "^4.2.3"
   }

src/back/banner.ts

@@ -1,13 +1,11 @@
 import { join } from 'path'
 import os from 'os'
 import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron'
-import dayjs from 'dayjs'
-import logger from 'electron-log'
-import ms from 'ms'
 
 import { DEV } from '.'
 import Settings from './settings'
 import TrayUtility from './tray'
+import { InputDevicesStatus } from './utils'
 
 export default class Banner {
   static interval: ReturnType<typeof setInterval>
@@ -22,18 +20,21 @@ export default class Banner {
     })
   }
 
+  static shouldShow(): boolean {
+    const [paused, interval] = Settings.getStatus()
+    if (paused || interval > 1000) return false
+    if (InputDevicesStatus.areCameraOrMicrophoneActive()) return true
+    return true
+  }
+
   static check() {
     TrayUtility.build()
-    const [paused, interval] = Settings.getStatus()
-    if (!paused && interval < 1000) {
-      Banner.open()
-    }
+    if (Banner.shouldShow()) Banner.open()
   }
 
   static open() {
     if (this.window) return
 
-    logger.debug('Showing banner')
     const options: BrowserWindowConstructorOptions = {
       frame: false,
       webPreferences: {

src/back/index.ts

@@ -5,6 +5,7 @@ import TrayUtility from './tray'
 import Settings from './settings'
 import Banner from './banner'
 import Updater from './updater'
+import { InputDevicesStatus } from './utils'
 
 export const DEV = !app.isPackaged
 
@@ -27,6 +28,7 @@ app
     Settings.init()
     Banner.init()
     Updater.init()
+    InputDevicesStatus.init()
     logger.log('Done')
   })
   .catch((e) => {

src/back/settings.ts

@@ -19,6 +19,7 @@ const defaults = {
   lastRun: 0,
   autoClose: false,
   volume: 100,
+  skipOnCameraOrMic: true,
 }
 export type SettingKeys = keyof typeof defaults
 const IntNormalizer = (x: any) => parseInt(x)
@@ -31,6 +32,7 @@ const normalizers: Record<SettingKeys, (x: any) => any> = {
   paused: IntNormalizer,
   lastRun: IntNormalizer,
   volume: IntNormalizer,
+  skipOnCameraOrMic: BoolNormalizer,
 }
 
 export default class Settings {
@@ -66,7 +68,7 @@ export default class Settings {
     if (this.win) return
     this.win = new BrowserWindow({
       width: 400,
-      height: 630,
+      height: 690,
       center: true,
       resizable: false,
       webPreferences: {

src/back/tray.ts

@@ -4,13 +4,15 @@ import ms from 'ms'
 
 import Banner from './banner'
 import Settings from './settings'
+import { InputDevicesStatus } from './utils'
 
 export default class TrayUtility {
   static tray: Tray | null = null
 
   static build() {
     const [paused, interval] = Settings.getStatus()
-    const status = paused ? `Paused for: ${ms(interval)}` : `Next break: ${ms(interval)}`
+    let status = paused ? `Paused for: ${ms(interval)}` : `Next break: ${ms(interval)}`
+    if (InputDevicesStatus.areCameraOrMicrophoneActive()) status = `Paused: Mic/Camera Active`
 
     const template: Parameters<typeof Menu['buildFromTemplate']>[0] = [
       { label: status, type: 'normal', enabled: false },
@@ -60,11 +62,11 @@ export default class TrayUtility {
 
   static init() {
     if (!this.tray) {
-      const file = path.join(__dirname, '../../assets/trayTemplate.png')
-      // const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
-      // resized.setTemplateImage(true)
-      // resized.isMacTemplateImage = true
-      this.tray = new Tray(file)
+      const file = path.join(__dirname, '../../assets/tray.png')
+      const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
+      resized.setTemplateImage(true)
+      resized.isMacTemplateImage = true
+      this.tray = new Tray(resized)
       this.build()
     }
   }

src/back/updater.ts

@@ -4,6 +4,7 @@ import logger from 'electron-log'
 import { dialog, shell } from 'electron'
 
 import pkg from '../../package.json'
+import Banner from './banner'
 
 const current = semver.coerce(pkg.version)
 const url = 'https://api.github.com/repos/cupcakearmy/unpixel/tags'
@@ -25,7 +26,9 @@ export default class Updater {
     if (!current) throw new Error('Could not determine current version')
     if (semver.lt(current, latest)) {
       logger.info('New version available')
+      Banner.close()
       dialog
+        // @ts-ignore
         .showMessageBox(null, {
           title: 'Update available',
           message: 'A newer version is available, please download.',
@@ -35,7 +38,6 @@ export default class Updater {
         .then(({ response }) => {
           if (response === 0) {
             shell.openExternal('https://github.com/cupcakearmy/unpixel/releases')
-            process.exit(0)
           }
         })
     } else {

src/back/utils.ts

@@ -0,0 +1,49 @@
+import cp from 'child_process'
+import { promisify } from 'util'
+
+import Settings from './settings'
+
+const exec = promisify(cp.exec)
+
+export async function isCameraActive(): Promise<boolean> {
+  if (process.platform === 'darwin') {
+    // Check number of processes using the camera
+    const out = await exec(`lsof -n | grep "AppleCamera"`)
+    const processesUsingCamera = out.stdout.trim().split('\n').length
+    return processesUsingCamera > 1 // One is the apple daemon that is always active
+  }
+  return false
+}
+
+export async function isMicrophoneActive(): Promise<boolean> {
+  if (process.platform === 'darwin') {
+    const out = await exec(`ioreg -c AppleHDAEngineInput | grep "IOAudioEngineState"`)
+    const parsed = parseInt(out.stdout.trim().replace(/[^\d]/gim, ''))
+    return parsed > 0
+  }
+  return false
+}
+
+export class InputDevicesStatus {
+  static status = {
+    mic: false,
+    camera: false,
+  }
+
+  static update() {
+    // TODO: Update electron version as soon as issue is resolved https://github.com/electron/electron/issues/26143
+    isMicrophoneActive().then((result) => (InputDevicesStatus.status.mic = result))
+    isCameraActive().then((result) => (InputDevicesStatus.status.camera = result))
+  }
+
+  static init() {
+    setInterval(InputDevicesStatus.update, 2000)
+  }
+
+  static areCameraOrMicrophoneActive(): boolean {
+    if (Settings.load('skipOnCameraOrMic')) {
+      return InputDevicesStatus.status.mic || InputDevicesStatus.status.camera
+    }
+    return false
+  }
+}

src/front/banner/index.css

@@ -19,11 +19,6 @@ main {
   align-items: center;
 }
 
-h1 {
-  border-bottom: 0.5em solid currentColor;
-  padding-bottom: 0.15em;
-}
-
 .countdown {
   font-size: min(8rem, 25vh);
 }
@@ -58,3 +53,16 @@ button {
 button:hover {
   background-color: #2c2cce;
 }
+
+.progress {
+  width: 100%;
+  height: 3rem;
+  border: 0.125rem solid currentColor;
+}
+
+.progress > div {
+  background-color: currentColor;
+  height: 100%;
+  width: 100%;
+  transition: width ease-out 250ms;
+}

src/front/banner/index.tsx

@@ -30,6 +30,8 @@ const Banner: React.FC = () => {
 
   const [done, setDone] = useState(false)
   const [auto, setAuto] = useState(false)
+  const [progress, setProgress] = useState(100)
+  const [max, setMax] = useState(0)
   const [countdown, setCountdown] = useState<null | number>(null)
 
   const handler = useCallback(
@@ -57,16 +59,26 @@ const Banner: React.FC = () => {
     }
   }, [countdown])
 
+  useEffect(() => {
+    if (countdown !== null) {
+      setProgress((countdown / max) * 100)
+    }
+  }, [countdown, max])
+
   useEffect(() => {
     const autoClose = ipcRenderer.sendSync('load', { key: 'autoClose' })
     setAuto(autoClose)
     const time = ipcRenderer.sendSync('load', { key: 'duration' })
     setCountdown(time)
+    setMax(time)
   }, [])
 
   return (
     <div>
-      <h1 className="ma0 mb4">Look Away</h1>
+      <h1 className="ma0 mb3">Look Away</h1>
+      <div className="progress mb4">
+        <div style={{ width: progress.toFixed(2) + '%' }} />
+      </div>
       <div className="code countdown">{countdown}</div>
       <div className="tile message">
         Look at least <b>6 meters</b> away. <br />

src/front/settings/Field.tsx

@@ -7,6 +7,7 @@ const labels = {
   boot: ['Start on boot'],
   autoClose: ['Close window after countdown'],
   volume: ['Chime Volume'],
+  skipOnCameraOrMic: ['Pause when Mic or Camera are active'],
 }
 
 const ranges: Partial<Record<keyof typeof labels, [number, number]>> = {

src/front/settings/Settings.tsx

@@ -1,7 +1,5 @@
 import React from 'react'
 
-import '../base.css'
-
 import Field from './Field'
 
 const Settings = () => {
@@ -15,6 +13,10 @@ const Settings = () => {
           <Field setting="volume" />
           <Field setting="autoClose" />
           <Field setting="boot" />
+          <Field setting="skipOnCameraOrMic" />
+          <small className="ml4" style={{ position: 'relative', top: '-0.5em' }}>
+            only on <i>macOS</i>
+          </small>
         </fieldset>
       </form>
     </div>

src/front/settings/index.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8" />
     <title>Settings</title>
     <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
+    <link href="../base.css" rel="stylesheet" charset="utf-8" />
   </head>
   <body>
     <main></main>

src/front/settings/index.tsx

@@ -1,8 +1,6 @@
 import React from 'react'
 import { render } from 'react-dom'
 
-import '../base.css'
-
 import About from './About'
 import Settings from './Settings'
 import Footer from './Footer'