Replace Blob with File for file uploads

This commit is contained in:
CPTProgrammer 2026-07-11 06:06:34 +08:00
parent 24637d3db3
commit cbce560805
No known key found for this signature in database
5 changed files with 21 additions and 25 deletions

View File

@ -39,20 +39,18 @@ export async function getFiles(
* @param client CurseForge
* @param projectId ID
* @param metadata Zod
* @param file Blob
* @param file
*/
export async function uploadFile(
client: CurseForgeClient,
projectId: number,
metadata: UploadMetadata,
file: Blob,
file: File,
): Promise<UploadResponse> {
const form = new FormData();
form.append("metadata", JSON.stringify(metadata));
const filename =
file instanceof File ? file.name : "upload.jar";
form.append("file", file, filename);
form.append("file", file, file.name);
const result = await client.uploadPost<unknown>(
`/api/projects/${encodeURIComponent(projectId)}/upload-file`,

View File

@ -90,12 +90,12 @@ export async function getVersions(
*
* @param client Modrinth
* @param data Zod CreatableVersion
* @param files key multipart data.file_parts value Blob
* @param files key multipart data.file_parts value
*/
export async function createVersion(
client: ModrinthClient,
data: CreatableVersion,
files: Record<string, Blob>,
files: Record<string, File>,
): Promise<Version> {
const form = new FormData();
@ -104,16 +104,13 @@ export async function createVersion(
// 逐一添加文件
for (const fieldName of data.file_parts) {
const blob = files[fieldName];
if (!blob) {
const file = files[fieldName];
if (!file) {
throw new Error(
`createVersion: file field "${fieldName}" declared in file_parts but not provided in files`,
);
}
// 从 Blob 推断文件名;若无则使用字段名作为回退
const filename =
blob instanceof File ? blob.name : `${fieldName}.jar`;
form.append(fieldName, blob, filename);
form.append(fieldName, file, file.name);
}
const result = await client.post<unknown>("/version", form);

View File

@ -1,9 +1,10 @@
import { readFileSync } from "node:fs";
import { readFile } from "node:fs/promises";
import { basename } from "node:path";
export function readJarBlob(filePath: string): Blob {
export async function readAsFile(filePath: string): Promise<File> {
try {
const buffer = readFileSync(filePath);
return new Blob([buffer]);
const buffer = await readFile(filePath);
return new File([buffer], basename(filePath));
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
throw new Error(`Failed to read file "${filePath}": ${msg}`);

View File

@ -1,7 +1,7 @@
import { curseforgeClient } from "@/services/clients";
import { uploadFile, getGameVersions } from "@/lib/curseforge";
import { resolveVersionName, buildJarPath } from "@/lib/utils/format";
import { readJarBlob } from "@/lib/utils/file";
import { readAsFile } from "@/lib/utils/file";
import type { UploadMetadata } from "@/types";
import type { PlatformContext } from "./types";
@ -24,7 +24,7 @@ export async function publishCurseForgeVersion(
mcVersion,
);
const primaryBlob = readJarBlob(primaryPath);
const primaryFile = await readAsFile(primaryPath);
const gameVersions = await getGameVersions(curseforgeClient);
@ -51,6 +51,6 @@ export async function publishCurseForgeVersion(
curseforgeClient,
config.curseforge.project_id,
metadata,
primaryBlob,
primaryFile,
);
}

View File

@ -1,7 +1,7 @@
import { modrinthClient } from "@/services/clients";
import { createVersion } from "@/lib/modrinth";
import { resolveVersionName, buildJarPath } from "@/lib/utils/format";
import { readJarBlob } from "@/lib/utils/file";
import { readAsFile } from "@/lib/utils/file";
import type { CreatableVersion } from "@/types";
import type { PlatformContext } from "./types";
@ -40,8 +40,8 @@ export async function publishModrinthVersion(
mcVersion,
);
const primaryBlob = readJarBlob(primaryPath);
const sourceBlob = readJarBlob(sourcePath);
const primaryFile = await readAsFile(primaryPath);
const sourceFile = await readAsFile(sourcePath);
const data: CreatableVersion = {
project_id: config.modrinth.project_id,
@ -65,7 +65,7 @@ export async function publishModrinthVersion(
};
await createVersion(modrinthClient, data, {
primary: primaryBlob,
sources: sourceBlob,
primary: primaryFile,
sources: sourceFile,
});
}