Merge branch 'whyour:develop' into develop

back/config/index.ts

@@ -20,6 +20,7 @@ const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
 const dataPath = path.join(rootPath, 'data/');
+const shellPath = path.join(rootPath, 'shell/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
@@ -44,6 +45,7 @@ const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path.join(rootPath, 'version.yaml');
 const dataTgzFile = path.join(tmpPath, 'data.tgz');
+const shareShellFile = path.join(shellPath, 'share.sh');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -64,6 +66,7 @@ export default {
   tmpPath,
   dataPath,
   dataTgzFile,
+  shareShellFile,
   configString,
   loginFaild,
   authError,

back/data/dependence.ts

@@ -43,13 +43,13 @@ export enum DependenceTypes {
 export enum InstallDependenceCommandTypes {
   'pnpm add -g',
   'pip3 install --disable-pip-version-check --root-user-action=ignore',
-  'apk add',
+  'apk add --no-check-certificate',
 }
 
 export enum GetDependenceCommandTypes {
   'pnpm ls -g ',
-  'pip3 list --disable-pip-version-check',
+  'pip3 show --disable-pip-version-check',
-  'apk info',
+  'apk info -es',
 }
 
 export enum versionDependenceCommandTypes {

back/loaders/initData.ts

@@ -38,7 +38,7 @@ export default async () => {
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
   DependenceModel.findAll({
     where: {},
-    order: [['type', 'DESC']],
+    order: [['type', 'DESC'], ['createdAt', 'DESC']],
     raw: true,
   }).then(async (docs) => {
     await DependenceModel.update(

back/public.ts

@@ -13,7 +13,7 @@ const client = new HealthClient(
 app.get('/api/health', (req, res) => {
   client.check({ service: 'cron' }, (err, response) => {
     if (err) {
-      return res.status(500).send({ code: 500, error: err });
+      return res.status(200).send({ code: 500, error: err });
     }
     return res.status(200).send({ code: 200, data: response });
   });

back/services/dependence.ts

@@ -23,7 +23,7 @@ export default class DependenceService {
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
-  ) {}
+  ) { }
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
@@ -168,7 +168,7 @@ export default class DependenceService {
         const socketMessageType = isInstall
           ? 'installDependence'
           : 'uninstallDependence';
-        const depName = dependency.name.trim();
+        let depName = dependency.name.trim();
         const depRunCommand = (
           isInstall
             ? InstallDependenceCommandTypes
@@ -191,18 +191,35 @@ export default class DependenceService {
         if (isInstall) {
           const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
           const depVersionStr = versionDependenceCommandTypes[dependency.type];
-          const [_depName] = dependency.name.trim().split(depVersionStr);
+          let depVersion = '';
+          if (depName.includes(depVersionStr)) {
+            const symbolRegx = new RegExp(`(.*)${depVersionStr}([0-9\\.\\-\\+a-zA-Z]*)`);
+            const [, _depName, _depVersion] = depName.match(symbolRegx) || [];
+            if (_depVersion && _depName) {
+              depName = _depName;
+              depVersion = _depVersion;
+            }
+          }
+          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
+          const isLinuxDependence = dependency.type === DependenceTypes.linux;
+          const isPythonDependence = dependency.type === DependenceTypes.python3;
           const depInfo = (
             await promiseExecSuccess(
-              dependency.type === DependenceTypes.linux
+              isNodeDependence
-                ? `${getCommandPrefix} ${_depName}`
+                ? `${getCommandPrefix} | grep "${depName}" | head -1`
-                : `${getCommandPrefix} | grep "${_depName}"`,
+                : `${getCommandPrefix} ${depName}`,
             )
-          ).replace(/\s{2,}/, ' ');
+          ).replace(/\s{2,}/, ' ').replace(/\s+$/, '');
 
-          if (depInfo) {
+          if (
+            depInfo &&
+            ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
+              (isLinuxDependence && depInfo.toLocaleLowerCase().includes('installed')) ||
+              isPythonDependence) &&
+            (!depVersion || depInfo.includes(depVersion))
+          ) {
             const endTime = dayjs();
-            const _message = `检测到已经安装 ${_depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
+            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
               'YYYY-MM-DD HH:mm:ss',
             )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
             this.sockService.sendMessage({
@@ -219,7 +236,7 @@ export default class DependenceService {
           }
         }
 
-        const cp = spawn(`${depRunCommand} ${depName}`, {
+        const cp = spawn(`source ${config.shareShellFile} && set_proxy && ${depRunCommand} ${dependency.name.trim()}`, {
           shell: '/bin/bash',
         });
 

docker/Dockerfile

@@ -24,7 +24,6 @@ ENV PNPM_HOME=/root/.local/share/pnpm \
   QL_BRANCH=${QL_BRANCH}
 
 RUN set -x \
-  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
   && apk update -f \
   && apk upgrade \
   && apk --no-cache add -f bash \

shell/check.sh

@@ -79,8 +79,6 @@ main() {
   npm i -g pnpm@8.3.1
   patch_version
 
-  apk add procps netcat-openbsd
-
   if [[ $PipMirror ]]; then
     pip3 config set global.index-url $PipMirror
   fi

shell/share.sh

@@ -314,7 +314,6 @@ reload_pm2() {
   unset_proxy
   pm2 flush &>/dev/null
   pm2 startOrGracefulReload $file_ecosystem_js --update-env
-  pm2 sendSignal SIGKILL panel &>/dev/null
 }
 
 diff_time() {

src/pages/dependence/index.tsx

@@ -290,7 +290,7 @@ const Dependence = () => {
   const handleDependence = (dependence: any) => {
     const result = [...value];
     if (Array.isArray(dependence)) {
-      result.push(...dependence);
+      result.unshift(...dependence);
     } else {
       const index = value.findIndex((x) => x.id === dependence.id);
       if (index !== -1) {

src/utils/http.ts

@@ -11,6 +11,7 @@ interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
+  error?: any;
 }
 
 type Override<

version.yaml

@@ -1,7 +1,6 @@
-version: 2.15.18
+version: 2.15.20
-changeLogLink: https://t.me/jiao_long/384
+changeLogLink: https://t.me/jiao_long/386
-publishTime: 2023-07-19 21:21
+publishTime: 2023-07-22 16:00
 changeLog: |
-  1. 增加备份恢复功能
+  1. 修复判断 linux 依赖已安装逻辑
-  2. 重构系统检查更新逻辑
+  2. 修复未启动完成时，页面提示 500
-  3. 修复系统设置自动删除日志启动时失效