@aiscene/aiserver 1.1.9 → 1.2.1
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/.env +49 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +13 -14
- package/dist/config/index.js.map +1 -1
- package/dist/executor/android-executor.d.ts.map +1 -1
- package/dist/executor/android-executor.js +2 -2
- package/dist/executor/android-executor.js.map +1 -1
- package/dist/executor/ios-executor.d.ts.map +1 -1
- package/dist/executor/ios-executor.js +2 -2
- package/dist/executor/ios-executor.js.map +1 -1
- package/dist/task/scheduler.d.ts +2 -0
- package/dist/task/scheduler.d.ts.map +1 -1
- package/dist/task/scheduler.js +13 -127
- package/dist/task/scheduler.js.map +1 -1
- package/package.json +2 -1
package/dist/.env
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
# Server
|
|
2
|
+
AISERVER_PORT=8002
|
|
3
|
+
AISERVER_WEB_PORT=3900
|
|
4
|
+
AISERVER_HOST=0.0.0.0
|
|
5
|
+
|
|
6
|
+
# Device
|
|
7
|
+
AISERVER_DEVICE_HEARTBEAT_INTERVAL=30000
|
|
8
|
+
AISERVER_DEVICE_OFFLINE_RETRY_COUNT=3
|
|
9
|
+
AISERVER_DEVICE_OFFLINE_CALLBACK_URL=
|
|
10
|
+
|
|
11
|
+
# Task
|
|
12
|
+
AISERVER_TASK_POLL_INTERVAL=3000
|
|
13
|
+
AISERVER_TASK_API_URL=http://nethp-test.jd.com
|
|
14
|
+
AISERVER_TASK_MAX_CONCURRENT=3
|
|
15
|
+
AISERVER_TASK_TIMEOUT=1200000
|
|
16
|
+
|
|
17
|
+
# Node
|
|
18
|
+
AISERVER_NODE_PORT=8002
|
|
19
|
+
AISERVER_NODE_TYPE=executor
|
|
20
|
+
AISERVER_NODE_VERSION=1.0.0
|
|
21
|
+
AISERVER_NODE_ENVIRONMENT=prod
|
|
22
|
+
AISERVER_NODE_WEIGHT=1
|
|
23
|
+
AISERVER_NODE_SUPPORTED_TAGS=android,ios,web
|
|
24
|
+
AISERVER_NODE_REGION=
|
|
25
|
+
AISERVER_NODE_DESCRIPTION=
|
|
26
|
+
AISERVER_NODE_REGISTER_URL=http://nethp-test.jd.com/rest/execution-nodes/register
|
|
27
|
+
AISERVER_NODE_HEARTBEAT_URL=http://nethp-test.jd.com/rest/execution-nodes/heartbeat
|
|
28
|
+
AISERVER_NODE_HEARTBEAT_INTERVAL=30000
|
|
29
|
+
|
|
30
|
+
# AI
|
|
31
|
+
OPENAI_BASE_URL=
|
|
32
|
+
OPENAI_API_KEY=
|
|
33
|
+
MIDSCENE_MODEL_NAME=
|
|
34
|
+
MIDSCENE_USE_QWEN3_VL=1
|
|
35
|
+
|
|
36
|
+
# Storage
|
|
37
|
+
AISERVER_DB_PATH=./data/aiserver.db
|
|
38
|
+
|
|
39
|
+
# Callback
|
|
40
|
+
AISERVER_STATUS_UPDATE_URL=http://nethp-test.jd.com/rest/execution-queue/tasks
|
|
41
|
+
AISERVER_REPORT_UPLOAD_URL=http://nethp-test.jd.com/rest/execution-callback/result-file
|
|
42
|
+
AISERVER_DEVICE_HEARTBEAT_URL=http://nethp-test.jd.com/rest/mobile-devices/heartbeat
|
|
43
|
+
AISERVER_DEVICE_STATUS_UPDATE_URL=http://nethp-test.jd.com/rest/mobile-devices
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
MIDSCENE_MODEL_BASE_URL=https://modelservice.jdcloud.com/v1
|
|
47
|
+
MIDSCENE_MODEL_API_KEY=pk-485b2b56-7334-4bed-bd74-09bb42ca3baf
|
|
48
|
+
MIDSCENE_MODEL_NAME=doubao-seed-1-6-vision-250815
|
|
49
|
+
MIDSCENE_MODEL_FAMILY=vlm-ui-tars-doubao-1.5
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA8ClD,wBAAgB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA8ClD,wBAAgB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,cAAc,CA0G9D;AAID,wBAAgB,SAAS,IAAI,cAAc,CAK1C;AAED,wBAAgB,YAAY,IAAI,cAAc,CAG7C"}
|
package/dist/config/index.js
CHANGED
|
@@ -80,14 +80,14 @@ export function loadConfig(configPath) {
|
|
|
80
80
|
timeout: getEnvNumber('AISERVER_TASK_TIMEOUT', 1200000),
|
|
81
81
|
},
|
|
82
82
|
ai: {
|
|
83
|
-
baseUrl: cliArgs.modelBaseUrl ??
|
|
84
|
-
apiKey: cliArgs.modelApiKey ??
|
|
85
|
-
modelName: cliArgs.modelName ?? getEnv('MIDSCENE_MODEL_NAME', ''),
|
|
83
|
+
baseUrl: cliArgs.modelBaseUrl ?? getEnv('MIDSCENE_MODEL_BASE_URL', 'https://modelservice.jdcloud.com/v1'),
|
|
84
|
+
apiKey: cliArgs.modelApiKey ?? getEnv('MIDSCENE_MODEL_API_KEY', 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf'),
|
|
85
|
+
modelName: cliArgs.modelName ?? getEnv('MIDSCENE_MODEL_NAME', 'doubao-seed-1-6-vision-250815'),
|
|
86
86
|
useQwen3Vl: getEnvBoolean('MIDSCENE_USE_QWEN3_VL', true),
|
|
87
|
-
insightModelName: getEnv('MIDSCENE_INSIGHT_MODEL_NAME', ''),
|
|
88
|
-
insightModelApiKey: getEnv('MIDSCENE_INSIGHT_MODEL_API_KEY', ''),
|
|
89
|
-
insightModelBaseUrl: getEnv('MIDSCENE_INSIGHT_MODEL_BASE_URL', ''),
|
|
90
|
-
insightModelFamily: cliArgs.modelFamily ?? getEnv('MIDSCENE_INSIGHT_MODEL_FAMILY', ''),
|
|
87
|
+
insightModelName: getEnv('MIDSCENE_INSIGHT_MODEL_NAME', 'doubao-seed-1-6-vision-250815'),
|
|
88
|
+
insightModelApiKey: getEnv('MIDSCENE_INSIGHT_MODEL_API_KEY', 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf'),
|
|
89
|
+
insightModelBaseUrl: getEnv('MIDSCENE_INSIGHT_MODEL_BASE_URL', 'https://modelservice.jdcloud.com/v1'),
|
|
90
|
+
insightModelFamily: cliArgs.modelFamily ?? getEnv('MIDSCENE_INSIGHT_MODEL_FAMILY', 'vlm-ui-tars-doubao-1.5'),
|
|
91
91
|
insightModelTimeout: getEnvNumber('MIDSCENE_INSIGHT_MODEL_TIMEOUT', 60000),
|
|
92
92
|
insightModelTemperature: getEnvNumber('MIDSCENE_INSIGHT_MODEL_TEMPERATURE', 1),
|
|
93
93
|
},
|
|
@@ -122,20 +122,19 @@ export function loadConfig(configPath) {
|
|
|
122
122
|
},
|
|
123
123
|
};
|
|
124
124
|
// Sync AI model config to process.env so underlying libraries (e.g. @aiscene/android) can read them
|
|
125
|
-
|
|
125
|
+
// Always sync to ensure dev and production use the same config
|
|
126
|
+
if (config.ai.modelName) {
|
|
126
127
|
process.env.MIDSCENE_MODEL_NAME = config.ai.modelName;
|
|
127
128
|
}
|
|
128
|
-
if (config.ai.baseUrl
|
|
129
|
+
if (config.ai.baseUrl) {
|
|
129
130
|
process.env.MIDSCENE_MODEL_BASE_URL = config.ai.baseUrl;
|
|
130
131
|
}
|
|
131
|
-
if (config.ai.apiKey
|
|
132
|
+
if (config.ai.apiKey) {
|
|
132
133
|
process.env.MIDSCENE_MODEL_API_KEY = config.ai.apiKey;
|
|
133
134
|
}
|
|
134
|
-
if (config.ai.insightModelFamily
|
|
135
|
+
if (config.ai.insightModelFamily) {
|
|
135
136
|
process.env.MIDSCENE_INSIGHT_MODEL_FAMILY = config.ai.insightModelFamily;
|
|
136
|
-
|
|
137
|
-
// Also set MIDSCENE_MODEL_FAMILY which is required by @aiscene/android for VL model detection
|
|
138
|
-
if (config.ai.insightModelFamily && !process.env.MIDSCENE_MODEL_FAMILY) {
|
|
137
|
+
// Also set MIDSCENE_MODEL_FAMILY which is required by @aiscene/android for VL model detection
|
|
139
138
|
process.env.MIDSCENE_MODEL_FAMILY = config.ai.insightModelFamily;
|
|
140
139
|
}
|
|
141
140
|
// Log CLI overrides if any were used
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-executor.d.ts","sourceRoot":"","sources":["../../src/executor/android-executor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIrE,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,KAAK,CAA6B;IAEpC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"android-executor.d.ts","sourceRoot":"","sources":["../../src/executor/android-executor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIrE,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,KAAK,CAA6B;IAEpC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;YAqD9C,aAAa;YAiBb,eAAe;YAiBf,SAAS;IA2BjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAY/B"}
|
|
@@ -12,13 +12,13 @@ export class AndroidExecutor extends BaseExecutor {
|
|
|
12
12
|
// Connect device
|
|
13
13
|
await this.connectDevice(config);
|
|
14
14
|
// Create agent
|
|
15
|
-
// 注意：不传递 modelConfig，与 electron-shadcn 保持一致
|
|
16
|
-
// 模型配置完全通过环境变量传递给底层库
|
|
17
15
|
const agentConfig = {};
|
|
18
16
|
if (config.aiActionContext)
|
|
19
17
|
agentConfig.aiActionContext = config.aiActionContext;
|
|
20
18
|
if (config.testName)
|
|
21
19
|
agentConfig.groupName = config.testName;
|
|
20
|
+
if (config.modelConfig)
|
|
21
|
+
agentConfig.modelConfig = config.modelConfig;
|
|
22
22
|
this.agent = new AndroidAgent(this.device, agentConfig);
|
|
23
23
|
this.log('Midscene Android Agent initialized');
|
|
24
24
|
// Start dump interval
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-executor.js","sourceRoot":"","sources":["../../src/executor/android-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,MAAM,OAAO,eAAgB,SAAQ,YAAY;IACvC,MAAM,GAAyB,IAAI,CAAC;IACpC,KAAK,GAAwB,IAAI,CAAC;IAE1C,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,+BAA+B,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAE9D,iBAAiB;YACjB,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAEjC,eAAe;YACf,
|
|
1
|
+
{"version":3,"file":"android-executor.js","sourceRoot":"","sources":["../../src/executor/android-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-executor.d.ts","sourceRoot":"","sources":["../../src/executor/ios-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,KAAK,CAAyB;IAEhC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ios-executor.d.ts","sourceRoot":"","sources":["../../src/executor/ios-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,KAAK,CAAyB;IAEhC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;YA8D9C,aAAa;IAiBrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAY/B"}
|
|
@@ -9,13 +9,13 @@ export class IOSExecutor extends BaseExecutor {
|
|
|
9
9
|
// Connect device
|
|
10
10
|
await this.connectDevice(config);
|
|
11
11
|
// Create agent
|
|
12
|
-
// 注意：不传递 modelConfig，与 electron-shadcn 保持一致
|
|
13
|
-
// 模型配置完全通过环境变量传递给底层库
|
|
14
12
|
const agentConfig = {};
|
|
15
13
|
if (config.aiActionContext)
|
|
16
14
|
agentConfig.aiActionContext = config.aiActionContext;
|
|
17
15
|
if (config.testName)
|
|
18
16
|
agentConfig.groupName = config.testName;
|
|
17
|
+
if (config.modelConfig)
|
|
18
|
+
agentConfig.modelConfig = config.modelConfig;
|
|
19
19
|
if (!this.device)
|
|
20
20
|
throw new Error('Device not connected');
|
|
21
21
|
this.agent = new IOSAgent(this.device, agentConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-executor.js","sourceRoot":"","sources":["../../src/executor/ios-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,MAAM,OAAO,WAAY,SAAQ,YAAY;IACnC,MAAM,GAAqB,IAAI,CAAC;IAChC,KAAK,GAAoB,IAAI,CAAC;IAEtC,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEvD,iBAAiB;YACjB,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAEjC,eAAe;YACf,
|
|
1
|
+
{"version":3,"file":"ios-executor.js","sourceRoot":"","sources":["../../src/executor/ios-executor.ts"],"names":[],"mappings":"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"}
|
package/dist/task/scheduler.d.ts
CHANGED
|
@@ -3,8 +3,10 @@ import type { Task } from '../core/types.js';
|
|
|
3
3
|
import type { SchedulerStats } from './types.js';
|
|
4
4
|
export declare class TaskScheduler {
|
|
5
5
|
private runningTasks;
|
|
6
|
+
private maxConcurrent;
|
|
6
7
|
private config;
|
|
7
8
|
private callbackConfig;
|
|
9
|
+
private aiConfig;
|
|
8
10
|
start(config: TaskConfig, callbackConfig: CallbackConfig): Promise<void>;
|
|
9
11
|
canAcceptMore(): boolean;
|
|
10
12
|
schedule(task: Task): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/task/scheduler.ts"],"names":[],"mappings":"
|
|
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,CAAc;IACnC,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"}
|
package/dist/task/scheduler.js
CHANGED
|
@@ -1,91 +1,32 @@
|
|
|
1
|
-
import { fork
|
|
2
|
-
import { promisify } from 'util';
|
|
3
|
-
import fs from 'fs';
|
|
4
|
-
import path from 'path';
|
|
1
|
+
import { fork } from 'child_process';
|
|
5
2
|
import { createLogger } from '../core/logger.js';
|
|
6
3
|
import { eventBus } from '../core/event-bus.js';
|
|
7
4
|
import { taskRepo } from '../storage/repositories/task-repo.js';
|
|
8
5
|
import { executionLogRepo } from '../storage/repositories/execution-log-repo.js';
|
|
9
6
|
const logger = createLogger('TaskScheduler');
|
|
10
|
-
const execPromise = promisify(exec);
|
|
11
|
-
/**
|
|
12
|
-
* Smart ANDROID_HOME detection (consistent with electron-shadcn reference project)
|
|
13
|
-
* Strategy 1: Shell environment variable
|
|
14
|
-
* Strategy 2: Infer from `which adb`
|
|
15
|
-
* Strategy 3: Default paths
|
|
16
|
-
*/
|
|
17
|
-
async function detectAndroidHome() {
|
|
18
|
-
// 1. Try to get ANDROID_HOME from shell
|
|
19
|
-
if (process.platform === 'darwin' || process.platform === 'linux') {
|
|
20
|
-
try {
|
|
21
|
-
const shell = process.env.SHELL || '/bin/zsh';
|
|
22
|
-
const { stdout } = await execPromise(`${shell} -l -c 'echo "$ANDROID_HOME"'`, {
|
|
23
|
-
timeout: 3000,
|
|
24
|
-
encoding: 'utf8',
|
|
25
|
-
});
|
|
26
|
-
const value = stdout.trim();
|
|
27
|
-
if (value && fs.existsSync(path.join(value, 'platform-tools', 'adb'))) {
|
|
28
|
-
logger.info(`[EnvDetection] Valid ANDROID_HOME found in shell: ${value}`);
|
|
29
|
-
return value;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
catch {
|
|
33
|
-
// ignore
|
|
34
|
-
}
|
|
35
|
-
// 2. Try to infer from `which adb`
|
|
36
|
-
try {
|
|
37
|
-
const shell = process.env.SHELL || '/bin/zsh';
|
|
38
|
-
const { stdout } = await execPromise(`${shell} -l -c 'which adb'`, { timeout: 3000 });
|
|
39
|
-
const adbPath = stdout.trim();
|
|
40
|
-
if (adbPath) {
|
|
41
|
-
const realAdbPath = fs.realpathSync(adbPath);
|
|
42
|
-
if (realAdbPath.includes('platform-tools')) {
|
|
43
|
-
const sdkRoot = path.dirname(path.dirname(realAdbPath));
|
|
44
|
-
if (fs.existsSync(sdkRoot)) {
|
|
45
|
-
logger.info(`[EnvDetection] Inferred ANDROID_HOME from adb path: ${sdkRoot}`);
|
|
46
|
-
return sdkRoot;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
catch {
|
|
52
|
-
// ignore
|
|
53
|
-
}
|
|
54
|
-
// 3. Try default paths
|
|
55
|
-
if (process.platform === 'darwin') {
|
|
56
|
-
const home = process.env.HOME || '';
|
|
57
|
-
const possiblePaths = [
|
|
58
|
-
path.join(home, 'Library/Android/sdk'),
|
|
59
|
-
'/usr/local/share/android-sdk',
|
|
60
|
-
'/opt/android-sdk',
|
|
61
|
-
];
|
|
62
|
-
for (const p of possiblePaths) {
|
|
63
|
-
if (fs.existsSync(path.join(p, 'platform-tools', 'adb'))) {
|
|
64
|
-
logger.info(`[EnvDetection] Found ANDROID_HOME at default location: ${p}`);
|
|
65
|
-
return p;
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
// Fallback to process.env
|
|
71
|
-
return process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
|
|
72
|
-
}
|
|
73
7
|
export class TaskScheduler {
|
|
74
8
|
runningTasks = new Map();
|
|
9
|
+
maxConcurrent = 50;
|
|
75
10
|
config;
|
|
76
11
|
callbackConfig;
|
|
12
|
+
aiConfig;
|
|
77
13
|
async start(config, callbackConfig) {
|
|
78
14
|
this.config = config;
|
|
79
15
|
this.callbackConfig = callbackConfig;
|
|
80
|
-
|
|
16
|
+
this.maxConcurrent = config.maxConcurrent;
|
|
17
|
+
logger.info(`Task scheduler started (maxConcurrent: ${this.maxConcurrent})`);
|
|
81
18
|
}
|
|
82
19
|
canAcceptMore() {
|
|
83
|
-
return
|
|
20
|
+
return this.runningTasks.size < this.maxConcurrent;
|
|
84
21
|
}
|
|
85
22
|
schedule(task) {
|
|
23
|
+
if (!this.canAcceptMore()) {
|
|
24
|
+
logger.warn(`Scheduler full, cannot accept task ${task.taskId}`);
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
86
27
|
this.executeTask(task);
|
|
87
28
|
}
|
|
88
|
-
|
|
29
|
+
executeTask(task) {
|
|
89
30
|
taskRepo.updateStatus(task.taskId, 'running');
|
|
90
31
|
eventBus.emitEvent('task:started', 'scheduler', { taskId: task.taskId, type: task.type });
|
|
91
32
|
// 参考项目不在启动时通知服务器，只在完成/失败时通知
|
|
@@ -95,62 +36,11 @@ export class TaskScheduler {
|
|
|
95
36
|
logger.info(`Executing task ${task.taskId} with config: ${JSON.stringify(config)?.substring(0, 500)}`);
|
|
96
37
|
// Fork a child process to run the executor
|
|
97
38
|
const workerPath = new URL('../executor/worker-entry.js', import.meta.url).pathname;
|
|
98
|
-
// Hardcoded AI model environment variables (consistent with electron-shadcn)
|
|
99
|
-
const aiEnv = {
|
|
100
|
-
// Core AI model config
|
|
101
|
-
OPENAI_BASE_URL: 'https://modelservice.jdcloud.com/v1',
|
|
102
|
-
MIDSCENE_MODEL_BASE_URL: 'https://modelservice.jdcloud.com/v1',
|
|
103
|
-
MIDSCENE_MODEL_API_KEY: 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf',
|
|
104
|
-
OPENAI_API_KEY: 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf',
|
|
105
|
-
MIDSCENE_MODEL_NAME: 'doubao-seed-1-6-vision-250815',
|
|
106
|
-
MIDSCENE_MODEL_FAMILY: 'vlm-ui-tars-doubao-1.5',
|
|
107
|
-
// Planning model config
|
|
108
|
-
MIDSCENE_PLANNING_MODEL_API_KEY: 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf',
|
|
109
|
-
MIDSCENE_PLANNING_MODEL_BASE_URL: 'https://modelservice.jdcloud.com/v1',
|
|
110
|
-
MIDSCENE_PLANNING_MODEL_NAME: 'doubao-seed-1-6-vision-250815',
|
|
111
|
-
MIDSCENE_PLANNING_MODEL_FAMILY: 'vlm-ui-tars-doubao-1.5',
|
|
112
|
-
// Insight (assertion) AI model config
|
|
113
|
-
MIDSCENE_INSIGHT_MODEL_NAME: 'Qwen3-235B-A22B',
|
|
114
|
-
MIDSCENE_INSIGHT_MODEL_API_KEY: 'pk-485b2b56-7334-4bed-bd74-09bb42ca3baf',
|
|
115
|
-
MIDSCENE_INSIGHT_MODEL_BASE_URL: 'https://modelservice.jdcloud.com/v1',
|
|
116
|
-
MIDSCENE_INSIGHT_MODEL_FAMILY: 'vlm-ui-tars-doubao-1.5',
|
|
117
|
-
MIDSCENE_INSIGHT_MODEL_TIMEOUT: '60000',
|
|
118
|
-
MIDSCENE_INSIGHT_MODEL_TEMPERATURE: '0.1',
|
|
119
|
-
};
|
|
120
|
-
// Smart detect ANDROID_HOME and inject into worker environment
|
|
121
|
-
let androidHome = await detectAndroidHome();
|
|
122
|
-
if (!androidHome) {
|
|
123
|
-
androidHome = process.env.ANDROID_HOME || process.env.ANDROID_SDK_ROOT;
|
|
124
|
-
}
|
|
125
|
-
if (androidHome) {
|
|
126
|
-
aiEnv.ANDROID_HOME = androidHome;
|
|
127
|
-
aiEnv.ANDROID_SDK_ROOT = androidHome;
|
|
128
|
-
logger.info(`[EnvDetection] Injecting ANDROID_HOME into worker: ${androidHome}`);
|
|
129
|
-
}
|
|
130
|
-
else {
|
|
131
|
-
logger.warn('[EnvDetection] Could not find ANDROID_HOME, Android tasks may fail');
|
|
132
|
-
}
|
|
133
39
|
const workerEnv = {
|
|
134
40
|
...process.env,
|
|
135
|
-
...aiEnv,
|
|
136
41
|
WORKER_CONFIG: JSON.stringify(config),
|
|
137
|
-
NODE_OPTIONS: '--max-old-space-size=
|
|
42
|
+
NODE_OPTIONS: '--max-old-space-size=4096',
|
|
138
43
|
};
|
|
139
|
-
// Log AI model configuration for debugging
|
|
140
|
-
logger.info(`[AI Model Config] Task ${task.taskId} model info:`);
|
|
141
|
-
logger.info(` OPENAI_BASE_URL: ${workerEnv.OPENAI_BASE_URL || '(not set)'}`);
|
|
142
|
-
logger.info(` MIDSCENE_MODEL_BASE_URL: ${workerEnv.MIDSCENE_MODEL_BASE_URL || '(not set)'}`);
|
|
143
|
-
logger.info(` MIDSCENE_MODEL_NAME: ${workerEnv.MIDSCENE_MODEL_NAME || '(not set)'}`);
|
|
144
|
-
logger.info(` MIDSCENE_MODEL_FAMILY: ${workerEnv.MIDSCENE_MODEL_FAMILY || '(not set)'}`);
|
|
145
|
-
logger.info(` MIDSCENE_MODEL_API_KEY: ${workerEnv.MIDSCENE_MODEL_API_KEY ? '***' + String(workerEnv.MIDSCENE_MODEL_API_KEY).slice(-6) : '(not set)'}`);
|
|
146
|
-
logger.info(` MIDSCENE_USE_QWEN3_VL: ${workerEnv.MIDSCENE_USE_QWEN3_VL || '(not set)'}`);
|
|
147
|
-
logger.info(` MIDSCENE_PLANNING_MODEL_NAME: ${workerEnv.MIDSCENE_PLANNING_MODEL_NAME || '(not set)'}`);
|
|
148
|
-
logger.info(` MIDSCENE_PLANNING_MODEL_FAMILY: ${workerEnv.MIDSCENE_PLANNING_MODEL_FAMILY || '(not set)'}`);
|
|
149
|
-
logger.info(` MIDSCENE_PLANNING_MODEL_BASE_URL: ${workerEnv.MIDSCENE_PLANNING_MODEL_BASE_URL || '(not set)'}`);
|
|
150
|
-
logger.info(` MIDSCENE_INSIGHT_MODEL_NAME: ${workerEnv.MIDSCENE_INSIGHT_MODEL_NAME || '(not set)'}`);
|
|
151
|
-
logger.info(` MIDSCENE_INSIGHT_MODEL_FAMILY: ${workerEnv.MIDSCENE_INSIGHT_MODEL_FAMILY || '(not set)'}`);
|
|
152
|
-
logger.info(` MIDSCENE_INSIGHT_MODEL_BASE_URL: ${workerEnv.MIDSCENE_INSIGHT_MODEL_BASE_URL || '(not set)'}`);
|
|
153
|
-
logger.info(` ANDROID_HOME: ${workerEnv.ANDROID_HOME || '(not set)'}`);
|
|
154
44
|
const childProcess = fork(workerPath, ['--worker'], {
|
|
155
45
|
env: workerEnv,
|
|
156
46
|
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
|
|
@@ -309,10 +199,6 @@ export class TaskScheduler {
|
|
|
309
199
|
baseConfig.mobileMode = config.mobileMode;
|
|
310
200
|
// Merge remaining params
|
|
311
201
|
Object.assign(baseConfig, params);
|
|
312
|
-
// 关键修复：过滤掉后端数据中的 modelConfig
|
|
313
|
-
// 与 electron-shadcn 保持一致，模型配置完全通过环境变量传递
|
|
314
|
-
// 不允许后端数据覆盖环境变量中的模型配置
|
|
315
|
-
delete baseConfig.modelConfig;
|
|
316
202
|
// After Object.assign, force action type if runCode was detected
|
|
317
203
|
// (Object.assign may have overwritten our type with the original type)
|
|
318
204
|
if (baseConfig._forceActionType) {
|
|
@@ -373,7 +259,7 @@ export class TaskScheduler {
|
|
|
373
259
|
running: this.runningTasks.size,
|
|
374
260
|
completed: taskRepo.getByStatus('completed').length,
|
|
375
261
|
failed: taskRepo.getByStatus('failed').length,
|
|
376
|
-
maxConcurrent:
|
|
262
|
+
maxConcurrent: this.maxConcurrent,
|
|
377
263
|
};
|
|
378
264
|
}
|
|
379
265
|
async stop() {
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aiscene/aiserver",
|
|
3
|
-
"version": "1.1
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "AI automation server with device management, task scheduling, and debug capabilities",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
"scripts": {
|
|
14
14
|
"build": "tsc",
|
|
15
15
|
"start": "node dist/index.js",
|
|
16
|
+
"start:prod": "node dist/index.js",
|
|
16
17
|
"dev": "tsx watch src/index.ts",
|
|
17
18
|
"lint": "eslint src/",
|
|
18
19
|
"format": "prettier --write src/"
|