filecat 7.8.0 → 7.10.1

package/shell/config/prebuild-file-path.js

@@ -1,18 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptyPath = void 0;
-var fs = require("fs");
-var os = require("os");
-var path = require("path");
-function prebuildName() {
-    var tags = [];
-    tags.push(process.versions.hasOwnProperty('electron') ? 'electron' : 'node');
-    tags.push('abi' + process.versions.modules);
-    if (os.platform() === 'linux' && fs.existsSync('/etc/alpine-release')) {
-        tags.push('musl');
-    }
-    return tags.join('.') + '.node';
-}
-var pathToBuild = path.resolve(__dirname, "../prebuilds/".concat(os.platform(), "-").concat(os.arch(), "/").concat(prebuildName()));
-exports.ptyPath = fs.existsSync(pathToBuild) ? pathToBuild : null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ptyPath = void 0;
+var fs = require("fs");
+var os = require("os");
+var path = require("path");
+function prebuildName() {
+    var tags = [];
+    tags.push(process.versions.hasOwnProperty('electron') ? 'electron' : 'node');
+    tags.push('abi' + process.versions.modules);
+    if (os.platform() === 'linux' && fs.existsSync('/etc/alpine-release')) {
+        tags.push('musl');
+    }
+    return tags.join('.') + '.node';
+}
+var pathToBuild = path.resolve(__dirname, "../prebuilds/".concat(os.platform(), "-").concat(os.arch(), "/").concat(prebuildName()));
+exports.ptyPath = fs.existsSync(pathToBuild) ? pathToBuild : null;
 //# sourceMappingURL=prebuild-file-path.js.map

package/shell/config/webpack.exe.config.js

@@ -1,36 +1,36 @@
-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")
-const {base_url} = require("./env");
-const { _node_rules, get_exe_plugins, pkg_externals} = require("./base.webpack.config");
-
-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: _node_rules
-    },
-    externalsPresets: { node: true },
-    externals: pkg_externals,
-    // externals: [nodeExternals()], // 将所有的外部模块排除打包
-    plugins:get_exe_plugins(),
-    optimization: {
-        minimize: true, // 压缩Js代码
-        minimizer: [
-            new TerserPlugin({
-                // extractComments: true,//不将注释提取到单独的文件中
-            }),
-        ],
-    }
-
-};
+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")
+const {base_url} = require("./env");
+const { _node_rules, get_exe_plugins, pkg_externals} = require("./base.webpack.config");
+
+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: _node_rules
+    },
+    externalsPresets: { node: true },
+    externals: pkg_externals,
+    // externals: [nodeExternals()], // 将所有的外部模块排除打包
+    plugins:get_exe_plugins(),
+    optimization: {
+        minimize: true, // 压缩Js代码
+        minimizer: [
+            new TerserPlugin({
+                // extractComments: true,//不将注释提取到单独的文件中
+            }),
+        ],
+    }
+
+};

package/shell/config/webpack.npm.config.js

@@ -1,44 +1,44 @@
-const path = require('path');
-const webpack = require('webpack');
-const TerserPlugin = require("terser-webpack-plugin");
-const package_data = require("../../package.json")
-const {base_url} = require("./env");
-const {npm_externals, common_plugins} = require("./base.webpack.config");
-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: {
-        // 入口是 tsc 编译后的 .js，不需要 webpack 解析 .ts
-        extensions: ['.js', '.node']
-    },
-    module: {
-        rules: [
-        ]
-    },
-    externalsPresets: { node: true },
-    externals: npm_externals,
-    plugins: [
-        new webpack.DefinePlugin(common_plugins),
-        // new webpack.IgnorePlugin({ // 前面已经排除了可能含义.node的项目 这里就不需要了
-        //     resourceRegExp: /\.node$/
-        //     // contextRegExp: /moment$/,
-        // }),
-        // new webpack.IgnorePlugin({
-        //     resourceRegExp: /Addon$/
-        //     // contextRegExp: /moment$/,
-        // }),
-    ],
-    optimization: {
-        minimize: true, // 压缩Js代码
-        minimizer: [
-            new TerserPlugin({
-                // extractComments: true,//不将注释提取到单独的文件中
-            }),
-        ],
-    }
-};
+const path = require('path');
+const webpack = require('webpack');
+const TerserPlugin = require("terser-webpack-plugin");
+const package_data = require("../../package.json")
+const {base_url} = require("./env");
+const {npm_externals, common_plugins} = require("./base.webpack.config");
+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: {
+        // 入口是 tsc 编译后的 .js，不需要 webpack 解析 .ts
+        extensions: ['.js', '.node']
+    },
+    module: {
+        rules: [
+        ]
+    },
+    externalsPresets: { node: true },
+    externals: npm_externals,
+    plugins: [
+        new webpack.DefinePlugin(common_plugins),
+        // new webpack.IgnorePlugin({ // 前面已经排除了可能含义.node的项目 这里就不需要了
+        //     resourceRegExp: /\.node$/
+        //     // contextRegExp: /moment$/,
+        // }),
+        // new webpack.IgnorePlugin({
+        //     resourceRegExp: /Addon$/
+        //     // contextRegExp: /moment$/,
+        // }),
+    ],
+    optimization: {
+        minimize: true, // 压缩Js代码
+        minimizer: [
+            new TerserPlugin({
+                // extractComments: true,//不将注释提取到单独的文件中
+            }),
+        ],
+    }
+};

