save file

Author: javascript-2020

blog/26-02-05/request-url-to-absolute-filename/ex/resolve.js

@@ -1,12 +1,12 @@
 
 /*
   requires
-    path
+    path,fs
 */
 
         resolve.df    = false;
 
-        function resolve(url,docroot='.'){
+        async function resolve(url,docroot='.'){
                                                                                 resolve.df && console.log('=== resolve v2.0 ===');
                                                                                 resolve.df && console.log('url :',url);
                                                                                 resolve.df && console.log('docroot :',docroot);
@@ -23,7 +23,8 @@
               }//catch
               if(err){
                                                                                 resolve.df && console.error(err);
-                    return false;
+                    var error   = 'invalid url';
+                    return {error};
               }
 
               url         = url.slice(1);
@@ -32,18 +33,34 @@
               root       += path.sep;
                                                                                 resolve.df && console.log('root :',root);
               var abs     = path.resolve(docroot,url);
+              var err;
+              try{
+              
+                    var stat    = await fs.promises.stat(abs);
+                    
+              }//try
+              catch(err2){
+              
+                    err   = err2;
+                    
+              }//catch
+              if(err){
+                    var error   = err.toString();
+                    return {error}
+              }
+              if(stat.isDirectory()){
+                    abs  += path.sep;
+              }
                                                                                 resolve.df && console.log('abs :',abs);
 
               if(!abs.startsWith(root)){
                                                                                 resolve.df && console.log('fail');
-                    return false;
+                    var error   = 'resolve';
+                    return {error};
               }
 
-              if(url.endsWith('/')){
-                    abs  += '/';
-              }
                                                                                 resolve.df && console.log('ok',abs);
-              return abs;
+              return {abs};
 
         }//resolve