configurapi 1.6.8 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configurapi",
-  "version": "1.6.8",
+  "version": "1.7.0",
   "description": "A configurable API framework",
   "main": "src/configurapi.js",
   "types": "src/configurapi.d.ts",

package/src/config.js

@@ -5,6 +5,16 @@ let LogLevel = require('./logLevel');
 let yaml = require('js-yaml');
 let fs = require('fs');
 let NestedError = require('nested-error-stacks');
+const nodePath = require('path');
+
+function getPathParentDir(path)
+{
+    if (!nodePath.isAbsolute(path))
+    {
+        path = nodePath.resolve(process.cwd(), path);
+    }
+    return nodePath.parse(path).dir
+}
 
 module.exports = class Config
 {
@@ -27,10 +37,10 @@ module.exports = class Config
             throw new NestedError(`Failed to load '${path}'`, error);
         }
 
-        return this.parse(content);
+        return this.parse(content, getPathParentDir(path));
     }
 
-    static parse(content)
+    static parse(content, parentDirectory)
     {
         
         let document = yaml.safeLoad(content);
@@ -39,7 +49,7 @@ module.exports = class Config
         {
             let config = new Config();
             
-            config.modules = this.parseImport(document);
+            config.modules = this.parseImport(document, parentDirectory);
             config.events = this.parseApi(document);
 
             return config;
@@ -50,7 +60,7 @@ module.exports = class Config
         }
     }
 
-    static parseImport(document) 
+    static parseImport(document, parentDirectory) 
     {
         let result = [];
 
@@ -64,6 +74,10 @@ module.exports = class Config
             
             for(let module of document['import'])
             {
+                if (module.startsWith('.'))
+                {
+                    module = nodePath.resolve(parentDirectory, module);
+                }
                 result.push(module);
             }
         } 
@@ -210,4 +224,4 @@ module.exports = class Config
         
         return policy.parameters || []
     }
-};
+};

package/src/policy/policy.js

@@ -1,5 +1,4 @@
 const Result = require('../result');
-const getParams = require('get-parameter-names');
 const EventEmitter = require('events').EventEmitter;
 const LogLevel = require('../logLevel')
 
@@ -31,22 +30,14 @@ module.exports = class Policy extends EventEmitter
                 let handlerParams = this.parameters instanceof Array ? this.parameters.slice(0) : [];
                 handlerParams.unshift(event);
 
-                let something = this.handler.apply(context, handlerParams);
-                
-                if(something instanceof Promise)
+                try
                 {
-                    something.then(()=>
-                    {
-                        resolve(state);
-                    })
-                    .catch((error)=>
-                    {
-                        reject(error);
-                    })
+                    await this.handler.apply(context, handlerParams);
+                    resolve(state);
                 }
-                else
+                catch (error)
                 {
-                    resolve(state);
+                    reject(error);
                 }
             });
     }

package/src/service.js

@@ -83,11 +83,17 @@ module.exports = class Service extends events.EventEmitter
             this.emit(LogLevel.Trace, `configurapi -  - Registerd ${route.name} route.`);
         });
 
-        this._handleEvent('on_start');
+        this.onStartPromise = this._handleEvent('on_start');
     }
 
     async process(event) 
     {
+        if (!this.isReady)
+        {
+            await this.onStartPromise
+            this.isReady = true;
+        }
+
         let watch = new Stopwatch();
 
         try