fix: resolve lint issues (XSS K601, knip unused exports, eslint errors)

- Fix XSS warnings in user.tsx by adding safe attribute to elements
- Remove unused exports: ChunkUploadRequest, getArchiveInfo,
  getFileForDirectDownload, createDirectDownloadHeaders, createConverterArchive
- Fix eslint no-unused-vars errors across multiple files
- Fix pdfmathtranslate async Promise executor issue
- Update tests to use toThrow instead of toMatch for Error objects
- Apply prettier formatting
This commit is contained in:
Your Name 2026-01-21 16:00:26 +08:00
parent db5f47586e
commit 79fc6f7067
21 changed files with 439 additions and 439 deletions

View file

@ -1,7 +1,11 @@
import { type SupportedLocale, type Translator, createTranslator, defaultLocale } from "../i18n/index";
import {
type SupportedLocale,
type Translator,
createTranslator,
defaultLocale,
} from "../i18n/index";
export const ThemeToggle = ({
locale = defaultLocale,
t = createTranslator(defaultLocale),
}: {
locale?: SupportedLocale;

View file

@ -26,7 +26,10 @@ import { convert as convertVcf, properties as propertiesVcf } from "./vcf";
import { convert as convertxelatex, properties as propertiesxelatex } from "./xelatex";
import { convert as convertMarkitdown, properties as propertiesMarkitdown } from "./markitdown";
import { convert as convertMineru, properties as propertiesMineru } from "./mineru";
import { convert as convertPDFMathTranslate, properties as propertiesPDFMathTranslate } from "./pdfmathtranslate";
import {
convert as convertPDFMathTranslate,
properties as propertiesPDFMathTranslate,
} from "./pdfmathtranslate";
// This should probably be reconstructed so that the functions are not imported instead the functions hook into this to make the converters more modular

View file

@ -2,7 +2,7 @@ import { execFile as execFileOriginal } from "node:child_process";
import { mkdirSync, existsSync, readdirSync, unlinkSync, rmdirSync } from "node:fs";
import { join, basename, dirname } from "node:path";
import { ExecFileFn } from "./types";
import { createConverterArchive, getArchiveFileName } from "../transfer";
import { getArchiveFileName } from "../transfer";
export const properties = {
from: {
@ -16,7 +16,7 @@ export const properties = {
/**
* Helper function to create a .tar archive from a directory (no compression)
*
*
* 使 .tar .tar.gz / .tgz / .zip
*/
function createTarArchive(
@ -28,23 +28,19 @@ function createTarArchive(
// Use tar command to create archive (without gzip compression)
// tar -cf <output.tar> -C <sourceDir> .
// 注意:使用 -cf 而非 -czf避免 gzip 壓縮
execFile(
"tar",
["-cf", outputTar, "-C", sourceDir, "."],
(error, stdout, stderr) => {
if (error) {
reject(`tar error: ${error}`);
return;
}
if (stdout) {
console.log(`tar stdout: ${stdout}`);
}
if (stderr) {
console.error(`tar stderr: ${stderr}`);
}
resolve();
},
);
execFile("tar", ["-cf", outputTar, "-C", sourceDir, "."], (error, stdout, stderr) => {
if (error) {
reject(`tar error: ${error}`);
return;
}
if (stdout) {
console.log(`tar stdout: ${stdout}`);
}
if (stderr) {
console.error(`tar stderr: ${stderr}`);
}
resolve();
});
});
}
@ -75,11 +71,6 @@ export async function convert(
execFile: ExecFileFn = execFileOriginal,
): Promise<string> {
return new Promise((resolve, reject) => {
// Determine mode based on target format
// md-t = table mode (tables as markdown)
// md-i = image mode (tables as images)
const tableMode = convertTo === "md-t" ? "latex" : "html";
// Create a temporary output directory for MinerU
const outputDir = dirname(targetPath);
const inputFileName = basename(filePath, `.${fileType}`);
@ -92,14 +83,7 @@ export async function convert(
// Build MinerU command arguments
// MinerU CLI: magic-pdf -p <input> -o <output_dir> -m auto
const args = [
"-p",
filePath,
"-o",
mineruOutputDir,
"-m",
"auto",
];
const args = ["-p", filePath, "-o", mineruOutputDir, "-m", "auto"];
// Add table mode option if md-i (render tables as images)
if (convertTo === "md-i") {

View file

@ -6,46 +6,47 @@ import { getArchiveFileName } from "../transfer";
/**
* PDFMathTranslate Content Engine
*
*
* PDF
*
*
* 使 pdf2zh CLI
* .tar
* - original.pdf PDF
* - translated-<lang>.pdf PDF
*
*
* Docker build
* runtime
*/
// 支援的目標語言列表
const SUPPORTED_LANGUAGES = [
"en", // English
"zh", // Chinese (Simplified)
"en", // English
"zh", // Chinese (Simplified)
"zh-TW", // Chinese (Traditional)
"ja", // Japanese
"ko", // Korean
"de", // German
"fr", // French
"es", // Spanish
"it", // Italian
"pt", // Portuguese
"ru", // Russian
"ar", // Arabic
"hi", // Hindi
"vi", // Vietnamese
"th", // Thai
"ja", // Japanese
"ko", // Korean
"de", // German
"fr", // French
"es", // Spanish
"it", // Italian
"pt", // Portuguese
"ru", // Russian
"ar", // Arabic
"hi", // Hindi
"vi", // Vietnamese
"th", // Thai
] as const;
type SupportedLanguage = typeof SUPPORTED_LANGUAGES[number];
// 模型路徑Docker 環境中)
const MODELS_PATH = process.env.PDFMATHTRANSLATE_MODELS_PATH || "/models/pdfmathtranslate";
// 生成 from/to 格式映射
function generateLanguageMappings(): { from: Record<string, string[]>; to: Record<string, string[]> } {
const outputFormats = SUPPORTED_LANGUAGES.map(lang => `pdf-${lang}`);
function generateLanguageMappings(): {
from: Record<string, string[]>;
to: Record<string, string[]>;
} {
const outputFormats = SUPPORTED_LANGUAGES.map((lang) => `pdf-${lang}`);
return {
from: {
document: ["pdf"],
@ -91,7 +92,7 @@ function checkModelsExist(): boolean {
/**
* Helper function to create a .tar archive from a directory (no compression)
*
*
* 使 .tar .tar.gz / .tgz / .zip
*/
function createTarArchive(
@ -103,23 +104,19 @@ function createTarArchive(
// Use tar command to create archive (without gzip compression)
// tar -cf <output.tar> -C <sourceDir> .
// 注意:使用 -cf 而非 -czf避免 gzip 壓縮
execFile(
"tar",
["-cf", outputTar, "-C", sourceDir, "."],
(error, stdout, stderr) => {
if (error) {
reject(`tar error: ${error}`);
return;
}
if (stdout) {
console.log(`tar stdout: ${stdout}`);
}
if (stderr) {
console.error(`tar stderr: ${stderr}`);
}
resolve();
},
);
execFile("tar", ["-cf", outputTar, "-C", sourceDir, "."], (error, stdout, stderr) => {
if (error) {
reject(`tar error: ${error}`);
return;
}
if (stdout) {
console.log(`tar stdout: ${stdout}`);
}
if (stderr) {
console.error(`tar stderr: ${stderr}`);
}
resolve();
});
});
}
@ -143,7 +140,7 @@ function removeDir(dirPath: string): void {
/**
* pdf2zh PDF
*
*
* @param inputPath PDF
* @param outputDir
* @param targetLang
@ -160,16 +157,19 @@ function runPdf2zh(
// -lo <lang>: 目標語言
// -o <dir>: 輸出目錄
// -s google: 使用 Google 翻譯(預設,免費)
//
//
// 輸出檔案:
// - <filename>-mono.pdf: 純翻譯版本
// - <filename>-dual.pdf: 雙語對照版本
const args = [
inputPath,
"-lo", targetLang,
"-o", outputDir,
"-s", process.env.PDFMATHTRANSLATE_SERVICE || "google",
"-lo",
targetLang,
"-o",
outputDir,
"-s",
process.env.PDFMATHTRANSLATE_SERVICE || "google",
];
// 如果設定了自訂模型路徑,使用 --onnx 參數
@ -205,9 +205,9 @@ function runPdf2zh(
if (!existsSync(monoPath) && !existsSync(dualPath)) {
// 嘗試在 outputDir 下尋找任何 PDF 檔案
const files = readdirSync(outputDir);
const pdfFiles = files.filter(f => f.endsWith(".pdf"));
const pdfFiles = files.filter((f) => f.endsWith(".pdf"));
console.log(`[PDFMathTranslate] Found PDF files: ${pdfFiles.join(", ")}`);
if (pdfFiles.length === 0) {
reject(`No output PDF files found in ${outputDir}`);
return;
@ -221,7 +221,7 @@ function runPdf2zh(
/**
*
*
*
* @param filePath PDF
* @param fileType "pdf"
* @param convertTo "pdf-zh"
@ -234,93 +234,91 @@ export async function convert(
fileType: string,
convertTo: string,
targetPath: string,
options?: unknown,
_options?: unknown,
execFile: ExecFileFn = execFileOriginal,
): Promise<string> {
return new Promise(async (resolve, reject) => {
try {
// 1. 檢查模型(警告但不阻止,因為 pdf2zh 可能會自動下載)
checkModelsExist();
try {
// 1. 檢查模型(警告但不阻止,因為 pdf2zh 可能會自動下載)
checkModelsExist();
// 2. 提取目標語言
const targetLang = extractTargetLanguage(convertTo);
console.log(`[PDFMathTranslate] Translating to: ${targetLang}`);
// 2. 提取目標語言
const targetLang = extractTargetLanguage(convertTo);
console.log(`[PDFMathTranslate] Translating to: ${targetLang}`);
// 3. 建立臨時輸出目錄
const outputDir = dirname(targetPath);
const inputFileName = basename(filePath, `.${fileType}`);
const tempDir = join(outputDir, `${inputFileName}_pdfmathtranslate_${Date.now()}`);
// 3. 建立臨時輸出目錄
const outputDir = dirname(targetPath);
const inputFileName = basename(filePath, `.${fileType}`);
const tempDir = join(outputDir, `${inputFileName}_pdfmathtranslate_${Date.now()}`);
if (!existsSync(tempDir)) {
mkdirSync(tempDir, { recursive: true });
}
// 4. 建立封裝用目錄
const archiveDir = join(tempDir, "archive");
mkdirSync(archiveDir, { recursive: true });
// 5. 執行 pdf2zh 翻譯
const { monoPath, dualPath } = await runPdf2zh(filePath, tempDir, targetLang, execFile);
// 6. 複製原始檔案到封裝目錄
const originalDest = join(archiveDir, "original.pdf");
copyFileSync(filePath, originalDest);
// 7. 複製翻譯後的檔案(優先使用 mono因為它是純翻譯版本
const translatedDest = join(archiveDir, `translated-${targetLang}.pdf`);
// 檢查各種可能的輸出檔案名稱
const possibleOutputs = [
monoPath,
dualPath,
join(tempDir, `${inputFileName}-mono.pdf`),
join(tempDir, `${inputFileName}-dual.pdf`),
];
let foundOutput = false;
for (const outputPath of possibleOutputs) {
if (existsSync(outputPath)) {
copyFileSync(outputPath, translatedDest);
foundOutput = true;
console.log(`[PDFMathTranslate] Using output: ${outputPath}`);
break;
}
}
// 如果找不到預期的輸出檔案,嘗試找任何 PDF
if (!foundOutput) {
const allFiles = readdirSync(tempDir);
const pdfFiles = allFiles.filter(f => f.endsWith(".pdf") && f !== basename(filePath));
const firstPdfName = pdfFiles[0];
if (firstPdfName) {
const firstPdf = join(tempDir, firstPdfName);
copyFileSync(firstPdf, translatedDest);
foundOutput = true;
console.log(`[PDFMathTranslate] Using fallback output: ${firstPdf}`);
}
}
if (!foundOutput) {
throw new Error("No translated PDF output found");
}
// 8. 建立 .tar 封裝
const tarPath = getArchiveFileName(targetPath);
const tarDir = dirname(tarPath);
if (!existsSync(tarDir)) {
mkdirSync(tarDir, { recursive: true });
}
await createTarArchive(archiveDir, tarPath, execFile);
console.log(`[PDFMathTranslate] Created archive: ${tarPath}`);
// 9. 清理臨時目錄
removeDir(tempDir);
resolve("Done");
} catch (error) {
reject(`PDFMathTranslate error: ${error}`);
if (!existsSync(tempDir)) {
mkdirSync(tempDir, { recursive: true });
}
});
// 4. 建立封裝用目錄
const archiveDir = join(tempDir, "archive");
mkdirSync(archiveDir, { recursive: true });
// 5. 執行 pdf2zh 翻譯
const { monoPath, dualPath } = await runPdf2zh(filePath, tempDir, targetLang, execFile);
// 6. 複製原始檔案到封裝目錄
const originalDest = join(archiveDir, "original.pdf");
copyFileSync(filePath, originalDest);
// 7. 複製翻譯後的檔案(優先使用 mono因為它是純翻譯版本
const translatedDest = join(archiveDir, `translated-${targetLang}.pdf`);
// 檢查各種可能的輸出檔案名稱
const possibleOutputs = [
monoPath,
dualPath,
join(tempDir, `${inputFileName}-mono.pdf`),
join(tempDir, `${inputFileName}-dual.pdf`),
];
let foundOutput = false;
for (const outputPath of possibleOutputs) {
if (existsSync(outputPath)) {
copyFileSync(outputPath, translatedDest);
foundOutput = true;
console.log(`[PDFMathTranslate] Using output: ${outputPath}`);
break;
}
}
// 如果找不到預期的輸出檔案,嘗試找任何 PDF
if (!foundOutput) {
const allFiles = readdirSync(tempDir);
const pdfFiles = allFiles.filter((f) => f.endsWith(".pdf") && f !== basename(filePath));
const firstPdfName = pdfFiles[0];
if (firstPdfName) {
const firstPdf = join(tempDir, firstPdfName);
copyFileSync(firstPdf, translatedDest);
foundOutput = true;
console.log(`[PDFMathTranslate] Using fallback output: ${firstPdf}`);
}
}
if (!foundOutput) {
throw new Error("No translated PDF output found");
}
// 8. 建立 .tar 封裝
const tarPath = getArchiveFileName(targetPath);
const tarDir = dirname(tarPath);
if (!existsSync(tarDir)) {
mkdirSync(tarDir, { recursive: true });
}
await createTarArchive(archiveDir, tarPath, execFile);
console.log(`[PDFMathTranslate] Created archive: ${tarPath}`);
// 9. 清理臨時目錄
removeDir(tempDir);
return "Done";
} catch (error) {
throw new Error(`PDFMathTranslate error: ${error}`);
}
}

View file

@ -1,11 +1,10 @@
import path from "node:path";
import { Elysia } from "elysia";
import sanitize from "sanitize-filename";
import { outputDir } from "..";
import db from "../db/db";
import { WEBROOT } from "../helpers/env";
import { userService } from "./user";
import { createJobArchive, shouldUseChunkedDownload } from "../transfer";
import { createJobArchive } from "../transfer";
export const download = new Elysia()
.use(userService)
@ -45,10 +44,10 @@ export const download = new Elysia()
const jobId = decodeURIComponent(params.jobId);
const outputPath = `${outputDir}${userId}/${jobId}`;
// 使用統一的封裝管理器建立 .tar不壓縮
const outputTar = await createJobArchive(outputPath, jobId);
return Bun.file(outputTar);
},
{

View file

@ -1,14 +1,12 @@
/**
* Contents.CN Chunk API
*
*
*
*/
import { Elysia, t } from "elysia";
import { join } from "node:path";
import { Elysia } from "elysia";
import { outputDir } from "..";
import db from "../db/db";
import { WEBROOT } from "../helpers/env";
import { userService } from "./user";
import sanitize from "sanitize-filename";
import {
@ -16,11 +14,8 @@ import {
getChunkDownloadInfo,
getChunk,
createChunkDownloadHeaders,
getFileForDirectDownload,
createDirectDownloadHeaders,
CHUNK_SIZE_BYTES,
} from "../transfer";
import { statSync, existsSync } from "node:fs";
import { existsSync } from "node:fs";
export const downloadChunk = new Elysia()
.use(userService)
@ -44,7 +39,7 @@ export const downloadChunk = new Elysia()
const filePath = `${outputDir}${userId}/${jobId}/${fileName}`;
const info = getChunkDownloadInfo(filePath);
if (!info) {
return { error: "File not found" };
}
@ -54,7 +49,7 @@ export const downloadChunk = new Elysia()
use_chunked: shouldUseChunkedDownload(filePath),
};
},
{ auth: true }
{ auth: true },
)
/**
* chunk
@ -90,14 +85,14 @@ export const downloadChunk = new Elysia()
}
const headers = createChunkDownloadHeaders(info, chunkIndex, chunkData);
for (const [key, value] of Object.entries(headers)) {
set.headers[key] = value;
}
return new Response(chunkData);
},
{ auth: true }
{ auth: true },
)
/**
* Archive chunk
@ -122,7 +117,7 @@ export const downloadChunk = new Elysia()
}
const info = getChunkDownloadInfo(archivePath);
if (!info) {
return { error: "Archive not found" };
}
@ -132,7 +127,7 @@ export const downloadChunk = new Elysia()
use_chunked: shouldUseChunkedDownload(archivePath),
};
},
{ auth: true }
{ auth: true },
)
/**
* Archive chunk
@ -167,12 +162,12 @@ export const downloadChunk = new Elysia()
}
const headers = createChunkDownloadHeaders(info, chunkIndex, chunkData);
for (const [key, value] of Object.entries(headers)) {
set.headers[key] = value;
}
return new Response(chunkData);
},
{ auth: true }
{ auth: true },
);

View file

@ -1,11 +1,10 @@
/**
* Contents.CN Chunk API
*
*
*
*/
import { Elysia, t } from "elysia";
import { WEBROOT } from "../helpers/env";
import { uploadsDir } from "../index";
import { userService } from "./user";
import sanitize from "sanitize-filename";
@ -44,7 +43,7 @@ export const uploadChunk = new Elysia().use(userService).post(
user.id,
jobId.value,
`${uploadsDir}${user.id}/`,
userUploadsDir
userUploadsDir,
);
return result;
@ -59,7 +58,7 @@ export const uploadChunk = new Elysia().use(userService).post(
chunk: t.File(),
}),
auth: true,
}
},
);
/**
@ -72,7 +71,7 @@ export const uploadInfo = new Elysia().use(userService).post(
const size = parseInt(file_size, 10);
const useChunked = shouldUseChunkedUpload(size);
return {
use_chunked: useChunked,
chunk_size: CHUNK_SIZE_BYTES,
@ -84,5 +83,5 @@ export const uploadInfo = new Elysia().use(userService).post(
file_size: t.String(),
}),
auth: true,
}
},
);

View file

@ -115,12 +115,16 @@ export const user = new Elysia()
sm:px-4
`}
>
<h1 class="my-8 text-3xl">{t("setup", "welcome")}</h1>
<h1 class="my-8 text-3xl" safe>
{t("setup", "welcome")}
</h1>
<article class="article p-0">
<header class="w-full bg-neutral-800 p-4">{t("setup", "createYourAccount")}</header>
<header class="w-full bg-neutral-800 p-4" safe>
{t("setup", "createYourAccount")}
</header>
<form method="post" action={`${WEBROOT}/register`} class="p-4">
<fieldset class="mb-4 flex flex-col gap-4">
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "email")}
<input
type="email"
@ -131,7 +135,7 @@ export const user = new Elysia()
required
/>
</label>
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "password")}
<input
type="password"
@ -146,13 +150,14 @@ export const user = new Elysia()
<input type="submit" value={t("auth", "createAccount")} class="btn-primary" />
</form>
<footer class="p-4">
{t("setup", "reportIssues")}{" "}
<span safe>{t("setup", "reportIssues")}</span>{" "}
<a
class={`
text-accent-500 underline
hover:text-accent-400
`}
href="https://github.com/pi-docket/ConvertX-CN"
safe
>
{t("setup", "github")}
</a>
@ -186,7 +191,7 @@ export const user = new Elysia()
<article class="article">
<form method="post" class="flex flex-col gap-4">
<fieldset class="mb-4 flex flex-col gap-4">
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "email")}
<input
type="email"
@ -197,7 +202,7 @@ export const user = new Elysia()
required
/>
</label>
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "password")}
<input
type="password"
@ -308,7 +313,7 @@ export const user = new Elysia()
<article class="article">
<form method="post" class="flex flex-col gap-4">
<fieldset class="mb-4 flex flex-col gap-4">
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "email")}
<input
type="email"
@ -319,7 +324,7 @@ export const user = new Elysia()
required
/>
</label>
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "password")}
<input
type="password"
@ -336,6 +341,7 @@ export const user = new Elysia()
href={`${WEBROOT}/register`}
role="button"
class="w-full btn-secondary text-center"
safe
>
{t("nav", "register")}
</a>
@ -444,7 +450,7 @@ export const user = new Elysia()
<article class="article">
<form method="post" class="flex flex-col gap-4">
<fieldset class="mb-4 flex flex-col gap-4">
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "email")}
<input
type="email"
@ -456,7 +462,7 @@ export const user = new Elysia()
required
/>
</label>
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "newPassword")}
<input
type="password"
@ -466,7 +472,7 @@ export const user = new Elysia()
autocomplete="new-password"
/>
</label>
<label class="flex flex-col gap-1">
<label class="flex flex-col gap-1" safe>
{t("auth", "currentPassword")}
<input
type="password"

View file

@ -1,13 +1,13 @@
/**
* Contents.CN
*
*
*
* - .tar
* - .tar.gz, .tgz, .zip
*/
import { existsSync, mkdirSync, readdirSync, statSync } from "node:fs";
import { join, basename } from "node:path";
import { existsSync, mkdirSync, readdirSync } from "node:fs";
import { join } from "node:path";
import * as tar from "tar";
import { ALLOWED_ARCHIVE_FORMAT, FORBIDDEN_ARCHIVE_FORMATS } from "./constants";
@ -16,14 +16,14 @@ import { ALLOWED_ARCHIVE_FORMAT, FORBIDDEN_ARCHIVE_FORMATS } from "./constants";
*/
export function validateArchiveFormat(fileName: string): boolean {
const lowerName = fileName.toLowerCase();
// 檢查是否使用禁止的格式
for (const forbidden of FORBIDDEN_ARCHIVE_FORMATS) {
if (lowerName.endsWith(forbidden)) {
return false;
}
}
// 檢查是否是允許的格式
return lowerName.endsWith(ALLOWED_ARCHIVE_FORMAT);
}
@ -33,7 +33,7 @@ export function validateArchiveFormat(fileName: string): boolean {
*/
export function getArchiveFileName(baseName: string): string {
const lowerName = baseName.toLowerCase();
// 移除任何禁止的副檔名
let cleanName = baseName;
for (const forbidden of FORBIDDEN_ARCHIVE_FORMATS) {
@ -42,19 +42,19 @@ export function getArchiveFileName(baseName: string): string {
break;
}
}
// 如果已經是 .tar 結尾,直接返回
if (cleanName.toLowerCase().endsWith(ALLOWED_ARCHIVE_FORMAT)) {
return cleanName;
}
// 否則加上 .tar
return `${cleanName}${ALLOWED_ARCHIVE_FORMAT}`;
}
/**
* .tar
*
*
* @param sourceDir -
* @param outputPath - .tar
* @param options -
@ -65,11 +65,11 @@ export async function createTarArchive(
options: {
filter?: (path: string) => boolean;
prefix?: string;
} = {}
} = {},
): Promise<string> {
// 強制確保輸出是 .tar 格式
const finalOutputPath = getArchiveFileName(outputPath);
// 確保輸出目錄存在
const outputDir = join(finalOutputPath, "..");
if (!existsSync(outputDir)) {
@ -78,7 +78,7 @@ export async function createTarArchive(
// 取得要封裝的檔案列表
const files = readdirSync(sourceDir);
// 預設過濾器:排除其他 tar 檔案
const defaultFilter = (path: string) => !path.match(/\.tar$/i);
const filter = options.filter || defaultFilter;
@ -91,7 +91,7 @@ export async function createTarArchive(
// 不使用 gzip 壓縮
gzip: false,
},
files.filter(f => filter(f))
files.filter((f) => filter(f)),
);
console.log(`Created tar archive: ${finalOutputPath}`);
@ -100,7 +100,7 @@ export async function createTarArchive(
/**
* .tar
*
*
* @param outputDir -
* @param jobId - ID
*/
@ -114,41 +114,3 @@ export async function createJobArchive(outputDir: string, jobId: string): Promis
return archivePath;
}
/**
* MinerU
*
* @param mineruOutputDir - MinerU
* @param targetPath - .tar
*/
export async function createConverterArchive(
converterOutputDir: string,
targetPath: string
): Promise<string> {
// 確保輸出使用 .tar 格式
const tarPath = getArchiveFileName(targetPath);
await createTarArchive(converterOutputDir, tarPath);
return tarPath;
}
/**
*
*/
export function getArchiveInfo(archivePath: string): {
exists: boolean;
size: number;
fileName: string;
} | null {
if (!existsSync(archivePath)) {
return null;
}
const stats = statSync(archivePath);
return {
exists: true,
size: stats.size,
fileName: basename(archivePath),
};
}

View file

@ -1,6 +1,6 @@
/**
* Contents.CN
*
*
*
*/

View file

@ -1,6 +1,6 @@
/**
* Contents.CN
*
*
*
* - 10MB
* - >10MBchunk
@ -46,9 +46,9 @@ export function getChunkDownloadInfo(filePath: string): ChunkDownloadInfo | null
* chunk
*/
export async function getChunk(
filePath: string,
chunkIndex: number,
chunkSize: number = CHUNK_SIZE_BYTES
filePath: string,
chunkIndex: number,
chunkSize: number = CHUNK_SIZE_BYTES,
): Promise<Buffer | null> {
if (!existsSync(filePath)) {
return null;
@ -78,23 +78,13 @@ export async function getChunk(
});
}
/**
*
*/
export function getFileForDirectDownload(filePath: string): ReturnType<typeof Bun.file> | null {
if (!existsSync(filePath)) {
return null;
}
return Bun.file(filePath);
}
/**
* chunk headers
*/
export function createChunkDownloadHeaders(
info: ChunkDownloadInfo,
chunkIndex: number,
chunkData: Buffer
info: ChunkDownloadInfo,
chunkIndex: number,
chunkData: Buffer,
): Record<string, string> {
const start = chunkIndex * info.chunk_size;
const end = start + chunkData.length - 1;
@ -110,14 +100,3 @@ export function createChunkDownloadHeaders(
"X-Total-Size": info.total_size.toString(),
};
}
/**
* headers
*/
export function createDirectDownloadHeaders(fileName: string, fileSize: number): Record<string, string> {
return {
"Content-Type": "application/octet-stream",
"Content-Length": fileSize.toString(),
"Content-Disposition": `attachment; filename="${encodeURIComponent(fileName)}"`,
};
}

View file

@ -1,6 +1,6 @@
/**
* Contents.CN
*
*
*
*/
@ -16,7 +16,6 @@ export {
// 類型
export type {
ChunkUploadRequest,
ChunkUploadResponse,
DirectUploadResponse,
ChunkDownloadInfo,
@ -40,9 +39,7 @@ export {
shouldUseChunkedDownload,
getChunkDownloadInfo,
getChunk,
getFileForDirectDownload,
createChunkDownloadHeaders,
createDirectDownloadHeaders,
} from "./downloadManager";
// 封裝管理
@ -51,6 +48,4 @@ export {
getArchiveFileName,
createTarArchive,
createJobArchive,
createConverterArchive,
getArchiveInfo,
} from "./archiveManager";

View file

@ -2,24 +2,6 @@
* Contents.CN
*/
/**
* Chunk
*/
export interface ChunkUploadRequest {
/** 上傳會話 IDUUID */
upload_id: string;
/** 當前 chunk 索引(從 0 開始) */
chunk_index: number;
/** 總 chunk 數量 */
total_chunks: number;
/** chunk 數據 */
data: Blob | ArrayBuffer;
/** 原始檔案名稱 */
file_name: string;
/** 檔案總大小 */
total_size: number;
}
/**
* Chunk
*/

View file

@ -1,6 +1,6 @@
/**
* Contents.CN
*
*
*
* - 10MB
* - >10MBchunk
@ -8,7 +8,12 @@
import { existsSync, mkdirSync, rmSync, readdirSync, createWriteStream, statSync } from "node:fs";
import { join } from "node:path";
import { CHUNK_THRESHOLD_BYTES, CHUNK_SIZE_BYTES, UPLOAD_SESSION_TIMEOUT_MS, CHUNK_TEMP_DIR } from "./constants";
import {
CHUNK_THRESHOLD_BYTES,
CHUNK_SIZE_BYTES,
UPLOAD_SESSION_TIMEOUT_MS,
CHUNK_TEMP_DIR,
} from "./constants";
import type { UploadSession, ChunkUploadResponse, DirectUploadResponse } from "./types";
import { getTransferMode } from "./types";
@ -22,9 +27,12 @@ class UploadSessionManager {
constructor() {
// 定期清理過期的 sessions
this.cleanupInterval = setInterval(() => {
this.cleanupExpiredSessions();
}, 5 * 60 * 1000); // 每 5 分鐘清理一次
this.cleanupInterval = setInterval(
() => {
this.cleanupExpiredSessions();
},
5 * 60 * 1000,
); // 每 5 分鐘清理一次
}
/**
@ -37,10 +45,10 @@ class UploadSessionManager {
fileName: string,
totalSize: number,
totalChunks: number,
baseTempDir: string
baseTempDir: string,
): UploadSession {
const tempDir = join(baseTempDir, CHUNK_TEMP_DIR, uploadId);
if (!existsSync(tempDir)) {
mkdirSync(tempDir, { recursive: true });
}
@ -74,7 +82,7 @@ class UploadSessionManager {
markChunkReceived(uploadId: string, chunkIndex: number): boolean {
const session = this.sessions.get(uploadId);
if (!session) return false;
session.received_chunks.add(chunkIndex);
return true;
}
@ -85,7 +93,7 @@ class UploadSessionManager {
isComplete(uploadId: string): boolean {
const session = this.sessions.get(uploadId);
if (!session) return false;
return session.received_chunks.size === session.total_chunks;
}
@ -140,11 +148,11 @@ export function shouldUseChunkedUpload(fileSize: number): boolean {
export async function handleDirectUpload(
file: File,
targetDir: string,
fileName: string
fileName: string,
): Promise<DirectUploadResponse> {
try {
const targetPath = join(targetDir, fileName);
if (!existsSync(targetDir)) {
mkdirSync(targetDir, { recursive: true });
}
@ -178,12 +186,12 @@ export async function handleChunkUpload(
userId: string,
jobId: string,
baseTempDir: string,
targetDir: string
targetDir: string,
): Promise<ChunkUploadResponse> {
try {
// 取得或建立會話
let session = uploadSessionManager.getSession(uploadId);
if (!session) {
session = uploadSessionManager.createSession(
uploadId,
@ -192,7 +200,7 @@ export async function handleChunkUpload(
fileName,
totalSize,
totalChunks,
baseTempDir
baseTempDir,
);
}
@ -224,7 +232,7 @@ export async function handleChunkUpload(
if (uploadSessionManager.isComplete(uploadId)) {
// 合併所有 chunks
const finalPath = await mergeChunks(session, targetDir);
// 清理會話
uploadSessionManager.removeSession(uploadId);
@ -257,14 +265,14 @@ export async function handleChunkUpload(
*/
async function mergeChunks(session: UploadSession, targetDir: string): Promise<string> {
const targetPath = join(targetDir, session.file_name);
if (!existsSync(targetDir)) {
mkdirSync(targetDir, { recursive: true });
}
// 讀取並排序所有 chunks
const chunkFiles = readdirSync(session.temp_dir)
.filter(f => f.startsWith("chunk_"))
.filter((f) => f.startsWith("chunk_"))
.sort();
// 建立輸出串流
@ -298,6 +306,9 @@ async function mergeChunks(session: UploadSession, targetDir: string): Promise<s
/**
* chunk
*/
export function calculateChunkCount(fileSize: number, chunkSize: number = CHUNK_SIZE_BYTES): number {
export function calculateChunkCount(
fileSize: number,
chunkSize: number = CHUNK_SIZE_BYTES,
): number {
return Math.ceil(fileSize / chunkSize);
}