hid-keymap 0.1.0 → 0.2.0

package/README.md

@@ -22,6 +22,8 @@ hid-keymap --map 0x01/0x97=key:escape
 hid-keymap --map 0x01/0x97=left_command+key:space
 ```
 
+Mapping mode stays running as a menu bar utility. Open its keyboard icon to see the configured source-to-target mappings, current status, and controls to stop, restart, or quit. The `--monitor` Event Viewer remains in the terminal and prints raw HID usage/value events.
+
 Use `hid-keymap --list-targets` to list accepted target names. By default, it listens to all keyboard collections; add `--device VID/PID` to scope a monitor or mapping to one keyboard.
 
 ## Permissions and behavior

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hid-keymap",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "macOS HID keyboard event viewer and key mapper",
   "bin": {
     "hid-keymap": "bin/hid-keymap.js"

package/src/hid-keymap.swift

@@ -1,4 +1,5 @@
 import ApplicationServices
+import AppKit
 import CoreGraphics
 import Foundation
 import IOKit.hid
@@ -305,6 +306,8 @@ private final class HIDMapper {
     private var activeTargets = Set<KeyTarget>()
     private var connectedDevices = Set<String>()
     private let formatter = ISO8601DateFormatter()
+    var onStatusChange: ((String) -> Void)?
+    private(set) var status = "Not started"
 
     init(options: CLIOptions) {
         eventViewer = options.monitor
@@ -356,9 +359,7 @@ private final class HIDMapper {
             print("Listening for HID changes from \(scope). Press Ctrl-C to stop.")
             print("Timestamp                      Device                                  Usage page   Usage        Value")
         } else {
-            for (source, target) in mappings.sorted(by: { $0.key.description < $1.key.description }) {
-                print("Mapping \(source) → \(target). Press Ctrl-C to stop.")
-            }
+            setStatus("Ready · \(mappings.count) mapping\(mappings.count == 1 ? "" : "s")")
         }
         fflush(stdout)
     }
@@ -386,6 +387,9 @@ private final class HIDMapper {
         guard changed else { return }
 
         updateTargets()
+        if !eventViewer, let target = mappings[code] {
+            setStatus(isDown ? "Pressed · \(target)" : "Ready · \(mappings.count) mapping\(mappings.count == 1 ? "" : "s")")
+        }
     }
 
     func setConnected(_ rawDevice: IOHIDDevice, connected: Bool) {
@@ -399,6 +403,7 @@ private final class HIDMapper {
             if eventViewer { print("[Disconnected] \(device.label)") }
             activeSources = activeSources.filter { $0.deviceID != device.id }
             updateTargets()
+            if !eventViewer { setStatus("Keyboard disconnected · waiting for input") }
         }
     }
 
@@ -429,6 +434,7 @@ private final class HIDMapper {
             IOHIDManagerUnscheduleFromRunLoop(manager, CFRunLoopGetMain(), CFRunLoopMode.defaultMode.rawValue)
         }
         manager = nil
+        if !eventViewer { setStatus("Stopped") }
     }
 
     private func releaseAllTargets() {
@@ -459,6 +465,124 @@ private final class HIDMapper {
         event.flags = target.modifiers.reduce(flags) { $0.union($1.flag) }
         event.post(tap: .cghidEventTap)
     }
+
+    func reportError(_ error: Error) {
+        setStatus(String(describing: error))
+    }
+
+    private func setStatus(_ newStatus: String) {
+        status = newStatus
+        onStatusChange?(newStatus)
+    }
+}
+
+private final class MappingMenuApp: NSObject, NSApplicationDelegate {
+    private let mapper: HIDMapper
+    private let mappings: [HIDMapping]
+    private let deviceFilter: DeviceFilter?
+    private var statusItem: NSStatusItem?
+    private var statusMenuItem: NSMenuItem?
+    private var interruptSource: DispatchSourceSignal?
+    private var terminateSource: DispatchSourceSignal?
+
+    init(options: CLIOptions) {
+        mapper = HIDMapper(options: options)
+        mappings = options.mappings ?? []
+        deviceFilter = options.deviceFilter
+    }
+
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        NSApp.setActivationPolicy(.accessory)
+        buildMenu()
+        mapper.onStatusChange = { [weak self] status in
+            self?.statusMenuItem?.title = status
+            self?.statusItem?.button?.toolTip = "hid-keymap · \(status)"
+        }
+        installSignalHandlers()
+        startMapping()
+    }
+
+    func applicationWillTerminate(_ notification: Notification) {
+        mapper.stop()
+    }
+
+    @objc private func stopMapping() {
+        mapper.stop()
+    }
+
+    @objc private func restartMapping() {
+        mapper.stop()
+        startMapping()
+    }
+
+    @objc private func quit() {
+        mapper.stop()
+        NSApp.terminate(nil)
+    }
+
+    private func startMapping() {
+        do {
+            try mapper.start()
+        } catch {
+            mapper.reportError(error)
+        }
+    }
+
+    private func buildMenu() {
+        let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+        item.button?.title = "⌨"
+        item.button?.toolTip = "hid-keymap"
+
+        let menu = NSMenu()
+        let status = NSMenuItem(title: mapper.status, action: nil, keyEquivalent: "")
+        status.isEnabled = false
+        menu.addItem(status)
+        statusMenuItem = status
+        menu.addItem(.separator())
+
+        for mapping in mappings.sorted(by: { $0.source.description < $1.source.description }) {
+            let line = NSMenuItem(title: "\(mapping.source) → \(mapping.target)", action: nil, keyEquivalent: "")
+            line.isEnabled = false
+            menu.addItem(line)
+        }
+        if let deviceFilter {
+            let scope = NSMenuItem(title: String(format: "Device · 0x%04x/0x%04x", deviceFilter.vendorID, deviceFilter.productID), action: nil, keyEquivalent: "")
+            scope.isEnabled = false
+            menu.addItem(scope)
+        } else {
+            let scope = NSMenuItem(title: "Device · all keyboards", action: nil, keyEquivalent: "")
+            scope.isEnabled = false
+            menu.addItem(scope)
+        }
+        menu.addItem(.separator())
+
+        let stopItem = NSMenuItem(title: "Stop Mapping", action: #selector(stopMapping), keyEquivalent: "")
+        stopItem.target = self
+        menu.addItem(stopItem)
+        let restartItem = NSMenuItem(title: "Restart Mapping", action: #selector(restartMapping), keyEquivalent: "")
+        restartItem.target = self
+        menu.addItem(restartItem)
+        menu.addItem(.separator())
+        let quitItem = NSMenuItem(title: "Quit hid-keymap", action: #selector(quit), keyEquivalent: "q")
+        quitItem.target = self
+        menu.addItem(quitItem)
+        item.menu = menu
+        statusItem = item
+    }
+
+    private func installSignalHandlers() {
+        signal(SIGINT, SIG_IGN)
+        let interrupt = DispatchSource.makeSignalSource(signal: SIGINT, queue: .main)
+        interrupt.setEventHandler { [weak self] in self?.quit() }
+        interrupt.resume()
+        interruptSource = interrupt
+
+        signal(SIGTERM, SIG_IGN)
+        let terminate = DispatchSource.makeSignalSource(signal: SIGTERM, queue: .main)
+        terminate.setEventHandler { [weak self] in self?.quit() }
+        terminate.resume()
+        terminateSource = terminate
+    }
 }
 
 @main
@@ -466,9 +590,16 @@ enum FnHIDMapMain {
     static func main() {
         do {
             let options = try parseArguments(Array(CommandLine.arguments.dropFirst()))
-            let mapper = HIDMapper(options: options)
-            try mapper.start()
-            mapper.run()
+            if options.monitor {
+                let mapper = HIDMapper(options: options)
+                try mapper.start()
+                mapper.run()
+            } else {
+                let app = NSApplication.shared
+                let delegate = MappingMenuApp(options: options)
+                app.delegate = delegate
+                app.run()
+            }
         } catch {
             fputs("hid-keymap: \(error)\nUse --help for usage.\n", stderr)
             exit(EXIT_FAILURE)