Skip to content

fix: use ESM Tauri event listeners #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chaochaoweb3 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: use ESM Tauri event listeners #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/components/ClaudeCodeSession.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,16 @@ import { Label } from "@/components/ui/label";
import { Popover } from "@/components/ui/popover";
import { api, type Session } from "@/lib/api";
import { cn } from "@/lib/utils";
import { listen as tauriListen } from "@tauri-apps/api/event";

// Conditional imports for Tauri APIs
let tauriListen: any;
type UnlistenFn = () => void;

try {
if (typeof window !== 'undefined' && window.__TAURI__) {
tauriListen = require("@tauri-apps/api/event").listen;
// Web-compatible replacements
const listen = (eventName: string, callback: (event: any) => void) => {
if (typeof window !== 'undefined' && '__TAURI__' in window) {
return tauriListen(eventName, callback);
}
} catch (e) {
console.log('[ClaudeCodeSession] Tauri APIs not available, using web mode');
}

// Web-compatible replacements
const listen = tauriListen || ((eventName: string, callback: (event: any) => void) => {
console.log('[ClaudeCodeSession] Setting up DOM event listener for:', eventName);

// In web mode, listen for DOM events
Expand All @@ -46,7 +41,7 @@ const listen = tauriListen || ((eventName: string, callback: (event: any) => voi
console.log('[ClaudeCodeSession] Removing DOM event listener for:', eventName);
window.removeEventListener(eventName, domEventHandler);
});
});
};
import { StreamMessage } from "./StreamMessage";
import { FloatingPromptInput, type FloatingPromptInputRef } from "./FloatingPromptInput";
import { ErrorBoundary } from "./ErrorBoundary";
Expand Down
15 changes: 3 additions & 12 deletions src/components/claude-code-session/useClaudeMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@ import { useState, useCallback, useRef, useEffect } from 'react';
import { api } from '@/lib/api';
import { getEnvironmentInfo } from '@/lib/apiAdapter';
import type { ClaudeStreamMessage } from '../AgentExecution';

// Conditional import for Tauri
let tauriListen: any;
try {
if (typeof window !== 'undefined' && window.__TAURI__) {
tauriListen = require('@tauri-apps/api/event').listen;
}
} catch (e) {
console.log('[useClaudeMessages] Tauri event API not available, using web mode');
}
import { listen as tauriListen } from '@tauri-apps/api/event';

interface UseClaudeMessagesOptions {
onSessionInfo?: (info: { sessionId: string; projectId: string }) => void;
Expand Down Expand Up @@ -135,7 +126,7 @@ export function useClaudeMessages(options: UseClaudeMessagesOptions = {}) {
const envInfo = getEnvironmentInfo();
console.log('[TRACE] Environment info:', envInfo);

if (envInfo.isTauri && tauriListen) {
if (envInfo.isTauri) {
// Tauri mode - use Tauri's event system
console.log('[TRACE] Setting up Tauri event listener for claude-stream');
eventListenerRef.current = await tauriListen("claude-stream", (event: any) => {
Expand Down Expand Up @@ -202,4 +193,4 @@ export function useClaudeMessages(options: UseClaudeMessagesOptions = {}) {
loadMessages,
handleMessage
};
}
}