filecat 3.7.1 → 4.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "filecat",
-  "version": "3.7.1",
-  "description": "filecat 文件管理器",
+  "version": "4.0.0",
+  "description": "filecat",
   "author": "xiaobaidadada",
   "scripts": {
     "dev": "node  --require ts-node/register ./shell/dev.js --env ./env",
@@ -9,18 +9,19 @@
     "dev-inspect": "node --inspect=0.0.0.0:9001 --require ts-node/register ./shell/dev.js --env ./env",
     "server-dev-inspect": "node --inspect=0.0.0.0:9001 --require ts-node/register ./src/main/server.ts --env ./env ",
     "server-dev": "node --require ts-node/register ./src/main/server.ts --env ./env",
-    "webpack-dev": "npx webpack serve --mode development --config shell/config/webpack.config.js",
+    "webpack-dev": "npx webpack serve --mode development --config shell/config/webpack.web.config.js",
     "generate-proto": "node --require ts-node/register ./src/common/proto/proto.generate.ts",
     "hot-server-dev": "node --require ts-node/register ./src/main/piping.main.ts ",
-    "webpack-build": "npx webpack  --config shell/config/webpack.config.js",
+    "webpack-build": "npx webpack  --config shell/config/webpack.web.config.js",
     "i-dev": "npm i --omit=dev",
     "build": "npm run npm-build",
+    "build-ts": "tsc",
     "npm-build": "tsc && node shell/build.js npm",
-    "docker-build": "tsc && node shell/build.js docker",
-    "pkg-build": "tsc && node shell/build.js pkg",
+    "exe-build": "tsc && node shell/build.js exe",
+    "build-exe-linux-x64": "npm run exe-build && node --require ts-node/register shell/pkg.ts filecat-linux-x64.tar.gz",
+    "build-exe-win-x64": "npm run exe-build && node --require ts-node/register shell/pkg.ts filecat-win-x64.tar.gz",
     "start": "node build/main.js",
-    "pkg-win-amd64": "npm run pkg-build && pkg . --no-dependencies --targets node18-win-x64 --output filecat-win.exe",
-    "pkg-linux-amd64": "npm run pkg-build && pkg . --no-dependencies --targets node18-linux-x64 --output filecat-linux"
+    "test": "prebuild --upload-files-gz filecat-linux --set-version \"\" -u 11234 "
   },
   "pkg": {
     "assets": [
@@ -83,7 +84,7 @@
     "@xiaobaidadada/node-pty-prebuilt": "^1.0.4",
     "@xiaobaidadada/node-tuntap2-wintun": "^1.0.6",
     "@xiaobaidadada/ssh2-prebuilt": "^1.16.0",
-    "node-process-watcher": "^1.1.0"
+    "node-process-watcher": "^1.1.8"
   },
   "devDependencies": {
     "@babel/core": "^7.24.3",
@@ -93,12 +94,12 @@
     "@babel/preset-typescript": "^7.24.1",
     "@excalidraw/excalidraw": "^0.17.6",
     "@koa/cors": "^5.0.0",
-    "@xiaobaidadada/prebuild": "^13.0.1-7",
+    "@xiaobaidadada/prebuild": "^13.0.1-9",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
     "ace-builds": "^1.32.9",
     "archiver": "^7.0.1",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
     "babel-loader": "^9.1.3",
     "chart.js": "^4.4.2",
     "chokidar": "^4.0.3",
@@ -110,6 +111,7 @@
     "github-markdown-css": "^5.6.1",
     "html-webpack-plugin": "^5.6.0",
     "http-proxy-middleware": "^3.0.3",
+    "https-proxy-agent": "^7.0.6",
     "i18next": "^23.12.2",
     "koa-proxies": "^0.12.4",
     "listr2": "^8.2.1",
@@ -130,7 +132,6 @@
     "normalize.css": "^8.0.1",
     "noty": "^3.2.0-beta-deprecated",
     "piping": "^1.0.0-rc.4",
-    "pkg": "^5.8.1",
     "protobufjs-cli": "^1.1.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package/shell/build.js

@@ -1,15 +1,13 @@
 const {Listr} = require("listr2");
 const webpack = require('webpack');
 const os = require("os");
-const config = require('./config/webpack.config.js');
+const config = require('./config/webpack.web.config.js');
 const args = process.argv.slice(2);  // slice to remove the first two default values
 let serverConfig ;
 if (args.length ===0 || args[0]==="npm") {
     serverConfig = require('./config/webpack.npm.config.js');
-} else if (args[0]==="pkg") {
-    serverConfig = require('./config/webpack.pkg.config.js');
-} else if (args[0]==="docker") {
-    serverConfig = require('./config/webpack.docker.config.js');
+} else if (args[0]==="exe") {
+    serverConfig = require('./config/webpack.exe.config.js');
 }
 const {copyFileSync} = require("fs");
 const fs = require("fs");
@@ -88,6 +86,7 @@ const tasksLister = new Listr(
                         // 因为不一定不是windows环境 所以都复制一下，发布npm 在windows环境下，不然没有这个dll
                         copyFiles(path.resolve("node_modules/@xiaobaidadada/node-tuntap2-wintun/wintun_dll"),path.join(__dirname, "..", "build"))
                         rimraf(path.join(__dirname,"..","build","server"));
+
                         res(true);
                     });
 

package/shell/config/env.js

@@ -1,3 +1,11 @@
 
-// module.exports.base_url = "/abc" // 这将会影响到自定义路由 修改以后之前设置的自定义路由将不可用 请谨慎修改
-module.exports.base_url = ""
+// module.exports.base_url = "/pre" // 这将会影响到自定义路由 修改以后之前设置的自定义路由将不可用 请谨慎修改 dev 环境前后端都需要重启
+module.exports.base_url = ""
+
+/**
+ * 构建说明：
+ * 1. npm方式不能把二进制依赖推送到npm 用户安装的时候 环境可能是win或者linux 需要自己安装依赖
+ * 2. docker与二进制安装，需要把二进制打包进去
+ * 3. 前后端同步的数据 本地dev的时候需要靠这个文件，正式包可以依赖参数
+ *
+ * */

package/shell/config/{webpack.pkg.config.js → webpack.exe.config.js}

@@ -3,7 +3,6 @@ const nodeExternals = require('webpack-node-externals');
 const webpack = require('webpack');
 const TerserPlugin = require("terser-webpack-plugin");
 const package_data = require("../../package.json")
-var prebuild_file_path_1 = require("./prebuild-file-path");
 const {base_url} = require("./env");
 const plugins = [
     new webpack.DefinePlugin({
@@ -12,11 +11,11 @@ const plugins = [
     new webpack.DefinePlugin({
         'process.env.version': JSON.stringify(package_data.version),
     }),
+    // new webpack.DefinePlugin({
+    //     'process.platform': JSON.stringify(process.platform) // 这里将 process.platform 替换为实际的值 在遇到动态打包的时候require 可以判断类型 函数内部的无法判断
+    // }),
     new webpack.DefinePlugin({
-        'process.platform': JSON.stringify(process.platform) // 这里将 process.platform 替换为实际的值 在遇到动态打包的时候require 可以判断类型 函数内部的无法判断
-    }),
-    new webpack.DefinePlugin({
-        'process.env.run_env': JSON.stringify("pkg")
+        'process.env.run_env': JSON.stringify("exe") // 必须用 JSON.stringify
     }),
     new webpack.IgnorePlugin({
         resourceRegExp: /Debug/,

package/shell/pkg.ts

@@ -0,0 +1,37 @@
+import {FileCompressType} from "../src/common/file.pojo";
+import {FileService} from "../src/main/domain/file/file.service";
+
+
+const fs = require('fs');
+const path = require('path');
+
+// 复制 node
+fs.copyFileSync(process.execPath, path.join(__dirname, "..", "build", path.basename(process.execPath)));
+
+const FileServiceImpl = new FileService();
+const args = process.argv.slice(2);
+
+if(args[0].includes("win")) {
+    fs.copyFileSync(path.join(__dirname,"start","run.cmd"), path.join(__dirname, "..", "build", "run.cmd"));
+} else  {
+    fs.copyFileSync(path.join(__dirname,"start","run.sh"), path.join(__dirname, "..", "build", "run.sh"));
+}
+
+const filePaths: string[] = [], directorys: string[] = [];
+const root_path = path.join(__dirname, "..", "build");
+for (const file of fs.readdirSync(root_path)) {
+    const name = path.join(root_path, decodeURIComponent(file));
+    try {
+        const stats = fs.statSync(name);
+        if (stats.isFile()) {
+            filePaths.push(name);
+        } else {
+            directorys.push(name);
+        }
+    } catch (e) {
+    }
+}
+// args[0] 会在 package.json 所在目录下
+FileServiceImpl.compress(FileCompressType.tar,9,args[0], filePaths, directorys,(v)=>{
+    console.log(`压缩进度:${v.toFixed(2)}`)
+},true)

package/shell/start/run.cmd

@@ -0,0 +1 @@
+.\node main.js  %*

package/shell/start/run.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+./node main.js "$@"

package/shell/config/webpack.docker.config.js

@@ -1,66 +0,0 @@
-const path = require('path');
-const nodeExternals = require('webpack-node-externals');
-const webpack = require('webpack');
-const TerserPlugin = require("terser-webpack-plugin");
-const package_data = require("../../package.json")
-var prebuild_file_path_1 = require("./prebuild-file-path");
-const {base_url} = require("./env");
-const plugins = [
-    new webpack.DefinePlugin({
-        'process.env.NODE_ENV': JSON.stringify('production'),
-    }),
-    new webpack.DefinePlugin({
-        'process.env.version': JSON.stringify(package_data.version),
-    }),
-    new webpack.DefinePlugin({
-        'process.platform': JSON.stringify(process.platform) // 这里将 process.platform 替换为实际的值 在遇到动态打包的时候require 可以判断类型 函数内部的无法判断
-    }),
-    new webpack.DefinePlugin({
-        'process.env.run_env': JSON.stringify("docker") // 必须用 JSON.stringify
-    }),
-    new webpack.IgnorePlugin({
-        resourceRegExp: /Debug/,
-    }),
-    new webpack.DefinePlugin({
-        'process.env.base_url': JSON.stringify(base_url),
-    }),
-];
-module.exports = {
-    target: 'node', // 指定打包结果运行在node环境下
-    mode: 'production', // 或者 'production'
-    entry: path.join(__dirname, "..", "..", "build", "server", "main", "server.js"), // 你的TypeScript入口文件路径
-    output: {
-        path: path.resolve(__dirname, "..", "..", "build"), // 输出目录
-        filename: 'main.js', // 输出文件名
-    },
-    resolve: {
-        extensions: ['.ts', '.js', '.node'], // 解析文件时自动补全的文件扩展名
-    },
-    module: {
-        rules: [
-            {
-                test: /\.node$|Addon$/,
-                loader: 'node-loader', // 会拷贝.node 并改变require路径 到build目录下 但是如果 .node 有更新 他是不会不更新的需要先删除?
-            }
-        ]
-    },
-    externalsPresets: { node: true },
-    externals: [
-        {
-            '@aws-sdk/client-s3': 'S3', // 假设全局变量名为 S3 是 @aws-sdk/client-s3带 @符号的话会无法压缩
-            'cors':'commonjs cors' // 动态加载无法打包 如果需要可以使用 import "cors"
-            // 'routing-controllers':'commonjs routing-controllers', // 有一些动态引入(他需要的动态引入也需要导入)，或者含有.node(使用用户自己安装编译的版本) 无法被打包 直接忽略这个包
-        }
-    ],
-    // externals: [nodeExternals()], // 将所有的外部模块排除打包
-    plugins,
-    optimization: {
-        minimize: true, // 压缩Js代码
-        minimizer: [
-            new TerserPlugin({
-                extractComments: true,//不将注释提取到单独的文件中
-            }),
-        ],
-    }
-
-};

package/shell/restart.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-
-# 读取参数
-PORT1=5567
-PORT2=3301
-
-# 查找并关闭第一个端口的程序
-find_and_kill_process() {
-  local PORT=$1
-  local PID=$(lsof -t -i:$PORT)
-  if [ -n "$PID" ]; then
-    echo "Found process with PID $PID using port $PORT. Killing process..."
-    kill $PID
-    echo "Process killed."
-  else
-    echo "No process found using port $PORT."
-  fi
-}
-
-# 查找并关闭第一个端口的程序
-find_and_kill_process $PORT1
-
-# 查找并关闭第二个端口的程序
-find_and_kill_process $PORT2
-
-npm install
-
-nohup npm run dev >./nohup.out 2>&1 &