修复模型下载问题
This commit is contained in:
@ -68,7 +68,7 @@ export abstract class Model {
|
||||
}
|
||||
//不存在则下载
|
||||
let cache = cacheJsonData.find(c => c.url === url);
|
||||
if (!cache) {
|
||||
if (!cache || !fs.existsSync(path.join(cacheDir, cache.filename))) {
|
||||
let saveType = option?.saveType ?? null;
|
||||
const saveTypeDict: Record<string, ModelType> = {
|
||||
".onnx": "onnx",
|
||||
@ -83,33 +83,40 @@ export abstract class Model {
|
||||
return res.blob();
|
||||
}).then(blob => blob.stream()).then(async stream => {
|
||||
const cacheFilename = path.join(cacheDir, Date.now().toString());
|
||||
let fsStream!: ReturnType<typeof fs.createWriteStream>;
|
||||
let hashStream!: ReturnType<typeof crypto.createHash>;
|
||||
let hash!: string;
|
||||
await stream.pipeTo(new WritableStream({
|
||||
start(controller) {
|
||||
fsStream = fs.createWriteStream(cacheFilename);
|
||||
hashStream = crypto.createHash("md5");
|
||||
},
|
||||
async write(chunk, controller) {
|
||||
await new Promise<void>((resolve, reject) => fsStream.write(chunk, err => err ? reject(err) : resolve()));
|
||||
await new Promise<void>((resolve, reject) => hashStream.write(chunk, err => err ? reject(err) : resolve()));
|
||||
},
|
||||
close() {
|
||||
fsStream.end();
|
||||
hashStream.end();
|
||||
hash = hashStream.digest("hex")
|
||||
},
|
||||
abort() { }
|
||||
}));
|
||||
const hash = await new Promise<string>((resolve, reject) => {
|
||||
let fsStream!: ReturnType<typeof fs.createWriteStream>;
|
||||
let hashStream!: ReturnType<typeof crypto.createHash>;
|
||||
stream.pipeTo(new WritableStream({
|
||||
start(controller) {
|
||||
fsStream = fs.createWriteStream(cacheFilename);
|
||||
hashStream = crypto.createHash("md5");
|
||||
},
|
||||
async write(chunk, controller) {
|
||||
await new Promise<void>((resolve, reject) => fsStream.write(chunk, err => err ? reject(err) : resolve()));
|
||||
await new Promise<void>((resolve, reject) => hashStream.write(chunk, err => err ? reject(err) : resolve()));
|
||||
},
|
||||
close() {
|
||||
fsStream.end();
|
||||
hashStream.end();
|
||||
resolve(hashStream.digest("hex"));
|
||||
},
|
||||
abort() { }
|
||||
})).catch(reject);
|
||||
})
|
||||
return { filename: cacheFilename, hash };
|
||||
});
|
||||
//重命名
|
||||
const filename = `${res.hash}.${saveType}`;
|
||||
fs.promises.rename(res.filename, path.join(cacheDir, filename));
|
||||
//保存缓存
|
||||
cache = { url, filename };
|
||||
cacheJsonData.push(cache);
|
||||
if (!cache) {
|
||||
cache = { url, filename };
|
||||
cacheJsonData.push(cache);
|
||||
}
|
||||
else {
|
||||
cache.filename = filename;
|
||||
cache.url = url;
|
||||
}
|
||||
fs.promises.writeFile(cacheJsonFile, JSON.stringify(cacheJsonData, null, 4));
|
||||
}
|
||||
//返回模型数据
|
||||
|
Reference in New Issue
Block a user