filecat 5.16.1 → 5.16.2

package/build/main.js.LICENSE.txt

@@ -0,0 +1,445 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*!
+   * mustache.js - Logic-less {{mustache}} templates with JavaScript
+   * http://github.com/janl/mustache.js
+   */
+
+/*!
+ * @koa/multer
+ *
+ * Copyright(c) 2014 Hage Yaapa
+ * Copyright(c) 2015 Fangdun Cai
+ * MIT Licensed
+ */
+
+/*!
+ * Array of passes.
+ *
+ * A `pass` is just a function that is executed on `req, res, options`
+ * so that you can easily add new checks while still keeping the base
+ * flexible.
+ */
+
+/*!
+ * Array of passes.
+ *
+ * A `pass` is just a function that is executed on `req, socket, options`
+ * so that you can easily add new checks while still keeping the base
+ * flexible.
+ */
+
+/*!
+ * Caron dimonio, con occhi di bragia
+ * loro accennando, tutte le raccoglie;
+ * batte col remo qualunque s’adagia 
+ *
+ * Charon the demon, with the eyes of glede,
+ * Beckoning to them, collects them all together,
+ * Beats with his oar whoever lags behind
+ *          
+ *          Dante - The Divine Comedy (Canto III)
+ */
+
+/*!
+ * accepts
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * body-parser
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * body-parser
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * bytes
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015 Jed Watson
+ * MIT Licensed
+ */
+
+/*!
+ * compressible
+ * Copyright(c) 2013 Jonathan Ong
+ * Copyright(c) 2014 Jeremiah Senkpiel
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * compression
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * content-disposition
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * content-type
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * cookie
+ * Copyright(c) 2012-2014 Roman Shtylman
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * cookies
+ * Copyright(c) 2014 Jed Schmidt, http://jed.is/
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * copy-to - index.js
+ * Copyright(c) 2014 dead_horse <dead_horse@qq.com>
+ * MIT Licensed
+ */
+
+/*!
+ * depd
+ * Copyright(c) 2014 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * depd
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * depd
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * depd
+ * Copyright(c) 2014-2018 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * depd
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * destroy
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015-2022 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * ee-first
+ * Copyright(c) 2014 Jonathan Ong
+ * MIT Licensed
+ */
+
+/*!
+ * encodeurl
+ * Copyright(c) 2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * escape-html
+ * Copyright(c) 2012-2013 TJ Holowaychuk
+ * Copyright(c) 2015 Andreas Lubbe
+ * Copyright(c) 2015 Tiancheng "Timothy" Gu
+ * MIT Licensed
+ */
+
+/*!
+ * etag
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * express
+ * Copyright(c) 2009-2013 TJ Holowaychuk
+ * Copyright(c) 2013 Roman Shtylman
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * express
+ * Copyright(c) 2009-2013 TJ Holowaychuk
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * finalhandler
+ * Copyright(c) 2014-2022 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * forwarded
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * fresh
+ * Copyright(c) 2012 TJ Holowaychuk
+ * Copyright(c) 2016-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * http-errors
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * keygrip
+ * Copyright(c) 2011-2014 Jed Schmidt
+ * MIT Licensed
+ */
+
+/*!
+ * media-typer
+ * Copyright(c) 2014 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * media-typer
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * merge-descriptors
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * methods
+ * Copyright(c) 2013-2014 TJ Holowaychuk
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * mime-db
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015-2022 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * mime-types
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * negotiator
+ * Copyright(c) 2012 Federico Romero
+ * Copyright(c) 2012-2014 Isaac Z. Schlueter
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Copyright (c) 2014-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+/*!
+ * on-finished
+ * Copyright(c) 2013 Jonathan Ong
+ * Copyright(c) 2014 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * on-headers
+ * Copyright(c) 2014 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * parseurl
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * proxy-addr
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * range-parser
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * raw-body
+ * Copyright(c) 2013-2014 Jonathan Ong
+ * Copyright(c) 2014-2022 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * send
+ * Copyright(c) 2012 TJ Holowaychuk
+ * Copyright(c) 2014-2022 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * serve-static
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * statuses
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * toidentifier
+ * Copyright(c) 2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * type-is
+ * Copyright(c) 2014 Jonathan Ong
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * unpipe
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * vary
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*! *****************************************************************************
+Copyright (C) Microsoft. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) */
+
+/*! crc32.js (C) 2014-present SheetJS -- http://sheetjs.com */
+
+/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+
+/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/**
+ * Archiver Core
+ *
+ * @ignore
+ * @license [MIT]{@link https://github.com/archiverjs/node-archiver/blob/master/LICENSE}
+ * @copyright (c) 2012-2014 Chris Talkington, contributors.
+ */
+
+/**
+ * Archiver Vending
+ *
+ * @ignore
+ * @license [MIT]{@link https://github.com/archiverjs/node-archiver/blob/master/LICENSE}
+ * @copyright (c) 2012-2014 Chris Talkington, contributors.
+ */
+
+/**
+ * JSON Format Plugin
+ *
+ * @module plugins/json
+ * @license [MIT]{@link https://github.com/archiverjs/node-archiver/blob/master/LICENSE}
+ * @copyright (c) 2012-2014 Chris Talkington, contributors.
+ */
+
+/**
+ * TAR Format Plugin
+ *
+ * @module plugins/tar
+ * @license [MIT]{@link https://github.com/archiverjs/node-archiver/blob/master/LICENSE}
+ * @copyright (c) 2012-2014 Chris Talkington, contributors.
+ */
+
+/**
+ * ZIP Format Plugin
+ *
+ * @module plugins/zip
+ * @license [MIT]{@link https://github.com/archiverjs/node-archiver/blob/master/LICENSE}
+ * @copyright (c) 2012-2014 Chris Talkington, contributors.
+ */
+
+/**
+ * ZipStream
+ *
+ * @ignore
+ * @license [MIT]{@link https://github.com/archiverjs/node-zip-stream/blob/master/LICENSE}
+ * @copyright (c) 2014 Chris Talkington, contributors.
+ */

