add endpoint for oembed; restyle gifv; skeleton for websocket

This commit is contained in:
waveringana 2024-05-10 02:43:52 -04:00
parent ec3597e474
commit e799724b3b
9 changed files with 312 additions and 209 deletions

View file

@ -7,6 +7,8 @@ import which from "which";
import fs from "fs";
import { wss } from "./ws";
/**
* Enum to represent different types of video encoding methods.
*

View file

@ -31,7 +31,9 @@ export interface oembedObj {
provider_name: string;
provider_url: string;
cache_age: number;
title: string;
html: string;
url: string;
width?: number;
height?: number;
}
@ -54,4 +56,4 @@ export const imageExtensions = [
".svg",
".tiff",
".webp",
];
];

View file

@ -69,6 +69,8 @@ export const createEmbedData: Middleware = async (req, res, next) => {
html: `<iframe src='${req.protocol}://${req.get(
"host",
)}/gifv/${filename}${fileExtension}'></iframe>`,
title: filename,
url: `${req.protocol}://${req.get("host")}/uploads/${filename}${fileExtension}`,
};
if (isMedia) {

20
app/lib/ws.ts Normal file
View file

@ -0,0 +1,20 @@
import WebSocket from "ws";
const wsPort = normalizePort(process.env.EBWSPORT || "3001");
function normalizePort(val: string) {
const port = parseInt(val, 10);
if (isNaN(port)) {
return parseInt(val);
}
if (port >= 0) {
return port;
}
}
const wss = new WebSocket.Server({port: wsPort});
export { wss };

View file

@ -1,295 +1,295 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable no-undef */
/* eslint-env browser: true */
let newMediaList;
const videoExtensions = [
".mp4",
".mov",
".avi",
".flv",
".mkv",
".wmv",
".webm",
".mp4",
".mov",
".avi",
".flv",
".mkv",
".wmv",
".webm",
];
const imageExtensions = [
".jpg",
".jpeg",
".png",
".gif",
".bmp",
".svg",
".tiff",
".webp",
".jpg",
".jpeg",
".png",
".gif",
".bmp",
".svg",
".tiff",
".webp",
];
function copyURI(evt) {
evt.preventDefault();
navigator.clipboard
.writeText(absolutePath(evt.target.getAttribute("src")))
.then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
evt.preventDefault();
navigator.clipboard
.writeText(absolutePath(evt.target.getAttribute("src")))
.then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
}
function copyA(evt) {
evt.preventDefault();
navigator.clipboard
.writeText(absolutePath(evt.target.getAttribute("href")))
.then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
evt.preventDefault();
navigator.clipboard
.writeText(absolutePath(evt.target.getAttribute("href")))
.then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
}
function copyPath(evt) {
navigator.clipboard.writeText(absolutePath(evt)).then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
navigator.clipboard.writeText(absolutePath(evt)).then(
() => {
console.log("copied");
},
() => {
console.log("failed");
}
);
}
function absolutePath(href) {
let link = document.createElement("a");
link.href = href;
return link.href;
let link = document.createElement("a");
link.href = href;
return link.href;
}
function extension(string) {
return string.slice(((string.lastIndexOf(".") - 2) >>> 0) + 2);
return string.slice(((string.lastIndexOf(".") - 2) >>> 0) + 2);
}
let dropArea = document.getElementById("dropArea");
["dragenter", "dragover", "dragleave", "drop"].forEach((eventName) => {
dropArea.addEventListener(eventName, preventDefaults, false);
dropArea.addEventListener(eventName, preventDefaults, false);
});
function preventDefaults(e) {
e.preventDefault();
e.stopPropagation();
e.preventDefault();
e.stopPropagation();
}
["dragenter", "dragover"].forEach((eventName) => {
dropArea.addEventListener(eventName, highlight, false);
dropArea.addEventListener(eventName, highlight, false);
});
["dragleave", "drop"].forEach((eventName) => {
dropArea.addEventListener(eventName, unhighlight, false);
dropArea.addEventListener(eventName, unhighlight, false);
});
function highlight(e) {
dropArea.classList.add("highlight");
dropArea.classList.add("highlight");
}
function unhighlight(e) {
dropArea.classList.remove("highlight");
dropArea.classList.remove("highlight");
}
dropArea.addEventListener("drop", handleDrop, false);
window.addEventListener("paste", handlePaste);
function handleDrop(e) {
let dt = e.dataTransfer;
let files = dt.files;
handleFiles(files);
let dt = e.dataTransfer;
let files = dt.files;
handleFiles(files);
}
function handlePaste(e) {
// Get the data of clipboard
const clipboardItems = e.clipboardData.items;
const items = [].slice.call(clipboardItems).filter(function (item) {
// Get the data of clipboard
const clipboardItems = e.clipboardData.items;
const items = [].slice.call(clipboardItems).filter(function (item) {
// Filter the image items only
return item.type.indexOf("image") !== -1;
});
if (items.length === 0) {
return;
}
return item.type.indexOf("image") !== -1;
});
if (items.length === 0) {
return;
}
const item = items[0];
// Get the blob of image
const blob = item.getAsFile();
console.log(blob);
const item = items[0];
// Get the blob of image
const blob = item.getAsFile();
console.log(blob);
uploadFile(blob);
previewFile(blob);
uploadFile(blob);
previewFile(blob);
}
function handleFiles(files) {
files = [...files];
files.forEach(uploadFile);
files.forEach(previewFile);
files = [...files];
files.forEach(uploadFile);
files.forEach(previewFile);
}
function previewFile(file) {
let reader = new FileReader();
reader.readAsDataURL(file);
reader.onloadend = function () {
let img = document.createElement("img");
img.src = reader.result;
img.className = "image";
document.getElementById("gallery").appendChild(img);
document.getElementById("fileupload").src = img.src;
};
let reader = new FileReader();
reader.readAsDataURL(file);
reader.onloadend = function () {
let img = document.createElement("img");
img.src = reader.result;
img.className = "image";
document.getElementById("gallery").appendChild(img);
document.getElementById("fileupload").src = img.src;
};
}
function uploadFile(file) {
let xhr = new XMLHttpRequest();
let formData = new FormData();
let reader = new FileReader();
let xhr = new XMLHttpRequest();
let formData = new FormData();
xhr.open("POST", "/", true);
xhr.open("POST", "/", true);
xhr.addEventListener("readystatechange", function (e) {
if (xhr.readyState == 4) {
if (xhr.status == 200) {
let response = xhr.responseText;
//document.getElementById("embedder-list").innerHTML = response;
htmx.ajax("GET", "/media-list", {target: "#embedder-list", swap: "innerHTML"});
document.getElementById("gallery").innerHTML = "";
htmx.process(document.body);
} else {
alert(`Upload failed, error code: ${xhr.status}`);
}
xhr.addEventListener("readystatechange", function () {
if (xhr.readyState == 4) {
if (xhr.status == 200) {
//document.getElementById("embedder-list").innerHTML = response;
htmx.ajax("GET", "/media-list", {target: "#embedder-list", swap: "innerHTML"});
document.getElementById("gallery").innerHTML = "";
htmx.process(document.body);
} else {
alert(`Upload failed, error code: ${xhr.status}`);
}
}
});
if (file == null || file == undefined) {
file = document.querySelector("#fileupload").files[0];
}
});
if (file == null || file == undefined) {
file = document.querySelector("#fileupload").files[0];
}
formData.append("fileupload", file);
formData.append("expire", document.getElementById("expire").value);
xhr.send(formData);
formData.append("fileupload", file);
formData.append("expire", document.getElementById("expire").value);
xhr.send(formData);
}
function openFullSize(imageUrl) {
let modal = document.createElement("div");
modal.classList.add("modal");
let img = document.createElement("img");
let video = document.createElement("video");
img.src = imageUrl;
video.src = imageUrl;
video.controls = true;
let modal = document.createElement("div");
modal.classList.add("modal");
let img = document.createElement("img");
let video = document.createElement("video");
img.src = imageUrl;
video.src = imageUrl;
video.controls = true;
if (
imageExtensions.includes(extension(imageUrl))
) {
modal.appendChild(img);
} else if (
videoExtensions.includes(extension(imageUrl))
) {
modal.appendChild(video);
}
if (
imageExtensions.includes(extension(imageUrl))
) {
modal.appendChild(img);
} else if (
videoExtensions.includes(extension(imageUrl))
) {
modal.appendChild(video);
}
// Add the modal to the page
document.body.appendChild(modal);
// Add the modal to the page
document.body.appendChild(modal);
// Add an event listener to close the modal when the user clicks on it
modal.addEventListener("click", function () {
modal.remove();
});
// Add an event listener to close the modal when the user clicks on it
modal.addEventListener("click", function () {
modal.remove();
});
}
let searchInput = document.getElementById("search");
searchInput.addEventListener("input", () => {
let searchValue = searchInput.value;
let mediaList = document.querySelectorAll("ul.embedder-list li");
let searchValue = searchInput.value;
let mediaList = document.querySelectorAll("ul.embedder-list li");
mediaList.forEach((li) => {
if (!li.id.toLowerCase().includes(searchValue)) {
//make lowercase to allow case insensitivity
li.classList.add("hide");
li.classList.remove("show");
li.addEventListener(
"animationend",
function () {
if (searchInput.value !== "") {
this.style.display = "none";
}
},
{ once: true }
); // The {once: true} option automatically removes the event listener after it has been called
} else {
li.style.display = "";
li.classList.remove("hide");
if (searchValue === "" && !li.classList.contains("show")) {
li.classList.add("show");
}
}
});
mediaList.forEach((li) => {
if (!li.id.toLowerCase().includes(searchValue)) {
//make lowercase to allow case insensitivity
li.classList.add("hide");
li.classList.remove("show");
li.addEventListener(
"animationend",
function () {
if (searchInput.value !== "") {
this.style.display = "none";
}
},
{ once: true }
); // The {once: true} option automatically removes the event listener after it has been called
} else {
li.style.display = "";
li.classList.remove("hide");
if (searchValue === "" && !li.classList.contains("show")) {
li.classList.add("show");
}
}
});
});
function p(num) {
return `${(num * 100).toFixed(2)}%`;
return `${(num * 100).toFixed(2)}%`;
}
function checkFileAvailability(filePath) {
const checkFile = () => {
console.log(`Checking if ${filePath} is processed...`);
fetch(`/uploads/${filePath}-progress.json`)
.then((response) => {
if (response.ok) {
console.log(`${filePath} still processing`);
return response.json().then(json => {
document.getElementById(`spinner-${filePath}`).innerText = `Optimizing Video for Sharing: ${p(json.progress)} done`;
return response;
})
} else if (response.status === 404) {
console.log(`${filePath} finished processing`);
console.log(`/uploads/720p-${filePath}-progress.json finished`);
clearInterval(interval);
createVideoElement(filePath);
} else {
throw new Error(`HTTP error: Status code ${response.status}`);
}
})
.catch((error) => console.error("Error:", error));
};
const checkFile = () => {
console.log(`Checking if ${filePath} is processed...`);
fetch(`/uploads/${filePath}-progress.json`)
.then((response) => {
if (response.ok) {
console.log(`${filePath} still processing`);
return response.json().then(json => {
document.getElementById(`spinner-${filePath}`).innerText = `Optimizing Video for Sharing: ${p(json.progress)} done`;
return response;
});
} else if (response.status === 404) {
console.log(`${filePath} finished processing`);
console.log(`/uploads/720p-${filePath}-progress.json finished`);
clearInterval(interval);
createVideoElement(filePath);
} else {
throw new Error(`HTTP error: Status code ${response.status}`);
}
})
.catch((error) => console.error("Error:", error));
};
checkFile();
const interval = setInterval(checkFile, 1000);
checkFile();
const interval = setInterval(checkFile, 1000);
}
function createVideoElement(filePath) {
const videoContainer = document.getElementById(`video-${filePath}`);
videoContainer.outerHTML = `
const videoContainer = document.getElementById(`video-${filePath}`);
videoContainer.outerHTML = `
<video id='video-${filePath}' class="image" autoplay loop muted playsinline>
<source src="/uploads/720p-${filePath}">
</video>
`;
videoContainer.style.display = "block";
document.getElementById(`spinner-${filePath}`).style.display = "none";
videoContainer.style.display = "block";
document.getElementById(`spinner-${filePath}`).style.display = "none";
}
function updateMediaList() {
htmx.ajax("GET", "/media-list", {target: "#embedder-list", swap: "innerHTML"});
htmx.process(document.body);
htmx.ajax("GET", "/media-list", {target: "#embedder-list", swap: "innerHTML"});
htmx.process(document.body);
}
function refreshMediaList(files) {
files.forEach(file => {
console.log(`Checking ${file.path}...`);
if (videoExtensions.includes(extension(file.path))) {
const progressFileName = `uploads/${file.path}-progress.json`;
console.log(`Fetching ${progressFileName}...`);
checkFileAvailability(file.path);
} else {
console.log(`File ${file.path} is not a video, displaying...`);
}
});
files.forEach(file => {
console.log(`Checking ${file.path}...`);
if (videoExtensions.includes(extension(file.path))) {
const progressFileName = `uploads/${file.path}-progress.json`;
console.log(`Fetching ${progressFileName}...`);
checkFileAvailability(file.path);
} else {
console.log(`File ${file.path} is not a video, displaying...`);
}
});
}

View file

@ -14,7 +14,7 @@ import { ffProbe } from "../lib/ffmpeg";
import fs from "fs";
import path from "path";
import { extension, videoExtensions } from "../lib/lib";
import { extension, videoExtensions, oembedObj } from "../lib/lib";
import { db, MediaRow, getPath, deleteId } from "../lib/db";
import { fileStorage } from "../lib/multer";
import {
@ -117,6 +117,43 @@ router.get(
}
);
router.get("/oembed/:file",
async (req: Request, res: Response) => {
const filename = req.params.file;
const fileExtension = filename.slice(filename.lastIndexOf("."));
try {
const oembedData: oembedObj = {
type: (videoExtensions.includes(fileExtension) ? "photo" : "video"),
version: "1.0",
provider_name: "embedder",
provider_url: "https://github.com/WaveringAna/embedder",
cache_age: 86400,
title: filename.slice(0, filename.lastIndexOf(".")),
html: "",
url: `${req.protocol}://${req.get("host")}/uploads/${filename}`
};
if (videoExtensions.includes(fileExtension) || fileExtension === '.gif') {
const ffprobeData = await ffProbe(`uploads/${filename}`, filename, fileExtension);
oembedData.width = ffprobeData.streams[0].width;
oembedData.height = ffprobeData.streams[0].height;
// Consider generating a thumbnail_url if it's a video
} else {
const imageData = await imageProbe(fs.createReadStream(`uploads/${filename}`));
oembedData.width = imageData.width;
oembedData.height = imageData.height;
}
res.json(oembedData);
} catch (error) {
console.error("Error generating oEmbed data:", error);
res.status(500).send("Error generating oEmbed data");
}
}
);
router.post(
"/",
[

View file

@ -12,8 +12,9 @@ const videoExtensions = ['.mp4', '.mov', '.avi', '.flv', '.mkv', '.wmv', '.webm'
<head>
<% if (extension(url)[1] == ".gif") { %>
<meta name="twitter:card" content="summary_large_image">
<link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0]+extension(url)[1] %>.json"></link>
<meta property="og:title" content="<%= extension(url)[0] %>.gif"></meta>
<link rel="alternate" type="application/json+oembed"
href="<%= host %>/oembed/<%= extension(url)[0]+extension(url)[1] %>"></link>
<meta property="og:title" content="<%= extension(url)[0] %>.gif"></meta>
<meta property="og:description" content="Click to view the GIF"></meta>
<meta property="og:site_name" content="embedder"></meta>
<meta property="og:type" content="article"></meta>
@ -24,8 +25,9 @@ const videoExtensions = ['.mp4', '.mov', '.avi', '.flv', '.mkv', '.wmv', '.webm'
<meta property="og:url" content="<%= host %>/uploads/720p-<%= extension(url)[0] %>.gif"></meta>
<% } else if (videoExtensions.includes(extension(url)[1])) { %>
<meta name="twitter:card" content="player">
<link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0]+extension(url)[1] %>.json"></link>
<meta property="og:title" content="<%= extension(url)[0]+extension(url)[1] %>"></meta>
<link rel="alternate" type="application/json+oembed"
href="<%= host %>/oembed/<%= extension(url)[0]+extension(url)[1] %>"></link>
<meta property="og:title" content="<%= extension(url)[0]+extension(url)[1] %>"></meta>
<meta property="og:description" content="Click to view the GIFv"></meta>
<meta property="og:site_name" content="embedder"></meta>
<meta property="og:type" content="article"></meta>
@ -36,8 +38,9 @@ const videoExtensions = ['.mp4', '.mov', '.avi', '.flv', '.mkv', '.wmv', '.webm'
<meta property="og:url" content="<%= host %>/uploads/720p-<%= extension(url)[0]+extension(url)[1] %>.mp4"></meta>
<% } else { %>
<meta name="twitter:card" content="summary_large_image">
<link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0]+extension(url)[1] %>.json"></link>
<meta property="og:title" content="<%= extension(url)[0] + extension(url)[1] %>"></meta>
<link rel="alternate" type="application/json+oembed"
href="<%= host %>/oembed/<%= extension(url)[0]+extension(url)[1] %>"></link>
<meta property="og:title" content="<%= extension(url)[0] + extension(url)[1] %>"></meta>
<meta property="og:description" content="Click to view the image"></meta>
<meta property="og:site_name" content="embedder"></meta>
<meta property="og:type" content="article"></meta>
@ -109,11 +112,15 @@ footer a:hover {
</style>
<body>
<% if (videoExtensions.includes(extension(url)[1])) { %>
<video class="image" width="100%" controls autoplay loop muted><source src="/uploads/720p-<%= extension(url)[0]+extension(url)[1] %>"></video>
<% } else { %>
<img src="/uploads/<%= extension(url)[0] + extension(url)[1] %>" class="image" width="100%">
<% } %>
<div class="container">
<% if (videoExtensions.includes(extension(url)[1])) { %>
<video class="image" width="100%" controls autoplay muted>
<source src="/uploads/720p-<%= extension(url)[0]+extension(url)[1] %>" type="video/mp4">
</video>
<% } else { %>
<img src="/uploads/<%= extension(url)[0] + extension(url)[1] %>" class="image" alt="<%= oembedData.title %>">
<% } %>
</div>
<footer>
<p>Powered by <a href="https://github.com/waveringana/embedder">Embedder</a> created by <a href="https://github.com/waveringana">WaveringAna</a></p>

33
package-lock.json generated
View file

@ -26,7 +26,8 @@
"passport-local": "^1.0.0",
"probe-image-size": "^7.2.3",
"sqlite3": "^5.0.2",
"which": "^4.0.0"
"which": "^4.0.0",
"ws": "^8.17.0"
},
"devDependencies": {
"@types/connect-sqlite3": "^0.9.1",
@ -42,6 +43,7 @@
"@types/passport-local": "^1.0.34",
"@types/probe-image-size": "^7.2.0",
"@types/which": "^3.0.1",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1",
"copyfiles": "^2.4.1",
@ -764,6 +766,15 @@
"integrity": "sha512-OJWjr4k8gS1HXuOnCmQbBrQez+xqt/zqfp5PhgbKtsmEFEuojAg23arr+TiTZZ1TORdUF9RKXb/WKEpT1dwgSg==",
"dev": true
},
"node_modules/@types/ws": {
"version": "8.5.10",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
"integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.46.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz",
@ -4936,6 +4947,26 @@
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"node_modules/ws": {
"version": "8.17.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
"integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

View file

@ -46,7 +46,8 @@
"passport-local": "^1.0.0",
"probe-image-size": "^7.2.3",
"sqlite3": "^5.0.2",
"which": "^4.0.0"
"which": "^4.0.0",
"ws": "^8.17.0"
},
"devDependencies": {
"@types/connect-sqlite3": "^0.9.1",
@ -62,6 +63,7 @@
"@types/passport-local": "^1.0.34",
"@types/probe-image-size": "^7.2.0",
"@types/which": "^3.0.1",
"@types/ws": "^8.5.10",
"@typescript-eslint/eslint-plugin": "^5.46.1",
"@typescript-eslint/parser": "^5.46.1",
"copyfiles": "^2.4.1",