Merge pull request #22 from ostrojs/develop

Develop

Author: amarksingh

serverless.js

@@ -8,12 +8,13 @@ class Serverless {
 		const handler = this.handle()
 		Object.defineProperties(this, {
 			handler: {
-				value: (event, context) => handler(event, context)
+				value: handler
 			},
-			$serverless: {
+			$config: {
 				value: serverless
 			}
 		});
+
 		this.entry(resolveWithRequire(serverless.handler))
 	}
 
@@ -59,8 +60,8 @@ class Serverless {
 	handle() {
 		return (event, context) => {
 			return new Promise((resolve) => {
-				const serverlessPlateform = this.$serverless.platform || "generic";
-				const serverlessGetway = this.$serverless.getway;
+				const serverlessPlateform = this.$config.platform || "generic";
+				const serverlessGetway = this.$config.getway;
 				const request = new this.$request(new this.$streamRequest(event, context, serverlessPlateform, serverlessGetway));
 				const response = new this.$response(new this.$streamResponse(resolve, serverlessPlateform, serverlessGetway))
 				Object.defineProperty(response, 'request', { value: request })
@@ -74,7 +75,7 @@ class Serverless {
 	entry(entryPath) {
 		this.loadMainModule(entryPath);
 	}
-	
+
 	loadMainModule(mainModulePath) {
 		const mainPath = path.resolve(mainModulePath);
 		const mainModule = require(mainPath);

stream/response.js

@@ -4,7 +4,13 @@ const { normalizeHeaders } = require('../utils');
 
 class Response extends ServerResponse {
   constructor(resolve, platform, getwayType) {
-    super({ writable: true } instanceof Writable ? { writable: true } : new Writable());
+    const dummyWritable = new Writable({
+      write(chunk, encoding, callback) {
+        callback(); // noop
+      }
+    });
+
+    super(dummyWritable);
 
     this._resolve = resolve;
     this._chunks = [];
@@ -27,10 +33,9 @@ class Response extends ServerResponse {
     if (chunk) this.write(chunk);
 
     const result = this.toJSON();
-
     this._resolve(result);
-
-    return super.end(...args);
+   
+    return super.end(null, ...args);
   }
 
   encode(encoding) {
@@ -52,21 +57,24 @@ class Response extends ServerResponse {
     const isBase64Encoded = this.isBase64Encoded();
     const body = isBase64Encoded ? buffer.toString('base64') : buffer.toString('utf8');
 
-    const headers = normalizeHeaders(this.getHeaders(), this._platform, this._getwayType)
-    let cookies = '';
+    const headers = normalizeHeaders(this.getHeaders(), this._platform, this._getwayType);
+
+    headers['content-length'] = buffer.length;
+
+    let cookies = undefined;
     if (this.isPlatform('aws')) {
       const setCookieKey = Object.keys(headers).find(
         key => key.toLowerCase() === 'set-cookie'
       );
-      cookies = setCookieKey ? headers[setCookieKey] : undefined;
       if (setCookieKey) {
+        cookies = headers[setCookieKey];
         delete headers[setCookieKey];
       }
     }
 
-    const platform = this._platform;
     const statusCode = this.statusCode || 200;
-    switch (platform) {
+
+    switch (this._platform) {
       case 'azure':
         return {
           status: statusCode,
@@ -85,14 +93,14 @@ class Response extends ServerResponse {
           headers,
           body,
           cookies,
-          isBase64Encoded
-        }
+          isBase64Encoded,
+        };
       default:
         return {
           statusCode,
           headers,
           body,
-          isBase64Encoded
+          isBase64Encoded,
         };
     }
   }