filecat 5.23.2 → 5.23.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filecat",
-  "version": "5.23.2",
+  "version": "5.23.3",
   "description": "FileCat Server Manager",
   "author": "xiaobaidadada",
   "scripts": {

package/shell/build.js

@@ -8,7 +8,9 @@ const is_exe = args[0]==="exe"
 const is_npm = args[0]==="npm"
 if (args.length ===0 || is_npm) {
     serverConfig = require('./config/webpack.npm.config.js');
+    console.log('npm打包')
 } else if (is_exe) {
+    console.log('二进制打包')
     serverConfig = require('./config/webpack.exe.config.js');
 } else {
     console.error('无法识别打包环境')
@@ -18,9 +20,12 @@ const fs = require("fs");
 const path = require("path");
 const {rimraf} = require("rimraf");
 const fse = require("fs-extra");
-const {get_webpack_work_config} = require('./config/webpack.worker.get.js');
 const {copy_wintun_dll} = require("./config/common-bin.config");
 
+// const test_p = path.join(process.cwd(), "node_modules","node-process-watcher");
+// const test_p2 = path.join(process.cwd(), "node_modules","better-sqlite3");
+// console.log(`存在node-process-watcher ${fs.existsSync(test_p)}`);
+// console.log(`存在better-sqlite3 ${fs.existsSync(test_p2)}`);
 
 function ensure_copyFileSync(sourcePath, destPath) {
     fse.ensureDirSync(path.dirname(destPath))
@@ -54,12 +59,12 @@ const tasksLister = new Listr(
             title:"子线程构建",
             task:async ()=>{
                 return  Promise.all([new Promise((res, rej) => {
-                    // 第一个
-                    webpack(get_webpack_work_config({
-                        entry_path:path.join(__dirname, "..", "build", "server", "main","threads","filecat","threads.work.filecat.js"),
-                        output_name:'threads.work.filecat.js',
-                        is_exe
-                    }), (err, stats) => {
+                    const config = {...serverConfig};
+                    config['entry'] = path.join(__dirname, "..", "build", "server", "main","threads","filecat","threads.work.filecat.js")
+                    config['output'] = {...config['output']}
+                    config['output']['filename'] = 'threads.work.filecat.js'
+                        // 第一个
+                    webpack(config, (err, stats) => {
                         if (err || stats.hasErrors()) {
                             console.error(err || stats.toString());
                             rej(false);

package/shell/pkg.ts

@@ -4,6 +4,7 @@ import {FileService} from "../src/main/domain/file/file.service";
 
 const fs = require('fs');
 const path = require('path');
+const {copy_auto} = require('./util/file');
 
 // 复制 node
 fs.copyFileSync(process.execPath, path.join(__dirname, "..", "build", path.basename(process.execPath)));
@@ -17,7 +18,7 @@ if(args[0].includes("win")) {
     fs.copyFileSync(path.join(__dirname,"start","filecat-uninstall.cmd"), path.join(__dirname, "..", "build", "filecat-uninstall.cmd"));
     fs.copyFileSync(path.join(__dirname,"start","windows-install.js"), path.join(__dirname, "..", "build", "windows-install.js"));
     fs.copyFileSync(path.join(__dirname,"start","windows-uninstall.js"), path.join(__dirname, "..", "build", "windows-uninstall.js"));
-
+    copy_auto(path.join(process.cwd(),"node_modules","windows-shortcuts"), path.join(__dirname, "..", "build", "node_modules","windows-shortcuts"))
 } else  {
     fs.copyFileSync(path.join(__dirname,"start","filecat-run.sh"), path.join(__dirname, "..", "build", "filecat-run.sh"));
 }

package/shell/start/windows-install.js

@@ -3,15 +3,13 @@ const path = require("path");
 const fs = require("fs");
 const readline = require("readline");
 
-// 当前脚本所在目录
-// const currentDir = process.cwd();
+// 当前脚本目录
 const currentDir = __dirname;
 
-
 // 默认安装目录
-const defaultInstallDir = "C:\\Program Files\\Filecat";
+const defaultInstallDir = "C:\\Filecat";
 
-// 需要启动的 cmd
+// 启动脚本
 const CMD_NAME = "filecat-run.cmd";
 
 // 开始菜单目录
@@ -24,6 +22,16 @@ const startMenuDir = path.join(
     "Filecat"
 );
 
+// 当前用户开机启动目录
+const startupDir = path.join(
+    process.env.APPDATA,
+    "Microsoft",
+    "Windows",
+    "Start Menu",
+    "Programs",
+    "Startup"
+);
+
 // =====================
 // 递归复制目录
 // =====================
@@ -47,9 +55,9 @@ function copyDir(src, dest) {
 }
 
 // =====================
-// 创建快捷方式
+// 创建开始菜单快捷方式
 // =====================
-function createShortcut(installDir) {
+function createStartMenuShortcut(installDir) {
     const cmdPath = path.join(installDir, CMD_NAME);
     const shortcutPath = path.join(startMenuDir, "Filecat.lnk");
 
@@ -61,22 +69,42 @@ function createShortcut(installDir) {
         desc: "Filecat 启动程序"
     }, (err) => {
         if (err) {
-            console.error("创建快捷方式失败:", err);
+            console.error("创建开始菜单快捷方式失败:", err);
         } else {
             console.log("开始菜单快捷方式创建成功！");
         }
     });
 }
 
+// =====================
+// 创建开机启动快捷方式
+// =====================
+function createStartupShortcut(installDir) {
+    const cmdPath = path.join(installDir, CMD_NAME);
+    const shortcutPath = path.join(startupDir, "Filecat.lnk");
+
+    ws.create(shortcutPath, {
+        target: cmdPath,
+        workingDir: installDir,
+        desc: "Filecat 开机自启"
+    }, (err) => {
+        if (err) {
+            console.error("创建开机自启失败:", err);
+        } else {
+            console.log("已加入当前用户开机自启！");
+        }
+    });
+}
+
 // =====================
 // 安装主流程
 // =====================
-function install(installDir) {
+function install(installDir, askStartup = true) {
 
     const cmdSrc = path.join(currentDir, CMD_NAME);
 
     if (!fs.existsSync(cmdSrc)) {
-        console.error("找不到 filecat-start.cmd");
+        console.error("找不到 filecat-run.cmd");
         return;
     }
 
@@ -87,11 +115,30 @@ function install(installDir) {
 
         console.log("文件复制完成");
 
-        createShortcut(installDir);
+        createStartMenuShortcut(installDir);
 
         console.log("安装成功！");
         console.log("Win 键搜索 Filecat 即可启动");
 
+        // ===== 询问是否开机自启 =====
+        if (askStartup) {
+            const rl2 = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout
+            });
+
+            rl2.question("是否加入当前用户开机自启？(y/n): ", (answer) => {
+
+                if (answer.toLowerCase() === "y") {
+                    createStartupShortcut(installDir);
+                } else {
+                    console.log("未启用开机自启");
+                }
+
+                rl2.close();
+            });
+        }
+
     } catch (e) {
         console.error("安装失败:", e.message);
     }

package/shell/start/windows-uninstall.js

@@ -2,7 +2,9 @@ const ws = require("windows-shortcuts");
 const path = require("path");
 const fs = require("fs");
 
-// 快捷方式路径
+// =====================
+// 开始菜单快捷方式
+// =====================
 const shortcutPath = path.join(
     process.env.APPDATA,
     "Microsoft",
@@ -13,6 +15,22 @@ const shortcutPath = path.join(
     "Filecat.lnk"
 );
 
+// =====================
+// 开机自启快捷方式
+// =====================
+const startupShortcutPath = path.join(
+    process.env.APPDATA,
+    "Microsoft",
+    "Windows",
+    "Start Menu",
+    "Programs",
+    "Startup",
+    "Filecat.lnk"
+);
+
+// =====================
+// 安全删除目录
+// =====================
 function removeDirSafe(dir) {
     if (fs.existsSync(dir)) {
         fs.rmSync(dir, { recursive: true, force: true });
@@ -20,6 +38,9 @@ function removeDirSafe(dir) {
     }
 }
 
+// =====================
+// 安全删除文件
+// =====================
 function removeFileSafe(file) {
     if (fs.existsSync(file)) {
         fs.rmSync(file, { force: true });
@@ -27,14 +48,29 @@ function removeFileSafe(file) {
     }
 }
 
+// =====================
+// 删除开机自启
+// =====================
+function removeStartupShortcut() {
+    if (fs.existsSync(startupShortcutPath)) {
+        removeFileSafe(startupShortcutPath);
+        console.log("已移除开机自启");
+    }
+}
+
 // =====================
 // 主逻辑
 // =====================
 if (!fs.existsSync(shortcutPath)) {
-    console.log("找不到快捷方式，无法确定安装目录");
+    console.log("找不到开始菜单快捷方式，尝试仅删除开机自启...");
+
+    removeStartupShortcut();
+
+    console.log("卸载完成（仅移除自启）");
     process.exit(0);
 }
 
+// 读取快捷方式
 ws.query(shortcutPath, (err, options) => {
 
     if (err) {
@@ -47,10 +83,10 @@ ws.query(shortcutPath, (err, options) => {
         process.exit(1);
     }
 
-    // ⭐ 获取真实文件路径
+    // 获取真实文件路径
     const targetFile = options.target;
 
-    // ⭐ 获取安装目录
+    // 获取安装目录
     const installDir = path.dirname(targetFile);
 
     console.log("检测到安装目录:", installDir);
@@ -60,12 +96,15 @@ ws.query(shortcutPath, (err, options) => {
         // 删除安装目录
         removeDirSafe(installDir);
 
-        // 删除快捷方式
+        // 删除开始菜单快捷方式
         removeFileSafe(shortcutPath);
 
         // 删除开始菜单文件夹
         removeDirSafe(path.dirname(shortcutPath));
 
+        // 删除开机自启
+        removeStartupShortcut();
+
         console.log("卸载完成");
 
     } catch (e) {

package/shell/util/file.js

@@ -0,0 +1,46 @@
+const fse = require("fs-extra");
+const fs = require("fs");
+const path = require("path");
+
+/**
+ * 自动复制文件或目录
+ * @param {string} src 源路径
+ * @param {string} dest 目标路径
+ */
+function copy_auto(src, dest) {
+
+    if (!fs.existsSync(src)) {
+        throw new Error(`源路径不存在: ${src}`);
+    }
+
+    const stat = fs.statSync(src);
+
+    // ===== 如果是文件 =====
+    if (stat.isFile()) {
+
+        // 确保目标目录存在
+        fse.ensureDirSync(path.dirname(dest));
+
+        fs.copyFileSync(src, dest);
+        return;
+    }
+
+    // ===== 如果是目录 =====
+    if (stat.isDirectory()) {
+
+        fse.copySync(src, dest, {
+            overwrite: true,
+            recursive: true,
+            errorOnExist: false
+        });
+
+        return;
+    }
+
+    throw new Error("未知文件类型");
+}
+
+module.exports.copy_auto = copy_auto;
+
+// copy_auto(path.join(process.cwd(),"node_modules","windows-shortcuts"), path.join(process.cwd(),"build","windows-shortcuts"))
+

package/shell/config/webpack.worker.get.js

@@ -1,42 +0,0 @@
-const path = require("path");
-const package_data = require("../../package.json")
-const webpack = require('webpack');
-const TerserPlugin = require("terser-webpack-plugin");
-const {base_url} = require("./env");
-const {plugins, pkg_externals, npm_externals, _node_rules} = require("./base.webpack.config");
-
-function get_webpack_work_config({entry_path,output_name,is_exe}) {
-    const config = {
-        target: 'node', // 指定打包结果运行在node环境下
-        mode: 'production', // 或者 'production'
-        entry: entry_path, // 你的TypeScript入口文件路径
-        output: {
-            path: path.resolve(__dirname, "..",'..',  "build"), // 输出目录
-            filename: output_name, // 输出文件名
-        },
-        resolve: {
-            extensions: ['.ts', '.js', '.node'] // 解析文件时自动补全的文件扩展名
-        },
-        externalsPresets: { node: true },
-        optimization: {
-            minimize: true, // 压缩Js代码
-            minimizer: [
-                new TerserPlugin({
-                    // extractComments: true,//不将注释提取到单独的文件中
-                }),
-            ],
-        },
-        plugins,
-        externals: npm_externals
-    }
-    if(is_exe) {
-        // 整体打包需要二进制也进去
-        config['module'] = {
-            rules: _node_rules
-        }
-        config['externals'] = pkg_externals;
-    }
-    return config;
-}
-
-module.exports.get_webpack_work_config = get_webpack_work_config;