qcobjects-cli 2.4.64 → 2.4.66

package/VERSION

@@ -1 +1 @@
-2.4.64
+2.4.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.4.64",
+  "version": "2.4.66",
   "description": "qcobjects cli command line tool",
   "main": "src/index.cjs",
   "module": "src/index.mjs",

package/src/backend/com.qcobjects.backend.microservice.static.js

@@ -63,7 +63,6 @@ Package("com.qcobjects.backend.microservice.static", [
           };
           if (typeof microservice.route.responseHeaders !== "undefined") {
             headers = Object.assign(headers, microservice.route.responseHeaders);
-            console.log(headers);
           }
 
           stream.respondWithFD(fd, headers);
@@ -74,8 +73,7 @@ Package("com.qcobjects.backend.microservice.static", [
           stream.end();
 
         } catch (e) {
-          console.log(e);
-          logger.debug("[ERROR] Something went wrong when trying to send the response as file " + fileName);
+          logger.warn("[ERROR] Something went wrong when trying to send the response as file " + fileName);
           if (e.errno == -2) {
             const headers = {
               ":status": 404,
@@ -96,7 +94,7 @@ Package("com.qcobjects.backend.microservice.static", [
         // read and send file content in the stream
         let headers;
         try {
-          console.log("trying to read "+ fileName);
+          logger.info("trying to read "+ fileName);
           const fd = fs.openSync(fileName, "r");
           const stat = fs.fstatSync(fd);
           headers = {
@@ -107,7 +105,6 @@ Package("com.qcobjects.backend.microservice.static", [
           };
           if (typeof microservice.route.responseHeaders !== "undefined") {
             headers = Object.assign(headers, microservice.route.responseHeaders);
-            console.log(headers);
           }
 
           logger.debug("closing file " + fileName);
@@ -117,7 +114,7 @@ Package("com.qcobjects.backend.microservice.static", [
 
           stream.write(fs.readFileSync(fileName));
           stream.on("close", () => {
-            console.log("closing static file", fileName);
+            logger.info("closing static file", fileName);
           });
 
         } catch (e){
@@ -129,10 +126,10 @@ Package("com.qcobjects.backend.microservice.static", [
             stream.writeHead(404, headers);
             stream.write("<h1>404 - FILE NOT FOUND</h1>");
             stream.on("close", () => {
-              console.log("closing static file with error: ", fileName);
+              logger.info("closing static file with error: ", fileName);
             });
           }
-          console.log(e);
+          logger.warn(e);
           stream.end();
         }
         stream.end();
@@ -171,7 +168,7 @@ Package("com.qcobjects.backend.microservice.static", [
             try {
               resolve();
             } catch (e) {
-              console.log("\u{1F926} Something went wrong \u{1F926} when trying to deliver a static path: " + microservice.fileName);
+              logger.warn("\u{1F926} Something went wrong \u{1F926} when trying to deliver a static path: " + microservice.fileName);
               reject();
             }
           } else {

package/src/qcobjects-createcert.js

@@ -33,6 +33,14 @@
 const path = require("path");
 const absolutePath = path.resolve( __dirname, "./" );
 const templatePath = path.resolve( __dirname, "./templates/apps/" )+"/";
+const os = require("os");
+const isWindows = ()=>{
+  return os.platform().toLowerCase().startsWith("win");
+};
+const isMac = ()=>{
+  return os.platform().toLowerCase().startsWith("darwin");
+};
+
 
 require("qcobjects");
 
@@ -53,11 +61,19 @@ class Main extends InheritClass {
       case "self_signed":
         // stderr is sent to stderr of parent process
         // you can set options.stdio if you want it to go elsewhere
-        stdout = execSync("openssl req -x509 -newkey rsa:2048 -nodes -sha256 -subj '/CN="+CONFIG.get("domain")+"'  -keyout "+CONFIG.get("private-key-pem")+" -out "+CONFIG.get("private-cert-pem"));
+        if (isWindows()){
+          stdout = execSync("openssl req -x509 -newkey rsa:2048 -nodes -sha256 -subj \"/CN="+CONFIG.get("domain")+"\"  -keyout "+CONFIG.get("private-key-pem")+" -out "+CONFIG.get("private-cert-pem"));
+        } else {
+          stdout = execSync("openssl req -x509 -newkey rsa:2048 -nodes -sha256 -subj '/CN="+CONFIG.get("domain")+"'  -keyout "+CONFIG.get("private-key-pem")+" -out "+CONFIG.get("private-cert-pem"));
+        }
         break;
       case "letsencrypt":
-        var prehook_posthook = "--pre-hook \"service qcobjects stop\" --post-hook=\"service qcobjects start\"";
-        stdout = execSync(`certbot -n -d ${CONFIG.get("domain")} certonly --standalone ${prehook_posthook}`);
+        if (isWindows()){
+          throw Error("Letsencrypt certificate is not supported in Windows");
+        } else {
+          var prehook_posthook = "--pre-hook \"service qcobjects stop\" --post-hook=\"service qcobjects start\"";
+          stdout = execSync(`certbot -n -d ${CONFIG.get("domain")} certonly --standalone ${prehook_posthook}`);
+        }
         break;
       default:
         break;