qcobjects-cli 2.5.140-beta → 2.5.143-beta

package/src/main-http-gae-server.ts

@@ -406,10 +406,23 @@ class HTTPServerResponse extends InheritClass {
     super(o);
     var self = this;
     self.body = "";
-    self.request = o.request;
+    self.request = o.request || {};
     self.stream = o.stream;
     self.headers = o.headers;
     self.fileDispatcher = o.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");
+    }
+
+    // Ensure documentRoot is set
+    if (!CONFIG.get("documentRoot")) {
+      CONFIG.set("documentRoot", path.join(process.cwd(), "public"));
+    }
+
     self._generateResponse();
     this.headers = {
       ":status": 200,

package/src/main-http-server.ts

@@ -247,13 +247,25 @@ class HTTPServerResponse extends InheritClass {
       stream
     });
     var self = this;
-    self.request = request;
+    self.request = request || {};
     self.stream = stream;
     self.headers = headers;
     self.body = body;
     self.fileDispatcher = fileDispatcher;
-    self._generateResponse();
 
+    // 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");
+    }
+
+    // Ensure documentRoot is set
+    if (!CONFIG.get("documentRoot")) {
+      CONFIG.set("documentRoot", path.join(process.cwd(), "public"));
+    }
+
+    self._generateResponse();
   }
 
   sendFile(stream: any, fileName: string) {

package/src/main-http2-server.ts

@@ -80,11 +80,24 @@ class HTTP2ServerResponse extends InheritClass {
   }) {
     super();
     var self = this;
-    self.request = request;
+    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");
+    }
+
+    // Ensure documentRoot is set
+    if (!CONFIG.get("documentRoot")) {
+      CONFIG.set("documentRoot", path.join(process.cwd(), "public"));
+    }
+    
     self._generateResponse();
   }
 
@@ -309,13 +322,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));