@gengchenchina/chrome-media-publish-extension 1.0.12 → 1.0.13

package/README.md

@@ -318,6 +318,10 @@ type PublishStatusRef = {
 | `cover` | 当前使用第一张图作为封面 | 可选自定义封面，上传到 ImageX |
 | `content` | `Array<{ url: string }>` 图片 URL 列表 | 视频 URL 字符串 |
 
+从 `1.0.13` 开始，视频最终提交由本包原生使用创作者中心 `create_v2` JSON 协议，在 Chrome `MAIN` 页面上下文执行。立即发布的 `item.common.timing` 为数值 `0`，定时发布为 Unix 秒数；无需宿主改写请求或包装共享 Toolkit 对象。
+
+视频最终提交只发起一次。页面返回空正文、网络错误或超时时，不回退旧 `create` 接口、不从扩展后台重复提交；遇到结果不明确时，应先在创作者中心核对作品。每次视频发布使用独立的步骤生命周期与截止时间，超时后阻止尚未开始的后续步骤和最终投稿，并继续清理请求头规则。已发送到服务器的请求仍可能被受理，超时不代表撤回成功。
+
 Douyin `publish()` 成功返回的 `statusRef.url` 是可推导候选：
 
 - 图文：`https://www.douyin.com/note/<id>`

package/dist/index.js

@@ -434,10 +434,14 @@ function buildVideoTextPayload(media, resolvedTags = []) {
     resolvedTags
   });
 }
