dsh-project-deck 0.1.3 → 0.1.4

package/README.md

@@ -67,9 +67,21 @@ deck demo                 # 演示环境
 无变化：官网改版、基础设施、…
 ```
 
-## 通知渠道（可选，默认 wxpush）
+## 通知渠道（可选）
 
-播报通过 `report.delivery` 选择发送器，**不带任何内置账号**：
+播报通过 `report.delivery` 选择发送器，**默认不依赖任何外部服务**：
+
+| 类型 | 说明 |
+|---|---|
+| `ilink` | **内置微信连接**：面板点「连接微信」→ 扫码 → 在微信里给 bot 发一句话即可推送，不需要额外服务 |
+| `wxpush` | 复用本机 [wxpush](https://github.com/) 网关（支持附图） |
+| `serverchan` | ServerChan SendKey |
+| `webhook` | 任意 URL（企业微信机器人等） |
+| `command` | 自写脚本，stdin 收文本，退出码 0 = 成功 |
+
+面板顶部有「通知渠道」下拉，选完保存即可；`ilink` 模式下会直接显示二维码。
+
+```jsonc
 
 ```jsonc
 "report": {
@@ -77,7 +89,7 @@ deck demo                 # 演示环境
   "image": false,                          // 附图仅 wxpush 通道支持
   "delivery": {
     "type": "wxpush",                      // wxpush | serverchan | webhook | command
-    "url": "http://127.0.0.1:9098",        // wxpush
+    "url": "http://127.0.0.1:9098",        // wxpush（ilink 模式忽略）
     "key": "",                             // ServerChan SendKey
     "webhook": "",                         // 任意 webhook（企业微信机器人等）
     "command": ""                          // 自写脚本：stdin 收文本，退出码 0 = 成功

package/backend/deck

@@ -1017,6 +1017,171 @@ def cmd_scan(argv):
 
 
 # ── 发送 ────────────────────────────────────────────────────
+# ── 内置微信通道（iLink，扫码即用）────────────────────────────
+WECHAT_STATE = os.path.join(BASE, 'wechat.json')
+WECHAT_QR = os.path.join(BASE, 'wechat-qr.png')
+ILINK_BASE = 'https://ilinkai.weixin.qq.com/ilink'
+
+
+def wechat_state():
+    return load_json(WECHAT_STATE, {})
+
+
+def save_wechat_state(d):
+    save_json(WECHAT_STATE, d)
+
+
+def _ilink_headers(token=None):
+    uin = base64.b64encode(str(secrets.randbelow(2**32)).encode()).decode()
+    h = {'Content-Type': 'application/json', 'AuthorizationType': 'ilink_bot_token',
+         'X-WECHAT-UIN': uin, 'iLink-App-Id': 'bot', 'iLink-App-ClientVersion': '132105'}
+    if token:
+        h['Authorization'] = f'Bearer {token}'
+    return h
+
+
+def _ilink_request(path, body=None, method='POST', params=None, token=None, timeout=30):
+    url = ILINK_BASE + path
+    if params:
+        url += '?' + urllib.parse.urlencode(params)
+    data = json.dumps(body).encode() if body is not None else None
+    req = urllib.request.Request(url, data=data, headers=_ilink_headers(token), method=method)
+    with urllib.request.urlopen(req, timeout=timeout) as r:
+        return json.loads(r.read().decode() or '{}')
+
+
+def _extract_ctx(data):
+    found = {}
+
+    def walk(node):
+        if isinstance(node, dict):
+            for k, v in node.items():
+                if k == 'context_token' and isinstance(v, str) and v and 'ctx' not in found:
+                    found['ctx'] = v
+                if k in ('from_user_id', 'user_id', 'ilink_user_id') and isinstance(v, str) and v and 'uid' not in found:
+                    found['uid'] = v
+                walk(v)
+        elif isinstance(node, list):
+            for it in node:
+                walk(it)
+    walk(data)
+    return found.get('ctx'), found.get('uid')
+
+
+def wechat_qr_png(url):
+    """用本机 Python 生成二维码 PNG（面板运行在系统 Python 上，可能没有 qrcode 模块）。"""
+    for py in ('/usr/local/bin/python3', sys.executable, '/usr/bin/python3'):
+        try:
+            r = subprocess.run([py, '-c', 'import qrcode,sys;qrcode.make(sys.argv[1]).save(sys.argv[2])', url, WECHAT_QR],
+                               capture_output=True, timeout=20)
+            if r.returncode == 0 and os.path.exists(WECHAT_QR):
+                return True
+        except Exception:
+            continue
+    return False
+
+
+def wechat_start_login():
+    r = _ilink_request('/bot/get_bot_qrcode', method='GET', params={'bot_type': 3})
+    ticket = r.get('qrcode') or r.get('qrcode_id')
+    url = r.get('qrcode_img_content') or r.get('qrcode_url') or r.get('url')
+    st = wechat_state()
+    st.update({'qr_ticket': ticket, 'qr_url': url, 'qr_at': time.time(),
+               'bot_token': None, 'context_token': None, 'last_error': None})
+    save_wechat_state(st)
+    if url:
+        wechat_qr_png(url)
+    return st
+
+
+def wechat_check_login():
+    st = wechat_state()
+    ticket = st.get('qr_ticket')
+    if not ticket:
+        return {'status': 'none'}
+    try:
+        r = _ilink_request('/bot/get_qrcode_status', method='GET', params={'qrcode': ticket}, timeout=15)
+    except Exception as e:
+        st['last_error'] = f'扫码状态查询失败: {e}'
+        save_wechat_state(st)
+        return {'status': 'error', 'error': str(e)}
+    status = str(r.get('status') or '')
+    if status == 'confirmed':
+        token = r.get('bot_token')
+        uid = r.get('ilink_user_id')
+        st.update({'bot_token': token, 'user_id': uid, 'authorized_at': time.time(),
+                   'qr_ticket': None, 'qr_url': None, 'last_error': None})
+        save_wechat_state(st)
+        log('[wechat] 扫码授权成功')
+        return {'status': 'confirmed'}
+    if status == 'expired':
+        wechat_start_login()
+        return {'status': 'expired'}
+    return {'status': status or 'wait'}
+
+
+def wechat_poll_once(timeout=60):
+    st = wechat_state()
+    token = st.get('bot_token')
+    if not token:
+        return
+    body = {'timeout': timeout, 'limit': 100,
+            'get_updates_buf': st.get('updates_buf') or '',
+            'base_info': {'channel_version': '1.0.0'}}
+    try:
+        r = _ilink_request('/bot/getupdates', body, token=token, timeout=timeout + 10)
+    except Exception:
+        return
+    ctx, uid = _extract_ctx(r)
+    if r.get('get_updates_buf'):
+        st['updates_buf'] = r.get('get_updates_buf')
+    if ctx:
+        st['context_token'] = ctx
+        log('[wechat] 捕获 context_token，可主动推送')
+    if uid:
+        st['user_id'] = uid
+    save_wechat_state(st)
+
+
+def wechat_send_text(text):
+    st = wechat_state()
+    token = st.get('bot_token')
+    ctx = st.get('context_token')
+    uid = st.get('user_id')
+    if not token:
+        return 2, '微信未登录：请在面板扫码'
+    if not ctx:
+        return 2, '缺少 context_token：请在微信里给 bot 发一条消息'
+    body = {'msg': {'from_user_id': '', 'to_user_id': uid or '',
+                    'client_id': f'deck:{int(time.time())}:{secrets.randbelow(999999)}',
+                    'message_type': 2, 'message_state': 2, 'context_token': ctx,
+                    'item_list': [{'type': 1, 'text_item': {'text': text}}]},
+            'base_info': {'channel_version': '1.0.0'}}
+    try:
+        r = _ilink_request('/bot/sendmessage', body, token=token, timeout=25)
+    except Exception as e:
+        return 3, f'微信发送失败: {e}'
+    if r.get('message_id'):
+        return 0, '已送达（微信）'
+    if r.get('ret', 0) == -2:
+        return 2, 'context_token 失效：请在微信里给 bot 发一条消息'
+    return 2, f'未被投递: {str(r)[:120]}'
+
+
+def wechat_status():
+    st = wechat_state()
+    logged = bool(st.get('bot_token'))
+    has_ctx = bool(st.get('context_token'))
+    return {'logged': logged, 'hasContext': has_ctx,
+            'qrUrl': st.get('qr_url') if not logged else None,
+            'qrAt': st.get('qr_at') if not logged else None,
+            'authorizedAt': st.get('authorized_at'),
+            'lastError': st.get('last_error'),
+            'detail': ('微信已连接，可主动推送' if logged and has_ctx else
+                       ('微信已扫码，但还没收到你的消息（去给 bot 发一句）' if logged else
+                        ('等待扫码' if st.get('qr_url') else '未连接：点「连接微信」生成二维码')))}
+
+
 def delivery_cfg(cfg=None):
     cfg = cfg or load_json(CONFIG, {})
     d = (cfg.get('report') or {}).get('delivery') or {}
@@ -1042,6 +1207,8 @@ def delivery_send(text):
     d = delivery_cfg()
     t = d['type']
     try:
+        if t == 'ilink':
+            return wechat_send_text(text)
         if t == 'wxpush':
             if not d['url']:
                 return 3, 'wxpush url 未配置'
@@ -1086,6 +1253,11 @@ def delivery_status():
     d = delivery_cfg()
     out = {'type': d['type'], 'ok': False, 'detail': '', 'pending': 0}
     try:
+        if d['type'] == 'ilink':
+            w = wechat_status()
+            out['ok'] = bool(w['logged'] and w['hasContext'])
+            out['detail'] = w['detail']
+            return out
         if d['type'] == 'wxpush':
             with urllib.request.urlopen(d['url'] + '/health', timeout=5) as r:
                 j = json.loads(r.read().decode() or '{}')
@@ -1220,7 +1392,7 @@ def do_report_with_image(cfg, quiet=False, force=None):
     """播报（文字）+ 可选附图；force=True/False 覆盖 config，None 跟随 config。"""
     code, text, msg = do_report(cfg, quiet)
     want = cfg.get('report', {}).get('image') if force is None else force
-    if delivery_cfg(cfg)['type'] != 'wxpush':
+    if delivery_cfg(cfg)['type'] not in ('wxpush', 'ilink'):
         want = False
     if code == 0 and want:
         try:
@@ -1246,6 +1418,9 @@ GRAPHICS = os.path.join(BASE, 'graphics')
 
 
 def _wx_state():
+    if delivery_cfg()['type'] == 'ilink':
+        st = wechat_state()
+        return st.get('bot_token'), st.get('context_token'), st.get('user_id'), ILINK_BASE
     st = load_json(WXPUSH_STATE, {})
     return st.get('bot_token'), st.get('context_token'), st.get('ilink_user_id'), \
         (st.get('api_base') or 'https://ilinkai.weixin.qq.com/ilink')
@@ -1293,7 +1468,7 @@ def flush_pending_image():
     p = load_json(PENDING_IMG, None)
     if not p:
         return False
-    if delivery_cfg()['type'] != 'wxpush':
+    if delivery_cfg()['type'] not in ('wxpush', 'ilink'):
         return False
     if channel_stale():
         return False
@@ -1739,6 +1914,25 @@ def cmd_daemon():
         time.sleep(30)
 
 
+def cmd_wechat(argv):
+    action = argv[0] if argv else 'status'
+    if action == 'login':
+        st = wechat_start_login()
+        print('二维码链接:', st.get('qr_url'))
+        print('二维码图片:', WECHAT_QR if os.path.exists(WECHAT_QR) else '(生成失败，可用链接自行转二维码)')
+        print('扫码后运行: deck wechat status')
+        return 0
+    if action == 'logout':
+        save_wechat_state({})
+        print('已清除微信登录态')
+        return 0
+    w = wechat_status()
+    print(f"微信: {w['detail']}")
+    if w.get('qrUrl'):
+        print('二维码:', w['qrUrl'])
+    return 0
+
+
 def cmd_demo(argv):
     """deck demo：生成一个演示环境（假项目 + 独立面板端口），不碰真实注册表。"""
     import shutil
@@ -1837,6 +2031,8 @@ def main():
         return cmd_approvals(rest)
     if cmd == 'decisions':
         return cmd_decisions(rest)
+    if cmd == 'wechat':
+        return cmd_wechat(rest)
     if cmd == 'demo':
         return cmd_demo(rest)
     if cmd == 'panel':

package/backend/panel.html

@@ -184,6 +184,31 @@
     <div class="hint" id="imgHint" style="margin-top:6px"></div>
   </div>
 
+  <div class="controls" id="wxBox" style="padding:10px 12px">
+    <span class="pill" style="margin:0"><i class="dot" id="wxDot"></i><b id="wxTitle">通知渠道</b></span>
+    <select id="wxType" onchange="onWxTypeChange()" style="font-size:12px;padding:5px 8px">
+      <option value="ilink">内置微信（扫码）</option>
+      <option value="wxpush">wxpush 网关</option>
+      <option value="serverchan">ServerChan</option>
+      <option value="webhook">Webhook</option>
+      <option value="command">自定义命令</option>
+    </select>
+    <input id="wxField" placeholder="" style="flex:1;min-width:160px;display:none">
+    <button class="ghost" id="wxSaveBtn" onclick="saveWx()" style="display:none">保存</button>
+    <span class="hint" id="wxDetail"></span>
+    <button class="ghost" id="wxLoginBtn" onclick="wxLogin()" style="display:none">连接微信</button>
+    <button class="ghost" id="wxLogoutBtn" onclick="wxLogout()" style="display:none">断开</button>
+  </div>
+  <div id="wxQrWrap" style="display:none;margin:-6px 0 18px;display:none">
+    <div style="display:flex;gap:14px;align-items:center;background:var(--panel);border:1px solid var(--line);border-radius:12px;padding:12px">
+      <img id="wxQr" style="width:150px;height:150px;border-radius:8px;background:#fff;padding:6px">
+      <div>
+        <div style="color:#e6edf3;font-size:13px;margin-bottom:6px">用微信扫码连接</div>
+        <div class="hint">扫码确认后，<b>还要在微信里给这个 bot 发任意一句话</b>（iLink 需要你发一次消息才能主动推送）。二维码约 2 分钟过期，会自动刷新。</div>
+      </div>
+    </div>
+  </div>
+
   <div class="controls" style="padding:9px 12px">
     <input id="q" placeholder="搜索项目（名称 / id / 路径 / 说明）" style="flex:1;min-width:180px" oninput="render()">
     <select id="fStatus" onchange="render()">
@@ -581,6 +606,67 @@ function sendToPlugin(payload){
   };
 }
 
+let WX = null, wxTimer = null;
+
+async function refreshWechat(){
+  try{
+    const r = await fetch('/api/wechat'); const j = await r.json();
+    WX = j.wechat || {};
+    const dot = $('wxDot'); const title = $('wxTitle');
+    if (dot) dot.className = 'dot ' + (WX.ok ? 'ok' : 'bad');
+    if (title) title.textContent = WX.mode === 'ilink' ? '微信' : (WX.mode || '通知');
+    $('wxDetail').textContent = WX.detail || '';
+    const curType = (S && S.config && S.config.delivery && S.config.delivery.type) || WX.mode || 'ilink';
+    if ($('wxType') && $('wxType').value !== curType) { $('wxType').value = curType; onWxTypeChange(); }
+    const needQr = WX.mode === 'ilink' && !WX.logged && WX.qrUrl;
+    $('wxQrWrap').style.display = needQr ? 'block' : 'none';
+    if (needQr) $('wxQr').src = '/api/wechat/qr.png?t=' + Date.now();
+    $('wxLoginBtn').style.display = (WX.mode === 'ilink' && !WX.logged) ? '' : 'none';
+    $('wxLogoutBtn').style.display = (WX.mode === 'ilink' && WX.logged) ? '' : 'none';
+    if (WX.mode === 'ilink' && !WX.ok) {
+      if (!wxTimer) wxTimer = setInterval(refreshWechat, 2500);
+    } else if (wxTimer) { clearInterval(wxTimer); wxTimer = null; }
+    if (S && S.wechat) { S.wechat.ok = WX.ok; render(); }
+  }catch(e){ /* 忽略 */ }
+}
+
+async function wxLogin(){ try{ await api('/api/wechat/login', {}); refreshWechat(); }catch(e){ toast('生成二维码失败：' + e.message, true); } }
+async function wxLogout(){ try{ await api('/api/wechat/logout', {}); refreshWechat(); toast('已断开微信'); }catch(e){ toast('断开失败：' + e.message, true); } }
+
+const WX_FIELD = {
+  serverchan: ['key', 'ServerChan SendKey（SCT...）'],
+  webhook: ['webhook', 'webhook URL（企业微信机器人等）'],
+  command: ['command', '命令（stdin 收文本，退出码 0=成功）'],
+  wxpush: ['url', 'wxpush 地址，默认 http://127.0.0.1:9098'],
+  ilink: null,
+};
+
+function onWxTypeChange(){
+  const type = $('wxType').value;
+  const f = WX_FIELD[type];
+  $('wxField').style.display = f ? '' : 'none';
+  $('wxSaveBtn').style.display = f ? '' : 'none';
+  if (f) {
+    const cur = (S && S.config && S.config.delivery) || {};
+    $('wxField').placeholder = f[1];
+    $('wxField').value = cur[f[0]] || '';
+  }
+  const isIlink = type === 'ilink';
+  $('wxLoginBtn').style.display = isIlink ? '' : 'none';
+  $('wxLogoutBtn').style.display = 'none';
+}
+
+async function saveWx(){
+  const type = $('wxType').value;
+  const f = WX_FIELD[type];
+  if (!f) return;
+  const delivery = { type, [f[0]]: $('wxField').value.trim() };
+  try{
+    const r = await api('/api/config', { delivery });
+    S = r.state; render(); refreshWechat(); toast('通知渠道已更新');
+  }catch(e){ toast('保存失败：' + e.message, true); }
+}
+
 function setFabPos(pos){
   if (!inPluginFrame()) { toast('请在 DSH 内嵌面板里使用（浏览器打开时无效）', true); return; }
   window.parent.postMessage({ type: 'deck:set-fab-pos', pos }, '*');

package/backend/panel.py

@@ -47,6 +47,26 @@ P = load_deck()
 
 
 # ── 数据汇总 ────────────────────────────────────────────────
+def wechat_view():
+    d = P.delivery_cfg()
+    if d['type'] == 'ilink':
+        P.wechat_check_login() if P.wechat_state().get('qr_ticket') else None
+        return {'mode': 'ilink', **P.wechat_status()}
+    st = P.delivery_status()
+    return {'mode': d['type'], **st}
+
+
+def wechat_poller():
+    while True:
+        try:
+            if P.delivery_cfg()['type'] == 'ilink' and P.wechat_state().get('bot_token'):
+                P.wechat_poll_once(50)
+            else:
+                time.sleep(4)
+        except Exception:
+            time.sleep(5)
+
+
 def wechat_state():
     st = P.delivery_status()
     return {'ok': bool(st.get('ok')), 'raw': st.get('detail', ''),
@@ -102,6 +122,7 @@ def snapshot():
                    'format': rep.get('format', 'markdown'),
                    'image': bool(rep.get('image', False)),
                    'web': cfg.get('web', {}).get('baseUrl', 'http://127.0.0.1:43120'),
+                   'delivery': P.delivery_cfg(cfg),
                    'scan': cfg.get('scan', {})},
         'daemon': {'running': bool(P.daemon_status()), 'pid': P.daemon_status() or 0,
                    'lastRun': last, 'nextRun': (last + interval * 3600) if last else 0},
@@ -566,6 +587,11 @@ def set_config(payload):
         rep['maxChars'] = int(payload['maxChars'])
     if 'image' in payload:
         rep['image'] = bool(payload['image'])
+    if 'delivery' in payload and isinstance(payload['delivery'], dict):
+        dl = rep.setdefault('delivery', {})
+        for k in ('type', 'url', 'key', 'webhook', 'command'):
+            if k in payload['delivery']:
+                dl[k] = payload['delivery'][k]
     if 'scan' in payload and isinstance(payload['scan'], dict):
         sc = cfg.setdefault('scan', {})
         for k in ('enabled', 'autoAdd'):
@@ -785,6 +811,33 @@ class Handler(http.server.BaseHTTPRequestHandler):
             return self._json({'ok': False, 'error': 'forbidden'}, 403)
         if path in ('/', '/index.html'):
             return self._html(HTML)
+        if path == '/api/wechat':
+            return self._json({'ok': True, 'wechat': wechat_view()})
+        if path == '/api/wechat/qr.png':
+            fp = P.WECHAT_QR
+            if not os.path.isfile(fp):
+                return self._json({'ok': False, 'error': '二维码尚未生成'}, 404)
+            body = open(fp, 'rb').read()
+            self.send_response(200)
+            self.send_header('Content-Type', 'image/png')
+            self.send_header('Cache-Control', 'no-store')
+            self.send_header('Content-Length', str(len(body)))
+            self.end_headers()
+            self.wfile.write(body)
+            return
+        if path == '/icons':
+            fp = os.path.join(BASE, 'icons.html')
+            if not os.path.isfile(fp):
+                return self._json({'ok': False, 'error': 'icons.html 不存在'}, 404)
+            body = open(fp, 'rb').read()
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.send_header('Content-Length', str(len(body)))
+            self.end_headers()
+            self.wfile.write(body)
+            return
+        if path in ('/api/node/scanner.py', '/api/node/scanner.js', '/api/node/scanner.ps1'):
+            pass
         if path == '/api/state':
             try:
                 return self._json(snapshot())
@@ -891,6 +944,12 @@ class Handler(http.server.BaseHTTPRequestHandler):
             return self._json({'ok': False, 'error': '请求体不是合法 JSON'}, 400)
 
         try:
+            if path == '/api/wechat/login':
+                P.wechat_start_login()
+                return self._json({'ok': True, 'wechat': wechat_view()})
+            if path == '/api/wechat/logout':
+                P.save_wechat_state({})
+                return self._json({'ok': True, 'wechat': wechat_view()})
             if path == '/api/autonomy':
                 return self._json({'ok': True, 'state': set_autonomy(payload.get('project'), payload.get('mode'), payload.get('maxPerDay'))})
             if path == '/api/approval':
@@ -939,6 +998,7 @@ class Handler(http.server.BaseHTTPRequestHandler):
 def main():
     import threading
     threading.Thread(target=lambda: session_index(), daemon=True).start()  # 预热会话索引
+    threading.Thread(target=wechat_poller, daemon=True).start()  # 微信内置通道轮询
     httpd = http.server.ThreadingHTTPServer((HOST, PORT), Handler)
     P.log(f'[panel] listening http://{HOST}:{PORT}')
     try:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-project-deck",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "DeepSeek Harness plugin: a project deck for your repos — registry, dashboard, scheduled WeChat reports, auto-discovery, multi-node scanning.",
   "type": "module",
   "main": "./lib/index.js",