dsh-apk-vm 0.8.1 → 0.10.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/CHANGELOG.md +68 -0
- package/README.md +112 -8
- package/client.js +551 -9
- package/index.js +904 -15
- package/lib/app-skills.js +592 -0
- package/lib/control-codebook.js +374 -0
- package/lib/http-owner.js +80 -0
- package/lib/image-features.js +329 -0
- package/lib/instances.js +225 -43
- package/lib/ui-inspector.js +61 -2
- package/lib/vm-ownership.js +254 -0
- package/package.json +8 -3
package/client.js
CHANGED
|
@@ -30,7 +30,7 @@ window.__ModuleLoader__.load({
|
|
|
30
30
|
var SWIPE_THRESHOLD_PX = 24;
|
|
31
31
|
var FRAME_INTERVAL_MS = 500;
|
|
32
32
|
var STATE_INTERVAL_MS = 2000;
|
|
33
|
-
var CLIENT_VERSION = '0.
|
|
33
|
+
var CLIENT_VERSION = '0.10.1';
|
|
34
34
|
|
|
35
35
|
/* ------------------------------------------------------------------ *
|
|
36
36
|
* Optional dsh-better-sidebar integration.
|
|
@@ -113,6 +113,19 @@ window.__ModuleLoader__.load({
|
|
|
113
113
|
'pill.boot': 'boot {s}s',
|
|
114
114
|
'pill.snapshot': 'quick {s}s',
|
|
115
115
|
'pill.cold': 'cold {s}s',
|
|
116
|
+
'owner.pill': 'owner: {label}',
|
|
117
|
+
'owner.shared': 'shared',
|
|
118
|
+
'owner.conversation': 'conversation VM',
|
|
119
|
+
'owner.project': 'project VM',
|
|
120
|
+
'owner.title': 'VM usage',
|
|
121
|
+
'owner.none': 'unowned',
|
|
122
|
+
'owner.claim': 'Claim',
|
|
123
|
+
'owner.release': 'Release',
|
|
124
|
+
'owner.claimOk': 'VM claimed',
|
|
125
|
+
'owner.releaseOk': 'VM released',
|
|
126
|
+
'owner.busy': 'in use by {label}',
|
|
127
|
+
'owner.scope': 'Scope',
|
|
128
|
+
'owner.forceHint': 'Another owner holds this VM; release it first.',
|
|
116
129
|
'action.start': 'Start VM',
|
|
117
130
|
'action.starting': 'Starting…',
|
|
118
131
|
'action.stop': 'Stop',
|
|
@@ -232,6 +245,7 @@ window.__ModuleLoader__.load({
|
|
|
232
245
|
'network.forwardLocal': 'Host port',
|
|
233
246
|
'network.forwardRemote': 'Guest port',
|
|
234
247
|
'network.addForward': 'Add forward',
|
|
248
|
+
'network.presets': 'Presets',
|
|
235
249
|
'network.remove': 'Remove',
|
|
236
250
|
'network.mode': 'Mode',
|
|
237
251
|
'network.isolated': 'Isolated',
|
|
@@ -263,6 +277,20 @@ window.__ModuleLoader__.load({
|
|
|
263
277
|
'flow.saved': 'Saved {name}',
|
|
264
278
|
'flow.done': 'Replayed {name}',
|
|
265
279
|
'flow.count': '{n} step(s)',
|
|
280
|
+
'skill.title': 'App operation Skills',
|
|
281
|
+
'skill.start': 'Record Skill',
|
|
282
|
+
'skill.stop': 'Stop recording',
|
|
283
|
+
'skill.name': 'Skill name',
|
|
284
|
+
'skill.target': 'Target code (optional)',
|
|
285
|
+
'skill.run': 'Run to target',
|
|
286
|
+
'skill.delete': 'Delete',
|
|
287
|
+
'skill.empty': 'No App Skills yet',
|
|
288
|
+
'skill.recording': 'Recording semantic controls…',
|
|
289
|
+
'skill.saved': 'Saved Skill {name}',
|
|
290
|
+
'skill.done': 'Ran {name} ({n} steps)',
|
|
291
|
+
'skill.failed': 'Skill run failed',
|
|
292
|
+
'skill.meta': '{n} steps · {codes} codes',
|
|
293
|
+
'skill.hint': 'Agent records code-based controls; replay skips fixed sleeps and stops at target code.',
|
|
266
294
|
'snapshots.title': 'VM snapshots',
|
|
267
295
|
'snapshots.placeholder': 'snapshot name',
|
|
268
296
|
'snapshots.save': 'Save',
|
|
@@ -402,6 +430,19 @@ window.__ModuleLoader__.load({
|
|
|
402
430
|
'pill.boot': '启动用时 {s} 秒',
|
|
403
431
|
'pill.snapshot': '快照启动 {s} 秒',
|
|
404
432
|
'pill.cold': '冷启动 {s} 秒',
|
|
433
|
+
'owner.pill': '使用者:{label}',
|
|
434
|
+
'owner.shared': '共享',
|
|
435
|
+
'owner.conversation': '对话专属',
|
|
436
|
+
'owner.project': '项目专属',
|
|
437
|
+
'owner.title': '虚拟机使用',
|
|
438
|
+
'owner.none': '未占用',
|
|
439
|
+
'owner.claim': '认领',
|
|
440
|
+
'owner.release': '释放',
|
|
441
|
+
'owner.claimOk': '已认领虚拟机',
|
|
442
|
+
'owner.releaseOk': '已释放虚拟机',
|
|
443
|
+
'owner.busy': '被 {label} 占用',
|
|
444
|
+
'owner.scope': '范围',
|
|
445
|
+
'owner.forceHint': '其他使用者正在占用,请先释放。',
|
|
405
446
|
'action.start': '启动虚拟机',
|
|
406
447
|
'action.starting': '正在启动…',
|
|
407
448
|
'action.stop': '停止',
|
|
@@ -521,6 +562,7 @@ window.__ModuleLoader__.load({
|
|
|
521
562
|
'network.forwardLocal': '宿主机端口',
|
|
522
563
|
'network.forwardRemote': 'Guest 端口',
|
|
523
564
|
'network.addForward': '添加转发',
|
|
565
|
+
'network.presets': '预设',
|
|
524
566
|
'network.remove': '删除',
|
|
525
567
|
'network.mode': '模式',
|
|
526
568
|
'network.isolated': '隔离',
|
|
@@ -552,6 +594,20 @@ window.__ModuleLoader__.load({
|
|
|
552
594
|
'flow.saved': '已保存 {name}',
|
|
553
595
|
'flow.done': '已回放 {name}',
|
|
554
596
|
'flow.count': '{n} 步',
|
|
597
|
+
'skill.title': '应用操作 Skill',
|
|
598
|
+
'skill.start': '录制 Skill',
|
|
599
|
+
'skill.stop': '停止录制',
|
|
600
|
+
'skill.name': 'Skill 名称',
|
|
601
|
+
'skill.target': '目标编码(可选)',
|
|
602
|
+
'skill.run': '运行到目标',
|
|
603
|
+
'skill.delete': '删除',
|
|
604
|
+
'skill.empty': '还没有 App Skill',
|
|
605
|
+
'skill.recording': '正在录制语义控件…',
|
|
606
|
+
'skill.saved': '已保存 Skill {name}',
|
|
607
|
+
'skill.done': '已运行 {name}({n} 步)',
|
|
608
|
+
'skill.failed': 'Skill 运行失败',
|
|
609
|
+
'skill.meta': '{n} 步 · {codes} 个编码',
|
|
610
|
+
'skill.hint': 'Agent 用编码录制操作;回放跳过固定等待,并在目标编码出现时提前结束。',
|
|
555
611
|
'snapshots.title': 'VM 快照',
|
|
556
612
|
'snapshots.placeholder': '快照名称',
|
|
557
613
|
'snapshots.save': '保存',
|
|
@@ -762,6 +818,49 @@ window.__ModuleLoader__.load({
|
|
|
762
818
|
* reject, so a dead Host route only produces an inline error banner.
|
|
763
819
|
* ------------------------------------------------------------------ */
|
|
764
820
|
|
|
821
|
+
var PANEL_OWNER_ID = 'apkvm.panel.id';
|
|
822
|
+
var PANEL_OWNER_SCOPE = 'apkvm.panel.scope';
|
|
823
|
+
|
|
824
|
+
function panelOwnerId() {
|
|
825
|
+
try {
|
|
826
|
+
var stored = window.localStorage.getItem(PANEL_OWNER_ID);
|
|
827
|
+
if (stored) return String(stored).slice(0, 120);
|
|
828
|
+
var created = Math.random().toString(36).slice(2, 10);
|
|
829
|
+
window.localStorage.setItem(PANEL_OWNER_ID, created);
|
|
830
|
+
return created;
|
|
831
|
+
} catch (error) {
|
|
832
|
+
return 'default';
|
|
833
|
+
}
|
|
834
|
+
}
|
|
835
|
+
|
|
836
|
+
function panelOwnerKey() {
|
|
837
|
+
return 'panel:' + panelOwnerScope() + ':' + panelOwnerId();
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
function panelOwnerScope() {
|
|
841
|
+
try {
|
|
842
|
+
var stored = window.localStorage.getItem(PANEL_OWNER_SCOPE);
|
|
843
|
+
return stored === 'conversation' || stored === 'project' ? stored : 'shared';
|
|
844
|
+
} catch (error) {
|
|
845
|
+
return 'shared';
|
|
846
|
+
}
|
|
847
|
+
}
|
|
848
|
+
|
|
849
|
+
function panelOwnerHeaders() {
|
|
850
|
+
return {
|
|
851
|
+
'x-apk-vm-owner': panelOwnerKey(),
|
|
852
|
+
'x-apk-vm-scope': panelOwnerScope(),
|
|
853
|
+
'x-apk-vm-label': encodeURIComponent('桌面面板'),
|
|
854
|
+
};
|
|
855
|
+
}
|
|
856
|
+
|
|
857
|
+
var PORT_PRESETS = [
|
|
858
|
+
{ key: 'metro', label: 'Metro 8081', localPort: 8081, remotePort: 8081 },
|
|
859
|
+
{ key: 'http', label: 'HTTP 8080', localPort: 8080, remotePort: 8080 },
|
|
860
|
+
{ key: 'frida', label: 'Frida 27042', localPort: 27042, remotePort: 27042 },
|
|
861
|
+
{ key: 'devtools', label: 'DevTools 9222', localPort: 9222, remotePort: 9222 },
|
|
862
|
+
];
|
|
863
|
+
|
|
765
864
|
function requestJson(url, options, T) {
|
|
766
865
|
var tr = typeof T === 'function' ? T : createTranslator(null);
|
|
767
866
|
var opts = isObject(options) ? options : {};
|
|
@@ -769,10 +868,18 @@ window.__ModuleLoader__.load({
|
|
|
769
868
|
return Promise.resolve({ ok: false, status: 0, error: tr('err.noFetch'), data: null });
|
|
770
869
|
}
|
|
771
870
|
var init = { method: opts.method ? String(opts.method).toUpperCase() : 'GET', cache: 'no-store' };
|
|
871
|
+
var headers = {};
|
|
772
872
|
if (opts.body !== undefined) {
|
|
773
873
|
init.body = opts.body;
|
|
774
|
-
|
|
874
|
+
headers['content-type'] = 'application/json';
|
|
775
875
|
}
|
|
876
|
+
if (init.method !== 'GET' && init.method !== 'HEAD') {
|
|
877
|
+
var ownerHeaders = panelOwnerHeaders();
|
|
878
|
+
for (var ownerHeader in ownerHeaders) {
|
|
879
|
+
if (Object.prototype.hasOwnProperty.call(ownerHeaders, ownerHeader)) headers[ownerHeader] = ownerHeaders[ownerHeader];
|
|
880
|
+
}
|
|
881
|
+
}
|
|
882
|
+
if (Object.keys(headers).length) init.headers = headers;
|
|
776
883
|
return fetch(url, init)
|
|
777
884
|
.then(function (response) {
|
|
778
885
|
return response.text().then(function (text) {
|
|
@@ -1141,7 +1248,12 @@ window.__ModuleLoader__.load({
|
|
|
1141
1248
|
'.apkvm-instactions{display:flex;gap:3px;flex:none}' +
|
|
1142
1249
|
'.apkvm-mini{font:inherit;font-size:10px;height:19px;padding:0 5px;border-radius:5px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-secondary);cursor:pointer}' +
|
|
1143
1250
|
'.apkvm-mini:hover{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-brand-primary)}' +
|
|
1251
|
+
'.apkvm-mini.active{color:var(--dsw-alias-brand-primary);border-color:var(--dsw-alias-brand-primary);background:var(--dsw-alias-bg-layer-2)}' +
|
|
1252
|
+
'.apkvm-mini:disabled{opacity:.5;cursor:default}' +
|
|
1144
1253
|
'.apkvm-mini.danger:hover{color:var(--dsw-alias-state-error-primary);border-color:var(--dsw-alias-state-error-primary)}' +
|
|
1254
|
+
'.apkvm-ownerbody{padding:6px 10px 9px;display:flex;flex-direction:column;gap:7px}' +
|
|
1255
|
+
'.apkvm-ownerrow{font-size:11px;line-height:16px}' +
|
|
1256
|
+
'.apkvm-ownercontrols{display:flex;align-items:center;gap:5px;flex-wrap:wrap}' +
|
|
1145
1257
|
'.apkvm-appsbody{display:flex;flex-direction:column;gap:5px;padding-top:4px}' +
|
|
1146
1258
|
'.apkvm-appslist{display:flex;flex-direction:column;gap:3px;max-height:180px}' +
|
|
1147
1259
|
'.apkvm-approw{display:flex;align-items:center;gap:4px;min-width:0;font-size:11px}' +
|
|
@@ -1419,6 +1531,15 @@ window.__ModuleLoader__.load({
|
|
|
1419
1531
|
var instancesListState = React.useState([]);
|
|
1420
1532
|
var instancesList = instancesListState[0];
|
|
1421
1533
|
var setInstancesList = instancesListState[1];
|
|
1534
|
+
var ownershipState = React.useState(null);
|
|
1535
|
+
var ownership = ownershipState[0];
|
|
1536
|
+
var setOwnership = ownershipState[1];
|
|
1537
|
+
var panelScopeState = React.useState(panelOwnerScope());
|
|
1538
|
+
var panelScope = panelScopeState[0];
|
|
1539
|
+
var setPanelScope = panelScopeState[1];
|
|
1540
|
+
var ownerBusyState = React.useState(false);
|
|
1541
|
+
var ownerBusy = ownerBusyState[0];
|
|
1542
|
+
var setOwnerBusy = ownerBusyState[1];
|
|
1422
1543
|
var gridOpenState = React.useState(false);
|
|
1423
1544
|
var gridOpen = gridOpenState[0];
|
|
1424
1545
|
var setGridOpen = gridOpenState[1];
|
|
@@ -1475,6 +1596,21 @@ window.__ModuleLoader__.load({
|
|
|
1475
1596
|
var flowBusyState = React.useState('');
|
|
1476
1597
|
var flowBusy = flowBusyState[0];
|
|
1477
1598
|
var setFlowBusy = flowBusyState[1];
|
|
1599
|
+
var skillsState = React.useState([]);
|
|
1600
|
+
var skills = skillsState[0];
|
|
1601
|
+
var setSkills = skillsState[1];
|
|
1602
|
+
var skillRecordingState = React.useState(false);
|
|
1603
|
+
var skillRecording = skillRecordingState[0];
|
|
1604
|
+
var setSkillRecording = skillRecordingState[1];
|
|
1605
|
+
var skillNameState = React.useState('');
|
|
1606
|
+
var skillName = skillNameState[0];
|
|
1607
|
+
var setSkillName = skillNameState[1];
|
|
1608
|
+
var skillTargetState = React.useState('');
|
|
1609
|
+
var skillTarget = skillTargetState[0];
|
|
1610
|
+
var setSkillTarget = skillTargetState[1];
|
|
1611
|
+
var skillBusyState = React.useState('');
|
|
1612
|
+
var skillBusy = skillBusyState[0];
|
|
1613
|
+
var setSkillBusy = skillBusyState[1];
|
|
1478
1614
|
|
|
1479
1615
|
var storageState = React.useState(null);
|
|
1480
1616
|
var storage = storageState[0];
|
|
@@ -1674,6 +1810,11 @@ window.__ModuleLoader__.load({
|
|
|
1674
1810
|
}
|
|
1675
1811
|
}
|
|
1676
1812
|
pillMeta.push('v' + CLIENT_VERSION);
|
|
1813
|
+
var ownerSnapshot = snapshot && isObject(snapshot.owner) ? snapshot.owner : null;
|
|
1814
|
+
if (ownerSnapshot) {
|
|
1815
|
+
var ownerPillLabel = String(ownerSnapshot.label || ownerSnapshot.key || '').slice(0, 48);
|
|
1816
|
+
if (ownerPillLabel) pillMeta.push(T('owner.pill', { label: ownerPillLabel }));
|
|
1817
|
+
}
|
|
1677
1818
|
var subtitleText = apkInfo
|
|
1678
1819
|
? T('apk.current', { name: apkInfo.label || apkInfo.packageName || apkInfo.path })
|
|
1679
1820
|
: T('subtitle');
|
|
@@ -1738,8 +1879,10 @@ window.__ModuleLoader__.load({
|
|
|
1738
1879
|
loadState();
|
|
1739
1880
|
loadApks();
|
|
1740
1881
|
loadInstances();
|
|
1882
|
+
loadOwnership();
|
|
1741
1883
|
loadDevices();
|
|
1742
1884
|
loadFlows();
|
|
1885
|
+
loadSkills();
|
|
1743
1886
|
loadStorage();
|
|
1744
1887
|
loadNetwork();
|
|
1745
1888
|
var pollId = setInterval(function () {
|
|
@@ -1750,7 +1893,10 @@ window.__ModuleLoader__.load({
|
|
|
1750
1893
|
});
|
|
1751
1894
|
}, STATE_INTERVAL_MS);
|
|
1752
1895
|
var instancePollId = setInterval(function () {
|
|
1753
|
-
if (mountedRef.current)
|
|
1896
|
+
if (mountedRef.current) {
|
|
1897
|
+
loadInstances();
|
|
1898
|
+
loadOwnership();
|
|
1899
|
+
}
|
|
1754
1900
|
}, 5000);
|
|
1755
1901
|
return function () {
|
|
1756
1902
|
mountedRef.current = false;
|
|
@@ -2181,6 +2327,8 @@ window.__ModuleLoader__.load({
|
|
|
2181
2327
|
setInspectNodes([]);
|
|
2182
2328
|
setInspectSelected(null);
|
|
2183
2329
|
loadFlows();
|
|
2330
|
+
loadSkills();
|
|
2331
|
+
loadOwnership();
|
|
2184
2332
|
setNetwork(null);
|
|
2185
2333
|
loadNetwork();
|
|
2186
2334
|
stopLiveLogcat();
|
|
@@ -2198,6 +2346,116 @@ window.__ModuleLoader__.load({
|
|
|
2198
2346
|
});
|
|
2199
2347
|
}
|
|
2200
2348
|
|
|
2349
|
+
function loadOwnership() {
|
|
2350
|
+
var id = activeInstanceRef.current || 'default';
|
|
2351
|
+
return requestJson('/apk-vm/ownership?instanceId=' + encodeURIComponent(id), null, T).then(function (result) {
|
|
2352
|
+
if (!mountedRef.current) return result;
|
|
2353
|
+
if (result.ok && isObject(result.data)) setOwnership(result.data);
|
|
2354
|
+
return result;
|
|
2355
|
+
});
|
|
2356
|
+
}
|
|
2357
|
+
|
|
2358
|
+
function panelOwnsCurrentVm() {
|
|
2359
|
+
return Boolean(ownership && isObject(ownership.owner) && ownership.owner.key === panelOwnerKey());
|
|
2360
|
+
}
|
|
2361
|
+
|
|
2362
|
+
function claimPanelOwner(force) {
|
|
2363
|
+
if (ownerBusy) return;
|
|
2364
|
+
var id = activeInstanceRef.current || 'default';
|
|
2365
|
+
setOwnerBusy(true);
|
|
2366
|
+
requestJson('/apk-vm/ownership', {
|
|
2367
|
+
method: 'POST',
|
|
2368
|
+
body: JSON.stringify({
|
|
2369
|
+
action: 'claim',
|
|
2370
|
+
instanceId: id,
|
|
2371
|
+
ownerKey: panelOwnerKey(),
|
|
2372
|
+
ownerScope: panelScope,
|
|
2373
|
+
ownerLabel: '桌面面板',
|
|
2374
|
+
force: force === true,
|
|
2375
|
+
}),
|
|
2376
|
+
}, T).then(function (result) {
|
|
2377
|
+
if (!mountedRef.current) return;
|
|
2378
|
+
setOwnerBusy(false);
|
|
2379
|
+
if (!result.ok) {
|
|
2380
|
+
pushToast('error', (result.error || T('err.action')).slice(0, 400));
|
|
2381
|
+
loadOwnership();
|
|
2382
|
+
return;
|
|
2383
|
+
}
|
|
2384
|
+
pushToast('success', T('owner.claimOk'));
|
|
2385
|
+
loadOwnership();
|
|
2386
|
+
loadState();
|
|
2387
|
+
});
|
|
2388
|
+
}
|
|
2389
|
+
|
|
2390
|
+
function releasePanelOwner() {
|
|
2391
|
+
if (ownerBusy) return;
|
|
2392
|
+
var id = activeInstanceRef.current || 'default';
|
|
2393
|
+
var activeKey = ownership && isObject(ownership.owner) && String(ownership.owner.key || '').indexOf('panel:') === 0
|
|
2394
|
+
? ownership.owner.key
|
|
2395
|
+
: panelOwnerKey();
|
|
2396
|
+
setOwnerBusy(true);
|
|
2397
|
+
requestJson('/apk-vm/ownership', {
|
|
2398
|
+
method: 'POST',
|
|
2399
|
+
body: JSON.stringify({ action: 'release', instanceId: id, ownerKey: activeKey }),
|
|
2400
|
+
}, T).then(function (result) {
|
|
2401
|
+
if (!mountedRef.current) return;
|
|
2402
|
+
setOwnerBusy(false);
|
|
2403
|
+
if (!result.ok) {
|
|
2404
|
+
pushToast('error', (result.error || T('err.action')).slice(0, 400));
|
|
2405
|
+
loadOwnership();
|
|
2406
|
+
return;
|
|
2407
|
+
}
|
|
2408
|
+
pushToast('success', T('owner.releaseOk'));
|
|
2409
|
+
loadOwnership();
|
|
2410
|
+
loadState();
|
|
2411
|
+
});
|
|
2412
|
+
}
|
|
2413
|
+
|
|
2414
|
+
function changePanelScope(next) {
|
|
2415
|
+
if ((next !== 'shared' && next !== 'conversation' && next !== 'project') || next === panelScope) return;
|
|
2416
|
+
var id = activeInstanceRef.current || 'default';
|
|
2417
|
+
var beforeKey = panelOwnerKey();
|
|
2418
|
+
var owns = Boolean(ownership && isObject(ownership.owner) && ownership.owner.key === beforeKey);
|
|
2419
|
+
try {
|
|
2420
|
+
window.localStorage.setItem(PANEL_OWNER_SCOPE, next);
|
|
2421
|
+
} catch (error) {
|
|
2422
|
+
// ignore storage failures
|
|
2423
|
+
}
|
|
2424
|
+
setPanelScope(next);
|
|
2425
|
+
if (!owns) {
|
|
2426
|
+
loadOwnership();
|
|
2427
|
+
return;
|
|
2428
|
+
}
|
|
2429
|
+
var afterKey = panelOwnerKey();
|
|
2430
|
+
setOwnerBusy(true);
|
|
2431
|
+
requestJson('/apk-vm/ownership', {
|
|
2432
|
+
method: 'POST',
|
|
2433
|
+
body: JSON.stringify({ action: 'release', instanceId: id, ownerKey: beforeKey }),
|
|
2434
|
+
}, T).then(function (result) {
|
|
2435
|
+
if (!mountedRef.current || !result.ok) return result;
|
|
2436
|
+
return requestJson('/apk-vm/ownership', {
|
|
2437
|
+
method: 'POST',
|
|
2438
|
+
body: JSON.stringify({
|
|
2439
|
+
action: 'claim',
|
|
2440
|
+
instanceId: id,
|
|
2441
|
+
ownerKey: afterKey,
|
|
2442
|
+
ownerScope: next,
|
|
2443
|
+
ownerLabel: '桌面面板',
|
|
2444
|
+
}),
|
|
2445
|
+
}, T);
|
|
2446
|
+
}).then(function (result) {
|
|
2447
|
+
if (!mountedRef.current) return;
|
|
2448
|
+
setOwnerBusy(false);
|
|
2449
|
+
if (!result || !result.ok) {
|
|
2450
|
+
pushToast('error', ((result && result.error) || T('err.action')).slice(0, 400));
|
|
2451
|
+
} else {
|
|
2452
|
+
pushToast('success', T('owner.claimOk'));
|
|
2453
|
+
}
|
|
2454
|
+
loadOwnership();
|
|
2455
|
+
loadState();
|
|
2456
|
+
});
|
|
2457
|
+
}
|
|
2458
|
+
|
|
2201
2459
|
function createInstance() {
|
|
2202
2460
|
if (instanceBusy) return;
|
|
2203
2461
|
setInstanceBusy(true);
|
|
@@ -2516,8 +2774,87 @@ window.__ModuleLoader__.load({
|
|
|
2516
2774
|
});
|
|
2517
2775
|
}
|
|
2518
2776
|
|
|
2519
|
-
function
|
|
2520
|
-
|
|
2777
|
+
function skillPath() {
|
|
2778
|
+
var id = activeInstanceRef.current || 'default';
|
|
2779
|
+
return id === 'default'
|
|
2780
|
+
? '/apk-vm/skills'
|
|
2781
|
+
: '/apk-vm/instances/' + encodeURIComponent(id) + '/skills';
|
|
2782
|
+
}
|
|
2783
|
+
|
|
2784
|
+
function loadSkills() {
|
|
2785
|
+
return requestJson(skillPath(), null, T).then(function (result) {
|
|
2786
|
+
if (!mountedRef.current) return;
|
|
2787
|
+
if (result.ok && isObject(result.data) && Array.isArray(result.data.skills)) {
|
|
2788
|
+
setSkills(result.data.skills);
|
|
2789
|
+
setSkillRecording(Boolean(result.data.recording));
|
|
2790
|
+
}
|
|
2791
|
+
});
|
|
2792
|
+
}
|
|
2793
|
+
|
|
2794
|
+
function toggleSkillRecording() {
|
|
2795
|
+
var starting = !skillRecording;
|
|
2796
|
+
var action = starting ? 'start' : 'stop';
|
|
2797
|
+
requestJson(skillPath(), {
|
|
2798
|
+
method: 'POST',
|
|
2799
|
+
body: JSON.stringify({ action: action, name: skillName || '', targetCode: skillTarget || '' }),
|
|
2800
|
+
}, T).then(function (result) {
|
|
2801
|
+
if (!mountedRef.current) return;
|
|
2802
|
+
if (!result.ok) {
|
|
2803
|
+
pushToast('error', T('err.action') + ': ' + result.error);
|
|
2804
|
+
return;
|
|
2805
|
+
}
|
|
2806
|
+
setSkillRecording(starting);
|
|
2807
|
+
if (!starting) {
|
|
2808
|
+
setSkillName('');
|
|
2809
|
+
loadSkills();
|
|
2810
|
+
pushToast('success', T('skill.saved', { name: (result.data && result.data.skill && result.data.skill.name) || 'Skill' }));
|
|
2811
|
+
} else {
|
|
2812
|
+
pushToast('success', T('skill.recording'));
|
|
2813
|
+
}
|
|
2814
|
+
});
|
|
2815
|
+
}
|
|
2816
|
+
|
|
2817
|
+
function runAppSkill(skill) {
|
|
2818
|
+
if (!skill || !skill.id || skillBusy) return;
|
|
2819
|
+
setSkillBusy(skill.id);
|
|
2820
|
+
requestJson(skillPath(), {
|
|
2821
|
+
method: 'POST',
|
|
2822
|
+
body: JSON.stringify({
|
|
2823
|
+
action: 'run',
|
|
2824
|
+
skillId: skill.id,
|
|
2825
|
+
untilCode: skillTarget || skill.target || '',
|
|
2826
|
+
speed: 1.5,
|
|
2827
|
+
}),
|
|
2828
|
+
}, T).then(function (result) {
|
|
2829
|
+
if (!mountedRef.current) return;
|
|
2830
|
+
setSkillBusy('');
|
|
2831
|
+
if (!result.ok) {
|
|
2832
|
+
pushToast('error', T('skill.failed') + ': ' + result.error);
|
|
2833
|
+
return;
|
|
2834
|
+
}
|
|
2835
|
+
var data = result.data && result.data.result ? result.data.result : {};
|
|
2836
|
+
pushToast('success', T('skill.done', { name: skill.name, n: data.stepsRun || 0 }));
|
|
2837
|
+
});
|
|
2838
|
+
}
|
|
2839
|
+
|
|
2840
|
+
function deleteAppSkill(skill) {
|
|
2841
|
+
if (!skill || !skill.id || skillBusy) return;
|
|
2842
|
+
setSkillBusy(skill.id);
|
|
2843
|
+
requestJson(skillPath(), {
|
|
2844
|
+
method: 'POST',
|
|
2845
|
+
body: JSON.stringify({ action: 'delete', skillId: skill.id }),
|
|
2846
|
+
}, T).then(function (result) {
|
|
2847
|
+
if (!mountedRef.current) return;
|
|
2848
|
+
setSkillBusy('');
|
|
2849
|
+
if (!result.ok) {
|
|
2850
|
+
pushToast('error', T('err.action') + ': ' + result.error);
|
|
2851
|
+
return;
|
|
2852
|
+
}
|
|
2853
|
+
loadSkills();
|
|
2854
|
+
});
|
|
2855
|
+
}
|
|
2856
|
+
|
|
2857
|
+
function toggleMaximized() { setIsMaximized(function (value) {
|
|
2521
2858
|
var next = !value;
|
|
2522
2859
|
writeUiFlag('apk-vm.maximized', next);
|
|
2523
2860
|
return next;
|
|
@@ -2642,6 +2979,18 @@ window.__ModuleLoader__.load({
|
|
|
2642
2979
|
});
|
|
2643
2980
|
}
|
|
2644
2981
|
|
|
2982
|
+
function applyPortPreset(preset) {
|
|
2983
|
+
if (!preset) return;
|
|
2984
|
+
setForwardLocal(String(preset.localPort));
|
|
2985
|
+
setForwardRemote(String(preset.remotePort));
|
|
2986
|
+
setForwardShared(false);
|
|
2987
|
+
networkAction('forward-add', {
|
|
2988
|
+
localPort: preset.localPort,
|
|
2989
|
+
remotePort: preset.remotePort,
|
|
2990
|
+
shared: false,
|
|
2991
|
+
});
|
|
2992
|
+
}
|
|
2993
|
+
|
|
2645
2994
|
function removePortForward(localPort) {
|
|
2646
2995
|
networkAction('forward-remove', { localPort: localPort });
|
|
2647
2996
|
}
|
|
@@ -3587,9 +3936,14 @@ window.__ModuleLoader__.load({
|
|
|
3587
3936
|
var id = activeInstanceRef.current || 'default';
|
|
3588
3937
|
var path = id === 'default' ? '/apk-vm/touch' : '/apk-vm/instances/' + encodeURIComponent(id) + '/touch';
|
|
3589
3938
|
try {
|
|
3939
|
+
var touchHeaders = { 'content-type': 'application/json' };
|
|
3940
|
+
var ownerHeaders = panelOwnerHeaders();
|
|
3941
|
+
for (var ownerHeader in ownerHeaders) {
|
|
3942
|
+
if (Object.prototype.hasOwnProperty.call(ownerHeaders, ownerHeader)) touchHeaders[ownerHeader] = ownerHeaders[ownerHeader];
|
|
3943
|
+
}
|
|
3590
3944
|
fetch(path, {
|
|
3591
3945
|
method: 'POST',
|
|
3592
|
-
headers:
|
|
3946
|
+
headers: touchHeaders,
|
|
3593
3947
|
body: JSON.stringify({ action: action, pointerId: pointerId, x: point.x, y: point.y }),
|
|
3594
3948
|
cache: 'no-store',
|
|
3595
3949
|
}).catch(function () {});
|
|
@@ -4246,7 +4600,7 @@ window.__ModuleLoader__.load({
|
|
|
4246
4600
|
color: rootActive ? 'var(--dsw-alias-state-success-primary)' : 'var(--dsw-alias-label-secondary)',
|
|
4247
4601
|
whiteSpace: 'nowrap',
|
|
4248
4602
|
};
|
|
4249
|
-
var instancesCard = instancesList.length >
|
|
4603
|
+
var instancesCard = instancesList.length > 0
|
|
4250
4604
|
? h(
|
|
4251
4605
|
'details',
|
|
4252
4606
|
{ className: 'apkvm-card apkvm-instances' },
|
|
@@ -4262,7 +4616,13 @@ window.__ModuleLoader__.load({
|
|
|
4262
4616
|
{ className: 'apkvm-instlist' },
|
|
4263
4617
|
instancesList.map(function (entry) {
|
|
4264
4618
|
var isDefault = entry.id === 'default';
|
|
4265
|
-
var
|
|
4619
|
+
var ownerInfo = entry.ownerInfo && isObject(entry.ownerInfo) ? entry.ownerInfo : null;
|
|
4620
|
+
var owner = ownerInfo
|
|
4621
|
+
? String(ownerInfo.label || ownerInfo.key || '')
|
|
4622
|
+
: entry.owner ? String(entry.owner).replace(/^agent-/, '').slice(0, 14) : '';
|
|
4623
|
+
var ownerScope = ownerInfo && ownerInfo.scope && ownerInfo.scope !== 'shared'
|
|
4624
|
+
? ' · ' + T('owner.' + ownerInfo.scope)
|
|
4625
|
+
: '';
|
|
4266
4626
|
var idle = Number(entry.idleMs) >= 0 ? Math.max(0, Math.round(Number(entry.idleMs) / 1000)) : null;
|
|
4267
4627
|
return h(
|
|
4268
4628
|
'div',
|
|
@@ -4271,7 +4631,7 @@ window.__ModuleLoader__.load({
|
|
|
4271
4631
|
'div',
|
|
4272
4632
|
{ className: 'apkvm-instname', title: entry.id },
|
|
4273
4633
|
isDefault ? T('instances.default') : entry.id,
|
|
4274
|
-
h('span', { className: 'apkvm-dim' }, ' · ' + (entry.state || '?') + (owner ? ' · ' + owner : ''))
|
|
4634
|
+
h('span', { className: 'apkvm-dim' }, ' · ' + (entry.state || '?') + (owner ? ' · ' + owner + ownerScope : ''))
|
|
4275
4635
|
),
|
|
4276
4636
|
h(
|
|
4277
4637
|
'div',
|
|
@@ -4316,6 +4676,83 @@ window.__ModuleLoader__.load({
|
|
|
4316
4676
|
)
|
|
4317
4677
|
: null;
|
|
4318
4678
|
|
|
4679
|
+
var currentOwner = ownership && isObject(ownership.owner) ? ownership.owner : null;
|
|
4680
|
+
var panelOwns = Boolean(currentOwner && currentOwner.key === panelOwnerKey());
|
|
4681
|
+
var ownerLabel = currentOwner ? String(currentOwner.label || currentOwner.key) : T('owner.none');
|
|
4682
|
+
var ownerCard = h(
|
|
4683
|
+
'details',
|
|
4684
|
+
{ className: 'apkvm-card apkvm-owner', open: true },
|
|
4685
|
+
h(
|
|
4686
|
+
'summary',
|
|
4687
|
+
{ className: 'apkvm-debug-summary' },
|
|
4688
|
+
h('span', { className: 'apkvm-card-title' }, T('owner.title')),
|
|
4689
|
+
h('span', { className: 'apkvm-dim', style: { marginLeft: 'auto' } }, ownerLabel),
|
|
4690
|
+
h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
|
|
4691
|
+
),
|
|
4692
|
+
h(
|
|
4693
|
+
'div',
|
|
4694
|
+
{ className: 'apkvm-ownerbody' },
|
|
4695
|
+
h(
|
|
4696
|
+
'div',
|
|
4697
|
+
{ className: 'apkvm-ownerrow' },
|
|
4698
|
+
h('span', { className: 'apkvm-dim' }, T('owner.pill', { label: ownerLabel })),
|
|
4699
|
+
currentOwner && !panelOwns
|
|
4700
|
+
? h('span', { className: 'apkvm-dim' }, ' · ' + T('owner.busy', { label: ownerLabel }))
|
|
4701
|
+
: null
|
|
4702
|
+
),
|
|
4703
|
+
h(
|
|
4704
|
+
'div',
|
|
4705
|
+
{ className: 'apkvm-ownercontrols' },
|
|
4706
|
+
h('span', { className: 'apkvm-dim' }, T('owner.scope')),
|
|
4707
|
+
['shared', 'conversation', 'project'].map(function (scope) {
|
|
4708
|
+
return h(
|
|
4709
|
+
'button',
|
|
4710
|
+
{
|
|
4711
|
+
key: scope,
|
|
4712
|
+
type: 'button',
|
|
4713
|
+
className: 'apkvm-mini' + (panelScope === scope ? ' active' : ''),
|
|
4714
|
+
disabled: ownerBusy,
|
|
4715
|
+
onClick: function (event) {
|
|
4716
|
+
event.preventDefault();
|
|
4717
|
+
changePanelScope(scope);
|
|
4718
|
+
},
|
|
4719
|
+
},
|
|
4720
|
+
T('owner.' + scope)
|
|
4721
|
+
);
|
|
4722
|
+
}),
|
|
4723
|
+
h(
|
|
4724
|
+
'button',
|
|
4725
|
+
{
|
|
4726
|
+
type: 'button',
|
|
4727
|
+
className: 'apkvm-mini',
|
|
4728
|
+
disabled: ownerBusy || panelOwns,
|
|
4729
|
+
onClick: function (event) {
|
|
4730
|
+
event.preventDefault();
|
|
4731
|
+
claimPanelOwner(false);
|
|
4732
|
+
},
|
|
4733
|
+
},
|
|
4734
|
+
T('owner.claim')
|
|
4735
|
+
),
|
|
4736
|
+
h(
|
|
4737
|
+
'button',
|
|
4738
|
+
{
|
|
4739
|
+
type: 'button',
|
|
4740
|
+
className: 'apkvm-mini',
|
|
4741
|
+
disabled: ownerBusy || !panelOwns,
|
|
4742
|
+
onClick: function (event) {
|
|
4743
|
+
event.preventDefault();
|
|
4744
|
+
releasePanelOwner();
|
|
4745
|
+
},
|
|
4746
|
+
},
|
|
4747
|
+
T('owner.release')
|
|
4748
|
+
)
|
|
4749
|
+
),
|
|
4750
|
+
currentOwner && !panelOwns
|
|
4751
|
+
? h('div', { className: 'apkvm-dim' }, T('owner.forceHint'))
|
|
4752
|
+
: null
|
|
4753
|
+
)
|
|
4754
|
+
);
|
|
4755
|
+
|
|
4319
4756
|
var appsCard = h(
|
|
4320
4757
|
'details',
|
|
4321
4758
|
{
|
|
@@ -4733,6 +5170,94 @@ window.__ModuleLoader__.load({
|
|
|
4733
5170
|
)
|
|
4734
5171
|
);
|
|
4735
5172
|
|
|
5173
|
+
var skillCard = h(
|
|
5174
|
+
'details',
|
|
5175
|
+
{ className: 'apkvm-card apkvm-debug' },
|
|
5176
|
+
h(
|
|
5177
|
+
'summary',
|
|
5178
|
+
{ className: 'apkvm-debug-summary' },
|
|
5179
|
+
h('span', { className: 'apkvm-card-title' }, T('skill.title')),
|
|
5180
|
+
h('span', { className: 'apkvm-tag' + (skillRecording ? ' ok' : '') }, skillRecording ? T('skill.recording') : T('flow.count', { n: skills.length })),
|
|
5181
|
+
h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
|
|
5182
|
+
),
|
|
5183
|
+
h(
|
|
5184
|
+
'div',
|
|
5185
|
+
{ className: 'apkvm-debug-body' },
|
|
5186
|
+
h(
|
|
5187
|
+
'div',
|
|
5188
|
+
{ style: { display: 'flex', alignItems: 'center', gap: '6px' } },
|
|
5189
|
+
h('input', {
|
|
5190
|
+
className: 'apkvm-input',
|
|
5191
|
+
type: 'text',
|
|
5192
|
+
value: skillName,
|
|
5193
|
+
placeholder: T('skill.name'),
|
|
5194
|
+
disabled: skillRecording,
|
|
5195
|
+
onChange: function (event) {
|
|
5196
|
+
setSkillName(event && event.target ? String(event.target.value) : '');
|
|
5197
|
+
},
|
|
5198
|
+
'aria-label': T('skill.name'),
|
|
5199
|
+
}),
|
|
5200
|
+
actionBtn(skillRecording ? T('skill.stop') : T('skill.start'), {
|
|
5201
|
+
key: 'skill-record',
|
|
5202
|
+
small: true,
|
|
5203
|
+
variant: skillRecording ? 'danger' : 'primary',
|
|
5204
|
+
disabled: !ready,
|
|
5205
|
+
onClick: toggleSkillRecording,
|
|
5206
|
+
})
|
|
5207
|
+
),
|
|
5208
|
+
h('input', {
|
|
5209
|
+
className: 'apkvm-input',
|
|
5210
|
+
type: 'text',
|
|
5211
|
+
value: skillTarget,
|
|
5212
|
+
placeholder: T('skill.target'),
|
|
5213
|
+
onChange: function (event) {
|
|
5214
|
+
setSkillTarget(event && event.target ? String(event.target.value) : '');
|
|
5215
|
+
},
|
|
5216
|
+
'aria-label': T('skill.target'),
|
|
5217
|
+
}),
|
|
5218
|
+
skills.length
|
|
5219
|
+
? h(
|
|
5220
|
+
'div',
|
|
5221
|
+
{ className: 'apkvm-list', style: { maxHeight: '150px' } },
|
|
5222
|
+
skills.slice(0, 12).map(function (skill) {
|
|
5223
|
+
return h(
|
|
5224
|
+
'div',
|
|
5225
|
+
{ className: 'apkvm-apk', key: skill.id },
|
|
5226
|
+
h('span', { className: 'apkvm-apk-name', title: skill.description || skill.id }, skill.name || skill.id),
|
|
5227
|
+
h(
|
|
5228
|
+
'span',
|
|
5229
|
+
{ style: { display: 'flex', flexDirection: 'column', gap: '4px', alignItems: 'flex-end' } },
|
|
5230
|
+
h('span', { className: 'apkvm-dim' }, T('skill.meta', { n: skill.steps || 0, codes: skill.codes || 0 })),
|
|
5231
|
+
h(
|
|
5232
|
+
'span',
|
|
5233
|
+
{ style: { display: 'flex', gap: '5px' } },
|
|
5234
|
+
actionBtn(T('skill.run'), {
|
|
5235
|
+
key: 'skill-run-' + skill.id,
|
|
5236
|
+
small: true,
|
|
5237
|
+
disabled: !ready || Boolean(skillBusy),
|
|
5238
|
+
onClick: function () {
|
|
5239
|
+
runAppSkill(skill);
|
|
5240
|
+
},
|
|
5241
|
+
}),
|
|
5242
|
+
actionBtn(T('skill.delete'), {
|
|
5243
|
+
key: 'skill-delete-' + skill.id,
|
|
5244
|
+
small: true,
|
|
5245
|
+
variant: 'danger',
|
|
5246
|
+
disabled: Boolean(skillBusy),
|
|
5247
|
+
onClick: function () {
|
|
5248
|
+
deleteAppSkill(skill);
|
|
5249
|
+
},
|
|
5250
|
+
})
|
|
5251
|
+
)
|
|
5252
|
+
)
|
|
5253
|
+
);
|
|
5254
|
+
})
|
|
5255
|
+
)
|
|
5256
|
+
: h('div', { className: 'apkvm-dim' }, T('skill.empty')),
|
|
5257
|
+
h('div', { className: 'apkvm-dim', style: { whiteSpace: 'normal' } }, T('skill.hint'))
|
|
5258
|
+
)
|
|
5259
|
+
);
|
|
5260
|
+
|
|
4736
5261
|
var networkCard = h(
|
|
4737
5262
|
'details',
|
|
4738
5263
|
{ className: 'apkvm-card apkvm-debug' },
|
|
@@ -4867,6 +5392,21 @@ window.__ModuleLoader__.load({
|
|
|
4867
5392
|
);
|
|
4868
5393
|
})
|
|
4869
5394
|
: h('div', { className: 'apkvm-dim' }, T('network.forwards')),
|
|
5395
|
+
h(
|
|
5396
|
+
'div',
|
|
5397
|
+
{ style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
|
|
5398
|
+
h('span', { className: 'apkvm-dim' }, T('network.presets')),
|
|
5399
|
+
PORT_PRESETS.map(function (preset) {
|
|
5400
|
+
return actionBtn(preset.label, {
|
|
5401
|
+
key: 'forward-preset-' + preset.key,
|
|
5402
|
+
small: true,
|
|
5403
|
+
disabled: !ready || Boolean(networkBusy),
|
|
5404
|
+
onClick: function () {
|
|
5405
|
+
applyPortPreset(preset);
|
|
5406
|
+
},
|
|
5407
|
+
});
|
|
5408
|
+
})
|
|
5409
|
+
),
|
|
4870
5410
|
h(
|
|
4871
5411
|
'div',
|
|
4872
5412
|
{ style: { display: 'flex', alignItems: 'center', gap: '5px' } },
|
|
@@ -5741,8 +6281,10 @@ window.__ModuleLoader__.load({
|
|
|
5741
6281
|
setupCard,
|
|
5742
6282
|
apkCard,
|
|
5743
6283
|
instancesCard,
|
|
6284
|
+
ownerCard,
|
|
5744
6285
|
debugCard,
|
|
5745
6286
|
flowCard,
|
|
6287
|
+
skillCard,
|
|
5746
6288
|
networkCard,
|
|
5747
6289
|
storageCard,
|
|
5748
6290
|
snapshotCard,
|