qcobjects-cli 2.3.43 → 2.3.50

package/VERSION

@@ -1 +1 @@
-2.3.43
+2.3.50

package/org.quickcorp.qcobjects.defaultsettings.js

@@ -132,10 +132,15 @@ try {
   /* Auto Discover dependencies (lib, handlers, commands) */
   const path = require("path");
   const projectPath = CONFIG.get("projectPath", `${process.cwd()}/`);
+  const hasKeyword = (p,keyword) => {
+    const {keywords} = require(`${findPackageNodePath(p)}/${p}/package.json`);
+    return typeof keywords !== "undefined" && keywords.includes(keyword);
+  };
+
   const loadLibs = async () => {
     let _ret_;
     if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_libs",false)){
-      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("qcobjects-lib")).map((p)=>Import(p))).then(()=>logger.info("Libs loaded"));
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-lib")).map((p)=>Import(p))).then(()=>logger.info("Libs loaded"));
     } else {
       _ret_ = Promise.resolve();
       logger.debug("To load libs, set autodiscover_libs to true in your config.json");
@@ -145,7 +150,7 @@ try {
   const loadHandlers = async () => {
     let _ret_;
     if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_handlers",false)){
-      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("qcobjects-handler")).map((p)=>Import(p))).then(()=>logger.info("Handlers loaded"));
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-handler")).map((p)=>Import(p))).then(()=>logger.info("Handlers loaded"));
     } else {
       _ret_ = Promise.resolve();
       logger.debug("To load handlers, set autodiscover_handlers to true in your config.json");
@@ -155,7 +160,7 @@ try {
   const loadCommands = async () => {
     let _ret_;
     if (CONFIG.get("autodiscover", false) || CONFIG.get("autodiscover_commands",false)){
-      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>require(`${findPackageNodePath(p)}/${p}/package.json`).keywords.includes("qcobjects-command")).map((p)=>Import(p))).then(()=>logger.info("Commands loaded"));
+      _ret_ = Promise.all(Object.keys(require(`${projectPath}/package.json`).dependencies).filter((p)=>hasKeyword(p,"qcobjects-command")).map((p)=>Import(p))).then(()=>logger.info("Commands loaded"));
     } else {
       _ret_ = Promise.resolve();
       logger.debug("To load commands, set autodiscover_commands to true in your config.json");

package/org.quickcorp.qcobjects.main.http.gae.server.js

@@ -33,7 +33,6 @@
 const path = require("path");
 const absolutePath = path.resolve( __dirname, "./" );
 
-const http2 = require("http2");
 const fs = require("fs");
 const mime = require("mime");
 require(absolutePath+"/org.quickcorp.qcobjects.main.file.js");
@@ -291,6 +290,7 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
     response:"",
     server:null,
     scriptname:"",
+    interceptorInstances:[],
     showIPAddress:function (){
       var _ret_ = "";
       var os = require("os");
@@ -341,6 +341,26 @@ Package("org.quickcorp.qcobjects.main.http.gae.server",[
 
       server.on("error", (err) => console.error(err));
 
+      if (global.get("backendAvailable")){
+        logger.info("Loading backend interceptors...");
+        let interceptors = CONFIG.get("backend",{}).interceptors;
+        if (typeof interceptors !== "undefined"){
+          logger.info("Backend Interceptors Available");
+          interceptors.map(interceptor=>{
+            ImportMicroservice (interceptor.microservice);
+            var interceptorClassFactory = ClassFactory(interceptor.microservice+".Interceptor");
+            var interceptorInstance = New(interceptorClassFactory,{
+              domain:CONFIG.get("domain"),
+              basePath:CONFIG.get("basePath"),
+              projectPath:CONFIG.get("projectPath"),
+              interceptor:interceptor,
+              server:server
+            });
+            oHTTPServer.interceptorInstances.push(interceptorInstance);
+          });
+        }
+      }
+
       server.on("request", (req, res) => {
 
         let request = Object.assign(New(HTTPServerRequest),require("url").parse(req.url));

package/org.quickcorp.qcobjects.main.http.server.js

@@ -33,7 +33,6 @@
 const path = require("path");
 const absolutePath = path.resolve( __dirname, "./" );
 
-const http2 = require("http2");
 const fs = require("fs");
 const mime = require("mime");
 require(absolutePath+"/org.quickcorp.qcobjects.main.file.js");
@@ -291,6 +290,7 @@ Package("org.quickcorp.qcobjects.main.http.server",[
     response:"",
     server:null,
     scriptname:"",
+    interceptorInstances:[],
     showIPAddress:function (){
       var _ret_ = "";
       var os = require("os");
@@ -341,6 +341,26 @@ Package("org.quickcorp.qcobjects.main.http.server",[
 
       server.on("error", (err) => console.error(err));
 
+      if (global.get("backendAvailable")){
+        logger.info("Loading backend interceptors...");
+        let interceptors = CONFIG.get("backend",{}).interceptors;
+        if (typeof interceptors !== "undefined"){
+          logger.info("Backend Interceptors Available");
+          interceptors.map(interceptor=>{
+            ImportMicroservice (interceptor.microservice);
+            var interceptorClassFactory = ClassFactory(interceptor.microservice+".Interceptor");
+            var interceptorInstance = New(interceptorClassFactory,{
+              domain:CONFIG.get("domain"),
+              basePath:CONFIG.get("basePath"),
+              projectPath:CONFIG.get("projectPath"),
+              interceptor:interceptor,
+              server:server
+            });
+            oHTTPServer.interceptorInstances.push(interceptorInstance);
+          });
+        }
+      }
+
       server.on("request", (req, res) => {
 
         let request = Object.assign(New(HTTPServerRequest),require("url").parse(req.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.3.43",
+  "version": "2.3.50",
   "description": "qcobjects cli command line tool",
   "main": "qcobjects-cli.js",
   "scripts": {