dsh-apk-vm 0.4.1 → 0.6.0

package/client.js

@@ -189,6 +189,25 @@ window.__ModuleLoader__.load({
       'network.caPath': 'CA certificate path (.pem/.crt)',
       'network.installCa': 'Install CA',
       'network.current': 'Current: {value}',
+      'network.forwards': 'Port forwards',
+      'network.forwardLocal': 'Host port',
+      'network.forwardRemote': 'Guest port',
+      'network.addForward': 'Add forward',
+      'network.remove': 'Remove',
+      'network.mode': 'Mode',
+      'network.isolated': 'Isolated',
+      'network.shared': 'Shared (host bridge)',
+      'network.dns': 'DNS servers',
+      'network.applyDns': 'Apply DNS',
+      'network.hosts': 'Hosts entries',
+      'network.applyHosts': 'Apply hosts',
+      'network.test': 'Test connectivity',
+      'network.testOk': 'Connectivity OK',
+      'network.testFail': 'Connectivity check failed',
+      'network.pcap': 'Download pcap',
+      'network.restartRequired': 'Restart the VM to apply custom DNS',
+      'network.sharedHint': 'Shared forwards are reachable from other VMs through the emulator host alias.',
+      'network.guestUrl': 'Guest URL: {url}',
       'flow.title': 'Flow recorder',
       'flow.start': 'Record',
       'flow.stop': 'Stop',
@@ -200,6 +219,21 @@ window.__ModuleLoader__.load({
       'flow.saved': 'Saved {name}',
       'flow.done': 'Replayed {name}',
       'flow.count': '{n} step(s)',
+      'storage.title': 'Storage',
+      'storage.refresh': 'Refresh',
+      'storage.cleanTemp': 'Clean temp',
+      'storage.cleanSnapshots': 'Clean snapshots',
+      'storage.cleanOrphans': 'Clean orphan AVDs',
+      'storage.confirm': 'Click again to confirm',
+      'storage.freed': 'Freed {size}',
+      'storage.avds': '{size} AVDs',
+      'storage.snapshots': 'Snapshots',
+      'storage.sdk': 'SDK',
+      'storage.temp': 'Temp',
+      'storage.free': 'Free disk',
+      'storage.active': 'active',
+      'storage.orphan': 'orphan',
+      'storage.empty': 'No AVDs found',
       'apk.bundle': 'Bundle',
       'setup.title': 'Environment',
       'setup.ok': 'Ready',
@@ -387,6 +421,25 @@ window.__ModuleLoader__.load({
       'network.caPath': 'CA 证书路径（.pem/.crt）',
       'network.installCa': '安装 CA',
       'network.current': '当前：{value}',
+      'network.forwards': '端口转发',
+      'network.forwardLocal': '宿主机端口',
+      'network.forwardRemote': 'Guest 端口',
+      'network.addForward': '添加转发',
+      'network.remove': '删除',
+      'network.mode': '模式',
+      'network.isolated': '隔离',
+      'network.shared': '共享（宿主桥接）',
+      'network.dns': 'DNS 服务器',
+      'network.applyDns': '应用 DNS',
+      'network.hosts': 'Hosts 条目',
+      'network.applyHosts': '应用 Hosts',
+      'network.test': '测试连通性',
+      'network.testOk': '连通性正常',
+      'network.testFail': '连通性检查失败',
+      'network.pcap': '下载 pcap',
+      'network.restartRequired': '重启虚拟机后生效自定义 DNS',
+      'network.sharedHint': '共享转发可被其他 VM 通过模拟器宿主别名访问。',
+      'network.guestUrl': 'Guest URL: {url}',
       'flow.title': '操作录制',
       'flow.start': '录制',
       'flow.stop': '停止',
@@ -398,6 +451,21 @@ window.__ModuleLoader__.load({
       'flow.saved': '已保存 {name}',
       'flow.done': '已回放 {name}',
       'flow.count': '{n} 步',
+      'storage.title': '存储',
+      'storage.refresh': '刷新',
+      'storage.cleanTemp': '清理临时文件',
+      'storage.cleanSnapshots': '清理快照',
+      'storage.cleanOrphans': '清理孤立 AVD',
+      'storage.confirm': '再点一次确认',
+      'storage.freed': '已释放 {size}',
+      'storage.avds': '{size} 个 AVD',
+      'storage.snapshots': '快照',
+      'storage.sdk': 'SDK',
+      'storage.temp': '临时文件',
+      'storage.free': '磁盘剩余',
+      'storage.active': '运行中',
+      'storage.orphan': '孤立',
+      'storage.empty': '没有找到 AVD',
       'apk.bundle': '安装包',
       'setup.title': '环境',
       'setup.ok': '就绪',
@@ -1207,6 +1275,19 @@ window.__ModuleLoader__.load({
         var flowBusy = flowBusyState[0];
         var setFlowBusy = flowBusyState[1];
 
+        var storageState = React.useState(null);
+        var storage = storageState[0];
+        var setStorage = storageState[1];
+        var storageBusyState = React.useState('');
+        var storageBusy = storageBusyState[0];
+        var setStorageBusy = storageBusyState[1];
+        var storageErrorState = React.useState('');
+        var storageError = storageErrorState[0];
+        var setStorageError = storageErrorState[1];
+        var storageConfirmState = React.useState('');
+        var storageConfirm = storageConfirmState[0];
+        var setStorageConfirm = storageConfirmState[1];
+
         var proxyState = React.useState({ host: '', port: '' });
         var proxy = proxyState[0];
         var setProxy = proxyState[1];
@@ -1216,6 +1297,27 @@ window.__ModuleLoader__.load({
         var caPathState = React.useState('');
         var caPath = caPathState[0];
         var setCaPath = caPathState[1];
+        var networkState = React.useState(null);
+        var network = networkState[0];
+        var setNetwork = networkState[1];
+        var networkBusyState = React.useState('');
+        var networkBusy = networkBusyState[0];
+        var setNetworkBusy = networkBusyState[1];
+        var forwardLocalState = React.useState('');
+        var forwardLocal = forwardLocalState[0];
+        var setForwardLocal = forwardLocalState[1];
+        var forwardRemoteState = React.useState('');
+        var forwardRemote = forwardRemoteState[0];
+        var setForwardRemote = forwardRemoteState[1];
+        var forwardSharedState = React.useState(false);
+        var forwardShared = forwardSharedState[0];
+        var setForwardShared = forwardSharedState[1];
+        var dnsTextState = React.useState('');
+        var dnsText = dnsTextState[0];
+        var setDnsText = dnsTextState[1];
+        var hostsTextState = React.useState('');
+        var hostsText = hostsTextState[0];
+        var setHostsText = hostsTextState[1];
 
         var actualFpsState = React.useState(0);
         var actualFps = actualFpsState[0];
@@ -1392,6 +1494,8 @@ window.__ModuleLoader__.load({
           loadInstances();
           loadDevices();
           loadFlows();
+          loadStorage();
+          loadNetwork();
           var pollId = setInterval(function () {
             if (stateBusyRef.current) return;
             stateBusyRef.current = true;
@@ -1413,6 +1517,12 @@ window.__ModuleLoader__.load({
           };
         }, []);
 
+        // Load network details once the VM becomes ready (the first render often
+        // happens while the state is still loading).
+        React.useEffect(function () {
+          if (ready) loadNetwork();
+        }, [ready, activeInstance]);
+
         // Track document visibility so the frame stream pauses when hidden.
         React.useEffect(function () {
           if (typeof document === 'undefined' || typeof document.addEventListener !== 'function') {
@@ -1789,6 +1899,8 @@ window.__ModuleLoader__.load({
           setInspectNodes([]);
           setInspectSelected(null);
           loadFlows();
+          setNetwork(null);
+          loadNetwork();
           stopLiveLogcat();
           frameStatsRef.current = [];
           loadState();
@@ -2122,6 +2234,98 @@ window.__ModuleLoader__.load({
           });
         }
 
+        function loadNetwork() {
+          if (!ready) return Promise.resolve(null);
+          setNetworkBusy('load');
+          return requestJson(instancePath('/network'), null, T).then(function (result) {
+            if (!mountedRef.current) return result;
+            setNetworkBusy('');
+            if (result.ok && isObject(result.data)) {
+              setNetwork(result.data);
+              if (result.data.proxy && typeof result.data.proxy === 'string') {
+                var colon = result.data.proxy.lastIndexOf(':');
+                if (colon > 0) {
+                  setProxy({ host: result.data.proxy.slice(0, colon), port: result.data.proxy.slice(colon + 1) });
+                }
+              }
+              if (result.data.dnsServers && result.data.dnsServers.length) {
+                setDnsText(result.data.dnsServers.join(', '));
+              }
+            }
+            return result;
+          });
+        }
+
+        function networkAction(action, payload) {
+          if (networkBusy) return;
+          setNetworkBusy(action);
+          return requestJson(
+            instancePath('/network'),
+            { method: 'POST', body: JSON.stringify(Object.assign({ action: action }, payload || {})) },
+            T
+          ).then(function (result) {
+            if (!mountedRef.current) return result;
+            setNetworkBusy('');
+            if (!result.ok) {
+              pushToast('error', T('err.action') + ': ' + result.error);
+              return result;
+            }
+            if (action === 'test') {
+              pushToast(result.data && result.data.ok === true ? 'success' : 'error', T(result.data && result.data.ok ? 'network.testOk' : 'network.testFail'));
+            } else if (action === 'dns' && result.data && result.data.restartRequired) {
+              pushToast('success', T('network.restartRequired'));
+            } else {
+              pushToast('success', T('network.title'));
+            }
+            loadNetwork();
+            return result;
+          });
+        }
+
+        function addPortForward() {
+          var local = Number(forwardLocal);
+          var remote = Number(forwardRemote);
+          if (!Number.isInteger(local) || local < 1 || local > 65535 || !Number.isInteger(remote) || remote < 1 || remote > 65535) {
+            pushToast('error', T('err.action'));
+            return;
+          }
+          networkAction('forward-add', {
+            localPort: local,
+            remotePort: remote,
+            shared: forwardShared === true,
+          }).then(function (result) {
+            if (result && result.ok) {
+              setForwardLocal('');
+              setForwardRemote('');
+              setForwardShared(false);
+            }
+          });
+        }
+
+        function removePortForward(localPort) {
+          networkAction('forward-remove', { localPort: localPort });
+        }
+
+        function applyDns() {
+          var servers = String(dnsText || '')
+            .split(',')
+            .map(function (item) {
+              return item.trim();
+            })
+            .filter(Boolean);
+          networkAction('dns', { servers: servers });
+        }
+
+        function applyHosts() {
+          var entries = String(hostsText || '')
+            .split(/\r?\n/)
+            .map(function (line) {
+              return line.trim();
+            })
+            .filter(Boolean);
+          networkAction('hosts', { entries: entries });
+        }
+
         function applyProxy() {
           if (proxyBusy) return;
           setProxyBusy(true);
@@ -2137,6 +2341,7 @@ window.__ModuleLoader__.load({
               return;
             }
             pushToast('success', T('network.current', { value: (result.data && result.data.proxy) || 'off' }));
+            loadNetwork();
           });
         }
 
@@ -2151,6 +2356,7 @@ window.__ModuleLoader__.load({
               return;
             }
             pushToast('success', T('network.clear'));
+            loadNetwork();
           });
         }
 
@@ -2173,6 +2379,67 @@ window.__ModuleLoader__.load({
           });
         }
 
+        function loadStorage() {
+          setStorageBusy('load');
+          setStorageError('');
+          return requestJson('/apk-vm/storage', null, T).then(function (result) {
+            if (!mountedRef.current) return result;
+            setStorageBusy('');
+            if (!result.ok) {
+              setStorageError(result.error || T('err.action'));
+              return result;
+            }
+            setStorage(isObject(result.data) ? result.data : null);
+            return result;
+          });
+        }
+
+        function storageSnapshotAvd() {
+          var list = storage && Array.isArray(storage.avds) ? storage.avds : [];
+          var current = snapshot && snapshot.vm && snapshot.vm.avd ? String(snapshot.vm.avd) : '';
+          var match = list.find(function (item) {
+            return item.name === current;
+          });
+          if (match) return match.name;
+          var active = list.find(function (item) {
+            return item.active && item.managed;
+          });
+          if (active) return active.name;
+          var managed = list.find(function (item) {
+            return item.managed;
+          });
+          return managed ? managed.name : 'dsh_apk';
+        }
+
+        function cleanStorage(action) {
+          if (storageBusy) return;
+          var destructive = action === 'snapshots' || action === 'orphan-avds';
+          if (destructive && storageConfirm !== action) {
+            setStorageConfirm(action);
+            pushToast('success', T('storage.confirm'));
+            return;
+          }
+          setStorageConfirm('');
+          setStorageBusy(action);
+          var payload = { action: action };
+          if (action === 'snapshots') {
+            payload.avdName = storageSnapshotAvd();
+            payload.confirm = true;
+          }
+          if (action === 'orphan-avds') payload.confirm = true;
+          requestJson('/apk-vm/storage', { method: 'POST', body: JSON.stringify(payload) }, T).then(function (result) {
+            if (!mountedRef.current) return;
+            setStorageBusy('');
+            if (!result.ok) {
+              pushToast('error', T('err.action') + ': ' + result.error);
+              return;
+            }
+            var freed = result.data && Number(result.data.freedBytes) ? Number(result.data.freedBytes) : 0;
+            pushToast('success', T('storage.freed', { size: formatBytes(freed) }));
+            loadStorage();
+          });
+        }
+
         function refreshAll() {
           loadState();
           loadApks();
@@ -3810,7 +4077,285 @@ window.__ModuleLoader__.load({
                 onClick: installCa,
               })
             ),
-            h('div', { className: 'apkvm-dim' }, T('network.caPath'))
+            h('div', { className: 'apkvm-dim' }, T('network.caPath')),
+            h(
+              'label',
+              { style: { display: 'flex', alignItems: 'center', gap: '6px', fontSize: '11px', color: 'var(--dsw-alias-label-secondary)' } },
+              h('span', null, T('network.mode')),
+              h(
+                'select',
+                {
+                  value: (network && network.mode) || 'isolated',
+                  disabled: Boolean(networkBusy) || !ready,
+                  onChange: function (event) {
+                    networkAction('mode', { mode: event && event.target ? String(event.target.value) : 'isolated' });
+                  },
+                  style: {
+                    font: 'inherit',
+                    background: 'var(--dsw-alias-bg-layer-1)',
+                    color: 'var(--dsw-alias-label-primary)',
+                    border: '1px solid var(--dsw-alias-border-l2)',
+                    borderRadius: '6px',
+                    padding: '1px 4px',
+                  },
+                },
+                h('option', { value: 'isolated' }, T('network.isolated')),
+                h('option', { value: 'shared' }, T('network.shared'))
+              )
+            ),
+            h(
+              'div',
+              { style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
+              h('span', { className: 'apkvm-card-title' }, T('network.forwards')),
+              actionBtn(T('network.test'), {
+                key: 'network-test',
+                small: true,
+                disabled: !ready || Boolean(networkBusy),
+                onClick: function () {
+                  networkAction('test', { host: proxy.host || '', port: proxy.port || undefined });
+                },
+              })
+            ),
+            network && Array.isArray(network.forwards) && network.forwards.length
+              ? network.forwards.map(function (rule) {
+                  return h(
+                    'div',
+                    { key: 'forward-' + rule.localPort, className: 'apkvm-dim', style: { display: 'flex', alignItems: 'center', gap: '5px' } },
+                    h('span', { style: { flex: '1 1 auto' } }, 'tcp:' + rule.localPort + ' -> guest tcp:' + rule.remotePort),
+                    rule.shared ? h('span', { className: 'apkvm-tag ok' }, 'shared') : null,
+                    actionBtn(T('network.remove'), {
+                      key: 'forward-remove-' + rule.localPort,
+                      small: true,
+                      variant: 'danger',
+                      disabled: Boolean(networkBusy),
+                      onClick: function () {
+                        removePortForward(rule.localPort);
+                      },
+                    })
+                  );
+                })
+              : h('div', { className: 'apkvm-dim' }, T('network.forwards')),
+            h(
+              'div',
+              { style: { display: 'flex', alignItems: 'center', gap: '5px' } },
+              h('input', {
+                className: 'apkvm-input',
+                type: 'text',
+                value: forwardLocal,
+                placeholder: T('network.forwardLocal'),
+                spellCheck: false,
+                disabled: Boolean(networkBusy),
+                onChange: function (event) {
+                  setForwardLocal(event && event.target ? String(event.target.value) : '');
+                },
+                'aria-label': T('network.forwardLocal'),
+              }),
+              h('input', {
+                className: 'apkvm-input',
+                type: 'text',
+                value: forwardRemote,
+                placeholder: T('network.forwardRemote'),
+                spellCheck: false,
+                disabled: Boolean(networkBusy),
+                onChange: function (event) {
+                  setForwardRemote(event && event.target ? String(event.target.value) : '');
+                },
+                'aria-label': T('network.forwardRemote'),
+              }),
+              actionBtn(T('network.addForward'), {
+                key: 'forward-add',
+                small: true,
+                disabled: !ready || Boolean(networkBusy) || !forwardLocal.trim() || !forwardRemote.trim(),
+                onClick: addPortForward,
+              })
+            ),
+            h(
+              'label',
+              { style: { display: 'flex', alignItems: 'center', gap: '5px', fontSize: '11px', color: 'var(--dsw-alias-label-secondary)' } },
+              h('input', {
+                type: 'checkbox',
+                checked: forwardShared,
+                disabled: Boolean(networkBusy),
+                onChange: function (event) {
+                  setForwardShared(Boolean(event && event.target && event.target.checked));
+                },
+              }),
+              h('span', null, T('network.shared'))
+            ),
+            h(
+              'div',
+              { style: { display: 'flex', alignItems: 'center', gap: '5px' } },
+              h('input', {
+                className: 'apkvm-input',
+                type: 'text',
+                value: dnsText,
+                placeholder: T('network.dns'),
+                spellCheck: false,
+                disabled: Boolean(networkBusy),
+                onChange: function (event) {
+                  setDnsText(event && event.target ? String(event.target.value) : '');
+                },
+                'aria-label': T('network.dns'),
+              }),
+              actionBtn(T('network.applyDns'), {
+                key: 'dns-apply',
+                small: true,
+                disabled: !ready || Boolean(networkBusy),
+                onClick: applyDns,
+              })
+            ),
+            h('textarea', {
+              className: 'apkvm-input',
+              value: hostsText,
+              placeholder: T('network.hosts'),
+              spellCheck: false,
+              disabled: Boolean(networkBusy),
+              style: { minHeight: '46px', height: '46px', resize: 'vertical', padding: '4px 8px' },
+              onChange: function (event) {
+                setHostsText(event && event.target ? String(event.target.value) : '');
+              },
+              'aria-label': T('network.hosts'),
+            }),
+            h(
+              'div',
+              { style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
+              actionBtn(T('network.applyHosts'), {
+                key: 'hosts-apply',
+                small: true,
+                disabled: !ready || Boolean(networkBusy),
+                onClick: applyHosts,
+              }),
+              network && network.pcap && network.pcap.enabled
+                ? h(
+                    'a',
+                    {
+                      href: instancePath('/network/pcap'),
+                      download: 'capture.pcap',
+                      style: { fontSize: '11px', color: 'var(--dsw-alias-brand-primary)' },
+                    },
+                    T('network.pcap')
+                  )
+                : null
+            ),
+            network && network.mode === 'shared' ? h('div', { className: 'apkvm-dim' }, T('network.sharedHint')) : null
+          )
+        );
+
+        var storageCard = h(
+          'details',
+          { className: 'apkvm-card apkvm-debug' },
+          h(
+            'summary',
+            { className: 'apkvm-debug-summary' },
+            h('span', { className: 'apkvm-card-title' }, T('storage.title')),
+            h(
+              'span',
+              { className: 'apkvm-dim', style: { marginLeft: 'auto' } },
+              storage ? formatBytes((storage.totals && storage.totals.avdBytes) || 0) : '…'
+            ),
+            h('span', { className: 'apkvm-chevron', 'aria-hidden': 'true' }, '▸')
+          ),
+          h(
+            'div',
+            { className: 'apkvm-debug-body' },
+            !storage
+              ? h('div', { className: 'apkvm-dim' }, storageError || T('storage.empty'))
+              : h(
+                  'div',
+                  { style: { display: 'flex', flexDirection: 'column', gap: '5px', minWidth: 0 } },
+                  h(
+                    'div',
+                    { className: 'apkvm-dim', style: { display: 'flex', flexWrap: 'wrap', gap: '8px' } },
+                    h('span', null, T('storage.avds', { size: (storage.avds || []).length }) + ': ' + formatBytes((storage.totals && storage.totals.avdBytes) || 0)),
+                    h('span', null, T('storage.snapshots') + ': ' + formatBytes((storage.totals && storage.totals.snapshotBytes) || 0)),
+                    h('span', null, T('storage.sdk') + ': ' + formatBytes((storage.totals && storage.totals.sdkBytes) || 0)),
+                    h('span', null, T('storage.temp') + ': ' + formatBytes((storage.totals && storage.totals.tempBytes) || 0)),
+                    storage.disk
+                      ? h('span', null, T('storage.free') + ': ' + formatBytes(storage.disk.freeBytes))
+                      : null
+                  ),
+                  (storage.avds || []).slice(0, 4).map(function (avd) {
+                    return h(
+                      'div',
+                      {
+                        key: 'storage-' + avd.name,
+                        className: 'apkvm-apk',
+                        style: { padding: '5px 7px', gap: '3px' },
+                      },
+                      h(
+                        'div',
+                        { style: { display: 'flex', alignItems: 'center', gap: '6px', minWidth: 0 } },
+                        h('span', { className: 'apkvm-apk-name', title: avd.path }, avd.name),
+                        avd.active ? h('span', { className: 'apkvm-tag ok' }, T('storage.active')) : null,
+                        avd.orphan ? h('span', { className: 'apkvm-tag' }, T('storage.orphan')) : null
+                      ),
+                      h(
+                        'div',
+                        { className: 'apkvm-dim' },
+                        formatBytes(avd.totalBytes || 0) +
+                          ' · ' +
+                          T('storage.snapshots') +
+                          ' ' +
+                          formatBytes(avd.snapshotBytes || 0)
+                      )
+                    );
+                  }),
+                  h(
+                    'div',
+                    { style: { display: 'flex', alignItems: 'center', gap: '5px', flexWrap: 'wrap' } },
+                    actionBtn(storageBusy === 'load' ? '…' : T('storage.refresh'), {
+                      key: 'storage-refresh',
+                      small: true,
+                      disabled: Boolean(storageBusy),
+                      onClick: loadStorage,
+                    }),
+                    actionBtn(storageBusy === 'temp' ? '…' : T('storage.cleanTemp'), {
+                      key: 'storage-temp',
+                      small: true,
+                      disabled: Boolean(storageBusy),
+                      onClick: function () {
+                        cleanStorage('temp');
+                      },
+                    }),
+                    actionBtn(
+                      storageConfirm === 'snapshots'
+                        ? T('storage.confirm')
+                        : storageBusy === 'snapshots'
+                          ? '…'
+                          : T('storage.cleanSnapshots'),
+                      {
+                        key: 'storage-snapshots',
+                        small: true,
+                        disabled: Boolean(storageBusy),
+                        onClick: function () {
+                          cleanStorage('snapshots');
+                        },
+                      }
+                    ),
+                    (storage.recommendations || []).some(function (item) {
+                      return item.code === 'orphan-avds';
+                    }) || (storage.avds || []).some(function (item) {
+                      return item.orphan;
+                    })
+                      ? actionBtn(
+                          storageConfirm === 'orphan-avds'
+                            ? T('storage.confirm')
+                            : storageBusy === 'orphan-avds'
+                              ? '…'
+                              : T('storage.cleanOrphans'),
+                          {
+                            key: 'storage-orphans',
+                            small: true,
+                            disabled: Boolean(storageBusy),
+                            onClick: function () {
+                              cleanStorage('orphan-avds');
+                            },
+                          }
+                        )
+                      : null
+                  ),
+                  storageError ? h('div', { className: 'apkvm-dim' }, storageError) : null
+                )
           )
         );
 
@@ -4149,6 +4694,7 @@ window.__ModuleLoader__.load({
               debugCard,
               flowCard,
               networkCard,
+              storageCard,
               appsCard,
               diagCard,
               h('div', { className: 'apkvm-footnote', title: T('hint.boot') }, T('hint.short')),