package/shell/config/webpack.web.config.js

@@ -1,152 +1,152 @@
-const path = require('path');
-const fs = require('fs');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const Mustache = require('mustache');
-const webpack = require('webpack');
-const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
-const TerserPlugin = require("terser-webpack-plugin");
-
-const package_data = require("../../package.json")
-const {base_url} = require("./env");
-const {common_plugins} = require("./base.webpack.config");
-
-/**
- * dev 下 index.html 由 webpack-dev-server 直接吐给浏览器，不经过后端 Mustache.render，
- * 模板里的 {{{web_site_title}}} 这类占位符会原样显示成 "dev 占位符"。
- * 这里只在 dev 用同一个模板引擎渲染；production 保持原模板输出，
- * 交给后端 get_index_html() 用真实环境配置渲染。
- */
-const INDEX_TEMPLATE = path.join(__dirname, "..", "..", "src", "web", "project", 'index.html');
-function render_index() {
-    const tpl = fs.readFileSync(INDEX_TEMPLATE, 'utf8');
-    return Mustache.render(tpl, {
-        Windows_FileCat: JSON.stringify({
-            base_url,
-            web_site_title: "Local FileCat",
-            logo_url: ""
-        }),
-        web_site_title: "Local FileCat",
-        logo_favicon: "favicon-32x32.png"
-    });
-}
-
-const is_dev = process.env.NODE_ENV !== 'production';
-module.exports = {
-    mode: process.env.NODE_ENV === 'development' ? 'development' : 'production',
-    entry: path.join(__dirname, "..", "..", "src", "web", "project", 'index.js'),
-    output: {
-        // path: path.resolve(__dirname, '..','..','dist'),
-        // filename: 'bundle.js',
-        filename: '[name].[contenthash].js',  // 使用 contenthash 进行文件名哈希 下次更新代码 浏览器缓存也会更新
-        path: path.resolve(__dirname, '..', "..", 'build', 'dist'),
-    },
-    module: {
-        rules: [
-            {
-                test: /\.(js|jsx|tsx|ts)$/,
-                exclude: /node_modules/,
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        configFile: path.resolve(__dirname, '.babelrc'), // 指定 .babelrc 文件路径
-                    },
-                },
-            },
-            {
-                test: /\.css$/, // 匹配所有以.css结尾的文件
-                use: ['style-loader', 'css-loader'] // 使用style-loader和css-loader处理匹配到的文件
-            },
-            {
-                test: /\.svg/,
-                type: 'asset/inline'
-            },
-            {
-                // 数学公式（KaTeX）用的字体。webpack 5 默认不认识字体文件，
-                // 不加这条规则 import katex 的样式会直接报 Module parse failed。
-                // 输出到 dist 根目录（不带子目录）：后端静态资源是按 basename 找文件的
-                // （见 main.ts 的 path.basename），放子目录里反而取不到。
-                test: /\.(woff2?|ttf|otf|eot)$/,
-                type: 'asset/resource',
-                generator: {
-                    filename: '[name].[contenthash][ext]',
-                },
-            },
-            {
-                test: /workflow.yml/,
-                type: 'asset/source', // 直接把文件内容导出为字符串
-            },
-            {
-                test: /\.m?js/,
-                resolve: {
-                    fullySpecified: false, // 关闭对文件扩展名的严格要求
-                },
-            },
-        ],
-    },
-    resolve: {
-        // .mjs 不能省：mermaid 等包的 exports 直接指向 .mjs 产物，
-        // webpack 按这份扩展名列表去找入口，缺了就会报 Can't resolve
-        extensions: ['.tsx', '.ts', '.js', '.jsx', '.mjs'],
-    },
-    plugins: [
-        new HtmlWebpackPlugin({
-            template: INDEX_TEMPLATE,
-            // dev 才预先渲染占位符；production 保持原样，交给后端 Mustache.render
-            ...(is_dev ? { templateContent: render_index() } : {}),
-            inject: true,
-        }),
-        new webpack.DefinePlugin(common_plugins),
-        // new BundleAnalyzerPlugin({
-        //     analyzerMode: 'server',  // 启动本地服务器查看分析报告
-        //     openAnalyzer: true,      // 是否自动打开浏览器
-        // })
-    ],
-    optimization: {
-        minimize: true, // 压缩Js代码
-        minimizer: [
-            new TerserPlugin({
-                // extractComments: true,//不将注释提取到单独的文件中
-            }),
-        ],
-        // splitChunks: {
-        //     chunks: 'all', // 对所有 chunk 进行优化
-        //     maxInitialRequests: Infinity,
-        //     minSize: 20000, // 超过 20kb 的模块进行拆分
-        //     cacheGroups: {
-        //         // 将所有 node_modules 中的库打包为一个 vendors 文件
-        //         vendors: {
-        //             test: /[\\/]node_modules[\\/]/,
-        //             name(module) {
-        //                 // 获取包名，将第三方库按包名拆分，防止 vendors.js 过大
-        //                 const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
-        //                 return `npm.${packageName.replace('@', '')}`;
-        //             },
-        //         },
-        //     },
-        // },
-    },
-    devServer: {
-        static: [
-            // {directory: path.join(__dirname, "..", "..", "node_modules", "@excalidraw", "excalidraw", "dist","excalidraw-assets-dev"),},
-            {
-                directory: path.join(__dirname, "..", "..", "node_modules", "@excalidraw", "excalidraw", "dist", "dev", "fonts"),
-                publicPath: "/fonts" // 重点：将 URL 中的 /fonts 映射到上述物理文件夹 多个路径可以一样 按优先级查找
-            },
-            {directory: path.join(__dirname, "..", "..", "src", "web", "project", './'),},// web index.js
-            {directory: path.join(__dirname, "..", "..", "src", "web", "project", 'component', "file", "component", "image", "js")},
-            {directory: path.join(__dirname, "..", "..", "src", "web", "project", 'component', "proxy", "rdp", "client", "js")},
-            {directory: path.join(__dirname, "..", "..", "src", "web", "meta", 'resources', "img", "./",)},
-            {directory: path.join(__dirname, "..", "..", "src", "web", "meta", 'resources', "css", "themes",)}
-        ],
-        port: 3301,
-        open: false,
-        // onListening: function (devServer) {
-        //     if (!devServer) {
-        //         throw new Error('webpack-dev-server is not defined');
-        //     }
-        //     // const port = devServer.server.address().port;
-        //     console.log('Listening on port:', port);
-        // },
-        allowedHosts: "all", //  新增该配置项
-    },
-};
+const path = require('path');
+const fs = require('fs');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const Mustache = require('mustache');
+const webpack = require('webpack');
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const TerserPlugin = require("terser-webpack-plugin");
+
+const package_data = require("../../package.json")
+const {base_url} = require("./env");
+const {common_plugins} = require("./base.webpack.config");
+
+/**
+ * dev 下 index.html 由 webpack-dev-server 直接吐给浏览器，不经过后端 Mustache.render，
+ * 模板里的 {{{web_site_title}}} 这类占位符会原样显示成 "dev 占位符"。
+ * 这里只在 dev 用同一个模板引擎渲染；production 保持原模板输出，
+ * 交给后端 get_index_html() 用真实环境配置渲染。
+ */
+const INDEX_TEMPLATE = path.join(__dirname, "..", "..", "src", "web", "project", 'index.html');
+function render_index() {
+    const tpl = fs.readFileSync(INDEX_TEMPLATE, 'utf8');
+    return Mustache.render(tpl, {
+        Windows_FileCat: JSON.stringify({
+            base_url,
+            web_site_title: "Local FileCat",
+            logo_url: ""
+        }),
+        web_site_title: "Local FileCat",
+        logo_favicon: "favicon-32x32.png"
+    });
+}
+
+const is_dev = process.env.NODE_ENV !== 'production';
+module.exports = {
+    mode: process.env.NODE_ENV === 'development' ? 'development' : 'production',
+    entry: path.join(__dirname, "..", "..", "src", "web", "project", 'index.js'),
+    output: {
+        // path: path.resolve(__dirname, '..','..','dist'),
+        // filename: 'bundle.js',
+        filename: '[name].[contenthash].js',  // 使用 contenthash 进行文件名哈希 下次更新代码 浏览器缓存也会更新
+        path: path.resolve(__dirname, '..', "..", 'build', 'dist'),
+    },
+    module: {
+        rules: [
+            {
+                test: /\.(js|jsx|tsx|ts)$/,
+                exclude: /node_modules/,
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        configFile: path.resolve(__dirname, '.babelrc'), // 指定 .babelrc 文件路径
+                    },
+                },
+            },
+            {
+                test: /\.css$/, // 匹配所有以.css结尾的文件
+                use: ['style-loader', 'css-loader'] // 使用style-loader和css-loader处理匹配到的文件
+            },
+            {
+                test: /\.svg/,
+                type: 'asset/inline'
+            },
+            {
+                // 数学公式（KaTeX）用的字体。webpack 5 默认不认识字体文件，
+                // 不加这条规则 import katex 的样式会直接报 Module parse failed。
+                // 输出到 dist 根目录（不带子目录）：后端静态资源是按 basename 找文件的
+                // （见 main.ts 的 path.basename），放子目录里反而取不到。
+                test: /\.(woff2?|ttf|otf|eot)$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: '[name].[contenthash][ext]',
+                },
+            },
+            {
+                test: /workflow.yml/,
+                type: 'asset/source', // 直接把文件内容导出为字符串
+            },
+            {
+                test: /\.m?js/,
+                resolve: {
+                    fullySpecified: false, // 关闭对文件扩展名的严格要求
+                },
+            },
+        ],
+    },
+    resolve: {
+        // .mjs 不能省：mermaid 等包的 exports 直接指向 .mjs 产物，
+        // webpack 按这份扩展名列表去找入口，缺了就会报 Can't resolve
+        extensions: ['.tsx', '.ts', '.js', '.jsx', '.mjs'],
+    },
+    plugins: [
+        new HtmlWebpackPlugin({
+            template: INDEX_TEMPLATE,
+            // dev 才预先渲染占位符；production 保持原样，交给后端 Mustache.render
+            ...(is_dev ? { templateContent: render_index() } : {}),
+            inject: true,
+        }),
+        new webpack.DefinePlugin(common_plugins),
+        // new BundleAnalyzerPlugin({
+        //     analyzerMode: 'server',  // 启动本地服务器查看分析报告
+        //     openAnalyzer: true,      // 是否自动打开浏览器
+        // })
+    ],
+    optimization: {
+        minimize: true, // 压缩Js代码
+        minimizer: [
+            new TerserPlugin({
+                // extractComments: true,//不将注释提取到单独的文件中
+            }),
+        ],
+        // splitChunks: {
+        //     chunks: 'all', // 对所有 chunk 进行优化
+        //     maxInitialRequests: Infinity,
+        //     minSize: 20000, // 超过 20kb 的模块进行拆分
+        //     cacheGroups: {
+        //         // 将所有 node_modules 中的库打包为一个 vendors 文件
+        //         vendors: {
+        //             test: /[\\/]node_modules[\\/]/,
+        //             name(module) {
+        //                 // 获取包名，将第三方库按包名拆分，防止 vendors.js 过大
+        //                 const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
+        //                 return `npm.${packageName.replace('@', '')}`;
+        //             },
+        //         },
+        //     },
+        // },
+    },
+    devServer: {
+        static: [
+            // {directory: path.join(__dirname, "..", "..", "node_modules", "@excalidraw", "excalidraw", "dist","excalidraw-assets-dev"),},
+            {
+                directory: path.join(__dirname, "..", "..", "node_modules", "@excalidraw", "excalidraw", "dist", "dev", "fonts"),
+                publicPath: "/fonts" // 重点：将 URL 中的 /fonts 映射到上述物理文件夹 多个路径可以一样 按优先级查找
+            },
+            {directory: path.join(__dirname, "..", "..", "src", "web", "project", './'),},// web index.js
+            {directory: path.join(__dirname, "..", "..", "src", "web", "project", 'component', "file", "component", "image", "js")},
+            {directory: path.join(__dirname, "..", "..", "src", "web", "project", 'component', "proxy", "rdp", "client", "js")},
+            {directory: path.join(__dirname, "..", "..", "src", "web", "meta", 'resources', "img", "./",)},
+            {directory: path.join(__dirname, "..", "..", "src", "web", "meta", 'resources', "css", "themes",)}
+        ],
+        port: 3301,
+        open: false,
+        // onListening: function (devServer) {
+        //     if (!devServer) {
+        //         throw new Error('webpack-dev-server is not defined');
+        //     }
+        //     // const port = devServer.server.address().port;
+        //     console.log('Listening on port:', port);
+        // },
+        allowedHosts: "all", //  新增该配置项
+    },
+};

