additional error handling

ricsam · Apr 19, 2020 · 89998f2 · 89998f2
1 parent af259f8
commit 89998f2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/expressMiddleware.ts b/src/expressMiddleware.ts
@@ -16,6 +16,7 @@ export const expressMiddleware = (
       res.setHeader('Allow', 'GET, HEAD');
       res.setHeader('Content-Length', '0');
       res.end();
+      next();
       return;
     }
     const fpath = parse(req.url as string).pathname;
@@ -26,8 +27,15 @@ export const expressMiddleware = (
     }
 
     const stream = createReadStream(fpath);
-    stream.on('error', function error(err) {
-      next(err);
+    stream.once('error', function error(err) {
+      // next(err);
+      if (err.name === 'NoSuchKey') {
+        (res as any).statusCode = 404;
+        res.write('Not found');
+        res.end();
+      } else {
+        next(err);
+      }
     });
     stream.pipe(res);
   };

diff --git a/src/nafs.ts b/src/nafs.ts
@@ -123,17 +123,12 @@ const activeStorageS3Serve: NAFSFactory = (url) => {
     path.join(rootPath, fpath).replace(/^\//, '');
 
   const readRemoteStream = (fpath: string) => {
-    try {
-      return s3
-        .getObject({
-          Bucket: bucket,
-          Key: getS3Path(fpath),
-        })
-        .createReadStream();
-    } catch (err) {
-      console.log('Yes');
-    }
-    return new stream.PassThrough();
+    return s3
+      .getObject({
+        Bucket: bucket,
+        Key: getS3Path(fpath),
+      })
+      .createReadStream();
   };
 
   let cachePath: string | undefined;