murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Export jobs, removed unused opcode

Browse source
This commit is contained in:
TheEssem 2021-05-17 22:37:40 -05:00
parent 753bf84f78
commit 7aa684eae6
No known key found for this signature in database
GPG key ID: A3F9F02129092FCA
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
utils/image.js
View file

@ -10,12 +10,10 @@ const logger = require("./logger.js");
const formats = ["image/jpeg", "image/png", "image/webp", "image/gif", "video/mp4", "video/webm", "video/mov"]; const formats = ["image/jpeg", "image/png", "image/webp", "image/gif", "video/mp4", "video/webm", "video/mov"];
const jobs = {}; exports.jobs = {};
exports.connections = []; exports.connections = [];
const statuses = {};
exports.servers = JSON.parse(fs.readFileSync("./servers.json", { encoding: "utf8" })).image; exports.servers = JSON.parse(fs.readFileSync("./servers.json", { encoding: "utf8" })).image;
const chooseServer = async (ideal) => { const chooseServer = async (ideal) => {
@ -83,34 +81,31 @@ exports.connect = (server) => {
const req = msg.slice(37, msg.length); const req = msg.slice(37, msg.length);
const uuid = msg.slice(1, 37).toString(); const uuid = msg.slice(1, 37).toString();
if (opcode === 0x00) { // Job queued if (opcode === 0x00) { // Job queued
if (jobs[req]) { if (this.jobs[req]) {
jobs[req].event.emit("uuid", uuid); this.jobs[req].event.emit("uuid", uuid);
} }
} else if (opcode === 0x01) { // Job completed successfully } else if (opcode === 0x01) { // Job completed successfully
// the image API sends all job responses over the same socket; make sure this is ours // the image API sends all job responses over the same socket; make sure this is ours
if (jobs[uuid]) { if (this.jobs[uuid]) {
const imageReq = await fetch(`http://${connection.remoteAddress}:8081/image?id=${uuid}`); const imageReq = await fetch(`http://${connection.remoteAddress}:8081/image?id=${uuid}`);
const image = await imageReq.buffer(); const image = await imageReq.buffer();
// The response data is given as the file extension/ImageMagick type of the image (e.g. "png"), followed // The response data is given as the file extension/ImageMagick type of the image (e.g. "png"), followed
// by a newline, followed by the image data. // by a newline, followed by the image data.
jobs[uuid].event.emit("image", image, imageReq.headers.get("ext")); this.jobs[uuid].event.emit("image", image, imageReq.headers.get("ext"));
} }
} else if (opcode === 0x02) { // Job errored } else if (opcode === 0x02) { // Job errored
if (jobs[uuid]) { if (this.jobs[uuid]) {
jobs[uuid].event.emit("error", new Error(req)); this.jobs[uuid].event.emit("error", new Error(req));
} }
} else if (opcode === 0x03) {
// we use the uuid part here because queue info requests don't respond with one
statuses[`${connection.remoteAddress}:${connection.remotePort}`] = parseInt(uuid);
} }
}); });
connection.on("error", (e) => { connection.on("error", (e) => {
logger.error(e.toString()); logger.error(e.toString());
}); });
connection.once("close", () => { connection.once("close", () => {
for (const uuid of Object.keys(jobs)) { for (const uuid of Object.keys(this.jobs)) {
if (jobs[uuid].addr === connection.remoteAddress) jobs[uuid].event.emit("error", "Job ended prematurely due to a closed connection; please run your image job again"); if (this.jobs[uuid].addr === connection.remoteAddress) this.jobs[uuid].event.emit("error", "Job ended prematurely due to a closed connection; please run your image job again");
} }
}); });
this.connections.push(connection); this.connections.push(connection);
@ -122,9 +117,9 @@ exports.disconnect = async () => {
for (const connection of this.connections) { for (const connection of this.connections) {
connection.destroy(); connection.destroy();
} }
for (const uuid of Object.keys(jobs)) { for (const uuid of Object.keys(this.jobs)) {
jobs[uuid].event.emit("error", "Job ended prematurely (not really an error; just run your image job again)"); this.jobs[uuid].event.emit("error", "Job ended prematurely (not really an error; just run your image job again)");
delete jobs[uuid]; delete this.jobs[uuid];
} }
this.connections = []; this.connections = [];
return; return;
@ -208,13 +203,13 @@ const start = (object, num) => {
const event = new EventEmitter(); const event = new EventEmitter();
return new Promise((resolve) => { return new Promise((resolve) => {
event.once("uuid", (uuid) => resolve({ event, uuid, addr })); event.once("uuid", (uuid) => resolve({ event, uuid, addr }));
jobs[num] = { event, addr }; this.jobs[num] = { event, addr };
}); });
}, (result) => { }, (result) => {
throw result; throw result;
}).then(data => { }).then(data => {
delete jobs[num]; delete this.jobs[num];
jobs[data.uuid] = { event: data.event, addr: data.addr }; this.jobs[data.uuid] = { event: data.event, addr: data.addr };
return { uuid: data.uuid, event: data.event }; return { uuid: data.uuid, event: data.event };
}); });
}; };
@ -269,7 +264,7 @@ exports.run = object => {
// Connect to best image server // Connect to best image server
const num = Math.floor(Math.random() * 100000).toString().slice(0, 5); const num = Math.floor(Math.random() * 100000).toString().slice(0, 5);
const timeout = setTimeout(() => { const timeout = setTimeout(() => {
if (jobs[num]) delete jobs[num]; if (this.jobs[num]) delete this.jobs[num];
reject("the image request timed out after 25 seconds. Try uploading your image elsewhere."); reject("the image request timed out after 25 seconds. Try uploading your image elsewhere.");
}, 25000); }, 25000);
start(object, num).catch(err => { // incredibly hacky code incoming start(object, num).catch(err => { // incredibly hacky code incoming
@ -280,7 +275,7 @@ exports.run = object => {
clearTimeout(timeout); clearTimeout(timeout);
if (!data.event) reject("Not connected to image server"); if (!data.event) reject("Not connected to image server");
data.event.once("image", (image, type) => { data.event.once("image", (image, type) => {
delete jobs[data.uuid]; delete this.jobs[data.uuid];
const payload = { const payload = {
// Take just the image data // Take just the image data
buffer: image, buffer: image,