feat(mpc-system): 完善 co_managed_keygen 流程并添加调试控制台
主要改动: - service-party-app: 发起方创建会话后自动加入并设置 activeKeygenSession - service-party-app: 添加轮询机制确保 100% 可靠触发 keygen - service-party-app: 添加 DebugConsole 组件 (Ctrl+Shift+D 打开) - service-party-app: 主进程添加 debugLog 系统，日志可实时显示到前端 - session-coordinator: JoinSession 加入 messageRouterClient 发布事件 - session-coordinator: 添加 PublishSessionStarted 方法 修复: - 发起方不设置 activeKeygenSession 导致无法触发 keygen 的问题 - 加入方可能错过 session_started 事件的时序问题 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
a5ab2e8350
commit
5f4c7c135f
|
|
@ -8,16 +8,166 @@ import { DatabaseManager } from './modules/database';
|
|||
import { addressDerivationService, CHAIN_CONFIGS } from './modules/address-derivation';
|
||||
import { KavaTxService, KAVA_MAINNET_TX_CONFIG } from './modules/kava-tx-service';
|
||||
import { AccountClient } from './modules/account-client';
|
||||
import { TSSHandler, MockTSSHandler, KeygenResult } from './modules/tss-handler';
|
||||
|
||||
// 内置 HTTP 服务器端口
|
||||
const HTTP_PORT = 3456;
|
||||
|
||||
// 是否使用 Mock TSS Handler (开发模式)
|
||||
const USE_MOCK_TSS = process.env.USE_MOCK_TSS === 'true' || process.env.NODE_ENV === 'development';
|
||||
|
||||
// ===========================================================================
|
||||
// 调试日志系统
|
||||
// ===========================================================================
|
||||
let debugLogEnabled = false;
|
||||
|
||||
type LogLevel = 'info' | 'warn' | 'error' | 'debug';
|
||||
type LogSource = 'main' | 'grpc' | 'tss' | 'account' | 'renderer';
|
||||
|
||||
function sendDebugLog(level: LogLevel, source: LogSource, message: string) {
|
||||
if (debugLogEnabled && mainWindow) {
|
||||
mainWindow.webContents.send('debug:log', { level, source, message });
|
||||
}
|
||||
// 同时输出到控制台
|
||||
const prefix = `[${source.toUpperCase()}]`;
|
||||
switch (level) {
|
||||
case 'error':
|
||||
console.error(prefix, message);
|
||||
break;
|
||||
case 'warn':
|
||||
console.warn(prefix, message);
|
||||
break;
|
||||
case 'debug':
|
||||
console.debug(prefix, message);
|
||||
break;
|
||||
default:
|
||||
console.log(prefix, message);
|
||||
}
|
||||
}
|
||||
|
||||
// 创建日志辅助函数
|
||||
const debugLog = {
|
||||
info: (source: LogSource, message: string) => sendDebugLog('info', source, message),
|
||||
warn: (source: LogSource, message: string) => sendDebugLog('warn', source, message),
|
||||
error: (source: LogSource, message: string) => sendDebugLog('error', source, message),
|
||||
debug: (source: LogSource, message: string) => sendDebugLog('debug', source, message),
|
||||
};
|
||||
|
||||
let mainWindow: BrowserWindow | null = null;
|
||||
let grpcClient: GrpcClient | null = null;
|
||||
let database: DatabaseManager | null = null;
|
||||
let httpServer: ReturnType<typeof express.application.listen> | null = null;
|
||||
let kavaTxService: KavaTxService | null = null;
|
||||
let accountClient: AccountClient | null = null;
|
||||
let tssHandler: TSSHandler | MockTSSHandler | null = null;
|
||||
|
||||
// 当前正在进行的 Keygen 会话信息
|
||||
interface ActiveKeygenSession {
|
||||
sessionId: string;
|
||||
partyIndex: number;
|
||||
participants: Array<{ partyId: string; partyIndex: number; name: string }>;
|
||||
threshold: { t: number; n: number };
|
||||
walletName: string;
|
||||
encryptionPassword: string;
|
||||
}
|
||||
let activeKeygenSession: ActiveKeygenSession | null = null;
|
||||
|
||||
// 会话事件缓存 - 解决前端订阅时可能错过事件的时序问题
|
||||
// 当事件到达时，前端可能还在页面导航中，尚未订阅
|
||||
interface SessionEventData {
|
||||
type: string;
|
||||
sessionId: string;
|
||||
thresholdN?: number;
|
||||
thresholdT?: number;
|
||||
selectedParties?: string[];
|
||||
publicKey?: string;
|
||||
shareId?: string;
|
||||
allCompleted?: boolean;
|
||||
error?: string;
|
||||
}
|
||||
const sessionEventCache = new Map<string, SessionEventData[]>();
|
||||
const SESSION_EVENT_CACHE_MAX_AGE = 60000; // 60秒后清理缓存
|
||||
const sessionEventCacheTimestamps = new Map<string, number>();
|
||||
|
||||
// 添加事件到缓存
|
||||
function cacheSessionEvent(sessionId: string, event: SessionEventData) {
|
||||
if (!sessionEventCache.has(sessionId)) {
|
||||
sessionEventCache.set(sessionId, []);
|
||||
}
|
||||
sessionEventCache.get(sessionId)!.push(event);
|
||||
sessionEventCacheTimestamps.set(sessionId, Date.now());
|
||||
|
||||
// 清理过期缓存
|
||||
cleanExpiredEventCache();
|
||||
}
|
||||
|
||||
// 获取并清除缓存的事件
|
||||
function getAndClearCachedEvents(sessionId: string): SessionEventData[] {
|
||||
const events = sessionEventCache.get(sessionId) || [];
|
||||
sessionEventCache.delete(sessionId);
|
||||
sessionEventCacheTimestamps.delete(sessionId);
|
||||
return events;
|
||||
}
|
||||
|
||||
// 清理过期缓存
|
||||
function cleanExpiredEventCache() {
|
||||
const now = Date.now();
|
||||
for (const [sessionId, timestamp] of sessionEventCacheTimestamps.entries()) {
|
||||
if (now - timestamp > SESSION_EVENT_CACHE_MAX_AGE) {
|
||||
sessionEventCache.delete(sessionId);
|
||||
sessionEventCacheTimestamps.delete(sessionId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 检查并触发 keygen（100% 可靠方案：不依赖事件，直接检查状态）
|
||||
async function checkAndTriggerKeygen(sessionId: string) {
|
||||
if (!activeKeygenSession || activeKeygenSession.sessionId !== sessionId) {
|
||||
console.log('No matching active keygen session for', sessionId);
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果 TSS 已经在运行，不重复触发
|
||||
if (tssHandler?.getIsRunning()) {
|
||||
console.log('TSS already running, skip check');
|
||||
return;
|
||||
}
|
||||
|
||||
// 从 Account 服务获取最新会话状态
|
||||
try {
|
||||
const status = await accountClient?.getSessionStatus(sessionId);
|
||||
if (!status) {
|
||||
debugLog.warn('main', 'Failed to get session status');
|
||||
return;
|
||||
}
|
||||
|
||||
debugLog.info('main', `Session ${sessionId} status: ${status.status} (${status.completed_parties}/${status.total_parties} parties)`);
|
||||
|
||||
// 如果会话已经是 in_progress 或 all_joined，或者参与方已满，触发 keygen
|
||||
// 使用 status 字段判断是否可以开始
|
||||
if (status.status === 'in_progress' ||
|
||||
status.status === 'all_joined' ||
|
||||
status.status === 'waiting_for_keygen') {
|
||||
|
||||
debugLog.info('main', 'Session ready, triggering keygen...');
|
||||
|
||||
// 使用 activeKeygenSession 中已有的参与者信息
|
||||
const selectedParties = activeKeygenSession.participants.map(p => p.partyId);
|
||||
|
||||
await handleSessionStart({
|
||||
eventType: 'session_started',
|
||||
sessionId: sessionId,
|
||||
thresholdN: activeKeygenSession.threshold.n,
|
||||
thresholdT: activeKeygenSession.threshold.t,
|
||||
selectedParties: selectedParties,
|
||||
});
|
||||
} else {
|
||||
debugLog.debug('main', `Session not ready yet, status: ${status.status}`);
|
||||
}
|
||||
} catch (error) {
|
||||
debugLog.error('main', `Failed to check session status: ${error}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 创建主窗口
|
||||
function createWindow() {
|
||||
|
|
@ -105,6 +255,38 @@ async function initServices() {
|
|||
// 初始化 gRPC 客户端
|
||||
grpcClient = new GrpcClient();
|
||||
|
||||
// 初始化 TSS Handler
|
||||
if (USE_MOCK_TSS) {
|
||||
debugLog.info('tss', 'Using Mock TSS Handler (development mode)');
|
||||
tssHandler = new MockTSSHandler(grpcClient);
|
||||
} else {
|
||||
debugLog.info('tss', 'Using real TSS Handler');
|
||||
tssHandler = new TSSHandler(grpcClient);
|
||||
}
|
||||
|
||||
// 设置 TSS 进度事件监听
|
||||
tssHandler.on('progress', (progress: { round: number; totalRounds: number }) => {
|
||||
debugLog.info('tss', `Keygen progress: round ${progress.round}/${progress.totalRounds}`);
|
||||
// 通知前端更新进度
|
||||
if (activeKeygenSession) {
|
||||
mainWindow?.webContents.send(`session:events:${activeKeygenSession.sessionId}`, {
|
||||
type: 'progress',
|
||||
round: progress.round,
|
||||
totalRounds: progress.totalRounds,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
tssHandler.on('error', (error: Error) => {
|
||||
debugLog.error('tss', `TSS error: ${error.message}`);
|
||||
if (activeKeygenSession) {
|
||||
mainWindow?.webContents.send(`session:events:${activeKeygenSession.sessionId}`, {
|
||||
type: 'failed',
|
||||
error: error.message,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// 初始化 Kava 交易服务
|
||||
kavaTxService = new KavaTxService(KAVA_MAINNET_TX_CONFIG);
|
||||
|
||||
|
|
@ -113,20 +295,171 @@ async function initServices() {
|
|||
const settings = database.getAllSettings();
|
||||
const accountServiceUrl = settings['account_service_url'] || 'https://rwaapi.szaiai.com';
|
||||
accountClient = new AccountClient(accountServiceUrl);
|
||||
debugLog.info('account', `Account service URL: ${accountServiceUrl}`);
|
||||
|
||||
// 设置 IPC 处理器
|
||||
setupIpcHandlers();
|
||||
|
||||
// 启动时自动连接并注册到 Message Router (非阻塞)
|
||||
connectAndRegisterToMessageRouter().catch((err) => {
|
||||
console.error('Background connection failed:', err.message);
|
||||
debugLog.error('grpc', `Background connection failed: ${err.message}`);
|
||||
});
|
||||
}
|
||||
|
||||
// 处理会话开始事件 - 触发 Keygen
|
||||
async function handleSessionStart(event: {
|
||||
eventType: string;
|
||||
sessionId: string;
|
||||
thresholdN: number;
|
||||
thresholdT: number;
|
||||
selectedParties: string[];
|
||||
}) {
|
||||
if (!activeKeygenSession) {
|
||||
debugLog.debug('main', 'No active keygen session, ignoring session start event');
|
||||
return;
|
||||
}
|
||||
|
||||
if (activeKeygenSession.sessionId !== event.sessionId) {
|
||||
debugLog.debug('main', `Session ID mismatch: expected ${activeKeygenSession.sessionId}, got ${event.sessionId}`);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!tssHandler) {
|
||||
debugLog.error('tss', 'TSS handler not initialized');
|
||||
mainWindow?.webContents.send(`session:events:${event.sessionId}`, {
|
||||
type: 'failed',
|
||||
error: 'TSS handler not initialized',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 从事件中更新参与者列表（如果事件包含完整列表）
|
||||
if (event.selectedParties && event.selectedParties.length > 0) {
|
||||
const myPartyId = grpcClient?.getPartyId();
|
||||
const updatedParticipants: Array<{ partyId: string; partyIndex: number; name: string }> = [];
|
||||
|
||||
event.selectedParties.forEach((partyId, index) => {
|
||||
// 查找已有的参与者信息
|
||||
const existing = activeKeygenSession!.participants.find(p => p.partyId === partyId);
|
||||
updatedParticipants.push({
|
||||
partyId: partyId,
|
||||
partyIndex: index,
|
||||
name: existing?.name || (partyId === myPartyId ? '我' : `参与方 ${index + 1}`),
|
||||
});
|
||||
});
|
||||
|
||||
activeKeygenSession.participants = updatedParticipants;
|
||||
|
||||
// 更新自己的 partyIndex
|
||||
const myInfo = updatedParticipants.find(p => p.partyId === myPartyId);
|
||||
if (myInfo) {
|
||||
activeKeygenSession.partyIndex = myInfo.partyIndex;
|
||||
}
|
||||
|
||||
debugLog.info('main', `Updated participants: ${JSON.stringify(updatedParticipants.map(p => ({
|
||||
partyId: p.partyId.substring(0, 8) + '...',
|
||||
partyIndex: p.partyIndex,
|
||||
name: p.name,
|
||||
})))}`);
|
||||
}
|
||||
|
||||
debugLog.info('tss', `Starting keygen for session ${event.sessionId}...`);
|
||||
|
||||
try {
|
||||
const result = await tssHandler.participateKeygen(
|
||||
activeKeygenSession.sessionId,
|
||||
grpcClient?.getPartyId() || '',
|
||||
activeKeygenSession.partyIndex,
|
||||
activeKeygenSession.participants,
|
||||
activeKeygenSession.threshold,
|
||||
activeKeygenSession.encryptionPassword
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
debugLog.info('tss', 'Keygen completed successfully');
|
||||
await handleKeygenComplete(result);
|
||||
} else {
|
||||
debugLog.error('tss', `Keygen failed: ${result.error}`);
|
||||
mainWindow?.webContents.send(`session:events:${activeKeygenSession.sessionId}`, {
|
||||
type: 'failed',
|
||||
error: result.error || 'Keygen failed',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
debugLog.error('tss', `Keygen error: ${(error as Error).message}`);
|
||||
mainWindow?.webContents.send(`session:events:${activeKeygenSession?.sessionId}`, {
|
||||
type: 'failed',
|
||||
error: (error as Error).message,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 处理 Keygen 完成 - 保存 share 并报告完成
|
||||
async function handleKeygenComplete(result: KeygenResult) {
|
||||
if (!activeKeygenSession || !database || !grpcClient) {
|
||||
debugLog.error('main', 'Missing required components for keygen completion');
|
||||
return;
|
||||
}
|
||||
|
||||
const sessionId = activeKeygenSession.sessionId;
|
||||
const partyId = grpcClient.getPartyId();
|
||||
|
||||
try {
|
||||
// 1. 保存 share 到本地数据库
|
||||
const publicKeyHex = result.publicKey.toString('hex');
|
||||
// 转换 participants 格式：从 { partyId, partyIndex, name } 到 { partyId, name }
|
||||
const participantsForSave = activeKeygenSession.participants.map(p => ({
|
||||
partyId: p.partyId,
|
||||
name: p.name,
|
||||
}));
|
||||
const saved = database.saveShare({
|
||||
sessionId: sessionId,
|
||||
walletName: activeKeygenSession.walletName,
|
||||
partyId: partyId || '',
|
||||
partyIndex: result.partyIndex,
|
||||
thresholdT: activeKeygenSession.threshold.t,
|
||||
thresholdN: activeKeygenSession.threshold.n,
|
||||
publicKeyHex: publicKeyHex,
|
||||
rawShare: result.encryptedShare.toString('base64'),
|
||||
participants: participantsForSave,
|
||||
}, activeKeygenSession.encryptionPassword);
|
||||
|
||||
debugLog.info('main', `Share saved to local database: ${saved?.id}`);
|
||||
|
||||
// 2. 报告完成给 session-coordinator
|
||||
const allCompleted = await grpcClient.reportCompletion(
|
||||
sessionId,
|
||||
partyId || '',
|
||||
result.publicKey
|
||||
);
|
||||
|
||||
debugLog.info('grpc', `Reported completion to session-coordinator, all_completed: ${allCompleted}`);
|
||||
|
||||
// 3. 通知前端
|
||||
mainWindow?.webContents.send(`session:events:${sessionId}`, {
|
||||
type: 'completed',
|
||||
publicKey: publicKeyHex,
|
||||
shareId: saved?.id,
|
||||
allCompleted: allCompleted,
|
||||
});
|
||||
|
||||
// 4. 清理活跃会话
|
||||
activeKeygenSession = null;
|
||||
debugLog.info('main', 'Keygen session completed and cleaned up');
|
||||
|
||||
} catch (error) {
|
||||
debugLog.error('main', `Failed to handle keygen completion: ${error}`);
|
||||
mainWindow?.webContents.send(`session:events:${sessionId}`, {
|
||||
type: 'failed',
|
||||
error: (error as Error).message,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 连接并注册到 Message Router
|
||||
async function connectAndRegisterToMessageRouter() {
|
||||
if (!grpcClient || !database) {
|
||||
console.error('gRPC client or database not initialized');
|
||||
debugLog.error('grpc', 'gRPC client or database not initialized');
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -136,17 +469,51 @@ async function connectAndRegisterToMessageRouter() {
|
|||
const partyId = getOrCreatePartyId(database);
|
||||
const role = 'temporary'; // Service-Party-App 使用 temporary 角色
|
||||
|
||||
console.log(`Connecting to Message Router: ${routerUrl}...`);
|
||||
debugLog.info('grpc', `Connecting to Message Router: ${routerUrl}...`);
|
||||
await grpcClient.connect(routerUrl);
|
||||
console.log('Connected to Message Router');
|
||||
debugLog.info('grpc', 'Connected to Message Router');
|
||||
|
||||
console.log(`Registering as party: ${partyId} (role: ${role})...`);
|
||||
debugLog.info('grpc', `Registering as party: ${partyId} (role: ${role})...`);
|
||||
await grpcClient.registerParty(partyId, role);
|
||||
console.log('Registered to Message Router successfully');
|
||||
debugLog.info('grpc', 'Registered to Message Router successfully');
|
||||
|
||||
// 订阅会话事件
|
||||
grpcClient.subscribeSessionEvents(partyId);
|
||||
console.log('Subscribed to session events');
|
||||
debugLog.info('grpc', 'Subscribed to session events');
|
||||
|
||||
// 监听会话事件并处理
|
||||
grpcClient.on('sessionEvent', async (event: {
|
||||
eventId: string;
|
||||
eventType: string;
|
||||
sessionId: string;
|
||||
thresholdN: number;
|
||||
thresholdT: number;
|
||||
selectedParties: string[];
|
||||
joinTokens: Record<string, string>;
|
||||
messageHash?: Buffer;
|
||||
}) => {
|
||||
debugLog.info('grpc', `Received session event: ${event.eventType} for session ${event.sessionId}`);
|
||||
|
||||
const eventData: SessionEventData = {
|
||||
type: event.eventType,
|
||||
sessionId: event.sessionId,
|
||||
thresholdN: event.thresholdN,
|
||||
thresholdT: event.thresholdT,
|
||||
selectedParties: event.selectedParties,
|
||||
};
|
||||
|
||||
// 缓存事件（解决前端可能还未订阅的时序问题）
|
||||
cacheSessionEvent(event.sessionId, eventData);
|
||||
|
||||
// 转发事件到前端
|
||||
mainWindow?.webContents.send(`session:events:${event.sessionId}`, eventData);
|
||||
|
||||
// 根据事件类型处理
|
||||
if (event.eventType === 'session_started' || event.eventType === 'all_joined') {
|
||||
// 当会话开始或所有参与方都加入时，检查是否需要触发 keygen
|
||||
await handleSessionStart(event);
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to connect/register to Message Router:', (error as Error).message);
|
||||
// 不抛出错误，允许应用继续启动，用户可以稍后手动重试
|
||||
|
|
@ -180,9 +547,52 @@ function setupIpcHandlers() {
|
|||
});
|
||||
|
||||
// 加入会话
|
||||
ipcMain.handle('grpc:joinSession', async (_event, { sessionId, partyId, joinToken }) => {
|
||||
ipcMain.handle('grpc:joinSession', async (_event, { sessionId, partyId, joinToken, walletName }) => {
|
||||
try {
|
||||
const result = await grpcClient?.joinSession(sessionId, partyId, joinToken);
|
||||
if (result?.success) {
|
||||
// 设置活跃的 keygen 会话信息
|
||||
const participants: Array<{ partyId: string; partyIndex: number; name: string }> = result.otherParties?.map((p: { partyId: string; partyIndex: number }, idx: number) => ({
|
||||
partyId: p.partyId,
|
||||
partyIndex: p.partyIndex,
|
||||
name: `参与方 ${idx + 1}`, // 暂时使用默认名称
|
||||
})) || [];
|
||||
|
||||
// 添加自己到参与者列表
|
||||
participants.push({
|
||||
partyId: partyId,
|
||||
partyIndex: result.partyIndex,
|
||||
name: '我',
|
||||
});
|
||||
|
||||
// 按 partyIndex 排序
|
||||
participants.sort((a, b) => a.partyIndex - b.partyIndex);
|
||||
|
||||
activeKeygenSession = {
|
||||
sessionId: sessionId,
|
||||
partyIndex: result.partyIndex,
|
||||
participants: participants,
|
||||
threshold: {
|
||||
t: result.sessionInfo?.thresholdT || 0,
|
||||
n: result.sessionInfo?.thresholdN || 0,
|
||||
},
|
||||
walletName: walletName || result.sessionInfo?.sessionId || 'Shared Wallet',
|
||||
encryptionPassword: '', // 不使用加密密码
|
||||
};
|
||||
|
||||
console.log('Active keygen session set:', {
|
||||
sessionId: activeKeygenSession.sessionId,
|
||||
partyIndex: activeKeygenSession.partyIndex,
|
||||
participantCount: activeKeygenSession.participants.length,
|
||||
threshold: activeKeygenSession.threshold,
|
||||
});
|
||||
|
||||
// 100% 可靠方案：延迟检查会话状态，如果所有人都已加入则触发 keygen
|
||||
// 这样即使错过 session_started 事件也能正常工作
|
||||
setTimeout(() => {
|
||||
checkAndTriggerKeygen(sessionId);
|
||||
}, 1000); // 延迟 1 秒等待可能的事件到达
|
||||
}
|
||||
return { success: true, data: result };
|
||||
} catch (error) {
|
||||
return { success: false, error: (error as Error).message };
|
||||
|
|
@ -208,6 +618,58 @@ function setupIpcHandlers() {
|
|||
external_count: params.thresholdN, // 所有参与方都是外部 party
|
||||
expires_in_seconds: 86400, // 24 小时
|
||||
});
|
||||
|
||||
if (!result?.session_id) {
|
||||
return { success: false, error: '创建会话失败: 未返回会话ID' };
|
||||
}
|
||||
|
||||
// 发起方自动加入会话
|
||||
const joinToken = result.join_tokens?.[partyId];
|
||||
if (joinToken) {
|
||||
console.log('Initiator auto-joining session...');
|
||||
const joinResult = await grpcClient?.joinSession(result.session_id, partyId, joinToken);
|
||||
|
||||
if (joinResult?.success) {
|
||||
// 设置活跃的 keygen 会话信息
|
||||
const participants: Array<{ partyId: string; partyIndex: number; name: string }> = [];
|
||||
|
||||
// 添加发起方（自己）
|
||||
participants.push({
|
||||
partyId: partyId,
|
||||
partyIndex: joinResult.partyIndex,
|
||||
name: params.initiatorName || '发起者',
|
||||
});
|
||||
|
||||
activeKeygenSession = {
|
||||
sessionId: result.session_id,
|
||||
partyIndex: joinResult.partyIndex,
|
||||
participants: participants,
|
||||
threshold: {
|
||||
t: params.thresholdT,
|
||||
n: params.thresholdN,
|
||||
},
|
||||
walletName: params.walletName,
|
||||
encryptionPassword: '', // 不使用加密密码
|
||||
};
|
||||
|
||||
console.log('Initiator active keygen session set:', {
|
||||
sessionId: activeKeygenSession.sessionId,
|
||||
partyIndex: activeKeygenSession.partyIndex,
|
||||
participantCount: activeKeygenSession.participants.length,
|
||||
threshold: activeKeygenSession.threshold,
|
||||
});
|
||||
|
||||
// 100% 可靠方案：延迟检查会话状态，如果所有人都已加入则触发 keygen
|
||||
setTimeout(() => {
|
||||
checkAndTriggerKeygen(result.session_id);
|
||||
}, 1000);
|
||||
} else {
|
||||
console.warn('Initiator failed to join session');
|
||||
}
|
||||
} else {
|
||||
console.warn('No join token found for initiator partyId:', partyId);
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
sessionId: result?.session_id,
|
||||
|
|
@ -856,6 +1318,26 @@ function setupIpcHandlers() {
|
|||
});
|
||||
return result.canceled ? null : result.filePath;
|
||||
});
|
||||
|
||||
// ===========================================================================
|
||||
// 调试相关
|
||||
// ===========================================================================
|
||||
|
||||
// 订阅日志
|
||||
ipcMain.on('debug:subscribe', () => {
|
||||
debugLogEnabled = true;
|
||||
debugLog.info('main', 'Debug console connected');
|
||||
});
|
||||
|
||||
// 取消订阅日志
|
||||
ipcMain.on('debug:unsubscribe', () => {
|
||||
debugLogEnabled = false;
|
||||
});
|
||||
|
||||
// 接收来自渲染进程的日志
|
||||
ipcMain.on('debug:log', (_event, { level, source, message }) => {
|
||||
sendDebugLog(level as LogLevel, source as LogSource, message);
|
||||
});
|
||||
}
|
||||
|
||||
// 应用生命周期
|
||||
|
|
|
|||
|
|
@ -16,8 +16,12 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||
initiatorName: string;
|
||||
}) => ipcRenderer.invoke('grpc:createSession', params),
|
||||
|
||||
joinSession: (params: { sessionId: string; partyId: string; joinToken: string }) =>
|
||||
ipcRenderer.invoke('grpc:joinSession', params),
|
||||
joinSession: (params: {
|
||||
sessionId: string;
|
||||
partyId: string;
|
||||
joinToken: string;
|
||||
walletName?: string;
|
||||
}) => ipcRenderer.invoke('grpc:joinSession', params),
|
||||
|
||||
validateInviteCode: (code: string) =>
|
||||
ipcRenderer.invoke('grpc:validateInviteCode', { code }),
|
||||
|
|
@ -246,4 +250,26 @@ contextBridge.exposeInMainWorld('electronAPI', {
|
|||
saveFile: (defaultPath?: string, filters?: { name: string; extensions: string[] }[]) =>
|
||||
ipcRenderer.invoke('dialog:saveFile', { defaultPath, filters }),
|
||||
},
|
||||
|
||||
// ===========================================================================
|
||||
// 调试相关
|
||||
// ===========================================================================
|
||||
debug: {
|
||||
// 订阅主进程日志
|
||||
subscribeLogs: (callback: (event: unknown, data: { level: string; source: string; message: string }) => void) => {
|
||||
ipcRenderer.on('debug:log', callback);
|
||||
ipcRenderer.send('debug:subscribe');
|
||||
},
|
||||
|
||||
// 取消订阅
|
||||
unsubscribeLogs: () => {
|
||||
ipcRenderer.removeAllListeners('debug:log');
|
||||
ipcRenderer.send('debug:unsubscribe');
|
||||
},
|
||||
|
||||
// 发送日志到主进程
|
||||
log: (level: string, source: string, message: string) => {
|
||||
ipcRenderer.send('debug:log', { level, source, message });
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
import { useState } from 'react';
|
||||
import { useState, useEffect } from 'react';
|
||||
import { Routes, Route, Navigate } from 'react-router-dom';
|
||||
import Layout from './components/Layout';
|
||||
import StartupCheck from './components/StartupCheck';
|
||||
import DebugConsole from './components/DebugConsole';
|
||||
import Home from './pages/Home';
|
||||
import Join from './pages/Join';
|
||||
import Create from './pages/Create';
|
||||
|
|
@ -11,6 +12,20 @@ import Settings from './pages/Settings';
|
|||
|
||||
function App() {
|
||||
const [startupComplete, setStartupComplete] = useState(false);
|
||||
const [showDebugConsole, setShowDebugConsole] = useState(false);
|
||||
|
||||
// 监听键盘快捷键 Ctrl+Shift+D 打开调试窗口
|
||||
useEffect(() => {
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.ctrlKey && e.shiftKey && e.key === 'D') {
|
||||
e.preventDefault();
|
||||
setShowDebugConsole(prev => !prev);
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener('keydown', handleKeyDown);
|
||||
return () => window.removeEventListener('keydown', handleKeyDown);
|
||||
}, []);
|
||||
|
||||
// 显示启动检测页面
|
||||
if (!startupComplete) {
|
||||
|
|
@ -18,19 +33,25 @@ function App() {
|
|||
}
|
||||
|
||||
return (
|
||||
<Layout>
|
||||
<Routes>
|
||||
<Route path="/" element={<Home />} />
|
||||
<Route path="/join" element={<Join />} />
|
||||
<Route path="/join/:inviteCode" element={<Join />} />
|
||||
<Route path="/create" element={<Create />} />
|
||||
<Route path="/session/:sessionId" element={<Session />} />
|
||||
<Route path="/sign" element={<Sign />} />
|
||||
<Route path="/sign/:sessionId" element={<Sign />} />
|
||||
<Route path="/settings" element={<Settings />} />
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
</Layout>
|
||||
<>
|
||||
<Layout>
|
||||
<Routes>
|
||||
<Route path="/" element={<Home />} />
|
||||
<Route path="/join" element={<Join />} />
|
||||
<Route path="/join/:inviteCode" element={<Join />} />
|
||||
<Route path="/create" element={<Create />} />
|
||||
<Route path="/session/:sessionId" element={<Session />} />
|
||||
<Route path="/sign" element={<Sign />} />
|
||||
<Route path="/sign/:sessionId" element={<Sign />} />
|
||||
<Route path="/settings" element={<Settings />} />
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
</Layout>
|
||||
<DebugConsole
|
||||
isOpen={showDebugConsole}
|
||||
onClose={() => setShowDebugConsole(false)}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
.overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.console {
|
||||
width: 90%;
|
||||
max-width: 1200px;
|
||||
height: 80%;
|
||||
background: #1e1e1e;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.5);
|
||||
font-family: 'Consolas', 'Monaco', 'Courier New', monospace;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 12px 16px;
|
||||
background: #2d2d2d;
|
||||
border-radius: 8px 8px 0 0;
|
||||
border-bottom: 1px solid #3d3d3d;
|
||||
}
|
||||
|
||||
.header h3 {
|
||||
margin: 0;
|
||||
color: #e0e0e0;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.controls {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.filter {
|
||||
background: #3d3d3d;
|
||||
border: 1px solid #4d4d4d;
|
||||
color: #e0e0e0;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.filter:hover {
|
||||
border-color: #5d5d5d;
|
||||
}
|
||||
|
||||
.btn {
|
||||
background: #3d3d3d;
|
||||
border: 1px solid #4d4d4d;
|
||||
color: #e0e0e0;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.btn:hover {
|
||||
background: #4d4d4d;
|
||||
}
|
||||
|
||||
.btn.active {
|
||||
background: #4a6da7;
|
||||
border-color: #5a7db7;
|
||||
}
|
||||
|
||||
.btn.paused {
|
||||
background: #7a4a4a;
|
||||
border-color: #8a5a5a;
|
||||
}
|
||||
|
||||
.closeBtn {
|
||||
background: transparent;
|
||||
border: none;
|
||||
color: #888;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
padding: 4px 8px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.closeBtn:hover {
|
||||
color: #e0e0e0;
|
||||
}
|
||||
|
||||
.logs {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
padding: 8px 0;
|
||||
font-size: 12px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.logs::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
.logs::-webkit-scrollbar-track {
|
||||
background: #2d2d2d;
|
||||
}
|
||||
|
||||
.logs::-webkit-scrollbar-thumb {
|
||||
background: #4d4d4d;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.logs::-webkit-scrollbar-thumb:hover {
|
||||
background: #5d5d5d;
|
||||
}
|
||||
|
||||
.empty {
|
||||
color: #666;
|
||||
text-align: center;
|
||||
padding: 40px;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.logEntry {
|
||||
display: flex;
|
||||
padding: 2px 16px;
|
||||
gap: 8px;
|
||||
border-left: 3px solid transparent;
|
||||
}
|
||||
|
||||
.logEntry:hover {
|
||||
background: #2a2a2a;
|
||||
}
|
||||
|
||||
.logEntry.info {
|
||||
border-left-color: #4caf50;
|
||||
}
|
||||
|
||||
.logEntry.warn {
|
||||
border-left-color: #ff9800;
|
||||
background: rgba(255, 152, 0, 0.1);
|
||||
}
|
||||
|
||||
.logEntry.error {
|
||||
border-left-color: #f44336;
|
||||
background: rgba(244, 67, 54, 0.1);
|
||||
}
|
||||
|
||||
.logEntry.debug {
|
||||
border-left-color: #9e9e9e;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.timestamp {
|
||||
color: #666;
|
||||
flex-shrink: 0;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.source {
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
font-size: 11px;
|
||||
min-width: 70px;
|
||||
}
|
||||
|
||||
.message {
|
||||
color: #d4d4d4;
|
||||
word-break: break-all;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 8px 16px;
|
||||
background: #2d2d2d;
|
||||
border-radius: 0 0 8px 8px;
|
||||
border-top: 1px solid #3d3d3d;
|
||||
color: #666;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
|
@ -0,0 +1,218 @@
|
|||
import { useState, useEffect, useRef, useCallback } from 'react';
|
||||
import styles from './DebugConsole.module.css';
|
||||
|
||||
interface LogEntry {
|
||||
id: number;
|
||||
timestamp: string;
|
||||
level: 'info' | 'warn' | 'error' | 'debug';
|
||||
source: 'main' | 'renderer' | 'grpc' | 'tss' | 'account';
|
||||
message: string;
|
||||
}
|
||||
|
||||
interface DebugConsoleProps {
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
let logIdCounter = 0;
|
||||
|
||||
export default function DebugConsole({ isOpen, onClose }: DebugConsoleProps) {
|
||||
const [logs, setLogs] = useState<LogEntry[]>([]);
|
||||
const [filter, setFilter] = useState<string>('all');
|
||||
const [autoScroll, setAutoScroll] = useState(true);
|
||||
const [isPaused, setIsPaused] = useState(false);
|
||||
const logsEndRef = useRef<HTMLDivElement>(null);
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const addLog = useCallback((entry: Omit<LogEntry, 'id' | 'timestamp'>) => {
|
||||
if (isPaused) return;
|
||||
|
||||
const now = new Date();
|
||||
const ms = now.getMilliseconds().toString().padStart(3, '0');
|
||||
const newEntry: LogEntry = {
|
||||
...entry,
|
||||
id: ++logIdCounter,
|
||||
timestamp: `${now.toLocaleTimeString('zh-CN', {
|
||||
hour12: false,
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit',
|
||||
})}.${ms}`,
|
||||
};
|
||||
|
||||
setLogs(prev => {
|
||||
const newLogs = [...prev, newEntry];
|
||||
// 保留最近 500 条日志
|
||||
if (newLogs.length > 500) {
|
||||
return newLogs.slice(-500);
|
||||
}
|
||||
return newLogs;
|
||||
});
|
||||
}, [isPaused]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!isOpen) return;
|
||||
|
||||
// 订阅主进程的日志
|
||||
const handleMainLog = (_event: unknown, data: { level: string; source: string; message: string }) => {
|
||||
addLog({
|
||||
level: data.level as LogEntry['level'],
|
||||
source: data.source as LogEntry['source'],
|
||||
message: data.message,
|
||||
});
|
||||
};
|
||||
|
||||
// 使用 IPC 监听日志事件
|
||||
window.electronAPI?.debug?.subscribeLogs(handleMainLog);
|
||||
|
||||
// 拦截 console 方法来捕获前端日志
|
||||
const originalConsole = {
|
||||
log: console.log,
|
||||
warn: console.warn,
|
||||
error: console.error,
|
||||
debug: console.debug,
|
||||
};
|
||||
|
||||
console.log = (...args) => {
|
||||
originalConsole.log(...args);
|
||||
addLog({ level: 'info', source: 'renderer', message: args.map(String).join(' ') });
|
||||
};
|
||||
console.warn = (...args) => {
|
||||
originalConsole.warn(...args);
|
||||
addLog({ level: 'warn', source: 'renderer', message: args.map(String).join(' ') });
|
||||
};
|
||||
console.error = (...args) => {
|
||||
originalConsole.error(...args);
|
||||
addLog({ level: 'error', source: 'renderer', message: args.map(String).join(' ') });
|
||||
};
|
||||
console.debug = (...args) => {
|
||||
originalConsole.debug(...args);
|
||||
addLog({ level: 'debug', source: 'renderer', message: args.map(String).join(' ') });
|
||||
};
|
||||
|
||||
return () => {
|
||||
// 恢复原始 console
|
||||
console.log = originalConsole.log;
|
||||
console.warn = originalConsole.warn;
|
||||
console.error = originalConsole.error;
|
||||
console.debug = originalConsole.debug;
|
||||
|
||||
window.electronAPI?.debug?.unsubscribeLogs();
|
||||
};
|
||||
}, [isOpen, addLog]);
|
||||
|
||||
useEffect(() => {
|
||||
if (autoScroll && logsEndRef.current) {
|
||||
logsEndRef.current.scrollIntoView({ behavior: 'smooth' });
|
||||
}
|
||||
}, [logs, autoScroll]);
|
||||
|
||||
const handleScroll = () => {
|
||||
if (!containerRef.current) return;
|
||||
const { scrollTop, scrollHeight, clientHeight } = containerRef.current;
|
||||
// 如果用户手动滚动到顶部，暂停自动滚动
|
||||
setAutoScroll(scrollHeight - scrollTop - clientHeight < 50);
|
||||
};
|
||||
|
||||
const clearLogs = () => {
|
||||
setLogs([]);
|
||||
logIdCounter = 0;
|
||||
};
|
||||
|
||||
const filteredLogs = logs.filter(log => {
|
||||
if (filter === 'all') return true;
|
||||
if (filter === 'errors') return log.level === 'error' || log.level === 'warn';
|
||||
return log.source === filter;
|
||||
});
|
||||
|
||||
const getLevelClass = (level: string) => {
|
||||
switch (level) {
|
||||
case 'error': return styles.error;
|
||||
case 'warn': return styles.warn;
|
||||
case 'debug': return styles.debug;
|
||||
default: return styles.info;
|
||||
}
|
||||
};
|
||||
|
||||
const getSourceColor = (source: string) => {
|
||||
switch (source) {
|
||||
case 'main': return '#61afef';
|
||||
case 'grpc': return '#c678dd';
|
||||
case 'tss': return '#e5c07b';
|
||||
case 'account': return '#56b6c2';
|
||||
default: return '#98c379';
|
||||
}
|
||||
};
|
||||
|
||||
if (!isOpen) return null;
|
||||
|
||||
return (
|
||||
<div className={styles.overlay}>
|
||||
<div className={styles.console}>
|
||||
<div className={styles.header}>
|
||||
<h3>🔧 Debug Console</h3>
|
||||
<div className={styles.controls}>
|
||||
<select
|
||||
value={filter}
|
||||
onChange={(e) => setFilter(e.target.value)}
|
||||
className={styles.filter}
|
||||
>
|
||||
<option value="all">All</option>
|
||||
<option value="errors">Errors/Warnings</option>
|
||||
<option value="main">Main Process</option>
|
||||
<option value="renderer">Renderer</option>
|
||||
<option value="grpc">gRPC</option>
|
||||
<option value="tss">TSS</option>
|
||||
<option value="account">Account</option>
|
||||
</select>
|
||||
<button
|
||||
className={`${styles.btn} ${isPaused ? styles.paused : ''}`}
|
||||
onClick={() => setIsPaused(!isPaused)}
|
||||
>
|
||||
{isPaused ? '▶️ Resume' : '⏸️ Pause'}
|
||||
</button>
|
||||
<button
|
||||
className={`${styles.btn} ${autoScroll ? styles.active : ''}`}
|
||||
onClick={() => setAutoScroll(!autoScroll)}
|
||||
>
|
||||
⬇️ Auto-scroll
|
||||
</button>
|
||||
<button className={styles.btn} onClick={clearLogs}>
|
||||
🗑️ Clear
|
||||
</button>
|
||||
<button className={styles.closeBtn} onClick={onClose}>
|
||||
✕
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
className={styles.logs}
|
||||
ref={containerRef}
|
||||
onScroll={handleScroll}
|
||||
>
|
||||
{filteredLogs.length === 0 ? (
|
||||
<div className={styles.empty}>No logs yet...</div>
|
||||
) : (
|
||||
filteredLogs.map(log => (
|
||||
<div key={log.id} className={`${styles.logEntry} ${getLevelClass(log.level)}`}>
|
||||
<span className={styles.timestamp}>{log.timestamp}</span>
|
||||
<span
|
||||
className={styles.source}
|
||||
style={{ color: getSourceColor(log.source) }}
|
||||
>
|
||||
[{log.source.toUpperCase()}]
|
||||
</span>
|
||||
<span className={styles.message}>{log.message}</span>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
<div ref={logsEndRef} />
|
||||
</div>
|
||||
<div className={styles.footer}>
|
||||
<span>{filteredLogs.length} logs</span>
|
||||
<span>Press F12 for DevTools</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -100,6 +100,7 @@ export default function Join() {
|
|||
sessionId: sessionInfo.sessionId,
|
||||
partyId: partyId,
|
||||
joinToken: joinToken,
|
||||
walletName: sessionInfo.walletName,
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
|
|
|
|||
|
|
@ -423,7 +423,12 @@ interface ElectronAPI {
|
|||
// gRPC 相关
|
||||
grpc: {
|
||||
createSession: (params: CreateSessionParams) => Promise<CreateSessionResult>;
|
||||
joinSession: (sessionId: string, participantName: string) => Promise<JoinSessionResult>;
|
||||
joinSession: (params: {
|
||||
sessionId: string;
|
||||
partyId: string;
|
||||
joinToken: string;
|
||||
walletName?: string;
|
||||
}) => Promise<JoinSessionResult>;
|
||||
validateInviteCode: (code: string) => Promise<ValidateInviteCodeResult>;
|
||||
getSessionStatus: (sessionId: string) => Promise<GetSessionStatusResult>;
|
||||
subscribeSessionEvents: (sessionId: string, callback: (event: SessionEvent) => void) => () => void;
|
||||
|
|
@ -506,6 +511,13 @@ interface ElectronAPI {
|
|||
selectFile: (filters?: { name: string; extensions: string[] }[]) => Promise<string | null>;
|
||||
saveFile: (defaultPath?: string, filters?: { name: string; extensions: string[] }[]) => Promise<string | null>;
|
||||
};
|
||||
|
||||
// 调试相关
|
||||
debug?: {
|
||||
subscribeLogs: (callback: (event: unknown, data: { level: string; source: string; message: string }) => void) => void;
|
||||
unsubscribeLogs: () => void;
|
||||
log: (level: string, source: string, message: string) => void;
|
||||
};
|
||||
}
|
||||
|
||||
declare global {
|
||||
|
|
|
|||
|
|
@ -147,3 +147,27 @@ func (c *MessageRouterClient) PublishSessionCreated(
|
|||
|
||||
return c.PublishSessionEvent(ctx, event)
|
||||
}
|
||||
|
||||
// PublishSessionStarted publishes a session_started event when all parties have joined
|
||||
func (c *MessageRouterClient) PublishSessionStarted(
|
||||
ctx context.Context,
|
||||
sessionID string,
|
||||
thresholdN int32,
|
||||
thresholdT int32,
|
||||
selectedParties []string,
|
||||
joinTokens map[string]string,
|
||||
startedAt int64,
|
||||
) error {
|
||||
event := &router.SessionEvent{
|
||||
EventId: uuid.New().String(),
|
||||
EventType: "session_started",
|
||||
SessionId: sessionID,
|
||||
ThresholdN: thresholdN,
|
||||
ThresholdT: thresholdT,
|
||||
SelectedParties: selectedParties,
|
||||
JoinTokens: joinTokens,
|
||||
CreatedAt: startedAt,
|
||||
}
|
||||
|
||||
return c.PublishSessionEvent(ctx, event)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,12 +16,26 @@ import (
|
|||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// JoinSessionMessageRouterClient defines the interface for publishing session events via gRPC
|
||||
type JoinSessionMessageRouterClient interface {
|
||||
PublishSessionStarted(
|
||||
ctx context.Context,
|
||||
sessionID string,
|
||||
thresholdN int32,
|
||||
thresholdT int32,
|
||||
selectedParties []string,
|
||||
joinTokens map[string]string,
|
||||
startedAt int64,
|
||||
) error
|
||||
}
|
||||
|
||||
// JoinSessionUseCase implements the join session use case
|
||||
type JoinSessionUseCase struct {
|
||||
sessionRepo repositories.SessionRepository
|
||||
tokenValidator jwt.TokenValidator
|
||||
eventPublisher output.MessageBrokerPort
|
||||
coordinatorSvc *services.SessionCoordinatorService
|
||||
sessionRepo repositories.SessionRepository
|
||||
tokenValidator jwt.TokenValidator
|
||||
eventPublisher output.MessageBrokerPort
|
||||
messageRouterClient JoinSessionMessageRouterClient
|
||||
coordinatorSvc *services.SessionCoordinatorService
|
||||
}
|
||||
|
||||
// NewJoinSessionUseCase creates a new join session use case
|
||||
|
|
@ -29,12 +43,14 @@ func NewJoinSessionUseCase(
|
|||
sessionRepo repositories.SessionRepository,
|
||||
tokenValidator jwt.TokenValidator,
|
||||
eventPublisher output.MessageBrokerPort,
|
||||
messageRouterClient JoinSessionMessageRouterClient,
|
||||
) *JoinSessionUseCase {
|
||||
return &JoinSessionUseCase{
|
||||
sessionRepo: sessionRepo,
|
||||
tokenValidator: tokenValidator,
|
||||
eventPublisher: eventPublisher,
|
||||
coordinatorSvc: services.NewSessionCoordinatorService(),
|
||||
sessionRepo: sessionRepo,
|
||||
tokenValidator: tokenValidator,
|
||||
eventPublisher: eventPublisher,
|
||||
messageRouterClient: messageRouterClient,
|
||||
coordinatorSvc: services.NewSessionCoordinatorService(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -156,16 +172,43 @@ func (uc *JoinSessionUseCase) Execute(
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// Publish session started event
|
||||
startedAt := time.Now().UnixMilli()
|
||||
|
||||
// Publish session started event to internal message broker (for logging/monitoring)
|
||||
startedEvent := output.SessionStartedEvent{
|
||||
SessionID: session.ID.String(),
|
||||
StartedAt: time.Now().UnixMilli(),
|
||||
StartedAt: startedAt,
|
||||
}
|
||||
if err := uc.eventPublisher.PublishEvent(ctx, output.TopicSessionStarted, startedEvent); err != nil {
|
||||
logger.Error("failed to publish session started event",
|
||||
zap.String("session_id", session.ID.String()),
|
||||
zap.Error(err))
|
||||
}
|
||||
|
||||
// Publish session started event via gRPC to message-router (for party notification)
|
||||
if uc.messageRouterClient != nil {
|
||||
selectedParties := session.GetPartyIDs()
|
||||
// Build join tokens map (empty for session_started, parties already have tokens)
|
||||
joinTokens := make(map[string]string)
|
||||
|
||||
if err := uc.messageRouterClient.PublishSessionStarted(
|
||||
ctx,
|
||||
session.ID.String(),
|
||||
int32(session.Threshold.N()),
|
||||
int32(session.Threshold.T()),
|
||||
selectedParties,
|
||||
joinTokens,
|
||||
startedAt,
|
||||
); err != nil {
|
||||
logger.Error("failed to publish session started event to message router",
|
||||
zap.String("session_id", session.ID.String()),
|
||||
zap.Error(err))
|
||||
} else {
|
||||
logger.Info("published session started event to message router",
|
||||
zap.String("session_id", session.ID.String()),
|
||||
zap.Int("party_count", len(selectedParties)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 8. Save updated session
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ func main() {
|
|||
|
||||
// Initialize use cases
|
||||
createSessionUC := use_cases.NewCreateSessionUseCaseWithNotification(sessionRepo, jwtService, eventPublisher, partyPool, messageRouterClient, notificationService)
|
||||
joinSessionUC := use_cases.NewJoinSessionUseCase(sessionRepo, jwtService, eventPublisher)
|
||||
joinSessionUC := use_cases.NewJoinSessionUseCase(sessionRepo, jwtService, eventPublisher, messageRouterClient)
|
||||
getSessionStatusUC := use_cases.NewGetSessionStatusUseCase(sessionRepo)
|
||||
reportCompletionUC := use_cases.NewReportCompletionUseCase(sessionRepo, eventPublisher, accountServiceClient)
|
||||
closeSessionUC := use_cases.NewCloseSessionUseCase(sessionRepo, messageRepo, eventPublisher)
|
||||
|
|
|
|||
Loading…
Reference in New Issue