package/shell/dev.js

@@ -1,51 +1,51 @@
-
-const { spawn } = require('child_process');
-const path = require("path");
-const Webpack = require('webpack');
-const WebpackDevServer = require('webpack-dev-server');
-const webpackConfig = require('./config/webpack.web.config.js');
-const {find_available_port} = require("../src/common/node/findPort");
-
-// const temLog = console.log;
-
-// const child = spawn('npm', ['run', 'server-dev'], {
-//     shell: true, // 在某些系统上可能需要设置 shell 为 true 以正确执行命令
-//     stdio: 'inherit', // 使子进程的输入、输出和错误流与父进程共享
-// });
-
-// child.stdout.on('data', (data) => {
-//
-//     console.log(data.toString());
-// })
-// child.stderr.on('data', (data) => {
-//     console.log = temLog;
-//     console.error(data.toString());
-// });
-
-
-const runServer = async () => {
-    const port = await find_available_port(49152, 65535);
-    process.env.webpack_port = port;
-    webpackConfig['mode'] = 'development';
-    webpackConfig['devServer']['port'] = port;
-    webpackConfig['devServer']['onListening'] = function (devServer) {
-        if (!devServer) {
-            throw new Error('webpack-dev-server is not defined');
-        }
-        console.log('\x1b[31m请用后端端口访问网页\x1b[0m');
-    };
-    const compiler = Webpack(webpackConfig);
-
-// webpackConfig['mode'] = 'production';
-    const devServerOptions = { ...webpackConfig.devServer, open: false };
-    const server = new WebpackDevServer(devServerOptions, compiler);
-    server.start();
-    require("../src/main/server")
-};
-
-runServer();
-// console.log = function (...args) {
-// }
-
-
-
+
+const { spawn } = require('child_process');
+const path = require("path");
+const Webpack = require('webpack');
+const WebpackDevServer = require('webpack-dev-server');
+const webpackConfig = require('./config/webpack.web.config.js');
+const {find_available_port} = require("../src/common/node/findPort");
+
+// const temLog = console.log;
+
+// const child = spawn('npm', ['run', 'server-dev'], {
+//     shell: true, // 在某些系统上可能需要设置 shell 为 true 以正确执行命令
+//     stdio: 'inherit', // 使子进程的输入、输出和错误流与父进程共享
+// });
+
+// child.stdout.on('data', (data) => {
+//
+//     console.log(data.toString());
+// })
+// child.stderr.on('data', (data) => {
+//     console.log = temLog;
+//     console.error(data.toString());
+// });
+
+
+const runServer = async () => {
+    const port = await find_available_port(49152, 65535);
+    process.env.webpack_port = port;
+    webpackConfig['mode'] = 'development';
+    webpackConfig['devServer']['port'] = port;
+    webpackConfig['devServer']['onListening'] = function (devServer) {
+        if (!devServer) {
+            throw new Error('webpack-dev-server is not defined');
+        }
+        console.log('\x1b[31m请用后端端口访问网页\x1b[0m');
+    };
+    const compiler = Webpack(webpackConfig);
+
+// webpackConfig['mode'] = 'production';
+    const devServerOptions = { ...webpackConfig.devServer, open: false };
+    const server = new WebpackDevServer(devServerOptions, compiler);
+    server.start();
+    require("../src/main/server")
+};
+
+runServer();
+// console.log = function (...args) {
+// }
+
+
+

package/shell/docker-build.sh

@@ -1,3 +1,3 @@
-
-npm run docker-build
+
+npm run docker-build
 docker build -t test .

package/shell/filecat

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 require("../build/main.js");

package/shell/filecat-watch

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 require("../build/watch.js");