fix: fix the bug when delete a file

jacobbubu · Oct 23, 2020 · 58b746a · 58b746a
1 parent 933be39
commit 58b746a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/jacobbubu-rest-file-server-0.0.0.tgz b/jacobbubu-rest-file-server-0.0.0.tgz
diff --git a/src/index.ts b/src/index.ts
@@ -131,17 +131,21 @@ export class FileServer {
 
     app.get(`/${_options.route}/:filename`, (request, response) => {
       const result = readFile(request.params.filename)
+      if (result.status >= 200 && result.status < 300) {
+        response.writeHead(result.status, {
+          'Content-Type': 'application/octet-stream',
+          'Content-disposition': 'attachment;filename=' + result.filename ?? 'temp.dat',
+        })
+        response.end(result.data, 'binary')
 
-      response.writeHead(200, {
-        'Content-Type': 'application/octet-stream',
-        'Content-disposition': 'attachment;filename=' + result.filename ?? 'temp.dat',
-      })
-      response.end(result.data, 'binary')
+        return
+      }
+      response.status(result.status).send(result.data)
     })
 
     app.delete(`/${_options.route}/:filename`, (request, response) => {
       const result = removeFile(request.params.filename)
-      response.status(result.status)
+      response.status(result.status).send({})
     })
 
     app.post(`/${_options.route}`, upload.single('file'), async (request, response) => {

diff --git a/test/basic.test.ts b/test/basic.test.ts
@@ -37,11 +37,18 @@ describe('basic', () => {
     })
 
     superagent.get(url + '/' + fileName).pipe(
-      concat((result) => {
+      concat(async (result) => {
         const elapsed = Date.now() - startTime
         expect(elapsed).toBeLessThan(500)
         expect(result.toString('utf8')).toBe(expectedContent)
-        done()
+
+        await superagent.del(url + '/' + fileName)
+        try {
+          await superagent.get(url + '/' + fileName)
+        } catch (err) {
+          expect(err.status).toBe(404)
+          done()
+        }
       })
     )
   })