@morehao/dsh-github-trending 0.8.3 → 0.8.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [v0.8.4] - 2026-11-02
+
+### Features
+
+- **auth**: open device-code page with prefilled code
+- **auth**: 美化 GitHub OAuth 回调落地页 (#78)
+
+**Full Changelog**: https://github.com/morehao/dsh-github-trending/compare/v0.8.3...v0.8.4
+
 ## [v0.8.3] - 2026-11-02
 
 ### Fixes

package/client.js

@@ -125,10 +125,10 @@ var DICT = {
     "auth.gh": "本机 gh",
     "auth.browser": "浏览器登录",
     "auth.gh.hint": "使用本机 gh 登录态：终端执行 `gh auth login` 完成登录，再点「测试认证」。",
-    "auth.browser.hint": "在浏览器里完成 GitHub 授权，token 由 DSH 安全保存，无需手工粘贴。默认走设备码：点一下后按提示输入验证码。",
+    "auth.browser.hint": "在浏览器里完成 GitHub 授权，token 由 DSH 安全保存，无需手工粘贴。点一下会在浏览器打开授权页（验证码通常已自动填入），确认授权即可。",
     "auth.browser.signin": "用 GitHub 登录",
     "auth.browser.waiting": "等待浏览器授权…",
-    "auth.browser.code": "在打开的页面输入验证码：",
+    "auth.browser.code": "如未自动填入，请手动输入验证码：",
     "auth.browser.cancel": "取消",
     "auth.browser.done": "已登录",
     "auth.browser.device": "用设备码登录",
@@ -670,10 +670,10 @@ var DICT = {
     "auth.gh": "Local gh",
     "auth.browser": "Browser login",
     "auth.gh.hint": "Uses your local gh login: run `gh auth login` in a terminal, then click Test authentication.",
-    "auth.browser.hint": "Authorize GitHub in your browser; DSH stores the token securely, no manual paste. Uses a device code by default: enter the code on the GitHub page after clicking.",
+    "auth.browser.hint": "Authorize GitHub in your browser; DSH stores the token securely, no manual paste. Clicking opens the authorization page with the code usually pre-filled — just confirm.",
     "auth.browser.signin": "Sign in with GitHub",
     "auth.browser.waiting": "Waiting for browser authorization…",
-    "auth.browser.code": "Enter this code on the opened page:",
+    "auth.browser.code": "If it is not filled in automatically, enter this code:",
     "auth.browser.cancel": "Cancel",
     "auth.browser.done": "Signed in",
     "auth.browser.device": "Use a device code",
@@ -2272,9 +2272,10 @@ function SettingsView(props) {
         } catch {
         }
       }
-      if (view.phase === "waiting-device" && view.verificationUri !== void 0) {
+      const deviceUrl = view.verificationUriComplete ?? view.verificationUri;
+      if (view.phase === "waiting-device" && deviceUrl !== void 0) {
         try {
-          window.open(view.verificationUri, "_blank", "noopener,noreferrer");
+          window.open(deviceUrl, "_blank", "noopener,noreferrer");
         } catch {
         }
       }
@@ -2583,10 +2584,19 @@ function SettingsView(props) {
         " ",
         h(Btn, { small: true, variant: "ghost", onClick: () => copyAuthorizeLink() }, t("auth.browser.copy"))
       ) : null,
-      signIn.verificationUri !== void 0 ? h(
+      signIn.verificationUriComplete !== void 0 || signIn.verificationUri !== void 0 ? h(
         "div",
         { className: "dshgt-desc" },
-        h("a", { className: "dshgt-link", href: signIn.verificationUri, target: "_blank", rel: "noreferrer" }, signIn.verificationUri)
+        h(
+          "a",
+          {
+            className: "dshgt-link",
+            href: signIn.verificationUriComplete ?? signIn.verificationUri,
+            target: "_blank",
+            rel: "noreferrer"
+          },
+          t("auth.browser.open")
+        )
       ) : null,
       signIn.userCode !== void 0 ? h("div", { className: "dshgt-mono" }, `${t("auth.browser.code")} ${signIn.userCode}`) : null
     ) : null,

package/lib/{chunk-VO72OOVK.js → chunk-QOYTABJH.js}

@@ -3540,8 +3540,10 @@ __export(github_auth_exports, {
   createPkce: () => createPkce,
   ensureGithubFlow: () => ensureGithubFlow,
   isGithubFlowRegistered: () => isGithubFlowRegistered,
+  isHttpUrl: () => isHttpUrl,
   isLoopbackSignInAvailable: () => isLoopbackSignInAvailable,
   registerGithubFlow: () => registerGithubFlow,
+  renderCallbackPage: () => renderCallbackPage,
   resetAttemptForTest: () => resetAttemptForTest,
   resolveClientId: () => resolveClientId,
   resolveClientSecret: () => resolveClientSecret,
@@ -3581,6 +3583,16 @@ function attemptView() {
 function base64url(buf) {
   return buf.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
+function isHttpUrl(value) {
+  if (typeof value !== "string" || value === "") return false;
+  let url;
+  try {
+    url = new URL(value);
+  } catch {
+    return false;
+  }
+  return url.protocol === "https:" || url.protocol === "http:";
+}
 function createPkce() {
   const verifier = base64url(randomBytes2(32));
   const challenge = base64url(createHash3("sha256").update(verifier).digest());
@@ -3591,6 +3603,41 @@ function verifyState(received, expected) {
   const b = Buffer.from(expected);
   return a.length === b.length && timingSafeEqual2(a, b);
 }
+function renderCallbackPage(kind) {
+  const ok = kind === "success";
+  const title = ok ? "\u767B\u5F55\u5B8C\u6210" : "\u767B\u5F55\u672A\u5B8C\u6210";
+  const heading = ok ? "GitHub \u6388\u6743\u6210\u529F" : "GitHub \u6388\u6743\u5931\u8D25";
+  const body = ok ? "\u5DF2\u5B8C\u6210\u767B\u5F55\uFF0C\u53EF\u4EE5\u5173\u95ED\u6B64\u9875\u9762\u3002" : "\u6388\u6743\u6821\u9A8C\u672A\u901A\u8FC7\uFF0C\u8BF7\u56DE\u5230 DSH \u91CD\u65B0\u53D1\u8D77\u767B\u5F55\u3002";
+  const accent = ok ? "#1f883d" : "#cf222e";
+  const icon = ok ? '<path d="M20 6 9 17l-5-5"/>' : '<path d="M18 6 6 18"/><path d="m6 6 12 12"/>';
+  const autoClose = ok ? "<script>(function(){try{setTimeout(function(){window.close()},1200)}catch(e){}})()</script>" : "";
+  return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<meta name="color-scheme" content="light dark">
+<title>${title}</title>
+<style>
+  :root{--bg:#f6f8fa;--card:#ffffff;--fg:#1f2328;--muted:#59636e;--border:#d1d9e0;--accent:${accent}}
+  @media (prefers-color-scheme:dark){:root{--bg:#0d1117;--card:#151b23;--fg:#e6edf3;--muted:#9198a1;--border:#3d444d}}
+  *{box-sizing:border-box}
+  html,body{height:100%}
+  body{margin:0;display:flex;align-items:center;justify-content:center;padding:24px;
+    background:var(--bg);color:var(--fg);
+    font:400 15px/1.6 -apple-system,BlinkMacSystemFont,"Segoe UI","PingFang SC","Hiragino Sans GB","Microsoft YaHei",sans-serif}
+  main{width:100%;max-width:400px;background:var(--card);border:1px solid var(--border);
+    border-radius:14px;padding:40px 32px;text-align:center;
+    box-shadow:0 8px 24px rgba(0,0,0,.06)}
+  .mark{width:64px;height:64px;margin:0 auto 20px;border-radius:50%;display:flex;
+    align-items:center;justify-content:center;background:color-mix(in srgb,var(--accent) 14%,transparent);color:var(--accent)}
+  .mark svg{width:30px;height:30px;fill:none;stroke:currentColor;stroke-width:2.4;stroke-linecap:round;stroke-linejoin:round}
+  h1{margin:0 0 8px;font-size:19px;font-weight:600;letter-spacing:.2px}
+  p{margin:0;color:var(--muted);font-size:14px}
+</style></head>
+<body><main role="status">
+  <div class="mark"><svg viewBox="0 0 24 24" aria-hidden="true">${icon}</svg></div>
+  <h1>${heading}</h1>
+  <p>${body}</p>
+</main>${autoClose}</body></html>`;
+}
 function buildAuthorizeUrl(params) {
   const url = new URL(params.authorizeEndpoint);
   url.searchParams.set("client_id", params.clientId);
@@ -3684,10 +3731,10 @@ async function runBrowser(deps, session) {
       const single = url.searchParams.getAll("state").length === 1 && url.searchParams.getAll("code").length === 1;
       const bad = req.method !== "GET" || url.pathname !== CALLBACK_PATH || !single || code === "" || !verifyState(gotState, state);
       if (bad) {
-        res.writeHead(400, { "cache-control": "no-store" }).end();
+        res.writeHead(400, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }).end(renderCallbackPage("error"));
         return;
       }
-      res.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }).end('<!doctype html><meta charset="utf-8"><title>GitHub</title><p>\u5DF2\u5B8C\u6210\u767B\u5F55\uFF0C\u53EF\u4EE5\u5173\u95ED\u6B64\u9875\u9762\u3002</p>');
+      res.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }).end(renderCallbackPage("success"));
       resolveCode(code);
     }
   });
@@ -3750,15 +3797,17 @@ async function runDevice(deps, session) {
   const intervalSec = typeof start.interval === "number" && start.interval > 0 ? start.interval : 5;
   const expiresInSec = typeof start.expires_in === "number" && start.expires_in > 0 ? start.expires_in : 900;
   const deadline = Date.now() + expiresInSec * 1e3;
+  const verificationUriComplete = isHttpUrl(start.verification_uri_complete) ? start.verification_uri_complete : void 0;
   updateCurrent({
     phase: "waiting-device",
     verificationUri: start.verification_uri,
+    ...verificationUriComplete === void 0 ? {} : { verificationUriComplete },
     userCode: start.user_code,
     expiresAt: deadline
   });
   session.notify?.({
     message: "Enter this code on the verification page to finish signing in.",
-    url: start.verification_uri,
+    url: verificationUriComplete ?? start.verification_uri,
     code: start.user_code
   });
   let waitMs = intervalSec * 1e3;
@@ -3880,7 +3929,7 @@ async function beginGithubSignIn(deps, method = "browser") {
       interaction: {
         notify: (notice) => {
           if (notice.code !== void 0 && notice.url !== void 0) {
-            updateCurrent({ phase: "waiting-device", verificationUri: notice.url, userCode: notice.code });
+            updateCurrent({ phase: "waiting-device", userCode: notice.code });
           } else if (notice.url !== void 0) {
             updateCurrent({ phase: "waiting-browser", authorizeUrl: notice.url });
           }

package/lib/index.js

@@ -9,7 +9,7 @@ import {
   createUpdateService,
   ensureGithubFlow,
   readPluginInfo
-} from "./chunk-VO72OOVK.js";
+} from "./chunk-QOYTABJH.js";
 
 // src/index.ts
 var name = "dsh-github-trending";

package/lib/internal.d.ts

@@ -1260,12 +1260,16 @@ interface GithubAttemptView {
     phase: GithubAttemptPhase;
     authorizeUrl?: string;
     verificationUri?: string;
+    /** device flow 预填验证码的地址（GitHub 返回的 `verification_uri_complete`）：打开只需点授权。 */
+    verificationUriComplete?: string;
     userCode?: string;
     expiresAt?: number;
     login?: string;
     error?: string;
 }
 declare function attemptView(): GithubAttemptView;
+/** 判断一个未知值是否是可直接打开的 http(s) URL（用于校验 GitHub 返回的验证页地址）。 */
+declare function isHttpUrl(value: unknown): boolean;
 /** PKCE：返回 verifier 与 S256 challenge。 */
 declare function createPkce(): {
     verifier: string;
@@ -1273,6 +1277,13 @@ declare function createPkce(): {
 };
 /** 常量时间比较 state（长度不等直接 false，避免 timingSafeEqual 抛错）。 */
 declare function verifyState(received: string, expected: string): boolean;
+/** 回调落地页的两种结果（纯展示，无外部资源，离线可测）。 */
+type CallbackPageKind = 'success' | 'error';
+/**
+ * 回环回调的落地页 HTML。自包含、无外链资源（CSP 友好、离线可用），
+ * 跟随系统深浅色；成功页会尝试自动关闭本窗口（脚本失败时文字兜底）。
+ */
+declare function renderCallbackPage(kind: CallbackPageKind): string;
 /** 拼授权页 URL。 */
 declare function buildAuthorizeUrl(params: {
     authorizeEndpoint: string;
@@ -1344,15 +1355,17 @@ declare const githubAuth_cancelGithubSignIn: typeof cancelGithubSignIn;
 declare const githubAuth_createPkce: typeof createPkce;
 declare const githubAuth_ensureGithubFlow: typeof ensureGithubFlow;
 declare const githubAuth_isGithubFlowRegistered: typeof isGithubFlowRegistered;
+declare const githubAuth_isHttpUrl: typeof isHttpUrl;
 declare const githubAuth_isLoopbackSignInAvailable: typeof isLoopbackSignInAvailable;
 declare const githubAuth_registerGithubFlow: typeof registerGithubFlow;
+declare const githubAuth_renderCallbackPage: typeof renderCallbackPage;
 declare const githubAuth_resetAttemptForTest: typeof resetAttemptForTest;
 declare const githubAuth_resolveClientId: typeof resolveClientId;
 declare const githubAuth_resolveClientSecret: typeof resolveClientSecret;
 declare const githubAuth_resolveMethod: typeof resolveMethod;
 declare const githubAuth_verifyState: typeof verifyState;
 declare namespace githubAuth {
-  export { type githubAuth_AuthorizationFlow as AuthorizationFlow, type githubAuth_AuthorizationLike as AuthorizationLike, type githubAuth_AuthorizationSessionLike as AuthorizationSessionLike, githubAuth_CALLBACK_PATH as CALLBACK_PATH, githubAuth_DEFAULT_GITHUB_CLIENT_ID as DEFAULT_GITHUB_CLIENT_ID, githubAuth_DEFAULT_SCOPE as DEFAULT_SCOPE, githubAuth_GITHUB_RECORD_KEY as GITHUB_RECORD_KEY, type githubAuth_GithubAttemptPhase as GithubAttemptPhase, type githubAuth_GithubAttemptView as GithubAttemptView, type githubAuth_GithubAuthDeps as GithubAuthDeps, type githubAuth_GithubGrantPayload as GithubGrantPayload, type githubAuth_WebServerLike as WebServerLike, githubAuth_attemptView as attemptView, githubAuth_beginGithubSignIn as beginGithubSignIn, githubAuth_buildAuthorizeUrl as buildAuthorizeUrl, githubAuth_cancelGithubSignIn as cancelGithubSignIn, githubAuth_createPkce as createPkce, githubAuth_ensureGithubFlow as ensureGithubFlow, githubAuth_isGithubFlowRegistered as isGithubFlowRegistered, githubAuth_isLoopbackSignInAvailable as isLoopbackSignInAvailable, githubAuth_registerGithubFlow as registerGithubFlow, githubAuth_resetAttemptForTest as resetAttemptForTest, githubAuth_resolveClientId as resolveClientId, githubAuth_resolveClientSecret as resolveClientSecret, githubAuth_resolveMethod as resolveMethod, githubAuth_verifyState as verifyState };
+  export { type githubAuth_AuthorizationFlow as AuthorizationFlow, type githubAuth_AuthorizationLike as AuthorizationLike, type githubAuth_AuthorizationSessionLike as AuthorizationSessionLike, githubAuth_CALLBACK_PATH as CALLBACK_PATH, githubAuth_DEFAULT_GITHUB_CLIENT_ID as DEFAULT_GITHUB_CLIENT_ID, githubAuth_DEFAULT_SCOPE as DEFAULT_SCOPE, githubAuth_GITHUB_RECORD_KEY as GITHUB_RECORD_KEY, type githubAuth_GithubAttemptPhase as GithubAttemptPhase, type githubAuth_GithubAttemptView as GithubAttemptView, type githubAuth_GithubAuthDeps as GithubAuthDeps, type githubAuth_GithubGrantPayload as GithubGrantPayload, type githubAuth_WebServerLike as WebServerLike, githubAuth_attemptView as attemptView, githubAuth_beginGithubSignIn as beginGithubSignIn, githubAuth_buildAuthorizeUrl as buildAuthorizeUrl, githubAuth_cancelGithubSignIn as cancelGithubSignIn, githubAuth_createPkce as createPkce, githubAuth_ensureGithubFlow as ensureGithubFlow, githubAuth_isGithubFlowRegistered as isGithubFlowRegistered, githubAuth_isHttpUrl as isHttpUrl, githubAuth_isLoopbackSignInAvailable as isLoopbackSignInAvailable, githubAuth_registerGithubFlow as registerGithubFlow, githubAuth_renderCallbackPage as renderCallbackPage, githubAuth_resetAttemptForTest as resetAttemptForTest, githubAuth_resolveClientId as resolveClientId, githubAuth_resolveClientSecret as resolveClientSecret, githubAuth_resolveMethod as resolveMethod, githubAuth_verifyState as verifyState };
 }
 
 interface DefaultBranchResult {

package/lib/internal.js

@@ -27,7 +27,7 @@ import {
   tools_exports,
   update_exports,
   version_exports
-} from "./chunk-VO72OOVK.js";
+} from "./chunk-QOYTABJH.js";
 
 // src/internal.ts
 import * as exec from "@morehao/dsh-plugin-kit/exec";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "GitHub 趋势日报的 DeepSeek Harness 插件：按日 / 周 / 月周期定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与周期总结，并可选把订阅仓库的新 Release 合成中文摘要，一起提交到你的仓库、自动开 PR 合并；内置概览 / 榜单 / 运行记录 / 订阅 / 设置工作台。",
   "type": "module",
   "main": "lib/index.js",