From 4febd46baf2921661a7486c97f6a2847ece713cb Mon Sep 17 00:00:00 2001 From: Neko Date: Mon, 1 Dec 2025 00:49:08 +0800 Subject: [PATCH] fix(stage-tamagotchi,stage-shared): split eventa and beat-sync business into two entries (#779) --- apps/stage-tamagotchi/src/main/windows/beat-sync/index.ts | 2 +- apps/stage-tamagotchi/src/renderer/beat-sync.main.ts | 3 ++- .../src/renderer/components/InteractiveArea.vue | 2 -- packages/stage-shared/package.json | 2 ++ packages/stage-shared/src/beat-sync/eventa.ts | 7 +++++++ .../stage-shared/src/{beat-sync.ts => beat-sync/index.ts} | 7 +------ 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 packages/stage-shared/src/beat-sync/eventa.ts rename packages/stage-shared/src/{beat-sync.ts => beat-sync/index.ts} (91%) diff --git a/apps/stage-tamagotchi/src/main/windows/beat-sync/index.ts b/apps/stage-tamagotchi/src/main/windows/beat-sync/index.ts index b54fb3625..1f44fdec1 100644 --- a/apps/stage-tamagotchi/src/main/windows/beat-sync/index.ts +++ b/apps/stage-tamagotchi/src/main/windows/beat-sync/index.ts @@ -3,7 +3,7 @@ import { fileURLToPath } from 'node:url' import { defineInvoke, defineInvokeHandler } from '@moeru/eventa' import { createContext } from '@moeru/eventa/adapters/electron/main' -import { beatSyncRequestSignalBeat, beatSyncSignalBeat } from '@proj-airi/stage-shared' +import { beatSyncRequestSignalBeat, beatSyncSignalBeat } from '@proj-airi/stage-shared/beat-sync/eventa' import { BrowserWindow, ipcMain } from 'electron' import { baseUrl, getElectronMainDirname, load } from '../../libs/electron/location' diff --git a/apps/stage-tamagotchi/src/renderer/beat-sync.main.ts b/apps/stage-tamagotchi/src/renderer/beat-sync.main.ts index 5a59a80dd..d4cd24a65 100644 --- a/apps/stage-tamagotchi/src/renderer/beat-sync.main.ts +++ b/apps/stage-tamagotchi/src/renderer/beat-sync.main.ts @@ -1,6 +1,7 @@ import { defineInvoke, defineInvokeHandler } from '@moeru/eventa' import { createContext } from '@moeru/eventa/adapters/electron/renderer' -import { beatSyncRequestSignalBeat, beatSyncToggle, createBeatSyncDetector, StageEnvironment } from '@proj-airi/stage-shared' +import { createBeatSyncDetector, StageEnvironment } from '@proj-airi/stage-shared' +import { beatSyncRequestSignalBeat, beatSyncToggle } from '@proj-airi/stage-shared/beat-sync/eventa' const { ipcRenderer } = window.electron diff --git a/apps/stage-tamagotchi/src/renderer/components/InteractiveArea.vue b/apps/stage-tamagotchi/src/renderer/components/InteractiveArea.vue index 9f192ea49..c73481e3d 100644 --- a/apps/stage-tamagotchi/src/renderer/components/InteractiveArea.vue +++ b/apps/stage-tamagotchi/src/renderer/components/InteractiveArea.vue @@ -29,8 +29,6 @@ const { activeModel, activeProvider } = storeToRefs(useConsciousnessStore()) const isComposing = ref(false) async function handleSend() { - debugger - if (isComposing.value) { return } diff --git a/packages/stage-shared/package.json b/packages/stage-shared/package.json index 0727f7c45..ef417f586 100644 --- a/packages/stage-shared/package.json +++ b/packages/stage-shared/package.json @@ -16,6 +16,8 @@ }, "exports": { ".": "./src/index.ts", + "./beat-sync": "./src/beat-sync/index.ts", + "./beat-sync/eventa": "./src/beat-sync/eventa.ts", "./electron-renderer": "./src/electron-renderer.d.ts" }, "scripts": { diff --git a/packages/stage-shared/src/beat-sync/eventa.ts b/packages/stage-shared/src/beat-sync/eventa.ts new file mode 100644 index 000000000..a6cd0b227 --- /dev/null +++ b/packages/stage-shared/src/beat-sync/eventa.ts @@ -0,0 +1,7 @@ +import type { AnalyserBeatEvent } from '@nekopaw/tempora' + +import { defineInvokeEventa } from '@moeru/eventa' + +export const beatSyncToggle = defineInvokeEventa('eventa:event:electron:beat-sync:toggle') +export const beatSyncRequestSignalBeat = defineInvokeEventa('eventa:event:electron:beat-sync:request-signal-beat') +export const beatSyncSignalBeat = defineInvokeEventa('eventa:event:electron:beat-sync:signal-beat') diff --git a/packages/stage-shared/src/beat-sync.ts b/packages/stage-shared/src/beat-sync/index.ts similarity index 91% rename from packages/stage-shared/src/beat-sync.ts rename to packages/stage-shared/src/beat-sync/index.ts index 122102902..80bfb33d0 100644 --- a/packages/stage-shared/src/beat-sync.ts +++ b/packages/stage-shared/src/beat-sync/index.ts @@ -2,10 +2,9 @@ import type { Analyser, AnalyserBeatEvent, AnalyserWorkletParameters } from '@ne import analyserWorklet from '@nekopaw/tempora/worklet?url' -import { defineInvokeEventa } from '@moeru/eventa' import { startAnalyser as startTemporaAnalyser } from '@nekopaw/tempora' -import { StageEnvironment } from './environment' +import { StageEnvironment } from '../environment' export interface BeatSyncDetectorEventMap { stateChange: (isActive: boolean) => void @@ -190,7 +189,3 @@ export function createBeatSyncDetector(options: CreateBeatSyncDetectorOptions): get source() { return source }, } } - -export const beatSyncToggle = defineInvokeEventa('eventa:event:electron:beat-sync:toggle') -export const beatSyncRequestSignalBeat = defineInvokeEventa('eventa:event:electron:beat-sync:request-signal-beat') -export const beatSyncSignalBeat = defineInvokeEventa('eventa:event:electron:beat-sync:signal-beat')