Merge branch 'master' of github.com:archilogic-com/lambda-expressless

Author: tomas-polach

src/lambda-wrapper.spec.js

@@ -130,7 +130,6 @@ describe('Lambda Wrapper', () => {
     })
     const lambdaHandler = ApiGatewayHandler(router)
     const out = await lambdaHandler(proxyRequest, {})
-    console.log(out)
   })
 
   it('should handle next(error)', async () => {

src/request.js

@@ -2,6 +2,17 @@ const ReadableStream = require('stream').Readable;
 const accepts = require('accepts');
 const typeis = require('type-is');
 
+function byteLength(str) {
+  // returns the byte length of an utf8 string
+  let s = str.length
+  for (let i=str.length-1; i>=0; i--) {
+    const code = str.charCodeAt(i)
+    if (code > 0x7f && code <= 0x7ff) s++
+    else if (code > 0x7ff && code <= 0xffff) s+=2
+  }
+  return s
+}
+
 /**
  *
  */
@@ -43,7 +54,7 @@ class Request extends ReadableStream {
     this.params = event.pathParameters;
 
     if (!this.get('Content-Length') && event.body) {
-      this.headers['content-length'] = event.body.length;
+      this.headers['content-length'] = byteLength (event.body);
     }
 
     this.protocol = this.get('X-Forwarded-Proto')

src/request.spec.js

@@ -141,11 +141,22 @@ describe('Request object', () => {
   });
 
   it('should handle content-length header if its not provided', () => {
-    delete event.headers['content-length'];
-    delete event.multiValueHeaders['content-length'];
+    delete event.headers['Content-Length'];
+    delete event.multiValueHeaders['Content-Length'];
+    const body = JSON.stringify(requestObject);
+    event.body = body
 
     const request = new Request(event);
-    const body = JSON.stringify(requestObject);
     expect(request.get('content-length')).toBe(body.length);
   })
+
+  it('should handle non-ascii content-length if header is not provided', () => {
+    delete event.headers['Content-Length'];
+    delete event.multiValueHeaders['Content-Length'];
+    const body = JSON.stringify({text:"árvíztűrőtükörfúrógép"});
+    event.body = body
+
+    const request = new Request(event);
+    expect(request.get('content-length')).toBe(41);
+  })
 });

src/response.js

@@ -2,6 +2,7 @@ const EventEmitter = require('events');
 
 const AWS_RES_BODY = Symbol('body')
 const AWS_RES_HEADERS = Symbol('body')
+const AWS_RES_MULTI_VALUE_HEADERS = Symbol('body')
 const ON_FINISHED = Symbol('body')
 
 /**
@@ -20,6 +21,7 @@ class Response extends EventEmitter {
     this.statusCode = 200
     // Non-Express compatible props: Use symbols to avoid name clashes
     this[AWS_RES_HEADERS] = {}
+    this[AWS_RES_MULTI_VALUE_HEADERS] = undefined
     this[AWS_RES_BODY] = ''
     this[ON_FINISHED] = onFinished
   }
@@ -40,6 +42,7 @@ class Response extends EventEmitter {
       headers: this[AWS_RES_HEADERS],
       body: bodyStr
     }
+    if (this[AWS_RES_MULTI_VALUE_HEADERS]) apiGatewayResult.multiValueHeaders = this[AWS_RES_MULTI_VALUE_HEADERS]
     this[ON_FINISHED](apiGatewayResult)
   }
 
@@ -152,6 +155,58 @@ class Response extends EventEmitter {
     return this;
   }
 
+  /**
+   * Set cookie
+   *
+   * @param {string} key Cookie name
+   * @param {string} value Cookie value
+   * @param {{domain: string, expires: Date, maxAge: number, path: string, sameSite: string, httpOnly:boolean, secure: boolean}} options
+   */
+  cookie(key, value, options={}) {
+    if (! options['path']) {
+      options['path'] = '/'
+    }
+    let cookieStr = `${key}=${value}`;
+    for (const optKey in options) {
+      switch (optKey.toLocaleLowerCase()) {
+        case 'domain':
+          cookieStr += `; Domain=${options[optKey]}`
+          break
+        case 'expires':
+          cookieStr += `; Expires=${options[optKey].toUTCString()}`
+          break
+        case 'maxage':
+          cookieStr += `; Max-Age=${options[optKey]}`
+          break
+        case 'path':
+          cookieStr += `; Path=${options[optKey]}`
+          break
+        case 'samesite':
+          cookieStr += `; SameSite=${options[optKey]}`
+          break
+        case 'httponly':
+          if (options[optKey]) {
+            cookieStr += '; HttpOnly'
+          }
+          break
+        case 'secure':
+          if (options[optKey]) {
+            cookieStr += '; Secure'
+          }
+          break
+        default:
+          console.warn (`Warning: Cookie paramterer ${optKey} not supported`)
+      }
+    }
+    if (!this[AWS_RES_MULTI_VALUE_HEADERS]) {
+      this[AWS_RES_MULTI_VALUE_HEADERS] = {'Set-Cookie': [cookieStr]};
+    } else {
+      const cookies = this[AWS_RES_MULTI_VALUE_HEADERS]['Set-Cookie'] || []
+      cookies.push (cookieStr)
+    }
+    return this;
+  }
+
   /**
    * Set status code for response
    *

src/response.spec.js

@@ -46,6 +46,31 @@ describe('Response object', () => {
     res.end()
   });
 
+  it('set cookies', done => {
+    const res = new Response(null, out => {
+      expect(out.multiValueHeaders).toEqual({
+        'Set-Cookie': [
+          'foo=1234; Path=/', 
+          'bar=5678; Path=/docs',
+          'foo2=1234; Domain=example.com; Path=/',
+          'foo3=1234; Expires=Fri, 25 Sep 2020 22:00:00 GMT; Path=/',
+          'foo4=1234; Max-Age=456879; Path=/',
+          'foo5=1234; Secure; SameSite=None; Path=/',
+          'foo6=1234; HttpOnly; Path=/'
+        ]
+      })
+      done()
+    });
+    res.cookie('foo', '1234');
+    res.cookie('bar', '5678', {path: '/docs'})
+    res.cookie('foo2', '1234', {domain: 'example.com'})
+    res.cookie('foo3', '1234', {expires: new Date(2020, 8, 26)})
+    res.cookie('foo4', '1234', {maxAge: 456879})
+    res.cookie('foo5', '1234', {secure: true, sameSite: 'None'})
+    res.cookie('foo6', '1234', {httpOnly: true})
+    res.end()
+  });
+
   it('can chain status method', done => {
     const res = new Response(null, out => {
       expect(out.statusCode).toBe(201);