@whyour/qinglong 0.6.1 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/static/build/public.js

@@ -13,7 +13,7 @@ const client = new health_1.HealthClient(`localhost:${config_1.default.cronPort}
 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 });
     });

package/static/build/services/dependence.js

@@ -138,7 +138,7 @@ let DependenceService = class DependenceService {
                 const socketMessageType = isInstall
                     ? 'installDependence'
                     : 'uninstallDependence';
-                const depName = dependency.name.trim();
+                let depName = dependency.name.trim();
                 const depRunCommand = (isInstall
                     ? dependence_1.InstallDependenceCommandTypes
                     : dependence_1.unInstallDependenceCommandTypes)[dependency.type];
@@ -155,22 +155,28 @@ let DependenceService = class DependenceService {
                 if (isInstall) {
                     const getCommandPrefix = dependence_1.GetDependenceCommandTypes[dependency.type];
                     const depVersionStr = dependence_1.versionDependenceCommandTypes[dependency.type];
-                    const [_depName, _depVersion] = 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 === dependence_1.DependenceTypes.nodejs;
                     const isLinuxDependence = dependency.type === dependence_1.DependenceTypes.linux;
                     const isPythonDependence = dependency.type === dependence_1.DependenceTypes.python3;
                     const depInfo = (await (0, util_1.promiseExecSuccess)(isNodeDependence
-                        ? `${getCommandPrefix} | grep "${_depName}" | head -1`
-                        : `${getCommandPrefix} ${_depName}`)).replace(/\s{2,}/, ' ');
+                        ? `${getCommandPrefix} | grep "${depName}" | head -1`
+                        : `${getCommandPrefix} ${depName}`)).replace(/\s{2,}/, ' ');
                     if (depInfo &&
-                        ((isNodeDependence && ((_a = depInfo.split(' ')) === null || _a === void 0 ? void 0 : _a[0]) === _depName) ||
+                        ((isNodeDependence && ((_a = depInfo.split(' ')) === null || _a === void 0 ? void 0 : _a[0]) === depName) ||
                             (isLinuxDependence && depInfo.toLocaleLowerCase().includes('installed')) ||
                             isPythonDependence) &&
-                        (!_depVersion || depInfo.includes(_depVersion))) {
+                        (!depVersion || depInfo.includes(depVersion))) {
                         const endTime = (0, dayjs_1.default)();
-                        const _message = `检测到已经安装 ${_depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                        const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
                         this.sockService.sendMessage({
                             type: socketMessageType,
                             message: _message,
@@ -181,7 +187,7 @@ let DependenceService = class DependenceService {
                         return resolve(null);
                     }
                 }
-                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${depName}`, {
+                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${dependency.name.trim()}`, {
                     shell: '/bin/bash',
                 });
                 cp.stdout.on('data', async (data) => {

package/version.yaml

@@ -1,7 +1,6 @@
-version: 2.15.19
-changeLogLink: https://t.me/jiao_long/385
-publishTime: 2023-07-20 23:59
+version: 2.15.20
+changeLogLink: https://t.me/jiao_long/386
+publishTime: 2023-07-22 16:00
 changeLog: |
-  1. 通知支持 pushMe
-  2. 修复系统通知设置保存失败
-  3. 修复判断依赖已安装逻辑
+  1. 修复判断 linux 依赖已安装逻辑
+  2. 修复未启动完成时，页面提示 500