Merge pull request syumai#37 from syumai/fix-space-decoding-in-form

Fix space decoding in form params

handler.ts

@@ -1,4 +1,5 @@
 import { Response } from './response.ts';
+import { Params } from './params.ts';
 
 export enum Method {
   GET = 'GET',
@@ -11,10 +12,6 @@ export enum Method {
   UNLINK = 'UNLINK',
 }
 
-export interface Params {
-  [key: string]: any;
-}
-
 export type Context = {
   readonly path: string;
   readonly method: Method;

mod.ts

@@ -7,7 +7,8 @@ import {
 import { decode } from 'https://deno.land/std/strings/strings.ts';
 import { Response, processResponse } from './response.ts';
 import { ErrorCode, getErrorMessage } from './errors.ts';
-import { Method, Params, Handler, HandlerConfig } from './handler.ts';
+import { Method, Handler, HandlerConfig } from './handler.ts';
+import { Params, parseURLSearchParams } from './params.ts';
 import { defaultPort } from './constants.ts';
 import { detectedContentType } from './mime.ts';
 export { contentType, detectedContentType } from './mime.ts';
@@ -95,20 +96,14 @@ export class App {
     const params: Params = {};
     if (method === Method.GET) {
       if (search) {
-        for (const [key, value] of new URLSearchParams(search).entries()) {
-          params[key] = value;
-        }
+        Object.assign(params, parseURLSearchParams(search));
       }
     } else {
-      const decodedBody = decode(await readAll(req.body)); // FIXME: this line is broken
+      const decodedBody = decode(await readAll(req.body)); // FIXME: this line is should be refactored using Deno.Reader
       const contentType = req.headers.get('content-type');
       switch (contentType) {
         case 'application/x-www-form-urlencoded':
-          for (const [key, value] of new URLSearchParams(
-            decodedBody
-          ).entries()) {
-            params[key] = value;
-          }
+          Object.assign(params, parseURLSearchParams(decodedBody));
           break;
         case 'application/json':
           let obj: Object;
@@ -117,9 +112,7 @@ export class App {
           } catch (e) {
             throw ErrorCode.BadRequest;
           }
-          for (const [key, value] of Object.entries(obj)) {
-            params[key] = value;
-          }
+          Object.assign(params, obj);
           break;
       }
     }
@@ -159,6 +152,8 @@ export class App {
         let status = ErrorCode.InternalServerError;
         if (typeof err === 'number') {
           status = err;
+        } else {
+          console.error(err);
         }
         r = [status, getErrorMessage(status)];
       }

params.ts

@@ -0,0 +1,12 @@
+export interface Params {
+  [key: string]: any;
+}
+
+export function parseURLSearchParams(paramsStr: string): Params {
+  const params: Params = {};
+  const spaceReplacedStr = paramsStr.replace(/\+/g, ' '); // replace all + to spaces
+  for (const [key, value] of new URLSearchParams(spaceReplacedStr).entries()) {
+    params[key] = value;
+  }
+  return params;
+}

serve_test.ts

@@ -1,7 +1,7 @@
 import { test, runTests } from 'https://deno.land/std/testing/mod.ts';
 import { assertEquals } from 'https://deno.land/std/testing/asserts.ts';
 import { App, get, post } from './mod.ts';
-import { HandlerConfig, Method, Params } from './handler.ts';
+import { HandlerConfig, Method } from './handler.ts';
 const { exit } = Deno;
 
 const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));