@goodandready/dsh-voice 0.9.2 → 0.9.3

package/lib/client.js

@@ -773,6 +773,9 @@ window.__ModuleLoader__.load({
 
     function keyLabel(name) {
       if (!name) return t('keyUnset')
+      if (typeof name === 'string' && name.includes('+')) {
+        return name.split('+').map((p) => keyLabel(p)).join(' + ')
+      }
       if (name === 'Space') return t('keySpace')
       if (KEY_LABELS[name]) return KEY_LABELS[name]
       // Drop the Key/Digit prefix from codes like KeyR and Digit5.
@@ -781,10 +784,23 @@ window.__ModuleLoader__.load({
 
     // What to store on key press. Pure modifiers are remembered by name:
     // left and right have different codes but the user means "either".
+    // Supports combos like Control+Space or Alt+KeyV.
     function keyFromEvent(event) {
-      if (['Control', 'Alt', 'Shift', 'Meta'].includes(event.key)) return event.key
-      if (event.code) return event.code
-      return event.key || ''
+      if (!event) return ''
+      const modifiers = []
+      if (event.ctrlKey && event.key !== 'Control') modifiers.push('Control')
+      if (event.altKey && event.key !== 'Alt') modifiers.push('Alt')
+      if (event.shiftKey && event.key !== 'Shift') modifiers.push('Shift')
+      if (event.metaKey && event.key !== 'Meta') modifiers.push('Meta')
+
+      const main = ['Control', 'Alt', 'Shift', 'Meta'].includes(event.key)
+        ? event.key
+        : (event.code || event.key || '')
+
+      if (modifiers.length > 0 && !['Control', 'Alt', 'Shift', 'Meta'].includes(main)) {
+        return modifiers.concat(main).join('+')
+      }
+      return main
     }
 
     // Announce that the user started speaking.
@@ -1215,18 +1231,56 @@ window.__ModuleLoader__.load({
     // Hotkey: holding a key is easier than aiming the mouse. While the key is
     // down we record; Escape cancels.
     function hotkeyMatches(event, name) {
+      if (!event || !name) return false
+      if (typeof name === 'string' && name.includes('+')) {
+        const parts = name.split('+')
+        const main = parts[parts.length - 1]
+        const needCtrl = parts.includes('Control')
+        const needAlt = parts.includes('Alt')
+        const needShift = parts.includes('Shift')
+        const needMeta = parts.includes('Meta')
+        if (needCtrl && !event.ctrlKey) return false
+        if (needAlt && !event.altKey) return false
+        if (needShift && !event.shiftKey) return false
+        if (needMeta && !event.metaKey) return false
+        return event.code === main || event.key === main
+      }
       if (name === 'Control') return event.key === 'Control'
       if (name === 'Alt') return event.key === 'Alt'
       if (name === 'Shift') return event.key === 'Shift'
+      if (name === 'Meta') return event.key === 'Meta'
       return event.code === name || event.key === name
     }
 
+    function isAllowedInEditable(name) {
+      if (!name) return false
+      if (['Control', 'Alt', 'Shift', 'Meta'].includes(name)) return true
+      if (/^F\d{1,2}$/.test(name)) return true
+      if (typeof name === 'string' && name.includes('+')) return true
+      if (['Tab', 'Pause', 'ScrollLock', 'Insert'].includes(name)) return true
+      return false
+    }
+
+    let activeHotkeyCleanup = null
+
+    function clearGlobalHotkey() {
+      if (typeof activeHotkeyCleanup === 'function') {
+        try { activeHotkeyCleanup() } catch (_) { /* ignore */ }
+        activeHotkeyCleanup = null
+      }
+      if (typeof window !== 'undefined' && typeof window.__dsh_voice_hotkey_cleanup === 'function') {
+        try { window.__dsh_voice_hotkey_cleanup() } catch (_) { /* ignore */ }
+        window.__dsh_voice_hotkey_cleanup = null
+      }
+    }
+
     function installHotkey(ctx, keyName, mode) {
+      clearGlobalHotkey()
       if (typeof document === 'undefined' || !keyName) return () => {}
       const down = (event) => {
         if (event.repeat) return
-        // A modifier hotkey does not fight the text field: modifiers do not
-        // type. A plain letter key must not be hijacked while typing.
+        // A modifier, function key or combo does not fight the text field:
+        // modifiers/combos do not type plain text. A plain letter key must not be hijacked while typing.
         const target = event.target
         const isEditable = target && (
           target.tagName === 'INPUT' ||
@@ -1234,23 +1288,41 @@ window.__ModuleLoader__.load({
           target.isContentEditable ||
           (typeof target.getAttribute === 'function' && target.getAttribute('contenteditable') === 'true')
         )
-        if (isEditable && !['Control', 'Alt', 'Shift'].includes(keyName)) return
+        if (isEditable && !isAllowedInEditable(keyName)) return
 
-        if (hotkeyMatches(event, keyName)) beginHold(mode)
+        if (hotkeyMatches(event, keyName)) {
+          event.preventDefault()
+          event.stopPropagation()
+          beginHold(mode)
+        }
       }
       const up = (event) => {
-        if (hotkeyMatches(event, keyName)) endHold(false)
-        else if (event.key === 'Escape' && hold.armed) endHold(true)
+        if (hotkeyMatches(event, keyName)) {
+          event.preventDefault()
+          endHold(false)
+        } else if (event.key === 'Escape' && hold.armed) {
+          event.preventDefault()
+          endHold(true)
+        }
       }
       const blur = () => { if (hold.armed) endHold(true) }
       document.addEventListener('keydown', down, true)
       document.addEventListener('keyup', up, true)
       window.addEventListener('blur', blur)
-      return () => {
+      const cleanup = () => {
         document.removeEventListener('keydown', down, true)
         document.removeEventListener('keyup', up, true)
         window.removeEventListener('blur', blur)
+        if (activeHotkeyCleanup === cleanup) activeHotkeyCleanup = null
+        if (typeof window !== 'undefined' && window.__dsh_voice_hotkey_cleanup === cleanup) {
+          window.__dsh_voice_hotkey_cleanup = null
+        }
       }
+      activeHotkeyCleanup = cleanup
+      if (typeof window !== 'undefined') {
+        window.__dsh_voice_hotkey_cleanup = cleanup
+      }
+      return cleanup
     }
 
     function cancelCurrent() {
@@ -1941,6 +2013,7 @@ window.__ModuleLoader__.load({
           alive = false
           window.removeEventListener('dsh-voice:settings-saved', reload)
           dispose()
+          clearGlobalHotkey()
         }
       }, 'dsh-voice: hold hotkey')
 
@@ -2219,11 +2292,17 @@ window.__ModuleLoader__.load({
           if (event.key === 'Escape') { setCatching(false); return }
           const chosen = keyFromEvent(event)
           setDraft((d) => Object.assign({}, d || {}, { hotkey: chosen }))
+          voice.hotkey = chosen || ''
+          if (chosen) {
+            installHotkey(ctx, chosen, 'message')
+          } else {
+            clearGlobalHotkey()
+          }
           setCatching(false)
         }
         document.addEventListener('keydown', onKey, true)
         return () => document.removeEventListener('keydown', onKey, true)
-      }, [catching])
+      }, [catching, ctx])
 
       React.useEffect(() => {
         let alive = true
@@ -2562,7 +2641,14 @@ window.__ModuleLoader__.load({
         }
 
         const d = draft || {}
+        voice.hotkey = d.hotkey || ''
+        if (voice.hotkey) {
+          installHotkey(ctx, voice.hotkey, 'message')
+        } else {
+          clearGlobalHotkey()
+        }
         Object.assign(voice.settings, {
+          hotkey: d.hotkey || '',
           vadSilenceMs: Number(d.dictation && d.dictation.vadSilenceMs) || 700,
           autoSendMs: Number(d.message && d.message.autoSendMs) || 4000,
           beep: !!d.beep,
@@ -2611,7 +2697,11 @@ window.__ModuleLoader__.load({
           }, catching ? t('pressKey') : keyLabel(draft && draft.hotkey)),
           React.createElement('button', {
             type: 'button', className: 'cb-btn cb-btn-mini', title: t('clearKey'),
-            disabled: !writable, onClick: () => setDraft((d) => Object.assign({}, d || {}, { hotkey: '' })),
+            disabled: !writable, onClick: () => {
+              setDraft((d) => Object.assign({}, d || {}, { hotkey: '' }))
+              voice.hotkey = ''
+              clearGlobalHotkey()
+            },
           }, '×'),
         ),
         React.createElement('span', { className: 'dvs-sub' }, t('hotkeyHint1') + t('hotkeyHint2')),
@@ -3137,7 +3227,7 @@ window.__ModuleLoader__.load({
           React.createElement('div', { className: 'cb-section-desc' }, t('versionHint')),
           React.createElement('div', { className: 'cb-row', style: { alignItems: 'center', gap: '12px' } },
             React.createElement('span', { className: 'cb-badge cb-badge-ok' },
-              'v' + ((updaterStatus && updaterStatus.currentVersion) || '0.9.2')
+              'v' + ((updaterStatus && updaterStatus.currentVersion) || '0.9.3')
             ),
             updaterStatus && updaterStatus.updateAvailable
               ? React.createElement('span', { className: 'cb-badge cb-badge-warn' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-voice",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Voice input for DeepSeek Harness: dictation chunked by pauses and voice messages, each with its own provider fallback chain (Deepgram, Groq, HuggingFace, local whisper.cpp, plus any OpenAI-compatible API of your own).",
   "license": "MIT",
   "type": "module",