@aiscene/aiserver 1.3.6 → 1.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/cli.d.ts +1 -0
- package/dist/config/cli.d.ts.map +1 -1
- package/dist/config/cli.js.map +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +1 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/core/types.d.ts +1 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/debug/types.d.ts +2 -0
- package/dist/debug/types.d.ts.map +1 -1
- package/dist/debug/websocket-server.d.ts +1 -0
- package/dist/debug/websocket-server.d.ts.map +1 -1
- package/dist/debug/websocket-server.js +203 -21
- package/dist/debug/websocket-server.js.map +1 -1
- package/dist/executor/cli-executor.d.ts.map +1 -1
- package/dist/executor/cli-executor.js +30 -5
- package/dist/executor/cli-executor.js.map +1 -1
- package/dist/executor/worker-entry.js +23 -125
- package/dist/executor/worker-entry.js.map +1 -1
- package/dist/task/scheduler.d.ts.map +1 -1
- package/dist/task/scheduler.js +49 -42
- package/dist/task/scheduler.js.map +1 -1
- package/dist/web/debug-page.d.ts.map +1 -1
- package/dist/web/debug-page.js +31 -0
- package/dist/web/debug-page.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-entry.js","sourceRoot":"","sources":["../../src/executor/worker-entry.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"worker-entry.js","sourceRoot":"","sources":["../../src/executor/worker-entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,qBAAa,aAAa;IACxB,OAAO,CAAC,YAAY,CAAwC;IAC5D,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,WAAW,CAAC,CAAc;IAE5B,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7H,aAAa,IAAI,OAAO;IAIxB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS1B,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAIjD,qBAAa,aAAa;IACxB,OAAO,CAAC,YAAY,CAAwC;IAC5D,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,WAAW,CAAC,CAAc;IAE5B,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7H,aAAa,IAAI,OAAO;IAIxB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS1B,OAAO,CAAC,WAAW;IAkHnB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,mBAAmB;IAgK3B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAsBvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IA4BjC,QAAQ,IAAI,cAAc;IAUpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}
|
package/dist/task/scheduler.js
CHANGED
|
@@ -79,51 +79,40 @@ export class TaskScheduler {
|
|
|
79
79
|
childProcess.kill('SIGKILL');
|
|
80
80
|
}, 5000);
|
|
81
81
|
}, timeout);
|
|
82
|
-
//
|
|
83
|
-
//
|
|
84
|
-
|
|
85
|
-
const resultPromise = new Promise((resolve) => {
|
|
86
|
-
resultResolve = resolve;
|
|
87
|
-
});
|
|
82
|
+
// 以 IPC message 为主结果来源，exit 事件只做兜底清理
|
|
83
|
+
// Node.js 保证：fork 的子进程 process.send 回调成功 → 主进程 message 事件触发
|
|
84
|
+
// 所以只要 worker 在 process.exit 前 await sendResult 完成，message 一定先于 exit
|
|
88
85
|
let resultHandled = false;
|
|
89
|
-
|
|
86
|
+
const handleResult = (msg) => {
|
|
87
|
+
if (resultHandled)
|
|
88
|
+
return;
|
|
89
|
+
resultHandled = true;
|
|
90
90
|
clearTimeout(timer);
|
|
91
91
|
if (forceKillTimer)
|
|
92
92
|
clearTimeout(forceKillTimer);
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
this.handleTaskResult(task, msg);
|
|
94
|
+
};
|
|
95
|
+
childProcess.on('message', (msg) => {
|
|
96
|
+
handleResult(msg);
|
|
95
97
|
});
|
|
96
|
-
childProcess.on('exit',
|
|
98
|
+
childProcess.on('exit', (code, signal) => {
|
|
97
99
|
clearTimeout(timer);
|
|
98
100
|
if (forceKillTimer)
|
|
99
101
|
clearTimeout(forceKillTimer);
|
|
100
102
|
this.runningTasks.delete(task.taskId);
|
|
101
|
-
//
|
|
102
|
-
if (
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
this.handleTaskResult(task, msg);
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
const errorMsg = code === null
|
|
118
|
-
? `Worker was terminated (signal: ${signal || 'unknown'})`
|
|
119
|
-
: `Worker exited with code ${code}`;
|
|
120
|
-
logger.error(`Task ${task.taskId} did not send result. ${errorMsg}`);
|
|
121
|
-
this.handleTaskResult(task, {
|
|
122
|
-
success: false,
|
|
123
|
-
errorMessage: errorMsg,
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
}
|
|
103
|
+
// 如果 message 已经处理过，exit 只做清理
|
|
104
|
+
if (resultHandled)
|
|
105
|
+
return;
|
|
106
|
+
// 兜底：worker 异常退出（被信号杀死、未 sendResult 就崩溃等）
|
|
107
|
+
resultHandled = true;
|
|
108
|
+
const errorMsg = code === null
|
|
109
|
+
? `Worker was terminated (signal: ${signal || 'unknown'})`
|
|
110
|
+
: `Worker exited with code ${code}`;
|
|
111
|
+
logger.error(`Task ${task.taskId} did not send result. ${errorMsg}`);
|
|
112
|
+
this.handleTaskResult(task, {
|
|
113
|
+
success: code === 0,
|
|
114
|
+
errorMessage: code === 0 ? undefined : errorMsg,
|
|
115
|
+
});
|
|
127
116
|
});
|
|
128
117
|
childProcess.on('error', async (error) => {
|
|
129
118
|
clearTimeout(timer);
|
|
@@ -352,14 +341,32 @@ export class TaskScheduler {
|
|
|
352
341
|
}
|
|
353
342
|
stopTask(taskId) {
|
|
354
343
|
const childProcess = this.runningTasks.get(taskId);
|
|
355
|
-
if (childProcess)
|
|
344
|
+
if (!childProcess)
|
|
345
|
+
return false;
|
|
346
|
+
// 只发 SIGTERM，让 worker 走 SIGTERM handler 自行 sendResult（含 reportFile）
|
|
347
|
+
// 然后由现有的 message / exit 监听器统一调用 handleTaskResult，
|
|
348
|
+
// 这样能保证报告上传 + 状态同步完整执行；不要在这里抢先 emit 'task:failed'，
|
|
349
|
+
// 否则会和 worker 返回的结果重复触发，且会丢失 reportFile。
|
|
350
|
+
logger.info(`Stopping task ${taskId}: sending SIGTERM, waiting for worker to send result`);
|
|
351
|
+
try {
|
|
356
352
|
childProcess.kill('SIGTERM');
|
|
357
|
-
this.runningTasks.delete(taskId);
|
|
358
|
-
taskRepo.updateStatus(taskId, 'stopped');
|
|
359
|
-
eventBus.emitEvent('task:failed', 'scheduler', { taskId, errorMessage: 'Task stopped by user' });
|
|
360
|
-
return true;
|
|
361
353
|
}
|
|
362
|
-
|
|
354
|
+
catch (e) {
|
|
355
|
+
logger.warn(`Failed to send SIGTERM to task ${taskId}: ${e.message}`);
|
|
356
|
+
}
|
|
357
|
+
// 5 秒后若进程仍未退出则强杀（兜底由现有 exit 兜底逻辑处理结果）
|
|
358
|
+
setTimeout(() => {
|
|
359
|
+
if (this.runningTasks.has(taskId)) {
|
|
360
|
+
logger.warn(`Task ${taskId} still alive after SIGTERM, force killing`);
|
|
361
|
+
try {
|
|
362
|
+
childProcess.kill('SIGKILL');
|
|
363
|
+
}
|
|
364
|
+
catch {
|
|
365
|
+
// ignore
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
}, 5000);
|
|
369
|
+
return true;
|
|
363
370
|
}
|
|
364
371
|
getStats() {
|
|
365
372
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-page.d.ts","sourceRoot":"","sources":["../../src/web/debug-page.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"debug-page.d.ts","sourceRoot":"","sources":["../../src/web/debug-page.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAquDzC"}
|
package/dist/web/debug-page.js
CHANGED
|
@@ -232,6 +232,27 @@ html,body{overflow:hidden;margin:0;padding:0}
|
|
|
232
232
|
<input type="checkbox" id="debug-mobileMode">
|
|
233
233
|
<label for="debug-mobileMode">模拟移动端</label>
|
|
234
234
|
</div>
|
|
235
|
+
<div id="debug-device-select" style="display:none;margin-top:8px">
|
|
236
|
+
<label>设备型号</label>
|
|
237
|
+
<select id="debug-deviceName">
|
|
238
|
+
<option value="iPhone 13">iPhone 13</option>
|
|
239
|
+
<option value="iPhone 14">iPhone 14</option>
|
|
240
|
+
<option value="iPhone 14 Pro">iPhone 14 Pro</option>
|
|
241
|
+
<option value="iPhone 14 Pro Max">iPhone 14 Pro Max</option>
|
|
242
|
+
<option value="iPhone 15">iPhone 15</option>
|
|
243
|
+
<option value="iPhone 15 Pro">iPhone 15 Pro</option>
|
|
244
|
+
<option value="iPhone 15 Pro Max">iPhone 15 Pro Max</option>
|
|
245
|
+
<option value="Pixel 7">Pixel 7</option>
|
|
246
|
+
<option value="Pixel 5">Pixel 5</option>
|
|
247
|
+
<option value="Galaxy S5">Galaxy S5</option>
|
|
248
|
+
<option value="Galaxy S20">Galaxy S20</option>
|
|
249
|
+
<option value="Galaxy S21">Galaxy S21</option>
|
|
250
|
+
<option value="Galaxy S22">Galaxy S22</option>
|
|
251
|
+
<option value="Galaxy S23 Ultra">Galaxy S23 Ultra</option>
|
|
252
|
+
<option value="iPad Mini">iPad Mini</option>
|
|
253
|
+
<option value="iPad Pro 11">iPad Pro 11</option>
|
|
254
|
+
</select>
|
|
255
|
+
</div>
|
|
235
256
|
</div>
|
|
236
257
|
|
|
237
258
|
<div class="form-group">
|
|
@@ -453,6 +474,14 @@ function onRunModeChange() {
|
|
|
453
474
|
if(debugState.runMode === 'device') refreshDevices();
|
|
454
475
|
}
|
|
455
476
|
|
|
477
|
+
// 手机模式切换：显示/隐藏设备选择器
|
|
478
|
+
document.getElementById('debug-mobileMode')?.addEventListener('change', function() {
|
|
479
|
+
const deviceSelect = document.getElementById('debug-device-select');
|
|
480
|
+
if (deviceSelect) {
|
|
481
|
+
deviceSelect.style.display = this.checked ? '' : 'none';
|
|
482
|
+
}
|
|
483
|
+
});
|
|
484
|
+
|
|
456
485
|
function onPlatformChange() {
|
|
457
486
|
debugState.platform = document.getElementById('debug-platform').value;
|
|
458
487
|
const label = document.getElementById('debug-package-label');
|
|
@@ -649,6 +678,7 @@ async function handleDebugExecute() {
|
|
|
649
678
|
platform: runMode === 'device' ? document.getElementById('debug-platform').value : undefined,
|
|
650
679
|
packageName: runMode === 'device' ? getPackageName() : undefined,
|
|
651
680
|
mobileMode: document.getElementById('debug-mobileMode')?.checked || false,
|
|
681
|
+
deviceName: document.getElementById('debug-mobileMode')?.checked ? (document.getElementById('debug-deviceName')?.value || 'iPhone 13') : undefined,
|
|
652
682
|
isRnUrl: false,
|
|
653
683
|
};
|
|
654
684
|
|
|
@@ -1473,6 +1503,7 @@ async function handleSaveCase() {
|
|
|
1473
1503
|
platform: runMode === 'device' ? document.getElementById('debug-platform').value : undefined,
|
|
1474
1504
|
packageName: runMode === 'device' ? getPackageName() : undefined,
|
|
1475
1505
|
mobileMode: document.getElementById('debug-mobileMode')?.checked || false,
|
|
1506
|
+
deviceName: document.getElementById('debug-mobileMode')?.checked ? (document.getElementById('debug-deviceName')?.value || 'iPhone 13') : undefined,
|
|
1476
1507
|
isRnUrl: false,
|
|
1477
1508
|
loginUsername: document.getElementById('debug-loginUser').value || undefined,
|
|
1478
1509
|
loginPassword: document.getElementById('debug-loginPass').value || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-page.js","sourceRoot":"","sources":["../../src/web/debug-page.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO
|
|
1
|
+
{"version":3,"file":"debug-page.js","sourceRoot":"","sources":["../../src/web/debug-page.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmuDR,CAAC;AACF,CAAC"}
|