refactor:

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on:
   push:
     tags:
-      - "v*"
+      - v*
 
 permissions:
   packages: write

main.ts

@@ -1,6 +1,16 @@
 import { basename, join } from "jsr:@std/path";
 import { Mutex } from "npm:async-mutex";
-import { downloadChunk } from "./workerpool.ts";
+import { downloadChunk, type Chunk } from "./workerpool.ts";
+
+export interface DownloadOptions {
+  url: string;
+  dirpath: string;
+  threads: number;
+  chunkSize?: number;
+  headers?: HeadersInit;
+  startChunk?: number;
+  endChunk?: number;
+}
 
 export async function download({
   url,
@@ -10,15 +20,7 @@ export async function download({
   headers = {},
   startChunk = 0,
   endChunk = Infinity,
-}: {
-  url: string;
-  dirpath: string;
-  threads: number;
-  chunkSize?: number;
-  headers?: HeadersInit;
-  startChunk?: number;
-  endChunk?: number;
-}) {
+}: DownloadOptions) {
   async function getURLInfo() {
     while (true) {
       const r = await fetch(url, {
@@ -59,17 +61,17 @@ export async function download({
       start: startChunk + i * chunkSize,
       end: startChunk + Math.min((i + 1) * chunkSize, contentLength) - 1,
     }));
-    await downloadChunk<Chunk, ArrayBuffer>(
-      threads,
+    await downloadChunk({
+      threadCount: threads,
       url,
       headers,
-      chunks,
-      async (i) => {
+      data: chunks,
+      onProgress: async (i) => {
         const release = await mutex.acquire();
         while (true) {
           try {
             await file.seek(i.origin.start, Deno.SeekMode.Start);
-            await file.write(new Uint8Array(i.data));
+            await file.write(i.data);
             break;
           } catch (e) {
             console.error("%c" + e, "color: red");
@@ -78,8 +80,8 @@ export async function download({
         release();
         console.log(`chunk ${i.origin.start} - ${i.origin.end} done`);
       },
-      Infinity
-    );
+      maxRetries: Infinity,
+    });
     await mutex.waitForUnlock();
   } finally {
     file.close();
@@ -88,11 +90,6 @@ export async function download({
   return filePath;
 }
 
-export interface Chunk {
-  start: number;
-  end: number;
-}
-
 if (import.meta.main) {
   const url = Deno.args[0];
   const threads = +Deno.args[1] || 32;

worker.ts

@@ -1,6 +1,6 @@
-import type { Chunk } from "./main.ts";
+import type { Chunk } from "./workerpool.ts";
 
-interface EventData {
+export interface EventData {
   url: string;
   headers: HeadersInit;
   chunks: Chunk[];
@@ -15,7 +15,7 @@ addEventListener("message", async ({ data }: MessageEvent<EventData>) => {
       },
     });
     if (r.status !== 206) throw new Error(`Invalid status code ${r.status}"}`);
-    const buf = await r.arrayBuffer();
+    const buf = new Uint8Array(await r.arrayBuffer());
     self.postMessage(buf, [buf]);
   }
 });

workerpool.ts

@@ -1,12 +1,25 @@
 // deno-lint-ignore-file ban-ts-comment
-export function downloadChunk<T, R>(
-  threadCount: number,
-  url: string,
-  headers: HeadersInit,
-  data: T[],
-  onProgress: (data: { origin: T; data: R; index: number }) => void,
-  maxRetries: number = 3
-) {
+export interface DownloadChunkOptions {
+  threadCount: number;
+  url: string;
+  headers: HeadersInit;
+  data: Chunk[];
+  onProgress: (data: {
+    origin: Chunk;
+    data: Uint8Array;
+    index: number;
+  }) => void;
+  maxRetries: number;
+}
+
+export function downloadChunk({
+  threadCount,
+  url,
+  headers,
+  data,
+  onProgress,
+  maxRetries = 3,
+}: DownloadChunkOptions) {
   if (data.length < 1) return Promise.resolve([]);
   if (threadCount < 1) throw new Error("threadCount must be greater than 0");
   const workerFactory = () =>
@@ -30,20 +43,20 @@ export function downloadChunk<T, R>(
         stolen: false,
       } as WorkerData);
       printWorkerData(workerData, i);
-      const messageHandle = (e: MessageEvent<R>) => {
+      const messageHandle = (e: MessageEvent<Uint8Array>) => {
         // Deno 不能在主线程中捕获错误，所以这是折中的办法 start
         // @ts-ignore
         if (e.data?.type === "error" || e.data?.type === "unhandledrejection") {
           // @ts-ignore
           return errorHandel(e.data);
         }
         // Deno 不能在主线程中捕获错误，所以这是折中的办法 end
-        workerData.retryCount = 0;
         onProgress({
           index: workerData.currentChunk,
           origin: data[workerData.currentChunk],
           data: e.data,
         });
+        workerData.retryCount = 0;
         workerData.currentChunk++;
         if (workerData.currentChunk < workerData.endChunk) return;
         if (workerData.stolen) {
@@ -119,6 +132,11 @@ export function downloadChunk<T, R>(
   });
 }
 
+export interface Chunk {
+  start: number;
+  end: number;
+}
+
 interface WorkerData {
   worker: Worker;
   startChunk: number;