Fix for multiple requests on same pdf + errorcodes

OM-MediaWorks · Jul 26, 2023 · 4add1a6 · 4add1a6
1 parent 18b7caf
commit 4add1a6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 cache
 nottest.ts
 .old
-.env
+.env
+test.html
diff --git a/index.ts b/index.ts
@@ -7,6 +7,7 @@ import * as pdf_handler from "./pdf_handler.ts"
 import * as pdf_to_jpg from "./pdf_to_jpg.ts"
 
 export async function pdfImageConverter(pdfLocation: string, pageToConvert: string){
+    const antiOverlapNum = Math.random()
     const pdfHash = hash.createHash(pdfLocation)
 
     const value_firstToNum = keyword.firstToNum(pageToConvert)
@@ -21,22 +22,22 @@ export async function pdfImageConverter(pdfLocation: string, pageToConvert: stri
         return value_checkCache
     }
 
-    await pdf_handler.fetchPDF(pdfLocation, pdfHash)
+    await pdf_handler.fetchPDF(pdfLocation, antiOverlapNum, pdfHash)
 
-    const pdfLength = await pdf_handler.getPDFLength(pdfHash)
+    const pdfLength = await pdf_handler.getPDFLength(pdfHash, antiOverlapNum)
 
     const value_keywordToPageNum = keyword.keywordToPageNum(pageToConvert, pdfLength)
     if (value_keywordToPageNum !== false) {
         pageNum = value_keywordToPageNum
     }
 
     if (pageNum > 0 && pageNum <= pdfLength){
-        await pdf_to_jpg.pdfToJPG(String(pageNum), pdfHash, pageToConvert, String(pdfLength))
-        await pdf_handler.removeTemp(pdfHash)
+        await pdf_to_jpg.pdfToJPG(String(pageNum), pdfHash, antiOverlapNum, pageToConvert, String(pdfLength))
+        await pdf_handler.removeTemp(pdfHash, antiOverlapNum)
     }
 
     else {
-        await pdf_handler.removeTemp(pdfHash)
+        await pdf_handler.removeTemp(pdfHash, antiOverlapNum)
         throw new Error("Page outside of valid range")
     }
 

diff --git a/pdf_handler.ts b/pdf_handler.ts
@@ -1,27 +1,27 @@
-export async function fetchPDF(pdfLocation:string, hashName:string) {
+export async function fetchPDF(pdfLocation:string, antiOverlapNum:number, hashName:string) {
     const buffer = await fetch(pdfLocation).then((response) => response.arrayBuffer())
     const uint8arr = new Uint8Array(buffer)
-    await Deno.writeFile(`${hashName}.pdf`, uint8arr)
+    await Deno.writeFile(`${hashName+antiOverlapNum}.pdf`, uint8arr)
 }
 
-export async function removeTemp(hashName:string) {
-    await Deno.remove(`${hashName}.pdf`)
+export async function removeTemp(hashName:string, antiOverlapNum:number) {
+    await Deno.remove(`${hashName+antiOverlapNum}.pdf`)
 }
 
-export async function getPDFLength(hashName:string, pageInfoOffset = 16) {
+export async function getPDFLength(hashName:string, antiOverlapNum:number, pageInfoOffset = 16) {
     const getPDFInfo = new Deno.Command("pdfinfo", {
         args: [
-            `${hashName}.pdf`
+            `${hashName+antiOverlapNum}.pdf`
         ]
     })
     const{stdout, stderr} = await getPDFInfo.output()
     if (stderr[0] != undefined){
         if ((new TextDecoder().decode(stderr)).search("May not be a PDF file")) {
-            await(removeTemp(hashName))
+            await(removeTemp(hashName, antiOverlapNum))
             throw new Error("Error reading PDF info, PDF file may not be present at this URL")
         }
         else {
-            await(removeTemp(hashName))
+            await(removeTemp(hashName, antiOverlapNum))
             throw new Error("Error reading PDF info")
         }
     }

diff --git a/pdf_to_jpg.ts b/pdf_to_jpg.ts
@@ -1,8 +1,8 @@
-export async function pdfToJPG(pageNum:string, fileName:string, pageToConvert:string, totalPages:string){
+export async function pdfToJPG(pageNum:string, fileName:string, antiOverlapNum:number, pageToConvert:string, totalPages:string){
   const cacheName = `./cache/${fileName}`
   const convertCommand = new Deno.Command("pdftoppm", {
     args: [
-      '-jpeg', `${fileName}.pdf`, '-f', pageNum,'-l', pageNum, cacheName
+      '-jpeg', `${fileName+antiOverlapNum}.pdf`, '-f', pageNum,'-l', pageNum, cacheName
     ]
   })
   await convertCommand.output()

diff --git a/server.ts b/server.ts
@@ -18,11 +18,13 @@ app.use(async (context, next) => {
     try {
       await next();
     } catch (error) {
-        context.response.type = "json";
+        context.response.type = "json"
+        context.response.status = 500
 
         let message =  String(error)
 
         if (error instanceof ZodError) {
+            context.response.status = 400
             const jsonBody = JSON.parse(error.message)
             message = jsonBody?.[0]?.message ?? ''