mastercontroller 1.3.1 → 1.3.3

package/MasterRequest.js

@@ -1,7 +1,6 @@
 
 // version 0.0.2
 
-var master = require('./MasterControl');
 var url = require('url');
 const StringDecoder = require('string_decoder').StringDecoder;
 var qs = require('qs');
@@ -20,15 +19,30 @@ class MasterRequest{
         this.options = {};
         this.options.disableFormidableMultipartFormData = options.disableFormidableMultipartFormData === null? false : options.disableFormidableMultipartFormData;
         this.options.formidable = options.formidable === null? {}: options.formidable;
+        // Body size limits (DoS protection)
+        this.options.maxBodySize = options.maxBodySize || 10 * 1024 * 1024; // 10MB default
+        this.options.maxJsonSize = options.maxJsonSize || 1 * 1024 * 1024;  // 1MB default for JSON
+        this.options.maxTextSize = options.maxTextSize || 1 * 1024 * 1024;  // 1MB default for text
      }
    }
 
-   getRequestParam(request, res){
+   getRequestParam(requestOrContext, res){
     var $that = this;
     $that.response = res;
     try {
         return new Promise(function (resolve, reject) {
-            var querydata = url.parse(request.requrl, true);
+            // BACKWARD COMPATIBILITY: Support both old and new patterns
+            // New pattern (v1.3.x pipeline): Pass context with requrl property
+            // Old pattern (pre-v1.3.x): Pass request with requrl property
+            const request = requestOrContext.request || requestOrContext;
+            let requrl = requestOrContext.requrl || request.requrl;
+
+            // Fallback: If requrl not set, parse from request.url
+            if (!requrl) {
+                requrl = url.parse(request.url, true);
+            }
+
+            var querydata = url.parse(requrl, true);
             $that.parsedURL.query = querydata.query;
             $that.form = new formidable.IncomingForm($that.options.formidable);
             if(request.headers['content-type'] || request.headers['transfer-encoding'] ){
@@ -43,16 +57,25 @@ class MasterRequest{
                         case "multipart/form-data" :
                             // Offer operturnity to add options. find a way to add dependecy injection. to request
                             if(!$that.options.disableFormidableMultipartFormData){
-                            
+
                                 $that.parsedURL.formData = {
                                     files : {},
                                     fields : {}
                                 };
 
+                                // Track uploaded files for cleanup on error
+                                const uploadedFiles = [];
+                                let uploadAborted = false;
+
                                 $that.form.on('field', function(field, value) {
                                     $that.parsedURL.formData.fields[field] = value;
                                 });
 
+                                $that.form.on('fileBegin', function(formname, file) {
+                                    // Track file for potential cleanup
+                                    uploadedFiles.push(file);
+                                });
+
                                 $that.form.on('file', function(field, file) {
                                     file.extension = file.name === undefined ? path.extname(file.originalFilename) : path.extname(file.name);
 
@@ -65,14 +88,55 @@ class MasterRequest{
                                     }
                                 });
 
+                                $that.form.on('error', function(err) {
+                                    // CRITICAL: Handle upload errors
+                                    uploadAborted = true;
+                                    console.error('[MasterRequest] File upload error:', err.message);
+
+                                    // Cleanup temporary files
+                                    uploadedFiles.forEach(file => {
+                                        if (file.filepath) {
+                                            try {
+                                                $that.deleteFileBuffer(file.filepath);
+                                            } catch (cleanupErr) {
+                                                console.error('[MasterRequest] Failed to cleanup temp file:', cleanupErr.message);
+                                            }
+                                        }
+                                    });
+
+                                    reject(new Error(`File upload failed: ${err.message}`));
+                                });
+
+                                $that.form.on('aborted', function() {
+                                    // CRITICAL: Handle client abort (connection closed)
+                                    uploadAborted = true;
+                                    console.warn('[MasterRequest] File upload aborted by client');
+
+                                    // Cleanup temporary files
+                                    uploadedFiles.forEach(file => {
+                                        if (file.filepath) {
+                                            try {
+                                                $that.deleteFileBuffer(file.filepath);
+                                            } catch (cleanupErr) {
+                                                console.error('[MasterRequest] Failed to cleanup temp file:', cleanupErr.message);
+                                            }
+                                        }
+                                    });
+
+                                    reject(new Error('File upload aborted by client'));
+                                });
+
                                 $that.form.on('end', function() {
-                                    resolve($that.parsedURL);
+                                    // Only resolve if upload wasn't aborted
+                                    if (!uploadAborted) {
+                                        resolve($that.parsedURL);
+                                    }
                                 });
 
                                 $that.form.parse(request);
-                
+
                             }else{
-                                
+
                                 resolve($that.parsedURL);
                                 console.log("skipped multipart/form-data")
                             }
@@ -124,38 +188,59 @@ class MasterRequest{
     let body = '';
     let receivedBytes = 0;
     const maxBytes = 1 * 1024 * 1024; // 1MB limit
-  
- 
+    let errorOccurred = false;
+
     try {
 
         request.on('data', (chunk) => {
+            if (errorOccurred) return;
+
             receivedBytes += chunk.length;
-      
+
             // Prevent memory overload
             if (receivedBytes > maxBytes) {
-              req.destroy(); // Close the connection
+              errorOccurred = true;
+              request.destroy(); // ✅ Fixed: was 'req', now 'request'
+              console.error(`Plain text payload too large: ${receivedBytes} bytes (max: ${maxBytes})`);
+              func({ error: 'Payload too large', maxSize: maxBytes });
               return;
             }
-            
+
             // Append chunk to body
             body += chunk.toString('utf8');
         });
-  
+
         request.on('end', () => {
+            if (errorOccurred) return;
+
             try {
                 // Process the plain text data here
                 const responseData = body;
-                func(responseData );
+                func(responseData);
               } catch (err) {
-
                 console.error('Processing error handling text/plain:', err);
-                throw err;
+                func({ error: err.message });
               }
 
         });
+
+        request.on('error', (err) => {
+            if (errorOccurred) return;
+            errorOccurred = true;
+            console.error('[MasterRequest] Stream error in fetchData:', err.message);
+            func({ error: err.message });
+        });
+
+        request.on('aborted', () => {
+            if (errorOccurred) return;
+            errorOccurred = true;
+            console.warn('[MasterRequest] Request aborted in fetchData');
+            func({ error: 'Request aborted' });
+        });
+
     } catch (error) {
       console.error("Failed to fetch data:", error);
-      throw error;
+      func({ error: error.message });
     }
   }
 
@@ -170,56 +255,148 @@ class MasterRequest{
 
   urlEncodeStream(request, func){
       const decoder = new StringDecoder('utf-8');
-      //request.pipe(decoder);
       let buffer = '';
+      let receivedBytes = 0;
+      const maxBytes = this.options.maxBodySize || 10 * 1024 * 1024; // 10MB limit
+      let errorOccurred = false;
+
       request.on('data', (chunk) => {
+          if (errorOccurred) return;
+
+          receivedBytes += chunk.length;
+
+          // Prevent memory overload (DoS protection)
+          if (receivedBytes > maxBytes) {
+              errorOccurred = true;
+              request.destroy();
+              console.error(`Form data too large: ${receivedBytes} bytes (max: ${maxBytes})`);
+              func({ error: 'Payload too large', maxSize: maxBytes });
+              return;
+          }
+
           buffer += decoder.write(chunk);
       });
 
       request.on('end', () => {
+          if (errorOccurred) return;
+
           buffer += decoder.end();
           var buff = qs.parse(buffer);
           func(buff);
       });
 
-  }
+      request.on('error', (err) => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.error('[MasterRequest] Stream error in urlEncodeStream:', err.message);
+          func({ error: err.message });
+      });
 
-  stringToJson(request, func){
+      request.on('aborted', () => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.warn('[MasterRequest] Request aborted in urlEncodeStream');
+          func({ error: 'Request aborted' });
+      });
 
   }
-  
+
   jsonStream(request, func){
-      //request.pipe(decoder);
       let buffer = '';
+      let receivedBytes = 0;
+      const maxBytes = this.options.maxJsonSize || 1 * 1024 * 1024; // 1MB limit
+      let errorOccurred = false;
+
       request.on('data', (chunk) => {
+          if (errorOccurred) return;
+
+          receivedBytes += chunk.length;
+
+          // Prevent memory overload (DoS protection)
+          if (receivedBytes > maxBytes) {
+              errorOccurred = true;
+              request.destroy();
+              console.error(`JSON payload too large: ${receivedBytes} bytes (max: ${maxBytes})`);
+              func({ error: 'JSON payload too large', maxSize: maxBytes });
+              return;
+          }
+
           buffer += chunk;
       });
 
       request.on('end', () => {
+            if (errorOccurred) return;
+
             try {
                 var buff = JSON.parse(buffer);
                 func(buff);
             } catch (e) {
-                var buff = qs.parse(buffer);
-                func(buff);
+                // Security: Don't fallback to qs.parse to avoid prototype pollution
+                console.error('Invalid JSON payload:', e.message);
+                func({ error: 'Invalid JSON', details: e.message });
             }
       });
 
+      request.on('error', (err) => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.error('[MasterRequest] Stream error in jsonStream:', err.message);
+          func({ error: err.message });
+      });
+
+      request.on('aborted', () => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.warn('[MasterRequest] Request aborted in jsonStream');
+          func({ error: 'Request aborted' });
+      });
+
   }
 
   textStream(request, func){
       const decoder = new StringDecoder('utf-8');
-      //request.pipe(decoder);
       let buffer = '';
+      let receivedBytes = 0;
+      const maxBytes = this.options.maxTextSize || 1 * 1024 * 1024; // 1MB limit
+      let errorOccurred = false;
+
       request.on('data', (chunk) => {
+          if (errorOccurred) return;
+
+          receivedBytes += chunk.length;
+
+          // Prevent memory overload (DoS protection)
+          if (receivedBytes > maxBytes) {
+              errorOccurred = true;
+              request.destroy();
+              console.error(`Text payload too large: ${receivedBytes} bytes (max: ${maxBytes})`);
+              func({ error: 'Text payload too large', maxSize: maxBytes });
+              return;
+          }
+
           buffer += decoder.write(chunk);
       });
 
       request.on('end', () => {
+          if (errorOccurred) return;
           buffer += decoder.end();
           func(buffer);
       });
 
+      request.on('error', (err) => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.error('[MasterRequest] Stream error in textStream:', err.message);
+          func({ error: err.message });
+      });
+
+      request.on('aborted', () => {
+          if (errorOccurred) return;
+          errorOccurred = true;
+          console.warn('[MasterRequest] Request aborted in textStream');
+          func({ error: 'Request aborted' });
+      });
+
   }
 
   // have a clear all object that you can run that will delete all rununing objects
@@ -229,4 +406,4 @@ class MasterRequest{
     }
 }
 
-master.extend("request", MasterRequest);
+module.exports = { MasterRequest };

package/MasterRouter.js

@@ -1,6 +1,5 @@
 // version 0.0.250
 
-var master = require('./MasterControl');
 var toolClass =  require('./MasterTools');
 const EventEmitter = require("events");
 var path = require('path');
@@ -564,4 +563,4 @@ class MasterRouter {
     
 }
 
-master.extend("router", MasterRouter);
+module.exports = { MasterRouter };

package/MasterSocket.js

@@ -1,6 +1,5 @@
 // version 0.1.2
 
-var master = require('./MasterControl');
 const { Server } = require('socket.io');
 const fs = require('fs');
 const path = require('path');
@@ -26,7 +25,12 @@ class MasterSocket{
             // Prefer explicit server, fallback to master.server
             const httpServer = serverOrIo || master.server;
             if (!httpServer) {
-                throw new Error('MasterSocket.init requires an HTTP server or a pre-created Socket.IO instance');
+                throw new Error(
+                    'MasterSocket.init requires an HTTP server. ' +
+                    'Either pass the server explicitly: master.socket.init(server) ' +
+                    'or call master.start(server) before socket.init(). ' +
+                    'Current initialization order issue: socket.init() called before master.start()'
+                );
             }
             this.io = new Server(httpServer, ioOptions);
         }
@@ -134,7 +138,7 @@ class MasterSocket{
     }
 }
 
-master.extend("socket", MasterSocket);
+module.exports = { MasterSocket };
 
 // shallow+deep merge helper
 function isObject(item) {

package/MasterTemp.js

@@ -1,5 +1,4 @@
 // version 0.0.3
-var master = require('./MasterControl');
 
 class MasterTemp{
 
@@ -27,4 +26,4 @@ class MasterTemp{
 
 }
 
-master.extend("tempdata", MasterTemp);
+module.exports = { MasterTemp };

package/MasterTimeout.js

@@ -13,7 +13,6 @@
  * @version 1.0.0
  */
 
-var master = require('./MasterControl');
 const { logger } = require('./error/MasterErrorLogger');
 
 class MasterTimeout {
@@ -327,6 +326,5 @@ class MasterTimeout {
     }
 }
 
-master.extend("timeout", MasterTimeout);
-
-module.exports = MasterTimeout;
+// Export for MasterControl to register (prevents circular dependency)
+module.exports = { MasterTimeout };