From 8b73df366007f09011b5a144b88ebbb9eca11fd0 Mon Sep 17 00:00:00 2001 From: Minzkraut Date: Thu, 1 Jun 2023 22:45:05 +0200 Subject: [PATCH] Remove deprecated API routes --- src/index.js | 58 ---------------------------------------------------- 1 file changed, 58 deletions(-) diff --git a/src/index.js b/src/index.js index 5fe7bd9..c62b141 100644 --- a/src/index.js +++ b/src/index.js @@ -32,15 +32,11 @@ app.use('/example', express.static(path.join(__dirname, 'example'))); app.get('/jobs', (req, res) => { let queued = Object.values(jobs['queued']); - let waiting = Object.values(jobs['waiting']); - let finished = Object.values(jobs['finished']); res.json( { 'jobs': { 'queued': { 'count': queued.length, 'items': queued }, - 'waiting': { 'count': waiting.length, 'items': waiting }, - 'finished': { 'count': finished.length, 'items': finished }, } } ); @@ -79,60 +75,6 @@ app.post("/jobs", async (req, res) => { res.json({ 'jobId': jobId, "path": result["path"] }); }); -app.get("/batch", async (req, res) => { - let queued = Object.values(jobs['queued']); - const batchSize = req.query.size || Math.min(queued.length, 10); - let assignedJobs = [] - for (let index = 0; index < batchSize; index++) { - let job = queued[index] - assignedJobs.push(job); - jobs['waiting'][job['jobId']] = job; - delete jobs['queued'][job['jobId']]; - console.log(`Handed out Job ${job['jobId']}`); - } - res.json({ 'count': assignedJobs.length, 'jobs': assignedJobs }); -}); - -app.post("/jobs/:jobId/completed", async (req, res) => { - const jobId = req.params.jobId; - const jobResult = req.body; - - if(jobs['queued'][jobId]) { - res.status(400).send({ 'message': 'This Job has not been handed out yet!' }); - return; - } - - if (jobs['waiting'][jobId]) { - jobs['finished'][jobId] = jobs['waiting'][jobId]; - jobs['finished'][jobId]['result'] = jobResult; - delete jobs['waiting'][jobId]; - console.log(`Completed Job ${jobId}`); - res.json({message: `Job successfully completed`}); - - let callbackUrl = jobs['finished'][jobId]['callback']; - if(callbackUrl) { - axios.post(callbackUrl, JSON.stringify(jobResult), { - headers: { - 'Content-Type': 'application/json' - }}) - .then(response => { - console.log(`Callback Succesful for Job ${jobId}`); - }) - .catch(error => { - console.log(`Callback Error on Job ${jobId}: ${error}`); - }); - } - return; - } - - if(jobs['finished'][jobId]) { - res.status(400).send({ 'message': 'Job already completed!' }); - return; - } - - res.status(400).send({ 'message': `Job ${jobId} not found` }); -}); - wss.on('connection', function connection(ws) { var nodeID = uuid.v4(); ws.nodeID = nodeID;