@gengchenchina/chrome-media-publish-extension 1.0.8 → 1.0.10

package/README.md

@@ -509,6 +509,11 @@ Manager 发布菜单会自动递增 patch；工具包若首发为 `1.0.9`，则
 
 ## Adapter 开发规范
 
+百家号编辑页跳到 STOKEN 中间页时，内核会自动执行 Passport 获取 STOKEN、`dealtoken` 和一次编辑页重试。
+真实账号验证步骤与失败诊断见 `docs/integration-guide.md` 的“百家号 STOKEN 补全与修复验证”。
+本次还补充了 Passport STOKEN 接口的百家号 Referer 规则，以处理 `errno=12 / invalid refer`。
+已发布版本不会自动包含本地新修复；发布前查询版本并递增，然后更新下游依赖、重建并重新加载扩展。
+
 真实平台 adapter 放在：
 
 ```text

package/dist/index.js

@@ -4126,6 +4126,9 @@ var BAIJIAHAO_PLATFORM = Platform.Baijiahao;
 var BAIJIAHAO_ORIGIN = "https://baijiahao.baidu.com";
 var BAIJIAHAO_APPINFO_URL = `${BAIJIAHAO_ORIGIN}/builder/app/appinfo`;
 var BAIJIAHAO_EDIT_URL = `${BAIJIAHAO_ORIGIN}/builder/rc/edit`;
+var BAIJIAHAO_STOKEN_URL = `${BAIJIAHAO_ORIGIN}/builder/fe-react/stoken.html`;
+var BAIJIAHAO_PASSPORT_AUTH_URL = "https://passport.baidu.com/v3/login/api/auth/";
+var BAIJIAHAO_DEALTOKEN_URL = `${BAIJIAHAO_ORIGIN}/pcui/home/dealtoken`;
 var BAIJIAHAO_ARTICLE_PUBLISH_URL = `${BAIJIAHAO_ORIGIN}/pcui/article/publish`;
 var BAIJIAHAO_ARTICLE_LIST_URL = `${BAIJIAHAO_ORIGIN}/pcui/article/lists`;
 var BAIJIAHAO_IMAGE_UPLOAD_URL = `${BAIJIAHAO_ORIGIN}/pcui/picture/uploadproxy`;
@@ -4137,6 +4140,12 @@ var BAIJIAHAO_HEADER_RULES = Object.freeze([
       Referer: `${BAIJIAHAO_ORIGIN}/`
     }),
     resourceTypes: Object.freeze(["xmlhttprequest"])
+  }),
+  Object.freeze({
+    // Passport 校验 STOKEN 请求来源；只覆盖此接口，保持其他 Passport 请求不变。
+    urlFilter: `|${BAIJIAHAO_PASSPORT_AUTH_URL}`,
+    headers: Object.freeze({ Referer: `${BAIJIAHAO_ORIGIN}/` }),
+    resourceTypes: Object.freeze(["xmlhttprequest"])
   })
 ]);
 var BAIJIAHAO_SKIP_IMAGE_HOSTS = Object.freeze([
@@ -4154,7 +4163,9 @@ async function fetchText(ctx, url, init = {}, options = {}) {
       Accept: "application/json, text/plain, */*",
       ...init.headers || {}
     },
-    body: init.body
+    body: init.body,
+    ...init.cache ? { cache: init.cache } : {},
+    ...init.redirect ? { redirect: init.redirect } : {}
   }, { timeoutMs: options.timeoutMs });
   const text = await response.text();
   options.onResponse?.(response, text);
@@ -4616,14 +4627,7 @@ function createArticleDependencies(ctx, input) {
 async function fetchBaijiahaoAuthToken(ctx, input = {}) {
   const startedAt = Date.now();
   let httpErrorCode;
-  const diagnostics = {
-    schemaVersion: 1,
-    stage: "baijiahao.auth-token",
-    failure: "REQUEST_FAILED",
-    requestedAt: new Date(startedAt).toISOString(),
-    requestUrl: BAIJIAHAO_EDIT_URL,
-    requestAccept: "application/json, text/plain, */*",
-    credentials: "include",
+  const emptyResponse = {
     status: null,
     finalUrl: null,
     redirected: null,
@@ -4633,13 +4637,26 @@ async function fetchBaijiahaoAuthToken(ctx, input = {}) {
     tokenMatched: null,
     hasHtmlMarkers: null,
     hasLoginMarkers: null,
-    hasChallengeMarkers: null,
+    hasChallengeMarkers: null
+  };
+  const diagnostics = {
+    schemaVersion: 1,
+    stage: "baijiahao.auth-token",
+    failure: "REQUEST_FAILED",
+    requestedAt: new Date(startedAt).toISOString(),
+    requestUrl: BAIJIAHAO_EDIT_URL,
+    requestAccept: "application/json, text/plain, */*",
+    credentials: "include",
+    ...emptyResponse,
     elapsedMs: 0
   };
-  try {
-    const html = await fetchText(ctx, BAIJIAHAO_EDIT_URL, {
-      credentials: "include"
-    }, {
+  const requestText = (url, init = {}) => {
+    httpErrorCode = void 0;
+    Object.assign(diagnostics, emptyResponse, {
+      requestUrl: url.split("?")[0],
+      failure: "REQUEST_FAILED"
+    });
+    return fetchText(ctx, url, { credentials: "include", ...init }, {
       timeoutMs: input.timeoutMs,
       includeErrorBody: false,
       onResponse(response, text) {
@@ -4650,8 +4667,8 @@ async function fetchBaijiahaoAuthToken(ctx, input = {}) {
         }
         let finalUrl = null;
         try {
-          const url = new URL(response.url);
-          finalUrl = `${url.origin}${url.pathname}`;
+          const url2 = new URL(response.url);
+          finalUrl = `${url2.origin}${url2.pathname}`;
         } catch {
         }
         Object.assign(diagnostics, {
@@ -4667,9 +4684,75 @@ async function fetchBaijiahaoAuthToken(ctx, input = {}) {
           hasLoginMarkers: /passport\.baidu\.com|登录|\blogin\b/i.test(text),
           hasChallengeMarkers: /验证码|安全验证|安全校验|\bcaptcha\b/i.test(text)
         });
+        if (diagnostics.sessionRefresh?.phase === "passport") {
+          diagnostics.sessionRefresh.authStatus = response.status;
+        } else if (diagnostics.sessionRefresh?.phase === "dealtoken") {
+          diagnostics.sessionRefresh.dealtokenStatus = response.status;
+        }
       }
     });
-    const match = html.match(/window\.__BJH__INIT__AUTH__\s*=\s*['"]([^'"]+)['"]/);
+  };
+  const matchToken = (html) => html.match(/window\.__BJH__INIT__AUTH__\s*=\s*['"]([^'"]+)['"]/);
+  try {
+    let html = await requestText(BAIJIAHAO_EDIT_URL);
+    let match = matchToken(html);
+    if (!match && diagnostics.finalUrl === BAIJIAHAO_STOKEN_URL) {
+      diagnostics.sessionRefresh = {
+        attempted: true,
+        completed: false,
+        phase: "passport",
+        authStatus: null,
+        authErrno: null,
+        dealtokenStatus: null
+      };
+      const callback = `json_callback_${Date.now()}`;
+      const params = new URLSearchParams({ callback, return_type: "2", tpl: "bjh" });
+      const authText = await requestText(`${BAIJIAHAO_PASSPORT_AUTH_URL}?${params}`, { cache: "no-store" });
+      let auth;
+      try {
+        const jsonp = authText.trim().match(new RegExp(`^${callback}\\s*\\(([\\s\\S]*)\\)\\s*;?$`));
+        auth = JSON.parse(jsonp ? jsonp[1] : authText);
+        if (!auth || typeof auth !== "object" || Array.isArray(auth)) throw new Error();
+      } catch {
+        diagnostics.failure = "STOKEN_RESPONSE_INVALID";
+        throw new Error("\u767E\u5BB6\u53F7 Passport STOKEN \u54CD\u5E94\u683C\u5F0F\u5F02\u5E38");
+      }
+      const errno = typeof auth.errno === "number" || typeof auth.errno === "string" && /^-?\d+$/.test(auth.errno) ? Number(auth.errno) : NaN;
+      diagnostics.sessionRefresh.authErrno = Number.isFinite(errno) ? errno : null;
+      if (errno === 12) {
+        diagnostics.failure = "STOKEN_REFERER_REJECTED";
+        throw new Error("\u767E\u5BB6\u53F7 Passport \u8BF7\u6C42\u6765\u6E90\u6821\u9A8C\u5931\u8D25\uFF08errno=12\uFF09\uFF0C\u8BF7\u66F4\u65B0\u53D1\u6587\u6269\u5C55\u540E\u91CD\u8BD5");
+      }
+      const stoken = typeof auth.stoken === "string" ? auth.stoken.trim() : "";
+      if (errno !== 0 || !/^[\x21-\x7e]+$/.test(stoken)) {
+        diagnostics.failure = "STOKEN_AUTH_FAILED";
+        throw new Error(`\u767E\u5BB6\u53F7 STOKEN \u83B7\u53D6\u5931\u8D25\uFF08Passport errno=${diagnostics.sessionRefresh.authErrno ?? "\u672A\u77E5"}\uFF09\uFF0C\u8BF7\u5728\u5E73\u53F0\u9875\u9762\u5B8C\u6210\u767B\u5F55\u6216\u9A8C\u8BC1\u540E\u91CD\u8BD5`);
+      }
+      diagnostics.sessionRefresh.phase = "dealtoken";
+      await requestText(BAIJIAHAO_DEALTOKEN_URL, {
+        headers: { bjh: stoken },
+        cache: "no-store",
+        redirect: "error"
+      });
+      if (diagnostics.sessionRefresh.dealtokenStatus !== 200 || diagnostics.redirected === true || diagnostics.finalUrl !== null && diagnostics.finalUrl !== BAIJIAHAO_DEALTOKEN_URL) {
+        diagnostics.failure = "STOKEN_REFRESH_FAILED";
+        throw new Error("\u767E\u5BB6\u53F7 STOKEN \u4F1A\u8BDD\u8865\u5168\u672A\u6210\u529F");
+      }
+      diagnostics.sessionRefresh.completed = true;
+      diagnostics.sessionRefresh.phase = "retry-edit";
+      html = await requestText(BAIJIAHAO_EDIT_URL, { cache: "no-store" });
+      match = matchToken(html);
+      if (!match) {
+        const repeatedRedirect = diagnostics.finalUrl === BAIJIAHAO_STOKEN_URL;
+        diagnostics.failure = repeatedRedirect ? "STOKEN_REDIRECT_LOOP" : "TOKEN_NOT_FOUND";
+        throw new Error(repeatedRedirect ? "\u767E\u5BB6\u53F7 STOKEN \u8865\u5168\u540E\u4ECD\u8DF3\u8F6C\u5230\u4F1A\u8BDD\u521D\u59CB\u5316\u9875\uFF0C\u8BF7\u5728\u5E73\u53F0\u9875\u9762\u5B8C\u6210\u767B\u5F55\u6216\u9A8C\u8BC1\u540E\u91CD\u8BD5" : "\u767E\u5BB6\u53F7\u4F1A\u8BDD\u8865\u5168\u540E\u672A\u80FD\u83B7\u53D6\u7F16\u8F91\u9875\u53D1\u5E03 token");
+      }
+      ctx.Logger?.info?.("\u767E\u5BB6\u53F7 STOKEN \u4F1A\u8BDD\u8865\u5168\u6210\u529F", {
+        stage: "baijiahao.auth-token",
+        ...diagnostics.sessionRefresh,
+        elapsedMs: Date.now() - startedAt
+      });
+    }
     if (!match) throw new Error("\u767B\u5F55\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u767E\u5BB6\u53F7");
     return match[1];
   } catch (error) {