-function buildVideoFormPayload(media, video, posterUri, cover, resolvedTags = [], scheduleTime) {
+function buildVideoPublishItem(media, video, posterUri, cover, resolvedTags = [], scheduleTime) {
   const textPayload = buildVideoTextPayload(media, resolvedTags);
-  const timing = normalizeDouyinTiming(scheduleTime);
-  const payload = {
+  const timing = normalizeDouyinTiming(scheduleTime) ?? 0;
+  if (!Number.isSafeInteger(timing) || timing < 0) {
+    throw new Error("\u6296\u97F3\u5B9A\u65F6\u53D1\u5E03\u65F6\u95F4\u65E0\u6548");
+  }
+  if (!video.vid || !posterUri) throw new Error("\u6296\u97F3\u89C6\u9891\u6216\u5C01\u9762\u53C2\u6570\u65E0\u6548");
+  const common = {
     video_id: video.vid,
     text: textPayload.text,
     caption: textPayload.bodyText,
@@ -447,25 +451,36 @@ function buildVideoFormPayload(media, video, posterUri, cover, resolvedTags = []
     challenges: JSON.stringify(textPayload.challenges || []),
     mentions: JSON.stringify(textPayload.mentions || []),
     hashtag_source: textPayload.hashtagSource || "",
-    visibility_type: "0",
-    upload_source: "1",
-    is_preview: "0",
-    is_post_assistant: "0",
-    title_permission: "1",
+    visibility_type: 0,
     creation_id: createCreationId(),
-    sync_to_toutiao: "0",
-    ugc_activity: "{}",
-    download: "1",
-    timing: String(timing ?? 0),
-    poster: posterUri,
-    poster_delay: "0"
-  };
-  if (cover) {
-    payload.upload_poster = cover.uri;
-    if (cover.width) payload.custom_cover_image_width = String(cover.width);
-    if (cover.height) payload.custom_cover_image_height = String(cover.height);
+    download: 1,
+    timing,
+    media_type: 4,
+    music_source: 0,
+    music_id: null,
+    hot_sentence: "",
+    interaction_stickers: "[]"
+  };
+  const videoCover = { poster: posterUri, poster_delay: 0 };
+  for (const [source, target] of [["width", "custom_cover_image_width"], ["height", "custom_cover_image_height"]]) {
+    if (cover?.[source] !== void 0) {
+      if (!Number.isSafeInteger(cover[source]) || cover[source] <= 0) {
+        throw new Error("\u6296\u97F3\u89C6\u9891\u5C01\u9762\u5C3A\u5BF8\u65E0\u6548");
+      }
+      videoCover[target] = cover[source];
+    }
   }
-  return payload;
+  return {
+    common,
+    cover: videoCover,
+    mix: {},
+    selected_member: { is_selected_member_video: false },
+    chapter: {},
+    anchor: {},
+    sync: { should_sync: false, sync_to_toutiao: 0 },
+    open_platform: {},
+    assistant: { is_preview: 0, is_post_assistant: 1 }
+  };
 }
 function buildTextPayloadResult({ title, text, textExtra, bodyText, resolvedTags }) {
   const challenges = resolvedTags.map((tag) => tag.id).filter((id) => id !== void 0 && id !== null && id !== "");
@@ -522,6 +537,9 @@ async function getCreatorJson(ctx, url, headers = {}, options = {}) {
   }, options);
 }
 async function postCreatorJson(ctx, url, body, options = {}) {
+  if (options.pageContextOnly) {
+    return postJsonFromPage(ctx, url, body, options);
+  }
   if (options.preferPageContext) {
     const result = await postJsonFromPage(ctx, url, body, options).catch((error) => {
       if (isSecurityCheckError(error)) throw error;
@@ -540,25 +558,6 @@ async function postCreatorJson(ctx, url, body, options = {}) {
     body: JSON.stringify(body)
   }, options);
 }
-async function postCreatorForm(ctx, url, body, options = {}) {
-  if (options.preferPageContext) {
-    const result = await postFormFromPage(ctx, url, body, options).catch((error) => {
-      if (isSecurityCheckError(error)) throw error;
-      ctx.Logger?.warn?.("\u6296\u97F3\u9875\u9762\u4E0A\u4E0B\u6587 FORM POST \u5931\u8D25\uFF0C\u56DE\u9000\u6269\u5C55\u4E0A\u4E0B\u6587", error);
-      return null;
-    });
-    if (result) return result;
-  }
-  return requestJson(ctx, url, {
-    method: "POST",
-    credentials: "include",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      ...options.headers
-    },
-    body: new URLSearchParams(body)
-  }, options);
-}
 async function getCreatorJsonWithPageFallback(ctx, url, options = {}) {
   try {
     return await getJsonFromPage(ctx, url, options);
@@ -587,6 +586,7 @@ async function getJsonFromPage(ctx, url, options = {}) {
           ok: response.ok,
           status: response.status,
           statusText: response.statusText,
+          passportDecision: response.headers.get("x-tt-verify-passport-decision"),
           text: await response.text()
         };
       } finally {
@@ -598,66 +598,42 @@ async function getJsonFromPage(ctx, url, options = {}) {
   ).then((result) => parsePageResponse(result, url)), options);
 }
 async function postJsonFromPage(ctx, url, body, options = {}) {
-  return withCreatorTab(ctx, async (tab) => ctx.Runtime.scripting.execute(
-    tab.id,
-    async (requestUrl, requestBody, timeoutMs) => {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-      try {
-        const response = await fetch(requestUrl, {
-          method: "POST",
-          credentials: "include",
-          headers: {
-            "Content-Type": "application/json",
-            Accept: "application/json, text/plain, */*"
-          },
-          body: JSON.stringify(requestBody),
-          signal: controller.signal
-        });
-        return {
-          ok: response.ok,
-          status: response.status,
-          statusText: response.statusText,
-          text: await response.text()
-        };
-      } finally {
-        clearTimeout(timeoutId);
-      }
-    },
-    [url, body, options.timeoutMs || PAGE_CONTEXT_FETCH_TIMEOUT_MS],
-    { timeoutMs: options.timeoutMs, world: "MAIN" }
-  ).then((result) => parsePageResponse(result, url)), options);
-}
-async function postFormFromPage(ctx, url, body, options = {}) {
-  return withCreatorTab(ctx, async (tab) => ctx.Runtime.scripting.execute(
-    tab.id,
-    async (requestUrl, requestBody, timeoutMs) => {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-      try {
-        const response = await fetch(requestUrl, {
-          method: "POST",
-          credentials: "include",
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded",
-            Accept: "application/json, text/plain, */*"
-          },
-          body: new URLSearchParams(requestBody),
-          signal: controller.signal
-        });
-        return {
-          ok: response.ok,
-          status: response.status,
-          statusText: response.statusText,
-          text: await response.text()
-        };
-      } finally {
-        clearTimeout(timeoutId);
-      }
-    },
-    [url, body, options.timeoutMs || PAGE_CONTEXT_FETCH_TIMEOUT_MS],
-    { timeoutMs: options.timeoutMs, world: "MAIN" }
-  ).then((result) => parsePageResponse(result, url)), options);
+  return withCreatorTab(ctx, async (tab) => {
+    options.assertActive?.();
+    if (options.deadline && Date.now() >= options.deadline) throw new Error("\u6296\u97F3\u89C6\u9891\u63D0\u4EA4\u5DF2\u8D85\u65F6\uFF0C\u5DF2\u963B\u6B62\u8FDF\u5230\u6295\u7A3F");
+    return ctx.Runtime.scripting.execute(
+      tab.id,
+      async (requestUrl, requestBody, timeoutMs, deadline) => {
+        if (deadline && Date.now() >= deadline) throw new Error("\u6296\u97F3\u89C6\u9891\u63D0\u4EA4\u5DF2\u8D85\u65F6\uFF0C\u5DF2\u963B\u6B62\u8FDF\u5230\u6295\u7A3F");
+        const controller = new AbortController();
+        const remaining = deadline ? Math.min(timeoutMs, deadline - Date.now()) : timeoutMs;
+        const timeoutId = setTimeout(() => controller.abort(), remaining);
+        try {
+          const response = await fetch(requestUrl, {
+            method: "POST",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json",
+              Accept: "application/json, text/plain, */*"
+            },
+            body: JSON.stringify(requestBody),
+            signal: controller.signal
+          });
+          return {
+            ok: response.ok,
+            status: response.status,
+            statusText: response.statusText,
+            passportDecision: response.headers.get("x-tt-verify-passport-decision"),
+            text: await response.text()
+          };
+        } finally {
+          clearTimeout(timeoutId);
+        }
+      },
+      [url, body, options.timeoutMs || PAGE_CONTEXT_FETCH_TIMEOUT_MS, options.deadline],
+      { timeoutMs: options.timeoutMs, world: "MAIN" }
+    ).then((result) => parsePageResponse(result, url));
+  }, options);
 }
 async function requestJson(ctx, url, init = {}, options = {}) {
   const response = await ctx.Runtime.network.fetch(url, {
@@ -670,6 +646,7 @@ async function requestJson(ctx, url, init = {}, options = {}) {
     body: init.body,
     timeoutMs: options.timeoutMs
   });
+  throwIfPassportVerification(response.headers?.get?.("x-tt-verify-passport-decision"));
   const text = await response.text();
   if (!response.ok) {
     if ([401, 403].includes(response.status) || looksLikeSecurityResponse(text)) {
@@ -684,6 +661,7 @@ async function requestJson(ctx, url, init = {}, options = {}) {
   return parseJsonText(text);
 }
 function parsePageResponse(result, url) {
+  throwIfPassportVerification(result?.passportDecision);
   if (!result?.ok) {
     if ([401, 403].includes(result?.status) || looksLikeSecurityResponse(result?.text)) {
       throw createSecurityCheckError(`\u6296\u97F3\u9875\u9762\u4E0A\u4E0B\u6587\u8981\u6C42\u5B89\u5168\u6821\u9A8C: HTTP ${result?.status}`);
@@ -696,6 +674,18 @@ function parsePageResponse(result, url) {
   }
   return parseJsonText(result.text);
 }
+function throwIfPassportVerification(value) {
+  if (!value) return;
+  let decision;
+  try {
+    decision = JSON.parse(value);
+  } catch {
+    return;
+  }
+  if (decision?.account_flow === "verify") {
+    throw createSecurityCheckError("\u6296\u97F3\u8981\u6C42\u8D26\u53F7\u8EAB\u4EFD\u9A8C\u8BC1\uFF0C\u8BF7\u5728\u6296\u97F3\u521B\u4F5C\u8005\u4E2D\u5FC3\u5B8C\u6210\u8EAB\u4EFD\u9A8C\u8BC1\u540E\u91CD\u8BD5");
+  }
+}
 function looksLikeSecurityResponse(text) {
   try {
     throwIfSecurityCheck(text);
@@ -1514,11 +1504,31 @@ async function withDouyinHeaderRules(ctx, input = {}, callback) {
     return callback();
   }
   const ruleIds = [];
+  let cleaningUp = false;
+  const removeRule = async (ruleId) => {
+    try {
+      await (ctx.cleanupKit || ctx.Kit).runStep(
+        "\u6296\u97F3\u6E05\u7406\u8BF7\u6C42\u5934\u89C4\u5219",
+        () => headerRules.remove(ruleId, { timeoutMs: input.timeoutMs }),
+        {
+          timeoutMs: input.timeoutMs,
+          data: { platform: DOUYIN_PLATFORM, ruleId }
+        }
+      );
+    } catch (error) {
+      ctx.Logger?.warn?.("\u6296\u97F3\u6E05\u7406\u8BF7\u6C42\u5934\u89C4\u5219\u5931\u8D25", error);
+    }
+  };
   try {
     for (const rule of DOUYIN_HEADER_RULES) {
-      const ruleId = await ctx.Kit.runStep(
+      await ctx.Kit.runStep(
         "\u6296\u97F3\u6DFB\u52A0\u8BF7\u6C42\u5934\u89C4\u5219",
-        () => headerRules.add(rule, { timeoutMs: input.timeoutMs }),
+        async () => {
+          const ruleId = await headerRules.add(rule, { timeoutMs: 0 });
+          if (cleaningUp) await removeRule(ruleId);
+          else ruleIds.push(ruleId);
+          return ruleId;
+        },
         {
           timeoutMs: input.timeoutMs,
           data: {
@@ -1527,26 +1537,12 @@ async function withDouyinHeaderRules(ctx, input = {}, callback) {
           }
         }
       );
-      ruleIds.push(ruleId);
     }
     return await callback();
   } finally {
+    cleaningUp = true;
     for (const ruleId of ruleIds.reverse()) {
-      try {
-        await ctx.Kit.runStep(
-          "\u6296\u97F3\u6E05\u7406\u8BF7\u6C42\u5934\u89C4\u5219",
-          () => headerRules.remove(ruleId, { timeoutMs: input.timeoutMs }),
-          {
-            timeoutMs: input.timeoutMs,
-            data: {
-              platform: DOUYIN_PLATFORM,
-              ruleId
-            }
-          }
-        );
-      } catch (error) {
-        ctx.Logger?.warn?.("\u6296\u97F3\u6E05\u7406\u8BF7\u6C42\u5934\u89C4\u5219\u5931\u8D25", error);
-      }
+      await removeRule(ruleId);
     }
   }
 }
@@ -1807,7 +1803,7 @@ async function publishDouyinVideo(ctx, media, input = {}, dependencies = createV
   );
   const payload = await ctx.Kit.runStep(
     "\u6296\u97F3\u6784\u9020\u89C6\u9891\u53D1\u5E03\u53C2\u6570",
-    () => buildVideoFormPayload(media, video, posterUri, cover, resolvedTags, input.scheduleTime),
+    () => ({ item: buildVideoPublishItem(media, video, posterUri, cover, resolvedTags, input.scheduleTime) }),
     {
       timeoutMs: input.timeoutMs,
       data: {
@@ -1819,22 +1815,34 @@ async function publishDouyinVideo(ctx, media, input = {}, dependencies = createV
       }
     }
   );
+  let submitStarted = false;
   const response = await ctx.Kit.runStep(
     "\u6296\u97F3\u63D0\u4EA4\u89C6\u9891\u53D1\u5E03",
-    () => dependencies.postCreatorForm(
-      `${CREATOR_ORIGIN}/web/api/media/aweme/create/?read_aid=${DOUYIN_READ_AID}`,
-      payload,
-      {
-        preferPageContext: true,
-        timeoutMs: input.timeoutMs
-      }
-    ),
+    () => {
+      ctx.publishLifecycle?.assertActive();
+      if (submitStarted) throw new Error("\u6296\u97F3\u89C6\u9891\u5DF2\u63D0\u4EA4\uFF0C\u5DF2\u963B\u6B62\u91CD\u590D\u6295\u7A3F");
+      submitStarted = true;
+      return dependencies.postCreatorJson(
+        `${CREATOR_ORIGIN}/web/api/media/aweme/create_v2/?read_aid=${DOUYIN_READ_AID}`,
+        payload,
+        {
+          preferPageContext: true,
+          pageContextOnly: true,
+          assertActive: ctx.publishLifecycle?.assertActive,
+          deadline: ctx.publishLifecycle?.getDeadline(),
+          timeoutMs: input.timeoutMs
+        }
+      );
+    },
     {
       timeoutMs: input.timeoutMs,
+      retry: { times: 0 },
       data: {
         platform: DOUYIN_PLATFORM,
+        requestPath: "/web/api/media/aweme/create_v2/",
+        contentType: "application/json",
         videoId: video.vid,
-        textLength: payload.text?.length ?? 0
+        textLength: payload.item.common.text.length
       }
     }
   );
@@ -1854,7 +1862,7 @@ async function publishDouyinVideo(ctx, media, input = {}, dependencies = createV
       meta: {
         kind: "video",
         videoId: video.vid,
-        ...Number(payload.timing) ? { timing: Number(payload.timing) } : {}
+        ...payload.item.common.timing ? { timing: payload.item.common.timing } : {}
       }
     }
   };
@@ -1874,7 +1882,7 @@ function createVideoDependencies(ctx, input) {
       (url) => getCreatorJson(ctx, url, {}, { timeoutMs: input?.timeoutMs }),
       { timeoutMs: input?.timeoutMs }
     ),
-    postCreatorForm: (url, body, options) => postCreatorForm(ctx, url, body, options)
+    postCreatorJson: (url, body, options) => postCreatorJson(ctx, url, body, options)
   };
 }
 
@@ -12833,6 +12841,7 @@ async function publishOperation(ctx, adapterLookup, input = {}) {
       platform: platform15
     });
   }
+  let publishContext = ctx;
   try {
     const authInput = withDefaultTimeout(input, OperationTimeoutMs.CheckAuth);
     const publishInput = withDefaultTimeout(input, OperationTimeoutMs.Publish);
@@ -12846,13 +12855,22 @@ async function publishOperation(ctx, adapterLookup, input = {}) {
         platform: platform15
       });
     }
-    const publishResult = await ctx.Kit.runStep(
+    const guardedVideo = platform15 === "douyin" && media.type === "video";
+    if (guardedVideo) publishContext = createDouyinVideoPublishContext(ctx, publishInput.timeoutMs);
+    let publishStarted = false;
+    const publishOptions = createStepOptions(publishInput, {
+      platform: platform15,
+      type: media.type
+    }, OperationTimeoutMs.Publish);
+    if (guardedVideo) publishOptions.retry = { times: 0 };
+    const publishResult = await publishContext.Kit.runStep(
       `${platform15}: \u53D1\u5E03\u5185\u5BB9`,
-      () => adapter.publish(ctx, media, publishInput),
-      createStepOptions(publishInput, {
-        platform: platform15,
-        type: media.type
-      }, OperationTimeoutMs.Publish)
+      () => {
+        if (guardedVideo && publishStarted) throw new Error("\u6296\u97F3\u89C6\u9891\u5DF2\u6267\u884C\uFF0C\u5DF2\u963B\u6B62\u91CD\u590D\u53D1\u5E03");
+        publishStarted = true;
+        return adapter.publish(publishContext, media, publishInput);
+      },
+      publishOptions
     );
     if (publishResult?.securityCheckRequired === true) {
       return createFailure(StatusCode.SecurityCheckRequired, publishResult.reason ?? "\u5E73\u53F0\u8981\u6C42\u5B89\u5168\u6821\u9A8C", {
@@ -12875,7 +12893,57 @@ async function publishOperation(ctx, adapterLookup, input = {}) {
     return mapErrorToResult(error, StatusCode.Unknown, {
       platform: platform15
     });
+  } finally {
+    if (publishContext !== ctx) publishContext.publishLifecycle.close();
+  }
+}
+function createDouyinVideoPublishContext(ctx, timeoutMs) {
+  let active = true;
+  const deadline = Date.now() + timeoutMs;
+  const stepDeadlines = /* @__PURE__ */ new Set();
+  const getDeadline = () => Math.min(deadline, ...Array.from(stepDeadlines, (step) => step.deadline));
+  const assertActive = () => {
+    if (!active || Date.now() >= getDeadline()) {
+      active = false;
+      throw Object.assign(new Error("\u6296\u97F3\u89C6\u9891\u53D1\u5E03\u5DF2\u7ED3\u675F\u6216\u8D85\u65F6\uFF0C\u5DF2\u963B\u6B62\u8FDF\u5230\u6B65\u9AA4"), { code: 30000003 });
+    }
+  };
+  const Kit = { ...ctx.Kit };
+  for (const method of ["runStep", "runStepLoose"]) {
+    if (typeof ctx.Kit[method] !== "function") continue;
+    Kit[method] = async (name, action, options = {}) => {
+      assertActive();
+      const step = { deadline: Date.now() + (options.timeoutMs ?? 6e4) };
+      try {
+        return await ctx.Kit[method](name, async (...args) => {
+          stepDeadlines.add(step);
+          try {
+            assertActive();
+            const result = await action(...args);
+            assertActive();
+            return result;
+          } finally {
+            stepDeadlines.delete(step);
+          }
+        }, options);
+      } catch (error) {
+        const seen = /* @__PURE__ */ new Set();
+        for (let cause = error; cause && !seen.has(cause); cause = cause.cause) {
+          seen.add(cause);
+          if ([30000003, 30000008].includes(cause.code) || cause.name === "TimeoutError") active = false;
+        }
+        throw error;
+      }
+    };
   }
+  return {
+    ...ctx,
+    Kit,
+    cleanupKit: ctx.Kit,
+    publishLifecycle: { assertActive, getDeadline, close: () => {
+      active = false;
+    } }
+  };
 }
 
 // src/operations/get-status.js