filecat 5.22.12 → 5.22.14

package/package.json

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

package/shell/build.js

@@ -21,6 +21,11 @@ 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");
 
+
+function ensure_copyFileSync(sourcePath, destPath) {
+    fse.ensureDirSync(path.dirname(destPath))
+    copyFileSync(sourcePath, destPath);
+}
 // 只能复制文件
 function copyFiles(sourceDir,destDir) {
     try {
@@ -53,8 +58,7 @@ const tasksLister = new Listr(
                     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',
-                        pkg:args[0]==="npm",
-                        docker:args[0]==="docker",
+                        is_exe
                     }), (err, stats) => {
                         if (err || stats.hasErrors()) {
                             console.error(err || stats.toString());
@@ -89,15 +93,15 @@ const tasksLister = new Listr(
                         // copyFileSync(path.resolve("build/server/main/domain/file/file.worker.js"), path.join(__dirname, "..", "build", "file.worker.js"))
 
                         // 复制 子进程监控脚本
-                        copyFileSync(path.resolve("src/main/watch.js"), path.join(__dirname, "..", "build", "watch.js"))
+                        ensure_copyFileSync(path.resolve("src/main/watch.js"), path.join(__dirname, "..", "build", "watch.js"))
                         if(is_exe) {
                             copy_wintun_dll()
                             fs.copyFileSync(path.resolve('package.json'), path.resolve('build','package.json'));
-                            copyFileSync(path.resolve("node_modules/sqlite3/build/Release/node_sqlite3.node"), path.join(__dirname, "..", "build","build", "node_sqlite3.node"))
+                            // ensure_copyFileSync(path.resolve("node_modules/sqlite3/build/Release/node_sqlite3.node"), path.join(__dirname, "..", "build", "node_sqlite3.node"))
                         }
 
-                        copyFileSync(path.resolve("node_modules/node-unrar-js/esm/js/unrar.wasm"), path.join(__dirname, "..", "build", "unrar.wasm"))
-                        copyFileSync(path.resolve("node_modules/jieba-wasm/pkg/nodejs/jieba_rs_wasm_bg.wasm"), path.join(__dirname, "..", "build", "jieba_rs_wasm_bg.wasm"))
+                        ensure_copyFileSync(path.resolve("node_modules/node-unrar-js/esm/js/unrar.wasm"), path.join(__dirname, "..", "build", "unrar.wasm"))
+                        ensure_copyFileSync(path.resolve("node_modules/jieba-wasm/pkg/nodejs/jieba_rs_wasm_bg.wasm"), path.join(__dirname, "..", "build", "jieba_rs_wasm_bg.wasm"))
 
                         rimraf.sync(path.join(__dirname,"..","build","server"));
 

package/shell/config/base.webpack.config.js

@@ -56,7 +56,7 @@ const npm_externals = [
         '@xiaobaidadada/node-tuntap2-wintun': 'commonjs @xiaobaidadada/node-tuntap2-wintun',
         'node-process-watcher': 'commonjs node-process-watcher',
         '@xiaobaidadada/ssh2-prebuilt': 'commonjs @xiaobaidadada/ssh2-prebuilt',
-        'sqlite3': 'commonjs sqlite3',
+        'sqlite3/build/Release/node_sqlite3.node': 'commonjs sqlite3/build/Release/node_sqlite3.node',
     }
 ]
 const pkg_externals = [

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

@@ -5,7 +5,7 @@ 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,pkg,docker}) {
+function get_webpack_work_config({entry_path,output_name,is_exe}) {
     const config = {
         target: 'node', // 指定打包结果运行在node环境下
         mode: 'production', // 或者 'production'
@@ -29,7 +29,7 @@ function get_webpack_work_config({entry_path,output_name,pkg,docker}) {
         plugins,
         externals: npm_externals
     }
-    if(pkg===true || docker===true) {
+    if(is_exe) {
         // 整体打包需要二进制也进去
         config['module'] = {
             rules: _node_rules