package/build/{server/main/watch.js → watch.js}

@@ -1,68 +1,86 @@
-const { fork } = require('child_process');
-const readline = require('readline');
-const path = require('path');
-let child = null;
-const argv = process.argv;
-const isDev = argv.includes('dev');
-const childScript = path.resolve(__dirname, isDev ? 'server.ts' : 'main.js');
-const childArgs = argv.slice(2);
-let last = 0;
-let running = false;
-function startServer() {
-    if (running === true && Date.now() - last <= 3000) {
-        console.log(`${last} server started`);
-        return;
-    }
-    last = Date.now();
-    running = true;
-    console.log('🚀 启动子进程...', (new Date()).toLocaleString());
-    if (isDev) {
-        child = fork(childScript, [...childArgs, '--watch'], {
-            stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-            execArgv: ['-r', 'ts-node/register'],
-            env: Object.assign({}, process.env)
-        });
-    }
-    else {
-        child = fork(childScript, childArgs, {
-            stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-            env: Object.assign({}, process.env)
-        });
-    }
-    child.on('message', (msg) => {
-        if (msg === 'restart') {
-            console.log('♻️ 子进程请求重启...');
-            restartServer();
-        }
-    });
-    child.on('exit', (code, signal) => {
-        console.log(`⚠️ 子进程退出：code=${code}, signal=${signal}`);
-    });
-}
-function restartServer() {
-    running = false;
-    if (child) {
-        console.log('♻️ 正在重启子进程...');
-        child.kill('SIGTERM');
-        setTimeout(() => startServer(), 500);
-    }
-    else {
-        startServer();
-    }
-}
-startServer();
-readline.emitKeypressEvents(process.stdin);
-if (process.stdin.isTTY)
-    process.stdin.setRawMode(true);
-process.stdin.on('keypress', (str, key) => {
-    if (key.ctrl && key.name === 'r') {
-        restartServer();
-    }
-    if (key.ctrl && key.name === 'c') {
-        console.log('\n🛑 主进程退出');
-        if (child)
-            child.kill('SIGTERM');
-        process.exit(0);
-    }
-});
-//# sourceMappingURL=watch.js.map
+const { fork } = require('child_process');
+const readline = require('readline');
+const path = require('path');
+
+let child = null;
+
+// 判断是否包含 dev
+const argv = process.argv;
+const isDev = argv.includes('dev');
+
+// 子进程入口
+const childScript = path.resolve(__dirname, isDev ? 'server.ts' : 'main.js');
+const childArgs = argv.slice(2); // 传递给子进程的参数
+
+let last = 0
+let running = false;
+function startServer() {
+    if(running === true && Date.now() - last <= 3000) {
+        // 最少3秒重启一次
+        console.log(`${last} server started`);
+        return;
+    }
+    last = Date.now();
+    running = true;
+    console.log('🚀 启动子进程...', (new Date()).toLocaleString());
+
+    if (isDev) {
+        // dev 模式下 fork ts 文件，使用 ts-node/register
+        child = fork(childScript, [...childArgs,'--watch'], {
+            stdio: ['inherit', 'inherit', 'inherit', 'ipc'], // 输出 + 消息通道
+            execArgv: ['-r', 'ts-node/register'],
+            env: { ...process.env }
+        });
+    } else {
+        // 生产模式 fork js 文件
+        child = fork(childScript, childArgs, {
+            stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+            env: { ...process.env }
+        });
+    }
+
+    // 监听子进程发来的消息
+    child.on('message', (msg) => {
+        if (msg === 'restart') {
+            console.log('♻️ 子进程请求重启...');
+            restartServer();
+        }
+    });
+
+    // 子进程退出事件
+    child.on('exit', (code, signal) => {
+        console.log(`⚠️ 子进程退出：code=${code}, signal=${signal}`);
+    });
+}
+
+function restartServer() {
+    running = false;
+    if (child) {
+        console.log('♻️ 正在重启子进程...');
+        child.kill('SIGTERM'); // 发送信号让子进程优雅退出
+        setTimeout(() => startServer(), 500); // 延迟重启，给端口释放时间
+    } else {
+        startServer();
+    }
+}
+
+// 启动子进程
+startServer();
+
+// 监听键盘输入
+readline.emitKeypressEvents(process.stdin);
+if (process.stdin.isTTY) process.stdin.setRawMode(true);
+
+process.stdin.on('keypress', (str, key) => {
+    // Ctrl + R 重启
+    if (key.ctrl && key.name === 'r') {
+        restartServer();
+    }
+
+    // Ctrl + C 退出
+    if (key.ctrl && key.name === 'c') {
+        console.log('\n🛑 主进程退出');
+        if (child) child.kill('SIGTERM');
+        process.exit(0);
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filecat",
-  "version": "5.16.1",
+  "version": "5.16.2",
   "description": "FileCat Server Manager",
   "author": "xiaobaidadada",
   "scripts": {
@@ -12,10 +12,11 @@
     "server-watch": "node ./src/main/watch.js --env ./env dev",
     "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",
-    "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",
+    "web-build-test": "tsc && npx webpack  --config shell/config/webpack.web.config.js",
+    "server-build-test": "tsc && npx webpack --config shell/config/webpack.npm.config.js",
     "npm-build": "tsc && node shell/build.js npm",
     "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",
@@ -108,7 +109,7 @@
     "chokidar": "^4.0.3",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.10.0",
-    "dockerode": "^4.0.9",
+    "docker-cli-js": "^2.10.0",
     "fluent-ffmpeg": "^2.1.3",
     "flv.js": "^1.6.2",
     "fs-extra": "^11.2.0",

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

@@ -25,7 +25,7 @@ module.exports = {
     },
     externalsPresets: { node: true },
     externals: [
-        {
+        { // 这些都不安装，需要安装dev依赖
             '@aws-sdk/client-s3': 'S3', // 假设全局变量名为 S3 是 @aws-sdk/client-s3带 @符号的话会无法压缩
             // 'routing-controllers':'commonjs routing-controllers', // 有一些动态引入(他需要的动态引入也需要导入)，或者含有.node(使用用户自己安装编译的版本) 无法被打包 直接忽略这个包
             'cors':'commonjs cors', // 动态加载无法打包 如果需要可以使用 import "cors"