@kevisual/cnb 0.0.74 → 0.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/cnb",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "description": "",
   "main": "index.js",
   "basename": "/root/cnb",

package/src/repo/download.ts

@@ -8,22 +8,27 @@ type DownloadFn = (url: string, opts?: { headers?: any, hash?: string, token?: s
  */
 export const downloadByCNBApi: DownloadFn = async (url, opts) => {
   const hash = opts?.hash;
-  const headers = opts?.token ? { Authorization: `${opts.token}` } : {};
+  const headers = {
+    Accept: "application/vnd.cnb.api+json",
+    // Authorization: `${CNB_API_KEY}`
+    ...(opts?.token ? { Authorization: `${opts.token}` } : {}),
+    ...opts?.headers
+  }
   const res = await fetch(url, {
-    headers: {
-      Accept: "application/vnd.cnb.api+json",
-      ...headers,
-      ...opts?.headers
-    }
+    headers: headers
   });
   type CNBResponse = {
-    type?: 'blob' | 'file' | 'dir';
+    type?: 'blob' | 'file' | 'dir' | 'lfs';
     size?: number;
     path: string;
     name: string;
     sha?: string;
     encoding?: string;
     content?: string;
+
+    lfs_oid?: string;
+    lfs_size?: number;
+    lfs_download_url?: string;
   }
   let resJson: CNBResponse;
   try {
@@ -32,13 +37,40 @@ export const downloadByCNBApi: DownloadFn = async (url, opts) => {
     console.error(`下载失败 ${url}: ${res.statusText}`, e);
     return { code: res.status, buffer: null };
   }
-  if (res.ok && resJson.type === 'blob' && resJson.encoding === 'base64' && resJson.content) {
-    if (hash && resJson.sha === hash) {
-      // 文件未修改，跳过下载
-      return { code: 304, buffer: null };
+  if (res.ok) {
+    if (resJson.size === 0) {
+      return { code: 200, buffer: Buffer.from('') };
     }
-    const buffer = Buffer.from(resJson.content, 'base64');
-    return { code: 200, buffer };
+    if (resJson.type === 'blob' && resJson.encoding === 'base64') {
+      if (resJson.content) {
+        if (hash && resJson.sha === hash) {
+          // 文件未修改，跳过下载
+          return { code: 304, buffer: null };
+        }
+        const buffer = Buffer.from(resJson.content, 'base64');
+        return { code: 200, buffer };
+      }
+    }
+    if (resJson.type === 'lfs') {
+      const lfs_download_url = resJson.lfs_download_url;
+      if (lfs_download_url) {
+        const lfsRes = await fetch(lfs_download_url, {
+          headers: headers
+        });
+        if (lfsRes.ok) {
+          const etag = lfsRes.headers.get('ETag');
+          if (hash && etag === hash) {
+            // 文件未修改，跳过下载
+            return { code: 304, buffer: null };
+          }
+          const arrayBuffer = await lfsRes.arrayBuffer();
+          return { code: 200, buffer: Buffer.from(arrayBuffer) };
+        }
+      }
+    }
+
+    console.error(`下载失败 ${url}: 内容为空`, resJson);
+    return { code: 200, buffer: null };
   } else {
     console.error(`下载失败 ${url}: ${res.statusText}`, resJson);
     return { code: res.status, buffer: null };