4ad1ae6ed4
Shortcuts were defined in four places that drifted apart: per-action IPC channel pairs, a hand-written VK table in the service, a second one in the renderer, and three copies of the keycap styling. Adding an action meant editing all of them, so two shortcuts stayed hardcoded in bootstrap and one had no settings entry at all. packages/core/src/keybinding.ts is now the single source for the binding type, the selectable key catalog, the action catalog, normalization, validation, conflict detection, display labels, search and deserialization. Main, preload and renderer all read from it; nothing redefines keys or rules locally. - Each action holds a list of bindings instead of one. AppConfig's four *Shortcut fields collapse into a single keyBindings map, migrated on launch. - Mouse buttons can be bound. Left click is refused, right/middle need a modifier, side buttons are free. uiohook cannot swallow events, so the original click still fires and the UI says so. - Keys can be picked from a grouped dropdown with a search box, not only by recording a keypress. - HOTKEY's 14 channels become KEYBINDING's 9, taking the action as a parameter, so actions no longer multiply channels. The history and command popups moved out of bootstrap into ordinary actions. - displayLabel is gone; labels derive from the binding and follow the app language and platform. Fixes found on the way: - Double-press hands-free was unreachable: lookup returned only the first matching action, and dictation shares its default binding. - Reserved-combination checks compared joined key names, so a different modifier order let Ctrl+C through. - Disabling shortcuts released every global registration in the process, including the popup ones, and never restored them. - Enabling shortcuts after starting disabled left nothing registered. - The dashboard stored the caption event payload instead of the state in it.
109 lines
5.9 KiB
Markdown
109 lines
5.9 KiB
Markdown
# 03 — Shared Packages Map
|
|
|
|
> Surface: `packages/*` (npm workspaces)
|
|
> Source of truth for: shared domain logic, design systems, i18n, API client
|
|
|
|
All packages are private, version `1.2.0`, source-only (`main`/`types` point at `src`).
|
|
|
|
---
|
|
|
|
## 1. `@d3ro/core` — business logic SSOT (`packages/core`)
|
|
|
|
The canonical place for types and cross-surface logic. Both desktop and web/mobile depend on it.
|
|
|
|
| Area | Exports | Notes |
|
|
|---|---|---|
|
|
| Types | `./types` | Domain types shared across surfaces |
|
|
| Errors | `./errors` | `D3ROError`, `ErrorCode` |
|
|
| IPC channels | `./ipc-channels` | `IPC_CHANNELS` object + `IPCChannel` union. **SSOT** for every desktop IPC channel (VOICE, AUDIO, STT, TTS, LLM, KEYBINDING, CONFIG, HISTORY, DICTIONARY, WINDOW, SYSTEM, STATS, MEMO, VOICE_COMMAND, CONTEXT, CHAIN, CAPTION, FILE_TRANSCRIPTION, MEETING_SUMMARY, DICTATION_TEMPLATE, VOICE_CONVERSATION, RAG, VOICE_ACTION, MEETING_MODE, MEETING_DOC_TEMPLATE, MEETING_CHAT, LICENSE, CLOUD_SYNC, INSTRUCTION, SYSTEM_AUDIO, POPUP_RESULT, POPUP_HISTORY, POPUP_COMMAND, POPUP_CAPTION, VOICE_PARTIAL, CLIPBOARD, APP, ONLINE_AUTH, ADS, SUPPORT, PAYMENT) |
|
|
| Key bindings | `./keybinding` | **SSOT** for every global shortcut in the app: `KeyBinding` (`device`/`code`/`ctrl`/`alt`/`shift`/`meta`), `KEY_CATALOG` (10 selectable groups incl. mouse), `KEYBINDING_ACTIONS` (6 rebindable actions), `bindingKey`/`normalizeBinding`/`validateBinding`/`detectBindingConflicts`/`formatBindingSegments`/`searchKeyCatalog`/`parseBindingMap`. Persisted as `AppConfig.keyBindings`. i18n keys are exposed as plain `string` so core stays independent of `@d3ro/i18n`; consumers narrow at the boundary (`asTranslationKey`) and a contract test guards the keys — accepted constraint, `11` §7 CONSTRAINT-I18N-01. Tests: `__tests__/keybinding*.test.ts` via `vitest.config.ts` (`npm run test --workspace=@d3ro/core`), 117 cases as of 2026-09-21 |
|
|
| Constants | `./constants` | Shared constants |
|
|
| Crypto license | `./utils/crypto-license` | Ed25519 license sign/verify (used by admin issuer + desktop verifier) |
|
|
| PII | `pii-redactor`, `secure-memory` | Redaction + secure memory helpers |
|
|
| Supabase config | `supabase-config` | Shared Supabase config shape |
|
|
| Entitlement | `./entitlement` | `EntitlementTier`, `AdminRole`, `EntitlementSnapshot`, `resolveEntitlement`, `normalizeEntitlementTier`/`normalizeAdminRole` — canonical tier/role contract across Supabase, desktop license, and .NET |
|
|
| Doc utils | `./utils/meeting-markdown`, `./utils/markdown-to-docx` | Meeting Markdown export + DOCX generation (dep: `docx`) |
|
|
|
|
**When to change:** new cross-surface type, new error code, new IPC channel, license format. Add here first, then consume.
|
|
|
|
---
|
|
|
|
## 2. `@d3ro/ui` — web/desktop design system (`packages/ui`)
|
|
|
|
| Export | Contents |
|
|
|---|---|
|
|
| `.` | Barrel |
|
|
| `./theme` | `theme.ts` — `d3roPalette`, `d3roTypo` (13 steps), `d3roShadow` (10), `d3roRadius` (7); 6 themes (dark/Midnight, light, nord, solarized, catppuccin, dracula) + build helpers |
|
|
| `./theme-vars` | CSS variable map for popups/vanilla surfaces |
|
|
| `./components/ds` | MUI/Emotion DS components: CrtDisplay, InstrumentPanel, Led, PhysicalButton, MetalCard, PhosphorText (13 variants), MetalDial, ScreenPanel, ButtonGroup, TiltCard, GradientWave, StatRing |
|
|
|
|
Peers: React 19, MUI 7, Emotion 11. Depends on `@d3ro/core`.
|
|
|
|
**Theme SSOT rule:** never hardcode hex outside `theme.ts`; use `d3roPalette`/`d3roShadow` tokens. `accent.amber` was removed in Wave 2; use `accent.main`.
|
|
|
|
---
|
|
|
|
## 3. `@d3ro/ui-native` — React Native design system (`packages/ui-native`)
|
|
|
|
| Provides |
|
|
|---|
|
|
| `NativeThemeProvider` / `useNativePalette`, native palette/typo/radius/fonts |
|
|
| Components: `MetalCard`, `PhosphorText`, `Led`, `PhysicalButton`, `ScreenPanel`, `WaveBars`, `AppStatusBar`, `Header`, `FilterChip` |
|
|
|
|
Peers: `react`, `react-native`. Consumed by `apps/mobile-rn` via file: workspace dependencies.
|
|
|
|
---
|
|
|
|
## 4. `@d3ro/i18n` — internationalization (`packages/i18n`)
|
|
|
|
| Provides | Notes |
|
|
|---|---|
|
|
| 12 locales | `ko` (master), `en`, `ja`, `zh`, `zh-TW`, `es`, `fr`, `de`, `pt`, `ru`, `vi`, `th` in `src/locales/` |
|
|
| Type-safe keys | `TranslationKey` derived from `ko.json` |
|
|
| React context | `I18nProvider`, `useI18n`, `TFunction` |
|
|
| Fallback chain | locale → `en` → `ko` → key |
|
|
| Formatters | `formatDate`, `formatNumber`, `formatRelativeDate`, `formatTime` via `Intl` |
|
|
| Storage injection | `I18nStorage` adapter (localStorage on web, AsyncStorage on mobile) |
|
|
|
|
Electron-independent. Rule: no hardcoded Korean/English strings in UI; use `t()`.
|
|
|
|
---
|
|
|
|
## 5. `@d3ro/api-client` — Supabase wrapper (`packages/api-client`)
|
|
|
|
| Export | Purpose |
|
|
|---|---|
|
|
| `client` | Base Supabase client factory |
|
|
| `auth` | Auth helpers |
|
|
| `meetings` | Meeting queries |
|
|
| `history` | History queries |
|
|
| `usage` | Usage queries |
|
|
| `transcribe` | STT calls |
|
|
| `supabase-browser` | Browser client (`getSupabaseBrowserClient`, `isSupabaseConfigured`) |
|
|
| `supabase-server` | Server client (`createSupabaseServerClient`) |
|
|
| `types` | Shared DB/domain types — **canonical; do not redefine table types per app** |
|
|
|
|
Deps: `@d3ro/core`, `@supabase/supabase-js`; optional peer `@supabase/ssr`. Tests: `__tests__/` (client, transcribe, types) via vitest.
|
|
|
|
Consumed by `apps/web`, `apps/admin` (via re-exports), `apps/mobile-rn`, and desktop cloud paths.
|
|
|
|
---
|
|
|
|
## 6. Dependency direction
|
|
|
|
```
|
|
@d3ro/i18n (standalone)
|
|
@d3ro/ui → @d3ro/core
|
|
@d3ro/ui-native(standalone, peers react-native)
|
|
@d3ro/api-client → @d3ro/core
|
|
@d3ro/core (standalone)
|
|
```
|
|
|
|
Apps depend on packages, never the reverse. Shared package changes ripple to all consumers (see `docs/REFACTOR_POLICY.md`).
|
|
|
|
---
|
|
|
|
## 7. Package-level gaps
|
|
|
|
- `apps/mobile-rn` is not an npm workspace member, so root `typecheck`/`test` skip it; use `typecheck:mobile`/`lint:mobile`/`test:mobile` from the repo root.
|
|
- No versioned publishing of packages (private, source-only); all consumers are in-repo.
|