empty skylink issue
This commit is contained in:
parent
16353ca634
commit
c1b454dc10
|
@ -3,23 +3,10 @@ import express, { Request, Response } from "express";
|
||||||
import { rmdirSync, unlinkSync } from "fs";
|
import { rmdirSync, unlinkSync } from "fs";
|
||||||
import { extension as toExtension } from "mime-types";
|
import { extension as toExtension } from "mime-types";
|
||||||
import { Collection } from "mongodb";
|
import { Collection } from "mongodb";
|
||||||
import {
|
import { API_HOSTNAME, API_PORT, MONGO_CONNECTIONSTRING, MONGO_DBNAME, UPLOAD_PATH } from "./consts";
|
||||||
API_HOSTNAME,
|
|
||||||
API_PORT,
|
|
||||||
MONGO_CONNECTIONSTRING,
|
|
||||||
MONGO_DBNAME,
|
|
||||||
UPLOAD_PATH,
|
|
||||||
} from "./consts";
|
|
||||||
import { MongoDB } from "./mongodb";
|
import { MongoDB } from "./mongodb";
|
||||||
import { IRecord } from "./types";
|
import { IRecord } from "./types";
|
||||||
import {
|
import { contentType, download, extractArchive, isDirectory, uploadDirectory, uploadFile } from "./utils";
|
||||||
contentType,
|
|
||||||
download,
|
|
||||||
extractArchive,
|
|
||||||
isDirectory,
|
|
||||||
uploadDirectory,
|
|
||||||
uploadFile,
|
|
||||||
} from "./utils";
|
|
||||||
|
|
||||||
require("dotenv").config();
|
require("dotenv").config();
|
||||||
|
|
||||||
|
@ -52,29 +39,20 @@ require("dotenv").config();
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
async function handleGetLink(
|
async function handleGetLink(req: Request, res: Response, recordsDB: Collection<IRecord>) {
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
recordsDB: Collection<IRecord>
|
|
||||||
) {
|
|
||||||
try {
|
try {
|
||||||
const { cid } = req.params;
|
const { cid } = req.params;
|
||||||
|
|
||||||
const record = await recordsDB.findOne({ cid });
|
const record = await recordsDB.findOne({ cid });
|
||||||
if (record && record.skylink) {
|
if (record) {
|
||||||
|
if (record.skylink) {
|
||||||
res.status(200).send({ skylink: record.skylink });
|
res.status(200).send({ skylink: record.skylink });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
// if (record && !record.skylink) {
|
|
||||||
// // TODO: we can retry the IPFS download and skynet upload here if
|
|
||||||
// // time.Since(createdAt) exceeds some threshold
|
|
||||||
// res.status(200).send({ error: "processing" });
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// insert an empty record for the cid
|
// insert an empty record for the cid
|
||||||
await recordsDB.insertOne({ cid, createdAt: new Date(), skylink: "" });
|
await recordsDB.insertOne({ cid, createdAt: new Date(), skylink: "" });
|
||||||
|
}
|
||||||
|
|
||||||
// reupload the cid and return the skylink
|
// reupload the cid and return the skylink
|
||||||
const skylink = await reuploadFile(cid, recordsDB);
|
const skylink = await reuploadFile(cid, recordsDB);
|
||||||
|
@ -86,10 +64,7 @@ async function handleGetLink(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function reuploadFile(
|
async function reuploadFile(cid: string, recordsDB: Collection<IRecord>): Promise<string> {
|
||||||
cid: string,
|
|
||||||
recordsDB: Collection<IRecord>
|
|
||||||
): Promise<string> {
|
|
||||||
// get the content type
|
// get the content type
|
||||||
const ct = await contentType(cid);
|
const ct = await contentType(cid);
|
||||||
const ext = toExtension(ct);
|
const ext = toExtension(ct);
|
||||||
|
|
Reference in New Issue