echoapi-cron-scheduler-batch 1.0.2 → 1.0.4

package/index.js

@@ -42,7 +42,6 @@ class CronScheduler {
                 is_cancel INTEGER DEFAULT 0,
                 api_token TEXT,
                 project_id TEXT,
-                user_uid TEXT,        -- 新增：存储用户UID
                 cases TEXT,           -- 存储 runners 数组 JSON
                 create_dtime INTEGER
             )
@@ -168,7 +167,6 @@ class CronScheduler {
                     job_id: record.job_info.job_id,
                     report_name: record.job_info.name,
                     project_id: record.job_info.project_id,
-                    user_uid: record.job_info.user_uid, // 放入最终报文
                     execution_id: executionId,
                     start_at: this.formatTimeToISO(record.job_info.start_time),
                     end_at: this.formatTimeToISO(endTime),
@@ -295,22 +293,21 @@ class CronScheduler {
      * 创建或更新任务
      */
     createJob(payload) {
-        const { job_id, name, frequency, api_token, project_id, user_uid, runners } = payload;
+        const { job_id, name, frequency, api_token, project_id, runners } = payload;
         const casesJson = JSON.stringify(Array.isArray(runners) ? runners : []);
         const freqJson = JSON.stringify(frequency);
 
         const stmt = this.db.prepare(`
-            INSERT INTO jobs (job_id, name, frequency, api_token, project_id, cases, create_dtime)
+            INSERT INTO jobs (job_id, name, frequency, api_token, project_id, cases,  create_dtime)
             VALUES (?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT(job_id) DO UPDATE SET
                 name=excluded.name,
                 frequency=excluded.frequency,
                 cases=excluded.cases,
                 api_token=excluded.api_token,
-                user_uid=excluded.user_uid, -- 更新时也同步 UID
                 is_cancel=0
         `);
-        stmt.run(job_id, name, freqJson, api_token, project_id, user_uid || '', casesJson, Date.now());
+        stmt.run(job_id, name, freqJson, api_token, project_id, casesJson, Date.now());
 
         // 使用增量更新，不再 loadJobs()
         this.upsertTimer(job_id, name, frequency, { is_cancel: 0 });
@@ -395,7 +392,6 @@ class CronScheduler {
                     job_id: job.job_id,
                     name: job.name,
                     project_id: job.project_id,
-                    user_uid: job.user_uid, // 将 UID 存入内存
                     start_time: Date.now()
                     // 如果数据库有创建人字段，也可以存入：creator: job.creator
                 }
@@ -404,8 +400,10 @@ class CronScheduler {
             runners.forEach((runner, index) => {
                 // 负载均衡：选取当前存活的 worker 
                 const workers = Object.values(cluster.workers).filter(w => w.isConnected());
+                console.log(`[Dispatch] Active workers count: ${workers.length}`);
                 const worker = _.sample(workers);
                 if (worker) {
+                    console.log(`[Dispatch] Sending Unit ${index} to Worker ${worker.process.pid}`);
                     worker.send({
                         action: 'EXECUTE_UNIT',
                         payload: {
@@ -416,6 +414,8 @@ class CronScheduler {
                             unit_index: index
                         }
                     });
+                } else {
+                    console.error(`[Dispatch Error] No active workers available to handle job ${job.job_id}`);
                 }
             });
         } catch (e) {
@@ -428,50 +428,64 @@ class CronScheduler {
     // ==========================================
 
     _startWorker() {
-        const { run: runner } = require('runner-runtime');
-        const net = require('net');
-
-        process.on('message', async (msg) => {
-            if (msg.action === 'EXECUTE_UNIT') {
-                const { executionId, api_token, test_events, option } = msg.payload;
-                const socketPath = path.join(os.tmpdir(), `echoapi_${uuidv4()}.sock`);
-
-                const server = net.createServer((socket) => {
-                    socket.on('data', async (stream) => {
-                        try {
-                            const info = JSON.parse(stream.toString());
-                            const { action, data } = info;
-                            await this._handleUnitScript(socket, action, data);
-                        } catch (e) {
-                            socket.write(JSON.stringify({ status: 'error', message: e.message }) + "\n\n");
-                        }
+        try {
+            console.log(`[Worker ${process.pid}] Starting initialization...`);
+            const { run: runner } = require('runner-runtime');
+            const net = require('net');
+
+            process.on('message', async (msg) => {
+                if (msg.action === 'EXECUTE_UNIT') {
+                    const { executionId, api_token, test_events, option } = msg.payload;
+                    const socketPath = path.join(os.tmpdir(), `echoapi_${uuidv4()}.sock`);
+
+                    const server = net.createServer((socket) => {
+                        socket.on('data', async (stream) => {
+                            try {
+                                const info = JSON.parse(stream.toString());
+                                const { action, data } = info;
+                                await this._handleUnitScript(socket, action, data);
+                            } catch (e) {
+                                socket.write(JSON.stringify({ status: 'error', message: e.message }) + "\n\n");
+                            }
+                        });
                     });
-                });
 
-                server.listen(socketPath, () => {
-                    const finalOptions = _.cloneDeep(option || {});
-                    const base64Pipe = Buffer.from(socketPath).toString('base64');
-                    _.set(finalOptions, 'env.ELECTRON_PIPE', base64Pipe);
-
-                    runner(test_events, finalOptions, (res) => {
-                        if (res?.action === 'complete') {
-                            process.send({
-                                action: 'UNIT_COMPLETED',
-                                payload: { executionId, data: res.data, api_token }
-                            });
-                            server.close();
-                            if (fs.existsSync(socketPath)) {
-                                try { fs.unlinkSync(socketPath); } catch (e) { }
+                    // --- 这里是关键！注册错误监听 ---
+                    server.on('error', (err) => {
+                        // 在服务器上看到这个日志，就能定位是权限问题还是路径问题
+                        console.error(`[Worker Socket Server Error] PID: ${process.pid}`);
+                        console.error(`[Error Details] Code: ${err.code} | Message: ${err.message}`);
+                        console.error(`[Attempted Path] ${socketPath}`);
+                    });
+
+                    server.listen(socketPath, () => {
+                        const finalOptions = _.cloneDeep(option || {});
+                        const base64Pipe = Buffer.from(socketPath).toString('base64');
+                        _.set(finalOptions, 'env.ELECTRON_PIPE', base64Pipe);
+
+                        runner(test_events, finalOptions, (res) => {
+                            if (res?.action === 'complete') {
+                                process.send({
+                                    action: 'UNIT_COMPLETED',
+                                    payload: { executionId, data: res.data, api_token }
+                                });
+                                server.close();
+                                if (fs.existsSync(socketPath)) {
+                                    try { fs.unlinkSync(socketPath); } catch (e) { }
+                                }
                             }
-                        }
+                        });
                     });
-                });
-            }
-        });
-        process.on('uncaughtException', (err) => {
-            console.error('[Worker Fatal Error] 捕获到沙箱崩溃:', err.message);
-            // 即使崩溃也不要让子进程立即退出，或者让 Master 自动重启它
-        });
+                }
+            });
+            process.on('uncaughtException', (err) => {
+                console.error('[Worker Fatal Error] 捕获到沙箱崩溃:', err.message);
+                // 即使崩溃也不要让子进程立即退出，或者让 Master 自动重启它
+            });
+        } catch (error) {
+            console.error(`[Worker ${process.pid}] Critical Boot Error:`, err.stack);
+            process.exit(1);
+        }
     }
 
     async _handleUnitScript(socket, action, data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-cron-scheduler-batch",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {