0.3.0 - usar fetch y coso

This commit is contained in:
Cat /dev/Nulo 2023-05-16 19:46:18 -03:00
parent d44e35d40e
commit b22f2b5741
3 changed files with 17 additions and 35 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "@nulo/isogit-lfs", "name": "@nulo/isogit-lfs",
"version": "0.2.9", "version": "0.3.0",
"description": "LFS helpers for Isomorphic Git", "description": "LFS helpers for Isomorphic Git",
"main": "dist/index.js", "main": "dist/index.js",
"repository": "git@github.com:riboseinc/isogit-lfs.git", "repository": "git@github.com:riboseinc/isogit-lfs.git",

View file

@ -3,7 +3,7 @@ import { Buffer } from "buffer";
import { bodyToBuffer, getAuthHeader, isWriteable } from "./util"; import { bodyToBuffer, getAuthHeader, isWriteable } from "./util";
import { Pointer } from "./pointers"; import { Pointer } from "./pointers";
import { HTTPRequest } from "./types"; import { HTTPRequest, BasicAuth } from "./types";
import { PromiseFsClient } from "isomorphic-git"; import { PromiseFsClient } from "isomorphic-git";
interface LFSInfoResponse { interface LFSInfoResponse {
@ -29,9 +29,10 @@ function isValidLFSInfoResponseData(
*/ */
export default async function downloadBlobFromPointer( export default async function downloadBlobFromPointer(
fs: PromiseFsClient | null, fs: PromiseFsClient | null,
{ http: { request }, headers = {}, url, auth }: HTTPRequest, url: string,
auth: BasicAuth | {},
{ info, objectPath }: Pointer { info, objectPath }: Pointer
): Promise<Buffer> { ): Promise<Blob> {
if (fs) { if (fs) {
try { try {
const cached = await fs?.promises.readFile(objectPath); const cached = await fs?.promises.readFile(objectPath);
@ -46,7 +47,8 @@ export default async function downloadBlobFromPointer(
} }
} }
const authHeaders: Record<string, string> = auth ? getAuthHeader(auth) : {}; const authHeaders: Record<string, string> =
"username" in auth ? getAuthHeader(auth) : {};
// Request LFS transfer // Request LFS transfer
@ -56,29 +58,18 @@ export default async function downloadBlobFromPointer(
objects: [info], objects: [info],
}; };
const { body: lfsInfoBody } = await request({ const lfsInfoRes = await fetch(`${url}/info/lfs/objects/batch`, {
url: `${url}/info/lfs/objects/batch`,
method: "POST", method: "POST",
headers: { headers: {
// Github LFS doesnt seem to accept this UA, but works fine without any // Github LFS doesnt seem to accept this UA, but works fine without any
// 'User-Agent': `git/isomorphic-git@${git.version()}`, // 'User-Agent': `git/isomorphic-git@${git.version()}`,
...headers,
...authHeaders, ...authHeaders,
Accept: "application/vnd.git-lfs+json", Accept: "application/vnd.git-lfs+json",
"Content-Type": "application/vnd.git-lfs+json", "Content-Type": "application/vnd.git-lfs+json",
}, },
body: [Buffer.from(JSON.stringify(lfsInfoRequestData))], body: JSON.stringify(lfsInfoRequestData),
}); });
const lfsInfoResponseData = await lfsInfoRes.json();
const lfsInfoResponseRaw = (await bodyToBuffer(lfsInfoBody)).toString();
let lfsInfoResponseData: any;
try {
lfsInfoResponseData = JSON.parse(lfsInfoResponseRaw);
} catch (e) {
throw new Error(
`Unexpected structure received from LFS server: unable to parse JSON ${lfsInfoResponseRaw}`
);
}
if (isValidLFSInfoResponseData(lfsInfoResponseData)) { if (isValidLFSInfoResponseData(lfsInfoResponseData)) {
// Request the actual blob // Request the actual blob
@ -87,19 +78,14 @@ export default async function downloadBlobFromPointer(
const lfsObjectDownloadURL = downloadAction.href; const lfsObjectDownloadURL = downloadAction.href;
const lfsObjectDownloadHeaders = downloadAction.header ?? {}; const lfsObjectDownloadHeaders = downloadAction.header ?? {};
const dlHeaders = { const lfsObjectRes = await fetch(lfsObjectDownloadURL, {
...headers, method: "GET",
headers: {
...authHeaders, ...authHeaders,
...lfsObjectDownloadHeaders, ...lfsObjectDownloadHeaders,
}; },
const { body: lfsObjectBody } = await request({
url: lfsObjectDownloadURL,
method: "GET",
headers: dlHeaders,
}); });
const blob = await lfsObjectRes.blob();
const blob = await bodyToBuffer(lfsObjectBody);
if (fs) { if (fs) {
// Write LFS cache for this object, if cache path is accessible. // Write LFS cache for this object, if cache path is accessible.

View file

@ -75,11 +75,7 @@ export default async function populateCache(
total: 10, total: 10,
}); });
await downloadBlobFromPointer( await downloadBlobFromPointer(fs, remoteURL, {}, pointer);
fs,
{ http, url: remoteURL },
pointer
);
} }
} }
} }