@makano/rew 1.5.3 → 1.5.4

package/lib/rew/pkgs/serve.app.js

@@ -7,6 +7,14 @@ module.exports = (context) => {
 
   let appOptions = {};
 
+  const additionalParams = {
+    text: svr.prototype.text,
+    html: svr.prototype.html,
+    status: svr.prototype.status,
+    json: svr.prototype.json,
+    error: svr.prototype.error
+  };
+
   const mkRouter = (options = {}) => svr.prototype.router({ type: 'auto', ...appOptions, ...options });
 
   class Events {
@@ -251,7 +259,7 @@ module.exports = (context) => {
     that.controller.register(method, _path, cb, middleWare);
     return cb;
   }
-  const mkReq = (usage) => (req, ctx) => usage.call(req, req, ctx);
+  const mkReq = (usage) => (req, ...args) => usage.call(req, req, ...args);
   class SControllerContext extends Context('controller') {
 
     middleWares = [];
@@ -317,18 +325,21 @@ module.exports = (context) => {
   }
 
   function mkBody(req){
+    if(!req.data) return null;
     const type = req.headers.get('content-type');
     if(type == 'application/json'){
       return req.data.json();
-    } else {
-      try {
-        return req.data.json();
-      } catch(e){
-        return req.data.text();
-      }
+    } else if(type.startsWith('multipart/form-data')){
+      return req.data.multipart();
+    } else if(type == 'multipart/form-data'){
+      return req.data;
+    } else try {
+      return req.data.json();
+    } catch(e){
+      return req.data?.text();
     }
   }
-
+  let f;
   class SController extends Injectable {
 
     constructor(root){
@@ -341,14 +352,9 @@ module.exports = (context) => {
       return async (req, ctx) => {
         let context = {...{
           request: req,
+          params: req.params || {},
           body: mkBody(req)
-        },...ctx, ...(cb.parent || {}), ...{
-          text: svr.prototype.text,
-          html: svr.prototype.html,
-          status: svr.prototype.status,
-          json: svr.prototype.json,
-          error: svr.prototype.error
-        }};
+        },...ctx, ...(cb.parent || {}), ...additionalParams};
         return await cb.call(context, ...Object.keys(context).map(i => context[i]));
       }
     }

package/lib/rew/pkgs/serve.js

@@ -30,7 +30,65 @@ module.exports = (context) => {
     return new Request(url, options);
   }
 
-  function getBody(req){
+
+  function parseMultipart(req, content) {
+    const contentType = req.headers.get('content-type');
+    const boundary = contentType.split('boundary=')[1];
+    if (!boundary) throw new Error('No boundary in multipart/form-data');
+
+    const body = content;
+    const parts = body.split(`--${boundary}`).filter(part => part.trim() !== '--' && part.trim() !== '');
+
+    const fields = {};
+    const files = {};
+
+    parts.forEach(part => {
+      const [headers, ...content] = part.split('\r\n\r\n');
+      const contentBody = content.join('\r\n\r\n').trim();
+      const headerLines = headers.split('\r\n');
+
+      let name, filename, contentType;
+      headerLines.forEach(line => {
+        if (line.startsWith('Content-Disposition')) {
+          const matchName = /name="([^"]+)"/.exec(line);
+          const matchFilename = /filename="([^"]+)"/.exec(line);
+          if (matchName) name = matchName[1];
+          if (matchFilename) filename = matchFilename[1];
+        }
+        if (line.startsWith('Content-Type')) {
+          contentType = line.split(': ')[1];
+        }
+      });
+
+      if (filename) {
+        files[name] = {
+          filename,
+          contentType,
+          ...handleBuffer(Buffer.from(contentBody, 'binary'))
+        };
+      } else {
+        fields[name] = contentBody;
+      }
+    });
+
+    return { ...fields, ...files };
+  }
+
+  function handleBuffer(buffer){
+    return {
+      text(){
+        return buffer.toString();
+      },
+      json(){
+        return JSON.parse(buffer.toString());
+      },
+      buffer(){
+        return buffer;
+      }
+    }
+  }
+
+  function getBody(req, request){
     return new Promise((resolve, reject) => {
       const chunks = [];
 
@@ -41,14 +99,9 @@ module.exports = (context) => {
       req.on('end', () => {
         let buffer = chunks.length ? Buffer.concat(chunks) : null;
         resolve(buffer ? {
-          text(){
-            return buffer.toString();
-          },
-          json(){
-            return JSON.parse(buffer.toString());
-          },
-          buffer(){
-            return buffer;
+          ...handleBuffer(buffer),
+          multipart(){
+            return parseMultipart(request, buffer.toString());
           }
         } : null);
       });
@@ -81,7 +134,7 @@ module.exports = (context) => {
 
         context.getRealRequest = () => req;
 
-        request.data = await getBody(req);
+        request.data = await getBody(req, request);
 
         if(this.options.fetch == 'router'){
           if(!Object.keys(this.options.routers).length) throw new Error('No fetch function nor routers found');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {