@aiscene/aiserver 1.3.4 → 1.3.5
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 +4 -0
- package/dist/config/cli.d.ts.map +1 -1
- package/dist/config/cli.js +24 -0
- package/dist/config/cli.js.map +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +12 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +12 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/core/types.d.ts +8 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/debug/types.d.ts +31 -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 +93 -3
- package/dist/debug/websocket-server.js.map +1 -1
- package/dist/executor/android-executor.js +1 -1
- package/dist/executor/android-executor.js.map +1 -1
- package/dist/executor/cli-executor.d.ts +8 -0
- package/dist/executor/cli-executor.d.ts.map +1 -1
- package/dist/executor/cli-executor.js +130 -7
- package/dist/executor/cli-executor.js.map +1 -1
- package/dist/executor/ios-executor.js +1 -1
- package/dist/executor/ios-executor.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/task/poller.d.ts +2 -2
- package/dist/task/poller.d.ts.map +1 -1
- package/dist/task/poller.js +2 -2
- package/dist/task/poller.js.map +1 -1
- package/dist/task/scheduler.d.ts +3 -2
- package/dist/task/scheduler.d.ts.map +1 -1
- package/dist/task/scheduler.js +43 -6
- package/dist/task/scheduler.js.map +1 -1
- package/dist/web/debug-page.js +2 -2
- package/package.json +1 -1
package/dist/task/poller.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../src/task/poller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAGpD,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAE1C,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,MAAM,OAAO,iBAAiB;IACpB,QAAQ,GAA0B,IAAI,CAAC;IACvC,KAAK,GAAc,IAAI,SAAS,EAAE,CAAC;IACnC,SAAS,GAAkB,IAAI,aAAa,EAAE,CAAC;IAC/C,MAAM,CAAc;IACpB,OAAO,GAAY,KAAK,CAAC;IACzB,mBAAmB,GAAW,CAAC,CAAC;IAChC,cAAc,GAAwB,IAAI,GAAG,EAAE,CAAC;IAExD,KAAK,CAAC,KAAK,CAAC,MAAkB,EAAE,cAA8B,EAAE,QAAkB;
|
|
1
|
+
{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../src/task/poller.ts"],"names":[],"mappings":"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"}
|
package/dist/task/scheduler.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { TaskConfig, CallbackConfig, AIConfig } from '../config/schema.js';
|
|
1
|
+
import type { TaskConfig, CallbackConfig, AIConfig, LoginConfig } from '../config/schema.js';
|
|
2
2
|
import type { Task } from '../core/types.js';
|
|
3
3
|
import type { SchedulerStats } from './types.js';
|
|
4
4
|
export declare class TaskScheduler {
|
|
@@ -7,7 +7,8 @@ export declare class TaskScheduler {
|
|
|
7
7
|
private config;
|
|
8
8
|
private callbackConfig;
|
|
9
9
|
private aiConfig;
|
|
10
|
-
|
|
10
|
+
private loginConfig?;
|
|
11
|
+
start(config: TaskConfig, callbackConfig: CallbackConfig, aiConfig: AIConfig, loginConfig?: LoginConfig): Promise<void>;
|
|
11
12
|
canAcceptMore(): boolean;
|
|
12
13
|
schedule(task: Task): void;
|
|
13
14
|
private executeTask;
|
|
@@ -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,MAAM,qBAAqB,CAAC;
|
|
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;IA6HnB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,mBAAmB;IAgK3B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAsBvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAYjC,QAAQ,IAAI,cAAc;IAUpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}
|
package/dist/task/scheduler.js
CHANGED
|
@@ -10,10 +10,12 @@ export class TaskScheduler {
|
|
|
10
10
|
config;
|
|
11
11
|
callbackConfig;
|
|
12
12
|
aiConfig;
|
|
13
|
-
|
|
13
|
+
loginConfig;
|
|
14
|
+
async start(config, callbackConfig, aiConfig, loginConfig) {
|
|
14
15
|
this.config = config;
|
|
15
16
|
this.callbackConfig = callbackConfig;
|
|
16
17
|
this.aiConfig = aiConfig;
|
|
18
|
+
this.loginConfig = loginConfig;
|
|
17
19
|
this.maxConcurrent = config.maxConcurrent;
|
|
18
20
|
logger.info(`Task scheduler started (maxConcurrent: ${this.maxConcurrent})`);
|
|
19
21
|
}
|
|
@@ -197,6 +199,10 @@ export class TaskScheduler {
|
|
|
197
199
|
if (isRealDevice) {
|
|
198
200
|
baseConfig.type = 'android';
|
|
199
201
|
}
|
|
202
|
+
else {
|
|
203
|
+
// 浏览器模式
|
|
204
|
+
baseConfig.type = 'cli';
|
|
205
|
+
}
|
|
200
206
|
}
|
|
201
207
|
// Device ID: allocated device > targetDeviceId > config.deviceId > udid
|
|
202
208
|
if (!baseConfig.udid) {
|
|
@@ -226,9 +232,15 @@ export class TaskScheduler {
|
|
|
226
232
|
baseConfig.actionType = 'runCode';
|
|
227
233
|
// Pass code to actionParams.code for ActionExecutor.executeRunCode()
|
|
228
234
|
baseConfig.actionParams = { code: codeContent };
|
|
229
|
-
//
|
|
230
|
-
//
|
|
231
|
-
baseConfig.
|
|
235
|
+
// 对于web任务（cli类型），使用cli执行器
|
|
236
|
+
// 对于真机任务（android/ios类型），使用action执行器
|
|
237
|
+
if (baseConfig.type === 'cli') {
|
|
238
|
+
// web任务使用cli执行器，不需要强制类型
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
// 真机任务使用action执行器
|
|
242
|
+
baseConfig._forceActionType = true;
|
|
243
|
+
}
|
|
232
244
|
}
|
|
233
245
|
}
|
|
234
246
|
else {
|
|
@@ -258,11 +270,32 @@ export class TaskScheduler {
|
|
|
258
270
|
baseConfig.waitTime = config.effectiveWaitTime;
|
|
259
271
|
if (config.effectiveImplicitlyWait)
|
|
260
272
|
baseConfig.timeout = config.effectiveImplicitlyWait;
|
|
261
|
-
// Login info
|
|
273
|
+
// Login info from task config
|
|
262
274
|
if (config.loginUsername)
|
|
263
275
|
baseConfig.loginUsername = config.loginUsername;
|
|
264
276
|
if (config.loginPassword)
|
|
265
277
|
baseConfig.loginPassword = config.loginPassword;
|
|
278
|
+
if (config.loginUrl)
|
|
279
|
+
baseConfig.loginUrl = config.loginUrl;
|
|
280
|
+
// Login info from global login config (fallback)
|
|
281
|
+
if (this.loginConfig) {
|
|
282
|
+
if (!baseConfig.loginUrl && this.loginConfig.loginUrl)
|
|
283
|
+
baseConfig.loginUrl = this.loginConfig.loginUrl;
|
|
284
|
+
if (!baseConfig.loginUsername && this.loginConfig.loginUsername)
|
|
285
|
+
baseConfig.loginUsername = this.loginConfig.loginUsername;
|
|
286
|
+
if (!baseConfig.loginPassword && this.loginConfig.loginPassword)
|
|
287
|
+
baseConfig.loginPassword = this.loginConfig.loginPassword;
|
|
288
|
+
if (this.loginConfig.usernameSelector)
|
|
289
|
+
baseConfig.usernameSelector = this.loginConfig.usernameSelector;
|
|
290
|
+
if (this.loginConfig.passwordSelector)
|
|
291
|
+
baseConfig.passwordSelector = this.loginConfig.passwordSelector;
|
|
292
|
+
if (this.loginConfig.loginButtonSelector)
|
|
293
|
+
baseConfig.loginButtonSelector = this.loginConfig.loginButtonSelector;
|
|
294
|
+
if (this.loginConfig.loginModeSelector)
|
|
295
|
+
baseConfig.loginModeSelector = this.loginConfig.loginModeSelector;
|
|
296
|
+
if (this.loginConfig.agreementSelector)
|
|
297
|
+
baseConfig.agreementSelector = this.loginConfig.agreementSelector;
|
|
298
|
+
}
|
|
266
299
|
// Mobile mode
|
|
267
300
|
if (config.mobileMode !== undefined)
|
|
268
301
|
baseConfig.mobileMode = config.mobileMode;
|
|
@@ -270,8 +303,12 @@ export class TaskScheduler {
|
|
|
270
303
|
Object.assign(baseConfig, params);
|
|
271
304
|
// After Object.assign, force action type if runCode was detected
|
|
272
305
|
// (Object.assign may have overwritten our type with the original type)
|
|
306
|
+
// 注意：只有真机任务才强制使用action执行器，web任务保持cli执行器
|
|
273
307
|
if (baseConfig._forceActionType) {
|
|
274
|
-
|
|
308
|
+
// 如果原始类型是cli（web任务），不要强制改为action
|
|
309
|
+
if (baseConfig.type !== 'cli') {
|
|
310
|
+
baseConfig.type = 'action';
|
|
311
|
+
}
|
|
275
312
|
delete baseConfig._forceActionType;
|
|
276
313
|
}
|
|
277
314
|
// After Object.assign, restore device udid if it was overwritten
|
|
@@ -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/dist/web/debug-page.js
CHANGED
|
@@ -1557,7 +1557,7 @@ function generateScriptFromNaturalLanguage(naturalLanguage) {
|
|
|
1557
1557
|
if(url) lines.push(" await page.goto('" + url + "');");
|
|
1558
1558
|
lines.push(' // 自然语言指令:');
|
|
1559
1559
|
lines.push(' // ' + naturalLanguage);
|
|
1560
|
-
lines.push(" await ai.
|
|
1560
|
+
lines.push(" await ai.aiAct('" + naturalLanguage.replace(/'/g, "\\'") + "');");
|
|
1561
1561
|
lines.push('});');
|
|
1562
1562
|
return lines.join('\\n');
|
|
1563
1563
|
} else {
|
|
@@ -1573,7 +1573,7 @@ function generateScriptFromNaturalLanguage(naturalLanguage) {
|
|
|
1573
1573
|
if(url) lines.push(' // URL: ' + url);
|
|
1574
1574
|
lines.push(' // 自然语言指令:');
|
|
1575
1575
|
lines.push(' // ' + naturalLanguage);
|
|
1576
|
-
lines.push(" await agent.
|
|
1576
|
+
lines.push(" await agent.aiAct('" + naturalLanguage.replace(/'/g, "\\'") + "');");
|
|
1577
1577
|
lines.push('}');
|
|
1578
1578
|
lines.push('');
|
|
1579
1579
|
lines.push('main().catch(console.error);');
|