新增：工单反馈功能，便于解决问题

Author: modstart

electron/config/window.ts

@@ -11,6 +11,8 @@ export const WindowConfig = {
     pluginHeight: 500,
     aboutWidth: 500,
     aboutHeight: 400,
+    feedbackWidth: 600,
+    feedbackHeight: 600,
     guideWidth: 800,
     guideHeight: 540,
     setupWidth: 800,

electron/mapi/app/main.ts

@@ -1,7 +1,7 @@
-import {app, BrowserWindow, ipcMain, screen, shell, clipboard, nativeImage, nativeTheme} from "electron";
+import {app, BrowserWindow, clipboard, ipcMain, nativeImage, nativeTheme, screen, shell} from "electron";
 import {WindowConfig} from "../../config/window";
 import {AppRuntime} from "../env";
-import {isDev, isMac} from "../../lib/env";
+import {isDev, isMac, platformArch, platformName} from "../../lib/env";
 import {AppPosition} from "./lib/position";
 import {Events} from "../event/main";
 import {ConfigMain} from "../config/main";
@@ -318,6 +318,17 @@ ipcMain.handle('app:getBuildInfo', async () => {
     return getBuildInfo()
 })
 
+const collect = async (options?: {}) => {
+    return {
+        platformName: platformName(),
+        platformArch: platformArch(),
+    }
+}
+
+ipcMain.handle('app:collect', async (event, options?: {}) => {
+    return collect(options)
+})
+
 export default {
     quit
 }

electron/mapi/app/render.ts

@@ -76,6 +76,13 @@ const appEnv = async () => {
     return AppEnv
 }
 
+const setRenderAppEnv = (env: any) => {
+    AppEnv.isInit = true
+    AppEnv.appRoot = env.appRoot
+    AppEnv.appData = env.appData
+    AppEnv.userData = env.userData
+}
+
 const getClipboardText = () => {
     return ipcRenderer.invoke('app:getClipboardText')
 }
@@ -112,6 +119,10 @@ const getBuildInfo = async () => {
     return ipcRenderer.invoke('app:getBuildInfo')
 }
 
+const collect = async (options?: {}) => {
+    return ipcRenderer.invoke('app:collect', options)
+}
+
 export const AppsRender = {
     isDarkMode,
     resourcePathResolve,
@@ -131,6 +142,7 @@ export const AppsRender = {
     openExternalWeb,
     getPreload,
     appEnv,
+    setRenderAppEnv,
     getClipboardText,
     setClipboardText,
     getClipboardImage,
@@ -140,6 +152,7 @@ export const AppsRender = {
     setupOpen,
     setupIsOk,
     getBuildInfo,
+    collect,
     shell: appIndex.shell,
     spawnShell: appIndex.spawnShell,
     availablePort: appIndex.availablePort,

electron/mapi/file/index.ts

@@ -214,6 +214,43 @@ const readBuffer = async (path: string, option?: { isFullPath?: boolean, }): Pro
     })
 }
 
+const readLine = async (path: string, callback: (line: string) => void, option?: {
+    isFullPath?: boolean,
+}) => {
+    option = Object.assign({
+        isFullPath: false,
+    }, option)
+    let fp = path
+    if (!option.isFullPath) {
+        fp = await fullPath(path)
+    }
+    if (!fs.existsSync(fp)) {
+        return
+    }
+    return new Promise((resolve, reject) => {
+        const f = fs.createReadStream(fp)
+        let remaining = ''
+        f.on('data', (chunk) => {
+            remaining += chunk
+            let index = remaining.indexOf('\n')
+            let last = 0
+            while (index > -1) {
+                let line = remaining.substring(last, index)
+                last = index + 1
+                callback(line)
+                index = remaining.indexOf('\n', last)
+            }
+            remaining = remaining.substring(last)
+        })
+        f.on('end', () => {
+            if (remaining.length > 0) {
+                callback(remaining)
+            }
+            resolve(undefined)
+        })
+    })
+}
+
 const deletes = async (path: string, option?: { isFullPath?: boolean, }) => {
     option = Object.assign({
         isFullPath: false,
@@ -520,7 +557,7 @@ const download = async (url: string, path: string, option?: {
     })
 }
 
-export default {
+export const FileIndex = {
     fullPath,
     absolutePath,
     exists,
@@ -532,6 +569,7 @@ export default {
     writeBuffer,
     read,
     readBuffer,
+    readLine,
     deletes,
     rename,
     copy,
@@ -541,3 +579,5 @@ export default {
     appendText,
     download,
 }
+
+export default FileIndex

electron/mapi/log/index.ts

@@ -3,6 +3,8 @@ import date from "date-and-time";
 import path from "node:path";
 import {AppEnv} from "../env";
 import fs from "node:fs";
+import dayjs from "dayjs";
+import FileIndex from "../file";
 
 let fileName = null
 let fileStream = null
@@ -43,7 +45,7 @@ const cleanOldLogs = (keepDays: number) => {
         for (let file of files) {
             const filePath = path.join(logDir, file)
             let date = null
-            for (let s of file.split('_')) {
+            for (let s of file.split(/[_\\.]/)) {
                 // 匹配 YYYYMMDD
                 if (s.match(/^\d{8}$/)) {
                     date = s
@@ -117,13 +119,80 @@ const errorRenderOrMain = (label: string, data: any = null) => {
     }
 }
 
+const collectRenderOrMain = async (option?: {
+    startTime?: string,
+    endTime?: string,
+    limit?: number,
+}) => {
+    option = Object.assign({
+        startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        limit: 10 * 10000,
+    }, option)
+    let startMs = dayjs(option.startTime).valueOf()
+    let endMs = dayjs(option.endTime).valueOf()
+    let startDayMs = dayjs(option.startTime).startOf('day').valueOf()
+    let endDayMs = dayjs(option.endTime).endOf('day').valueOf()
+    let resultLines = []
+    let logFiles = []
+    logFiles = logFiles.concat(await FileIndex.list(logsDir(), {isFullPath: true}))
+    logFiles = logFiles.concat(await FileIndex.list(appLogsDir(), {isFullPath: true}))
+    // console.log('logFiles', logFiles)
+    logFiles = logFiles.filter((logFile) => {
+        if (logFile.isDirectory) {
+            return false
+        }
+        let date = null
+        for (let s of logFile.name.split(/[_\\.]/)) {
+            // 匹配 YYYYMMDD
+            if (s.match(/^\d{8}$/)) {
+                date = s
+                break
+            }
+        }
+        if (!date) {
+            return false
+        }
+        const fileDate = new Date(
+            parseInt(date.substring(0, 4)),
+            parseInt(date.substring(4, 6)) - 1,
+            parseInt(date.substring(6, 8))
+        )
+        if (fileDate.getTime() < startDayMs || fileDate.getTime() > endDayMs) {
+            return false
+        }
+        return true
+    })
+    // console.log('collectRenderOrMain', {
+    //     ...option,
+    //     logFiles, startMs, endMs, startDayMs, endDayMs
+    // })
+    for (const logFile of logFiles) {
+        await FileIndex.readLine(logFile.pathname, (line) => {
+            const lineParts = line.split(' - ')
+            const lineTime = dayjs(lineParts[0])
+            // console.log('lineTime', lineParts[0], lineTime.isBefore(startMs) || lineTime.isAfter(endMs))
+            if (lineTime.isBefore(startMs) || lineTime.isAfter(endMs)) {
+                return
+            }
+            resultLines.push(line)
+        }, {isFullPath: true})
+    }
+    return {
+        startTime: option.startTime,
+        endTime: option.endTime,
+        logs: resultLines.join("\n"),
+    }
+}
+
 
 export default {
     root,
     info,
     error,
     infoRenderOrMain,
     errorRenderOrMain,
+    collectRenderOrMain,
 }
 
 export const Log = {

electron/mapi/log/render.ts

@@ -4,4 +4,5 @@ export default {
     root: logIndex.root,
     info: logIndex.infoRenderOrMain,
     error: logIndex.errorRenderOrMain,
+    collect: logIndex.collectRenderOrMain,
 }

electron/page/feedback.ts

@@ -0,0 +1,34 @@
+import {BrowserWindow} from "electron";
+import {preloadDefault} from "../lib/env-main";
+import {AppRuntime} from "../mapi/env";
+import {t} from "../config/lang";
+import {Page} from "./index";
+import {WindowConfig} from "../config/window";
+
+export const PageFeedback = {
+    NAME: 'feedback',
+    open: async (option: any) => {
+        const win = new BrowserWindow({
+            title: t('工单反馈'),
+            parent: AppRuntime.mainWindow,
+            minWidth: WindowConfig.feedbackWidth,
+            minHeight: WindowConfig.feedbackHeight,
+            width: WindowConfig.feedbackWidth,
+            height: WindowConfig.feedbackHeight,
+            webPreferences: {
+                preload: preloadDefault,
+                // Warning: Enable nodeIntegration and disable contextIsolation is not secure in production
+                nodeIntegration: true,
+                webSecurity: false,
+                webviewTag: true,
+                // Consider using contextBridge.exposeInMainWorld
+                // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
+                contextIsolation: false,
+            },
+            show: true,
+            frame: false,
+            transparent: false,
+        });
+        return Page.openWindow(PageFeedback.NAME, win, "page/feedback.html");
+    }
+}

electron/page/index.ts

@@ -7,12 +7,14 @@ import {PageGuide} from "./guide";
 import {PageSetup} from "./setup";
 import {PageAbout} from "./about";
 import {DevToolsManager} from "../lib/devtools";
+import {PageFeedback} from "./feedback";
 
 const Pages = {
     'user': PageUser,
     'guide': PageGuide,
     'setup': PageSetup,
     'about': PageAbout,
+    'feedback': PageFeedback,
 }
 
 export const Page = {

page/feedback.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8"/>
+    <link rel="icon" type="image/svg+xml" href="/logo.svg"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>%name%</title>
+    <link rel="stylesheet" href="./../iconfont/iconfont.css"/>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="/src/entry/feedback.ts"></script>
+</body>
+</html>

src/components/Setting/SettingAbout.vue

@@ -38,7 +38,7 @@ const doOpenLog = async () => {
                target="_blank"
                class="align-top arco-btn arco-btn-secondary arco-btn-shape-square arco-btn-size-medium arco-btn-status-normal ml-3">
                 <icon-customer-service class="mr-1"/>
-                {{ t('使用反馈') }}
+                {{ t('工单反馈') }}
             </a>
             <a-button class="ml-3"
                       @click="doOpenLog">