dshost-plugin 0.1.1 → 0.1.3

package/cordis.patch.yml

@@ -9,6 +9,6 @@
 # id -> dsh crashed on startup (systemd restart loop).
 #
 # The plugin is still loaded by cordis because the user profile entry references
-# it by name ('@noeljude/dsh-remote-plugin'); this file only needs to exist for
+# it by name ('dshost-plugin'); this file only needs to exist for
 # the bundle mechanism.
 []

package/lib/core.js

@@ -5,6 +5,7 @@
 import http from 'http';
 import os from 'os';
 import fs from 'fs';
+import path from 'path';
 import crypto from 'crypto';
 import { execFileSync } from 'child_process';
 import WebSocket from 'ws';
@@ -37,22 +38,31 @@ function localIPv4() {
 let cachedInstanceId = null;
 function getInstanceId() {
   if (cachedInstanceId) return cachedInstanceId;
-  // 稳定实例 ID：hostname + 主 MAC 哈希前缀。进程/机器重启后不变 —— 此前的
-  // 随机后缀在 agent 每次重启时都会让浏览器标签页的 dsh_instance 引用失效，
-  // 造成无限 503 重试风暴（生产单日 992 次 502）。同名主机（如两台都叫
-  // "debian"）由 MAC 区分。
-  let mac = '';
-  try {
-    const macs = [];
-    for (const addrs of Object.values(os.networkInterfaces())) {
-      for (const a of addrs || []) {
-        if (a && !a.internal && a.mac && a.mac !== '00:00:00:00:00:00') macs.push(a.mac);
+  // 稳定实例 ID：hostname + systemd machine-id 的哈希前缀。machine-id 由系统
+  // 安装时生成、跨重启持久 —— 此前两版（纯随机 / 首个MAC哈希）分别败于 agent
+  // 重启与 Docker/虚拟网卡导致的 MAC 集合变化，都会让浏览器标签页的实例引用
+  // 失效并触发 503 重试风暴。同名主机由 machine-id 区分。
+  let mid = '';
+  for (const f of ['/etc/machine-id', '/var/lib/dbus/machine-id']) {
+    try {
+      const s = fs.readFileSync(f, 'utf8').trim();
+      if (s) { mid = s; break; }
+    } catch {}
+  }
+  if (!mid) {
+    // 无 machine-id 的兜底：全部非内部 MAC 的联合哈希（排序拼接，不依赖
+    // 枚举顺序与单个网卡的存在性）
+    try {
+      const macs = [];
+      for (const addrs of Object.values(os.networkInterfaces())) {
+        for (const a of addrs || []) {
+          if (a && !a.internal && a.mac && a.mac !== '00:00:00:00:00:00') macs.push(a.mac);
+        }
       }
-    }
-    macs.sort();
-    mac = macs[0] || '';
-  } catch {}
-  const h = crypto.createHash('sha256').update(os.hostname() + '|' + mac).digest('hex');
+      mid = 'mac:' + macs.sort().join(',');
+    } catch {}
+  }
+  const h = crypto.createHash('sha256').update(os.hostname() + '|' + mid).digest('hex');
   cachedInstanceId = os.hostname() + '-' + parseInt(h.slice(0, 8), 16).toString(36).slice(0, 4);
   return cachedInstanceId;
 }
@@ -170,6 +180,8 @@ export function collectSystemInfo(defaultVersion) {
     diskFree,
     dshVersion: defaultVersion || meta.dshVersion,
     plugins: meta.plugins,
+    // 无头检测：供 relay 注入脚本决定产物点击行为(新窗口HTTP直出 vs 本地打开)
+    headless: !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,
   };
 }
 
@@ -241,6 +253,7 @@ export function startAgent(opts) {
       if (msg.type === 'heartbeat') return;
 
       if (msg.type === 'http:request') {
+        if (serveArtifactIfRequested(ws, msg)) return;
         handleHttpRequest(ws, msg);
       } else if (msg.type === 'http:body') {
         const stream = streams.get(msg.streamId);
@@ -316,6 +329,67 @@ export function startAgent(opts) {
     }, 15000);
   }
 
+  // [Artifact Viewer] 无头机产物 HTTP 直出：GET /api/host.artifact?path=...
+  // 由注入脚本在浏览器劫持 openPath 点击后以新窗口打开 —— 无显示环境无法
+  // "本地打开"，改为把文本/代码类产物以对应 MIME 直出给浏览器渲染。
+  const ARTIFACT_TEXT_EXT = new Set([
+    '.md', '.markdown', '.txt', '.log', '.json', '.yml', '.yaml', '.toml', '.ini',
+    '.cfg', '.conf', '.env', '.csv', '.tsv', '.js', '.mjs', '.cjs', '.ts', '.tsx',
+    '.jsx', '.py', '.rb', '.go', '.rs', '.java', '.kt', '.c', '.h', '.cpp', '.hpp',
+    '.cs', '.php', '.sh', '.bash', '.zsh', '.sql', '.html', '.htm', '.css', '.scss',
+    '.less', '.vue', '.svelte', '.swift', '.lua', '.r', '.pl', '.xml', '.svg',
+  ]);
+  const ARTIFACT_MIME = {
+    '.md': 'text/markdown; charset=utf-8', '.markdown': 'text/markdown; charset=utf-8',
+    '.html': 'text/html; charset=utf-8', '.htm': 'text/html; charset=utf-8',
+    '.css': 'text/css; charset=utf-8', '.scss': 'text/x-scss; charset=utf-8',
+    '.js': 'text/javascript; charset=utf-8', '.mjs': 'text/javascript; charset=utf-8',
+    '.cjs': 'text/javascript; charset=utf-8', '.ts': 'text/typescript; charset=utf-8',
+    '.tsx': 'text/typescript; charset=utf-8', '.jsx': 'text/typescript; charset=utf-8',
+    '.json': 'application/json; charset=utf-8', '.xml': 'application/xml; charset=utf-8',
+    '.svg': 'image/svg+xml', '.py': 'text/x-python; charset=utf-8',
+    '.sh': 'text/x-shellscript; charset=utf-8', '.bash': 'text/x-shellscript; charset=utf-8',
+    '.csv': 'text/csv; charset=utf-8', '.yml': 'text/yaml; charset=utf-8',
+    '.yaml': 'text/yaml; charset=utf-8', '.sql': 'text/x-sql; charset=utf-8',
+  };
+  const ARTIFACT_MAX_BYTES = 2 * 1024 * 1024;
+
+  function artifactRespond(ws, streamId, status, headers, body) {
+    send(ws, { type: 'http:response', streamId, status, headers });
+    if (body) send(ws, { type: 'http:data', streamId, data: b64(body) });
+    send(ws, { type: 'http:end', streamId });
+  }
+
+  function serveArtifactIfRequested(ws, msg) {
+    if (msg.method !== 'GET') return false;
+    let u;
+    try { u = new URL(msg.path, 'http://local'); } catch { return false; }
+    if (u.pathname !== '/api/host.artifact') return false;
+    const sid = msg.streamId;
+    const fail = (status, text) => artifactRespond(ws, sid, status,
+      { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' },
+      Buffer.from(JSON.stringify({ ok: false, error: { code: 'artifact', message: text } })));
+    const rawPath = u.searchParams.get('path') || '';
+    if (!path.isAbsolute(rawPath)) return fail(400, 'absolute path required');
+    const ext = path.extname(rawPath).toLowerCase();
+    const dotfile = /(^|\/)(\.[a-z0-9_.-]+)$/i.test(path.basename(rawPath));
+    if (!ARTIFACT_TEXT_EXT.has(ext) && !dotfile) return fail(415, `unsupported artifact type: ${ext || '(none)'}`);
+    let st;
+    try { st = fs.statSync(rawPath); } catch { return fail(404, 'file not found'); }
+    if (!st.isFile()) return fail(400, 'not a regular file');
+    if (st.size > ARTIFACT_MAX_BYTES) return fail(413, `artifact too large (${st.size} bytes > ${ARTIFACT_MAX_BYTES})`);
+    let buf;
+    try { buf = fs.readFileSync(rawPath); } catch (e) { return fail(500, 'read failed: ' + e.message); }
+    const mime = ARTIFACT_MIME[ext] || 'text/plain; charset=utf-8';
+    artifactRespond(ws, sid, 200, {
+      'content-type': mime,
+      'content-disposition': `inline; filename="${path.basename(rawPath)}"`,
+      'cache-control': 'no-store',
+    }, buf);
+    log.log?.(`[agent] artifact served: ${rawPath} (${buf.length}B)`);
+    return true;
+  }
+
   function handleHttpRequest(ws, msg) {
     const { streamId, method, path, headers } = msg;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dshost-plugin",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Official remote cloud relay plugin for DSHost (dshost.me): securely access your dsh Web UI from anywhere",
   "type": "module",
   "main": "lib/index.js",