Compare commits
No commits in common. "main" and "revert-84-main" have entirely different histories.
main
...
revert-84-
31
.github/ISSUE_TEMPLATE/bug_report.md
vendored
31
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -1,31 +0,0 @@
|
||||
---
|
||||
name: Bug Report
|
||||
about: Create a report to help us improve
|
||||
title: "[BUG] "
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior:
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
4. See error
|
||||
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**Environment (please complete the following information):**
|
||||
- OS: [e.g. macOS, Windows]
|
||||
- App Version [e.g. 1.0.0]
|
||||
|
||||
**Additional context**
|
||||
Add any other context about the problem here.
|
||||
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -1,20 +0,0 @@
|
||||
---
|
||||
name: Feature Request
|
||||
about: Suggest an idea for this project
|
||||
title: "[FEAT] "
|
||||
labels: feature
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
|
||||
**Describe the solution you'd like**
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
**Describe alternatives you've considered**
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
**Additional context**
|
||||
Add any other context or screenshots about the feature request here.
|
||||
28
.github/PULL_REQUEST_TEMPLATE.md
vendored
28
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,28 +0,0 @@
|
||||
---
|
||||
name: Pull Request
|
||||
about: Propose a change to the codebase
|
||||
---
|
||||
|
||||
## Summary of Changes
|
||||
|
||||
Please provide a brief, high-level summary of the changes in this pull request.
|
||||
|
||||
## Related Issue
|
||||
|
||||
- Closes #XXX
|
||||
|
||||
*Please replace `XXX` with the issue number that this pull request resolves. If it does not resolve a specific issue, please explain why this change is needed.*
|
||||
|
||||
## Contributor's Self-Review Checklist
|
||||
|
||||
Please check the boxes that apply. This is a reminder of what we look for in a good pull request.
|
||||
|
||||
- [ ] I have read the [CONTRIBUTING.md](https://github.com/your-org/your-repo/blob/main/CONTRIBUTING.md) document.
|
||||
- [ ] My code follows the project's coding style and architectural patterns as described in [DESIGN_PATTERNS.md](https://github.com/your-org/your-repo/blob/main/docs/DESIGN_PATTERNS.md).
|
||||
- [ ] I have added or updated relevant tests for my changes.
|
||||
- [ ] I have updated the documentation to reflect my changes (if applicable).
|
||||
- [ ] My changes have been tested locally and are working as expected.
|
||||
|
||||
## Additional Context (Optional)
|
||||
|
||||
Add any other context or screenshots about the pull request here.
|
||||
62
.github/workflows/assign-on-comment.yml
vendored
62
.github/workflows/assign-on-comment.yml
vendored
@ -1,62 +0,0 @@
|
||||
name: Assign on Comment
|
||||
|
||||
on:
|
||||
issue_comment:
|
||||
types: [created]
|
||||
|
||||
jobs:
|
||||
# Job 1: Any contributor can self-assign
|
||||
self-assign:
|
||||
# Only run if the comment is exactly '/assign'
|
||||
if: startsWith(github.event.comment.body, '/assign') && !contains(github.event.comment.body, '@')
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
issues: write
|
||||
steps:
|
||||
- name: Assign commenter to the issue
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
// Assign the commenter as the assignee
|
||||
await github.rest.issues.addAssignees({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.issue.number,
|
||||
assignees: [context.actor]
|
||||
});
|
||||
// Add a rocket (🚀) reaction to indicate success
|
||||
await github.rest.reactions.createForIssueComment({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
comment_id: context.payload.comment.id,
|
||||
content: 'rocket'
|
||||
});
|
||||
|
||||
# Job 2: Admin can assign others
|
||||
assign-others:
|
||||
# Only run if the comment starts with '/assign @' and the commenter is in the admin group
|
||||
if: startsWith(github.event.comment.body, '/assign @') && contains(fromJson('["OWNER", "COLLABORATOR", "MEMBER"]'), github.event.comment.author_association)
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
issues: write
|
||||
steps:
|
||||
- name: Assign mentioned user
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
const mention = context.payload.comment.body.split(' ')[1];
|
||||
const assignee = mention.substring(1); // Remove '@'
|
||||
// Assign the mentioned user as the assignee
|
||||
await github.rest.issues.addAssignees({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.issue.number,
|
||||
assignees: [assignee]
|
||||
});
|
||||
// Add a thumbs up (+1) reaction to indicate success
|
||||
await github.rest.reactions.createForIssueComment({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
comment_id: context.payload.comment.id,
|
||||
content: '+1'
|
||||
});
|
||||
@ -1,2 +1,2 @@
|
||||
src/ui/assets
|
||||
src/assets
|
||||
node_modules
|
||||
|
||||
@ -2,57 +2,52 @@
|
||||
|
||||
Thank you for considering contributing to **Glass by Pickle**! Contributions make the open-source community vibrant, innovative, and collaborative. We appreciate every contribution you make—big or small.
|
||||
|
||||
This document guides you through the entire contribution process, from finding an issue to getting your pull request merged.
|
||||
## 📌 Contribution Guidelines
|
||||
|
||||
### 👥 Avoid Work Duplication
|
||||
|
||||
Before creating an issue or submitting a pull request (PR), please check existing [Issues](https://github.com/pickle-com/glass/issues) and [Pull Requests](https://github.com/pickle-com/glass/pulls) to prevent duplicate efforts.
|
||||
|
||||
### ✅ Start with Approved Issues
|
||||
|
||||
- **Feature Requests**: Please wait for approval from core maintainers before starting work. Issues needing approval are marked with the `🚨 needs approval` label.
|
||||
- **Bugs & Improvements**: You may begin immediately without explicit approval.
|
||||
|
||||
### 📝 Clearly Document Your Work
|
||||
|
||||
Provide enough context and detail to allow easy understanding. Issues and PRs should clearly communicate the problem or feature and stand alone without external references.
|
||||
|
||||
### 💡 Summarize Pull Requests
|
||||
|
||||
Include a brief summary at the top of your PR, describing the intent and scope of your changes.
|
||||
|
||||
### 🔗 Link Related Issues
|
||||
|
||||
Use GitHub keywords (`Closes #123`, `Fixes #456`) to auto-link and close issues upon PR merge.
|
||||
|
||||
### 🧪 Include Testing Information
|
||||
|
||||
Clearly state how your changes were tested.
|
||||
|
||||
> Example:
|
||||
> "Tested locally on macOS 14, confirmed all features working as expected."
|
||||
|
||||
### 🧠 Future-Proof Your Descriptions
|
||||
|
||||
Document trade-offs, edge cases, and temporary workarounds clearly to help future maintainers understand your decisions.
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Contribution Workflow
|
||||
## 🔖 Issue Priorities
|
||||
|
||||
To ensure a smooth and effective workflow, all contributions must go through the following process. Please follow these steps carefully.
|
||||
| Issue Type | Priority |
|
||||
|----------------------------------------------------|---------------------|
|
||||
| Minor enhancements & non-core feature requests | 🟢 Low Priority |
|
||||
| UX improvements & minor bugs | 🟡 Medium Priority |
|
||||
| Core functionalities & essential features | 🟠 High Priority |
|
||||
| Critical bugs & breaking issues | 🔴 Urgent |
|
||||
|
|
||||
|
||||
### 1. Find or Create an Issue
|
||||
|
||||
All work begins with an issue. This is the central place to discuss new ideas and track progress.
|
||||
|
||||
- Browse our existing [**Issues**](https://github.com/pickle-com/glass/issues) to find something you'd like to work on. We recommend looking for issues labeled `good first issue` if you're new!
|
||||
- If you have a new idea or find a bug that hasn't been reported, please **create a new issue** using our templates.
|
||||
|
||||
### 2. Claim the Issue
|
||||
|
||||
To avoid duplicate work, you must claim an issue before you start coding.
|
||||
|
||||
- On the issue you want to work on, leave a comment with the command:
|
||||
```
|
||||
/assign
|
||||
```
|
||||
- Our GitHub bot will automatically assign the issue to you. Once your profile appears in the **`Assignees`** section on the right, you are ready to start development.
|
||||
|
||||
### 3. Fork & Create a Branch
|
||||
|
||||
Now it's time to set up your local environment.
|
||||
|
||||
1. **Fork** the repository to your own GitHub account.
|
||||
2. **Clone** your forked repository to your local machine.
|
||||
3. **Create a new branch** from `main`. A clear branch name is recommended.
|
||||
- For new features: `feat/short-description` (e.g., `feat/user-login-ui`)
|
||||
- For bug fixes: `fix/short-description` (e.g., `fix/header-rendering-bug`)
|
||||
|
||||
### 4. Develop
|
||||
|
||||
Write your code! As you work, please adhere to our quality standards.
|
||||
|
||||
- **Code Style & Quality**: Our project uses `Prettier` and `ESLint` to maintain a consistent code style.
|
||||
- **Architecture & Design Patterns**: All new code must be consistent with the project's architecture. Please read our **[Design Patterns Guide](https://github.com/pickle-com/glass/blob/main/docs/DESIGN_PATTERNS.md)** before making significant changes.
|
||||
|
||||
### 5. Create a Pull Request (PR)
|
||||
|
||||
Once your work is ready, create a Pull Request to the `main` branch of the original repository.
|
||||
|
||||
- **Fill out the PR Template**: Our template will appear automatically. Please provide a clear summary of your changes.
|
||||
- **Link the Issue**: In the PR description, include the line `Closes #XXX` (e.g., `Closes #123`) to link it to the issue you resolved. This is mandatory.
|
||||
- **Code Review**: A maintainer will review your code, provide feedback, and merge it.
|
||||
|
||||
---
|
||||
|
||||
# Developing
|
||||
|
||||
@ -90,4 +85,11 @@ Please ensure that you can make a full production build before pushing code.
|
||||
npm run lint
|
||||
```
|
||||
|
||||
If you get errors, be sure to fix them before committing.
|
||||
If you get errors, be sure to fix them before committing.
|
||||
|
||||
|
||||
## Making a Pull Request
|
||||
|
||||
- Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) when creating your PR. (This option isn't available if you're [contributing from a fork belonging to an organization](https://github.com/orgs/community/discussions/5634))
|
||||
- If your PR refers to or fixes an issue, add `refs #XXX` or `fixes #XXX` to the PR description. Replace `XXX` with the respective issue number. See more about [linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
|
||||
- Lastly, make sure to keep your branches updated (e.g., click the `Update branch` button on the GitHub PR page).
|
||||
@ -69,7 +69,7 @@ npm run setup
|
||||
**Currently Supporting:**
|
||||
- OpenAI API: Get OpenAI API Key [here](https://platform.openai.com/api-keys)
|
||||
- Gemini API: Get Gemini API Key [here](https://aistudio.google.com/apikey)
|
||||
- Local LLM Ollama & Whisper
|
||||
- Local LLM (WIP)
|
||||
|
||||
### Liquid Glass Design (coming soon)
|
||||
|
||||
@ -115,6 +115,8 @@ We have a list of [help wanted](https://github.com/pickle-com/glass/issues?q=is%
|
||||
|
||||
| Status | Issue | Description |
|
||||
|--------|--------------------------------|---------------------------------------------------|
|
||||
| 🚧 WIP | Local LLM Support | Supporting Local LLM to power AI answers |
|
||||
| 🚧 WIP | Firebase Data Storage Issue | Session & ask should be saved in firebase for signup users |
|
||||
| 🚧 WIP | Liquid Glass | Liquid Glass UI for MacOS 26 |
|
||||
|
||||
### Changelog
|
||||
@ -123,7 +125,7 @@ We have a list of [help wanted](https://github.com/pickle-com/glass/issues?q=is%
|
||||
- Jul 6: Full code refactoring has done.
|
||||
- Jul 7: Now support Claude, LLM/STT model selection
|
||||
- Jul 8: Now support Windows(beta), Improved AEC by Rust(to seperate mic/system audio), shortcut editing(beta)
|
||||
- Jul 8: Now support Local LLM & STT, Firebase Data Storage
|
||||
|
||||
|
||||
|
||||
## About Pickle
|
||||
|
||||
2
aec
2
aec
@ -1 +1 @@
|
||||
Subproject commit 9e11f4f95707714464194bdfc9db0222ec5c6163
|
||||
Subproject commit f00bb1fb948053c752b916adfee19f90644a0b2f
|
||||
4
build.js
4
build.js
@ -14,8 +14,8 @@ const baseConfig = {
|
||||
};
|
||||
|
||||
const entryPoints = [
|
||||
{ in: 'src/ui/app/HeaderController.js', out: 'public/build/header' },
|
||||
{ in: 'src/ui/app/PickleGlassApp.js', out: 'public/build/content' },
|
||||
{ in: 'src/app/HeaderController.js', out: 'public/build/header' },
|
||||
{ in: 'src/app/PickleGlassApp.js', out: 'public/build/content' },
|
||||
];
|
||||
|
||||
async function build() {
|
||||
|
||||
@ -1,126 +0,0 @@
|
||||
# Glass: Design Patterns and Architectural Overview
|
||||
|
||||
Welcome to the Glass project! This document is the definitive guide to the architectural patterns, conventions, and design philosophy that guide our development. Adhering to these principles is essential for building new features, maintaining the quality of our codebase, and ensuring a stable, consistent developer experience.
|
||||
|
||||
The architecture is designed to be modular, robust, and clear, with a strict separation of concerns.
|
||||
|
||||
---
|
||||
|
||||
## Core Architectural Principles
|
||||
|
||||
These are the fundamental rules that govern the entire application.
|
||||
|
||||
1. **Centralized Data Logic**: All data persistence logic (reading from or writing to a database) is centralized within the **Electron Main Process**. The UI layers (both Electron's renderer and the web dashboard) are forbidden from accessing data sources directly.
|
||||
2. **Feature-Based Modularity**: Code is organized by feature (`src/features`) to promote encapsulation and separation of concerns. A new feature should be self-contained within its own directory.
|
||||
3. **Dual-Database Repositories**: The data access layer uses a **Repository Pattern** that abstracts away the underlying database. Every repository that handles user data **must** have two implementations: one for the local `SQLite` database and one for the cloud `Firebase` database. Both must expose an identical interface.
|
||||
4. **AI Provider Abstraction**: AI model interactions are abstracted using a **Factory Pattern**. To add a new provider (e.g., a new LLM), you only need to create a new provider module that conforms to the base interface in `src/common/ai/providers/` and register it in the `factory.js`.
|
||||
5. **Single Source of Truth for Schema**: The schema for the local SQLite database is defined in a single location: `src/common/config/schema.js`. Any change to the database structure **must** be updated here.
|
||||
6. **Encryption by Default**: All sensitive user data **must** be encrypted before being persisted to Firebase. This includes, but is not limited to, API keys, conversation titles, transcription text, and AI-generated summaries. This is handled automatically by the `createEncryptedConverter` Firestore helper.
|
||||
|
||||
---
|
||||
|
||||
## I. Electron Application Architecture (`src/`)
|
||||
|
||||
This section details the architecture of the core desktop application.
|
||||
|
||||
### 1. Overall Pattern: Service-Repository
|
||||
|
||||
The Electron app's logic is primarily built on a **Service-Repository** pattern, with the Views being the HTML/JS files in the `src/app` and `src/features` directories.
|
||||
|
||||
- **Views** (`*.html`, `*View.js`): The UI layer. Views are responsible for rendering the interface and capturing user interactions. They are intentionally kept "dumb" and delegate all significant logic to a corresponding Service.
|
||||
- **Services** (`*Service.js`): Services contain the application's business logic. They act as the intermediary between Views and Repositories. For example, `sttService` contains the logic for STT, while `summaryService` handles the logic for generating summaries.
|
||||
- **Repositories** (`*.repository.js`): Repositories are responsible for all data access. They are the *only* part of the application that directly interacts with `sqliteClient` or `firebaseClient`.
|
||||
|
||||
**Location of Modules:**
|
||||
- **Feature-Specific**: If a service or repository is used by only one feature, it should reside within that feature's directory (e.g., `src/features/listen/summary/summaryService.js`).
|
||||
- **Common**: If a service or repository is shared across multiple features (like `authService` or `userRepository`), it must be placed in `src/common/services/` or `src/common/repositories/` respectively.
|
||||
|
||||
### 2. Data Persistence: The Dual Repository Factory
|
||||
|
||||
The application dynamically switches between using the local SQLite database and the cloud-based Firebase Firestore.
|
||||
|
||||
- **SQLite**: The default data store for all users, especially those not logged in. This ensures full offline functionality. The low-level client is `src/common/services/sqliteClient.js`.
|
||||
- **Firebase**: Used exclusively for users who are authenticated. This enables data synchronization across devices and with the web dashboard.
|
||||
|
||||
The selection mechanism is a sophisticated **Factory and Adapter Pattern** located in the `index.js` file of each repository directory (e.g., `src/common/repositories/session/index.js`).
|
||||
|
||||
**How it works:**
|
||||
1. **Service Call**: A service makes a call to a high-level repository function, like `sessionRepository.create('ask')`. The service is unaware of the user's state or the underlying database.
|
||||
2. **Repository Selection (Factory)**: The `index.js` adapter logic first determines which underlying repository to use. It imports and calls `authService.getCurrentUser()` to check the login state. If the user is logged in, it selects `firebase.repository.js`; otherwise, it defaults to `sqlite.repository.js`.
|
||||
3. **UID Injection (Adapter)**: The adapter then retrieves the current user's ID (`uid`) from `authService.getCurrentUserId()`. It injects this `uid` into the actual, low-level repository call (e.g., `firebaseRepository.create(uid, 'ask')`).
|
||||
4. **Execution**: The selected repository (`sqlite` or `firebase`) executes the data operation.
|
||||
|
||||
This powerful pattern accomplishes two critical goals:
|
||||
- It makes the services completely agnostic about the underlying data source.
|
||||
- It frees the services from the responsibility of managing and passing user IDs for every database query.
|
||||
|
||||
**Visualizing the Data Flow**
|
||||
|
||||
```mermaid
|
||||
graph TD
|
||||
subgraph "Electron Main Process"
|
||||
A -- User Action --> B[Service Layer];
|
||||
B -- Data Request --> C[Repository Factory];
|
||||
C -- Check Login Status --> D{Decision};
|
||||
D -- No --> E[SQLite Repository];
|
||||
D -- Yes --> F[Firebase Repository];
|
||||
E -- Access Local DB --> G[(SQLite)];
|
||||
F -- Access Cloud DB --> H[(Firebase)];
|
||||
G -- Return Data --> B;
|
||||
H -- Return Data --> B;
|
||||
B -- Update UI --> A;
|
||||
end
|
||||
|
||||
style A fill:#D6EAF8,stroke:#3498DB
|
||||
style G fill:#E8DAEF,stroke:#8E44AD
|
||||
style H fill:#FADBD8,stroke:#E74C3C
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## II. Web Dashboard Architecture (`pickleglass_web/`)
|
||||
|
||||
This section details the architecture of the Next.js web application, which serves as the user-facing dashboard for account management and cloud data viewing.
|
||||
|
||||
### 1. Frontend, Backend, and Main Process Communication
|
||||
|
||||
The web dashboard has a more complex, three-part architecture:
|
||||
|
||||
1. **Next.js Frontend (`app/`):** The React-based user interface.
|
||||
2. **Node.js Backend (`backend_node/`):** An Express.js server that acts as an intermediary.
|
||||
3. **Electron Main Process (`src/`):** The ultimate authority for all local data access.
|
||||
|
||||
Crucially, **the web dashboard's backend cannot access the local SQLite database directly**. It must communicate with the Electron main process to request data.
|
||||
|
||||
### 2. The IPC Data Flow
|
||||
|
||||
When the web frontend needs data that resides in the local SQLite database (e.g., viewing a non-synced session), it follows this precise flow:
|
||||
|
||||
1. **HTTP Request**: The Next.js frontend makes a standard API call to its own Node.js backend (e.g., `GET /api/conversations`).
|
||||
2. **IPC Request**: The Node.js backend receives the HTTP request. It **does not** contain any database logic. Instead, it uses the `ipcRequest` helper from `backend_node/ipcBridge.js`.
|
||||
3. **IPC Emission**: `ipcRequest` sends an event to the Electron main process over an IPC channel (`web-data-request`). It passes three things: the desired action (e.g., `'get-sessions'`), a unique channel name for the response, and a payload.
|
||||
4. **Main Process Listener**: The Electron main process has a listener (`ipcMain.on('web-data-request', ...)`) that receives this request. It identifies the action and calls the appropriate **Service** or **Repository** to fetch the data from the SQLite database.
|
||||
5. **IPC Response**: Once the data is retrieved, the main process sends it back to the web backend using the unique response channel provided in the request.
|
||||
6. **HTTP Response**: The web backend's `ipcRequest` promise resolves with the data, and the backend sends it back to the Next.js frontend as a standard JSON HTTP response.
|
||||
|
||||
This round-trip ensures our core principle of centralizing data logic in the main process is never violated.
|
||||
|
||||
**Visualizing the IPC Data Flow**
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant FE as Next.js Frontend
|
||||
participant BE as Node.js Backend
|
||||
participant Main as Electron Main Process
|
||||
|
||||
FE->>+BE: 1. HTTP GET /api/local-data
|
||||
Note over BE: Receives local data request
|
||||
|
||||
BE->>+Main: 2. ipcRequest('get-data', responseChannel)
|
||||
Note over Main: Receives request, fetches data from SQLite<br/>via Service/Repository
|
||||
|
||||
Main-->>-BE: 3. ipcResponse on responseChannel (data)
|
||||
Note over BE: Receives data, prepares HTTP response
|
||||
|
||||
BE-->>-FE: 4. HTTP 200 OK (JSON data)
|
||||
```
|
||||
@ -1,19 +0,0 @@
|
||||
# Refactor Plan: Non-Window Logic Migration from windowManager.js
|
||||
|
||||
## Goal
|
||||
`windowManager.js`를 순수 창 관리 모듈로 만들기 위해 비즈니스 로직을 해당 서비스와 `featureBridge.js`로 이전.
|
||||
|
||||
## Steps (based on initial plan)
|
||||
1. **Shortcuts**: Completed. Logic moved to `shortcutsService.js` and IPC to `featureBridge.js`. Used `internalBridge` for coordination.
|
||||
|
||||
2. **Screenshot**: Next. Move `captureScreenshot` function and related IPC handlers from `windowManager.js` to `askService.js` (since it's primarily used there). Update `askService.js` to use its own screenshot method. Add IPC handlers to `featureBridge.js` if needed.
|
||||
|
||||
3. **System Permissions**: Create new `permissionService.js` in `src/features/common/services/`. Move all permission-related logic (check, request, open preferences, mark completed, etc.) and IPC handlers from `windowManager.js` to the new service and `featureBridge.js`.
|
||||
|
||||
4. **API Key / Model State**: Completely remove from `windowManager.js` (e.g., `setupApiKeyIPC` and helpers). Ensure all usages (e.g., in `askService.js`) directly require and use `modelStateService.js` instead.
|
||||
|
||||
## Notes
|
||||
- Maintain original logic without changes.
|
||||
- Break circular dependencies if found.
|
||||
- Use `internalBridge` for inter-module communication where appropriate.
|
||||
- After each step, verify no errors and test functionality.
|
||||
@ -33,24 +33,19 @@ extraResources:
|
||||
to: out
|
||||
|
||||
asarUnpack:
|
||||
- "src/ui/assets/SystemAudioDump"
|
||||
- "**/node_modules/sharp/**/*"
|
||||
- "**/node_modules/@img/**/*"
|
||||
- "src/assets/SystemAudioDump"
|
||||
|
||||
# Windows configuration
|
||||
win:
|
||||
icon: src/ui/assets/logo.ico
|
||||
icon: src/assets/logo.ico
|
||||
target:
|
||||
- target: nsis
|
||||
arch: x64
|
||||
- target: portable
|
||||
arch: x64
|
||||
requestedExecutionLevel: asInvoker
|
||||
signAndEditExecutable: true
|
||||
cscLink: build\certs\glass-dev.pfx
|
||||
cscKeyPassword: "${env.CSC_KEY_PASSWORD}"
|
||||
signtoolOptions:
|
||||
certificateSubjectName: "Glass Dev Code Signing"
|
||||
# Disable code signing to avoid symbolic link issues on Windows
|
||||
signAndEditExecutable: false
|
||||
|
||||
# NSIS installer configuration for Windows
|
||||
nsis:
|
||||
@ -67,7 +62,7 @@ mac:
|
||||
# The application category type
|
||||
category: public.app-category.utilities
|
||||
# Path to the .icns icon file
|
||||
icon: src/ui/assets/logo.icns
|
||||
icon: src/assets/logo.icns
|
||||
# Minimum macOS version (supports both Intel and Apple Silicon)
|
||||
minimumSystemVersion: '11.0'
|
||||
hardenedRuntime: true
|
||||
|
||||
87
forge.config.js
Normal file
87
forge.config.js
Normal file
@ -0,0 +1,87 @@
|
||||
const { FusesPlugin } = require('@electron-forge/plugin-fuses');
|
||||
const { FuseV1Options, FuseVersion } = require('@electron/fuses');
|
||||
const { notarizeApp } = require('./notarize');
|
||||
|
||||
module.exports = {
|
||||
packagerConfig: {
|
||||
asar: {
|
||||
unpack: '**/*.node,**/*.dylib,' + '**/node_modules/{sharp,@img}/**/*',
|
||||
},
|
||||
extraResource: ['./src/assets/SystemAudioDump', './pickleglass_web/out'],
|
||||
name: 'Glass',
|
||||
icon: 'src/assets/logo',
|
||||
appBundleId: 'com.pickle.glass',
|
||||
arch: 'universal',
|
||||
protocols: [
|
||||
{
|
||||
name: 'PickleGlass Protocol',
|
||||
schemes: ['pickleglass'],
|
||||
},
|
||||
],
|
||||
asarUnpack: [
|
||||
'**/*.node',
|
||||
'**/*.dylib',
|
||||
'node_modules/@img/sharp-darwin-x64/**',
|
||||
'node_modules/@img/sharp-libvips-darwin-x64/**',
|
||||
'node_modules/@img/sharp-darwin-arm64/**',
|
||||
'node_modules/@img/sharp-libvips-darwin-arm64/**',
|
||||
],
|
||||
osxSign: {
|
||||
identity: process.env.APPLE_SIGNING_IDENTITY,
|
||||
'hardened-runtime': true,
|
||||
entitlements: 'entitlements.plist',
|
||||
'entitlements-inherit': 'entitlements.plist',
|
||||
},
|
||||
osxNotarize: {
|
||||
tool: 'notarytool',
|
||||
appleId: process.env.APPLE_ID,
|
||||
appleIdPassword: process.env.APPLE_ID_PASSWORD,
|
||||
teamId: process.env.APPLE_TEAM_ID,
|
||||
},
|
||||
},
|
||||
rebuildConfig: {},
|
||||
makers: [
|
||||
{
|
||||
name: '@electron-forge/maker-squirrel',
|
||||
config: {
|
||||
name: 'pickle-glass',
|
||||
productName: 'Glass',
|
||||
shortcutName: 'Glass',
|
||||
createDesktopShortcut: true,
|
||||
createStartMenuShortcut: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: '@electron-forge/maker-dmg',
|
||||
platforms: ['darwin'],
|
||||
},
|
||||
{
|
||||
name: '@electron-forge/maker-deb',
|
||||
config: {},
|
||||
},
|
||||
{
|
||||
name: '@electron-forge/maker-rpm',
|
||||
config: {},
|
||||
},
|
||||
],
|
||||
hooks: {
|
||||
afterSign: async (context, forgeConfig, platform, arch, appPath) => {
|
||||
await notarizeApp(context, forgeConfig, platform, arch, appPath);
|
||||
},
|
||||
},
|
||||
plugins: [
|
||||
{
|
||||
name: '@electron-forge/plugin-auto-unpack-natives',
|
||||
config: {},
|
||||
},
|
||||
new FusesPlugin({
|
||||
version: FuseVersion.V1,
|
||||
[FuseV1Options.RunAsNode]: false,
|
||||
[FuseV1Options.EnableCookieEncryption]: true,
|
||||
[FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
|
||||
[FuseV1Options.EnableNodeCliInspectArguments]: false,
|
||||
[FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
|
||||
[FuseV1Options.OnlyLoadAppFromAsar]: false,
|
||||
}),
|
||||
],
|
||||
};
|
||||
4788
package-lock.json
generated
4788
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@ -1,13 +1,15 @@
|
||||
{
|
||||
"name": "pickle-glass",
|
||||
"productName": "Glass",
|
||||
"version": "0.2.4",
|
||||
|
||||
"version": "0.2.2",
|
||||
|
||||
"description": "Cl*ely for Free",
|
||||
"main": "src/index.js",
|
||||
"scripts": {
|
||||
"setup": "npm install && cd pickleglass_web && npm install && npm run build && cd .. && npm start",
|
||||
"start": "npm run build:renderer && electron .",
|
||||
"package": "npm run build:all && electron-builder --dir",
|
||||
"start": "npm run build:renderer && electron-forge start",
|
||||
"package": "npm run build:renderer && electron-forge package",
|
||||
"make": "npm run build:renderer && electron-forge make",
|
||||
"build": "npm run build:all && electron-builder --config electron-builder.yml --publish never",
|
||||
"build:win": "npm run build:all && electron-builder --win --x64 --publish never",
|
||||
@ -33,11 +35,10 @@
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@anthropic-ai/sdk": "^0.56.0",
|
||||
"@deepgram/sdk": "^4.9.1",
|
||||
"@google/genai": "^1.8.0",
|
||||
"@google/generative-ai": "^0.24.1",
|
||||
"axios": "^1.10.0",
|
||||
"better-sqlite3": "^9.6.0",
|
||||
"better-sqlite3": "^9.4.3",
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^17.0.0",
|
||||
"electron-squirrel-startup": "^1.0.1",
|
||||
@ -47,10 +48,8 @@
|
||||
"firebase": "^11.10.0",
|
||||
"firebase-admin": "^13.4.0",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
"keytar": "^7.9.0",
|
||||
"node-fetch": "^2.7.0",
|
||||
"openai": "^4.70.0",
|
||||
"portkey-ai": "^1.10.1",
|
||||
"react-hot-toast": "^2.5.2",
|
||||
"sharp": "^0.34.2",
|
||||
"validator": "^13.11.0",
|
||||
@ -58,13 +57,20 @@
|
||||
"ws": "^8.18.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron-forge/cli": "^7.8.1",
|
||||
"@electron-forge/maker-deb": "^7.8.1",
|
||||
"@electron-forge/maker-dmg": "^7.8.1",
|
||||
"@electron-forge/maker-rpm": "^7.8.1",
|
||||
"@electron-forge/maker-squirrel": "^7.8.1",
|
||||
"@electron-forge/maker-zip": "^7.8.1",
|
||||
"@electron-forge/plugin-auto-unpack-natives": "^7.8.1",
|
||||
"@electron-forge/plugin-fuses": "^7.8.1",
|
||||
"@electron/fuses": "^1.8.0",
|
||||
"@electron/notarize": "^2.5.0",
|
||||
"electron": "^30.5.1",
|
||||
"electron-builder": "^26.0.12",
|
||||
"electron-reloader": "^1.2.3",
|
||||
"esbuild": "^0.25.5",
|
||||
"prettier": "^3.6.2"
|
||||
"esbuild": "^0.25.5"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"electron-liquid-glass": "^1.0.1"
|
||||
|
||||
@ -43,10 +43,9 @@ export default function LoginPage() {
|
||||
|
||||
window.location.href = deepLinkUrl
|
||||
|
||||
// Maybe we don't need this
|
||||
// setTimeout(() => {
|
||||
// alert('Login completed. Please return to Pickle Glass app.')
|
||||
// }, 1000)
|
||||
setTimeout(() => {
|
||||
alert('Login completed. Please return to Pickle Glass app.')
|
||||
}, 1000)
|
||||
|
||||
} catch (error) {
|
||||
console.error('❌ Deep link processing failed:', error)
|
||||
|
||||
@ -2,7 +2,7 @@ const crypto = require('crypto');
|
||||
|
||||
function ipcRequest(req, channel, payload) {
|
||||
return new Promise((resolve, reject) => {
|
||||
// Immediately check bridge status and fail if it's not available.
|
||||
// 즉시 브리지 상태 확인 - 문제있으면 바로 실패
|
||||
if (!req.bridge || typeof req.bridge.emit !== 'function') {
|
||||
reject(new Error('IPC bridge is not available'));
|
||||
return;
|
||||
|
||||
@ -46,8 +46,7 @@ router.post('/find-or-create', async (req, res) => {
|
||||
|
||||
router.post('/api-key', async (req, res) => {
|
||||
try {
|
||||
const { apiKey, provider = 'openai' } = req.body;
|
||||
await ipcRequest(req, 'save-api-key', { apiKey, provider });
|
||||
await ipcRequest(req, 'save-api-key', req.body.apiKey);
|
||||
res.json({ message: 'API key saved successfully' });
|
||||
} catch (error) {
|
||||
console.error('Failed to save API key via IPC:', error);
|
||||
|
||||
10
pickleglass_web/package-lock.json
generated
10
pickleglass_web/package-lock.json
generated
@ -42,21 +42,27 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@emnapi/core": {
|
||||
|
||||
"version": "1.4.4",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.4.tgz",
|
||||
"integrity": "sha512-A9CnAbC6ARNMKcIcrQwq6HeHCjpcBZ5wSx4U01WXCqEKlrzB9F9315WDNHkrs2xbx7YjjSxbUYxuN6EQzpcY2g==",
|
||||
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
|
||||
"@emnapi/wasi-threads": "1.0.3",
|
||||
|
||||
"tslib": "^2.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@emnapi/runtime": {
|
||||
|
||||
"version": "1.4.4",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.4.tgz",
|
||||
"integrity": "sha512-hHyapA4A3gPaDCNfiqyZUStTMqIkKRshqPIuDOXv1hcBnD4U3l8cP0T1HMCfGRxQ6V64TGCcoswChANyOAwbQg==",
|
||||
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@ -65,9 +71,11 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@emnapi/wasi-threads": {
|
||||
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.3.tgz",
|
||||
"integrity": "sha512-8K5IFFsQqF9wQNJptGbS6FNKgUTsSRYnTqNCG1vPP8jFdjSv18n2mQfJpkt2Oibo9iBEzcDnDxNwKTzC7svlJw==",
|
||||
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@ -2667,9 +2675,11 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/electron-to-chromium": {
|
||||
|
||||
"version": "1.5.180",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.180.tgz",
|
||||
"integrity": "sha512-ED+GEyEh3kYMwt2faNmgMB0b8O5qtATGgR4RmRsIp4T6p7B8vdMbIedYndnvZfsaXvSzegtpfqRMDNCjjiSduA==",
|
||||
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/emoji-regex": {
|
||||
|
||||
551
src/app/ApiKeyHeader.js
Normal file
551
src/app/ApiKeyHeader.js
Normal file
@ -0,0 +1,551 @@
|
||||
import { html, css, LitElement } from "../assets/lit-core-2.7.4.min.js"
|
||||
|
||||
export class ApiKeyHeader extends LitElement {
|
||||
//////// after_modelStateService ////////
|
||||
static properties = {
|
||||
llmApiKey: { type: String },
|
||||
sttApiKey: { type: String },
|
||||
llmProvider: { type: String },
|
||||
sttProvider: { type: String },
|
||||
isLoading: { type: Boolean },
|
||||
errorMessage: { type: String },
|
||||
providers: { type: Object, state: true },
|
||||
}
|
||||
//////// after_modelStateService ////////
|
||||
|
||||
static styles = css`
|
||||
:host {
|
||||
display: block;
|
||||
transform: translate3d(0, 0, 0);
|
||||
backface-visibility: hidden;
|
||||
transition: opacity 0.25s ease-out;
|
||||
}
|
||||
|
||||
:host(.sliding-out) {
|
||||
animation: slideOutUp 0.3s ease-in forwards;
|
||||
will-change: opacity, transform;
|
||||
}
|
||||
|
||||
:host(.hidden) {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@keyframes slideOutUp {
|
||||
from {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
to {
|
||||
opacity: 0;
|
||||
transform: translateY(-20px);
|
||||
}
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: 'Helvetica Neue', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
|
||||
cursor: default;
|
||||
user-select: none;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 350px;
|
||||
min-height: 260px;
|
||||
padding: 18px 20px;
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
border-radius: 16px;
|
||||
overflow: visible;
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.container::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
border-radius: 16px;
|
||||
padding: 1px;
|
||||
background: linear-gradient(169deg, rgba(255, 255, 255, 0.5) 0%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.5) 100%);
|
||||
-webkit-mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
|
||||
-webkit-mask-composite: destination-out;
|
||||
mask-composite: exclude;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.close-button {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: rgba(255, 255, 255, 0.7);
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: all 0.15s ease;
|
||||
z-index: 10;
|
||||
font-size: 14px;
|
||||
line-height: 1;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.close-button:hover {
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
color: rgba(255, 255, 255, 0.9);
|
||||
}
|
||||
|
||||
.close-button:active {
|
||||
transform: scale(0.95);
|
||||
}
|
||||
|
||||
.title {
|
||||
color: white;
|
||||
font-size: 16px;
|
||||
font-weight: 500; /* Medium */
|
||||
margin: 0;
|
||||
text-align: center;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.form-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
margin-top: auto;
|
||||
}
|
||||
|
||||
.error-message {
|
||||
color: rgba(239, 68, 68, 0.9);
|
||||
font-weight: 500;
|
||||
font-size: 11px;
|
||||
height: 14px;
|
||||
text-align: center;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.api-input {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 10px;
|
||||
border: none;
|
||||
padding: 0 10px;
|
||||
color: white;
|
||||
font-size: 12px;
|
||||
font-weight: 400; /* Regular */
|
||||
margin-bottom: 6px;
|
||||
text-align: center;
|
||||
user-select: text;
|
||||
cursor: text;
|
||||
}
|
||||
|
||||
.api-input::placeholder {
|
||||
color: rgba(255, 255, 255, 0.6);
|
||||
}
|
||||
|
||||
.api-input:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.providers-container { display: flex; gap: 12px; width: 100%; }
|
||||
.provider-column { flex: 1; display: flex; flex-direction: column; align-items: center; }
|
||||
.provider-label { color: rgba(255, 255, 255, 0.7); font-size: 11px; font-weight: 500; margin-bottom: 6px; }
|
||||
.api-input, .provider-select {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
text-align: center;
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 10px;
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
padding: 0 10px;
|
||||
color: white;
|
||||
font-size: 12px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
.provider-select option { background: #1a1a1a; color: white; }
|
||||
|
||||
.provider-select:hover {
|
||||
background-color: rgba(255, 255, 255, 0.15);
|
||||
border-color: rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
|
||||
.provider-select:focus {
|
||||
outline: none;
|
||||
background-color: rgba(255, 255, 255, 0.15);
|
||||
border-color: rgba(255, 255, 255, 0.4);
|
||||
}
|
||||
|
||||
|
||||
.action-button {
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
border: none;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
font-size: 12px;
|
||||
font-weight: 500; /* Medium */
|
||||
cursor: pointer;
|
||||
transition: background 0.15s ease;
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.action-button::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
border-radius: 10px;
|
||||
padding: 1px;
|
||||
background: linear-gradient(169deg, rgba(255, 255, 255, 0.5) 0%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0.5) 100%);
|
||||
-webkit-mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
|
||||
-webkit-mask-composite: destination-out;
|
||||
mask-composite: exclude;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.action-button:hover {
|
||||
background: rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
|
||||
.action-button:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.or-text {
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
font-size: 12px;
|
||||
font-weight: 500; /* Medium */
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
|
||||
/* ────────────────[ GLASS BYPASS ]─────────────── */
|
||||
:host-context(body.has-glass) .container,
|
||||
:host-context(body.has-glass) .api-input,
|
||||
:host-context(body.has-glass) .provider-select,
|
||||
:host-context(body.has-glass) .action-button,
|
||||
:host-context(body.has-glass) .close-button {
|
||||
background: transparent !important;
|
||||
border: none !important;
|
||||
box-shadow: none !important;
|
||||
filter: none !important;
|
||||
backdrop-filter: none !important;
|
||||
}
|
||||
|
||||
:host-context(body.has-glass) .container::after,
|
||||
:host-context(body.has-glass) .action-button::after {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
:host-context(body.has-glass) .action-button:hover,
|
||||
:host-context(body.has-glass) .provider-select:hover,
|
||||
:host-context(body.has-glass) .close-button:hover {
|
||||
background: transparent !important;
|
||||
}
|
||||
`
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.dragState = null
|
||||
this.wasJustDragged = false
|
||||
this.isLoading = false
|
||||
this.errorMessage = ""
|
||||
//////// after_modelStateService ////////
|
||||
this.llmApiKey = "";
|
||||
this.sttApiKey = "";
|
||||
this.llmProvider = "openai";
|
||||
this.sttProvider = "openai";
|
||||
this.providers = { llm: [], stt: [] }; // 초기화
|
||||
this.loadProviderConfig();
|
||||
//////// after_modelStateService ////////
|
||||
|
||||
this.handleMouseMove = this.handleMouseMove.bind(this)
|
||||
this.handleMouseUp = this.handleMouseUp.bind(this)
|
||||
this.handleKeyPress = this.handleKeyPress.bind(this)
|
||||
this.handleSubmit = this.handleSubmit.bind(this)
|
||||
this.handleInput = this.handleInput.bind(this)
|
||||
this.handleAnimationEnd = this.handleAnimationEnd.bind(this)
|
||||
this.handleUsePicklesKey = this.handleUsePicklesKey.bind(this)
|
||||
this.handleProviderChange = this.handleProviderChange.bind(this)
|
||||
}
|
||||
|
||||
reset() {
|
||||
this.apiKey = ""
|
||||
this.isLoading = false
|
||||
this.errorMessage = ""
|
||||
this.validatedApiKey = null
|
||||
this.selectedProvider = "openai"
|
||||
this.requestUpdate()
|
||||
}
|
||||
|
||||
async loadProviderConfig() {
|
||||
if (!window.require) return;
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
const config = await ipcRenderer.invoke('model:get-provider-config');
|
||||
|
||||
const llmProviders = [];
|
||||
const sttProviders = [];
|
||||
|
||||
for (const id in config) {
|
||||
// 'openai-glass' 같은 가상 Provider는 UI에 표시하지 않음
|
||||
if (id.includes('-glass')) continue;
|
||||
|
||||
if (config[id].llmModels.length > 0) {
|
||||
llmProviders.push({ id, name: config[id].name });
|
||||
}
|
||||
if (config[id].sttModels.length > 0) {
|
||||
sttProviders.push({ id, name: config[id].name });
|
||||
}
|
||||
}
|
||||
|
||||
this.providers = { llm: llmProviders, stt: sttProviders };
|
||||
|
||||
// 기본 선택 값 설정
|
||||
if (llmProviders.length > 0) this.llmProvider = llmProviders[0].id;
|
||||
if (sttProviders.length > 0) this.sttProvider = sttProviders[0].id;
|
||||
|
||||
this.requestUpdate();
|
||||
}
|
||||
|
||||
async handleMouseDown(e) {
|
||||
if (e.target.tagName === "INPUT" || e.target.tagName === "BUTTON" || e.target.tagName === "SELECT") {
|
||||
return
|
||||
}
|
||||
|
||||
e.preventDefault()
|
||||
|
||||
const { ipcRenderer } = window.require("electron")
|
||||
const initialPosition = await ipcRenderer.invoke("get-header-position")
|
||||
|
||||
this.dragState = {
|
||||
initialMouseX: e.screenX,
|
||||
initialMouseY: e.screenY,
|
||||
initialWindowX: initialPosition.x,
|
||||
initialWindowY: initialPosition.y,
|
||||
moved: false,
|
||||
}
|
||||
|
||||
window.addEventListener("mousemove", this.handleMouseMove)
|
||||
window.addEventListener("mouseup", this.handleMouseUp, { once: true })
|
||||
}
|
||||
|
||||
handleMouseMove(e) {
|
||||
if (!this.dragState) return
|
||||
|
||||
const deltaX = Math.abs(e.screenX - this.dragState.initialMouseX)
|
||||
const deltaY = Math.abs(e.screenY - this.dragState.initialMouseY)
|
||||
|
||||
if (deltaX > 3 || deltaY > 3) {
|
||||
this.dragState.moved = true
|
||||
}
|
||||
|
||||
const newWindowX = this.dragState.initialWindowX + (e.screenX - this.dragState.initialMouseX)
|
||||
const newWindowY = this.dragState.initialWindowY + (e.screenY - this.dragState.initialMouseY)
|
||||
|
||||
const { ipcRenderer } = window.require("electron")
|
||||
ipcRenderer.invoke("move-header-to", newWindowX, newWindowY)
|
||||
}
|
||||
|
||||
handleMouseUp(e) {
|
||||
if (!this.dragState) return
|
||||
|
||||
const wasDragged = this.dragState.moved
|
||||
|
||||
window.removeEventListener("mousemove", this.handleMouseMove)
|
||||
this.dragState = null
|
||||
|
||||
if (wasDragged) {
|
||||
this.wasJustDragged = true
|
||||
setTimeout(() => {
|
||||
this.wasJustDragged = false
|
||||
}, 200)
|
||||
}
|
||||
}
|
||||
|
||||
handleInput(e) {
|
||||
this.apiKey = e.target.value
|
||||
this.errorMessage = ""
|
||||
console.log("Input changed:", this.apiKey?.length || 0, "chars")
|
||||
|
||||
this.requestUpdate()
|
||||
this.updateComplete.then(() => {
|
||||
const inputField = this.shadowRoot?.querySelector(".apikey-input")
|
||||
if (inputField && this.isInputFocused) {
|
||||
inputField.focus()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
handleProviderChange(e) {
|
||||
this.selectedProvider = e.target.value
|
||||
this.errorMessage = ""
|
||||
console.log("Provider changed to:", this.selectedProvider)
|
||||
this.requestUpdate()
|
||||
}
|
||||
|
||||
handlePaste(e) {
|
||||
e.preventDefault()
|
||||
this.errorMessage = ""
|
||||
const clipboardText = (e.clipboardData || window.clipboardData).getData("text")
|
||||
console.log("Paste event detected:", clipboardText?.substring(0, 10) + "...")
|
||||
|
||||
if (clipboardText) {
|
||||
this.apiKey = clipboardText.trim()
|
||||
|
||||
const inputElement = e.target
|
||||
inputElement.value = this.apiKey
|
||||
}
|
||||
|
||||
this.requestUpdate()
|
||||
this.updateComplete.then(() => {
|
||||
const inputField = this.shadowRoot?.querySelector(".apikey-input")
|
||||
if (inputField) {
|
||||
inputField.focus()
|
||||
inputField.setSelectionRange(inputField.value.length, inputField.value.length)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
handleKeyPress(e) {
|
||||
if (e.key === "Enter") {
|
||||
e.preventDefault()
|
||||
this.handleSubmit()
|
||||
}
|
||||
}
|
||||
|
||||
//////// after_modelStateService ////////
|
||||
async handleSubmit() {
|
||||
console.log('[ApiKeyHeader] handleSubmit: Submitting API keys...');
|
||||
if (this.isLoading || !this.llmApiKey.trim() || !this.sttApiKey.trim()) {
|
||||
this.errorMessage = "Please enter keys for both LLM and STT.";
|
||||
return;
|
||||
}
|
||||
|
||||
this.isLoading = true;
|
||||
this.errorMessage = "";
|
||||
this.requestUpdate();
|
||||
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
console.log('[ApiKeyHeader] handleSubmit: Validating LLM key...');
|
||||
const llmValidation = ipcRenderer.invoke('model:validate-key', { provider: this.llmProvider, key: this.llmApiKey.trim() });
|
||||
const sttValidation = ipcRenderer.invoke('model:validate-key', { provider: this.sttProvider, key: this.sttApiKey.trim() });
|
||||
|
||||
const [llmResult, sttResult] = await Promise.all([llmValidation, sttValidation]);
|
||||
|
||||
if (llmResult.success && sttResult.success) {
|
||||
console.log('[ApiKeyHeader] handleSubmit: Both LLM and STT keys are valid.');
|
||||
this.startSlideOutAnimation();
|
||||
} else {
|
||||
console.log('[ApiKeyHeader] handleSubmit: Validation failed.');
|
||||
let errorParts = [];
|
||||
if (!llmResult.success) errorParts.push(`LLM Key: ${llmResult.error || 'Invalid'}`);
|
||||
if (!sttResult.success) errorParts.push(`STT Key: ${sttResult.error || 'Invalid'}`);
|
||||
this.errorMessage = errorParts.join(' | ');
|
||||
}
|
||||
|
||||
this.isLoading = false;
|
||||
this.requestUpdate();
|
||||
}
|
||||
//////// after_modelStateService ////////
|
||||
|
||||
|
||||
startSlideOutAnimation() {
|
||||
console.log('[ApiKeyHeader] startSlideOutAnimation: Starting slide out animation.');
|
||||
this.classList.add("sliding-out")
|
||||
}
|
||||
|
||||
handleUsePicklesKey(e) {
|
||||
e.preventDefault()
|
||||
if (this.wasJustDragged) return
|
||||
|
||||
console.log("Requesting Firebase authentication from main process...")
|
||||
if (window.require) {
|
||||
window.require("electron").ipcRenderer.invoke("start-firebase-auth")
|
||||
}
|
||||
}
|
||||
|
||||
handleClose() {
|
||||
console.log("Close button clicked")
|
||||
if (window.require) {
|
||||
window.require("electron").ipcRenderer.invoke("quit-application")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//////// after_modelStateService ////////
|
||||
handleAnimationEnd(e) {
|
||||
if (e.target !== this || !this.classList.contains('sliding-out')) return;
|
||||
this.classList.remove("sliding-out");
|
||||
this.classList.add("hidden");
|
||||
window.require('electron').ipcRenderer.invoke('get-current-user').then(userState => {
|
||||
console.log('[ApiKeyHeader] handleAnimationEnd: User state updated:', userState);
|
||||
this.stateUpdateCallback?.(userState);
|
||||
});
|
||||
}
|
||||
//////// after_modelStateService ////////
|
||||
|
||||
connectedCallback() {
|
||||
super.connectedCallback()
|
||||
this.addEventListener("animationend", this.handleAnimationEnd)
|
||||
}
|
||||
|
||||
disconnectedCallback() {
|
||||
super.disconnectedCallback()
|
||||
this.removeEventListener("animationend", this.handleAnimationEnd)
|
||||
}
|
||||
|
||||
render() {
|
||||
const isButtonDisabled = this.isLoading || !this.llmApiKey.trim() || !this.sttApiKey.trim();
|
||||
|
||||
return html`
|
||||
<div class="container" @mousedown=${this.handleMouseDown}>
|
||||
<h1 class="title">Enter Your API Keys</h1>
|
||||
|
||||
<div class="providers-container">
|
||||
<div class="provider-column">
|
||||
<div class="provider-label"></div>
|
||||
<select class="provider-select" .value=${this.llmProvider} @change=${e => this.llmProvider = e.target.value} ?disabled=${this.isLoading}>
|
||||
${this.providers.llm.map(p => html`<option value=${p.id}>${p.name}</option>`)}
|
||||
</select>
|
||||
<input type="password" class="api-input" placeholder="LLM Provider API Key" .value=${this.llmApiKey} @input=${e => this.llmApiKey = e.target.value} ?disabled=${this.isLoading}>
|
||||
</div>
|
||||
|
||||
<div class="provider-column">
|
||||
<div class="provider-label"></div>
|
||||
<select class="provider-select" .value=${this.sttProvider} @change=${e => this.sttProvider = e.target.value} ?disabled=${this.isLoading}>
|
||||
${this.providers.stt.map(p => html`<option value=${p.id}>${p.name}</option>`)}
|
||||
</select>
|
||||
<input type="password" class="api-input" placeholder="STT Provider API Key" .value=${this.sttApiKey} @input=${e => this.sttApiKey = e.target.value} ?disabled=${this.isLoading}>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="error-message">${this.errorMessage}</div>
|
||||
|
||||
<button class="action-button" @click=${this.handleSubmit} ?disabled=${isButtonDisabled}>
|
||||
${this.isLoading ? "Validating..." : "Confirm"}
|
||||
</button>
|
||||
<div class="or-text">or</div>
|
||||
<button class="action-button" @click=${this.handleUsePicklesKey}>Use Pickle's Key (Login)</button>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define("apikey-header", ApiKeyHeader)
|
||||
@ -1,20 +1,18 @@
|
||||
import './MainHeader.js';
|
||||
import './ApiKeyHeader.js';
|
||||
import './PermissionHeader.js';
|
||||
import './WelcomeHeader.js';
|
||||
|
||||
class HeaderTransitionManager {
|
||||
constructor() {
|
||||
this.headerContainer = document.getElementById('header-container');
|
||||
this.currentHeaderType = null; // 'welcome' | 'apikey' | 'main' | 'permission'
|
||||
this.welcomeHeader = null;
|
||||
this.currentHeaderType = null; // 'apikey' | 'main' | 'permission'
|
||||
this.apiKeyHeader = null;
|
||||
this.mainHeader = null;
|
||||
this.permissionHeader = null;
|
||||
|
||||
/**
|
||||
* only one header window is allowed
|
||||
* @param {'welcome'|'apikey'|'main'|'permission'} type
|
||||
* @param {'apikey'|'main'|'permission'} type
|
||||
*/
|
||||
this.ensureHeader = (type) => {
|
||||
console.log('[HeaderController] ensureHeader: Ensuring header of type:', type);
|
||||
@ -25,39 +23,18 @@ class HeaderTransitionManager {
|
||||
|
||||
this.headerContainer.innerHTML = '';
|
||||
|
||||
this.welcomeHeader = null;
|
||||
this.apiKeyHeader = null;
|
||||
this.mainHeader = null;
|
||||
this.permissionHeader = null;
|
||||
|
||||
// Create new header element
|
||||
if (type === 'welcome') {
|
||||
this.welcomeHeader = document.createElement('welcome-header');
|
||||
this.welcomeHeader.loginCallback = () => this.handleLoginOption();
|
||||
this.welcomeHeader.apiKeyCallback = () => this.handleApiKeyOption();
|
||||
this.headerContainer.appendChild(this.welcomeHeader);
|
||||
console.log('[HeaderController] ensureHeader: Header of type:', type, 'created.');
|
||||
} else if (type === 'apikey') {
|
||||
if (type === 'apikey') {
|
||||
this.apiKeyHeader = document.createElement('apikey-header');
|
||||
this.apiKeyHeader.stateUpdateCallback = (userState) => this.handleStateUpdate(userState);
|
||||
this.apiKeyHeader.backCallback = () => this.transitionToWelcomeHeader();
|
||||
this.apiKeyHeader.addEventListener('request-resize', e => {
|
||||
this._resizeForApiKey(e.detail.height);
|
||||
});
|
||||
this.headerContainer.appendChild(this.apiKeyHeader);
|
||||
console.log('[HeaderController] ensureHeader: Header of type:', type, 'created.');
|
||||
} else if (type === 'permission') {
|
||||
this.permissionHeader = document.createElement('permission-setup');
|
||||
this.permissionHeader.addEventListener('request-resize', e => {
|
||||
this._resizeForPermissionHeader(e.detail.height);
|
||||
});
|
||||
this.permissionHeader.continueCallback = async () => {
|
||||
if (window.api && window.api.headerController) {
|
||||
console.log('[HeaderController] Re-initializing model state after permission grant...');
|
||||
await window.api.headerController.reInitializeModelState();
|
||||
}
|
||||
this.transitionToMainHeader();
|
||||
};
|
||||
this.permissionHeader.continueCallback = () => this.transitionToMainHeader();
|
||||
this.headerContainer.appendChild(this.permissionHeader);
|
||||
} else {
|
||||
this.mainHeader = document.createElement('main-header');
|
||||
@ -71,105 +48,74 @@ class HeaderTransitionManager {
|
||||
|
||||
console.log('[HeaderController] Manager initialized');
|
||||
|
||||
// WelcomeHeader 콜백 메서드들
|
||||
this.handleLoginOption = this.handleLoginOption.bind(this);
|
||||
this.handleApiKeyOption = this.handleApiKeyOption.bind(this);
|
||||
|
||||
this._bootstrap();
|
||||
|
||||
if (window.api) {
|
||||
window.api.headerController.onUserStateChanged((event, userState) => {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
ipcRenderer.on('user-state-changed', (event, userState) => {
|
||||
console.log('[HeaderController] Received user state change:', userState);
|
||||
this.handleStateUpdate(userState);
|
||||
});
|
||||
|
||||
window.api.headerController.onAuthFailed((event, { message }) => {
|
||||
ipcRenderer.on('auth-failed', (event, { message }) => {
|
||||
console.error('[HeaderController] Received auth failure from main process:', message);
|
||||
if (this.apiKeyHeader) {
|
||||
this.apiKeyHeader.errorMessage = 'Authentication failed. Please try again.';
|
||||
this.apiKeyHeader.isLoading = false;
|
||||
}
|
||||
});
|
||||
window.api.headerController.onForceShowApiKeyHeader(async () => {
|
||||
ipcRenderer.on('force-show-apikey-header', async () => {
|
||||
console.log('[HeaderController] Received broadcast to show apikey header. Switching now.');
|
||||
const isConfigured = await window.api.apiKeyHeader.areProvidersConfigured();
|
||||
if (!isConfigured) {
|
||||
await this._resizeForWelcome();
|
||||
this.ensureHeader('welcome');
|
||||
} else {
|
||||
await this._resizeForApiKey();
|
||||
this.ensureHeader('apikey');
|
||||
}
|
||||
});
|
||||
await this._resizeForApiKey();
|
||||
this.ensureHeader('apikey');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
notifyHeaderState(stateOverride) {
|
||||
const state = stateOverride || this.currentHeaderType || 'apikey';
|
||||
if (window.api) {
|
||||
window.api.headerController.sendHeaderStateChanged(state);
|
||||
if (window.require) {
|
||||
window.require('electron').ipcRenderer.send('header-state-changed', state);
|
||||
}
|
||||
}
|
||||
|
||||
async _bootstrap() {
|
||||
// The initial state will be sent by the main process via 'user-state-changed'
|
||||
// We just need to request it.
|
||||
if (window.api) {
|
||||
const userState = await window.api.common.getCurrentUser();
|
||||
if (window.require) {
|
||||
const userState = await window.require('electron').ipcRenderer.invoke('get-current-user');
|
||||
console.log('[HeaderController] Bootstrapping with initial user state:', userState);
|
||||
this.handleStateUpdate(userState);
|
||||
} else {
|
||||
// Fallback for non-electron environment (testing/web)
|
||||
this.ensureHeader('welcome');
|
||||
this.ensureHeader('apikey');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//////// after_modelStateService ////////
|
||||
async handleStateUpdate(userState) {
|
||||
const isConfigured = await window.api.apiKeyHeader.areProvidersConfigured();
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
const isConfigured = await ipcRenderer.invoke('model:are-providers-configured');
|
||||
|
||||
if (isConfigured) {
|
||||
// If providers are configured, always check permissions regardless of login state.
|
||||
const permissionResult = await this.checkPermissions();
|
||||
if (permissionResult.success) {
|
||||
this.transitionToMainHeader();
|
||||
const { isLoggedIn } = userState;
|
||||
if (isLoggedIn) {
|
||||
const permissionResult = await this.checkPermissions();
|
||||
if (permissionResult.success) {
|
||||
this.transitionToMainHeader();
|
||||
} else {
|
||||
this.transitionToPermissionHeader();
|
||||
}
|
||||
} else {
|
||||
this.transitionToPermissionHeader();
|
||||
this.transitionToMainHeader();
|
||||
}
|
||||
} else {
|
||||
// If no providers are configured, show the welcome header to prompt for setup.
|
||||
await this._resizeForWelcome();
|
||||
this.ensureHeader('welcome');
|
||||
await this._resizeForApiKey();
|
||||
this.ensureHeader('apikey');
|
||||
}
|
||||
}
|
||||
|
||||
// WelcomeHeader 콜백 메서드들
|
||||
async handleLoginOption() {
|
||||
console.log('[HeaderController] Login option selected');
|
||||
if (window.api) {
|
||||
await window.api.common.startFirebaseAuth();
|
||||
}
|
||||
}
|
||||
|
||||
async handleApiKeyOption() {
|
||||
console.log('[HeaderController] API key option selected');
|
||||
await this._resizeForApiKey(400);
|
||||
this.ensureHeader('apikey');
|
||||
// ApiKeyHeader에 뒤로가기 콜백 설정
|
||||
if (this.apiKeyHeader) {
|
||||
this.apiKeyHeader.backCallback = () => this.transitionToWelcomeHeader();
|
||||
}
|
||||
}
|
||||
|
||||
async transitionToWelcomeHeader() {
|
||||
if (this.currentHeaderType === 'welcome') {
|
||||
return this._resizeForWelcome();
|
||||
}
|
||||
|
||||
await this._resizeForWelcome();
|
||||
this.ensureHeader('welcome');
|
||||
}
|
||||
//////// after_modelStateService ////////
|
||||
|
||||
async transitionToPermissionHeader() {
|
||||
@ -180,9 +126,10 @@ class HeaderTransitionManager {
|
||||
}
|
||||
|
||||
// Check if permissions were previously completed
|
||||
if (window.api) {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
try {
|
||||
const permissionsCompleted = await window.api.headerController.checkPermissionsCompleted();
|
||||
const permissionsCompleted = await ipcRenderer.invoke('check-permissions-completed');
|
||||
if (permissionsCompleted) {
|
||||
console.log('[HeaderController] Permissions were previously completed, checking current status...');
|
||||
|
||||
@ -201,19 +148,7 @@ class HeaderTransitionManager {
|
||||
}
|
||||
}
|
||||
|
||||
let initialHeight = 220;
|
||||
if (window.api) {
|
||||
try {
|
||||
const userState = await window.api.common.getCurrentUser();
|
||||
if (userState.mode === 'firebase') {
|
||||
initialHeight = 280;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Could not get user state for resize', e);
|
||||
}
|
||||
}
|
||||
|
||||
await this._resizeForPermissionHeader(initialHeight);
|
||||
await this._resizeForPermissionHeader();
|
||||
this.ensureHeader('permission');
|
||||
}
|
||||
|
||||
@ -226,39 +161,39 @@ class HeaderTransitionManager {
|
||||
this.ensureHeader('main');
|
||||
}
|
||||
|
||||
async _resizeForMain() {
|
||||
if (!window.api) return;
|
||||
console.log('[HeaderController] _resizeForMain: Resizing window to 353x47');
|
||||
return window.api.headerController.resizeHeaderWindow({ width: 353, height: 47 }).catch(() => {});
|
||||
}
|
||||
|
||||
async _resizeForApiKey(height = 370) {
|
||||
if (!window.api) return;
|
||||
console.log(`[HeaderController] _resizeForApiKey: Resizing window to 456x${height}`);
|
||||
return window.api.headerController.resizeHeaderWindow({ width: 456, height: height }).catch(() => {});
|
||||
}
|
||||
|
||||
async _resizeForPermissionHeader(height) {
|
||||
if (!window.api) return;
|
||||
const finalHeight = height || 220;
|
||||
return window.api.headerController.resizeHeaderWindow({ width: 285, height: finalHeight })
|
||||
_resizeForMain() {
|
||||
if (!window.require) return;
|
||||
return window
|
||||
.require('electron')
|
||||
.ipcRenderer.invoke('resize-header-window', { width: 353, height: 47 })
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
async _resizeForWelcome() {
|
||||
if (!window.api) return;
|
||||
console.log('[HeaderController] _resizeForWelcome: Resizing window to 456x370');
|
||||
return window.api.headerController.resizeHeaderWindow({ width: 456, height: 364 })
|
||||
async _resizeForApiKey() {
|
||||
if (!window.require) return;
|
||||
return window
|
||||
.require('electron')
|
||||
.ipcRenderer.invoke('resize-header-window', { width: 350, height: 300 })
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
async _resizeForPermissionHeader() {
|
||||
if (!window.require) return;
|
||||
return window
|
||||
.require('electron')
|
||||
.ipcRenderer.invoke('resize-header-window', { width: 285, height: 220 })
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
async checkPermissions() {
|
||||
if (!window.api) {
|
||||
if (!window.require) {
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
try {
|
||||
const permissions = await window.api.headerController.checkSystemPermissions();
|
||||
const permissions = await ipcRenderer.invoke('check-system-permissions');
|
||||
console.log('[HeaderController] Current permissions:', permissions);
|
||||
|
||||
if (!permissions.needsSetup) {
|
||||
@ -2,15 +2,17 @@ import { html, css, LitElement } from '../assets/lit-core-2.7.4.min.js';
|
||||
|
||||
export class MainHeader extends LitElement {
|
||||
static properties = {
|
||||
isTogglingSession: { type: Boolean, state: true },
|
||||
isSessionActive: { type: Boolean, state: true },
|
||||
shortcuts: { type: Object, state: true },
|
||||
listenSessionStatus: { type: String, state: true },
|
||||
};
|
||||
|
||||
static styles = css`
|
||||
:host {
|
||||
display: flex;
|
||||
transform: translate3d(0, 0, 0);
|
||||
backface-visibility: hidden;
|
||||
transition: transform 0.2s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.2s ease-out;
|
||||
will-change: transform, opacity;
|
||||
}
|
||||
|
||||
:host(.hiding) {
|
||||
@ -31,6 +33,65 @@ export class MainHeader extends LitElement {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@keyframes slideUp {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: translateY(0) scale(1);
|
||||
filter: blur(0px);
|
||||
}
|
||||
30% {
|
||||
opacity: 0.7;
|
||||
transform: translateY(-20%) scale(0.98);
|
||||
filter: blur(0.5px);
|
||||
}
|
||||
70% {
|
||||
opacity: 0.3;
|
||||
transform: translateY(-80%) scale(0.92);
|
||||
filter: blur(1.5px);
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
transform: translateY(-150%) scale(0.85);
|
||||
filter: blur(2px);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideDown {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translateY(-150%) scale(0.85);
|
||||
filter: blur(2px);
|
||||
}
|
||||
30% {
|
||||
opacity: 0.5;
|
||||
transform: translateY(-50%) scale(0.92);
|
||||
filter: blur(1px);
|
||||
}
|
||||
65% {
|
||||
opacity: 0.9;
|
||||
transform: translateY(-5%) scale(0.99);
|
||||
filter: blur(0.2px);
|
||||
}
|
||||
85% {
|
||||
opacity: 0.98;
|
||||
transform: translateY(2%) scale(1.005);
|
||||
filter: blur(0px);
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
transform: translateY(0) scale(1);
|
||||
filter: blur(0px);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes fadeIn {
|
||||
0% {
|
||||
opacity: 0;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: 'Helvetica Neue', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
|
||||
@ -39,7 +100,6 @@ export class MainHeader extends LitElement {
|
||||
}
|
||||
|
||||
.header {
|
||||
-webkit-app-region: drag;
|
||||
width: max-content;
|
||||
height: 47px;
|
||||
padding: 2px 10px 2px 13px;
|
||||
@ -81,7 +141,6 @@ export class MainHeader extends LitElement {
|
||||
}
|
||||
|
||||
.listen-button {
|
||||
-webkit-app-region: no-drag;
|
||||
height: 26px;
|
||||
padding: 0 13px;
|
||||
background: transparent;
|
||||
@ -96,11 +155,6 @@ export class MainHeader extends LitElement {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.listen-button:disabled {
|
||||
cursor: default;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.listen-button.active::before {
|
||||
background: rgba(215, 0, 0, 0.5);
|
||||
}
|
||||
@ -109,24 +163,6 @@ export class MainHeader extends LitElement {
|
||||
background: rgba(255, 20, 20, 0.6);
|
||||
}
|
||||
|
||||
.listen-button.done {
|
||||
background-color: rgba(255, 255, 255, 0.6);
|
||||
transition: background-color 0.15s ease;
|
||||
}
|
||||
|
||||
.listen-button.done .action-text-content {
|
||||
color: black;
|
||||
}
|
||||
|
||||
.listen-button.done .listen-icon svg rect,
|
||||
.listen-button.done .listen-icon svg path {
|
||||
fill: black;
|
||||
}
|
||||
|
||||
.listen-button.done:hover {
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
|
||||
.listen-button:hover::before {
|
||||
background: rgba(255, 255, 255, 0.18);
|
||||
}
|
||||
@ -156,40 +192,7 @@ export class MainHeader extends LitElement {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.listen-button.done::after {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.loading-dots {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
.loading-dots span {
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
background-color: white;
|
||||
border-radius: 50%;
|
||||
animation: pulse 1.4s infinite ease-in-out both;
|
||||
}
|
||||
.loading-dots span:nth-of-type(1) {
|
||||
animation-delay: -0.32s;
|
||||
}
|
||||
.loading-dots span:nth-of-type(2) {
|
||||
animation-delay: -0.16s;
|
||||
}
|
||||
@keyframes pulse {
|
||||
0%, 80%, 100% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
40% {
|
||||
opacity: 1.0;
|
||||
}
|
||||
}
|
||||
|
||||
.header-actions {
|
||||
-webkit-app-region: no-drag;
|
||||
height: 26px;
|
||||
box-sizing: border-box;
|
||||
justify-content: flex-start;
|
||||
@ -261,7 +264,6 @@ export class MainHeader extends LitElement {
|
||||
}
|
||||
|
||||
.settings-button {
|
||||
-webkit-app-region: no-drag;
|
||||
padding: 5px;
|
||||
border-radius: 50%;
|
||||
background: transparent;
|
||||
@ -289,6 +291,7 @@ export class MainHeader extends LitElement {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
/* ────────────────[ GLASS BYPASS ]─────────────── */
|
||||
:host-context(body.has-glass) .header,
|
||||
:host-context(body.has-glass) .listen-button,
|
||||
@ -343,33 +346,24 @@ export class MainHeader extends LitElement {
|
||||
constructor() {
|
||||
super();
|
||||
this.shortcuts = {};
|
||||
this.dragState = null;
|
||||
this.wasJustDragged = false;
|
||||
this.isVisible = true;
|
||||
this.isAnimating = false;
|
||||
this.hasSlidIn = false;
|
||||
this.settingsHideTimer = null;
|
||||
this.isTogglingSession = false;
|
||||
this.listenSessionStatus = 'beforeSession';
|
||||
this.isSessionActive = false;
|
||||
this.animationEndTimer = null;
|
||||
this.handleAnimationEnd = this.handleAnimationEnd.bind(this);
|
||||
this.handleMouseMove = this.handleMouseMove.bind(this);
|
||||
this.handleMouseUp = this.handleMouseUp.bind(this);
|
||||
this.dragState = null;
|
||||
this.wasJustDragged = false;
|
||||
}
|
||||
|
||||
_getListenButtonText(status) {
|
||||
switch (status) {
|
||||
case 'beforeSession': return 'Listen';
|
||||
case 'inSession' : return 'Stop';
|
||||
case 'afterSession': return 'Done';
|
||||
default : return 'Listen';
|
||||
}
|
||||
this.handleAnimationEnd = this.handleAnimationEnd.bind(this);
|
||||
}
|
||||
|
||||
async handleMouseDown(e) {
|
||||
e.preventDefault();
|
||||
|
||||
const initialPosition = await window.api.mainHeader.getHeaderPosition();
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
const initialPosition = await ipcRenderer.invoke('get-header-position');
|
||||
|
||||
this.dragState = {
|
||||
initialMouseX: e.screenX,
|
||||
@ -396,7 +390,8 @@ export class MainHeader extends LitElement {
|
||||
const newWindowX = this.dragState.initialWindowX + (e.screenX - this.dragState.initialMouseX);
|
||||
const newWindowY = this.dragState.initialWindowY + (e.screenY - this.dragState.initialMouseY);
|
||||
|
||||
window.api.mainHeader.moveHeaderTo(newWindowX, newWindowY);
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('move-header-to', newWindowX, newWindowY);
|
||||
}
|
||||
|
||||
handleMouseUp(e) {
|
||||
@ -436,29 +431,58 @@ export class MainHeader extends LitElement {
|
||||
}
|
||||
|
||||
hide() {
|
||||
this.classList.remove('showing');
|
||||
this.classList.remove('showing', 'hidden');
|
||||
this.classList.add('hiding');
|
||||
this.isVisible = false;
|
||||
|
||||
this.animationEndTimer = setTimeout(() => {
|
||||
if (this.classList.contains('hiding')) {
|
||||
this.handleAnimationEnd({ target: this });
|
||||
}
|
||||
}, 350);
|
||||
}
|
||||
|
||||
|
||||
show() {
|
||||
this.classList.remove('hiding', 'hidden');
|
||||
this.classList.add('showing');
|
||||
this.isVisible = true;
|
||||
|
||||
this.animationEndTimer = setTimeout(() => {
|
||||
if (this.classList.contains('showing')) {
|
||||
this.handleAnimationEnd({ target: this });
|
||||
}
|
||||
}, 400);
|
||||
}
|
||||
|
||||
|
||||
handleAnimationEnd(e) {
|
||||
if (e.target !== this) return;
|
||||
|
||||
|
||||
if (this.animationEndTimer) {
|
||||
clearTimeout(this.animationEndTimer);
|
||||
this.animationEndTimer = null;
|
||||
}
|
||||
|
||||
this.isAnimating = false;
|
||||
|
||||
|
||||
if (this.classList.contains('hiding')) {
|
||||
this.classList.remove('hiding');
|
||||
this.classList.add('hidden');
|
||||
if (window.api) {
|
||||
window.api.mainHeader.sendHeaderAnimationFinished('hidden');
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.send('header-animation-complete', 'hidden');
|
||||
}
|
||||
} else if (this.classList.contains('showing')) {
|
||||
if (window.api) {
|
||||
window.api.mainHeader.sendHeaderAnimationFinished('visible');
|
||||
this.classList.remove('showing');
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.send('header-animation-complete', 'visible');
|
||||
}
|
||||
} else if (this.classList.contains('sliding-in')) {
|
||||
this.classList.remove('sliding-in');
|
||||
this.hasSlidIn = true;
|
||||
console.log('[MainHeader] Slide-in animation completed');
|
||||
}
|
||||
}
|
||||
|
||||
@ -471,27 +495,17 @@ export class MainHeader extends LitElement {
|
||||
super.connectedCallback();
|
||||
this.addEventListener('animationend', this.handleAnimationEnd);
|
||||
|
||||
if (window.api) {
|
||||
|
||||
this._sessionStateTextListener = (event, { success }) => {
|
||||
if (success) {
|
||||
this.listenSessionStatus = ({
|
||||
beforeSession: 'inSession',
|
||||
inSession: 'afterSession',
|
||||
afterSession: 'beforeSession',
|
||||
})[this.listenSessionStatus] || 'beforeSession';
|
||||
} else {
|
||||
this.listenSessionStatus = 'beforeSession';
|
||||
}
|
||||
this.isTogglingSession = false; // ✨ 로딩 상태만 해제
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
this._sessionStateListener = (event, { isActive }) => {
|
||||
this.isSessionActive = isActive;
|
||||
};
|
||||
window.api.mainHeader.onListenChangeSessionResult(this._sessionStateTextListener);
|
||||
|
||||
ipcRenderer.on('session-state-changed', this._sessionStateListener);
|
||||
this._shortcutListener = (event, keybinds) => {
|
||||
console.log('[MainHeader] Received updated shortcuts:', keybinds);
|
||||
this.shortcuts = keybinds;
|
||||
};
|
||||
window.api.mainHeader.onShortcutsUpdated(this._shortcutListener);
|
||||
ipcRenderer.on('shortcuts-updated', this._shortcutListener);
|
||||
}
|
||||
}
|
||||
|
||||
@ -504,76 +518,62 @@ export class MainHeader extends LitElement {
|
||||
this.animationEndTimer = null;
|
||||
}
|
||||
|
||||
if (window.api) {
|
||||
if (this._sessionStateTextListener) {
|
||||
window.api.mainHeader.removeOnListenChangeSessionResult(this._sessionStateTextListener);
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
if (this._sessionStateListener) {
|
||||
ipcRenderer.removeListener('session-state-changed', this._sessionStateListener);
|
||||
}
|
||||
if (this._shortcutListener) {
|
||||
window.api.mainHeader.removeOnShortcutsUpdated(this._shortcutListener);
|
||||
ipcRenderer.removeListener('shortcuts-updated', this._shortcutListener);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
showSettingsWindow(element) {
|
||||
if (this.wasJustDragged) return;
|
||||
if (window.api) {
|
||||
console.log(`[MainHeader] showSettingsWindow called at ${Date.now()}`);
|
||||
window.api.mainHeader.showSettingsWindow();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
hideSettingsWindow() {
|
||||
if (this.wasJustDragged) return;
|
||||
if (window.api) {
|
||||
console.log(`[MainHeader] hideSettingsWindow called at ${Date.now()}`);
|
||||
window.api.mainHeader.hideSettingsWindow();
|
||||
}
|
||||
}
|
||||
|
||||
async _handleListenClick() {
|
||||
if (this.wasJustDragged) return;
|
||||
if (this.isTogglingSession) {
|
||||
invoke(channel, ...args) {
|
||||
if (this.wasJustDragged) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.isTogglingSession = true;
|
||||
|
||||
try {
|
||||
const listenButtonText = this._getListenButtonText(this.listenSessionStatus);
|
||||
if (window.api) {
|
||||
await window.api.mainHeader.sendListenButtonClick(listenButtonText);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('IPC invoke for session change failed:', error);
|
||||
this.isTogglingSession = false;
|
||||
if (window.require) {
|
||||
window.require('electron').ipcRenderer.invoke(channel, ...args);
|
||||
}
|
||||
}
|
||||
|
||||
async _handleAskClick() {
|
||||
showWindow(name, element) {
|
||||
if (this.wasJustDragged) return;
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
console.log(`[MainHeader] showWindow('${name}') called at ${Date.now()}`);
|
||||
|
||||
ipcRenderer.send('cancel-hide-window', name);
|
||||
|
||||
try {
|
||||
if (window.api) {
|
||||
await window.api.mainHeader.sendAskButtonClick();
|
||||
if (name === 'settings' && element) {
|
||||
const rect = element.getBoundingClientRect();
|
||||
ipcRenderer.send('show-window', {
|
||||
name: 'settings',
|
||||
bounds: {
|
||||
x: rect.left,
|
||||
y: rect.top,
|
||||
width: rect.width,
|
||||
height: rect.height
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ipcRenderer.send('show-window', name);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('IPC invoke for ask button failed:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async _handleToggleAllWindowsVisibility() {
|
||||
hideWindow(name) {
|
||||
if (this.wasJustDragged) return;
|
||||
|
||||
try {
|
||||
if (window.api) {
|
||||
await window.api.mainHeader.sendToggleAllWindowsVisibility();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('IPC invoke for all windows visibility button failed:', error);
|
||||
if (window.require) {
|
||||
console.log(`[MainHeader] hideWindow('${name}') called at ${Date.now()}`);
|
||||
window.require('electron').ipcRenderer.send('hide-window', name);
|
||||
}
|
||||
}
|
||||
|
||||
cancelHideWindow(name) {
|
||||
|
||||
}
|
||||
|
||||
renderShortcut(accelerator) {
|
||||
if (!accelerator) return html``;
|
||||
@ -599,50 +599,34 @@ export class MainHeader extends LitElement {
|
||||
}
|
||||
|
||||
render() {
|
||||
const listenButtonText = this._getListenButtonText(this.listenSessionStatus);
|
||||
|
||||
const buttonClasses = {
|
||||
active: listenButtonText === 'Stop',
|
||||
done: listenButtonText === 'Done',
|
||||
};
|
||||
const showStopIcon = listenButtonText === 'Stop' || listenButtonText === 'Done';
|
||||
|
||||
return html`
|
||||
<div class="header" @mousedown=${this.handleMouseDown}>
|
||||
<button
|
||||
class="listen-button ${Object.keys(buttonClasses).filter(k => buttonClasses[k]).join(' ')}"
|
||||
@click=${this._handleListenClick}
|
||||
?disabled=${this.isTogglingSession}
|
||||
class="listen-button ${this.isSessionActive ? 'active' : ''}"
|
||||
@click=${() => this.invoke(this.isSessionActive ? 'close-session' : 'toggle-feature', 'listen')}
|
||||
>
|
||||
${this.isTogglingSession
|
||||
? html`
|
||||
<div class="loading-dots">
|
||||
<span></span><span></span><span></span>
|
||||
</div>
|
||||
`
|
||||
: html`
|
||||
<div class="action-text">
|
||||
<div class="action-text-content">${listenButtonText}</div>
|
||||
</div>
|
||||
<div class="listen-icon">
|
||||
${showStopIcon
|
||||
? html`
|
||||
<svg width="9" height="9" viewBox="0 0 9 9" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect width="9" height="9" rx="1" fill="white"/>
|
||||
</svg>
|
||||
`
|
||||
: html`
|
||||
<svg width="12" height="11" viewBox="0 0 12 11" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M1.69922 2.7515C1.69922 2.37153 2.00725 2.0635 2.38722 2.0635H2.73122C3.11119 2.0635 3.41922 2.37153 3.41922 2.7515V8.2555C3.41922 8.63547 3.11119 8.9435 2.73122 8.9435H2.38722C2.00725 8.9435 1.69922 8.63547 1.69922 8.2555V2.7515Z" fill="white"/>
|
||||
<path d="M5.13922 1.3755C5.13922 0.995528 5.44725 0.6875 5.82722 0.6875H6.17122C6.55119 0.6875 6.85922 0.995528 6.85922 1.3755V9.6315C6.85922 10.0115 6.55119 10.3195 6.17122 10.3195H5.82722C5.44725 10.3195 5.13922 10.0115 5.13922 9.6315V1.3755Z" fill="white"/>
|
||||
<path d="M8.57922 3.0955C8.57922 2.71553 8.88725 2.4075 9.26722 2.4075H9.61122C9.99119 2.4075 10.2992 2.71553 10.2992 3.0955V7.9115C10.2992 8.29147 9.99119 8.5995 9.61122 8.5995H9.26722C8.88725 8.5995 8.57922 8.29147 8.57922 7.9115V3.0955Z" fill="white"/>
|
||||
</svg>
|
||||
`}
|
||||
</div>
|
||||
`}
|
||||
<div class="action-text">
|
||||
<div class="action-text-content">${this.isSessionActive ? 'Stop' : 'Listen'}</div>
|
||||
</div>
|
||||
<div class="listen-icon">
|
||||
${this.isSessionActive
|
||||
? html`
|
||||
<svg width="9" height="9" viewBox="0 0 9 9" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect width="9" height="9" rx="1" fill="white"/>
|
||||
</svg>
|
||||
|
||||
`
|
||||
: html`
|
||||
<svg width="12" height="11" viewBox="0 0 12 11" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M1.69922 2.7515C1.69922 2.37153 2.00725 2.0635 2.38722 2.0635H2.73122C3.11119 2.0635 3.41922 2.37153 3.41922 2.7515V8.2555C3.41922 8.63547 3.11119 8.9435 2.73122 8.9435H2.38722C2.00725 8.9435 1.69922 8.63547 1.69922 8.2555V2.7515Z" fill="white"/>
|
||||
<path d="M5.13922 1.3755C5.13922 0.995528 5.44725 0.6875 5.82722 0.6875H6.17122C6.55119 0.6875 6.85922 0.995528 6.85922 1.3755V9.6315C6.85922 10.0115 6.55119 10.3195 6.17122 10.3195H5.82722C5.44725 10.3195 5.13922 10.0115 5.13922 9.6315V1.3755Z" fill="white"/>
|
||||
<path d="M8.57922 3.0955C8.57922 2.71553 8.88725 2.4075 9.26722 2.4075H9.61122C9.99119 2.4075 10.2992 2.71553 10.2992 3.0955V7.9115C10.2992 8.29147 9.99119 8.5995 9.61122 8.5995H9.26722C8.88725 8.5995 8.57922 8.29147 8.57922 7.9115V3.0955Z" fill="white"/>
|
||||
</svg>
|
||||
`}
|
||||
</div>
|
||||
</button>
|
||||
|
||||
<div class="header-actions ask-action" @click=${() => this._handleAskClick()}>
|
||||
<div class="header-actions ask-action" @click=${() => this.invoke('toggle-feature', 'ask')}>
|
||||
<div class="action-text">
|
||||
<div class="action-text-content">Ask</div>
|
||||
</div>
|
||||
@ -651,7 +635,7 @@ export class MainHeader extends LitElement {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="header-actions" @click=${() => this._handleToggleAllWindowsVisibility()}>
|
||||
<div class="header-actions" @click=${() => this.invoke('toggle-all-windows-visibility')}>
|
||||
<div class="action-text">
|
||||
<div class="action-text-content">Show/Hide</div>
|
||||
</div>
|
||||
@ -662,8 +646,8 @@ export class MainHeader extends LitElement {
|
||||
|
||||
<button
|
||||
class="settings-button"
|
||||
@mouseenter=${(e) => this.showSettingsWindow(e.currentTarget)}
|
||||
@mouseleave=${() => this.hideSettingsWindow()}
|
||||
@mouseenter=${(e) => this.showWindow('settings', e.currentTarget)}
|
||||
@mouseleave=${() => this.hideWindow('settings')}
|
||||
>
|
||||
<div class="settings-icon">
|
||||
<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
@ -4,13 +4,14 @@ export class PermissionHeader extends LitElement {
|
||||
static styles = css`
|
||||
:host {
|
||||
display: block;
|
||||
transition: opacity 0.3s ease-in, transform 0.3s ease-in;
|
||||
will-change: opacity, transform;
|
||||
transform: translate3d(0, 0, 0);
|
||||
backface-visibility: hidden;
|
||||
transition: opacity 0.25s ease-out;
|
||||
}
|
||||
|
||||
:host(.sliding-out) {
|
||||
opacity: 0;
|
||||
transform: translateY(-20px);
|
||||
animation: slideOutUp 0.3s ease-in forwards;
|
||||
will-change: opacity, transform;
|
||||
}
|
||||
|
||||
:host(.hidden) {
|
||||
@ -18,6 +19,17 @@ export class PermissionHeader extends LitElement {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@keyframes slideOutUp {
|
||||
from {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
to {
|
||||
opacity: 0;
|
||||
transform: translateY(-20px);
|
||||
}
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: 'Helvetica Neue', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
|
||||
cursor: default;
|
||||
@ -26,9 +38,8 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
.container {
|
||||
-webkit-app-region: drag;
|
||||
width: 285px;
|
||||
/* height is now set dynamically */
|
||||
height: 220px;
|
||||
padding: 18px 20px;
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
border-radius: 16px;
|
||||
@ -56,7 +67,6 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
.close-button {
|
||||
-webkit-app-region: no-drag;
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
@ -103,12 +113,6 @@ export class PermissionHeader extends LitElement {
|
||||
margin-top: auto;
|
||||
}
|
||||
|
||||
.form-content.all-granted {
|
||||
flex-grow: 1;
|
||||
justify-content: center;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
color: rgba(255, 255, 255, 0.7);
|
||||
font-size: 11px;
|
||||
@ -153,7 +157,6 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
.action-button {
|
||||
-webkit-app-region: no-drag;
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
@ -195,7 +198,6 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
.continue-button {
|
||||
-webkit-app-region: no-drag;
|
||||
width: 100%;
|
||||
height: 34px;
|
||||
background: rgba(34, 197, 94, 0.8);
|
||||
@ -235,7 +237,7 @@ export class PermissionHeader extends LitElement {
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
|
||||
/* ────────────────[ GLASS BYPASS ]─────────────── */
|
||||
:host-context(body.has-glass) .container,
|
||||
:host-context(body.has-glass) .action-button,
|
||||
@ -264,60 +266,27 @@ export class PermissionHeader extends LitElement {
|
||||
static properties = {
|
||||
microphoneGranted: { type: String },
|
||||
screenGranted: { type: String },
|
||||
keychainGranted: { type: String },
|
||||
isChecking: { type: String },
|
||||
continueCallback: { type: Function },
|
||||
userMode: { type: String }, // 'local' or 'firebase'
|
||||
continueCallback: { type: Function }
|
||||
};
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
this.microphoneGranted = 'unknown';
|
||||
this.screenGranted = 'unknown';
|
||||
this.keychainGranted = 'unknown';
|
||||
this.isChecking = false;
|
||||
this.continueCallback = null;
|
||||
this.userMode = 'local'; // Default to local
|
||||
}
|
||||
|
||||
updated(changedProperties) {
|
||||
super.updated(changedProperties);
|
||||
if (changedProperties.has('userMode')) {
|
||||
const newHeight = this.userMode === 'firebase' ? 280 : 220;
|
||||
console.log(`[PermissionHeader] User mode changed to ${this.userMode}, requesting resize to ${newHeight}px`);
|
||||
this.dispatchEvent(new CustomEvent('request-resize', {
|
||||
detail: { height: newHeight },
|
||||
bubbles: true,
|
||||
composed: true
|
||||
}));
|
||||
}
|
||||
this.handleMouseMove = this.handleMouseMove.bind(this);
|
||||
this.handleMouseUp = this.handleMouseUp.bind(this);
|
||||
}
|
||||
|
||||
async connectedCallback() {
|
||||
super.connectedCallback();
|
||||
|
||||
if (window.api) {
|
||||
try {
|
||||
const userState = await window.api.common.getCurrentUser();
|
||||
this.userMode = userState.mode;
|
||||
} catch (e) {
|
||||
console.error('[PermissionHeader] Failed to get user state', e);
|
||||
this.userMode = 'local'; // Fallback to local
|
||||
}
|
||||
}
|
||||
|
||||
await this.checkPermissions();
|
||||
|
||||
// Set up periodic permission check
|
||||
this.permissionCheckInterval = setInterval(async () => {
|
||||
if (window.api) {
|
||||
try {
|
||||
const userState = await window.api.common.getCurrentUser();
|
||||
this.userMode = userState.mode;
|
||||
} catch (e) {
|
||||
this.userMode = 'local';
|
||||
}
|
||||
}
|
||||
this.permissionCheckInterval = setInterval(() => {
|
||||
this.checkPermissions();
|
||||
}, 1000);
|
||||
}
|
||||
@ -329,36 +298,86 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
async handleMouseDown(e) {
|
||||
if (e.target.tagName === 'BUTTON') {
|
||||
return;
|
||||
}
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
const initialPosition = await ipcRenderer.invoke('get-header-position');
|
||||
|
||||
this.dragState = {
|
||||
initialMouseX: e.screenX,
|
||||
initialMouseY: e.screenY,
|
||||
initialWindowX: initialPosition.x,
|
||||
initialWindowY: initialPosition.y,
|
||||
moved: false,
|
||||
};
|
||||
|
||||
window.addEventListener('mousemove', this.handleMouseMove);
|
||||
window.addEventListener('mouseup', this.handleMouseUp, { once: true });
|
||||
}
|
||||
|
||||
handleMouseMove(e) {
|
||||
if (!this.dragState) return;
|
||||
|
||||
const deltaX = Math.abs(e.screenX - this.dragState.initialMouseX);
|
||||
const deltaY = Math.abs(e.screenY - this.dragState.initialMouseY);
|
||||
|
||||
if (deltaX > 3 || deltaY > 3) {
|
||||
this.dragState.moved = true;
|
||||
}
|
||||
|
||||
const newWindowX = this.dragState.initialWindowX + (e.screenX - this.dragState.initialMouseX);
|
||||
const newWindowY = this.dragState.initialWindowY + (e.screenY - this.dragState.initialMouseY);
|
||||
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('move-header-to', newWindowX, newWindowY);
|
||||
}
|
||||
|
||||
handleMouseUp(e) {
|
||||
if (!this.dragState) return;
|
||||
|
||||
const wasDragged = this.dragState.moved;
|
||||
|
||||
window.removeEventListener('mousemove', this.handleMouseMove);
|
||||
this.dragState = null;
|
||||
|
||||
if (wasDragged) {
|
||||
this.wasJustDragged = true;
|
||||
setTimeout(() => {
|
||||
this.wasJustDragged = false;
|
||||
}, 200);
|
||||
}
|
||||
}
|
||||
|
||||
async checkPermissions() {
|
||||
if (!window.api || this.isChecking) return;
|
||||
if (!window.require || this.isChecking) return;
|
||||
|
||||
this.isChecking = true;
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
try {
|
||||
const permissions = await window.api.permissionHeader.checkSystemPermissions();
|
||||
const permissions = await ipcRenderer.invoke('check-system-permissions');
|
||||
console.log('[PermissionHeader] Permission check result:', permissions);
|
||||
|
||||
const prevMic = this.microphoneGranted;
|
||||
const prevScreen = this.screenGranted;
|
||||
const prevKeychain = this.keychainGranted;
|
||||
|
||||
this.microphoneGranted = permissions.microphone;
|
||||
this.screenGranted = permissions.screen;
|
||||
this.keychainGranted = permissions.keychain;
|
||||
|
||||
// if permissions changed == UI update
|
||||
if (prevMic !== this.microphoneGranted || prevScreen !== this.screenGranted || prevKeychain !== this.keychainGranted) {
|
||||
if (prevMic !== this.microphoneGranted || prevScreen !== this.screenGranted) {
|
||||
console.log('[PermissionHeader] Permission status changed, updating UI');
|
||||
this.requestUpdate();
|
||||
}
|
||||
|
||||
const isKeychainRequired = this.userMode === 'firebase';
|
||||
const keychainOk = !isKeychainRequired || this.keychainGranted === 'granted';
|
||||
|
||||
// if all permissions granted == automatically continue
|
||||
if (this.microphoneGranted === 'granted' &&
|
||||
this.screenGranted === 'granted' &&
|
||||
keychainOk &&
|
||||
this.continueCallback) {
|
||||
console.log('[PermissionHeader] All permissions granted, proceeding automatically');
|
||||
setTimeout(() => this.handleContinue(), 500);
|
||||
@ -371,12 +390,13 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
async handleMicrophoneClick() {
|
||||
if (!window.api || this.microphoneGranted === 'granted') return;
|
||||
if (!window.require || this.microphoneGranted === 'granted' || this.wasJustDragged) return;
|
||||
|
||||
console.log('[PermissionHeader] Requesting microphone permission...');
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
try {
|
||||
const result = await window.api.permissionHeader.checkSystemPermissions();
|
||||
const result = await ipcRenderer.invoke('check-system-permissions');
|
||||
console.log('[PermissionHeader] Microphone permission result:', result);
|
||||
|
||||
if (result.microphone === 'granted') {
|
||||
@ -386,7 +406,7 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
if (result.microphone === 'not-determined' || result.microphone === 'denied' || result.microphone === 'unknown' || result.microphone === 'restricted') {
|
||||
const res = await window.api.permissionHeader.requestMicrophonePermission();
|
||||
const res = await ipcRenderer.invoke('request-microphone-permission');
|
||||
if (res.status === 'granted' || res.success === true) {
|
||||
this.microphoneGranted = 'granted';
|
||||
this.requestUpdate();
|
||||
@ -403,12 +423,13 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
|
||||
async handleScreenClick() {
|
||||
if (!window.api || this.screenGranted === 'granted') return;
|
||||
if (!window.require || this.screenGranted === 'granted' || this.wasJustDragged) return;
|
||||
|
||||
console.log('[PermissionHeader] Checking screen recording permission...');
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
try {
|
||||
const permissions = await window.api.permissionHeader.checkSystemPermissions();
|
||||
const permissions = await ipcRenderer.invoke('check-system-permissions');
|
||||
console.log('[PermissionHeader] Screen permission check result:', permissions);
|
||||
|
||||
if (permissions.screen === 'granted') {
|
||||
@ -418,7 +439,7 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
if (permissions.screen === 'not-determined' || permissions.screen === 'denied' || permissions.screen === 'unknown' || permissions.screen === 'restricted') {
|
||||
console.log('[PermissionHeader] Opening screen recording preferences...');
|
||||
await window.api.permissionHeader.openSystemPreferences('screen-recording');
|
||||
await ipcRenderer.invoke('open-system-preferences', 'screen-recording');
|
||||
}
|
||||
|
||||
// Check permissions again after a delay
|
||||
@ -429,39 +450,19 @@ export class PermissionHeader extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
async handleKeychainClick() {
|
||||
if (!window.api || this.keychainGranted === 'granted') return;
|
||||
|
||||
console.log('[PermissionHeader] Requesting keychain permission...');
|
||||
|
||||
try {
|
||||
// Trigger initializeKey to prompt for keychain access
|
||||
// Assuming encryptionService is accessible or via API
|
||||
await window.api.permissionHeader.initializeEncryptionKey(); // New IPC handler needed
|
||||
|
||||
// After success, update status
|
||||
this.keychainGranted = 'granted';
|
||||
this.requestUpdate();
|
||||
} catch (error) {
|
||||
console.error('[PermissionHeader] Error requesting keychain permission:', error);
|
||||
}
|
||||
}
|
||||
|
||||
async handleContinue() {
|
||||
const isKeychainRequired = this.userMode === 'firebase';
|
||||
const keychainOk = !isKeychainRequired || this.keychainGranted === 'granted';
|
||||
|
||||
if (this.continueCallback &&
|
||||
this.microphoneGranted === 'granted' &&
|
||||
this.screenGranted === 'granted' &&
|
||||
keychainOk) {
|
||||
!this.wasJustDragged) {
|
||||
// Mark permissions as completed
|
||||
if (window.api && isKeychainRequired) {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
try {
|
||||
await window.api.permissionHeader.markKeychainCompleted();
|
||||
console.log('[PermissionHeader] Marked keychain as completed');
|
||||
await ipcRenderer.invoke('mark-permissions-completed');
|
||||
console.log('[PermissionHeader] Marked permissions as completed');
|
||||
} catch (error) {
|
||||
console.error('[PermissionHeader] Error marking keychain as completed:', error);
|
||||
console.error('[PermissionHeader] Error marking permissions as completed:', error);
|
||||
}
|
||||
}
|
||||
|
||||
@ -471,19 +472,16 @@ export class PermissionHeader extends LitElement {
|
||||
|
||||
handleClose() {
|
||||
console.log('Close button clicked');
|
||||
if (window.api) {
|
||||
window.api.common.quitApplication();
|
||||
if (window.require) {
|
||||
window.require('electron').ipcRenderer.invoke('quit-application');
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const isKeychainRequired = this.userMode === 'firebase';
|
||||
const containerHeight = isKeychainRequired ? 280 : 220;
|
||||
const keychainOk = !isKeychainRequired || this.keychainGranted === 'granted';
|
||||
const allGranted = this.microphoneGranted === 'granted' && this.screenGranted === 'granted' && keychainOk;
|
||||
const allGranted = this.microphoneGranted === 'granted' && this.screenGranted === 'granted';
|
||||
|
||||
return html`
|
||||
<div class="container" style="height: ${containerHeight}px">
|
||||
<div class="container" @mousedown=${this.handleMouseDown}>
|
||||
<button class="close-button" @click=${this.handleClose} title="Close application">
|
||||
<svg width="8" height="8" viewBox="0 0 10 10" fill="currentColor">
|
||||
<path d="M1 1L9 9M9 1L1 9" stroke="currentColor" stroke-width="1.2" />
|
||||
@ -491,92 +489,65 @@ export class PermissionHeader extends LitElement {
|
||||
</button>
|
||||
<h1 class="title">Permission Setup Required</h1>
|
||||
|
||||
<div class="form-content ${allGranted ? 'all-granted' : ''}">
|
||||
${!allGranted ? html`
|
||||
<div class="subtitle">Grant access to microphone, screen recording${isKeychainRequired ? ' and keychain' : ''} to continue</div>
|
||||
|
||||
<div class="permission-status">
|
||||
<div class="permission-item ${this.microphoneGranted === 'granted' ? 'granted' : ''}">
|
||||
${this.microphoneGranted === 'granted' ? html`
|
||||
<svg class="check-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Microphone ✓</span>
|
||||
` : html`
|
||||
<svg class="permission-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M7 4a3 3 0 016 0v4a3 3 0 11-6 0V4zm4 10.93A7.001 7.001 0 0017 8a1 1 0 10-2 0A5 5 0 015 8a1 1 0 00-2 0 7.001 7.001 0 006 6.93V17H6a1 1 0 100 2h8a1 1 0 100-2h-3v-2.07z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Microphone</span>
|
||||
`}
|
||||
</div>
|
||||
|
||||
<div class="permission-item ${this.screenGranted === 'granted' ? 'granted' : ''}">
|
||||
${this.screenGranted === 'granted' ? html`
|
||||
<svg class="check-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Screen ✓</span>
|
||||
` : html`
|
||||
<svg class="permission-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M3 5a2 2 0 012-2h10a2 2 0 012 2v8a2 2 0 01-2 2h-2.22l.123.489.804.804A1 1 0 0113 18H7a1 1 0 01-.707-1.707l.804-.804L7.22 15H5a2 2 0 01-2-2V5zm5.771 7H5V5h10v7H8.771z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Screen Recording</span>
|
||||
`}
|
||||
</div>
|
||||
|
||||
${isKeychainRequired ? html`
|
||||
<div class="permission-item ${this.keychainGranted === 'granted' ? 'granted' : ''}">
|
||||
${this.keychainGranted === 'granted' ? html`
|
||||
<svg class="check-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Data Encryption ✓</span>
|
||||
` : html`
|
||||
<svg class="permission-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M18 8a6 6 0 01-7.744 5.668l-1.649 1.652c-.63.63-1.706.19-1.706-.742V12.18a.75.75 0 00-1.5 0v2.696c0 .932-1.075 1.372-1.706.742l-1.649-1.652A6 6 0 112 8zm-4 0a.75.75 0 00.75-.75A3.75 3.75 0 018.25 4a.75.75 0 000 1.5 2.25 2.25 0 012.25 2.25.75.75 0 00.75.75z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Data Encryption</span>
|
||||
`}
|
||||
</div>
|
||||
` : ''}
|
||||
<div class="form-content">
|
||||
<div class="subtitle">Grant access to microphone and screen recording to continue</div>
|
||||
|
||||
<div class="permission-status">
|
||||
<div class="permission-item ${this.microphoneGranted === 'granted' ? 'granted' : ''}">
|
||||
${this.microphoneGranted === 'granted' ? html`
|
||||
<svg class="check-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Microphone ✓</span>
|
||||
` : html`
|
||||
<svg class="permission-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M7 4a3 3 0 016 0v4a3 3 0 11-6 0V4zm4 10.93A7.001 7.001 0 0017 8a1 1 0 10-2 0A5 5 0 015 8a1 1 0 00-2 0 7.001 7.001 0 006 6.93V17H6a1 1 0 100 2h8a1 1 0 100-2h-3v-2.07z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Microphone</span>
|
||||
`}
|
||||
</div>
|
||||
|
||||
<div class="permission-item ${this.screenGranted === 'granted' ? 'granted' : ''}">
|
||||
${this.screenGranted === 'granted' ? html`
|
||||
<svg class="check-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Screen ✓</span>
|
||||
` : html`
|
||||
<svg class="permission-icon" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M3 5a2 2 0 012-2h10a2 2 0 012 2v8a2 2 0 01-2 2h-2.22l.123.489.804.804A1 1 0 0113 18H7a1 1 0 01-.707-1.707l.804-.804L7.22 15H5a2 2 0 01-2-2V5zm5.771 7H5V5h10v7H8.771z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
<span>Screen Recording</span>
|
||||
`}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
${this.microphoneGranted !== 'granted' ? html`
|
||||
<button
|
||||
class="action-button"
|
||||
@click=${this.handleMicrophoneClick}
|
||||
?disabled=${this.microphoneGranted === 'granted'}
|
||||
>
|
||||
${this.microphoneGranted === 'granted' ? 'Microphone Access Granted' : 'Grant Microphone Access'}
|
||||
Grant Microphone Access
|
||||
</button>
|
||||
` : ''}
|
||||
|
||||
${this.screenGranted !== 'granted' ? html`
|
||||
<button
|
||||
class="action-button"
|
||||
@click=${this.handleScreenClick}
|
||||
?disabled=${this.screenGranted === 'granted'}
|
||||
>
|
||||
${this.screenGranted === 'granted' ? 'Screen Recording Granted' : 'Grant Screen Recording Access'}
|
||||
Grant Screen Recording Access
|
||||
</button>
|
||||
` : ''}
|
||||
|
||||
${isKeychainRequired ? html`
|
||||
<button
|
||||
class="action-button"
|
||||
@click=${this.handleKeychainClick}
|
||||
?disabled=${this.keychainGranted === 'granted'}
|
||||
>
|
||||
${this.keychainGranted === 'granted' ? 'Encryption Enabled' : 'Enable Encryption'}
|
||||
</button>
|
||||
<div class="subtitle" style="visibility: ${this.keychainGranted === 'granted' ? 'hidden' : 'visible'}">
|
||||
Stores the key to encrypt your data. Press "<b>Always Allow</b>" to continue.
|
||||
</div>
|
||||
` : ''}
|
||||
` : html`
|
||||
${allGranted ? html`
|
||||
<button
|
||||
class="continue-button"
|
||||
@click=${this.handleContinue}
|
||||
>
|
||||
Continue to Pickle Glass
|
||||
</button>
|
||||
`}
|
||||
` : ''}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
@ -1,10 +1,10 @@
|
||||
import { html, css, LitElement } from '../assets/lit-core-2.7.4.min.js';
|
||||
import { SettingsView } from '../settings/SettingsView.js';
|
||||
import { ListenView } from '../listen/ListenView.js';
|
||||
import { AskView } from '../ask/AskView.js';
|
||||
import { ShortcutSettingsView } from '../settings/ShortCutSettingsView.js';
|
||||
import { SettingsView } from '../features/settings/SettingsView.js';
|
||||
import { AssistantView } from '../features/listen/AssistantView.js';
|
||||
import { AskView } from '../features/ask/AskView.js';
|
||||
import { ShortcutSettingsView } from '../features/settings/ShortCutSettingsView.js';
|
||||
|
||||
import '../listen/audioCore/renderer.js';
|
||||
import '../features/listen/renderer/renderer.js';
|
||||
|
||||
export class PickleGlassApp extends LitElement {
|
||||
static styles = css`
|
||||
@ -17,7 +17,7 @@ export class PickleGlassApp extends LitElement {
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
listen-view {
|
||||
assistant-view {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@ -68,27 +68,46 @@ export class PickleGlassApp extends LitElement {
|
||||
this.selectedScreenshotInterval = localStorage.getItem('selectedScreenshotInterval') || '5';
|
||||
this.selectedImageQuality = localStorage.getItem('selectedImageQuality') || 'medium';
|
||||
this._isClickThrough = false;
|
||||
this.outlines = [];
|
||||
this.analysisRequests = [];
|
||||
|
||||
window.pickleGlass.setStructuredData = data => {
|
||||
this.updateStructuredData(data);
|
||||
};
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
super.connectedCallback();
|
||||
|
||||
if (window.api) {
|
||||
window.api.pickleGlassApp.onClickThroughToggled((_, isEnabled) => {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
ipcRenderer.on('update-status', (_, status) => this.setStatus(status));
|
||||
ipcRenderer.on('click-through-toggled', (_, isEnabled) => {
|
||||
this._isClickThrough = isEnabled;
|
||||
});
|
||||
ipcRenderer.on('start-listening-session', () => {
|
||||
console.log('Received start-listening-session command, calling handleListenClick.');
|
||||
this.handleListenClick();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
disconnectedCallback() {
|
||||
super.disconnectedCallback();
|
||||
if (window.api) {
|
||||
window.api.pickleGlassApp.removeAllClickThroughListeners();
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.removeAllListeners('update-status');
|
||||
ipcRenderer.removeAllListeners('click-through-toggled');
|
||||
ipcRenderer.removeAllListeners('start-listening-session');
|
||||
}
|
||||
}
|
||||
|
||||
updated(changedProperties) {
|
||||
if (changedProperties.has('isMainViewVisible') || changedProperties.has('currentView')) {
|
||||
this.requestWindowResize();
|
||||
}
|
||||
|
||||
if (changedProperties.has('currentView')) {
|
||||
const viewContainer = this.shadowRoot?.querySelector('.view-container');
|
||||
if (viewContainer) {
|
||||
@ -117,24 +136,130 @@ export class PickleGlassApp extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
async handleClose() {
|
||||
if (window.api) {
|
||||
await window.api.common.quitApplication();
|
||||
requestWindowResize() {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('resize-window', {
|
||||
isMainViewVisible: this.isMainViewVisible,
|
||||
view: this.currentView,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
setStatus(text) {
|
||||
this.statusText = text;
|
||||
}
|
||||
|
||||
async handleListenClick() {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
const isActive = await ipcRenderer.invoke('is-session-active');
|
||||
if (isActive) {
|
||||
console.log('Session is already active. No action needed.');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (window.pickleGlass) {
|
||||
await window.pickleGlass.initializeopenai(this.selectedProfile, this.selectedLanguage);
|
||||
window.pickleGlass.startCapture(this.selectedScreenshotInterval, this.selectedImageQuality);
|
||||
}
|
||||
|
||||
// 🔄 Clear previous summary/analysis when a new listening session begins
|
||||
this.structuredData = {
|
||||
summary: [],
|
||||
topic: { header: '', bullets: [] },
|
||||
actions: [],
|
||||
followUps: [],
|
||||
};
|
||||
|
||||
this.currentResponseIndex = -1;
|
||||
this.startTime = Date.now();
|
||||
this.currentView = 'listen';
|
||||
this.isMainViewVisible = true;
|
||||
}
|
||||
|
||||
handleShowHideClick() {
|
||||
this.isMainViewVisible = !this.isMainViewVisible;
|
||||
}
|
||||
|
||||
handleSettingsClick() {
|
||||
this.currentView = 'settings';
|
||||
this.isMainViewVisible = true;
|
||||
}
|
||||
|
||||
handleHelpClick() {
|
||||
this.currentView = 'help';
|
||||
this.isMainViewVisible = true;
|
||||
}
|
||||
|
||||
handleHistoryClick() {
|
||||
this.currentView = 'history';
|
||||
this.isMainViewVisible = true;
|
||||
}
|
||||
|
||||
async handleClose() {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
await ipcRenderer.invoke('quit-application');
|
||||
}
|
||||
}
|
||||
|
||||
handleBackClick() {
|
||||
this.currentView = 'listen';
|
||||
}
|
||||
|
||||
async handleSendText(message) {
|
||||
if (window.pickleGlass) {
|
||||
const result = await window.pickleGlass.sendTextMessage(message);
|
||||
|
||||
if (!result.success) {
|
||||
console.error('Failed to send message:', result.error);
|
||||
this.setStatus('Error sending message: ' + result.error);
|
||||
} else {
|
||||
this.setStatus('Message sent...');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// updateOutline(outline) {
|
||||
// console.log('📝 PickleGlassApp updateOutline:', outline);
|
||||
// this.outlines = [...outline];
|
||||
// this.requestUpdate();
|
||||
// }
|
||||
|
||||
// updateAnalysisRequests(requests) {
|
||||
// console.log('📝 PickleGlassApp updateAnalysisRequests:', requests);
|
||||
// this.analysisRequests = [...requests];
|
||||
// this.requestUpdate();
|
||||
// }
|
||||
|
||||
updateStructuredData(data) {
|
||||
console.log('📝 PickleGlassApp updateStructuredData:', data);
|
||||
this.structuredData = data;
|
||||
this.requestUpdate();
|
||||
|
||||
const assistantView = this.shadowRoot?.querySelector('assistant-view');
|
||||
if (assistantView) {
|
||||
assistantView.structuredData = data;
|
||||
console.log('✅ Structured data passed to AssistantView');
|
||||
}
|
||||
}
|
||||
|
||||
handleResponseIndexChanged(e) {
|
||||
this.currentResponseIndex = e.detail.index;
|
||||
}
|
||||
|
||||
render() {
|
||||
switch (this.currentView) {
|
||||
case 'listen':
|
||||
return html`<listen-view
|
||||
return html`<assistant-view
|
||||
.currentResponseIndex=${this.currentResponseIndex}
|
||||
.selectedProfile=${this.selectedProfile}
|
||||
.structuredData=${this.structuredData}
|
||||
.onSendText=${message => this.handleSendText(message)}
|
||||
@response-index-changed=${e => (this.currentResponseIndex = e.detail.index)}
|
||||
></listen-view>`;
|
||||
></assistant-view>`;
|
||||
case 'ask':
|
||||
return html`<ask-view></ask-view>`;
|
||||
case 'settings':
|
||||
311
src/app/content.html
Normal file
311
src/app/content.html
Normal file
@ -0,0 +1,311 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
|
||||
<title>Pickle Glass Content</title>
|
||||
<style>
|
||||
:root {
|
||||
--background-transparent: transparent;
|
||||
--text-color: #e5e5e7;
|
||||
--border-color: rgba(255, 255, 255, 0.2);
|
||||
--header-background: rgba(0, 0, 0, 0.8);
|
||||
--header-actions-color: rgba(255, 255, 255, 0.6);
|
||||
--main-content-background: rgba(0, 0, 0, 0.8);
|
||||
--button-background: rgba(0, 0, 0, 0.5);
|
||||
--button-border: rgba(255, 255, 255, 0.1);
|
||||
--icon-button-color: rgb(229, 229, 231);
|
||||
--hover-background: rgba(255, 255, 255, 0.1);
|
||||
--input-background: rgba(0, 0, 0, 0.3);
|
||||
--placeholder-color: rgba(255, 255, 255, 0.4);
|
||||
--focus-border-color: #007aff;
|
||||
--focus-box-shadow: rgba(0, 122, 255, 0.2);
|
||||
--input-focus-background: rgba(0, 0, 0, 0.5);
|
||||
--scrollbar-track: rgba(0, 0, 0, 0.2);
|
||||
--scrollbar-thumb: rgba(255, 255, 255, 0.2);
|
||||
--scrollbar-thumb-hover: rgba(255, 255, 255, 0.3);
|
||||
--preview-video-background: rgba(0, 0, 0, 0.9);
|
||||
--preview-video-border: rgba(255, 255, 255, 0.15);
|
||||
--option-label-color: rgba(255, 255, 255, 0.8);
|
||||
--screen-option-background: rgba(0, 0, 0, 0.4);
|
||||
--screen-option-hover-background: rgba(0, 0, 0, 0.6);
|
||||
--screen-option-selected-background: rgba(0, 122, 255, 0.15);
|
||||
--screen-option-text: rgba(255, 255, 255, 0.7);
|
||||
--description-color: rgba(255, 255, 255, 0.6);
|
||||
--start-button-background: white;
|
||||
--start-button-color: black;
|
||||
--start-button-border: white;
|
||||
--start-button-hover-background: rgba(255, 255, 255, 0.8);
|
||||
--start-button-hover-border: rgba(0, 0, 0, 0.2);
|
||||
--text-input-button-background: #007aff;
|
||||
--text-input-button-hover: #0056b3;
|
||||
--link-color: #007aff;
|
||||
--key-background: rgba(255, 255, 255, 0.1);
|
||||
--scrollbar-background: rgba(0, 0, 0, 0.4);
|
||||
|
||||
/* Layout-specific variables */
|
||||
--header-padding: 10px 20px;
|
||||
--header-font-size: 16px;
|
||||
--header-gap: 12px;
|
||||
--header-button-padding: 8px 16px;
|
||||
--header-icon-padding: 8px;
|
||||
--header-font-size-small: 13px;
|
||||
--main-content-padding: 20px;
|
||||
--main-content-margin-top: 10px;
|
||||
--icon-size: 24px;
|
||||
--border-radius: 7px;
|
||||
--content-border-radius: 7px;
|
||||
}
|
||||
|
||||
/* Compact layout styles */
|
||||
:root.compact-layout {
|
||||
--header-padding: 6px 12px;
|
||||
--header-font-size: 13px;
|
||||
--header-gap: 6px;
|
||||
--header-button-padding: 4px 8px;
|
||||
--header-icon-padding: 4px;
|
||||
--header-font-size-small: 10px;
|
||||
--main-content-padding: 10px;
|
||||
--main-content-margin-top: 2px;
|
||||
--icon-size: 16px;
|
||||
--border-radius: 4px;
|
||||
--content-border-radius: 4px;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
min-height: 100%;
|
||||
overflow: hidden;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
pickle-glass-app {
|
||||
display: block;
|
||||
width: 100%;
|
||||
transform: translate3d(0, 0, 0);
|
||||
backface-visibility: hidden;
|
||||
perspective: 1000px;
|
||||
transform-origin: center center;
|
||||
contain: layout style paint;
|
||||
transition: transform 0.25s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.25s ease-out;
|
||||
}
|
||||
|
||||
.window-sliding-down {
|
||||
animation: slideDownFromHeader 0.12s cubic-bezier(0.23, 1, 0.32, 1) forwards;
|
||||
will-change: transform, opacity;
|
||||
transform-style: preserve-3d;
|
||||
}
|
||||
|
||||
.window-sliding-up {
|
||||
animation: slideUpToHeader 0.10s cubic-bezier(0.55, 0.085, 0.68, 0.53) forwards;
|
||||
will-change: transform, opacity;
|
||||
transform-style: preserve-3d;
|
||||
}
|
||||
|
||||
.window-hidden {
|
||||
opacity: 0;
|
||||
transform: translate3d(0, -18px, 0) scale3d(0.96, 0.96, 1);
|
||||
pointer-events: none;
|
||||
will-change: auto;
|
||||
contain: layout style paint;
|
||||
}
|
||||
|
||||
.listen-window-moving {
|
||||
transition: transform 0.35s cubic-bezier(0.25, 0.46, 0.45, 0.94);
|
||||
will-change: transform;
|
||||
}
|
||||
|
||||
.listen-window-center {
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
|
||||
.listen-window-left {
|
||||
transform: translate3d(-110px, 0, 0);
|
||||
}
|
||||
|
||||
@keyframes slideDownFromHeader {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translate3d(0, -18px, 0) scale3d(0.96, 0.96, 1);
|
||||
}
|
||||
25% {
|
||||
opacity: 0.4;
|
||||
transform: translate3d(0, -10px, 0) scale3d(0.98, 0.98, 1);
|
||||
}
|
||||
50% {
|
||||
opacity: 0.7;
|
||||
transform: translate3d(0, -3px, 0) scale3d(1.01, 1.01, 1);
|
||||
}
|
||||
75% {
|
||||
opacity: 0.9;
|
||||
transform: translate3d(0, -0.5px, 0) scale3d(1.005, 1.005, 1);
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
.settings-window-show {
|
||||
animation: settingsPopFromButton 0.12s cubic-bezier(0.23, 1, 0.32, 1) forwards;
|
||||
transform-origin: 85% 0%;
|
||||
will-change: transform, opacity;
|
||||
transform-style: preserve-3d;
|
||||
}
|
||||
|
||||
.settings-window-hide {
|
||||
animation: settingsCollapseToButton 0.10s cubic-bezier(0.55, 0.085, 0.68, 0.53) forwards;
|
||||
transform-origin: 85% 0%;
|
||||
will-change: transform, opacity;
|
||||
transform-style: preserve-3d;
|
||||
}
|
||||
|
||||
@keyframes settingsPopFromButton {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translate3d(0, -8px, 0) scale3d(0.5, 0.5, 1);
|
||||
}
|
||||
40% {
|
||||
opacity: 0.8;
|
||||
transform: translate3d(0, -2px, 0) scale3d(1.05, 1.05, 1);
|
||||
}
|
||||
70% {
|
||||
opacity: 0.95;
|
||||
transform: translate3d(0, 0, 0) scale3d(1.02, 1.02, 1);
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes settingsCollapseToButton {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
|
||||
}
|
||||
30% {
|
||||
opacity: 0.8;
|
||||
transform: translate3d(0, -1px, 0) scale3d(0.9, 0.9, 1);
|
||||
}
|
||||
70% {
|
||||
opacity: 0.3;
|
||||
transform: translate3d(0, -5px, 0) scale3d(0.7, 0.7, 1);
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
transform: translate3d(0, -8px, 0) scale3d(0.5, 0.5, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideUpToHeader {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
|
||||
}
|
||||
30% {
|
||||
opacity: 0.6;
|
||||
transform: translate3d(0, -6px, 0) scale3d(0.98, 0.98, 1);
|
||||
}
|
||||
65% {
|
||||
opacity: 0.2;
|
||||
transform: translate3d(0, -14px, 0) scale3d(0.95, 0.95, 1);
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
transform: translate3d(0, -18px, 0) scale3d(0.93, 0.93, 1);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<script src="../assets/marked-4.3.0.min.js"></script>
|
||||
|
||||
<script type="module" src="../../public/build/content.js"></script>
|
||||
|
||||
<pickle-glass-app id="pickle-glass"></pickle-glass-app>
|
||||
|
||||
<script>
|
||||
window.addEventListener('DOMContentLoaded', () => {
|
||||
const app = document.getElementById('pickle-glass');
|
||||
let animationTimeout = null;
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
|
||||
ipcRenderer.on('window-show-animation', () => {
|
||||
console.log('Starting window show animation');
|
||||
app.classList.remove('window-hidden', 'window-sliding-up', 'settings-window-hide');
|
||||
app.classList.add('window-sliding-down');
|
||||
|
||||
if (animationTimeout) clearTimeout(animationTimeout);
|
||||
animationTimeout = setTimeout(() => {
|
||||
app.classList.remove('window-sliding-down');
|
||||
}, 120);
|
||||
});
|
||||
|
||||
ipcRenderer.on('window-hide-animation', () => {
|
||||
console.log('Starting window hide animation');
|
||||
app.classList.remove('window-sliding-down', 'settings-window-show');
|
||||
app.classList.add('window-sliding-up');
|
||||
|
||||
if (animationTimeout) clearTimeout(animationTimeout);
|
||||
animationTimeout = setTimeout(() => {
|
||||
app.classList.remove('window-sliding-up');
|
||||
app.classList.add('window-hidden');
|
||||
}, 100);
|
||||
});
|
||||
|
||||
ipcRenderer.on('settings-window-hide-animation', () => {
|
||||
console.log('Starting settings window hide animation');
|
||||
app.classList.remove('window-sliding-down', 'settings-window-show');
|
||||
app.classList.add('settings-window-hide');
|
||||
|
||||
if (animationTimeout) clearTimeout(animationTimeout);
|
||||
animationTimeout = setTimeout(() => {
|
||||
app.classList.remove('settings-window-hide');
|
||||
app.classList.add('window-hidden');
|
||||
}, 100);
|
||||
});
|
||||
|
||||
ipcRenderer.on('listen-window-move-to-center', () => {
|
||||
console.log('Moving listen window to center');
|
||||
app.classList.add('listen-window-moving');
|
||||
app.classList.remove('listen-window-left');
|
||||
app.classList.add('listen-window-center');
|
||||
|
||||
setTimeout(() => {
|
||||
app.classList.remove('listen-window-moving');
|
||||
}, 350);
|
||||
});
|
||||
|
||||
ipcRenderer.on('listen-window-move-to-left', () => {
|
||||
console.log('Moving listen window to left');
|
||||
app.classList.add('listen-window-moving');
|
||||
app.classList.remove('listen-window-center');
|
||||
app.classList.add('listen-window-left');
|
||||
|
||||
setTimeout(() => {
|
||||
app.classList.remove('listen-window-moving');
|
||||
}, 350);
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
if (params.get('glass') === 'true') {
|
||||
document.body.classList.add('has-glass');
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval'" />
|
||||
<meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
|
||||
<title>Pickle Glass Header</title>
|
||||
<style>
|
||||
html,
|
||||
@ -17,7 +17,7 @@
|
||||
<div id="header-container" tabindex="0" style="outline: none;">
|
||||
</div>
|
||||
|
||||
<script type="module" src="../../../public/build/header.js"></script>
|
||||
<script type="module" src="../../public/build/header.js"></script>
|
||||
<script>
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
if (params.get('glass') === 'true') {
|
||||
|
Before Width: | Height: | Size: 877 B After Width: | Height: | Size: 877 B |
|
Before Width: | Height: | Size: 226 B After Width: | Height: | Size: 226 B |
20
src/assets/aec.js
Normal file
20
src/assets/aec.js
Normal file
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 125 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
@ -1,239 +0,0 @@
|
||||
// src/bridge/featureBridge.js
|
||||
const { ipcMain, app, BrowserWindow } = require('electron');
|
||||
const settingsService = require('../features/settings/settingsService');
|
||||
const authService = require('../features/common/services/authService');
|
||||
const whisperService = require('../features/common/services/whisperService');
|
||||
const ollamaService = require('../features/common/services/ollamaService');
|
||||
const modelStateService = require('../features/common/services/modelStateService');
|
||||
const shortcutsService = require('../features/shortcuts/shortcutsService');
|
||||
const presetRepository = require('../features/common/repositories/preset');
|
||||
const localAIManager = require('../features/common/services/localAIManager');
|
||||
const askService = require('../features/ask/askService');
|
||||
const listenService = require('../features/listen/listenService');
|
||||
const permissionService = require('../features/common/services/permissionService');
|
||||
const encryptionService = require('../features/common/services/encryptionService');
|
||||
|
||||
module.exports = {
|
||||
// Renderer로부터의 요청을 수신하고 서비스로 전달
|
||||
initialize() {
|
||||
// Settings Service
|
||||
ipcMain.handle('settings:getPresets', async () => await settingsService.getPresets());
|
||||
ipcMain.handle('settings:get-auto-update', async () => await settingsService.getAutoUpdateSetting());
|
||||
ipcMain.handle('settings:set-auto-update', async (event, isEnabled) => await settingsService.setAutoUpdateSetting(isEnabled));
|
||||
ipcMain.handle('settings:get-model-settings', async () => await settingsService.getModelSettings());
|
||||
ipcMain.handle('settings:clear-api-key', async (e, { provider }) => await settingsService.clearApiKey(provider));
|
||||
ipcMain.handle('settings:set-selected-model', async (e, { type, modelId }) => await settingsService.setSelectedModel(type, modelId));
|
||||
|
||||
ipcMain.handle('settings:get-ollama-status', async () => await settingsService.getOllamaStatus());
|
||||
ipcMain.handle('settings:ensure-ollama-ready', async () => await settingsService.ensureOllamaReady());
|
||||
ipcMain.handle('settings:shutdown-ollama', async () => await settingsService.shutdownOllama());
|
||||
|
||||
// Shortcuts
|
||||
ipcMain.handle('settings:getCurrentShortcuts', async () => await shortcutsService.loadKeybinds());
|
||||
ipcMain.handle('shortcut:getDefaultShortcuts', async () => await shortcutsService.handleRestoreDefaults());
|
||||
ipcMain.handle('shortcut:closeShortcutSettingsWindow', async () => await shortcutsService.closeShortcutSettingsWindow());
|
||||
ipcMain.handle('shortcut:openShortcutSettingsWindow', async () => await shortcutsService.openShortcutSettingsWindow());
|
||||
ipcMain.handle('shortcut:saveShortcuts', async (event, newKeybinds) => await shortcutsService.handleSaveShortcuts(newKeybinds));
|
||||
ipcMain.handle('shortcut:toggleAllWindowsVisibility', async () => await shortcutsService.toggleAllWindowsVisibility());
|
||||
|
||||
// Permissions
|
||||
ipcMain.handle('check-system-permissions', async () => await permissionService.checkSystemPermissions());
|
||||
ipcMain.handle('request-microphone-permission', async () => await permissionService.requestMicrophonePermission());
|
||||
ipcMain.handle('open-system-preferences', async (event, section) => await permissionService.openSystemPreferences(section));
|
||||
ipcMain.handle('mark-keychain-completed', async () => await permissionService.markKeychainCompleted());
|
||||
ipcMain.handle('check-keychain-completed', async () => await permissionService.checkKeychainCompleted());
|
||||
ipcMain.handle('initialize-encryption-key', async () => {
|
||||
const userId = authService.getCurrentUserId();
|
||||
await encryptionService.initializeKey(userId);
|
||||
return { success: true };
|
||||
});
|
||||
|
||||
// User/Auth
|
||||
ipcMain.handle('get-current-user', () => authService.getCurrentUser());
|
||||
ipcMain.handle('start-firebase-auth', async () => await authService.startFirebaseAuthFlow());
|
||||
ipcMain.handle('firebase-logout', async () => await authService.signOut());
|
||||
|
||||
// App
|
||||
ipcMain.handle('quit-application', () => app.quit());
|
||||
|
||||
// Whisper
|
||||
ipcMain.handle('whisper:download-model', async (event, modelId) => await whisperService.handleDownloadModel(modelId));
|
||||
ipcMain.handle('whisper:get-installed-models', async () => await whisperService.handleGetInstalledModels());
|
||||
|
||||
// General
|
||||
ipcMain.handle('get-preset-templates', () => presetRepository.getPresetTemplates());
|
||||
ipcMain.handle('get-web-url', () => process.env.pickleglass_WEB_URL || 'http://localhost:3000');
|
||||
|
||||
// Ollama
|
||||
ipcMain.handle('ollama:get-status', async () => await ollamaService.handleGetStatus());
|
||||
ipcMain.handle('ollama:install', async () => await ollamaService.handleInstall());
|
||||
ipcMain.handle('ollama:start-service', async () => await ollamaService.handleStartService());
|
||||
ipcMain.handle('ollama:ensure-ready', async () => await ollamaService.handleEnsureReady());
|
||||
ipcMain.handle('ollama:get-models', async () => await ollamaService.handleGetModels());
|
||||
ipcMain.handle('ollama:get-model-suggestions', async () => await ollamaService.handleGetModelSuggestions());
|
||||
ipcMain.handle('ollama:pull-model', async (event, modelName) => await ollamaService.handlePullModel(modelName));
|
||||
ipcMain.handle('ollama:is-model-installed', async (event, modelName) => await ollamaService.handleIsModelInstalled(modelName));
|
||||
ipcMain.handle('ollama:warm-up-model', async (event, modelName) => await ollamaService.handleWarmUpModel(modelName));
|
||||
ipcMain.handle('ollama:auto-warm-up', async () => await ollamaService.handleAutoWarmUp());
|
||||
ipcMain.handle('ollama:get-warm-up-status', async () => await ollamaService.handleGetWarmUpStatus());
|
||||
ipcMain.handle('ollama:shutdown', async (event, force = false) => await ollamaService.handleShutdown(force));
|
||||
|
||||
// Ask
|
||||
ipcMain.handle('ask:sendQuestionFromAsk', async (event, userPrompt) => await askService.sendMessage(userPrompt));
|
||||
ipcMain.handle('ask:sendQuestionFromSummary', async (event, userPrompt) => await askService.sendMessage(userPrompt));
|
||||
ipcMain.handle('ask:toggleAskButton', async () => await askService.toggleAskButton());
|
||||
ipcMain.handle('ask:closeAskWindow', async () => await askService.closeAskWindow());
|
||||
|
||||
// Listen
|
||||
ipcMain.handle('listen:sendMicAudio', async (event, { data, mimeType }) => await listenService.handleSendMicAudioContent(data, mimeType));
|
||||
ipcMain.handle('listen:sendSystemAudio', async (event, { data, mimeType }) => {
|
||||
const result = await listenService.sttService.sendSystemAudioContent(data, mimeType);
|
||||
if(result.success) {
|
||||
listenService.sendToRenderer('system-audio-data', { data });
|
||||
}
|
||||
return result;
|
||||
});
|
||||
ipcMain.handle('listen:startMacosSystemAudio', async () => await listenService.handleStartMacosAudio());
|
||||
ipcMain.handle('listen:stopMacosSystemAudio', async () => await listenService.handleStopMacosAudio());
|
||||
ipcMain.handle('update-google-search-setting', async (event, enabled) => await listenService.handleUpdateGoogleSearchSetting(enabled));
|
||||
ipcMain.handle('listen:isSessionActive', async () => await listenService.isSessionActive());
|
||||
ipcMain.handle('listen:changeSession', async (event, listenButtonText) => {
|
||||
console.log('[FeatureBridge] listen:changeSession from mainheader', listenButtonText);
|
||||
try {
|
||||
await listenService.handleListenRequest(listenButtonText);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('[FeatureBridge] listen:changeSession failed', error.message);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
});
|
||||
|
||||
// ModelStateService
|
||||
ipcMain.handle('model:validate-key', async (e, { provider, key }) => await modelStateService.handleValidateKey(provider, key));
|
||||
ipcMain.handle('model:get-all-keys', async () => await modelStateService.getAllApiKeys());
|
||||
ipcMain.handle('model:set-api-key', async (e, { provider, key }) => await modelStateService.setApiKey(provider, key));
|
||||
ipcMain.handle('model:remove-api-key', async (e, provider) => await modelStateService.handleRemoveApiKey(provider));
|
||||
ipcMain.handle('model:get-selected-models', async () => await modelStateService.getSelectedModels());
|
||||
ipcMain.handle('model:set-selected-model', async (e, { type, modelId }) => await modelStateService.handleSetSelectedModel(type, modelId));
|
||||
ipcMain.handle('model:get-available-models', async (e, { type }) => await modelStateService.getAvailableModels(type));
|
||||
ipcMain.handle('model:are-providers-configured', async () => await modelStateService.areProvidersConfigured());
|
||||
ipcMain.handle('model:get-provider-config', () => modelStateService.getProviderConfig());
|
||||
ipcMain.handle('model:re-initialize-state', async () => await modelStateService.initialize());
|
||||
|
||||
// LocalAIManager 이벤트를 모든 윈도우에 브로드캐스트
|
||||
localAIManager.on('install-progress', (service, data) => {
|
||||
const event = { service, ...data };
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:install-progress', event);
|
||||
}
|
||||
});
|
||||
});
|
||||
localAIManager.on('installation-complete', (service) => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:installation-complete', { service });
|
||||
}
|
||||
});
|
||||
});
|
||||
localAIManager.on('error', (error) => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:error-occurred', error);
|
||||
}
|
||||
});
|
||||
});
|
||||
// Handle error-occurred events from LocalAIManager's error handling
|
||||
localAIManager.on('error-occurred', (error) => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:error-occurred', error);
|
||||
}
|
||||
});
|
||||
});
|
||||
localAIManager.on('model-ready', (data) => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:model-ready', data);
|
||||
}
|
||||
});
|
||||
});
|
||||
localAIManager.on('state-changed', (service, state) => {
|
||||
const event = { service, ...state };
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('localai:service-status-changed', event);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 주기적 상태 동기화 시작
|
||||
localAIManager.startPeriodicSync();
|
||||
|
||||
// ModelStateService 이벤트를 모든 윈도우에 브로드캐스트
|
||||
modelStateService.on('state-updated', (state) => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('model-state:updated', state);
|
||||
}
|
||||
});
|
||||
});
|
||||
modelStateService.on('settings-updated', () => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('settings-updated');
|
||||
}
|
||||
});
|
||||
});
|
||||
modelStateService.on('force-show-apikey-header', () => {
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed()) {
|
||||
win.webContents.send('force-show-apikey-header');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// LocalAI 통합 핸들러 추가
|
||||
ipcMain.handle('localai:install', async (event, { service, options }) => {
|
||||
return await localAIManager.installService(service, options);
|
||||
});
|
||||
ipcMain.handle('localai:get-status', async (event, service) => {
|
||||
return await localAIManager.getServiceStatus(service);
|
||||
});
|
||||
ipcMain.handle('localai:start-service', async (event, service) => {
|
||||
return await localAIManager.startService(service);
|
||||
});
|
||||
ipcMain.handle('localai:stop-service', async (event, service) => {
|
||||
return await localAIManager.stopService(service);
|
||||
});
|
||||
ipcMain.handle('localai:install-model', async (event, { service, modelId, options }) => {
|
||||
return await localAIManager.installModel(service, modelId, options);
|
||||
});
|
||||
ipcMain.handle('localai:get-installed-models', async (event, service) => {
|
||||
return await localAIManager.getInstalledModels(service);
|
||||
});
|
||||
ipcMain.handle('localai:run-diagnostics', async (event, service) => {
|
||||
return await localAIManager.runDiagnostics(service);
|
||||
});
|
||||
ipcMain.handle('localai:repair-service', async (event, service) => {
|
||||
return await localAIManager.repairService(service);
|
||||
});
|
||||
|
||||
// 에러 처리 핸들러
|
||||
ipcMain.handle('localai:handle-error', async (event, { service, errorType, details }) => {
|
||||
return await localAIManager.handleError(service, errorType, details);
|
||||
});
|
||||
|
||||
// 전체 상태 조회
|
||||
ipcMain.handle('localai:get-all-states', async (event) => {
|
||||
return await localAIManager.getAllServiceStates();
|
||||
});
|
||||
|
||||
console.log('[FeatureBridge] Initialized with all feature handlers.');
|
||||
},
|
||||
|
||||
// Renderer로 상태를 전송
|
||||
sendAskProgress(win, progress) {
|
||||
win.webContents.send('feature:ask:progress', progress);
|
||||
},
|
||||
};
|
||||
@ -1,11 +0,0 @@
|
||||
// src/bridge/internalBridge.js
|
||||
const { EventEmitter } = require('events');
|
||||
|
||||
// FeatureCore와 WindowCore를 잇는 내부 이벤트 버스
|
||||
const internalBridge = new EventEmitter();
|
||||
module.exports = internalBridge;
|
||||
|
||||
// 예시 이벤트
|
||||
// internalBridge.on('content-protection-changed', (enabled) => {
|
||||
// // windowManager에서 처리
|
||||
// });
|
||||
@ -1,34 +0,0 @@
|
||||
// src/bridge/windowBridge.js
|
||||
const { ipcMain, shell } = require('electron');
|
||||
|
||||
// Bridge는 단순히 IPC 핸들러를 등록하는 역할만 함 (비즈니스 로직 없음)
|
||||
module.exports = {
|
||||
initialize() {
|
||||
// initialize 시점에 windowManager를 require하여 circular dependency 문제 해결
|
||||
const windowManager = require('../window/windowManager');
|
||||
|
||||
// 기존 IPC 핸들러들
|
||||
ipcMain.handle('toggle-content-protection', () => windowManager.toggleContentProtection());
|
||||
ipcMain.handle('resize-header-window', (event, args) => windowManager.resizeHeaderWindow(args));
|
||||
ipcMain.handle('get-content-protection-status', () => windowManager.getContentProtectionStatus());
|
||||
ipcMain.on('show-settings-window', () => windowManager.showSettingsWindow());
|
||||
ipcMain.on('hide-settings-window', () => windowManager.hideSettingsWindow());
|
||||
ipcMain.on('cancel-hide-settings-window', () => windowManager.cancelHideSettingsWindow());
|
||||
|
||||
ipcMain.handle('open-login-page', () => windowManager.openLoginPage());
|
||||
ipcMain.handle('open-personalize-page', () => windowManager.openLoginPage());
|
||||
ipcMain.handle('move-window-step', (event, direction) => windowManager.moveWindowStep(direction));
|
||||
ipcMain.handle('open-external', (event, url) => shell.openExternal(url));
|
||||
|
||||
// Newly moved handlers from windowManager
|
||||
ipcMain.on('header-state-changed', (event, state) => windowManager.handleHeaderStateChanged(state));
|
||||
ipcMain.on('header-animation-finished', (event, state) => windowManager.handleHeaderAnimationFinished(state));
|
||||
ipcMain.handle('get-header-position', () => windowManager.getHeaderPosition());
|
||||
ipcMain.handle('move-header-to', (event, newX, newY) => windowManager.moveHeaderTo(newX, newY));
|
||||
ipcMain.handle('adjust-window-height', (event, { winName, height }) => windowManager.adjustWindowHeight(winName, height));
|
||||
},
|
||||
|
||||
notifyFocusChange(win, isFocused) {
|
||||
win.webContents.send('window:focus-change', isFocused);
|
||||
}
|
||||
};
|
||||
@ -57,42 +57,6 @@ const PROVIDERS = {
|
||||
],
|
||||
sttModels: [],
|
||||
},
|
||||
'deepgram': {
|
||||
name: 'Deepgram',
|
||||
handler: () => require("./providers/deepgram"),
|
||||
llmModels: [],
|
||||
sttModels: [
|
||||
{ id: 'nova-3', name: 'Nova-3 (General)' },
|
||||
],
|
||||
},
|
||||
'ollama': {
|
||||
name: 'Ollama (Local)',
|
||||
handler: () => require("./providers/ollama"),
|
||||
llmModels: [], // Dynamic models populated from installed Ollama models
|
||||
sttModels: [], // Ollama doesn't support STT yet
|
||||
},
|
||||
'whisper': {
|
||||
name: 'Whisper (Local)',
|
||||
handler: () => {
|
||||
// This needs to remain a function due to its conditional logic for renderer/main process
|
||||
if (typeof window === 'undefined') {
|
||||
const { WhisperProvider } = require("./providers/whisper");
|
||||
return new WhisperProvider();
|
||||
}
|
||||
// Return a dummy object for the renderer process
|
||||
return {
|
||||
validateApiKey: async () => ({ success: true }), // Mock validate for renderer
|
||||
createSTT: () => { throw new Error('Whisper STT is only available in main process'); },
|
||||
};
|
||||
},
|
||||
llmModels: [],
|
||||
sttModels: [
|
||||
{ id: 'whisper-tiny', name: 'Whisper Tiny (39M)' },
|
||||
{ id: 'whisper-base', name: 'Whisper Base (74M)' },
|
||||
{ id: 'whisper-small', name: 'Whisper Small (244M)' },
|
||||
{ id: 'whisper-medium', name: 'Whisper Medium (769M)' },
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
function sanitizeModelId(model) {
|
||||
@ -138,33 +102,6 @@ function createStreamingLLM(provider, opts) {
|
||||
return handler.createStreamingLLM(opts);
|
||||
}
|
||||
|
||||
function getProviderClass(providerId) {
|
||||
const providerConfig = PROVIDERS[providerId];
|
||||
if (!providerConfig) return null;
|
||||
|
||||
// Handle special cases for glass providers
|
||||
let actualProviderId = providerId;
|
||||
if (providerId === 'openai-glass') {
|
||||
actualProviderId = 'openai';
|
||||
}
|
||||
|
||||
// The handler function returns the module, from which we get the class.
|
||||
const module = providerConfig.handler();
|
||||
|
||||
// Map provider IDs to their actual exported class names
|
||||
const classNameMap = {
|
||||
'openai': 'OpenAIProvider',
|
||||
'anthropic': 'AnthropicProvider',
|
||||
'gemini': 'GeminiProvider',
|
||||
'deepgram': 'DeepgramProvider',
|
||||
'ollama': 'OllamaProvider',
|
||||
'whisper': 'WhisperProvider'
|
||||
};
|
||||
|
||||
const className = classNameMap[actualProviderId];
|
||||
return className ? module[className] : null;
|
||||
}
|
||||
|
||||
function getAvailableProviders() {
|
||||
const stt = [];
|
||||
const llm = [];
|
||||
@ -180,6 +117,5 @@ module.exports = {
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM,
|
||||
getProviderClass,
|
||||
getAvailableProviders,
|
||||
};
|
||||
@ -1,38 +1,4 @@
|
||||
const { Anthropic } = require("@anthropic-ai/sdk")
|
||||
|
||||
class AnthropicProvider {
|
||||
static async validateApiKey(key) {
|
||||
if (!key || typeof key !== 'string' || !key.startsWith('sk-ant-')) {
|
||||
return { success: false, error: 'Invalid Anthropic API key format.' };
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch("https://api.anthropic.com/v1/messages", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"x-api-key": key,
|
||||
"anthropic-version": "2023-06-01",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: "claude-3-haiku-20240307",
|
||||
max_tokens: 1,
|
||||
messages: [{ role: "user", content: "Hi" }],
|
||||
}),
|
||||
});
|
||||
|
||||
if (response.ok || response.status === 400) { // 400 is a valid response for a bad request, not a bad key
|
||||
return { success: true };
|
||||
} else {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
return { success: false, error: errorData.error?.message || `Validation failed with status: ${response.status}` };
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[AnthropicProvider] Network error during key validation:`, error);
|
||||
return { success: false, error: 'A network error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
}
|
||||
const Anthropic = require("@anthropic-ai/sdk")
|
||||
|
||||
/**
|
||||
* Creates an Anthropic STT session
|
||||
@ -320,8 +286,7 @@ function createStreamingLLM({
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
AnthropicProvider,
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
};
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM,
|
||||
}
|
||||
337
src/common/ai/providers/gemini.js
Normal file
337
src/common/ai/providers/gemini.js
Normal file
@ -0,0 +1,337 @@
|
||||
const { GoogleGenerativeAI } = require('@google/generative-ai');
|
||||
const { GoogleGenAI } = require('@google/genai');
|
||||
|
||||
/**
|
||||
* Creates a Gemini STT session
|
||||
* @param {object} opts - Configuration options
|
||||
* @param {string} opts.apiKey - Gemini API key
|
||||
* @param {string} [opts.language='en-US'] - Language code
|
||||
* @param {object} [opts.callbacks] - Event callbacks
|
||||
* @returns {Promise<object>} STT session
|
||||
*/
|
||||
async function createSTT({ apiKey, language = 'en-US', callbacks = {}, ...config }) {
|
||||
const liveClient = new GoogleGenAI({ vertexai: false, apiKey });
|
||||
|
||||
// Language code BCP-47 conversion
|
||||
const lang = language.includes('-') ? language : `${language}-US`;
|
||||
|
||||
const session = await liveClient.live.connect({
|
||||
model: 'gemini-live-2.5-flash-preview',
|
||||
callbacks: {
|
||||
...callbacks,
|
||||
onMessage: (msg) => {
|
||||
if (!msg || typeof msg !== 'object') return;
|
||||
msg.provider = 'gemini';
|
||||
callbacks.onmessage?.(msg);
|
||||
}
|
||||
},
|
||||
config: {
|
||||
inputAudioTranscription: {},
|
||||
speechConfig: { languageCode: lang },
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
sendRealtimeInput: async payload => session.sendRealtimeInput(payload),
|
||||
close: async () => session.close(),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Gemini LLM instance
|
||||
* @param {object} opts - Configuration options
|
||||
* @param {string} opts.apiKey - Gemini API key
|
||||
* @param {string} [opts.model='gemini-2.5-flash'] - Model name
|
||||
* @param {number} [opts.temperature=0.7] - Temperature
|
||||
* @param {number} [opts.maxTokens=8192] - Max tokens
|
||||
* @returns {object} LLM instance
|
||||
*/
|
||||
function createLLM({ apiKey, model = 'gemini-2.5-flash', temperature = 0.7, maxTokens = 8192, ...config }) {
|
||||
const client = new GoogleGenerativeAI(apiKey);
|
||||
|
||||
return {
|
||||
generateContent: async (parts) => {
|
||||
const geminiModel = client.getGenerativeModel({ model: model });
|
||||
|
||||
let systemPrompt = '';
|
||||
let userContent = [];
|
||||
|
||||
for (const part of parts) {
|
||||
if (typeof part === 'string') {
|
||||
if (systemPrompt === '' && part.includes('You are')) {
|
||||
systemPrompt = part;
|
||||
} else {
|
||||
userContent.push(part);
|
||||
}
|
||||
} else if (part.inlineData) {
|
||||
// Convert base64 image data to Gemini format
|
||||
userContent.push({
|
||||
inlineData: {
|
||||
mimeType: part.inlineData.mimeType,
|
||||
data: part.inlineData.data
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Prepare content array
|
||||
const content = [];
|
||||
|
||||
// Add system instruction if present
|
||||
if (systemPrompt) {
|
||||
// For Gemini, we'll prepend system prompt to user content
|
||||
content.push(systemPrompt + '\n\n' + userContent[0]);
|
||||
content.push(...userContent.slice(1));
|
||||
} else {
|
||||
content.push(...userContent);
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await geminiModel.generateContent(content);
|
||||
const response = await result.response;
|
||||
|
||||
return {
|
||||
response: {
|
||||
text: () => response.text()
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Gemini API error:', error);
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
// For compatibility with chat-style interfaces
|
||||
chat: async (messages) => {
|
||||
// Extract system instruction if present
|
||||
let systemInstruction = '';
|
||||
const history = [];
|
||||
let lastMessage;
|
||||
|
||||
messages.forEach((msg, index) => {
|
||||
if (msg.role === 'system') {
|
||||
systemInstruction = msg.content;
|
||||
return;
|
||||
}
|
||||
|
||||
// Gemini's history format
|
||||
const role = msg.role === 'user' ? 'user' : 'model';
|
||||
|
||||
if (index === messages.length - 1) {
|
||||
lastMessage = msg;
|
||||
} else {
|
||||
history.push({ role, parts: [{ text: msg.content }] });
|
||||
}
|
||||
});
|
||||
|
||||
const geminiModel = client.getGenerativeModel({
|
||||
model: model,
|
||||
systemInstruction: systemInstruction
|
||||
});
|
||||
|
||||
const chat = geminiModel.startChat({
|
||||
history: history,
|
||||
generationConfig: {
|
||||
temperature: temperature,
|
||||
maxOutputTokens: maxTokens,
|
||||
}
|
||||
});
|
||||
|
||||
// Get the last user message content
|
||||
let content = lastMessage.content;
|
||||
|
||||
// Handle multimodal content for the last message
|
||||
if (Array.isArray(content)) {
|
||||
const geminiContent = [];
|
||||
for (const part of content) {
|
||||
if (typeof part === 'string') {
|
||||
geminiContent.push(part);
|
||||
} else if (part.type === 'text') {
|
||||
geminiContent.push(part.text);
|
||||
} else if (part.type === 'image_url' && part.image_url) {
|
||||
// Convert base64 image to Gemini format
|
||||
const base64Data = part.image_url.url.split(',')[1];
|
||||
geminiContent.push({
|
||||
inlineData: {
|
||||
mimeType: 'image/png',
|
||||
data: base64Data
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
content = geminiContent;
|
||||
}
|
||||
|
||||
const result = await chat.sendMessage(content);
|
||||
const response = await result.response;
|
||||
return {
|
||||
content: response.text(),
|
||||
raw: result
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Gemini streaming LLM instance
|
||||
* @param {object} opts - Configuration options
|
||||
* @param {string} opts.apiKey - Gemini API key
|
||||
* @param {string} [opts.model='gemini-2.5-flash'] - Model name
|
||||
* @param {number} [opts.temperature=0.7] - Temperature
|
||||
* @param {number} [opts.maxTokens=8192] - Max tokens
|
||||
* @returns {object} Streaming LLM instance
|
||||
*/
|
||||
function createStreamingLLM({ apiKey, model = 'gemini-2.5-flash', temperature = 0.7, maxTokens = 8192, ...config }) {
|
||||
const client = new GoogleGenerativeAI(apiKey);
|
||||
|
||||
return {
|
||||
streamChat: async (messages) => {
|
||||
console.log('[Gemini Provider] Starting streaming request');
|
||||
|
||||
// Extract system instruction if present
|
||||
let systemInstruction = '';
|
||||
const nonSystemMessages = [];
|
||||
|
||||
for (const msg of messages) {
|
||||
if (msg.role === 'system') {
|
||||
systemInstruction = msg.content;
|
||||
} else {
|
||||
nonSystemMessages.push(msg);
|
||||
}
|
||||
}
|
||||
|
||||
const geminiModel = client.getGenerativeModel({
|
||||
model: model,
|
||||
systemInstruction: systemInstruction || undefined
|
||||
});
|
||||
|
||||
const chat = geminiModel.startChat({
|
||||
history: [],
|
||||
generationConfig: {
|
||||
temperature,
|
||||
maxOutputTokens: maxTokens || 8192,
|
||||
}
|
||||
});
|
||||
|
||||
// Create a ReadableStream to handle Gemini's streaming
|
||||
const stream = new ReadableStream({
|
||||
async start(controller) {
|
||||
try {
|
||||
console.log('[Gemini Provider] Processing messages:', nonSystemMessages.length, 'messages (excluding system)');
|
||||
|
||||
// Get the last user message
|
||||
const lastMessage = nonSystemMessages[nonSystemMessages.length - 1];
|
||||
let lastUserMessage = lastMessage.content;
|
||||
|
||||
// Handle case where content might be an array (multimodal)
|
||||
if (Array.isArray(lastUserMessage)) {
|
||||
// Extract text content from array
|
||||
const textParts = lastUserMessage.filter(part =>
|
||||
typeof part === 'string' || (part && part.type === 'text')
|
||||
);
|
||||
lastUserMessage = textParts.map(part =>
|
||||
typeof part === 'string' ? part : part.text
|
||||
).join(' ');
|
||||
}
|
||||
|
||||
console.log('[Gemini Provider] Sending message to Gemini:',
|
||||
typeof lastUserMessage === 'string' ? lastUserMessage.substring(0, 100) + '...' : 'multimodal content');
|
||||
|
||||
// Prepare the message content for Gemini
|
||||
let geminiContent = [];
|
||||
|
||||
// Handle multimodal content properly
|
||||
if (Array.isArray(lastMessage.content)) {
|
||||
for (const part of lastMessage.content) {
|
||||
if (typeof part === 'string') {
|
||||
geminiContent.push(part);
|
||||
} else if (part.type === 'text') {
|
||||
geminiContent.push(part.text);
|
||||
} else if (part.type === 'image_url' && part.image_url) {
|
||||
// Convert base64 image to Gemini format
|
||||
const base64Data = part.image_url.url.split(',')[1];
|
||||
geminiContent.push({
|
||||
inlineData: {
|
||||
mimeType: 'image/png',
|
||||
data: base64Data
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
geminiContent = [lastUserMessage];
|
||||
}
|
||||
|
||||
console.log('[Gemini Provider] Prepared Gemini content:',
|
||||
geminiContent.length, 'parts');
|
||||
|
||||
// Stream the response
|
||||
let chunkCount = 0;
|
||||
let totalContent = '';
|
||||
|
||||
const contentParts = geminiContent.map(part => {
|
||||
if (typeof part === 'string') {
|
||||
return { text: part };
|
||||
} else if (part.inlineData) {
|
||||
return { inlineData: part.inlineData };
|
||||
}
|
||||
return part;
|
||||
});
|
||||
|
||||
const result = await geminiModel.generateContentStream({
|
||||
contents: [{
|
||||
role: 'user',
|
||||
parts: contentParts
|
||||
}],
|
||||
generationConfig: {
|
||||
temperature,
|
||||
maxOutputTokens: maxTokens || 8192,
|
||||
}
|
||||
});
|
||||
|
||||
for await (const chunk of result.stream) {
|
||||
chunkCount++;
|
||||
const chunkText = chunk.text() || '';
|
||||
totalContent += chunkText;
|
||||
|
||||
// Format as SSE data
|
||||
const data = JSON.stringify({
|
||||
choices: [{
|
||||
delta: {
|
||||
content: chunkText
|
||||
}
|
||||
}]
|
||||
});
|
||||
controller.enqueue(new TextEncoder().encode(`data: ${data}\n\n`));
|
||||
}
|
||||
|
||||
console.log(`[Gemini Provider] Streamed ${chunkCount} chunks, total length: ${totalContent.length} chars`);
|
||||
|
||||
// Send the final done message
|
||||
controller.enqueue(new TextEncoder().encode('data: [DONE]\n\n'));
|
||||
controller.close();
|
||||
console.log('[Gemini Provider] Streaming completed successfully');
|
||||
} catch (error) {
|
||||
console.error('[Gemini Provider] Streaming error:', error);
|
||||
controller.error(error);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Create a Response object with the stream
|
||||
return new Response(stream, {
|
||||
headers: {
|
||||
'Content-Type': 'text/event-stream',
|
||||
'Cache-Control': 'no-cache',
|
||||
'Connection': 'keep-alive'
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
};
|
||||
@ -1,35 +1,5 @@
|
||||
const OpenAI = require('openai');
|
||||
const WebSocket = require('ws');
|
||||
const { Portkey } = require('portkey-ai');
|
||||
const { Readable } = require('stream');
|
||||
const { getProviderForModel } = require('../factory.js');
|
||||
|
||||
|
||||
class OpenAIProvider {
|
||||
static async validateApiKey(key) {
|
||||
if (!key || typeof key !== 'string' || !key.startsWith('sk-')) {
|
||||
return { success: false, error: 'Invalid OpenAI API key format.' };
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch('https://api.openai.com/v1/models', {
|
||||
headers: { 'Authorization': `Bearer ${key}` }
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
return { success: true };
|
||||
} else {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
const message = errorData.error?.message || `Validation failed with status: ${response.status}`;
|
||||
return { success: false, error: message };
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[OpenAIProvider] Network error during key validation:`, error);
|
||||
return { success: false, error: 'A network error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates an OpenAI STT session
|
||||
@ -78,8 +48,8 @@ async function createSTT({ apiKey, language = 'en', callbacks = {}, usePortkey =
|
||||
turn_detection: {
|
||||
type: 'server_vad',
|
||||
threshold: 0.5,
|
||||
prefix_padding_ms: 200,
|
||||
silence_duration_ms: 100,
|
||||
prefix_padding_ms: 50,
|
||||
silence_duration_ms: 25,
|
||||
},
|
||||
input_audio_noise_reduction: {
|
||||
type: 'near_field'
|
||||
@ -236,7 +206,7 @@ function createLLM({ apiKey, model = 'gpt-4.1', temperature = 0.7, maxTokens = 2
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Creates an OpenAI streaming LLM instance
|
||||
* @param {object} opts - Configuration options
|
||||
* @param {string} opts.apiKey - OpenAI API key
|
||||
@ -287,8 +257,7 @@ function createStreamingLLM({ apiKey, model = 'gpt-4.1', temperature = 0.7, maxT
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
OpenAIProvider,
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
};
|
||||
@ -5,8 +5,8 @@ const LATEST_SCHEMA = {
|
||||
{ name: 'display_name', type: 'TEXT NOT NULL' },
|
||||
{ name: 'email', type: 'TEXT NOT NULL' },
|
||||
{ name: 'created_at', type: 'INTEGER' },
|
||||
{ name: 'auto_update_enabled', type: 'INTEGER DEFAULT 1' },
|
||||
{ name: 'has_migrated_to_firebase', type: 'INTEGER DEFAULT 0' }
|
||||
{ name: 'api_key', type: 'TEXT' },
|
||||
{ name: 'provider', type: 'TEXT DEFAULT \'openai\'' }
|
||||
]
|
||||
},
|
||||
sessions: {
|
||||
@ -71,49 +71,6 @@ const LATEST_SCHEMA = {
|
||||
{ name: 'created_at', type: 'INTEGER' },
|
||||
{ name: 'sync_state', type: 'TEXT DEFAULT \'clean\'' }
|
||||
]
|
||||
},
|
||||
ollama_models: {
|
||||
columns: [
|
||||
{ name: 'name', type: 'TEXT PRIMARY KEY' },
|
||||
{ name: 'size', type: 'TEXT NOT NULL' },
|
||||
{ name: 'installed', type: 'INTEGER DEFAULT 0' },
|
||||
{ name: 'installing', type: 'INTEGER DEFAULT 0' }
|
||||
]
|
||||
},
|
||||
whisper_models: {
|
||||
columns: [
|
||||
{ name: 'id', type: 'TEXT PRIMARY KEY' },
|
||||
{ name: 'name', type: 'TEXT NOT NULL' },
|
||||
{ name: 'size', type: 'TEXT NOT NULL' },
|
||||
{ name: 'installed', type: 'INTEGER DEFAULT 0' },
|
||||
{ name: 'installing', type: 'INTEGER DEFAULT 0' }
|
||||
]
|
||||
},
|
||||
provider_settings: {
|
||||
columns: [
|
||||
{ name: 'provider', type: 'TEXT NOT NULL' },
|
||||
{ name: 'api_key', type: 'TEXT' },
|
||||
{ name: 'selected_llm_model', type: 'TEXT' },
|
||||
{ name: 'selected_stt_model', type: 'TEXT' },
|
||||
{ name: 'is_active_llm', type: 'INTEGER DEFAULT 0' },
|
||||
{ name: 'is_active_stt', type: 'INTEGER DEFAULT 0' },
|
||||
{ name: 'created_at', type: 'INTEGER' },
|
||||
{ name: 'updated_at', type: 'INTEGER' }
|
||||
],
|
||||
constraints: ['PRIMARY KEY (provider)']
|
||||
},
|
||||
shortcuts: {
|
||||
columns: [
|
||||
{ name: 'action', type: 'TEXT PRIMARY KEY' },
|
||||
{ name: 'accelerator', type: 'TEXT NOT NULL' },
|
||||
{ name: 'created_at', type: 'INTEGER' }
|
||||
]
|
||||
},
|
||||
permissions: {
|
||||
columns: [
|
||||
{ name: 'uid', type: 'TEXT PRIMARY KEY' },
|
||||
{ name: 'keychain_completed', type: 'INTEGER DEFAULT 0' }
|
||||
]
|
||||
}
|
||||
};
|
||||
|
||||
19
src/common/repositories/preset/index.js
Normal file
19
src/common/repositories/preset/index.js
Normal file
@ -0,0 +1,19 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
// const firebaseRepository = require('./firebase.repository');
|
||||
const authService = require('../../../common/services/authService');
|
||||
|
||||
function getRepository() {
|
||||
// const user = authService.getCurrentUser();
|
||||
// if (user.isLoggedIn) {
|
||||
// return firebaseRepository;
|
||||
// }
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getPresets: (...args) => getRepository().getPresets(...args),
|
||||
getPresetTemplates: (...args) => getRepository().getPresetTemplates(...args),
|
||||
create: (...args) => getRepository().create(...args),
|
||||
update: (...args) => getRepository().update(...args),
|
||||
delete: (...args) => getRepository().delete(...args),
|
||||
};
|
||||
26
src/common/repositories/session/index.js
Normal file
26
src/common/repositories/session/index.js
Normal file
@ -0,0 +1,26 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
// const firebaseRepository = require('./firebase.repository'); // Future implementation
|
||||
const authService = require('../../../common/services/authService');
|
||||
|
||||
function getRepository() {
|
||||
// In the future, we can check the user's login status from authService
|
||||
// const user = authService.getCurrentUser();
|
||||
// if (user.isLoggedIn) {
|
||||
// return firebaseRepository;
|
||||
// }
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
// Directly export functions for ease of use, decided by the strategy
|
||||
module.exports = {
|
||||
getById: (...args) => getRepository().getById(...args),
|
||||
create: (...args) => getRepository().create(...args),
|
||||
getAllByUserId: (...args) => getRepository().getAllByUserId(...args),
|
||||
updateTitle: (...args) => getRepository().updateTitle(...args),
|
||||
deleteWithRelatedData: (...args) => getRepository().deleteWithRelatedData(...args),
|
||||
end: (...args) => getRepository().end(...args),
|
||||
updateType: (...args) => getRepository().updateType(...args),
|
||||
touch: (...args) => getRepository().touch(...args),
|
||||
getOrCreateActive: (...args) => getRepository().getOrCreateActive(...args),
|
||||
endAllActiveSessions: (...args) => getRepository().endAllActiveSessions(...args),
|
||||
};
|
||||
@ -108,15 +108,14 @@ function getOrCreateActive(uid, requestedType = 'ask') {
|
||||
}
|
||||
}
|
||||
|
||||
function endAllActiveSessions(uid) {
|
||||
function endAllActiveSessions() {
|
||||
const db = sqliteClient.getDb();
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
// Filter by uid to match the Firebase repository's behavior.
|
||||
const query = `UPDATE sessions SET ended_at = ?, updated_at = ? WHERE ended_at IS NULL AND uid = ?`;
|
||||
const query = `UPDATE sessions SET ended_at = ?, updated_at = ? WHERE ended_at IS NULL`;
|
||||
|
||||
try {
|
||||
const result = db.prepare(query).run(now, now, uid);
|
||||
console.log(`[Repo] Ended ${result.changes} active SQLite session(s) for user ${uid}.`);
|
||||
const result = db.prepare(query).run(now, now);
|
||||
console.log(`[Repo] Ended ${result.changes} active session(s).`);
|
||||
return { changes: result.changes };
|
||||
} catch (err) {
|
||||
console.error('SQLite: Failed to end all active sessions:', err);
|
||||
@ -6,6 +6,6 @@ function getRepository() {
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
markKeychainCompleted: (...args) => getRepository().markKeychainCompleted(...args),
|
||||
checkKeychainCompleted: (...args) => getRepository().checkKeychainCompleted(...args),
|
||||
markPermissionsAsCompleted: (...args) => getRepository().markPermissionsAsCompleted(...args),
|
||||
checkPermissionsCompleted: (...args) => getRepository().checkPermissionsCompleted(...args),
|
||||
};
|
||||
14
src/common/repositories/systemSettings/sqlite.repository.js
Normal file
14
src/common/repositories/systemSettings/sqlite.repository.js
Normal file
@ -0,0 +1,14 @@
|
||||
const sqliteClient = require('../../services/sqliteClient');
|
||||
|
||||
async function markPermissionsAsCompleted() {
|
||||
return sqliteClient.markPermissionsAsCompleted();
|
||||
}
|
||||
|
||||
async function checkPermissionsCompleted() {
|
||||
return sqliteClient.checkPermissionsCompleted();
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
markPermissionsAsCompleted,
|
||||
checkPermissionsCompleted,
|
||||
};
|
||||
19
src/common/repositories/user/index.js
Normal file
19
src/common/repositories/user/index.js
Normal file
@ -0,0 +1,19 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
// const firebaseRepository = require('./firebase.repository');
|
||||
const authService = require('../../../common/services/authService');
|
||||
|
||||
function getRepository() {
|
||||
// const user = authService.getCurrentUser();
|
||||
// if (user.isLoggedIn) {
|
||||
// return firebaseRepository;
|
||||
// }
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
findOrCreate: (...args) => getRepository().findOrCreate(...args),
|
||||
getById: (...args) => getRepository().getById(...args),
|
||||
saveApiKey: (...args) => getRepository().saveApiKey(...args),
|
||||
update: (...args) => getRepository().update(...args),
|
||||
deleteById: (...args) => getRepository().deleteById(...args),
|
||||
};
|
||||
@ -40,7 +40,17 @@ function getById(uid) {
|
||||
return db.prepare('SELECT * FROM users WHERE uid = ?').get(uid);
|
||||
}
|
||||
|
||||
|
||||
function saveApiKey(apiKey, uid, provider = 'openai') {
|
||||
const db = sqliteClient.getDb();
|
||||
try {
|
||||
const result = db.prepare('UPDATE users SET api_key = ?, provider = ? WHERE uid = ?').run(apiKey, provider, uid);
|
||||
console.log(`SQLite: API key saved for user ${uid} with provider ${provider}.`);
|
||||
return { changes: result.changes };
|
||||
} catch (err) {
|
||||
console.error('SQLite: Failed to save API key:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
function update({ uid, displayName }) {
|
||||
const db = sqliteClient.getDb();
|
||||
@ -48,16 +58,6 @@ function update({ uid, displayName }) {
|
||||
return { changes: result.changes };
|
||||
}
|
||||
|
||||
function setMigrationComplete(uid) {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('UPDATE users SET has_migrated_to_firebase = 1 WHERE uid = ?');
|
||||
const result = stmt.run(uid);
|
||||
if (result.changes > 0) {
|
||||
console.log(`[Repo] Marked migration as complete for user ${uid}.`);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function deleteById(uid) {
|
||||
const db = sqliteClient.getDb();
|
||||
const userSessions = db.prepare('SELECT id FROM sessions WHERE uid = ?').all(uid);
|
||||
@ -86,7 +86,7 @@ function deleteById(uid) {
|
||||
module.exports = {
|
||||
findOrCreate,
|
||||
getById,
|
||||
saveApiKey,
|
||||
update,
|
||||
setMigrationComplete,
|
||||
deleteById
|
||||
};
|
||||
160
src/common/services/authService.js
Normal file
160
src/common/services/authService.js
Normal file
@ -0,0 +1,160 @@
|
||||
const { onAuthStateChanged, signInWithCustomToken, signOut } = require('firebase/auth');
|
||||
const { BrowserWindow } = require('electron');
|
||||
const { getFirebaseAuth } = require('./firebaseClient');
|
||||
const userRepository = require('../repositories/user');
|
||||
const fetch = require('node-fetch');
|
||||
|
||||
async function getVirtualKeyByEmail(email, idToken) {
|
||||
if (!idToken) {
|
||||
throw new Error('Firebase ID token is required for virtual key request');
|
||||
}
|
||||
|
||||
const resp = await fetch('https://serverless-api-sf3o.vercel.app/api/virtual_key', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${idToken}`,
|
||||
},
|
||||
body: JSON.stringify({ email: email.trim().toLowerCase() }),
|
||||
redirect: 'follow',
|
||||
});
|
||||
|
||||
const json = await resp.json().catch(() => ({}));
|
||||
if (!resp.ok) {
|
||||
console.error('[VK] API request failed:', json.message || 'Unknown error');
|
||||
throw new Error(json.message || `HTTP ${resp.status}: Virtual key request failed`);
|
||||
}
|
||||
|
||||
const vKey = json?.data?.virtualKey || json?.data?.virtual_key || json?.data?.newVKey?.slug;
|
||||
|
||||
if (!vKey) throw new Error('virtual key missing in response');
|
||||
return vKey;
|
||||
}
|
||||
|
||||
class AuthService {
|
||||
constructor() {
|
||||
this.currentUserId = 'default_user';
|
||||
this.currentUserMode = 'local'; // 'local' or 'firebase'
|
||||
this.currentUser = null;
|
||||
this.isInitialized = false;
|
||||
}
|
||||
|
||||
initialize() {
|
||||
if (this.isInitialized) return;
|
||||
|
||||
const auth = getFirebaseAuth();
|
||||
onAuthStateChanged(auth, async (user) => {
|
||||
const previousUser = this.currentUser;
|
||||
|
||||
if (user) {
|
||||
// User signed IN
|
||||
console.log(`[AuthService] Firebase user signed in:`, user.uid);
|
||||
this.currentUser = user;
|
||||
this.currentUserId = user.uid;
|
||||
this.currentUserMode = 'firebase';
|
||||
|
||||
// Start background task to fetch and save virtual key
|
||||
(async () => {
|
||||
try {
|
||||
const idToken = await user.getIdToken(true);
|
||||
const virtualKey = await getVirtualKeyByEmail(user.email, idToken);
|
||||
|
||||
if (global.modelStateService) {
|
||||
global.modelStateService.setFirebaseVirtualKey(virtualKey);
|
||||
}
|
||||
console.log(`[AuthService] BG: Virtual key for ${user.email} has been processed.`);
|
||||
|
||||
} catch (error) {
|
||||
console.error('[AuthService] BG: Failed to fetch or save virtual key:', error);
|
||||
}
|
||||
})();
|
||||
|
||||
} else {
|
||||
// User signed OUT
|
||||
console.log(`[AuthService] No Firebase user.`);
|
||||
if (previousUser) {
|
||||
console.log(`[AuthService] Clearing API key for logged-out user: ${previousUser.uid}`);
|
||||
if (global.modelStateService) {
|
||||
global.modelStateService.setFirebaseVirtualKey(null);
|
||||
}
|
||||
}
|
||||
this.currentUser = null;
|
||||
this.currentUserId = 'default_user';
|
||||
this.currentUserMode = 'local';
|
||||
}
|
||||
this.broadcastUserState();
|
||||
});
|
||||
|
||||
this.isInitialized = true;
|
||||
console.log('[AuthService] Initialized and attached to Firebase Auth state.');
|
||||
}
|
||||
|
||||
async signInWithCustomToken(token) {
|
||||
const auth = getFirebaseAuth();
|
||||
try {
|
||||
const userCredential = await signInWithCustomToken(auth, token);
|
||||
console.log(`[AuthService] Successfully signed in with custom token for user:`, userCredential.user.uid);
|
||||
// onAuthStateChanged will handle the state update and broadcast
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Error signing in with custom token:', error);
|
||||
throw error; // Re-throw to be handled by the caller
|
||||
}
|
||||
}
|
||||
|
||||
async signOut() {
|
||||
const auth = getFirebaseAuth();
|
||||
try {
|
||||
await signOut(auth);
|
||||
console.log('[AuthService] User sign-out initiated successfully.');
|
||||
// onAuthStateChanged will handle the state update and broadcast,
|
||||
// which will also re-evaluate the API key status.
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Error signing out:', error);
|
||||
}
|
||||
}
|
||||
|
||||
broadcastUserState() {
|
||||
const userState = this.getCurrentUser();
|
||||
console.log('[AuthService] Broadcasting user state change:', userState);
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed() && win.webContents && !win.webContents.isDestroyed()) {
|
||||
win.webContents.send('user-state-changed', userState);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
getCurrentUserId() {
|
||||
return this.currentUserId;
|
||||
}
|
||||
|
||||
getCurrentUser() {
|
||||
const isLoggedIn = !!(this.currentUserMode === 'firebase' && this.currentUser);
|
||||
|
||||
if (isLoggedIn) {
|
||||
return {
|
||||
uid: this.currentUser.uid,
|
||||
email: this.currentUser.email,
|
||||
displayName: this.currentUser.displayName,
|
||||
mode: 'firebase',
|
||||
isLoggedIn: true,
|
||||
//////// before_modelStateService ////////
|
||||
// hasApiKey: this.hasApiKey // Always true for firebase users, but good practice
|
||||
//////// before_modelStateService ////////
|
||||
};
|
||||
}
|
||||
return {
|
||||
uid: this.currentUserId, // returns 'default_user'
|
||||
email: 'contact@pickle.com',
|
||||
displayName: 'Default User',
|
||||
mode: 'local',
|
||||
isLoggedIn: false,
|
||||
//////// before_modelStateService ////////
|
||||
// hasApiKey: this.hasApiKey
|
||||
//////// before_modelStateService ////////
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const authService = new AuthService();
|
||||
module.exports = authService;
|
||||
@ -10,13 +10,10 @@ class DatabaseInitializer {
|
||||
|
||||
// 최종적으로 사용될 DB 경로 (쓰기 가능한 위치)
|
||||
const userDataPath = app.getPath('userData');
|
||||
// In both development and production mode, the database is stored in the userData directory:
|
||||
// macOS: ~/Library/Application Support/Glass/pickleglass.db
|
||||
// Windows: %APPDATA%\Glass\pickleglass.db
|
||||
this.dbPath = path.join(userDataPath, 'pickleglass.db');
|
||||
this.dataDir = userDataPath;
|
||||
|
||||
// The original DB path (read-only location in the package)
|
||||
// 원본 DB 경로 (패키지 내 읽기 전용 위치)
|
||||
this.sourceDbPath = app.isPackaged
|
||||
? path.join(process.resourcesPath, 'data', 'pickleglass.db')
|
||||
: path.join(app.getAppPath(), 'data', 'pickleglass.db');
|
||||
@ -55,7 +52,7 @@ class DatabaseInitializer {
|
||||
try {
|
||||
this.ensureDatabaseExists();
|
||||
|
||||
sqliteClient.connect(this.dbPath); // DB 경로를 인자로 전달
|
||||
await sqliteClient.connect(this.dbPath); // DB 경로를 인자로 전달
|
||||
|
||||
// This single call will now synchronize the schema and then init default data.
|
||||
await sqliteClient.initTables();
|
||||
@ -1,9 +1,6 @@
|
||||
const { initializeApp } = require('firebase/app');
|
||||
const { initializeAuth } = require('firebase/auth');
|
||||
const Store = require('electron-store');
|
||||
const { getFirestore, setLogLevel } = require('firebase/firestore');
|
||||
|
||||
// setLogLevel('debug');
|
||||
|
||||
/**
|
||||
* Firebase Auth expects the `persistence` option passed to `initializeAuth()` to be *classes*,
|
||||
@ -69,7 +66,6 @@ const firebaseConfig = {
|
||||
|
||||
let firebaseApp = null;
|
||||
let firebaseAuth = null;
|
||||
let firestoreInstance = null; // To hold the specific DB instance
|
||||
|
||||
function initializeFirebase() {
|
||||
if (firebaseApp) {
|
||||
@ -88,11 +84,7 @@ function initializeFirebase() {
|
||||
persistence: [ElectronStorePersistence],
|
||||
});
|
||||
|
||||
// Initialize Firestore with the specific database ID
|
||||
firestoreInstance = getFirestore(firebaseApp, 'pickle-glass');
|
||||
|
||||
console.log('[FirebaseClient] Firebase initialized successfully with class-based electron-store persistence.');
|
||||
console.log('[FirebaseClient] Firestore instance is targeting the "pickle-glass" database.');
|
||||
} catch (error) {
|
||||
console.error('[FirebaseClient] Firebase initialization failed:', error);
|
||||
}
|
||||
@ -105,15 +97,7 @@ function getFirebaseAuth() {
|
||||
return firebaseAuth;
|
||||
}
|
||||
|
||||
function getFirestoreInstance() {
|
||||
if (!firestoreInstance) {
|
||||
throw new Error("Firestore has not been initialized. Call initializeFirebase() first.");
|
||||
}
|
||||
return firestoreInstance;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
initializeFirebase,
|
||||
getFirebaseAuth,
|
||||
getFirestoreInstance,
|
||||
};
|
||||
329
src/common/services/modelStateService.js
Normal file
329
src/common/services/modelStateService.js
Normal file
@ -0,0 +1,329 @@
|
||||
const Store = require('electron-store');
|
||||
const fetch = require('node-fetch');
|
||||
const { ipcMain, webContents } = require('electron');
|
||||
const { PROVIDERS } = require('../ai/factory');
|
||||
|
||||
class ModelStateService {
|
||||
constructor(authService) {
|
||||
this.authService = authService;
|
||||
this.store = new Store({ name: 'pickle-glass-model-state' });
|
||||
this.state = {};
|
||||
}
|
||||
|
||||
initialize() {
|
||||
this._loadStateForCurrentUser();
|
||||
|
||||
this.setupIpcHandlers();
|
||||
console.log('[ModelStateService] Initialized.');
|
||||
}
|
||||
|
||||
_logCurrentSelection() {
|
||||
const llmModel = this.state.selectedModels.llm;
|
||||
const sttModel = this.state.selectedModels.stt;
|
||||
const llmProvider = this.getProviderForModel('llm', llmModel) || 'None';
|
||||
const sttProvider = this.getProviderForModel('stt', sttModel) || 'None';
|
||||
|
||||
console.log(`[ModelStateService] 🌟 Current Selection -> LLM: ${llmModel || 'None'} (Provider: ${llmProvider}), STT: ${sttModel || 'None'} (Provider: ${sttProvider})`);
|
||||
}
|
||||
|
||||
_autoSelectAvailableModels() {
|
||||
console.log('[ModelStateService] Running auto-selection for models...');
|
||||
const types = ['llm', 'stt'];
|
||||
|
||||
types.forEach(type => {
|
||||
const currentModelId = this.state.selectedModels[type];
|
||||
let isCurrentModelValid = false;
|
||||
|
||||
if (currentModelId) {
|
||||
const provider = this.getProviderForModel(type, currentModelId);
|
||||
if (provider && this.getApiKey(provider)) {
|
||||
isCurrentModelValid = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isCurrentModelValid) {
|
||||
console.log(`[ModelStateService] No valid ${type.toUpperCase()} model selected. Finding an alternative...`);
|
||||
const availableModels = this.getAvailableModels(type);
|
||||
if (availableModels.length > 0) {
|
||||
this.state.selectedModels[type] = availableModels[0].id;
|
||||
console.log(`[ModelStateService] Auto-selected ${type.toUpperCase()} model: ${availableModels[0].id}`);
|
||||
} else {
|
||||
this.state.selectedModels[type] = null;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
_loadStateForCurrentUser() {
|
||||
const userId = this.authService.getCurrentUserId();
|
||||
const initialApiKeys = Object.keys(PROVIDERS).reduce((acc, key) => {
|
||||
acc[key] = null;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const defaultState = {
|
||||
apiKeys: initialApiKeys,
|
||||
selectedModels: { llm: null, stt: null },
|
||||
};
|
||||
this.state = this.store.get(`users.${userId}`, defaultState);
|
||||
console.log(`[ModelStateService] State loaded for user: ${userId}`);
|
||||
for (const p of Object.keys(PROVIDERS)) {
|
||||
if (!(p in this.state.apiKeys)) {
|
||||
this.state.apiKeys[p] = null;
|
||||
}
|
||||
}
|
||||
this._autoSelectAvailableModels();
|
||||
this._saveState();
|
||||
this._logCurrentSelection();
|
||||
}
|
||||
|
||||
|
||||
_saveState() {
|
||||
const userId = this.authService.getCurrentUserId();
|
||||
this.store.set(`users.${userId}`, this.state);
|
||||
console.log(`[ModelStateService] State saved for user: ${userId}`);
|
||||
this._logCurrentSelection();
|
||||
}
|
||||
|
||||
async validateApiKey(provider, key) {
|
||||
if (!key || key.trim() === '') {
|
||||
return { success: false, error: 'API key cannot be empty.' };
|
||||
}
|
||||
|
||||
let validationUrl, headers;
|
||||
const body = undefined;
|
||||
|
||||
switch (provider) {
|
||||
case 'openai':
|
||||
validationUrl = 'https://api.openai.com/v1/models';
|
||||
headers = { 'Authorization': `Bearer ${key}` };
|
||||
break;
|
||||
case 'gemini':
|
||||
validationUrl = `https://generativelanguage.googleapis.com/v1beta/models?key=${key}`;
|
||||
headers = {};
|
||||
break;
|
||||
case 'anthropic': {
|
||||
if (!key.startsWith('sk-ant-')) {
|
||||
throw new Error('Invalid Anthropic key format.');
|
||||
}
|
||||
const response = await fetch("https://api.anthropic.com/v1/messages", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"x-api-key": key,
|
||||
"anthropic-version": "2023-06-01",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
model: "claude-3-haiku-20240307",
|
||||
max_tokens: 1,
|
||||
messages: [{ role: "user", content: "Hi" }],
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok && response.status !== 400) {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
return { success: false, error: errorData.error?.message || `Validation failed with status: ${response.status}` };
|
||||
}
|
||||
|
||||
console.log(`[ModelStateService] API key for ${provider} is valid.`);
|
||||
this.setApiKey(provider, key);
|
||||
return { success: true };
|
||||
}
|
||||
default:
|
||||
return { success: false, error: 'Unknown provider.' };
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(validationUrl, { headers, body });
|
||||
if (response.ok) {
|
||||
console.log(`[ModelStateService] API key for ${provider} is valid.`);
|
||||
this.setApiKey(provider, key);
|
||||
return { success: true };
|
||||
} else {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
const message = errorData.error?.message || `Validation failed with status: ${response.status}`;
|
||||
console.log(`[ModelStateService] API key for ${provider} is invalid: ${message}`);
|
||||
return { success: false, error: message };
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[ModelStateService] Network error during ${provider} key validation:`, error);
|
||||
return { success: false, error: 'A network error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
|
||||
setFirebaseVirtualKey(virtualKey) {
|
||||
console.log(`[ModelStateService] Setting Firebase virtual key (for openai-glass).`);
|
||||
this.state.apiKeys['openai-glass'] = virtualKey;
|
||||
|
||||
const llmModels = PROVIDERS['openai-glass']?.llmModels;
|
||||
const sttModels = PROVIDERS['openai-glass']?.sttModels;
|
||||
|
||||
if (!this.state.selectedModels.llm && llmModels?.length > 0) {
|
||||
this.state.selectedModels.llm = llmModels[0].id;
|
||||
}
|
||||
if (!this.state.selectedModels.stt && sttModels?.length > 0) {
|
||||
this.state.selectedModels.stt = sttModels[0].id;
|
||||
}
|
||||
this._autoSelectAvailableModels();
|
||||
this._saveState();
|
||||
this._logCurrentSelection();
|
||||
}
|
||||
|
||||
setApiKey(provider, key) {
|
||||
if (provider in this.state.apiKeys) {
|
||||
this.state.apiKeys[provider] = key;
|
||||
|
||||
const llmModels = PROVIDERS[provider]?.llmModels;
|
||||
const sttModels = PROVIDERS[provider]?.sttModels;
|
||||
|
||||
if (!this.state.selectedModels.llm && llmModels?.length > 0) {
|
||||
this.state.selectedModels.llm = llmModels[0].id;
|
||||
}
|
||||
if (!this.state.selectedModels.stt && sttModels?.length > 0) {
|
||||
this.state.selectedModels.stt = sttModels[0].id;
|
||||
}
|
||||
this._saveState();
|
||||
this._logCurrentSelection();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
getApiKey(provider) {
|
||||
return this.state.apiKeys[provider] || null;
|
||||
}
|
||||
|
||||
getAllApiKeys() {
|
||||
const { 'openai-glass': _, ...displayKeys } = this.state.apiKeys;
|
||||
return displayKeys;
|
||||
}
|
||||
|
||||
removeApiKey(provider) {
|
||||
if (provider in this.state.apiKeys) {
|
||||
this.state.apiKeys[provider] = null;
|
||||
const llmProvider = this.getProviderForModel('llm', this.state.selectedModels.llm);
|
||||
if (llmProvider === provider) this.state.selectedModels.llm = null;
|
||||
|
||||
const sttProvider = this.getProviderForModel('stt', this.state.selectedModels.stt);
|
||||
if (sttProvider === provider) this.state.selectedModels.stt = null;
|
||||
|
||||
this._autoSelectAvailableModels();
|
||||
this._saveState();
|
||||
this._logCurrentSelection();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
getProviderForModel(type, modelId) {
|
||||
if (!modelId) return null;
|
||||
for (const providerId in PROVIDERS) {
|
||||
const models = type === 'llm' ? PROVIDERS[providerId].llmModels : PROVIDERS[providerId].sttModels;
|
||||
if (models.some(m => m.id === modelId)) {
|
||||
return providerId;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
getCurrentProvider(type) {
|
||||
const selectedModel = this.state.selectedModels[type];
|
||||
return this.getProviderForModel(type, selectedModel);
|
||||
}
|
||||
|
||||
isLoggedInWithFirebase() {
|
||||
return this.authService.getCurrentUser().isLoggedIn;
|
||||
}
|
||||
|
||||
areProvidersConfigured() {
|
||||
if (this.isLoggedInWithFirebase()) return true;
|
||||
|
||||
// LLM과 STT 모델을 제공하는 Provider 중 하나라도 API 키가 설정되었는지 확인
|
||||
const hasLlmKey = Object.entries(this.state.apiKeys).some(([provider, key]) => key && PROVIDERS[provider]?.llmModels.length > 0);
|
||||
const hasSttKey = Object.entries(this.state.apiKeys).some(([provider, key]) => key && PROVIDERS[provider]?.sttModels.length > 0);
|
||||
|
||||
return hasLlmKey && hasSttKey;
|
||||
}
|
||||
|
||||
|
||||
getAvailableModels(type) {
|
||||
const available = [];
|
||||
const modelList = type === 'llm' ? 'llmModels' : 'sttModels';
|
||||
|
||||
Object.entries(this.state.apiKeys).forEach(([providerId, key]) => {
|
||||
if (key && PROVIDERS[providerId]?.[modelList]) {
|
||||
available.push(...PROVIDERS[providerId][modelList]);
|
||||
}
|
||||
});
|
||||
return [...new Map(available.map(item => [item.id, item])).values()];
|
||||
}
|
||||
|
||||
getSelectedModels() {
|
||||
return this.state.selectedModels;
|
||||
}
|
||||
|
||||
setSelectedModel(type, modelId) {
|
||||
const provider = this.getProviderForModel(type, modelId);
|
||||
if (provider && this.state.apiKeys[provider]) {
|
||||
this.state.selectedModels[type] = modelId;
|
||||
this._saveState();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {('llm' | 'stt')} type
|
||||
* @returns {{provider: string, model: string, apiKey: string} | null}
|
||||
*/
|
||||
getCurrentModelInfo(type) {
|
||||
this._logCurrentSelection();
|
||||
const model = this.state.selectedModels[type];
|
||||
if (!model) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const provider = this.getProviderForModel(type, model);
|
||||
if (!provider) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const apiKey = this.getApiKey(provider);
|
||||
return { provider, model, apiKey };
|
||||
}
|
||||
|
||||
setupIpcHandlers() {
|
||||
ipcMain.handle('model:validate-key', (e, { provider, key }) => this.validateApiKey(provider, key));
|
||||
ipcMain.handle('model:get-all-keys', () => this.getAllApiKeys());
|
||||
ipcMain.handle('model:set-api-key', (e, { provider, key }) => this.setApiKey(provider, key));
|
||||
ipcMain.handle('model:remove-api-key', (e, { provider }) => {
|
||||
const success = this.removeApiKey(provider);
|
||||
if (success) {
|
||||
const selectedModels = this.getSelectedModels();
|
||||
if (!selectedModels.llm || !selectedModels.stt) {
|
||||
webContents.getAllWebContents().forEach(wc => {
|
||||
wc.send('force-show-apikey-header');
|
||||
});
|
||||
}
|
||||
}
|
||||
return success;
|
||||
});
|
||||
ipcMain.handle('model:get-selected-models', () => this.getSelectedModels());
|
||||
ipcMain.handle('model:set-selected-model', (e, { type, modelId }) => this.setSelectedModel(type, modelId));
|
||||
ipcMain.handle('model:get-available-models', (e, { type }) => this.getAvailableModels(type));
|
||||
ipcMain.handle('model:are-providers-configured', () => this.areProvidersConfigured());
|
||||
ipcMain.handle('model:get-current-model-info', (e, { type }) => this.getCurrentModelInfo(type));
|
||||
|
||||
ipcMain.handle('model:get-provider-config', () => {
|
||||
const serializableProviders = {};
|
||||
for (const key in PROVIDERS) {
|
||||
const { handler, ...rest } = PROVIDERS[key];
|
||||
serializableProviders[key] = rest;
|
||||
}
|
||||
return serializableProviders;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ModelStateService;
|
||||
@ -33,89 +33,8 @@ class SQLiteClient {
|
||||
return this.db;
|
||||
}
|
||||
|
||||
_validateAndQuoteIdentifier(identifier) {
|
||||
if (!/^[a-zA-Z0-9_]+$/.test(identifier)) {
|
||||
throw new Error(`Invalid database identifier used: ${identifier}. Only alphanumeric characters and underscores are allowed.`);
|
||||
}
|
||||
return `"${identifier}"`;
|
||||
}
|
||||
|
||||
_migrateProviderSettings() {
|
||||
const tablesInDb = this.getTablesFromDb();
|
||||
if (!tablesInDb.includes('provider_settings')) {
|
||||
return; // Table doesn't exist, no migration needed.
|
||||
}
|
||||
|
||||
const providerSettingsInfo = this.db.prepare(`PRAGMA table_info(provider_settings)`).all();
|
||||
const hasUidColumn = providerSettingsInfo.some(col => col.name === 'uid');
|
||||
|
||||
if (hasUidColumn) {
|
||||
console.log('[DB Migration] Old provider_settings schema detected. Starting robust migration...');
|
||||
|
||||
try {
|
||||
this.db.transaction(() => {
|
||||
this.db.exec('ALTER TABLE provider_settings RENAME TO provider_settings_old');
|
||||
console.log('[DB Migration] Renamed provider_settings to provider_settings_old');
|
||||
|
||||
this.createTable('provider_settings', LATEST_SCHEMA.provider_settings);
|
||||
console.log('[DB Migration] Created new provider_settings table');
|
||||
|
||||
// Dynamically build the migration query for robustness
|
||||
const oldColumnNames = this.db.prepare(`PRAGMA table_info(provider_settings_old)`).all().map(c => c.name);
|
||||
const newColumnNames = LATEST_SCHEMA.provider_settings.columns.map(c => c.name);
|
||||
const commonColumns = newColumnNames.filter(name => oldColumnNames.includes(name));
|
||||
|
||||
if (!commonColumns.includes('provider')) {
|
||||
console.warn('[DB Migration] Old table is missing the "provider" column. Aborting migration for this table.');
|
||||
this.db.exec('DROP TABLE provider_settings_old');
|
||||
return;
|
||||
}
|
||||
|
||||
const orderParts = [];
|
||||
if (oldColumnNames.includes('updated_at')) orderParts.push('updated_at DESC');
|
||||
if (oldColumnNames.includes('created_at')) orderParts.push('created_at DESC');
|
||||
const orderByClause = orderParts.length > 0 ? `ORDER BY ${orderParts.join(', ')}` : '';
|
||||
|
||||
const columnsForInsert = commonColumns.map(c => this._validateAndQuoteIdentifier(c)).join(', ');
|
||||
|
||||
const migrationQuery = `
|
||||
INSERT INTO provider_settings (${columnsForInsert})
|
||||
SELECT ${columnsForInsert}
|
||||
FROM (
|
||||
SELECT *, ROW_NUMBER() OVER(PARTITION BY provider ${orderByClause}) as rn
|
||||
FROM provider_settings_old
|
||||
)
|
||||
WHERE rn = 1
|
||||
`;
|
||||
|
||||
console.log(`[DB Migration] Executing robust migration query for columns: ${commonColumns.join(', ')}`);
|
||||
const result = this.db.prepare(migrationQuery).run();
|
||||
console.log(`[DB Migration] Migrated ${result.changes} rows to the new provider_settings table.`);
|
||||
|
||||
this.db.exec('DROP TABLE provider_settings_old');
|
||||
console.log('[DB Migration] Dropped provider_settings_old table.');
|
||||
})();
|
||||
console.log('[DB Migration] provider_settings migration completed successfully.');
|
||||
} catch (error) {
|
||||
console.error('[DB Migration] Failed to migrate provider_settings table.', error);
|
||||
|
||||
// Try to recover by dropping the temp table if it exists
|
||||
const oldTableExists = this.getTablesFromDb().includes('provider_settings_old');
|
||||
if (oldTableExists) {
|
||||
this.db.exec('DROP TABLE provider_settings_old');
|
||||
console.warn('[DB Migration] Cleaned up temporary old table after failure.');
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async synchronizeSchema() {
|
||||
synchronizeSchema() {
|
||||
console.log('[DB Sync] Starting schema synchronization...');
|
||||
|
||||
// Run special migration for provider_settings before the generic sync logic
|
||||
this._migrateProviderSettings();
|
||||
|
||||
const tablesInDb = this.getTablesFromDb();
|
||||
|
||||
for (const tableName of Object.keys(LATEST_SCHEMA)) {
|
||||
@ -138,42 +57,25 @@ class SQLiteClient {
|
||||
}
|
||||
|
||||
createTable(tableName, tableSchema) {
|
||||
const safeTableName = this._validateAndQuoteIdentifier(tableName);
|
||||
const columnDefs = tableSchema.columns
|
||||
.map(col => `${this._validateAndQuoteIdentifier(col.name)} ${col.type}`)
|
||||
.join(', ');
|
||||
|
||||
const constraints = tableSchema.constraints || [];
|
||||
const constraintsDef = constraints.length > 0 ? ', ' + constraints.join(', ') : '';
|
||||
|
||||
const query = `CREATE TABLE IF NOT EXISTS ${safeTableName} (${columnDefs}${constraintsDef})`;
|
||||
const columnDefs = tableSchema.columns.map(col => `"${col.name}" ${col.type}`).join(', ');
|
||||
const query = `CREATE TABLE IF NOT EXISTS "${tableName}" (${columnDefs})`;
|
||||
|
||||
console.log(`[DB Sync] Creating table: ${tableName}`);
|
||||
this.db.exec(query);
|
||||
this.db.prepare(query).run();
|
||||
}
|
||||
|
||||
updateTable(tableName, tableSchema) {
|
||||
const safeTableName = this._validateAndQuoteIdentifier(tableName);
|
||||
|
||||
// Get current columns
|
||||
const currentColumns = this.db.prepare(`PRAGMA table_info(${safeTableName})`).all();
|
||||
const currentColumnNames = currentColumns.map(col => col.name);
|
||||
const existingColumns = this.db.prepare(`PRAGMA table_info("${tableName}")`).all();
|
||||
const existingColumnNames = existingColumns.map(c => c.name);
|
||||
const columnsToAdd = tableSchema.columns.filter(col => !existingColumnNames.includes(col.name));
|
||||
|
||||
// Check for new columns to add
|
||||
const newColumns = tableSchema.columns.filter(col => !currentColumnNames.includes(col.name));
|
||||
|
||||
if (newColumns.length > 0) {
|
||||
console.log(`[DB Sync] Adding ${newColumns.length} new column(s) to ${tableName}`);
|
||||
for (const col of newColumns) {
|
||||
const safeColName = this._validateAndQuoteIdentifier(col.name);
|
||||
const addColumnQuery = `ALTER TABLE ${safeTableName} ADD COLUMN ${safeColName} ${col.type}`;
|
||||
this.db.exec(addColumnQuery);
|
||||
console.log(`[DB Sync] Added column ${col.name} to ${tableName}`);
|
||||
if (columnsToAdd.length > 0) {
|
||||
console.log(`[DB Sync] Updating table: ${tableName}. Adding columns: ${columnsToAdd.map(c=>c.name).join(', ')}`);
|
||||
for (const column of columnsToAdd) {
|
||||
const addColumnQuery = `ALTER TABLE "${tableName}" ADD COLUMN "${column.name}" ${column.type}`;
|
||||
this.db.prepare(addColumnQuery).run();
|
||||
}
|
||||
}
|
||||
|
||||
if (tableSchema.constraints && tableSchema.constraints.length > 0) {
|
||||
console.log(`[DB Sync] Note: Constraints for ${tableName} can only be set during table creation`);
|
||||
}
|
||||
}
|
||||
|
||||
runQuery(query, params = []) {
|
||||
@ -206,8 +108,8 @@ class SQLiteClient {
|
||||
console.log(`[DB Cleanup] Successfully deleted ${result.changes} empty sessions.`);
|
||||
}
|
||||
|
||||
async initTables() {
|
||||
await this.synchronizeSchema();
|
||||
initTables() {
|
||||
this.synchronizeSchema();
|
||||
this.initDefaultData();
|
||||
}
|
||||
|
||||
@ -240,6 +142,21 @@ class SQLiteClient {
|
||||
console.log('Default data initialized.');
|
||||
}
|
||||
|
||||
markPermissionsAsCompleted() {
|
||||
return this.query(
|
||||
'INSERT OR REPLACE INTO system_settings (key, value) VALUES (?, ?)',
|
||||
['permissions_completed', 'true']
|
||||
);
|
||||
}
|
||||
|
||||
checkPermissionsCompleted() {
|
||||
const result = this.query(
|
||||
'SELECT value FROM system_settings WHERE key = ?',
|
||||
['permissions_completed']
|
||||
);
|
||||
return result.length > 0 && result[0].value === 'true';
|
||||
}
|
||||
|
||||
close() {
|
||||
if (this.db) {
|
||||
try {
|
||||
227
src/electron/smoothMovementManager.js
Normal file
227
src/electron/smoothMovementManager.js
Normal file
@ -0,0 +1,227 @@
|
||||
const { screen } = require('electron');
|
||||
|
||||
class SmoothMovementManager {
|
||||
constructor(windowPool, getDisplayById, getCurrentDisplay, updateLayout) {
|
||||
this.windowPool = windowPool;
|
||||
this.getDisplayById = getDisplayById;
|
||||
this.getCurrentDisplay = getCurrentDisplay;
|
||||
this.updateLayout = updateLayout;
|
||||
this.stepSize = 80;
|
||||
this.animationDuration = 300;
|
||||
this.headerPosition = { x: 0, y: 0 };
|
||||
this.isAnimating = false;
|
||||
this.hiddenPosition = null;
|
||||
this.lastVisiblePosition = null;
|
||||
this.currentDisplayId = null;
|
||||
this.animationFrameId = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {BrowserWindow} win
|
||||
* @returns {boolean}
|
||||
*/
|
||||
_isWindowValid(win) {
|
||||
if (!win || win.isDestroyed()) {
|
||||
if (this.isAnimating) {
|
||||
console.warn('[MovementManager] Window destroyed mid-animation. Halting.');
|
||||
this.isAnimating = false;
|
||||
if (this.animationFrameId) {
|
||||
clearTimeout(this.animationFrameId);
|
||||
this.animationFrameId = null;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
moveToDisplay(displayId) {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!this._isWindowValid(header) || !header.isVisible() || this.isAnimating) return;
|
||||
|
||||
const targetDisplay = this.getDisplayById(displayId);
|
||||
if (!targetDisplay) return;
|
||||
|
||||
const currentBounds = header.getBounds();
|
||||
const currentDisplay = this.getCurrentDisplay(header);
|
||||
|
||||
if (currentDisplay.id === targetDisplay.id) return;
|
||||
|
||||
const relativeX = (currentBounds.x - currentDisplay.workArea.x) / currentDisplay.workAreaSize.width;
|
||||
const relativeY = (currentBounds.y - currentDisplay.workArea.y) / currentDisplay.workAreaSize.height;
|
||||
const targetX = targetDisplay.workArea.x + targetDisplay.workAreaSize.width * relativeX;
|
||||
const targetY = targetDisplay.workArea.y + targetDisplay.workAreaSize.height * relativeY;
|
||||
|
||||
const finalX = Math.max(targetDisplay.workArea.x, Math.min(targetDisplay.workArea.x + targetDisplay.workAreaSize.width - currentBounds.width, targetX));
|
||||
const finalY = Math.max(targetDisplay.workArea.y, Math.min(targetDisplay.workArea.y + targetDisplay.workAreaSize.height - currentBounds.height, targetY));
|
||||
|
||||
this.headerPosition = { x: currentBounds.x, y: currentBounds.y };
|
||||
this.animateToPosition(header, finalX, finalY);
|
||||
this.currentDisplayId = targetDisplay.id;
|
||||
}
|
||||
|
||||
hideToEdge(edge, callback, { instant = false } = {}) {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!header || header.isDestroyed()) {
|
||||
if (typeof callback === 'function') callback();
|
||||
return;
|
||||
}
|
||||
|
||||
const { x, y } = header.getBounds();
|
||||
this.lastVisiblePosition = { x, y };
|
||||
this.hiddenPosition = { edge };
|
||||
|
||||
if (instant) {
|
||||
header.hide();
|
||||
if (typeof callback === 'function') callback();
|
||||
return;
|
||||
}
|
||||
|
||||
header.webContents.send('window-hide-animation');
|
||||
|
||||
setTimeout(() => {
|
||||
if (!header.isDestroyed()) header.hide();
|
||||
if (typeof callback === 'function') callback();
|
||||
}, 5);
|
||||
}
|
||||
|
||||
showFromEdge(callback) {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!header || header.isDestroyed()) {
|
||||
if (typeof callback === 'function') callback();
|
||||
return;
|
||||
}
|
||||
|
||||
// 숨기기 전에 기억해둔 위치 복구
|
||||
if (this.lastVisiblePosition) {
|
||||
header.setPosition(
|
||||
this.lastVisiblePosition.x,
|
||||
this.lastVisiblePosition.y,
|
||||
false // animate: false
|
||||
);
|
||||
}
|
||||
|
||||
header.show();
|
||||
header.webContents.send('window-show-animation');
|
||||
|
||||
// 내부 상태 초기화
|
||||
this.hiddenPosition = null;
|
||||
this.lastVisiblePosition = null;
|
||||
|
||||
if (typeof callback === 'function') callback();
|
||||
}
|
||||
|
||||
moveStep(direction) {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!this._isWindowValid(header) || !header.isVisible() || this.isAnimating) return;
|
||||
|
||||
const currentBounds = header.getBounds();
|
||||
this.headerPosition = { x: currentBounds.x, y: currentBounds.y };
|
||||
let targetX = this.headerPosition.x;
|
||||
let targetY = this.headerPosition.y;
|
||||
|
||||
switch (direction) {
|
||||
case 'left': targetX -= this.stepSize; break;
|
||||
case 'right': targetX += this.stepSize; break;
|
||||
case 'up': targetY -= this.stepSize; break;
|
||||
case 'down': targetY += this.stepSize; break;
|
||||
default: return;
|
||||
}
|
||||
|
||||
const displays = screen.getAllDisplays();
|
||||
let validPosition = displays.some(d => (
|
||||
targetX >= d.workArea.x && targetX + currentBounds.width <= d.workArea.x + d.workArea.width &&
|
||||
targetY >= d.workArea.y && targetY + currentBounds.height <= d.workArea.y + d.workArea.height
|
||||
));
|
||||
|
||||
if (!validPosition) {
|
||||
const nearestDisplay = screen.getDisplayNearestPoint({ x: targetX, y: targetY });
|
||||
const { x, y, width, height } = nearestDisplay.workArea;
|
||||
targetX = Math.max(x, Math.min(x + width - currentBounds.width, targetX));
|
||||
targetY = Math.max(y, Math.min(y + height - currentBounds.height, targetY));
|
||||
}
|
||||
|
||||
if (targetX === this.headerPosition.x && targetY === this.headerPosition.y) return;
|
||||
this.animateToPosition(header, targetX, targetY);
|
||||
}
|
||||
|
||||
animateToPosition(header, targetX, targetY) {
|
||||
if (!this._isWindowValid(header)) return;
|
||||
|
||||
this.isAnimating = true;
|
||||
const startX = this.headerPosition.x;
|
||||
const startY = this.headerPosition.y;
|
||||
const startTime = Date.now();
|
||||
|
||||
if (!Number.isFinite(targetX) || !Number.isFinite(targetY) || !Number.isFinite(startX) || !Number.isFinite(startY)) {
|
||||
this.isAnimating = false;
|
||||
return;
|
||||
}
|
||||
|
||||
const animate = () => {
|
||||
if (!this._isWindowValid(header)) return;
|
||||
|
||||
const elapsed = Date.now() - startTime;
|
||||
const progress = Math.min(elapsed / this.animationDuration, 1);
|
||||
const eased = 1 - Math.pow(1 - progress, 3);
|
||||
const currentX = startX + (targetX - startX) * eased;
|
||||
const currentY = startY + (targetY - startY) * eased;
|
||||
|
||||
if (!Number.isFinite(currentX) || !Number.isFinite(currentY)) {
|
||||
this.isAnimating = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this._isWindowValid(header)) return;
|
||||
header.setPosition(Math.round(currentX), Math.round(currentY));
|
||||
|
||||
if (progress < 1) {
|
||||
this.animationFrameId = setTimeout(animate, 8);
|
||||
} else {
|
||||
this.animationFrameId = null;
|
||||
this.headerPosition = { x: targetX, y: targetY };
|
||||
if (Number.isFinite(targetX) && Number.isFinite(targetY)) {
|
||||
if (!this._isWindowValid(header)) return;
|
||||
header.setPosition(Math.round(targetX), Math.round(targetY));
|
||||
}
|
||||
this.isAnimating = false;
|
||||
this.updateLayout();
|
||||
}
|
||||
};
|
||||
animate();
|
||||
}
|
||||
|
||||
moveToEdge(direction) {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!this._isWindowValid(header) || !header.isVisible() || this.isAnimating) return;
|
||||
|
||||
const display = this.getCurrentDisplay(header);
|
||||
const { width, height } = display.workAreaSize;
|
||||
const { x: workAreaX, y: workAreaY } = display.workArea;
|
||||
const headerBounds = header.getBounds();
|
||||
const currentBounds = header.getBounds();
|
||||
let targetX = currentBounds.x;
|
||||
let targetY = currentBounds.y;
|
||||
|
||||
switch (direction) {
|
||||
case 'left': targetX = workAreaX; break;
|
||||
case 'right': targetX = workAreaX + width - headerBounds.width; break;
|
||||
case 'up': targetY = workAreaY; break;
|
||||
case 'down': targetY = workAreaY + height - headerBounds.height; break;
|
||||
}
|
||||
|
||||
this.headerPosition = { x: currentBounds.x, y: currentBounds.y };
|
||||
this.animateToPosition(header, targetX, targetY);
|
||||
}
|
||||
|
||||
destroy() {
|
||||
if (this.animationFrameId) {
|
||||
clearTimeout(this.animationFrameId);
|
||||
this.animationFrameId = null;
|
||||
}
|
||||
this.isAnimating = false;
|
||||
console.log('[Movement] Manager destroyed');
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = SmoothMovementManager;
|
||||
217
src/electron/windowLayoutManager.js
Normal file
217
src/electron/windowLayoutManager.js
Normal file
@ -0,0 +1,217 @@
|
||||
const { screen } = require('electron');
|
||||
|
||||
/**
|
||||
* 주어진 창이 현재 어느 디스플레이에 속해 있는지 반환합니다.
|
||||
* @param {BrowserWindow} window - 확인할 창 객체
|
||||
* @returns {Display} Electron의 Display 객체
|
||||
*/
|
||||
function getCurrentDisplay(window) {
|
||||
if (!window || window.isDestroyed()) return screen.getPrimaryDisplay();
|
||||
|
||||
const windowBounds = window.getBounds();
|
||||
const windowCenter = {
|
||||
x: windowBounds.x + windowBounds.width / 2,
|
||||
y: windowBounds.y + windowBounds.height / 2,
|
||||
};
|
||||
|
||||
return screen.getDisplayNearestPoint(windowCenter);
|
||||
}
|
||||
|
||||
class WindowLayoutManager {
|
||||
/**
|
||||
* @param {Map<string, BrowserWindow>} windowPool - 관리할 창들의 맵
|
||||
*/
|
||||
constructor(windowPool) {
|
||||
this.windowPool = windowPool;
|
||||
this.isUpdating = false;
|
||||
this.PADDING = 80;
|
||||
}
|
||||
|
||||
/**
|
||||
* 모든 창의 레이아웃 업데이트를 요청합니다.
|
||||
* 중복 실행을 방지하기 위해 isUpdating 플래그를 사용합니다.
|
||||
*/
|
||||
updateLayout() {
|
||||
if (this.isUpdating) return;
|
||||
this.isUpdating = true;
|
||||
|
||||
setImmediate(() => {
|
||||
this.positionWindows();
|
||||
this.isUpdating = false;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 헤더 창을 기준으로 모든 기능 창들의 위치를 계산하고 배치합니다.
|
||||
*/
|
||||
positionWindows() {
|
||||
const header = this.windowPool.get('header');
|
||||
if (!header?.getBounds) return;
|
||||
|
||||
const headerBounds = header.getBounds();
|
||||
const display = getCurrentDisplay(header);
|
||||
const { width: screenWidth, height: screenHeight } = display.workAreaSize;
|
||||
const { x: workAreaX, y: workAreaY } = display.workArea;
|
||||
|
||||
const headerCenterX = headerBounds.x - workAreaX + headerBounds.width / 2;
|
||||
const headerCenterY = headerBounds.y - workAreaY + headerBounds.height / 2;
|
||||
|
||||
const relativeX = headerCenterX / screenWidth;
|
||||
const relativeY = headerCenterY / screenHeight;
|
||||
|
||||
const strategy = this.determineLayoutStrategy(headerBounds, screenWidth, screenHeight, relativeX, relativeY);
|
||||
|
||||
this.positionFeatureWindows(headerBounds, strategy, screenWidth, screenHeight, workAreaX, workAreaY);
|
||||
this.positionSettingsWindow(headerBounds, strategy, screenWidth, screenHeight, workAreaX, workAreaY);
|
||||
}
|
||||
|
||||
/**
|
||||
* 헤더 창의 위치에 따라 기능 창들을 배치할 최적의 전략을 결정합니다.
|
||||
* @returns {{name: string, primary: string, secondary: string}} 레이아웃 전략
|
||||
*/
|
||||
determineLayoutStrategy(headerBounds, screenWidth, screenHeight, relativeX, relativeY) {
|
||||
const spaceBelow = screenHeight - (headerBounds.y + headerBounds.height);
|
||||
const spaceAbove = headerBounds.y;
|
||||
const spaceLeft = headerBounds.x;
|
||||
const spaceRight = screenWidth - (headerBounds.x + headerBounds.width);
|
||||
|
||||
if (spaceBelow >= 400) {
|
||||
return { name: 'below', primary: 'below', secondary: relativeX < 0.5 ? 'right' : 'left' };
|
||||
} else if (spaceAbove >= 400) {
|
||||
return { name: 'above', primary: 'above', secondary: relativeX < 0.5 ? 'right' : 'left' };
|
||||
} else if (relativeX < 0.3 && spaceRight >= 800) {
|
||||
return { name: 'right-side', primary: 'right', secondary: spaceBelow > spaceAbove ? 'below' : 'above' };
|
||||
} else if (relativeX > 0.7 && spaceLeft >= 800) {
|
||||
return { name: 'left-side', primary: 'left', secondary: spaceBelow > spaceAbove ? 'below' : 'above' };
|
||||
} else {
|
||||
return { name: 'adaptive', primary: spaceBelow > spaceAbove ? 'below' : 'above', secondary: spaceRight > spaceLeft ? 'right' : 'left' };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 'ask'와 'listen' 창의 위치를 조정합니다.
|
||||
*/
|
||||
positionFeatureWindows(headerBounds, strategy, screenWidth, screenHeight, workAreaX, workAreaY) {
|
||||
const ask = this.windowPool.get('ask');
|
||||
const listen = this.windowPool.get('listen');
|
||||
const askVisible = ask && ask.isVisible() && !ask.isDestroyed();
|
||||
const listenVisible = listen && listen.isVisible() && !listen.isDestroyed();
|
||||
|
||||
if (!askVisible && !listenVisible) return;
|
||||
|
||||
const PAD = 8;
|
||||
const headerCenterXRel = headerBounds.x - workAreaX + headerBounds.width / 2;
|
||||
let askBounds = askVisible ? ask.getBounds() : null;
|
||||
let listenBounds = listenVisible ? listen.getBounds() : null;
|
||||
|
||||
if (askVisible && listenVisible) {
|
||||
const combinedWidth = listenBounds.width + PAD + askBounds.width;
|
||||
let groupStartXRel = headerCenterXRel - combinedWidth / 2;
|
||||
let listenXRel = groupStartXRel;
|
||||
let askXRel = groupStartXRel + listenBounds.width + PAD;
|
||||
|
||||
if (listenXRel < PAD) {
|
||||
listenXRel = PAD;
|
||||
askXRel = listenXRel + listenBounds.width + PAD;
|
||||
}
|
||||
if (askXRel + askBounds.width > screenWidth - PAD) {
|
||||
askXRel = screenWidth - PAD - askBounds.width;
|
||||
listenXRel = askXRel - listenBounds.width - PAD;
|
||||
}
|
||||
|
||||
let yRel = (strategy.primary === 'above')
|
||||
? headerBounds.y - workAreaY - Math.max(askBounds.height, listenBounds.height) - PAD
|
||||
: headerBounds.y - workAreaY + headerBounds.height + PAD;
|
||||
|
||||
listen.setBounds({ x: Math.round(listenXRel + workAreaX), y: Math.round(yRel + workAreaY), width: listenBounds.width, height: listenBounds.height });
|
||||
ask.setBounds({ x: Math.round(askXRel + workAreaX), y: Math.round(yRel + workAreaY), width: askBounds.width, height: askBounds.height });
|
||||
} else {
|
||||
const win = askVisible ? ask : listen;
|
||||
const winBounds = askVisible ? askBounds : listenBounds;
|
||||
let xRel = headerCenterXRel - winBounds.width / 2;
|
||||
let yRel = (strategy.primary === 'above')
|
||||
? headerBounds.y - workAreaY - winBounds.height - PAD
|
||||
: headerBounds.y - workAreaY + headerBounds.height + PAD;
|
||||
|
||||
xRel = Math.max(PAD, Math.min(screenWidth - winBounds.width - PAD, xRel));
|
||||
yRel = Math.max(PAD, Math.min(screenHeight - winBounds.height - PAD, yRel));
|
||||
|
||||
win.setBounds({ x: Math.round(xRel + workAreaX), y: Math.round(yRel + workAreaY), width: winBounds.width, height: winBounds.height });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 'settings' 창의 위치를 조정합니다.
|
||||
*/
|
||||
positionSettingsWindow(headerBounds, strategy, screenWidth, screenHeight, workAreaX, workAreaY) {
|
||||
const settings = this.windowPool.get('settings');
|
||||
if (!settings?.getBounds || !settings.isVisible()) return;
|
||||
|
||||
if (settings.__lockedByButton) {
|
||||
const headerDisplay = getCurrentDisplay(this.windowPool.get('header'));
|
||||
const settingsDisplay = getCurrentDisplay(settings);
|
||||
if (headerDisplay.id !== settingsDisplay.id) {
|
||||
settings.__lockedByButton = false;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const settingsBounds = settings.getBounds();
|
||||
const PAD = 5;
|
||||
const buttonPadding = 17;
|
||||
let x = headerBounds.x + headerBounds.width - settingsBounds.width - buttonPadding;
|
||||
let y = headerBounds.y + headerBounds.height + PAD;
|
||||
|
||||
const otherVisibleWindows = [];
|
||||
['listen', 'ask'].forEach(name => {
|
||||
const win = this.windowPool.get(name);
|
||||
if (win && win.isVisible() && !win.isDestroyed()) {
|
||||
otherVisibleWindows.push({ name, bounds: win.getBounds() });
|
||||
}
|
||||
});
|
||||
|
||||
const settingsNewBounds = { x, y, width: settingsBounds.width, height: settingsBounds.height };
|
||||
let hasOverlap = otherVisibleWindows.some(otherWin => this.boundsOverlap(settingsNewBounds, otherWin.bounds));
|
||||
|
||||
if (hasOverlap) {
|
||||
x = headerBounds.x + headerBounds.width + PAD;
|
||||
y = headerBounds.y;
|
||||
if (x + settingsBounds.width > screenWidth - 10) {
|
||||
x = headerBounds.x - settingsBounds.width - PAD;
|
||||
}
|
||||
if (x < 10) {
|
||||
x = headerBounds.x + headerBounds.width - settingsBounds.width - buttonPadding;
|
||||
y = headerBounds.y - settingsBounds.height - PAD;
|
||||
if (y < 10) {
|
||||
x = headerBounds.x + headerBounds.width - settingsBounds.width;
|
||||
y = headerBounds.y + headerBounds.height + PAD;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
x = Math.max(workAreaX + 10, Math.min(workAreaX + screenWidth - settingsBounds.width - 10, x));
|
||||
y = Math.max(workAreaY + 10, Math.min(workAreaY + screenHeight - settingsBounds.height - 10, y));
|
||||
|
||||
settings.setBounds({ x: Math.round(x), y: Math.round(y) });
|
||||
settings.moveTop();
|
||||
}
|
||||
|
||||
/**
|
||||
* 두 사각형 영역이 겹치는지 확인합니다.
|
||||
* @param {Rectangle} bounds1
|
||||
* @param {Rectangle} bounds2
|
||||
* @returns {boolean} 겹침 여부
|
||||
*/
|
||||
boundsOverlap(bounds1, bounds2) {
|
||||
const margin = 10;
|
||||
return !(
|
||||
bounds1.x + bounds1.width + margin < bounds2.x ||
|
||||
bounds2.x + bounds2.width + margin < bounds1.x ||
|
||||
bounds1.y + bounds1.height + margin < bounds2.y ||
|
||||
bounds2.y + bounds2.height + margin < bounds1.y
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = WindowLayoutManager;
|
||||
1536
src/electron/windowManager.js
Normal file
1536
src/electron/windowManager.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,4 @@
|
||||
import { html, css, LitElement } from '../../ui/assets/lit-core-2.7.4.min.js';
|
||||
import { parser, parser_write, parser_end, default_renderer } from '../../ui/assets/smd.js';
|
||||
import { html, css, LitElement } from '../../assets/lit-core-2.7.4.min.js';
|
||||
|
||||
export class AskView extends LitElement {
|
||||
static properties = {
|
||||
@ -99,12 +98,6 @@ export class AskView extends LitElement {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
/* Allow text selection in assistant responses */
|
||||
.response-container, .response-container * {
|
||||
user-select: text !important;
|
||||
cursor: text !important;
|
||||
}
|
||||
|
||||
.response-container pre {
|
||||
background: rgba(0, 0, 0, 0.4) !important;
|
||||
border-radius: 8px !important;
|
||||
@ -493,7 +486,7 @@ export class AskView extends LitElement {
|
||||
background: rgba(0, 0, 0, 0.1);
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.1);
|
||||
flex-shrink: 0;
|
||||
transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out;
|
||||
transition: all 0.3s ease-in-out;
|
||||
transform-origin: bottom;
|
||||
}
|
||||
|
||||
@ -503,7 +496,6 @@ export class AskView extends LitElement {
|
||||
padding: 0;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
.text-input-container.no-response {
|
||||
@ -599,14 +591,6 @@ export class AskView extends LitElement {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.btn-gap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
/* ────────────────[ GLASS BYPASS ]─────────────── */
|
||||
:host-context(body.has-glass) .ask-container,
|
||||
:host-context(body.has-glass) .response-header,
|
||||
@ -642,73 +626,6 @@ export class AskView extends LitElement {
|
||||
:host-context(body.has-glass) .response-container::-webkit-scrollbar-thumb {
|
||||
background: transparent !important;
|
||||
}
|
||||
|
||||
.submit-btn, .clear-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background: transparent;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
margin-left: 8px;
|
||||
font-size: 13px;
|
||||
font-family: 'Helvetica Neue', sans-serif;
|
||||
font-weight: 500;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s;
|
||||
height: 32px;
|
||||
padding: 0 10px;
|
||||
box-shadow: none;
|
||||
}
|
||||
.submit-btn:hover, .clear-btn:hover {
|
||||
background: rgba(255,255,255,0.1);
|
||||
}
|
||||
.btn-label {
|
||||
margin-right: 8px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
}
|
||||
.btn-icon {
|
||||
background: rgba(255,255,255,0.1);
|
||||
border-radius: 13%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
}
|
||||
.btn-icon img, .btn-icon svg {
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
display: block;
|
||||
}
|
||||
.header-clear-btn {
|
||||
background: transparent;
|
||||
border: none;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
cursor: pointer;
|
||||
padding: 0 2px;
|
||||
}
|
||||
.header-clear-btn .icon-box {
|
||||
color: white;
|
||||
font-size: 12px;
|
||||
font-family: 'Helvetica Neue', sans-serif;
|
||||
font-weight: 500;
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 13%;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.header-clear-btn:hover .icon-box {
|
||||
background-color: rgba(255,255,255,0.18);
|
||||
}
|
||||
`;
|
||||
|
||||
constructor() {
|
||||
@ -721,124 +638,35 @@ export class AskView extends LitElement {
|
||||
this.headerText = 'AI Response';
|
||||
this.headerAnimating = false;
|
||||
this.isStreaming = false;
|
||||
this.accumulatedResponse = '';
|
||||
|
||||
this.marked = null;
|
||||
this.hljs = null;
|
||||
this.DOMPurify = null;
|
||||
this.isLibrariesLoaded = false;
|
||||
|
||||
// SMD.js streaming markdown parser
|
||||
this.smdParser = null;
|
||||
this.smdContainer = null;
|
||||
this.lastProcessedLength = 0;
|
||||
|
||||
this.handleStreamChunk = this.handleStreamChunk.bind(this);
|
||||
this.handleStreamEnd = this.handleStreamEnd.bind(this);
|
||||
this.handleSendText = this.handleSendText.bind(this);
|
||||
this.handleTextKeydown = this.handleTextKeydown.bind(this);
|
||||
this.closeResponsePanel = this.closeResponsePanel.bind(this);
|
||||
this.handleCopy = this.handleCopy.bind(this);
|
||||
this.clearResponseContent = this.clearResponseContent.bind(this);
|
||||
this.processAssistantQuestion = this.processAssistantQuestion.bind(this);
|
||||
this.handleToggleTextInput = this.handleToggleTextInput.bind(this);
|
||||
this.handleEscKey = this.handleEscKey.bind(this);
|
||||
this.handleDocumentClick = this.handleDocumentClick.bind(this);
|
||||
this.handleWindowBlur = this.handleWindowBlur.bind(this);
|
||||
|
||||
this.handleScroll = this.handleScroll.bind(this);
|
||||
this.handleCloseAskWindow = this.handleCloseAskWindow.bind(this);
|
||||
this.handleCloseIfNoContent = this.handleCloseIfNoContent.bind(this);
|
||||
|
||||
this.loadLibraries();
|
||||
|
||||
// --- Resize helpers ---
|
||||
this.adjustHeightThrottle = null;
|
||||
this.isThrottled = false;
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
super.connectedCallback();
|
||||
|
||||
console.log('📱 AskView connectedCallback - IPC 이벤트 리스너 설정');
|
||||
|
||||
document.addEventListener('keydown', this.handleEscKey);
|
||||
|
||||
this.resizeObserver = new ResizeObserver(entries => {
|
||||
for (const entry of entries) {
|
||||
const needed = entry.contentRect.height;
|
||||
const current = window.innerHeight;
|
||||
|
||||
if (needed > current - 4) {
|
||||
this.requestWindowResize(Math.ceil(needed));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const container = this.shadowRoot?.querySelector('.ask-container');
|
||||
if (container) this.resizeObserver.observe(container);
|
||||
|
||||
this.handleQuestionFromAssistant = (event, question) => {
|
||||
console.log('AskView: Received question from ListenView:', question);
|
||||
this.handleSendText(null, question);
|
||||
};
|
||||
|
||||
if (window.api) {
|
||||
window.api.askView.onShowTextInput(() => {
|
||||
console.log('Show text input signal received');
|
||||
if (!this.showTextInput) {
|
||||
this.showTextInput = true;
|
||||
this.updateComplete.then(() => this.focusTextInput());
|
||||
} else {
|
||||
this.focusTextInput();
|
||||
}
|
||||
});
|
||||
|
||||
window.api.askView.onScrollResponseUp(() => this.handleScroll('up'));
|
||||
window.api.askView.onScrollResponseDown(() => this.handleScroll('down'));
|
||||
window.api.askView.onAskStateUpdate((event, newState) => {
|
||||
this.currentResponse = newState.currentResponse;
|
||||
this.currentQuestion = newState.currentQuestion;
|
||||
this.isLoading = newState.isLoading;
|
||||
this.isStreaming = newState.isStreaming;
|
||||
|
||||
const wasHidden = !this.showTextInput;
|
||||
this.showTextInput = newState.showTextInput;
|
||||
|
||||
if (newState.showTextInput) {
|
||||
if (wasHidden) {
|
||||
this.updateComplete.then(() => this.focusTextInput());
|
||||
} else {
|
||||
this.focusTextInput();
|
||||
}
|
||||
}
|
||||
});
|
||||
console.log('AskView: IPC 이벤트 리스너 등록 완료');
|
||||
}
|
||||
}
|
||||
|
||||
disconnectedCallback() {
|
||||
super.disconnectedCallback();
|
||||
this.resizeObserver?.disconnect();
|
||||
|
||||
console.log('📱 AskView disconnectedCallback - IPC 이벤트 리스너 제거');
|
||||
|
||||
document.removeEventListener('keydown', this.handleEscKey);
|
||||
|
||||
if (this.copyTimeout) {
|
||||
clearTimeout(this.copyTimeout);
|
||||
}
|
||||
|
||||
if (this.headerAnimationTimeout) {
|
||||
clearTimeout(this.headerAnimationTimeout);
|
||||
}
|
||||
|
||||
if (this.streamingTimeout) {
|
||||
clearTimeout(this.streamingTimeout);
|
||||
}
|
||||
|
||||
Object.values(this.lineCopyTimeouts).forEach(timeout => clearTimeout(timeout));
|
||||
|
||||
if (window.api) {
|
||||
window.api.askView.removeOnAskStateUpdate(this.handleAskStateUpdate);
|
||||
window.api.askView.removeOnShowTextInput(this.handleShowTextInput);
|
||||
window.api.askView.removeOnScrollResponseUp(this.handleScroll);
|
||||
window.api.askView.removeOnScrollResponseDown(this.handleScroll);
|
||||
console.log('✅ AskView: IPC 이벤트 리스너 제거 필요');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async loadLibraries() {
|
||||
try {
|
||||
if (!window.marked) {
|
||||
@ -895,49 +723,38 @@ export class AskView extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
handleCloseAskWindow() {
|
||||
// this.clearResponseContent();
|
||||
window.api.askView.closeAskWindow();
|
||||
}
|
||||
|
||||
handleCloseIfNoContent() {
|
||||
handleDocumentClick(e) {
|
||||
if (!this.currentResponse && !this.isLoading && !this.isStreaming) {
|
||||
this.handleCloseAskWindow();
|
||||
const askContainer = this.shadowRoot?.querySelector('.ask-container');
|
||||
if (askContainer && !e.composedPath().includes(askContainer)) {
|
||||
this.closeIfNoContent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
handleEscKey(e) {
|
||||
if (e.key === 'Escape') {
|
||||
e.preventDefault();
|
||||
this.handleCloseIfNoContent();
|
||||
this.closeResponsePanel();
|
||||
}
|
||||
}
|
||||
|
||||
clearResponseContent() {
|
||||
this.currentResponse = '';
|
||||
this.currentQuestion = '';
|
||||
this.isLoading = false;
|
||||
this.isStreaming = false;
|
||||
this.headerText = 'AI Response';
|
||||
this.showTextInput = true;
|
||||
this.lastProcessedLength = 0;
|
||||
this.smdParser = null;
|
||||
this.smdContainer = null;
|
||||
}
|
||||
|
||||
handleInputFocus() {
|
||||
this.isInputFocused = true;
|
||||
}
|
||||
|
||||
focusTextInput() {
|
||||
requestAnimationFrame(() => {
|
||||
const textInput = this.shadowRoot?.getElementById('textInput');
|
||||
if (textInput) {
|
||||
textInput.focus();
|
||||
handleWindowBlur() {
|
||||
if (!this.currentResponse && !this.isLoading && !this.isStreaming) {
|
||||
// If there's no active content, ask the main process to close this window.
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('close-ask-window-if-empty');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
closeIfNoContent() {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('force-close-window', 'ask');
|
||||
}
|
||||
}
|
||||
|
||||
loadScript(src) {
|
||||
return new Promise((resolve, reject) => {
|
||||
@ -977,6 +794,125 @@ export class AskView extends LitElement {
|
||||
return text;
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
super.connectedCallback();
|
||||
|
||||
console.log('📱 AskView connectedCallback - IPC 이벤트 리스너 설정');
|
||||
|
||||
document.addEventListener('click', this.handleDocumentClick, true);
|
||||
document.addEventListener('keydown', this.handleEscKey);
|
||||
|
||||
this.resizeObserver = new ResizeObserver(entries => {
|
||||
for (const entry of entries) {
|
||||
const needed = entry.contentRect.height;
|
||||
const current = window.innerHeight;
|
||||
|
||||
if (needed > current - 4) {
|
||||
this.requestWindowResize(Math.ceil(needed));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const container = this.shadowRoot?.querySelector('.ask-container');
|
||||
if (container) this.resizeObserver.observe(container);
|
||||
|
||||
this.handleQuestionFromAssistant = (event, question) => {
|
||||
console.log('📨 AskView: Received question from AssistantView:', question);
|
||||
this.currentResponse = '';
|
||||
this.isStreaming = false;
|
||||
this.requestUpdate();
|
||||
|
||||
this.currentQuestion = question;
|
||||
this.isLoading = true;
|
||||
this.showTextInput = false;
|
||||
this.headerText = 'analyzing screen...';
|
||||
this.startHeaderAnimation();
|
||||
this.requestUpdate();
|
||||
|
||||
this.processAssistantQuestion(question);
|
||||
};
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.on('ask-global-send', this.handleGlobalSendRequest);
|
||||
ipcRenderer.on('toggle-text-input', this.handleToggleTextInput);
|
||||
ipcRenderer.on('receive-question-from-assistant', this.handleQuestionFromAssistant);
|
||||
ipcRenderer.on('hide-text-input', () => {
|
||||
console.log('📤 Hide text input signal received');
|
||||
this.showTextInput = false;
|
||||
this.requestUpdate();
|
||||
});
|
||||
ipcRenderer.on('clear-ask-response', () => {
|
||||
console.log('📤 Clear response signal received');
|
||||
this.currentResponse = '';
|
||||
this.isStreaming = false;
|
||||
this.isLoading = false;
|
||||
this.headerText = 'AI Response';
|
||||
this.requestUpdate();
|
||||
});
|
||||
ipcRenderer.on('window-hide-animation', () => {
|
||||
console.log('📤 Ask window hiding - clearing response content');
|
||||
setTimeout(() => {
|
||||
this.clearResponseContent();
|
||||
}, 250);
|
||||
});
|
||||
ipcRenderer.on('window-blur', this.handleWindowBlur);
|
||||
ipcRenderer.on('window-did-show', () => {
|
||||
if (!this.currentResponse && !this.isLoading && !this.isStreaming) {
|
||||
this.focusTextInput();
|
||||
}
|
||||
});
|
||||
|
||||
ipcRenderer.on('ask-response-chunk', this.handleStreamChunk);
|
||||
ipcRenderer.on('ask-response-stream-end', this.handleStreamEnd);
|
||||
|
||||
ipcRenderer.on('scroll-response-up', () => this.handleScroll('up'));
|
||||
ipcRenderer.on('scroll-response-down', () => this.handleScroll('down'));
|
||||
console.log('✅ AskView: IPC 이벤트 리스너 등록 완료');
|
||||
}
|
||||
}
|
||||
|
||||
disconnectedCallback() {
|
||||
super.disconnectedCallback();
|
||||
this.resizeObserver?.disconnect();
|
||||
|
||||
console.log('📱 AskView disconnectedCallback - IPC 이벤트 리스너 제거');
|
||||
|
||||
document.removeEventListener('click', this.handleDocumentClick, true);
|
||||
document.removeEventListener('keydown', this.handleEscKey);
|
||||
|
||||
if (this.copyTimeout) {
|
||||
clearTimeout(this.copyTimeout);
|
||||
}
|
||||
|
||||
if (this.headerAnimationTimeout) {
|
||||
clearTimeout(this.headerAnimationTimeout);
|
||||
}
|
||||
|
||||
if (this.streamingTimeout) {
|
||||
clearTimeout(this.streamingTimeout);
|
||||
}
|
||||
|
||||
Object.values(this.lineCopyTimeouts).forEach(timeout => clearTimeout(timeout));
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.removeListener('ask-global-send', this.handleGlobalSendRequest);
|
||||
ipcRenderer.removeListener('toggle-text-input', this.handleToggleTextInput);
|
||||
ipcRenderer.removeListener('clear-ask-response', () => {});
|
||||
ipcRenderer.removeListener('hide-text-input', () => {});
|
||||
ipcRenderer.removeListener('window-hide-animation', () => {});
|
||||
ipcRenderer.removeListener('window-blur', this.handleWindowBlur);
|
||||
|
||||
ipcRenderer.removeListener('ask-response-chunk', this.handleStreamChunk);
|
||||
ipcRenderer.removeListener('ask-response-stream-end', this.handleStreamEnd);
|
||||
|
||||
ipcRenderer.removeListener('scroll-response-up', () => this.handleScroll('up'));
|
||||
ipcRenderer.removeListener('scroll-response-down', () => this.handleScroll('down'));
|
||||
console.log('✅ AskView: IPC 이벤트 리스너 제거 완료');
|
||||
}
|
||||
}
|
||||
|
||||
handleScroll(direction) {
|
||||
const scrollableElement = this.shadowRoot.querySelector('#responseContainer');
|
||||
if (scrollableElement) {
|
||||
@ -989,94 +925,57 @@ export class AskView extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
// --- 스트리밍 처리 핸들러 ---
|
||||
handleStreamChunk(event, { token }) {
|
||||
if (!this.isStreaming) {
|
||||
this.isStreaming = true;
|
||||
this.isLoading = false;
|
||||
this.accumulatedResponse = '';
|
||||
const container = this.shadowRoot.getElementById('responseContainer');
|
||||
if (container) container.innerHTML = '';
|
||||
this.headerText = 'AI Response';
|
||||
this.headerAnimating = false;
|
||||
this.requestUpdate();
|
||||
}
|
||||
this.accumulatedResponse += token;
|
||||
this.renderContent();
|
||||
}
|
||||
|
||||
handleStreamEnd() {
|
||||
this.isStreaming = false;
|
||||
this.currentResponse = this.accumulatedResponse;
|
||||
if (this.headerText !== 'AI Response') {
|
||||
this.headerText = 'AI Response';
|
||||
this.requestUpdate();
|
||||
}
|
||||
this.renderContent();
|
||||
}
|
||||
|
||||
// ✨ 렌더링 로직 통합
|
||||
renderContent() {
|
||||
if (!this.isLoading && !this.isStreaming && !this.currentResponse) {
|
||||
const responseContainer = this.shadowRoot.getElementById('responseContainer');
|
||||
if (responseContainer) responseContainer.innerHTML = '<div class="empty-state">Ask a question to see the response here</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
const responseContainer = this.shadowRoot.getElementById('responseContainer');
|
||||
if (!responseContainer) return;
|
||||
|
||||
// Check loading state
|
||||
|
||||
if (this.isLoading) {
|
||||
responseContainer.innerHTML = `
|
||||
<div class="loading-dots">
|
||||
<div class="loading-dot"></div>
|
||||
<div class="loading-dot"></div>
|
||||
<div class="loading-dot"></div>
|
||||
</div>`;
|
||||
this.resetStreamingParser();
|
||||
<div class="loading-dots">
|
||||
<div class="loading-dot"></div><div class="loading-dot"></div><div class="loading-dot"></div>
|
||||
</div>`;
|
||||
return;
|
||||
}
|
||||
|
||||
// If there is no response, show empty state
|
||||
if (!this.currentResponse) {
|
||||
responseContainer.innerHTML = `<div class="empty-state">...</div>`;
|
||||
this.resetStreamingParser();
|
||||
return;
|
||||
}
|
||||
|
||||
// Set streaming markdown parser
|
||||
this.renderStreamingMarkdown(responseContainer);
|
||||
|
||||
// After updating content, recalculate window height
|
||||
this.adjustWindowHeightThrottled();
|
||||
}
|
||||
let textToRender = this.isStreaming ? this.accumulatedResponse : this.currentResponse;
|
||||
|
||||
resetStreamingParser() {
|
||||
this.smdParser = null;
|
||||
this.smdContainer = null;
|
||||
this.lastProcessedLength = 0;
|
||||
}
|
||||
// 불완전한 마크다운 수정
|
||||
textToRender = this.fixIncompleteMarkdown(textToRender);
|
||||
textToRender = this.fixIncompleteCodeBlocks(textToRender);
|
||||
|
||||
renderStreamingMarkdown(responseContainer) {
|
||||
try {
|
||||
// 파서가 없거나 컨테이너가 변경되었으면 새로 생성
|
||||
if (!this.smdParser || this.smdContainer !== responseContainer) {
|
||||
this.smdContainer = responseContainer;
|
||||
this.smdContainer.innerHTML = '';
|
||||
|
||||
// smd.js의 default_renderer 사용
|
||||
const renderer = default_renderer(this.smdContainer);
|
||||
this.smdParser = parser(renderer);
|
||||
this.lastProcessedLength = 0;
|
||||
}
|
||||
|
||||
// 새로운 텍스트만 처리 (스트리밍 최적화)
|
||||
const currentText = this.currentResponse;
|
||||
const newText = currentText.slice(this.lastProcessedLength);
|
||||
|
||||
if (newText.length > 0) {
|
||||
// 새로운 텍스트 청크를 파서에 전달
|
||||
parser_write(this.smdParser, newText);
|
||||
this.lastProcessedLength = currentText.length;
|
||||
}
|
||||
|
||||
// 스트리밍이 완료되면 파서 종료
|
||||
if (!this.isStreaming && !this.isLoading) {
|
||||
parser_end(this.smdParser);
|
||||
}
|
||||
|
||||
// 코드 하이라이팅 적용
|
||||
if (this.hljs) {
|
||||
responseContainer.querySelectorAll('pre code').forEach(block => {
|
||||
if (!block.hasAttribute('data-highlighted')) {
|
||||
this.hljs.highlightElement(block);
|
||||
block.setAttribute('data-highlighted', 'true');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 스크롤을 맨 아래로
|
||||
responseContainer.scrollTop = responseContainer.scrollHeight;
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error rendering streaming markdown:', error);
|
||||
// 에러 발생 시 기본 텍스트 렌더링으로 폴백
|
||||
this.renderFallbackContent(responseContainer);
|
||||
}
|
||||
}
|
||||
|
||||
renderFallbackContent(responseContainer) {
|
||||
const textToRender = this.currentResponse || '';
|
||||
|
||||
if (this.isLibrariesLoaded && this.marked && this.DOMPurify) {
|
||||
try {
|
||||
// 마크다운 파싱
|
||||
@ -1085,13 +984,42 @@ export class AskView extends LitElement {
|
||||
// DOMPurify로 정제
|
||||
const cleanHtml = this.DOMPurify.sanitize(parsedHtml, {
|
||||
ALLOWED_TAGS: [
|
||||
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'br', 'strong', 'b', 'em', 'i',
|
||||
'ul', 'ol', 'li', 'blockquote', 'code', 'pre', 'a', 'img', 'table', 'thead',
|
||||
'tbody', 'tr', 'th', 'td', 'hr', 'sup', 'sub', 'del', 'ins',
|
||||
'h1',
|
||||
'h2',
|
||||
'h3',
|
||||
'h4',
|
||||
'h5',
|
||||
'h6',
|
||||
'p',
|
||||
'br',
|
||||
'strong',
|
||||
'b',
|
||||
'em',
|
||||
'i',
|
||||
'ul',
|
||||
'ol',
|
||||
'li',
|
||||
'blockquote',
|
||||
'code',
|
||||
'pre',
|
||||
'a',
|
||||
'img',
|
||||
'table',
|
||||
'thead',
|
||||
'tbody',
|
||||
'tr',
|
||||
'th',
|
||||
'td',
|
||||
'hr',
|
||||
'sup',
|
||||
'sub',
|
||||
'del',
|
||||
'ins',
|
||||
],
|
||||
ALLOWED_ATTR: ['href', 'src', 'alt', 'title', 'class', 'id', 'target', 'rel'],
|
||||
});
|
||||
|
||||
// HTML 적용
|
||||
responseContainer.innerHTML = cleanHtml;
|
||||
|
||||
// 코드 하이라이팅 적용
|
||||
@ -1100,8 +1028,12 @@ export class AskView extends LitElement {
|
||||
this.hljs.highlightElement(block);
|
||||
});
|
||||
}
|
||||
|
||||
// 스크롤을 맨 아래로
|
||||
responseContainer.scrollTop = responseContainer.scrollHeight;
|
||||
} catch (error) {
|
||||
console.error('Error in fallback rendering:', error);
|
||||
console.error('Error rendering markdown:', error);
|
||||
// 에러 발생 시 일반 텍스트로 표시
|
||||
responseContainer.textContent = textToRender;
|
||||
}
|
||||
} else {
|
||||
@ -1118,12 +1050,32 @@ export class AskView extends LitElement {
|
||||
|
||||
responseContainer.innerHTML = `<p>${basicHtml}</p>`;
|
||||
}
|
||||
|
||||
// 🚀 After updating content, recalculate window height
|
||||
this.adjustWindowHeightThrottled();
|
||||
}
|
||||
|
||||
clearResponseContent() {
|
||||
this.currentResponse = '';
|
||||
this.currentQuestion = '';
|
||||
this.isLoading = false;
|
||||
this.isStreaming = false;
|
||||
this.headerText = 'AI Response';
|
||||
this.showTextInput = true;
|
||||
this.accumulatedResponse = '';
|
||||
this.requestUpdate();
|
||||
this.renderContent(); // 👈 updateResponseContent() 대신 renderContent() 호출
|
||||
}
|
||||
|
||||
handleToggleTextInput() {
|
||||
this.showTextInput = !this.showTextInput;
|
||||
this.requestUpdate();
|
||||
}
|
||||
|
||||
requestWindowResize(targetHeight) {
|
||||
if (window.api) {
|
||||
window.api.askView.adjustWindowHeight(targetHeight);
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('adjust-window-height', targetHeight);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1163,6 +1115,13 @@ export class AskView extends LitElement {
|
||||
.replace(/`(.*?)`/g, '<code>$1</code>');
|
||||
}
|
||||
|
||||
closeResponsePanel() {
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('force-close-window', 'ask');
|
||||
}
|
||||
}
|
||||
|
||||
fixIncompleteMarkdown(text) {
|
||||
if (!text) return text;
|
||||
|
||||
@ -1200,6 +1159,29 @@ export class AskView extends LitElement {
|
||||
return text;
|
||||
}
|
||||
|
||||
// ✨ processAssistantQuestion 수정
|
||||
async processAssistantQuestion(question) {
|
||||
this.currentQuestion = question;
|
||||
this.showTextInput = false;
|
||||
this.isLoading = true;
|
||||
this.isStreaming = false;
|
||||
this.currentResponse = '';
|
||||
this.accumulatedResponse = '';
|
||||
this.startHeaderAnimation();
|
||||
this.requestUpdate();
|
||||
this.renderContent();
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('ask:sendMessage', question).catch(error => {
|
||||
console.error('Error processing assistant question:', error);
|
||||
this.isLoading = false;
|
||||
this.isStreaming = false;
|
||||
this.currentResponse = `Error: ${error.message}`;
|
||||
this.renderContent();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async handleCopy() {
|
||||
if (this.copyState === 'copied') return;
|
||||
@ -1269,16 +1251,33 @@ export class AskView extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
async handleSendText(e, overridingText = '') {
|
||||
async handleSendText() {
|
||||
const textInput = this.shadowRoot?.getElementById('textInput');
|
||||
const text = (overridingText || textInput?.value || '').trim();
|
||||
// if (!text) return;
|
||||
if (!textInput) return;
|
||||
const text = textInput.value.trim();
|
||||
if (!text) return;
|
||||
|
||||
textInput.value = '';
|
||||
|
||||
if (window.api) {
|
||||
window.api.askView.sendMessage(text).catch(error => {
|
||||
this.currentQuestion = text;
|
||||
this.lineCopyState = {};
|
||||
this.showTextInput = false;
|
||||
this.isLoading = true;
|
||||
this.isStreaming = false;
|
||||
this.currentResponse = '';
|
||||
this.accumulatedResponse = '';
|
||||
this.startHeaderAnimation();
|
||||
this.requestUpdate();
|
||||
this.renderContent();
|
||||
|
||||
if (window.require) {
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('ask:sendMessage', text).catch(error => {
|
||||
console.error('Error sending text:', error);
|
||||
this.isLoading = false;
|
||||
this.isStreaming = false;
|
||||
this.currentResponse = `Error: ${error.message}`;
|
||||
this.renderContent();
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -1300,25 +1299,42 @@ export class AskView extends LitElement {
|
||||
|
||||
updated(changedProperties) {
|
||||
super.updated(changedProperties);
|
||||
|
||||
// ✨ isLoading 또는 currentResponse가 변경될 때마다 뷰를 다시 그립니다.
|
||||
if (changedProperties.has('isLoading') || changedProperties.has('currentResponse')) {
|
||||
if (changedProperties.has('isLoading')) {
|
||||
this.renderContent();
|
||||
}
|
||||
|
||||
if (changedProperties.has('showTextInput') || changedProperties.has('isLoading') || changedProperties.has('currentResponse')) {
|
||||
|
||||
if (changedProperties.has('showTextInput') || changedProperties.has('isLoading')) {
|
||||
this.adjustWindowHeightThrottled();
|
||||
}
|
||||
|
||||
|
||||
if (changedProperties.has('showTextInput') && this.showTextInput) {
|
||||
this.focusTextInput();
|
||||
}
|
||||
}
|
||||
|
||||
focusTextInput(){
|
||||
requestAnimationFrame(() => {
|
||||
const textInput = this.shadowRoot?.getElementById('textInput');
|
||||
if (textInput){
|
||||
textInput.focus();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
firstUpdated() {
|
||||
setTimeout(() => this.adjustWindowHeight(), 200);
|
||||
}
|
||||
|
||||
handleGlobalSendRequest() {
|
||||
const textInput = this.shadowRoot?.getElementById('textInput');
|
||||
if (!textInput) return;
|
||||
|
||||
textInput.focus();
|
||||
|
||||
if (!textInput.value.trim()) return;
|
||||
|
||||
this.handleSendText();
|
||||
}
|
||||
|
||||
getTruncatedQuestion(question, maxLength = 30) {
|
||||
if (!question) return '';
|
||||
@ -1326,11 +1342,27 @@ export class AskView extends LitElement {
|
||||
return question.substring(0, maxLength) + '...';
|
||||
}
|
||||
|
||||
handleInputFocus() {
|
||||
this.isInputFocused = true;
|
||||
}
|
||||
|
||||
handleInputBlur(e) {
|
||||
this.isInputFocused = false;
|
||||
|
||||
// 잠시 후 포커스가 다른 곳으로 갔는지 확인
|
||||
setTimeout(() => {
|
||||
const activeElement = this.shadowRoot?.activeElement || document.activeElement;
|
||||
const textInput = this.shadowRoot?.getElementById('textInput');
|
||||
|
||||
// 포커스가 AskView 내부가 아니고, 응답이 없는 경우
|
||||
if (!this.currentResponse && !this.isLoading && !this.isStreaming && activeElement !== textInput && !this.isInputFocused) {
|
||||
this.closeIfNoContent();
|
||||
}
|
||||
}, 200);
|
||||
}
|
||||
|
||||
render() {
|
||||
const hasResponse = this.isLoading || this.currentResponse || this.isStreaming;
|
||||
const headerText = this.isLoading ? 'Thinking...' : 'AI Response';
|
||||
|
||||
return html`
|
||||
<div class="ask-container">
|
||||
@ -1343,7 +1375,7 @@ export class AskView extends LitElement {
|
||||
<path d="M8 12l2 2 4-4" />
|
||||
</svg>
|
||||
</div>
|
||||
<span class="response-label">${headerText}</span>
|
||||
<span class="response-label ${this.headerAnimating ? 'animating' : ''}">${this.headerText}</span>
|
||||
</div>
|
||||
<div class="header-right">
|
||||
<span class="question-text">${this.getTruncatedQuestion(this.currentQuestion)}</span>
|
||||
@ -1365,7 +1397,7 @@ export class AskView extends LitElement {
|
||||
<path d="M20 6L9 17l-5-5" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="close-button" @click=${this.handleCloseAskWindow}>
|
||||
<button class="close-button" @click=${this.closeResponsePanel}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
<line x1="18" y1="6" x2="6" y2="18" />
|
||||
<line x1="6" y1="6" x2="18" y2="18" />
|
||||
@ -1388,16 +1420,8 @@ export class AskView extends LitElement {
|
||||
placeholder="Ask about your screen or audio"
|
||||
@keydown=${this.handleTextKeydown}
|
||||
@focus=${this.handleInputFocus}
|
||||
@blur=${this.handleInputBlur}
|
||||
/>
|
||||
<button
|
||||
class="submit-btn"
|
||||
@click=${this.handleSendText}
|
||||
>
|
||||
<span class="btn-label">Submit</span>
|
||||
<span class="btn-icon">
|
||||
↵
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
@ -1405,24 +1429,25 @@ export class AskView extends LitElement {
|
||||
|
||||
// Dynamically resize the BrowserWindow to fit current content
|
||||
adjustWindowHeight() {
|
||||
if (!window.api) return;
|
||||
if (!window.require) return;
|
||||
|
||||
this.updateComplete.then(() => {
|
||||
const headerEl = this.shadowRoot.querySelector('.response-header');
|
||||
const headerEl = this.shadowRoot.querySelector('.response-header');
|
||||
const responseEl = this.shadowRoot.querySelector('.response-container');
|
||||
const inputEl = this.shadowRoot.querySelector('.text-input-container');
|
||||
const inputEl = this.shadowRoot.querySelector('.text-input-container');
|
||||
|
||||
if (!headerEl || !responseEl) return;
|
||||
|
||||
const headerHeight = headerEl.classList.contains('hidden') ? 0 : headerEl.offsetHeight;
|
||||
const headerHeight = headerEl.classList.contains('hidden') ? 0 : headerEl.offsetHeight;
|
||||
const responseHeight = responseEl.scrollHeight;
|
||||
const inputHeight = (inputEl && !inputEl.classList.contains('hidden')) ? inputEl.offsetHeight : 0;
|
||||
const inputHeight = (inputEl && !inputEl.classList.contains('hidden')) ? inputEl.offsetHeight : 0;
|
||||
|
||||
const idealHeight = headerHeight + responseHeight + inputHeight;
|
||||
|
||||
const targetHeight = Math.min(700, idealHeight);
|
||||
|
||||
window.api.askView.adjustWindowHeight("ask", targetHeight);
|
||||
const { ipcRenderer } = window.require('electron');
|
||||
ipcRenderer.invoke('adjust-window-height', targetHeight);
|
||||
|
||||
}).catch(err => console.error('AskView adjustWindowHeight error:', err));
|
||||
}
|
||||
@ -1431,11 +1456,12 @@ export class AskView extends LitElement {
|
||||
adjustWindowHeightThrottled() {
|
||||
if (this.isThrottled) return;
|
||||
|
||||
this.adjustWindowHeight();
|
||||
this.isThrottled = true;
|
||||
requestAnimationFrame(() => {
|
||||
this.adjustWindowHeight();
|
||||
|
||||
this.adjustHeightThrottle = setTimeout(() => {
|
||||
this.isThrottled = false;
|
||||
});
|
||||
}, 16);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,450 +1,144 @@
|
||||
const { BrowserWindow } = require('electron');
|
||||
const { createStreamingLLM } = require('../common/ai/factory');
|
||||
// Lazy require helper to avoid circular dependency issues
|
||||
const getWindowManager = () => require('../../window/windowManager');
|
||||
const internalBridge = require('../../bridge/internalBridge');
|
||||
|
||||
const getWindowPool = () => {
|
||||
try {
|
||||
return getWindowManager().windowPool;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const sessionRepository = require('../common/repositories/session');
|
||||
const { ipcMain, BrowserWindow } = require('electron');
|
||||
const { createStreamingLLM } = require('../../common/ai/factory');
|
||||
const { getStoredApiKey, getStoredProvider, getCurrentModelInfo, windowPool, captureScreenshot } = require('../../electron/windowManager');
|
||||
const authService = require('../../common/services/authService');
|
||||
const sessionRepository = require('../../common/repositories/session');
|
||||
const askRepository = require('./repositories');
|
||||
const { getSystemPrompt } = require('../common/prompts/promptBuilder');
|
||||
const path = require('node:path');
|
||||
const fs = require('node:fs');
|
||||
const os = require('os');
|
||||
const util = require('util');
|
||||
const execFile = util.promisify(require('child_process').execFile);
|
||||
const { desktopCapturer } = require('electron');
|
||||
const modelStateService = require('../common/services/modelStateService');
|
||||
const { getSystemPrompt } = require('../../common/prompts/promptBuilder');
|
||||
|
||||
// Try to load sharp, but don't fail if it's not available
|
||||
let sharp;
|
||||
try {
|
||||
sharp = require('sharp');
|
||||
console.log('[AskService] Sharp module loaded successfully');
|
||||
} catch (error) {
|
||||
console.warn('[AskService] Sharp module not available:', error.message);
|
||||
console.warn('[AskService] Screenshot functionality will work with reduced image processing capabilities');
|
||||
sharp = null;
|
||||
function formatConversationForPrompt(conversationTexts) {
|
||||
if (!conversationTexts || conversationTexts.length === 0) return 'No conversation history available.';
|
||||
return conversationTexts.slice(-30).join('\n');
|
||||
}
|
||||
let lastScreenshot = null;
|
||||
|
||||
async function captureScreenshot(options = {}) {
|
||||
if (process.platform === 'darwin') {
|
||||
try {
|
||||
const tempPath = path.join(os.tmpdir(), `screenshot-${Date.now()}.jpg`);
|
||||
// Access conversation history via the global listenService instance created in index.js
|
||||
function getConversationHistory() {
|
||||
const listenService = global.listenService;
|
||||
return listenService ? listenService.getConversationHistory() : [];
|
||||
}
|
||||
|
||||
await execFile('screencapture', ['-x', '-t', 'jpg', tempPath]);
|
||||
|
||||
const imageBuffer = await fs.promises.readFile(tempPath);
|
||||
await fs.promises.unlink(tempPath);
|
||||
|
||||
if (sharp) {
|
||||
try {
|
||||
// Try using sharp for optimal image processing
|
||||
const resizedBuffer = await sharp(imageBuffer)
|
||||
.resize({ height: 384 })
|
||||
.jpeg({ quality: 80 })
|
||||
.toBuffer();
|
||||
|
||||
const base64 = resizedBuffer.toString('base64');
|
||||
const metadata = await sharp(resizedBuffer).metadata();
|
||||
|
||||
lastScreenshot = {
|
||||
base64,
|
||||
width: metadata.width,
|
||||
height: metadata.height,
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
return { success: true, base64, width: metadata.width, height: metadata.height };
|
||||
} catch (sharpError) {
|
||||
console.warn('Sharp module failed, falling back to basic image processing:', sharpError.message);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: Return the original image without resizing
|
||||
console.log('[AskService] Using fallback image processing (no resize/compression)');
|
||||
const base64 = imageBuffer.toString('base64');
|
||||
|
||||
lastScreenshot = {
|
||||
base64,
|
||||
width: null, // We don't have metadata without sharp
|
||||
height: null,
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
return { success: true, base64, width: null, height: null };
|
||||
} catch (error) {
|
||||
console.error('Failed to capture screenshot:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
async function sendMessage(userPrompt) {
|
||||
if (!userPrompt || userPrompt.trim().length === 0) {
|
||||
console.warn('[AskService] Cannot process empty message');
|
||||
return { success: false, error: 'Empty message' };
|
||||
}
|
||||
|
||||
const askWindow = windowPool.get('ask');
|
||||
if (askWindow && !askWindow.isDestroyed()) {
|
||||
askWindow.webContents.send('hide-text-input');
|
||||
}
|
||||
|
||||
try {
|
||||
const sources = await desktopCapturer.getSources({
|
||||
types: ['screen'],
|
||||
thumbnailSize: {
|
||||
width: 1920,
|
||||
height: 1080,
|
||||
console.log(`[AskService] 🤖 Processing message: ${userPrompt.substring(0, 50)}...`);
|
||||
|
||||
const modelInfo = await getCurrentModelInfo(null, { type: 'llm' });
|
||||
if (!modelInfo || !modelInfo.apiKey) {
|
||||
throw new Error('AI model or API key not configured.');
|
||||
}
|
||||
console.log(`[AskService] Using model: ${modelInfo.model} for provider: ${modelInfo.provider}`);
|
||||
|
||||
const screenshotResult = await captureScreenshot({ quality: 'medium' });
|
||||
const screenshotBase64 = screenshotResult.success ? screenshotResult.base64 : null;
|
||||
|
||||
const conversationHistoryRaw = getConversationHistory();
|
||||
const conversationHistory = formatConversationForPrompt(conversationHistoryRaw);
|
||||
|
||||
const systemPrompt = getSystemPrompt('pickle_glass_analysis', conversationHistory, false);
|
||||
|
||||
|
||||
const messages = [
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{
|
||||
role: 'user',
|
||||
content: [
|
||||
{ type: 'text', text: `User Request: ${userPrompt.trim()}` },
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
if (screenshotBase64) {
|
||||
messages[1].content.push({
|
||||
type: 'image_url',
|
||||
image_url: { url: `data:image/jpeg;base64,${screenshotBase64}` },
|
||||
});
|
||||
}
|
||||
|
||||
const streamingLLM = createStreamingLLM(modelInfo.provider, {
|
||||
apiKey: modelInfo.apiKey,
|
||||
model: modelInfo.model,
|
||||
temperature: 0.7,
|
||||
maxTokens: 2048,
|
||||
usePortkey: modelInfo.provider === 'openai-glass',
|
||||
portkeyVirtualKey: modelInfo.provider === 'openai-glass' ? modelInfo.apiKey : undefined,
|
||||
});
|
||||
|
||||
if (sources.length === 0) {
|
||||
throw new Error('No screen sources available');
|
||||
}
|
||||
const source = sources[0];
|
||||
const buffer = source.thumbnail.toJPEG(70);
|
||||
const base64 = buffer.toString('base64');
|
||||
const size = source.thumbnail.getSize();
|
||||
const response = await streamingLLM.streamChat(messages);
|
||||
|
||||
return {
|
||||
success: true,
|
||||
base64,
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Failed to capture screenshot using desktopCapturer:', error);
|
||||
return {
|
||||
success: false,
|
||||
error: error.message,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @class
|
||||
* @description
|
||||
*/
|
||||
class AskService {
|
||||
constructor() {
|
||||
this.abortController = null;
|
||||
this.state = {
|
||||
isVisible: false,
|
||||
isLoading: false,
|
||||
isStreaming: false,
|
||||
currentQuestion: '',
|
||||
currentResponse: '',
|
||||
showTextInput: true,
|
||||
};
|
||||
console.log('[AskService] Service instance created.');
|
||||
}
|
||||
|
||||
_broadcastState() {
|
||||
const askWindow = getWindowPool()?.get('ask');
|
||||
if (askWindow && !askWindow.isDestroyed()) {
|
||||
askWindow.webContents.send('ask:stateUpdate', this.state);
|
||||
}
|
||||
}
|
||||
|
||||
async toggleAskButton(inputScreenOnly = false) {
|
||||
const askWindow = getWindowPool()?.get('ask');
|
||||
|
||||
let shouldSendScreenOnly = false;
|
||||
if (inputScreenOnly && this.state.showTextInput && askWindow && askWindow.isVisible()) {
|
||||
shouldSendScreenOnly = true;
|
||||
await this.sendMessage('', []);
|
||||
return;
|
||||
}
|
||||
|
||||
const hasContent = this.state.isLoading || this.state.isStreaming || (this.state.currentResponse && this.state.currentResponse.length > 0);
|
||||
|
||||
if (askWindow && askWindow.isVisible() && hasContent) {
|
||||
this.state.showTextInput = !this.state.showTextInput;
|
||||
this._broadcastState();
|
||||
} else {
|
||||
if (askWindow && askWindow.isVisible()) {
|
||||
internalBridge.emit('window:requestVisibility', { name: 'ask', visible: false });
|
||||
this.state.isVisible = false;
|
||||
} else {
|
||||
console.log('[AskService] Showing hidden Ask window');
|
||||
internalBridge.emit('window:requestVisibility', { name: 'ask', visible: true });
|
||||
this.state.isVisible = true;
|
||||
}
|
||||
if (this.state.isVisible) {
|
||||
this.state.showTextInput = true;
|
||||
this._broadcastState();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async closeAskWindow () {
|
||||
if (this.abortController) {
|
||||
this.abortController.abort('Window closed by user');
|
||||
this.abortController = null;
|
||||
}
|
||||
|
||||
this.state = {
|
||||
isVisible : false,
|
||||
isLoading : false,
|
||||
isStreaming : false,
|
||||
currentQuestion: '',
|
||||
currentResponse: '',
|
||||
showTextInput : true,
|
||||
};
|
||||
this._broadcastState();
|
||||
|
||||
internalBridge.emit('window:requestVisibility', { name: 'ask', visible: false });
|
||||
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {string[]} conversationTexts
|
||||
* @returns {string}
|
||||
* @private
|
||||
*/
|
||||
_formatConversationForPrompt(conversationTexts) {
|
||||
if (!conversationTexts || conversationTexts.length === 0) {
|
||||
return 'No conversation history available.';
|
||||
}
|
||||
return conversationTexts.slice(-30).join('\n');
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {string} userPrompt
|
||||
* @returns {Promise<{success: boolean, response?: string, error?: string}>}
|
||||
*/
|
||||
async sendMessage(userPrompt, conversationHistoryRaw=[]) {
|
||||
internalBridge.emit('window:requestVisibility', { name: 'ask', visible: true });
|
||||
this.state = {
|
||||
...this.state,
|
||||
isLoading: true,
|
||||
isStreaming: false,
|
||||
currentQuestion: userPrompt,
|
||||
currentResponse: '',
|
||||
showTextInput: false,
|
||||
};
|
||||
this._broadcastState();
|
||||
|
||||
if (this.abortController) {
|
||||
this.abortController.abort('New request received.');
|
||||
}
|
||||
this.abortController = new AbortController();
|
||||
const { signal } = this.abortController;
|
||||
|
||||
|
||||
let sessionId;
|
||||
|
||||
try {
|
||||
console.log(`[AskService] 🤖 Processing message: ${userPrompt.substring(0, 50)}...`);
|
||||
|
||||
sessionId = await sessionRepository.getOrCreateActive('ask');
|
||||
await askRepository.addAiMessage({ sessionId, role: 'user', content: userPrompt.trim() });
|
||||
console.log(`[AskService] DB: Saved user prompt to session ${sessionId}`);
|
||||
|
||||
const modelInfo = await modelStateService.getCurrentModelInfo('llm');
|
||||
if (!modelInfo || !modelInfo.apiKey) {
|
||||
throw new Error('AI model or API key not configured.');
|
||||
}
|
||||
console.log(`[AskService] Using model: ${modelInfo.model} for provider: ${modelInfo.provider}`);
|
||||
|
||||
const screenshotResult = await captureScreenshot({ quality: 'medium' });
|
||||
const screenshotBase64 = screenshotResult.success ? screenshotResult.base64 : null;
|
||||
|
||||
const conversationHistory = this._formatConversationForPrompt(conversationHistoryRaw);
|
||||
|
||||
const systemPrompt = getSystemPrompt('pickle_glass_analysis', conversationHistory, false);
|
||||
|
||||
const messages = [
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{
|
||||
role: 'user',
|
||||
content: [
|
||||
{ type: 'text', text: `User Request: ${userPrompt.trim()}` },
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
if (screenshotBase64) {
|
||||
messages[1].content.push({
|
||||
type: 'image_url',
|
||||
image_url: { url: `data:image/jpeg;base64,${screenshotBase64}` },
|
||||
});
|
||||
}
|
||||
|
||||
const streamingLLM = createStreamingLLM(modelInfo.provider, {
|
||||
apiKey: modelInfo.apiKey,
|
||||
model: modelInfo.model,
|
||||
temperature: 0.7,
|
||||
maxTokens: 2048,
|
||||
usePortkey: modelInfo.provider === 'openai-glass',
|
||||
portkeyVirtualKey: modelInfo.provider === 'openai-glass' ? modelInfo.apiKey : undefined,
|
||||
});
|
||||
|
||||
try {
|
||||
const response = await streamingLLM.streamChat(messages);
|
||||
const askWin = getWindowPool()?.get('ask');
|
||||
|
||||
if (!askWin || askWin.isDestroyed()) {
|
||||
console.error("[AskService] Ask window is not available to send stream to.");
|
||||
response.body.getReader().cancel();
|
||||
return { success: false, error: 'Ask window is not available.' };
|
||||
}
|
||||
|
||||
const reader = response.body.getReader();
|
||||
signal.addEventListener('abort', () => {
|
||||
console.log(`[AskService] Aborting stream reader. Reason: ${signal.reason}`);
|
||||
reader.cancel(signal.reason).catch(() => { /* 이미 취소된 경우의 오류는 무시 */ });
|
||||
});
|
||||
|
||||
await this._processStream(reader, askWin, sessionId, signal);
|
||||
return { success: true };
|
||||
|
||||
} catch (multimodalError) {
|
||||
// 멀티모달 요청이 실패했고 스크린샷이 포함되어 있다면 텍스트만으로 재시도
|
||||
if (screenshotBase64 && this._isMultimodalError(multimodalError)) {
|
||||
console.log(`[AskService] Multimodal request failed, retrying with text-only: ${multimodalError.message}`);
|
||||
|
||||
// 텍스트만으로 메시지 재구성
|
||||
const textOnlyMessages = [
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{
|
||||
role: 'user',
|
||||
content: `User Request: ${userPrompt.trim()}`
|
||||
}
|
||||
];
|
||||
|
||||
const fallbackResponse = await streamingLLM.streamChat(textOnlyMessages);
|
||||
const askWin = getWindowPool()?.get('ask');
|
||||
|
||||
if (!askWin || askWin.isDestroyed()) {
|
||||
console.error("[AskService] Ask window is not available for fallback response.");
|
||||
fallbackResponse.body.getReader().cancel();
|
||||
return { success: false, error: 'Ask window is not available.' };
|
||||
}
|
||||
|
||||
const fallbackReader = fallbackResponse.body.getReader();
|
||||
signal.addEventListener('abort', () => {
|
||||
console.log(`[AskService] Aborting fallback stream reader. Reason: ${signal.reason}`);
|
||||
fallbackReader.cancel(signal.reason).catch(() => {});
|
||||
});
|
||||
|
||||
await this._processStream(fallbackReader, askWin, sessionId, signal);
|
||||
return { success: true };
|
||||
} else {
|
||||
// 다른 종류의 에러이거나 스크린샷이 없었다면 그대로 throw
|
||||
throw multimodalError;
|
||||
}
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('[AskService] Error during message processing:', error);
|
||||
this.state = {
|
||||
...this.state,
|
||||
isLoading: false,
|
||||
isStreaming: false,
|
||||
showTextInput: true,
|
||||
};
|
||||
this._broadcastState();
|
||||
|
||||
const askWin = getWindowPool()?.get('ask');
|
||||
if (askWin && !askWin.isDestroyed()) {
|
||||
const streamError = error.message || 'Unknown error occurred';
|
||||
askWin.webContents.send('ask-response-stream-error', { error: streamError });
|
||||
}
|
||||
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {ReadableStreamDefaultReader} reader
|
||||
* @param {BrowserWindow} askWin
|
||||
* @param {number} sessionId
|
||||
* @param {AbortSignal} signal
|
||||
* @returns {Promise<void>}
|
||||
* @private
|
||||
*/
|
||||
async _processStream(reader, askWin, sessionId, signal) {
|
||||
// --- Stream Processing ---
|
||||
const reader = response.body.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
let fullResponse = '';
|
||||
|
||||
try {
|
||||
this.state.isLoading = false;
|
||||
this.state.isStreaming = true;
|
||||
this._broadcastState();
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) break;
|
||||
const askWin = windowPool.get('ask');
|
||||
if (!askWin || askWin.isDestroyed()) {
|
||||
console.error("[AskService] Ask window is not available to send stream to.");
|
||||
reader.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
const chunk = decoder.decode(value);
|
||||
const lines = chunk.split('\n').filter(line => line.trim() !== '');
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) break;
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.startsWith('data: ')) {
|
||||
const data = line.substring(6);
|
||||
if (data === '[DONE]') {
|
||||
return;
|
||||
}
|
||||
const chunk = decoder.decode(value);
|
||||
const lines = chunk.split('\n').filter(line => line.trim() !== '');
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.startsWith('data: ')) {
|
||||
const data = line.substring(6);
|
||||
if (data === '[DONE]') {
|
||||
askWin.webContents.send('ask-response-stream-end');
|
||||
|
||||
// Save to DB
|
||||
try {
|
||||
const json = JSON.parse(data);
|
||||
const token = json.choices[0]?.delta?.content || '';
|
||||
if (token) {
|
||||
fullResponse += token;
|
||||
this.state.currentResponse = fullResponse;
|
||||
this._broadcastState();
|
||||
}
|
||||
} catch (error) {
|
||||
const uid = authService.getCurrentUserId();
|
||||
if (!uid) throw new Error("User not logged in, cannot save message.");
|
||||
const sessionId = await sessionRepository.getOrCreateActive(uid, 'ask');
|
||||
await askRepository.addAiMessage({ sessionId, role: 'user', content: userPrompt.trim() });
|
||||
await askRepository.addAiMessage({ sessionId, role: 'assistant', content: fullResponse });
|
||||
console.log(`[AskService] DB: Saved ask/answer pair to session ${sessionId}`);
|
||||
} catch(dbError) {
|
||||
console.error("[AskService] DB: Failed to save ask/answer pair:", dbError);
|
||||
}
|
||||
|
||||
return { success: true, response: fullResponse };
|
||||
}
|
||||
try {
|
||||
const json = JSON.parse(data);
|
||||
const token = json.choices[0]?.delta?.content || '';
|
||||
if (token) {
|
||||
fullResponse += token;
|
||||
askWin.webContents.send('ask-response-chunk', { token });
|
||||
}
|
||||
} catch (error) {
|
||||
// Ignore parsing errors for now
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (streamError) {
|
||||
if (signal.aborted) {
|
||||
console.log(`[AskService] Stream reading was intentionally cancelled. Reason: ${signal.reason}`);
|
||||
} else {
|
||||
console.error('[AskService] Error while processing stream:', streamError);
|
||||
if (askWin && !askWin.isDestroyed()) {
|
||||
askWin.webContents.send('ask-response-stream-error', { error: streamError.message });
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
this.state.isStreaming = false;
|
||||
this.state.currentResponse = fullResponse;
|
||||
this._broadcastState();
|
||||
if (fullResponse) {
|
||||
try {
|
||||
await askRepository.addAiMessage({ sessionId, role: 'assistant', content: fullResponse });
|
||||
console.log(`[AskService] DB: Saved partial or full assistant response to session ${sessionId} after stream ended.`);
|
||||
} catch(dbError) {
|
||||
console.error("[AskService] DB: Failed to save assistant response after stream ended:", dbError);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[AskService] Error processing message:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
|
||||
/**
|
||||
* 멀티모달 관련 에러인지 판단
|
||||
* @private
|
||||
*/
|
||||
_isMultimodalError(error) {
|
||||
const errorMessage = error.message?.toLowerCase() || '';
|
||||
return (
|
||||
errorMessage.includes('vision') ||
|
||||
errorMessage.includes('image') ||
|
||||
errorMessage.includes('multimodal') ||
|
||||
errorMessage.includes('unsupported') ||
|
||||
errorMessage.includes('image_url') ||
|
||||
errorMessage.includes('400') || // Bad Request often for unsupported features
|
||||
errorMessage.includes('invalid') ||
|
||||
errorMessage.includes('not supported')
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const askService = new AskService();
|
||||
function initialize() {
|
||||
ipcMain.handle('ask:sendMessage', async (event, userPrompt) => {
|
||||
return sendMessage(userPrompt);
|
||||
});
|
||||
console.log('[AskService] Initialized and ready.');
|
||||
}
|
||||
|
||||
module.exports = askService;
|
||||
module.exports = {
|
||||
initialize,
|
||||
};
|
||||
@ -1,38 +0,0 @@
|
||||
const { collection, addDoc, query, getDocs, orderBy, Timestamp } = require('firebase/firestore');
|
||||
const { getFirestoreInstance } = require('../../common/services/firebaseClient');
|
||||
const { createEncryptedConverter } = require('../../common/repositories/firestoreConverter');
|
||||
|
||||
const aiMessageConverter = createEncryptedConverter(['content']);
|
||||
|
||||
function aiMessagesCol(sessionId) {
|
||||
if (!sessionId) throw new Error("Session ID is required to access AI messages.");
|
||||
const db = getFirestoreInstance();
|
||||
return collection(db, `sessions/${sessionId}/ai_messages`).withConverter(aiMessageConverter);
|
||||
}
|
||||
|
||||
async function addAiMessage({ uid, sessionId, role, content, model = 'unknown' }) {
|
||||
const now = Timestamp.now();
|
||||
const newMessage = {
|
||||
uid, // To identify the author of the message
|
||||
session_id: sessionId,
|
||||
sent_at: now,
|
||||
role,
|
||||
content,
|
||||
model,
|
||||
created_at: now,
|
||||
};
|
||||
|
||||
const docRef = await addDoc(aiMessagesCol(sessionId), newMessage);
|
||||
return { id: docRef.id };
|
||||
}
|
||||
|
||||
async function getAllAiMessagesBySessionId(sessionId) {
|
||||
const q = query(aiMessagesCol(sessionId), orderBy('sent_at', 'asc'));
|
||||
const querySnapshot = await getDocs(q);
|
||||
return querySnapshot.docs.map(doc => doc.data());
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
addAiMessage,
|
||||
getAllAiMessagesBySessionId,
|
||||
};
|
||||
@ -1,25 +1,18 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
const firebaseRepository = require('./firebase.repository');
|
||||
const authService = require('../../common/services/authService');
|
||||
// const firebaseRepository = require('./firebase.repository'); // Future implementation
|
||||
const authService = require('../../../common/services/authService');
|
||||
|
||||
function getBaseRepository() {
|
||||
const user = authService.getCurrentUser();
|
||||
if (user && user.isLoggedIn) {
|
||||
return firebaseRepository;
|
||||
}
|
||||
function getRepository() {
|
||||
// In the future, we can check the user's login status from authService
|
||||
// const user = authService.getCurrentUser();
|
||||
// if (user.isLoggedIn) {
|
||||
// return firebaseRepository;
|
||||
// }
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
// The adapter layer that injects the UID
|
||||
const askRepositoryAdapter = {
|
||||
addAiMessage: ({ sessionId, role, content, model }) => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().addAiMessage({ uid, sessionId, role, content, model });
|
||||
},
|
||||
getAllAiMessagesBySessionId: (sessionId) => {
|
||||
// This function does not require a UID at the service level.
|
||||
return getBaseRepository().getAllAiMessagesBySessionId(sessionId);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = askRepositoryAdapter;
|
||||
// Directly export functions for ease of use, decided by the strategy
|
||||
module.exports = {
|
||||
addAiMessage: (...args) => getRepository().addAiMessage(...args),
|
||||
getAllAiMessagesBySessionId: (...args) => getRepository().getAllAiMessagesBySessionId(...args),
|
||||
};
|
||||
@ -1,7 +1,6 @@
|
||||
const sqliteClient = require('../../common/services/sqliteClient');
|
||||
const sqliteClient = require('../../../common/services/sqliteClient');
|
||||
|
||||
function addAiMessage({ uid, sessionId, role, content, model = 'unknown' }) {
|
||||
// uid is ignored in the SQLite implementation
|
||||
function addAiMessage({ sessionId, role, content, model = 'gpt-4.1' }) {
|
||||
const db = sqliteClient.getDb();
|
||||
const messageId = require('crypto').randomUUID();
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
// providers/deepgram.js
|
||||
|
||||
const { createClient, LiveTranscriptionEvents } = require('@deepgram/sdk');
|
||||
const WebSocket = require('ws');
|
||||
|
||||
/**
|
||||
* Deepgram Provider 클래스. API 키 유효성 검사를 담당합니다.
|
||||
*/
|
||||
class DeepgramProvider {
|
||||
/**
|
||||
* Deepgram API 키의 유효성을 검사합니다.
|
||||
* @param {string} key - 검사할 Deepgram API 키
|
||||
* @returns {Promise<{success: boolean, error?: string}>}
|
||||
*/
|
||||
static async validateApiKey(key) {
|
||||
if (!key || typeof key !== 'string') {
|
||||
return { success: false, error: 'Invalid Deepgram API key format.' };
|
||||
}
|
||||
try {
|
||||
// ✨ 변경점: SDK 대신 직접 fetch로 API를 호출하여 안정성 확보 (openai.js 방식)
|
||||
const response = await fetch('https://api.deepgram.com/v1/projects', {
|
||||
headers: { 'Authorization': `Token ${key}` }
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
return { success: true };
|
||||
} else {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
const message = errorData.err_msg || `Validation failed with status: ${response.status}`;
|
||||
return { success: false, error: message };
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[DeepgramProvider] Network error during key validation:`, error);
|
||||
return { success: false, error: error.message || 'A network error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function createSTT({
|
||||
apiKey,
|
||||
language = 'en-US',
|
||||
sampleRate = 24000,
|
||||
callbacks = {},
|
||||
}) {
|
||||
const qs = new URLSearchParams({
|
||||
model: 'nova-3',
|
||||
encoding: 'linear16',
|
||||
sample_rate: sampleRate.toString(),
|
||||
language,
|
||||
smart_format: 'true',
|
||||
interim_results: 'true',
|
||||
channels: '1',
|
||||
});
|
||||
|
||||
const url = `wss://api.deepgram.com/v1/listen?${qs}`;
|
||||
|
||||
const ws = new WebSocket(url, {
|
||||
headers: { Authorization: `Token ${apiKey}` },
|
||||
});
|
||||
ws.binaryType = 'arraybuffer';
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const to = setTimeout(() => {
|
||||
ws.terminate();
|
||||
reject(new Error('DG open timeout (10 s)'));
|
||||
}, 10_000);
|
||||
|
||||
ws.on('open', () => {
|
||||
clearTimeout(to);
|
||||
resolve({
|
||||
sendRealtimeInput: (buf) => ws.send(buf),
|
||||
close: () => ws.close(1000, 'client'),
|
||||
});
|
||||
});
|
||||
|
||||
ws.on('message', raw => {
|
||||
let msg;
|
||||
try { msg = JSON.parse(raw.toString()); } catch { return; }
|
||||
if (msg.channel?.alternatives?.[0]?.transcript !== undefined) {
|
||||
callbacks.onmessage?.({ provider: 'deepgram', ...msg });
|
||||
}
|
||||
});
|
||||
|
||||
ws.on('close', (code, reason) =>
|
||||
callbacks.onclose?.({ code, reason: reason.toString() })
|
||||
);
|
||||
|
||||
ws.on('error', err => {
|
||||
clearTimeout(to);
|
||||
callbacks.onerror?.(err);
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// ... (LLM 관련 Placeholder 함수들은 그대로 유지) ...
|
||||
function createLLM(opts) {
|
||||
console.warn("[Deepgram] LLM not supported.");
|
||||
return { generateContent: async () => { throw new Error("Deepgram does not support LLM functionality."); } };
|
||||
}
|
||||
function createStreamingLLM(opts) {
|
||||
console.warn("[Deepgram] Streaming LLM not supported.");
|
||||
return { streamChat: async () => { throw new Error("Deepgram does not support Streaming LLM functionality."); } };
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
DeepgramProvider,
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
};
|
||||
@ -1,328 +0,0 @@
|
||||
const { GoogleGenerativeAI } = require("@google/generative-ai")
|
||||
const { GoogleGenAI } = require("@google/genai")
|
||||
|
||||
class GeminiProvider {
|
||||
static async validateApiKey(key) {
|
||||
if (!key || typeof key !== 'string') {
|
||||
return { success: false, error: 'Invalid Gemini API key format.' };
|
||||
}
|
||||
|
||||
try {
|
||||
const validationUrl = `https://generativelanguage.googleapis.com/v1beta/models?key=${key}`;
|
||||
const response = await fetch(validationUrl);
|
||||
|
||||
if (response.ok) {
|
||||
return { success: true };
|
||||
} else {
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
const message = errorData.error?.message || `Validation failed with status: ${response.status}`;
|
||||
return { success: false, error: message };
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[GeminiProvider] Network error during key validation:`, error);
|
||||
return { success: false, error: 'A network error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a Gemini STT session
|
||||
* @param {object} opts - Configuration options
|
||||
* @param {string} opts.apiKey - Gemini API key
|
||||
* @param {string} [opts.language='en-US'] - Language code
|
||||
* @param {object} [opts.callbacks] - Event callbacks
|
||||
* @returns {Promise<object>} STT session
|
||||
*/
|
||||
async function createSTT({ apiKey, language = "en-US", callbacks = {}, ...config }) {
|
||||
const liveClient = new GoogleGenAI({ vertexai: false, apiKey })
|
||||
|
||||
// Language code BCP-47 conversion
|
||||
const lang = language.includes("-") ? language : `${language}-US`
|
||||
|
||||
const session = await liveClient.live.connect({
|
||||
|
||||
model: 'gemini-live-2.5-flash-preview',
|
||||
callbacks: {
|
||||
...callbacks,
|
||||
onMessage: (msg) => {
|
||||
if (!msg || typeof msg !== 'object') return;
|
||||
msg.provider = 'gemini';
|
||||
callbacks.onmessage?.(msg);
|
||||
}
|
||||
},
|
||||
|
||||
config: {
|
||||
inputAudioTranscription: {},
|
||||
speechConfig: { languageCode: lang },
|
||||
},
|
||||
})
|
||||
|
||||
return {
|
||||
sendRealtimeInput: async (payload) => session.sendRealtimeInput(payload),
|
||||
close: async () => session.close(),
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Gemini LLM instance with proper text response handling
|
||||
*/
|
||||
function createLLM({ apiKey, model = "gemini-2.5-flash", temperature = 0.7, maxTokens = 8192, ...config }) {
|
||||
const client = new GoogleGenerativeAI(apiKey)
|
||||
|
||||
return {
|
||||
generateContent: async (parts) => {
|
||||
const geminiModel = client.getGenerativeModel({
|
||||
model: model,
|
||||
generationConfig: {
|
||||
temperature,
|
||||
maxOutputTokens: maxTokens,
|
||||
// Ensure we get text responses, not JSON
|
||||
responseMimeType: "text/plain",
|
||||
},
|
||||
})
|
||||
|
||||
const systemPrompt = ""
|
||||
const userContent = []
|
||||
|
||||
for (const part of parts) {
|
||||
if (typeof part === "string") {
|
||||
// Don't automatically assume strings starting with "You are" are system prompts
|
||||
// Check if it's explicitly marked as a system instruction
|
||||
userContent.push(part)
|
||||
} else if (part.inlineData) {
|
||||
userContent.push({
|
||||
inlineData: {
|
||||
mimeType: part.inlineData.mimeType,
|
||||
data: part.inlineData.data,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await geminiModel.generateContent(userContent)
|
||||
const response = await result.response
|
||||
|
||||
// Return plain text, not wrapped in JSON structure
|
||||
return {
|
||||
response: {
|
||||
text: () => response.text(),
|
||||
},
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Gemini API error:", error)
|
||||
throw error
|
||||
}
|
||||
},
|
||||
|
||||
chat: async (messages) => {
|
||||
// Filter out any system prompts that might be causing JSON responses
|
||||
let systemInstruction = ""
|
||||
const history = []
|
||||
let lastMessage
|
||||
|
||||
messages.forEach((msg, index) => {
|
||||
if (msg.role === "system") {
|
||||
// Clean system instruction - avoid JSON formatting requests
|
||||
systemInstruction = msg.content
|
||||
.replace(/respond in json/gi, "")
|
||||
.replace(/format.*json/gi, "")
|
||||
.replace(/return.*json/gi, "")
|
||||
|
||||
// Add explicit instruction for natural text
|
||||
if (!systemInstruction.includes("respond naturally")) {
|
||||
systemInstruction += "\n\nRespond naturally in plain text, not in JSON or structured format."
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const role = msg.role === "user" ? "user" : "model"
|
||||
|
||||
if (index === messages.length - 1) {
|
||||
lastMessage = msg
|
||||
} else {
|
||||
history.push({ role, parts: [{ text: msg.content }] })
|
||||
}
|
||||
})
|
||||
|
||||
const geminiModel = client.getGenerativeModel({
|
||||
model: model,
|
||||
systemInstruction:
|
||||
systemInstruction ||
|
||||
"Respond naturally in plain text format. Do not use JSON or structured responses unless specifically requested.",
|
||||
generationConfig: {
|
||||
temperature: temperature,
|
||||
maxOutputTokens: maxTokens,
|
||||
// Force plain text responses
|
||||
responseMimeType: "text/plain",
|
||||
},
|
||||
})
|
||||
|
||||
const chat = geminiModel.startChat({
|
||||
history: history,
|
||||
})
|
||||
|
||||
let content = lastMessage.content
|
||||
|
||||
// Handle multimodal content
|
||||
if (Array.isArray(content)) {
|
||||
const geminiContent = []
|
||||
for (const part of content) {
|
||||
if (typeof part === "string") {
|
||||
geminiContent.push(part)
|
||||
} else if (part.type === "text") {
|
||||
geminiContent.push(part.text)
|
||||
} else if (part.type === "image_url" && part.image_url) {
|
||||
const base64Data = part.image_url.url.split(",")[1]
|
||||
geminiContent.push({
|
||||
inlineData: {
|
||||
mimeType: "image/png",
|
||||
data: base64Data,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
content = geminiContent
|
||||
}
|
||||
|
||||
const result = await chat.sendMessage(content)
|
||||
const response = await result.response
|
||||
|
||||
// Return plain text content
|
||||
return {
|
||||
content: response.text(),
|
||||
raw: result,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Gemini streaming LLM instance with text response fix
|
||||
*/
|
||||
function createStreamingLLM({ apiKey, model = "gemini-2.5-flash", temperature = 0.7, maxTokens = 8192, ...config }) {
|
||||
const client = new GoogleGenerativeAI(apiKey)
|
||||
|
||||
return {
|
||||
streamChat: async (messages) => {
|
||||
console.log("[Gemini Provider] Starting streaming request")
|
||||
|
||||
let systemInstruction = ""
|
||||
const nonSystemMessages = []
|
||||
|
||||
for (const msg of messages) {
|
||||
if (msg.role === "system") {
|
||||
// Clean and modify system instruction
|
||||
systemInstruction = msg.content
|
||||
.replace(/respond in json/gi, "")
|
||||
.replace(/format.*json/gi, "")
|
||||
.replace(/return.*json/gi, "")
|
||||
|
||||
if (!systemInstruction.includes("respond naturally")) {
|
||||
systemInstruction += "\n\nRespond naturally in plain text, not in JSON or structured format."
|
||||
}
|
||||
} else {
|
||||
nonSystemMessages.push(msg)
|
||||
}
|
||||
}
|
||||
|
||||
const geminiModel = client.getGenerativeModel({
|
||||
model: model,
|
||||
systemInstruction:
|
||||
systemInstruction ||
|
||||
"Respond naturally in plain text format. Do not use JSON or structured responses unless specifically requested.",
|
||||
generationConfig: {
|
||||
temperature,
|
||||
maxOutputTokens: maxTokens || 8192,
|
||||
// Force plain text responses
|
||||
responseMimeType: "text/plain",
|
||||
},
|
||||
})
|
||||
|
||||
const stream = new ReadableStream({
|
||||
async start(controller) {
|
||||
try {
|
||||
const lastMessage = nonSystemMessages[nonSystemMessages.length - 1]
|
||||
let geminiContent = []
|
||||
|
||||
if (Array.isArray(lastMessage.content)) {
|
||||
for (const part of lastMessage.content) {
|
||||
if (typeof part === "string") {
|
||||
geminiContent.push(part)
|
||||
} else if (part.type === "text") {
|
||||
geminiContent.push(part.text)
|
||||
} else if (part.type === "image_url" && part.image_url) {
|
||||
const base64Data = part.image_url.url.split(",")[1]
|
||||
geminiContent.push({
|
||||
inlineData: {
|
||||
mimeType: "image/png",
|
||||
data: base64Data,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
geminiContent = [lastMessage.content]
|
||||
}
|
||||
|
||||
const contentParts = geminiContent.map((part) => {
|
||||
if (typeof part === "string") {
|
||||
return { text: part }
|
||||
} else if (part.inlineData) {
|
||||
return { inlineData: part.inlineData }
|
||||
}
|
||||
return part
|
||||
})
|
||||
|
||||
const result = await geminiModel.generateContentStream({
|
||||
contents: [
|
||||
{
|
||||
role: "user",
|
||||
parts: contentParts,
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
for await (const chunk of result.stream) {
|
||||
const chunkText = chunk.text() || ""
|
||||
|
||||
// Format as SSE data - this should now be plain text
|
||||
const data = JSON.stringify({
|
||||
choices: [
|
||||
{
|
||||
delta: {
|
||||
content: chunkText,
|
||||
},
|
||||
},
|
||||
],
|
||||
})
|
||||
controller.enqueue(new TextEncoder().encode(`data: ${data}\n\n`))
|
||||
}
|
||||
|
||||
controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n"))
|
||||
controller.close()
|
||||
} catch (error) {
|
||||
console.error("[Gemini Provider] Streaming error:", error)
|
||||
controller.error(error)
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
return new Response(stream, {
|
||||
headers: {
|
||||
"Content-Type": "text/event-stream",
|
||||
"Cache-Control": "no-cache",
|
||||
Connection: "keep-alive",
|
||||
},
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
GeminiProvider,
|
||||
createSTT,
|
||||
createLLM,
|
||||
createStreamingLLM
|
||||
};
|
||||
@ -1,342 +0,0 @@
|
||||
const http = require('http');
|
||||
const fetch = require('node-fetch');
|
||||
|
||||
// Request Queue System for Ollama API (only for non-streaming requests)
|
||||
class RequestQueue {
|
||||
constructor() {
|
||||
this.queue = [];
|
||||
this.processing = false;
|
||||
this.streamingActive = false;
|
||||
}
|
||||
|
||||
async addStreamingRequest(requestFn) {
|
||||
// Streaming requests have priority - wait for current processing to finish
|
||||
while (this.processing) {
|
||||
await new Promise(resolve => setTimeout(resolve, 50));
|
||||
}
|
||||
|
||||
this.streamingActive = true;
|
||||
console.log('[Ollama Queue] Starting streaming request (priority)');
|
||||
|
||||
try {
|
||||
const result = await requestFn();
|
||||
return result;
|
||||
} finally {
|
||||
this.streamingActive = false;
|
||||
console.log('[Ollama Queue] Streaming request completed');
|
||||
}
|
||||
}
|
||||
|
||||
async add(requestFn) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.queue.push({ requestFn, resolve, reject });
|
||||
this.process();
|
||||
});
|
||||
}
|
||||
|
||||
async process() {
|
||||
if (this.processing || this.queue.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait if streaming is active
|
||||
if (this.streamingActive) {
|
||||
setTimeout(() => this.process(), 100);
|
||||
return;
|
||||
}
|
||||
|
||||
this.processing = true;
|
||||
|
||||
while (this.queue.length > 0) {
|
||||
// Check if streaming started while processing queue
|
||||
if (this.streamingActive) {
|
||||
this.processing = false;
|
||||
setTimeout(() => this.process(), 100);
|
||||
return;
|
||||
}
|
||||
|
||||
const { requestFn, resolve, reject } = this.queue.shift();
|
||||
|
||||
try {
|
||||
console.log(`[Ollama Queue] Processing queued request (${this.queue.length} remaining)`);
|
||||
const result = await requestFn();
|
||||
resolve(result);
|
||||
} catch (error) {
|
||||
console.error('[Ollama Queue] Request failed:', error);
|
||||
reject(error);
|
||||
}
|
||||
}
|
||||
|
||||
this.processing = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Global request queue instance
|
||||
const requestQueue = new RequestQueue();
|
||||
|
||||
class OllamaProvider {
|
||||
static async validateApiKey() {
|
||||
try {
|
||||
const response = await fetch('http://localhost:11434/api/tags');
|
||||
if (response.ok) {
|
||||
return { success: true };
|
||||
} else {
|
||||
return { success: false, error: 'Ollama service is not running. Please start Ollama first.' };
|
||||
}
|
||||
} catch (error) {
|
||||
return { success: false, error: 'Cannot connect to Ollama. Please ensure Ollama is installed and running.' };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function convertMessagesToOllamaFormat(messages) {
|
||||
return messages.map(msg => {
|
||||
if (Array.isArray(msg.content)) {
|
||||
let textContent = '';
|
||||
const images = [];
|
||||
|
||||
for (const part of msg.content) {
|
||||
if (part.type === 'text') {
|
||||
textContent += part.text;
|
||||
} else if (part.type === 'image_url') {
|
||||
const base64 = part.image_url.url.replace(/^data:image\/[^;]+;base64,/, '');
|
||||
images.push(base64);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
role: msg.role,
|
||||
content: textContent,
|
||||
...(images.length > 0 && { images })
|
||||
};
|
||||
} else {
|
||||
return msg;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function createLLM({
|
||||
model,
|
||||
temperature = 0.7,
|
||||
maxTokens = 2048,
|
||||
baseUrl = 'http://localhost:11434',
|
||||
...config
|
||||
}) {
|
||||
if (!model) {
|
||||
throw new Error('Model parameter is required for Ollama LLM. Please specify a model name (e.g., "llama3.2:latest", "gemma3:4b")');
|
||||
}
|
||||
return {
|
||||
generateContent: async (parts) => {
|
||||
let systemPrompt = '';
|
||||
const userContent = [];
|
||||
|
||||
for (const part of parts) {
|
||||
if (typeof part === 'string') {
|
||||
if (systemPrompt === '' && part.includes('You are')) {
|
||||
systemPrompt = part;
|
||||
} else {
|
||||
userContent.push(part);
|
||||
}
|
||||
} else if (part.inlineData) {
|
||||
userContent.push({
|
||||
type: 'image',
|
||||
image: `data:${part.inlineData.mimeType};base64,${part.inlineData.data}`
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const messages = [];
|
||||
if (systemPrompt) {
|
||||
messages.push({ role: 'system', content: systemPrompt });
|
||||
}
|
||||
messages.push({ role: 'user', content: userContent.join('\n') });
|
||||
|
||||
// Use request queue to prevent concurrent API calls
|
||||
return await requestQueue.add(async () => {
|
||||
try {
|
||||
const response = await fetch(`${baseUrl}/api/chat`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
messages,
|
||||
stream: false,
|
||||
options: {
|
||||
temperature,
|
||||
num_predict: maxTokens,
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
return {
|
||||
response: {
|
||||
text: () => result.message.content
|
||||
},
|
||||
raw: result
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Ollama LLM error:', error);
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
chat: async (messages) => {
|
||||
const ollamaMessages = convertMessagesToOllamaFormat(messages);
|
||||
|
||||
// Use request queue to prevent concurrent API calls
|
||||
return await requestQueue.add(async () => {
|
||||
try {
|
||||
const response = await fetch(`${baseUrl}/api/chat`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
messages: ollamaMessages,
|
||||
stream: false,
|
||||
options: {
|
||||
temperature,
|
||||
num_predict: maxTokens,
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
return {
|
||||
content: result.message.content,
|
||||
raw: result
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Ollama chat error:', error);
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function createStreamingLLM({
|
||||
model,
|
||||
temperature = 0.7,
|
||||
maxTokens = 2048,
|
||||
baseUrl = 'http://localhost:11434',
|
||||
...config
|
||||
}) {
|
||||
if (!model) {
|
||||
throw new Error('Model parameter is required for Ollama streaming LLM. Please specify a model name (e.g., "llama3.2:latest", "gemma3:4b")');
|
||||
}
|
||||
return {
|
||||
streamChat: async (messages) => {
|
||||
console.log('[Ollama Provider] Starting streaming request');
|
||||
|
||||
const ollamaMessages = convertMessagesToOllamaFormat(messages);
|
||||
console.log('[Ollama Provider] Converted messages for Ollama:', ollamaMessages);
|
||||
|
||||
// Streaming requests have priority over queued requests
|
||||
return await requestQueue.addStreamingRequest(async () => {
|
||||
try {
|
||||
const response = await fetch(`${baseUrl}/api/chat`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
messages: ollamaMessages,
|
||||
stream: true,
|
||||
options: {
|
||||
temperature,
|
||||
num_predict: maxTokens,
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
console.log('[Ollama Provider] Got streaming response');
|
||||
|
||||
const stream = new ReadableStream({
|
||||
async start(controller) {
|
||||
let buffer = '';
|
||||
|
||||
try {
|
||||
response.body.on('data', (chunk) => {
|
||||
buffer += chunk.toString();
|
||||
const lines = buffer.split('\n');
|
||||
buffer = lines.pop() || '';
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.trim() === '') continue;
|
||||
|
||||
try {
|
||||
const data = JSON.parse(line);
|
||||
|
||||
if (data.message?.content) {
|
||||
const sseData = JSON.stringify({
|
||||
choices: [{
|
||||
delta: {
|
||||
content: data.message.content
|
||||
}
|
||||
}]
|
||||
});
|
||||
controller.enqueue(new TextEncoder().encode(`data: ${sseData}\n\n`));
|
||||
}
|
||||
|
||||
if (data.done) {
|
||||
controller.enqueue(new TextEncoder().encode('data: [DONE]\n\n'));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[Ollama Provider] Failed to parse chunk:', e);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
response.body.on('end', () => {
|
||||
controller.close();
|
||||
console.log('[Ollama Provider] Streaming completed');
|
||||
});
|
||||
|
||||
response.body.on('error', (error) => {
|
||||
console.error('[Ollama Provider] Streaming error:', error);
|
||||
controller.error(error);
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('[Ollama Provider] Streaming setup error:', error);
|
||||
controller.error(error);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
ok: true,
|
||||
body: stream
|
||||
};
|
||||
|
||||
} catch (error) {
|
||||
console.error('[Ollama Provider] Request error:', error);
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
OllamaProvider,
|
||||
createLLM,
|
||||
createStreamingLLM,
|
||||
convertMessagesToOllamaFormat
|
||||
};
|
||||
@ -1,241 +0,0 @@
|
||||
let spawn, path, EventEmitter;
|
||||
|
||||
if (typeof window === 'undefined') {
|
||||
spawn = require('child_process').spawn;
|
||||
path = require('path');
|
||||
EventEmitter = require('events').EventEmitter;
|
||||
} else {
|
||||
class DummyEventEmitter {
|
||||
on() {}
|
||||
emit() {}
|
||||
removeAllListeners() {}
|
||||
}
|
||||
EventEmitter = DummyEventEmitter;
|
||||
}
|
||||
|
||||
class WhisperSTTSession extends EventEmitter {
|
||||
constructor(model, whisperService, sessionId) {
|
||||
super();
|
||||
this.model = model;
|
||||
this.whisperService = whisperService;
|
||||
this.sessionId = sessionId || `session_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
|
||||
this.process = null;
|
||||
this.isRunning = false;
|
||||
this.audioBuffer = Buffer.alloc(0);
|
||||
this.processingInterval = null;
|
||||
this.lastTranscription = '';
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
try {
|
||||
await this.whisperService.ensureModelAvailable(this.model);
|
||||
this.isRunning = true;
|
||||
this.startProcessingLoop();
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('[WhisperSTT] Initialization error:', error);
|
||||
this.emit('error', error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
startProcessingLoop() {
|
||||
this.processingInterval = setInterval(async () => {
|
||||
const minBufferSize = 16000 * 2 * 0.15;
|
||||
if (this.audioBuffer.length >= minBufferSize && !this.process) {
|
||||
console.log(`[WhisperSTT-${this.sessionId}] Processing audio chunk, buffer size: ${this.audioBuffer.length}`);
|
||||
await this.processAudioChunk();
|
||||
}
|
||||
}, 1500);
|
||||
}
|
||||
|
||||
async processAudioChunk() {
|
||||
if (!this.isRunning || this.audioBuffer.length === 0) return;
|
||||
|
||||
const audioData = this.audioBuffer;
|
||||
this.audioBuffer = Buffer.alloc(0);
|
||||
|
||||
try {
|
||||
const tempFile = await this.whisperService.saveAudioToTemp(audioData, this.sessionId);
|
||||
|
||||
if (!tempFile || typeof tempFile !== 'string') {
|
||||
console.error('[WhisperSTT] Invalid temp file path:', tempFile);
|
||||
return;
|
||||
}
|
||||
|
||||
const whisperPath = await this.whisperService.getWhisperPath();
|
||||
const modelPath = await this.whisperService.getModelPath(this.model);
|
||||
|
||||
if (!whisperPath || !modelPath) {
|
||||
console.error('[WhisperSTT] Invalid whisper or model path:', { whisperPath, modelPath });
|
||||
return;
|
||||
}
|
||||
|
||||
this.process = spawn(whisperPath, [
|
||||
'-m', modelPath,
|
||||
'-f', tempFile,
|
||||
'--no-timestamps',
|
||||
'--output-txt',
|
||||
'--output-json',
|
||||
'--language', 'auto',
|
||||
'--threads', '4',
|
||||
'--print-progress', 'false'
|
||||
]);
|
||||
|
||||
let output = '';
|
||||
let errorOutput = '';
|
||||
|
||||
this.process.stdout.on('data', (data) => {
|
||||
output += data.toString();
|
||||
});
|
||||
|
||||
this.process.stderr.on('data', (data) => {
|
||||
errorOutput += data.toString();
|
||||
});
|
||||
|
||||
this.process.on('close', async (code) => {
|
||||
this.process = null;
|
||||
|
||||
if (code === 0 && output.trim()) {
|
||||
const transcription = output.trim();
|
||||
if (transcription && transcription !== this.lastTranscription) {
|
||||
this.lastTranscription = transcription;
|
||||
console.log(`[WhisperSTT-${this.sessionId}] Transcription: "${transcription}"`);
|
||||
this.emit('transcription', {
|
||||
text: transcription,
|
||||
timestamp: Date.now(),
|
||||
confidence: 1.0,
|
||||
sessionId: this.sessionId
|
||||
});
|
||||
}
|
||||
} else if (errorOutput) {
|
||||
console.error(`[WhisperSTT-${this.sessionId}] Process error:`, errorOutput);
|
||||
}
|
||||
|
||||
await this.whisperService.cleanupTempFile(tempFile);
|
||||
});
|
||||
|
||||
} catch (error) {
|
||||
console.error('[WhisperSTT] Processing error:', error);
|
||||
this.emit('error', error);
|
||||
}
|
||||
}
|
||||
|
||||
sendRealtimeInput(audioData) {
|
||||
if (!this.isRunning) {
|
||||
console.warn(`[WhisperSTT-${this.sessionId}] Session not running, cannot accept audio`);
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof audioData === 'string') {
|
||||
try {
|
||||
audioData = Buffer.from(audioData, 'base64');
|
||||
} catch (error) {
|
||||
console.error('[WhisperSTT] Failed to decode base64 audio data:', error);
|
||||
return;
|
||||
}
|
||||
} else if (audioData instanceof ArrayBuffer) {
|
||||
audioData = Buffer.from(audioData);
|
||||
} else if (!Buffer.isBuffer(audioData) && !(audioData instanceof Uint8Array)) {
|
||||
console.error('[WhisperSTT] Invalid audio data type:', typeof audioData);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Buffer.isBuffer(audioData)) {
|
||||
audioData = Buffer.from(audioData);
|
||||
}
|
||||
|
||||
if (audioData.length > 0) {
|
||||
this.audioBuffer = Buffer.concat([this.audioBuffer, audioData]);
|
||||
// Log every 10th audio chunk to avoid spam
|
||||
if (Math.random() < 0.1) {
|
||||
console.log(`[WhisperSTT-${this.sessionId}] Received audio chunk: ${audioData.length} bytes, total buffer: ${this.audioBuffer.length} bytes`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async close() {
|
||||
console.log(`[WhisperSTT-${this.sessionId}] Closing session`);
|
||||
this.isRunning = false;
|
||||
|
||||
if (this.processingInterval) {
|
||||
clearInterval(this.processingInterval);
|
||||
this.processingInterval = null;
|
||||
}
|
||||
|
||||
if (this.process) {
|
||||
this.process.kill('SIGTERM');
|
||||
this.process = null;
|
||||
}
|
||||
|
||||
this.removeAllListeners();
|
||||
}
|
||||
}
|
||||
|
||||
class WhisperProvider {
|
||||
static async validateApiKey() {
|
||||
// Whisper is a local service, no API key validation needed.
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
constructor() {
|
||||
this.whisperService = null;
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
if (!this.whisperService) {
|
||||
this.whisperService = require('../../services/whisperService');
|
||||
if (!this.whisperService.isInitialized) {
|
||||
await this.whisperService.initialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async createSTT(config) {
|
||||
await this.initialize();
|
||||
|
||||
const model = config.model || 'whisper-tiny';
|
||||
const sessionType = config.sessionType || 'unknown';
|
||||
console.log(`[WhisperProvider] Creating ${sessionType} STT session with model: ${model}`);
|
||||
|
||||
// Create unique session ID based on type
|
||||
const sessionId = `${sessionType}_${Date.now()}_${Math.random().toString(36).substr(2, 6)}`;
|
||||
const session = new WhisperSTTSession(model, this.whisperService, sessionId);
|
||||
|
||||
// Log session creation
|
||||
console.log(`[WhisperProvider] Created session: ${sessionId}`);
|
||||
|
||||
const initialized = await session.initialize();
|
||||
if (!initialized) {
|
||||
throw new Error('Failed to initialize Whisper STT session');
|
||||
}
|
||||
|
||||
if (config.callbacks) {
|
||||
if (config.callbacks.onmessage) {
|
||||
session.on('transcription', config.callbacks.onmessage);
|
||||
}
|
||||
if (config.callbacks.onerror) {
|
||||
session.on('error', config.callbacks.onerror);
|
||||
}
|
||||
if (config.callbacks.onclose) {
|
||||
session.on('close', config.callbacks.onclose);
|
||||
}
|
||||
}
|
||||
|
||||
return session;
|
||||
}
|
||||
|
||||
async createLLM() {
|
||||
throw new Error('Whisper provider does not support LLM functionality');
|
||||
}
|
||||
|
||||
async createStreamingLLM() {
|
||||
console.warn('[WhisperProvider] Streaming LLM is not supported by Whisper.');
|
||||
throw new Error('Whisper does not support LLM.');
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
WhisperProvider,
|
||||
WhisperSTTSession
|
||||
};
|
||||
@ -1,54 +0,0 @@
|
||||
const DOWNLOAD_CHECKSUMS = {
|
||||
ollama: {
|
||||
dmg: {
|
||||
url: 'https://ollama.com/download/Ollama.dmg',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
},
|
||||
exe: {
|
||||
url: 'https://ollama.com/download/OllamaSetup.exe',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
},
|
||||
linux: {
|
||||
url: 'curl -fsSL https://ollama.com/install.sh | sh',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
}
|
||||
},
|
||||
whisper: {
|
||||
models: {
|
||||
'whisper-tiny': {
|
||||
url: 'https://huggingface.co/ggml-org/whisper.cpp/resolve/main/ggml-tiny.bin',
|
||||
sha256: 'be07e048e1e599ad46341c8d2a135645097a538221678b7acdd1b1919c6e1b21'
|
||||
},
|
||||
'whisper-base': {
|
||||
url: 'https://huggingface.co/ggml-org/whisper.cpp/resolve/main/ggml-base.bin',
|
||||
sha256: '60ed5bc3dd14eea856493d334349b405782ddcaf0028d4b5df4088345fba2efe'
|
||||
},
|
||||
'whisper-small': {
|
||||
url: 'https://huggingface.co/ggml-org/whisper.cpp/resolve/main/ggml-small.bin',
|
||||
sha256: '1be3a9b2063867b937e64e2ec7483364a79917e157fa98c5d94b5c1fffea987b'
|
||||
},
|
||||
'whisper-medium': {
|
||||
url: 'https://huggingface.co/ggml-org/whisper.cpp/resolve/main/ggml-medium.bin',
|
||||
sha256: '6c14d5adee5f86394037b4e4e8b59f1673b6cee10e3cf0b11bbdbee79c156208'
|
||||
}
|
||||
},
|
||||
binaries: {
|
||||
'v1.7.6': {
|
||||
mac: {
|
||||
url: 'https://github.com/ggml-org/whisper.cpp/releases/download/v1.7.6/whisper-cpp-v1.7.6-mac-x64.zip',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
},
|
||||
windows: {
|
||||
url: 'https://github.com/ggml-org/whisper.cpp/releases/download/v1.7.6/whisper-cpp-v1.7.6-win-x64.zip',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
},
|
||||
linux: {
|
||||
url: 'https://github.com/ggml-org/whisper.cpp/releases/download/v1.7.6/whisper-cpp-v1.7.6-linux-x64.tar.gz',
|
||||
sha256: null // TODO: 실제 체크섬 추가 필요 - null일 경우 체크섬 검증 스킵됨
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = { DOWNLOAD_CHECKSUMS };
|
||||
@ -1,60 +0,0 @@
|
||||
const encryptionService = require('../services/encryptionService');
|
||||
const { Timestamp } = require('firebase/firestore');
|
||||
|
||||
/**
|
||||
* Creates a Firestore converter that automatically encrypts and decrypts specified fields.
|
||||
* @param {string[]} fieldsToEncrypt - An array of field names to encrypt.
|
||||
* @returns {import('@firebase/firestore').FirestoreDataConverter<T>} A Firestore converter.
|
||||
* @template T
|
||||
*/
|
||||
function createEncryptedConverter(fieldsToEncrypt = []) {
|
||||
return {
|
||||
/**
|
||||
* @param {import('@firebase/firestore').DocumentData} appObject
|
||||
*/
|
||||
toFirestore: (appObject) => {
|
||||
const firestoreData = { ...appObject };
|
||||
for (const field of fieldsToEncrypt) {
|
||||
if (Object.prototype.hasOwnProperty.call(firestoreData, field) && firestoreData[field] != null) {
|
||||
firestoreData[field] = encryptionService.encrypt(firestoreData[field]);
|
||||
}
|
||||
}
|
||||
// Ensure there's a timestamp for the last modification
|
||||
firestoreData.updated_at = Timestamp.now();
|
||||
return firestoreData;
|
||||
},
|
||||
/**
|
||||
* @param {import('@firebase/firestore').QueryDocumentSnapshot} snapshot
|
||||
* @param {import('@firebase/firestore').SnapshotOptions} options
|
||||
*/
|
||||
fromFirestore: (snapshot, options) => {
|
||||
const firestoreData = snapshot.data(options);
|
||||
const appObject = { ...firestoreData, id: snapshot.id }; // include the document ID
|
||||
|
||||
for (const field of fieldsToEncrypt) {
|
||||
if (Object.prototype.hasOwnProperty.call(appObject, field) && appObject[field] != null) {
|
||||
try {
|
||||
appObject[field] = encryptionService.decrypt(appObject[field]);
|
||||
} catch (error) {
|
||||
console.warn(`[FirestoreConverter] Failed to decrypt field '${field}' (possibly plaintext or key mismatch):`, error.message);
|
||||
// Keep the original value instead of failing
|
||||
// appObject[field] remains as is
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Convert Firestore Timestamps back to Unix timestamps (seconds) for app-wide consistency
|
||||
for (const key in appObject) {
|
||||
if (appObject[key] instanceof Timestamp) {
|
||||
appObject[key] = appObject[key].seconds;
|
||||
}
|
||||
}
|
||||
|
||||
return appObject;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
createEncryptedConverter,
|
||||
};
|
||||
@ -1,20 +0,0 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
|
||||
// For now, we only use SQLite repository
|
||||
// In the future, we could add cloud sync support
|
||||
|
||||
function getRepository() {
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
// Export all repository methods
|
||||
module.exports = {
|
||||
getAllModels: (...args) => getRepository().getAllModels(...args),
|
||||
getModel: (...args) => getRepository().getModel(...args),
|
||||
upsertModel: (...args) => getRepository().upsertModel(...args),
|
||||
updateInstallStatus: (...args) => getRepository().updateInstallStatus(...args),
|
||||
initializeDefaultModels: (...args) => getRepository().initializeDefaultModels(...args),
|
||||
deleteModel: (...args) => getRepository().deleteModel(...args),
|
||||
getInstalledModels: (...args) => getRepository().getInstalledModels(...args),
|
||||
getInstallingModels: (...args) => getRepository().getInstallingModels(...args)
|
||||
};
|
||||
@ -1,137 +0,0 @@
|
||||
const sqliteClient = require('../../services/sqliteClient');
|
||||
|
||||
/**
|
||||
* Get all Ollama models
|
||||
*/
|
||||
function getAllModels() {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'SELECT * FROM ollama_models ORDER BY name';
|
||||
|
||||
try {
|
||||
return db.prepare(query).all() || [];
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to get models:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a specific model by name
|
||||
*/
|
||||
function getModel(name) {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'SELECT * FROM ollama_models WHERE name = ?';
|
||||
|
||||
try {
|
||||
return db.prepare(query).get(name);
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to get model:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create or update a model entry
|
||||
*/
|
||||
function upsertModel({ name, size, installed = false, installing = false }) {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = `
|
||||
INSERT INTO ollama_models (name, size, installed, installing)
|
||||
VALUES (?, ?, ?, ?)
|
||||
ON CONFLICT(name) DO UPDATE SET
|
||||
size = excluded.size,
|
||||
installed = excluded.installed,
|
||||
installing = excluded.installing
|
||||
`;
|
||||
|
||||
try {
|
||||
db.prepare(query).run(name, size, installed ? 1 : 0, installing ? 1 : 0);
|
||||
return { success: true };
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to upsert model:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update installation status for a model
|
||||
*/
|
||||
function updateInstallStatus(name, installed, installing = false) {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'UPDATE ollama_models SET installed = ?, installing = ? WHERE name = ?';
|
||||
|
||||
try {
|
||||
const result = db.prepare(query).run(installed ? 1 : 0, installing ? 1 : 0, name);
|
||||
return { success: true, changes: result.changes };
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to update install status:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize default models - now done dynamically based on installed models
|
||||
*/
|
||||
function initializeDefaultModels() {
|
||||
// Default models are now detected dynamically from Ollama installation
|
||||
// This function maintains compatibility but doesn't hardcode any models
|
||||
console.log('[OllamaModel Repository] Default models initialization skipped - using dynamic detection');
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a model entry
|
||||
*/
|
||||
function deleteModel(name) {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'DELETE FROM ollama_models WHERE name = ?';
|
||||
|
||||
try {
|
||||
const result = db.prepare(query).run(name);
|
||||
return { success: true, changes: result.changes };
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to delete model:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get installed models
|
||||
*/
|
||||
function getInstalledModels() {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'SELECT * FROM ollama_models WHERE installed = 1 ORDER BY name';
|
||||
|
||||
try {
|
||||
return db.prepare(query).all() || [];
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to get installed models:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get models currently being installed
|
||||
*/
|
||||
function getInstallingModels() {
|
||||
const db = sqliteClient.getDb();
|
||||
const query = 'SELECT * FROM ollama_models WHERE installing = 1 ORDER BY name';
|
||||
|
||||
try {
|
||||
return db.prepare(query).all() || [];
|
||||
} catch (err) {
|
||||
console.error('[OllamaModel Repository] Failed to get installing models:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getAllModels,
|
||||
getModel,
|
||||
upsertModel,
|
||||
updateInstallStatus,
|
||||
initializeDefaultModels,
|
||||
deleteModel,
|
||||
getInstalledModels,
|
||||
getInstallingModels
|
||||
};
|
||||
@ -1,18 +0,0 @@
|
||||
const sqliteClient = require('../../services/sqliteClient');
|
||||
|
||||
function markKeychainCompleted(uid) {
|
||||
return sqliteClient.query(
|
||||
'INSERT OR REPLACE INTO permissions (uid, keychain_completed) VALUES (?, 1)',
|
||||
[uid]
|
||||
);
|
||||
}
|
||||
|
||||
function checkKeychainCompleted(uid) {
|
||||
const row = sqliteClient.query('SELECT keychain_completed FROM permissions WHERE uid = ?', [uid]);
|
||||
return row.length > 0 && row[0].keychain_completed === 1;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
markKeychainCompleted,
|
||||
checkKeychainCompleted
|
||||
};
|
||||
@ -1,107 +0,0 @@
|
||||
const { collection, doc, addDoc, getDoc, getDocs, updateDoc, deleteDoc, query, where, orderBy, Timestamp } = require('firebase/firestore');
|
||||
const { getFirestoreInstance } = require('../../services/firebaseClient');
|
||||
const { createEncryptedConverter } = require('../firestoreConverter');
|
||||
const encryptionService = require('../../services/encryptionService');
|
||||
|
||||
const userPresetConverter = createEncryptedConverter(['prompt', 'title']);
|
||||
|
||||
const defaultPresetConverter = {
|
||||
toFirestore: (data) => data,
|
||||
fromFirestore: (snapshot, options) => {
|
||||
const data = snapshot.data(options);
|
||||
return { ...data, id: snapshot.id };
|
||||
}
|
||||
};
|
||||
|
||||
function userPresetsCol() {
|
||||
const db = getFirestoreInstance();
|
||||
return collection(db, 'prompt_presets').withConverter(userPresetConverter);
|
||||
}
|
||||
|
||||
function defaultPresetsCol() {
|
||||
const db = getFirestoreInstance();
|
||||
// Path must have an odd number of segments. 'v1' is a placeholder document.
|
||||
return collection(db, 'defaults/v1/prompt_presets').withConverter(defaultPresetConverter);
|
||||
}
|
||||
|
||||
async function getPresets(uid) {
|
||||
const userPresetsQuery = query(userPresetsCol(), where('uid', '==', uid));
|
||||
const defaultPresetsQuery = query(defaultPresetsCol()); // Defaults have no owner
|
||||
|
||||
const [userSnapshot, defaultSnapshot] = await Promise.all([
|
||||
getDocs(userPresetsQuery),
|
||||
getDocs(defaultPresetsQuery)
|
||||
]);
|
||||
|
||||
const presets = [
|
||||
...defaultSnapshot.docs.map(d => d.data()),
|
||||
...userSnapshot.docs.map(d => d.data())
|
||||
];
|
||||
|
||||
return presets.sort((a, b) => {
|
||||
if (a.is_default && !b.is_default) return -1;
|
||||
if (!a.is_default && b.is_default) return 1;
|
||||
return a.title.localeCompare(b.title);
|
||||
});
|
||||
}
|
||||
|
||||
async function getPresetTemplates() {
|
||||
const q = query(defaultPresetsCol(), orderBy('title', 'asc'));
|
||||
const snapshot = await getDocs(q);
|
||||
return snapshot.docs.map(doc => doc.data());
|
||||
}
|
||||
|
||||
async function create({ uid, title, prompt }) {
|
||||
const now = Timestamp.now();
|
||||
const newPreset = {
|
||||
uid: uid,
|
||||
title,
|
||||
prompt,
|
||||
is_default: 0,
|
||||
created_at: now,
|
||||
};
|
||||
const docRef = await addDoc(userPresetsCol(), newPreset);
|
||||
return { id: docRef.id };
|
||||
}
|
||||
|
||||
async function update(id, { title, prompt }, uid) {
|
||||
const docRef = doc(userPresetsCol(), id);
|
||||
const docSnap = await getDoc(docRef);
|
||||
|
||||
if (!docSnap.exists() || docSnap.data().uid !== uid || docSnap.data().is_default) {
|
||||
throw new Error("Preset not found or permission denied to update.");
|
||||
}
|
||||
|
||||
// Encrypt sensitive fields before sending to Firestore because `updateDoc` bypasses converters.
|
||||
const updates = {};
|
||||
if (title !== undefined) {
|
||||
updates.title = encryptionService.encrypt(title);
|
||||
}
|
||||
if (prompt !== undefined) {
|
||||
updates.prompt = encryptionService.encrypt(prompt);
|
||||
}
|
||||
updates.updated_at = Timestamp.now();
|
||||
|
||||
await updateDoc(docRef, updates);
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function del(id, uid) {
|
||||
const docRef = doc(userPresetsCol(), id);
|
||||
const docSnap = await getDoc(docRef);
|
||||
|
||||
if (!docSnap.exists() || docSnap.data().uid !== uid || docSnap.data().is_default) {
|
||||
throw new Error("Preset not found or permission denied to delete.");
|
||||
}
|
||||
|
||||
await deleteDoc(docRef);
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getPresets,
|
||||
getPresetTemplates,
|
||||
create,
|
||||
update,
|
||||
delete: del,
|
||||
};
|
||||
@ -1,39 +0,0 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
const firebaseRepository = require('./firebase.repository');
|
||||
const authService = require('../../services/authService');
|
||||
|
||||
function getBaseRepository() {
|
||||
const user = authService.getCurrentUser();
|
||||
if (user && user.isLoggedIn) {
|
||||
return firebaseRepository;
|
||||
}
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
const presetRepositoryAdapter = {
|
||||
getPresets: () => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().getPresets(uid);
|
||||
},
|
||||
|
||||
getPresetTemplates: () => {
|
||||
return getBaseRepository().getPresetTemplates();
|
||||
},
|
||||
|
||||
create: (options) => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().create({ uid, ...options });
|
||||
},
|
||||
|
||||
update: (id, options) => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().update(id, options, uid);
|
||||
},
|
||||
|
||||
delete: (id) => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().delete(id, uid);
|
||||
},
|
||||
};
|
||||
|
||||
module.exports = presetRepositoryAdapter;
|
||||
@ -1,68 +0,0 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
|
||||
function getBaseRepository() {
|
||||
// For now, we only have sqlite. This could be expanded later.
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
const providerSettingsRepositoryAdapter = {
|
||||
// Core CRUD operations
|
||||
async getByProvider(provider) {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.getByProvider(provider);
|
||||
},
|
||||
|
||||
async getAll() {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.getAll();
|
||||
},
|
||||
|
||||
async upsert(provider, settings) {
|
||||
const repo = getBaseRepository();
|
||||
const now = Date.now();
|
||||
|
||||
const settingsWithMeta = {
|
||||
...settings,
|
||||
provider,
|
||||
updated_at: now,
|
||||
created_at: settings.created_at || now
|
||||
};
|
||||
|
||||
return await repo.upsert(provider, settingsWithMeta);
|
||||
},
|
||||
|
||||
async remove(provider) {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.remove(provider);
|
||||
},
|
||||
|
||||
async removeAll() {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.removeAll();
|
||||
},
|
||||
|
||||
async getRawApiKeys() {
|
||||
// This function should always target the local sqlite DB,
|
||||
// as it's part of the local-first boot sequence.
|
||||
return await sqliteRepository.getRawApiKeys();
|
||||
},
|
||||
|
||||
async getActiveProvider(type) {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.getActiveProvider(type);
|
||||
},
|
||||
|
||||
async setActiveProvider(provider, type) {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.setActiveProvider(provider, type);
|
||||
},
|
||||
|
||||
async getActiveSettings() {
|
||||
const repo = getBaseRepository();
|
||||
return await repo.getActiveSettings();
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
...providerSettingsRepositoryAdapter
|
||||
};
|
||||
@ -1,160 +0,0 @@
|
||||
const sqliteClient = require('../../services/sqliteClient');
|
||||
const encryptionService = require('../../services/encryptionService');
|
||||
|
||||
function getByProvider(provider) {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('SELECT * FROM provider_settings WHERE provider = ?');
|
||||
const result = stmt.get(provider) || null;
|
||||
|
||||
if (result && result.api_key && encryptionService.looksEncrypted(result.api_key)) {
|
||||
result.api_key = encryptionService.decrypt(result.api_key);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function getAll() {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('SELECT * FROM provider_settings ORDER BY provider');
|
||||
const results = stmt.all();
|
||||
|
||||
return results.map(result => {
|
||||
if (result.api_key && encryptionService.looksEncrypted(result.api_key)) {
|
||||
result.api_key = encryptionService.decrypt(result.api_key);
|
||||
}
|
||||
return result;
|
||||
});
|
||||
}
|
||||
|
||||
function upsert(provider, settings) {
|
||||
// Validate: prevent direct setting of active status
|
||||
if (settings.is_active_llm || settings.is_active_stt) {
|
||||
console.warn('[ProviderSettings] Warning: is_active_llm/is_active_stt should not be set directly. Use setActiveProvider() instead.');
|
||||
}
|
||||
|
||||
const db = sqliteClient.getDb();
|
||||
|
||||
// Use SQLite's UPSERT syntax (INSERT ... ON CONFLICT ... DO UPDATE)
|
||||
const stmt = db.prepare(`
|
||||
INSERT INTO provider_settings (provider, api_key, selected_llm_model, selected_stt_model, is_active_llm, is_active_stt, created_at, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT(provider) DO UPDATE SET
|
||||
api_key = excluded.api_key,
|
||||
selected_llm_model = excluded.selected_llm_model,
|
||||
selected_stt_model = excluded.selected_stt_model,
|
||||
-- is_active_llm and is_active_stt are NOT updated here
|
||||
-- Use setActiveProvider() to change active status
|
||||
updated_at = excluded.updated_at
|
||||
`);
|
||||
|
||||
const result = stmt.run(
|
||||
provider,
|
||||
settings.api_key || null,
|
||||
settings.selected_llm_model || null,
|
||||
settings.selected_stt_model || null,
|
||||
0, // is_active_llm - always 0, use setActiveProvider to activate
|
||||
0, // is_active_stt - always 0, use setActiveProvider to activate
|
||||
settings.created_at || Date.now(),
|
||||
settings.updated_at
|
||||
);
|
||||
|
||||
return { changes: result.changes };
|
||||
}
|
||||
|
||||
function remove(provider) {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('DELETE FROM provider_settings WHERE provider = ?');
|
||||
const result = stmt.run(provider);
|
||||
return { changes: result.changes };
|
||||
}
|
||||
|
||||
function removeAll() {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('DELETE FROM provider_settings');
|
||||
const result = stmt.run();
|
||||
return { changes: result.changes };
|
||||
}
|
||||
|
||||
function getRawApiKeys() {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare('SELECT api_key FROM provider_settings');
|
||||
return stmt.all();
|
||||
}
|
||||
|
||||
// Get active provider for a specific type (llm or stt)
|
||||
function getActiveProvider(type) {
|
||||
const db = sqliteClient.getDb();
|
||||
const column = type === 'llm' ? 'is_active_llm' : 'is_active_stt';
|
||||
const stmt = db.prepare(`SELECT * FROM provider_settings WHERE ${column} = 1`);
|
||||
const result = stmt.get() || null;
|
||||
|
||||
if (result && result.api_key && encryptionService.looksEncrypted(result.api_key)) {
|
||||
result.api_key = encryptionService.decrypt(result.api_key);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// Set active provider for a specific type
|
||||
function setActiveProvider(provider, type) {
|
||||
const db = sqliteClient.getDb();
|
||||
const column = type === 'llm' ? 'is_active_llm' : 'is_active_stt';
|
||||
|
||||
// Start transaction to ensure only one provider is active
|
||||
db.transaction(() => {
|
||||
// First, deactivate all providers for this type
|
||||
const deactivateStmt = db.prepare(`UPDATE provider_settings SET ${column} = 0`);
|
||||
deactivateStmt.run();
|
||||
|
||||
// Then activate the specified provider
|
||||
if (provider) {
|
||||
const activateStmt = db.prepare(`UPDATE provider_settings SET ${column} = 1 WHERE provider = ?`);
|
||||
activateStmt.run(provider);
|
||||
}
|
||||
})();
|
||||
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
// Get all active settings (both llm and stt)
|
||||
function getActiveSettings() {
|
||||
const db = sqliteClient.getDb();
|
||||
const stmt = db.prepare(`
|
||||
SELECT * FROM provider_settings
|
||||
WHERE (is_active_llm = 1 OR is_active_stt = 1)
|
||||
ORDER BY provider
|
||||
`);
|
||||
const results = stmt.all();
|
||||
|
||||
// Decrypt API keys and organize by type
|
||||
const activeSettings = {
|
||||
llm: null,
|
||||
stt: null
|
||||
};
|
||||
|
||||
results.forEach(result => {
|
||||
if (result.api_key && encryptionService.looksEncrypted(result.api_key)) {
|
||||
result.api_key = encryptionService.decrypt(result.api_key);
|
||||
}
|
||||
if (result.is_active_llm) {
|
||||
activeSettings.llm = result;
|
||||
}
|
||||
if (result.is_active_stt) {
|
||||
activeSettings.stt = result;
|
||||
}
|
||||
});
|
||||
|
||||
return activeSettings;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getByProvider,
|
||||
getAll,
|
||||
upsert,
|
||||
remove,
|
||||
removeAll,
|
||||
getRawApiKeys,
|
||||
getActiveProvider,
|
||||
setActiveProvider,
|
||||
getActiveSettings
|
||||
};
|
||||
@ -1,161 +0,0 @@
|
||||
const { doc, getDoc, collection, addDoc, query, where, getDocs, writeBatch, orderBy, limit, updateDoc, Timestamp } = require('firebase/firestore');
|
||||
const { getFirestoreInstance } = require('../../services/firebaseClient');
|
||||
const { createEncryptedConverter } = require('../firestoreConverter');
|
||||
const encryptionService = require('../../services/encryptionService');
|
||||
|
||||
const sessionConverter = createEncryptedConverter(['title']);
|
||||
|
||||
function sessionsCol() {
|
||||
const db = getFirestoreInstance();
|
||||
return collection(db, 'sessions').withConverter(sessionConverter);
|
||||
}
|
||||
|
||||
// Sub-collection references are now built from the top-level
|
||||
function subCollections(sessionId) {
|
||||
const db = getFirestoreInstance();
|
||||
const sessionPath = `sessions/${sessionId}`;
|
||||
return {
|
||||
transcripts: collection(db, `${sessionPath}/transcripts`),
|
||||
ai_messages: collection(db, `${sessionPath}/ai_messages`),
|
||||
summary: collection(db, `${sessionPath}/summary`),
|
||||
}
|
||||
}
|
||||
|
||||
async function getById(id) {
|
||||
const docRef = doc(sessionsCol(), id);
|
||||
const docSnap = await getDoc(docRef);
|
||||
return docSnap.exists() ? docSnap.data() : null;
|
||||
}
|
||||
|
||||
async function create(uid, type = 'ask') {
|
||||
const now = Timestamp.now();
|
||||
const newSession = {
|
||||
uid: uid,
|
||||
members: [uid], // For future sharing functionality
|
||||
title: `Session @ ${new Date().toLocaleTimeString()}`,
|
||||
session_type: type,
|
||||
started_at: now,
|
||||
updated_at: now,
|
||||
ended_at: null,
|
||||
};
|
||||
const docRef = await addDoc(sessionsCol(), newSession);
|
||||
console.log(`Firebase: Created session ${docRef.id} for user ${uid}`);
|
||||
return docRef.id;
|
||||
}
|
||||
|
||||
async function getAllByUserId(uid) {
|
||||
const q = query(sessionsCol(), where('members', 'array-contains', uid), orderBy('started_at', 'desc'));
|
||||
const querySnapshot = await getDocs(q);
|
||||
return querySnapshot.docs.map(doc => doc.data());
|
||||
}
|
||||
|
||||
async function updateTitle(id, title) {
|
||||
const docRef = doc(sessionsCol(), id);
|
||||
await updateDoc(docRef, {
|
||||
title: encryptionService.encrypt(title),
|
||||
updated_at: Timestamp.now()
|
||||
});
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function deleteWithRelatedData(id) {
|
||||
const db = getFirestoreInstance();
|
||||
const batch = writeBatch(db);
|
||||
|
||||
const { transcripts, ai_messages, summary } = subCollections(id);
|
||||
const [transcriptsSnap, aiMessagesSnap, summarySnap] = await Promise.all([
|
||||
getDocs(query(transcripts)),
|
||||
getDocs(query(ai_messages)),
|
||||
getDocs(query(summary)),
|
||||
]);
|
||||
|
||||
transcriptsSnap.forEach(d => batch.delete(d.ref));
|
||||
aiMessagesSnap.forEach(d => batch.delete(d.ref));
|
||||
summarySnap.forEach(d => batch.delete(d.ref));
|
||||
|
||||
const sessionRef = doc(sessionsCol(), id);
|
||||
batch.delete(sessionRef);
|
||||
|
||||
await batch.commit();
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
async function end(id) {
|
||||
const docRef = doc(sessionsCol(), id);
|
||||
await updateDoc(docRef, { ended_at: Timestamp.now() });
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function updateType(id, type) {
|
||||
const docRef = doc(sessionsCol(), id);
|
||||
await updateDoc(docRef, { session_type: type });
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function touch(id) {
|
||||
const docRef = doc(sessionsCol(), id);
|
||||
await updateDoc(docRef, { updated_at: Timestamp.now() });
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function getOrCreateActive(uid, requestedType = 'ask') {
|
||||
const findQuery = query(
|
||||
sessionsCol(),
|
||||
where('uid', '==', uid),
|
||||
where('ended_at', '==', null),
|
||||
orderBy('session_type', 'desc'),
|
||||
limit(1)
|
||||
);
|
||||
|
||||
const activeSessionSnap = await getDocs(findQuery);
|
||||
|
||||
if (!activeSessionSnap.empty) {
|
||||
const activeSessionDoc = activeSessionSnap.docs[0];
|
||||
const sessionRef = doc(sessionsCol(), activeSessionDoc.id);
|
||||
const activeSession = activeSessionDoc.data();
|
||||
|
||||
console.log(`[Repo] Found active Firebase session ${activeSession.id}`);
|
||||
|
||||
const updates = { updated_at: Timestamp.now() };
|
||||
if (activeSession.session_type === 'ask' && requestedType === 'listen') {
|
||||
updates.session_type = 'listen';
|
||||
console.log(`[Repo] Promoted Firebase session ${activeSession.id} to 'listen' type.`);
|
||||
}
|
||||
|
||||
await updateDoc(sessionRef, updates);
|
||||
return activeSessionDoc.id;
|
||||
} else {
|
||||
console.log(`[Repo] No active Firebase session for user ${uid}. Creating new.`);
|
||||
return create(uid, requestedType);
|
||||
}
|
||||
}
|
||||
|
||||
async function endAllActiveSessions(uid) {
|
||||
const q = query(sessionsCol(), where('uid', '==', uid), where('ended_at', '==', null));
|
||||
const snapshot = await getDocs(q);
|
||||
|
||||
if (snapshot.empty) return { changes: 0 };
|
||||
|
||||
const batch = writeBatch(getFirestoreInstance());
|
||||
const now = Timestamp.now();
|
||||
snapshot.forEach(d => {
|
||||
batch.update(d.ref, { ended_at: now });
|
||||
});
|
||||
await batch.commit();
|
||||
|
||||
console.log(`[Repo] Ended ${snapshot.size} active session(s) for user ${uid}.`);
|
||||
return { changes: snapshot.size };
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getById,
|
||||
create,
|
||||
getAllByUserId,
|
||||
updateTitle,
|
||||
deleteWithRelatedData,
|
||||
end,
|
||||
updateType,
|
||||
touch,
|
||||
getOrCreateActive,
|
||||
endAllActiveSessions,
|
||||
};
|
||||
@ -1,60 +0,0 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
const firebaseRepository = require('./firebase.repository');
|
||||
|
||||
let authService = null;
|
||||
|
||||
function setAuthService(service) {
|
||||
authService = service;
|
||||
}
|
||||
|
||||
function getBaseRepository() {
|
||||
if (!authService) {
|
||||
// Fallback or error if authService is not set, to prevent crashes.
|
||||
// During initial load, it might not be set, so we default to sqlite.
|
||||
return sqliteRepository;
|
||||
}
|
||||
const user = authService.getCurrentUser();
|
||||
if (user && user.isLoggedIn) {
|
||||
return firebaseRepository;
|
||||
}
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
// The adapter layer that injects the UID
|
||||
const sessionRepositoryAdapter = {
|
||||
setAuthService, // Expose the setter
|
||||
|
||||
getById: (id) => getBaseRepository().getById(id),
|
||||
|
||||
create: (type = 'ask') => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().create(uid, type);
|
||||
},
|
||||
|
||||
getAllByUserId: () => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().getAllByUserId(uid);
|
||||
},
|
||||
|
||||
updateTitle: (id, title) => getBaseRepository().updateTitle(id, title),
|
||||
|
||||
deleteWithRelatedData: (id) => getBaseRepository().deleteWithRelatedData(id),
|
||||
|
||||
end: (id) => getBaseRepository().end(id),
|
||||
|
||||
updateType: (id, type) => getBaseRepository().updateType(id, type),
|
||||
|
||||
touch: (id) => getBaseRepository().touch(id),
|
||||
|
||||
getOrCreateActive: (requestedType = 'ask') => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().getOrCreateActive(uid, requestedType);
|
||||
},
|
||||
|
||||
endAllActiveSessions: () => {
|
||||
const uid = authService.getCurrentUserId();
|
||||
return getBaseRepository().endAllActiveSessions(uid);
|
||||
},
|
||||
};
|
||||
|
||||
module.exports = sessionRepositoryAdapter;
|
||||
@ -1,86 +0,0 @@
|
||||
const { doc, getDoc, setDoc, deleteDoc, writeBatch, query, where, getDocs, collection, Timestamp } = require('firebase/firestore');
|
||||
const { getFirestoreInstance } = require('../../services/firebaseClient');
|
||||
const { createEncryptedConverter } = require('../firestoreConverter');
|
||||
const encryptionService = require('../../services/encryptionService');
|
||||
|
||||
const userConverter = createEncryptedConverter([]);
|
||||
|
||||
function usersCol() {
|
||||
const db = getFirestoreInstance();
|
||||
return collection(db, 'users').withConverter(userConverter);
|
||||
}
|
||||
|
||||
// These functions are mostly correct as they already operate on a top-level collection.
|
||||
// We just need to ensure the signatures are consistent.
|
||||
|
||||
async function findOrCreate(user) {
|
||||
if (!user || !user.uid) throw new Error('User object and uid are required');
|
||||
const { uid, displayName, email } = user;
|
||||
const now = Timestamp.now();
|
||||
const docRef = doc(usersCol(), uid);
|
||||
const docSnap = await getDoc(docRef);
|
||||
|
||||
if (docSnap.exists()) {
|
||||
await setDoc(docRef, {
|
||||
display_name: displayName || docSnap.data().display_name || 'User',
|
||||
email: email || docSnap.data().email || 'no-email@example.com'
|
||||
}, { merge: true });
|
||||
} else {
|
||||
await setDoc(docRef, { uid, display_name: displayName || 'User', email: email || 'no-email@example.com', created_at: now });
|
||||
}
|
||||
const finalDoc = await getDoc(docRef);
|
||||
return finalDoc.data();
|
||||
}
|
||||
|
||||
async function getById(uid) {
|
||||
const docRef = doc(usersCol(), uid);
|
||||
const docSnap = await getDoc(docRef);
|
||||
return docSnap.exists() ? docSnap.data() : null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
async function update({ uid, displayName }) {
|
||||
const docRef = doc(usersCol(), uid);
|
||||
await setDoc(docRef, { display_name: displayName }, { merge: true });
|
||||
return { changes: 1 };
|
||||
}
|
||||
|
||||
async function deleteById(uid) {
|
||||
const db = getFirestoreInstance();
|
||||
const batch = writeBatch(db);
|
||||
|
||||
// 1. Delete all sessions owned by the user
|
||||
const sessionsQuery = query(collection(db, 'sessions'), where('uid', '==', uid));
|
||||
const sessionsSnapshot = await getDocs(sessionsQuery);
|
||||
|
||||
for (const sessionDoc of sessionsSnapshot.docs) {
|
||||
// Recursively delete sub-collections
|
||||
const subcollectionsToDelete = ['transcripts', 'ai_messages', 'summary'];
|
||||
for (const sub of subcollectionsToDelete) {
|
||||
const subColPath = `sessions/${sessionDoc.id}/${sub}`;
|
||||
const subSnapshot = await getDocs(query(collection(db, subColPath)));
|
||||
subSnapshot.forEach(d => batch.delete(d.ref));
|
||||
}
|
||||
batch.delete(sessionDoc.ref);
|
||||
}
|
||||
|
||||
// 2. Delete all presets owned by the user
|
||||
const presetsQuery = query(collection(db, 'prompt_presets'), where('uid', '==', uid));
|
||||
const presetsSnapshot = await getDocs(presetsQuery);
|
||||
presetsSnapshot.forEach(doc => batch.delete(doc.ref));
|
||||
|
||||
// 3. Delete the user document itself
|
||||
const userRef = doc(usersCol(), uid);
|
||||
batch.delete(userRef);
|
||||
|
||||
await batch.commit();
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
findOrCreate,
|
||||
getById,
|
||||
update,
|
||||
deleteById,
|
||||
};
|
||||
@ -1,51 +0,0 @@
|
||||
const sqliteRepository = require('./sqlite.repository');
|
||||
const firebaseRepository = require('./firebase.repository');
|
||||
|
||||
let authService = null;
|
||||
|
||||
function getAuthService() {
|
||||
if (!authService) {
|
||||
authService = require('../../services/authService');
|
||||
}
|
||||
return authService;
|
||||
}
|
||||
|
||||
function getBaseRepository() {
|
||||
const service = getAuthService();
|
||||
if (!service) {
|
||||
throw new Error('AuthService could not be loaded for the user repository.');
|
||||
}
|
||||
const user = service.getCurrentUser();
|
||||
if (user && user.isLoggedIn) {
|
||||
return firebaseRepository;
|
||||
}
|
||||
return sqliteRepository;
|
||||
}
|
||||
|
||||
const userRepositoryAdapter = {
|
||||
findOrCreate: (user) => {
|
||||
// This function receives the full user object, which includes the uid. No need to inject.
|
||||
return getBaseRepository().findOrCreate(user);
|
||||
},
|
||||
|
||||
getById: () => {
|
||||
const uid = getAuthService().getCurrentUserId();
|
||||
return getBaseRepository().getById(uid);
|
||||
},
|
||||
|
||||
|
||||
|
||||
update: (updateData) => {
|
||||
const uid = getAuthService().getCurrentUserId();
|
||||
return getBaseRepository().update({ uid, ...updateData });
|
||||
},
|
||||
|
||||
deleteById: () => {
|
||||
const uid = getAuthService().getCurrentUserId();
|
||||
return getBaseRepository().deleteById(uid);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
...userRepositoryAdapter
|
||||
};
|
||||
@ -1,53 +0,0 @@
|
||||
const BaseModelRepository = require('../baseModel');
|
||||
|
||||
class WhisperModelRepository extends BaseModelRepository {
|
||||
constructor(db, tableName = 'whisper_models') {
|
||||
super(db, tableName);
|
||||
}
|
||||
|
||||
async initializeModels(availableModels) {
|
||||
const existingModels = await this.getAll();
|
||||
const existingIds = new Set(existingModels.map(m => m.id));
|
||||
|
||||
for (const [modelId, modelInfo] of Object.entries(availableModels)) {
|
||||
if (!existingIds.has(modelId)) {
|
||||
await this.create({
|
||||
id: modelId,
|
||||
name: modelInfo.name,
|
||||
size: modelInfo.size,
|
||||
installed: 0,
|
||||
installing: 0
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async getInstalledModels() {
|
||||
return this.findAll({ installed: 1 });
|
||||
}
|
||||
|
||||
async setInstalled(modelId, installed = true) {
|
||||
return this.update({ id: modelId }, {
|
||||
installed: installed ? 1 : 0,
|
||||
installing: 0
|
||||
});
|
||||
}
|
||||
|
||||
async setInstalling(modelId, installing = true) {
|
||||
return this.update({ id: modelId }, {
|
||||
installing: installing ? 1 : 0
|
||||
});
|
||||
}
|
||||
|
||||
async isInstalled(modelId) {
|
||||
const model = await this.findOne({ id: modelId });
|
||||
return model && model.installed === 1;
|
||||
}
|
||||
|
||||
async isInstalling(modelId) {
|
||||
const model = await this.findOne({ id: modelId });
|
||||
return model && model.installing === 1;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = WhisperModelRepository;
|
||||
@ -1,211 +0,0 @@
|
||||
const { onAuthStateChanged, signInWithCustomToken, signOut } = require('firebase/auth');
|
||||
const { BrowserWindow, shell } = require('electron');
|
||||
const { getFirebaseAuth } = require('./firebaseClient');
|
||||
const fetch = require('node-fetch');
|
||||
const encryptionService = require('./encryptionService');
|
||||
const migrationService = require('./migrationService');
|
||||
const sessionRepository = require('../repositories/session');
|
||||
const providerSettingsRepository = require('../repositories/providerSettings');
|
||||
const permissionService = require('./permissionService');
|
||||
|
||||
async function getVirtualKeyByEmail(email, idToken) {
|
||||
if (!idToken) {
|
||||
throw new Error('Firebase ID token is required for virtual key request');
|
||||
}
|
||||
|
||||
const resp = await fetch('https://serverless-api-sf3o.vercel.app/api/virtual_key', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${idToken}`,
|
||||
},
|
||||
body: JSON.stringify({ email: email.trim().toLowerCase() }),
|
||||
redirect: 'follow',
|
||||
});
|
||||
|
||||
const json = await resp.json().catch(() => ({}));
|
||||
if (!resp.ok) {
|
||||
console.error('[VK] API request failed:', json.message || 'Unknown error');
|
||||
throw new Error(json.message || `HTTP ${resp.status}: Virtual key request failed`);
|
||||
}
|
||||
|
||||
const vKey = json?.data?.virtualKey || json?.data?.virtual_key || json?.data?.newVKey?.slug;
|
||||
|
||||
if (!vKey) throw new Error('virtual key missing in response');
|
||||
return vKey;
|
||||
}
|
||||
|
||||
class AuthService {
|
||||
constructor() {
|
||||
this.currentUserId = 'default_user';
|
||||
this.currentUserMode = 'local'; // 'local' or 'firebase'
|
||||
this.currentUser = null;
|
||||
this.isInitialized = false;
|
||||
|
||||
// This ensures the key is ready before any login/logout state change.
|
||||
this.initializationPromise = null;
|
||||
|
||||
sessionRepository.setAuthService(this);
|
||||
}
|
||||
|
||||
initialize() {
|
||||
if (this.isInitialized) return this.initializationPromise;
|
||||
|
||||
this.initializationPromise = new Promise((resolve) => {
|
||||
const auth = getFirebaseAuth();
|
||||
onAuthStateChanged(auth, async (user) => {
|
||||
const previousUser = this.currentUser;
|
||||
|
||||
if (user) {
|
||||
// User signed IN
|
||||
console.log(`[AuthService] Firebase user signed in:`, user.uid);
|
||||
this.currentUser = user;
|
||||
this.currentUserId = user.uid;
|
||||
this.currentUserMode = 'firebase';
|
||||
|
||||
// Clean up any zombie sessions from a previous run for this user.
|
||||
await sessionRepository.endAllActiveSessions();
|
||||
|
||||
// ** Initialize encryption key for the logged-in user if permissions are already granted **
|
||||
if (process.platform === 'darwin' && !(await permissionService.checkKeychainCompleted(this.currentUserId))) {
|
||||
console.warn('[AuthService] Keychain permission not yet completed for this user. Deferring key initialization.');
|
||||
} else {
|
||||
await encryptionService.initializeKey(user.uid);
|
||||
}
|
||||
|
||||
// ** Check for and run data migration for the user **
|
||||
// No 'await' here, so it runs in the background without blocking startup.
|
||||
migrationService.checkAndRunMigration(user);
|
||||
|
||||
// ***** CRITICAL: Wait for the virtual key and model state update to complete *****
|
||||
try {
|
||||
const idToken = await user.getIdToken(true);
|
||||
const virtualKey = await getVirtualKeyByEmail(user.email, idToken);
|
||||
|
||||
if (global.modelStateService) {
|
||||
// The model state service now writes directly to the DB, no in-memory state.
|
||||
await global.modelStateService.setFirebaseVirtualKey(virtualKey);
|
||||
}
|
||||
console.log(`[AuthService] Virtual key for ${user.email} has been processed and state updated.`);
|
||||
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Failed to fetch or save virtual key:', error);
|
||||
// This is not critical enough to halt the login, but we should log it.
|
||||
}
|
||||
|
||||
} else {
|
||||
// User signed OUT
|
||||
console.log(`[AuthService] No Firebase user.`);
|
||||
if (previousUser) {
|
||||
console.log(`[AuthService] Clearing API key for logged-out user: ${previousUser.uid}`);
|
||||
if (global.modelStateService) {
|
||||
// The model state service now writes directly to the DB.
|
||||
await global.modelStateService.setFirebaseVirtualKey(null);
|
||||
}
|
||||
}
|
||||
this.currentUser = null;
|
||||
this.currentUserId = 'default_user';
|
||||
this.currentUserMode = 'local';
|
||||
|
||||
// End active sessions for the local/default user as well.
|
||||
await sessionRepository.endAllActiveSessions();
|
||||
|
||||
encryptionService.resetSessionKey();
|
||||
}
|
||||
this.broadcastUserState();
|
||||
|
||||
if (!this.isInitialized) {
|
||||
this.isInitialized = true;
|
||||
console.log('[AuthService] Initialized and resolved initialization promise.');
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
return this.initializationPromise;
|
||||
}
|
||||
|
||||
async startFirebaseAuthFlow() {
|
||||
try {
|
||||
const webUrl = process.env.pickleglass_WEB_URL || 'http://localhost:3000';
|
||||
const authUrl = `${webUrl}/login?mode=electron`;
|
||||
console.log(`[AuthService] Opening Firebase auth URL in browser: ${authUrl}`);
|
||||
await shell.openExternal(authUrl);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Failed to open Firebase auth URL:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async signInWithCustomToken(token) {
|
||||
const auth = getFirebaseAuth();
|
||||
try {
|
||||
const userCredential = await signInWithCustomToken(auth, token);
|
||||
console.log(`[AuthService] Successfully signed in with custom token for user:`, userCredential.user.uid);
|
||||
// onAuthStateChanged will handle the state update and broadcast
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Error signing in with custom token:', error);
|
||||
throw error; // Re-throw to be handled by the caller
|
||||
}
|
||||
}
|
||||
|
||||
async signOut() {
|
||||
const auth = getFirebaseAuth();
|
||||
try {
|
||||
// End all active sessions for the current user BEFORE signing out.
|
||||
await sessionRepository.endAllActiveSessions();
|
||||
|
||||
await signOut(auth);
|
||||
console.log('[AuthService] User sign-out initiated successfully.');
|
||||
// onAuthStateChanged will handle the state update and broadcast,
|
||||
// which will also re-evaluate the API key status.
|
||||
} catch (error) {
|
||||
console.error('[AuthService] Error signing out:', error);
|
||||
}
|
||||
}
|
||||
|
||||
broadcastUserState() {
|
||||
const userState = this.getCurrentUser();
|
||||
console.log('[AuthService] Broadcasting user state change:', userState);
|
||||
BrowserWindow.getAllWindows().forEach(win => {
|
||||
if (win && !win.isDestroyed() && win.webContents && !win.webContents.isDestroyed()) {
|
||||
win.webContents.send('user-state-changed', userState);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
getCurrentUserId() {
|
||||
return this.currentUserId;
|
||||
}
|
||||
|
||||
getCurrentUser() {
|
||||
const isLoggedIn = !!(this.currentUserMode === 'firebase' && this.currentUser);
|
||||
|
||||
if (isLoggedIn) {
|
||||
return {
|
||||
uid: this.currentUser.uid,
|
||||
email: this.currentUser.email,
|
||||
displayName: this.currentUser.displayName,
|
||||
mode: 'firebase',
|
||||
isLoggedIn: true,
|
||||
//////// before_modelStateService ////////
|
||||
// hasApiKey: this.hasApiKey // Always true for firebase users, but good practice
|
||||
//////// before_modelStateService ////////
|
||||
};
|
||||
}
|
||||
return {
|
||||
uid: this.currentUserId, // returns 'default_user'
|
||||
email: 'contact@pickle.com',
|
||||
displayName: 'Default User',
|
||||
mode: 'local',
|
||||
isLoggedIn: false,
|
||||
//////// before_modelStateService ////////
|
||||
// hasApiKey: this.hasApiKey
|
||||
//////// before_modelStateService ////////
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
const authService = new AuthService();
|
||||
module.exports = authService;
|
||||
@ -1,175 +0,0 @@
|
||||
const crypto = require('crypto');
|
||||
let keytar;
|
||||
|
||||
// Dynamically import keytar, as it's an optional dependency.
|
||||
try {
|
||||
keytar = require('keytar');
|
||||
} catch (error) {
|
||||
console.warn('[EncryptionService] keytar is not available. Will use in-memory key for this session. Restarting the app might be required for data persistence after login.');
|
||||
keytar = null;
|
||||
}
|
||||
|
||||
const permissionService = require('./permissionService');
|
||||
|
||||
const SERVICE_NAME = 'com.pickle.glass'; // A unique identifier for the app in the keychain
|
||||
let sessionKey = null; // In-memory fallback key
|
||||
|
||||
const ALGORITHM = 'aes-256-gcm';
|
||||
const IV_LENGTH = 16; // For AES, this is always 16
|
||||
const AUTH_TAG_LENGTH = 16;
|
||||
|
||||
|
||||
/**
|
||||
* Initializes the encryption key for a given user.
|
||||
* It first tries to get the key from the OS keychain.
|
||||
* If that fails, it generates a new key.
|
||||
* If keytar is available, it saves the new key.
|
||||
* Otherwise, it uses an in-memory key for the session.
|
||||
*
|
||||
* @param {string} userId - The unique identifier for the user (e.g., Firebase UID).
|
||||
*/
|
||||
async function initializeKey(userId) {
|
||||
if (!userId) {
|
||||
throw new Error('A user ID must be provided to initialize the encryption key.');
|
||||
}
|
||||
|
||||
let keyRetrieved = false;
|
||||
|
||||
if (keytar) {
|
||||
try {
|
||||
let key = await keytar.getPassword(SERVICE_NAME, userId);
|
||||
if (!key) {
|
||||
console.log(`[EncryptionService] No key found for ${userId}. Creating a new one.`);
|
||||
key = crypto.randomBytes(32).toString('hex');
|
||||
await keytar.setPassword(SERVICE_NAME, userId, key);
|
||||
console.log(`[EncryptionService] New key securely stored in keychain for ${userId}.`);
|
||||
} else {
|
||||
console.log(`[EncryptionService] Encryption key successfully retrieved from keychain for ${userId}.`);
|
||||
keyRetrieved = true;
|
||||
}
|
||||
sessionKey = key;
|
||||
} catch (error) {
|
||||
console.error('[EncryptionService] keytar failed. Falling back to in-memory key for this session.', error);
|
||||
keytar = null; // Disable keytar for the rest of the session to avoid repeated errors
|
||||
sessionKey = crypto.randomBytes(32).toString('hex');
|
||||
}
|
||||
} else {
|
||||
// keytar is not available
|
||||
if (!sessionKey) {
|
||||
console.warn('[EncryptionService] Using in-memory session key. Data will not persist across restarts without keytar.');
|
||||
sessionKey = crypto.randomBytes(32).toString('hex');
|
||||
}
|
||||
}
|
||||
|
||||
// Mark keychain completed in permissions DB if this is the first successful retrieval or storage
|
||||
try {
|
||||
await permissionService.markKeychainCompleted(userId);
|
||||
if (keyRetrieved) {
|
||||
console.log(`[EncryptionService] Keychain completion marked in DB for ${userId}.`);
|
||||
}
|
||||
} catch (permErr) {
|
||||
console.error('[EncryptionService] Failed to mark keychain completion:', permErr);
|
||||
}
|
||||
|
||||
if (!sessionKey) {
|
||||
throw new Error('Failed to initialize encryption key.');
|
||||
}
|
||||
}
|
||||
|
||||
function resetSessionKey() {
|
||||
sessionKey = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Encrypts a given text using AES-256-GCM.
|
||||
* @param {string} text The text to encrypt.
|
||||
* @returns {string | null} The encrypted data, as a base64 string containing iv, authTag, and content, or the original value if it cannot be encrypted.
|
||||
*/
|
||||
function encrypt(text) {
|
||||
if (!sessionKey) {
|
||||
console.error('[EncryptionService] Encryption key is not initialized. Cannot encrypt.');
|
||||
return text; // Return original if key is missing
|
||||
}
|
||||
if (text == null) { // checks for null or undefined
|
||||
return text;
|
||||
}
|
||||
|
||||
try {
|
||||
const key = Buffer.from(sessionKey, 'hex');
|
||||
const iv = crypto.randomBytes(IV_LENGTH);
|
||||
const cipher = crypto.createCipheriv(ALGORITHM, key, iv);
|
||||
|
||||
let encrypted = cipher.update(String(text), 'utf8', 'hex');
|
||||
encrypted += cipher.final('hex');
|
||||
|
||||
const authTag = cipher.getAuthTag();
|
||||
|
||||
// Prepend IV and AuthTag to the encrypted content, then encode as base64.
|
||||
return Buffer.concat([iv, authTag, Buffer.from(encrypted, 'hex')]).toString('base64');
|
||||
} catch (error) {
|
||||
console.error('[EncryptionService] Encryption failed:', error);
|
||||
return text; // Return original on error
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Decrypts a given encrypted string.
|
||||
* @param {string} encryptedText The base64 encrypted text.
|
||||
* @returns {string | null} The decrypted text, or the original value if it cannot be decrypted.
|
||||
*/
|
||||
function decrypt(encryptedText) {
|
||||
if (!sessionKey) {
|
||||
console.error('[EncryptionService] Encryption key is not initialized. Cannot decrypt.');
|
||||
return encryptedText; // Return original if key is missing
|
||||
}
|
||||
if (encryptedText == null || typeof encryptedText !== 'string') {
|
||||
return encryptedText;
|
||||
}
|
||||
|
||||
try {
|
||||
const data = Buffer.from(encryptedText, 'base64');
|
||||
if (data.length < IV_LENGTH + AUTH_TAG_LENGTH) {
|
||||
// This is not a valid encrypted string, likely plain text.
|
||||
return encryptedText;
|
||||
}
|
||||
|
||||
const key = Buffer.from(sessionKey, 'hex');
|
||||
const iv = data.slice(0, IV_LENGTH);
|
||||
const authTag = data.slice(IV_LENGTH, IV_LENGTH + AUTH_TAG_LENGTH);
|
||||
const encryptedContent = data.slice(IV_LENGTH + AUTH_TAG_LENGTH);
|
||||
|
||||
const decipher = crypto.createDecipheriv(ALGORITHM, key, iv);
|
||||
decipher.setAuthTag(authTag);
|
||||
|
||||
let decrypted = decipher.update(encryptedContent, 'hex', 'utf8');
|
||||
decrypted += decipher.final('utf8');
|
||||
|
||||
return decrypted;
|
||||
} catch (error) {
|
||||
// It's common for this to fail if the data is not encrypted (e.g., legacy data).
|
||||
// In that case, we return the original value.
|
||||
console.error('[EncryptionService] Decryption failed:', error);
|
||||
return encryptedText;
|
||||
}
|
||||
}
|
||||
|
||||
function looksEncrypted(str) {
|
||||
if (!str || typeof str !== 'string') return false;
|
||||
// Base64 chars + optional '=' padding
|
||||
if (!/^[A-Za-z0-9+/]+={0,2}$/.test(str)) return false;
|
||||
try {
|
||||
const buf = Buffer.from(str, 'base64');
|
||||
// Our AES-GCM cipher text must be at least 32 bytes (IV 16 + TAG 16)
|
||||
return buf.length >= 32;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
initializeKey,
|
||||
resetSessionKey,
|
||||
encrypt,
|
||||
decrypt,
|
||||
looksEncrypted,
|
||||
};
|
||||
@ -1,639 +0,0 @@
|
||||
const { EventEmitter } = require('events');
|
||||
const ollamaService = require('./ollamaService');
|
||||
const whisperService = require('./whisperService');
|
||||
|
||||
|
||||
//Central manager for managing Ollama and Whisper services
|
||||
class LocalAIManager extends EventEmitter {
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
// service map
|
||||
this.services = {
|
||||
ollama: ollamaService,
|
||||
whisper: whisperService
|
||||
};
|
||||
|
||||
// unified state management
|
||||
this.state = {
|
||||
ollama: {
|
||||
installed: false,
|
||||
running: false,
|
||||
models: []
|
||||
},
|
||||
whisper: {
|
||||
installed: false,
|
||||
initialized: false,
|
||||
models: []
|
||||
}
|
||||
};
|
||||
|
||||
// setup event listeners
|
||||
this.setupEventListeners();
|
||||
}
|
||||
|
||||
|
||||
// subscribe to events from each service and re-emit as unified events
|
||||
setupEventListeners() {
|
||||
// ollama events
|
||||
ollamaService.on('install-progress', (data) => {
|
||||
this.emit('install-progress', 'ollama', data);
|
||||
});
|
||||
|
||||
ollamaService.on('installation-complete', () => {
|
||||
this.emit('installation-complete', 'ollama');
|
||||
this.updateServiceState('ollama');
|
||||
});
|
||||
|
||||
ollamaService.on('error', (error) => {
|
||||
this.emit('error', { service: 'ollama', ...error });
|
||||
});
|
||||
|
||||
ollamaService.on('model-pull-complete', (data) => {
|
||||
this.emit('model-ready', { service: 'ollama', ...data });
|
||||
this.updateServiceState('ollama');
|
||||
});
|
||||
|
||||
ollamaService.on('state-changed', (state) => {
|
||||
this.emit('state-changed', 'ollama', state);
|
||||
});
|
||||
|
||||
// Whisper 이벤트
|
||||
whisperService.on('install-progress', (data) => {
|
||||
this.emit('install-progress', 'whisper', data);
|
||||
});
|
||||
|
||||
whisperService.on('installation-complete', () => {
|
||||
this.emit('installation-complete', 'whisper');
|
||||
this.updateServiceState('whisper');
|
||||
});
|
||||
|
||||
whisperService.on('error', (error) => {
|
||||
this.emit('error', { service: 'whisper', ...error });
|
||||
});
|
||||
|
||||
whisperService.on('model-download-complete', (data) => {
|
||||
this.emit('model-ready', { service: 'whisper', ...data });
|
||||
this.updateServiceState('whisper');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 서비스 설치
|
||||
*/
|
||||
async installService(serviceName, options = {}) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
try {
|
||||
if (serviceName === 'ollama') {
|
||||
return await service.handleInstall();
|
||||
} else if (serviceName === 'whisper') {
|
||||
// Whisper는 자동 설치
|
||||
await service.initialize();
|
||||
return { success: true };
|
||||
}
|
||||
} catch (error) {
|
||||
this.emit('error', {
|
||||
service: serviceName,
|
||||
errorType: 'installation-failed',
|
||||
error: error.message
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 서비스 상태 조회
|
||||
*/
|
||||
async getServiceStatus(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
if (serviceName === 'ollama') {
|
||||
return await service.getStatus();
|
||||
} else if (serviceName === 'whisper') {
|
||||
const installed = await service.isInstalled();
|
||||
const running = await service.isServiceRunning();
|
||||
const models = await service.getInstalledModels();
|
||||
return {
|
||||
success: true,
|
||||
installed,
|
||||
running,
|
||||
models
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 서비스 시작
|
||||
*/
|
||||
async startService(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
const result = await service.startService();
|
||||
await this.updateServiceState(serviceName);
|
||||
return { success: result };
|
||||
}
|
||||
|
||||
/**
|
||||
* 서비스 중지
|
||||
*/
|
||||
async stopService(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
let result;
|
||||
if (serviceName === 'ollama') {
|
||||
result = await service.shutdown(false);
|
||||
} else if (serviceName === 'whisper') {
|
||||
result = await service.stopService();
|
||||
}
|
||||
|
||||
// 서비스 중지 후 상태 업데이트
|
||||
await this.updateServiceState(serviceName);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 모델 설치/다운로드
|
||||
*/
|
||||
async installModel(serviceName, modelId, options = {}) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
if (serviceName === 'ollama') {
|
||||
return await service.pullModel(modelId);
|
||||
} else if (serviceName === 'whisper') {
|
||||
return await service.downloadModel(modelId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 설치된 모델 목록 조회
|
||||
*/
|
||||
async getInstalledModels(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
if (serviceName === 'ollama') {
|
||||
return await service.getAllModelsWithStatus();
|
||||
} else if (serviceName === 'whisper') {
|
||||
return await service.getInstalledModels();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 모델 워밍업 (Ollama 전용)
|
||||
*/
|
||||
async warmUpModel(modelName, forceRefresh = false) {
|
||||
return await ollamaService.warmUpModel(modelName, forceRefresh);
|
||||
}
|
||||
|
||||
/**
|
||||
* 자동 워밍업 (Ollama 전용)
|
||||
*/
|
||||
async autoWarmUp() {
|
||||
return await ollamaService.autoWarmUpSelectedModel();
|
||||
}
|
||||
|
||||
/**
|
||||
* 진단 실행
|
||||
*/
|
||||
async runDiagnostics(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
const diagnostics = {
|
||||
service: serviceName,
|
||||
timestamp: new Date().toISOString(),
|
||||
checks: {}
|
||||
};
|
||||
|
||||
try {
|
||||
// 1. 설치 상태 확인
|
||||
diagnostics.checks.installation = {
|
||||
check: 'Installation',
|
||||
status: await service.isInstalled() ? 'pass' : 'fail',
|
||||
details: {}
|
||||
};
|
||||
|
||||
// 2. 서비스 실행 상태
|
||||
diagnostics.checks.running = {
|
||||
check: 'Service Running',
|
||||
status: await service.isServiceRunning() ? 'pass' : 'fail',
|
||||
details: {}
|
||||
};
|
||||
|
||||
// 3. 포트 연결 테스트 및 상세 health check (Ollama)
|
||||
if (serviceName === 'ollama') {
|
||||
try {
|
||||
// Use comprehensive health check
|
||||
const health = await service.healthCheck();
|
||||
diagnostics.checks.health = {
|
||||
check: 'Service Health',
|
||||
status: health.healthy ? 'pass' : 'fail',
|
||||
details: health
|
||||
};
|
||||
|
||||
// Legacy port check for compatibility
|
||||
diagnostics.checks.port = {
|
||||
check: 'Port Connectivity',
|
||||
status: health.checks.apiResponsive ? 'pass' : 'fail',
|
||||
details: { connected: health.checks.apiResponsive }
|
||||
};
|
||||
} catch (error) {
|
||||
diagnostics.checks.health = {
|
||||
check: 'Service Health',
|
||||
status: 'fail',
|
||||
details: { error: error.message }
|
||||
};
|
||||
diagnostics.checks.port = {
|
||||
check: 'Port Connectivity',
|
||||
status: 'fail',
|
||||
details: { error: error.message }
|
||||
};
|
||||
}
|
||||
|
||||
// 4. 모델 목록
|
||||
if (diagnostics.checks.running.status === 'pass') {
|
||||
try {
|
||||
const models = await service.getInstalledModels();
|
||||
diagnostics.checks.models = {
|
||||
check: 'Installed Models',
|
||||
status: 'pass',
|
||||
details: { count: models.length, models: models.map(m => m.name) }
|
||||
};
|
||||
|
||||
// 5. 워밍업 상태
|
||||
const warmupStatus = await service.getWarmUpStatus();
|
||||
diagnostics.checks.warmup = {
|
||||
check: 'Model Warm-up',
|
||||
status: 'pass',
|
||||
details: warmupStatus
|
||||
};
|
||||
} catch (error) {
|
||||
diagnostics.checks.models = {
|
||||
check: 'Installed Models',
|
||||
status: 'fail',
|
||||
details: { error: error.message }
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Whisper 특화 진단
|
||||
if (serviceName === 'whisper') {
|
||||
// 바이너리 확인
|
||||
diagnostics.checks.binary = {
|
||||
check: 'Whisper Binary',
|
||||
status: service.whisperPath ? 'pass' : 'fail',
|
||||
details: { path: service.whisperPath }
|
||||
};
|
||||
|
||||
// 모델 디렉토리
|
||||
diagnostics.checks.modelDir = {
|
||||
check: 'Model Directory',
|
||||
status: service.modelsDir ? 'pass' : 'fail',
|
||||
details: { path: service.modelsDir }
|
||||
};
|
||||
}
|
||||
|
||||
// 전체 진단 결과
|
||||
const allChecks = Object.values(diagnostics.checks);
|
||||
diagnostics.summary = {
|
||||
total: allChecks.length,
|
||||
passed: allChecks.filter(c => c.status === 'pass').length,
|
||||
failed: allChecks.filter(c => c.status === 'fail').length,
|
||||
overallStatus: allChecks.every(c => c.status === 'pass') ? 'healthy' : 'unhealthy'
|
||||
};
|
||||
|
||||
} catch (error) {
|
||||
diagnostics.error = error.message;
|
||||
diagnostics.summary = {
|
||||
overallStatus: 'error'
|
||||
};
|
||||
}
|
||||
|
||||
return diagnostics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 서비스 복구
|
||||
*/
|
||||
async repairService(serviceName) {
|
||||
const service = this.services[serviceName];
|
||||
if (!service) {
|
||||
throw new Error(`Unknown service: ${serviceName}`);
|
||||
}
|
||||
|
||||
console.log(`[LocalAIManager] Starting repair for ${serviceName}...`);
|
||||
const repairLog = [];
|
||||
|
||||
try {
|
||||
// 1. 진단 실행
|
||||
repairLog.push('Running diagnostics...');
|
||||
const diagnostics = await this.runDiagnostics(serviceName);
|
||||
|
||||
if (diagnostics.summary.overallStatus === 'healthy') {
|
||||
repairLog.push('Service is already healthy, no repair needed');
|
||||
return {
|
||||
success: true,
|
||||
repairLog,
|
||||
diagnostics
|
||||
};
|
||||
}
|
||||
|
||||
// 2. 설치 문제 해결
|
||||
if (diagnostics.checks.installation?.status === 'fail') {
|
||||
repairLog.push('Installation missing, attempting to install...');
|
||||
try {
|
||||
await this.installService(serviceName);
|
||||
repairLog.push('Installation completed');
|
||||
} catch (error) {
|
||||
repairLog.push(`Installation failed: ${error.message}`);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 서비스 재시작
|
||||
if (diagnostics.checks.running?.status === 'fail') {
|
||||
repairLog.push('Service not running, attempting to start...');
|
||||
|
||||
// 종료 시도
|
||||
try {
|
||||
await this.stopService(serviceName);
|
||||
repairLog.push('Stopped existing service');
|
||||
} catch (error) {
|
||||
repairLog.push('Service was not running');
|
||||
}
|
||||
|
||||
// 잠시 대기
|
||||
await new Promise(resolve => setTimeout(resolve, 2000));
|
||||
|
||||
// 시작
|
||||
try {
|
||||
await this.startService(serviceName);
|
||||
repairLog.push('Service started successfully');
|
||||
} catch (error) {
|
||||
repairLog.push(`Failed to start service: ${error.message}`);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// 4. 포트 문제 해결 (Ollama)
|
||||
if (serviceName === 'ollama' && diagnostics.checks.port?.status === 'fail') {
|
||||
repairLog.push('Port connectivity issue detected');
|
||||
|
||||
// 프로세스 강제 종료
|
||||
if (process.platform === 'darwin') {
|
||||
try {
|
||||
const { exec } = require('child_process');
|
||||
const { promisify } = require('util');
|
||||
const execAsync = promisify(exec);
|
||||
await execAsync('pkill -f ollama');
|
||||
repairLog.push('Killed stale Ollama processes');
|
||||
} catch (error) {
|
||||
repairLog.push('No stale processes found');
|
||||
}
|
||||
}
|
||||
else if (process.platform === 'win32') {
|
||||
try {
|
||||
const { exec } = require('child_process');
|
||||
const { promisify } = require('util');
|
||||
const execAsync = promisify(exec);
|
||||
await execAsync('taskkill /F /IM ollama.exe');
|
||||
repairLog.push('Killed stale Ollama processes');
|
||||
} catch (error) {
|
||||
repairLog.push('No stale processes found');
|
||||
}
|
||||
}
|
||||
else if (process.platform === 'linux') {
|
||||
try {
|
||||
const { exec } = require('child_process');
|
||||
const { promisify } = require('util');
|
||||
const execAsync = promisify(exec);
|
||||
await execAsync('pkill -f ollama');
|
||||
repairLog.push('Killed stale Ollama processes');
|
||||
} catch (error) {
|
||||
repairLog.push('No stale processes found');
|
||||
}
|
||||
}
|
||||
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
|
||||
// 재시작
|
||||
await this.startService(serviceName);
|
||||
repairLog.push('Restarted service after port cleanup');
|
||||
}
|
||||
|
||||
// 5. Whisper 특화 복구
|
||||
if (serviceName === 'whisper') {
|
||||
// 세션 정리
|
||||
if (diagnostics.checks.running?.status === 'pass') {
|
||||
repairLog.push('Cleaning up Whisper sessions...');
|
||||
await service.cleanup();
|
||||
repairLog.push('Sessions cleaned up');
|
||||
}
|
||||
|
||||
// 초기화
|
||||
if (!service.installState.isInitialized) {
|
||||
repairLog.push('Re-initializing Whisper...');
|
||||
await service.initialize();
|
||||
repairLog.push('Whisper re-initialized');
|
||||
}
|
||||
}
|
||||
|
||||
// 6. 최종 상태 확인
|
||||
repairLog.push('Verifying repair...');
|
||||
const finalDiagnostics = await this.runDiagnostics(serviceName);
|
||||
|
||||
const success = finalDiagnostics.summary.overallStatus === 'healthy';
|
||||
repairLog.push(success ? 'Repair successful!' : 'Repair failed - manual intervention may be required');
|
||||
|
||||
// 성공 시 상태 업데이트
|
||||
if (success) {
|
||||
await this.updateServiceState(serviceName);
|
||||
}
|
||||
|
||||
return {
|
||||
success,
|
||||
repairLog,
|
||||
diagnostics: finalDiagnostics
|
||||
};
|
||||
|
||||
} catch (error) {
|
||||
repairLog.push(`Repair error: ${error.message}`);
|
||||
return {
|
||||
success: false,
|
||||
repairLog,
|
||||
error: error.message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 상태 업데이트
|
||||
*/
|
||||
async updateServiceState(serviceName) {
|
||||
try {
|
||||
const status = await this.getServiceStatus(serviceName);
|
||||
this.state[serviceName] = status;
|
||||
|
||||
// 상태 변경 이벤트 발행
|
||||
this.emit('state-changed', serviceName, status);
|
||||
} catch (error) {
|
||||
console.error(`[LocalAIManager] Failed to update ${serviceName} state:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 전체 상태 조회
|
||||
*/
|
||||
async getAllServiceStates() {
|
||||
const states = {};
|
||||
|
||||
for (const serviceName of Object.keys(this.services)) {
|
||||
try {
|
||||
states[serviceName] = await this.getServiceStatus(serviceName);
|
||||
} catch (error) {
|
||||
states[serviceName] = {
|
||||
success: false,
|
||||
error: error.message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return states;
|
||||
}
|
||||
|
||||
/**
|
||||
* 주기적 상태 동기화 시작
|
||||
*/
|
||||
startPeriodicSync(interval = 30000) {
|
||||
if (this.syncInterval) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.syncInterval = setInterval(async () => {
|
||||
for (const serviceName of Object.keys(this.services)) {
|
||||
await this.updateServiceState(serviceName);
|
||||
}
|
||||
}, interval);
|
||||
|
||||
// 각 서비스의 주기적 동기화도 시작
|
||||
ollamaService.startPeriodicSync();
|
||||
}
|
||||
|
||||
/**
|
||||
* 주기적 상태 동기화 중지
|
||||
*/
|
||||
stopPeriodicSync() {
|
||||
if (this.syncInterval) {
|
||||
clearInterval(this.syncInterval);
|
||||
this.syncInterval = null;
|
||||
}
|
||||
|
||||
// 각 서비스의 주기적 동기화도 중지
|
||||
ollamaService.stopPeriodicSync();
|
||||
}
|
||||
|
||||
/**
|
||||
* 전체 종료
|
||||
*/
|
||||
async shutdown() {
|
||||
this.stopPeriodicSync();
|
||||
|
||||
const results = {};
|
||||
for (const [serviceName, service] of Object.entries(this.services)) {
|
||||
try {
|
||||
if (serviceName === 'ollama') {
|
||||
results[serviceName] = await service.shutdown(false);
|
||||
} else if (serviceName === 'whisper') {
|
||||
await service.cleanup();
|
||||
results[serviceName] = true;
|
||||
}
|
||||
} catch (error) {
|
||||
results[serviceName] = false;
|
||||
console.error(`[LocalAIManager] Failed to shutdown ${serviceName}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
/**
|
||||
* 에러 처리
|
||||
*/
|
||||
async handleError(serviceName, errorType, details = {}) {
|
||||
console.error(`[LocalAIManager] Error in ${serviceName}: ${errorType}`, details);
|
||||
|
||||
// 서비스별 에러 처리
|
||||
switch(errorType) {
|
||||
case 'installation-failed':
|
||||
// 설치 실패 시 이벤트 발생
|
||||
this.emit('error-occurred', {
|
||||
service: serviceName,
|
||||
errorType,
|
||||
error: details.error || 'Installation failed',
|
||||
canRetry: true
|
||||
});
|
||||
break;
|
||||
|
||||
case 'model-pull-failed':
|
||||
case 'model-download-failed':
|
||||
// 모델 다운로드 실패
|
||||
this.emit('error-occurred', {
|
||||
service: serviceName,
|
||||
errorType,
|
||||
model: details.model,
|
||||
error: details.error || 'Model download failed',
|
||||
canRetry: true
|
||||
});
|
||||
break;
|
||||
|
||||
case 'service-not-responding':
|
||||
// 서비스 반응 없음
|
||||
console.log(`[LocalAIManager] Attempting to repair ${serviceName}...`);
|
||||
const repairResult = await this.repairService(serviceName);
|
||||
|
||||
this.emit('error-occurred', {
|
||||
service: serviceName,
|
||||
errorType,
|
||||
error: details.error || 'Service not responding',
|
||||
repairAttempted: true,
|
||||
repairSuccessful: repairResult.success
|
||||
});
|
||||
break;
|
||||
|
||||
default:
|
||||
// 기타 에러
|
||||
this.emit('error-occurred', {
|
||||
service: serviceName,
|
||||
errorType,
|
||||
error: details.error || `Unknown error: ${errorType}`,
|
||||
canRetry: false
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 싱글톤
|
||||
const localAIManager = new LocalAIManager();
|
||||
module.exports = localAIManager;
|
||||
@ -1,192 +0,0 @@
|
||||
const { doc, writeBatch, Timestamp } = require('firebase/firestore');
|
||||
const { getFirestoreInstance } = require('../services/firebaseClient');
|
||||
const encryptionService = require('../services/encryptionService');
|
||||
|
||||
const sqliteSessionRepo = require('../repositories/session/sqlite.repository');
|
||||
const sqlitePresetRepo = require('../repositories/preset/sqlite.repository');
|
||||
const sqliteUserRepo = require('../repositories/user/sqlite.repository');
|
||||
const sqliteSttRepo = require('../../listen/stt/repositories/sqlite.repository');
|
||||
const sqliteSummaryRepo = require('../../listen/summary/repositories/sqlite.repository');
|
||||
const sqliteAiMessageRepo = require('../../ask/repositories/sqlite.repository');
|
||||
|
||||
const MAX_BATCH_OPERATIONS = 500;
|
||||
|
||||
async function checkAndRunMigration(firebaseUser) {
|
||||
if (!firebaseUser || !firebaseUser.uid) {
|
||||
console.log('[Migration] No user, skipping migration check.');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`[Migration] Checking for user ${firebaseUser.uid}...`);
|
||||
|
||||
const localUser = sqliteUserRepo.getById(firebaseUser.uid);
|
||||
if (!localUser || localUser.has_migrated_to_firebase) {
|
||||
console.log(`[Migration] User ${firebaseUser.uid} is not eligible or already migrated.`);
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`[Migration] Starting data migration for user ${firebaseUser.uid}...`);
|
||||
|
||||
try {
|
||||
const db = getFirestoreInstance();
|
||||
|
||||
// --- Phase 1: Migrate Parent Documents (Presets & Sessions) ---
|
||||
console.log('[Migration Phase 1] Migrating parent documents...');
|
||||
let phase1Batch = writeBatch(db);
|
||||
let phase1OpCount = 0;
|
||||
const phase1Promises = [];
|
||||
|
||||
const localPresets = (await sqlitePresetRepo.getPresets(firebaseUser.uid)).filter(p => !p.is_default);
|
||||
console.log(`[Migration Phase 1] Found ${localPresets.length} custom presets.`);
|
||||
for (const preset of localPresets) {
|
||||
const presetRef = doc(db, 'prompt_presets', preset.id);
|
||||
const cleanPreset = {
|
||||
uid: preset.uid,
|
||||
title: encryptionService.encrypt(preset.title ?? ''),
|
||||
prompt: encryptionService.encrypt(preset.prompt ?? ''),
|
||||
is_default: preset.is_default ?? 0,
|
||||
created_at: preset.created_at ? Timestamp.fromMillis(preset.created_at * 1000) : null,
|
||||
updated_at: preset.updated_at ? Timestamp.fromMillis(preset.updated_at * 1000) : null
|
||||
};
|
||||
phase1Batch.set(presetRef, cleanPreset);
|
||||
phase1OpCount++;
|
||||
if (phase1OpCount >= MAX_BATCH_OPERATIONS) {
|
||||
phase1Promises.push(phase1Batch.commit());
|
||||
phase1Batch = writeBatch(db);
|
||||
phase1OpCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
const localSessions = await sqliteSessionRepo.getAllByUserId(firebaseUser.uid);
|
||||
console.log(`[Migration Phase 1] Found ${localSessions.length} sessions.`);
|
||||
for (const session of localSessions) {
|
||||
const sessionRef = doc(db, 'sessions', session.id);
|
||||
const cleanSession = {
|
||||
uid: session.uid,
|
||||
members: session.members ?? [session.uid],
|
||||
title: encryptionService.encrypt(session.title ?? ''),
|
||||
session_type: session.session_type ?? 'ask',
|
||||
started_at: session.started_at ? Timestamp.fromMillis(session.started_at * 1000) : null,
|
||||
ended_at: session.ended_at ? Timestamp.fromMillis(session.ended_at * 1000) : null,
|
||||
updated_at: session.updated_at ? Timestamp.fromMillis(session.updated_at * 1000) : null
|
||||
};
|
||||
phase1Batch.set(sessionRef, cleanSession);
|
||||
phase1OpCount++;
|
||||
if (phase1OpCount >= MAX_BATCH_OPERATIONS) {
|
||||
phase1Promises.push(phase1Batch.commit());
|
||||
phase1Batch = writeBatch(db);
|
||||
phase1OpCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (phase1OpCount > 0) {
|
||||
phase1Promises.push(phase1Batch.commit());
|
||||
}
|
||||
|
||||
if (phase1Promises.length > 0) {
|
||||
await Promise.all(phase1Promises);
|
||||
console.log(`[Migration Phase 1] Successfully committed ${phase1Promises.length} batches of parent documents.`);
|
||||
} else {
|
||||
console.log('[Migration Phase 1] No parent documents to migrate.');
|
||||
}
|
||||
|
||||
// --- Phase 2: Migrate Child Documents (sub-collections) ---
|
||||
console.log('[Migration Phase 2] Migrating child documents for all sessions...');
|
||||
let phase2Batch = writeBatch(db);
|
||||
let phase2OpCount = 0;
|
||||
const phase2Promises = [];
|
||||
|
||||
for (const session of localSessions) {
|
||||
const transcripts = await sqliteSttRepo.getAllTranscriptsBySessionId(session.id);
|
||||
for (const t of transcripts) {
|
||||
const transcriptRef = doc(db, `sessions/${session.id}/transcripts`, t.id);
|
||||
const cleanTranscript = {
|
||||
uid: firebaseUser.uid,
|
||||
session_id: t.session_id,
|
||||
start_at: t.start_at ? Timestamp.fromMillis(t.start_at * 1000) : null,
|
||||
end_at: t.end_at ? Timestamp.fromMillis(t.end_at * 1000) : null,
|
||||
speaker: t.speaker ?? null,
|
||||
text: encryptionService.encrypt(t.text ?? ''),
|
||||
lang: t.lang ?? 'en',
|
||||
created_at: t.created_at ? Timestamp.fromMillis(t.created_at * 1000) : null
|
||||
};
|
||||
phase2Batch.set(transcriptRef, cleanTranscript);
|
||||
phase2OpCount++;
|
||||
if (phase2OpCount >= MAX_BATCH_OPERATIONS) {
|
||||
phase2Promises.push(phase2Batch.commit());
|
||||
phase2Batch = writeBatch(db);
|
||||
phase2OpCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
const messages = await sqliteAiMessageRepo.getAllAiMessagesBySessionId(session.id);
|
||||
for (const m of messages) {
|
||||
const msgRef = doc(db, `sessions/${session.id}/ai_messages`, m.id);
|
||||
const cleanMessage = {
|
||||
uid: firebaseUser.uid,
|
||||
session_id: m.session_id,
|
||||
sent_at: m.sent_at ? Timestamp.fromMillis(m.sent_at * 1000) : null,
|
||||
role: m.role ?? 'user',
|
||||
content: encryptionService.encrypt(m.content ?? ''),
|
||||
tokens: m.tokens ?? null,
|
||||
model: m.model ?? 'unknown',
|
||||
created_at: m.created_at ? Timestamp.fromMillis(m.created_at * 1000) : null
|
||||
};
|
||||
phase2Batch.set(msgRef, cleanMessage);
|
||||
phase2OpCount++;
|
||||
if (phase2OpCount >= MAX_BATCH_OPERATIONS) {
|
||||
phase2Promises.push(phase2Batch.commit());
|
||||
phase2Batch = writeBatch(db);
|
||||
phase2OpCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
const summary = await sqliteSummaryRepo.getSummaryBySessionId(session.id);
|
||||
if (summary) {
|
||||
// Reverting to use 'data' as the document ID for summary.
|
||||
const summaryRef = doc(db, `sessions/${session.id}/summary`, 'data');
|
||||
const cleanSummary = {
|
||||
uid: firebaseUser.uid,
|
||||
session_id: summary.session_id,
|
||||
generated_at: summary.generated_at ? Timestamp.fromMillis(summary.generated_at * 1000) : null,
|
||||
model: summary.model ?? 'unknown',
|
||||
tldr: encryptionService.encrypt(summary.tldr ?? ''),
|
||||
text: encryptionService.encrypt(summary.text ?? ''),
|
||||
bullet_json: encryptionService.encrypt(summary.bullet_json ?? '[]'),
|
||||
action_json: encryptionService.encrypt(summary.action_json ?? '[]'),
|
||||
tokens_used: summary.tokens_used ?? null,
|
||||
updated_at: summary.updated_at ? Timestamp.fromMillis(summary.updated_at * 1000) : null
|
||||
};
|
||||
phase2Batch.set(summaryRef, cleanSummary);
|
||||
phase2OpCount++;
|
||||
if (phase2OpCount >= MAX_BATCH_OPERATIONS) {
|
||||
phase2Promises.push(phase2Batch.commit());
|
||||
phase2Batch = writeBatch(db);
|
||||
phase2OpCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (phase2OpCount > 0) {
|
||||
phase2Promises.push(phase2Batch.commit());
|
||||
}
|
||||
|
||||
if (phase2Promises.length > 0) {
|
||||
await Promise.all(phase2Promises);
|
||||
console.log(`[Migration Phase 2] Successfully committed ${phase2Promises.length} batches of child documents.`);
|
||||
} else {
|
||||
console.log('[Migration Phase 2] No child documents to migrate.');
|
||||
}
|
||||
|
||||
// --- 4. Mark migration as complete ---
|
||||
sqliteUserRepo.setMigrationComplete(firebaseUser.uid);
|
||||
console.log(`[Migration] ✅ Successfully marked migration as complete for ${firebaseUser.uid}.`);
|
||||
|
||||
} catch (error) {
|
||||
console.error(`[Migration] 🔥 An error occurred during migration for user ${firebaseUser.uid}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
checkAndRunMigration,
|
||||
};
|
||||
@ -1,437 +0,0 @@
|
||||
const { EventEmitter } = require('events');
|
||||
const Store = require('electron-store');
|
||||
const { PROVIDERS, getProviderClass } = require('../ai/factory');
|
||||
const encryptionService = require('./encryptionService');
|
||||
const providerSettingsRepository = require('../repositories/providerSettings');
|
||||
const authService = require('./authService');
|
||||
const ollamaModelRepository = require('../repositories/ollamaModel');
|
||||
|
||||
class ModelStateService extends EventEmitter {
|
||||
constructor() {
|
||||
super();
|
||||
this.authService = authService;
|
||||
// electron-store는 오직 레거시 데이터 마이그레이션 용도로만 사용됩니다.
|
||||
this.store = new Store({ name: 'pickle-glass-model-state' });
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
console.log('[ModelStateService] Initializing one-time setup...');
|
||||
await this._initializeEncryption();
|
||||
await this._runMigrations();
|
||||
this.setupLocalAIStateSync();
|
||||
await this._autoSelectAvailableModels([], true);
|
||||
console.log('[ModelStateService] One-time setup complete.');
|
||||
}
|
||||
|
||||
async _initializeEncryption() {
|
||||
try {
|
||||
const rows = await providerSettingsRepository.getRawApiKeys();
|
||||
if (rows.some(r => r.api_key && encryptionService.looksEncrypted(r.api_key))) {
|
||||
console.log('[ModelStateService] Encrypted keys detected, initializing encryption...');
|
||||
const userIdForMigration = this.authService.getCurrentUserId();
|
||||
await encryptionService.initializeKey(userIdForMigration);
|
||||
} else {
|
||||
console.log('[ModelStateService] No encrypted keys detected, skipping encryption initialization.');
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn('[ModelStateService] Error while checking encrypted keys:', err.message);
|
||||
}
|
||||
}
|
||||
|
||||
async _runMigrations() {
|
||||
console.log('[ModelStateService] Checking for data migrations...');
|
||||
const userId = this.authService.getCurrentUserId();
|
||||
|
||||
try {
|
||||
const sqliteClient = require('./sqliteClient');
|
||||
const db = sqliteClient.getDb();
|
||||
const tableExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='user_model_selections'").get();
|
||||
|
||||
if (tableExists) {
|
||||
const selections = db.prepare('SELECT * FROM user_model_selections WHERE uid = ?').get(userId);
|
||||
if (selections) {
|
||||
console.log('[ModelStateService] Migrating from user_model_selections table...');
|
||||
if (selections.llm_model) {
|
||||
const llmProvider = this.getProviderForModel(selections.llm_model, 'llm');
|
||||
if (llmProvider) {
|
||||
await this.setSelectedModel('llm', selections.llm_model);
|
||||
}
|
||||
}
|
||||
if (selections.stt_model) {
|
||||
const sttProvider = this.getProviderForModel(selections.stt_model, 'stt');
|
||||
if (sttProvider) {
|
||||
await this.setSelectedModel('stt', selections.stt_model);
|
||||
}
|
||||
}
|
||||
db.prepare('DROP TABLE user_model_selections').run();
|
||||
console.log('[ModelStateService] user_model_selections migration complete.');
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[ModelStateService] user_model_selections migration failed:', error);
|
||||
}
|
||||
|
||||
try {
|
||||
const legacyData = this.store.get(`users.${userId}`);
|
||||
if (legacyData && legacyData.apiKeys) {
|
||||
console.log('[ModelStateService] Migrating from electron-store...');
|
||||
for (const [provider, apiKey] of Object.entries(legacyData.apiKeys)) {
|
||||
if (apiKey && PROVIDERS[provider]) {
|
||||
await this.setApiKey(provider, apiKey);
|
||||
}
|
||||
}
|
||||
if (legacyData.selectedModels?.llm) {
|
||||
await this.setSelectedModel('llm', legacyData.selectedModels.llm);
|
||||
}
|
||||
if (legacyData.selectedModels?.stt) {
|
||||
await this.setSelectedModel('stt', legacyData.selectedModels.stt);
|
||||
}
|
||||
this.store.delete(`users.${userId}`);
|
||||
console.log('[ModelStateService] electron-store migration complete.');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('[ModelStateService] electron-store migration failed:', error);
|
||||
}
|
||||
}
|
||||
|
||||
setupLocalAIStateSync() {
|
||||
const localAIManager = require('./localAIManager');
|
||||
localAIManager.on('state-changed', (service, status) => {
|
||||
this.handleLocalAIStateChange(service, status);
|
||||
});
|
||||
}
|
||||
|
||||
async handleLocalAIStateChange(service, state) {
|
||||
console.log(`[ModelStateService] LocalAI state changed: ${service}`, state);
|
||||
if (!state.installed || !state.running) {
|
||||
const types = service === 'ollama' ? ['llm'] : service === 'whisper' ? ['stt'] : [];
|
||||
await this._autoSelectAvailableModels(types);
|
||||
}
|
||||
this.emit('state-updated', await this.getLiveState());
|
||||
}
|
||||
|
||||
async getLiveState() {
|
||||
const providerSettings = await providerSettingsRepository.getAll();
|
||||
const apiKeys = {};
|
||||
Object.keys(PROVIDERS).forEach(provider => {
|
||||
const setting = providerSettings.find(s => s.provider === provider);
|
||||
apiKeys[provider] = setting?.api_key || null;
|
||||
});
|
||||
|
||||
const activeSettings = await providerSettingsRepository.getActiveSettings();
|
||||
const selectedModels = {
|
||||
llm: activeSettings.llm?.selected_llm_model || null,
|
||||
stt: activeSettings.stt?.selected_stt_model || null
|
||||
};
|
||||
|
||||
return { apiKeys, selectedModels };
|
||||
}
|
||||
|
||||
async _autoSelectAvailableModels(forceReselectionForTypes = [], isInitialBoot = false) {
|
||||
console.log(`[ModelStateService] Running auto-selection. Force re-selection for: [${forceReselectionForTypes.join(', ')}]`);
|
||||
const { apiKeys, selectedModels } = await this.getLiveState();
|
||||
const types = ['llm', 'stt'];
|
||||
|
||||
for (const type of types) {
|
||||
const currentModelId = selectedModels[type];
|
||||
let isCurrentModelValid = false;
|
||||
const forceReselection = forceReselectionForTypes.includes(type);
|
||||
|
||||
if (currentModelId && !forceReselection) {
|
||||
const provider = this.getProviderForModel(currentModelId, type);
|
||||
const apiKey = apiKeys[provider];
|
||||
if (provider && apiKey) {
|
||||
isCurrentModelValid = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isCurrentModelValid) {
|
||||
console.log(`[ModelStateService] No valid ${type.toUpperCase()} model selected or selection forced. Finding an alternative...`);
|
||||
const availableModels = await this.getAvailableModels(type);
|
||||
if (availableModels.length > 0) {
|
||||
const apiModel = availableModels.find(model => {
|
||||
const provider = this.getProviderForModel(model.id, type);
|
||||
return provider && provider !== 'ollama' && provider !== 'whisper';
|
||||
});
|
||||
const newModel = apiModel || availableModels[0];
|
||||
await this.setSelectedModel(type, newModel.id);
|
||||
console.log(`[ModelStateService] Auto-selected ${type.toUpperCase()} model: ${newModel.id}`);
|
||||
} else {
|
||||
await providerSettingsRepository.setActiveProvider(null, type);
|
||||
if (!isInitialBoot) {
|
||||
this.emit('state-updated', await this.getLiveState());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async setFirebaseVirtualKey(virtualKey) {
|
||||
console.log(`[ModelStateService] Setting Firebase virtual key.`);
|
||||
|
||||
// 키를 설정하기 전에, 이전에 openai-glass 키가 있었는지 확인합니다.
|
||||
const previousSettings = await providerSettingsRepository.getByProvider('openai-glass');
|
||||
const wasPreviouslyConfigured = !!previousSettings?.api_key;
|
||||
|
||||
// 항상 새로운 가상 키로 업데이트합니다.
|
||||
await this.setApiKey('openai-glass', virtualKey);
|
||||
|
||||
if (virtualKey) {
|
||||
// 이전에 설정된 적이 없는 경우 (최초 로그인)에만 모델을 강제로 변경합니다.
|
||||
if (!wasPreviouslyConfigured) {
|
||||
console.log('[ModelStateService] First-time setup for openai-glass, setting default models.');
|
||||
const llmModel = PROVIDERS['openai-glass']?.llmModels[0];
|
||||
const sttModel = PROVIDERS['openai-glass']?.sttModels[0];
|
||||
if (llmModel) await this.setSelectedModel('llm', llmModel.id);
|
||||
if (sttModel) await this.setSelectedModel('stt', sttModel.id);
|
||||
} else {
|
||||
console.log('[ModelStateService] openai-glass key updated, but respecting user\'s existing model selection.');
|
||||
}
|
||||
} else {
|
||||
// 로그아웃 시, 현재 활성화된 모델이 openai-glass인 경우에만 다른 모델로 전환합니다.
|
||||
const selected = await this.getSelectedModels();
|
||||
const llmProvider = this.getProviderForModel(selected.llm, 'llm');
|
||||
const sttProvider = this.getProviderForModel(selected.stt, 'stt');
|
||||
|
||||
const typesToReselect = [];
|
||||
if (llmProvider === 'openai-glass') typesToReselect.push('llm');
|
||||
if (sttProvider === 'openai-glass') typesToReselect.push('stt');
|
||||
|
||||
if (typesToReselect.length > 0) {
|
||||
console.log('[ModelStateService] Logged out, re-selecting models for:', typesToReselect.join(', '));
|
||||
await this._autoSelectAvailableModels(typesToReselect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async setApiKey(provider, key) {
|
||||
console.log(`[ModelStateService] setApiKey for ${provider}`);
|
||||
if (!provider) {
|
||||
throw new Error('Provider is required');
|
||||
}
|
||||
|
||||
// 'openai-glass'는 자체 인증 키를 사용하므로 유효성 검사를 건너뜁니다.
|
||||
if (provider !== 'openai-glass') {
|
||||
const validationResult = await this.validateApiKey(provider, key);
|
||||
if (!validationResult.success) {
|
||||
console.warn(`[ModelStateService] API key validation failed for ${provider}: ${validationResult.error}`);
|
||||
return validationResult;
|
||||
}
|
||||
}
|
||||
|
||||
const finalKey = (provider === 'ollama' || provider === 'whisper') ? 'local' : key;
|
||||
const existingSettings = await providerSettingsRepository.getByProvider(provider) || {};
|
||||
await providerSettingsRepository.upsert(provider, { ...existingSettings, api_key: finalKey });
|
||||
|
||||
// 키가 추가/변경되었으므로, 해당 provider의 모델을 자동 선택할 수 있는지 확인
|
||||
await this._autoSelectAvailableModels([]);
|
||||
|
||||
this.emit('state-updated', await this.getLiveState());
|
||||
this.emit('settings-updated');
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
async getAllApiKeys() {
|
||||
const allSettings = await providerSettingsRepository.getAll();
|
||||
const apiKeys = {};
|
||||
allSettings.forEach(s => {
|
||||
if (s.provider !== 'openai-glass') {
|
||||
apiKeys[s.provider] = s.api_key;
|
||||
}
|
||||
});
|
||||
return apiKeys;
|
||||
}
|
||||
|
||||
async removeApiKey(provider) {
|
||||
const setting = await providerSettingsRepository.getByProvider(provider);
|
||||
if (setting && setting.api_key) {
|
||||
await providerSettingsRepository.upsert(provider, { ...setting, api_key: null });
|
||||
await this._autoSelectAvailableModels(['llm', 'stt']);
|
||||
this.emit('state-updated', await this.getLiveState());
|
||||
this.emit('settings-updated');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 사용자가 Firebase에 로그인했는지 확인합니다.
|
||||
*/
|
||||
isLoggedInWithFirebase() {
|
||||
return this.authService.getCurrentUser().isLoggedIn;
|
||||
}
|
||||
|
||||
/**
|
||||
* 유효한 API 키가 하나라도 설정되어 있는지 확인합니다.
|
||||
*/
|
||||
async hasValidApiKey() {
|
||||
if (this.isLoggedInWithFirebase()) return true;
|
||||
|
||||
const allSettings = await providerSettingsRepository.getAll();
|
||||
return allSettings.some(s => s.api_key && s.api_key.trim().length > 0);
|
||||
}
|
||||
|
||||
getProviderForModel(arg1, arg2) {
|
||||
// Compatibility: support both (type, modelId) old order and (modelId, type) new order
|
||||
let type, modelId;
|
||||
if (arg1 === 'llm' || arg1 === 'stt') {
|
||||
type = arg1;
|
||||
modelId = arg2;
|
||||
} else {
|
||||
modelId = arg1;
|
||||
type = arg2;
|
||||
}
|
||||
if (!modelId || !type) return null;
|
||||
for (const providerId in PROVIDERS) {
|
||||
const models = type === 'llm' ? PROVIDERS[providerId].llmModels : PROVIDERS[providerId].sttModels;
|
||||
if (models && models.some(m => m.id === modelId)) {
|
||||
return providerId;
|
||||
}
|
||||
}
|
||||
if (type === 'llm') {
|
||||
const installedModels = ollamaModelRepository.getInstalledModels();
|
||||
if (installedModels.some(m => m.name === modelId)) return 'ollama';
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async getSelectedModels() {
|
||||
const active = await providerSettingsRepository.getActiveSettings();
|
||||
return {
|
||||
llm: active.llm?.selected_llm_model || null,
|
||||
stt: active.stt?.selected_stt_model || null,
|
||||
};
|
||||
}
|
||||
|
||||
async setSelectedModel(type, modelId) {
|
||||
const provider = this.getProviderForModel(modelId, type);
|
||||
if (!provider) {
|
||||
console.warn(`[ModelStateService] No provider found for model ${modelId}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
const existingSettings = await providerSettingsRepository.getByProvider(provider) || {};
|
||||
const newSettings = { ...existingSettings };
|
||||
|
||||
if (type === 'llm') {
|
||||
newSettings.selected_llm_model = modelId;
|
||||
} else {
|
||||
newSettings.selected_stt_model = modelId;
|
||||
}
|
||||
|
||||
await providerSettingsRepository.upsert(provider, newSettings);
|
||||
await providerSettingsRepository.setActiveProvider(provider, type);
|
||||
|
||||
console.log(`[ModelStateService] Selected ${type} model: ${modelId} (provider: ${provider})`);
|
||||
|
||||
if (type === 'llm' && provider === 'ollama') {
|
||||
require('./localAIManager').warmUpModel(modelId).catch(err => console.warn(err));
|
||||
}
|
||||
|
||||
this.emit('state-updated', await this.getLiveState());
|
||||
this.emit('settings-updated');
|
||||
return true;
|
||||
}
|
||||
|
||||
async getAvailableModels(type) {
|
||||
const allSettings = await providerSettingsRepository.getAll();
|
||||
const available = [];
|
||||
const modelListKey = type === 'llm' ? 'llmModels' : 'sttModels';
|
||||
|
||||
for (const setting of allSettings) {
|
||||
if (!setting.api_key) continue;
|
||||
|
||||
const providerId = setting.provider;
|
||||
if (providerId === 'ollama' && type === 'llm') {
|
||||
const installed = ollamaModelRepository.getInstalledModels();
|
||||
available.push(...installed.map(m => ({ id: m.name, name: m.name })));
|
||||
} else if (PROVIDERS[providerId]?.[modelListKey]) {
|
||||
available.push(...PROVIDERS[providerId][modelListKey]);
|
||||
}
|
||||
}
|
||||
return [...new Map(available.map(item => [item.id, item])).values()];
|
||||
}
|
||||
|
||||
async getCurrentModelInfo(type) {
|
||||
const activeSetting = await providerSettingsRepository.getActiveProvider(type);
|
||||
if (!activeSetting) return null;
|
||||
|
||||
const model = type === 'llm' ? activeSetting.selected_llm_model : activeSetting.selected_stt_model;
|
||||
if (!model) return null;
|
||||
|
||||
return {
|
||||
provider: activeSetting.provider,
|
||||
model: model,
|
||||
apiKey: activeSetting.api_key,
|
||||
};
|
||||
}
|
||||
|
||||
// --- 핸들러 및 유틸리티 메서드 ---
|
||||
|
||||
async validateApiKey(provider, key) {
|
||||
if (!key || (key.trim() === '' && provider !== 'ollama' && provider !== 'whisper')) {
|
||||
return { success: false, error: 'API key cannot be empty.' };
|
||||
}
|
||||
const ProviderClass = getProviderClass(provider);
|
||||
if (!ProviderClass || typeof ProviderClass.validateApiKey !== 'function') {
|
||||
return { success: true };
|
||||
}
|
||||
try {
|
||||
return await ProviderClass.validateApiKey(key);
|
||||
} catch (error) {
|
||||
return { success: false, error: 'An unexpected error occurred during validation.' };
|
||||
}
|
||||
}
|
||||
|
||||
getProviderConfig() {
|
||||
const config = {};
|
||||
for (const key in PROVIDERS) {
|
||||
const { handler, ...rest } = PROVIDERS[key];
|
||||
config[key] = rest;
|
||||
}
|
||||
return config;
|
||||
}
|
||||
|
||||
async handleRemoveApiKey(provider) {
|
||||
const success = await this.removeApiKey(provider);
|
||||
if (success) {
|
||||
const selectedModels = await this.getSelectedModels();
|
||||
if (!selectedModels.llm && !selectedModels.stt) {
|
||||
this.emit('force-show-apikey-header');
|
||||
}
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
/*-------------- Compatibility Helpers --------------*/
|
||||
async handleValidateKey(provider, key) {
|
||||
return await this.setApiKey(provider, key);
|
||||
}
|
||||
|
||||
async handleSetSelectedModel(type, modelId) {
|
||||
return await this.setSelectedModel(type, modelId);
|
||||
}
|
||||
|
||||
async areProvidersConfigured() {
|
||||
if (this.isLoggedInWithFirebase()) return true;
|
||||
const allSettings = await providerSettingsRepository.getAll();
|
||||
const apiKeyMap = {};
|
||||
allSettings.forEach(s => apiKeyMap[s.provider] = s.api_key);
|
||||
// LLM
|
||||
const hasLlmKey = Object.entries(apiKeyMap).some(([provider, key]) => {
|
||||
if (!key) return false;
|
||||
if (provider === 'whisper') return false; // whisper는 LLM 없음
|
||||
return PROVIDERS[provider]?.llmModels?.length > 0;
|
||||
});
|
||||
// STT
|
||||
const hasSttKey = Object.entries(apiKeyMap).some(([provider, key]) => {
|
||||
if (!key) return false;
|
||||
if (provider === 'ollama') return false; // ollama는 STT 없음
|
||||
return PROVIDERS[provider]?.sttModels?.length > 0 || provider === 'whisper';
|
||||
});
|
||||
return hasLlmKey && hasSttKey;
|
||||
}
|
||||
}
|
||||
|
||||
const modelStateService = new ModelStateService();
|
||||
module.exports = modelStateService;
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,124 +0,0 @@
|
||||
const { systemPreferences, shell, desktopCapturer } = require('electron');
|
||||
const permissionRepository = require('../repositories/permission');
|
||||
|
||||
class PermissionService {
|
||||
_getAuthService() {
|
||||
return require('./authService');
|
||||
}
|
||||
|
||||
async checkSystemPermissions() {
|
||||
const permissions = {
|
||||
microphone: 'unknown',
|
||||
screen: 'unknown',
|
||||
keychain: 'unknown',
|
||||
needsSetup: true
|
||||
};
|
||||
|
||||
try {
|
||||
if (process.platform === 'darwin') {
|
||||
permissions.microphone = systemPreferences.getMediaAccessStatus('microphone');
|
||||
permissions.screen = systemPreferences.getMediaAccessStatus('screen');
|
||||
permissions.keychain = await this.checkKeychainCompleted(this._getAuthService().getCurrentUserId()) ? 'granted' : 'unknown';
|
||||
permissions.needsSetup = permissions.microphone !== 'granted' || permissions.screen !== 'granted' || permissions.keychain !== 'granted';
|
||||
} else {
|
||||
permissions.microphone = 'granted';
|
||||
permissions.screen = 'granted';
|
||||
permissions.keychain = 'granted';
|
||||
permissions.needsSetup = false;
|
||||
}
|
||||
|
||||
console.log('[Permissions] System permissions status:', permissions);
|
||||
return permissions;
|
||||
} catch (error) {
|
||||
console.error('[Permissions] Error checking permissions:', error);
|
||||
return {
|
||||
microphone: 'unknown',
|
||||
screen: 'unknown',
|
||||
keychain: 'unknown',
|
||||
needsSetup: true,
|
||||
error: error.message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
async requestMicrophonePermission() {
|
||||
if (process.platform !== 'darwin') {
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
try {
|
||||
const status = systemPreferences.getMediaAccessStatus('microphone');
|
||||
console.log('[Permissions] Microphone status:', status);
|
||||
if (status === 'granted') {
|
||||
return { success: true, status: 'granted' };
|
||||
}
|
||||
|
||||
const granted = await systemPreferences.askForMediaAccess('microphone');
|
||||
return {
|
||||
success: granted,
|
||||
status: granted ? 'granted' : 'denied'
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('[Permissions] Error requesting microphone permission:', error);
|
||||
return {
|
||||
success: false,
|
||||
error: error.message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
async openSystemPreferences(section) {
|
||||
if (process.platform !== 'darwin') {
|
||||
return { success: false, error: 'Not supported on this platform' };
|
||||
}
|
||||
|
||||
try {
|
||||
if (section === 'screen-recording') {
|
||||
try {
|
||||
console.log('[Permissions] Triggering screen capture request to register app...');
|
||||
await desktopCapturer.getSources({
|
||||
types: ['screen'],
|
||||
thumbnailSize: { width: 1, height: 1 }
|
||||
});
|
||||
console.log('[Permissions] App registered for screen recording');
|
||||
} catch (captureError) {
|
||||
console.log('[Permissions] Screen capture request triggered (expected to fail):', captureError.message);
|
||||
}
|
||||
|
||||
// await shell.openExternal('x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture');
|
||||
}
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('[Permissions] Error opening system preferences:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async markKeychainCompleted() {
|
||||
try {
|
||||
await permissionRepository.markKeychainCompleted(this._getAuthService().getCurrentUserId());
|
||||
console.log('[Permissions] Marked keychain as completed');
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('[Permissions] Error marking keychain as completed:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async checkKeychainCompleted(uid) {
|
||||
if (uid === "default_user") {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
const completed = permissionRepository.checkKeychainCompleted(uid);
|
||||
console.log('[Permissions] Keychain completed status:', completed);
|
||||
return completed;
|
||||
} catch (error) {
|
||||
console.error('[Permissions] Error checking keychain completed status:', error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const permissionService = new PermissionService();
|
||||
module.exports = permissionService;
|
||||
@ -1,877 +0,0 @@
|
||||
const { EventEmitter } = require('events');
|
||||
const { spawn, exec } = require('child_process');
|
||||
const { promisify } = require('util');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const os = require('os');
|
||||
const https = require('https');
|
||||
const crypto = require('crypto');
|
||||
const { spawnAsync } = require('../utils/spawnHelper');
|
||||
const { DOWNLOAD_CHECKSUMS } = require('../config/checksums');
|
||||
|
||||
const execAsync = promisify(exec);
|
||||
|
||||
const fsPromises = fs.promises;
|
||||
|
||||
class WhisperService extends EventEmitter {
|
||||
constructor() {
|
||||
super();
|
||||
this.serviceName = 'WhisperService';
|
||||
|
||||
// 경로 및 디렉토리
|
||||
this.whisperPath = null;
|
||||
this.modelsDir = null;
|
||||
this.tempDir = null;
|
||||
|
||||
// 세션 관리 (세션 풀 내장)
|
||||
this.sessionPool = [];
|
||||
this.activeSessions = new Map();
|
||||
this.maxSessions = 3;
|
||||
|
||||
// 설치 상태
|
||||
this.installState = {
|
||||
isInstalled: false,
|
||||
isInitialized: false
|
||||
};
|
||||
|
||||
// 사용 가능한 모델
|
||||
this.availableModels = {
|
||||
'whisper-tiny': {
|
||||
name: 'Tiny',
|
||||
size: '39M',
|
||||
url: 'https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.bin'
|
||||
},
|
||||
'whisper-base': {
|
||||
name: 'Base',
|
||||
size: '74M',
|
||||
url: 'https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-base.bin'
|
||||
},
|
||||
'whisper-small': {
|
||||
name: 'Small',
|
||||
size: '244M',
|
||||
url: 'https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-small.bin'
|
||||
},
|
||||
'whisper-medium': {
|
||||
name: 'Medium',
|
||||
size: '769M',
|
||||
url: 'https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-medium.bin'
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// Base class methods integration
|
||||
getPlatform() {
|
||||
return process.platform;
|
||||
}
|
||||
|
||||
async checkCommand(command) {
|
||||
try {
|
||||
const platform = this.getPlatform();
|
||||
const checkCmd = platform === 'win32' ? 'where' : 'which';
|
||||
const { stdout } = await execAsync(`${checkCmd} ${command}`);
|
||||
return stdout.trim();
|
||||
} catch (error) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async waitForService(checkFn, maxAttempts = 30, delayMs = 1000) {
|
||||
for (let i = 0; i < maxAttempts; i++) {
|
||||
if (await checkFn()) {
|
||||
console.log(`[${this.serviceName}] Service is ready`);
|
||||
return true;
|
||||
}
|
||||
await new Promise(resolve => setTimeout(resolve, delayMs));
|
||||
}
|
||||
throw new Error(`${this.serviceName} service failed to start within timeout`);
|
||||
}
|
||||
|
||||
async downloadFile(url, destination, options = {}) {
|
||||
const {
|
||||
onProgress = null,
|
||||
headers = { 'User-Agent': 'Glass-App' },
|
||||
timeout = 300000,
|
||||
modelId = null
|
||||
} = options;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const file = fs.createWriteStream(destination);
|
||||
let downloadedSize = 0;
|
||||
let totalSize = 0;
|
||||
|
||||
const request = https.get(url, { headers }, (response) => {
|
||||
if ([301, 302, 307, 308].includes(response.statusCode)) {
|
||||
file.close();
|
||||
fs.unlink(destination, () => {});
|
||||
|
||||
if (!response.headers.location) {
|
||||
reject(new Error('Redirect without location header'));
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`[${this.serviceName}] Following redirect from ${url} to ${response.headers.location}`);
|
||||
this.downloadFile(response.headers.location, destination, options)
|
||||
.then(resolve)
|
||||
.catch(reject);
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.statusCode !== 200) {
|
||||
file.close();
|
||||
fs.unlink(destination, () => {});
|
||||
reject(new Error(`Download failed: ${response.statusCode} ${response.statusMessage}`));
|
||||
return;
|
||||
}
|
||||
|
||||
totalSize = parseInt(response.headers['content-length'], 10) || 0;
|
||||
|
||||
response.on('data', (chunk) => {
|
||||
downloadedSize += chunk.length;
|
||||
|
||||
if (totalSize > 0) {
|
||||
const progress = Math.round((downloadedSize / totalSize) * 100);
|
||||
|
||||
if (onProgress) {
|
||||
onProgress(progress, downloadedSize, totalSize);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
response.pipe(file);
|
||||
|
||||
file.on('finish', () => {
|
||||
file.close(() => {
|
||||
resolve({ success: true, size: downloadedSize });
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
request.on('timeout', () => {
|
||||
request.destroy();
|
||||
file.close();
|
||||
fs.unlink(destination, () => {});
|
||||
reject(new Error('Download timeout'));
|
||||
});
|
||||
|
||||
request.on('error', (err) => {
|
||||
file.close();
|
||||
fs.unlink(destination, () => {});
|
||||
this.emit('download-error', { url, error: err, modelId });
|
||||
reject(err);
|
||||
});
|
||||
|
||||
request.setTimeout(timeout);
|
||||
|
||||
file.on('error', (err) => {
|
||||
fs.unlink(destination, () => {});
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async downloadWithRetry(url, destination, options = {}) {
|
||||
const {
|
||||
maxRetries = 3,
|
||||
retryDelay = 1000,
|
||||
expectedChecksum = null,
|
||||
modelId = null,
|
||||
...downloadOptions
|
||||
} = options;
|
||||
|
||||
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
||||
try {
|
||||
const result = await this.downloadFile(url, destination, {
|
||||
...downloadOptions,
|
||||
modelId
|
||||
});
|
||||
|
||||
if (expectedChecksum) {
|
||||
const isValid = await this.verifyChecksum(destination, expectedChecksum);
|
||||
if (!isValid) {
|
||||
fs.unlinkSync(destination);
|
||||
throw new Error('Checksum verification failed');
|
||||
}
|
||||
console.log(`[${this.serviceName}] Checksum verified successfully`);
|
||||
}
|
||||
|
||||
return result;
|
||||
} catch (error) {
|
||||
if (attempt === maxRetries) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
console.log(`Download attempt ${attempt} failed, retrying in ${retryDelay}ms...`);
|
||||
await new Promise(resolve => setTimeout(resolve, retryDelay * attempt));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async verifyChecksum(filePath, expectedChecksum) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const hash = crypto.createHash('sha256');
|
||||
const stream = fs.createReadStream(filePath);
|
||||
|
||||
stream.on('data', (data) => hash.update(data));
|
||||
stream.on('end', () => {
|
||||
const fileChecksum = hash.digest('hex');
|
||||
console.log(`[${this.serviceName}] File checksum: ${fileChecksum}`);
|
||||
console.log(`[${this.serviceName}] Expected checksum: ${expectedChecksum}`);
|
||||
resolve(fileChecksum === expectedChecksum);
|
||||
});
|
||||
stream.on('error', reject);
|
||||
});
|
||||
}
|
||||
|
||||
async autoInstall(onProgress) {
|
||||
const platform = this.getPlatform();
|
||||
console.log(`[${this.serviceName}] Starting auto-installation for ${platform}`);
|
||||
|
||||
try {
|
||||
switch(platform) {
|
||||
case 'darwin':
|
||||
return await this.installMacOS(onProgress);
|
||||
case 'win32':
|
||||
return await this.installWindows(onProgress);
|
||||
case 'linux':
|
||||
return await this.installLinux();
|
||||
default:
|
||||
throw new Error(`Unsupported platform: ${platform}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[${this.serviceName}] Auto-installation failed:`, error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async shutdown(force = false) {
|
||||
console.log(`[${this.serviceName}] Starting ${force ? 'forced' : 'graceful'} shutdown...`);
|
||||
|
||||
const isRunning = await this.isServiceRunning();
|
||||
if (!isRunning) {
|
||||
console.log(`[${this.serviceName}] Service not running, nothing to shutdown`);
|
||||
return true;
|
||||
}
|
||||
|
||||
const platform = this.getPlatform();
|
||||
|
||||
try {
|
||||
switch(platform) {
|
||||
case 'darwin':
|
||||
return await this.shutdownMacOS(force);
|
||||
case 'win32':
|
||||
return await this.shutdownWindows(force);
|
||||
case 'linux':
|
||||
return await this.shutdownLinux(force);
|
||||
default:
|
||||
console.warn(`[${this.serviceName}] Unsupported platform for shutdown: ${platform}`);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`[${this.serviceName}] Error during shutdown:`, error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
if (this.installState.isInitialized) return;
|
||||
|
||||
try {
|
||||
const homeDir = os.homedir();
|
||||
const whisperDir = path.join(homeDir, '.glass', 'whisper');
|
||||
|
||||
this.modelsDir = path.join(whisperDir, 'models');
|
||||
this.tempDir = path.join(whisperDir, 'temp');
|
||||
|
||||
// Windows에서는 .exe 확장자 필요
|
||||
const platform = this.getPlatform();
|
||||
const whisperExecutable = platform === 'win32' ? 'whisper-whisper.exe' : 'whisper';
|
||||
this.whisperPath = path.join(whisperDir, 'bin', whisperExecutable);
|
||||
|
||||
await this.ensureDirectories();
|
||||
await this.ensureWhisperBinary();
|
||||
|
||||
this.installState.isInitialized = true;
|
||||
console.log('[WhisperService] Initialized successfully');
|
||||
} catch (error) {
|
||||
console.error('[WhisperService] Initialization failed:', error);
|
||||
// Emit error event - LocalAIManager가 처리
|
||||
this.emit('error', {
|
||||
errorType: 'initialization-failed',
|
||||
error: error.message
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async ensureDirectories() {
|
||||
await fsPromises.mkdir(this.modelsDir, { recursive: true });
|
||||
await fsPromises.mkdir(this.tempDir, { recursive: true });
|
||||
await fsPromises.mkdir(path.dirname(this.whisperPath), { recursive: true });
|
||||
}
|
||||
|
||||
// local stt session
|
||||
async getSession(config) {
|
||||
// check available session
|
||||
const availableSession = this.sessionPool.find(s => !s.inUse);
|
||||
if (availableSession) {
|
||||
availableSession.inUse = true;
|
||||
await availableSession.reconfigure(config);
|
||||
return availableSession;
|
||||
}
|
||||
|
||||
// create new session
|
||||
if (this.activeSessions.size >= this.maxSessions) {
|
||||
throw new Error('Maximum session limit reached');
|
||||
}
|
||||
|
||||
const session = new WhisperSession(config, this);
|
||||
await session.initialize();
|
||||
this.activeSessions.set(session.id, session);
|
||||
|
||||
return session;
|
||||
}
|
||||
|
||||
async releaseSession(sessionId) {
|
||||
const session = this.activeSessions.get(sessionId);
|
||||
if (session) {
|
||||
await session.cleanup();
|
||||
session.inUse = false;
|
||||
|
||||
// add to session pool
|
||||
if (this.sessionPool.length < 2) {
|
||||
this.sessionPool.push(session);
|
||||
} else {
|
||||
// remove session
|
||||
await session.destroy();
|
||||
this.activeSessions.delete(sessionId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//cleanup
|
||||
async cleanup() {
|
||||
// cleanup all sessions
|
||||
for (const session of this.activeSessions.values()) {
|
||||
await session.destroy();
|
||||
}
|
||||
|
||||
this.activeSessions.clear();
|
||||
this.sessionPool = [];
|
||||
}
|
||||
|
||||
async ensureWhisperBinary() {
|
||||
const whisperCliPath = await this.checkCommand('whisper-cli');
|
||||
if (whisperCliPath) {
|
||||
this.whisperPath = whisperCliPath;
|
||||
console.log(`[WhisperService] Found whisper-cli at: ${this.whisperPath}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const whisperPath = await this.checkCommand('whisper');
|
||||
if (whisperPath) {
|
||||
this.whisperPath = whisperPath;
|
||||
console.log(`[WhisperService] Found whisper at: ${this.whisperPath}`);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await fsPromises.access(this.whisperPath, fs.constants.X_OK);
|
||||
console.log('[WhisperService] Custom whisper binary found');
|
||||
return;
|
||||
} catch (error) {
|
||||
// Continue to installation
|
||||
}
|
||||
|
||||
const platform = this.getPlatform();
|
||||
if (platform === 'darwin') {
|
||||
console.log('[WhisperService] Whisper not found, trying Homebrew installation...');
|
||||
try {
|
||||
await this.installViaHomebrew();
|
||||
// verify installation
|
||||
const verified = await this.verifyInstallation();
|
||||
if (!verified.success) {
|
||||
throw new Error(verified.error);
|
||||
}
|
||||
return;
|
||||
} catch (error) {
|
||||
console.log('[WhisperService] Homebrew installation failed:', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
await this.autoInstall();
|
||||
|
||||
// verify installation
|
||||
const verified = await this.verifyInstallation();
|
||||
if (!verified.success) {
|
||||
throw new Error(`Whisper installation verification failed: ${verified.error}`);
|
||||
}
|
||||
}
|
||||
|
||||
async installViaHomebrew() {
|
||||
const brewPath = await this.checkCommand('brew');
|
||||
if (!brewPath) {
|
||||
throw new Error('Homebrew not found. Please install Homebrew first.');
|
||||
}
|
||||
|
||||
console.log('[WhisperService] Installing whisper-cpp via Homebrew...');
|
||||
await spawnAsync('brew', ['install', 'whisper-cpp']);
|
||||
|
||||
const whisperCliPath = await this.checkCommand('whisper-cli');
|
||||
if (whisperCliPath) {
|
||||
this.whisperPath = whisperCliPath;
|
||||
console.log(`[WhisperService] Whisper-cli installed via Homebrew at: ${this.whisperPath}`);
|
||||
} else {
|
||||
const whisperPath = await this.checkCommand('whisper');
|
||||
if (whisperPath) {
|
||||
this.whisperPath = whisperPath;
|
||||
console.log(`[WhisperService] Whisper installed via Homebrew at: ${this.whisperPath}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async ensureModelAvailable(modelId) {
|
||||
if (!this.installState.isInitialized) {
|
||||
console.log('[WhisperService] Service not initialized, initializing now...');
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
const modelInfo = this.availableModels[modelId];
|
||||
if (!modelInfo) {
|
||||
throw new Error(`Unknown model: ${modelId}. Available models: ${Object.keys(this.availableModels).join(', ')}`);
|
||||
}
|
||||
|
||||
const modelPath = await this.getModelPath(modelId);
|
||||
try {
|
||||
await fsPromises.access(modelPath, fs.constants.R_OK);
|
||||
console.log(`[WhisperService] Model ${modelId} already available at: ${modelPath}`);
|
||||
} catch (error) {
|
||||
console.log(`[WhisperService] Model ${modelId} not found, downloading...`);
|
||||
await this.downloadModel(modelId);
|
||||
}
|
||||
}
|
||||
|
||||
async downloadModel(modelId) {
|
||||
const modelInfo = this.availableModels[modelId];
|
||||
const modelPath = await this.getModelPath(modelId);
|
||||
const checksumInfo = DOWNLOAD_CHECKSUMS.whisper.models[modelId];
|
||||
|
||||
// Emit progress event - LocalAIManager가 처리
|
||||
this.emit('install-progress', {
|
||||
model: modelId,
|
||||
progress: 0
|
||||
});
|
||||
|
||||
await this.downloadWithRetry(modelInfo.url, modelPath, {
|
||||
expectedChecksum: checksumInfo?.sha256,
|
||||
modelId, // pass modelId to LocalAIServiceBase for event handling
|
||||
onProgress: (progress) => {
|
||||
// Emit progress event - LocalAIManager가 처리
|
||||
this.emit('install-progress', {
|
||||
model: modelId,
|
||||
progress
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
console.log(`[WhisperService] Model ${modelId} downloaded successfully`);
|
||||
this.emit('model-download-complete', { modelId });
|
||||
}
|
||||
|
||||
async handleDownloadModel(modelId) {
|
||||
try {
|
||||
console.log(`[WhisperService] Handling download for model: ${modelId}`);
|
||||
|
||||
if (!this.installState.isInitialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
await this.ensureModelAvailable(modelId);
|
||||
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error(`[WhisperService] Failed to handle download for model ${modelId}:`, error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async handleGetInstalledModels() {
|
||||
try {
|
||||
if (!this.installState.isInitialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
const models = await this.getInstalledModels();
|
||||
return { success: true, models };
|
||||
} catch (error) {
|
||||
console.error('[WhisperService] Failed to get installed models:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
async getModelPath(modelId) {
|
||||
if (!this.installState.isInitialized || !this.modelsDir) {
|
||||
throw new Error('WhisperService is not initialized. Call initialize() first.');
|
||||
}
|
||||
return path.join(this.modelsDir, `${modelId}.bin`);
|
||||
}
|
||||
|
||||
async getWhisperPath() {
|
||||
return this.whisperPath;
|
||||
}
|
||||
|
||||
async saveAudioToTemp(audioBuffer, sessionId = '') {
|
||||
const timestamp = Date.now();
|
||||
const random = Math.random().toString(36).substr(2, 6);
|
||||
const sessionPrefix = sessionId ? `${sessionId}_` : '';
|
||||
const tempFile = path.join(this.tempDir, `audio_${sessionPrefix}${timestamp}_${random}.wav`);
|
||||
|
||||
const wavHeader = this.createWavHeader(audioBuffer.length);
|
||||
const wavBuffer = Buffer.concat([wavHeader, audioBuffer]);
|
||||
|
||||
await fsPromises.writeFile(tempFile, wavBuffer);
|
||||
return tempFile;
|
||||
}
|
||||
|
||||
createWavHeader(dataSize) {
|
||||
const header = Buffer.alloc(44);
|
||||
const sampleRate = 16000;
|
||||
const numChannels = 1;
|
||||
const bitsPerSample = 16;
|
||||
|
||||
header.write('RIFF', 0);
|
||||
header.writeUInt32LE(36 + dataSize, 4);
|
||||
header.write('WAVE', 8);
|
||||
header.write('fmt ', 12);
|
||||
header.writeUInt32LE(16, 16);
|
||||
header.writeUInt16LE(1, 20);
|
||||
header.writeUInt16LE(numChannels, 22);
|
||||
header.writeUInt32LE(sampleRate, 24);
|
||||
header.writeUInt32LE(sampleRate * numChannels * bitsPerSample / 8, 28);
|
||||
header.writeUInt16LE(numChannels * bitsPerSample / 8, 32);
|
||||
header.writeUInt16LE(bitsPerSample, 34);
|
||||
header.write('data', 36);
|
||||
header.writeUInt32LE(dataSize, 40);
|
||||
|
||||
return header;
|
||||
}
|
||||
|
||||
async cleanupTempFile(filePath) {
|
||||
if (!filePath || typeof filePath !== 'string') {
|
||||
console.warn('[WhisperService] Invalid file path for cleanup:', filePath);
|
||||
return;
|
||||
}
|
||||
|
||||
const filesToCleanup = [
|
||||
filePath,
|
||||
filePath.replace('.wav', '.txt'),
|
||||
filePath.replace('.wav', '.json')
|
||||
];
|
||||
|
||||
for (const file of filesToCleanup) {
|
||||
try {
|
||||
// Check if file exists before attempting to delete
|
||||
await fsPromises.access(file, fs.constants.F_OK);
|
||||
await fsPromises.unlink(file);
|
||||
console.log(`[WhisperService] Cleaned up: ${file}`);
|
||||
} catch (error) {
|
||||
// File doesn't exist or already deleted - this is normal
|
||||
if (error.code !== 'ENOENT') {
|
||||
console.warn(`[WhisperService] Failed to cleanup ${file}:`, error.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async getInstalledModels() {
|
||||
if (!this.installState.isInitialized) {
|
||||
console.log('[WhisperService] Service not initialized for getInstalledModels, initializing now...');
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
const models = [];
|
||||
for (const [modelId, modelInfo] of Object.entries(this.availableModels)) {
|
||||
try {
|
||||
const modelPath = await this.getModelPath(modelId);
|
||||
await fsPromises.access(modelPath, fs.constants.R_OK);
|
||||
models.push({
|
||||
id: modelId,
|
||||
name: modelInfo.name,
|
||||
size: modelInfo.size,
|
||||
installed: true
|
||||
});
|
||||
} catch (error) {
|
||||
models.push({
|
||||
id: modelId,
|
||||
name: modelInfo.name,
|
||||
size: modelInfo.size,
|
||||
installed: false
|
||||
});
|
||||
}
|
||||
}
|
||||
return models;
|
||||
}
|
||||
|
||||
async isServiceRunning() {
|
||||
return this.installState.isInitialized;
|
||||
}
|
||||
|
||||
async startService() {
|
||||
if (!this.installState.isInitialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
async stopService() {
|
||||
return true;
|
||||
}
|
||||
|
||||
async isInstalled() {
|
||||
try {
|
||||
const whisperPath = await this.checkCommand('whisper-cli') || await this.checkCommand('whisper');
|
||||
return !!whisperPath;
|
||||
} catch (error) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async installMacOS() {
|
||||
throw new Error('Binary installation not available for macOS. Please install Homebrew and run: brew install whisper-cpp');
|
||||
}
|
||||
|
||||
async installWindows() {
|
||||
console.log('[WhisperService] Installing Whisper on Windows...');
|
||||
const version = 'v1.7.6';
|
||||
const binaryUrl = `https://github.com/ggml-org/whisper.cpp/releases/download/${version}/whisper-bin-x64.zip`;
|
||||
const tempFile = path.join(this.tempDir, 'whisper-binary.zip');
|
||||
|
||||
try {
|
||||
console.log('[WhisperService] Step 1: Downloading Whisper binary...');
|
||||
await this.downloadWithRetry(binaryUrl, tempFile);
|
||||
|
||||
console.log('[WhisperService] Step 2: Extracting archive...');
|
||||
const extractDir = path.join(this.tempDir, 'extracted');
|
||||
|
||||
// 임시 압축 해제 디렉토리 생성
|
||||
await fsPromises.mkdir(extractDir, { recursive: true });
|
||||
|
||||
// PowerShell 명령에서 경로를 올바르게 인용
|
||||
const expandCommand = `Expand-Archive -Path "${tempFile}" -DestinationPath "${extractDir}" -Force`;
|
||||
await spawnAsync('powershell', ['-command', expandCommand]);
|
||||
|
||||
console.log('[WhisperService] Step 3: Finding and moving whisper executable...');
|
||||
|
||||
// 압축 해제된 디렉토리에서 whisper.exe 파일 찾기
|
||||
const whisperExecutables = await this.findWhisperExecutables(extractDir);
|
||||
|
||||
if (whisperExecutables.length === 0) {
|
||||
throw new Error('whisper.exe not found in extracted files');
|
||||
}
|
||||
|
||||
// 첫 번째로 찾은 whisper.exe를 목표 위치로 복사
|
||||
const sourceExecutable = whisperExecutables[0];
|
||||
const targetDir = path.dirname(this.whisperPath);
|
||||
await fsPromises.mkdir(targetDir, { recursive: true });
|
||||
await fsPromises.copyFile(sourceExecutable, this.whisperPath);
|
||||
|
||||
console.log('[WhisperService] Step 4: Verifying installation...');
|
||||
|
||||
// 설치 검증
|
||||
await fsPromises.access(this.whisperPath, fs.constants.F_OK);
|
||||
|
||||
// whisper.exe 실행 테스트
|
||||
try {
|
||||
await spawnAsync(this.whisperPath, ['--help']);
|
||||
console.log('[WhisperService] Whisper executable verified successfully');
|
||||
} catch (testError) {
|
||||
console.warn('[WhisperService] Whisper executable test failed, but file exists:', testError.message);
|
||||
}
|
||||
|
||||
console.log('[WhisperService] Step 5: Cleanup...');
|
||||
|
||||
// 임시 파일 정리
|
||||
await fsPromises.unlink(tempFile).catch(() => {});
|
||||
await this.removeDirectory(extractDir).catch(() => {});
|
||||
|
||||
console.log('[WhisperService] Whisper installed successfully on Windows');
|
||||
return true;
|
||||
|
||||
} catch (error) {
|
||||
console.error('[WhisperService] Windows installation failed:', error);
|
||||
|
||||
// 실패 시 임시 파일 정리
|
||||
await fsPromises.unlink(tempFile).catch(() => {});
|
||||
await this.removeDirectory(path.join(this.tempDir, 'extracted')).catch(() => {});
|
||||
|
||||
throw new Error(`Failed to install Whisper on Windows: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 압축 해제된 디렉토리에서 whisper.exe 파일들을 재귀적으로 찾기
|
||||
async findWhisperExecutables(dir) {
|
||||
const executables = [];
|
||||
|
||||
try {
|
||||
const items = await fsPromises.readdir(dir, { withFileTypes: true });
|
||||
|
||||
for (const item of items) {
|
||||
const fullPath = path.join(dir, item.name);
|
||||
|
||||
if (item.isDirectory()) {
|
||||
const subExecutables = await this.findWhisperExecutables(fullPath);
|
||||
executables.push(...subExecutables);
|
||||
} else if (item.isFile() && (item.name === 'whisper-whisper.exe' || item.name === 'whisper.exe' || item.name === 'main.exe')) {
|
||||
executables.push(fullPath);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('[WhisperService] Error reading directory:', dir, error.message);
|
||||
}
|
||||
|
||||
return executables;
|
||||
}
|
||||
|
||||
// 디렉토리 재귀적 삭제
|
||||
async removeDirectory(dir) {
|
||||
try {
|
||||
const items = await fsPromises.readdir(dir, { withFileTypes: true });
|
||||
|
||||
for (const item of items) {
|
||||
const fullPath = path.join(dir, item.name);
|
||||
|
||||
if (item.isDirectory()) {
|
||||
await this.removeDirectory(fullPath);
|
||||
} else {
|
||||
await fsPromises.unlink(fullPath);
|
||||
}
|
||||
}
|
||||
|
||||
await fsPromises.rmdir(dir);
|
||||
} catch (error) {
|
||||
console.warn('[WhisperService] Error removing directory:', dir, error.message);
|
||||
}
|
||||
}
|
||||
|
||||
async installLinux() {
|
||||
console.log('[WhisperService] Installing Whisper on Linux...');
|
||||
const version = 'v1.7.6';
|
||||
const binaryUrl = `https://github.com/ggml-org/whisper.cpp/releases/download/${version}/whisper-cpp-${version}-linux-x64.tar.gz`;
|
||||
const tempFile = path.join(this.tempDir, 'whisper-binary.tar.gz');
|
||||
|
||||
try {
|
||||
await this.downloadWithRetry(binaryUrl, tempFile);
|
||||
const extractDir = path.dirname(this.whisperPath);
|
||||
await spawnAsync('tar', ['-xzf', tempFile, '-C', extractDir, '--strip-components=1']);
|
||||
await spawnAsync('chmod', ['+x', this.whisperPath]);
|
||||
await fsPromises.unlink(tempFile);
|
||||
console.log('[WhisperService] Whisper installed successfully on Linux');
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('[WhisperService] Linux installation failed:', error);
|
||||
throw new Error(`Failed to install Whisper on Linux: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
async shutdownMacOS(force) {
|
||||
return true;
|
||||
}
|
||||
|
||||
async shutdownWindows(force) {
|
||||
return true;
|
||||
}
|
||||
|
||||
async shutdownLinux(force) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// WhisperSession class
|
||||
class WhisperSession {
|
||||
constructor(config, service) {
|
||||
this.id = `session_${Date.now()}_${Math.random()}`;
|
||||
this.config = config;
|
||||
this.service = service;
|
||||
this.process = null;
|
||||
this.inUse = true;
|
||||
this.audioBuffer = Buffer.alloc(0);
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
await this.service.ensureModelAvailable(this.config.model);
|
||||
this.startProcessingLoop();
|
||||
}
|
||||
|
||||
async reconfigure(config) {
|
||||
this.config = config;
|
||||
await this.service.ensureModelAvailable(this.config.model);
|
||||
}
|
||||
|
||||
startProcessingLoop() {
|
||||
// TODO: 실제 처리 루프 구현
|
||||
}
|
||||
|
||||
async cleanup() {
|
||||
// 임시 파일 정리
|
||||
await this.cleanupTempFiles();
|
||||
}
|
||||
|
||||
async cleanupTempFiles() {
|
||||
// TODO: 임시 파일 정리 구현
|
||||
}
|
||||
|
||||
async destroy() {
|
||||
if (this.process) {
|
||||
this.process.kill();
|
||||
}
|
||||
// 임시 파일 정리
|
||||
await this.cleanupTempFiles();
|
||||
}
|
||||
}
|
||||
|
||||
// verify installation
|
||||
WhisperService.prototype.verifyInstallation = async function() {
|
||||
try {
|
||||
console.log('[WhisperService] Verifying installation...');
|
||||
|
||||
// 1. check binary
|
||||
if (!this.whisperPath) {
|
||||
return { success: false, error: 'Whisper binary path not set' };
|
||||
}
|
||||
|
||||
try {
|
||||
await fsPromises.access(this.whisperPath, fs.constants.X_OK);
|
||||
} catch (error) {
|
||||
return { success: false, error: 'Whisper binary not executable' };
|
||||
}
|
||||
|
||||
// 2. check version
|
||||
try {
|
||||
const { stdout } = await spawnAsync(this.whisperPath, ['--help']);
|
||||
if (!stdout.includes('whisper')) {
|
||||
return { success: false, error: 'Invalid whisper binary' };
|
||||
}
|
||||
} catch (error) {
|
||||
return { success: false, error: 'Whisper binary not responding' };
|
||||
}
|
||||
|
||||
// 3. check directories
|
||||
try {
|
||||
await fsPromises.access(this.modelsDir, fs.constants.W_OK);
|
||||
await fsPromises.access(this.tempDir, fs.constants.W_OK);
|
||||
} catch (error) {
|
||||
return { success: false, error: 'Required directories not accessible' };
|
||||
}
|
||||
|
||||
console.log('[WhisperService] Installation verified successfully');
|
||||
return { success: true };
|
||||
|
||||
} catch (error) {
|
||||
console.error('[WhisperService] Verification failed:', error);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
};
|
||||
|
||||
// Export singleton instance
|
||||
const whisperService = new WhisperService();
|
||||
module.exports = whisperService;
|
||||
@ -1,39 +0,0 @@
|
||||
const { spawn } = require('child_process');
|
||||
|
||||
function spawnAsync(command, args = [], options = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const child = spawn(command, args, options);
|
||||
let stdout = '';
|
||||
let stderr = '';
|
||||
|
||||
if (child.stdout) {
|
||||
child.stdout.on('data', (data) => {
|
||||
stdout += data.toString();
|
||||
});
|
||||
}
|
||||
|
||||
if (child.stderr) {
|
||||
child.stderr.on('data', (data) => {
|
||||
stderr += data.toString();
|
||||
});
|
||||
}
|
||||
|
||||
child.on('error', (error) => {
|
||||
reject(error);
|
||||
});
|
||||
|
||||
child.on('close', (code) => {
|
||||
if (code === 0) {
|
||||
resolve({ stdout, stderr });
|
||||
} else {
|
||||
const error = new Error(`Command failed with code ${code}: ${stderr || stdout}`);
|
||||
error.code = code;
|
||||
error.stdout = stdout;
|
||||
error.stderr = stderr;
|
||||
reject(error);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = { spawnAsync };
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user