qcobjects-cli 2.3.49 → 2.4.21

package/org.quickcorp.qcobjects.defaultsettings.js

@@ -1,5 +1,5 @@
 /**
- * QCObjects CLI 2.3.x
+ * QCObjects CLI 2.4.x
  * ________________
  *
  * Author: Jean Machuca <correojean@gmail.com>

package/org.quickcorp.qcobjects.main.file.js

@@ -1,5 +1,5 @@
 /**
- * QCObjects CLI 2.3.x
+ * QCObjects CLI 2.4.x
  * ________________
  *
  * Author: Jean Machuca <correojean@gmail.com>
@@ -33,84 +33,41 @@ const path = require("path");
 const fs = require("fs");
 const mime = require("mime");
 
-const absolutePath = path.resolve( __dirname, "./" );
+const absolutePath = path.resolve(__dirname, "./");
 
-Package("org.quickcorp.qcobjects.main.file",[
-  Class("FileDispatcher",{
-    name:CONFIG.get("documentRootFileIndex"),
-    template:"",
-    templateURI:CONFIG.get("documentRootFileIndex"),
-    headers:{},
-    body:"",
-    filename:"",
-    file_extension:function (){
-      return this.filename.substr(this.filename.indexOf("."));
-    },
-    isTemplate:function (){
-      return CONFIG.get("useTemplate") && (this.file_extension()==".html" || this.file_extension() == ".tpl.html");
-    },
-    _done:function (){
-      var appTemplateInstance = this;
-      const source = appTemplateInstance.template;
-      if (appTemplateInstance.isTemplate()){
+Package("org.quickcorp.qcobjects.main.file", [
+  class FileDispatcher extends InheritClass {
+    constructor({
+      name = CONFIG.get("documentRootFileIndex"),
+      template = "",
+      templateURI = CONFIG.get("documentRootFileIndex"),
+      headers = {},
+      body = "",
+      filename = ""
+    }) {
+      super(...arguments);
 
-        (New(Component, {
-          name: "static_source",
-          template: source,
-          cached:false,
-          tplsource: "inline",
-          data: {
-            title: "QCObjects"
-          },
-          done ({request, component}) {
-            appTemplateInstance.body = component.parsedAssignmentText;
-            return Promise.resolve({request, component});
-          }
-        }));
+      var o = this;
 
-      } else {
-        appTemplateInstance.body = source;
-      }
-
-      if ([".png",
-            ".jpg",
-            ".jpeg",
-            ".json",
-            ".html",
-            ".tpl.html",
-            ".css",
-            ".js",
-            ".svg"].includes(appTemplateInstance.file_extension())){
-        appTemplateInstance.headers["content-type"]=mime.getType(appTemplateInstance.templateURI);
-        appTemplateInstance.headers["cache-control"]=CONFIG.get("cacheControl", "max-age=31536000");
-        appTemplateInstance.done.call(appTemplateInstance,
-                                      appTemplateInstance.headers,
-                                      appTemplateInstance.body,
-                                      appTemplateInstance.templateURI,
-                                      appTemplateInstance.isTemplate());
-      } else {
-        appTemplateInstance.done.call(appTemplateInstance,
-                                      {
-                                        ":status": 403,
-                                        "content-type": "text/plain"
-                                      },
-                                      "FORBIDDEN","notfound.html",false);
-      }
-    },
-    done:function (headers,body){},
-    _new_:function (o){
       var scriptname = o.scriptname;
       this.filename = scriptname;
-      var pathname = (o.pathname !== "")?(o.pathname+"/"):("");
+      var pathname = (o.pathname !== "") ? (o.pathname + "/") : ("");
       var appTemplateInstance = this;
+      if (typeof appTemplateInstance.headers === "undefined"){
+        appTemplateInstance.headers = {
+          ":status": 500,
+          "content-type": "text/html"
+        };
+      }
+
       appTemplateInstance.done = o.done;
-      appTemplateInstance.templateURI = CONFIG.get("documentRoot")+pathname+scriptname;
-      appTemplateInstance.templateURI = appTemplateInstance.templateURI.replace("//","/");
+      appTemplateInstance.templateURI = CONFIG.get("documentRoot") + pathname + scriptname;
+      appTemplateInstance.templateURI = appTemplateInstance.templateURI.replace("//", "/");
 
-      if (appTemplateInstance.isTemplate()){
-        fs.readFile(appTemplateInstance.templateURI, function(err, data) {
-          logger.debug("reading data from "+appTemplateInstance.templateURI);
-          if (typeof data !== "undefined"){
+      if (appTemplateInstance.isTemplate()) {
+        fs.readFile(appTemplateInstance.templateURI, function (err, data) {
+          logger.debug("reading data from " + appTemplateInstance.templateURI);
+          if (typeof data !== "undefined") {
             appTemplateInstance.template = data.toString();
             appTemplateInstance._done.call(appTemplateInstance);
           } else {
@@ -119,20 +76,84 @@ Package("org.quickcorp.qcobjects.main.file",[
               "content-type": "text/html"
             };
             appTemplateInstance.done.call(appTemplateInstance,
-                                          appTemplateInstance.headers,
-                                          "FILE NOT FOUND","notfound.html",false);
+              appTemplateInstance.headers,
+              "FILE NOT FOUND", "notfound.html", false);
             logger.debug("file not found");
           }
         });
       } else {
-        appTemplateInstance.headers[":status"]=200;
-        appTemplateInstance.headers["content-type"]=mime.getType(appTemplateInstance.templateURI);
+        appTemplateInstance.headers[":status"] = 200;
+        appTemplateInstance.headers["content-type"] = mime.getType(appTemplateInstance.templateURI);
         appTemplateInstance.done.call(appTemplateInstance,
-                                      appTemplateInstance.headers,
-                                      "",appTemplateInstance.templateURI,false);
+          appTemplateInstance.headers,
+          "", appTemplateInstance.templateURI, false);
       }
 
       logger.info("FileDispatcher initialized");
+
+    }
+
+    file_extension() {
+      return this.filename.substr(this.filename.indexOf("."));
+    }
+    isTemplate() {
+      return CONFIG.get("useTemplate") && (this.file_extension() == ".html" || this.file_extension() == ".tpl.html");
     }
-  })
-]);
+    _done() {
+      var appTemplateInstance = this;
+      const source = appTemplateInstance.template;
+      if (appTemplateInstance.isTemplate()) {
+
+        (New(Component, {
+          name: "static_source",
+          template: source,
+          cached: false,
+          tplsource: "inline",
+          data: {
+            title: "QCObjects"
+          },
+          done({
+            request,
+            component
+          }) {
+            appTemplateInstance.body = component.parsedAssignmentText;
+            return Promise.resolve({
+              request,
+              component
+            });
+          }
+        }));
+
+      } else {
+        appTemplateInstance.body = source;
+      }
+
+      if ([".png",
+          ".jpg",
+          ".jpeg",
+          ".json",
+          ".html",
+          ".tpl.html",
+          ".css",
+          ".js",
+          ".svg"
+        ].includes(appTemplateInstance.file_extension())) {
+        appTemplateInstance.headers["content-type"] = mime.getType(appTemplateInstance.templateURI);
+        appTemplateInstance.headers["cache-control"] = CONFIG.get("cacheControl", "max-age=31536000");
+        appTemplateInstance.done.call(appTemplateInstance,
+          appTemplateInstance.headers,
+          appTemplateInstance.body,
+          appTemplateInstance.templateURI,
+          appTemplateInstance.isTemplate());
+      } else {
+        appTemplateInstance.done.call(appTemplateInstance, {
+            ":status": 403,
+            "content-type": "text/plain"
+          },
+          "FORBIDDEN", "notfound.html", false);
+      }
+    }
+    done(headers, body) {}
+
+  }
+]);