Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36848b46dc | ||
|
|
5bda4b19df | ||
|
|
476d297e4b | ||
|
|
ce7147025d | ||
|
|
080fb67974 | ||
|
|
f6f8069ce4 | ||
|
|
6328378da5 | ||
|
|
d25f2948c3 | ||
|
|
63956c9c2d | ||
|
|
a785640d7a | ||
|
|
1265d044f6 | ||
|
|
9ca0ad0396 | ||
|
|
f0eb7c6b61 | ||
|
|
ea51253d58 | ||
|
|
dd9e84a0db | ||
|
|
a988a33d21 | ||
|
|
e959ee346e | ||
|
|
5a2168030e | ||
|
|
00bf4dea0b | ||
|
|
02080588b7 | ||
|
|
d5ee08d5a0 | ||
|
|
e844aa9545 | ||
|
|
0d4e2ab21f | ||
|
|
f15bb48fdd | ||
|
|
515648d64d | ||
|
|
22265e153c | ||
|
|
ad39a735b5 | ||
|
|
6a07bc0a10 | ||
|
|
e91457eceb | ||
|
|
01e3f8f8fd | ||
|
|
bd3d41aed1 | ||
|
|
d2945a6e8a | ||
|
|
89f39710c7 | ||
|
|
1bce5d331d | ||
|
|
47be175e27 | ||
|
|
f0718db374 |
No files matched your search
@@ -0,0 +1,88 @@
|
|||||||
|
---
|
||||||
|
name: antigravity-manager
|
||||||
|
description: Comprehensive guide to Antigravity Manager architecture, workflows, and development. Use this to understand how to work on the project.
|
||||||
|
---
|
||||||
|
|
||||||
|
# Antigravity Manager Developer Guide
|
||||||
|
|
||||||
|
## 🏗️ Architecture Overview
|
||||||
|
|
||||||
|
Antigravity Manager is a hybrid Desktop Application built with Electron, React, and NestJS. It follows a modular architecture where the frontend (Renderer) communicates with the backend (Main) via type-safe IPC (ORPC).
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TD
|
||||||
|
User[User Interface] -->|React/Vite| Renderer[Renderer Process]
|
||||||
|
Renderer -->|ORPC Client| IPC[IPC Layer]
|
||||||
|
IPC -->|ORPC Router| Main[Main Process]
|
||||||
|
Main -->|Bootstraps| Server[NestJS Server]
|
||||||
|
Main -->|Calls| Services[Service Layer]
|
||||||
|
Services -->|Read/Write| DB[(SQLite Database)]
|
||||||
|
Services -->|HTTP| Cloud[Cloud APIs (Google/Anthropic)]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Key Technologies
|
||||||
|
|
||||||
|
- **Frontend**: React 19, TailwindCSS v4, TanStack Router, TanStack Query.
|
||||||
|
- **Backend**: Electron (Main), NestJS (Core Logic), Better-SQLite3 (Data).
|
||||||
|
- **Communication**: ORPC (Type-safe IPC wrapper around Electron IPC).
|
||||||
|
- **Build**: Electron Forge + Vite.
|
||||||
|
|
||||||
|
## 📂 Directory Structure
|
||||||
|
|
||||||
|
- `src/main.ts`: Electron Main Process entry point.
|
||||||
|
- `src/preload.ts`: Bridge between Main and Renderer.
|
||||||
|
- `src/renderer.tsx`: React App entry point.
|
||||||
|
- `src/components/`: Reusable React UI components (Radix UI based).
|
||||||
|
- `src/ipc/`: IPC Routers and Handlers (Domain logic).
|
||||||
|
- `router.ts`: Main ORPC router definition.
|
||||||
|
- `account/`, `cloud/`, `database/`: Domain-specific handlers.
|
||||||
|
- `src/server/`: NestJS application modules (proxies/gateways).
|
||||||
|
- `src/services/`: Core business logic (framework agnostic).
|
||||||
|
- `GoogleAPIService.ts`: Gemini/Cloud interactions.
|
||||||
|
- `AutoSwitchService.ts`: Account rotation logic.
|
||||||
|
- `src/routes/`: Frontend routing definitions (File-based).
|
||||||
|
|
||||||
|
## 🚀 Development Workflow
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- Node.js 18+
|
||||||
|
- npm (Project uses `package-lock.json`)
|
||||||
|
|
||||||
|
### Common Commands
|
||||||
|
|
||||||
|
- **Start Dev Server**: `npm start`
|
||||||
|
- **Lint Code**: `npm run lint`
|
||||||
|
- **Unit Test**: `npm run test:unit`
|
||||||
|
- **E2E Test**: `npm run test:e2e`
|
||||||
|
- **Build Production**: `npm run make`
|
||||||
|
|
||||||
|
## 🧠 Core Concepts
|
||||||
|
|
||||||
|
### IPC Communication (ORPC)
|
||||||
|
|
||||||
|
The project uses `orpc` for type-safe communication.
|
||||||
|
|
||||||
|
- **Define**: Create a router in `src/ipc/router.ts` with Zod schemas.
|
||||||
|
- **Implement**: Add logic in handlers (e.g., `src/ipc/account/handler.ts`).
|
||||||
|
- **Call**: Use the generated client in React components.
|
||||||
|
|
||||||
|
### Database Access
|
||||||
|
|
||||||
|
Data is stored in a local SQLite file (`test.db` in dev, user data in prod).
|
||||||
|
|
||||||
|
- Use `Better-SQLite3` for direct access.
|
||||||
|
- Logic should be encapsulated in `src/services` or `src/ipc`.
|
||||||
|
|
||||||
|
### Account Management
|
||||||
|
|
||||||
|
- Accounts are added via OAuth (Google/Claude).
|
||||||
|
- `GoogleAPIService` handles token exchange and refreshing.
|
||||||
|
- `AutoSwitchService` monitors usage and switches active accounts automatically.
|
||||||
|
|
||||||
|
## ⚠️ Critical Rules
|
||||||
|
|
||||||
|
1. **Type Safety**: strict TypeScript usage; Zod for runtime validation.
|
||||||
|
2. **Components**: Use `src/components/ui` (Radix primitives) for consistency.
|
||||||
|
3. **Async**: Handle all IPC/DB calls asynchronously with try/catch.
|
||||||
|
4. **Security**: Never commit secrets. API keys are user-provided or encrypted locally.
|
||||||
@@ -1,14 +1,18 @@
|
|||||||
---
|
---
|
||||||
description: Implement an approved OpenSpec change and keep tasks in sync.
|
description: Implement an approved OpenSpec change and keep tasks in sync.
|
||||||
---
|
---
|
||||||
|
|
||||||
<!-- OPENSPEC:START -->
|
<!-- OPENSPEC:START -->
|
||||||
|
|
||||||
**Guardrails**
|
**Guardrails**
|
||||||
|
|
||||||
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
||||||
- Keep changes tightly scoped to the requested outcome.
|
- Keep changes tightly scoped to the requested outcome.
|
||||||
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
||||||
|
|
||||||
**Steps**
|
**Steps**
|
||||||
Track these steps as TODOs and complete them one by one.
|
Track these steps as TODOs and complete them one by one.
|
||||||
|
|
||||||
1. Read `changes/<id>/proposal.md`, `design.md` (if present), and `tasks.md` to confirm scope and acceptance criteria.
|
1. Read `changes/<id>/proposal.md`, `design.md` (if present), and `tasks.md` to confirm scope and acceptance criteria.
|
||||||
2. Work through tasks sequentially, keeping edits minimal and focused on the requested change.
|
2. Work through tasks sequentially, keeping edits minimal and focused on the requested change.
|
||||||
3. Confirm completion before updating statuses—make sure every item in `tasks.md` is finished.
|
3. Confirm completion before updating statuses—make sure every item in `tasks.md` is finished.
|
||||||
@@ -16,5 +20,6 @@ Track these steps as TODOs and complete them one by one.
|
|||||||
5. Reference `openspec list` or `openspec show <item>` when additional context is required.
|
5. Reference `openspec list` or `openspec show <item>` when additional context is required.
|
||||||
|
|
||||||
**Reference**
|
**Reference**
|
||||||
|
|
||||||
- Use `openspec show <id> --json --deltas-only` if you need additional context from the proposal while implementing.
|
- Use `openspec show <id> --json --deltas-only` if you need additional context from the proposal while implementing.
|
||||||
<!-- OPENSPEC:END -->
|
<!-- OPENSPEC:END -->
|
||||||
@@ -1,13 +1,17 @@
|
|||||||
---
|
---
|
||||||
description: Archive a deployed OpenSpec change and update specs.
|
description: Archive a deployed OpenSpec change and update specs.
|
||||||
---
|
---
|
||||||
|
|
||||||
<!-- OPENSPEC:START -->
|
<!-- OPENSPEC:START -->
|
||||||
|
|
||||||
**Guardrails**
|
**Guardrails**
|
||||||
|
|
||||||
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
||||||
- Keep changes tightly scoped to the requested outcome.
|
- Keep changes tightly scoped to the requested outcome.
|
||||||
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
||||||
|
|
||||||
**Steps**
|
**Steps**
|
||||||
|
|
||||||
1. Determine the change ID to archive:
|
1. Determine the change ID to archive:
|
||||||
- If this prompt already includes a specific change ID (for example inside a `<ChangeId>` block populated by slash-command arguments), use that value after trimming whitespace.
|
- If this prompt already includes a specific change ID (for example inside a `<ChangeId>` block populated by slash-command arguments), use that value after trimming whitespace.
|
||||||
- If the conversation references a change loosely (for example by title or summary), run `openspec list` to surface likely IDs, share the relevant candidates, and confirm which one the user intends.
|
- If the conversation references a change loosely (for example by title or summary), run `openspec list` to surface likely IDs, share the relevant candidates, and confirm which one the user intends.
|
||||||
@@ -19,6 +23,7 @@ description: Archive a deployed OpenSpec change and update specs.
|
|||||||
5. Validate with `openspec validate --strict` and inspect with `openspec show <id>` if anything looks off.
|
5. Validate with `openspec validate --strict` and inspect with `openspec show <id>` if anything looks off.
|
||||||
|
|
||||||
**Reference**
|
**Reference**
|
||||||
|
|
||||||
- Use `openspec list` to confirm change IDs before archiving.
|
- Use `openspec list` to confirm change IDs before archiving.
|
||||||
- Inspect refreshed specs with `openspec list --specs` and address any validation issues before handing off.
|
- Inspect refreshed specs with `openspec list --specs` and address any validation issues before handing off.
|
||||||
<!-- OPENSPEC:END -->
|
<!-- OPENSPEC:END -->
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
---
|
---
|
||||||
description: Scaffold a new OpenSpec change and validate strictly.
|
description: Scaffold a new OpenSpec change and validate strictly.
|
||||||
---
|
---
|
||||||
|
|
||||||
<!-- OPENSPEC:START -->
|
<!-- OPENSPEC:START -->
|
||||||
|
|
||||||
**Guardrails**
|
**Guardrails**
|
||||||
|
|
||||||
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
- Favor straightforward, minimal implementations first and add complexity only when it is requested or clearly required.
|
||||||
- Keep changes tightly scoped to the requested outcome.
|
- Keep changes tightly scoped to the requested outcome.
|
||||||
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
- Refer to `openspec/AGENTS.md` (located inside the `openspec/` directory—run `ls openspec` or `openspec update` if you don't see it) if you need additional OpenSpec conventions or clarifications.
|
||||||
@@ -10,6 +13,7 @@ description: Scaffold a new OpenSpec change and validate strictly.
|
|||||||
- Do not write any code during the proposal stage. Only create design documents (proposal.md, tasks.md, design.md, and spec deltas). Implementation happens in the apply stage after approval.
|
- Do not write any code during the proposal stage. Only create design documents (proposal.md, tasks.md, design.md, and spec deltas). Implementation happens in the apply stage after approval.
|
||||||
|
|
||||||
**Steps**
|
**Steps**
|
||||||
|
|
||||||
1. Review `openspec/project.md`, run `openspec list` and `openspec list --specs`, and inspect related code or docs (e.g., via `rg`/`ls`) to ground the proposal in current behaviour; note any gaps that require clarification.
|
1. Review `openspec/project.md`, run `openspec list` and `openspec list --specs`, and inspect related code or docs (e.g., via `rg`/`ls`) to ground the proposal in current behaviour; note any gaps that require clarification.
|
||||||
2. Choose a unique verb-led `change-id` and scaffold `proposal.md`, `tasks.md`, and `design.md` (when needed) under `openspec/changes/<id>/`.
|
2. Choose a unique verb-led `change-id` and scaffold `proposal.md`, `tasks.md`, and `design.md` (when needed) under `openspec/changes/<id>/`.
|
||||||
3. Map the change into concrete capabilities or requirements, breaking multi-scope efforts into distinct spec deltas with clear relationships and sequencing.
|
3. Map the change into concrete capabilities or requirements, breaking multi-scope efforts into distinct spec deltas with clear relationships and sequencing.
|
||||||
@@ -19,6 +23,7 @@ description: Scaffold a new OpenSpec change and validate strictly.
|
|||||||
7. Validate with `openspec validate <id> --strict` and resolve every issue before sharing the proposal.
|
7. Validate with `openspec validate <id> --strict` and resolve every issue before sharing the proposal.
|
||||||
|
|
||||||
**Reference**
|
**Reference**
|
||||||
|
|
||||||
- Use `openspec show <id> --json --deltas-only` or `openspec show <spec> --type spec` to inspect details when validation fails.
|
- Use `openspec show <id> --json --deltas-only` or `openspec show <spec> --type spec` to inspect details when validation fails.
|
||||||
- Search existing requirements with `rg -n "Requirement:|Scenario:" openspec/specs` before writing new ones.
|
- Search existing requirements with `rg -n "Requirement:|Scenario:" openspec/specs` before writing new ones.
|
||||||
- Explore the codebase with `rg <keyword>`, `ls`, or direct file reads so proposals align with current implementation realities.
|
- Explore the codebase with `rg <keyword>`, `ls`, or direct file reads so proposals align with current implementation realities.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
version: 2
|
version: 2
|
||||||
updates:
|
updates:
|
||||||
- package-ecosystem: "npm"
|
- package-ecosystem: 'npm'
|
||||||
directory: "/"
|
directory: '/'
|
||||||
schedule:
|
schedule:
|
||||||
interval: "weekly"
|
interval: 'weekly'
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
name-template: 'v$RESOLVED_VERSION'
|
name-template: 'v$RESOLVED_VERSION'
|
||||||
tag-template: 'v$RESOLVED_VERSION'
|
tag-template: 'v$RESOLVED_VERSION'
|
||||||
categories:
|
categories:
|
||||||
- title: '🚀 What''s new'
|
- title: "🚀 What's new"
|
||||||
labels:
|
labels:
|
||||||
- 'feature'
|
- 'feature'
|
||||||
- 'feat'
|
- 'feat'
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
name: Publish Release
|
name: Publish Release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
release:
|
||||||
tags:
|
types: [published]
|
||||||
- 'v*'
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -11,7 +10,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, macos-latest, macos-14, ubuntu-latest]
|
os: [windows-latest, windows-11-arm, macos-latest, macos-14, ubuntu-latest]
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
@@ -40,4 +39,8 @@ jobs:
|
|||||||
- name: Publish Release
|
- name: Publish Release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
|
||||||
|
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
|
||||||
|
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
|
||||||
|
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
|
||||||
run: npm run publish
|
run: npm run publish
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
name: Semantic Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0 # Required for semantic-release to analyze commits
|
||||||
|
persist-credentials: false # We use a token in the next steps
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Release
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} # Use GH_TOKEN to trigger other workflows
|
||||||
|
run: npx semantic-release
|
||||||
@@ -102,3 +102,6 @@ out/
|
|||||||
|
|
||||||
# Tanstack
|
# Tanstack
|
||||||
.tanstack/
|
.tanstack/
|
||||||
|
|
||||||
|
# Sentry Config File
|
||||||
|
.env.sentry-build-plugin
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
/coverage
|
/coverage
|
||||||
/.vite
|
/.vite
|
||||||
README.md
|
README.md
|
||||||
|
CHANGELOG.md
|
||||||
/src/routeTree.gen.ts
|
/src/routeTree.gen.ts
|
||||||
.agents/
|
.agents/
|
||||||
openspec/
|
openspec/
|
||||||
@@ -106,7 +106,6 @@ Keep this managed block so 'openspec update' can refresh the instructions.
|
|||||||
- `npm run test:e2e` - 运行 Playwright 端到端测试
|
- `npm run test:e2e` - 运行 Playwright 端到端测试
|
||||||
- `npm run test:all` - 运行所有测试
|
- `npm run test:all` - 运行所有测试
|
||||||
|
|
||||||
|
|
||||||
### 运行单个测试 (Running Single Tests)
|
### 运行单个测试 (Running Single Tests)
|
||||||
|
|
||||||
- 单元测试: `npm run test:unit path/to/test.test.ts`
|
- 单元测试: `npm run test:unit path/to/test.test.ts`
|
||||||
|
|||||||
+90
-3
@@ -1,9 +1,96 @@
|
|||||||
|
<a name="readme-top"></a>
|
||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
## [0.6.0](https://github.com/Draculabo/AntigravityManager/compare/v0.5.0...v0.6.0) (2026-02-04)
|
||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
### ✨ Features
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
|
* add cloud reset time UI ([#56](https://github.com/Draculabo/AntigravityManager/issues/56)) ([f6f8069](https://github.com/Draculabo/AntigravityManager/commit/f6f8069ce4673ae7027c6ba248daa18c8b602218))
|
||||||
|
* windows install guidance ([#63](https://github.com/Draculabo/AntigravityManager/issues/63)) ([ce71470](https://github.com/Draculabo/AntigravityManager/commit/ce7147025d37648a82f6f6b300502ef4462bfde6))
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
* correct Windows install notice path ([5bda4b1](https://github.com/Draculabo/AntigravityManager/commit/5bda4b19dfc9ce64735cd39600d41a5deefc26ee))
|
||||||
|
* **proxy:** route Claude Code CLI requests on /v1/chat/completions to Anthropic handler ([#61](https://github.com/Draculabo/AntigravityManager/issues/61)) ([476d297](https://github.com/Draculabo/AntigravityManager/commit/476d297e4b2dd3015f7ebcbb915b643730816dc6))
|
||||||
|
|
||||||
|
## [0.5.0](https://github.com/Draculabo/AntigravityManager/compare/v0.4.0...v0.5.0) (2026-01-30)
|
||||||
|
|
||||||
|
### ✨ Features
|
||||||
|
|
||||||
|
* **i18n:** add Russian localization ([#48](https://github.com/Draculabo/AntigravityManager/issues/48)) ([63956c9](https://github.com/Draculabo/AntigravityManager/commit/63956c9c2d60f829a998237abe6ade675fdb01ed))
|
||||||
|
* Implement collapsible sidebar and refined status bar UI ([#45](https://github.com/Draculabo/AntigravityManager/issues/45)) ([1265d04](https://github.com/Draculabo/AntigravityManager/commit/1265d044f69e52fba7da72fde6c47a0b85c58232))
|
||||||
|
* sentry integration ([#51](https://github.com/Draculabo/AntigravityManager/issues/51)) ([a785640](https://github.com/Draculabo/AntigravityManager/commit/a785640d7a51b65a6852383401bd7c284b716975))
|
||||||
|
|
||||||
|
## [0.4.0](https://github.com/Draculabo/AntigravityManager/compare/v0.3.5...v0.4.0) (2026-01-28)
|
||||||
|
|
||||||
|
### ✨ Features
|
||||||
|
|
||||||
|
* add system autostart and single-instance support ([ea51253](https://github.com/Draculabo/AntigravityManager/commit/ea51253d589abd537682344d3bdb684b8fc9a511))
|
||||||
|
* implement smart foreground quota refresh with debounce ([dd9e84a](https://github.com/Draculabo/AntigravityManager/commit/dd9e84a0dbefad6066193b6bd468689a755a02e3))
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
* stub nestjs optional modules for packaging ([f0eb7c6](https://github.com/Draculabo/AntigravityManager/commit/f0eb7c6b619a3ea9ea203d66f5dbce731d731e3c))
|
||||||
|
|
||||||
|
## [0.3.5](https://github.com/Draculabo/AntigravityManager/compare/v0.3.4...v0.3.5) (2026-01-26)
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- "Check Quota Now" button not refreshing UI after polling ([#42](https://github.com/Draculabo/AntigravityManager/issues/42)) ([e959ee3](https://github.com/Draculabo/AntigravityManager/commit/e959ee346e7c26a8a4c5b7deefa5bd2452153f9d))
|
||||||
|
|
||||||
|
### 📝 Documentation
|
||||||
|
|
||||||
|
- remove beta download links from README ([5a21680](https://github.com/Draculabo/AntigravityManager/commit/5a2168030eac4ddeffa1c3b002b2de48b6a11a8f))
|
||||||
|
|
||||||
|
## [0.3.4](https://github.com/Draculabo/AntigravityManager/compare/v0.3.3...v0.3.4) (2026-01-26)
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- **security:** add safeStorage fallback for production builds ([#38](https://github.com/Draculabo/AntigravityManager/issues/38)) ([#43](https://github.com/Draculabo/AntigravityManager/issues/43)) ([0208058](https://github.com/Draculabo/AntigravityManager/commit/02080588b764ed88a5831152a3a1249f1d077d29))
|
||||||
|
|
||||||
|
### 📝 Documentation
|
||||||
|
|
||||||
|
- update beta release link ([d5ee08d](https://github.com/Draculabo/AntigravityManager/commit/d5ee08d5a06a915a8b82f680b38e2f532105498c))
|
||||||
|
|
||||||
|
## [0.3.4-beta.1](https://github.com/Draculabo/AntigravityManager/compare/v0.3.3...v0.3.4-beta.1) (2026-01-25)
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- **security:** add safeStorage fallback for production builds ([#38](https://github.com/Draculabo/AntigravityManager/issues/38)) ([92dc2f6](https://github.com/Draculabo/AntigravityManager/commit/92dc2f6f2169eb1a32950694387f2333ea2de682))
|
||||||
|
|
||||||
|
## [0.3.3](https://github.com/Draculabo/AntigravityManager/compare/v0.3.2...v0.3.3) (2026-01-25)
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- accept lowercase antigravity in process detection ([0d4e2ab](https://github.com/Draculabo/AntigravityManager/commit/0d4e2ab21f37704e09ef1a67c181c48b42df1180))
|
||||||
|
|
||||||
|
### 📝 Documentation
|
||||||
|
|
||||||
|
- add beta download link to readme ([f15bb48](https://github.com/Draculabo/AntigravityManager/commit/f15bb48fdda10fda3c2382941ee0ce51204f750a))
|
||||||
|
- clean up changelog duplicate ([22265e1](https://github.com/Draculabo/AntigravityManager/commit/22265e153c9d394229aa48afdc5948044b74e842))
|
||||||
|
|
||||||
|
## [0.3.2](https://github.com/Draculabo/AntigravityManager/compare/v0.3.1...v0.3.2) (2026-01-25)
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- handle keychain hint and suppress pgrep spam ([bd3d41a](https://github.com/Draculabo/AntigravityManager/commit/bd3d41aed17bafe9d684c5c421bad8b90afa19a8))
|
||||||
|
|
||||||
|
### 📝 Documentation
|
||||||
|
|
||||||
|
- add macOS self-signing workaround for Keychain issues ([01e3f8f](https://github.com/Draculabo/AntigravityManager/commit/01e3f8f8fd6dacc5eed214ed4b505d6d85f4bcff))
|
||||||
|
|
||||||
|
### 🔧 Continuous Integration
|
||||||
|
|
||||||
|
- setup semantic release configuration and github actions workflow ([d2945a6](https://github.com/Draculabo/AntigravityManager/commit/d2945a6e8a14d75f577716183cdff093443d9636))
|
||||||
|
- trigger publish on release published event ([6a07bc0](https://github.com/Draculabo/AntigravityManager/commit/6a07bc0a10a5ad802777e007cfd7390852119b15))
|
||||||
|
|
||||||
|
## [0.3.1] - 2026-01-25
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- Fixed startup race condition causing cloud accounts verify failure ([f0718db])
|
||||||
|
- Enabled WAL mode and force initialization on startup to resolve process resource contention ([1bce5d3])
|
||||||
|
|
||||||
## [0.3.0] - 2026-01-23
|
## [0.3.0] - 2026-01-23
|
||||||
|
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ Download the latest release for your platform from the [Releases](https://github
|
|||||||
|
|
||||||
| Platform | Download |
|
| Platform | Download |
|
||||||
|----------|----------|
|
|----------|----------|
|
||||||
| Windows | [.exe installer](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| Windows (x64/ARM64) | [.exe installer](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
| macOS | [.dmg installer](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| macOS | [.dmg installer](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
| Linux | [.deb / .rpm](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| Linux | [.deb / .rpm](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
|
|
||||||
@@ -280,6 +280,24 @@ Please check:
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary><b>Q: macOS shows Keychain/Credential error and OAuth cannot be saved?</b></summary>
|
||||||
|
|
||||||
|
This is a common macOS security behavior, usually when the app is unsigned or run directly from Downloads.
|
||||||
|
This is a **temporary workaround** for personal use:
|
||||||
|
|
||||||
|
1. Move the app to `/Applications`
|
||||||
|
2. Run the following commands in Terminal (repeat after every update)
|
||||||
|
|
||||||
|
```plaintext
|
||||||
|
sudo xattr -dr com.apple.quarantine "/Applications/Antigravity Manager 2.app"
|
||||||
|
codesign --force --deep --sign - "/Applications/Antigravity Manager 2.app"
|
||||||
|
```
|
||||||
|
|
||||||
|
Reopen the app and allow Keychain access if prompted.
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><b>Q: How to report issues or suggestions?</b></summary>
|
<summary><b>Q: How to report issues or suggestions?</b></summary>
|
||||||
|
|
||||||
|
|||||||
+19
-1
@@ -184,7 +184,7 @@
|
|||||||
|
|
||||||
| 平台 | 下载链接 |
|
| 平台 | 下载链接 |
|
||||||
| ------- | ------------------------------------------------------------------------------ |
|
| ------- | ------------------------------------------------------------------------------ |
|
||||||
| Windows | [.exe 安装包](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| Windows (x64/ARM64) | [.exe 安装包](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
| macOS | [.dmg 安装包](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| macOS | [.dmg 安装包](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
| Linux | [.deb / .rpm](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
| Linux | [.deb / .rpm](https://github.com/Draculabo/AntigravityManager/releases/latest) |
|
||||||
|
|
||||||
@@ -280,6 +280,24 @@ AntigravityManager/
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary><b>Q: macOS 上提示 Keychain/凭据管理不可用,OAuth 无法保存?</b></summary>
|
||||||
|
|
||||||
|
这是 macOS 安全机制导致的常见问题,通常出现在未签名的应用或从 Downloads 直接运行的场景。
|
||||||
|
这是**临时方案**,仅适合个人设备:
|
||||||
|
|
||||||
|
1. 将应用移动到 `/Applications`
|
||||||
|
2. 打开终端执行以下命令(每次更新后都需要重新执行)
|
||||||
|
|
||||||
|
```plaintext
|
||||||
|
sudo xattr -dr com.apple.quarantine "/Applications/Antigravity Manager 2.app"
|
||||||
|
codesign --force --deep --sign - "/Applications/Antigravity Manager 2.app"
|
||||||
|
```
|
||||||
|
|
||||||
|
重新打开应用后,Keychain 应会提示授权(可选“始终允许”)。
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><b>Q: 如何反馈问题或建议?</b></summary>
|
<summary><b>Q: 如何反馈问题或建议?</b></summary>
|
||||||
|
|
||||||
|
|||||||
@@ -25,4 +25,14 @@ export default defineConfig([
|
|||||||
reactHooks.configs.flat.recommended,
|
reactHooks.configs.flat.recommended,
|
||||||
eslintPluginPrettierRecommended,
|
eslintPluginPrettierRecommended,
|
||||||
...tseslint.configs.recommended,
|
...tseslint.configs.recommended,
|
||||||
|
{
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
'@typescript-eslint/no-unused-vars': 'off',
|
||||||
|
'@typescript-eslint/no-empty-object-type': 'off',
|
||||||
|
'@typescript-eslint/ban-ts-comment': 'off',
|
||||||
|
'no-empty-pattern': 'off',
|
||||||
|
'prefer-const': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
+234
-8
@@ -1,19 +1,115 @@
|
|||||||
import type { ForgeConfig } from '@electron-forge/shared-types';
|
import crypto from 'crypto';
|
||||||
|
import { FuseV1Options, FuseVersion } from '@electron/fuses';
|
||||||
|
import type {
|
||||||
|
HookFunction,
|
||||||
|
HookFunctionErrorCallback,
|
||||||
|
TargetArch,
|
||||||
|
TargetPlatform,
|
||||||
|
} from '@electron/packager';
|
||||||
|
import { MakerDeb } from '@electron-forge/maker-deb';
|
||||||
|
import { MakerDMG } from '@electron-forge/maker-dmg';
|
||||||
|
import { MakerRpm } from '@electron-forge/maker-rpm';
|
||||||
import { MakerSquirrel } from '@electron-forge/maker-squirrel';
|
import { MakerSquirrel } from '@electron-forge/maker-squirrel';
|
||||||
import { MakerZIP } from '@electron-forge/maker-zip';
|
import { MakerZIP } from '@electron-forge/maker-zip';
|
||||||
import { MakerDeb } from '@electron-forge/maker-deb';
|
|
||||||
import { MakerRpm } from '@electron-forge/maker-rpm';
|
|
||||||
import { VitePlugin } from '@electron-forge/plugin-vite';
|
|
||||||
import { FusesPlugin } from '@electron-forge/plugin-fuses';
|
|
||||||
import { FuseV1Options, FuseVersion } from '@electron/fuses';
|
|
||||||
import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives';
|
import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives';
|
||||||
|
import { FusesPlugin } from '@electron-forge/plugin-fuses';
|
||||||
|
import { VitePlugin } from '@electron-forge/plugin-vite';
|
||||||
|
import type { ForgeConfig } from '@electron-forge/shared-types';
|
||||||
|
import MakerAppImage from '@pengx17/electron-forge-maker-appimage';
|
||||||
|
import setLanguages from 'electron-packager-languages';
|
||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
import { stringify as yamlStringify } from 'yaml';
|
||||||
|
|
||||||
const nativeModules = ['better-sqlite3', 'keytar', 'bindings', 'file-uri-to-path'];
|
const nativeModules = ['better-sqlite3', 'keytar', 'bindings', 'file-uri-to-path'];
|
||||||
|
const ResolvedMakerAppImage = MakerAppImage;
|
||||||
|
const keepLanguages = new Set(['en', 'en-US', 'zh-CN', 'ru']);
|
||||||
|
|
||||||
const isStartCommand = process.argv.some((arg) => arg.includes('start'));
|
const isStartCommand = process.argv.some((arg) => arg.includes('start'));
|
||||||
|
|
||||||
|
const artifactRegex = /.*\.(?:exe|dmg|AppImage|zip|deb|rpm)$/;
|
||||||
|
const platformNamesMap: Record<string, string> = {
|
||||||
|
darwin: 'macos',
|
||||||
|
linux: 'linux',
|
||||||
|
win32: 'windows',
|
||||||
|
};
|
||||||
|
const ymlMapsMap: Record<string, string> = {
|
||||||
|
darwin: 'latest-mac.yml',
|
||||||
|
linux: 'latest-linux.yml',
|
||||||
|
win32: 'latest.yml',
|
||||||
|
};
|
||||||
|
const ignorePatterns = [
|
||||||
|
/^\/\.git/,
|
||||||
|
/^\/\.github/,
|
||||||
|
/^\/\.vscode/,
|
||||||
|
/^\/\.idea/,
|
||||||
|
/^\/openspec/,
|
||||||
|
/^\/docs?/,
|
||||||
|
/^\/scripts?/,
|
||||||
|
/^\/tests?/,
|
||||||
|
/^\/mocks?/,
|
||||||
|
/^\/src/,
|
||||||
|
/^\/node_modules\/\.cache/,
|
||||||
|
];
|
||||||
|
const setLanguagesHook = setLanguages([...keepLanguages.values()]);
|
||||||
|
const packagerAfterCopy: HookFunction[] = [
|
||||||
|
(
|
||||||
|
buildPath: string,
|
||||||
|
electronVersion: string,
|
||||||
|
platform: TargetPlatform,
|
||||||
|
arch: TargetArch,
|
||||||
|
callback: HookFunctionErrorCallback,
|
||||||
|
) => {
|
||||||
|
if (platform !== 'win32') {
|
||||||
|
callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setLanguagesHook(buildPath, electronVersion, platform, arch, callback);
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
function normalizeArtifactName(value?: string) {
|
||||||
|
if (!value) {
|
||||||
|
return 'app';
|
||||||
|
}
|
||||||
|
|
||||||
|
return value.trim().replace(/\s+/g, '-');
|
||||||
|
}
|
||||||
|
|
||||||
|
function isSquirrelArtifact(artifactPath: string) {
|
||||||
|
const fileName = path.basename(artifactPath);
|
||||||
|
if (fileName === 'RELEASES') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return artifactPath.endsWith('.nupkg');
|
||||||
|
}
|
||||||
|
|
||||||
|
const appImageMaker = new ResolvedMakerAppImage({
|
||||||
|
config: {
|
||||||
|
icons: [
|
||||||
|
{
|
||||||
|
file: 'images/32x32.png',
|
||||||
|
size: 32,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'images/64x64.png',
|
||||||
|
size: 64,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'images/128x128.png',
|
||||||
|
size: 128,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'images/[email protected]',
|
||||||
|
size: 256,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
appImageMaker.name = '@pengx17/electron-forge-maker-appimage';
|
||||||
|
|
||||||
const config: ForgeConfig = {
|
const config: ForgeConfig = {
|
||||||
packagerConfig: {
|
packagerConfig: {
|
||||||
asar: {
|
asar: {
|
||||||
@@ -23,6 +119,9 @@ const config: ForgeConfig = {
|
|||||||
executableName: 'antigravity-manager',
|
executableName: 'antigravity-manager',
|
||||||
icon: 'images/icon', // Electron Forge automatically adds .icns/.ico
|
icon: 'images/icon', // Electron Forge automatically adds .icns/.ico
|
||||||
extraResource: ['src/assets'], // Copy assets folder to resources/assets
|
extraResource: ['src/assets'], // Copy assets folder to resources/assets
|
||||||
|
afterCopy: packagerAfterCopy,
|
||||||
|
ignore: ignorePatterns,
|
||||||
|
prune: true,
|
||||||
},
|
},
|
||||||
rebuildConfig: {},
|
rebuildConfig: {},
|
||||||
hooks: {
|
hooks: {
|
||||||
@@ -63,8 +162,135 @@ const config: ForgeConfig = {
|
|||||||
console.warn(`Assets directory not found: ${assetsSrc}`);
|
console.warn(`Assets directory not found: ${assetsSrc}`);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
postMake: async (_config, makeResults) => {
|
||||||
|
if (!makeResults?.length) {
|
||||||
|
return makeResults;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ymlByPlatform = new Map<
|
||||||
|
string,
|
||||||
|
{
|
||||||
|
basePath: string;
|
||||||
|
yml: {
|
||||||
|
version?: string;
|
||||||
|
files: {
|
||||||
|
url: string;
|
||||||
|
sha512: string;
|
||||||
|
size: number;
|
||||||
|
}[];
|
||||||
|
releaseDate?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
>();
|
||||||
|
|
||||||
|
makeResults = makeResults.map((result) => {
|
||||||
|
const productName = normalizeArtifactName(result.packageJSON.productName);
|
||||||
|
const platformName = platformNamesMap[result.platform] || result.platform;
|
||||||
|
const version = result.packageJSON.version;
|
||||||
|
const platformKey = result.platform;
|
||||||
|
|
||||||
|
if (!ymlByPlatform.has(platformKey)) {
|
||||||
|
ymlByPlatform.set(platformKey, {
|
||||||
|
basePath: '',
|
||||||
|
yml: {
|
||||||
|
version,
|
||||||
|
files: [],
|
||||||
},
|
},
|
||||||
makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})],
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const platformState = ymlByPlatform.get(platformKey)!;
|
||||||
|
|
||||||
|
result.artifacts = result.artifacts
|
||||||
|
.map((artifact) => {
|
||||||
|
if (!artifact) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isSquirrelArtifact(artifact)) {
|
||||||
|
return artifact;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!artifactRegex.test(artifact)) {
|
||||||
|
return artifact;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!platformState.basePath) {
|
||||||
|
platformState.basePath = path.dirname(artifact);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newArtifact = `${path.dirname(artifact)}/${productName}-${version}-${platformName}-${result.arch}${path.extname(artifact)}`;
|
||||||
|
if (newArtifact !== artifact) {
|
||||||
|
fs.renameSync(artifact, newArtifact);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const fileData = fs.readFileSync(newArtifact);
|
||||||
|
const hash = crypto.createHash('sha512').update(fileData).digest('base64');
|
||||||
|
const { size } = fs.statSync(newArtifact);
|
||||||
|
|
||||||
|
platformState.yml.files.push({
|
||||||
|
url: path.basename(newArtifact),
|
||||||
|
sha512: hash,
|
||||||
|
size,
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
console.error(`Failed to hash ${newArtifact}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return newArtifact;
|
||||||
|
})
|
||||||
|
.filter((artifact) => artifact !== null);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
|
||||||
|
const releaseDate = new Date().toISOString();
|
||||||
|
for (const [platform, platformState] of ymlByPlatform.entries()) {
|
||||||
|
const ymlFileName = ymlMapsMap[platform];
|
||||||
|
if (!ymlFileName || !platformState.basePath) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
platformState.yml.releaseDate = releaseDate;
|
||||||
|
const ymlPath = path.join(platformState.basePath, ymlFileName);
|
||||||
|
fs.writeFileSync(ymlPath, yamlStringify(platformState.yml));
|
||||||
|
|
||||||
|
const sampleResult = makeResults.find((result) => result.platform === platform);
|
||||||
|
if (!sampleResult) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
makeResults.push({
|
||||||
|
artifacts: [ymlPath],
|
||||||
|
platform: sampleResult.platform,
|
||||||
|
arch: sampleResult.arch,
|
||||||
|
packageJSON: sampleResult.packageJSON,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return makeResults;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
makers: [
|
||||||
|
new MakerSquirrel({
|
||||||
|
setupIcon: 'images/icon.ico',
|
||||||
|
iconUrl:
|
||||||
|
'https://raw.githubusercontent.com/Draculabo/AntigravityManager/main/images/icon.ico',
|
||||||
|
}),
|
||||||
|
new MakerDMG(
|
||||||
|
{
|
||||||
|
overwrite: true,
|
||||||
|
icon: 'images/icon.icns',
|
||||||
|
iconSize: 160,
|
||||||
|
},
|
||||||
|
['darwin'],
|
||||||
|
),
|
||||||
|
new MakerZIP({}, ['darwin']),
|
||||||
|
appImageMaker,
|
||||||
|
new MakerRpm({}),
|
||||||
|
new MakerDeb({}),
|
||||||
|
],
|
||||||
publishers: [
|
publishers: [
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -78,7 +304,7 @@ const config: ForgeConfig = {
|
|||||||
name: 'AntigravityManager',
|
name: 'AntigravityManager',
|
||||||
},
|
},
|
||||||
draft: true,
|
draft: true,
|
||||||
prerelease: true,
|
prerelease: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
Generated
+9389
-239
File diff suppressed because it is too large.
Load diff
+15
-2
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "antigravity-manager",
|
"name": "antigravity-manager",
|
||||||
"productName": "Antigravity Manager",
|
"productName": "Antigravity Manager",
|
||||||
"version": "0.3.0",
|
"version": "0.6.0",
|
||||||
"description": "Antigravity Manager - Electron App",
|
"description": "Antigravity Manager - Electron App",
|
||||||
"main": ".vite/build/main.js",
|
"main": ".vite/build/main.js",
|
||||||
"private": true,
|
"private": true,
|
||||||
@@ -25,6 +25,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@electron-forge/cli": "^7.10.2",
|
"@electron-forge/cli": "^7.10.2",
|
||||||
"@electron-forge/maker-deb": "^7.10.2",
|
"@electron-forge/maker-deb": "^7.10.2",
|
||||||
|
"@electron-forge/maker-dmg": "^7.10.2",
|
||||||
"@electron-forge/maker-rpm": "^7.10.2",
|
"@electron-forge/maker-rpm": "^7.10.2",
|
||||||
"@electron-forge/maker-squirrel": "^7.10.2",
|
"@electron-forge/maker-squirrel": "^7.10.2",
|
||||||
"@electron-forge/maker-zip": "^7.10.2",
|
"@electron-forge/maker-zip": "^7.10.2",
|
||||||
@@ -33,11 +34,16 @@
|
|||||||
"@electron-forge/plugin-vite": "^7.10.2",
|
"@electron-forge/plugin-vite": "^7.10.2",
|
||||||
"@electron-forge/publisher-github": "^7.10.2",
|
"@electron-forge/publisher-github": "^7.10.2",
|
||||||
"@electron-forge/shared-types": "^7.8.1",
|
"@electron-forge/shared-types": "^7.8.1",
|
||||||
|
"@pengx17/electron-forge-maker-appimage": "^1.2.1",
|
||||||
"@electron/fuses": "~1.8.0",
|
"@electron/fuses": "~1.8.0",
|
||||||
"@electron/rebuild": "^3.7.1",
|
"@electron/rebuild": "^3.7.1",
|
||||||
"@eslint/compat": "^1.4.1",
|
"@eslint/compat": "^1.4.1",
|
||||||
"@eslint/js": "^9.39.0",
|
"@eslint/js": "^9.39.0",
|
||||||
"@playwright/test": "^1.56.1",
|
"@playwright/test": "^1.56.1",
|
||||||
|
"@semantic-release/changelog": "^6.0.3",
|
||||||
|
"@semantic-release/git": "^10.0.1",
|
||||||
|
"@semantic-release/github": "^12.0.2",
|
||||||
|
"@sentry/vite-plugin": "^4.8.0",
|
||||||
"@swc/core": "^1.15.8",
|
"@swc/core": "^1.15.8",
|
||||||
"@tanstack/router-plugin": "^1.135.0",
|
"@tanstack/router-plugin": "^1.135.0",
|
||||||
"@testing-library/jest-dom": "^6.9.1",
|
"@testing-library/jest-dom": "^6.9.1",
|
||||||
@@ -53,9 +59,11 @@
|
|||||||
"@vitejs/plugin-react": "^4.7.0",
|
"@vitejs/plugin-react": "^4.7.0",
|
||||||
"babel-plugin-react-compiler": "1.0.0",
|
"babel-plugin-react-compiler": "1.0.0",
|
||||||
"code-inspector-plugin": "^1.3.3",
|
"code-inspector-plugin": "^1.3.3",
|
||||||
|
"conventional-changelog-conventionalcommits": "^9.1.0",
|
||||||
"electron": "^37.3.1",
|
"electron": "^37.3.1",
|
||||||
"electron-devtools-installer": "^4.0.0",
|
"electron-devtools-installer": "^4.0.0",
|
||||||
"electron-playwright-helpers": "^1.8.2",
|
"electron-playwright-helpers": "^1.8.2",
|
||||||
|
"electron-packager-languages": "^0.6.0",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.1",
|
||||||
"eslint-config-prettier": "^10.1.8",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-prettier": "^5.5.4",
|
"eslint-plugin-prettier": "^5.5.4",
|
||||||
@@ -67,6 +75,8 @@
|
|||||||
"node-addon-api": "^8.3.1",
|
"node-addon-api": "^8.3.1",
|
||||||
"prettier": "^3.6.2",
|
"prettier": "^3.6.2",
|
||||||
"prettier-plugin-tailwindcss": "^0.7.1",
|
"prettier-plugin-tailwindcss": "^0.7.1",
|
||||||
|
"semantic-release": "^25.0.2",
|
||||||
|
"semantic-release-config-gitmoji": "^1.5.3",
|
||||||
"sharp": "^0.34.5",
|
"sharp": "^0.34.5",
|
||||||
"tailwindcss": "^4.1.16",
|
"tailwindcss": "^4.1.16",
|
||||||
"ts-node": "^10.9.2",
|
"ts-node": "^10.9.2",
|
||||||
@@ -85,7 +95,6 @@
|
|||||||
"@nestjs/microservices": "^11.1.11",
|
"@nestjs/microservices": "^11.1.11",
|
||||||
"@nestjs/platform-express": "^11.1.11",
|
"@nestjs/platform-express": "^11.1.11",
|
||||||
"@nestjs/platform-fastify": "^11.1.10",
|
"@nestjs/platform-fastify": "^11.1.10",
|
||||||
"@nestjs/websockets": "^11.1.11",
|
|
||||||
"@orpc/client": "^1.10.4",
|
"@orpc/client": "^1.10.4",
|
||||||
"@orpc/server": "^1.11.3",
|
"@orpc/server": "^1.11.3",
|
||||||
"@radix-ui/react-avatar": "^1.1.11",
|
"@radix-ui/react-avatar": "^1.1.11",
|
||||||
@@ -102,6 +111,9 @@
|
|||||||
"@radix-ui/react-toast": "^1.2.15",
|
"@radix-ui/react-toast": "^1.2.15",
|
||||||
"@radix-ui/react-toggle": "^1.1.9",
|
"@radix-ui/react-toggle": "^1.1.9",
|
||||||
"@radix-ui/react-toggle-group": "^1.1.11",
|
"@radix-ui/react-toggle-group": "^1.1.11",
|
||||||
|
"@radix-ui/react-tooltip": "^1.2.8",
|
||||||
|
"@sentry/electron": "^7.7.0",
|
||||||
|
"@sentry/integrations": "^7.114.0",
|
||||||
"@tailwindcss/vite": "^4.1.17",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"@tanstack/react-query": "^5.90.7",
|
"@tanstack/react-query": "^5.90.7",
|
||||||
"@tanstack/react-router": "^1.139.3",
|
"@tanstack/react-router": "^1.139.3",
|
||||||
@@ -133,6 +145,7 @@
|
|||||||
"undici": "^7.16.0",
|
"undici": "^7.16.0",
|
||||||
"update-electron-app": "^3.1.1",
|
"update-electron-app": "^3.1.1",
|
||||||
"uuid": "^13.0.0",
|
"uuid": "^13.0.0",
|
||||||
|
"yaml": "^2.8.2",
|
||||||
"zod": "^4.1.12"
|
"zod": "^4.1.12"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,259 @@
|
|||||||
|
/**
|
||||||
|
* Semantic Release Configuration
|
||||||
|
*
|
||||||
|
* This configuration uses the specific release rules requested by the user,
|
||||||
|
* but adapts the plugin configuration to work with standard Conventional Commits
|
||||||
|
* instead of Gitmoji (since the project history doesn't use emojis).
|
||||||
|
*/
|
||||||
|
|
||||||
|
const REPO_URL = 'https://github.com/Draculabo/AntigravityManager';
|
||||||
|
const GITHUB_BASE_URL = 'https://github.com';
|
||||||
|
const FULL_CHANGELOG_URL = `${REPO_URL}/blob/main/CHANGELOG.md`;
|
||||||
|
|
||||||
|
const releaseRules = [
|
||||||
|
{
|
||||||
|
release: 'minor',
|
||||||
|
type: 'feat',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'patch',
|
||||||
|
type: 'fix',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'patch',
|
||||||
|
type: 'perf',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'patch',
|
||||||
|
type: 'style',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'patch',
|
||||||
|
type: 'refactor',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'patch',
|
||||||
|
type: 'build',
|
||||||
|
},
|
||||||
|
{ release: 'patch', scope: 'README', type: 'docs' },
|
||||||
|
{ release: 'patch', scope: 'README.md', type: 'docs' },
|
||||||
|
{ release: false, type: 'docs' },
|
||||||
|
{
|
||||||
|
release: false,
|
||||||
|
type: 'test',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: false,
|
||||||
|
type: 'ci',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: false,
|
||||||
|
type: 'chore',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: false,
|
||||||
|
type: 'wip',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'major',
|
||||||
|
type: 'BREAKING CHANGE',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'major',
|
||||||
|
scope: 'BREAKING CHANGE',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
release: 'major',
|
||||||
|
subject: '*BREAKING CHANGE*',
|
||||||
|
},
|
||||||
|
{ release: 'patch', subject: '*force release*' },
|
||||||
|
{ release: 'patch', subject: '*force patch*' },
|
||||||
|
{ release: 'minor', subject: '*force minor*' },
|
||||||
|
{ release: 'major', subject: '*force major*' },
|
||||||
|
{ release: false, subject: '*skip release*' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const getGithubUsernameFromEmail = (email) => {
|
||||||
|
if (!email) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const match = email.match(/^(?:\d+\+)?(?<username>[a-z0-9-]+)@users\.noreply\.github\.com$/i);
|
||||||
|
|
||||||
|
return match?.groups?.username;
|
||||||
|
};
|
||||||
|
|
||||||
|
const isBotIdentity = (value) => {
|
||||||
|
return typeof value === 'string' && /bot/i.test(value);
|
||||||
|
};
|
||||||
|
|
||||||
|
const buildReleaseFooter = (commits) => {
|
||||||
|
const mergedPullRequests = new Map();
|
||||||
|
const contributors = new Map();
|
||||||
|
|
||||||
|
(commits || []).forEach((commit) => {
|
||||||
|
const message = [commit?.message, commit?.subject, commit?.header].filter(Boolean).join('\n');
|
||||||
|
if (message) {
|
||||||
|
const mergeMatches = message.match(/pull request #(?<number>\d+)/gi);
|
||||||
|
if (mergeMatches) {
|
||||||
|
mergeMatches.forEach((match) => {
|
||||||
|
const number = match.replace(/\D/g, '');
|
||||||
|
if (number) {
|
||||||
|
mergedPullRequests.set(number, {
|
||||||
|
number,
|
||||||
|
url: `${REPO_URL}/pull/${number}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const squashMatches = message.match(/\(#(?<number>\d+)\)/g);
|
||||||
|
if (squashMatches) {
|
||||||
|
squashMatches.forEach((match) => {
|
||||||
|
const number = match.replace(/\D/g, '');
|
||||||
|
if (number) {
|
||||||
|
mergedPullRequests.set(number, {
|
||||||
|
number,
|
||||||
|
url: `${REPO_URL}/pull/${number}`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const author = commit?.author || commit?.committer;
|
||||||
|
const username = getGithubUsernameFromEmail(author?.email);
|
||||||
|
const displayName = username ? `@${username}` : author?.name;
|
||||||
|
|
||||||
|
if (!displayName || isBotIdentity(displayName)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (username && isBotIdentity(username)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
contributors.set(username || displayName, {
|
||||||
|
name: displayName,
|
||||||
|
url: username ? `${GITHUB_BASE_URL}/${username}` : undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const footerLines = [];
|
||||||
|
const sortedPullRequests = Array.from(mergedPullRequests.values()).sort(
|
||||||
|
(left, right) => Number(left.number) - Number(right.number),
|
||||||
|
);
|
||||||
|
if (sortedPullRequests.length > 0) {
|
||||||
|
footerLines.push('### 🔀 Merged Pull Requests');
|
||||||
|
sortedPullRequests.forEach((pullRequest) => {
|
||||||
|
footerLines.push(`- [#${pullRequest.number}](${pullRequest.url})`);
|
||||||
|
});
|
||||||
|
footerLines.push('');
|
||||||
|
}
|
||||||
|
|
||||||
|
const sortedContributors = Array.from(contributors.values()).sort((left, right) =>
|
||||||
|
left.name.localeCompare(right.name),
|
||||||
|
);
|
||||||
|
if (sortedContributors.length > 0) {
|
||||||
|
footerLines.push('### 🙌 Contributors');
|
||||||
|
sortedContributors.forEach((contributor) => {
|
||||||
|
if (contributor.url) {
|
||||||
|
footerLines.push(`- [${contributor.name}](${contributor.url})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
footerLines.push(`- ${contributor.name}`);
|
||||||
|
});
|
||||||
|
footerLines.push('');
|
||||||
|
}
|
||||||
|
|
||||||
|
footerLines.push(`Full Changelog: ${FULL_CHANGELOG_URL}`);
|
||||||
|
|
||||||
|
return footerLines.join('\n');
|
||||||
|
};
|
||||||
|
|
||||||
|
const appendReleaseNotes = (notes, commits) => {
|
||||||
|
const trimmedNotes = (notes || '').trimEnd();
|
||||||
|
const footer = buildReleaseFooter(commits);
|
||||||
|
|
||||||
|
if (!footer) {
|
||||||
|
return trimmedNotes;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${trimmedNotes}\n\n${footer}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const appendReleaseNotesPlugin = {
|
||||||
|
publish: async (pluginConfig, context) => {
|
||||||
|
if (!context?.nextRelease?.notes) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
context.nextRelease.notes = appendReleaseNotes(context.nextRelease.notes, context.commits);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const releaseConfig = {
|
||||||
|
branches: ['main', { name: 'beta', prerelease: true }],
|
||||||
|
plugins: [
|
||||||
|
[
|
||||||
|
'@semantic-release/commit-analyzer',
|
||||||
|
{
|
||||||
|
preset: 'conventionalcommits',
|
||||||
|
releaseRules: releaseRules,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'@semantic-release/release-notes-generator',
|
||||||
|
{
|
||||||
|
preset: 'conventionalcommits',
|
||||||
|
presetConfig: {
|
||||||
|
types: [
|
||||||
|
{ type: 'feat', section: '✨ Features' },
|
||||||
|
{ type: 'fix', section: '🐛 Bug Fixes' },
|
||||||
|
{ type: 'perf', section: '⚡ Performance Improvements' },
|
||||||
|
{ type: 'revert', section: '⏪ Reverts' },
|
||||||
|
{ type: 'docs', section: '📝 Documentation' },
|
||||||
|
{ type: 'style', section: '💄 Styles' },
|
||||||
|
{ type: 'refactor', section: '♻️ Code Refactoring' },
|
||||||
|
{ type: 'test', section: '✅ Tests' },
|
||||||
|
{ type: 'build', section: '👷 Build System' },
|
||||||
|
{ type: 'ci', section: '🔧 Continuous Integration' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'@semantic-release/changelog',
|
||||||
|
{
|
||||||
|
changelogFile: 'CHANGELOG.md',
|
||||||
|
changelogTitle: '<a name="readme-top"></a>\n\n# Changelog',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'@semantic-release/npm', // Updates package.json and npm-shrinkwrap.json
|
||||||
|
appendReleaseNotesPlugin,
|
||||||
|
[
|
||||||
|
'@semantic-release/github',
|
||||||
|
{
|
||||||
|
successComment: false,
|
||||||
|
failComment: false,
|
||||||
|
labels: false,
|
||||||
|
releaseName: 'v${nextRelease.version}',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'@semantic-release/git',
|
||||||
|
{
|
||||||
|
assets: ['CHANGELOG.md', 'package.json', 'package-lock.json', 'npm-shrinkwrap.json'],
|
||||||
|
message: 'chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
releaseConfig.__internal = {
|
||||||
|
appendReleaseNotes,
|
||||||
|
buildReleaseFooter,
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = releaseConfig;
|
||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
} from '@/components/ui/dropdown-menu';
|
} from '@/components/ui/dropdown-menu';
|
||||||
import { MoreVertical, Trash2, RefreshCw } from 'lucide-react';
|
import { MoreVertical, Trash2, RefreshCw } from 'lucide-react';
|
||||||
import { formatDistanceToNow } from 'date-fns';
|
import { formatDistanceToNow } from 'date-fns';
|
||||||
|
import { enUS, zhCN, ru } from 'date-fns/locale';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
@@ -32,7 +33,7 @@ export const AccountCard: React.FC<AccountCardProps> = ({
|
|||||||
isSwitching,
|
isSwitching,
|
||||||
isDeleting,
|
isDeleting,
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation();
|
const { t, i18n } = useTranslation();
|
||||||
const cardRef = useRef<HTMLDivElement>(null);
|
const cardRef = useRef<HTMLDivElement>(null);
|
||||||
const [transform, setTransform] = useState('');
|
const [transform, setTransform] = useState('');
|
||||||
const [glarePosition, setGlarePosition] = useState({ x: 50, y: 50 });
|
const [glarePosition, setGlarePosition] = useState({ x: 50, y: 50 });
|
||||||
@@ -136,6 +137,7 @@ export const AccountCard: React.FC<AccountCardProps> = ({
|
|||||||
{t('account.lastUsed', {
|
{t('account.lastUsed', {
|
||||||
time: formatDistanceToNow(new Date(account.last_used), {
|
time: formatDistanceToNow(new Date(account.last_used), {
|
||||||
addSuffix: true,
|
addSuffix: true,
|
||||||
|
locale: { en: enUS, 'zh-CN': zhCN, ru: ru }[i18n.language] || enUS,
|
||||||
}),
|
}),
|
||||||
})}
|
})}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import {
|
|||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
|
||||||
import { MoreVertical, Trash, RefreshCw, Box, Power } from 'lucide-react';
|
import { MoreVertical, Trash, RefreshCw, Box, Power } from 'lucide-react';
|
||||||
import { formatDistanceToNow } from 'date-fns';
|
import { formatDistanceToNow, differenceInMinutes, differenceInHours, isBefore } from 'date-fns';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
@@ -50,11 +50,64 @@ export function CloudAccountCard({
|
|||||||
|
|
||||||
// Helpers to get quota color
|
// Helpers to get quota color
|
||||||
const getQuotaColor = (percentage: number) => {
|
const getQuotaColor = (percentage: number) => {
|
||||||
if (percentage > 80) return 'text-green-500';
|
if (percentage > 80) {
|
||||||
if (percentage > 20) return 'text-yellow-500';
|
return 'text-green-500';
|
||||||
|
}
|
||||||
|
if (percentage > 20) {
|
||||||
|
return 'text-yellow-500';
|
||||||
|
}
|
||||||
return 'text-red-500';
|
return 'text-red-500';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const formatTimeRemaining = (dateStr: string) => {
|
||||||
|
const targetDate = new Date(dateStr);
|
||||||
|
if (Number.isNaN(targetDate.getTime())) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
if (isBefore(targetDate, now)) {
|
||||||
|
return '0h 0m';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate difference in hours and minutes
|
||||||
|
const diffHrs = differenceInHours(targetDate, now);
|
||||||
|
const diffMins = differenceInMinutes(targetDate, now) - diffHrs * 60;
|
||||||
|
if (diffHrs >= 24) {
|
||||||
|
const diffDays = Math.floor(diffHrs / 24);
|
||||||
|
const remainingHrs = diffHrs % 24;
|
||||||
|
return `${diffDays}d ${remainingHrs}h`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${diffHrs}h ${diffMins}m`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getResetTimeLabel = (resetTime?: string) => {
|
||||||
|
if (!resetTime) {
|
||||||
|
return t('cloud.card.resetUnknown');
|
||||||
|
}
|
||||||
|
|
||||||
|
const remaining = formatTimeRemaining(resetTime);
|
||||||
|
if (!remaining) {
|
||||||
|
return t('cloud.card.resetUnknown');
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${t('cloud.card.resetPrefix')}: ${remaining}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getResetTimeTitle = (resetTime?: string) => {
|
||||||
|
if (!resetTime) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const resetDate = new Date(resetTime);
|
||||||
|
if (Number.isNaN(resetDate.getTime())) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${t('cloud.card.resetTime')}: ${resetDate.toLocaleString()}`;
|
||||||
|
};
|
||||||
|
|
||||||
const modelQuotas = Object.entries(account.quota?.models || {});
|
const modelQuotas = Object.entries(account.quota?.models || {});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -169,15 +222,30 @@ export function CloudAccountCard({
|
|||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{modelQuotas.length > 0 ? (
|
{modelQuotas.length > 0 ? (
|
||||||
modelQuotas.map(([modelName, info]) => (
|
modelQuotas.map(([modelName, info]) => (
|
||||||
<div key={modelName} className="flex items-center justify-between text-sm">
|
<div
|
||||||
<span className="text-muted-foreground max-w-[120px] truncate" title={modelName}>
|
key={modelName}
|
||||||
|
className="hover:bg-muted/40 grid grid-cols-[minmax(0,1fr)_auto] items-start gap-3 rounded-md px-1.5 py-1 text-sm transition-colors"
|
||||||
|
>
|
||||||
|
<span className="text-muted-foreground min-w-0 truncate" title={modelName}>
|
||||||
{modelName.replace('models/', '')}
|
{modelName.replace('models/', '')}
|
||||||
</span>
|
</span>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex flex-col items-end gap-1">
|
||||||
<span className={`font-mono font-bold ${getQuotaColor(info.percentage)}`}>
|
<span
|
||||||
|
className="text-muted-foreground text-[10px] leading-none"
|
||||||
|
title={getResetTimeTitle(info.resetTime)}
|
||||||
|
>
|
||||||
|
{getResetTimeLabel(info.resetTime)}
|
||||||
|
</span>
|
||||||
|
<div className="flex items-baseline gap-1.5">
|
||||||
|
<span
|
||||||
|
className={`font-mono leading-none font-bold ${getQuotaColor(info.percentage)}`}
|
||||||
|
>
|
||||||
{info.percentage}%
|
{info.percentage}%
|
||||||
</span>
|
</span>
|
||||||
<span className="text-muted-foreground text-xs">{t('cloud.card.left')}</span>
|
<span className="text-muted-foreground text-[10px]">
|
||||||
|
{t('cloud.card.left')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))
|
))
|
||||||
|
|||||||
@@ -41,12 +41,13 @@ import { Input } from '@/components/ui/input';
|
|||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { getLocalizedErrorMessage } from '@/utils/errorMessages';
|
||||||
|
|
||||||
// ... (existing code: imports and comments)
|
// ... (existing code: imports and comments)
|
||||||
|
|
||||||
export function CloudAccountList() {
|
export function CloudAccountList() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { data: accounts, isLoading, isError } = useCloudAccounts();
|
const { data: accounts, isLoading, isError, error } = useCloudAccounts();
|
||||||
const refreshMutation = useRefreshQuota();
|
const refreshMutation = useRefreshQuota();
|
||||||
const deleteMutation = useDeleteCloudAccount();
|
const deleteMutation = useDeleteCloudAccount();
|
||||||
const addMutation = useAddGoogleAccount();
|
const addMutation = useAddGoogleAccount();
|
||||||
@@ -78,7 +79,7 @@ export function CloudAccountList() {
|
|||||||
onError: (err) => {
|
onError: (err) => {
|
||||||
toast({
|
toast({
|
||||||
title: t('cloud.toast.addFailed.title'),
|
title: t('cloud.toast.addFailed.title'),
|
||||||
description: err.message,
|
description: getLocalizedErrorMessage(err, t),
|
||||||
variant: 'destructive',
|
variant: 'destructive',
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -133,7 +134,7 @@ export function CloudAccountList() {
|
|||||||
onError: (err) =>
|
onError: (err) =>
|
||||||
toast({
|
toast({
|
||||||
title: t('cloud.toast.switchFailed'),
|
title: t('cloud.toast.switchFailed'),
|
||||||
description: err.message,
|
description: getLocalizedErrorMessage(err, t),
|
||||||
variant: 'destructive',
|
variant: 'destructive',
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
@@ -175,8 +176,15 @@ export function CloudAccountList() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleForcePoll = () => {
|
const handleForcePoll = () => {
|
||||||
|
if (forcePollMutation.isPending) return;
|
||||||
forcePollMutation.mutate(undefined, {
|
forcePollMutation.mutate(undefined, {
|
||||||
onSuccess: () => toast({ title: t('cloud.polling') }),
|
onSuccess: () => toast({ title: t('cloud.polling') }),
|
||||||
|
onError: (err) =>
|
||||||
|
toast({
|
||||||
|
title: t('cloud.toast.pollFailed'),
|
||||||
|
description: getLocalizedErrorMessage(err, t),
|
||||||
|
variant: 'destructive',
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -199,7 +207,7 @@ export function CloudAccountList() {
|
|||||||
onError: (err) => {
|
onError: (err) => {
|
||||||
toast({
|
toast({
|
||||||
title: t('cloud.toast.syncFailed.title'),
|
title: t('cloud.toast.syncFailed.title'),
|
||||||
description: err.message,
|
description: getLocalizedErrorMessage(err, t),
|
||||||
variant: 'destructive',
|
variant: 'destructive',
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -272,7 +280,13 @@ export function CloudAccountList() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isError) {
|
if (isError) {
|
||||||
return <div className="p-4 text-red-500">Failed to load cloud accounts.</div>;
|
const errorMessage = getLocalizedErrorMessage(error, t);
|
||||||
|
return (
|
||||||
|
<div className="p-4 text-red-500">
|
||||||
|
<div>{t('cloud.error.loadFailed')}</div>
|
||||||
|
<div className="mt-1 text-sm text-red-400">{errorMessage}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -380,7 +394,7 @@ export function CloudAccountList() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
<div className="grid gap-4 md:grid-cols-2 xl:grid-cols-3">
|
||||||
{accounts?.map((account) => (
|
{accounts?.map((account) => (
|
||||||
<CloudAccountCard
|
<CloudAccountCard
|
||||||
key={account.id}
|
key={account.id}
|
||||||
|
|||||||
@@ -3,10 +3,15 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
|||||||
import { isProcessRunning, startAntigravity, closeAntigravity } from '@/actions/process';
|
import { isProcessRunning, startAntigravity, closeAntigravity } from '@/actions/process';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { Play, Square, Loader2 } from 'lucide-react';
|
import { Play, Square, Loader2, Power } from 'lucide-react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
|
||||||
|
|
||||||
export const StatusBar: React.FC = () => {
|
interface StatusBarProps {
|
||||||
|
isCollapsed?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const StatusBar: React.FC<StatusBarProps> = ({ isCollapsed = false }) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
@@ -40,45 +45,101 @@ export const StatusBar: React.FC = () => {
|
|||||||
|
|
||||||
const isPending = startMutation.isPending || stopMutation.isPending;
|
const isPending = startMutation.isPending || stopMutation.isPending;
|
||||||
|
|
||||||
|
// Collapsed View
|
||||||
|
if (isCollapsed) {
|
||||||
|
return (
|
||||||
|
<div className="flex justify-center py-2">
|
||||||
|
<TooltipProvider>
|
||||||
|
<Tooltip delayDuration={0}>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={handleToggle}
|
||||||
|
disabled={isLoading || isPending}
|
||||||
|
className={cn(
|
||||||
|
'h-10 w-10 rounded-lg transition-all duration-300',
|
||||||
|
isRunning
|
||||||
|
? 'bg-green-100/50 text-green-700 hover:bg-green-100 hover:text-green-800 dark:bg-green-900/30 dark:text-green-400 dark:hover:bg-green-900/50'
|
||||||
|
: 'bg-red-100/50 text-red-700 hover:bg-red-100 hover:text-red-800 dark:bg-red-900/30 dark:text-red-400 dark:hover:bg-red-900/50',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{isPending ? (
|
||||||
|
<Loader2 className="h-5 w-5 animate-spin" />
|
||||||
|
) : (
|
||||||
|
<Power className="h-5 w-5" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="right" className="flex items-center gap-2">
|
||||||
|
<div
|
||||||
|
className={cn('h-2 w-2 rounded-full', isRunning ? 'bg-green-500' : 'bg-red-500')}
|
||||||
|
/>
|
||||||
|
<p>
|
||||||
|
{isLoading
|
||||||
|
? t('status.checking')
|
||||||
|
: isRunning
|
||||||
|
? t('status.running')
|
||||||
|
: t('status.stopped')}
|
||||||
|
</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</TooltipProvider>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expanded View
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex items-center justify-between px-4 py-2 text-sm font-medium transition-colors',
|
'flex items-center justify-between overflow-hidden rounded-lg px-3 py-2.5 text-sm font-medium ring-1 transition-colors ring-inset',
|
||||||
isRunning
|
isRunning
|
||||||
? 'bg-green-100 text-green-900 dark:bg-green-900/30 dark:text-green-100'
|
? 'bg-green-100 text-green-900 ring-green-200 dark:bg-green-900/20 dark:text-green-100 dark:ring-green-900/50'
|
||||||
: 'bg-red-100 text-red-900 dark:bg-red-900/30 dark:text-red-100',
|
: 'bg-red-100 text-red-900 ring-red-200 dark:bg-red-900/20 dark:text-red-100 dark:ring-red-900/50',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex flex-1 items-start gap-3">
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<Loader2 className="h-4 w-4 animate-spin" />
|
<Loader2 className="mt-0.5 h-3.5 w-3.5 shrink-0 animate-spin" />
|
||||||
) : isRunning ? (
|
) : isRunning ? (
|
||||||
<div className="h-3 w-3 rounded-full bg-green-500" />
|
<div className="mt-1.5 h-2.5 w-2.5 shrink-0 rounded-full bg-green-500 shadow-[0_0_8px_rgba(34,197,94,0.5)]" />
|
||||||
) : (
|
) : (
|
||||||
<div className="h-3 w-3 rounded-full bg-red-500" />
|
<div className="mt-1.5 h-2.5 w-2.5 shrink-0 rounded-full bg-red-500 shadow-[0_0_8px_rgba(239,68,68,0.5)]" />
|
||||||
)}
|
)}
|
||||||
<span>
|
<div className="flex flex-col gap-1 leading-none">
|
||||||
{isLoading ? t('status.checking') : isRunning ? t('status.running') : t('status.stopped')}
|
<span className="text-xs font-semibold tracking-wider uppercase opacity-80">Status</span>
|
||||||
|
<span className="text-sm leading-tight font-medium">
|
||||||
|
{isLoading
|
||||||
|
? t('status.checking')
|
||||||
|
: isRunning
|
||||||
|
? t('status.running')
|
||||||
|
: t('status.stopped')}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="sm"
|
size="sm"
|
||||||
onClick={handleToggle}
|
onClick={handleToggle}
|
||||||
disabled={isLoading || isPending}
|
disabled={isLoading || isPending}
|
||||||
className={cn(
|
className={cn(
|
||||||
'h-8 px-3 hover:bg-white/20',
|
'ml-2 h-8 shrink-0 rounded-md border px-3 transition-all',
|
||||||
isRunning ? 'hover:text-green-900' : 'hover:text-red-900',
|
isRunning
|
||||||
|
? 'border-green-200 bg-green-200/50 text-green-900 hover:bg-green-200 dark:border-green-800 dark:bg-green-800/30 dark:text-green-100 dark:hover:bg-green-800/50'
|
||||||
|
: 'border-red-200 bg-red-200/50 text-red-900 hover:bg-red-200 dark:border-red-800 dark:bg-red-800/30 dark:text-red-100 dark:hover:bg-red-800/50',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{isPending ? (
|
{isPending ? (
|
||||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
||||||
) : isRunning ? (
|
) : isRunning ? (
|
||||||
<Square className="mr-2 h-4 w-4 fill-current" />
|
<Square className="h-3.5 w-3.5 fill-current" />
|
||||||
) : (
|
) : (
|
||||||
<Play className="mr-2 h-4 w-4 fill-current" />
|
<Play className="h-3.5 w-3.5 fill-current" />
|
||||||
)}
|
)}
|
||||||
|
<span className="ml-2 font-semibold">
|
||||||
{isRunning ? t('action.stop') : t('action.start')}
|
{isRunning ? t('action.stop') : t('action.start')}
|
||||||
|
</span>
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import * as TooltipPrimitive from '@radix-ui/react-tooltip';
|
||||||
|
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
const TooltipProvider = TooltipPrimitive.Provider;
|
||||||
|
|
||||||
|
const Tooltip = TooltipPrimitive.Root;
|
||||||
|
|
||||||
|
const TooltipTrigger = TooltipPrimitive.Trigger;
|
||||||
|
|
||||||
|
const TooltipContent = React.forwardRef<
|
||||||
|
React.ElementRef<typeof TooltipPrimitive.Content>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
|
||||||
|
>(({ className, sideOffset = 4, ...props }, ref) => (
|
||||||
|
<TooltipPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
|
sideOffset={sideOffset}
|
||||||
|
className={cn(
|
||||||
|
'bg-popover text-popover-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 origin-[--radix-tooltip-content-transform-origin] overflow-hidden rounded-md border px-3 py-1.5 text-sm shadow-md',
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
));
|
||||||
|
TooltipContent.displayName = TooltipPrimitive.Content.displayName;
|
||||||
|
|
||||||
|
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
|
||||||
@@ -1,7 +1,12 @@
|
|||||||
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
import { useCallback, useEffect, useRef } from 'react';
|
||||||
|
|
||||||
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||||
|
|
||||||
|
import { toast } from '@/components/ui/use-toast';
|
||||||
import { ipc } from '@/ipc/manager';
|
import { ipc } from '@/ipc/manager';
|
||||||
import { AppConfig } from '@/types/config';
|
import { AppConfig } from '@/types/config';
|
||||||
import { toast } from '@/components/ui/use-toast';
|
|
||||||
|
const SAVE_DEBOUNCE_MS = 400;
|
||||||
|
|
||||||
export function useAppConfig() {
|
export function useAppConfig() {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@@ -20,28 +25,105 @@ export function useAppConfig() {
|
|||||||
const updateConfig = useMutation({
|
const updateConfig = useMutation({
|
||||||
mutationFn: async (newConfig: AppConfig) => {
|
mutationFn: async (newConfig: AppConfig) => {
|
||||||
await ipc.client.config.save(newConfig);
|
await ipc.client.config.save(newConfig);
|
||||||
|
return newConfig;
|
||||||
},
|
},
|
||||||
onSuccess: () => {
|
});
|
||||||
queryClient.invalidateQueries({ queryKey: ['appConfig'] });
|
|
||||||
|
const latestConfigRef = useRef<AppConfig | null>(null);
|
||||||
|
const lastStableConfigRef = useRef<AppConfig | null>(null);
|
||||||
|
const pendingResolversRef = useRef<
|
||||||
|
Array<{ resolve: () => void; reject: (error: Error) => void }>
|
||||||
|
>([]);
|
||||||
|
const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (config) {
|
||||||
|
lastStableConfigRef.current = config;
|
||||||
|
}
|
||||||
|
}, [config]);
|
||||||
|
|
||||||
|
const flushPendingSave = useCallback(async () => {
|
||||||
|
const pendingBatch = pendingResolversRef.current.splice(0);
|
||||||
|
const nextConfig = latestConfigRef.current;
|
||||||
|
if (!nextConfig) {
|
||||||
|
for (const item of pendingBatch) {
|
||||||
|
item.resolve();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const savedConfig = await updateConfig.mutateAsync(nextConfig);
|
||||||
|
queryClient.setQueryData(['appConfig'], savedConfig);
|
||||||
|
lastStableConfigRef.current = savedConfig;
|
||||||
toast({
|
toast({
|
||||||
title: 'Settings saved',
|
title: 'Settings saved',
|
||||||
description: 'Your configuration has been updated.',
|
description: 'Your configuration has been updated.',
|
||||||
});
|
});
|
||||||
},
|
for (const item of pendingBatch) {
|
||||||
onError: (err) => {
|
item.resolve();
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
const error = err instanceof Error ? err : new Error('Failed to save settings');
|
||||||
|
const fallback = lastStableConfigRef.current;
|
||||||
|
if (fallback) {
|
||||||
|
queryClient.setQueryData(['appConfig'], fallback);
|
||||||
|
} else {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['appConfig'] });
|
||||||
|
}
|
||||||
toast({
|
toast({
|
||||||
title: 'Error saving settings',
|
title: 'Error saving settings',
|
||||||
description: err.message,
|
description: error.message,
|
||||||
variant: 'destructive',
|
variant: 'destructive',
|
||||||
});
|
});
|
||||||
},
|
for (const item of pendingBatch) {
|
||||||
|
item.reject(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [queryClient, updateConfig]);
|
||||||
|
|
||||||
|
const saveConfig = useCallback(
|
||||||
|
(newConfig: AppConfig) => {
|
||||||
|
latestConfigRef.current = newConfig;
|
||||||
|
queryClient.setQueryData(['appConfig'], newConfig);
|
||||||
|
|
||||||
|
if (debounceTimerRef.current) {
|
||||||
|
clearTimeout(debounceTimerRef.current);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Promise<void>((resolve, reject) => {
|
||||||
|
pendingResolversRef.current.push({ resolve, reject });
|
||||||
|
debounceTimerRef.current = setTimeout(() => {
|
||||||
|
debounceTimerRef.current = null;
|
||||||
|
flushPendingSave();
|
||||||
|
}, SAVE_DEBOUNCE_MS);
|
||||||
});
|
});
|
||||||
|
},
|
||||||
|
[flushPendingSave, queryClient],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handleBeforeUnload = () => {
|
||||||
|
if (!debounceTimerRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
clearTimeout(debounceTimerRef.current);
|
||||||
|
debounceTimerRef.current = null;
|
||||||
|
void flushPendingSave();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('beforeunload', handleBeforeUnload);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('beforeunload', handleBeforeUnload);
|
||||||
|
handleBeforeUnload();
|
||||||
|
};
|
||||||
|
}, [flushPendingSave]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
config,
|
config,
|
||||||
isLoading,
|
isLoading,
|
||||||
error,
|
error,
|
||||||
saveConfig: updateConfig.mutateAsync,
|
saveConfig,
|
||||||
isSaving: updateConfig.isPending,
|
isSaving: updateConfig.isPending,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -47,12 +47,12 @@ export function useRefreshQuota() {
|
|||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: refreshAccountQuota,
|
mutationFn: refreshAccountQuota,
|
||||||
onSuccess: (updatedAccount: CloudAccount) => {
|
onSuccess: (updatedAccount: CloudAccount) => {
|
||||||
// Optimistically update the list or just invalidate?
|
// Optimistically update
|
||||||
// Invalidating is safer as sorting might change (last_used)
|
|
||||||
queryClient.setQueryData(QUERY_KEYS.cloudAccounts, (oldData: CloudAccount[] | undefined) => {
|
queryClient.setQueryData(QUERY_KEYS.cloudAccounts, (oldData: CloudAccount[] | undefined) => {
|
||||||
if (!oldData) return [updatedAccount];
|
if (!oldData) return [updatedAccount];
|
||||||
return oldData.map((acc) => (acc.id === updatedAccount.id ? updatedAccount : acc));
|
return oldData.map((acc) => (acc.id === updatedAccount.id ? updatedAccount : acc));
|
||||||
});
|
});
|
||||||
|
queryClient.invalidateQueries({ queryKey: QUERY_KEYS.cloudAccounts });
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -97,8 +97,12 @@ export function useSetAutoSwitchEnabled() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function useForcePollCloudMonitor() {
|
export function useForcePollCloudMonitor() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: forcePollCloudMonitor,
|
mutationFn: forcePollCloudMonitor,
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: QUERY_KEYS.cloudAccounts });
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import { app } from 'electron';
|
||||||
|
import * as Sentry from '@sentry/electron/main';
|
||||||
|
import path from 'path';
|
||||||
|
import fs from 'fs';
|
||||||
|
import { getAppDataDir } from './utils/paths';
|
||||||
|
import { logger } from './utils/logger';
|
||||||
|
|
||||||
|
function getQuickConfig() {
|
||||||
|
try {
|
||||||
|
const configPath = path.join(getAppDataDir(), 'gui_config.json');
|
||||||
|
if (fs.existsSync(configPath)) {
|
||||||
|
const content = fs.readFileSync(configPath, 'utf-8');
|
||||||
|
const config = JSON.parse(content);
|
||||||
|
// Default to false (privacy by default)
|
||||||
|
return config.error_reporting_enabled;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to read config for Sentry init:', e);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getQuickConfig()) {
|
||||||
|
Sentry.init({
|
||||||
|
dsn: process.env.SENTRY_DSN,
|
||||||
|
release: `antigravity-manager@${app.getVersion()}`,
|
||||||
|
beforeSend(event) {
|
||||||
|
if (event.exception?.values?.[0]?.value) {
|
||||||
|
event.exception.values[0].value = event.exception.values[0].value.replace(
|
||||||
|
/Users\\\\[^\\\\]+/g,
|
||||||
|
'Users\\\\***',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return event;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
logger.setErrorReportingEnabled(true);
|
||||||
|
logger.setSentryReporter((payload) => {
|
||||||
|
Sentry.withScope((scope) => {
|
||||||
|
scope.setTag('log_level', payload.level);
|
||||||
|
scope.setContext('recent_logs', {
|
||||||
|
entries: payload.logs.map((entry) => ({
|
||||||
|
timestamp: new Date(entry.timestamp).toISOString(),
|
||||||
|
level: entry.level,
|
||||||
|
message: entry.message,
|
||||||
|
formatted: entry.formatted,
|
||||||
|
})),
|
||||||
|
});
|
||||||
|
scope.setExtra('log_message', payload.message);
|
||||||
|
if (payload.error) {
|
||||||
|
Sentry.captureException(payload.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Sentry.captureMessage(payload.message, 'error');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
logger.setErrorReportingEnabled(false);
|
||||||
|
logger.setSentryReporter(null);
|
||||||
|
}
|
||||||
@@ -123,6 +123,8 @@ export async function refreshAccountQuota(accountId: string): Promise<CloudAccou
|
|||||||
const quota = await GoogleAPIService.fetchQuota(account.token.access_token);
|
const quota = await GoogleAPIService.fetchQuota(account.token.access_token);
|
||||||
account.quota = quota;
|
account.quota = quota;
|
||||||
await CloudAccountRepo.updateQuota(account.id, quota);
|
await CloudAccountRepo.updateQuota(account.id, quota);
|
||||||
|
await CloudAccountRepo.updateLastUsed(account.id);
|
||||||
|
account.last_used = Math.floor(Date.now() / 1000); // Sync memory object
|
||||||
notifyTrayUpdate(account);
|
notifyTrayUpdate(account);
|
||||||
return account;
|
return account;
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
@@ -143,6 +145,8 @@ export async function refreshAccountQuota(accountId: string): Promise<CloudAccou
|
|||||||
const quota = await GoogleAPIService.fetchQuota(account.token.access_token);
|
const quota = await GoogleAPIService.fetchQuota(account.token.access_token);
|
||||||
account.quota = quota;
|
account.quota = quota;
|
||||||
await CloudAccountRepo.updateQuota(account.id, quota);
|
await CloudAccountRepo.updateQuota(account.id, quota);
|
||||||
|
await CloudAccountRepo.updateLastUsed(account.id);
|
||||||
|
account.last_used = Math.floor(Date.now() / 1000); // Sync memory object
|
||||||
return account;
|
return account;
|
||||||
} catch (refreshError) {
|
} catch (refreshError) {
|
||||||
logger.error(
|
logger.error(
|
||||||
|
|||||||
@@ -1,13 +1,20 @@
|
|||||||
import { AppConfig } from '../../types/config';
|
import { AppConfig } from '../../types/config';
|
||||||
import { ConfigManager } from './manager';
|
import { ConfigManager } from './manager';
|
||||||
|
import { syncAutoStart } from '../../utils/autoStart';
|
||||||
|
import { logger } from '../../utils/logger';
|
||||||
|
|
||||||
export function loadConfig(): AppConfig {
|
export function loadConfig(): AppConfig {
|
||||||
return ConfigManager.loadConfig();
|
return ConfigManager.loadConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function saveConfig(config: AppConfig): void {
|
export async function saveConfig(config: AppConfig): Promise<void> {
|
||||||
// Logic to notify proxy server if configuration changes (hot update)
|
// Logic to notify proxy server if configuration changes (hot update)
|
||||||
// Logic to update Tray if language changes
|
// Logic to update Tray if language changes
|
||||||
// For now just save
|
// For now just save
|
||||||
ConfigManager.saveConfig(config);
|
const previous = ConfigManager.getCachedConfig() ?? ConfigManager.loadConfig();
|
||||||
|
await ConfigManager.saveConfig(config);
|
||||||
|
logger.setErrorReportingEnabled(config.error_reporting_enabled);
|
||||||
|
if (previous.auto_startup !== config.auto_startup) {
|
||||||
|
syncAutoStart(config);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -7,6 +7,9 @@ import { logger } from '../../utils/logger';
|
|||||||
const CONFIG_FILENAME = 'gui_config.json';
|
const CONFIG_FILENAME = 'gui_config.json';
|
||||||
|
|
||||||
export class ConfigManager {
|
export class ConfigManager {
|
||||||
|
private static cachedConfig: AppConfig | null = null;
|
||||||
|
private static saveQueue: Promise<void> = Promise.resolve();
|
||||||
|
|
||||||
private static getConfigPath(): string {
|
private static getConfigPath(): string {
|
||||||
const appDataDir = getAppDataDir();
|
const appDataDir = getAppDataDir();
|
||||||
if (!fs.existsSync(appDataDir)) {
|
if (!fs.existsSync(appDataDir)) {
|
||||||
@@ -20,6 +23,7 @@ export class ConfigManager {
|
|||||||
const configPath = this.getConfigPath();
|
const configPath = this.getConfigPath();
|
||||||
if (!fs.existsSync(configPath)) {
|
if (!fs.existsSync(configPath)) {
|
||||||
logger.info(`Config: File not found at ${configPath}, returning default`);
|
logger.info(`Config: File not found at ${configPath}, returning default`);
|
||||||
|
this.cachedConfig = DEFAULT_APP_CONFIG;
|
||||||
return DEFAULT_APP_CONFIG;
|
return DEFAULT_APP_CONFIG;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +32,7 @@ export class ConfigManager {
|
|||||||
|
|
||||||
// Merge with default to ensure new fields are present
|
// Merge with default to ensure new fields are present
|
||||||
// Zod parse helps validate
|
// Zod parse helps validate
|
||||||
const merged = {
|
const merged: AppConfig = {
|
||||||
...DEFAULT_APP_CONFIG,
|
...DEFAULT_APP_CONFIG,
|
||||||
...raw,
|
...raw,
|
||||||
proxy: { ...DEFAULT_APP_CONFIG.proxy, ...(raw.proxy || {}) },
|
proxy: { ...DEFAULT_APP_CONFIG.proxy, ...(raw.proxy || {}) },
|
||||||
@@ -45,22 +49,35 @@ export class ConfigManager {
|
|||||||
// Handle Anthropic Mapping Map vs Object
|
// Handle Anthropic Mapping Map vs Object
|
||||||
// In JSON it's object
|
// In JSON it's object
|
||||||
|
|
||||||
return merged as AppConfig;
|
this.cachedConfig = merged;
|
||||||
|
return merged;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error('Config: Failed to load config', e);
|
logger.error('Config: Failed to load config', e);
|
||||||
|
this.cachedConfig = DEFAULT_APP_CONFIG;
|
||||||
return DEFAULT_APP_CONFIG;
|
return DEFAULT_APP_CONFIG;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static saveConfig(config: AppConfig): void {
|
static getCachedConfig(): AppConfig | null {
|
||||||
try {
|
return this.cachedConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
static async saveConfig(config: AppConfig): Promise<void> {
|
||||||
const configPath = this.getConfigPath();
|
const configPath = this.getConfigPath();
|
||||||
const content = JSON.stringify(config, null, 2);
|
const content = JSON.stringify(config, null, 2);
|
||||||
fs.writeFileSync(configPath, content, 'utf-8');
|
|
||||||
|
this.saveQueue = this.saveQueue
|
||||||
|
.catch(() => undefined)
|
||||||
|
.then(async () => {
|
||||||
|
await fs.promises.writeFile(configPath, content, 'utf-8');
|
||||||
|
this.cachedConfig = config;
|
||||||
logger.info(`Config: Saved to ${configPath}`);
|
logger.info(`Config: Saved to ${configPath}`);
|
||||||
} catch (e) {
|
})
|
||||||
|
.catch((e) => {
|
||||||
logger.error('Config: Failed to save config', e);
|
logger.error('Config: Failed to save config', e);
|
||||||
throw e;
|
throw e;
|
||||||
}
|
});
|
||||||
|
|
||||||
|
return this.saveQueue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,6 @@ export const configRouter = os.router({
|
|||||||
.input(AppConfigSchema)
|
.input(AppConfigSchema)
|
||||||
.output(z.void())
|
.output(z.void())
|
||||||
.handler(async ({ input }) => {
|
.handler(async ({ input }) => {
|
||||||
saveConfig(input);
|
await saveConfig(input);
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
|
|||||||
import { getCloudAccountsDbPath, getAntigravityDbPaths } from '../../utils/paths';
|
import { getCloudAccountsDbPath, getAntigravityDbPaths } from '../../utils/paths';
|
||||||
import { logger } from '../../utils/logger';
|
import { logger } from '../../utils/logger';
|
||||||
import { CloudAccount } from '../../types/cloudAccount';
|
import { CloudAccount } from '../../types/cloudAccount';
|
||||||
import { encrypt, decrypt } from '../../utils/security';
|
import { decryptWithMigration, encrypt, type KeySource } from '../../utils/security';
|
||||||
import { ProtobufUtils } from '../../utils/protobuf';
|
import { ProtobufUtils } from '../../utils/protobuf';
|
||||||
import { GoogleAPIService } from '../../services/GoogleAPIService';
|
import { GoogleAPIService } from '../../services/GoogleAPIService';
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ function ensureDatabaseInitialized(dbPath: string): void {
|
|||||||
let db: Database.Database | null = null;
|
let db: Database.Database | null = null;
|
||||||
try {
|
try {
|
||||||
db = new Database(dbPath);
|
db = new Database(dbPath);
|
||||||
|
db.pragma('journal_mode = WAL');
|
||||||
|
|
||||||
// Create accounts table
|
// Create accounts table
|
||||||
// Storing complex objects (token, quota) as JSON strings for simplicity
|
// Storing complex objects (token, quota) as JSON strings for simplicity
|
||||||
@@ -73,9 +74,70 @@ function ensureDatabaseInitialized(dbPath: string): void {
|
|||||||
function getDb(): Database.Database {
|
function getDb(): Database.Database {
|
||||||
const dbPath = getCloudAccountsDbPath();
|
const dbPath = getCloudAccountsDbPath();
|
||||||
ensureDatabaseInitialized(dbPath);
|
ensureDatabaseInitialized(dbPath);
|
||||||
return new Database(dbPath);
|
const db = new Database(dbPath);
|
||||||
|
db.pragma('journal_mode = WAL');
|
||||||
|
return db;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface MigrationStats {
|
||||||
|
totalFields: number;
|
||||||
|
fallbackUsedFields: number;
|
||||||
|
migratedFields: number;
|
||||||
|
migratedBySource: Record<KeySource, number>;
|
||||||
|
failedFields: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createMigrationStats(): MigrationStats {
|
||||||
|
return {
|
||||||
|
totalFields: 0,
|
||||||
|
fallbackUsedFields: 0,
|
||||||
|
migratedFields: 0,
|
||||||
|
migratedBySource: {
|
||||||
|
safeStorage: 0,
|
||||||
|
keytar: 0,
|
||||||
|
file: 0,
|
||||||
|
},
|
||||||
|
failedFields: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function decryptAndMigrateField(
|
||||||
|
db: Database.Database,
|
||||||
|
accountId: string,
|
||||||
|
field: 'token_json' | 'quota_json',
|
||||||
|
value: string | null,
|
||||||
|
): Promise<{ value: string | null; migrated: boolean; usedFallback?: KeySource }> {
|
||||||
|
if (!value) {
|
||||||
|
return { value: null, migrated: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await decryptWithMigration(value);
|
||||||
|
if (result.reencrypted) {
|
||||||
|
if (field === 'token_json') {
|
||||||
|
db.prepare('UPDATE accounts SET token_json = ? WHERE id = ?').run(
|
||||||
|
result.reencrypted,
|
||||||
|
accountId,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
db.prepare('UPDATE accounts SET quota_json = ? WHERE id = ?').run(
|
||||||
|
result.reencrypted,
|
||||||
|
accountId,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
logger.info(
|
||||||
|
`Migrated ${field} for account ${accountId} from ${result.usedFallback ?? 'unknown'} key`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
value: result.value,
|
||||||
|
migrated: Boolean(result.reencrypted),
|
||||||
|
usedFallback: result.usedFallback,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
type DecryptFieldResult = Awaited<ReturnType<typeof decryptAndMigrateField>>;
|
||||||
|
|
||||||
export class CloudAccountRepo {
|
export class CloudAccountRepo {
|
||||||
static async init(): Promise<void> {
|
static async init(): Promise<void> {
|
||||||
const dbPath = getCloudAccountsDbPath();
|
const dbPath = getCloudAccountsDbPath();
|
||||||
@@ -168,6 +230,7 @@ export class CloudAccountRepo {
|
|||||||
|
|
||||||
static async getAccounts(): Promise<CloudAccount[]> {
|
static async getAccounts(): Promise<CloudAccount[]> {
|
||||||
const db = getDb();
|
const db = getDb();
|
||||||
|
const migrationStats = createMigrationStats();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const stmt = db.prepare('SELECT * FROM accounts ORDER BY last_used DESC');
|
const stmt = db.prepare('SELECT * FROM accounts ORDER BY last_used DESC');
|
||||||
@@ -180,24 +243,91 @@ export class CloudAccountRepo {
|
|||||||
);
|
);
|
||||||
activeRows.forEach((r) => logger.info(`[DEBUG] Active Account: ${r.email} (${r.id})`));
|
activeRows.forEach((r) => logger.info(`[DEBUG] Active Account: ${r.email} (${r.id})`));
|
||||||
|
|
||||||
const accounts = await Promise.all(
|
const accounts: CloudAccount[] = [];
|
||||||
rows.map(async (row) => ({
|
for (const row of rows) {
|
||||||
|
let tokenResult: DecryptFieldResult;
|
||||||
|
try {
|
||||||
|
tokenResult = await decryptAndMigrateField(db, row.id, 'token_json', row.token_json);
|
||||||
|
} catch (error) {
|
||||||
|
migrationStats.failedFields += 1;
|
||||||
|
logger.error(`Failed to decrypt token for account ${row.id}`, error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
let quotaResult: DecryptFieldResult;
|
||||||
|
try {
|
||||||
|
quotaResult = await decryptAndMigrateField(db, row.id, 'quota_json', row.quota_json);
|
||||||
|
} catch (error) {
|
||||||
|
migrationStats.failedFields += 1;
|
||||||
|
logger.error(`Failed to decrypt quota for account ${row.id}`, error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!tokenResult.value) {
|
||||||
|
throw new Error(`Missing token data for account ${row.id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokenResult.value) {
|
||||||
|
migrationStats.totalFields += 1;
|
||||||
|
}
|
||||||
|
if (tokenResult.usedFallback) {
|
||||||
|
migrationStats.fallbackUsedFields += 1;
|
||||||
|
}
|
||||||
|
if (tokenResult.migrated) {
|
||||||
|
migrationStats.migratedFields += 1;
|
||||||
|
if (tokenResult.usedFallback) {
|
||||||
|
migrationStats.migratedBySource[tokenResult.usedFallback] += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (quotaResult.value) {
|
||||||
|
migrationStats.totalFields += 1;
|
||||||
|
}
|
||||||
|
if (quotaResult.usedFallback) {
|
||||||
|
migrationStats.fallbackUsedFields += 1;
|
||||||
|
}
|
||||||
|
if (quotaResult.migrated) {
|
||||||
|
migrationStats.migratedFields += 1;
|
||||||
|
if (quotaResult.usedFallback) {
|
||||||
|
migrationStats.migratedBySource[quotaResult.usedFallback] += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
accounts.push({
|
||||||
id: row.id,
|
id: row.id,
|
||||||
provider: row.provider,
|
provider: row.provider,
|
||||||
email: row.email,
|
email: row.email,
|
||||||
name: row.name,
|
name: row.name,
|
||||||
avatar_url: row.avatar_url,
|
avatar_url: row.avatar_url,
|
||||||
token: JSON.parse(await decrypt(row.token_json)),
|
token: JSON.parse(tokenResult.value),
|
||||||
quota: row.quota_json ? JSON.parse(await decrypt(row.quota_json)) : undefined,
|
quota: quotaResult.value ? JSON.parse(quotaResult.value) : undefined,
|
||||||
created_at: row.created_at,
|
created_at: row.created_at,
|
||||||
last_used: row.last_used,
|
last_used: row.last_used,
|
||||||
status: row.status,
|
status: row.status,
|
||||||
is_active: Boolean(row.is_active),
|
is_active: Boolean(row.is_active),
|
||||||
})),
|
});
|
||||||
);
|
}
|
||||||
|
|
||||||
return accounts;
|
return accounts;
|
||||||
} finally {
|
} finally {
|
||||||
|
if (
|
||||||
|
migrationStats.migratedFields > 0 ||
|
||||||
|
migrationStats.fallbackUsedFields > 0 ||
|
||||||
|
migrationStats.failedFields > 0
|
||||||
|
) {
|
||||||
|
const summary = {
|
||||||
|
totalFields: migrationStats.totalFields,
|
||||||
|
fallbackUsedFields: migrationStats.fallbackUsedFields,
|
||||||
|
migratedFields: migrationStats.migratedFields,
|
||||||
|
migratedBySource: migrationStats.migratedBySource,
|
||||||
|
failedFields: migrationStats.failedFields,
|
||||||
|
};
|
||||||
|
if (migrationStats.failedFields > 0) {
|
||||||
|
logger.warn('CloudAccountRepo migration summary (with failures)', summary);
|
||||||
|
} else {
|
||||||
|
logger.info('CloudAccountRepo migration summary', summary);
|
||||||
|
}
|
||||||
|
}
|
||||||
db.close();
|
db.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -211,14 +341,21 @@ export class CloudAccountRepo {
|
|||||||
|
|
||||||
if (!row) return undefined;
|
if (!row) return undefined;
|
||||||
|
|
||||||
|
const tokenResult = await decryptAndMigrateField(db, row.id, 'token_json', row.token_json);
|
||||||
|
const quotaResult = await decryptAndMigrateField(db, row.id, 'quota_json', row.quota_json);
|
||||||
|
|
||||||
|
if (!tokenResult.value) {
|
||||||
|
throw new Error(`Missing token data for account ${row.id}`);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
provider: row.provider,
|
provider: row.provider,
|
||||||
email: row.email,
|
email: row.email,
|
||||||
name: row.name,
|
name: row.name,
|
||||||
avatar_url: row.avatar_url,
|
avatar_url: row.avatar_url,
|
||||||
token: JSON.parse(await decrypt(row.token_json)),
|
token: JSON.parse(tokenResult.value),
|
||||||
quota: row.quota_json ? JSON.parse(await decrypt(row.quota_json)) : undefined,
|
quota: quotaResult.value ? JSON.parse(quotaResult.value) : undefined,
|
||||||
created_at: row.created_at,
|
created_at: row.created_at,
|
||||||
last_used: row.last_used,
|
last_used: row.last_used,
|
||||||
status: row.status,
|
status: row.status,
|
||||||
@@ -293,20 +430,14 @@ export class CloudAccountRepo {
|
|||||||
|
|
||||||
static injectCloudToken(account: CloudAccount): void {
|
static injectCloudToken(account: CloudAccount): void {
|
||||||
const dbPaths = getAntigravityDbPaths();
|
const dbPaths = getAntigravityDbPaths();
|
||||||
let dbPath: string | null = null;
|
const dbPath = dbPaths.find((p) => fs.existsSync(p)) ?? null;
|
||||||
|
|
||||||
for (const p of dbPaths) {
|
|
||||||
if (fs.existsSync(p)) {
|
|
||||||
dbPath = p;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbPath) {
|
if (!dbPath) {
|
||||||
throw new Error(`Antigravity database not found. Checked paths: ${dbPaths.join(', ')}`);
|
throw new Error(`Antigravity database not found. Checked paths: ${dbPaths.join(', ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const db = new Database(dbPath);
|
const db = new Database(dbPath);
|
||||||
|
db.pragma('journal_mode = WAL');
|
||||||
try {
|
try {
|
||||||
const row = db
|
const row = db
|
||||||
.prepare('SELECT value FROM ItemTable WHERE key = ?')
|
.prepare('SELECT value FROM ItemTable WHERE key = ?')
|
||||||
@@ -437,14 +568,11 @@ export class CloudAccountRepo {
|
|||||||
const dbPaths = getAntigravityDbPaths();
|
const dbPaths = getAntigravityDbPaths();
|
||||||
logger.info(`SyncLocal: Checking database paths: ${JSON.stringify(dbPaths)}`);
|
logger.info(`SyncLocal: Checking database paths: ${JSON.stringify(dbPaths)}`);
|
||||||
|
|
||||||
let dbPath: string | null = null;
|
const dbPath =
|
||||||
for (const p of dbPaths) {
|
dbPaths.find((p) => {
|
||||||
logger.info(`SyncLocal: Checking path: ${p}, exists: ${fs.existsSync(p)}`);
|
logger.info(`SyncLocal: Checking path: ${p}, exists: ${fs.existsSync(p)}`);
|
||||||
if (fs.existsSync(p)) {
|
return fs.existsSync(p);
|
||||||
dbPath = p;
|
}) ?? null;
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dbPath) {
|
if (!dbPath) {
|
||||||
const errorMsg = `Antigravity database not found. Please ensure Antigravity IDE is installed. Checked paths: ${dbPaths.join(', ')}`;
|
const errorMsg = `Antigravity database not found. Please ensure Antigravity IDE is installed. Checked paths: ${dbPaths.join(', ')}`;
|
||||||
@@ -454,6 +582,7 @@ export class CloudAccountRepo {
|
|||||||
|
|
||||||
logger.info(`SyncLocal: Using Antigravity database at: ${dbPath}`);
|
logger.info(`SyncLocal: Using Antigravity database at: ${dbPath}`);
|
||||||
const ideDb = new Database(dbPath, { readonly: true });
|
const ideDb = new Database(dbPath, { readonly: true });
|
||||||
|
ideDb.pragma('journal_mode = WAL');
|
||||||
try {
|
try {
|
||||||
// 1. Read Raw Token Data
|
// 1. Read Raw Token Data
|
||||||
const row = ideDb
|
const row = ideDb
|
||||||
|
|||||||
@@ -8,6 +8,31 @@ import path from 'path';
|
|||||||
|
|
||||||
const KEYS_TO_BACKUP = ['antigravityAuthStatus', 'jetskiStateSync.agentManagerInitState'];
|
const KEYS_TO_BACKUP = ['antigravityAuthStatus', 'jetskiStateSync.agentManagerInitState'];
|
||||||
|
|
||||||
|
function getDbWithWal(dbPath: string, options: Database.Options = {}): Database.Database {
|
||||||
|
const db = new Database(dbPath, options);
|
||||||
|
db.pragma('journal_mode = WAL');
|
||||||
|
return db;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the database and ensures WAL mode is enabled.
|
||||||
|
* Should be called on application startup.
|
||||||
|
*/
|
||||||
|
export function initDatabase(): void {
|
||||||
|
try {
|
||||||
|
const dbPaths = getAntigravityDbPaths();
|
||||||
|
if (dbPaths.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const db = getDatabaseConnection();
|
||||||
|
db.close();
|
||||||
|
logger.info('Database initialized and verified (WAL mode)');
|
||||||
|
} catch (error) {
|
||||||
|
logger.error('Failed to initialize database on startup', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensures that the database file exists.
|
* Ensures that the database file exists.
|
||||||
* @param dbPath {string} The path to the database file.
|
* @param dbPath {string} The path to the database file.
|
||||||
@@ -59,7 +84,7 @@ export function getDatabaseConnection(dbPath?: string): Database.Database {
|
|||||||
ensureDatabaseExists(targetPath);
|
ensureDatabaseExists(targetPath);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return new Database(targetPath, { readonly: false, fileMustExist: false });
|
return getDbWithWal(targetPath, { readonly: false, fileMustExist: false });
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
const err = error as { code?: string };
|
const err = error as { code?: string };
|
||||||
if (err.code === 'SQLITE_BUSY' || err.code === 'SQLITE_LOCKED') {
|
if (err.code === 'SQLITE_BUSY' || err.code === 'SQLITE_LOCKED') {
|
||||||
@@ -69,6 +94,12 @@ export function getDatabaseConnection(dbPath?: string): Database.Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets a database connection and enables WAL mode.
|
||||||
|
* @param dbPath {string} The path to the database file.
|
||||||
|
* @returns {Database.Database} The database connection.
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the current account info.
|
* Gets the current account info.
|
||||||
* @returns {AccountInfo} The current account info.
|
* @returns {AccountInfo} The current account info.
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export const generateApiKey = async (): Promise<string> => {
|
|||||||
// Save to config
|
// Save to config
|
||||||
const config = ConfigManager.loadConfig();
|
const config = ConfigManager.loadConfig();
|
||||||
config.proxy.api_key = newKey;
|
config.proxy.api_key = newKey;
|
||||||
ConfigManager.saveConfig(config);
|
await ConfigManager.saveConfig(config);
|
||||||
|
|
||||||
return newKey;
|
return newKey;
|
||||||
};
|
};
|
||||||
+1
-1
@@ -78,7 +78,7 @@ function createIPCClient(port: MessagePort) {
|
|||||||
pendingRequests.delete(id);
|
pendingRequests.delete(id);
|
||||||
reject(new Error(`Request /${methodPath} timed out`));
|
reject(new Error(`Request /${methodPath} timed out`));
|
||||||
}
|
}
|
||||||
}, 10000);
|
}, 60000);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { exec, execSync } from 'child_process';
|
import { exec, execSync } from 'child_process';
|
||||||
import { promisify } from 'util';
|
import { promisify } from 'util';
|
||||||
import findProcess from 'find-process';
|
import findProcess, { ProcessInfo } from 'find-process';
|
||||||
import { getAntigravityExecutablePath, isWsl } from '../../utils/paths';
|
import { getAntigravityExecutablePath, isWsl } from '../../utils/paths';
|
||||||
import { logger } from '../../utils/logger';
|
import { logger } from '../../utils/logger';
|
||||||
|
|
||||||
@@ -51,6 +51,17 @@ function isHelperProcess(name: string, cmd: string): boolean {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isPgrepNoMatchError(error: unknown): boolean {
|
||||||
|
if (!(error instanceof Error)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const message = error.message.toLowerCase();
|
||||||
|
const hasPgrep = message.includes('pgrep') && message.includes('antigravity');
|
||||||
|
const code = (error as { code?: number }).code;
|
||||||
|
return hasPgrep && code === 1;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the Antigravity process is running.
|
* Checks if the Antigravity process is running.
|
||||||
* Uses find-process package for robust cross-platform process detection.
|
* Uses find-process package for robust cross-platform process detection.
|
||||||
@@ -63,9 +74,33 @@ export async function isProcessRunning(): Promise<boolean> {
|
|||||||
|
|
||||||
// Use find-process to search for Antigravity processes
|
// Use find-process to search for Antigravity processes
|
||||||
// 'name' search type matches process name
|
// 'name' search type matches process name
|
||||||
const processes = await findProcess('name', 'Antigravity', true);
|
const processMap = new Map<number, ProcessInfo>();
|
||||||
|
const searchNames = ['Antigravity', 'antigravity'];
|
||||||
|
let sawNoMatch = false;
|
||||||
|
|
||||||
logger.debug(`Found ${processes.length} processes matching 'Antigravity'`);
|
for (const searchName of searchNames) {
|
||||||
|
try {
|
||||||
|
const matches = await findProcess('name', searchName, true);
|
||||||
|
for (const proc of matches) {
|
||||||
|
if (typeof proc.pid === 'number') {
|
||||||
|
processMap.set(proc.pid, proc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (isPgrepNoMatchError(error)) {
|
||||||
|
sawNoMatch = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const processes = Array.from(processMap.values());
|
||||||
|
if (processes.length === 0 && sawNoMatch) {
|
||||||
|
logger.debug('No Antigravity process found (pgrep returned 1)');
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.debug(`Found ${processes.length} processes matching 'Antigravity/antigravity'`);
|
||||||
|
|
||||||
for (const proc of processes) {
|
for (const proc of processes) {
|
||||||
// Skip self
|
// Skip self
|
||||||
|
|||||||
+96
-16
@@ -1,14 +1,34 @@
|
|||||||
import React from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { Link, Outlet, useLocation } from '@tanstack/react-router';
|
import { Link, Outlet, useLocation } from '@tanstack/react-router';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { StatusBar } from '@/components/StatusBar';
|
import { StatusBar } from '@/components/StatusBar';
|
||||||
import { LayoutDashboard, Settings, Network, Rocket } from 'lucide-react';
|
import {
|
||||||
|
LayoutDashboard,
|
||||||
|
Settings,
|
||||||
|
Network,
|
||||||
|
Rocket,
|
||||||
|
ChevronLeft,
|
||||||
|
ChevronRight,
|
||||||
|
} from 'lucide-react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
|
||||||
|
|
||||||
export const MainLayout: React.FC = () => {
|
export const MainLayout: React.FC = () => {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
// Initialize state from localStorage if available, default to false (expanded)
|
||||||
|
const [isCollapsed, setIsCollapsed] = useState(() => {
|
||||||
|
const saved = localStorage.getItem('sidebar-collapsed');
|
||||||
|
return saved ? JSON.parse(saved) : false;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Persist state changes
|
||||||
|
useEffect(() => {
|
||||||
|
localStorage.setItem('sidebar-collapsed', JSON.stringify(isCollapsed));
|
||||||
|
}, [isCollapsed]);
|
||||||
|
|
||||||
const navItems = [
|
const navItems = [
|
||||||
{
|
{
|
||||||
to: '/',
|
to: '/',
|
||||||
@@ -31,25 +51,83 @@ export const MainLayout: React.FC = () => {
|
|||||||
<div className="bg-background text-foreground flex h-screen flex-col overflow-hidden">
|
<div className="bg-background text-foreground flex h-screen flex-col overflow-hidden">
|
||||||
<div className="flex flex-1 overflow-hidden">
|
<div className="flex flex-1 overflow-hidden">
|
||||||
{/* Sidebar */}
|
{/* Sidebar */}
|
||||||
<aside className="bg-muted/10 flex w-64 flex-col border-r">
|
<aside
|
||||||
<div className="p-6">
|
className={cn(
|
||||||
<h1 className="flex items-center gap-2 text-xl font-bold tracking-tight">
|
'bg-muted/10 group relative flex flex-col border-r transition-all duration-300 ease-in-out',
|
||||||
<div className="bg-primary text-primary-foreground flex h-6 w-6 items-center justify-center rounded">
|
isCollapsed ? 'w-[70px]' : 'w-64',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="bg-background hover:bg-accent hover:text-accent-foreground absolute top-6 -right-3 z-10 h-6 w-6 rounded-full border opacity-0 shadow-md transition-opacity group-hover:opacity-100"
|
||||||
|
onClick={() => setIsCollapsed(!isCollapsed)}
|
||||||
|
>
|
||||||
|
{isCollapsed ? (
|
||||||
|
<ChevronRight className="h-3 w-3" />
|
||||||
|
) : (
|
||||||
|
<ChevronLeft className="h-3 w-3" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div className={cn('flex flex-col', isCollapsed ? 'items-center p-4' : 'p-6')}>
|
||||||
|
<div className="flex items-center gap-2 overflow-hidden whitespace-nowrap">
|
||||||
|
<div className="bg-primary text-primary-foreground flex h-6 w-6 shrink-0 items-center justify-center rounded">
|
||||||
<Rocket className="h-4 w-4" />
|
<Rocket className="h-4 w-4" />
|
||||||
</div>
|
</div>
|
||||||
Antigravity
|
<div
|
||||||
</h1>
|
className={cn(
|
||||||
<p className="text-muted-foreground mt-1 text-xs">Manager</p>
|
'overflow-hidden transition-all duration-300',
|
||||||
|
isCollapsed ? 'w-0 opacity-0' : 'w-auto opacity-100',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<h1 className="text-xl font-bold tracking-tight">Antigravity</h1>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
'text-muted-foreground mt-1 overflow-hidden text-xs whitespace-nowrap transition-all duration-300',
|
||||||
|
isCollapsed ? 'h-0 opacity-0' : 'h-auto opacity-100',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
Manager
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav className="flex-1 space-y-2 px-4">
|
<nav className="flex-1 space-y-2 px-2">
|
||||||
{navItems.map((item) => (
|
<TooltipProvider>
|
||||||
|
{navItems.map((item) => {
|
||||||
|
const isActive = location.pathname === item.to;
|
||||||
|
|
||||||
|
if (isCollapsed) {
|
||||||
|
return (
|
||||||
|
<Tooltip key={item.to} delayDuration={0}>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Link
|
||||||
|
to={item.to}
|
||||||
|
className={cn(
|
||||||
|
'mx-auto flex h-10 w-10 items-center justify-center rounded-md transition-colors',
|
||||||
|
isActive
|
||||||
|
? 'bg-primary text-primary-foreground'
|
||||||
|
: 'hover:bg-muted text-muted-foreground hover:text-foreground',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<item.icon className="h-5 w-5" />
|
||||||
|
<span className="sr-only">{item.label}</span>
|
||||||
|
</Link>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="right">{item.label}</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
<Link
|
<Link
|
||||||
key={item.to}
|
key={item.to}
|
||||||
to={item.to}
|
to={item.to}
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',
|
'flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',
|
||||||
location.pathname === item.to
|
isActive
|
||||||
? 'bg-primary text-primary-foreground'
|
? 'bg-primary text-primary-foreground'
|
||||||
: 'hover:bg-muted text-muted-foreground hover:text-foreground',
|
: 'hover:bg-muted text-muted-foreground hover:text-foreground',
|
||||||
)}
|
)}
|
||||||
@@ -57,16 +135,18 @@ export const MainLayout: React.FC = () => {
|
|||||||
<item.icon className="h-4 w-4" />
|
<item.icon className="h-4 w-4" />
|
||||||
{item.label}
|
{item.label}
|
||||||
</Link>
|
</Link>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
|
</TooltipProvider>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div className="border-t p-4">
|
<div className="border-t p-2">
|
||||||
<StatusBar />
|
<StatusBar isCollapsed={isCollapsed} />
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
{/* Content Area */}
|
{/* Content Area */}
|
||||||
<main className="flex-1 overflow-auto">
|
<main className="flex-1 overflow-auto transition-all duration-300">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ export function transformClaudeRequestIn(
|
|||||||
const toolIdToName = new Map<string, string>();
|
const toolIdToName = new Map<string, string>();
|
||||||
|
|
||||||
// 1. System Instruction
|
// 1. System Instruction
|
||||||
let systemInstruction = buildSystemInstruction(claudeReq.system, claudeReq.model);
|
const systemInstruction = buildSystemInstruction(claudeReq.system, claudeReq.model);
|
||||||
|
|
||||||
// Map model name
|
// Map model name
|
||||||
const mappedModel = hasWebSearchTool
|
const mappedModel = hasWebSearchTool
|
||||||
@@ -100,7 +100,7 @@ export function transformClaudeRequestIn(
|
|||||||
);
|
);
|
||||||
|
|
||||||
// 3. Tools
|
// 3. Tools
|
||||||
let tools = buildTools(claudeReq.tools, hasWebSearchTool);
|
const tools = buildTools(claudeReq.tools, hasWebSearchTool);
|
||||||
|
|
||||||
// 5. Safety Settings
|
// 5. Safety Settings
|
||||||
const safetySettings = [
|
const safetySettings = [
|
||||||
@@ -152,7 +152,7 @@ export function transformClaudeRequestIn(
|
|||||||
delete innerRequest.systemInstruction;
|
delete innerRequest.systemInstruction;
|
||||||
|
|
||||||
// 3. Clean generationConfig
|
// 3. Clean generationConfig
|
||||||
let genConfig = innerRequest.generationConfig || {};
|
const genConfig = innerRequest.generationConfig || {};
|
||||||
delete genConfig.thinkingConfig;
|
delete genConfig.thinkingConfig;
|
||||||
delete genConfig.responseMimeType;
|
delete genConfig.responseMimeType;
|
||||||
delete genConfig.responseModalities;
|
delete genConfig.responseModalities;
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ function flattenRefs(map: any, defs: Record<string, any>) {
|
|||||||
|
|
||||||
// Recursively process all children
|
// Recursively process all children
|
||||||
for (const k in map) {
|
for (const k in map) {
|
||||||
if (map.hasOwnProperty(k)) {
|
if (Object.prototype.hasOwnProperty.call(map, k)) {
|
||||||
const v = map[k];
|
const v = map[k];
|
||||||
if (typeof v === 'object' && v !== null) {
|
if (typeof v === 'object' && v !== null) {
|
||||||
flattenRefs(v, defs);
|
flattenRefs(v, defs);
|
||||||
@@ -91,7 +91,7 @@ function cleanJsonSchemaRecursive(value: any) {
|
|||||||
|
|
||||||
// 1. Recursively process all children first to ensure nested structures are cleaned
|
// 1. Recursively process all children first to ensure nested structures are cleaned
|
||||||
for (const k in map) {
|
for (const k in map) {
|
||||||
if (map.hasOwnProperty(k)) {
|
if (Object.prototype.hasOwnProperty.call(map, k)) {
|
||||||
cleanJsonSchemaRecursive(map[k]);
|
cleanJsonSchemaRecursive(map[k]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+397
-1
@@ -12,7 +12,7 @@ i18n
|
|||||||
caches: ['localStorage'],
|
caches: ['localStorage'],
|
||||||
lookupLocalStorage: 'lang',
|
lookupLocalStorage: 'lang',
|
||||||
},
|
},
|
||||||
supportedLngs: ['en', 'zh-CN'],
|
supportedLngs: ['en', 'zh-CN', 'ru'],
|
||||||
load: 'currentOnly', // Only load the exact language code, not variants
|
load: 'currentOnly', // Only load the exact language code, not variants
|
||||||
resources: {
|
resources: {
|
||||||
en: {
|
en: {
|
||||||
@@ -34,6 +34,19 @@ i18n
|
|||||||
},
|
},
|
||||||
error: {
|
error: {
|
||||||
generic: 'An unexpected error occurred.',
|
generic: 'An unexpected error occurred.',
|
||||||
|
keychainUnavailable: 'Keychain is unavailable.',
|
||||||
|
keychainHint: {
|
||||||
|
translocation:
|
||||||
|
'Detected macOS App Translocation. Move the app to /Applications and reopen.',
|
||||||
|
keychainDenied:
|
||||||
|
'Keychain access denied. The app may be unsigned; see README for the self-signing workaround.',
|
||||||
|
signNotarize: 'Please use a signed and notarized build when available.',
|
||||||
|
},
|
||||||
|
dataMigrationFailed: 'Unable to decrypt legacy account data.',
|
||||||
|
dataMigrationHint: {
|
||||||
|
relogin: 'Please re-login or re-add your accounts.',
|
||||||
|
clearData: 'If the issue persists, clear local account data and sign in again.',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
nav: {
|
nav: {
|
||||||
accounts: 'Accounts',
|
accounts: 'Accounts',
|
||||||
@@ -70,6 +83,7 @@ i18n
|
|||||||
description: 'Select your preferred language.',
|
description: 'Select your preferred language.',
|
||||||
english: 'English',
|
english: 'English',
|
||||||
chinese: 'Chinese (Simplified)',
|
chinese: 'Chinese (Simplified)',
|
||||||
|
russian: 'Russian',
|
||||||
},
|
},
|
||||||
about: {
|
about: {
|
||||||
title: 'About',
|
title: 'About',
|
||||||
@@ -87,6 +101,23 @@ i18n
|
|||||||
auto_sync: 'Auto Sync Current Account',
|
auto_sync: 'Auto Sync Current Account',
|
||||||
auto_sync_desc: 'Periodically sync active account information',
|
auto_sync_desc: 'Periodically sync active account information',
|
||||||
},
|
},
|
||||||
|
startup: {
|
||||||
|
title: 'Startup',
|
||||||
|
description: 'Control application launch behavior at system startup.',
|
||||||
|
auto_startup: 'Start with system',
|
||||||
|
auto_startup_desc: 'Launch at sign-in and keep the app in the system tray',
|
||||||
|
macos_hint:
|
||||||
|
'macOS requires a signed app for Login Items to work. If auto-start fails, please sign the app or enable it manually in System Settings.',
|
||||||
|
},
|
||||||
|
privacy: {
|
||||||
|
title: 'Privacy',
|
||||||
|
description: 'Control how your data is used to improve the application.',
|
||||||
|
error_reporting: 'Error Reporting',
|
||||||
|
error_reporting_desc:
|
||||||
|
'Send anonymous error reports to help us improve the app. No personal data is collected.',
|
||||||
|
restart_note:
|
||||||
|
'Changes to error reporting will take effect after restarting the application.',
|
||||||
|
},
|
||||||
proxy: {
|
proxy: {
|
||||||
title: 'Upstream Proxy',
|
title: 'Upstream Proxy',
|
||||||
description: 'Configure a proxy for outgoing requests to Google/Gemini APIs.',
|
description: 'Configure a proxy for outgoing requests to Google/Gemini APIs.',
|
||||||
@@ -210,10 +241,16 @@ i18n
|
|||||||
refresh: 'Refresh Quota',
|
refresh: 'Refresh Quota',
|
||||||
delete: 'Delete Account',
|
delete: 'Delete Account',
|
||||||
noQuota: 'No quota data',
|
noQuota: 'No quota data',
|
||||||
|
resetPrefix: 'reset',
|
||||||
|
resetTime: 'Reset time',
|
||||||
|
resetUnknown: 'Unknown',
|
||||||
},
|
},
|
||||||
list: {
|
list: {
|
||||||
noAccounts: 'No cloud accounts added yet.',
|
noAccounts: 'No cloud accounts added yet.',
|
||||||
},
|
},
|
||||||
|
error: {
|
||||||
|
loadFailed: 'Failed to load cloud accounts.',
|
||||||
|
},
|
||||||
toast: {
|
toast: {
|
||||||
syncSuccess: {
|
syncSuccess: {
|
||||||
title: 'Sync Successful',
|
title: 'Sync Successful',
|
||||||
@@ -229,6 +266,7 @@ i18n
|
|||||||
},
|
},
|
||||||
quotaRefreshed: 'Quota refreshed',
|
quotaRefreshed: 'Quota refreshed',
|
||||||
refreshFailed: 'Failed to refresh quota',
|
refreshFailed: 'Failed to refresh quota',
|
||||||
|
pollFailed: 'Failed to poll quota for all accounts',
|
||||||
switched: {
|
switched: {
|
||||||
title: 'Account switched!',
|
title: 'Account switched!',
|
||||||
description: 'Restarting Antigravity...',
|
description: 'Restarting Antigravity...',
|
||||||
@@ -277,6 +315,10 @@ i18n
|
|||||||
api_key: 'API Key',
|
api_key: 'API Key',
|
||||||
auto_start: 'Auto Start with App',
|
auto_start: 'Auto Start with App',
|
||||||
auto_start_desc: 'Start proxy service when application launches',
|
auto_start_desc: 'Start proxy service when application launches',
|
||||||
|
local_access: 'Local network access:',
|
||||||
|
no_token_warning: '⚠️ API key is not set. Access is open to everyone!',
|
||||||
|
show_key: 'Show',
|
||||||
|
hide_key: 'Hide',
|
||||||
},
|
},
|
||||||
mapping: {
|
mapping: {
|
||||||
title: 'Model Mapping',
|
title: 'Model Mapping',
|
||||||
@@ -310,6 +352,19 @@ i18n
|
|||||||
},
|
},
|
||||||
error: {
|
error: {
|
||||||
generic: '发生未知错误。',
|
generic: '发生未知错误。',
|
||||||
|
keychainUnavailable: 'Keychain 不可用。',
|
||||||
|
keychainHint: {
|
||||||
|
translocation:
|
||||||
|
'检测到 macOS App Translocation。请将应用移动到 /Applications 后重试。',
|
||||||
|
keychainDenied:
|
||||||
|
'Keychain 访问被拒绝。应用可能未签名,可参考 README 的“macOS 自签”说明。',
|
||||||
|
signNotarize: '请在可用时使用已签名并公证的版本。',
|
||||||
|
},
|
||||||
|
dataMigrationFailed: '旧版账号数据无法解密。',
|
||||||
|
dataMigrationHint: {
|
||||||
|
relogin: '请重新登录或重新添加账号。',
|
||||||
|
clearData: '如仍失败,请清理本地账号数据后再登录。',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
nav: {
|
nav: {
|
||||||
accounts: '账号',
|
accounts: '账号',
|
||||||
@@ -346,6 +401,7 @@ i18n
|
|||||||
description: '选择您的首选语言。',
|
description: '选择您的首选语言。',
|
||||||
english: '英语',
|
english: '英语',
|
||||||
chinese: '中文 (简体)',
|
chinese: '中文 (简体)',
|
||||||
|
russian: '俄语',
|
||||||
},
|
},
|
||||||
about: {
|
about: {
|
||||||
title: '关于',
|
title: '关于',
|
||||||
@@ -363,6 +419,21 @@ i18n
|
|||||||
auto_sync: '自动获取当前账号',
|
auto_sync: '自动获取当前账号',
|
||||||
auto_sync_desc: '定期自动同步当前活跃账号信息',
|
auto_sync_desc: '定期自动同步当前活跃账号信息',
|
||||||
},
|
},
|
||||||
|
startup: {
|
||||||
|
title: '启动',
|
||||||
|
description: '控制系统启动时的应用行为。',
|
||||||
|
auto_startup: '随系统启动',
|
||||||
|
auto_startup_desc: '登录时自动启动并保持在托盘里',
|
||||||
|
macos_hint:
|
||||||
|
'macOS 需要应用已签名才可生效。如自启动失败,请自行签名或在系统设置中手动启用。',
|
||||||
|
},
|
||||||
|
privacy: {
|
||||||
|
title: '隐私',
|
||||||
|
description: '控制你的数据如何用于改进应用。',
|
||||||
|
error_reporting: '错误上报',
|
||||||
|
error_reporting_desc: '发送匿名错误报告以帮助我们改进应用。不收集个人数据。',
|
||||||
|
restart_note: '错误上报设置会在重启应用后生效。',
|
||||||
|
},
|
||||||
proxy: {
|
proxy: {
|
||||||
title: '上游代理',
|
title: '上游代理',
|
||||||
description: '为发往 Google/Gemini API 的请求配置代理。',
|
description: '为发往 Google/Gemini API 的请求配置代理。',
|
||||||
@@ -484,10 +555,16 @@ i18n
|
|||||||
refresh: '刷新配额',
|
refresh: '刷新配额',
|
||||||
delete: '删除账号',
|
delete: '删除账号',
|
||||||
noQuota: '无配额数据',
|
noQuota: '无配额数据',
|
||||||
|
resetPrefix: '重置',
|
||||||
|
resetTime: '重置时间',
|
||||||
|
resetUnknown: '未知',
|
||||||
},
|
},
|
||||||
list: {
|
list: {
|
||||||
noAccounts: '暂无云账号。',
|
noAccounts: '暂无云账号。',
|
||||||
},
|
},
|
||||||
|
error: {
|
||||||
|
loadFailed: '加载云账号失败。',
|
||||||
|
},
|
||||||
toast: {
|
toast: {
|
||||||
syncSuccess: {
|
syncSuccess: {
|
||||||
title: '同步成功',
|
title: '同步成功',
|
||||||
@@ -503,6 +580,7 @@ i18n
|
|||||||
},
|
},
|
||||||
quotaRefreshed: '配额已刷新',
|
quotaRefreshed: '配额已刷新',
|
||||||
refreshFailed: '刷新配额失败',
|
refreshFailed: '刷新配额失败',
|
||||||
|
pollFailed: '轮询所有账号配额失败',
|
||||||
switched: {
|
switched: {
|
||||||
title: '账号已切换!',
|
title: '账号已切换!',
|
||||||
description: '正在重启 Antigravity...',
|
description: '正在重启 Antigravity...',
|
||||||
@@ -568,5 +646,323 @@ i18n
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
ru: {
|
||||||
|
translation: {
|
||||||
|
appName: 'Antigravity Manager',
|
||||||
|
status: {
|
||||||
|
checking: 'Проверка статуса...',
|
||||||
|
running: 'Antigravity работает в фоне',
|
||||||
|
stopped: 'Служба Antigravity остановлена',
|
||||||
|
},
|
||||||
|
action: {
|
||||||
|
stop: 'Стоп',
|
||||||
|
start: 'Старт',
|
||||||
|
switch: 'Переключить',
|
||||||
|
deleteBackup: 'Удалить резервную копию',
|
||||||
|
backupCurrent: 'Создать бэкап текущего',
|
||||||
|
retry: 'Повторить',
|
||||||
|
openLogs: 'Открыть папку логов',
|
||||||
|
},
|
||||||
|
error: {
|
||||||
|
generic: 'Произошла непредвиденная ошибка.',
|
||||||
|
keychainUnavailable: 'Keychain недоступен.',
|
||||||
|
keychainHint: {
|
||||||
|
translocation:
|
||||||
|
'Обнаружено App Translocation (macOS). Переместите приложение в /Applications и откройте заново.',
|
||||||
|
keychainDenied:
|
||||||
|
'Доступ к Keychain запрещен. Возможно, приложение не подписано. См. README для инструкции.',
|
||||||
|
signNotarize: 'Пожалуйста, используйте подписанную версию приложения.',
|
||||||
|
},
|
||||||
|
dataMigrationFailed: 'Не удалось расшифровать данные старого аккаунта.',
|
||||||
|
dataMigrationHint: {
|
||||||
|
relogin: 'Пожалуйста, перезайдите в аккаунт или добавьте его заново.',
|
||||||
|
clearData: 'Если ошибка сохраняется, очистите локальные данные и войдите снова.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
nav: {
|
||||||
|
accounts: 'Аккаунты',
|
||||||
|
proxy: 'API Прокси',
|
||||||
|
settings: 'Настройки',
|
||||||
|
},
|
||||||
|
account: {
|
||||||
|
current: 'Текущий',
|
||||||
|
lastUsed: 'Последнее использование {{time}}',
|
||||||
|
},
|
||||||
|
home: {
|
||||||
|
title: 'Аккаунты',
|
||||||
|
description: 'Управление вашими аккаунтами Antigravity Google Gemini.',
|
||||||
|
noBackups: {
|
||||||
|
title: 'Бэкапы не найдены',
|
||||||
|
description:
|
||||||
|
'Создайте резервную копию вашего текущего аккаунта Antigravity, чтобы начать.',
|
||||||
|
action: 'Создать бэкап текущего аккаунта',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
settings: {
|
||||||
|
title: 'Настройки',
|
||||||
|
description: 'Управление настройками приложения.',
|
||||||
|
general: 'Общие',
|
||||||
|
connection: 'Подключение',
|
||||||
|
models: 'Модели',
|
||||||
|
appearance: {
|
||||||
|
title: 'Внешний вид',
|
||||||
|
description: 'Настройте внешний вид Antigravity Manager.',
|
||||||
|
},
|
||||||
|
darkMode: 'Темная тема',
|
||||||
|
darkModeDescription: 'Включить темную тему для комфортной работы ночью.',
|
||||||
|
language: {
|
||||||
|
title: 'Язык',
|
||||||
|
description: 'Выберите язык интерфейса.',
|
||||||
|
english: 'English',
|
||||||
|
chinese: '中文 (简体)',
|
||||||
|
russian: 'Русский',
|
||||||
|
},
|
||||||
|
about: {
|
||||||
|
title: 'О программе',
|
||||||
|
description: 'Информация о приложении.',
|
||||||
|
},
|
||||||
|
version: 'Версия',
|
||||||
|
platform: 'Платформа',
|
||||||
|
license: 'Лицензия',
|
||||||
|
openLogDir: 'Открыть',
|
||||||
|
account: {
|
||||||
|
title: 'Настройки аккаунта',
|
||||||
|
description: 'Настройка автоматического обновления и синхронизации.',
|
||||||
|
auto_refresh: 'Автообновление квот',
|
||||||
|
auto_refresh_desc: 'Периодически обновлять информацию о квотах для всех аккаунтов',
|
||||||
|
auto_sync: 'Автосинхронизация текущего',
|
||||||
|
auto_sync_desc: 'Периодически синхронизировать активный аккаунт',
|
||||||
|
},
|
||||||
|
startup: {
|
||||||
|
title: 'Автозагрузка',
|
||||||
|
description: 'Управление запуском приложения при старте системы.',
|
||||||
|
auto_startup: 'Запускать вместе с системой',
|
||||||
|
auto_startup_desc: 'Запускать при входе и сворачивать в трей',
|
||||||
|
macos_hint:
|
||||||
|
'macOS требует подписанное приложение для работы элементов входа. Если автозапуск не работает, подпишите приложение или включите его вручную в системных настройках.',
|
||||||
|
},
|
||||||
|
privacy: {
|
||||||
|
title: 'Конфиденциальность',
|
||||||
|
description: 'Управление использованием данных для улучшения приложения.',
|
||||||
|
error_reporting: 'Отчеты об ошибках',
|
||||||
|
error_reporting_desc:
|
||||||
|
'Отправляйте анонимные отчеты об ошибках, чтобы помочь нам улучшить приложение. Личные данные не собираются.',
|
||||||
|
restart_note:
|
||||||
|
'Изменения в отчетах об ошибках вступят в силу после перезапуска приложения.',
|
||||||
|
},
|
||||||
|
proxy: {
|
||||||
|
title: 'Верхнеуровневый прокси',
|
||||||
|
description: 'Настроить прокси для исходящих запросов к Google/Gemini API.',
|
||||||
|
enable: 'Включить прокси',
|
||||||
|
url: 'URL прокси',
|
||||||
|
timeout: 'Тайм-аут запроса (сек)',
|
||||||
|
},
|
||||||
|
modelMapping: {
|
||||||
|
title: 'Маппинг моделей',
|
||||||
|
description:
|
||||||
|
'Сопоставьте модели Claude Code с моделями Antigravity. Оптимизируйте затраты и скорость, разумно маршрутизируя запросы.',
|
||||||
|
claudeKeyword: 'Модель Claude (Ключевое слово)',
|
||||||
|
targetGemini: 'Целевая модель Gemini',
|
||||||
|
addPlaceholderKey: 'например, op-3',
|
||||||
|
addPlaceholderValue: 'например, gemini-2.0-flash-exp',
|
||||||
|
noMappings: 'Нет пользовательских сопоставлений.',
|
||||||
|
mapsTo: 'Мапится в',
|
||||||
|
default: 'По умолчанию',
|
||||||
|
restoreDefaults: 'Сбросить по умолчанию',
|
||||||
|
},
|
||||||
|
examples: {
|
||||||
|
title: 'Примеры использования',
|
||||||
|
description: 'Примеры команд для вызова локального API прокси.',
|
||||||
|
curl: 'cURL',
|
||||||
|
python: 'Python',
|
||||||
|
copy: 'Копировать',
|
||||||
|
copied: 'Скопировано!',
|
||||||
|
openai_protocol: 'Протокол OpenAI',
|
||||||
|
anthropic_protocol: 'Протокол Anthropic',
|
||||||
|
openai_tools: 'Cursor, Windsurf, NextChat',
|
||||||
|
anthropic_tools: 'Claude Code CLI',
|
||||||
|
flash: 'Быстрый (Flash)',
|
||||||
|
pro: 'Про (Pro)',
|
||||||
|
flash_preview: 'Превью (Flash Preview)',
|
||||||
|
pro_high: 'Лучший (Pro High)',
|
||||||
|
sonnet: 'Мыслящий (Sonnet)',
|
||||||
|
opus: 'Opus',
|
||||||
|
},
|
||||||
|
gateway: {
|
||||||
|
title: 'Служба API Прокси',
|
||||||
|
description: 'Управление локальным прокси-сервером API.',
|
||||||
|
status_running: 'Запущено',
|
||||||
|
status_stopped: 'Остановлено',
|
||||||
|
action_start: 'Запустить службу',
|
||||||
|
action_stop: 'Остановить службу',
|
||||||
|
accounts_info: '{{count}} аккаунтов доступно',
|
||||||
|
port: 'Порт прослушивания',
|
||||||
|
port_hint: 'По умолчанию 8045, требуется перезапуск для применения',
|
||||||
|
timeout: 'Тайм-аут запроса',
|
||||||
|
timeout_hint: 'По умолчанию 120с, диапазон 30-600с',
|
||||||
|
api_key: 'API Ключ',
|
||||||
|
regenerate_key: 'Перегенерировать',
|
||||||
|
regenerateConfirm: {
|
||||||
|
title: 'Перегенерировать API ключ?',
|
||||||
|
description:
|
||||||
|
'Это немедленно сделает текущий ключ недействительным. Все приложения, использующие старый ключ, перестанут работать.',
|
||||||
|
cancel: 'Отмена',
|
||||||
|
confirm: 'Перегенерировать',
|
||||||
|
},
|
||||||
|
key_warning: 'Держите ваш API ключ в секрете. Не передавайте его никому.',
|
||||||
|
auto_start: 'Автозапуск с приложением',
|
||||||
|
auto_start_desc: 'Запускать прокси-службу при старте приложения',
|
||||||
|
},
|
||||||
|
proxy_tab: 'Прокси',
|
||||||
|
save: 'Сохранить настройки',
|
||||||
|
},
|
||||||
|
toast: {
|
||||||
|
backupSuccess: {
|
||||||
|
title: 'Успешно',
|
||||||
|
description: 'Бэкап аккаунта создан.',
|
||||||
|
},
|
||||||
|
backupError: {
|
||||||
|
title: 'Ошибка',
|
||||||
|
description: 'Не удалось создать бэкап: {{error}}',
|
||||||
|
},
|
||||||
|
switchSuccess: {
|
||||||
|
title: 'Успешно',
|
||||||
|
description: 'Аккаунт переключен.',
|
||||||
|
},
|
||||||
|
switchError: {
|
||||||
|
title: 'Ошибка',
|
||||||
|
description: 'Не удалось переключить аккаунт: {{error}}',
|
||||||
|
},
|
||||||
|
deleteSuccess: {
|
||||||
|
title: 'Успешно',
|
||||||
|
description: 'Бэкап удален.',
|
||||||
|
},
|
||||||
|
deleteError: {
|
||||||
|
title: 'Ошибка',
|
||||||
|
description: 'Не удалось удалить бэкап: {{error}}',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
cloud: {
|
||||||
|
title: 'Аккаунты',
|
||||||
|
description: 'Управление пулом аккаунтов Google Gemini.',
|
||||||
|
autoSwitch: 'Авто-переключение',
|
||||||
|
addAccount: 'Добавить аккаунт',
|
||||||
|
syncFromIDE: 'Синхр. из IDE',
|
||||||
|
checkQuota: 'Проверить квоту',
|
||||||
|
polling: 'Опрос запущен',
|
||||||
|
authDialog: {
|
||||||
|
title: 'Добавить Google Аккаунт',
|
||||||
|
description: 'Для добавления аккаунта необходимо авторизовать приложение.',
|
||||||
|
openLogin: 'Открыть страницу входа',
|
||||||
|
authCode: 'Код авторизации',
|
||||||
|
placeholder: 'Вставьте код, начинающийся с 4/...',
|
||||||
|
instruction:
|
||||||
|
'Откроется браузер для входа в Google. Скопируйте код со страницы localhost и вставьте сюда.',
|
||||||
|
verify: 'Проверить и добавить',
|
||||||
|
},
|
||||||
|
card: {
|
||||||
|
active: 'Активен',
|
||||||
|
use: 'Использовать',
|
||||||
|
rateLimited: 'Лимит исчерпан',
|
||||||
|
left: 'ост.',
|
||||||
|
used: 'Исп.',
|
||||||
|
unknown: 'Неизвестный',
|
||||||
|
actions: 'Действия',
|
||||||
|
useAccount: 'Использовать этот аккаунт',
|
||||||
|
refresh: 'Обновить квоту',
|
||||||
|
delete: 'Удалить аккаунт',
|
||||||
|
noQuota: 'Нет данных',
|
||||||
|
resetPrefix: 'Сброс',
|
||||||
|
resetTime: 'Время сброса',
|
||||||
|
resetUnknown: 'Неизвестно',
|
||||||
|
},
|
||||||
|
list: {
|
||||||
|
noAccounts: 'Нет добавленных облачных аккаунтов.',
|
||||||
|
},
|
||||||
|
error: {
|
||||||
|
loadFailed: 'Не удалось загрузить аккаунты.',
|
||||||
|
},
|
||||||
|
toast: {
|
||||||
|
syncSuccess: {
|
||||||
|
title: 'Синхронизация успешна',
|
||||||
|
description: 'Импортирован {{email}} из IDE.',
|
||||||
|
},
|
||||||
|
syncFailed: {
|
||||||
|
title: 'Синхронизация не удалась',
|
||||||
|
description: 'В базе данных IDE не найдено активных аккаунтов.',
|
||||||
|
},
|
||||||
|
addSuccess: 'Аккаунт успешно добавлен!',
|
||||||
|
addFailed: {
|
||||||
|
title: 'Не удалось добавить аккаунт',
|
||||||
|
},
|
||||||
|
quotaRefreshed: 'Квота обновлена',
|
||||||
|
refreshFailed: 'Не удалось обновить квоту',
|
||||||
|
pollFailed: 'Не удалось опросить квоты всех аккаунтов',
|
||||||
|
switched: {
|
||||||
|
title: 'Аккаунт переключен!',
|
||||||
|
description: 'Перезапуск Antigravity...',
|
||||||
|
},
|
||||||
|
switchFailed: 'Не удалось переключить аккаунт',
|
||||||
|
deleted: 'Аккаунт удален',
|
||||||
|
deleteFailed: 'Не удалось удалить аккаунт',
|
||||||
|
deleteConfirm: 'Вы уверены, что хотите удалить этот аккаунт?',
|
||||||
|
autoSwitchOn: 'Авто-переключение включено',
|
||||||
|
autoSwitchOff: 'Авто-переключение выключено',
|
||||||
|
updateSettingsFailed: 'Не удалось обновить настройки',
|
||||||
|
},
|
||||||
|
batch: {
|
||||||
|
selected: 'Выбрано {{count}}',
|
||||||
|
delete: 'Удалить выбранные',
|
||||||
|
refresh: 'Обновить выбранные',
|
||||||
|
selectAll: 'Выбрать все',
|
||||||
|
clear: 'Снять выделение',
|
||||||
|
confirmDelete: 'Вы уверены, что хотите удалить {{count}} аккаунтов?',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
proxy: {
|
||||||
|
title: 'API Прокси',
|
||||||
|
description: 'Управление локальным прокси-сервером API.',
|
||||||
|
save: 'Сохранить',
|
||||||
|
copy: 'Копировать',
|
||||||
|
regenerate: 'Перегенерировать',
|
||||||
|
regenerateConfirm: {
|
||||||
|
title: 'Перегенерировать API ключ?',
|
||||||
|
description:
|
||||||
|
'Это немедленно сделает текущий ключ недействительным. Все приложения, использующие старый ключ, перестанут работать.',
|
||||||
|
cancel: 'Отмена',
|
||||||
|
confirm: 'Перегенерировать',
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
title: 'Статус сервиса',
|
||||||
|
description: 'Управление локальным сервером.',
|
||||||
|
running: 'Работает',
|
||||||
|
stopped: 'Остановлен',
|
||||||
|
start: 'Запустить',
|
||||||
|
stop: 'Остановить',
|
||||||
|
},
|
||||||
|
config: {
|
||||||
|
port: 'Порт',
|
||||||
|
timeout: 'Тайм-аут',
|
||||||
|
api_key: 'API Ключ',
|
||||||
|
auto_start: 'Автозапуск',
|
||||||
|
auto_start_desc: 'Запускать прокси при старте приложения',
|
||||||
|
local_access: 'Доступ из локальной сети:',
|
||||||
|
no_token_warning: '⚠️ API ключ не установлен. Доступ открыт всем!',
|
||||||
|
show_key: 'Показать',
|
||||||
|
hide_key: 'Скрыть',
|
||||||
|
},
|
||||||
|
mapping: {
|
||||||
|
title: 'Маппинг моделей',
|
||||||
|
description: 'Настройка маршрутизации моделей.',
|
||||||
|
maps_to: '->',
|
||||||
|
restore: 'Сброс',
|
||||||
|
},
|
||||||
|
examples: {
|
||||||
|
title: 'Примеры',
|
||||||
|
description: 'Примеры использования локального прокси.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
+146
-9
@@ -1,14 +1,23 @@
|
|||||||
import { app, BrowserWindow, Tray, Menu, nativeImage } from 'electron';
|
import './instrument'; // MUST be the first import to ensure Sentry initializes before app ready
|
||||||
|
import { app, BrowserWindow, dialog, shell } from 'electron';
|
||||||
|
import type { MessageBoxOptions } from 'electron';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
|
import squirrelStartup from 'electron-squirrel-startup';
|
||||||
|
|
||||||
// import { installExtension, REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer';
|
|
||||||
import { ipcMain } from 'electron/main';
|
import { ipcMain } from 'electron/main';
|
||||||
import { ipcContext } from '@/ipc/context';
|
import { ipcContext } from '@/ipc/context';
|
||||||
import { IPC_CHANNELS } from './constants';
|
import { IPC_CHANNELS } from './constants';
|
||||||
import { updateElectronApp, UpdateSourceType } from 'update-electron-app';
|
import { updateElectronApp, UpdateSourceType } from 'update-electron-app';
|
||||||
import { logger } from './utils/logger';
|
import { logger } from './utils/logger';
|
||||||
|
import {
|
||||||
|
getExpectedInstallRoot,
|
||||||
|
getInstallNoticeText,
|
||||||
|
isRunningFromExpectedInstallDir as isRunningFromExpectedInstallDirUtil,
|
||||||
|
resolveInstallNoticeLanguage,
|
||||||
|
} from './utils/installNotice';
|
||||||
import { CloudAccountRepo } from './ipc/database/cloudHandler';
|
import { CloudAccountRepo } from './ipc/database/cloudHandler';
|
||||||
|
import { initDatabase } from './ipc/database/handler';
|
||||||
import { CloudMonitorService } from './services/CloudMonitorService';
|
import { CloudMonitorService } from './services/CloudMonitorService';
|
||||||
|
|
||||||
// Static Imports to fix Bundle Resolution Errors
|
// Static Imports to fix Bundle Resolution Errors
|
||||||
@@ -17,6 +26,8 @@ import { bootstrapNestServer, stopNestServer } from './server/main';
|
|||||||
import { initTray, setTrayLanguage, destroyTray } from './ipc/tray/handler';
|
import { initTray, setTrayLanguage, destroyTray } from './ipc/tray/handler';
|
||||||
import { rpcHandler } from './ipc/handler';
|
import { rpcHandler } from './ipc/handler';
|
||||||
import { ConfigManager } from './ipc/config/manager';
|
import { ConfigManager } from './ipc/config/manager';
|
||||||
|
import { AppConfig } from './types/config';
|
||||||
|
import { isAutoStartLaunch, syncAutoStart } from './utils/autoStart';
|
||||||
|
|
||||||
const packetLogPath = path.join(app.getPath('userData'), 'orpc_packets.log');
|
const packetLogPath = path.join(app.getPath('userData'), 'orpc_packets.log');
|
||||||
|
|
||||||
@@ -55,6 +66,11 @@ ipcMain.on(IPC_CHANNELS.CHANGE_LANGUAGE, (event, lang) => {
|
|||||||
|
|
||||||
app.disableHardwareAcceleration();
|
app.disableHardwareAcceleration();
|
||||||
|
|
||||||
|
if (squirrelStartup) {
|
||||||
|
app.quit();
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
const inDevelopment = process.env.NODE_ENV === 'development';
|
const inDevelopment = process.env.NODE_ENV === 'development';
|
||||||
|
|
||||||
// Keep a global reference of the window object, if you don't, the window will
|
// Keep a global reference of the window object, if you don't, the window will
|
||||||
@@ -62,6 +78,81 @@ const inDevelopment = process.env.NODE_ENV === 'development';
|
|||||||
let globalMainWindow: BrowserWindow | null = null;
|
let globalMainWindow: BrowserWindow | null = null;
|
||||||
// let tray: Tray | null = null; // Moved to tray/handler.ts
|
// let tray: Tray | null = null; // Moved to tray/handler.ts
|
||||||
let isQuitting = false;
|
let isQuitting = false;
|
||||||
|
let startupConfig: AppConfig | null = null;
|
||||||
|
let shouldStartHidden = false;
|
||||||
|
let hasShownInstallNotice = false;
|
||||||
|
|
||||||
|
function isRunningFromExpectedInstallDir() {
|
||||||
|
return isRunningFromExpectedInstallDirUtil({
|
||||||
|
platform: process.platform,
|
||||||
|
isPackaged: app.isPackaged,
|
||||||
|
localAppData: process.env.LOCALAPPDATA,
|
||||||
|
appName: app.getName(),
|
||||||
|
execPath: process.execPath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function showWindowsInstallNoticeIfNeeded() {
|
||||||
|
if (hasShownInstallNotice) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isRunningFromExpectedInstallDir()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const expectedRoot = getExpectedInstallRoot({
|
||||||
|
platform: process.platform,
|
||||||
|
localAppData: process.env.LOCALAPPDATA,
|
||||||
|
appName: app.getName(),
|
||||||
|
});
|
||||||
|
if (!expectedRoot) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hasShownInstallNotice = true;
|
||||||
|
const language = resolveInstallNoticeLanguage({
|
||||||
|
configLanguage: startupConfig?.language,
|
||||||
|
locale: app.getLocale(),
|
||||||
|
});
|
||||||
|
const text = getInstallNoticeText(language);
|
||||||
|
|
||||||
|
const options: MessageBoxOptions = {
|
||||||
|
type: 'info',
|
||||||
|
title: text.title,
|
||||||
|
message: text.message,
|
||||||
|
detail: `${text.detailPrefix}${expectedRoot}`,
|
||||||
|
buttons: [...text.buttons],
|
||||||
|
defaultId: 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
const showPromise = globalMainWindow
|
||||||
|
? dialog.showMessageBox(globalMainWindow, options)
|
||||||
|
: dialog.showMessageBox(options);
|
||||||
|
|
||||||
|
showPromise.then(({ response }) => {
|
||||||
|
if (response === 0) {
|
||||||
|
shell.openPath(expectedRoot);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const gotSingleInstanceLock = app.requestSingleInstanceLock();
|
||||||
|
|
||||||
|
if (!gotSingleInstanceLock) {
|
||||||
|
app.quit();
|
||||||
|
} else {
|
||||||
|
app.on('second-instance', () => {
|
||||||
|
logger.info('Second instance detected, focusing existing window');
|
||||||
|
if (app.isReady()) {
|
||||||
|
createWindow({ startHidden: false });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
app.whenReady().then(() => {
|
||||||
|
createWindow({ startHidden: false });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
process.on('exit', (code) => {
|
process.on('exit', (code) => {
|
||||||
logger.info(`Process exit event triggered with code: ${code}`);
|
logger.info(`Process exit event triggered with code: ${code}`);
|
||||||
@@ -74,7 +165,22 @@ process.on('before-exit', (code) => {
|
|||||||
|
|
||||||
// let tray: Tray | null = null; // Moved to tray/handler.ts
|
// let tray: Tray | null = null; // Moved to tray/handler.ts
|
||||||
|
|
||||||
function createWindow() {
|
function createWindow({ startHidden }: { startHidden: boolean }) {
|
||||||
|
if (globalMainWindow && !globalMainWindow.isDestroyed()) {
|
||||||
|
if (startHidden) {
|
||||||
|
globalMainWindow.hide();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (globalMainWindow.isMinimized()) {
|
||||||
|
globalMainWindow.restore();
|
||||||
|
}
|
||||||
|
if (!globalMainWindow.isVisible()) {
|
||||||
|
globalMainWindow.show();
|
||||||
|
}
|
||||||
|
globalMainWindow.focus();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
logger.info('createWindow: start');
|
logger.info('createWindow: start');
|
||||||
const preload = path.join(__dirname, 'preload.js');
|
const preload = path.join(__dirname, 'preload.js');
|
||||||
logger.info(`createWindow: preload path: ${preload}`);
|
logger.info(`createWindow: preload path: ${preload}`);
|
||||||
@@ -83,6 +189,7 @@ function createWindow() {
|
|||||||
const mainWindow = new BrowserWindow({
|
const mainWindow = new BrowserWindow({
|
||||||
width: 1200,
|
width: 1200,
|
||||||
height: 800,
|
height: 800,
|
||||||
|
show: !startHidden,
|
||||||
autoHideMenuBar: true,
|
autoHideMenuBar: true,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
devTools: inDevelopment,
|
devTools: inDevelopment,
|
||||||
@@ -98,6 +205,10 @@ function createWindow() {
|
|||||||
});
|
});
|
||||||
globalMainWindow = mainWindow;
|
globalMainWindow = mainWindow;
|
||||||
logger.info('createWindow: BrowserWindow instance created');
|
logger.info('createWindow: BrowserWindow instance created');
|
||||||
|
if (startHidden) {
|
||||||
|
mainWindow.hide();
|
||||||
|
logger.info('createWindow: startHidden enabled, window hidden');
|
||||||
|
}
|
||||||
|
|
||||||
logger.info('createWindow: setting main window in ipcContext');
|
logger.info('createWindow: setting main window in ipcContext');
|
||||||
ipcContext.setMainWindow(mainWindow);
|
ipcContext.setMainWindow(mainWindow);
|
||||||
@@ -112,6 +223,7 @@ function createWindow() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.info('Window created');
|
logger.info('Window created');
|
||||||
|
showWindowsInstallNoticeIfNeeded();
|
||||||
|
|
||||||
mainWindow.on('close', (event) => {
|
mainWindow.on('close', (event) => {
|
||||||
if (!isQuitting) {
|
if (!isQuitting) {
|
||||||
@@ -125,6 +237,7 @@ function createWindow() {
|
|||||||
|
|
||||||
mainWindow.on('closed', () => {
|
mainWindow.on('closed', () => {
|
||||||
logger.info('Window closed event triggered');
|
logger.info('Window closed event triggered');
|
||||||
|
globalMainWindow = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
mainWindow.webContents.on('render-process-gone', (event, details) => {
|
mainWindow.webContents.on('render-process-gone', (event, details) => {
|
||||||
@@ -143,6 +256,10 @@ function createWindow() {
|
|||||||
const { level, message, lineNumber, sourceId } = details;
|
const { level, message, lineNumber, sourceId } = details;
|
||||||
logger.info(`[Renderer Console][${level}] ${message} (${sourceId}:${lineNumber})`);
|
logger.info(`[Renderer Console][${level}] ${message} (${sourceId}:${lineNumber})`);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mainWindow.on('focus', () => {
|
||||||
|
CloudMonitorService.handleAppFocus();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
app.on('child-process-gone', (event, details) => {
|
app.on('child-process-gone', (event, details) => {
|
||||||
@@ -223,13 +340,36 @@ process.on('unhandledRejection', (reason) => {
|
|||||||
|
|
||||||
app
|
app
|
||||||
.whenReady()
|
.whenReady()
|
||||||
|
.then(async () => {
|
||||||
|
logger.info('Step: Initialize CloudAccountRepo');
|
||||||
|
try {
|
||||||
|
await CloudAccountRepo.init();
|
||||||
|
} catch (e) {
|
||||||
|
logger.error('Startup: Failed to initialize CloudAccountRepo', e);
|
||||||
|
// We might want to exit here or show a dialog, but for now we proceed
|
||||||
|
// though functionality will be broken.
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info('Step: Initialize Antigravity DB (WAL Mode)');
|
||||||
|
initDatabase();
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
logger.info('Step: Load Config');
|
||||||
|
const config = ConfigManager.loadConfig();
|
||||||
|
startupConfig = config;
|
||||||
|
syncAutoStart(config);
|
||||||
|
shouldStartHidden = isAutoStartLaunch() && config.auto_startup;
|
||||||
|
if (shouldStartHidden) {
|
||||||
|
logger.info('Startup: Auto-start detected, window will start hidden');
|
||||||
|
}
|
||||||
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
logger.info('Step: setupORPC');
|
logger.info('Step: setupORPC');
|
||||||
return setupORPC();
|
return setupORPC();
|
||||||
})
|
})
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
logger.info('Step: createWindow');
|
logger.info('Step: createWindow');
|
||||||
await createWindow();
|
await createWindow({ startHidden: shouldStartHidden });
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
logger.info('Step: installExtensions (SKIPPED)');
|
logger.info('Step: installExtensions (SKIPPED)');
|
||||||
@@ -242,14 +382,11 @@ app
|
|||||||
.then(async () => {
|
.then(async () => {
|
||||||
// Initialize Cloud Monitor if enabled
|
// Initialize Cloud Monitor if enabled
|
||||||
try {
|
try {
|
||||||
// Initialize DB & Migrate to Encrypted Storage
|
|
||||||
await CloudAccountRepo.init();
|
|
||||||
|
|
||||||
// Start OAuth Server
|
// Start OAuth Server
|
||||||
AuthServer.start();
|
AuthServer.start();
|
||||||
|
|
||||||
// Gateway Server (NestJS) - auto-start if enabled
|
// Gateway Server (NestJS) - auto-start if enabled
|
||||||
const config = ConfigManager.loadConfig();
|
const config = startupConfig || ConfigManager.loadConfig();
|
||||||
if (config.proxy?.auto_start) {
|
if (config.proxy?.auto_start) {
|
||||||
const port = config.proxy?.port || 8045;
|
const port = config.proxy?.port || 8045;
|
||||||
// Default to a valid ProxyConfig object if null, although loadConfig ensures defaults
|
// Default to a valid ProxyConfig object if null, although loadConfig ensures defaults
|
||||||
@@ -291,7 +428,7 @@ app.on('window-all-closed', () => {
|
|||||||
|
|
||||||
app.on('activate', () => {
|
app.on('activate', () => {
|
||||||
if (BrowserWindow.getAllWindows().length === 0) {
|
if (BrowserWindow.getAllWindows().length === 0) {
|
||||||
createWindow();
|
createWindow({ startHidden: false });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//osX only ends
|
//osX only ends
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export {};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export {};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export {};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export {};
|
||||||
@@ -1,6 +1,44 @@
|
|||||||
import { ipcRenderer, contextBridge } from 'electron';
|
import { ipcRenderer, contextBridge } from 'electron';
|
||||||
|
import * as Sentry from '@sentry/electron/renderer';
|
||||||
import { IPC_CHANNELS } from './constants';
|
import { IPC_CHANNELS } from './constants';
|
||||||
|
|
||||||
|
import path from 'path';
|
||||||
|
import fs from 'fs';
|
||||||
|
import os from 'os';
|
||||||
|
|
||||||
|
// Config check logic (duplicate of instrument.ts logic but adapted for preload)
|
||||||
|
let sentryEnabled = false;
|
||||||
|
try {
|
||||||
|
const home = os.homedir();
|
||||||
|
let appDataPath = '';
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
appDataPath = path.join(
|
||||||
|
process.env.APPDATA || path.join(home, 'AppData', 'Roaming'),
|
||||||
|
'Antigravity',
|
||||||
|
);
|
||||||
|
} else if (process.platform === 'darwin') {
|
||||||
|
appDataPath = path.join(home, 'Library', 'Application Support', 'Antigravity');
|
||||||
|
} else {
|
||||||
|
appDataPath = path.join(home, '.config', 'Antigravity');
|
||||||
|
}
|
||||||
|
|
||||||
|
const configPath = path.join(appDataPath, 'gui_config.json');
|
||||||
|
if (fs.existsSync(configPath)) {
|
||||||
|
const content = fs.readFileSync(configPath, 'utf-8');
|
||||||
|
const config = JSON.parse(content);
|
||||||
|
sentryEnabled = config.error_reporting_enabled === true;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// console.error('Preload: Failed to read config', e);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sentryEnabled) {
|
||||||
|
// Defer Sentry init to avoid blocking main thread during startup (white screen fix)
|
||||||
|
setTimeout(() => {
|
||||||
|
// console.log('[Preload] Initializing Sentry (Deferred)');
|
||||||
|
Sentry.init({});
|
||||||
|
}, 2000);
|
||||||
|
}
|
||||||
window.addEventListener('message', (event) => {
|
window.addEventListener('message', (event) => {
|
||||||
if (event.data === IPC_CHANNELS.START_ORPC_SERVER) {
|
if (event.data === IPC_CHANNELS.START_ORPC_SERVER) {
|
||||||
const [serverPort] = event.ports;
|
const [serverPort] = event.ports;
|
||||||
@@ -10,6 +48,7 @@ window.addEventListener('message', (event) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
contextBridge.exposeInMainWorld('electron', {
|
contextBridge.exposeInMainWorld('electron', {
|
||||||
|
SENTRY_ENABLED: sentryEnabled,
|
||||||
onGoogleAuthCode: (callback: (code: string) => void) => {
|
onGoogleAuthCode: (callback: (code: string) => void) => {
|
||||||
const handler = (_event: any, code: string) => callback(code);
|
const handler = (_event: any, code: string) => callback(code);
|
||||||
ipcRenderer.on('GOOGLE_AUTH_CODE', handler);
|
ipcRenderer.on('GOOGLE_AUTH_CODE', handler);
|
||||||
|
|||||||
@@ -1 +1,12 @@
|
|||||||
|
import * as Sentry from '@sentry/electron/renderer';
|
||||||
|
|
||||||
|
if (window.electron.SENTRY_ENABLED) {
|
||||||
|
// Defer initialization to prioritize initial render
|
||||||
|
setTimeout(() => {
|
||||||
|
Sentry.init({
|
||||||
|
dsn: process.env.SENTRY_DSN,
|
||||||
|
});
|
||||||
|
}, 2000);
|
||||||
|
}
|
||||||
|
|
||||||
import '@/App';
|
import '@/App';
|
||||||
@@ -33,6 +33,7 @@ function SettingsPage() {
|
|||||||
// Sync config to local state when loaded
|
// Sync config to local state when loaded
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (config) {
|
if (config) {
|
||||||
|
// eslint-disable-next-line
|
||||||
setProxyConfig(config.proxy);
|
setProxyConfig(config.proxy);
|
||||||
}
|
}
|
||||||
}, [config]);
|
}, [config]);
|
||||||
@@ -47,6 +48,10 @@ function SettingsPage() {
|
|||||||
queryFn: getPlatform,
|
queryFn: getPlatform,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const isAutoStartSupported =
|
||||||
|
platform === 'win32' || platform === 'darwin' || platform === 'linux';
|
||||||
|
const isMac = platform === 'darwin';
|
||||||
|
|
||||||
const handleLanguageChange = (value: string) => {
|
const handleLanguageChange = (value: string) => {
|
||||||
setAppLanguage(value, i18n);
|
setAppLanguage(value, i18n);
|
||||||
};
|
};
|
||||||
@@ -120,6 +125,7 @@ function SettingsPage() {
|
|||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="en">{t('settings.language.english')}</SelectItem>
|
<SelectItem value="en">{t('settings.language.english')}</SelectItem>
|
||||||
<SelectItem value="zh-CN">{t('settings.language.chinese')}</SelectItem>
|
<SelectItem value="zh-CN">{t('settings.language.chinese')}</SelectItem>
|
||||||
|
<SelectItem value="ru">{t('settings.language.russian')}</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
@@ -179,6 +185,49 @@ function SettingsPage() {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
{isAutoStartSupported && (
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle>{t('settings.startup.title', 'Startup')}</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
{t(
|
||||||
|
'settings.startup.description',
|
||||||
|
'Control application launch behavior at system startup.',
|
||||||
|
)}
|
||||||
|
</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="space-y-4">
|
||||||
|
<div className="flex items-center justify-between rounded-lg border p-4">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('settings.startup.auto_startup', 'Start with system')}</Label>
|
||||||
|
<p className="text-xs text-gray-500">
|
||||||
|
{t(
|
||||||
|
'settings.startup.auto_startup_desc',
|
||||||
|
'Launch at sign-in and keep the app in the system tray',
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
checked={config?.auto_startup || false}
|
||||||
|
onCheckedChange={async (checked) => {
|
||||||
|
if (config) {
|
||||||
|
await saveConfig({ ...config, auto_startup: checked });
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{isMac && (
|
||||||
|
<p className="text-muted-foreground text-xs">
|
||||||
|
{t(
|
||||||
|
'settings.startup.macos_hint',
|
||||||
|
'macOS requires a signed app for Login Items to work. If auto-start fails, please sign the app or enable it manually in System Settings.',
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle>{t('settings.about.title')}</CardTitle>
|
<CardTitle>{t('settings.about.title')}</CardTitle>
|
||||||
@@ -206,6 +255,46 @@ function SettingsPage() {
|
|||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
{/* Privacy & Error Reporting Card */}
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle>{t('settings.privacy.title', 'Privacy')}</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
{t(
|
||||||
|
'settings.privacy.description',
|
||||||
|
'Control how your data is used to improve the application.',
|
||||||
|
)}
|
||||||
|
</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="space-y-4">
|
||||||
|
<div className="flex items-center justify-between rounded-lg border p-4">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('settings.privacy.error_reporting', 'Error Reporting')}</Label>
|
||||||
|
<p className="text-xs text-gray-500">
|
||||||
|
{t(
|
||||||
|
'settings.privacy.error_reporting_desc',
|
||||||
|
'Send anonymous error reports to help us improve the app. No personal data is collected.',
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
checked={config?.error_reporting_enabled || false}
|
||||||
|
onCheckedChange={async (checked) => {
|
||||||
|
if (config) {
|
||||||
|
await saveConfig({ ...config, error_reporting_enabled: checked });
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<p className="text-muted-foreground text-xs">
|
||||||
|
{t(
|
||||||
|
'settings.privacy.restart_note',
|
||||||
|
'Changes to error reporting will take effect after restarting the application.',
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
{/* --- PROXY TAB (Upstream Proxy Config Only) --- */}
|
{/* --- PROXY TAB (Upstream Proxy Config Only) --- */}
|
||||||
|
|||||||
@@ -44,6 +44,24 @@ export class ProxyController {
|
|||||||
@Post('chat/completions')
|
@Post('chat/completions')
|
||||||
async chatCompletions(@Body() body: OpenAIChatRequest, @Res() res: FastifyReply) {
|
async chatCompletions(@Body() body: OpenAIChatRequest, @Res() res: FastifyReply) {
|
||||||
try {
|
try {
|
||||||
|
// Claude Code CLI compatibility:
|
||||||
|
// Claude CLI uses OpenAI-style /v1/chat/completions
|
||||||
|
if (body.model?.startsWith('claude-')) {
|
||||||
|
const result = await this.proxyService.handleAnthropicMessages(
|
||||||
|
body as unknown as AnthropicChatRequest,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (body.stream && result instanceof Observable) {
|
||||||
|
res.header('Content-Type', 'text/event-stream');
|
||||||
|
res.header('Cache-Control', 'no-cache');
|
||||||
|
res.header('Connection', 'keep-alive');
|
||||||
|
res.send(result);
|
||||||
|
} else {
|
||||||
|
res.status(HttpStatus.OK).send(result);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const result = await this.proxyService.handleChatCompletions(body);
|
const result = await this.proxyService.handleChatCompletions(body);
|
||||||
|
|
||||||
if (body.stream && result instanceof Observable) {
|
if (body.stream && result instanceof Observable) {
|
||||||
|
|||||||
@@ -6,17 +6,28 @@ import { logger } from '../utils/logger';
|
|||||||
export class CloudMonitorService {
|
export class CloudMonitorService {
|
||||||
private static intervalId: NodeJS.Timeout | null = null;
|
private static intervalId: NodeJS.Timeout | null = null;
|
||||||
private static POLL_INTERVAL = 1000 * 60 * 5; // 5 minutes
|
private static POLL_INTERVAL = 1000 * 60 * 5; // 5 minutes
|
||||||
|
private static DEBOUNCE_TIME = 10000; // 10 seconds
|
||||||
|
private static lastFocusTime: number = 0;
|
||||||
|
private static isPolling: boolean = false;
|
||||||
|
|
||||||
|
// Helper for testing
|
||||||
|
static resetStateForTesting() {
|
||||||
|
this.lastFocusTime = 0;
|
||||||
|
this.isPolling = false;
|
||||||
|
this.stop();
|
||||||
|
}
|
||||||
|
|
||||||
static start() {
|
static start() {
|
||||||
if (this.intervalId) return;
|
if (this.intervalId) return;
|
||||||
logger.info('Starting CloudMonitorService...');
|
logger.info('Starting CloudMonitorService...');
|
||||||
|
|
||||||
|
// Set lastFocusTime to now to prevent "double-dip" on startup (focus event immediately after start)
|
||||||
|
this.lastFocusTime = Date.now();
|
||||||
|
|
||||||
// Initial Poll
|
// Initial Poll
|
||||||
this.poll().catch((e) => logger.error('Initial poll failed', e));
|
this.poll().catch((e) => logger.error('Initial poll failed', e));
|
||||||
|
|
||||||
this.intervalId = setInterval(() => {
|
this.startInterval();
|
||||||
this.poll().catch((e) => logger.error('Scheduled poll failed', e));
|
|
||||||
}, this.POLL_INTERVAL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static stop() {
|
static stop() {
|
||||||
@@ -27,7 +38,59 @@ export class CloudMonitorService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when the application window gains focus.
|
||||||
|
* Triggers an immediate poll if not rate-limited by debounce.
|
||||||
|
*/
|
||||||
|
static async handleAppFocus() {
|
||||||
|
const now = Date.now();
|
||||||
|
|
||||||
|
// 1. Concurrency Guard: If we are already polling, don't pile up requests
|
||||||
|
if (this.isPolling) {
|
||||||
|
logger.info('Monitor: App focused, but polling is already in progress. Skipping.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Debounce: If we focused recently, don't poll again
|
||||||
|
if (now - this.lastFocusTime < this.DEBOUNCE_TIME) {
|
||||||
|
logger.info('Monitor: App focused, skipping poll (debounce active).');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info('Monitor: App focused, triggering immediate poll...');
|
||||||
|
this.lastFocusTime = now;
|
||||||
|
|
||||||
|
// 3. Trigger Poll
|
||||||
|
await this.poll().catch((e) => {
|
||||||
|
logger.error('Monitor: Focus poll failed', e);
|
||||||
|
});
|
||||||
|
// 4. Reset the background interval so we don't double-poll shortly after
|
||||||
|
this.resetInterval();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static startInterval() {
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId);
|
||||||
|
}
|
||||||
|
this.intervalId = setInterval(() => {
|
||||||
|
this.poll().catch((e) => logger.error('Scheduled poll failed', e));
|
||||||
|
}, this.POLL_INTERVAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static resetInterval() {
|
||||||
|
if (this.intervalId) {
|
||||||
|
clearInterval(this.intervalId);
|
||||||
|
this.startInterval(); // Restart the 5-minute timer
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static async poll() {
|
static async poll() {
|
||||||
|
if (this.isPolling) {
|
||||||
|
return; // Extra safety
|
||||||
|
}
|
||||||
|
this.isPolling = true;
|
||||||
|
|
||||||
|
try {
|
||||||
logger.info('CloudMonitor: Polling quotas...');
|
logger.info('CloudMonitor: Polling quotas...');
|
||||||
const accounts = await CloudAccountRepo.getAccounts();
|
const accounts = await CloudAccountRepo.getAccounts();
|
||||||
const now = Math.floor(Date.now() / 1000);
|
const now = Math.floor(Date.now() / 1000);
|
||||||
@@ -53,6 +116,7 @@ export class CloudMonitorService {
|
|||||||
|
|
||||||
// 3. Update DB
|
// 3. Update DB
|
||||||
await CloudAccountRepo.updateQuota(account.id, quota);
|
await CloudAccountRepo.updateQuota(account.id, quota);
|
||||||
|
await CloudAccountRepo.updateLastUsed(account.id);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`Monitor: Failed to update ${account.email}`, error);
|
logger.error(`Monitor: Failed to update ${account.email}`, error);
|
||||||
// Could mark status as 'error' or 'rate_limited' if 429
|
// Could mark status as 'error' or 'rate_limited' if 429
|
||||||
@@ -61,5 +125,8 @@ export class CloudMonitorService {
|
|||||||
|
|
||||||
// 4. Check for Auto-Switch
|
// 4. Check for Auto-Switch
|
||||||
await AutoSwitchService.checkAndSwitchIfNeeded();
|
await AutoSwitchService.checkAndSwitchIfNeeded();
|
||||||
|
} finally {
|
||||||
|
this.isPolling = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
||||||
|
import { CloudMonitorService } from '../../services/CloudMonitorService';
|
||||||
|
import { CloudAccountRepo } from '../../ipc/database/cloudHandler';
|
||||||
|
import { GoogleAPIService } from '../../services/GoogleAPIService';
|
||||||
|
import { AutoSwitchService } from '../../services/AutoSwitchService';
|
||||||
|
import { logger } from '../../utils/logger';
|
||||||
|
|
||||||
|
// Mock dependencies
|
||||||
|
vi.mock('../../ipc/database/cloudHandler');
|
||||||
|
vi.mock('../../services/GoogleAPIService');
|
||||||
|
vi.mock('../../services/AutoSwitchService');
|
||||||
|
vi.mock('../../utils/logger');
|
||||||
|
|
||||||
|
describe('CloudMonitorService', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
vi.clearAllMocks();
|
||||||
|
CloudMonitorService.resetStateForTesting();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
CloudMonitorService.stop();
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should start polling on start() and set up interval', async () => {
|
||||||
|
const pollSpy = vi.spyOn(CloudMonitorService, 'poll').mockResolvedValue(undefined);
|
||||||
|
|
||||||
|
CloudMonitorService.start();
|
||||||
|
|
||||||
|
// Should call initial poll
|
||||||
|
expect(pollSpy).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
|
// Fast forward 5 minutes
|
||||||
|
await vi.advanceTimersByTimeAsync(1000 * 60 * 5);
|
||||||
|
expect(pollSpy).toHaveBeenCalledTimes(2);
|
||||||
|
|
||||||
|
pollSpy.mockRestore();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should poll accounts correctly', async () => {
|
||||||
|
const mockAccounts = [
|
||||||
|
{
|
||||||
|
id: 'acc1',
|
||||||
|
email: '[email protected]',
|
||||||
|
token: { access_token: 'valid_token', expiry_timestamp: Date.now() / 1000 + 3600 },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
vi.mocked(CloudAccountRepo.getAccounts).mockResolvedValue(mockAccounts as never);
|
||||||
|
vi.mocked(GoogleAPIService.fetchQuota).mockResolvedValue({ models: {} } as never);
|
||||||
|
|
||||||
|
// Start poll but don't await immediately, as it pauses
|
||||||
|
const pollPromise = CloudMonitorService.poll();
|
||||||
|
|
||||||
|
// Advance time to pass the 1s sleep
|
||||||
|
await vi.advanceTimersByTimeAsync(1000);
|
||||||
|
|
||||||
|
// Now await
|
||||||
|
await pollPromise;
|
||||||
|
|
||||||
|
expect(CloudAccountRepo.getAccounts).toHaveBeenCalled();
|
||||||
|
expect(GoogleAPIService.fetchQuota).toHaveBeenCalledWith('valid_token');
|
||||||
|
expect(CloudAccountRepo.updateQuota).toHaveBeenCalledWith('acc1', expect.anything());
|
||||||
|
expect(CloudAccountRepo.updateLastUsed).toHaveBeenCalledWith('acc1');
|
||||||
|
expect(AutoSwitchService.checkAndSwitchIfNeeded).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should refresh token if expired during poll', async () => {
|
||||||
|
const mockAccounts = [
|
||||||
|
{
|
||||||
|
id: 'acc1',
|
||||||
|
email: '[email protected]',
|
||||||
|
token: {
|
||||||
|
access_token: 'old_token',
|
||||||
|
refresh_token: 'ref_token',
|
||||||
|
expiry_timestamp: Math.floor(Date.now() / 1000) - 100, // Expired
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
vi.mocked(CloudAccountRepo.getAccounts).mockResolvedValue(mockAccounts as never);
|
||||||
|
vi.mocked(GoogleAPIService.refreshAccessToken).mockResolvedValue({
|
||||||
|
access_token: 'new_token',
|
||||||
|
expires_in: 3600,
|
||||||
|
token_type: 'Bearer',
|
||||||
|
});
|
||||||
|
vi.mocked(GoogleAPIService.fetchQuota).mockResolvedValue({ models: {} } as never);
|
||||||
|
|
||||||
|
// Same async pattern
|
||||||
|
const pollPromise = CloudMonitorService.poll();
|
||||||
|
await vi.advanceTimersByTimeAsync(1000);
|
||||||
|
await pollPromise;
|
||||||
|
|
||||||
|
expect(GoogleAPIService.refreshAccessToken).toHaveBeenCalledWith('ref_token');
|
||||||
|
expect(CloudAccountRepo.updateToken).toHaveBeenCalled();
|
||||||
|
expect(GoogleAPIService.fetchQuota).toHaveBeenCalledWith('new_token');
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('handleAppFocus (Smart Refresh)', () => {
|
||||||
|
it('should trigger poll when focused after debounce time', async () => {
|
||||||
|
const pollSpy = vi.spyOn(CloudMonitorService, 'poll').mockResolvedValue(undefined);
|
||||||
|
|
||||||
|
CloudMonitorService.start();
|
||||||
|
vi.setSystemTime(Date.now() + 20000);
|
||||||
|
|
||||||
|
await CloudMonitorService.handleAppFocus();
|
||||||
|
|
||||||
|
// Called once by start, once by focus
|
||||||
|
expect(pollSpy).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should NOT trigger poll if debounced (focused too soon)', async () => {
|
||||||
|
const pollSpy = vi.spyOn(CloudMonitorService, 'poll').mockResolvedValue(undefined);
|
||||||
|
|
||||||
|
CloudMonitorService.start();
|
||||||
|
|
||||||
|
vi.setSystemTime(Date.now() + 1000);
|
||||||
|
|
||||||
|
await CloudMonitorService.handleAppFocus();
|
||||||
|
|
||||||
|
// Called once by start, 0 by focus
|
||||||
|
expect(pollSpy).toHaveBeenCalledTimes(1);
|
||||||
|
expect(logger.info).toHaveBeenCalledWith(expect.stringContaining('debounce active'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should NOT trigger poll if already polling (concurrency guard)', async () => {
|
||||||
|
// Let's spy on poll to silence start's poll
|
||||||
|
const pollSpy = vi.spyOn(CloudMonitorService, 'poll').mockResolvedValue(undefined);
|
||||||
|
CloudMonitorService.start();
|
||||||
|
pollSpy.mockRestore(); // Restore so we can test the real guard logic
|
||||||
|
|
||||||
|
vi.setSystemTime(Date.now() + 20000);
|
||||||
|
|
||||||
|
// 2. Mock getAccounts to delay
|
||||||
|
let resolveGetAccounts: (value: unknown) => void;
|
||||||
|
const getAccountsPromise = new Promise((resolve) => {
|
||||||
|
resolveGetAccounts = resolve;
|
||||||
|
});
|
||||||
|
vi.mocked(CloudAccountRepo.getAccounts).mockImplementation(() => getAccountsPromise as never);
|
||||||
|
|
||||||
|
// 3. Trigger first focus -> starts poll, hangs at getAccounts or sleep
|
||||||
|
// Actually poll() calls getAccounts first thing.
|
||||||
|
const p1 = CloudMonitorService.handleAppFocus();
|
||||||
|
|
||||||
|
// Allow p1 to start execution and enter poll()
|
||||||
|
// We invoke one run loop
|
||||||
|
// But since everything is sync until first await, it should enter poll, set isPolling=true, call getAccounts, and await.
|
||||||
|
|
||||||
|
// 4. Trigger second focus immediately
|
||||||
|
const p2 = CloudMonitorService.handleAppFocus();
|
||||||
|
|
||||||
|
// 5. Release the first poll
|
||||||
|
resolveGetAccounts!([
|
||||||
|
{ id: '1', token: { access_token: 'tok', expiry_timestamp: 9999999999 } },
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Advance timer for the 1s sleep inside poll
|
||||||
|
await vi.advanceTimersByTimeAsync(1000);
|
||||||
|
|
||||||
|
await Promise.all([p1, p2]);
|
||||||
|
|
||||||
|
expect(logger.info).toHaveBeenCalledWith(
|
||||||
|
expect.stringContaining('polling is already in progress'),
|
||||||
|
);
|
||||||
|
// getAccounts should be called once (by the first unblocked poll)
|
||||||
|
// The second one blocked by guard before calling poll
|
||||||
|
expect(CloudAccountRepo.getAccounts).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should reset interval after successful focus poll', async () => {
|
||||||
|
const clearIntervalSpy = vi.spyOn(global, 'clearInterval');
|
||||||
|
const setIntervalSpy = vi.spyOn(global, 'setInterval');
|
||||||
|
|
||||||
|
// Spy on poll to consume the start() call
|
||||||
|
const pollSpy = vi.spyOn(CloudMonitorService, 'poll').mockResolvedValue(undefined);
|
||||||
|
CloudMonitorService.start();
|
||||||
|
pollSpy.mockRestore(); // Restore real poll
|
||||||
|
|
||||||
|
vi.setSystemTime(Date.now() + 20000);
|
||||||
|
|
||||||
|
// Needs to handle async poll
|
||||||
|
vi.mocked(CloudAccountRepo.getAccounts).mockResolvedValue([]);
|
||||||
|
|
||||||
|
const focusPromise = CloudMonitorService.handleAppFocus();
|
||||||
|
await vi.advanceTimersByTimeAsync(1000); // For poll sleep
|
||||||
|
await focusPromise;
|
||||||
|
|
||||||
|
expect(clearIntervalSpy).toHaveBeenCalled();
|
||||||
|
// 1 for start (initial), 1 for reset = 2
|
||||||
|
expect(setIntervalSpy).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
import crypto from 'crypto';
|
||||||
|
import fs from 'fs/promises';
|
||||||
|
import keytar from 'keytar';
|
||||||
|
import { safeStorage } from 'electron';
|
||||||
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
import { decryptWithMigration } from '../../utils/security';
|
||||||
|
|
||||||
|
const primaryHex = '11'.repeat(32);
|
||||||
|
const fallbackHex = '22'.repeat(32);
|
||||||
|
|
||||||
|
vi.mock('electron', () => ({
|
||||||
|
safeStorage: {
|
||||||
|
isEncryptionAvailable: vi.fn(() => true),
|
||||||
|
decryptString: vi.fn(() => primaryHex),
|
||||||
|
encryptString: vi.fn((value: string) => Buffer.from(value)),
|
||||||
|
},
|
||||||
|
app: {
|
||||||
|
getPath: vi.fn(() => 'C:\\test'),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('fs/promises', () => ({
|
||||||
|
default: {
|
||||||
|
readFile: vi.fn(),
|
||||||
|
writeFile: vi.fn(),
|
||||||
|
rename: vi.fn(),
|
||||||
|
unlink: vi.fn(),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('keytar', () => ({
|
||||||
|
default: {
|
||||||
|
findCredentials: vi.fn(async () => []),
|
||||||
|
getPassword: vi.fn(async () => fallbackHex),
|
||||||
|
setPassword: vi.fn(),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const fsMock = vi.mocked(fs, { deep: true });
|
||||||
|
const keytarMock = vi.mocked(keytar, { deep: true });
|
||||||
|
const safeStorageMock = vi.mocked(safeStorage, { deep: true });
|
||||||
|
|
||||||
|
function encryptWithKey(key: Buffer, text: string): string {
|
||||||
|
const iv = crypto.randomBytes(16);
|
||||||
|
const cipher = crypto.createCipheriv('aes-256-gcm', key, iv);
|
||||||
|
|
||||||
|
let encrypted = cipher.update(text, 'utf8', 'hex');
|
||||||
|
encrypted += cipher.final('hex');
|
||||||
|
|
||||||
|
const authTag = cipher.getAuthTag();
|
||||||
|
|
||||||
|
return `${iv.toString('hex')}:${authTag.toString('hex')}:${encrypted}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
|
||||||
|
safeStorageMock.isEncryptionAvailable.mockReturnValue(true);
|
||||||
|
safeStorageMock.decryptString.mockReturnValue(primaryHex);
|
||||||
|
|
||||||
|
fsMock.readFile.mockImplementation(async (_path, encoding) => {
|
||||||
|
if (encoding === 'utf8') {
|
||||||
|
return 'not-hex';
|
||||||
|
}
|
||||||
|
|
||||||
|
return Buffer.from('encrypted');
|
||||||
|
});
|
||||||
|
fsMock.writeFile.mockResolvedValue(undefined);
|
||||||
|
fsMock.rename.mockResolvedValue(undefined);
|
||||||
|
fsMock.unlink.mockResolvedValue(undefined);
|
||||||
|
|
||||||
|
keytarMock.findCredentials.mockResolvedValue([]);
|
||||||
|
keytarMock.getPassword.mockResolvedValue(fallbackHex);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('decryptWithMigration', () => {
|
||||||
|
it('falls back to legacy key and re-encrypts', async () => {
|
||||||
|
const plaintext = '{"token":"legacy"}';
|
||||||
|
const ciphertext = encryptWithKey(Buffer.from(fallbackHex, 'hex'), plaintext);
|
||||||
|
|
||||||
|
const result = await decryptWithMigration(ciphertext);
|
||||||
|
|
||||||
|
expect(result.value).toBe(plaintext);
|
||||||
|
expect(result.usedFallback).toBe('keytar');
|
||||||
|
expect(result.reencrypted).toBeTypeOf('string');
|
||||||
|
expect(result.reencrypted).not.toBe(ciphertext);
|
||||||
|
expect(keytarMock.getPassword).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
|
if (result.reencrypted) {
|
||||||
|
const migrated = await decryptWithMigration(result.reencrypted);
|
||||||
|
expect(migrated.value).toBe(plaintext);
|
||||||
|
expect(migrated.usedFallback).toBeUndefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not use fallback when primary key works', async () => {
|
||||||
|
const plaintext = '{"token":"primary"}';
|
||||||
|
const ciphertext = encryptWithKey(Buffer.from(primaryHex, 'hex'), plaintext);
|
||||||
|
|
||||||
|
const result = await decryptWithMigration(ciphertext);
|
||||||
|
|
||||||
|
expect(result.value).toBe(plaintext);
|
||||||
|
expect(result.usedFallback).toBeUndefined();
|
||||||
|
expect(result.reencrypted).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws migration error code when legacy keys are unavailable', async () => {
|
||||||
|
keytarMock.getPassword.mockResolvedValue(null);
|
||||||
|
fsMock.readFile.mockImplementation(async (_path, encoding) => {
|
||||||
|
if (encoding === 'utf8') {
|
||||||
|
return 'not-hex';
|
||||||
|
}
|
||||||
|
|
||||||
|
return Buffer.from('encrypted');
|
||||||
|
});
|
||||||
|
|
||||||
|
const plaintext = '{"token":"legacy"}';
|
||||||
|
const ciphertext = encryptWithKey(Buffer.from('33'.repeat(32), 'hex'), plaintext);
|
||||||
|
|
||||||
|
await expect(decryptWithMigration(ciphertext)).rejects.toThrow('ERR_DATA_MIGRATION_FAILED');
|
||||||
|
});
|
||||||
|
});
|
||||||
Vendored
+1
@@ -7,6 +7,7 @@ declare global {
|
|||||||
|
|
||||||
interface Window {
|
interface Window {
|
||||||
electron: {
|
electron: {
|
||||||
|
SENTRY_ENABLED: boolean;
|
||||||
onGoogleAuthCode: (callback: (code: string) => void) => () => void;
|
onGoogleAuthCode: (callback: (code: string) => void) => () => void;
|
||||||
changeLanguage: (lang: string) => void;
|
changeLanguage: (lang: string) => void;
|
||||||
};
|
};
|
||||||
|
|||||||
+7
-1
@@ -20,8 +20,11 @@ export const AppConfigSchema = z.object({
|
|||||||
theme: z.string(),
|
theme: z.string(),
|
||||||
auto_refresh: z.boolean(),
|
auto_refresh: z.boolean(),
|
||||||
refresh_interval: z.number(), // minutes
|
refresh_interval: z.number(), // minutes
|
||||||
auto_sync: z.boolean(), // 是否自动同步
|
auto_sync: z.boolean(),
|
||||||
sync_interval: z.number(), // minutes
|
sync_interval: z.number(), // minutes
|
||||||
|
auto_startup: z.boolean(),
|
||||||
|
error_reporting_enabled: z.boolean(),
|
||||||
|
privacy_consent_asked: z.boolean().optional().default(false), // Optional for backward compatibility
|
||||||
default_export_path: z.string().nullable().optional(), // 导出路径
|
default_export_path: z.string().nullable().optional(), // 导出路径
|
||||||
proxy: ProxyConfigSchema,
|
proxy: ProxyConfigSchema,
|
||||||
});
|
});
|
||||||
@@ -37,6 +40,9 @@ export const DEFAULT_APP_CONFIG: AppConfig = {
|
|||||||
refresh_interval: 15,
|
refresh_interval: 15,
|
||||||
auto_sync: false,
|
auto_sync: false,
|
||||||
sync_interval: 5,
|
sync_interval: 5,
|
||||||
|
auto_startup: false,
|
||||||
|
error_reporting_enabled: true, // Default to disabled for privacy
|
||||||
|
privacy_consent_asked: false, // Whether the user has been asked for consent
|
||||||
default_export_path: null,
|
default_export_path: null,
|
||||||
proxy: {
|
proxy: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
|
|||||||
@@ -0,0 +1,126 @@
|
|||||||
|
import { app } from 'electron';
|
||||||
|
import fs from 'fs';
|
||||||
|
import os from 'os';
|
||||||
|
import path from 'path';
|
||||||
|
import { logger } from './logger';
|
||||||
|
import { AppConfig } from '../types/config';
|
||||||
|
|
||||||
|
export const AUTO_START_ARG = '--autostart';
|
||||||
|
const LINUX_AUTOSTART_FILENAME = 'antigravity-manager.desktop';
|
||||||
|
|
||||||
|
function getLinuxAutoStartPath() {
|
||||||
|
const dir = path.join(os.homedir(), '.config', 'autostart');
|
||||||
|
return path.join(dir, LINUX_AUTOSTART_FILENAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isAutoStartLaunch(argv = process.argv) {
|
||||||
|
if (process.platform === 'linux') {
|
||||||
|
return argv.includes(AUTO_START_ARG);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform === 'win32' || process.platform === 'darwin') {
|
||||||
|
try {
|
||||||
|
const settings = app.getLoginItemSettings();
|
||||||
|
return settings.wasOpenedAtLogin;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error('AutoStart: Failed to read login item settings', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncWindowsOrMacAutoStart(enabled: boolean) {
|
||||||
|
try {
|
||||||
|
app.setLoginItemSettings({
|
||||||
|
openAtLogin: enabled,
|
||||||
|
openAsHidden: enabled,
|
||||||
|
path: process.execPath,
|
||||||
|
args: enabled ? [AUTO_START_ARG] : [],
|
||||||
|
});
|
||||||
|
const settings = app.getLoginItemSettings();
|
||||||
|
if (settings.openAtLogin !== enabled) {
|
||||||
|
logger.warn(
|
||||||
|
`AutoStart: Login item mismatch (expected ${enabled}, actual ${settings.openAtLogin})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
logger.info(`AutoStart: Login item set to ${enabled}`);
|
||||||
|
} catch (error) {
|
||||||
|
logger.error('AutoStart: Failed to update login item settings', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanupLinuxAutoStartEntries(currentPath: string) {
|
||||||
|
const autoStartDir = path.dirname(currentPath);
|
||||||
|
if (!fs.existsSync(autoStartDir)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const legacyNames = [
|
||||||
|
`${app.getName()}.desktop`,
|
||||||
|
`${app.getName().replace(/\s+/g, '')}.desktop`,
|
||||||
|
'Antigravity Manager.desktop',
|
||||||
|
'AntigravityManager.desktop',
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const name of legacyNames) {
|
||||||
|
const candidate = path.join(autoStartDir, name);
|
||||||
|
if (candidate === currentPath) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (fs.existsSync(candidate)) {
|
||||||
|
try {
|
||||||
|
fs.unlinkSync(candidate);
|
||||||
|
logger.info(`AutoStart: Removed legacy autostart entry ${candidate}`);
|
||||||
|
} catch (error) {
|
||||||
|
logger.warn('AutoStart: Failed to remove legacy autostart entry', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncLinuxAutoStart(enabled: boolean) {
|
||||||
|
const autoStartPath = getLinuxAutoStartPath();
|
||||||
|
|
||||||
|
if (!enabled) {
|
||||||
|
if (fs.existsSync(autoStartPath)) {
|
||||||
|
fs.unlinkSync(autoStartPath);
|
||||||
|
logger.info('AutoStart: Removed Linux autostart entry');
|
||||||
|
}
|
||||||
|
cleanupLinuxAutoStartEntries(autoStartPath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const autoStartDir = path.dirname(autoStartPath);
|
||||||
|
if (!fs.existsSync(autoStartDir)) {
|
||||||
|
fs.mkdirSync(autoStartDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const execPath = process.execPath.replace(/"/g, '\\"');
|
||||||
|
const content = [
|
||||||
|
'[Desktop Entry]',
|
||||||
|
'Type=Application',
|
||||||
|
`Name=${app.getName()}`,
|
||||||
|
`Exec="${execPath}" ${AUTO_START_ARG}`,
|
||||||
|
'X-GNOME-Autostart-enabled=true',
|
||||||
|
'Hidden=false',
|
||||||
|
'NoDisplay=false',
|
||||||
|
].join('\n');
|
||||||
|
|
||||||
|
cleanupLinuxAutoStartEntries(autoStartPath);
|
||||||
|
fs.writeFileSync(autoStartPath, content, 'utf-8');
|
||||||
|
logger.info('AutoStart: Created Linux autostart entry');
|
||||||
|
}
|
||||||
|
|
||||||
|
export function syncAutoStart(config: AppConfig) {
|
||||||
|
const enabled = Boolean(config.auto_startup);
|
||||||
|
|
||||||
|
if (process.platform === 'win32' || process.platform === 'darwin') {
|
||||||
|
syncWindowsOrMacAutoStart(enabled);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.platform === 'linux') {
|
||||||
|
syncLinuxAutoStart(enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
import type { TFunction } from 'i18next';
|
||||||
|
|
||||||
|
const KEYCHAIN_ERROR_CODE = 'ERR_KEYCHAIN_UNAVAILABLE';
|
||||||
|
const KEYCHAIN_HINT_TRANSLOCATION = 'HINT_APP_TRANSLOCATION';
|
||||||
|
const KEYCHAIN_HINT_KEYCHAIN_DENIED = 'HINT_KEYCHAIN_DENIED';
|
||||||
|
const KEYCHAIN_HINT_SIGN_NOTARIZE = 'HINT_SIGN_NOTARIZE';
|
||||||
|
const DATA_MIGRATION_ERROR_CODE = 'ERR_DATA_MIGRATION_FAILED';
|
||||||
|
const DATA_MIGRATION_HINT_RELOGIN = 'HINT_RELOGIN';
|
||||||
|
const DATA_MIGRATION_HINT_CLEAR_DATA = 'HINT_CLEAR_DATA';
|
||||||
|
|
||||||
|
const KEYCHAIN_HINT_I18N_MAP: Record<string, string> = {
|
||||||
|
[KEYCHAIN_HINT_TRANSLOCATION]: 'error.keychainHint.translocation',
|
||||||
|
[KEYCHAIN_HINT_KEYCHAIN_DENIED]: 'error.keychainHint.keychainDenied',
|
||||||
|
[KEYCHAIN_HINT_SIGN_NOTARIZE]: 'error.keychainHint.signNotarize',
|
||||||
|
};
|
||||||
|
|
||||||
|
const DATA_MIGRATION_HINT_I18N_MAP: Record<string, string> = {
|
||||||
|
[DATA_MIGRATION_HINT_RELOGIN]: 'error.dataMigrationHint.relogin',
|
||||||
|
[DATA_MIGRATION_HINT_CLEAR_DATA]: 'error.dataMigrationHint.clearData',
|
||||||
|
};
|
||||||
|
|
||||||
|
function resolveKeychainMessage(hintCode: string | undefined, t: TFunction): string {
|
||||||
|
const base = t('error.keychainUnavailable');
|
||||||
|
if (!hintCode) {
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hintKey = KEYCHAIN_HINT_I18N_MAP[hintCode];
|
||||||
|
if (!hintKey) {
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${base} ${t(hintKey)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveDataMigrationMessage(hintCode: string | undefined, t: TFunction): string {
|
||||||
|
const base = t('error.dataMigrationFailed');
|
||||||
|
if (!hintCode) {
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hintKey = DATA_MIGRATION_HINT_I18N_MAP[hintCode];
|
||||||
|
if (!hintKey) {
|
||||||
|
return base;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${base} ${t(hintKey)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getLocalizedErrorMessage(error: unknown, t: TFunction): string {
|
||||||
|
if (error instanceof Error) {
|
||||||
|
const rawMessage = error.message;
|
||||||
|
const [code, hint] = rawMessage.split('|');
|
||||||
|
if (code === KEYCHAIN_ERROR_CODE) {
|
||||||
|
return resolveKeychainMessage(hint, t);
|
||||||
|
}
|
||||||
|
if (code === DATA_MIGRATION_ERROR_CODE) {
|
||||||
|
return resolveDataMigrationMessage(hint, t);
|
||||||
|
}
|
||||||
|
return rawMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error && typeof error === 'object' && 'message' in error) {
|
||||||
|
const rawMessage = String((error as { message?: unknown }).message ?? '');
|
||||||
|
const [code, hint] = rawMessage.split('|');
|
||||||
|
if (code === KEYCHAIN_ERROR_CODE) {
|
||||||
|
return resolveKeychainMessage(hint, t);
|
||||||
|
}
|
||||||
|
if (code === DATA_MIGRATION_ERROR_CODE) {
|
||||||
|
return resolveDataMigrationMessage(hint, t);
|
||||||
|
}
|
||||||
|
if (rawMessage) {
|
||||||
|
return rawMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return String(error);
|
||||||
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
export type InstallNoticeLanguage = 'zh-CN' | 'en' | 'ru';
|
||||||
|
|
||||||
|
const installNoticeText: Record<
|
||||||
|
InstallNoticeLanguage,
|
||||||
|
{
|
||||||
|
title: string;
|
||||||
|
message: string;
|
||||||
|
detailPrefix: string;
|
||||||
|
buttons: [string, string];
|
||||||
|
}
|
||||||
|
> = {
|
||||||
|
'zh-CN': {
|
||||||
|
title: '建议从开始菜单启动',
|
||||||
|
message:
|
||||||
|
'检测到你正在从非安装路径启动应用。为了确保自动更新生效,请从开始菜单或桌面快捷方式启动。如果没有快捷方式,请重新运行安装包。',
|
||||||
|
detailPrefix: '安装目录:',
|
||||||
|
buttons: ['打开安装目录', '知道了'],
|
||||||
|
},
|
||||||
|
en: {
|
||||||
|
title: 'Please launch from the Start menu',
|
||||||
|
message:
|
||||||
|
'We detected the app is running from a non-install location. To ensure auto-updates work, launch it from the Start menu or desktop shortcut. If no shortcut exists, run the installer again.',
|
||||||
|
detailPrefix: 'Install location: ',
|
||||||
|
buttons: ['Open install folder', 'OK'],
|
||||||
|
},
|
||||||
|
ru: {
|
||||||
|
title: 'Запускайте приложение из меню «Пуск»',
|
||||||
|
message:
|
||||||
|
'Обнаружен запуск из неустановленного пути. Чтобы автообновления работали, запускайте приложение из меню «Пуск» или ярлыка. Если ярлыка нет, запустите установщик ещё раз.',
|
||||||
|
detailPrefix: 'Папка установки: ',
|
||||||
|
buttons: ['Открыть папку', 'Понятно'],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export function resolveInstallNoticeLanguage({
|
||||||
|
configLanguage,
|
||||||
|
locale,
|
||||||
|
}: {
|
||||||
|
configLanguage?: string | null;
|
||||||
|
locale?: string | null;
|
||||||
|
}): InstallNoticeLanguage {
|
||||||
|
const rawLanguage = configLanguage || locale;
|
||||||
|
if (!rawLanguage) {
|
||||||
|
return 'en';
|
||||||
|
}
|
||||||
|
|
||||||
|
const normalized = rawLanguage.toLowerCase();
|
||||||
|
if (normalized.startsWith('zh')) {
|
||||||
|
return 'zh-CN';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (normalized.startsWith('ru')) {
|
||||||
|
return 'ru';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'en';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getInstallNoticeText(language: InstallNoticeLanguage) {
|
||||||
|
return installNoticeText[language] || installNoticeText.en;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPathApi(platform: string) {
|
||||||
|
if (platform === 'win32') {
|
||||||
|
return path.win32;
|
||||||
|
}
|
||||||
|
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeWindowsInstallDirName(appName: string) {
|
||||||
|
return appName
|
||||||
|
.trim()
|
||||||
|
.replace(/[^a-zA-Z0-9]+/g, '_')
|
||||||
|
.replace(/^_+|_+$/g, '')
|
||||||
|
.toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getExpectedInstallRoot({
|
||||||
|
platform,
|
||||||
|
localAppData,
|
||||||
|
appName,
|
||||||
|
}: {
|
||||||
|
platform: string;
|
||||||
|
localAppData?: string | null;
|
||||||
|
appName: string;
|
||||||
|
}) {
|
||||||
|
if (platform !== 'win32') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!localAppData) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pathApi = getPathApi(platform);
|
||||||
|
const installDirName = normalizeWindowsInstallDirName(appName);
|
||||||
|
return pathApi.resolve(pathApi.join(localAppData, installDirName));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isRunningFromExpectedInstallDir({
|
||||||
|
platform,
|
||||||
|
isPackaged,
|
||||||
|
localAppData,
|
||||||
|
appName,
|
||||||
|
execPath,
|
||||||
|
}: {
|
||||||
|
platform: string;
|
||||||
|
isPackaged: boolean;
|
||||||
|
localAppData?: string | null;
|
||||||
|
appName: string;
|
||||||
|
execPath: string;
|
||||||
|
}) {
|
||||||
|
if (platform !== 'win32' || !isPackaged) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const expectedRoot = getExpectedInstallRoot({ platform, localAppData, appName });
|
||||||
|
if (!expectedRoot) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pathApi = getPathApi(platform);
|
||||||
|
const normalizedExecPath = pathApi.resolve(execPath);
|
||||||
|
|
||||||
|
return normalizedExecPath.toLowerCase().startsWith(expectedRoot.toLowerCase() + pathApi.sep);
|
||||||
|
}
|
||||||
@@ -4,6 +4,23 @@ import { getAgentDir } from './paths';
|
|||||||
|
|
||||||
export type LogLevel = 'info' | 'warn' | 'error' | 'debug';
|
export type LogLevel = 'info' | 'warn' | 'error' | 'debug';
|
||||||
|
|
||||||
|
const LOG_WINDOW_MS = 30_000;
|
||||||
|
const MAX_LOG_ENTRIES = 200;
|
||||||
|
|
||||||
|
interface LogEntry {
|
||||||
|
timestamp: number;
|
||||||
|
level: LogLevel;
|
||||||
|
message: string;
|
||||||
|
formatted: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
type SentryReporter = (payload: {
|
||||||
|
level: LogLevel;
|
||||||
|
message: string;
|
||||||
|
error?: Error;
|
||||||
|
logs: LogEntry[];
|
||||||
|
}) => void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Safely stringify an object, handling circular references
|
* Safely stringify an object, handling circular references
|
||||||
* This prevents "Converting circular structure to JSON" errors
|
* This prevents "Converting circular structure to JSON" errors
|
||||||
@@ -33,6 +50,9 @@ function safeStringify(obj: unknown): string {
|
|||||||
|
|
||||||
class Logger {
|
class Logger {
|
||||||
private logFilePath: string;
|
private logFilePath: string;
|
||||||
|
private recentLogs: LogEntry[] = [];
|
||||||
|
private sentryReporter: SentryReporter | null = null;
|
||||||
|
private sentryEnabled = false;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
const agentDir = getAgentDir();
|
const agentDir = getAgentDir();
|
||||||
@@ -75,10 +95,55 @@ class Logger {
|
|||||||
console.log(`${color}[${level.toUpperCase()}]${reset} ${message}`, ...args);
|
console.log(`${color}[${level.toUpperCase()}]${reset} ${message}`, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private pruneLogs(now: number) {
|
||||||
|
while (this.recentLogs.length > 0 && now - this.recentLogs[0].timestamp > LOG_WINDOW_MS) {
|
||||||
|
this.recentLogs.shift();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.recentLogs.length > MAX_LOG_ENTRIES) {
|
||||||
|
this.recentLogs = this.recentLogs.slice(-MAX_LOG_ENTRIES);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private extractError(args: unknown[]): Error | undefined {
|
||||||
|
for (const arg of args) {
|
||||||
|
if (arg instanceof Error) {
|
||||||
|
return arg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
setSentryReporter(reporter: SentryReporter | null) {
|
||||||
|
this.sentryReporter = reporter;
|
||||||
|
}
|
||||||
|
|
||||||
|
setErrorReportingEnabled(enabled: boolean) {
|
||||||
|
this.sentryEnabled = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
log(level: LogLevel, message: string, ...args: unknown[]) {
|
log(level: LogLevel, message: string, ...args: unknown[]) {
|
||||||
const formattedMessage = this.formatMessage(level, message, ...args);
|
const formattedMessage = this.formatMessage(level, message, ...args);
|
||||||
|
const now = Date.now();
|
||||||
|
this.recentLogs.push({
|
||||||
|
timestamp: now,
|
||||||
|
level,
|
||||||
|
message,
|
||||||
|
formatted: formattedMessage,
|
||||||
|
});
|
||||||
|
this.pruneLogs(now);
|
||||||
|
|
||||||
this.writeToConsole(level, message, ...args);
|
this.writeToConsole(level, message, ...args);
|
||||||
this.writeToFile(formattedMessage);
|
this.writeToFile(formattedMessage);
|
||||||
|
|
||||||
|
if (level === 'error' && this.sentryEnabled && this.sentryReporter) {
|
||||||
|
this.sentryReporter({
|
||||||
|
level,
|
||||||
|
message,
|
||||||
|
error: this.extractError(args),
|
||||||
|
logs: [...this.recentLogs],
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info(message: string, ...args: unknown[]) {
|
info(message: string, ...args: unknown[]) {
|
||||||
|
|||||||
@@ -40,9 +40,11 @@ export class ProtobufUtils {
|
|||||||
return this.readVarint(data, offset).nextOffset;
|
return this.readVarint(data, offset).nextOffset;
|
||||||
case 1: // 64-bit
|
case 1: // 64-bit
|
||||||
return offset + 8;
|
return offset + 8;
|
||||||
case 2: // Length-delimited
|
case 2: {
|
||||||
|
// Length-delimited
|
||||||
const { value: length, nextOffset } = this.readVarint(data, offset);
|
const { value: length, nextOffset } = this.readVarint(data, offset);
|
||||||
return nextOffset + Number(length);
|
return nextOffset + Number(length);
|
||||||
|
}
|
||||||
case 5: // 32-bit
|
case 5: // 32-bit
|
||||||
return offset + 4;
|
return offset + 4;
|
||||||
default:
|
default:
|
||||||
|
|||||||
+420
-49
@@ -1,40 +1,342 @@
|
|||||||
import keytar from 'keytar';
|
|
||||||
import crypto from 'crypto';
|
import crypto from 'crypto';
|
||||||
import { logger } from './logger';
|
import { logger } from './logger';
|
||||||
|
import { safeStorage, app } from 'electron';
|
||||||
|
import path from 'path';
|
||||||
|
import fs from 'fs/promises';
|
||||||
|
|
||||||
const SERVICE_NAME = 'AntigravityManager';
|
const SERVICE_NAME = 'AntigravityManager';
|
||||||
const ACCOUNT_NAME = 'MasterKey';
|
const ACCOUNT_NAME = 'MasterKey';
|
||||||
|
const KEYCHAIN_ERROR_CODE = 'ERR_KEYCHAIN_UNAVAILABLE';
|
||||||
|
const KEYCHAIN_HINT_TRANSLOCATION = 'HINT_APP_TRANSLOCATION';
|
||||||
|
const KEYCHAIN_HINT_KEYCHAIN_DENIED = 'HINT_KEYCHAIN_DENIED';
|
||||||
|
const KEYCHAIN_HINT_SIGN_NOTARIZE = 'HINT_SIGN_NOTARIZE';
|
||||||
|
const DATA_MIGRATION_ERROR_CODE = 'ERR_DATA_MIGRATION_FAILED';
|
||||||
|
const DATA_MIGRATION_HINT_RELOGIN = 'HINT_RELOGIN';
|
||||||
|
|
||||||
|
export type KeySource = 'safeStorage' | 'keytar' | 'file';
|
||||||
|
|
||||||
|
interface MasterKeyState {
|
||||||
|
key: Buffer;
|
||||||
|
source: KeySource;
|
||||||
|
}
|
||||||
|
|
||||||
// Cache the key in memory to avoid frequent system calls
|
// Cache the key in memory to avoid frequent system calls
|
||||||
let cachedMasterKey: Buffer | null = null;
|
let cachedMasterKey: Buffer | null = null;
|
||||||
|
let cachedMasterKeySource: KeySource | null = null;
|
||||||
|
|
||||||
async function getOrGenerateMasterKey(): Promise<Buffer> {
|
function cacheMasterKey(key: Buffer, source: KeySource) {
|
||||||
if (cachedMasterKey) return cachedMasterKey;
|
cachedMasterKey = key;
|
||||||
|
cachedMasterKeySource = source;
|
||||||
try {
|
|
||||||
let hexKey = await keytar.getPassword(SERVICE_NAME, ACCOUNT_NAME);
|
|
||||||
|
|
||||||
if (!hexKey) {
|
|
||||||
logger.info('Security: Generating new master key...');
|
|
||||||
// Generate 256-bit key (32 bytes)
|
|
||||||
const buffer = crypto.randomBytes(32);
|
|
||||||
hexKey = buffer.toString('hex');
|
|
||||||
await keytar.setPassword(SERVICE_NAME, ACCOUNT_NAME, hexKey);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cachedMasterKey = Buffer.from(hexKey, 'hex');
|
function getCachedMasterKey() {
|
||||||
return cachedMasterKey;
|
if (!cachedMasterKey || !cachedMasterKeySource) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { key: cachedMasterKey, source: cachedMasterKeySource };
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildKeychainAccessHint(error: unknown): string | null {
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let appPath = '';
|
||||||
|
try {
|
||||||
|
appPath = app.getAppPath();
|
||||||
|
} catch {
|
||||||
|
appPath = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
const isTranslocated = appPath.includes('/AppTranslocation/');
|
||||||
|
if (isTranslocated) {
|
||||||
|
return KEYCHAIN_HINT_TRANSLOCATION;
|
||||||
|
}
|
||||||
|
|
||||||
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||||
|
if (errorMessage.toLowerCase().includes('keychain')) {
|
||||||
|
return KEYCHAIN_HINT_KEYCHAIN_DENIED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return KEYCHAIN_HINT_SIGN_NOTARIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lock to prevent concurrent key generation
|
||||||
|
let keyGenerationInProgress: Promise<MasterKeyState> | null = null;
|
||||||
|
|
||||||
|
// Fallback key file path (used when keytar and safeStorage both fail)
|
||||||
|
function getFallbackKeyPath(): string {
|
||||||
|
const userDataPath = app.getPath('userData');
|
||||||
|
return path.join(userDataPath, '.mk');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Try to load keytar dynamically to avoid hard failure if it's not available
|
||||||
|
*/
|
||||||
|
async function tryKeytar(): Promise<typeof import('keytar') | null> {
|
||||||
|
try {
|
||||||
|
// Native modules may fail to load in production builds
|
||||||
|
const keytar = await import('keytar');
|
||||||
|
// Test if keytar is actually working by calling a method
|
||||||
|
await keytar.default.findCredentials(SERVICE_NAME);
|
||||||
|
return keytar.default;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
logger.warn('Security: keytar not available, using fallback', error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readSafeStorageKey(keyPath: string): Promise<Buffer | null> {
|
||||||
|
if (!safeStorage.isEncryptionAvailable()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const encryptedKey = await fs.readFile(keyPath);
|
||||||
|
const hexKey = safeStorage.decryptString(encryptedKey);
|
||||||
|
|
||||||
|
if (!/^[a-f0-9]+$/i.test(hexKey) || hexKey.length !== 64) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Buffer.from(hexKey, 'hex');
|
||||||
|
} catch (error) {
|
||||||
|
if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.warn('Security: Failed to read safeStorage key file', error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getOrCreateSafeStorageKey(
|
||||||
|
keyPath: string,
|
||||||
|
): Promise<{ key: Buffer; created: boolean }> {
|
||||||
|
const existingKey = await readSafeStorageKey(keyPath);
|
||||||
|
if (existingKey) {
|
||||||
|
return { key: existingKey, created: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
const buffer = crypto.randomBytes(32);
|
||||||
|
const hexKey = buffer.toString('hex');
|
||||||
|
const encrypted = safeStorage.encryptString(hexKey);
|
||||||
|
await atomicWriteFile(keyPath, encrypted, { mode: 0o600 });
|
||||||
|
return { key: buffer, created: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readKeytarKey(): Promise<Buffer | null> {
|
||||||
|
const keytar = await tryKeytar();
|
||||||
|
if (!keytar) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingKey = await keytar.getPassword(SERVICE_NAME, ACCOUNT_NAME);
|
||||||
|
if (!existingKey) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!/^[a-f0-9]+$/i.test(existingKey) || existingKey.length !== 64) {
|
||||||
|
logger.warn('Security: keytar key has unexpected format');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Buffer.from(existingKey, 'hex');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getOrCreateKeytarKey(): Promise<{ key: Buffer; created: boolean } | null> {
|
||||||
|
const keytar = await tryKeytar();
|
||||||
|
if (!keytar) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingKey = await keytar.getPassword(SERVICE_NAME, ACCOUNT_NAME);
|
||||||
|
if (existingKey) {
|
||||||
|
return { key: Buffer.from(existingKey, 'hex'), created: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
const buffer = crypto.randomBytes(32);
|
||||||
|
const hexKey = buffer.toString('hex');
|
||||||
|
await keytar.setPassword(SERVICE_NAME, ACCOUNT_NAME, hexKey);
|
||||||
|
return { key: buffer, created: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readFileFallbackKey(keyPath: string): Promise<Buffer | null> {
|
||||||
|
try {
|
||||||
|
const content = await fs.readFile(keyPath, 'utf8');
|
||||||
|
if (content.length === 64 && /^[a-f0-9]+$/i.test(content)) {
|
||||||
|
return Buffer.from(content, 'hex');
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
} catch (error) {
|
||||||
|
if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.warn('Security: Error reading fallback key file', error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getOrCreateFileFallbackKey(
|
||||||
|
keyPath: string,
|
||||||
|
): Promise<{ key: Buffer; created: boolean }> {
|
||||||
|
const existingKey = await readFileFallbackKey(keyPath);
|
||||||
|
if (existingKey) {
|
||||||
|
return { key: existingKey, created: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
const buffer = crypto.randomBytes(32);
|
||||||
|
const hexKey = buffer.toString('hex');
|
||||||
|
await atomicWriteFile(keyPath, hexKey, { mode: 0o600 });
|
||||||
|
return { key: buffer, created: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getFallbackMasterKeys(
|
||||||
|
keyPath: string,
|
||||||
|
primarySource: KeySource,
|
||||||
|
): Promise<MasterKeyState[]> {
|
||||||
|
const fallbackKeys: MasterKeyState[] = [];
|
||||||
|
|
||||||
|
if (primarySource !== 'keytar') {
|
||||||
|
const keytarKey = await readKeytarKey();
|
||||||
|
if (keytarKey) {
|
||||||
|
fallbackKeys.push({ key: keytarKey, source: 'keytar' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (primarySource !== 'file') {
|
||||||
|
const fileKey = await readFileFallbackKey(keyPath);
|
||||||
|
if (fileKey) {
|
||||||
|
fallbackKeys.push({ key: fileKey, source: 'file' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (primarySource !== 'safeStorage') {
|
||||||
|
const safeStorageKey = await readSafeStorageKey(keyPath);
|
||||||
|
if (safeStorageKey) {
|
||||||
|
fallbackKeys.push({ key: safeStorageKey, source: 'safeStorage' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fallbackKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Atomic file write to prevent data races
|
||||||
|
* Writes to a temp file first, then renames atomically
|
||||||
|
*/
|
||||||
|
async function atomicWriteFile(
|
||||||
|
filePath: string,
|
||||||
|
data: Buffer | string,
|
||||||
|
options?: { mode?: number },
|
||||||
|
): Promise<void> {
|
||||||
|
const tempPath = `${filePath}.tmp.${process.pid}.${Date.now()}`;
|
||||||
|
try {
|
||||||
|
await fs.writeFile(tempPath, data, { mode: options?.mode ?? 0o600 });
|
||||||
|
await fs.rename(tempPath, filePath);
|
||||||
|
} catch (error) {
|
||||||
|
// Clean up temp file if rename failed
|
||||||
|
try {
|
||||||
|
await fs.unlink(tempPath);
|
||||||
|
} catch {
|
||||||
|
// Ignore cleanup errors
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get or generate master encryption key using multiple fallback strategies:
|
||||||
|
* 1. safeStorage (Electron's built-in secure storage) - preferred
|
||||||
|
* 2. keytar (system keychain) - fallback
|
||||||
|
* 3. File-based with safeStorage encryption - last resort (with security warning)
|
||||||
|
*
|
||||||
|
* Uses a lock to prevent concurrent key generation (data race prevention)
|
||||||
|
*/
|
||||||
|
async function getPrimaryMasterKey(): Promise<MasterKeyState> {
|
||||||
|
const cached = getCachedMasterKey();
|
||||||
|
if (cached) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keyGenerationInProgress) {
|
||||||
|
return keyGenerationInProgress;
|
||||||
|
}
|
||||||
|
|
||||||
|
keyGenerationInProgress = generatePrimaryMasterKey();
|
||||||
|
try {
|
||||||
|
return await keyGenerationInProgress;
|
||||||
|
} finally {
|
||||||
|
keyGenerationInProgress = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function generatePrimaryMasterKey(): Promise<MasterKeyState> {
|
||||||
|
const cached = getCachedMasterKey();
|
||||||
|
if (cached) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
|
const keyPath = getFallbackKeyPath();
|
||||||
|
|
||||||
|
if (safeStorage.isEncryptionAvailable()) {
|
||||||
|
try {
|
||||||
|
const result = await getOrCreateSafeStorageKey(keyPath);
|
||||||
|
cacheMasterKey(result.key, 'safeStorage');
|
||||||
|
if (result.created) {
|
||||||
|
logger.info('Security: Generated new master key via safeStorage');
|
||||||
|
} else {
|
||||||
|
logger.info('Security: Loaded master key via safeStorage');
|
||||||
|
}
|
||||||
|
return { key: result.key, source: 'safeStorage' };
|
||||||
|
} catch (error) {
|
||||||
|
logger.warn('Security: safeStorage failed, trying keytar', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await getOrCreateKeytarKey();
|
||||||
|
if (result) {
|
||||||
|
cacheMasterKey(result.key, 'keytar');
|
||||||
|
if (result.created) {
|
||||||
|
logger.info('Security: Generated new master key via keytar');
|
||||||
|
} else {
|
||||||
|
logger.info('Security: Loaded master key via keytar');
|
||||||
|
}
|
||||||
|
return { key: result.key, source: 'keytar' };
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.warn('Security: keytar failed', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.warn(
|
||||||
|
'Security: WARNING - Using file-based key storage. ' +
|
||||||
|
'This is less secure than system keychain. ' +
|
||||||
|
'Ensure the app data directory has restricted permissions.',
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await getOrCreateFileFallbackKey(keyPath);
|
||||||
|
cacheMasterKey(result.key, 'file');
|
||||||
|
if (result.created) {
|
||||||
|
logger.warn('Security: Generating file-based fallback key (less secure)');
|
||||||
|
} else {
|
||||||
|
logger.warn('Security: Using file-based fallback key (less secure)');
|
||||||
|
}
|
||||||
|
return { key: result.key, source: 'file' };
|
||||||
|
} catch (error) {
|
||||||
|
const hint = buildKeychainAccessHint(error);
|
||||||
logger.error('Security: Failed to access keychain/credential manager', error);
|
logger.error('Security: Failed to access keychain/credential manager', error);
|
||||||
// Fallback? If we can't store the key, we can't persistently encrypt.
|
const message = hint ? `${KEYCHAIN_ERROR_CODE}|${hint}` : KEYCHAIN_ERROR_CODE;
|
||||||
// For now, throw to prevent data loss (better not to write than to write something we can't decrypt later or write plain text when promised encrypted)
|
throw new Error(message);
|
||||||
throw new Error('Key management system unavailable');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const ALGORITHM = 'aes-256-gcm';
|
const ALGORITHM = 'aes-256-gcm';
|
||||||
const IV_LENGTH = 16;
|
const IV_LENGTH = 16;
|
||||||
const AUTH_TAG_LENGTH = 16;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encrypts a string using AES-256-GCM.
|
* Encrypts a string using AES-256-GCM.
|
||||||
@@ -42,7 +344,15 @@ const AUTH_TAG_LENGTH = 16;
|
|||||||
*/
|
*/
|
||||||
export async function encrypt(text: string): Promise<string> {
|
export async function encrypt(text: string): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const key = await getOrGenerateMasterKey();
|
const { key } = await getPrimaryMasterKey();
|
||||||
|
return encryptWithKey(key, text);
|
||||||
|
} catch (error) {
|
||||||
|
logger.error('Security: Encryption failed', error);
|
||||||
|
throw new Error('Encryption failed');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function encryptWithKey(key: Buffer, text: string): string {
|
||||||
const iv = crypto.randomBytes(IV_LENGTH);
|
const iv = crypto.randomBytes(IV_LENGTH);
|
||||||
|
|
||||||
const cipher = crypto.createCipheriv(ALGORITHM, key, iv);
|
const cipher = crypto.createCipheriv(ALGORITHM, key, iv);
|
||||||
@@ -52,36 +362,15 @@ export async function encrypt(text: string): Promise<string> {
|
|||||||
|
|
||||||
const authTag = cipher.getAuthTag();
|
const authTag = cipher.getAuthTag();
|
||||||
|
|
||||||
// Format: iv:authTag:encrypted
|
|
||||||
return `${iv.toString('hex')}:${authTag.toString('hex')}:${encrypted}`;
|
return `${iv.toString('hex')}:${authTag.toString('hex')}:${encrypted}`;
|
||||||
} catch (error) {
|
|
||||||
logger.error('Security: Encryption failed', error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
function decryptWithKey(
|
||||||
* Decrypts a string using AES-256-GCM.
|
key: Buffer,
|
||||||
* Input format: "iv_hex:auth_tag_hex:ciphertext_hex"
|
ivHex: string,
|
||||||
*/
|
authTagHex: string,
|
||||||
export async function decrypt(text: string): Promise<string> {
|
encryptedHex: string,
|
||||||
// Check if it's plain text (JSON) for backward compatibility
|
): string {
|
||||||
// Very rough check: starts with { or [
|
|
||||||
if (text.startsWith('{') || text.startsWith('[')) {
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Also checking if it follows our pattern
|
|
||||||
const parts = text.split(':');
|
|
||||||
if (parts.length !== 3) {
|
|
||||||
// Treat as plain text if it doesn't look like our encrypted format
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const key = await getOrGenerateMasterKey();
|
|
||||||
|
|
||||||
const [ivHex, authTagHex, encryptedHex] = parts;
|
|
||||||
const iv = Buffer.from(ivHex, 'hex');
|
const iv = Buffer.from(ivHex, 'hex');
|
||||||
const authTag = Buffer.from(authTagHex, 'hex');
|
const authTag = Buffer.from(authTagHex, 'hex');
|
||||||
|
|
||||||
@@ -92,9 +381,91 @@ export async function decrypt(text: string): Promise<string> {
|
|||||||
decrypted += decipher.final('utf8');
|
decrypted += decipher.final('utf8');
|
||||||
|
|
||||||
return decrypted;
|
return decrypted;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isAuthTagMismatchError(errorMessage: string): boolean {
|
||||||
|
const normalized = errorMessage.toLowerCase();
|
||||||
|
return (
|
||||||
|
normalized.includes('unable to authenticate data') ||
|
||||||
|
normalized.includes('auth tag') ||
|
||||||
|
normalized.includes('bad decrypt')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function decryptWithMigration(
|
||||||
|
text: string,
|
||||||
|
): Promise<{ value: string; reencrypted?: string; usedFallback?: KeySource }> {
|
||||||
|
if (text.startsWith('{') || text.startsWith('[')) {
|
||||||
|
return { value: text };
|
||||||
|
}
|
||||||
|
|
||||||
|
const parts = text.split(':');
|
||||||
|
if (parts.length !== 3) {
|
||||||
|
return { value: text };
|
||||||
|
}
|
||||||
|
|
||||||
|
const [ivHex, authTagHex, encryptedHex] = parts;
|
||||||
|
|
||||||
|
if (
|
||||||
|
!/^[a-f0-9]+$/i.test(ivHex) ||
|
||||||
|
!/^[a-f0-9]+$/i.test(authTagHex) ||
|
||||||
|
!/^[a-f0-9]+$/i.test(encryptedHex)
|
||||||
|
) {
|
||||||
|
logger.warn('Security: Invalid encrypted format - not valid hex');
|
||||||
|
throw new Error('Invalid encrypted data format');
|
||||||
|
}
|
||||||
|
|
||||||
|
const primary = await getPrimaryMasterKey();
|
||||||
|
try {
|
||||||
|
return { value: decryptWithKey(primary.key, ivHex, authTagHex, encryptedHex) };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
||||||
|
|
||||||
|
if (errorMessage.includes('Invalid key length') || errorMessage.includes('Invalid IV length')) {
|
||||||
|
logger.error('Security: Decryption failed - corrupted encrypted data');
|
||||||
|
throw new Error('Decryption failed: Corrupted encrypted data');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isAuthTagMismatchError(errorMessage)) {
|
||||||
logger.error('Security: Decryption failed', error);
|
logger.error('Security: Decryption failed', error);
|
||||||
// If decryption fails, it might be corrupted or using a different key.
|
throw new Error('Decryption failed');
|
||||||
throw error;
|
}
|
||||||
|
|
||||||
|
const keyPath = getFallbackKeyPath();
|
||||||
|
const fallbackKeys = await getFallbackMasterKeys(keyPath, primary.source);
|
||||||
|
for (const fallback of fallbackKeys) {
|
||||||
|
try {
|
||||||
|
const value = decryptWithKey(fallback.key, ivHex, authTagHex, encryptedHex);
|
||||||
|
let reencrypted: string | undefined;
|
||||||
|
try {
|
||||||
|
reencrypted = encryptWithKey(primary.key, value);
|
||||||
|
} catch (reencryptError) {
|
||||||
|
logger.warn(
|
||||||
|
`Security: Failed to re-encrypt data from ${fallback.source} to ${primary.source}`,
|
||||||
|
reencryptError,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (reencrypted) {
|
||||||
|
logger.info(`Security: Re-encrypted data from ${fallback.source} to ${primary.source}`);
|
||||||
|
}
|
||||||
|
return { value, reencrypted, usedFallback: fallback.source };
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.error(
|
||||||
|
'Security: Decryption failed - authentication tag mismatch (wrong key or corrupted data)',
|
||||||
|
);
|
||||||
|
throw new Error(`${DATA_MIGRATION_ERROR_CODE}|${DATA_MIGRATION_HINT_RELOGIN}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decrypts a string using AES-256-GCM.
|
||||||
|
* Input format: "iv_hex:auth_tag_hex:ciphertext_hex"
|
||||||
|
*/
|
||||||
|
export async function decrypt(text: string): Promise<string> {
|
||||||
|
const result = await decryptWithMigration(text);
|
||||||
|
return result.value;
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@
|
|||||||
},
|
},
|
||||||
"include": [
|
"include": [
|
||||||
"src/**/*",
|
"src/**/*",
|
||||||
|
"types/**/*.d.ts",
|
||||||
"./package.json",
|
"./package.json",
|
||||||
"./forge.config.ts",
|
"./forge.config.ts",
|
||||||
"*.mts",
|
"*.mts",
|
||||||
|
|||||||
Vendored
+38
@@ -0,0 +1,38 @@
|
|||||||
|
declare module 'electron-packager-languages' {
|
||||||
|
type AfterCopyHook = (
|
||||||
|
buildPath: string,
|
||||||
|
electronVersion: string,
|
||||||
|
platform: string,
|
||||||
|
arch: string,
|
||||||
|
callback: () => void,
|
||||||
|
) => void;
|
||||||
|
|
||||||
|
interface SetLanguagesOptions {
|
||||||
|
allowRemovingAll?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setLanguages(languages: string[], options?: SetLanguagesOptions): AfterCopyHook;
|
||||||
|
|
||||||
|
export = setLanguages;
|
||||||
|
}
|
||||||
|
|
||||||
|
declare module '@pengx17/electron-forge-maker-appimage' {
|
||||||
|
import type MakerBase from '@electron-forge/maker-base';
|
||||||
|
import type { ForgePlatform } from '@electron-forge/shared-types';
|
||||||
|
|
||||||
|
export interface AppImageForgeConfig {
|
||||||
|
template?: string;
|
||||||
|
chmodChromeSandbox?: string;
|
||||||
|
icons?: { file: string; size: number }[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MakerAppImageConfig {
|
||||||
|
config?: AppImageForgeConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class MakerAppImage extends MakerBase<MakerAppImageConfig> {
|
||||||
|
name: string;
|
||||||
|
defaultPlatforms: ForgePlatform[];
|
||||||
|
isSupportedOnCurrentPlatform(): boolean;
|
||||||
|
}
|
||||||
|
}
|
||||||
+22
-2
@@ -1,8 +1,25 @@
|
|||||||
import { defineConfig } from 'vite';
|
import { defineConfig, loadEnv } from 'vite';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
import { sentryVitePlugin } from '@sentry/vite-plugin';
|
||||||
|
|
||||||
// https://vitejs.dev/config
|
// https://vitejs.dev/config
|
||||||
export default defineConfig({
|
export default defineConfig(({ mode }) => {
|
||||||
|
const env = loadEnv(mode, process.cwd(), '');
|
||||||
|
|
||||||
|
return {
|
||||||
|
plugins: [
|
||||||
|
sentryVitePlugin({
|
||||||
|
org: process.env.SENTRY_ORG || env.SENTRY_ORG,
|
||||||
|
project: process.env.SENTRY_PROJECT || env.SENTRY_PROJECT,
|
||||||
|
authToken: process.env.SENTRY_AUTH_TOKEN || env.SENTRY_AUTH_TOKEN,
|
||||||
|
release: {
|
||||||
|
name: `${process.env.npm_package_name}@${process.env.npm_package_version}`,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
define: {
|
||||||
|
'process.env.SENTRY_DSN': JSON.stringify(process.env.SENTRY_DSN || env.SENTRY_DSN),
|
||||||
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'@': path.resolve(process.cwd(), './src'),
|
'@': path.resolve(process.cwd(), './src'),
|
||||||
@@ -14,6 +31,8 @@ export default defineConfig({
|
|||||||
ioredis: path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
ioredis: path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
||||||
'@fastify/static': path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
'@fastify/static': path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
||||||
'@fastify/view': path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
'@fastify/view': path.resolve(process.cwd(), './src/mocks/empty.ts'),
|
||||||
|
'@nestjs/microservices': path.resolve(process.cwd(), './src/mocks/nestjs-microservices'),
|
||||||
|
'@nestjs/websockets': path.resolve(process.cwd(), './src/mocks/nestjs-websockets'),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
@@ -22,4 +41,5 @@ export default defineConfig({
|
|||||||
external: ['better-sqlite3', 'keytar'],
|
external: ['better-sqlite3', 'keytar'],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
};
|
||||||
});
|
});
|
||||||
+30
-3
@@ -1,4 +1,31 @@
|
|||||||
import { defineConfig } from 'vite';
|
import { defineConfig, loadEnv } from 'vite';
|
||||||
|
import { sentryVitePlugin } from '@sentry/vite-plugin';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
// https://vitejs.dev/config
|
export default defineConfig(({ mode }) => {
|
||||||
export default defineConfig({});
|
const env = loadEnv(mode, process.cwd(), '');
|
||||||
|
|
||||||
|
return {
|
||||||
|
plugins: [
|
||||||
|
sentryVitePlugin({
|
||||||
|
org: process.env.SENTRY_ORG || env.SENTRY_ORG,
|
||||||
|
project: process.env.SENTRY_PROJECT || env.SENTRY_PROJECT,
|
||||||
|
authToken: process.env.SENTRY_AUTH_TOKEN || env.SENTRY_AUTH_TOKEN,
|
||||||
|
release: {
|
||||||
|
name: `${process.env.npm_package_name}@${process.env.npm_package_version}`,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': path.resolve(process.cwd(), './src'),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
build: {
|
||||||
|
sourcemap: true,
|
||||||
|
rollupOptions: {
|
||||||
|
external: ['better-sqlite3', 'keytar'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
@@ -1,12 +1,33 @@
|
|||||||
import { defineConfig } from 'vite';
|
import { defineConfig, loadEnv } from 'vite';
|
||||||
import react from '@vitejs/plugin-react';
|
import react from '@vitejs/plugin-react';
|
||||||
import tailwindcss from '@tailwindcss/vite';
|
import tailwindcss from '@tailwindcss/vite';
|
||||||
import { tanstackRouter } from '@tanstack/router-plugin/vite';
|
import { tanstackRouter } from '@tanstack/router-plugin/vite';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { codeInspectorPlugin } from 'code-inspector-plugin';
|
import { codeInspectorPlugin } from 'code-inspector-plugin';
|
||||||
|
import { sentryVitePlugin } from '@sentry/vite-plugin';
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig(({ mode }) => {
|
||||||
|
const env = loadEnv(mode, process.cwd(), '');
|
||||||
|
|
||||||
|
return {
|
||||||
plugins: [
|
plugins: [
|
||||||
|
sentryVitePlugin({
|
||||||
|
org: process.env.SENTRY_ORG || env.SENTRY_ORG,
|
||||||
|
project: process.env.SENTRY_PROJECT || env.SENTRY_PROJECT,
|
||||||
|
authToken: process.env.SENTRY_AUTH_TOKEN || env.SENTRY_AUTH_TOKEN,
|
||||||
|
release: {
|
||||||
|
name: `${process.env.npm_package_name}@${process.env.npm_package_version}`,
|
||||||
|
},
|
||||||
|
// Electron loads files from app://, so we need to normalize paths for Source Map matching
|
||||||
|
sourcemaps: {
|
||||||
|
// Rewrite the source paths to strip the Electron app:// protocol
|
||||||
|
rewriteSources: (source) => {
|
||||||
|
// Transform: app:///.vite/renderer/main_window/assets/index.js
|
||||||
|
// Into: ~/.vite/renderer/main_window/assets/index.js
|
||||||
|
return source.replace(/^app:\/\/\//, '~/');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
tanstackRouter({
|
tanstackRouter({
|
||||||
target: 'react',
|
target: 'react',
|
||||||
autoCodeSplitting: true,
|
autoCodeSplitting: true,
|
||||||
@@ -19,10 +40,14 @@ export default defineConfig({
|
|||||||
}),
|
}),
|
||||||
codeInspectorPlugin({ bundler: 'vite' }),
|
codeInspectorPlugin({ bundler: 'vite' }),
|
||||||
],
|
],
|
||||||
|
define: {
|
||||||
|
'process.env.SENTRY_DSN': JSON.stringify(process.env.SENTRY_DSN || env.SENTRY_DSN),
|
||||||
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
preserveSymlinks: true,
|
preserveSymlinks: true,
|
||||||
alias: {
|
alias: {
|
||||||
'@': path.resolve(process.cwd(), './src'),
|
'@': path.resolve(process.cwd(), './src'),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
};
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user