qcobjects-cli - npm Package Compare versions

Comparing version 0.1.35 to 0.1.36

backend/org.quickcorp.backend.php.js

@@ -31,2 +31,9 @@ /**
 
+let fixWinCmd = function (commandline){
+  if (!process.platform.toLowerCase().startsWith('win')){
+    commandline = commandline.replace(/(")/g, String.fromCharCode(92)+`\"`);
+  }
+  return commandline;
+}
+
 Package('org.quickcorp.backend.php',[
@@ -38,12 +45,12 @@ Class('PHPMicroservice',BackendMicroservice,{
       var phpheaders = {
-        "QUERY_STRING":this.request.query,
-        "REDIRECT_STATUS":"200",
-        "REQUEST_METHOD":this.request.method,
-        "SCRIPT_FILENAME":this.request.scriptname,
-        "SCRIPT_NAME":this.request.scriptname,
-        "PATH_INFO":this.request.path,
-        "SERVER_NAME":this.request.hostname,
-        "SERVER_PROTOCOL":"HTTP/2",
-        "REQUEST_URI":this.request.href,
-        "HTTP_HOST":"localhost"
+        "QUERY_STRING":`${this.request.query}`,
+        "REDIRECT_STATUS":`200`,
+        "REQUEST_METHOD":`${this.request.method}`,
+        "SCRIPT_FILENAME":`${this.request.scriptname}`,
+        "SCRIPT_NAME":`${this.request.scriptname}`,
+        "PATH_INFO":`${this.request.path}`,
+        "SERVER_NAME":`${this.request.hostname}`,
+        "SERVER_PROTOCOL":`HTTP/2`,
+        "REQUEST_URI":`${this.request.href}`,
+        "HTTP_HOST":`${this.domain}`
       };
@@ -57,3 +64,3 @@ function fixedEncodeURIComponent (str) {
           var headervalue = this.request.headers[headername];
-          phpheaders['HTTP_'+phpheadername] = fixedEncodeURIComponent(headervalue);
+          phpheaders['HTTP_'+phpheadername] = `${fixedEncodeURIComponent(headervalue)}`;
         }
@@ -85,11 +92,21 @@ }
 
-        var commandline = microservice.get_php_headers_list()+' php -r \' \
-$_tmptransferfile = \''+microservice.tempFileName+'\'; \
-$_payload = file_get_contents(sys_get_temp_dir().$_tmptransferfile); \
-foreach ($_SERVER as $_k => $_v) {if ( substr($_k, 0, strlen(\'HTTP_\')) == \'HTTP_\' ){$_SERVER[$_k]=urldecode($_v);}} \
-@parse_str(parse_url("?".$_payload, PHP_URL_QUERY), $_REQUEST); \
-@parse_str(parse_url("?".$_payload, PHP_URL_QUERY), $_GET); \
-unlink(sys_get_temp_dir().$_tmptransferfile); \
-@include_once("'+microservice.request.scriptname+'");\' qcobjects=1';
-        logger.debug(commandline);
+        var scriptFileName = (microservice.route.hasOwnProperty('redirect_to')
+          && microservice.route.redirect_to !== '')?(microservice.route.redirect_to):(microservice.request.scriptname);
+
+        var commandline = microservice.get_php_headers_list()+` php -q <<- 'EOF'
+<?php
+$_payload = file_get_contents(sys_get_temp_dir().'${microservice.tempFileName}');
+foreach ($_SERVER as $_k => $_v) {
+  if ( substr($_k, 0, strlen('HTTP_')) == 'HTTP_' ){
+    $_SERVER[$_k]=urldecode($_v);
+  }
+}
+@parse_str(parse_url('?'.$_payload, PHP_URL_QUERY), $_REQUEST);
+@parse_str(parse_url('?'.$_payload, PHP_URL_QUERY), $_GET);
+unlink(sys_get_temp_dir().'${microservice.tempFileName}');
+@include_once('${scriptFileName}');
+?>
+EOF`
+        commandline = fixWinCmd(commandline);
+//        logger.debug(commandline);
         try {
@@ -117,11 +134,23 @@ microservice.body = execSync(commandline).toString();
         } catch (e){}
-        var commandline = microservice.get_php_headers_list()+' php -r \' \
-$_tmptransferfile = \''+microservice.tempFileName+'\'; \
-$_payload = file_get_contents(sys_get_temp_dir().$_tmptransferfile); \
-foreach ($_SERVER as $_k => $_v) {if ( substr($_k, 0, strlen(\'HTTP_\')) == \'HTTP_\' ){$_SERVER[$_k]=urldecode($_v);}} \
-@parse_str(parse_url("?".$_payload, PHP_URL_QUERY), $_REQUEST); \
-@parse_str(parse_url("?".$_payload, PHP_URL_QUERY), $_POST); \
-unlink(sys_get_temp_dir().$_tmptransferfile); \
-@include_once("'+microservice.request.scriptname+'");\' qcobjects=1';
-        logger.debug(commandline);
+
+        var scriptFileName = (microservice.route.hasOwnProperty('redirect_to')
+          && microservice.route.redirect_to !== '')?(microservice.route.redirect_to):(microservice.request.scriptname);
+
+        var commandline = microservice.get_php_headers_list()+` php -q <<- 'EOF'
+<?php
+$_payload = file_get_contents(sys_get_temp_dir().'${microservice.tempFileName}');
+foreach ($_SERVER as $_k => $_v) {
+  if ( substr($_k, 0, strlen('HTTP_')) == 'HTTP_' ){
+    $_SERVER[$_k]=urldecode($_v);
+  }
+}
+@parse_str(parse_url('?'.$_payload, PHP_URL_QUERY), $_REQUEST);
+@parse_str(parse_url('?'.$_payload, PHP_URL_QUERY), $_POST);
+unlink(sys_get_temp_dir().'${microservice.tempFileName}');
+@include_once('${scriptFileName}');
+?>
+EOF`
+        commandline = fixWinCmd(commandline);
+//        logger.debug(commandline);
+
         try {
@@ -128,0 +157,0 @@ microservice.body = execSync(commandline).toString();

org.quickcorp.qcobjects.main.http2.server.js

@@ -36,2 +36,11 @@ /**
 
+let ImportMicroservice = function (microservicePackage){
+  var standardPath = findPackageNodePath(microservicePackage);
+  if (standardPath !== null){
+    Import (microservicePackage);
+  } else {
+    Import (absolutePath+'/backend/'+microservicePackage);
+  }
+}
+
 Package('org.quickcorp.qcobjects.main.http2.server',[
@@ -285,6 +294,3 @@ Class('PipeLog',{
             selectedRoute.map(route=>{
-              Import (route.microservice);
-              if (typeof Package(route.microservice) == 'undefined' ){
-                Import (absolutePath+'/backend/'+route.microservice);
-              }
+              ImportMicroservice (route.microservice);
               var microServiceClassFactory = ClassFactory(route.microservice+'.Microservice');
@@ -291,0 +297,0 @@ this.response = New(microServiceClassFactory,{

package.json

 {
   "name": "qcobjects-cli",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "qcobjects cli command line tool",
@@ -5,0 +5,0 @@ "main": "qcobjects-cli.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

89689

increased by0.86%

Lines of code

2078

increased by1.42%

No dependency changes