@aiscene/aiserver 1.0.0
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/api/callback.d.ts +7 -0
- package/dist/api/callback.d.ts.map +1 -0
- package/dist/api/callback.js +116 -0
- package/dist/api/callback.js.map +1 -0
- package/dist/api/device-api.d.ts +13 -0
- package/dist/api/device-api.d.ts.map +1 -0
- package/dist/api/device-api.js +98 -0
- package/dist/api/device-api.js.map +1 -0
- package/dist/api/task-api.d.ts +9 -0
- package/dist/api/task-api.d.ts.map +1 -0
- package/dist/api/task-api.js +47 -0
- package/dist/api/task-api.js.map +1 -0
- package/dist/config/cli.d.ts +30 -0
- package/dist/config/cli.d.ts.map +1 -0
- package/dist/config/cli.js +129 -0
- package/dist/config/cli.js.map +1 -0
- package/dist/config/index.d.ts +6 -0
- package/dist/config/index.d.ts.map +1 -0
- package/dist/config/index.js +142 -0
- package/dist/config/index.js.map +1 -0
- package/dist/config/schema.d.ts +66 -0
- package/dist/config/schema.d.ts.map +1 -0
- package/dist/config/schema.js +2 -0
- package/dist/config/schema.js.map +1 -0
- package/dist/core/event-bus.d.ts +14 -0
- package/dist/core/event-bus.d.ts.map +1 -0
- package/dist/core/event-bus.js +33 -0
- package/dist/core/event-bus.js.map +1 -0
- package/dist/core/logger.d.ts +24 -0
- package/dist/core/logger.d.ts.map +1 -0
- package/dist/core/logger.js +52 -0
- package/dist/core/logger.js.map +1 -0
- package/dist/core/types.d.ts +134 -0
- package/dist/core/types.d.ts.map +1 -0
- package/dist/core/types.js +3 -0
- package/dist/core/types.js.map +1 -0
- package/dist/debug/dump-manager.d.ts +10 -0
- package/dist/debug/dump-manager.d.ts.map +1 -0
- package/dist/debug/dump-manager.js +52 -0
- package/dist/debug/dump-manager.js.map +1 -0
- package/dist/debug/screencast.d.ts +11 -0
- package/dist/debug/screencast.d.ts.map +1 -0
- package/dist/debug/screencast.js +88 -0
- package/dist/debug/screencast.js.map +1 -0
- package/dist/debug/session-manager.d.ts +14 -0
- package/dist/debug/session-manager.d.ts.map +1 -0
- package/dist/debug/session-manager.js +76 -0
- package/dist/debug/session-manager.js.map +1 -0
- package/dist/debug/types.d.ts +76 -0
- package/dist/debug/types.d.ts.map +1 -0
- package/dist/debug/types.js +2 -0
- package/dist/debug/types.js.map +1 -0
- package/dist/debug/web-screencast.d.ts +60 -0
- package/dist/debug/web-screencast.d.ts.map +1 -0
- package/dist/debug/web-screencast.js +146 -0
- package/dist/debug/web-screencast.js.map +1 -0
- package/dist/debug/websocket-server.d.ts +27 -0
- package/dist/debug/websocket-server.d.ts.map +1 -0
- package/dist/debug/websocket-server.js +681 -0
- package/dist/debug/websocket-server.js.map +1 -0
- package/dist/device/detector.d.ts +10 -0
- package/dist/device/detector.d.ts.map +1 -0
- package/dist/device/detector.js +100 -0
- package/dist/device/detector.js.map +1 -0
- package/dist/device/heartbeat.d.ts +26 -0
- package/dist/device/heartbeat.d.ts.map +1 -0
- package/dist/device/heartbeat.js +225 -0
- package/dist/device/heartbeat.js.map +1 -0
- package/dist/device/status-manager.d.ts +15 -0
- package/dist/device/status-manager.d.ts.map +1 -0
- package/dist/device/status-manager.js +58 -0
- package/dist/device/status-manager.js.map +1 -0
- package/dist/device/types.d.ts +30 -0
- package/dist/device/types.d.ts.map +1 -0
- package/dist/device/types.js +2 -0
- package/dist/device/types.js.map +1 -0
- package/dist/executor/action-executor.d.ts +25 -0
- package/dist/executor/action-executor.d.ts.map +1 -0
- package/dist/executor/action-executor.js +261 -0
- package/dist/executor/action-executor.js.map +1 -0
- package/dist/executor/android-executor.d.ts +12 -0
- package/dist/executor/android-executor.d.ts.map +1 -0
- package/dist/executor/android-executor.js +127 -0
- package/dist/executor/android-executor.js.map +1 -0
- package/dist/executor/base.d.ts +20 -0
- package/dist/executor/base.d.ts.map +1 -0
- package/dist/executor/base.js +91 -0
- package/dist/executor/base.js.map +1 -0
- package/dist/executor/cli-executor.d.ts +12 -0
- package/dist/executor/cli-executor.d.ts.map +1 -0
- package/dist/executor/cli-executor.js +94 -0
- package/dist/executor/cli-executor.js.map +1 -0
- package/dist/executor/code-executor.d.ts +13 -0
- package/dist/executor/code-executor.d.ts.map +1 -0
- package/dist/executor/code-executor.js +52 -0
- package/dist/executor/code-executor.js.map +1 -0
- package/dist/executor/code-instrument.d.ts +12 -0
- package/dist/executor/code-instrument.d.ts.map +1 -0
- package/dist/executor/code-instrument.js +116 -0
- package/dist/executor/code-instrument.js.map +1 -0
- package/dist/executor/executor-factory.d.ts +7 -0
- package/dist/executor/executor-factory.d.ts.map +1 -0
- package/dist/executor/executor-factory.js +24 -0
- package/dist/executor/executor-factory.js.map +1 -0
- package/dist/executor/ios-executor.d.ts +10 -0
- package/dist/executor/ios-executor.d.ts.map +1 -0
- package/dist/executor/ios-executor.js +91 -0
- package/dist/executor/ios-executor.js.map +1 -0
- package/dist/executor/types.d.ts +14 -0
- package/dist/executor/types.d.ts.map +1 -0
- package/dist/executor/types.js +2 -0
- package/dist/executor/types.js.map +1 -0
- package/dist/executor/worker-entry.d.ts +2 -0
- package/dist/executor/worker-entry.d.ts.map +1 -0
- package/dist/executor/worker-entry.js +61 -0
- package/dist/executor/worker-entry.js.map +1 -0
- package/dist/index.d.ts +22 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +157 -0
- package/dist/index.js.map +1 -0
- package/dist/node/service.d.ts +21 -0
- package/dist/node/service.d.ts.map +1 -0
- package/dist/node/service.js +178 -0
- package/dist/node/service.js.map +1 -0
- package/dist/node/types.d.ts +45 -0
- package/dist/node/types.d.ts.map +1 -0
- package/dist/node/types.js +3 -0
- package/dist/node/types.js.map +1 -0
- package/dist/storage/database.d.ts +6 -0
- package/dist/storage/database.d.ts.map +1 -0
- package/dist/storage/database.js +154 -0
- package/dist/storage/database.js.map +1 -0
- package/dist/storage/repositories/debug-log-repo.d.ts +29 -0
- package/dist/storage/repositories/debug-log-repo.d.ts.map +1 -0
- package/dist/storage/repositories/debug-log-repo.js +90 -0
- package/dist/storage/repositories/debug-log-repo.js.map +1 -0
- package/dist/storage/repositories/device-repo.d.ts +12 -0
- package/dist/storage/repositories/device-repo.d.ts.map +1 -0
- package/dist/storage/repositories/device-repo.js +87 -0
- package/dist/storage/repositories/device-repo.js.map +1 -0
- package/dist/storage/repositories/execution-log-repo.d.ts +9 -0
- package/dist/storage/repositories/execution-log-repo.d.ts.map +1 -0
- package/dist/storage/repositories/execution-log-repo.js +49 -0
- package/dist/storage/repositories/execution-log-repo.js.map +1 -0
- package/dist/storage/repositories/task-repo.d.ts +13 -0
- package/dist/storage/repositories/task-repo.d.ts.map +1 -0
- package/dist/storage/repositories/task-repo.js +109 -0
- package/dist/storage/repositories/task-repo.js.map +1 -0
- package/dist/task/poller.d.ts +25 -0
- package/dist/task/poller.d.ts.map +1 -0
- package/dist/task/poller.js +153 -0
- package/dist/task/poller.js.map +1 -0
- package/dist/task/queue.d.ts +13 -0
- package/dist/task/queue.d.ts.map +1 -0
- package/dist/task/queue.js +38 -0
- package/dist/task/queue.js.map +1 -0
- package/dist/task/scheduler.d.ts +25 -0
- package/dist/task/scheduler.d.ts.map +1 -0
- package/dist/task/scheduler.js +274 -0
- package/dist/task/scheduler.js.map +1 -0
- package/dist/task/types.d.ts +31 -0
- package/dist/task/types.d.ts.map +1 -0
- package/dist/task/types.js +37 -0
- package/dist/task/types.js.map +1 -0
- package/dist/web/server.d.ts +14 -0
- package/dist/web/server.d.ts.map +1 -0
- package/dist/web/server.js +478 -0
- package/dist/web/server.js.map +1 -0
- package/package.json +49 -0
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { createLogger } from '../core/logger.js';
|
|
2
|
+
const logger = createLogger('TaskQueue');
|
|
3
|
+
export class TaskQueue {
|
|
4
|
+
queue = [];
|
|
5
|
+
enqueue(task) {
|
|
6
|
+
// Avoid duplicates
|
|
7
|
+
if (this.queue.some(t => t.taskId === task.taskId)) {
|
|
8
|
+
logger.debug(`Task ${task.taskId} already in queue, skipping`);
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
this.queue.push(task);
|
|
12
|
+
// Sort by priority descending
|
|
13
|
+
this.queue.sort((a, b) => (b.priority || 0) - (a.priority || 0));
|
|
14
|
+
logger.info(`Task ${task.taskId} enqueued (priority: ${task.priority}, queue size: ${this.queue.length})`);
|
|
15
|
+
}
|
|
16
|
+
dequeue() {
|
|
17
|
+
return this.queue.shift();
|
|
18
|
+
}
|
|
19
|
+
peek() {
|
|
20
|
+
return this.queue[0];
|
|
21
|
+
}
|
|
22
|
+
remove(taskId) {
|
|
23
|
+
this.queue = this.queue.filter(t => t.taskId !== taskId);
|
|
24
|
+
}
|
|
25
|
+
size() {
|
|
26
|
+
return this.queue.length;
|
|
27
|
+
}
|
|
28
|
+
isEmpty() {
|
|
29
|
+
return this.queue.length === 0;
|
|
30
|
+
}
|
|
31
|
+
getAll() {
|
|
32
|
+
return [...this.queue];
|
|
33
|
+
}
|
|
34
|
+
clear() {
|
|
35
|
+
this.queue = [];
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=queue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/task/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AAEzC,MAAM,OAAO,SAAS;IACZ,KAAK,GAAW,EAAE,CAAC;IAE3B,OAAO,CAAC,IAAU;QAChB,mBAAmB;QACnB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,MAAM,6BAA6B,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,8BAA8B;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,wBAAwB,IAAI,CAAC,QAAQ,iBAAiB,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7G,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { TaskConfig, CallbackConfig } from '../config/schema.js';
|
|
2
|
+
import type { Task } from '../core/types.js';
|
|
3
|
+
import type { SchedulerStats } from './types.js';
|
|
4
|
+
export declare class TaskScheduler {
|
|
5
|
+
private runningTasks;
|
|
6
|
+
private maxConcurrent;
|
|
7
|
+
private config;
|
|
8
|
+
private callbackConfig;
|
|
9
|
+
private aiConfig;
|
|
10
|
+
start(config: TaskConfig, callbackConfig: CallbackConfig): Promise<void>;
|
|
11
|
+
canAcceptMore(): boolean;
|
|
12
|
+
schedule(task: Task): void;
|
|
13
|
+
private executeTask;
|
|
14
|
+
private handleTaskResult;
|
|
15
|
+
private buildExecutorConfig;
|
|
16
|
+
/**
|
|
17
|
+
* Detect if naturalLanguage content is actually JS code rather than plain text
|
|
18
|
+
* JS code typically contains: await, this.agent, this.sleep, variable assignments, etc.
|
|
19
|
+
*/
|
|
20
|
+
private looksLikeJsCode;
|
|
21
|
+
stopTask(taskId: string): void;
|
|
22
|
+
getStats(): SchedulerStats;
|
|
23
|
+
stop(): Promise<void>;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=scheduler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAY,MAAM,qBAAqB,CAAC;AAChF,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,CAAa;IAClC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAY;IAEtB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9E,aAAa,IAAI,OAAO;IAIxB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS1B,OAAO,CAAC,WAAW;IAkEnB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,mBAAmB;IA+H3B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAsBvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAU9B,QAAQ,IAAI,cAAc;IAUpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}
|
|
@@ -0,0 +1,274 @@
|
|
|
1
|
+
import { fork } from 'child_process';
|
|
2
|
+
import { createLogger } from '../core/logger.js';
|
|
3
|
+
import { eventBus } from '../core/event-bus.js';
|
|
4
|
+
import { taskRepo } from '../storage/repositories/task-repo.js';
|
|
5
|
+
import { executionLogRepo } from '../storage/repositories/execution-log-repo.js';
|
|
6
|
+
const logger = createLogger('TaskScheduler');
|
|
7
|
+
export class TaskScheduler {
|
|
8
|
+
runningTasks = new Map();
|
|
9
|
+
maxConcurrent = 3;
|
|
10
|
+
config;
|
|
11
|
+
callbackConfig;
|
|
12
|
+
aiConfig;
|
|
13
|
+
async start(config, callbackConfig) {
|
|
14
|
+
this.config = config;
|
|
15
|
+
this.callbackConfig = callbackConfig;
|
|
16
|
+
this.maxConcurrent = config.maxConcurrent;
|
|
17
|
+
logger.info(`Task scheduler started (maxConcurrent: ${this.maxConcurrent})`);
|
|
18
|
+
}
|
|
19
|
+
canAcceptMore() {
|
|
20
|
+
return this.runningTasks.size < this.maxConcurrent;
|
|
21
|
+
}
|
|
22
|
+
schedule(task) {
|
|
23
|
+
if (!this.canAcceptMore()) {
|
|
24
|
+
logger.warn(`Scheduler full, cannot accept task ${task.taskId}`);
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
this.executeTask(task);
|
|
28
|
+
}
|
|
29
|
+
executeTask(task) {
|
|
30
|
+
taskRepo.updateStatus(task.taskId, 'running');
|
|
31
|
+
eventBus.emitEvent('task:started', 'scheduler', { taskId: task.taskId, type: task.type });
|
|
32
|
+
// 参考项目不在启动时通知服务器,只在完成/失败时通知
|
|
33
|
+
// 移除了: updateTaskStatusToServer(task.taskId, true, ...)
|
|
34
|
+
// Build executor config
|
|
35
|
+
const config = this.buildExecutorConfig(task);
|
|
36
|
+
logger.info(`Executing task ${task.taskId} with config: ${JSON.stringify(config)?.substring(0, 500)}`);
|
|
37
|
+
// Fork a child process to run the executor
|
|
38
|
+
const workerPath = new URL('../executor/worker-entry.js', import.meta.url).pathname;
|
|
39
|
+
const workerEnv = {
|
|
40
|
+
...process.env,
|
|
41
|
+
WORKER_CONFIG: JSON.stringify(config),
|
|
42
|
+
NODE_OPTIONS: '--max-old-space-size=4096',
|
|
43
|
+
};
|
|
44
|
+
const childProcess = fork(workerPath, ['--worker'], {
|
|
45
|
+
env: workerEnv,
|
|
46
|
+
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
|
|
47
|
+
});
|
|
48
|
+
this.runningTasks.set(task.taskId, childProcess);
|
|
49
|
+
// Timeout handler
|
|
50
|
+
const timeout = this.config.timeout || 1200000;
|
|
51
|
+
const timer = setTimeout(() => {
|
|
52
|
+
logger.error(`Task ${task.taskId} timed out (${timeout}ms), killing`);
|
|
53
|
+
childProcess.kill('SIGKILL');
|
|
54
|
+
}, timeout);
|
|
55
|
+
let receivedResult = false;
|
|
56
|
+
childProcess.on('message', (msg) => {
|
|
57
|
+
receivedResult = true;
|
|
58
|
+
clearTimeout(timer);
|
|
59
|
+
this.handleTaskResult(task, msg);
|
|
60
|
+
});
|
|
61
|
+
childProcess.on('exit', (code) => {
|
|
62
|
+
clearTimeout(timer);
|
|
63
|
+
this.runningTasks.delete(task.taskId);
|
|
64
|
+
if (!receivedResult) {
|
|
65
|
+
this.handleTaskResult(task, {
|
|
66
|
+
success: false,
|
|
67
|
+
errorMessage: `Worker exited with code ${code}`,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
childProcess.on('error', (error) => {
|
|
72
|
+
clearTimeout(timer);
|
|
73
|
+
this.runningTasks.delete(task.taskId);
|
|
74
|
+
this.handleTaskResult(task, {
|
|
75
|
+
success: false,
|
|
76
|
+
errorMessage: error.message,
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
logger.info(`Task ${task.taskId} started (PID: ${childProcess.pid})`);
|
|
80
|
+
}
|
|
81
|
+
handleTaskResult(task, result) {
|
|
82
|
+
const status = result.success ? 'completed' : 'failed';
|
|
83
|
+
taskRepo.updateStatus(task.taskId, status, result.errorMessage, JSON.stringify(result));
|
|
84
|
+
// Emit event with full result data (including reportFile if available)
|
|
85
|
+
// This triggers report upload and status update in index.ts event listeners
|
|
86
|
+
eventBus.emitEvent(result.success ? 'task:completed' : 'task:failed', 'scheduler', {
|
|
87
|
+
taskId: task.taskId,
|
|
88
|
+
success: result.success,
|
|
89
|
+
reportFile: result.reportFile || undefined,
|
|
90
|
+
errorMessage: result.errorMessage,
|
|
91
|
+
});
|
|
92
|
+
// Log the result
|
|
93
|
+
executionLogRepo.create({
|
|
94
|
+
taskId: task.taskId,
|
|
95
|
+
level: result.success ? 'info' : 'error',
|
|
96
|
+
content: result.success ? 'Task completed successfully' : `Task failed: ${result.errorMessage}`,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
buildExecutorConfig(task) {
|
|
100
|
+
const baseConfig = {
|
|
101
|
+
type: task.type,
|
|
102
|
+
taskId: task.taskId,
|
|
103
|
+
executionId: task.executionId,
|
|
104
|
+
testName: `task-${task.taskId}`,
|
|
105
|
+
nodeId: this.config.nodeId,
|
|
106
|
+
startTime: Date.now(),
|
|
107
|
+
};
|
|
108
|
+
// Use allocated device from backend (highest priority)
|
|
109
|
+
if (task.device?.deviceId) {
|
|
110
|
+
baseConfig.udid = task.device.deviceId;
|
|
111
|
+
// Determine platform from device osType
|
|
112
|
+
if (task.device.osType === 'iOS') {
|
|
113
|
+
baseConfig.type = 'ios';
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
baseConfig.type = 'android';
|
|
117
|
+
}
|
|
118
|
+
logger.info(`Using allocated device: ${task.device.deviceId} (${task.device.osType || 'unknown'})`);
|
|
119
|
+
}
|
|
120
|
+
// Parse and merge executionParams from task.config
|
|
121
|
+
if (task.config) {
|
|
122
|
+
try {
|
|
123
|
+
const params = JSON.parse(task.config);
|
|
124
|
+
const config = params.config || {};
|
|
125
|
+
// Determine platform type (only if no allocated device)
|
|
126
|
+
if (!task.device?.deviceId) {
|
|
127
|
+
const isRealDevice = config.isRealDevice === true || params.targetDeviceId;
|
|
128
|
+
if (isRealDevice) {
|
|
129
|
+
baseConfig.type = 'android';
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
// Device ID: allocated device > targetDeviceId > config.deviceId > udid
|
|
133
|
+
if (!baseConfig.udid) {
|
|
134
|
+
baseConfig.udid = params.targetDeviceId || config.deviceId || config.udid;
|
|
135
|
+
}
|
|
136
|
+
// Package name
|
|
137
|
+
if (config.packageName)
|
|
138
|
+
baseConfig.packageName = config.packageName;
|
|
139
|
+
// Test URL
|
|
140
|
+
if (config.testUrl || params.testUrl) {
|
|
141
|
+
baseConfig.testUrl = config.testUrl || params.testUrl;
|
|
142
|
+
}
|
|
143
|
+
// Requirement / naturalLanguage for aiAction
|
|
144
|
+
const naturalLanguage = config.naturalLanguage || params.naturalLanguage || config.prompt || params.prompt || config.description || params.description;
|
|
145
|
+
if (naturalLanguage) {
|
|
146
|
+
// Check if it's JSON array format (new format with code blocks)
|
|
147
|
+
try {
|
|
148
|
+
const parsed = JSON.parse(naturalLanguage);
|
|
149
|
+
if (Array.isArray(parsed)) {
|
|
150
|
+
// Extract code fields and join
|
|
151
|
+
const codeContent = parsed
|
|
152
|
+
.map((item) => (item && typeof item === 'object' && item.code) ? String(item.code) : '')
|
|
153
|
+
.filter((code) => code.trim() !== '')
|
|
154
|
+
.join('\n');
|
|
155
|
+
if (codeContent) {
|
|
156
|
+
baseConfig.requirement = codeContent;
|
|
157
|
+
baseConfig.actionType = 'runCode';
|
|
158
|
+
// Pass code to actionParams.code for ActionExecutor.executeRunCode()
|
|
159
|
+
baseConfig.actionParams = { code: codeContent };
|
|
160
|
+
// Use 'action' executor type for JS code execution (runCode)
|
|
161
|
+
// Note: actual type assignment is after Object.assign to avoid override
|
|
162
|
+
baseConfig._forceActionType = true;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
baseConfig.requirement = String(naturalLanguage);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
catch {
|
|
170
|
+
// JSON parse failed - check if it's raw JS code (not natural language)
|
|
171
|
+
const nlStr = String(naturalLanguage);
|
|
172
|
+
const isJsCode = this.looksLikeJsCode(nlStr);
|
|
173
|
+
if (isJsCode) {
|
|
174
|
+
baseConfig.requirement = nlStr;
|
|
175
|
+
baseConfig.actionType = 'runCode';
|
|
176
|
+
baseConfig.actionParams = { code: nlStr };
|
|
177
|
+
baseConfig._forceActionType = true;
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
baseConfig.requirement = nlStr;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
// Config name
|
|
185
|
+
if (config.configName)
|
|
186
|
+
baseConfig.testName = config.configName;
|
|
187
|
+
// Wait times
|
|
188
|
+
if (config.effectiveWaitTime)
|
|
189
|
+
baseConfig.waitTime = config.effectiveWaitTime;
|
|
190
|
+
if (config.effectiveImplicitlyWait)
|
|
191
|
+
baseConfig.timeout = config.effectiveImplicitlyWait;
|
|
192
|
+
// Login info
|
|
193
|
+
if (config.loginUsername)
|
|
194
|
+
baseConfig.loginUsername = config.loginUsername;
|
|
195
|
+
if (config.loginPassword)
|
|
196
|
+
baseConfig.loginPassword = config.loginPassword;
|
|
197
|
+
// Mobile mode
|
|
198
|
+
if (config.mobileMode !== undefined)
|
|
199
|
+
baseConfig.mobileMode = config.mobileMode;
|
|
200
|
+
// Merge remaining params
|
|
201
|
+
Object.assign(baseConfig, params);
|
|
202
|
+
// After Object.assign, force action type if runCode was detected
|
|
203
|
+
// (Object.assign may have overwritten our type with the original type)
|
|
204
|
+
if (baseConfig._forceActionType) {
|
|
205
|
+
baseConfig.type = 'action';
|
|
206
|
+
delete baseConfig._forceActionType;
|
|
207
|
+
}
|
|
208
|
+
// After Object.assign, restore device udid if it was overwritten
|
|
209
|
+
// Priority: allocated device > targetDeviceId > udid from params
|
|
210
|
+
if (task.device?.deviceId) {
|
|
211
|
+
baseConfig.udid = task.device.deviceId;
|
|
212
|
+
}
|
|
213
|
+
else if (params.targetDeviceId || params.udid) {
|
|
214
|
+
baseConfig.udid = params.targetDeviceId || params.udid;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
// ignore
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
return baseConfig;
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* Detect if naturalLanguage content is actually JS code rather than plain text
|
|
225
|
+
* JS code typically contains: await, this.agent, this.sleep, variable assignments, etc.
|
|
226
|
+
*/
|
|
227
|
+
looksLikeJsCode(text) {
|
|
228
|
+
const codeIndicators = [
|
|
229
|
+
/\bawait\s+this\.agent\b/, // await this.agent.aiTap(...)
|
|
230
|
+
/\bawait\s+this\.sleep\b/, // await this.sleep(...)
|
|
231
|
+
/\bthis\.agent\.ai/, // this.agent.aiTap/AiAssert/...
|
|
232
|
+
/\bthis\.agent\.runAdb/, // this.agent.runAdbShell(...)
|
|
233
|
+
/\bconst\s+\w+\s*=\s*await\b/, // const x = await ...
|
|
234
|
+
/\blet\s+\w+\s*=\s*await\b/, // let x = await ...
|
|
235
|
+
/\bif\s*\(.+\)\s*\{/, // if (...) {
|
|
236
|
+
];
|
|
237
|
+
// Count how many indicators match
|
|
238
|
+
const matchCount = codeIndicators.filter(pattern => pattern.test(text)).length;
|
|
239
|
+
// If 2+ indicators match, it's very likely JS code
|
|
240
|
+
// Even 1 match with `await this.agent` is strong enough
|
|
241
|
+
if (matchCount >= 2)
|
|
242
|
+
return true;
|
|
243
|
+
if (matchCount >= 1 && /\bawait\b/.test(text))
|
|
244
|
+
return true;
|
|
245
|
+
return false;
|
|
246
|
+
}
|
|
247
|
+
stopTask(taskId) {
|
|
248
|
+
const childProcess = this.runningTasks.get(taskId);
|
|
249
|
+
if (childProcess) {
|
|
250
|
+
childProcess.kill('SIGTERM');
|
|
251
|
+
this.runningTasks.delete(taskId);
|
|
252
|
+
taskRepo.updateStatus(taskId, 'stopped');
|
|
253
|
+
eventBus.emitEvent('task:failed', 'scheduler', { taskId, errorMessage: 'Task stopped by user' });
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
getStats() {
|
|
257
|
+
return {
|
|
258
|
+
pending: 0, // Will be filled by poller
|
|
259
|
+
running: this.runningTasks.size,
|
|
260
|
+
completed: taskRepo.getByStatus('completed').length,
|
|
261
|
+
failed: taskRepo.getByStatus('failed').length,
|
|
262
|
+
maxConcurrent: this.maxConcurrent,
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
async stop() {
|
|
266
|
+
for (const [taskId, childProcess] of this.runningTasks) {
|
|
267
|
+
childProcess.kill('SIGTERM');
|
|
268
|
+
taskRepo.updateStatus(taskId, 'stopped');
|
|
269
|
+
}
|
|
270
|
+
this.runningTasks.clear();
|
|
271
|
+
logger.info('Task scheduler stopped');
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
//# sourceMappingURL=scheduler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { Task, AllocatedDevice } from '../core/types.js';
|
|
2
|
+
export interface NextTaskResponse {
|
|
3
|
+
id: number;
|
|
4
|
+
taskId: string;
|
|
5
|
+
configId: number;
|
|
6
|
+
status: number;
|
|
7
|
+
priority: number;
|
|
8
|
+
submittedAt?: string;
|
|
9
|
+
startedAt?: string;
|
|
10
|
+
retryCount?: number;
|
|
11
|
+
maxRetryCount?: number;
|
|
12
|
+
executionParams: string;
|
|
13
|
+
executorNodeId?: string;
|
|
14
|
+
executorNodeIp?: string;
|
|
15
|
+
occupiedDeviceId?: string;
|
|
16
|
+
batchId?: string;
|
|
17
|
+
}
|
|
18
|
+
export interface TaskPollResult {
|
|
19
|
+
task: NextTaskResponse | null;
|
|
20
|
+
device: AllocatedDevice | null;
|
|
21
|
+
}
|
|
22
|
+
export interface SchedulerStats {
|
|
23
|
+
pending: number;
|
|
24
|
+
running: number;
|
|
25
|
+
completed: number;
|
|
26
|
+
failed: number;
|
|
27
|
+
maxConcurrent: number;
|
|
28
|
+
}
|
|
29
|
+
export declare function parseExecutionParams(task: NextTaskResponse): Record<string, unknown>;
|
|
30
|
+
export declare function nextTaskResponseToTask(polled: NextTaskResponse, device?: AllocatedDevice | null): Omit<Task, 'id' | 'createdAt' | 'updatedAt'>;
|
|
31
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/task/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAY,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIxE,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMpF;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,CA2B9I"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export function parseExecutionParams(task) {
|
|
2
|
+
try {
|
|
3
|
+
return JSON.parse(task.executionParams);
|
|
4
|
+
}
|
|
5
|
+
catch {
|
|
6
|
+
return {};
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
export function nextTaskResponseToTask(polled, device) {
|
|
10
|
+
const params = parseExecutionParams(polled);
|
|
11
|
+
const config = params.config || {};
|
|
12
|
+
// Determine platform type based on allocated device or config
|
|
13
|
+
let type = 'android';
|
|
14
|
+
const isRealDevice = config.isRealDevice === true || params.targetDeviceId || device;
|
|
15
|
+
if (isRealDevice) {
|
|
16
|
+
// Use device osType to determine platform
|
|
17
|
+
if (device?.osType === 'iOS') {
|
|
18
|
+
type = 'ios';
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
type = 'android';
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
type = 'cli';
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
taskId: polled.taskId,
|
|
29
|
+
executionId: String(polled.id),
|
|
30
|
+
type,
|
|
31
|
+
status: 'pending',
|
|
32
|
+
priority: polled.priority,
|
|
33
|
+
config: polled.executionParams,
|
|
34
|
+
device: device || undefined,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/task/types.ts"],"names":[],"mappings":"AAkCA,MAAM,UAAU,oBAAoB,CAAC,IAAsB;IACzD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAwB,EAAE,MAA+B;IAC9F,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAI,MAAM,CAAC,MAAkC,IAAI,EAAE,CAAC;IAEhE,8DAA8D;IAC9D,IAAI,IAAI,GAAa,SAAS,CAAC;IAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC;IACrF,IAAI,YAAY,EAAE,CAAC;QACjB,0CAA0C;QAC1C,IAAI,MAAM,EAAE,MAAM,KAAK,KAAK,EAAE,CAAC;YAC7B,IAAI,GAAG,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,IAAI;QACJ,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,MAAM,EAAE,MAAM,CAAC,eAAe;QAC9B,MAAM,EAAE,MAAM,IAAI,SAAS;KAC5B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ServerConfig } from '../config/schema.js';
|
|
2
|
+
export declare class WebServer {
|
|
3
|
+
private app;
|
|
4
|
+
private config;
|
|
5
|
+
constructor();
|
|
6
|
+
private setupMiddleware;
|
|
7
|
+
private setupApiRoutes;
|
|
8
|
+
private setupStaticFiles;
|
|
9
|
+
private getFallbackHtml;
|
|
10
|
+
start(config: ServerConfig): void;
|
|
11
|
+
close(): void;
|
|
12
|
+
}
|
|
13
|
+
export declare const webServer: WebServer;
|
|
14
|
+
//# sourceMappingURL=server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/web/server.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,qBAAa,SAAS;IACpB,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,MAAM,CAAgB;;IAS9B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,cAAc;IAoFtB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,eAAe;IAqWvB,KAAK,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAOjC,KAAK,IAAI,IAAI;CAGd;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
|