@aiscene/aiserver 1.8.2 → 1.8.3
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.map +1 -1
- package/dist/api/callback.js +5 -0
- package/dist/api/callback.js.map +1 -1
- package/dist/api/device-api.d.ts.map +1 -1
- package/dist/api/device-api.js +9 -2
- package/dist/api/device-api.js.map +1 -1
- package/dist/api/task-api.d.ts.map +1 -1
- package/dist/api/task-api.js +6 -1
- package/dist/api/task-api.js.map +1 -1
- package/dist/auth/browser-auth.d.ts +4 -0
- package/dist/auth/browser-auth.d.ts.map +1 -0
- package/dist/auth/browser-auth.js +59 -0
- package/dist/auth/browser-auth.js.map +1 -0
- package/dist/auth/node-auth.d.ts +27 -0
- package/dist/auth/node-auth.d.ts.map +1 -0
- package/dist/auth/node-auth.js +132 -0
- package/dist/auth/node-auth.js.map +1 -0
- package/dist/config/cli.d.ts +12 -0
- package/dist/config/cli.d.ts.map +1 -1
- package/dist/config/cli.js +59 -2
- package/dist/config/cli.js.map +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +32 -10
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +3 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/core/types.d.ts +15 -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/web-screencast.d.ts.map +1 -1
- package/dist/debug/web-screencast.js +0 -6
- package/dist/debug/web-screencast.js.map +1 -1
- package/dist/debug/websocket-server.d.ts +6 -3
- package/dist/debug/websocket-server.d.ts.map +1 -1
- package/dist/debug/websocket-server.js +137 -103
- package/dist/debug/websocket-server.js.map +1 -1
- package/dist/device/heartbeat.d.ts.map +1 -1
- package/dist/device/heartbeat.js +9 -2
- package/dist/device/heartbeat.js.map +1 -1
- package/dist/executor/action-executor.d.ts.map +1 -1
- package/dist/executor/action-executor.js +6 -0
- package/dist/executor/action-executor.js.map +1 -1
- package/dist/executor/android-executor.d.ts +3 -0
- package/dist/executor/android-executor.d.ts.map +1 -1
- package/dist/executor/android-executor.js +51 -0
- package/dist/executor/android-executor.js.map +1 -1
- package/dist/executor/cli-executor.d.ts +3 -1
- package/dist/executor/cli-executor.d.ts.map +1 -1
- package/dist/executor/cli-executor.js +59 -77
- package/dist/executor/cli-executor.js.map +1 -1
- package/dist/executor/ios-executor.d.ts.map +1 -1
- package/dist/executor/ios-executor.js +4 -0
- package/dist/executor/ios-executor.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +79 -27
- package/dist/index.js.map +1 -1
- package/dist/login/android-login-context.d.ts +1 -0
- package/dist/login/android-login-context.d.ts.map +1 -1
- package/dist/login/android-login-context.js +79 -14
- package/dist/login/android-login-context.js.map +1 -1
- package/dist/node/service.d.ts.map +1 -1
- package/dist/node/service.js +13 -3
- package/dist/node/service.js.map +1 -1
- package/dist/task/execution-profile.d.ts +32 -0
- package/dist/task/execution-profile.d.ts.map +1 -0
- package/dist/task/execution-profile.js +227 -0
- package/dist/task/execution-profile.js.map +1 -0
- package/dist/task/scheduler.d.ts +1 -0
- package/dist/task/scheduler.d.ts.map +1 -1
- package/dist/task/scheduler.js +28 -27
- package/dist/task/scheduler.js.map +1 -1
- package/dist/task/types.js +1 -0
- package/dist/task/types.js.map +1 -1
- package/dist/web/server.d.ts +6 -1
- package/dist/web/server.d.ts.map +1 -1
- package/dist/web/server.js +141 -9
- package/dist/web/server.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/api/callback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/api/callback.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA+E1D;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuExB;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0FxB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC,CAwGlB;AAED,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,MAAM,EAAE,cAAc,EACtB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAiElB"}
|
package/dist/api/callback.js
CHANGED
|
@@ -3,6 +3,7 @@ import FormData from 'form-data';
|
|
|
3
3
|
import fs from 'fs';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { createLogger } from '../core/logger.js';
|
|
6
|
+
import { getNodeAuthHeaders } from '../auth/node-auth.js';
|
|
6
7
|
import { createStructuredReportPackage } from '../report/report-package.js';
|
|
7
8
|
const logger = createLogger('Callback');
|
|
8
9
|
const REPORT_UPLOAD_TIMEOUT_MS = Number(process.env.REPORT_UPLOAD_TIMEOUT_MS) || 10 * 60 * 1000;
|
|
@@ -114,6 +115,7 @@ export async function uploadReportToServer(reportFilePath, sessionId, uploadUrl)
|
|
|
114
115
|
'Accept': '*/*',
|
|
115
116
|
'Connection': 'close',
|
|
116
117
|
'Expect': '',
|
|
118
|
+
...getNodeAuthHeaders(),
|
|
117
119
|
// form-data 库会自动设置 Content-Type(含 boundary),必须带上
|
|
118
120
|
...formData.getHeaders(),
|
|
119
121
|
},
|
|
@@ -184,6 +186,7 @@ export async function uploadCapturePackageFile(captureFilePath, sessionId, uploa
|
|
|
184
186
|
'Accept': '*/*',
|
|
185
187
|
'Connection': 'close',
|
|
186
188
|
'Expect': '',
|
|
189
|
+
...getNodeAuthHeaders(),
|
|
187
190
|
...formData.getHeaders(),
|
|
188
191
|
},
|
|
189
192
|
timeout: 120000,
|
|
@@ -302,6 +305,7 @@ export async function uploadReportFile(filePath, taskId, testName, testUrl, succ
|
|
|
302
305
|
'Accept': '*/*',
|
|
303
306
|
'Connection': 'close',
|
|
304
307
|
'Expect': '',
|
|
308
|
+
...getNodeAuthHeaders(),
|
|
305
309
|
...formData.getHeaders(),
|
|
306
310
|
},
|
|
307
311
|
timeout: REPORT_UPLOAD_TIMEOUT_MS,
|
|
@@ -370,6 +374,7 @@ export async function updateTaskStatusToServer(taskId, success, nodeId, errorMes
|
|
|
370
374
|
const response = await axios.put(url, null, {
|
|
371
375
|
params,
|
|
372
376
|
timeout: 10000,
|
|
377
|
+
headers: getNodeAuthHeaders(),
|
|
373
378
|
});
|
|
374
379
|
if (isStatusUpdateSuccess(response)) {
|
|
375
380
|
logger.info(`Task status updated on server (attempt ${attempt}): ${taskId} -> ${success ? 'success' : 'failed'}`);
|
package/dist/api/callback.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/api/callback.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/api/callback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-api.d.ts","sourceRoot":"","sources":["../../src/api/device-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"device-api.d.ts","sourceRoot":"","sources":["../../src/api/device-api.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkB/C;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC,CA0ClB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC,CAqClB"}
|
package/dist/api/device-api.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
2
|
import os from 'os';
|
|
3
3
|
import { createLogger } from '../core/logger.js';
|
|
4
|
+
import { getNodeAuthHeaders } from '../auth/node-auth.js';
|
|
4
5
|
const logger = createLogger('DeviceAPI');
|
|
5
6
|
function getLocalIPAddress() {
|
|
6
7
|
const interfaces = os.networkInterfaces();
|
|
@@ -41,7 +42,10 @@ export async function sendDeviceHeartbeat(device, config) {
|
|
|
41
42
|
};
|
|
42
43
|
const response = await axios.post(config.deviceHeartbeatUrl, data, {
|
|
43
44
|
timeout: 10000,
|
|
44
|
-
headers: {
|
|
45
|
+
headers: {
|
|
46
|
+
'Content-Type': 'application/json',
|
|
47
|
+
...getNodeAuthHeaders(),
|
|
48
|
+
},
|
|
45
49
|
});
|
|
46
50
|
if (response.status === 200 && response.data) {
|
|
47
51
|
const success = response.data.success || response.data.code === 200 || response.data.status === 'success';
|
|
@@ -76,7 +80,10 @@ export async function updateDeviceStatus(serialNumber, status, reason, config) {
|
|
|
76
80
|
const response = await axios.put(updateUrl, null, {
|
|
77
81
|
params: params,
|
|
78
82
|
timeout: 10000,
|
|
79
|
-
headers: {
|
|
83
|
+
headers: {
|
|
84
|
+
'Content-Type': 'application/json',
|
|
85
|
+
...getNodeAuthHeaders(),
|
|
86
|
+
},
|
|
80
87
|
});
|
|
81
88
|
if (response.status === 200 && response.data) {
|
|
82
89
|
const success = response.data.success || response.data.code === 200 || response.data.status === 'success';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-api.js","sourceRoot":"","sources":["../../src/api/device-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"device-api.js","sourceRoot":"","sources":["../../src/api/device-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-api.d.ts","sourceRoot":"","sources":["../../src/api/task-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-api.d.ts","sourceRoot":"","sources":["../../src/api/task-api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKzE;;;GAGG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CA4B/E;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,OAAO,CAAC,CAclB"}
|
package/dist/api/task-api.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
2
|
import { createLogger } from '../core/logger.js';
|
|
3
|
+
import { getNodeAuthHeaders } from '../auth/node-auth.js';
|
|
3
4
|
const logger = createLogger('TaskAPI');
|
|
4
5
|
/**
|
|
5
6
|
* Fetch next task from server using POST /rest/execution-queue/tasks/next
|
|
@@ -12,6 +13,7 @@ export async function fetchNextTask(config) {
|
|
|
12
13
|
nodeId: config.nodeId,
|
|
13
14
|
},
|
|
14
15
|
timeout: 10000,
|
|
16
|
+
headers: getNodeAuthHeaders(),
|
|
15
17
|
});
|
|
16
18
|
if (response.status === 200 && response.data) {
|
|
17
19
|
const d = response.data;
|
|
@@ -36,7 +38,10 @@ export async function acknowledgeTask(executionId, nodeId, config) {
|
|
|
36
38
|
await axios.put(`${config.apiUrl}/rest/execution-queue/tasks/${executionId}/ack`, {
|
|
37
39
|
nodeId,
|
|
38
40
|
status: 1, // Running
|
|
39
|
-
}, {
|
|
41
|
+
}, {
|
|
42
|
+
timeout: 10000,
|
|
43
|
+
headers: getNodeAuthHeaders(),
|
|
44
|
+
});
|
|
40
45
|
return true;
|
|
41
46
|
}
|
|
42
47
|
catch (error) {
|
package/dist/api/task-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-api.js","sourceRoot":"","sources":["../../src/api/task-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-api.js","sourceRoot":"","sources":["../../src/api/task-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAkB;IACpD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,kCAAkC,EAAE,IAAI,EAAE;YAC1F,MAAM,EAAE;gBACN,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kBAAkB,EAAE;SAC9B,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC7C,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;YACxB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/D,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAA4B,CAAC;YAC9D,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,eAAe;gBACrB,IAAI,CAAC,qBAAqB;gBAC1B,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;gBAChC,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,qBAAqB,CAA2B,CAAC;YAElE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,8BAA+B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACtE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAmB,EACnB,MAAc,EACd,MAAkB;IAElB,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,+BAA+B,WAAW,MAAM,EAAE;YAChF,MAAM;YACN,MAAM,EAAE,CAAC,EAAE,UAAU;SACtB,EAAE;YACD,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kBAAkB,EAAE;SAC9B,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,8BAA8B,WAAW,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-auth.d.ts","sourceRoot":"","sources":["../../src/auth/browser-auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwB1D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAoBlE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAmB7C"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { execFile } from 'child_process';
|
|
2
|
+
import { createLogger } from '../core/logger.js';
|
|
3
|
+
const logger = createLogger('BrowserAuth');
|
|
4
|
+
const SSO_LOGIN_URL = 'https://ssa.jd.com/sso/login';
|
|
5
|
+
function appendQuery(url, params) {
|
|
6
|
+
const parsed = new URL(url);
|
|
7
|
+
Object.entries(params).forEach(([key, value]) => {
|
|
8
|
+
if (value) {
|
|
9
|
+
parsed.searchParams.set(key, value);
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
return parsed.toString();
|
|
13
|
+
}
|
|
14
|
+
function normalizeServerUrl(serverUrl) {
|
|
15
|
+
const trimmed = serverUrl.trim().replace(/\/+$/, '');
|
|
16
|
+
if (!/^https?:\/\//i.test(trimmed)) {
|
|
17
|
+
return `http://${trimmed}`;
|
|
18
|
+
}
|
|
19
|
+
return trimmed;
|
|
20
|
+
}
|
|
21
|
+
export function buildBrowserAuthUrl(config) {
|
|
22
|
+
const serverUrl = normalizeServerUrl(config.task.apiUrl);
|
|
23
|
+
const authPageOrigin = normalizeServerUrl(config.task.authPageUrl || serverUrl);
|
|
24
|
+
const callbackUrl = `http://127.0.0.1:${config.server.webPort}/api/auth/activate`;
|
|
25
|
+
const authPageUrl = `${authPageOrigin}/ai-automation/aiserver-bind`;
|
|
26
|
+
const returnUrl = appendQuery(authPageUrl, {
|
|
27
|
+
mode: 'auto',
|
|
28
|
+
serverUrl,
|
|
29
|
+
callbackUrl,
|
|
30
|
+
nodeId: config.node.nodeId,
|
|
31
|
+
name: config.node.nodeName,
|
|
32
|
+
tags: config.node.supportedTags,
|
|
33
|
+
version: config.node.version,
|
|
34
|
+
webPort: String(config.server.webPort),
|
|
35
|
+
});
|
|
36
|
+
return appendQuery(SSO_LOGIN_URL, {
|
|
37
|
+
ReturnUrl: returnUrl,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
export function openBrowser(url) {
|
|
41
|
+
const platform = process.platform;
|
|
42
|
+
let command = 'xdg-open';
|
|
43
|
+
let args = [url];
|
|
44
|
+
if (platform === 'darwin') {
|
|
45
|
+
command = 'open';
|
|
46
|
+
}
|
|
47
|
+
else if (platform === 'win32') {
|
|
48
|
+
command = 'cmd';
|
|
49
|
+
args = ['/c', 'start', '', url];
|
|
50
|
+
}
|
|
51
|
+
execFile(command, args, (error) => {
|
|
52
|
+
if (error) {
|
|
53
|
+
logger.warn(`自动打开浏览器失败,请手动访问授权地址: ${url}`);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
logger.info('已打开浏览器授权页面');
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=browser-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-auth.js","sourceRoot":"","sources":["../../src/auth/browser-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;AAC3C,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,SAAS,WAAW,CAAC,GAAW,EAAE,MAA0C;IAC1E,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAiB;IAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACnC,OAAO,UAAU,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAsB;IACxD,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,oBAAoB,MAAM,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC;IAClF,MAAM,WAAW,GAAG,GAAG,cAAc,8BAA8B,CAAC;IAEpE,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,EAAE;QACzC,IAAI,EAAE,MAAM;QACZ,SAAS;QACT,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa;QAC/B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;QAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;KACvC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,aAAa,EAAE;QAChC,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,OAAO,GAAG,UAAU,CAAC;IACzB,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAEjB,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;SAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,OAAO,GAAG,KAAK,CAAC;QAChB,IAAI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;QAChC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export interface NodeAuthState {
|
|
2
|
+
serverUrl: string;
|
|
3
|
+
nodeAuthId: string;
|
|
4
|
+
nodeAuthToken: string;
|
|
5
|
+
ownerErp: string;
|
|
6
|
+
name?: string;
|
|
7
|
+
nodeId?: string;
|
|
8
|
+
tags?: string;
|
|
9
|
+
activatedAt: string;
|
|
10
|
+
}
|
|
11
|
+
export interface ActivateOptions {
|
|
12
|
+
serverUrl?: string;
|
|
13
|
+
code?: string;
|
|
14
|
+
nodeAuthName?: string;
|
|
15
|
+
nodeId?: string;
|
|
16
|
+
tags?: string;
|
|
17
|
+
version?: string;
|
|
18
|
+
}
|
|
19
|
+
export declare function normalizeNodeAuthServerUrl(serverUrl: string): string;
|
|
20
|
+
export declare function loadNodeAuth(): NodeAuthState | null;
|
|
21
|
+
export declare function isNodeAuthUsable(expectedServerUrl: string, minActivatedAt?: Date): boolean;
|
|
22
|
+
export declare function saveNodeAuth(auth: NodeAuthState): void;
|
|
23
|
+
export declare function getSavedServerUrl(): string | undefined;
|
|
24
|
+
export declare function getNodeAuthHeaders(): Record<string, string>;
|
|
25
|
+
export declare function activateAIServer(options: ActivateOptions): Promise<NodeAuthState>;
|
|
26
|
+
export declare function sendNodeAuthHeartbeat(status?: string): Promise<boolean>;
|
|
27
|
+
//# sourceMappingURL=node-auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node-auth.d.ts","sourceRoot":"","sources":["../../src/auth/node-auth.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAUD,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEpE;AAMD,wBAAgB,YAAY,IAAI,aAAa,GAAG,IAAI,CAiBnD;AAED,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,IAAI,GAAG,OAAO,CAa1F;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,CAGtD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAS3D;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CA4CvF;AAED,wBAAsB,qBAAqB,CAAC,MAAM,GAAE,MAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBvF"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import axios from 'axios';
|
|
2
|
+
import fs from 'fs';
|
|
3
|
+
import os from 'os';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { createLogger } from '../core/logger.js';
|
|
6
|
+
const logger = createLogger('NodeAuth');
|
|
7
|
+
const AUTH_FILE_PATH = path.resolve(process.cwd(), 'data', 'aiserver-auth.json');
|
|
8
|
+
function normalizeServerUrl(serverUrl) {
|
|
9
|
+
const trimmed = serverUrl.trim().replace(/\/+$/, '');
|
|
10
|
+
if (!/^https?:\/\//i.test(trimmed)) {
|
|
11
|
+
return `http://${trimmed}`;
|
|
12
|
+
}
|
|
13
|
+
return trimmed;
|
|
14
|
+
}
|
|
15
|
+
export function normalizeNodeAuthServerUrl(serverUrl) {
|
|
16
|
+
return normalizeServerUrl(serverUrl);
|
|
17
|
+
}
|
|
18
|
+
function ensureDataDir() {
|
|
19
|
+
fs.mkdirSync(path.dirname(AUTH_FILE_PATH), { recursive: true });
|
|
20
|
+
}
|
|
21
|
+
export function loadNodeAuth() {
|
|
22
|
+
try {
|
|
23
|
+
if (!fs.existsSync(AUTH_FILE_PATH))
|
|
24
|
+
return null;
|
|
25
|
+
const raw = fs.readFileSync(AUTH_FILE_PATH, 'utf8');
|
|
26
|
+
const parsed = JSON.parse(raw);
|
|
27
|
+
const nodeAuthToken = parsed.nodeAuthToken || parsed.agentToken;
|
|
28
|
+
const nodeAuthId = parsed.nodeAuthId || parsed.agentId;
|
|
29
|
+
if (!parsed?.serverUrl || !nodeAuthToken || !nodeAuthId)
|
|
30
|
+
return null;
|
|
31
|
+
return {
|
|
32
|
+
...parsed,
|
|
33
|
+
nodeAuthId,
|
|
34
|
+
nodeAuthToken,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
logger.warn(`Failed to load node auth: ${error.message}`);
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
export function isNodeAuthUsable(expectedServerUrl, minActivatedAt) {
|
|
43
|
+
const auth = loadNodeAuth();
|
|
44
|
+
if (!auth)
|
|
45
|
+
return false;
|
|
46
|
+
if (normalizeServerUrl(auth.serverUrl) !== normalizeServerUrl(expectedServerUrl)) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
if (minActivatedAt) {
|
|
50
|
+
const activatedAt = new Date(auth.activatedAt).getTime();
|
|
51
|
+
if (!Number.isFinite(activatedAt) || activatedAt < minActivatedAt.getTime()) {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return true;
|
|
56
|
+
}
|
|
57
|
+
export function saveNodeAuth(auth) {
|
|
58
|
+
ensureDataDir();
|
|
59
|
+
fs.writeFileSync(AUTH_FILE_PATH, JSON.stringify(auth, null, 2), { mode: 0o600 });
|
|
60
|
+
}
|
|
61
|
+
export function getSavedServerUrl() {
|
|
62
|
+
return loadNodeAuth()?.serverUrl;
|
|
63
|
+
}
|
|
64
|
+
export function getNodeAuthHeaders() {
|
|
65
|
+
const auth = loadNodeAuth();
|
|
66
|
+
if (!auth?.nodeAuthToken)
|
|
67
|
+
return {};
|
|
68
|
+
return {
|
|
69
|
+
Authorization: `Bearer ${auth.nodeAuthToken}`,
|
|
70
|
+
'X-AIServer-Token': auth.nodeAuthToken,
|
|
71
|
+
'X-AIServer-Node-Auth-Id': auth.nodeAuthId,
|
|
72
|
+
'X-AIServer-Owner': auth.ownerErp,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
export async function activateAIServer(options) {
|
|
76
|
+
if (!options.serverUrl) {
|
|
77
|
+
throw new Error('Missing --server, e.g. --server http://opentestai.jd.com');
|
|
78
|
+
}
|
|
79
|
+
if (!options.code) {
|
|
80
|
+
throw new Error('Missing --code');
|
|
81
|
+
}
|
|
82
|
+
const serverUrl = normalizeServerUrl(options.serverUrl);
|
|
83
|
+
const nodeId = options.nodeId || os.hostname();
|
|
84
|
+
const response = await axios.post(`${serverUrl}/rest/aiserver/activate`, {
|
|
85
|
+
code: options.code,
|
|
86
|
+
nodeAuthName: options.nodeAuthName || `个人调试设备-${nodeId}`,
|
|
87
|
+
nodeId,
|
|
88
|
+
tags: options.tags || 'personal,debug',
|
|
89
|
+
version: options.version || '1.8.2',
|
|
90
|
+
}, {
|
|
91
|
+
timeout: 15000,
|
|
92
|
+
headers: { 'Content-Type': 'application/json' },
|
|
93
|
+
});
|
|
94
|
+
const payload = response.data?.data || response.data;
|
|
95
|
+
const nodeAuthToken = payload?.nodeAuthToken || payload?.agentToken;
|
|
96
|
+
const nodeAuthId = payload?.nodeAuthId || payload?.agentId;
|
|
97
|
+
if (!nodeAuthToken || !nodeAuthId) {
|
|
98
|
+
throw new Error(`Activation response missing token: ${JSON.stringify(response.data)}`);
|
|
99
|
+
}
|
|
100
|
+
const auth = {
|
|
101
|
+
serverUrl,
|
|
102
|
+
nodeAuthId,
|
|
103
|
+
nodeAuthToken,
|
|
104
|
+
ownerErp: payload.ownerErp,
|
|
105
|
+
name: payload.name,
|
|
106
|
+
nodeId,
|
|
107
|
+
tags: payload.tags,
|
|
108
|
+
activatedAt: new Date().toISOString(),
|
|
109
|
+
};
|
|
110
|
+
saveNodeAuth(auth);
|
|
111
|
+
return auth;
|
|
112
|
+
}
|
|
113
|
+
export async function sendNodeAuthHeartbeat(status = 'ONLINE') {
|
|
114
|
+
const auth = loadNodeAuth();
|
|
115
|
+
if (!auth)
|
|
116
|
+
return false;
|
|
117
|
+
try {
|
|
118
|
+
await axios.post(`${auth.serverUrl}/rest/aiserver/heartbeat`, { status }, {
|
|
119
|
+
timeout: 10000,
|
|
120
|
+
headers: {
|
|
121
|
+
'Content-Type': 'application/json',
|
|
122
|
+
...getNodeAuthHeaders(),
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
return true;
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
logger.warn(`Node auth heartbeat failed: ${error.message}`);
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=node-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node-auth.js","sourceRoot":"","sources":["../../src/auth/node-auth.ts"],"names":[],"mappings":"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"}
|
package/dist/config/cli.d.ts
CHANGED
|
@@ -24,9 +24,21 @@
|
|
|
24
24
|
* --insight-model-base-url <url> Insight model base URL (MIDSCENE_INSIGHT_MODEL_BASE_URL)
|
|
25
25
|
* --insight-model-api-key <key> Insight model API key (MIDSCENE_INSIGHT_MODEL_API_KEY)
|
|
26
26
|
* --insight-model-family <f> Insight model family (MIDSCENE_INSIGHT_MODEL_FAMILY)
|
|
27
|
+
* --auth-url <url> Frontend auth page origin
|
|
28
|
+
* --login-script-api-url <url> Backend URL for resolving login scripts
|
|
29
|
+
* --force-auth Always open browser authorization before starting services
|
|
30
|
+
* activate --server <url> --code <code> --name <name>
|
|
27
31
|
* --help Show help
|
|
28
32
|
*/
|
|
29
33
|
export interface CliArgs {
|
|
34
|
+
command?: 'activate';
|
|
35
|
+
serverUrl?: string;
|
|
36
|
+
authUrl?: string;
|
|
37
|
+
loginScriptApiUrl?: string;
|
|
38
|
+
forceAuth?: boolean;
|
|
39
|
+
bindCode?: string;
|
|
40
|
+
nodeAuthName?: string;
|
|
41
|
+
nodeAuthTags?: string;
|
|
30
42
|
supportedTags?: string;
|
|
31
43
|
maxConcurrent?: number;
|
|
32
44
|
nodeName?: string;
|
package/dist/config/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/config/cli.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/config/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmDD,wBAAgB,YAAY,IAAI,OAAO,CA+PtC"}
|
package/dist/config/cli.js
CHANGED
|
@@ -24,6 +24,10 @@
|
|
|
24
24
|
* --insight-model-base-url <url> Insight model base URL (MIDSCENE_INSIGHT_MODEL_BASE_URL)
|
|
25
25
|
* --insight-model-api-key <key> Insight model API key (MIDSCENE_INSIGHT_MODEL_API_KEY)
|
|
26
26
|
* --insight-model-family <f> Insight model family (MIDSCENE_INSIGHT_MODEL_FAMILY)
|
|
27
|
+
* --auth-url <url> Frontend auth page origin
|
|
28
|
+
* --login-script-api-url <url> Backend URL for resolving login scripts
|
|
29
|
+
* --force-auth Always open browser authorization before starting services
|
|
30
|
+
* activate --server <url> --code <code> --name <name>
|
|
27
31
|
* --help Show help
|
|
28
32
|
*/
|
|
29
33
|
function showHelp() {
|
|
@@ -31,6 +35,7 @@ function showHelp() {
|
|
|
31
35
|
@aiscene/aiserver - AI Automation Server
|
|
32
36
|
|
|
33
37
|
Usage: aiserver [options]
|
|
38
|
+
aiserver activate --server <url> --code <code> [--name <name>] [--tags <tags>]
|
|
34
39
|
|
|
35
40
|
Options:
|
|
36
41
|
--supported-tags <tags> Supported tags for task routing (e.g. "task,open,android,ios,web")
|
|
@@ -42,7 +47,7 @@ Options:
|
|
|
42
47
|
--region <region> Node region
|
|
43
48
|
--description <desc> Node description
|
|
44
49
|
--port <port> WebSocket server port (default: 8002)
|
|
45
|
-
--web-port <port> Web dashboard port (default:
|
|
50
|
+
--web-port <port> Web dashboard port (default: 3005)
|
|
46
51
|
--model-name <name> AI model name (required, e.g. "doubao-seed-1-6-vision-250815")
|
|
47
52
|
--model-base-url <url> AI model base URL (e.g. "https://modelservice.jdcloud.com/v1")
|
|
48
53
|
--model-api-key <key> AI model API key
|
|
@@ -58,9 +63,17 @@ Options:
|
|
|
58
63
|
--login-url <url> Login URL for web authentication
|
|
59
64
|
--login-username <user> Login username
|
|
60
65
|
--login-password <pass> Login password
|
|
66
|
+
--server <url> Backend server URL for activation and API callbacks
|
|
67
|
+
--auth-url <url> Frontend auth page origin (default: http://opentest.jd.com)
|
|
68
|
+
--login-script-api-url <url> Backend URL for login script resolution
|
|
69
|
+
--force-auth Always open browser authorization before starting services
|
|
70
|
+
--code <code> One-time bind code generated by frontend
|
|
71
|
+
--name <name> Local AIServer display name
|
|
61
72
|
--help Show this help message
|
|
62
73
|
|
|
63
74
|
Examples:
|
|
75
|
+
aiserver activate --server http://opentestai.jd.com --code ABCD2345 --name "我的调试设备"
|
|
76
|
+
aiserver --server http://opentestai.jd.com --auth-url http://opentest.jd.com
|
|
64
77
|
aiserver --supported-tags task,open --model-name doubao-seed-1-6-vision-250815 --model-base-url https://modelservice.jdcloud.com/v1 --model-api-key xxx
|
|
65
78
|
aiserver --supported-tags task --node-name "my-executor" --model-name doubao-seed-1-6-vision-250815 --model-family vlm-ui-tars-doubao-1.5
|
|
66
79
|
`);
|
|
@@ -68,14 +81,58 @@ Examples:
|
|
|
68
81
|
export function parseCliArgs() {
|
|
69
82
|
const args = {};
|
|
70
83
|
const argv = process.argv.slice(2);
|
|
84
|
+
let startIndex = 0;
|
|
85
|
+
if (argv[0] === 'activate') {
|
|
86
|
+
args.command = 'activate';
|
|
87
|
+
startIndex = 1;
|
|
88
|
+
}
|
|
71
89
|
if (argv.includes('--help') || argv.includes('-h')) {
|
|
72
90
|
showHelp();
|
|
73
91
|
process.exit(0);
|
|
74
92
|
}
|
|
75
|
-
for (let i =
|
|
93
|
+
for (let i = startIndex; i < argv.length; i++) {
|
|
76
94
|
const arg = argv[i];
|
|
77
95
|
const next = argv[i + 1];
|
|
78
96
|
switch (arg) {
|
|
97
|
+
case '--server':
|
|
98
|
+
if (next && !next.startsWith('--')) {
|
|
99
|
+
args.serverUrl = next;
|
|
100
|
+
i++;
|
|
101
|
+
}
|
|
102
|
+
break;
|
|
103
|
+
case '--auth-url':
|
|
104
|
+
if (next && !next.startsWith('--')) {
|
|
105
|
+
args.authUrl = next;
|
|
106
|
+
i++;
|
|
107
|
+
}
|
|
108
|
+
break;
|
|
109
|
+
case '--login-script-api-url':
|
|
110
|
+
if (next && !next.startsWith('--')) {
|
|
111
|
+
args.loginScriptApiUrl = next;
|
|
112
|
+
i++;
|
|
113
|
+
}
|
|
114
|
+
break;
|
|
115
|
+
case '--force-auth':
|
|
116
|
+
args.forceAuth = true;
|
|
117
|
+
break;
|
|
118
|
+
case '--code':
|
|
119
|
+
if (next && !next.startsWith('--')) {
|
|
120
|
+
args.bindCode = next;
|
|
121
|
+
i++;
|
|
122
|
+
}
|
|
123
|
+
break;
|
|
124
|
+
case '--name':
|
|
125
|
+
if (next && !next.startsWith('--')) {
|
|
126
|
+
args.nodeAuthName = next;
|
|
127
|
+
i++;
|
|
128
|
+
}
|
|
129
|
+
break;
|
|
130
|
+
case '--tags':
|
|
131
|
+
if (next && !next.startsWith('--')) {
|
|
132
|
+
args.nodeAuthTags = next;
|
|
133
|
+
i++;
|
|
134
|
+
}
|
|
135
|
+
break;
|
|
79
136
|
case '--supported-tags':
|
|
80
137
|
if (next && !next.startsWith('--')) {
|
|
81
138
|
args.supportedTags = next;
|