16 Commits

Author SHA1 Message Date
Minoricew
ef0e39dd8c [🔁 Chore] Auto upload release for workflow 2025-06-14 16:51:28 +08:00
Minoricew
9a2a335742 [ Feat] {#21} Add AppBar window oper icons
1. [+] {#21} 增加了应用栏 (顶栏) 上的窗口操作按钮
2. [-] 删掉了几个调试时留下的 console.debug
2025-06-14 16:07:10 +08:00
Minoricew
e63c989d88 [🚧 Fix] Infrastructure logic errors
1. [/] 修复了 Header Icon 默认样式为 Hidden, 导致 UI Loader 尝试 Revive 后 Header Icon 消失的异常。
2. [/] 修正了一个 PLS 连接逻辑错误 (未正确处理更新 `installed` 参数的时机)。
3. [/] 修正了冰点上报拦截预览视图中, 未正确判断状态码导致的异常。
2025-06-13 22:26:36 +08:00
Minoricew
70ffa3f581 [ Feat] <Settings UI> Support custom access methods
1. [/] 修复了 PLS 下载时, 目录未递归创建导致的 ENOENT 错误。
2. [+] 现在可以通过多种方式访问 Aura 设置 UI 了, 更多详细信息, 请参见 #18。
3. [↑] 优化了 Tooltip 的渲染逻辑。
2025-06-13 16:24:10 +08:00
Minoricew
c0249693a8 [🚧 Fix] <Settings> Invalid (outdated) tip msg in pref/aura
1. [-] 删除了来自旧版本的 Tip (现在配置文件已经可以手动启 / 禁用加密了)
2025-06-13 12:12:46 +08:00
Minoricew
ca5d94ebd8 [🚧 Fix] <PLS & FS> Improve PLS download logic & UX
1. [+] 增加了 PLS 下载操作的取消功能
2. [/] 修复了 FS IPC 中 `downloadFile` 时, 过早地从 downloadTasks 中删除任务的逻辑错误。
3. [↑] 改进了 PLS IPC 中 `handlePLSDownload` 获取版本信息时的逻辑, 现在该函数会从全局 API 信息中逐个尝试 API 域名。减少了极端网络环境下, 版本信息获取失败的可能性。
4. [/] 修复了下载失败后, 下载按钮依然保持灰显的问题。
5. [+] 为 PLS 下载增加了进度条显示。
6. [/] 优化了 `plsConnectionManager` 中一些不必要的 IPC 状态同步 (有些时候还会导致逻辑错误)。
2025-06-13 11:49:22 +08:00
Minoricew
a9d3772b51 [Fix] <PLS> More verbose logging & Change API domain 2025-06-12 20:30:13 +08:00
Minoricew
9e63a9374f [Feat] Log file auto cleanup (#15) & Improve logger experience
Co-authored-by: TianMiao <tianmiao.work@foxmail.com>
2025-06-11 17:59:57 +08:00
Minoricew
c3a70ece88 [Fix] IPC plsStats not sync 2025-06-11 17:29:28 +08:00
Minoricew
54df7011c0 [Fix] Page crash when plsRules === null 2025-06-11 01:10:44 +08:00
Minoricew
423142d785 [Fix] Minor UX tweaks: freezeOverride components 2025-06-11 00:35:49 +08:00
Minoricew
a639ae0ac6 [Feat] Refactor UI loader & Add freeze report override 2025-06-10 00:28:53 +08:00
Minoricew
ed29f1b86f [Feat] Download PLS from API 2025-06-09 18:02:11 +08:00
Minoricew
8ab55bc93c [Feat] Further PLS ctrl & childProc perf improvements 2025-06-07 23:51:54 +08:00
Minoricew
50bde49414 [Chore] Create auto pack workflow 2025-06-06 19:07:49 +08:00
Minoricew
7b7254f1bb [Chore] Add Repobeats analytics img 2025-06-06 17:57:32 +08:00
44 changed files with 4093 additions and 596 deletions

175
.github/workflows/pack.yml vendored Normal file
View File

@@ -0,0 +1,175 @@
name: Patch ASAR & Pack source code
on:
push:
branches: [dev, stable]
pull_request:
branches: [dev, stable, main, master]
workflow_dispatch:
permissions: write-all
jobs:
pack:
name: Patch & Pack
runs-on: ubuntu-latest
steps:
- name: Setup Node.JS 20 LTS
uses: actions/setup-node@v4
with:
node-version: "20"
- name: Install dependencies
run: |
sudo apt update
sudo apt install -y p7zip-full wget
npm install -g asar
- name: Checkout repository code
uses: actions/checkout@v4
with:
path: "./HugoAura-Code"
- name: Download SeewoServiceSetup
run: |
echo "[DEBUG] Working DIR:"
pwd
wget -nv -O "SeewoService.exe" "https://e.seewo.com/download/file?code=SeewoServiceSetup"
echo "[DEBUG] Listing downloaded file"
ls -la SeewoService*
- name: Extract SeewoServiceSetup as zip
run: |
mkdir -p SeewoServiceSource
7z x "SeewoService.exe" -o"./SeewoServiceSource/" -y
echo "[DEBUG] Listing extracted files"
ls -la SeewoServiceSource/
- name: Extract ASAR file
run: |
cd SeewoServiceSource
SEEWO_DIR=$(find . -name "SeewoService_*" -type d | head -1)
echo "[INFO] Found SeewoService directory: $SEEWO_DIR"
cd "$SEEWO_DIR/SeewoServiceAssistant/resources/"
asar extract ./app.asar ./app-unpacked
- name: Move app-unpacked and clean SSASource
run: |
mkdir -p SSARes
cd SeewoServiceSource
SEEWO_DIR=$(find . -name "SeewoService_*" -type d | head -1)
mv "$SEEWO_DIR/SeewoServiceAssistant/resources/app-unpacked" "../SSARes/"
cd ..
rm -rf SeewoServiceSource
rm -rf *.exe
echo "[DEBUG] Listing Working DIR"
ls -la
- name: Patch main.js
run: |
cd SSARes/app-unpacked
### cp main.js main.js.bak
cat > patch_main.js << 'EOF'
const fs = require('fs');
let content = fs.readFileSync('main.js', 'utf8');
content = 'const hook = require("./hook.js");\n' + content;
content = content.replace(/n\.m=e/, ';const zeron = require("./zeron.js");n = zeron(n);n.m=e');
content = content.replace(/let f=new s\(Object\.assign\(\{\},\{transparent:!0,/, ';hook({ central: n, windowName: this.wname, config: c });let f=new s(Object.assign({},{transparent:!0,');
content = content.replace(/c\.canOpenDevTool/, 'c.canOpenDevTool,preload: __dirname + "\\\\preload.js"');
fs.writeFileSync('main.js', content);
console.log('[SUCCESS] main.js has been modified successfully');
EOF
echo "[DEBUG] Running patch_main.js"
node ./patch_main.js
rm -rf patch_main.js
- name: Copy HugoAura core files
run: |
cp -r HugoAura-Code/src/core/* SSARes/app-unpacked/
echo "[DEBUG] Listing files under <Working DIR>/SSARes/app-unpacked/"
ls -la SSARes/app-unpacked/
- name: Create artifacts DIR and re-pack ASAR
run: |
echo "[DEBUG] Creating artifacts directory"
mkdir -p Artifacts
asar pack SSARes/app-unpacked Artifacts/app-patched.asar
- name: Create aura.zip
run: |
cd HugoAura-Code/src/aura
zip -r ../../../Artifacts/aura.zip .
cd ../../..
echo "[DEBUG] Files in <Working DIR>/Artifacts directory:"
ls -la Artifacts/
- name: Get short commit hash
run: |
cd ./HugoAura-Code
SHORT_HASH=$(git rev-parse --short=7 HEAD)
echo "SHORT_HASH=$SHORT_HASH" >> $GITHUB_ENV
- name: Create release content
run: |
cat > rel_msg.txt << EOF
## 这是 HugoAura 的 CI 自动构建版本
### 版本类型: 🔁 自动构建版
### 版本号: `vAutoBuild-${{ env.SHORT_HASH }}`
### 对应 Commit: [`${{ env.SHORT_HASH }}`](https://github.com/HugoAura/Seewo-HugoAura/commit/${{ env.GITHUB_SHA }})
---
### ⚠ 注意: CI 自动构建版本可能不稳定 / 存在较多 Bug, 更新时请留意
**🕘 构建时间: ${{ env.BUILDTIME }}**
EOF
- name: Upload patched ASAR
uses: actions/upload-artifact@v4
with:
name: asar-patched
path: Artifacts/app-patched.asar
- name: Upload aura.zip
uses: actions/upload-artifact@v4
with:
name: aura-code
path: Artifacts/aura.zip
- name: Upload release
uses: softprops/action-gh-release@v2
with:
tag_name: vAutoBuild
name: "[CI] HugoAura Auto Build Release"
body_path: rel_msg.txt
prerelease: true
generate_release_notes: false
token: ${{ secrets.GITHUB_TOKEN }}
file: |
Artifacts/app-patched.asar
Artifacts/aura.zip

View File

@@ -14,6 +14,8 @@
> [!IMPORTANT]
> 已经过测试的希沃管家版本: v1.5.4.3824
![Repobeats](https://repobeats.axiom.co/api/embed/69b5be5daacef624b8f5e4b8966a0b5898439a22.svg "Repobeats analytics image")
## ✨ 概览
[天下](https://www.bilibili.com/video/BV1UN4y1k7bA) [苦希沃管家](https://www.bilibili.com/video/BV18Z421j7Lf) [久矣](https://github.com/255doesnotexist/SeewoAssistantPasswordRecovery), 如此~~好用~~的一款集控软件, 让广大电教委员对它~~爱不释手~~。

View File

@@ -1,6 +1,6 @@
{
"name": "HugoAura",
"version": "0.1.1-pre-III",
"version": "0.1.1-pre-IV",
"description": "Aura for SeewoHugo",
"main": "app.asar/main.js",
"dependencies": {},

View File

@@ -64,16 +64,21 @@ const buildIpcMain = (electron) => {
} else {
const isWindowValid = global.__HUGO_AURA__.hookedWindows.has(windowKey);
if (!isWindowValid) {
throw new Error(
`[HugoAura / Main / IPC / ERROR] Unknown windowKey: ${windowKey}`
console.warn(
`[HugoAura / Main / IPC / WARN] Unknown windowKey: ${windowKey}, window may not have started yet.`
);
return {
success: false,
};
}
sendDataToWebContents(windowKey, channel, data);
}
};
const { applyBaseIpcHandler } = require("./ipcModules/baseIpcHandler");
const { applyConfigIpcHandler } = require("./ipcModules/configIpcHandler");
const { applyFsIpcHandler } = require("./ipcModules/fsIpcHandler");
const { applyPlsIpcHandler } = require("./ipcModules/plsIpcHandler");
ipcMain.handle("$aura.base.restartApplication", async () => {
@@ -81,7 +86,9 @@ const buildIpcMain = (electron) => {
app.exit(0);
});
applyBaseIpcHandler(ipcMain);
applyConfigIpcHandler(ipcMain);
applyFsIpcHandler(ipcMain);
applyPlsIpcHandler(ipcMain);
};

View File

@@ -0,0 +1,59 @@
// @ts-check
const { BrowserWindow } = require("electron");
const composables = {
getBrowserWindowInstance: (windowKey) => {
if (!global.__HUGO_AURA__.hookedWindows) return null;
const hookedWindowIns = global.__HUGO_AURA__.hookedWindows.get(windowKey);
if (!hookedWindowIns) return undefined;
const browserWindowIns = BrowserWindow.fromWebContents(
hookedWindowIns.webContents
);
return browserWindowIns;
},
};
/**
*
* @param {import("electron").IpcMain} ipcMain
*/
const applyBaseIpcHandler = (ipcMain) => {
const methodBase = "$aura.base";
ipcMain.on(
`${methodBase}.minimizeWindow`,
/**
*
* @param {import("electron").IpcMainEvent} _event
* @param {{ targetWindowKey: string }} arg
*/
(_event, arg) => {
const browserWindowIns = composables.getBrowserWindowInstance(
arg.targetWindowKey
);
if (!browserWindowIns) return;
browserWindowIns.minimize();
}
);
ipcMain.on(
`${methodBase}.closeWindow`,
/**
*
* @param {import("electron").IpcMainEvent} _event
* @param {{ targetWindowKey: string }} arg
*/
(_event, arg) => {
const browserWindowIns = composables.getBrowserWindowInstance(
arg.targetWindowKey
);
if (!browserWindowIns) return;
browserWindowIns.close();
}
);
};
module.exports = { applyBaseIpcHandler };

View File

@@ -0,0 +1,207 @@
// @ts-check
const __SCOPE = "main";
const { exec } = require("child_process");
const nodeHttp = require("http");
const nodeHttps = require("https");
const fs = require("fs");
const path = require("path");
const { genRandomHex } = require("../../../utils/crypto");
const composableFunctions = {
/**
*
* @param {string} url
* @param {string} targetPath
* @param {((arg: DownloadTask) => any)} progressCallback
*/
downloadFile: async (url, targetPath, progressCallback) => {
if (!progressCallback) return false;
const taskId = genRandomHex();
/**
* @type {DownloadTask}
*/
const failedTemplate = {
id: taskId,
progress: 100,
status: "failed",
dlUrl: url,
savePath: targetPath,
message: "",
};
if (!url || !targetPath) {
failedTemplate.message = "Invalid arg";
progressCallback(failedTemplate);
return false;
}
const dirName = path.dirname(targetPath);
if (!fs.existsSync(dirName)) {
fs.mkdirSync(dirName, { recursive: true });
}
const httpModuleIns = url.startsWith("https") ? nodeHttps : nodeHttp;
global.__HUGO_AURA__.fsTasks?.downloadTasks.set(taskId, {
status: "waiting",
cancelReq: null,
});
progressCallback({
id: taskId,
progress: 0,
status: "waiting",
dlUrl: url,
savePath: targetPath,
});
const fsStream = fs.createWriteStream(targetPath);
const dlReq = httpModuleIns.get(url, (response) => {
if (response.statusCode !== 200) {
fsStream.close();
failedTemplate.message = `Request error: HTTP ${response.statusCode}`;
progressCallback(failedTemplate);
return false;
}
const contentLength = response.headers["content-length"];
// @ts-expect-error
const totalBytes = parseInt(contentLength, 10) || 0; // No error handling 😆
let curRecvBytes = 0;
let hasCancelled = false;
global.__HUGO_AURA__.fsTasks?.downloadTasks.set(taskId, {
status: "progressing",
cancelReq: () => {
hasCancelled = true;
dlReq.destroy();
fsStream.close();
fs.unlink(targetPath, () => {});
global.__HUGO_AURA__.fsTasks?.downloadTasks.delete(taskId);
progressCallback({
id: taskId,
progress: 100,
curBytes: curRecvBytes,
totalBytes: totalBytes,
status: "cancelled",
dlUrl: url,
savePath: targetPath,
});
},
});
response.on("data", (chunk) => {
curRecvBytes += chunk.length;
const curProgress =
totalBytes > 0 ? (curRecvBytes / totalBytes) * 100 : 0;
progressCallback({
id: taskId,
progress: curProgress.toFixed(2),
curBytes: curRecvBytes,
totalBytes: totalBytes,
status: "progressing",
dlUrl: url,
savePath: targetPath,
});
});
response.pipe(fsStream);
fsStream.on("finish", () => {
fsStream.close();
if (hasCancelled) {
return;
}
progressCallback({
id: taskId,
progress: (100).toFixed(2),
curBytes: curRecvBytes,
totalBytes: totalBytes,
status: "done",
dlUrl: url,
savePath: targetPath,
});
global.__HUGO_AURA__.fsTasks?.downloadTasks.delete(taskId);
});
return true;
});
dlReq.on("error", (e) => {
fsStream.close();
fs.unlink(targetPath, () => {});
failedTemplate.message =
"Request error: Unexpected error while downloading file";
failedTemplate.errorObj = e;
console.error(
`[HugoAura / IPC / FS / ERROR] Error downloading file from ${url}, errorObj:`,
e
);
progressCallback(failedTemplate);
global.__HUGO_AURA__.fsTasks?.downloadTasks.delete(taskId);
return false;
});
},
};
/**
*
* @param {import("electron").IpcMain} ipcMain
*/
const applyFsIpcHandler = (ipcMain) => {
const methodBase = "$aura.fs";
global.__HUGO_AURA__.fsTasks = {
downloadTasks: new Map(),
};
ipcMain.handle(
`${methodBase}.dl.cancelDownloadTask`,
/**
*
* @param {import("electron").IpcMainInvokeEvent} _evt
* @param {{ targetTaskId: string }} arg
* @returns {{ success: boolean, error: string | null }}
*/
(_evt, arg) => {
if (!arg.targetTaskId) {
return {
success: false,
error: "ARG_INVALID",
};
}
if (!global.__HUGO_AURA__.fsTasks?.downloadTasks.has(arg.targetTaskId)) {
return {
success: false,
error: "TASK_ID_NOT_FOUND",
};
}
const taskObj = global.__HUGO_AURA__.fsTasks.downloadTasks.get(
arg.targetTaskId
);
if (!taskObj?.cancelReq) {
return {
success: false,
error: "TASK_NOT_STARTED",
};
}
taskObj.cancelReq();
return {
success: true,
error: null,
};
}
);
};
module.exports = { fsComposables: composableFunctions, applyFsIpcHandler };

View File

@@ -2,9 +2,212 @@
const __SCOPE = "main";
const os = require("os");
const { exec } = require("child_process");
const fs = require("fs");
const path = require("path");
const nodeHttps = require("https");
const { fsComposables } = require("./fsIpcHandler");
const functions = {
querySvcDetail: (
/** @type {string} */ svcName,
/** @type {string} */ findTarget
) => {
return new Promise((resolve) => {
exec(
`sc query ${svcName}`,
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) {
resolve({
success: true,
result: false,
});
return;
}
if (stdout.includes(findTarget)) {
resolve({
success: true,
result: true,
});
} else {
resolve({
success: true,
result: false,
});
}
}
);
});
},
/**
*
* @param {string} logHeader
* @param {string} binPath
* @param {string} command
* @returns {Promise<{ success: boolean, errorObj?: Error }>}
*/
execCommand: (logHeader, binPath, command) => {
const processedPath = binPath.includes(" ") ? `"${binPath}"` : binPath;
return new Promise((resolve) => {
exec(`${processedPath} ${command}`, (error, stdout, stderr) => {
if (error) {
console.error(`${logHeader} Failed to execute command:`, error);
resolve({ success: false, errorObj: error });
return;
}
resolve({ success: true });
});
});
},
/**
*
* @param {"stable" | "alpha"} channel
* @param {(arg: DownloadTask) => any} callbackFn
* @param {string} binPath
*/
handlePLSDownload: async (channel, callbackFn, binPath) => {
// TODO: Channel selection
const apiInfo = global.__HUGO_AURA_API__;
const getVerPromise = new Promise(async (resolveGetVerReq) => {
// ↓ 目前 channel param 没有什么用处
for (const apiDomain of apiInfo.domains) {
const reqPromise = new Promise((resolveHttpRequest) => {
nodeHttps
.get(
`${apiDomain}${apiInfo.plsUpdate}?channel=${channel}`,
(rep) => {
let dataChunk = "";
rep.on("data", (chunk) => {
dataChunk += chunk;
});
rep.on("end", () => {
let parsedData = {};
try {
parsedData = JSON.parse(dataChunk);
} catch (e) {
callbackFn({
id: "",
progress: 0,
status: "struggling",
dlUrl: null,
savePath: null,
message: `数据解析失败, 正在尝试 API 域名 ${
apiInfo.domains[apiInfo.domains.indexOf(apiDomain) + 1]
} ...`,
errorObj: e,
});
setTimeout(() => {
resolveHttpRequest({
success: false,
errorObj: e,
});
}, 1000);
return;
}
resolveHttpRequest({
success: true,
data: parsedData,
});
return;
});
}
)
.on("error", (e) => {
callbackFn({
id: "",
progress: 0,
status: "struggling",
dlUrl: null,
savePath: null,
message: `连接失败, 正在尝试 API 域名 ${
apiInfo.domains[apiInfo.domains.indexOf(apiDomain) + 1]
} ...`,
errorObj: e,
});
setTimeout(() => {
resolveHttpRequest({
success: false,
errorObj: e,
});
}, 1000);
});
});
const requestResult = await reqPromise;
if (requestResult.success) {
resolveGetVerReq({
success: true,
data: requestResult.data,
});
break;
} else {
continue;
}
}
resolveGetVerReq({
success: false,
data: null,
});
});
const rawResInfo = await getVerPromise;
if (!rawResInfo.success) {
callbackFn({
id: "",
progress: 0,
status: "failed",
dlUrl: null,
savePath: null,
message: "未能获取 PLS 版本信息, 所有 API 域名均无法连接",
});
return false;
}
const plsVersionInfo = rawResInfo.data;
let deviceArch = process.env.PROCESSOR_ARCHITEW6432
? process.env.PROCESSOR_ARCHITEW6432
: process.env.PROCESSOR_ARCHITECTURE;
// @ts-expect-error
deviceArch = deviceArch.toLowerCase();
if (!Object.keys(plsVersionInfo.data.downloadUrl).includes(deviceArch)) {
callbackFn({
id: "",
progress: 0,
status: "failed",
dlUrl: null,
savePath: null,
message: `处理器架构识别失败, 检测到的架构: ${deviceArch}`,
});
return false;
}
fsComposables.downloadFile(
plsVersionInfo.data.downloadUrl[deviceArch],
binPath,
(...args) => {
if (args[0].status === "done") {
if (global.__HUGO_AURA__.plsStats) {
global.__HUGO_AURA__.plsStats.installed = true;
global.__HUGO_AURA__.plsStats.status = "dead";
}
}
callbackFn(...args);
}
);
},
};
/**
*
@@ -13,6 +216,10 @@ const path = require("path");
const applyPlsIpcHandler = (ipcMain) => {
const methodBase = "$aura.pls";
const PLS_INSTALL_DIR = path.join("C:\\Program Files", "HugoAura PLS", "bin");
const PLS_BIN_PATH = path.join(PLS_INSTALL_DIR, "HugoAura-PLS.exe");
const PLS_SVC_NAME = "HugoAuraPLS";
const isPlsDetached = process.argv.includes("--pls-detach");
global.__HUGO_AURA__.plsStats = {
@@ -26,20 +233,26 @@ const applyPlsIpcHandler = (ipcMain) => {
};
ipcMain.handle(
`${methodBase}.getPlsFolderExists`,
`${methodBase}.getPlsBinExists`,
/**
*
* @returns {{ success: boolean; data: { isExists: boolean }; error?: Error }}
*/
(_event, _arg) => {
const plsFolderPath = path.join("C:\\Program Files", "HugoAura PLS");
try {
const result = fs.existsSync(plsFolderPath);
const result = fs.existsSync(PLS_BIN_PATH);
if (global.__HUGO_AURA__.plsStats?.status === "notInstalled") {
global.__HUGO_AURA__.plsStats.status = "dead";
}
return {
success: true,
data: { isExists: result },
};
} catch (e) {
// @ts-expect-error
global.__HUGO_AURA__.plsStats.status = "notInstalled";
return {
success: false,
data: { isExists: false },
@@ -49,6 +262,48 @@ const applyPlsIpcHandler = (ipcMain) => {
}
);
ipcMain.handle(
`${methodBase}.ensurePlsInstallDir`,
/**
*
* @param {import("electron").IpcMainInvokeEvent} _event
* @param {any} _arg
* @returns {{ success: boolean; data: { alreadyExists: boolean; createdDir: string; }; error?: Error }}
*/
(_event, _arg) => {
const alreadyExists = fs.existsSync(PLS_INSTALL_DIR);
if (alreadyExists) {
return {
success: true,
data: {
alreadyExists: true,
createdDir: PLS_INSTALL_DIR,
},
};
}
try {
fs.mkdirSync(PLS_INSTALL_DIR, { recursive: true });
return {
success: true,
data: {
alreadyExists: false,
createdDir: PLS_INSTALL_DIR,
},
};
} catch (error) {
return {
success: false,
data: {
alreadyExists: false,
createdDir: PLS_INSTALL_DIR,
},
error: error,
};
}
}
);
ipcMain.handle(
`${methodBase}.getPlsStats`,
/**
@@ -189,6 +444,115 @@ const applyPlsIpcHandler = (ipcMain) => {
}
);
ipcMain.handle(
`${methodBase}.plsLifecycleQuery`,
/**
*
* @param {import("electron").IpcMainInvokeEvent} _event
* @param {{ target: import("../../../types/shared/pls/status").PLSLifecycleType }} arg
* @returns {Promise<{ success: boolean, result: boolean }>}
*/
async (_event, arg) => {
switch (arg.target) {
case "isDetached":
return { success: true, result: isPlsDetached };
case "isSvcInstalled":
return await functions.querySvcDetail(PLS_SVC_NAME, "SERVICE_NAME");
case "isSvcStart":
return await functions.querySvcDetail(PLS_SVC_NAME, "RUNNING");
default:
console.warn(
`[HugoAura / IPC / PLS] <plsLifecycleQuery> Invalid arg.target: ${arg.target}`
);
return {
success: false,
result: false,
};
}
}
);
ipcMain.handle(
`${methodBase}.plsLifecycleControl`,
/**
*
* @param {*} _event
* @param {{ target: import("../../../types/shared/pls/status").PLSLifecycleControlType }} arg
* @returns {Promise<{ success: boolean, errorObj?: Error }>}
*/
async (_event, arg) => {
const logHeader = "[HugoAura / IPC / PLS] <plsLifecycleControl>";
switch (arg.target) {
case "instSvc":
return await functions.execCommand(
logHeader,
PLS_BIN_PATH,
"--startup auto install"
);
case "rmSvc":
return await functions.execCommand(logHeader, PLS_BIN_PATH, "remove");
case "startSvc":
return await functions.execCommand(logHeader, PLS_BIN_PATH, "start");
case "stopSvc":
return await functions.execCommand(logHeader, PLS_BIN_PATH, "stop");
case "rmBin":
const unlinkPromise = new Promise((resolve) => {
fs.unlink(PLS_BIN_PATH, (error) => {
if (error) {
resolve({
success: false,
errorObj: error,
});
console.error(
`${logHeader} Failed to remove PLS bin, error:`,
error
);
return false;
}
resolve({
success: true,
errorObj: null,
});
return true;
});
});
const unlinkRet = await unlinkPromise;
return unlinkRet;
default:
return { success: false, errorObj: new Error("Method not found") };
}
}
);
ipcMain.handle(
`${methodBase}.downloadPls`,
/**
*
* @param {import("electron").IpcMainInvokeEvent} _evt
* @param {{channel?: "stable" | "alpha", reportTo?: import("../../../types/main/core").WindowName}} arg
* @returns {void}
*/
(_evt, arg) => {
const channel = arg.channel ? arg.channel : "stable";
const reportWin = arg.reportTo ? arg.reportTo : "assistant";
functions.handlePLSDownload(
channel,
(status) => {
ipcMain.send(
reportWin,
`${methodBase}.post.reportPlsDownloadStatus`,
status
);
},
PLS_BIN_PATH
);
}
);
ipcMain.handle(
`${methodBase}.retryPlsConnect`,
/**

View File

@@ -0,0 +1,111 @@
const path = require("path");
const fs = require("fs");
const os = require("os");
const util = require("util");
/**
*
* @param {import("../aura/types/main/core").WindowName} windowName
*/
const initLogger = (windowName) => {
const logDir = path.join(os.homedir(), "Documents", "HugoAura", "logs");
if (!fs.existsSync(logDir)) {
fs.mkdirSync(logDir, { recursive: true });
}
cleanupOldLogs(logDir);
const logFile = getLogFileName(logDir);
const logStream = fs.createWriteStream(logFile, { flags: "a" });
const timestamp = new Date().toISOString();
const startupMsg = `\n=== [${timestamp}] HugoAura 窗口启动: ${windowName} ===\n\n`;
logStream.write(startupMsg);
const originalConsole = {
log: console.log,
error: console.error,
warn: console.warn,
info: console.info,
debug: console.debug,
};
console.log = function (...args) {
const msg = util.format(`[LOG] <${windowName}>`, ...args) + "\n";
logStream.write(msg);
originalConsole.log.apply(console, args);
};
console.error = function (...args) {
const msg = util.format(`[ERROR] <${windowName}>`, ...args) + "\n";
logStream.write(msg);
originalConsole.error.apply(console, args);
};
console.warn = function (...args) {
const msg = util.format(`[WARN] <${windowName}>`, ...args) + "\n";
logStream.write(msg);
originalConsole.warn.apply(console, args);
};
console.info = function (...args) {
const msg = util.format(`[INFO] <${windowName}>`, ...args) + "\n";
logStream.write(msg);
originalConsole.info.apply(console, args);
};
console.debug = function (...args) {
if (!process.argv.includes("--aura-debug")) return;
const msg = util.format(`[DEBUG] <${windowName}>`, ...args) + "\n";
logStream.write(msg);
originalConsole.debug.apply(console, args);
};
process.on("uncaughtException", (err) => {
console.error("[CRITICAL] UNCAUGHT EXCEPTION:", err);
});
console.log(
"[HugoAura / Logger] Logger initialized. Log file:",
logFile
);
};
const cleanupOldLogs = (logDir) => {
try {
const files = fs.readdirSync(logDir);
const now = new Date();
const sevenDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
files.forEach((file) => {
if (file.endsWith(".log")) {
const filePath = path.join(logDir, file);
const stats = fs.statSync(filePath);
// 如果文件创建时间超过 30 天, 则删除
if (stats.birthtime < sevenDaysAgo) {
fs.unlinkSync(filePath);
console.log(
`[HugoAura / Logger / Cleanup] Cleaned log file: ${file}`
);
}
}
});
} catch (error) {
console.error("[HugoAura / Logger / Cleanup] Unexpected error occurred cleaning log file:", error);
}
};
/**
* 生成每日 Log 文件路径
* @param {string} logDir 日志目录路径
* @param {string} _windowName 窗口名称 (暂时无用)
* @returns {string} 日志文件路径
*/
const getLogFileName = (logDir, _windowName) => {
const today = new Date();
const dateStr = today.toISOString().split("T")[0]; // YYYY-MM-DD 格式
const logFileName = `HugoAura-SSA-${dateStr}.log`;
return path.join(logDir, logFileName);
};
module.exports = { initLogger };

View File

@@ -24,40 +24,6 @@
});
};
const createStore = () => {
const store = {
router: "/",
};
const internal = {
get: (key) => store[key],
set: (key, value) => {
store[key] = value;
return true;
},
};
window.$store = {
get: (key) => {
const stack = new Error().stack;
if (stack.includes("aura/ui/pages/")) {
return internal.get(key);
}
return undefined;
},
set: (key, value) => {
const stack = new Error().stack;
if (stack.includes("aura/ui/pages/")) {
return internal.set(key, value);
}
return false;
},
};
return internal;
};
const store = createStore();
const createUILoader = () => {
const modules = "__TEMPLATE_TARGETS__";
const containers = new Map();
@@ -65,6 +31,63 @@
const moduleResources = new Map();
const globalScripts = new Set();
const flattenTargets = (targets, parentKey = "") => {
const flattened = {};
for (const [key, config] of Object.entries(targets)) {
const fullKey = parentKey ? `${parentKey}.${key}` : key;
flattened[fullKey] = { ...config };
if (
config.childs &&
typeof config.childs === "object" &&
!Array.isArray(config.childs)
) {
const childTargets = flattenTargets(config.childs, fullKey);
Object.assign(flattened, childTargets);
delete flattened[fullKey].childs;
}
}
return flattened;
};
const flatModules = flattenTargets(modules);
const createAccessProxy = (originalModules, flatModules) => {
const createNestedProxy = (target, path = []) => {
return new Proxy(target, {
get(target, prop) {
const currentPath = [...path, prop].join(".");
if (flatModules[currentPath]) {
return flatModules[currentPath];
}
const value = Reflect.get(target, prop);
if (typeof value === "object" && value !== null) {
return createNestedProxy(value, [...path, prop]);
}
return value;
},
set(target, prop, value) {
const currentPath = [...path, prop].join(".");
if (flatModules[currentPath]) {
flatModules[currentPath] = value;
}
return Reflect.set(target, prop, value);
},
});
};
return createNestedProxy(originalModules);
};
const accessibleModules = createAccessProxy(modules, flatModules);
const insertElement = (target, element, mode = "appendChild") => {
const elementId = element.id;
if (document.getElementById(elementId)) {
@@ -120,12 +143,12 @@
const observer = new MutationObserver((_mutations) => {
if (!document.getElementById(elementId)) {
let targetElement = document.querySelector(
modules[moduleKey].pageSelector
flatModules[moduleKey].pageSelector
);
if (
targetElement &&
modules[moduleKey].active &&
modules[moduleKey].revive
flatModules[moduleKey].active &&
flatModules[moduleKey].revive
) {
if (!document.getElementById(elementId)) {
console.log(
@@ -145,12 +168,53 @@
observers.set(moduleKey, observer);
};
const loadResources = async (resources, type, moduleKey, isRevive) => {
if (!resources || isRevive) return [];
const resourceArray = Array.isArray(resources) ? resources : [resources];
const loadedResources = [];
for (const resource of resourceArray) {
try {
let element;
if (type === "css") {
element = document.createElement("link");
element.rel = "stylesheet";
element.href = `../../aura/${resource}`;
document.head.appendChild(element);
} else if (type === "js") {
element = document.createElement("script");
element.src = `../../aura/${resource}`;
document.body.appendChild(element);
await new Promise((resolve, reject) => {
element.onload = resolve;
element.onerror = reject;
});
}
if (element) {
loadedResources.push(element);
console.log(
`[HugoAura / UI / ${moduleKey}] Loaded ${type}: ${resource}`
);
}
} catch (err) {
console.error(
`[HugoAura / UI / Error] Failed to load ${type} ${resource} for ${moduleKey}:`,
err
);
}
}
return loadedResources;
};
const loader = {
async loadModule(moduleKey, isRevive = false) {
if (!modules[moduleKey]?.active) return;
if (!flatModules[moduleKey]?.active) return;
try {
const config = modules[moduleKey];
const config = flatModules[moduleKey];
const target = await waitForElement(config.pageSelector);
const elementId = `aura-container-${moduleKey.replace(/\./g, "-")}`;
@@ -168,12 +232,14 @@
const resources = new Set();
moduleResources.set(moduleKey, resources);
if (config.pageCSS && !isRevive) {
const link = document.createElement("link");
link.rel = "stylesheet";
link.href = `../../aura/${config.pageCSS}`;
document.head.appendChild(link);
resources.add(link);
if (config.pageCSS) {
const cssResources = await loadResources(
config.pageCSS,
"css",
moduleKey,
isRevive
);
cssResources.forEach((resource) => resources.add(resource));
}
const html = await fetch(`../../aura/${config.pageURI}`).then((r) =>
@@ -184,18 +250,21 @@
insertElement(target, container, config.selectorMode);
monitorParent(moduleKey, target, container, config.selectorMode);
if (config.pageScript && !isRevive) {
const script = document.createElement("script");
script.src = `../../aura/${config.pageScript}`;
document.body.appendChild(script);
resources.add(script);
if (config.pageScript) {
const jsResources = await loadResources(
config.pageScript,
"js",
moduleKey,
isRevive
);
jsResources.forEach((resource) => resources.add(resource));
}
const observer = new MutationObserver(() => {
if (
!document.contains(container) &&
modules[moduleKey].active &&
modules[moduleKey].revive
flatModules[moduleKey].active &&
flatModules[moduleKey].revive
) {
this.loadModule(moduleKey, true);
}
@@ -238,13 +307,13 @@
handleModuleChange(moduleKey, path = []) {
const fullPath = [...path, moduleKey].join(".");
if (path.length === 0 && modules[moduleKey].active) {
if (path.length === 0 && flatModules[moduleKey].active) {
this.loadModule(moduleKey);
} else if (path.length === 0) {
this.unloadModule(moduleKey);
} else {
if (moduleKey === "active") {
if (modules[path[0]].active) {
if (flatModules[path[0]].active) {
this.loadModule(path[0]);
} else {
this.unloadModule(path[0]);
@@ -297,7 +366,7 @@
try {
await loadGlobalJS();
for (const [key, config] of Object.entries(modules)) {
for (const [key, config] of Object.entries(flatModules)) {
if (config.active) {
await loader.loadModule(key);
}
@@ -309,7 +378,7 @@
initialLoad();
return createDeepProxy(modules, (path, prop, value) => {
return createDeepProxy(accessibleModules, (path, prop, value) => {
loader.handleModuleChange(prop, path);
});
};

View File

@@ -14,7 +14,7 @@ class RendererHooksManager {
const hooksPath = path.join(__dirname, "../../../aura/ui/hookDefinitions");
/** @type {import("../../types/main/core").HooksMap} */
/** @type {import("../../types/main/core").UIHooksMap} */
const hooks = new Map();
try {
@@ -65,6 +65,7 @@ class RendererHooksManager {
webContents.removeListener("destroyed", destroyedListener);
}
// @ts-expect-error
global.__HUGO_AURA__.hookedWindows.delete(windowKey);
}
@@ -80,6 +81,7 @@ class RendererHooksManager {
/** @type {import("../../types/main/core").WindowName} */
const windowKey = `${hookConfig.windowName || windowName}`;
// @ts-expect-error
if (global.__HUGO_AURA__.hookedWindows.has(windowKey)) {
console.log(
`[HugoAura / Init / RDH] Duplicate ui hook for ${windowKey}, ignoring...`
@@ -137,6 +139,7 @@ class RendererHooksManager {
const destroyedListener = () => {
this.cleanupWindow(
windowKey,
// @ts-expect-error
global.__HUGO_AURA__.hookedWindows.get(windowKey)
);
};
@@ -144,6 +147,7 @@ class RendererHooksManager {
webContents.on("dom-ready", domReadyListener);
webContents.on("destroyed", destroyedListener);
// @ts-expect-error
global.__HUGO_AURA__.hookedWindows.set(windowKey, {
webContents,
domReadyListener,

View File

@@ -164,12 +164,12 @@ class ConfigManager {
/**
*
* @param {Record<any, any>} config
* @returns {boolean}
* @returns {Promise<boolean>}
*/
writeConfig(config) {
async writeConfig(config) {
try {
if (this.useEncConfig) {
const hashedPasswdResultObj = this.retrieveEncPassword();
const hashedPasswdResultObj = await this.retrieveEncPasswordAsync();
if (hashedPasswdResultObj.success && hashedPasswdResultObj.data) {
this.encryptConfig(config, hashedPasswdResultObj.data);
} else {
@@ -261,7 +261,7 @@ class ConfigManager {
*
* @param {SHA256EncryptedPassword} password
*/
saveEncPassword(password) {
async saveEncPassword(password) {
let macAddr = this.priv_getMacAddr();
let fallbackToStaticKey = false;
@@ -290,25 +290,25 @@ class ConfigManager {
const ivHex = iv.toString("hex");
const saltHex = randomSalt.toString("hex");
registryManager.createOrUpdateRegKey(
await registryManager.createOrUpdateRegKey(
LMAK_SETTINGS_BASE,
"LMAK_Value",
encryptedPassword,
true
);
registryManager.createOrUpdateRegKey(
await registryManager.createOrUpdateRegKey(
LMAK_SETTINGS_BASE,
"LMAK_IV",
ivHex,
true
);
registryManager.createOrUpdateRegKey(
await registryManager.createOrUpdateRegKey(
LMAK_SETTINGS_BASE,
"LMAK_Salt",
saltHex,
true
);
registryManager.createOrUpdateRegKey(
await registryManager.createOrUpdateRegKey(
LMAK_SETTINGS_BASE,
"LMAK_AuthTag",
authTagHex,
@@ -316,7 +316,7 @@ class ConfigManager {
);
if (fallbackToStaticKey) {
registryManager.createOrUpdateRegKey(
await registryManager.createOrUpdateRegKey(
LMAK_SETTINGS_BASE,
"LMAK_FakeMac",
macAddr,
@@ -329,22 +329,22 @@ class ConfigManager {
retrieveEncPassword() {
try {
const authTagHex = registryManager.readRegKey(
const authTagHex = registryManager.readRegKeySync(
LMAK_SETTINGS_BASE,
"LMAK_AuthTag",
true
)?.data;
const ivHex = registryManager.readRegKey(
const ivHex = registryManager.readRegKeySync(
LMAK_SETTINGS_BASE,
"LMAK_IV",
true
)?.data;
const saltHex = registryManager.readRegKey(
const saltHex = registryManager.readRegKeySync(
LMAK_SETTINGS_BASE,
"LMAK_Salt",
true
)?.data;
const encPasswdHex = registryManager.readRegKey(
const encPasswdHex = registryManager.readRegKeySync(
LMAK_SETTINGS_BASE,
"LMAK_Value",
true
@@ -353,7 +353,7 @@ class ConfigManager {
let macAddr = null;
try {
macAddr = registryManager.readRegKey(
macAddr = registryManager.readRegKeySync(
LMAK_SETTINGS_BASE,
"LMAK_FakeMac",
true
@@ -433,8 +433,112 @@ class ConfigManager {
}
}
clearEncPasswdRegKey() {
registryManager.delRegKey(LMAK_SETTINGS_BASE, null);
async retrieveEncPasswordAsync() {
try {
const authTagHex = (
await registryManager.readRegKey(
LMAK_SETTINGS_BASE,
"LMAK_AuthTag",
true
)
).data;
const ivHex = (
await registryManager.readRegKey(LMAK_SETTINGS_BASE, "LMAK_IV", true)
).data;
const saltHex = (
await registryManager.readRegKey(LMAK_SETTINGS_BASE, "LMAK_Salt", true)
).data;
const encPasswdHex = (
await registryManager.readRegKey(LMAK_SETTINGS_BASE, "LMAK_Value", true)
).data;
let isStaticKey = false;
let macAddr = null;
try {
macAddr = (
await registryManager.readRegKey(
LMAK_SETTINGS_BASE,
"LMAK_FakeMac",
true
)
).data;
if (!macAddr) {
isStaticKey = false;
} else {
isStaticKey = true;
}
} catch {
isStaticKey = false;
}
if (!isStaticKey) {
macAddr = this.priv_getMacAddr();
if (!macAddr) {
console.error(
"[HugoAura / Config / ERROR] Failed to retrieve password from reg: MAC Address invalid."
);
return {
success: false,
data: null,
error: new Error("Mac is null or undefined"),
};
}
}
if (!saltHex || !ivHex || !authTagHex || !encPasswdHex) {
console.error(
"[HugoAura / Config / ERROR] Failed to retrieve password from reg: Reg keys invalid."
);
return {
success: false,
data: null,
error: new Error("Reg key invalid"),
};
}
const salt = Buffer.from(saltHex, "hex");
const iv = Buffer.from(ivHex, "hex");
const authTag = Buffer.from(authTagHex, "hex");
const encPasswd = Buffer.from(encPasswdHex, "utf-8").toString();
const key = crypto.scryptSync(macAddr, salt, 32);
const decipherIns = crypto.createDecipheriv(
CRYPTO_SETTINGS_AES.mode,
key,
iv,
{
// @ts-expect-error
authTagLength: CRYPTO_SETTINGS_AES.tagLength,
}
);
decipherIns.setAuthTag(authTag);
const result = Buffer.concat([
decipherIns.update(encPasswd, "hex"),
decipherIns.final(),
]).toString();
return {
success: true,
data: result,
error: null,
};
} catch (e) {
console.error(
"[HugoAura / Config / ERROR] Unexpected error occurred while retrieving password from reg, error:",
e
);
return {
success: false,
data: null,
error: e,
};
}
}
async clearEncPasswdRegKey() {
await registryManager.delRegKey(LMAK_SETTINGS_BASE, null);
}
/**
@@ -443,7 +547,7 @@ class ConfigManager {
* @param {SHA256EncryptedPassword} passwd
*/
encryptConfig(configData, passwd) {
registryManager.initRegistry();
registryManager.initRegistrySync();
const salt = crypto.randomBytes(CRYPTO_SETTINGS_AES.saltLength);
const key = crypto.pbkdf2Sync(
passwd,
@@ -617,9 +721,9 @@ class ConfigManager {
*
* @param {Record<any, any> | null} curConfig
* @param {SHA256EncryptedPassword | undefined | null} passwd
* @returns {{success: boolean}}
* @returns {Promise<{success: boolean}>}
*/
switchToDecConfig(curConfig, passwd = null) {
async switchToDecConfig(curConfig, passwd = null) {
let decConfig = null;
if (!curConfig && passwd) {
const getDecConfigResult = this.decryptConfig(passwd);
@@ -639,7 +743,7 @@ class ConfigManager {
}
this.useEncConfig = false;
this.clearEncPasswdRegKey();
await this.clearEncPasswdRegKey();
// @ts-expect-error
this.writeConfig(curConfig ? curConfig : decConfig);
try {

View File

@@ -30,7 +30,14 @@
"settingsPasswordEnabled": false,
"settingsPasswordWithSalt": "32703D292460CC9A3B867494D6AD9A8E4A3ADF0FAA4D6867BC4D412CC3927D02E47C6D0B1763BB53E57B2241C6193433561CDA09D7C48CA03983072B876F0965",
"encryptConfig": false,
"appearance": {}
"appearance": {},
"uiAccessMethod": {
"showEntryIcon": true,
"fallbackAccessMethods": {
"hotkey": false,
"touch": false
}
}
},
"devTools": false
}

View File

@@ -1,20 +1,52 @@
// @ts-check
const childProc = require("child_process");
const { exec, execSync } = require("child_process");
// Constants
const LOG_PREFIX = "[HugoAura / Init / Reg";
const LOG_PREFIX_FUNC = "[HugoAura / Reg";
const AURA_REGISTRY_PATH = ["HKCU", "SOFTWARE", "HugoAura"].join("\\");
const AURA_REGISTRY_PATH = ["HKEY_USERS", ".DEFAULT", "SOFTWARE", "HugoAura"].join("\\");
class RegistryManager {
/**
* @param {string} [path]
* @returns {Promise<boolean>}
*/
handleCreateReg(path) {
async handleCreateReg(path) {
try {
const createResult = childProc.execSync(["reg", "add", path].join(" "), {
const { stdout } = await new Promise((resolve, reject) => {
exec(
["reg", "add", path].join(" "),
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) reject(error);
else resolve({ stdout, stderr });
}
);
});
console.log(
`${LOG_PREFIX} / SUCCESS] Registry path ${path} successfully created.`
);
console.debug(`${LOG_PREFIX} / DEBUG] Reg add command stdout:`, stdout);
return true;
} catch (e) {
console.error(
`${LOG_PREFIX} / ERROR] Failed creating registry path, error:`,
e
);
return false;
}
}
/**
* @param {string} [path]
* @returns {boolean}
*/
handleCreateRegSync(path) {
try {
const createResult = execSync(["reg", "add", path].join(" "), {
encoding: "utf8",
});
@@ -27,6 +59,8 @@ class RegistryManager {
createResult
);
return true;
} else {
return false;
}
} catch (e) {
console.error(
@@ -37,9 +71,37 @@ class RegistryManager {
}
}
initRegistry() {
/**
* @returns {Promise<boolean>}
*/
async initRegistry() {
try {
const queryResult = childProc.execSync(
const { stdout } = await new Promise((resolve, reject) => {
exec(
["reg", "query", AURA_REGISTRY_PATH].join(" "),
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) reject(error);
else resolve({ stdout, stderr });
}
);
});
console.log(`${LOG_PREFIX}] Registry check up success.`);
console.debug(`${LOG_PREFIX}] Command stdout:`, stdout);
return true;
} catch (e) {
console.warn(`${LOG_PREFIX} / WARN] Failed to query registry, error:`, e);
return await this.handleCreateReg(AURA_REGISTRY_PATH);
}
}
/**
* @returns {boolean}
*/
initRegistrySync() {
try {
const queryResult = execSync(
["reg", "query", AURA_REGISTRY_PATH].join(" "),
{ encoding: "utf8" }
);
@@ -48,23 +110,81 @@ class RegistryManager {
console.log(`${LOG_PREFIX}] Registry check up success.`);
console.debug(`${LOG_PREFIX}] Command stdout:`, queryResult);
return true;
} else {
return false;
}
} catch (e) {
console.warn(`${LOG_PREFIX} / WARN] Failed to query registry, error:`, e);
return this.handleCreateReg(AURA_REGISTRY_PATH);
return this.handleCreateRegSync(AURA_REGISTRY_PATH);
}
}
/**
*
* @param {string} relativePath
* @param {string} keyName
* @param {string} keyVal
* @param {boolean | undefined} silent
* @returns {Promise<{ success: boolean, error: Error | null }>}
*/
createOrUpdateRegKey(relativePath, keyName, keyVal, silent = false) {
async createOrUpdateRegKey(relativePath, keyName, keyVal, silent = false) {
try {
const result = childProc.execSync(
const { stdout } = await new Promise((resolve, reject) => {
exec(
[
"reg",
"add",
[AURA_REGISTRY_PATH, relativePath].join("\\"),
"/v",
keyName,
"/t",
"REG_SZ",
"/d",
`\"${keyVal}\"`,
"/f",
].join(" "),
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) reject(error);
else resolve({ stdout, stderr });
}
);
});
if (!silent) {
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Successfully created / updated reg key ${relativePath}/${keyName} with data: ${keyVal}`
);
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Add key command stdout:`,
stdout
);
}
return {
success: true,
error: null,
};
} catch (e) {
console.error(
`${LOG_PREFIX_FUNC} / ERROR] Failed to create / update reg key, error:`,
silent ? "<Hidden>" : e
);
return {
success: false,
error: e,
};
}
}
/**
* @param {string} relativePath
* @param {string} keyName
* @param {string} keyVal
* @param {boolean | undefined} silent
* @returns {{ success: boolean, error: Error | null }}
*/
createOrUpdateRegKeySync(relativePath, keyName, keyVal, silent = false) {
try {
const result = execSync(
[
"reg",
"add",
@@ -83,21 +203,76 @@ class RegistryManager {
if (result) {
if (!silent) {
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Successfully created / updated reg key ${relativePath}/${keyName} with data: ${keyVal}`
);
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Add key command stdout:`,
`${LOG_PREFIX} / SUCCESS] Successfully created / updated reg key ${relativePath}/${keyName} with data: ${keyVal}`,
result
);
console.error("");
}
return {
success: true,
error: null,
};
}
return {
success: true,
error: null,
};
} catch (e) {
console.error(
`${LOG_PREFIX_FUNC} / ERROR] Failed to create / update reg key, error:`,
`${LOG_PREFIX_FUNC} / ERROR] Failed to create / update reg key error:`,
e
);
return {
success: false,
error: e,
};
}
}
/**
* @param {string} relativePath
* @param {string | null} keyName
* @param {boolean | undefined} silent
* @returns {Promise<{ success: boolean, error: Error | null }>}
*/
async delRegKey(relativePath, keyName, silent = false) {
if (keyName === undefined) {
throw new Error(
`${LOG_PREFIX_FUNC} / CRITICAL] Arg \"keyName\" for function \"delRegKey\" cannot be undefined. Only null or null accepted.`
);
}
try {
const { stdout } = await new Promise((resolve, reject) => {
exec(
[
"reg",
"delete",
[AURA_REGISTRY_PATH, relativePath].join("\\"),
keyName ? "/v" : "",
keyName ? keyName : "",
"/f",
].join(" "),
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) reject(error);
else resolve({ stdout, stderr });
}
);
});
if (!silent) {
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Successfully deleted reg key ${relativePath}/${keyName}`
);
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Delete key command stdout:`,
stdout
);
}
return {
success: true,
error: null,
};
} catch (e) {
console.error(
`${LOG_PREFIX_FUNC} / ERROR] Failed to delete reg key, error:`,
silent ? "<Hidden>" : e
);
return {
@@ -107,24 +282,21 @@ class RegistryManager {
}
}
/*>>> BUC <<<
keyName === null --> delete the whole entry
>>> EUC <<<*/
/**
*
* @param {string} relativePath
* @param {string | null} keyName
* @param {boolean | undefined} silent
* @returns {{ success: boolean, error: Error | null }}
*/
delRegKey(relativePath, keyName, silent = false) {
delRegKeySync(relativePath, keyName, silent = false) {
if (keyName === undefined) {
throw new Error(
`${LOG_PREFIX_FUNC} / CRITICAL] Arg \"keyName\" for function \"delRegKey\" cannot be undefined. Only null or string accepted.`
`${LOG_PREFIX_FUNC} / CRITICAL] Arg \"keyName\" for function \"delRegKeySync\" cannot be undefined. Only null or string accepted.`
);
}
try {
const result = childProc.execSync(
const result = execSync(
[
"reg",
"delete",
@@ -150,6 +322,11 @@ class RegistryManager {
success: true,
error: null,
};
} else {
return {
success: false,
error: null,
};
}
} catch (e) {
console.error(
@@ -164,14 +341,76 @@ class RegistryManager {
}
/**
*
* @param {string} relativePath
* @param {string} keyName
* @param {boolean | undefined} silent
* @returns {Promise<{ success: boolean, data: string | null, error: Error | null }>}
*/
readRegKey(relativePath, keyName, silent = false) {
async readRegKey(relativePath, keyName, silent = false) {
try {
const readResult = childProc.execSync(
const { stdout } = await new Promise((resolve, reject) => {
exec(
[
"reg",
"query",
[AURA_REGISTRY_PATH, relativePath].join("\\"),
"/v",
`\"${keyName}\"`,
].join(" "),
{ encoding: "utf8" },
(error, stdout, stderr) => {
if (error) reject(error);
else resolve({ stdout, stderr });
}
);
});
if (!silent) {
console.debug(
`${LOG_PREFIX_FUNC} / SUCCESS] Successfully read reg key ${relativePath}/${keyName}, stdout:`,
stdout
);
}
const match = stdout.match(/REG_SZ\s+(.+)/);
if (!match) {
console.warn(`${LOG_PREFIX} / WARN] Data not found in stdout`);
return {
success: false,
data: null,
error: new Error("Data not found"),
};
}
const data = match[1].trim();
return {
success: true,
data,
error: null,
};
} catch (e) {
console.error(
`${LOG_PREFIX} / ERROR] Failed to read reg key, error:`,
e
);
return {
success: false,
data: null,
error: e,
};
}
}
/**
* @param {string} relativePath
* @param {string} keyName
* @param {boolean | undefined} silent
* @returns {{ success: boolean, data: string | null, error: Error | null }}
*/
readRegKeySync(relativePath, keyName, silent = false) {
try {
const readResult = execSync(
[
"reg",
"query",
@@ -185,14 +424,14 @@ class RegistryManager {
if (readResult) {
if (!silent) {
console.debug(
`${LOG_PREFIX}] Successfully read reg key ${relativePath}/${keyName}, stdout:`,
`${LOG_PREFIX_FUNC} / SUCCESS] Successfully read reg key ${relativePath}/${keyName}, stdout:`,
readResult
);
}
const match = readResult.match(/REG_SZ\s+(.+)/);
if (!match) {
console.warn(`${LOG_PREFIX_FUNC} / WARN] Data not found in stdout`);
console.warn(`${LOG_PREFIX} / WARN] Data not found in stdout`);
return {
success: false,
data: null,
@@ -206,10 +445,16 @@ class RegistryManager {
data,
error: null,
};
} else {
return {
success: false,
data: null,
error: null,
};
}
} catch (e) {
console.error(
`${LOG_PREFIX_FUNC} / ERROR] Failed to read reg key, error:`,
`${LOG_PREFIX} / ERROR] Failed to read reg key, error:`,
silent ? "<Hidden>" : e
);
return {

21
src/aura/types/main/ipc/fs.d.ts vendored Executable file
View File

@@ -0,0 +1,21 @@
type DownloadTaskID = string;
type DownloadTaskStatus = "waiting" | "progressing" | "done" | "failed" | "cancelled" | "struggling";
interface DownloadTask {
id: DownloadTaskID;
progress: float;
curBytes?: number;
totalBytes?: number;
status: DownloadTaskStatus;
dlUrl: string | null;
savePath: string | null;
message?: string;
errorObj?: Error;
}
interface FSTasks {
downloadTasks: Map<
DownloadTaskID,
{ status: DownloadTaskStatus; cancelReq: any }
>;
}

View File

@@ -1,12 +1,13 @@
import { WindowName } from "../main/core";
interface UIHookTarget {
active: boolean;
pageURI: string;
pageScript: string;
pageSelector: string;
selectorMode: "insertAfter" | "insertBefore" | "appendChild";
pageCSS: string;
active?: boolean;
pageURI?: string;
pageScript?: string;
pageSelector?: string;
selectorMode?: "insertAfter" | "insertBefore" | "appendChild";
pageCSS?: string;
childs?: Record<AuraElementUID, UIHookTarget>;
revive?: boolean;
}

View File

@@ -11,6 +11,7 @@ type RendererProcessOnlyVal<T> = T;
interface GlobalHugoAuraInfo {
central?: MainProcessOnlyVal<(...args: any) => any>;
configInit: boolean;
fsTasks?: MainProcessOnlyVal<FSTasks>;
hookedWindows?: MainProcessOnlyVal<HookedWindowsMap>;
ipcInit?: MainProcessOnlyVal<boolean>;
plsRules?: Record<any, any> | null;
@@ -22,11 +23,19 @@ interface GlobalHugoAuraInfo {
version: RendererProcessOnlyVal<string>;
}
interface GlobalHugoAuraApiInfo {
domains: string[];
plsUpdate: string;
auraUpdate: string;
}
type GlobalHugoAuraConfig = AuraConfig;
declare global {
var ipcRenderer: RendererProcessOnlyVal<IpcRenderer>;
var _ACCEPT_DATA: any;
var __HUGO_AURA__: GlobalHugoAuraInfo;
var __HUGO_AURA_API__: GlobalHugoAuraApiInfo;
var __HUGO_AURA_CONFIG__: GlobalHugoAuraConfig;
var __HUGO_AURA_CONFIG_MGR__: ConfigManager;
var __HUGO_AURA_EVENT_BUS__: EventBus;

View File

@@ -1,11 +1,28 @@
import { RendererProcessOnlyVal } from "../global";
type PLSStatusDesc =
| "dead"
| "running"
| "notReady"
| "downloading"
| "notInstalled";
interface PLSStatus {
installed: boolean;
detached: boolean;
connected: boolean;
launched: boolean;
status: string;
status: PLSStatusDesc;
version: string;
authToken: string;
}
type PLSLifecycleType = "isDetached" | "isSvcInstalled" | "isSvcStart";
type PLSLifecycleControlType =
| "instSvc"
| "rmSvc"
| "startSvc"
| "stopSvc"
| "rmBin"
| "dlBin";

View File

@@ -28,18 +28,7 @@ const updatePlsRulesFromLocal = async () => {
return plsRules;
};
/**
*
* @returns {string}
*/
const genRandomHex = () => {
let result = "";
for (let i = 0; i < 8; i++) {
const randomNum = Math.floor(Math.random() * 0x10000);
result += randomNum.toString(16).padStart(4, "0");
}
return result;
};
const { genRandomHex } = require("../../utils/crypto");
/**
*
@@ -48,24 +37,22 @@ const genRandomHex = () => {
*/
const updatePlsConfigToRemote = async (configKey, configValue) => {
const configLevels = configKey.split(".");
/** @type {Record<any, any>} */
// @ts-expect-error
let localUpdateTarget =
configLevels[0] === "ruleSettings"
? global.__HUGO_AURA__.plsRules
: global.__HUGO_AURA__.plsSettings;
for (const level of configLevels.slice(0, -1)) {
localUpdateTarget = localUpdateTarget[level];
}
localUpdateTarget[configLevels.slice(-1)[0]] = configValue;
const plsConfigUpdateEvent = new CustomEvent("onPLSConfigUpdate", {
detail: {
path: configKey,
path: configLevels,
value: configValue,
},
});
document.dispatchEvent(plsConfigUpdateEvent);
const settingsEntries = document.getElementsByClassName(
"aura-settings-entry"
);
if (settingsEntries.length > 0) {
Array.from(settingsEntries).forEach((entry) => {
entry.dispatchEvent(plsConfigUpdateEvent);
});
}
/**
* @type {ClientPLSRequest}

View File

@@ -36,12 +36,369 @@ const showToast = (entry) => {
showReloadToast();
} else if (entry.restart) {
showRelaunchToast();
} else if (entry.restartPLS) {
}
/*
else if (entry.restartPLS) {
showRelaunchPLSToast();
}
*/
};
const setDisableStatus = (el, isDisable, hint = null) => {
if (isDisable) {
el.classList.add("ase-operation-area-disabled");
if (hint) {
el.setAttribute("data-bs-toggle", "tooltip");
el.setAttribute("data-bs-placement", "top");
el.setAttribute("data-bs-title", hint);
const tooltipIns = bootstrap.Tooltip.getOrCreateInstance(el);
tooltipIns.enable();
}
} else {
el.setAttribute("data-bs-toggle", "tooltip");
el.setAttribute("data-bs-placement", "top");
el.setAttribute("data-bs-title", "None");
el.classList.remove("ase-operation-area-disabled");
const tooltipIns = bootstrap.Tooltip.getInstance(el);
if (tooltipIns) {
tooltipIns.dispose();
}
}
};
const settingsRenderer = (pendingEl, settingsObj, isPls = false) => {
const insertOrRemoveEl = (parent, child, isInsert = true) => {
if (Array.isArray(child)) {
for (const perEl of child) {
isInsert ? parent.appendChild(perEl) : parent.removeChild(perEl);
}
} else {
isInsert ? parent.appendChild(child) : parent.removeChild(child);
}
};
const createOnLeaveEvtListener =
global.__HUGO_AURA_GLOBAL__.utils.createOnLeaveEvtListener;
const renderInputArea = (entry, operationArea, descriptionArea) => {
switch (entry.type) {
case "switch": {
const switchEl = document.createElement("input");
switchEl.classList.add("form-check-input");
switchEl.type = "checkbox";
switchEl.role = "switch";
switchEl.id = entry.id;
const elValue = entry.valueGetter();
switchEl.value = elValue;
switchEl.checked = elValue;
switchEl.addEventListener("change", async (event) => {
showToast(entry);
await entry.callbackFn(
event.target.checked,
switchEl,
operationArea,
descriptionArea
);
});
operationArea.classList.add("form-check", "form-switch");
return switchEl;
}
case "radio": {
const elValue = entry.valueGetter();
const elArr = [];
for (const template of entry.templates) {
const inlineContainerEl = document.createElement("div");
inlineContainerEl.classList.add("form-check", "form-check-inline");
const radioEl = document.createElement("input");
radioEl.value = template;
radioEl.classList.add("form-check-input");
radioEl.type = "radio";
radioEl.name = `${entry.id}Radios`;
radioEl.id = `${entry.id}Radio${entry.templates.indexOf(template)}`;
radioEl.checked = template === elValue ? true : false;
radioEl.addEventListener("change", async (event) => {
if (event.target.checked) {
showToast(entry);
await entry.callbackFn(
event.target.value,
radioEl,
operationArea,
descriptionArea
);
}
});
inlineContainerEl.appendChild(radioEl);
const labelEl = document.createElement("label");
labelEl.classList.add("form-check-label");
labelEl.setAttribute("for", radioEl.id);
labelEl.textContent =
entry.templateLabels[entry.templates.indexOf(template)];
inlineContainerEl.appendChild(labelEl);
elArr.push(inlineContainerEl);
}
return elArr;
}
case "input": {
const inputEl = document.createElement("input");
inputEl.classList.add("form-control");
inputEl.type = entry.subType;
inputEl.value = entry.valueGetter();
inputEl.placeholder = entry.placeHolder;
inputEl.id = entry.id;
inputEl.addEventListener("change", async (event) => {
const result = await entry.callbackFn(
event.target.value,
inputEl,
operationArea,
descriptionArea
);
const success = result.valid;
if (success) {
showToast(entry);
if (inputEl.className.includes("is-invalid")) {
inputEl.classList.remove("is-invalid");
descriptionArea.textContent = entry.description;
descriptionArea.classList.remove("ase-desc-error-hint");
}
} else {
inputEl.classList.add("is-invalid");
descriptionArea.textContent = result.hint;
descriptionArea.classList.add("ase-desc-error-hint");
}
});
operationArea.classList.add("ase-operation-area-expanded");
return inputEl;
}
default:
break;
}
};
const renderNormalSettingsItem = (entry, formEl) => {
const entryContainerEl = document.createElement("div");
entryContainerEl.classList.add("aura-settings-entry");
entryContainerEl.id = `${entry.id}Container`;
const entryInfoContainerEl = document.createElement("div");
entryInfoContainerEl.classList.add("aura-settings-entry-info-container");
const entryTitle = document.createElement("p");
entryTitle.classList.add("aura-settings-entry-title");
entryTitle.textContent = entry.name;
if (entry.restart) {
const powerIcon = document.createElement("i");
powerIcon.classList.add(
"layui-icon",
"layui-icon-logout",
"aura-settings-entry-property-icon"
);
powerIcon.setAttribute("data-bs-toggle", "tooltip");
powerIcon.setAttribute("data-bs-placement", "top");
powerIcon.setAttribute("data-bs-title", "需要重启 Electron 进程");
entryTitle.appendChild(powerIcon);
}
if (entry.PLSRequired) {
const plsIcon = document.createElement("i");
plsIcon.classList.add(
"layui-icon",
"layui-icon-component",
"aura-settings-entry-property-icon"
);
plsIcon.setAttribute("data-bs-toggle", "tooltip");
plsIcon.setAttribute("data-bs-placement", "top");
plsIcon.setAttribute("data-bs-title", "需要 PLS 支持");
entryTitle.appendChild(plsIcon);
}
if (entry.restartPLS) {
const plsIcon = document.createElement("i");
plsIcon.classList.add(
"layui-icon",
"layui-icon-logout",
"aura-settings-entry-property-icon"
);
plsIcon.setAttribute("data-bs-toggle", "tooltip");
plsIcon.setAttribute("data-bs-placement", "top");
plsIcon.setAttribute("data-bs-title", "需要重启 PLS 进程");
entryTitle.appendChild(plsIcon);
}
if (entry.reload) {
const reloadIcon = document.createElement("i");
reloadIcon.classList.add(
"layui-icon",
"layui-icon-refresh",
"aura-settings-entry-property-icon"
);
reloadIcon.setAttribute("data-bs-toggle", "tooltip");
reloadIcon.setAttribute("data-bs-placement", "top");
reloadIcon.setAttribute("data-bs-title", "需要重载页面");
entryTitle.appendChild(reloadIcon);
}
const createToolTipIcon = (type, content) => {
const tipIcon = document.createElement("i");
tipIcon.classList.add(
"layui-icon",
"layui-icon-tips",
"aura-settings-entry-property-icon"
);
if (type === "warning") {
tipIcon.classList.add("aura-settings-entry-warning-icon");
}
tipIcon.setAttribute("data-bs-toggle", "tooltip");
tipIcon.setAttribute("data-bs-placement", "top");
tipIcon.setAttribute("data-bs-title", content);
entryTitle.appendChild(tipIcon);
};
if (entry.tip) {
createToolTipIcon("tip", entry.tipTitle);
}
if (entry.warning) {
createToolTipIcon("warning", entry.warningContent);
}
const entryDescription = document.createElement("p");
entryDescription.classList.add("aura-settings-entry-desc");
entryDescription.innerHTML = entry.description;
entryInfoContainerEl.appendChild(entryTitle);
entryInfoContainerEl.appendChild(entryDescription);
entryContainerEl.appendChild(entryInfoContainerEl);
const entryOperationArea = document.createElement("div");
entryOperationArea.classList.add("aura-settings-entry-operation-area");
let targetEl = renderInputArea(entry, entryOperationArea, entryDescription);
insertOrRemoveEl(entryOperationArea, targetEl, true);
if (entry.reactive) {
const evtListener = (event) => {
if (entry.reactiveVal.includes(event.detail.path.join("."))) {
insertOrRemoveEl(entryOperationArea, targetEl, false);
targetEl = renderInputArea(entry, entryOperationArea, entryDescription);
insertOrRemoveEl(entryOperationArea, targetEl, true);
}
};
const channel = entry.PLSRequired
? "onPLSConfigUpdate"
: "onHugoAuraConfigUpdate";
entryContainerEl.addEventListener(channel, evtListener);
// createOnLeaveEvtListener(channel, evtListener);
}
if (entry.PLSRequired) {
if (!global.__HUGO_AURA__.plsStats.connected) {
setDisableStatus(entryOperationArea, true, "连接至 PLS 以继续");
}
const evtListener = (event) => {
if (event.detail.connected) {
setDisableStatus(entryOperationArea, false);
} else {
setDisableStatus(entryOperationArea, true, "连接至 PLS 以继续");
}
};
entryContainerEl.addEventListener("onPLSStatsUpdate", evtListener);
// createOnLeaveEvtListener("onPLSStatsUpdate", evtListener);
}
entryContainerEl.appendChild(entryOperationArea);
const isShow = entry.auraIf();
if (!isShow) entryContainerEl.classList.add("aura-settings-entry-hidden");
const updateDisableStatus = () => {
const isDisabledRet = entry.auraDisable();
setDisableStatus(
entryOperationArea,
isDisabledRet.value,
isDisabledRet.tooltip
);
};
if (entry.auraDisable) {
updateDisableStatus();
}
if (entry.associateVal) {
const evtListener = (event) => {
if (!entry.associateVal.includes(event.detail.path.join("."))) return;
const cls = entryContainerEl.classList;
const isShow = entry.auraIf();
isShow
? cls.remove("aura-settings-entry-hidden")
: cls.add("aura-settings-entry-hidden");
if (entry.auraDisable) {
updateDisableStatus();
}
};
const channel = entry.PLSRequired
? "onPLSConfigUpdate"
: "onHugoAuraConfigUpdate";
entryContainerEl.addEventListener(channel, evtListener);
// createOnLeaveEvtListener(channel, evtListener);
}
formEl.appendChild(entryContainerEl);
};
const renderPreviewItem = (entry, formEl) => {
const elementId = entry.customId ? entry.customId : `${entry.id}Container`;
const eventChannel = entry.listenerType;
const separateHrContainer = document.createElement("div");
separateHrContainer.classList.add("aura-settings-preview-area-hr-container");
const hrTitle = document.createElement("p");
hrTitle.textContent = "预览";
const hrElement = document.createElement("hr");
hrElement.classList.add("aura-settings-preview-hr");
separateHrContainer.appendChild(hrElement);
separateHrContainer.appendChild(hrTitle);
separateHrContainer.appendChild(hrElement.cloneNode());
formEl.appendChild(separateHrContainer);
const previewContainerEl = document.createElement("div");
previewContainerEl.classList.add("aura-settings-preview-area-container");
previewContainerEl.id = elementId;
const eventListener = (event) => {
const childs = previewContainerEl.querySelectorAll("*");
Array.from(childs).forEach((el) => {
el.dispatchEvent(
new CustomEvent("onAssociateValueUpdated", { detail: event.detail })
);
});
};
document.addEventListener(
eventChannel === "pls" ? "onPLSConfigUpdate" : "onHugoAuraConfigUpdate",
eventListener
);
createOnLeaveEvtListener(eventListener); // Clean up
formEl.appendChild(previewContainerEl);
setTimeout(() => {
global.__HUGO_AURA_LOADER__[entry.loaderTarget].active = true;
}, 50);
};
const renderChild = (entry, formEl) => {
switch (entry.type) {
case "preview":
renderPreviewItem(entry, formEl);
break;
default:
renderNormalSettingsItem(entry, formEl);
break;
}
};
const settingsRenderer = (pendingEl, settingsObj) => {
const formEl = document.createElement("form");
formEl.classList.add("aura-settings-form");
for (const category of settingsObj) {
@@ -50,234 +407,7 @@ const settingsRenderer = (pendingEl, settingsObj, isPls = false) => {
categoryTitleEl.textContent = category.categoryName;
formEl.appendChild(categoryTitleEl);
for (const entry of category.child) {
const entryContainerEl = document.createElement("div");
entryContainerEl.classList.add("aura-settings-entry");
entryContainerEl.id = `${entry.id}Container`;
const entryInfoContainerEl = document.createElement("div");
entryInfoContainerEl.classList.add("aura-settings-entry-info-container");
const entryTitle = document.createElement("p");
entryTitle.classList.add("aura-settings-entry-title");
entryTitle.textContent = entry.name;
if (entry.restart) {
const powerIcon = document.createElement("i");
powerIcon.classList.add(
"layui-icon",
"layui-icon-logout",
"aura-settings-entry-property-icon"
);
powerIcon.setAttribute("data-bs-toggle", "tooltip");
powerIcon.setAttribute("data-bs-placement", "top");
powerIcon.setAttribute("data-bs-title", "需要重启 Electron 进程");
entryTitle.appendChild(powerIcon);
}
if (entry.PLSRequired) {
const plsIcon = document.createElement("i");
plsIcon.classList.add(
"layui-icon",
"layui-icon-component",
"aura-settings-entry-property-icon"
);
plsIcon.setAttribute("data-bs-toggle", "tooltip");
plsIcon.setAttribute("data-bs-placement", "top");
plsIcon.setAttribute("data-bs-title", "需要 PLS 支持");
entryTitle.appendChild(plsIcon);
}
if (entry.restartPLS) {
const plsIcon = document.createElement("i");
plsIcon.classList.add(
"layui-icon",
"layui-icon-logout",
"aura-settings-entry-property-icon"
);
plsIcon.setAttribute("data-bs-toggle", "tooltip");
plsIcon.setAttribute("data-bs-placement", "top");
plsIcon.setAttribute("data-bs-title", "需要重启 PLS 进程");
entryTitle.appendChild(plsIcon);
}
if (entry.reload) {
const reloadIcon = document.createElement("i");
reloadIcon.classList.add(
"layui-icon",
"layui-icon-refresh",
"aura-settings-entry-property-icon"
);
reloadIcon.setAttribute("data-bs-toggle", "tooltip");
reloadIcon.setAttribute("data-bs-placement", "top");
reloadIcon.setAttribute("data-bs-title", "需要重载页面");
entryTitle.appendChild(reloadIcon);
}
const createToolTipIcon = (type, content) => {
const tipIcon = document.createElement("i");
tipIcon.classList.add(
"layui-icon",
"layui-icon-tips",
"aura-settings-entry-property-icon"
);
if (type === "warning") {
tipIcon.classList.add("aura-settings-entry-warning-icon");
}
tipIcon.setAttribute("data-bs-toggle", "tooltip");
tipIcon.setAttribute("data-bs-placement", "top");
tipIcon.setAttribute("data-bs-title", content);
entryTitle.appendChild(tipIcon);
};
if (entry.tip) {
createToolTipIcon("tip", entry.tipTitle);
}
if (entry.warning) {
createToolTipIcon("warning", entry.warningContent);
}
const entryDescription = document.createElement("p");
entryDescription.classList.add("aura-settings-entry-desc");
entryDescription.textContent = entry.description;
entryInfoContainerEl.appendChild(entryTitle);
entryInfoContainerEl.appendChild(entryDescription);
entryContainerEl.appendChild(entryInfoContainerEl);
const entryOperationArea = document.createElement("div");
entryOperationArea.classList.add("aura-settings-entry-operation-area");
switch (entry.type) {
case "switch":
{
const switchEl = document.createElement("input");
switchEl.classList.add("form-check-input");
switchEl.type = "checkbox";
switchEl.role = "switch";
switchEl.id = entry.id;
const elValue = entry.valueGetter();
switchEl.value = elValue;
switchEl.checked = elValue;
switchEl.addEventListener("change", async (event) => {
showToast(entry);
await entry.callbackFn(event.target.checked);
});
entryOperationArea.classList.add("form-check", "form-switch");
entryOperationArea.appendChild(switchEl);
}
break;
case "radio":
{
const elValue = entry.valueGetter();
for (const template of entry.templates) {
const inlineContainerEl = document.createElement("div");
inlineContainerEl.classList.add(
"form-check",
"form-check-inline"
);
const radioEl = document.createElement("input");
radioEl.value = template;
radioEl.classList.add("form-check-input");
radioEl.type = "radio";
radioEl.name = `${entry.id}Radios`;
radioEl.id = `${entry.id}Radio${entry.templates.indexOf(
template
)}`;
radioEl.checked = template === elValue ? true : false;
radioEl.addEventListener("change", async (event) => {
if (event.target.checked) {
showToast(entry);
await entry.callbackFn(event.target.value);
}
});
inlineContainerEl.appendChild(radioEl);
const labelEl = document.createElement("label");
labelEl.classList.add("form-check-label");
labelEl.setAttribute("for", radioEl.id);
labelEl.textContent =
entry.templateLabels[entry.templates.indexOf(template)];
inlineContainerEl.appendChild(labelEl);
entryOperationArea.appendChild(inlineContainerEl);
}
}
break;
case "input":
{
const inputEl = document.createElement("input");
inputEl.classList.add("form-control");
inputEl.type = entry.subType;
inputEl.value = entry.valueGetter();
inputEl.placeholder = entry.placeHolder;
inputEl.id = entry.id;
inputEl.addEventListener("change", async (event) => {
const result = await entry.callbackFn(event.target.value);
const success = result.valid;
if (success) {
showToast(entry);
if (inputEl.className.includes("is-invalid")) {
inputEl.classList.remove("is-invalid");
entryDescription.textContent = entry.description;
entryDescription.classList.remove("ase-desc-error-hint");
}
} else {
inputEl.classList.add("is-invalid");
entryDescription.textContent = result.hint;
entryDescription.classList.add("ase-desc-error-hint");
}
});
entryOperationArea.classList.add("ase-operation-area-expanded");
entryOperationArea.appendChild(inputEl);
}
break;
default:
break;
}
const setDisableStatus = (el, isDisable, hint = null) => {
if (isDisable) {
el.classList.add("ase-operation-area-disabled");
if (hint) {
el.setAttribute("data-bs-toggle", "tooltip");
el.setAttribute("data-bs-placement", "top");
el.setAttribute("data-bs-title", hint);
}
} else {
el.setAttribute("data-bs-toggle", "");
el.setAttribute("data-bs-placement", "");
el.setAttribute("data-bs-title", "");
el.classList.remove("ase-operation-area-disabled");
}
};
if (entry.PLSRequired) {
if (!global.__HUGO_AURA__.plsStats.connected) {
setDisableStatus(entryOperationArea, true, "连接至 PLS 以继续");
}
document.addEventListener("onPLSStatsUpdate", (event) => {
if (event.detail.connected) {
setDisableStatus(entryOperationArea, false);
} else {
setDisableStatus(entryOperationArea, true, "连接至 PLS 以继续");
}
});
}
entryContainerEl.appendChild(entryOperationArea);
const isShow = entry.auraIf();
if (!isShow) entryContainerEl.classList.add("aura-settings-entry-hidden");
if (entry.associateVal) {
document.addEventListener(
isPls ? "onPLSConfigUpdate" : "onHugoAuraConfigUpdate",
(event) => {
if (!entry.associateVal.includes(event.detail.path.join(".")))
return;
const cls = entryContainerEl.classList;
const isShow = entry.auraIf();
isShow
? cls.remove("aura-settings-entry-hidden")
: cls.add("aura-settings-entry-hidden");
}
);
}
formEl.appendChild(entryContainerEl);
renderChild(entry, formEl);
}
const hrEl = document.createElement("hr");
@@ -286,7 +416,9 @@ const settingsRenderer = (pendingEl, settingsObj, isPls = false) => {
}
pendingEl.appendChild(formEl);
global.__HUGO_AURA_GLOBAL__.utils.refreshBsTooltip();
global.__HUGO_AURA_GLOBAL__.utils.refreshBsTooltip(
".aura-settings-entry-property-icon"
);
};
module.exports = { settingsRenderer };

View File

@@ -65,6 +65,33 @@
border-bottom: 0.75px solid rgba(0, 0, 0, 0.25);
}
.aura-settings-preview-area-hr-container {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.aura-settings-preview-hr {
margin-top: 1.5rem;
margin-bottom: 1.5rem;
border-bottom: 0.75px solid rgba(0, 0, 0, 0.25);
width: -webkit-fill-available;
}
.aura-settings-preview-area-hr-container p {
margin-left: 0.5rem;
margin-right: 0.5rem;
min-width: 2rem;
opacity: 0.75;
text-align: center;
}
.aura-settings-preview-area-container {
width: 100%;
padding-bottom: 0.5rem;
}
.aura-settings-entry-property-icon {
margin-left: 0.5rem;
font-size: 15px;
@@ -81,7 +108,7 @@
.aura-settings-entry-warning-icon {
transform: rotate(180deg);
display: inline-block;
color: rgb(241, 155, 0);
color: rgb(147, 0, 0);
}
/* Animations */

View File

@@ -25,3 +25,7 @@ button.nav-link {
.nav-underline {
--bs-nav-underline-link-active-color: #0d6efd !important;
}
.tooltip {
--bs-tooltip-max-width: 400px !important;
}

View File

@@ -21,41 +21,60 @@ const def = {
pageSelector: "#root",
selectorMode: "appendChild",
pageCSS: "ui/pages/config/config.css",
},
"Aura.UI.Assistant.Config.DisableLimitations": {
active: false,
pageURI:
"ui/pages/configSubPages/disableLimitations/disableLimitations.html",
pageScript:
"ui/pages/configSubPages/disableLimitations/disableLimitations.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS:
"ui/pages/configSubPages/disableLimitations/disableLimitations.css",
},
"Aura.UI.Assistant.Config.BehaviourCtrl": {
active: false,
pageURI: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.html",
pageScript: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.css",
},
"Aura.UI.Assistant.Config.BehaviourCtrl.PlsStatus": {
active: false,
pageURI: "ui/pages/configSubPages/behaviourCtrl/plsStatus.html",
pageScript: "ui/pages/configSubPages/behaviourCtrl/plsStatus.js",
pageSelector: "#status-subpage",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/behaviourCtrl/plsStatus.css",
},
"Aura.UI.Assistant.Config.Preferences": {
active: false,
pageURI: "ui/pages/configSubPages/preferences/preferences.html",
pageScript: "ui/pages/configSubPages/preferences/preferences.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/preferences/preferences.css",
childs: {
DisableLimitations: {
active: false,
pageURI:
"ui/pages/configSubPages/disableLimitations/disableLimitations.html",
pageScript:
"ui/pages/configSubPages/disableLimitations/disableLimitations.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS:
"ui/pages/configSubPages/disableLimitations/disableLimitations.css",
},
BehaviourCtrl: {
active: false,
pageURI: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.html",
pageScript: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/behaviourCtrl/behaviourCtrl.css",
childs: {
PlsStatus: {
active: false,
pageURI: "ui/pages/configSubPages/behaviourCtrl/plsStatus.html",
pageScript: "ui/pages/configSubPages/behaviourCtrl/plsStatus.js",
pageSelector: "#status-subpage",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/behaviourCtrl/plsStatus.css",
},
DeviceSecurity: {
childs: {
FreezeOverridePreview: {
active: false,
pageURI:
"ui/pages/configSubPages/behaviourCtrl/settings/previews/freezeOverridePreview/freezeOverridePreview.html",
pageScript:
"ui/pages/configSubPages/behaviourCtrl/settings/previews/freezeOverridePreview/freezeOverridePreview.js",
pageSelector: "#freezeInfoReportOverridePreviewContainer",
selectorMode: "appendChild",
pageCSS:
"ui/pages/configSubPages/behaviourCtrl/settings/previews/freezeOverridePreview/freezeOverridePreview.css",
},
},
},
},
},
Preferences: {
active: false,
pageURI: "ui/pages/configSubPages/preferences/preferences.html",
pageScript: "ui/pages/configSubPages/preferences/preferences.js",
pageSelector: ".aura-config-page-subpage-container",
selectorMode: "appendChild",
pageCSS: "ui/pages/configSubPages/preferences/preferences.css",
},
},
},
},
globalStyles: [
@@ -65,7 +84,11 @@ const def = {
"ui/layui/css/layui.css",
"ui/bootstrap/bootstrap.min.css",
],
globalJS: ["ui/js/global.js", "ui/js/plsListener.js", "ui/bootstrap/bootstrap.bundle.min.js"],
globalJS: [
"ui/js/global.js",
"ui/js/plsListener.js",
"ui/bootstrap/bootstrap.bundle.min.js",
],
onLoaded: `
console.log('[HugoAura / UI / Hooks / Assistant] Page loaded.');
`,

View File

@@ -4,26 +4,38 @@
/* Util: BootStrap Tooltip Ctrl */
let tooltipTriggerCache = null;
const refreshBsTooltip = () => {
const refreshBsTooltip = (selector = '[data-bs-toggle="tooltip"]') => {
if (tooltipTriggerCache) {
[...tooltipTriggerCache].map((el) =>
bootstrap.Tooltip.getInstance(el).disable()
);
}
const tooltipTriggerList = document.querySelectorAll(
'[data-bs-toggle="tooltip"]'
);
const tooltipTriggerList = document.querySelectorAll(selector);
tooltipTriggerCache = tooltipTriggerList;
[...tooltipTriggerList].map(
(tooltipTriggerEl) => new bootstrap.Tooltip(tooltipTriggerEl)
);
};
const createOnLeaveEvtListener = (
channel,
pendingRmEvtListener,
leaveEvt = "onCurConfigPageLeave"
) => {
const rmEvtListener = (event) => {
document.removeEventListener(channel, pendingRmEvtListener);
document.removeEventListener(leaveEvt, rmEvtListener);
};
document.addEventListener(leaveEvt, rmEvtListener);
return rmEvtListener;
};
if (!window.__HUGO_AURA_GLOBAL__) window.__HUGO_AURA_GLOBAL__ = {};
window.__HUGO_AURA_GLOBAL__.utils = {
sleep,
refreshBsTooltip,
createOnLeaveEvtListener,
};
})();

View File

@@ -6,7 +6,7 @@
detached: false,
connected: false,
launched: false,
status: "unknown",
status: "dead",
version: "未知",
authToken: "",
};
@@ -15,19 +15,91 @@
const REQUIRE_BASE = "../../aura/ui";
const __SCOPE = "desktopAssistant";
const PLS_REG_PATH = "ProxyLayerServices";
const { pushMsgHandler } = require(`${REQUIRE_BASE}/pls/pushHandler`);
const RegistryManager = require(`${REQUIRE_BASE}/../init/shared/registryManager`);
const registryManager = new RegistryManager();
/** @type {number} */
let failedCounter = 0;
/** @type {boolean} */
let isErrorOccurred = false;
/** @type {number} */
let plsPort = 22077;
/** @type {"wss" | "ws"} */
let plsProtocol = "wss";
/** @type {boolean} */
let isRetrying = false;
/** @type {any} */
let curSendListener = null;
const sendRetryStatusToMain = (/** @type {Boolean} */ status) => {
global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.post.updateRetryStatus`, {
success: status,
});
};
const calcFullAuthToken = (/** @type {string} */ authToken) => {
const trustToken = window._ACCEPT_DATA.getData("deviceId");
const conjToken = authToken + "AuraXAuth" + trustToken + "NeverEnds";
const crypto = require("crypto");
return crypto.createHash("sha512").update(conjToken).digest("hex");
};
const clearIpcListener = () => {
if (curSendListener) {
global.ipcRenderer.off(
`${IPC_METHOD_BASE}.ws.post.onReqSendMsg`,
curSendListener
);
curSendListener = null;
}
};
const startConnPlsProc = async (updatedPlsStats) => {
const authTokenRet = await registryManager.readRegKey(
PLS_REG_PATH,
"AuthToken",
true
);
if (authTokenRet.success) {
updatedPlsStats.authToken = authTokenRet.data;
// @ts-expect-error
global.__HUGO_AURA__.plsStats.authToken = authTokenRet.data;
} else {
sendRetryStatusToMain(false);
return;
}
const portRet = await registryManager.readRegKey(
PLS_REG_PATH,
"WsPort",
true
);
if (portRet.success) {
try {
plsPort = Number(portRet.data);
} catch {
console.warn(
`[HugoAura / UI / PLS Manager] Invalid PLS port: ${portRet.data}`
);
}
}
const protoRet = await registryManager.readRegKey(
PLS_REG_PATH,
"Protocol",
true
);
if (protoRet.success) {
plsProtocol = protoRet.data;
}
createPlsConnection(updatedPlsStats.authToken, connectionResultCallback);
};
/**
*
* @param {string} authToken
@@ -43,9 +115,11 @@
return;
}
const fullAuthToken = calcFullAuthToken(authToken);
/** @type {WebSocket} */
const plsWs = new WebSocket(
`wss://pls.hugoaura.local:22077/?auth=${authToken}`
`${plsProtocol}://pls.hugoaura.local:${plsPort}/?auth=${fullAuthToken}`
);
plsWs.onopen = () => {
@@ -59,6 +133,26 @@
};
plsWs.onclose = () => {
clearIpcListener();
if (global.__HUGO_AURA__.plsStats) {
if (global.__HUGO_AURA__.plsStats.status === "notReady") {
if (isRetrying) {
sendRetryStatusToMain(false);
return;
}
console.warn(
"[HugoAura / UI / PLS Manager / WARN] PLS not ready, try again after 10s..."
);
isRetrying = true;
setTimeout(async () => {
isRetrying = false;
startConnPlsProc(global.__HUGO_AURA__.plsStats);
}, 10000);
sendRetryStatusToMain(false);
return;
}
}
console.error(
"[HugoAura / UI / PLS Manager / ERROR] WebSocket connection closed."
);
@@ -73,16 +167,18 @@
* @param {WebSocket} wsObj
*/
const registerSendReqListener = (wsObj) => {
clearIpcListener();
/**
*
* @param {import("electron").IpcRendererEvent} _evt
* @param {any} arg
*/
curSendListener = (_evt, arg) => {
wsObj.send(JSON.stringify(arg));
};
global.ipcRenderer.on(
`${IPC_METHOD_BASE}.ws.post.onReqSendMsg`,
/**
*
* @param {import("electron").IpcRendererEvent} _evt
* @param {any} arg
*/
(_evt, arg) => {
wsObj.send(JSON.stringify(arg));
}
curSendListener
);
};
@@ -151,6 +247,11 @@
const initPlsConnection = async () => {
if (!global.__HUGO_AURA__.plsStats) return;
if (isRetrying) {
sendRetryStatusToMain(false);
return;
}
failedCounter = 0;
isErrorOccurred = false;
@@ -158,7 +259,10 @@
`${IPC_METHOD_BASE}.getPlsStats`
);
let updatedPlsStats = {};
if (curPlsStats === null || !curPlsStats.success) {
if (
(curPlsStats === null || !curPlsStats.success) &&
curPlsStats.status !== "downloading"
) {
updatedPlsStats = {
installed: false,
launched: false,
@@ -173,10 +277,9 @@
}
const isPlsFolderExists = (
await global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.getPlsFolderExists`)
await global.ipcRenderer.invoke(`${IPC_METHOD_BASE}.getPlsBinExists`)
).data.isExists;
updatedPlsStats.installed = isPlsFolderExists;
// @ts-expect-error
global.__HUGO_AURA__.plsStats = updatedPlsStats;
console.debug(
@@ -189,15 +292,11 @@
updatedPlsStats
);
const startConnPls = () => {
createPlsConnection(updatedPlsStats.authToken, connectionResultCallback);
};
/*
if (updatedPlsStats.detached && updatedPlsStats.installed) {
*/
if (updatedPlsStats.installed) {
startConnPls();
await startConnPlsProc(updatedPlsStats);
} else {
sendRetryStatusToMain(false);
}
@@ -229,5 +328,7 @@
);
};
onSetup();
setTimeout(() => {
onSetup();
}, 1500);
})();

View File

@@ -14,6 +14,23 @@
`${IPC_METHOD_BASE}.post.onPlsStatsUpdate`,
(_event, arg) => {
global.__HUGO_AURA__.plsStats = arg;
const event = new CustomEvent("onPLSStatsUpdate", {
detail: {
connected: arg.connected,
},
});
document.dispatchEvent(event);
const settingsEntries = document.getElementsByClassName(
"aura-settings-entry"
);
if (settingsEntries.length > 0) {
Array.from(settingsEntries).forEach((entry) => {
entry.dispatchEvent(event);
});
}
}
);
@@ -21,6 +38,24 @@
`${IPC_METHOD_BASE}.post.onPlsSettingsUpdate`,
(_event, arg) => {
global.__HUGO_AURA__.plsSettings = arg;
const event = new CustomEvent("onPLSConfigUpdate", {
detail: {
path: ["root", "settings"],
value: arg,
},
});
document.dispatchEvent(event);
const settingsEntries = document.getElementsByClassName(
"aura-settings-entry"
);
if (settingsEntries.length > 0) {
Array.from(settingsEntries).forEach((entry) => {
entry.dispatchEvent(event);
});
}
}
);
@@ -28,19 +63,38 @@
`${IPC_METHOD_BASE}.post.onPlsRulesUpdate`,
(_event, arg) => {
global.__HUGO_AURA__.plsRules = arg;
const event = new CustomEvent("onPLSConfigUpdate", {
detail: {
path: ["root", "ruleSettings"],
value: arg,
},
});
document.dispatchEvent(event);
const settingsEntries = document.getElementsByClassName(
"aura-settings-entry"
);
if (settingsEntries.length > 0) {
Array.from(settingsEntries).forEach((entry) => {
entry.dispatchEvent(event);
});
}
}
);
ipcRenderer.on(
`${IPC_METHOD_BASE}.post.updateRetryStatus`,
(_event, arg) => {
document.dispatchEvent(
new CustomEvent("onPLSStatsUpdate", {
detail: {
connected: arg.success,
},
})
);
const event = new CustomEvent("onPLSStatsUpdate", {
detail: {
connected: arg.success,
},
});
document.dispatchEvent(event);
if (
global.__HUGO_AURA_LOADER__["Aura.UI.Assistant.Config.BehaviourCtrl"]
.active

View File

@@ -7,11 +7,48 @@
<div class="aura-config-page-app-bar" style="-webkit-app-region: drag">
<div
onclick="global.__HUGO_AURA_UI_FUNCTIONS__.config.handleNavBack()"
style="-webkit-app-region: no-drag; z-index: 2000"
style="-webkit-app-region: no-drag; z-index: 2000; margin-right: 0.1rem"
>
<i class="iconfont"></i>
<!-- Chevron Left Icon -->
</div>
<p>雨光之环</p>
<div class="aura-config-page-app-bar-hr-vertical"></div>
<div
onclick="global.__HUGO_AURA_UI_FUNCTIONS__.config.handleNavHome()"
style="-webkit-app-region: no-drag; z-index: 2000; margin-left: 6px"
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="21"
height="21"
viewBox="0 0 24 24"
class="iconfont"
style="margin-top: -1.5px"
>
<path
fill="currentColor"
d="M6 19h3.692v-5.884h4.616V19H18v-9l-6-4.538L6 10zm-1 1V9.5l7-5.288L19 9.5V20h-5.692v-5.884h-2.616V20zm7-7.77"
stroke-width="0.5"
stroke="currentColor"
/>
</svg>
</div>
<div class="aura-config-page-app-bar-spacer"></div>
<div
onclick="global.__HUGO_AURA_UI_FUNCTIONS__.config.minimizeWindow()"
style="-webkit-app-region: no-drag; z-index: 2000"
>
<i class="iconfont"></i>
<!-- Minimize Icon -->
</div>
<div
onclick="global.__HUGO_AURA_UI_FUNCTIONS__.config.closeWindow()"
style="-webkit-app-region: no-drag; z-index: 2000; margin-left: 0.5rem"
>
<i class="iconfont"></i>
<!-- Failed / Cancel Icon -->
</div>
</div>
</div>
@@ -189,6 +226,11 @@
<div class="toast-header">
<i class="layui-icon layui-icon-tips"></i>
<strong class="me-auto">重载页面以应用设置</strong>
<button
type="button"
class="btn-close"
data-bs-dismiss="toast"
></button>
</div>
<div class="toast-body">
<p>请重载当前窗口以应用修改的设置</p>
@@ -217,6 +259,11 @@
<div class="toast-header">
<i class="layui-icon layui-icon-tips"></i>
<strong class="me-auto">重启进程以应用设置</strong>
<button
type="button"
class="btn-close"
data-bs-dismiss="toast"
></button>
</div>
<div class="toast-body">
<p>请重启 Electron 进程以应用修改的设置</p>
@@ -245,6 +292,11 @@
<div class="toast-header">
<i class="layui-icon layui-icon-tips"></i>
<strong class="me-auto">重启 PLS 进程以应用设置</strong>
<button
type="button"
class="btn-close"
data-bs-dismiss="toast"
></button>
</div>
<div class="toast-body">
<p>请重启 PLS 进程以应用修改的设置</p>

View File

@@ -6,6 +6,22 @@ global.__HUGO_AURA_UI_REACTIVES__.config = {
};
global.__HUGO_AURA_UI_FUNCTIONS__.config = {
closeWindow: async () => {
if (global.__HUGO_AURA_UI_REACTIVES__.config.isConfigPendingWrite) {
await global.__HUGO_AURA_UI_FUNCTIONS__.config.handleSaveConfig();
}
global.ipcRenderer.send("$aura.base.closeWindow", {
targetWindowKey: "assistant",
});
},
minimizeWindow: () => {
global.ipcRenderer.send("$aura.base.minimizeWindow", {
targetWindowKey: "assistant",
});
},
handleNavBack: () => {
if (global.__HUGO_AURA_UI_REACTIVES__.config.isInSubPage) {
const acsDialogAreaEl = document.getElementsByClassName(
@@ -23,11 +39,26 @@ global.__HUGO_AURA_UI_FUNCTIONS__.config = {
global.__HUGO_AURA_UI_REACTIVES__.config.currentActiveSubPage,
false
);
const onLeaveEvent = new CustomEvent("onCurConfigPageLeave");
document.dispatchEvent(onLeaveEvent);
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.config.hideConfigPage();
}
},
handleNavHome: async () => {
if (global.__HUGO_AURA_UI_REACTIVES__.config.isConfigPendingWrite) {
global.__HUGO_AURA_UI_FUNCTIONS__.config.handleSaveConfig();
}
global.__HUGO_AURA_UI_FUNCTIONS__.config.hideConfigPage();
setTimeout(() => {
const onLeaveEvent = new CustomEvent("onCurConfigPageLeave");
document.dispatchEvent(onLeaveEvent);
}, 500);
},
hideConfigPage: async () => {
const defaultHeader = document.getElementsByClassName(
"index__header__16DmR2a5"

View File

@@ -19,6 +19,11 @@
color: rgba(0, 0, 0, 0.8);
}
.aura-config-page-header-area.color-reverse
.aura-config-page-app-bar-hr-vertical {
background: rgba(0, 0, 0, 0.5);
}
.aura-config-page-header-area .iconfont {
font-size: 24px;
}
@@ -33,7 +38,7 @@
}
.aura-config-page-header-area p {
margin-top: -1px;
margin-top: -2px;
}
.aura-config-page-header-area.header-collapsed {
@@ -48,3 +53,16 @@
align-items: center;
width: 100%;
}
.aura-config-page-app-bar-spacer {
flex-grow: 1;
}
.aura-config-page-app-bar-hr-vertical {
position: relative;
margin-left: 8px;
width: 1px;
background: rgba(255, 255, 255, 0.5);
height: 12px;
transition: background 0.5s;
}

View File

@@ -7,6 +7,7 @@
} = require(`${REQUIRE_BASE}/../../../../composables/settingsRenderer`);
const { basicSettings } = require(`${REQUIRE_BASE}/basic`);
const { deviceSecuritySettings } = require(`${REQUIRE_BASE}/deviceSecurity`);
const {
updatePlsSettingsFromLocal,
@@ -24,19 +25,27 @@
settingsRenderer(basicSubPageEl, basicSettings);
};
const initDeviceSecuritySettingsPage = () => {
const deviceSecuritySubPageEl = document.getElementById(
"security-config-subpage"
);
settingsRenderer(deviceSecuritySubPageEl, deviceSecuritySettings);
};
const renderSubPages = async () => {
await updatePlsSettingsFromLocal();
await updatePlsRulesFromLocal();
initBasicSettingsPage();
initDeviceSecuritySettingsPage();
};
const onMounted = () => {
const rootEl = document.getElementById("acs-behaviour-control-el");
initStatusPage();
renderSubPages();
setTimeout(() => {
rootEl.classList.remove("acs-behaviour-control-hidden");
renderSubPages(); // 如果立即渲染子页面, 此时 plsRules 还未初始化, 会导致子页面 auraIf 失效
}, 500);
};

View File

@@ -33,6 +33,10 @@
margin-bottom: 1rem;
}
.acs-bc-psp-operations-container.acs-bc-psp-oper-ctnr-hidden {
display: none;
}
.acs-bc-psp-operation-btn {
--svg-color: rgb(17, 140, 255);
@@ -85,6 +89,50 @@
opacity: 0.3;
}
.acs-bc-psp-download-progress-area {
display: flex;
flex-direction: column;
width: 80%;
justify-content: center;
align-items: center;
}
.acs-bc-psp-download-progress-area.acs-bc-psp-dl-pbar-hidden {
display: none;
}
.acs-bc-psp-download-progress-area .progress {
height: 2px;
width: 80%;
margin-bottom: 0.6rem;
}
.acs-bc-psp-download-progress-area .progress-bar {
transition: all 0.15s;
}
.acs-bc-psp-download-progress-area #acsBcPspDownloadPbarDesc {
opacity: 0.6;
margin-bottom: 0.25rem;
}
.acs-bc-psp-download-progress-info-area {
display: flex;
}
.acs-bc-psp-download-progress-info-area .acs-bc-psp-operation-btn {
margin-left: 1rem;
margin-bottom: 0.25rem;
}
.acs-bc-psp-download-progress-info-area .acs-bc-psp-operation-btn.hidden {
display: none;
}
.acs-bc-psp-download-progress-info-area .acs-bc-psp-operation-btn svg {
margin-top: 1px;
}
.acs-bc-pls-status-page-status-el {
display: flex;
align-items: center;
@@ -137,3 +185,62 @@
.acs-bc-pls-status-page-status-area.failed p {
color: rgb(175, 0, 0);
}
.acs-bc-pls-status-page-status-area.warning
.acs-bc-pls-status-page-status-area-circle {
background-color: rgb(212, 127, 0);
}
.acs-bc-pls-status-page-status-area.warning p {
color: rgb(212, 127, 0);
}
.acs-bc-pls-status-page-status-area.info
.acs-bc-pls-status-page-status-area-circle {
background-color: #3d78ff;
}
.acs-bc-pls-status-page-status-area.info p {
color: #3d78ff;
}
.acs-bc-psp-toast.body-display-none .toast-body {
display: none;
}
.acs-bc-psp-toast.body-display-none .toast-header {
border-bottom: none;
}
.acs-bc-psp-toast[closable="false"] .btn-close {
display: none;
}
.acs-bc-psp-toast[variant="success"] .toast-header {
background-color: rgb(6, 196, 65);
color: rgb(255, 255, 255);
}
.acs-bc-psp-toast[variant="warning"] .toast-header {
background-color: rgb(225, 178, 44);
color: rgb(255 255 255);
}
.acs-bc-psp-toast[variant="error"] .toast-header {
background-color: rgb(217, 57, 4);
color: rgb(255 255 255);
}
.acs-bc-psp-toast[variant="info"] .toast-header {
background-color: rgb(0, 149, 222);
color: rgb(255 255 255);
}
.acs-bc-psp-toast[variant="success"] .btn-close,
.acs-bc-psp-toast[variant="warning"] .btn-close,
.acs-bc-psp-toast[variant="error"] .btn-close,
.acs-bc-psp-toast[variant="info"] .btn-close {
color: rgb(255, 255, 255);
filter: invert(1);
opacity: 0.95;
}

View File

@@ -92,6 +92,67 @@
</svg>
<p>卸载服务</p>
</div>
<div class="acs-bc-psp-operation-btn" id="acsBcPsp-operBtn-Start">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="var(--svg-color)"
d="M7 28a1 1 0 0 1-1-1V5a1 1 0 0 1 1.482-.876l20 11a1 1 0 0 1 0 1.752l-20 11A1 1 0 0 1 7 28M8 6.69v18.62L24.925 16Z"
/>
</svg>
<p>启动服务</p>
</div>
<div class="acs-bc-psp-operation-btn" id="acsBcPsp-operBtn-Stop">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="var(--svg-color)"
d="M24 8v16H8V8zm0-2H8a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2"
/>
</svg>
<p>停止服务</p>
</div>
</div>
<div class="acs-bc-psp-download-progress-area acs-bc-psp-dl-pbar-hidden">
<div class="progress" role="progressbar">
<div class="progress-bar" id="acsBcPspDownloadPbarEl"></div>
</div>
<div class="acs-bc-psp-download-progress-info-area">
<p id="acsBcPspDownloadPbarDesc">等待中...</p>
<div
class="acs-bc-psp-operation-btn hidden"
id="acsBcPspDownloadPbarCancelBtn"
onclick="global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.cancelDownloadTask()"
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="var(--svg-color)"
d="M9 10.555L10.555 9L23 21.444L21.444 23z"
/>
<path
fill="var(--svg-color)"
d="M16 2A13.914 13.914 0 0 0 2 16a13.914 13.914 0 0 0 14 14a13.914 13.914 0 0 0 14-14A13.914 13.914 0 0 0 16 2m0 26a12 12 0 1 1 12-12a12.035 12.035 0 0 1-12 12"
/>
</svg>
<p>取消操作</p>
</div>
</div>
</div>
<div class="acs-bc-pls-status-page-status-el">
@@ -133,4 +194,22 @@
<p id="acs-bc-psp-version-text">不可用</p>
</div>
</div>
<div class="toast-container position-fixed bottom-0 end-0 p-3">
<div
id="plsStatusNotifyToast"
class="acs-bc-psp-toast toast"
data-bs-autohide="false"
>
<div class="toast-header">
<strong class="me-auto" id="plsStatusNotifyToastTitle"></strong>
<button
type="button"
class="btn-close"
data-bs-dismiss="toast"
></button>
</div>
<div class="toast-body" id="plsStatusNotifyToastBody"></div>
</div>
</div>
</div>

View File

@@ -1,32 +1,356 @@
if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig = {};
if (!global.__HUGO_AURA_UI_REACTIVES__.subConfig)
global.__HUGO_AURA_UI_REACTIVES__.subConfig = {};
(() => {
const REQUIRE_BASE = "../../aura/ui/pages/configSubPages/behaviourCtrl";
const IPC_METHOD_BASE = "$aura.pls";
const lifecycleStatus = {
installed: false,
detached: false,
svcInstalled: false,
svcRunning: false,
};
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus = {
toastAutoHideTimeout: null,
curDlTaskId: null,
};
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus = {
updateOperationBtnStatus: async (btnName, side, btnContent = null) => {
updateToast: async (
variant,
title,
body = null,
closable = true,
autoHide = true,
hideAfter = 3000
) => {
const toastRootEl = document.getElementById("plsStatusNotifyToast");
const toastHeaderEl = document.getElementById(
"plsStatusNotifyToastTitle"
);
const toastBodyEl = document.getElementById("plsStatusNotifyToastBody");
const bsToastIns = bootstrap.Toast.getOrCreateInstance(toastRootEl);
if (bsToastIns.isShown) {
bsToastIns.hide();
const timeout =
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus
.toastAutoHideTimeout;
if (timeout) {
clearTimeout(timeout);
}
await global.__HUGO_AURA_GLOBAL__.utils.sleep(160);
}
toastRootEl.setAttribute("variant", variant);
toastHeaderEl.innerHTML = title;
if (body) {
toastBodyEl.innerHTML = body;
toastRootEl.classList.remove("body-display-none");
} else {
toastRootEl.classList.add("body-display-none");
}
toastRootEl.setAttribute("closable", closable.toString());
bsToastIns.show();
if (autoHide && hideAfter) {
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus.toastAutoHideTimeout =
setTimeout(() => {
bsToastIns.hide();
}, hideAfter);
}
},
updateOperationBtnStatus: async (
btnName,
isDisabled,
btnContent = null
) => {
const btnEl = document.getElementById(`acsBcPsp-operBtn-${btnName}`);
if (!btnEl) return false;
btnEl.setAttribute("aura-disabled", side ? "true" : "false");
btnEl.setAttribute("aura-disabled", isDisabled ? "true" : "false");
if (btnContent) {
const btnPEl = btnEl.getElementsByTagName("p")[0];
btnPEl.textContent = btnContent;
}
if (side) {
if (isDisabled) {
btnEl.onclick = () => {};
} else {
switch (btnName) {
case "Refresh":
btnEl.onclick = () =>
btnEl.onclick = () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"warning",
"正在更新",
null,
false,
false,
null
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.refreshPlsStatus();
};
break;
case "Download":
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.downloadPLSBin();
};
break;
// ↓ 这边的确可以把这些全都合并到一个可复用 fn 里去, 但没必要
// 如果后续要引入错误视觉反馈, 合并到单个 fn 反而会增加实现复杂度
case "Install":
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateOperationBtnStatus(
"Install",
true
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"info",
"正在请求安装",
null,
false,
false,
null
);
const ret = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "instSvc" }
);
if (ret.success) {
lifecycleStatus.svcInstalled = true;
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"服务安装成功",
null,
true,
true,
2000
);
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"服务安装失败",
`<p>${ret.errorObj}</p>`,
true,
false,
null
);
}
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
};
break;
case "Uninstall":
if (btnContent === "删除内核") {
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateOperationBtnStatus(
"Uninstall",
true
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"warning",
"正在删除内核",
null,
false,
false,
null
);
const ret = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "rmBin" }
);
if (ret.success) {
lifecycleStatus.installed = false;
lifecycleStatus.svcInstalled = false;
global.__HUGO_AURA__.plsStats.installed = false;
global.__HUGO_AURA__.plsStats.connected = false;
global.__HUGO_AURA__.plsStats.launched = false;
ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
global.__HUGO_AURA__.plsStats
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"内核已删除",
null,
true,
true,
2000
);
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"内核删除失败",
`<p>
${ret.errorObj ? ret.errorObj : "检查日志以获取详细信息"}
</p>`,
true,
false,
null
);
}
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
};
} else {
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateOperationBtnStatus(
"Uninstall",
true
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"info",
lifecycleStatus.svcRunning
? "正在停止服务并卸载"
: "正在请求卸载",
null,
false,
false,
null
);
if (lifecycleStatus.svcRunning) {
const stopRet = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "stopSvc" }
);
if (!stopRet.success) {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"服务卸载失败: 无法停止服务",
`<p>${
stopRet.errorObj
? stopRet.errorObj
: "检查日志以获取详细信息"
}</p>
<p>
您可以尝试手动停止 PLS 服务
</p>`,
true,
false,
null
);
} else {
lifecycleStatus.svcRunning = false;
}
}
const ret = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "rmSvc" }
);
if (ret.success) {
lifecycleStatus.svcInstalled = false;
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"服务卸载成功",
null,
true,
true,
2000
);
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"服务卸载失败",
"<p>检查日志以获取详细信息</p>",
true,
false,
null
);
}
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
};
}
break;
case "Start":
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateOperationBtnStatus(
"Start",
true
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"info",
"正在请求启动",
null,
false,
false,
null
);
const ret = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "startSvc" }
);
if (ret.success) {
lifecycleStatus.svcRunning = true;
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"PLS 已启动",
null,
true,
true,
2000
);
await global.__HUGO_AURA_GLOBAL__.utils.sleep(100);
await ipcRenderer.invoke(`${IPC_METHOD_BASE}.retryPlsConnect`);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"PLS 启动失败",
"<p>检查 PLS 日志目录以获取详细信息</p>",
true,
false,
null
);
}
};
break;
case "Stop":
btnEl.onclick = async () => {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateOperationBtnStatus(
"Stop",
true
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"info",
"正在请求停止",
null,
false,
false,
null
);
const ret = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleControl`,
{ target: "stopSvc" }
);
if (ret.success) {
lifecycleStatus.svcRunning = false;
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"PLS 已停止",
null,
true,
true,
2000
);
} else {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"PLS 停止失败",
null,
true,
false,
null
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
}
};
break;
default:
break;
@@ -35,32 +359,72 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
return true;
},
updateStatus: async () => {
updateStatusContent: async () => {
const curPlsStats = await updatePlsStatusFromLocal();
if (curPlsStats.status === "downloading") {
GLOBAL_FUNCTIONS.downloadPLSBin(true);
}
const acIdInst = "acs-bc-psp-installStatus-container";
const atIdInst = "acs-bc-psp-installStatus-text";
switch (curPlsStats.installed) {
switch (lifecycleStatus.installed) {
case true:
updateStatusEl(acIdInst, atIdInst, "SUCCESS", "已安装");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Install", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Uninstall", false);
if (!lifecycleStatus.svcInstalled) {
updateStatusEl(acIdInst, atIdInst, "WARNING", "已下载, 服务未安装");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Install", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus(
"Uninstall",
false,
"删除内核"
);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", true);
} else {
updateStatusEl(acIdInst, atIdInst, "SUCCESS", "已安装");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Install", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus(
"Uninstall",
false,
"卸载服务"
);
}
break;
case false:
updateStatusEl(acIdInst, atIdInst, "PENDING", "未安装");
updateStatusEl(acIdInst, atIdInst, "PENDING", "未下载");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Download", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Install", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Uninstall", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", true);
}
const acIdLaunch = "acs-bc-psp-launchStatus-container";
const atIdLaunch = "acs-bc-psp-launchStatus-text";
switch (curPlsStats.launched) {
case true:
updateStatusEl(acIdLaunch, atIdLaunch, "SUCCESS", "已启动");
break;
case false:
updateStatusEl(acIdLaunch, atIdLaunch, "PENDING", "未启动");
break;
if (lifecycleStatus.detached) {
updateStatusEl(acIdLaunch, atIdLaunch, "INFO", "已分离");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", true);
} else if (lifecycleStatus.svcInstalled && lifecycleStatus.installed) {
switch (lifecycleStatus.svcRunning || curPlsStats.launched) {
case true:
if (curPlsStats.status !== "notReady") {
updateStatusEl(acIdLaunch, atIdLaunch, "SUCCESS", "已启动");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", false);
} else {
updateStatusEl(acIdLaunch, atIdLaunch, "WARNING", "启动中");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", true);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", false);
}
break;
case false:
updateStatusEl(acIdLaunch, atIdLaunch, "PENDING", "未启动");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Start", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Stop", true);
break;
}
}
const acIdConn = "acs-bc-psp-connStatus-container";
@@ -70,7 +434,11 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
updateStatusEl(acIdConn, atIdConn, "SUCCESS", "已连接");
break;
case false:
updateStatusEl(acIdConn, atIdConn, "FAILED", "连接失败");
if (curPlsStats.status !== "notReady") {
updateStatusEl(acIdConn, atIdConn, "FAILED", "连接失败");
} else {
updateStatusEl(acIdConn, atIdConn, "PENDING", "等待启动");
}
break;
}
@@ -82,7 +450,71 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
}
},
refreshPlsStatus: async () => {
refreshPlsStatus: async (init = false) => {
const binExistsRet = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.getPlsBinExists`
);
if (binExistsRet.success && binExistsRet.data.isExists) {
lifecycleStatus.installed = true;
global.__HUGO_AURA__.plsStats.installed = true;
ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
global.__HUGO_AURA__.plsStats
);
} else {
lifecycleStatus.installed = false;
global.__HUGO_AURA__.plsStats.installed = false;
ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
global.__HUGO_AURA__.plsStats
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"error",
"请下载 PLS 内核以继续",
null,
true,
true,
3000
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
return;
}
const isDetachedRet = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleQuery`,
{ target: "isDetached" }
);
if (isDetachedRet.success && isDetachedRet.result) {
lifecycleStatus.detached = true;
} else {
lifecycleStatus.detached = false;
}
const isSvcInstalledRet = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleQuery`,
{ target: "isSvcInstalled" }
);
if (isSvcInstalledRet.success && isSvcInstalledRet.result) {
lifecycleStatus.svcInstalled = true;
} else {
lifecycleStatus.svcInstalled = false;
}
const isSvcRunningRet = await ipcRenderer.invoke(
`${IPC_METHOD_BASE}.plsLifecycleQuery`,
{ target: "isSvcStart" }
);
if (isSvcRunningRet.success && isSvcRunningRet.result) {
lifecycleStatus.svcRunning = true;
} else {
lifecycleStatus.svcRunning = false;
}
if (init) {
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
return;
}
const updateOperationBtnStatus =
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus
.updateOperationBtnStatus;
@@ -95,14 +527,289 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
ipcRenderer.once(
`${IPC_METHOD_BASE}.post.updateRetryStatus`,
async (_evt, _arg) => {
async (_evt, arg) => {
await global.__HUGO_AURA_GLOBAL__.utils.sleep(50);
updateOperationBtnStatus("Refresh", false, "刷新状态");
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatus();
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
arg.success ? "success" : "error",
arg.success ? "更新成功" : "连接失败",
null,
true,
true,
3000
);
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateStatusContent();
}
);
} else if (result.success && result.status === "Already") {
updateOperationBtnStatus("Refresh", false, "刷新状态");
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus.updateToast(
"success",
"更新成功",
null,
true,
true,
3000
);
}
},
/**
*
* @param {boolean} isShow
*/
switchPBarShowStatus: (isShow) => {
const operAreaEl = document.getElementsByClassName(
"acs-bc-psp-operations-container"
)[0];
const pBarAreaEl = document.getElementsByClassName(
"acs-bc-psp-download-progress-area"
)[0];
const pBarDescEl = document.getElementById("acsBcPspDownloadPbarDesc");
const pBarSelfEl = document.getElementById("acsBcPspDownloadPbarEl");
if (isShow) {
pBarAreaEl.classList.remove("acs-bc-psp-dl-pbar-hidden");
operAreaEl.classList.add("acs-bc-psp-oper-ctnr-hidden");
pBarDescEl.textContent = "等待中...";
pBarSelfEl.style["width"] = "0";
} else {
pBarAreaEl.classList.add("acs-bc-psp-dl-pbar-hidden");
operAreaEl.classList.remove("acs-bc-psp-oper-ctnr-hidden");
}
return true;
},
updatePBarStatus: async (
progress = null,
desc = null,
type = null,
isCancelShown = null
) => {
const pBarDescEl = document.getElementById("acsBcPspDownloadPbarDesc");
const pBarSelfEl = document.getElementById("acsBcPspDownloadPbarEl");
const pBarBtnEl = document.getElementById(
"acsBcPspDownloadPbarCancelBtn"
);
if (progress) {
pBarSelfEl.style["width"] = `${progress}%`;
}
if (type) {
pBarSelfEl.classList.remove("bg-success");
pBarSelfEl.classList.remove("bg-warning");
pBarSelfEl.classList.remove("bg-danger");
if (type !== "normal") {
pBarSelfEl.classList.add(`bg-${type}`);
}
}
if (desc) {
pBarDescEl.innerHTML = desc;
}
if (isCancelShown !== null) {
if (isCancelShown) {
pBarBtnEl.classList.remove("hidden");
} else {
pBarBtnEl.classList.add("hidden");
}
}
},
downloadPLSBin: async (retrieveMode = false) => {
const GLOBAL_FUNCTIONS =
global.__HUGO_AURA_UI_FUNCTIONS__.subConfig.plsStatus;
const CUR_CHANNEL = `${IPC_METHOD_BASE}.post.reportPlsDownloadStatus`;
if (!retrieveMode) {
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Download", true, "正在检查");
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", true);
await ipcRenderer.invoke(`${IPC_METHOD_BASE}.ensurePlsInstallDir`);
GLOBAL_FUNCTIONS.updateToast(
"info",
"准备开始下载...",
null,
true,
true,
2000
);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Download", true);
} else {
GLOBAL_FUNCTIONS.updateToast(
"info",
"正在恢复下载状态",
null,
true,
true,
2000
);
}
GLOBAL_FUNCTIONS.switchPBarShowStatus(true);
GLOBAL_FUNCTIONS.updatePBarStatus(0, "等待中...", "normal", false);
const callbackFn = (_evt, info) => {
switch (info.status) {
case "failed":
GLOBAL_FUNCTIONS.updateToast(
"error",
"下载失败",
`<p>${
info.message ? info.message : "检查日志以获取错误信息"
}</p><p>
${info.errorObj ? info.errorObj : ""}
</p>`,
true,
true,
5000
);
GLOBAL_FUNCTIONS.updatePBarStatus(
100,
"下载时发生错误",
"danger",
false
);
setTimeout(() => {
GLOBAL_FUNCTIONS.switchPBarShowStatus(false);
}, 1000);
ipcRenderer.off(CUR_CHANNEL, callbackFn);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus(
"Download",
false,
"下载内核"
);
break;
case "done":
GLOBAL_FUNCTIONS.updateToast(
"success",
"下载成功",
null,
true,
true,
2500
);
GLOBAL_FUNCTIONS.updatePBarStatus(
100,
"下载成功",
"success",
false
);
setTimeout(() => {
GLOBAL_FUNCTIONS.switchPBarShowStatus(false);
}, 1000);
ipcRenderer.off(CUR_CHANNEL, callbackFn);
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus(
"Download",
true,
"下载内核"
);
lifecycleStatus.installed = true;
global.__HUGO_AURA__.plsStats.installed = true;
ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
global.__HUGO_AURA__.plsStats
);
GLOBAL_FUNCTIONS.updateStatusContent();
break;
case "waiting":
GLOBAL_FUNCTIONS.updatePBarStatus(0, "正在连接", "normal");
if (
!global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus
.curDlTaskId ||
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus
.curDlTaskId !== info.id
) {
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus.curDlTaskId =
info.id;
}
break;
case "progressing":
const roundProgress = Math.round(info.progress);
GLOBAL_FUNCTIONS.updatePBarStatus(
roundProgress,
`正在下载中... ${roundProgress}% (${(
info.curBytes /
1024 /
1024
).toFixed(2)}MB / ${(info.totalBytes / 1024 / 1024).toFixed(
2
)}MB)`, // POWERED BY PRETTIER
"normal",
true
);
break;
case "struggling":
GLOBAL_FUNCTIONS.updatePBarStatus(100, info.message, "warning");
break;
case "cancelled":
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", false);
GLOBAL_FUNCTIONS.updateOperationBtnStatus(
"Download",
false,
"下载内核"
);
break;
}
};
ipcRenderer.on(CUR_CHANNEL, callbackFn);
ipcRenderer.invoke(`${IPC_METHOD_BASE}.downloadPls`, {
channel: "stable",
reportTo: "assistant",
});
},
cancelDownloadTask: async () => {
const taskId =
global.__HUGO_AURA_UI_REACTIVES__.subConfig.plsStatus.curDlTaskId;
if (!taskId) {
GLOBAL_FUNCTIONS.updateToast(
"error",
"操作取消失败",
"<p>未能获取当前的下载任务 ID</p>",
true,
true,
3000
);
return false;
}
const result = await ipcRenderer.invoke(
"$aura.fs.dl.cancelDownloadTask",
{ targetTaskId: taskId }
);
if (result.success) {
GLOBAL_FUNCTIONS.updateToast(
"success",
"操作取消成功",
null,
true,
true,
2000
);
GLOBAL_FUNCTIONS.switchPBarShowStatus(false);
return true;
} else {
GLOBAL_FUNCTIONS.updateToast(
"error",
"操作取消失败",
`<p>错误代码: ${result.error}</p>`,
true,
true,
3000
);
return false;
}
},
};
@@ -147,6 +854,9 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
areaContainerEl.className =
"acs-bc-pls-status-page-status-area warning";
break;
case "INFO":
areaContainerEl.className = "acs-bc-pls-status-page-status-area info";
break;
default:
return false;
}
@@ -155,12 +865,18 @@ if (!global.__HUGO_AURA_UI_FUNCTIONS__.subConfig)
};
const onMounted = () => {
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", false);
initBsTooltip();
GLOBAL_FUNCTIONS.updateStatus();
document.addEventListener("onPLSStatsUpdate", () => {
GLOBAL_FUNCTIONS.updateStatus();
});
GLOBAL_FUNCTIONS.updateOperationBtnStatus("Refresh", false);
GLOBAL_FUNCTIONS.refreshPlsStatus(true);
const eventListener = () => {
GLOBAL_FUNCTIONS.updateStatusContent();
};
document.addEventListener("onPLSStatsUpdate", eventListener);
global.__HUGO_AURA_GLOBAL__.utils.createOnLeaveEvtListener(
"onPLSStatsUpdate",
eventListener
);
};
onMounted();

View File

@@ -4,53 +4,48 @@ const {
updatePlsConfigToRemote,
} = require(`${REQUIRE_BASE}/../../../../composables/plsConfigManager`);
const reusableChkFn = {
checkRelativePath: () => {
if (newVal === "" || !newVal)
return { valid: false, hint: "请输入证书路径" };
if (newVal.includes(":/") || newVal.includes(":\\")) {
return { valid: false, hint: "请输入相对路径, 而非绝对路径" };
}
if (newVal.includes("\\")) {
return {
valid: false,
hint: '请输入正确的路径, 使用 "/" 作为路径符',
};
}
return {
valid: true,
};
},
};
const basicSettings = [
{
id: 0,
categoryName: "可访问性",
child: [
/*
{
index: 0,
id: "authToken",
type: "input",
subType: "text",
name: "WebSocket 认证密钥",
description: "选择一个安全的密钥, 用于 PLS 侧验证 Aura 前端身份",
restart: true,
reload: false,
restartPLS: true,
associateVal: null,
auraIf: () => true,
defaultValue: "",
placeHolder: "输入一个密钥",
valueGetter: () => {
return global.__HUGO_AURA_CONFIG__.plsToken;
},
callbackFn: (newVal) => {
if (newVal === "" || !newVal)
return { valid: false, hint: "请输入认证密钥" };
if (newVal.length < 8) {
return { valid: false, hint: "至少输入 8 位字符" };
}
global.__HUGO_AURA_CONFIG__.plsToken = newVal;
return { valid: true };
},
},
*/
{
index: 0,
id: "plsListenPort",
type: "input",
subType: "text",
name: "PLS WS 监听端口",
description: "PLS 的 WebSocket 服务器将监听指定的端口",
subType: "number",
name: "PLS WS 默认监听端口",
description: "PLS 的 WebSocket 服务器将默认监听指定的端口",
reactive: true,
reactiveVal: ["root.settings"],
restart: false,
reload: false,
PLSRequired: true,
restartPLS: true,
restartPLS: false,
warning: true,
warningContent: "PLS 仍会在默认端口被占用时, 自动随机端口重试",
associateVal: null,
auraIf: () => true,
defaultValue: "",
@@ -64,14 +59,114 @@ const basicSettings = [
return { valid: false, hint: "请输入端口号" };
const numberNewVal = Number(newVal);
if (numberNewVal === NaN || !(10000 <= numberNewVal <= 65535)) {
if (numberNewVal === NaN || !(10000 <= numberNewVal) || !(newVal <= 65535)) {
return { valid: false, hint: "请输入合法的端口号 (10000 ~ 65535)" };
}
global.__HUGO_AURA__.plsSettings.wsPort = numberNewVal;
updatePlsConfigToRemote("wsPort", numberNewVal);
return { valid: true };
},
},
{
index: 1,
id: "plsCertPath",
type: "input",
subType: "text",
name: "WSS TLS 证书相对路径",
description: "PLS 将使用指定路径下的证书启动 WSS 服务器",
reactive: true,
reactiveVal: ["root.settings"],
restart: false,
reload: false,
PLSRequired: true,
restartPLS: true,
tip: true,
tipTitle:
'路径相对于 "%PROGRAMDATA%\\HugoAura\\Aura-PLS\\", 使用 "/" 作为路径符',
associateVal: null,
auraIf: () => true,
defaultValue: "",
placeHolder: "输入相对路径, 例如: config/vme50/cert.crt",
valueGetter: () => {
if (!global.__HUGO_AURA__.plsSettings) return "";
return global.__HUGO_AURA__.plsSettings.certPath;
},
callbackFn: (newVal) => {
const validate = reusableChkFn.checkRelativePath();
if (!validate.valid) {
return validate;
}
global.__HUGO_AURA__.plsSettings.certPath = newVal;
updatePlsConfigToRemote("certPath", newVal);
return { valid: true };
},
},
{
index: 2,
id: "plsCertPath",
type: "input",
subType: "text",
name: "WSS TLS 证书私钥相对路径",
description: "PLS 将使用指定路径下的私钥启动 WSS 服务器",
reactive: true,
reactiveVal: ["root.settings"],
restart: false,
reload: false,
PLSRequired: true,
restartPLS: true,
tip: true,
tipTitle:
'路径相对于 "%PROGRAMDATA%\\HugoAura\\Aura-PLS\\", 使用 "/" 作为路径符',
warning: true,
warningContent: "请使用 PEM 格式的密钥",
associateVal: null,
auraIf: () => true,
defaultValue: "",
placeHolder: "输入相对路径, 例如: config/vme50/cert.key",
valueGetter: () => {
if (!global.__HUGO_AURA__.plsSettings) return "";
return global.__HUGO_AURA__.plsSettings.keyPath;
},
callbackFn: (newVal) => {
const validate = reusableChkFn.checkRelativePath();
if (!validate.valid) {
return validate;
}
global.__HUGO_AURA__.plsSettings.keyPath = newVal;
updatePlsConfigToRemote("keyPath", newVal);
return { valid: true };
},
},
{
index: 3,
id: "plsRegenCertAftRelaunch",
type: "switch",
name: "重新生成 TLS 证书",
description: "PLS 将在下次启动时重新生成 TLS 证书",
reactive: true,
reactiveVal: ["root.settings"],
restart: false,
reload: false,
PLSRequired: true,
restartPLS: true,
associateVal: null,
auraIf: () => true,
defaultValue: false,
valueGetter: () => {
if (!global.__HUGO_AURA__.plsSettings) return "";
return global.__HUGO_AURA__.plsSettings.regenCert;
},
callbackFn: (newVal) => {
if (typeof newVal !== "boolean") return false;
global.__HUGO_AURA__.plsSettings.regenCert = newVal;
updatePlsConfigToRemote("regenCert", newVal);
return true;
},
},
],
},
];

View File

@@ -0,0 +1,99 @@
const REQUIRE_BASE = ".";
const {
updatePlsConfigToRemote,
} = require(`${REQUIRE_BASE}/../../../../composables/plsConfigManager`);
const composables = {};
const deviceSecuritySettings = [
{
id: 0,
categoryName: "冰点管理",
child: [
{
index: 0,
id: "enableFreezeInfoReportOverride",
type: "switch",
name: "启用冰冻状态篡改",
description: "篡改上报的冰冻数据, 可自定义集控端显示的状态",
reactive: true,
reactiveVal: ["root.ruleSettings"],
restart: false,
reload: false,
PLSRequired: true,
restartPLS: false,
associateVal: null,
auraIf: () => true,
defaultValue: false,
valueGetter: () => {
if (!global.__HUGO_AURA__.plsRules) return "";
return global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo
.enable;
},
callbackFn: (newVal) => {
if (typeof newVal !== "boolean") return;
if (!global.__HUGO_AURA__.plsRules) return;
global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo.enable =
newVal;
updatePlsConfigToRemote(
"ruleSettings.client.security.uploadFreezeInfo.enable",
newVal
);
return true;
},
},
{
index: 1,
id: "freezeInfoReportOverrideType",
type: "radio",
name: "篡改模式",
description:
"选择一种篡改模式, 选中的磁盘范围会<b>被上报</b>为冻结 (不是实际行为)",
restart: false,
reload: false,
PLSRequired: true,
restartPLS: false,
reactive: true,
reactiveVal: ["root.ruleSettings"],
associateVal: ["ruleSettings.client.security.uploadFreezeInfo.enable"],
auraIf: () => {
if (!global.__HUGO_AURA__.plsRules) return true;
return global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo
.enable;
},
defaultValue: "allFreeze",
templates: ["allFreeze", "systemOnly", "exceptSecondDisk"],
templateLabels: ["全部冻结", "仅系统盘", "第二磁盘除外"],
valueGetter: () => {
if (!global.__HUGO_AURA__.plsRules) return;
return global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo
.rewriteMode;
},
callbackFn: (newVal) => {
global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo.rewriteMode =
newVal;
updatePlsConfigToRemote(
"ruleSettings.client.security.uploadFreezeInfo.rewriteMode",
newVal
);
return true;
},
},
{
index: 2,
id: "freezeInfoReportOverridePreview",
type: "preview",
loaderTarget:
"Aura.UI.Assistant.Config.BehaviourCtrl.DeviceSecurity.FreezeOverridePreview",
associateVal: ["ruleSettings.client.security.uploadFreezeInfo"],
listenerType: "pls",
},
],
},
];
module.exports = { deviceSecuritySettings };

View File

@@ -0,0 +1,104 @@
.acs-bc-dsc-fop-container {
display: flex;
}
.acs-bc-dsc-fop-please-wait,
.acs-bc-dsc-fop-on-req-error,
.acs-bc-dsc-fop-on-not-bind {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
opacity: 0.6;
}
.acs-bc-dsc-fop-please-wait svg,
.acs-bc-dsc-fop-on-req-error svg,
.acs-bc-dsc-fop-on-not-bind svg {
width: 18px;
height: 18px;
}
.acs-bc-dsc-fop-please-wait p,
.acs-bc-dsc-fop-on-req-error p,
.acs-bc-dsc-fop-on-not-bind p {
margin-left: 0.5rem;
margin-top: -1px;
}
.acs-bc-dsc-fop-please-wait[auraIf="false"],
.acs-bc-dsc-fop-on-req-error[auraIf="false"],
.acs-bc-dsc-fop-on-not-bind[auraIf="false"],
.acs-bc-dsc-fop-main[auraIf="false"] {
display: none;
}
.acs-bc-dsc-fop-main {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
}
.acs-bc-dsc-fop-main .disks-container {
display: flex;
flex-direction: row;
}
.acs-bc-dsc-fop-disk-el {
padding: 5px 10px;
border-radius: 3px;
border: 0.5px solid rgba(0, 0, 0, 0.25);
margin-left: 0.375rem;
margin-right: 0.375rem;
transition: all 0.5s;
/* 没有用, 因为元素全被重新创建了 */
}
.acs-bc-dsc-fop-disk-el.active {
background-color: #1d70f2;
color: white;
border: 0.5px solid rgba(0, 0, 0, 0.125);
}
.acs-bc-dsc-fop-disk-el.active:hover {
background-color: #4e8df2;
}
.acs-bc-dsc-fop-main-hint-area {
display: flex;
flex-direction: row;
margin-top: 1rem;
margin-bottom: -0.25rem;
}
.acs-bc-dsc-fop-main-hint-area svg {
width: 18px;
height: 18px;
}
.acs-bc-dsc-fop-main-hint-area div {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
}
.acs-bc-dsc-fop-main-hint-area p {
margin-top: -1px;
margin-left: 0.25rem;
}
.acs-bc-dsc-fop-main-hint-area .acs-bc-dsc-fop-main-hint-freeze {
margin-right: 0.5rem;
color: #1d70f2;
}
.acs-bc-dsc-fop-main-hint-area .acs-bc-dsc-fop-main-hint-unfreeze {
margin-left: 0.5rem;
}

View File

@@ -0,0 +1,91 @@
<div class="acs-bc-dsc-fop-container">
<div class="acs-bc-dsc-fop-please-wait" auraIf="true">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="currentColor"
d="M16 30a14 14 0 1 1 14-14a14 14 0 0 1-14 14m0-26a12 12 0 1 0 12 12A12 12 0 0 0 16 4"
/>
<path fill="currentColor" d="M20.59 22L15 16.41V7h2v8.58l5 5.01z" />
</svg>
<p>请稍候...</p>
</div>
<div class="acs-bc-dsc-fop-on-req-error" auraIf="false">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path fill="currentColor" d="M9 10.555L10.555 9L23 21.444L21.444 23z" />
<path
fill="currentColor"
d="M16 2A13.914 13.914 0 0 0 2 16a13.914 13.914 0 0 0 14 14a13.914 13.914 0 0 0 14-14A13.914 13.914 0 0 0 16 2m0 26a12 12 0 1 1 12-12a12.035 12.035 0 0 1-12 12"
/>
</svg>
<p>获取磁盘信息失败: <font id="acsBcDscFopOnReqErrorDetail"></font></p>
</div>
<div class="acs-bc-dsc-fop-on-not-bind" auraIf="false">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="currentColor"
d="M31.324 11.261A14.27 14.27 0 0 0 22.25 8H22v2h.25c2.608 0 5.155.837 7.246 2.372a12.18 12.18 0 0 1-7.548 7.036q.052-.605.052-1.22C22 10.366 15.635 4 7.812 4c-.929 0-1.856.09-2.757.268l-.657.13l-.13.657A14.3 14.3 0 0 0 4 7.812c0 4.124 1.78 7.831 4.598 10.426A14.2 14.2 0 0 0 8 22.254l.001.001a14.27 14.27 0 0 0 3.261 9.07l.439.53l.652-.22a14.18 14.18 0 0 0 9.237-10.046a14.18 14.18 0 0 0 10.045-9.237l.22-.652zM12.372 29.496A12.27 12.27 0 0 1 10 22.251c0-.912.113-1.796.303-2.652a14.1 14.1 0 0 0 9.105 2.349a12.18 12.18 0 0 1-7.036 7.548m7.51-9.613q-.833.116-1.694.117c-2.715 0-5.218-.904-7.247-2.412a12.4 12.4 0 0 1 4.048-5.204l-1.28-1.53A14.3 14.3 0 0 0 9.37 16.2A12.14 12.14 0 0 1 6.117 6.117A12 12 0 0 1 7.812 6C14.532 6 20 11.468 20 18.188q0 .862-.117 1.695Z"
/>
<circle cx="20" cy="2" r="2" fill="currentColor" />
<circle cx="27" cy="26" r="2" fill="currentColor" />
<circle cx="2" cy="20" r="2" fill="currentColor" />
</svg>
<p>当前设备暂未绑定学校, 无法查询冰点信息</p>
</div>
<div class="acs-bc-dsc-fop-main" auraIf="false">
<div class="disks-container">
<p class="acs-bc-dsc-fop-disk-el">C 盘</p>
</div>
<div class="acs-bc-dsc-fop-main-hint-area">
<div class="acs-bc-dsc-fop-main-hint-freeze">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="currentColor"
d="M21.415 12H28v-2h-4.585L28 5.415L26.586 4L22 8.587V4h-2v6.587L18.587 12H17V8h-2v4h-1.587L12 10.587V4h-2v4.587L5.414 4L4 5.415L8.585 10H4v2h6.585L12 13.415V15H8v2h4v1.587L10.587 20H4v2h4.587L4 26.586l1.414 1.415L10 23.415V28h2v-6.585L13.415 20H15v4h2v-4h1.585L20 21.415V28h2v-4.585l4.585 4.586L28 26.586L23.413 22H28v-2h-6.587L20 18.587V17h4v-2h-4v-1.585ZM18 18h-4v-4h4Z"
/>
</svg>
<p>已冻结</p>
</div>
<div class="acs-bc-dsc-fop-main-hint-unfreeze">
<svg
xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
viewBox="0 0 32 32"
>
<path
fill="currentColor"
d="M16 12.005a4 4 0 1 1-4 4a4.005 4.005 0 0 1 4-4m0-2a6 6 0 1 0 6 6a6 6 0 0 0-6-6M5.394 6.813L6.81 5.399l3.505 3.506L8.9 10.319zM2 15.005h5v2H2zm3.394 10.193L8.9 21.692l1.414 1.414l-3.505 3.506zM15 25.005h2v5h-2zm6.687-1.9l1.414-1.414l3.506 3.506l-1.414 1.414zm3.313-8.1h5v2h-5zm-3.313-6.101l3.506-3.506l1.414 1.414l-3.506 3.506zM15 2.005h2v5h-2z"
/>
</svg>
<p>未冻结</p>
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,164 @@
// @ts-check
(() => {
const REQUIRE_BASE = "../..";
const { genRandomHex } = require(`${REQUIRE_BASE}/aura/utils/crypto`);
const composables = {
getAndUpdateDiskInfo: async (curConfig) => {
const progressingEl = document.getElementsByClassName(
"acs-bc-dsc-fop-please-wait"
)[0];
const onErrorEl = document.getElementsByClassName(
"acs-bc-dsc-fop-on-req-error"
)[0];
const onNotBindEl = document.getElementsByClassName(
"acs-bc-dsc-fop-on-not-bind"
)[0];
const mainEl = document.getElementsByClassName("acs-bc-dsc-fop-main")[0];
const diskContainerEl =
document.getElementsByClassName("disks-container")[0];
const seewoProxyPort = window._ACCEPT_DATA.data.ports.SeewoProxyHTTP;
const reqPromise = new Promise((resolve) => {
fetch(
`https://127.0.0.1:${seewoProxyPort}/forward/freeze/api/v1/get_disk_data`,
{
headers: {
accept: "application/json, text/plain, */*",
"X-Auth-Traceid": genRandomHex(),
},
}
)
.then(async (response) => {
if (response.status !== 200) {
resolve({
success: true,
data: null,
status: response.status
})
}
const parsedData = await response.json();
resolve({
success: true,
data: parsedData,
status: response.status,
});
})
.catch((e) => {
resolve({ success: false, data: null, errorObj: e });
});
});
const responseInfo = await reqPromise;
progressingEl.setAttribute("auraIf", "false");
if (!responseInfo.success) {
onNotBindEl.setAttribute("auraIf", "false");
mainEl.setAttribute("auraIf", "false");
onErrorEl.setAttribute("auraIf", "true");
const detailEl = document.getElementById("acsBcDscFopOnReqErrorDetail");
// @ts-expect-error
detailEl.textContent = responseInfo.errorObj;
return;
}
if (responseInfo.status !== 200) {
onErrorEl.setAttribute("auraIf", "false");
mainEl.setAttribute("auraIf", "false");
onNotBindEl.setAttribute("auraIf", "true");
return;
}
diskContainerEl.innerHTML = ``;
const curDisks = [];
for (const disk of responseInfo.data.data[0].disksData) {
curDisks.push({ name: disk.diskName, status: disk.protectedStatus });
}
const diskElTemplate = document.createElement("p");
diskElTemplate.classList.add("acs-bc-dsc-fop-disk-el");
if (!curConfig.enable) {
for (const disk of curDisks) {
const curDiskEl = diskElTemplate.cloneNode();
if (disk.status !== 0) {
// @ts-expect-error
curDiskEl.classList.add("active");
}
curDiskEl.textContent = `${disk.name.toUpperCase()}`;
diskContainerEl.appendChild(curDiskEl);
}
} else {
switch (curConfig.rewriteMode) {
case "allFreeze":
{
for (const disk of curDisks) {
const curDiskEl = diskElTemplate.cloneNode();
// @ts-expect-error
curDiskEl.classList.add("active");
curDiskEl.textContent = `${disk.name.toUpperCase()}`;
diskContainerEl.appendChild(curDiskEl);
}
}
break;
case "systemOnly":
{
let idx = 0;
for (const disk of curDisks) {
const curDiskEl = diskElTemplate.cloneNode();
// @ts-expect-error
if (idx === 0) curDiskEl.classList.add("active");
curDiskEl.textContent = `${disk.name.toUpperCase()}`;
diskContainerEl.appendChild(curDiskEl);
idx += 1;
}
}
break;
case "exceptSecondDisk":
{
let idx = 0;
for (const disk of curDisks) {
const curDiskEl = diskElTemplate.cloneNode();
// @ts-expect-error
if (idx === 0) curDiskEl.classList.add("active");
curDiskEl.textContent = `${disk.name.toUpperCase()}`;
diskContainerEl.appendChild(curDiskEl);
idx += 1;
}
}
break;
}
}
onErrorEl.setAttribute("auraIf", "false");
onNotBindEl.setAttribute("auraIf", "false");
mainEl.setAttribute("auraIf", "true");
},
};
const onMounted = () => {
const rootEl = document.getElementsByClassName(
"acs-bc-dsc-fop-container"
)[0];
const eventListener = (_event) => {
if (!global.__HUGO_AURA__.plsRules) return;
composables.getAndUpdateDiskInfo(
global.__HUGO_AURA__.plsRules.client.security.uploadFreezeInfo
);
};
rootEl.addEventListener("onAssociateValueUpdated", eventListener);
setTimeout(() => {
eventListener();
}, 100);
};
onMounted();
})();

View File

@@ -30,7 +30,7 @@ const functions = {
);
break;
case "update":
const result = global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
const result = await global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
global.__HUGO_AURA_CONFIG__,
null
);
@@ -96,12 +96,9 @@ const functions = {
const handleExit = async () => {
const result = await awaitCompletePromise;
console.debug(result);
if (result) {
console.debug("ret true");
return { valid: true };
} else {
console.debug("ret false");
const inputEl = document.getElementById("auraSettingsPasswd");
// @ts-expect-error
inputEl.value = "";
@@ -155,6 +152,27 @@ const functions = {
return await handleExit();
},
getCurAccessMethodCount: () => {
const fallbackMethods =
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods;
const fallbackMethodsKeys = Object.keys(fallbackMethods);
let enabledCount = 0;
for (const method of fallbackMethodsKeys) {
if (fallbackMethods[method]) {
enabledCount += 1;
}
}
if (global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod.showEntryIcon) {
enabledCount += 1;
}
return enabledCount;
},
};
const auraSettings = [
@@ -170,8 +188,6 @@ const auraSettings = [
description: "启用后, Aura 设置 UI 需要输入密码才可访问",
restart: false,
reload: false,
tip: true,
tipTitle: "启用访问密码将自动加密配置文件",
associateVal: null,
auraIf: () => true,
defaultValue: false,
@@ -179,7 +195,7 @@ const auraSettings = [
return global.__HUGO_AURA_CONFIG__.auraSettings
.settingsPasswordEnabled;
},
callbackFn: (newVal) => {
callbackFn: async (newVal) => {
if (typeof newVal !== "boolean") return;
global.__HUGO_AURA_CONFIG__.auraSettings.settingsPasswordEnabled =
newVal;
@@ -192,7 +208,7 @@ const auraSettings = [
!newVal &&
global.__HUGO_AURA_CONFIG__.auraSettings.encryptConfig
) {
global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
await global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
global.__HUGO_AURA_CONFIG__,
null
);
@@ -220,13 +236,13 @@ const auraSettings = [
valueGetter: () => {
return global.__HUGO_AURA_CONFIG__.auraSettings.encryptConfig;
},
callbackFn: (newVal) => {
callbackFn: async (newVal) => {
if (typeof newVal !== "boolean") return;
global.__HUGO_AURA_CONFIG__.auraSettings.encryptConfig = newVal;
if (newVal) {
functions.handleEnableConfigEncryption("enc", null);
} else {
global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
await global.__HUGO_AURA_CONFIG_MGR__.switchToDecConfig(
global.__HUGO_AURA_CONFIG__,
null
);
@@ -288,8 +304,142 @@ const auraSettings = [
},
{
id: 1,
categoryName: "外观",
child: [],
categoryName: "访问方式",
child: [
{
index: 0,
id: "showEntryIcon",
type: "switch",
name: "显示 HugoAura 设置图标",
description: "控制 HugoAura 设置入口图标在管家首页的显示状态",
restart: false,
reload: true,
tip: true,
tipTitle: "禁用后, HugoAura 图标将不会出现在主页右上角",
associateVal: [
"auraSettings.uiAccessMethod.fallbackAccessMethods.hotkey",
"auraSettings.uiAccessMethod.fallbackAccessMethods.touch",
],
auraIf: () => {
return true;
},
auraDisable: () => {
const fallbackMethods =
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods;
const fallbackMethodsKeys = Object.keys(fallbackMethods);
let anyEnabled = false;
for (const method of fallbackMethodsKeys) {
if (fallbackMethods[method]) {
anyEnabled = true;
break;
}
}
return {
value: !anyEnabled,
tooltip: !anyEnabled ? "至少启用一个备选访问方式" : "",
};
},
defaultValue: false,
valueGetter: () => {
return global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.showEntryIcon;
},
callbackFn: async (newVal) => {
if (typeof newVal !== "boolean") return;
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod.showEntryIcon =
newVal;
},
},
{
index: 1,
id: "allowHotkeyAccess",
type: "switch",
name: "使用快捷键打开 HugoAura 设置 UI",
description:
"启用后, 在管家首页按下 Ctrl + Shift + A 以打开 HugoAura 设置",
restart: false,
reload: true,
associateVal: [
"auraSettings.uiAccessMethod.showEntryIcon",
"auraSettings.uiAccessMethod.fallbackAccessMethods.hotkey",
"auraSettings.uiAccessMethod.fallbackAccessMethods.touch",
],
auraIf: () => {
return true;
},
auraDisable: () => {
const enableCount = functions.getCurAccessMethodCount();
if (
enableCount < 2 &&
!global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.showEntryIcon &&
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.hotkey
) {
return { value: true, tooltip: "无法禁用所有访问方式" };
} else {
return { value: false };
}
},
defaultValue: false,
valueGetter: () => {
return global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.hotkey;
},
callbackFn: async (newVal) => {
if (typeof newVal !== "boolean") return;
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod.fallbackAccessMethods.hotkey =
newVal;
},
},
{
index: 2,
id: "allowTouchAccess",
type: "switch",
name: "使用触摸手势打开 HugoAura 设置 UI",
description:
"启用后, 在管家首页连击 7 次右上角信息栏 ( i ) 中的版本号区域以打开 HugoAura 设置",
restart: false,
reload: true,
tip: true,
tipTitle: "请在 10 秒钟内完成连击操作, 否则计时器将被重置",
associateVal: [
"auraSettings.uiAccessMethod.showEntryIcon",
"auraSettings.uiAccessMethod.fallbackAccessMethods.hotkey",
"auraSettings.uiAccessMethod.fallbackAccessMethods.touch",
],
auraIf: () => {
return true;
},
auraDisable: () => {
const enableCount = functions.getCurAccessMethodCount();
if (
enableCount < 2 &&
!global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.showEntryIcon &&
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.touch
) {
return { value: true, tooltip: "无法禁用所有访问方式" };
} else {
return { value: false };
}
},
defaultValue: false,
valueGetter: () => {
return global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.touch;
},
callbackFn: async (newVal) => {
if (typeof newVal !== "boolean") return;
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod.fallbackAccessMethods.touch =
newVal;
},
},
],
},
];

View File

@@ -7,6 +7,10 @@
transition: opacity 0.25s;
}
.aura-header-icon.aura-header-icon-hidden {
display: none;
}
.aura-header-icon:hover {
opacity: 0.75;
}

View File

@@ -1,5 +1,54 @@
global.__HUGO_AURA_UI_FUNCTIONS__.headerIcon = {
showAuraConfig: () => {
window.__HUGO_AURA_LOADER__["Aura.UI.Assistant.Config"].active = true;
if (global.__HUGO_AURA_LOADER__["Aura.UI.Assistant.Config"].active) return;
global.__HUGO_AURA_LOADER__["Aura.UI.Assistant.Config"].active = true;
},
};
(() => {
let clickCounter = 0;
let clickTimeout = null;
const onMounted = () => {
if (!global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod.showEntryIcon) {
const iconEl = document.getElementsByClassName("aura-header-icon")[0];
iconEl.classList.add("aura-header-icon-hidden");
}
if (
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.hotkey
) {
document.addEventListener("keydown", (event) => {
if (event.ctrlKey && event.shiftKey && event.key === "A") {
global.__HUGO_AURA_UI_FUNCTIONS__.headerIcon.showAuraConfig();
}
});
}
if (
global.__HUGO_AURA_CONFIG__.auraSettings.uiAccessMethod
.fallbackAccessMethods.touch
) {
const mesModelEl = document.getElementsByClassName(
"index__mes-modal__2hRouc6M"
)[0];
const verEl = mesModelEl.children[0];
verEl.onclick = () => {
clickCounter += 1;
if (clickCounter >= 7) {
global.__HUGO_AURA_UI_FUNCTIONS__.headerIcon.showAuraConfig();
clickCounter = 0;
if (clickTimeout) {
clearTimeout(clickTimeout);
}
}
clickTimeout = setTimeout(() => {
clickCounter = 0;
}, 10000);
};
}
};
onMounted();
})();

View File

@@ -11,8 +11,10 @@ const basicRouteHandler = (parsedWsMsg) => {
const target = parsedWsMsg.type.split(".").slice(-1)[0];
switch (target) {
case "pushPlsInfo":
global.__HUGO_AURA__.plsStats.status = parsedWsMsg.data.status;
global.__HUGO_AURA__.plsStats.version = parsedWsMsg.data.version;
if (global.__HUGO_AURA__.plsStats) {
global.__HUGO_AURA__.plsStats.status = parsedWsMsg.data.status;
global.__HUGO_AURA__.plsStats.version = parsedWsMsg.data.version;
}
global.ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
@@ -24,6 +26,19 @@ const basicRouteHandler = (parsedWsMsg) => {
global.__HUGO_AURA__.plsStats
);
break;
case "plsNotReadyError":
if (global.__HUGO_AURA__.plsStats) {
global.__HUGO_AURA__.plsStats.launched = true;
global.__HUGO_AURA__.plsStats.connected = false;
global.__HUGO_AURA__.plsStats.status = "notReady";
}
global.ipcRenderer.invoke(
`${IPC_METHOD_BASE}.updatePlsStats`,
global.__HUGO_AURA__.plsStats
);
break;
default:
return false;
}

14
src/aura/utils/crypto.js Executable file
View File

@@ -0,0 +1,14 @@
/**
*
* @returns {string}
*/
const genRandomHex = () => {
let result = "";
for (let i = 0; i < 8; i++) {
const randomNum = Math.floor(Math.random() * 0x10000);
result += randomNum.toString(16).padStart(4, "0");
}
return result;
};
module.exports = { genRandomHex };

View File

@@ -16,15 +16,26 @@ if (!global.__HUGO_AURA__) {
global.__HUGO_AURA__ = __HUGO_AURA__;
}
if (!global.__HUGO_AURA_API__) {
/** @type {import("../aura/types/shared/global").GlobalHugoAuraApiInfo} */
const __HUGO_AURA_API__ = {
domains: [
"https://api-aura-projekts.delta.ooo",
"https://api-aura.asaka.site",
"https://api.hugoaura.dpdns.org",
"https://api-aura-projekts.minorice.moe",
"https://api.aura.vim.moe"
],
plsUpdate: "/api/getPLSLatestVersion",
auraUpdate: "/api/getAuraLatestVersion",
};
global.__HUGO_AURA_API__ = __HUGO_AURA_API__;
}
if (!global.__HUGO_AURA_CONFIG__) {
global.__HUGO_AURA_CONFIG__ = {};
}
const fs = require("fs");
const util = require("util");
const path = require("path");
const os = require("os");
const MainProcessHooksManager = require("../aura/init/main/windowHooksManager");
const RendererHooksManager = require("../aura/init/rendererHook/uiHooksManager");
const EventBus = require("../aura/utils/eventBus");
@@ -32,70 +43,7 @@ const NetworkHook = require("../aura/init/rendererHook/networkHook");
const ConfigManager = require("../aura/init/shared/configManager");
const { buildIpcMain } = require("../aura/init/main/ipcHandler");
/**
*
* @param {import("../aura/types/main/core").WindowName} windowName
*/
const initLogger = (windowName) => {
const logDir = path.join(os.homedir(), "Documents", "HugoAura", "logs");
if (!fs.existsSync(logDir)) {
fs.mkdirSync(logDir, { recursive: true });
}
const logFile = path.join(
logDir,
`main-${windowName}-${new Date().toISOString().replace(/:/g, "-")}.log`
);
const logStream = fs.createWriteStream(logFile, { flags: "a" });
const originalConsole = {
log: console.log,
error: console.error,
warn: console.warn,
info: console.info,
debug: console.debug,
};
console.log = function (...args) {
const msg = util.format("[LOG] ", ...args) + "\n";
logStream.write(msg);
originalConsole.log.apply(console, args);
};
console.error = function (...args) {
const msg = util.format("[ERROR] ", ...args) + "\n";
logStream.write(msg);
originalConsole.error.apply(console, args);
};
console.warn = function (...args) {
const msg = util.format("[WARN] ", ...args) + "\n";
logStream.write(msg);
originalConsole.warn.apply(console, args);
};
console.info = function (...args) {
const msg = util.format("[INFO] ", ...args) + "\n";
logStream.write(msg);
originalConsole.info.apply(console, args);
};
console.debug = function (...args) {
if (!process.argv.includes("--aura-debug")) return;
const msg = util.format("[DEBUG] ", ...args) + "\n";
logStream.write(msg);
originalConsole.debug.apply(console, args);
};
process.on("uncaughtException", (err) => {
console.error("UNCAUGHT EXCEPTION:", err);
});
console.log(
"[HugoAura / Init / Logger] Logger initialized. Log file:",
logFile
);
};
const { initLogger } = require("../aura/init/main/logger");
/**
*
@@ -134,7 +82,8 @@ const launcher = ({ central, windowName, config }) => {
configManager.ensureConfigExists();
const loadedConfig = configManager.loadConfig();
if (!global.__HUGO_AURA__.configInit) global.__HUGO_AURA__.configInit = true;
if (!global.__HUGO_AURA_CONFIG_MGR__) global.__HUGO_AURA_CONFIG_MGR__ = configManager;
if (!global.__HUGO_AURA_CONFIG_MGR__)
global.__HUGO_AURA_CONFIG_MGR__ = configManager;
global.__HUGO_AURA_CONFIG__ = loadedConfig;

View File

@@ -1,6 +1,6 @@
// @ts-check
const __AURA_VERSION__ = "0.1.1-pre-III";
const __AURA_VERSION__ = "0.1.1-pre-IV";
(() => {
if (require.main) return; // 如果只是导入 Aura Version, 不运行闭包逻辑
@@ -63,6 +63,15 @@ const __AURA_VERSION__ = "0.1.1-pre-III";
});
const pathName = [...path, prop].join(".");
document.dispatchEvent(configUpdateEvent);
const settingsEntries = document.getElementsByClassName(
"aura-settings-entry"
);
if (settingsEntries.length > 0) {
Array.from(settingsEntries).forEach((entry) => {
entry.dispatchEvent(configUpdateEvent);
});
}
console.log(
`[HugoAura / Config] Config changed at path: ${[...path, prop].join(
"."