diff --git a/src/routes/external.ts b/src/routes/external.ts
index 3bcb39b0..2f8de5d9 100644
--- a/src/routes/external.ts
+++ b/src/routes/external.ts
@@ -2,8 +2,10 @@
import bodyParser from "body-parser";
import { Router } from "express";
import fetch from "node-fetch";
-import cheerio from "cheerio";
import crypto from "crypto";
+import { HTTPError } from "lambert-server";
+import { Snowflake } from "@fosscord/server-util";
+import { storage } from "../util/Storage";
const router = Router();
@@ -28,52 +30,34 @@ const DEFAULT_FETCH_OPTIONS: any = {
};
router.post("/", bodyParser.json(), async (req, res) => {
- if (!req.body) throw new Error("Invalid Body (url missing) \nExample: url:https://discord.com");
-
+ if (!req.body) throw new HTTPError("Invalid Body");
const { url } = req.body;
+ if (!url || typeof url !== "string") throw new HTTPError("Invalid url");
- const hash = crypto.createHash("md5").update(url).digest("hex");
+ const id = Snowflake.generate();
try {
- const request = await fetch(url, DEFAULT_FETCH_OPTIONS);
-
- const text = await request.text();
- const $ = cheerio.load(text);
-
- const ogTitle = $('meta[property="og:title"]').attr("content");
- const ogDescription = $('meta[property="og:description"]').attr("content");
- const ogImage = $('meta[property="og:image"]').attr("content");
- const ogUrl = $('meta[property="og:url"]').attr("content");
- const ogType = $('meta[property="og:type"]').attr("content");
-
- const filename = new URL(url).host.split(".")[0];
-
- const ImageResponse = await fetch(ogImage, DEFAULT_FETCH_OPTIONS);
- const ImageType = ImageResponse.headers.get("content-type");
- const ImageExtension = ImageType?.split("/")[1];
- const ImageResponseBuffer = (await ImageResponse.buffer()).toString("base64");
- const cachedImage = `/external/${ID}/${filename}.${ImageExtension}`;
+ const response = await fetch(ogImage, DEFAULT_FETCH_OPTIONS);
+ const buffer = await response.buffer();
- await db.data.externals.push({ image: ImageResponseBuffer, id: ID, type: ImageType });
+ await storage.set(`/external/${id}`, buffer);
- const new_cache_entry: crawled = { id: ID, ogTitle, ogDescription, cachedImage, ogUrl, ogType };
- await db.data.crawler.push(new_cache_entry);
-
- res.send(new_cache_entry);
+ res.send({ id });
} catch (error) {
- console.log(error);
-
- throw new Error("Couldn't fetch website");
+ throw new HTTPError("Couldn't fetch website");
}
});
-router.get("/:id/:filename", async (req, res) => {
- const { id, filename } = req.params;
- const { image, type } = await db.data.externals({ id: id }).get();
- const imageBuffer = Buffer.from(image, "base64");
+router.get("/:id/", async (req, res) => {
+ const { id } = req.params;
+
+ const file = await storage.get(`/external/${id}`);
+ if (!file) throw new HTTPError("File not found");
+ const result = await FileType.fromBuffer(file);
+
+ res.set("Content-Type", result?.mime);
- res.set("Content-Type", type);
- res.send(imageBuffer);
+ return res.send(file);
});
export default router;
|
