qcobjects-cli 2.5.139-beta → 2.5.141-beta

package/src/main-http-server.ts

@@ -247,9 +247,20 @@ class HTTPServerResponse extends InheritClass {
       stream
     });
     var self = this;
+    self.request = request || {};
     self.stream = stream;
-    self._generateResponse();
+    self.headers = headers;
+    self.body = body;
+    self.fileDispatcher = fileDispatcher;
+
+    // Initialize request properties if not set
+    if (!self.request.scriptname || !self.request.pathname) {
+      const defaultPath = "/";
+      self.request.pathname = self.request.pathname || defaultPath;
+      self.request.scriptname = self.request.scriptname || CONFIG.get("documentRootFileIndex", "index.html");
+    }
 
+    self._generateResponse();
   }
 
   sendFile(stream: any, fileName: string) {

package/src/main-http2-server.ts

@@ -64,7 +64,7 @@ const ImportMicroservice = function (microservicePackage: string) {
 class HTTP2ServerResponse extends InheritClass {
   fileDispatcher: any;
   request: any;
-  headers!: { [x: string]: number; };
+  headers!: { [x: string]: string | number };
   stream: any;
   body: any;
   constructor({
@@ -80,8 +80,20 @@ class HTTP2ServerResponse extends InheritClass {
   }) {
     super();
     var self = this;
+    self.request = request || {};
+    self.stream = stream;
+    self.headers = headers;
+    self.body = body;
+    self.fileDispatcher = fileDispatcher;
+    
+    // Initialize request properties if not set
+    if (!self.request.scriptname || !self.request.pathname) {
+      const defaultPath = "/";
+      self.request.pathname = self.request.pathname || defaultPath;
+      self.request.scriptname = self.request.scriptname || CONFIG.get("documentRootFileIndex", "index.html");
+    }
+    
     self._generateResponse();
-
   }
 
   sendFile(stream: { respondWithFD: (arg0: any, arg1: { "content-length": any; "last-modified": any; "content-type": any; "cache-control": any; }) => void; on: (arg0: string, arg1: { (): void; (): void; }) => void; end: () => void; respond: (arg0: { ":status": number; "content-type": any; }) => void; write: (arg0: string) => void; }, fileName: string) {
@@ -305,13 +317,20 @@ export class HTTP2Server extends InheritClass {
       http2ServerInstance.request.method = headers[":method"];
       http2ServerInstance.request.path = headers[":path"];
 
-
-      if (http2ServerInstance.request.pathname.indexOf(".") < 0) {
-        http2ServerInstance.request.scriptname = CONFIG.get("documentRootFileIndex");
+      // Fix pathname and scriptname initialization
+      const pathParts = http2ServerInstance.request.pathname.split("/");
+      if (pathParts.length > 0) {
+        if (http2ServerInstance.request.pathname.indexOf(".") < 0) {
+          http2ServerInstance.request.scriptname = CONFIG.get("documentRootFileIndex", "index.html");
+          // Keep the original pathname as is, no need to reassign
+        } else {
+          http2ServerInstance.request.scriptname = pathParts[pathParts.length - 1];
+          http2ServerInstance.request.pathname = http2ServerInstance.request.pathname.substr(0, http2ServerInstance.request.pathname.lastIndexOf("/"));
+        }
       } else {
-        http2ServerInstance.request.scriptname = http2ServerInstance.request.pathname.split("/").reverse()[0];
+        http2ServerInstance.request.scriptname = CONFIG.get("documentRootFileIndex", "index.html");
+        http2ServerInstance.request.pathname = "/";
       }
-      http2ServerInstance.request.pathname = this.request.pathname.substr(0, http2ServerInstance.request.pathname.lastIndexOf("/"));
 
       logger.debug(PipeLog.pipe(this.request));