update to typescript 2.1

Author: aeschli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "request-light",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Lightweight request library. Promise based, with proxy support.",
   "main": "./lib/main.js",
   "typings": "./lib/main",
@@ -14,12 +14,14 @@
     "url": "https://github.com/Microsoft/node-request-light/issues"
   },
 	"devDependencies": {
-		"typescript": "^1.8.9"
+		"typescript": "^2.1.5",
+    "@types/node": "^6.0.51",
+    "@types/mocha": "^2.2.33"
 	},
 	"dependencies": {
 		"http-proxy-agent": "^0.2.6",
 		"https-proxy-agent": "^0.3.5",
-		"vscode-nls": "^1.0.4"
+		"vscode-nls": "^2.0.2"
 	},
 	"scripts": {
 		"prepublish": "tsc -p ./src",

src/main.ts

@@ -57,7 +57,7 @@ export function xhr(options: XHROptions): Promise<XHRResponse> {
 
 	return request(options).then(result => new Promise<XHRResponse>((c, e) => {
 		let res = result.res;
-		let data: string[] = [];
+		let data: any = [];
 		res.on('data', c => data.push(c));
 		res.on('end', () => {
 			if (options.followRedirects > 0 && (res.statusCode >= 300 && res.statusCode <= 303 || res.statusCode === 307)) {
@@ -129,8 +129,7 @@ function request(options: XHROptions): Promise<RequestResult> {
 			opts.auth = options.user + ':' + options.password;
 		}
 
-		let protocol = endpoint.protocol === 'https:' ? https : http;
-		req = protocol.request(opts, (res: http.ClientResponse) => {
+		let handler = (res: http.ClientResponse) => {
 			if (res.statusCode >= 300 && res.statusCode < 400 && options.followRedirects && options.followRedirects > 0 && res.headers['location']) {
 				c(<any> request(assign({}, options, {
 					url: res.headers['location'],
@@ -139,7 +138,13 @@ function request(options: XHROptions): Promise<RequestResult> {
 			} else {
 				c({ req, res });
 			}
-		});
+		}
+		if (endpoint.protocol === 'https:') {
+			req = https.request(opts, handler);
+		} else {
+			req = http.request(opts, handler);
+		}
+
 		req.on('error', e);
 
 		if (options.timeout) {

src/tsconfig.json

@@ -6,6 +6,10 @@
  		"sourceMap": true, 
  		"declaration": true, 
  		"stripInternal": true, 
- 		"outDir": "../lib" 
+ 		"outDir": "../lib" ,
+		"lib": [
+			"es5",
+			"es2015.promise"
+		]
 	 }
 }