feat(#1714): 前端 prepare 短路（后端 skip_transfer 命中时跳过 OSS 直传） (#1729)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>
2026-09-06 11:43:59 +08:00
parent 06b0bacce1
commit ff60fdf956
5 changed files with 170 additions and 0 deletions
@@ -259,6 +259,112 @@ describe("assets API", () => {
    })
  })

+  describe("uploadAssetDirect skip_transfer 短路", () => {
+    it("prepare 返回 skip_transfer=true → 直接返回 duplicated，不调 transfer/complete", async () => {
+      mockPost.mockImplementation((url: string) => {
+        if (url === "/upload/direct/prepare") {
+          return Promise.resolve({
+            data: {
+              upload_url: "https://oss/x",
+              method: "POST",
+              storage_key: "uploads/skip/y.mp4",
+              expires_at: "2099",
+              fields: {},
+              max_size_bytes: 1e9,
+              asset_id: "existing-asset",
+              skip_transfer: true,
+              duplicated: true,
+            },
+          })
+        }
+        if (url === "/upload/direct/complete") {
+          throw new Error("complete 不应被调用")
+        }
+        throw new Error("unexpected url " + url)
+      })
+      const putSpy = vi.spyOn(globalThis, "XMLHttpRequest")
+      const file = new File(["x"], "x.mp4", { type: "video/mp4" })
+      const result = await uploadAssetDirect({ file, library_id: "lib-1" })
+      expect(result.duplicated).toBe(true)
+      expect(result.asset_id).toBe("existing-asset")
+      // complete 未被调用（mockPost 只记录 prepare，complete 若调用会抛 "不应被调用"）
+      const completeCalls = mockPost.mock.calls.filter(
+        ([u]: [string]) => u === "/upload/direct/complete",
+      )
+      expect(completeCalls).toHaveLength(0)
+      putSpy.mockRestore()
+    })
+
+    it("prepare 返回 skip_transfer=false → 走老流程（complete 被调用）", async () => {
+      mockPost.mockImplementation((url: string) => {
+        if (url === "/upload/direct/prepare") {
+          return Promise.resolve({
+            data: {
+              upload_url: "https://oss/x",
+              method: "POST",
+              storage_key: "uploads/normal/y.mp4",
+              expires_at: "2099",
+              fields: {},
+              max_size_bytes: 1e9,
+              asset_id: "new-asset",
+            },
+          })
+        }
+        if (url === "/upload/direct/complete") {
+          return Promise.resolve({
+            data: {
+              storage_key: "uploads/normal/y.mp4",
+              ingest_job_id: "job-1",
+              url: "https://oss/y.mp4",
+              duplicated: false,
+              asset_id: "new-asset",
+            },
+          })
+        }
+        throw new Error("unexpected url " + url)
+      })
+      // mock XMLHttpRequest：send 之后下一 tick 触发 onload 让 transfer 立即成功
+      const origOpen = XMLHttpRequest.prototype.open
+      const origSend = XMLHttpRequest.prototype.send
+      const origSetReadyState = Object.getOwnPropertyDescriptor(
+        XMLHttpRequest.prototype,
+        "readyState",
+      ) as PropertyDescriptor | undefined
+      const origStatus = Object.getOwnPropertyDescriptor(XMLHttpRequest.prototype, "status")
+      Object.defineProperty(XMLHttpRequest.prototype, "readyState", {
+        configurable: true,
+        writable: true,
+        value: 4,
+      })
+      Object.defineProperty(XMLHttpRequest.prototype, "status", {
+        configurable: true,
+        writable: true,
+        value: 200,
+      })
+      XMLHttpRequest.prototype.open = vi.fn() as unknown as typeof origOpen
+      XMLHttpRequest.prototype.send = vi.fn(function (this: XMLHttpRequest) {
+        // 下一 tick 触发 onload（模拟 XHR 异步完成）
+        setTimeout(() => this.onload?.(new ProgressEvent("load")), 0)
+      }) as unknown as typeof origSend
+      const file = new File(["x"], "x.mp4", { type: "video/mp4" })
+      const result = await uploadAssetDirect({ file, library_id: "lib-1" })
+      expect(result.duplicated).toBeFalsy()
+      expect(result.asset_id).toBe("new-asset")
+      const completeCalls = mockPost.mock.calls.filter(
+        ([u]: [string]) => u === "/upload/direct/complete",
+      )
+      expect(completeCalls).toHaveLength(1)
+      XMLHttpRequest.prototype.open = origOpen
+      XMLHttpRequest.prototype.send = origSend
+      if (origSetReadyState) {
+        Object.defineProperty(XMLHttpRequest.prototype, "readyState", origSetReadyState)
+      }
+      if (origStatus) {
+        Object.defineProperty(XMLHttpRequest.prototype, "status", origStatus)
+      }
+    })
+  })
+
  describe("getIngestJob", () => {
    it("should resolve successfully", async () => {
      await expect(getIngestJob("test-jobId")).resolves.not.toThrow()