lambder 1.0.3 → 1.0.4

package/dist/Resolver.d.ts

@@ -61,6 +61,7 @@ export default class Resolver {
         reject: (err: Error) => void;
     });
     private readFileSync;
+    private checkFileExist;
     raw(param: ResolverResponse): ResolverResponse;
     json(data: {
         [key: string]: any;
@@ -83,7 +84,7 @@ export default class Resolver {
     }): ResolverResponse;
     file(filePath: string, headers?: {
         [key: string]: string | string[];
-    }): ResolverResponse;
+    }, fallbackFilePath?: string): ResolverResponse;
     api({ payload, error, ...other }: {
         payload?: any;
         error?: any;

package/dist/Resolver.js

@@ -34,13 +34,21 @@ export default class Resolver {
         });
     }
     readFileSync(filePath) {
-        const __dirname = pathLibrary.resolve(pathLibrary.dirname(""));
-        const absolutePath = pathLibrary.resolve(filePath);
         const publicPath = pathLibrary.resolve(this.publicPath);
+        const absolutePath = pathLibrary.resolve(publicPath, filePath);
         if (!absolutePath.includes(publicPath)) {
             return "forbiddenpath";
         }
-        return fs.readFileSync(filePath);
+        return fs.readFileSync(absolutePath);
+    }
+    ;
+    checkFileExist(filePath) {
+        const absolutePath = pathLibrary.resolve(filePath);
+        const publicPath = pathLibrary.resolve(this.publicPath);
+        if (!absolutePath.includes(publicPath)) {
+            return false;
+        }
+        return fs.existsSync(absolutePath);
     }
     ;
     raw(param) {
@@ -110,9 +118,13 @@ export default class Resolver {
         });
     }
     ;
-    file(filePath, headers) {
-        if (!fs.existsSync(filePath))
+    file(filePath, headers, fallbackFilePath) {
+        if (!this.checkFileExist(filePath)) {
+            if (fallbackFilePath && this.checkFileExist(fallbackFilePath)) {
+                return this.file(fallbackFilePath, headers);
+            }
             return this.json({ error: "File not found: " + filePath });
+        }
         const mimeType = mimeTypeResolver.lookup(filePath);
         const body = this.readFileSync(filePath);
         const bodyBase64 = Buffer.from(body).toString("base64");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Resolver.ts

@@ -80,11 +80,16 @@ export default class Resolver {
     }
 
     private readFileSync(filePath: string){
-        const __dirname = pathLibrary.resolve(pathLibrary.dirname(""));
-        const absolutePath = pathLibrary.resolve(filePath);
         const publicPath = pathLibrary.resolve(this.publicPath);
+        const absolutePath = pathLibrary.resolve(publicPath, filePath);
         if(!absolutePath.includes(publicPath)){ return "forbiddenpath"; }
-        return fs.readFileSync(filePath);
+        return fs.readFileSync(absolutePath);
+    };
+    private checkFileExist(filePath: string){
+        const absolutePath = pathLibrary.resolve(filePath);
+        const publicPath = pathLibrary.resolve(this.publicPath);
+        if(!absolutePath.includes(publicPath)){ return false; }
+        return fs.existsSync(absolutePath);
     };
 
     raw(param: ResolverResponse){
@@ -174,8 +179,14 @@ export default class Resolver {
 	file(
         filePath: string, 
         headers?: { [key:string]: string|string[] },
+        fallbackFilePath?: string,
     ):ResolverResponse{
-        if(!fs.existsSync(filePath)) return this.json({ error: "File not found: " + filePath });
+        if(!this.checkFileExist(filePath)){
+            if(fallbackFilePath && this.checkFileExist(fallbackFilePath)){
+                return this.file(fallbackFilePath, headers);
+            }
+            return this.json({ error: "File not found: " + filePath })
+        }
         const mimeType = mimeTypeResolver.lookup(filePath);
         const body = this.readFileSync(filePath);
         const bodyBase64 = Buffer.from(body).toString("base64");