v1.0.1 Fix Dialog crash on repeated use and improve stability

laurensent · laurensent · commit 3b1ec7e180c9 · 2025-12-13T00:06:47.000+08:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,41 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag (e.g., v1.0)'
+        required: true
+      message:
+        description: 'Release message'
+        required: false
+        default: ''
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build and Package
+        run: |
+          chmod +x release.sh
+          chmod +x InstantLinguaDialog/build.sh
+          ./release.sh all
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          body: ${{ github.event.inputs.message }}
+          files: |
+            InstantLingua.popclipextz
+            InstantLingua-Dev.popclipextz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Build artifacts
 *.popclipextz
-InstantLinguaDialog/InstantLingua Dialog.app/
+InstantLingua Dialog.app/
 
 # macOS
 .DS_Store
diff --git a/InstantLinguaDialog/InstantLinguaDialog/main.swift b/InstantLinguaDialog/InstantLinguaDialog/main.swift
@@ -6,7 +6,14 @@ import NaturalLanguage
 class AppDelegate: NSObject, NSApplicationDelegate {
     var window: NSWindow?
     var eventMonitor: Any?
-    var handledURL = false
+    private var _handledURL = false
+    private var isTransitioning = false
+    private let lock = NSLock()
+
+    var handledURL: Bool {
+        get { lock.lock(); defer { lock.unlock() }; return _handledURL }
+        set { lock.lock(); defer { lock.unlock() }; _handledURL = newValue }
+    }
 
     func applicationWillFinishLaunching(_ notification: Notification) {
         // Register URL handler early to catch URL events before applicationDidFinishLaunching
@@ -27,7 +34,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        return true
+        // Don't terminate if we're transitioning to a new window
+        return !isTransitioning
     }
 
     func applicationWillTerminate(_ notification: Notification) {
@@ -75,6 +83,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func showDialog(text: String? = nil) {
+        // Prevent app termination during window transition
+        isTransitioning = true
+        defer { isTransitioning = false }
+
         // Clean up previous event monitor
         if let monitor = eventMonitor {
             NSEvent.removeMonitor(monitor)
@@ -147,7 +159,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         // Position near mouse cursor
         let mouseLocation = NSEvent.mouseLocation
-        let screenFrame = NSScreen.main?.visibleFrame ?? .zero
+        guard let screen = NSScreen.main ?? NSScreen.screens.first else {
+            // Fallback: center on screen if no screen available
+            panel.center()
+            panel.makeKeyAndOrderFront(nil)
+            window = panel
+            NSApplication.shared.activate(ignoringOtherApps: true)
+            return
+        }
+        let screenFrame = screen.visibleFrame
         var windowX = mouseLocation.x - estimatedWidth / 2
 
         // Default: above mouse, fallback: below if near top edge
@@ -180,7 +200,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NSApplication.shared.activate(ignoringOtherApps: true)
 
         // Keyboard shortcuts
-        eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in
+        eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
+            guard self != nil else { return event }
             // Escape to close
             if event.keyCode == 53 {
                 NSApplication.shared.terminate(nil)
@@ -231,19 +252,52 @@ func detectLanguage(_ text: String) -> String {
     return languageNames[language] ?? language.rawValue.capitalized
 }
 
+// MARK: - Speech Manager
+class SpeechManager: NSObject, ObservableObject, NSSpeechSynthesizerDelegate {
+    @Published var speakingOriginal = false
+    @Published var speakingTranslation = false
+
+    private let synthesizer = NSSpeechSynthesizer()
+
+    override init() {
+        super.init()
+        synthesizer.delegate = self
+    }
+
+    func speak(_ text: String, isOriginal: Bool) {
+        if synthesizer.isSpeaking {
+            synthesizer.stopSpeaking()
+            speakingOriginal = false
+            speakingTranslation = false
+            return
+        }
+
+        if isOriginal {
+            speakingOriginal = true
+        } else {
+            speakingTranslation = true
+        }
+        synthesizer.startSpeaking(text)
+    }
+
+    func speechSynthesizer(_ sender: NSSpeechSynthesizer, didFinishSpeaking finishedSpeaking: Bool) {
+        DispatchQueue.main.async { [weak self] in
+            self?.speakingOriginal = false
+            self?.speakingTranslation = false
+        }
+    }
+}
+
 // MARK: - Dialog View
 struct DialogView: View {
     let text: String
     let onClose: () -> Void
     @State private var copiedOriginal = false
     @State private var copiedTranslation = false
-    @State private var speakingOriginal = false
-    @State private var speakingTranslation = false
     @State private var showingHelp = false
+    @StateObject private var speechManager = SpeechManager()
     @Environment(\.colorScheme) private var colorScheme
 
-    private let synthesizer = NSSpeechSynthesizer()
-
     // Adaptive opacity based on color scheme
     private var originalCardOpacity: Double {
         colorScheme == .dark ? 0.15 : 0.06
@@ -285,10 +339,10 @@ struct DialogView: View {
                                     .foregroundStyle(.secondary)
                                 Spacer()
                                 HStack(spacing: 12) {
-                                    Button(action: { speakText(parts.original) }) {
-                                        Image(systemName: speakingOriginal ? "stop.fill" : "speaker.wave.2")
+                                    Button(action: { speechManager.speak(parts.original, isOriginal: true) }) {
+                                        Image(systemName: speechManager.speakingOriginal ? "stop.fill" : "speaker.wave.2")
                                             .font(.system(size: 12))
-                                            .foregroundStyle(speakingOriginal ? .orange : .secondary)
+                                            .foregroundStyle(speechManager.speakingOriginal ? .orange : .secondary)
                                             .frame(width: 14, height: 14)
                                     }
                                     .buttonStyle(.plain)
@@ -321,10 +375,10 @@ struct DialogView: View {
                                     .foregroundStyle(.secondary)
                                 Spacer()
                                 HStack(spacing: 12) {
-                                    Button(action: { speakText(parts.translation) }) {
-                                        Image(systemName: speakingTranslation ? "stop.fill" : "speaker.wave.2")
+                                    Button(action: { speechManager.speak(parts.translation, isOriginal: false) }) {
+                                        Image(systemName: speechManager.speakingTranslation ? "stop.fill" : "speaker.wave.2")
                                             .font(.system(size: 12))
-                                            .foregroundStyle(speakingTranslation ? .orange : .secondary)
+                                            .foregroundStyle(speechManager.speakingTranslation ? .orange : .secondary)
                                             .frame(width: 14, height: 14)
                                     }
                                     .buttonStyle(.plain)
@@ -361,10 +415,10 @@ struct DialogView: View {
                                 .foregroundStyle(.secondary)
                             Spacer()
                             HStack(spacing: 12) {
-                                Button(action: { speakText(text) }) {
-                                    Image(systemName: speakingOriginal ? "stop.fill" : "speaker.wave.2")
+                                Button(action: { speechManager.speak(text, isOriginal: true) }) {
+                                    Image(systemName: speechManager.speakingOriginal ? "stop.fill" : "speaker.wave.2")
                                         .font(.system(size: 12))
-                                        .foregroundStyle(speakingOriginal ? .orange : .secondary)
+                                        .foregroundStyle(speechManager.speakingOriginal ? .orange : .secondary)
                                         .frame(width: 14, height: 14)
                                 }
                                 .buttonStyle(.plain)
@@ -467,44 +521,6 @@ struct DialogView: View {
         .frame(minWidth: 360, minHeight: 160)
     }
 
-    private func speakText(_ textToSpeak: String) {
-        // Determine if this is original or translation text
-        let isOriginal: Bool
-        if let parts = bilingualParts {
-            isOriginal = textToSpeak == parts.original
-        } else {
-            isOriginal = true  // Single text mode - always treat as original
-        }
-
-        // If already speaking this text, stop it
-        if synthesizer.isSpeaking {
-            synthesizer.stopSpeaking()
-            speakingOriginal = false
-            speakingTranslation = false
-            return  // Just stop, don't restart
-        }
-
-        // Start speaking
-        if isOriginal {
-            speakingOriginal = true
-        } else {
-            speakingTranslation = true
-        }
-
-        synthesizer.startSpeaking(textToSpeak)
-
-        // Monitor when speech finishes
-        DispatchQueue.global().async {
-            while synthesizer.isSpeaking {
-                Thread.sleep(forTimeInterval: 0.1)
-            }
-            DispatchQueue.main.async {
-                speakingOriginal = false
-                speakingTranslation = false
-            }
-        }
-    }
-
     private func copyText(_ text: String, isTranslation: Bool = false) {
         NSPasteboard.general.clearContents()
         NSPasteboard.general.setString(text, forType: .string)
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ With built-in support for **OpenAI, Claude, Grok, Gemini, and Ollama (local)**,
 - **Custom Prompt** – Define your own AI instructions for custom text processing
 - **Multi-Provider Support** – Use OpenAI, Claude, Grok, Gemini, or Ollama (local) models for language tasks
 - **Paste Mode** – Paste results directly to cursor position
+- **Dialog Window** – Display results in a floating panel for longer content
 
 ## Tasks Overview
 
@@ -81,7 +82,9 @@ InstantLingua enhances your PopClip experience with fast, AI-driven language too
 
 ## Installation
 
-1. Download the latest release from the repository
+1. Download from [Releases](https://github.com/laurensent/InstantLingua/releases):
+   - **InstantLingua.popclipextz** – Standard version with preset models
+   - **InstantLingua-Dev.popclipextz** – Dev version with custom API endpoint and model ID support
 2. Double-click the .popclipextz file to install
 3. Configure your preferred AI provider API key in PopClip settings
 
diff --git a/release-dev.sh b/release-dev.sh
diff --git a/release.sh b/release.sh
@@ -1,19 +1,49 @@
 #!/bin/bash
 
 # InstantLingua Release Script
+# Usage: ./release.sh [all|main|dev]
 
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 cd "$SCRIPT_DIR"
 
-echo "Building Dialog app..."
-"$SCRIPT_DIR/InstantLinguaDialog/build.sh" > /dev/null
+build_dialog() {
+    echo "Building Dialog app..."
+    "$SCRIPT_DIR/InstantLinguaDialog/build.sh" > /dev/null
+}
 
-echo "Packaging extension..."
-rm -rf "$SCRIPT_DIR/InstantLingua.popclipext/InstantLingua Dialog.app"
-cp -R "$SCRIPT_DIR/InstantLinguaDialog/InstantLingua Dialog.app" "$SCRIPT_DIR/InstantLingua.popclipext/"
-rm -f "$SCRIPT_DIR/InstantLingua.popclipextz"
-zip -rq InstantLingua.popclipextz InstantLingua.popclipext -x "*.DS_Store"
+package_main() {
+    echo "Packaging InstantLingua..."
+    rm -rf "$SCRIPT_DIR/InstantLingua.popclipext/InstantLingua Dialog.app"
+    cp -R "$SCRIPT_DIR/InstantLinguaDialog/InstantLingua Dialog.app" "$SCRIPT_DIR/InstantLingua.popclipext/"
+    rm -f "$SCRIPT_DIR/InstantLingua.popclipextz"
+    zip -rq InstantLingua.popclipextz InstantLingua.popclipext -x "*.DS_Store"
+    echo "Created: InstantLingua.popclipextz ($(du -h InstantLingua.popclipextz | cut -f1))"
+}
 
-echo "Done: InstantLingua.popclipextz ($(du -h InstantLingua.popclipextz | cut -f1))"
+package_dev() {
+    echo "Packaging InstantLingua-Dev..."
+    rm -rf "$SCRIPT_DIR/InstantLingua-Dev.popclipext/InstantLingua Dialog.app"
+    cp -R "$SCRIPT_DIR/InstantLinguaDialog/InstantLingua Dialog.app" "$SCRIPT_DIR/InstantLingua-Dev.popclipext/"
+    rm -f "$SCRIPT_DIR/InstantLingua-Dev.popclipextz"
+    zip -rq InstantLingua-Dev.popclipextz InstantLingua-Dev.popclipext -x "*.DS_Store"
+    echo "Created: InstantLingua-Dev.popclipextz ($(du -h InstantLingua-Dev.popclipextz | cut -f1))"
+}
+
+case "${1:-all}" in
+    main)
+        build_dialog
+        package_main
+        ;;
+    dev)
+        build_dialog
+        package_dev
+        ;;
+    all|*)
+        build_dialog
+        package_main
+        package_dev
+        echo "Done!"
+        ;;
+esac
