Add update service

This commit is contained in:
2025-06-23 19:42:48 +08:00
parent 4f8272e290
commit ea025e3f5d
19 changed files with 639 additions and 270 deletions

View File

@@ -1001,11 +1001,6 @@ export class UpdatesConfig {
*/
"autoUpdate": boolean;
/**
* 是否启用测试版
*/
"betaChannel": boolean;
/** Creates a new UpdatesConfig instance. */
constructor($$source: Partial<UpdatesConfig> = {}) {
if (!("version" in $$source)) {
@@ -1014,9 +1009,6 @@ export class UpdatesConfig {
if (!("autoUpdate" in $$source)) {
this["autoUpdate"] = false;
}
if (!("betaChannel" in $$source)) {
this["betaChannel"] = false;
}
Object.assign(this, $$source);
}

View File

@@ -10,6 +10,7 @@ import * as MigrationService from "./migrationservice.js";
import * as StartupService from "./startupservice.js";
import * as SystemService from "./systemservice.js";
import * as TrayService from "./trayservice.js";
import * as UpdateService from "./updateservice.js";
export {
ConfigService,
DialogService,
@@ -19,7 +20,8 @@ export {
MigrationService,
StartupService,
SystemService,
TrayService
TrayService,
UpdateService
};
export * from "./models.js";

View File

@@ -114,3 +114,70 @@ export enum MigrationStatus {
MigrationStatusCompleted = "completed",
MigrationStatusFailed = "failed",
};
/**
* UpdateCheckResult 更新检查结果
*/
export class UpdateCheckResult {
/**
* 是否有更新
*/
"hasUpdate": boolean;
/**
* 当前版本
*/
"currentVer": string;
/**
* 最新版本
*/
"latestVer": string;
/**
* 发布说明
*/
"releaseNotes": string;
/**
* 发布页面URL
*/
"releaseURL": string;
/**
* 错误信息
*/
"error": string;
/** Creates a new UpdateCheckResult instance. */
constructor($$source: Partial<UpdateCheckResult> = {}) {
if (!("hasUpdate" in $$source)) {
this["hasUpdate"] = false;
}
if (!("currentVer" in $$source)) {
this["currentVer"] = "";
}
if (!("latestVer" in $$source)) {
this["latestVer"] = "";
}
if (!("releaseNotes" in $$source)) {
this["releaseNotes"] = "";
}
if (!("releaseURL" in $$source)) {
this["releaseURL"] = "";
}
if (!("error" in $$source)) {
this["error"] = "";
}
Object.assign(this, $$source);
}
/**
* Creates a new UpdateCheckResult instance from a string or object.
*/
static createFrom($$source: any = {}): UpdateCheckResult {
let $$parsedSource = typeof $$source === 'string' ? JSON.parse($$source) : $$source;
return new UpdateCheckResult($$parsedSource as Partial<UpdateCheckResult>);
}
}

View File

@@ -0,0 +1,30 @@
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
// This file is automatically generated. DO NOT EDIT
/**
* UpdateService 更新服务
* @module
*/
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore: Unused imports
import {Call as $Call, Create as $Create} from "@wailsio/runtime";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore: Unused imports
import * as $models from "./models.js";
/**
* CheckForUpdates 检查更新
*/
export function CheckForUpdates(): Promise<$models.UpdateCheckResult> & { cancel(): void } {
let $resultPromise = $Call.ByID(3024322786) as any;
let $typingPromise = $resultPromise.then(($result: any) => {
return $$createType0($result);
}) as any;
$typingPromise.cancel = $resultPromise.cancel.bind($resultPromise);
return $typingPromise;
}
// Private type creation functions
const $$createType0 = $models.UpdateCheckResult.createFrom;

View File

@@ -4,12 +4,14 @@ import { useConfigStore } from '@/stores/configStore';
import { useSystemStore } from '@/stores/systemStore';
import { useKeybindingStore } from '@/stores/keybindingStore';
import { useThemeStore } from '@/stores/themeStore';
import { useUpdateStore } from '@/stores/updateStore';
import WindowTitleBar from '@/components/titlebar/WindowTitleBar.vue';
const configStore = useConfigStore();
const systemStore = useSystemStore();
const keybindingStore = useKeybindingStore();
const themeStore = useThemeStore();
const updateStore = useUpdateStore();
// 应用启动时加载配置和初始化系统信息
onMounted(async () => {
@@ -23,6 +25,9 @@ onMounted(async () => {
// 初始化语言和主题
await configStore.initializeLanguage();
themeStore.initializeTheme();
// 启动时检查更新
await updateStore.checkOnStartup();
});
</script>

View File

@@ -3,6 +3,7 @@ import {useI18n} from 'vue-i18n';
import {onMounted, onUnmounted, ref, watch} from 'vue';
import {useConfigStore} from '@/stores/configStore';
import {useEditorStore} from '@/stores/editorStore';
import {useUpdateStore} from '@/stores/updateStore';
import * as runtime from '@wailsio/runtime';
import {useRouter} from 'vue-router';
import BlockLanguageSelector from './BlockLanguageSelector.vue';
@@ -11,6 +12,7 @@ import {getLanguage} from '@/views/editor/extensions/codeblock/lang-parser/langu
const editorStore = useEditorStore();
const configStore = useConfigStore();
const updateStore = useUpdateStore();
const {t} = useI18n();
const router = useRouter();
@@ -176,6 +178,21 @@ watch(isLoaded, async (newLoaded) => {
</svg>
</div>
<!-- 更新提示图标 -->
<div
v-if="updateStore.hasUpdate"
class="update-button"
:title="`发现新版本 ${updateStore.updateResult?.latestVer || ''}`"
@click="updateStore.openReleaseURL"
>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/>
<polyline points="7.5,10.5 12,15 16.5,10.5"/>
<polyline points="12,15 12,3"/>
</svg>
</div>
<!-- 窗口置顶图标按钮 -->
<div
class="pin-button"
@@ -241,6 +258,39 @@ watch(isLoaded, async (newLoaded) => {
}
/* 更新提示按钮样式 */
.update-button {
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
padding: 2px;
border-radius: 3px;
background-color: rgba(76, 175, 80, 0.1);
transition: all 0.2s ease;
animation: pulse 2s infinite;
&:hover {
background-color: rgba(76, 175, 80, 0.2);
transform: scale(1.05);
}
svg {
stroke: #4caf50;
}
@keyframes pulse {
0%, 100% {
opacity: 1;
}
50% {
opacity: 0.7;
}
}
}
/* 窗口置顶图标按钮样式 */
.pin-button {
cursor: pointer;

View File

@@ -135,6 +135,19 @@ export default {
language: 'Interface Language',
systemTheme: 'System Theme',
saveOptions: 'Save Options',
autoSaveDelay: 'Auto Save Delay (ms)'
autoSaveDelay: 'Auto Save Delay (ms)',
updateSettings: 'Update Settings',
autoCheckUpdates: 'Auto Check Updates',
autoCheckUpdatesDescription: 'Automatically check for updates on startup',
manualCheck: 'Manual Check',
currentVersion: 'Current Version',
checkForUpdates: 'Check for Updates',
checking: 'Checking...',
checkFailed: 'Check Failed',
newVersionAvailable: 'New Version Available',
upToDate: 'You are using the latest version',
viewUpdate: 'View Update',
releaseNotes: 'Release Notes',
networkError: 'Network connection error, please check your network settings'
}
};

View File

@@ -135,6 +135,19 @@ export default {
language: '界面语言',
systemTheme: '系统主题',
saveOptions: '保存选项',
autoSaveDelay: '自动保存延迟(毫秒)'
autoSaveDelay: '自动保存延迟(毫秒)',
updateSettings: '更新设置',
autoCheckUpdates: '自动检查更新',
autoCheckUpdatesDescription: '启动应用时自动检查更新',
manualCheck: '手动检查',
currentVersion: '当前版本',
checkForUpdates: '检查更新',
checking: '检查中...',
checkFailed: '检查失败',
newVersionAvailable: '发现新版本',
upToDate: '您正在使用最新版本',
viewUpdate: '查看更新',
releaseNotes: '更新内容',
networkError: '网络连接错误,请检查网络设置'
}
};

View File

@@ -9,6 +9,7 @@ import {
LanguageType,
SystemThemeType,
TabType,
UpdatesConfig,
} from '@/../bindings/voidraft/internal/models/models';
import {useI18n} from 'vue-i18n';
import {ConfigUtils} from '@/utils/configUtils';
@@ -42,6 +43,10 @@ type AppearanceConfigKeyMap = {
readonly [K in keyof AppearanceConfig]: string;
};
type UpdatesConfigKeyMap = {
readonly [K in keyof UpdatesConfig]: string;
};
type NumberConfigKey = 'fontSize' | 'tabSize' | 'lineHeight';
// 配置键映射
@@ -70,6 +75,11 @@ const APPEARANCE_CONFIG_KEY_MAP: AppearanceConfigKeyMap = {
systemTheme: 'appearance.systemTheme'
} as const;
const UPDATES_CONFIG_KEY_MAP: UpdatesConfigKeyMap = {
version: 'updates.version',
autoUpdate: 'updates.autoUpdate'
} as const;
// 配置限制
const CONFIG_LIMITS = {
fontSize: {min: 12, max: 28, default: 13},
@@ -145,7 +155,6 @@ const DEFAULT_CONFIG: AppConfig = {
updates: {
version: "1.0.0",
autoUpdate: true,
betaChannel: false
},
metadata: {
version: '1.0.0',
@@ -216,6 +225,21 @@ export const useConfigStore = defineStore('config', () => {
state.config.appearance[key] = value;
};
const updateUpdatesConfig = async <K extends keyof UpdatesConfig>(key: K, value: UpdatesConfig[K]): Promise<void> => {
// 确保配置已加载
if (!state.configLoaded && !state.isLoading) {
await initConfig();
}
const backendKey = UPDATES_CONFIG_KEY_MAP[key];
if (!backendKey) {
throw new Error(`No backend key mapping found for updates.${key.toString()}`);
}
await ConfigService.Set(backendKey, value);
state.config.updates[key] = value;
};
// 加载配置
const initConfig = async (): Promise<void> => {
if (state.isLoading) return;
@@ -411,6 +435,9 @@ export const useConfigStore = defineStore('config', () => {
await updateGeneralConfig('startAtLogin', value);
// 再调用系统设置API
await StartupService.SetEnabled(value);
}
},
// 更新配置相关方法
setAutoUpdate: async (value: boolean) => await updateUpdatesConfig('autoUpdate', value)
};
});

View File

@@ -0,0 +1,81 @@
import {defineStore} from 'pinia'
import {computed, ref} from 'vue'
import {CheckForUpdates} from '@/../bindings/voidraft/internal/services/updateservice'
import {UpdateCheckResult} from '@/../bindings/voidraft/internal/services/models'
import {useConfigStore} from './configStore'
export const useUpdateStore = defineStore('update', () => {
// 状态
const isChecking = ref(false)
const updateResult = ref<UpdateCheckResult | null>(null)
const hasCheckedOnStartup = ref(false)
// 计算属性
const hasUpdate = computed(() => updateResult.value?.hasUpdate || false)
const errorMessage = computed(() => updateResult.value?.error || '')
// 检查更新
const checkForUpdates = async (): Promise<boolean> => {
if (isChecking.value) return false
isChecking.value = true
try {
const result = await CheckForUpdates()
updateResult.value = result
return !result.error
} catch (error) {
updateResult.value = new UpdateCheckResult({
hasUpdate: false,
currentVer: '1.0.0',
latestVer: '',
releaseNotes: '',
releaseURL: '',
error: 'Network error'
})
return false
} finally {
isChecking.value = false
}
}
// 启动时检查更新
const checkOnStartup = async () => {
if (hasCheckedOnStartup.value) return
const configStore = useConfigStore()
if (configStore.config.updates.autoUpdate) {
await checkForUpdates()
}
hasCheckedOnStartup.value = true
}
// 打开发布页面
const openReleaseURL = () => {
if (updateResult.value?.releaseURL) {
window.open(updateResult.value.releaseURL, '_blank')
}
}
// 重置状态
const reset = () => {
updateResult.value = null
isChecking.value = false
}
return {
// 状态
isChecking,
updateResult,
hasCheckedOnStartup,
// 计算属性
hasUpdate,
errorMessage,
// 方法
checkForUpdates,
checkOnStartup,
openReleaseURL,
reset
}
})

View File

@@ -186,11 +186,6 @@ const parseKeyBinding = (keyStr: string, command?: string): string[] => {
return part.charAt(0).toUpperCase() + part.slice(1).toLowerCase();
}).filter(part => part.length > 0);
};
// 组件挂载时加载快捷键数据
onMounted(async () => {
await keybindingStore.loadKeyBindings();
});
</script>
<template>

View File

@@ -1,87 +1,123 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import { ref } from 'vue';
import {useI18n} from 'vue-i18n';
import {computed, onMounted} from 'vue';
import {useConfigStore} from '@/stores/configStore';
import {useUpdateStore} from '@/stores/updateStore';
import SettingSection from '../components/SettingSection.vue';
import SettingItem from '../components/SettingItem.vue';
import ToggleSwitch from '../components/ToggleSwitch.vue';
const { t } = useI18n();
const {t} = useI18n();
const configStore = useConfigStore();
const updateStore = useUpdateStore();
// 模拟版本数据
const currentVersion = ref('1.0.0');
const isCheckingForUpdates = ref(false);
const updateAvailable = ref(false);
const latestVersion = ref('1.1.0');
const updateNotes = ref([
'优化编辑器性能',
'新增自动保存功能',
'修复多个界面显示问题',
'添加更多编辑器主题'
]);
// 计算属性
const autoCheckUpdates = computed({
get: () => configStore.config.updates.autoUpdate,
set: async (value: boolean) => {
await configStore.setAutoUpdate(value);
}
});
// 自动检查更新选项
const autoCheckUpdates = ref(true);
// 格式化发布说明
const formatReleaseNotes = (notes: string) => {
if (!notes) return [];
// 模拟检查更新
const checkForUpdates = () => {
isCheckingForUpdates.value = true;
// 模拟网络请求延迟
setTimeout(() => {
isCheckingForUpdates.value = false;
updateAvailable.value = true;
}, 1500);
// 简单的Markdown列表解析
return notes
.split('\n')
.filter(line => line.trim().startsWith('-') || line.trim().startsWith('*'))
.map(line => line.replace(/^[\s\-\*]+/, '').trim())
.filter(line => line.length > 0);
};
// 模拟下载更新
const downloadUpdate = () => {
// 在实际应用中这里会调用后端API下载更新
alert('开始下载更新...');
// 处理查看更新
const viewUpdate = () => {
updateStore.openReleaseURL();
};
// 获取错误信息的国际化文本
const getErrorMessage = (error: string) => {
if (error.includes('Network') || error.includes('network')) {
return t('settings.networkError');
}
return error;
};
</script>
<template>
<div class="settings-page">
<SettingSection :title="t('settings.updates')">
<div class="update-info">
<div class="version-info">
<div class="current-version">
<span class="label">当前版本:</span>
<span class="version">{{ currentVersion }}</span>
<!-- 自动更新设置 -->
<SettingSection :title="t('settings.updateSettings')">
<SettingItem
:title="t('settings.autoCheckUpdates')"
:description="t('settings.autoCheckUpdatesDescription')"
>
<ToggleSwitch v-model="autoCheckUpdates"/>
</SettingItem>
</SettingSection>
<!-- 手动检查更新 -->
<SettingSection :title="t('settings.manualCheck')">
<SettingItem
:title="`${t('settings.currentVersion')}: ${updateStore.updateResult?.currentVer || configStore.config.updates.version}`"
>
<button
class="check-button"
@click="updateStore.checkForUpdates"
:disabled="updateStore.isChecking"
>
<span v-if="updateStore.isChecking" class="loading-spinner"></span>
{{ updateStore.isChecking ? t('settings.checking') : t('settings.checkForUpdates') }}
</button>
</SettingItem>
<!-- 检查结果 -->
<div class="check-results" v-if="updateStore.updateResult || updateStore.errorMessage">
<!-- 错误信息 -->
<div v-if="updateStore.errorMessage" class="result-item error-result">
<div class="result-text">
<span class="result-icon"></span>
<span class="result-message">{{ getErrorMessage(updateStore.errorMessage) }}</span>
</div>
<button
class="check-button"
@click="checkForUpdates"
:disabled="isCheckingForUpdates"
>
<span v-if="isCheckingForUpdates" class="loading-spinner"></span>
{{ isCheckingForUpdates ? '检查中...' : '检查更新' }}
</button>
</div>
<div v-if="updateAvailable" class="update-available">
<div class="update-header">
<div class="update-title">发现新版本: {{ latestVersion }}</div>
<button class="download-button" @click="downloadUpdate">
下载更新
<!-- 有新版本 -->
<div v-else-if="updateStore.hasUpdate" class="result-item update-result">
<div class="result-header">
<div class="result-text">
<span class="result-icon">🎉</span>
<span class="result-message">
{{ t('settings.newVersionAvailable') }}: {{ updateStore.updateResult?.latestVer }}
</span>
</div>
<button class="view-button" @click="viewUpdate">
{{ t('settings.viewUpdate') }}
</button>
</div>
<div class="update-notes">
<div class="notes-title">更新内容:</div>
<ul class="notes-list">
<li v-for="(note, index) in updateNotes" :key="index">
<div v-if="updateStore.updateResult?.releaseNotes" class="release-notes">
<div class="notes-title">{{ t('settings.releaseNotes') }}:</div>
<ul class="notes-list" v-if="formatReleaseNotes(updateStore.updateResult.releaseNotes).length > 0">
<li v-for="(note, index) in formatReleaseNotes(updateStore.updateResult.releaseNotes)" :key="index">
{{ note }}
</li>
</ul>
<div v-else class="notes-text">
{{ updateStore.updateResult.releaseNotes }}
</div>
</div>
</div>
<!-- 已是最新版本 -->
<div v-else-if="updateStore.updateResult && !updateStore.hasUpdate && !updateStore.errorMessage"
class="result-item success-result">
<div class="result-text">
<span class="result-icon"></span>
<span class="result-message">{{ t('settings.upToDate') }}</span>
</div>
</div>
</div>
<SettingItem title="自动检查更新" description="启动应用时自动检查更新">
<ToggleSwitch v-model="autoCheckUpdates" />
</SettingItem>
</SettingSection>
</div>
</template>
@@ -91,133 +127,167 @@ const downloadUpdate = () => {
max-width: 800px;
}
.update-info {
padding: 15px 16px;
margin-bottom: 20px;
.check-button {
padding: 8px 16px;
background-color: var(--settings-input-bg);
border: 1px solid var(--settings-input-border);
border-radius: 4px;
color: var(--settings-text);
cursor: pointer;
font-size: 12px;
transition: all 0.2s ease;
display: flex;
align-items: center;
gap: 8px;
&:hover:not(:disabled) {
background-color: var(--settings-hover);
border-color: var(--settings-border);
}
&:active:not(:disabled) {
transform: translateY(1px);
}
&:disabled {
opacity: 0.6;
cursor: not-allowed;
}
.loading-spinner {
display: inline-block;
width: 14px;
height: 14px;
border: 2px solid rgba(255, 255, 255, 0.3);
border-radius: 50%;
border-top-color: var(--settings-text);
animation: spin 1s linear infinite;
}
@keyframes spin {
to {
transform: rotate(360deg);
}
}
}
.check-results {
padding: 0 16px;
margin-top: 16px;
}
.result-item {
padding: 12px 0;
.version-info {
.result-text {
display: flex;
align-items: center;
gap: 8px;
font-size: 13px;
line-height: 1.4;
}
.result-icon {
font-size: 16px;
flex-shrink: 0;
}
.result-message {
flex: 1;
}
.result-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
.current-version {
font-size: 13px;
.label {
color: var(--text-muted);
margin-right: 5px;
}
.version {
color: var(--settings-text);
font-weight: 500;
}
}
.check-button {
padding: 8px 16px;
margin-bottom: 8px;
.view-button {
padding: 4px 12px;
background-color: var(--settings-input-bg);
border: 1px solid var(--settings-input-border);
border-radius: 4px;
color: var(--settings-text);
cursor: pointer;
font-size: 12px;
font-size: 11px;
transition: all 0.2s ease;
display: flex;
align-items: center;
gap: 8px;
&:hover:not(:disabled) {
flex-shrink: 0;
&:hover {
background-color: var(--settings-hover);
border-color: var(--settings-border);
}
&:active:not(:disabled) {
&:active {
transform: translateY(1px);
}
&:disabled {
opacity: 0.6;
cursor: not-allowed;
}
.loading-spinner {
display: inline-block;
width: 14px;
height: 14px;
border: 2px solid rgba(255, 255, 255, 0.3);
border-radius: 50%;
border-top-color: var(--settings-text);
animation: spin 1s linear infinite;
}
@keyframes spin {
to { transform: rotate(360deg); }
}
}
}
.update-available {
background-color: var(--settings-card-bg);
border: 1px solid var(--settings-border);
border-radius: 6px;
padding: 16px;
.update-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
.release-notes {
margin-top: 8px;
padding-left: 24px;
.notes-title {
font-size: 12px;
color: var(--text-muted);
margin-bottom: 6px;
}
.notes-list {
margin: 0;
padding-left: 16px;
.update-title {
font-size: 13px;
font-weight: 500;
color: #4a9eff;
}
.download-button {
padding: 8px 16px;
background-color: #2c5a9e;
border: none;
border-radius: 4px;
color: #ffffff;
cursor: pointer;
li {
font-size: 12px;
transition: all 0.2s ease;
&:hover {
background-color: #3867a9;
}
&:active {
transform: translateY(1px);
color: var(--settings-text-secondary);
line-height: 1.4;
margin-bottom: 3px;
&:last-child {
margin-bottom: 0;
}
}
}
.update-notes {
.notes-title {
font-size: 12px;
color: var(--settings-text-secondary);
margin-bottom: 8px;
}
.notes-list {
margin: 0;
padding-left: 20px;
li {
font-size: 12px;
color: var(--settings-text-secondary);
margin-bottom: 6px;
&:last-child {
margin-bottom: 0;
}
}
}
.notes-text {
font-size: 12px;
color: var(--settings-text-secondary);
line-height: 1.4;
white-space: pre-wrap;
word-wrap: break-word;
}
}
}
.error-result {
.result-message {
color: #f44336;
}
.result-icon {
color: #f44336;
}
}
.update-result {
.result-message {
color: #2196f3;
font-weight: 500;
}
.result-icon {
color: #2196f3;
}
}
.success-result {
.result-message {
color: #4caf50;
}
.result-icon {
color: #4caf50;
}
}
</style>

2
go.mod
View File

@@ -6,6 +6,7 @@ toolchain go1.24.2
require (
github.com/Masterminds/semver/v3 v3.3.1
github.com/google/go-github/v63 v63.0.0
github.com/knadh/koanf/parsers/json v1.0.0
github.com/knadh/koanf/providers/file v1.2.0
github.com/knadh/koanf/providers/structs v1.0.0
@@ -33,6 +34,7 @@ require (
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect

6
go.sum
View File

@@ -50,8 +50,13 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE=
github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -156,6 +161,7 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

View File

@@ -84,9 +84,8 @@ type AppearanceConfig struct {
// UpdatesConfig 更新设置配置
type UpdatesConfig struct {
Version string `json:"version"` // 当前版本号
AutoUpdate bool `json:"autoUpdate"` // 是否自动更新
BetaChannel bool `json:"betaChannel"` // 是否启用测试版
Version string `json:"version"` // 当前版本号
AutoUpdate bool `json:"autoUpdate"` // 是否自动更新
}
// AppConfig 应用配置 - 按照前端设置页面分类组织
@@ -143,9 +142,8 @@ func NewDefaultAppConfig() *AppConfig {
SystemTheme: SystemThemeAuto, // 默认使用深色系统主题
},
Updates: UpdatesConfig{
Version: "1.0.0",
AutoUpdate: true,
BetaChannel: false,
Version: "1.0.0",
AutoUpdate: true,
},
Metadata: ConfigMetadata{
LastUpdated: time.Now().Format(time.RFC3339),

View File

@@ -1,84 +0,0 @@
//go:build !windows && !darwin && !linux
package services
import (
"fmt"
"voidraft/internal/models"
"github.com/wailsapp/wails/v3/pkg/application"
"github.com/wailsapp/wails/v3/pkg/services/log"
)
// HotkeyService 存根热键服务
type HotkeyService struct {
logger *log.LoggerService
configService *ConfigService
}
// HotkeyError 热键错误
type HotkeyError struct {
Operation string
Err error
}
// Error 实现error接口
func (e *HotkeyError) Error() string {
return fmt.Sprintf("hotkey %s: %v", e.Operation, e.Err)
}
// Unwrap 获取原始错误
func (e *HotkeyError) Unwrap() error {
return e.Err
}
// NewHotkeyService 创建热键服务实例
func NewHotkeyService(configService *ConfigService, logger *log.LoggerService) *HotkeyService {
if logger == nil {
logger = log.New()
}
return &HotkeyService{
logger: logger,
configService: configService,
}
}
// Initialize 初始化热键服务
func (hs *HotkeyService) Initialize(app *application.App) error {
hs.logger.Warning("Global hotkey is not supported on this platform")
return nil
}
// RegisterHotkey 注册全局热键
func (hs *HotkeyService) RegisterHotkey(hotkey *models.HotkeyCombo) error {
return &HotkeyError{"register", fmt.Errorf("not supported on this platform")}
}
// UnregisterHotkey 取消注册全局热键
func (hs *HotkeyService) UnregisterHotkey() error {
return &HotkeyError{"unregister", fmt.Errorf("not supported on this platform")}
}
// UpdateHotkey 更新热键配置
func (hs *HotkeyService) UpdateHotkey(enable bool, hotkey *models.HotkeyCombo) error {
if enable {
return hs.RegisterHotkey(hotkey)
}
return hs.UnregisterHotkey()
}
// GetCurrentHotkey 获取当前热键
func (hs *HotkeyService) GetCurrentHotkey() *models.HotkeyCombo {
return nil
}
// IsRegistered 检查是否已注册
func (hs *HotkeyService) IsRegistered() bool {
return false
}
// ServiceShutdown 关闭服务
func (hs *HotkeyService) ServiceShutdown() error {
return nil
}

View File

@@ -19,6 +19,7 @@ type ServiceManager struct {
trayService *TrayService
keyBindingService *KeyBindingService
startupService *StartupService
updateService *UpdateService
logger *log.LoggerService
}
@@ -57,6 +58,9 @@ func NewServiceManager() *ServiceManager {
// 初始化开机启动服务
startupService := NewStartupService(configService, logger)
// 初始化更新服务
updateService := NewUpdateService(configService, logger)
// 使用新的配置通知系统设置热键配置变更监听
err := configService.SetHotkeyChangeCallback(func(enable bool, hotkey *models.HotkeyCombo) error {
return hotkeyService.UpdateHotkey(enable, hotkey)
@@ -89,6 +93,7 @@ func NewServiceManager() *ServiceManager {
trayService: trayService,
keyBindingService: keyBindingService,
startupService: startupService,
updateService: updateService,
logger: logger,
}
}
@@ -105,6 +110,7 @@ func (sm *ServiceManager) GetServices() []application.Service {
application.NewService(sm.trayService),
application.NewService(sm.keyBindingService),
application.NewService(sm.startupService),
application.NewService(sm.updateService),
}
}
@@ -142,3 +148,8 @@ func (sm *ServiceManager) GetKeyBindingService() *KeyBindingService {
func (sm *ServiceManager) GetStartupService() *StartupService {
return sm.startupService
}
// GetUpdateService 获取更新服务实例
func (sm *ServiceManager) GetUpdateService() *UpdateService {
return sm.updateService
}

View File

@@ -0,0 +1,89 @@
package services
import (
"context"
"fmt"
"net/http"
"strings"
"time"
"github.com/google/go-github/v63/github"
"github.com/wailsapp/wails/v3/pkg/services/log"
)
// UpdateCheckResult 更新检查结果
type UpdateCheckResult struct {
HasUpdate bool `json:"hasUpdate"` // 是否有更新
CurrentVer string `json:"currentVer"` // 当前版本
LatestVer string `json:"latestVer"` // 最新版本
ReleaseNotes string `json:"releaseNotes"` // 发布说明
ReleaseURL string `json:"releaseURL"` // 发布页面URL
Error string `json:"error"` // 错误信息
}
// UpdateService 更新服务
type UpdateService struct {
logger *log.LoggerService
configService *ConfigService
githubClient *github.Client
currentVersion string
}
// NewUpdateService 创建更新服务实例
func NewUpdateService(configService *ConfigService, logger *log.LoggerService) *UpdateService {
config, err := configService.GetConfig()
if err != nil {
logger.Error("Failed to get config", "error", err)
return nil
}
currentVersion := config.Updates.Version
if currentVersion == "" {
currentVersion = "1.0.0"
}
httpClient := &http.Client{Timeout: 30 * time.Second}
githubClient := github.NewClient(httpClient)
return &UpdateService{
logger: logger,
configService: configService,
githubClient: githubClient,
currentVersion: currentVersion,
}
}
// CheckForUpdates 检查更新
func (us *UpdateService) CheckForUpdates() UpdateCheckResult {
result := UpdateCheckResult{
CurrentVer: us.currentVersion,
HasUpdate: false,
}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
release, _, err := us.githubClient.Repositories.GetLatestRelease(ctx, "landaiqing", "voidraft")
if err != nil {
result.Error = fmt.Sprintf("Failed to check for updates: %v", err)
return result
}
if release.GetDraft() || release.GetPrerelease() {
result.Error = "Latest release is draft or prerelease"
return result
}
latestVer := strings.TrimPrefix(release.GetTagName(), "v")
currentVer := strings.TrimPrefix(us.currentVersion, "v")
result.LatestVer = latestVer
result.ReleaseNotes = release.GetBody()
result.ReleaseURL = release.GetHTMLURL()
if latestVer != currentVer && latestVer > currentVer {
result.HasUpdate = true
}
return result
}

View File

@@ -4,6 +4,7 @@ import (
"embed"
_ "embed"
"log"
"log/slog"
"time"
"voidraft/internal/services"
"voidraft/internal/systray"
@@ -44,6 +45,7 @@ func main() {
Assets: application.AssetOptions{
Handler: application.AssetFileServerFS(assets),
},
LogLevel: slog.LevelDebug,
Mac: application.MacOptions{
ApplicationShouldTerminateAfterLastWindowClosed: true,
},