静默启动

This commit is contained in:
刘嘉伟 2024-10-14 11:24:54 +08:00
parent 2ccddbe4b6
commit 4d9c5bf003
4 changed files with 226 additions and 168 deletions

View File

@ -143,7 +143,8 @@ export const initConfigApi = win => {
user: sourceConfig?.user || "",
metaToken: sourceConfig?.metadatas?.token || "",
systemSelfStart: false,
systemStartupConnect: false
systemStartupConnect: false,
systemSilentStartup: false
};
let frpcProxys = [];
// 解析proxy

View File

@ -1,10 +1,23 @@
import {app, BrowserWindow, ipcMain, Menu, MenuItem, MenuItemConstructorOptions, shell, Tray} from "electron";
import {
app,
BrowserWindow,
ipcMain,
Menu,
MenuItem,
MenuItemConstructorOptions,
shell,
Tray
} from "electron";
import { release } from "node:os";
import node_path, { join } from "node:path";
import { initGitHubApi } from "../api/github";
import { initConfigApi } from "../api/config";
import { initProxyApi } from "../api/proxy";
import {initFrpcApi, startFrpWorkerProcess, stopFrpcProcess} from "../api/frpc";
import {
initFrpcApi,
startFrpWorkerProcess,
stopFrpcProcess
} from "../api/frpc";
import { initLoggerApi } from "../api/logger";
import { initFileApi } from "../api/file";
import { getConfig } from "../storage/config";
@ -50,10 +63,16 @@ const preload = join(__dirname, "../preload/index.js");
const url = process.env.VITE_DEV_SERVER_URL;
const indexHtml = join(process.env.DIST, "index.html");
let isQuiting;
log.transports.file.level = 'debug';
log.transports.file.level = "debug";
log.transports.console.level = "debug";
async function createWindow() {
async function createWindow(config: FrpConfig) {
console.log("config", config);
let show = true;
if (config) {
show = !config.systemSilentStartup;
}
console.log("界面", show);
win = new BrowserWindow({
title: "Frpc Desktop",
icon: join(process.env.VITE_PUBLIC, "logo/only/16x16.png"),
@ -70,7 +89,8 @@ async function createWindow() {
// Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
nodeIntegration: true,
contextIsolation: false
}
},
show: show
});
if (process.env.VITE_DEV_SERVER_URL) {
// electron-vite-vue#298
@ -100,12 +120,12 @@ async function createWindow() {
// app.dock.hide();
// }
win.on('minimize', function (event) {
win.on("minimize", function (event) {
event.preventDefault();
win.hide();
});
win.on('close', function (event) {
win.on("close", function (event) {
if (!isQuiting) {
event.preventDefault();
win.hide();
@ -115,14 +135,18 @@ async function createWindow() {
}
return false;
});
}
export const createTray = () => {
log.info(`当前环境 platform${process.platform} arch${process.arch} appData${app.getPath("userData")} version:${app.getVersion()}`)
let menu: Array<(MenuItemConstructorOptions) | (MenuItem)> = [
export const createTray = (config: FrpConfig) => {
log.info(
`当前环境 platform${process.platform} arch${
process.arch
} appData${app.getPath("userData")} version:${app.getVersion()}`
);
let menu: Array<MenuItemConstructorOptions | MenuItem> = [
{
label: '显示主窗口', click: function () {
label: "显示主窗口",
click: function () {
win.show();
if (process.platform === "darwin") {
app.dock.show();
@ -130,40 +154,39 @@ export const createTray = () => {
}
},
{
label: '退出',
label: "退出",
click: () => {
isQuiting = true;
stopFrpcProcess(() => {
app.quit();
})
});
}
}
];
tray = new Tray(node_path.join(process.env.VITE_PUBLIC, "logo/only/16x16.png"))
tray.setToolTip('Frpc Desktop')
const contextMenu = Menu.buildFromTemplate(menu)
tray.setContextMenu(contextMenu)
tray = new Tray(
node_path.join(process.env.VITE_PUBLIC, "logo/only/16x16.png")
);
tray.setToolTip("Frpc Desktop");
const contextMenu = Menu.buildFromTemplate(menu);
tray.setContextMenu(contextMenu);
// 托盘双击打开
tray.on('double-click', () => {
tray.on("double-click", () => {
win.show();
})
});
getConfig((err, config) => {
if (!err) {
if (config) {
if (config.systemStartupConnect) {
log.info(`已开启自动连接 正在自动连接服务器`)
startFrpWorkerProcess(config)
log.info(`已开启自动连接 正在自动连接服务器`);
startFrpWorkerProcess(config);
}
}
}
})
}
};
app.whenReady().then(() => {
createWindow().then(r => {
createTray()
getConfig((err, config) => {
createWindow(config).then(r => {
createTray(config);
// 初始化各个API
initGitHubApi();
initConfigApi(win);
@ -174,7 +197,8 @@ app.whenReady().then(() => {
initCommonApi();
initLocalApi();
// initUpdaterApi(win);
})
});
});
});
app.on("window-all-closed", () => {
@ -182,7 +206,7 @@ app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
stopFrpcProcess(() => {
app.quit();
})
});
}
});
@ -199,14 +223,16 @@ app.on("activate", () => {
if (allWindows.length) {
allWindows[0].focus();
} else {
createWindow();
getConfig((err, config) => {
createWindow(config).then(r => {});
});
}
});
app.on('before-quit', () => {
log.info("before-quit")
app.on("before-quit", () => {
log.info("before-quit");
isQuiting = true;
})
});
// New window example arg: new windows url
ipcMain.handle("open-win", (_, arg) => {

View File

@ -41,6 +41,7 @@ const defaultFormData = ref<FrpConfig>({
proxyConfigProxyUrl: "",
systemSelfStart: false,
systemStartupConnect: false,
systemSilentStartup: false,
user: "",
metaToken: "",
transportHeartbeatInterval: 30,
@ -933,7 +934,7 @@ onUnmounted(() => {
<el-col :span="24">
<div class="h2">系统配置</div>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="开机自启:" prop="systemSelfStart">
<template #label>
<div class="h-full flex items-center mr-1">
@ -963,7 +964,36 @@ onUnmounted(() => {
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="静默启动:" prop="systemSilentStartup">
<template #label>
<div class="h-full flex items-center mr-1">
<el-popover placement="top" trigger="hover">
<template #default>
开启后启动时<span class="font-black text-[#5A3DAA]"
>不打开界面</span
>
</template>
<template #reference>
<IconifyIconOffline
class="text-base"
color="#5A3DAA"
icon="info"
/>
</template>
</el-popover>
</div>
静默启动
</template>
<el-switch
active-text="开"
inline-prompt
inactive-text="关"
v-model="formData.systemSilentStartup"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="自动连接:" prop="systemStartupConnect">
<template #label>
<div class="h-full flex items-center mr-1">

1
types/global.d.ts vendored
View File

@ -76,6 +76,7 @@ declare global {
proxyConfigProxyUrl: string;
systemSelfStart: boolean;
systemStartupConnect: boolean;
systemSilentStartup: boolean;
user: string;
metaToken: string;
transportHeartbeatInterval: number;