@whyour/qinglong 0.4.1 → 0.4.3

package/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-slim-bullseye as nodebuilder
+FROM node:18-slim as nodebuilder
 
 FROM python:3.10-slim-bullseye as builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/

package/package.json

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

package/static/build/services/cron.js

@@ -336,7 +336,7 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
     }
     async runSingle(cronId) {
-        return (0, pLimit_1.runCronWithLimit)(() => {
+        return (0, pLimit_1.runWithCpuLimit)(() => {
             return new Promise(async (resolve) => {
                 const cron = await this.getDb({ id: cronId });
                 if (cron.status !== cron_1.CrontabStatus.queued) {

package/static/build/services/dependence.js

@@ -95,7 +95,7 @@ let DependenceService = class DependenceService {
     }
     installDependenceOneByOne(docs, isInstall = true, force = false) {
         docs.forEach((dep) => {
-            this.installOrUninstallDependencies([dep], isInstall, force);
+            this.installOrUninstallDependency(dep, isInstall, force);
         });
     }
     async reInstall(ids) {
@@ -120,14 +120,11 @@ let DependenceService = class DependenceService {
         const newLog = (doc === null || doc === void 0 ? void 0 : doc.log) ? [...doc.log, log] : [log];
         await dependence_1.DependenceModel.update({ log: newLog }, { where: { id: ids } });
     }
-    installOrUninstallDependencies(dependencies, isInstall = true, force = false) {
-        return (0, pLimit_1.runCronWithLimit)(() => {
+    installOrUninstallDependency(dependency, isInstall = true, force = false) {
+        const fn = dependency.type === dependence_1.DependenceTypes.linux ? pLimit_1.runOneByOne : pLimit_1.runWithCpuLimit;
+        return fn(() => {
             return new Promise(async (resolve) => {
-                if (dependencies.length === 0) {
-                    resolve(null);
-                    return;
-                }
-                const depIds = dependencies.map((x) => x.id);
+                const depIds = [dependency.id];
                 const status = isInstall
                     ? dependence_1.DependenceStatus.installing
                     : dependence_1.DependenceStatus.removing;
@@ -135,20 +132,20 @@ let DependenceService = class DependenceService {
                 const socketMessageType = !force
                     ? 'installDependence'
                     : 'uninstallDependence';
-                const depNames = dependencies.map((x) => x.name).join(' ');
+                const depName = dependency.name;
                 const depRunCommand = (isInstall
                     ? dependence_1.InstallDependenceCommandTypes
-                    : dependence_1.unInstallDependenceCommandTypes)[dependencies[0].type];
+                    : dependence_1.unInstallDependenceCommandTypes)[dependency.type];
                 const actionText = isInstall ? '安装' : '删除';
                 const startTime = (0, dayjs_1.default)();
-                const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
+                const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
                 this.sockService.sendMessage({
                     type: socketMessageType,
                     message,
                     references: depIds,
                 });
                 await this.updateLog(depIds, message);
-                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${depNames}`, {
+                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${depName}`, {
                     shell: '/bin/bash',
                 });
                 cp.stdout.on('data', async (data) => {

package/static/build/services/schedule.js

@@ -30,7 +30,7 @@ let ScheduleService = class ScheduleService {
         this.maxBuffer = 200 * 1024 * 1024;
     }
     async runTask(command, callbacks = {}, completionTime = 'end') {
-        return (0, pLimit_1.runCronWithLimit)(() => {
+        return (0, pLimit_1.runWithCpuLimit)(() => {
             return new Promise(async (resolve, reject) => {
                 var _a, _b, _c;
                 try {

package/static/build/shared/pLimit.js

@@ -3,14 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCronWithLimit = void 0;
+exports.runOneByOne = exports.runWithCpuLimit = void 0;
 const p_limit_1 = __importDefault(require("p-limit"));
 const os_1 = __importDefault(require("os"));
-const cronLimit = (0, p_limit_1.default)(os_1.default.cpus().length);
-function runCronWithLimit(fn) {
-    return cronLimit(() => {
+const cpuLimit = (0, p_limit_1.default)(os_1.default.cpus().length);
+const oneLimit = (0, p_limit_1.default)(1);
+function runWithCpuLimit(fn) {
+    return cpuLimit(() => {
         return fn();
     });
 }
-exports.runCronWithLimit = runCronWithLimit;
+exports.runWithCpuLimit = runWithCpuLimit;
+function runOneByOne(fn) {
+    return oneLimit(() => {
+        return fn();
+    });
+}
+exports.runOneByOne = runOneByOne;
 //# sourceMappingURL=pLimit.js.map

package/static/build/shared/runCron.js

@@ -8,7 +8,7 @@ const cross_spawn_1 = require("cross-spawn");
 const pLimit_1 = require("./pLimit");
 const logger_1 = __importDefault(require("../loaders/logger"));
 function runCron(cmd) {
-    return (0, pLimit_1.runCronWithLimit)(() => {
+    return (0, pLimit_1.runWithCpuLimit)(() => {
         return new Promise(async (resolve) => {
             logger_1.default.silly('运行命令: ' + cmd);
             const cp = (0, cross_spawn_1.spawn)(cmd, { shell: '/bin/bash' });