chore(logging): add logging for curls (#253)

angular · May 17, 2017 · 77491ce · 77491ce
1 parent dca9ad9
commit 77491ce
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 7 deletions.
diff --git a/lib/binaries/config_source.ts b/lib/binaries/config_source.ts
@@ -2,11 +2,15 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import * as request from 'request';
+import * as url from 'url';
 import * as xml2js from 'xml2js';
 
+import {Logger} from '../cli/logger';
 import {Config} from '../config';
 import {HttpUtils} from '../http_utils';
 
+let logger = new Logger('config_source');
+
 export abstract class ConfigSource {
   ostype = Config.osType();
   osarch = Config.osArch();
@@ -69,10 +73,21 @@ export abstract class XmlConfigSource extends ConfigSource {
     return new Promise<string>((resolve, reject) => {
       let options = HttpUtils.initOptions(this.xmlUrl);
 
+      let curl = this.getFileName() + ' ' + options.url;
+      if (HttpUtils.requestOpts.proxy) {
+        let pathUrl = url.parse(options.url.toString()).path;
+        let host = url.parse(options.url.toString()).host;
+        let newFileUrl = url.resolve(HttpUtils.requestOpts.proxy, pathUrl);
+        curl = this.getFileName() + ' \'' + newFileUrl + '\' -H \'host:' + host + '\'';
+      }
+      if (HttpUtils.requestOpts.ignoreSSL) {
+        curl = 'k ' + curl;
+      }
+      logger.info('curl -o' + curl);
+
       let req = request(options);
       req.on('response', response => {
         if (response.statusCode === 200) {
-          // logger.info('curl -v ' + options.url);
           let output = '';
           response.on('data', (data) => {
             output += data;
@@ -144,10 +159,21 @@ export abstract class GithubApiConfigSource extends JsonConfigSource {
       options = HttpUtils.optionsHeader(options, 'Host', 'api.github.com');
       options = HttpUtils.optionsHeader(options, 'User-Agent', 'request');
 
+      let curl = this.getFileName() + ' ' + options.url;
+      if (HttpUtils.requestOpts.proxy) {
+        let pathUrl = url.parse(options.url.toString()).path;
+        let host = url.parse(options.url.toString()).host;
+        let newFileUrl = url.resolve(HttpUtils.requestOpts.proxy, pathUrl);
+        curl = this.getFileName() + ' \'' + newFileUrl + '\' -H \'host:' + host + '\'';
+      }
+      if (HttpUtils.requestOpts.ignoreSSL) {
+        curl = 'k ' + curl;
+      }
+      logger.info('curl -o' + curl);
+
       let req = request(options);
       req.on('response', response => {
         if (response.statusCode === 200) {
-          // logger.info('curl -v ' + options.url);
           let output = '';
           response.on('data', (data) => {
             output += data;

diff --git a/lib/files/downloader.ts b/lib/files/downloader.ts
@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as q from 'q';
 import * as request from 'request';
+import * as url from 'url';
 
 import {Binary} from '../binaries';
 import {Logger} from '../cli';
@@ -48,6 +49,19 @@ export class Downloader {
                    response.destroy();
                    resolve(false);
                  } else {
+                   let curl = outputDir + '/' + fileName + ' ' + options.url;
+                   if (HttpUtils.requestOpts.proxy) {
+                     let pathUrl = url.parse(options.url.toString()).path;
+                     let host = url.parse(options.url.toString()).host;
+                     let newFileUrl = url.resolve(HttpUtils.requestOpts.proxy, pathUrl);
+                     curl = outputDir + '/' + fileName + ' \'' + newFileUrl +
+                         '\' -H \'host:' + host + '\'';
+                   }
+                   if (HttpUtils.requestOpts.ignoreSSL) {
+                     curl = 'k ' + curl;
+                   }
+                   logger.info('curl -o' + curl);
+
                    // only pipe if the headers are different length
                    file = fs.createWriteStream(filePath);
                    req.pipe(file);

diff --git a/lib/http_utils.ts b/lib/http_utils.ts
@@ -11,11 +11,10 @@ export declare interface RequestOptionsValue {
   ignoreSSL?: boolean;
 }
 
-let requestOpts: RequestOptionsValue = {};
-
 export class HttpUtils {
+  static requestOpts: RequestOptionsValue = {};
   static assignOptions(options: RequestOptionsValue): void {
-    Object.assign(requestOpts, options);
+    Object.assign(HttpUtils.requestOpts, options);
   }
 
   static initOptions(url: string, timeout?: number): OptionsWithUrl {
@@ -25,8 +24,8 @@ export class HttpUtils {
       // increasing this arbitrarily to 4 minutes
       timeout: 240000
     };
-    HttpUtils.optionsSSL(options, requestOpts.ignoreSSL);
-    HttpUtils.optionsProxy(options, url, requestOpts.proxy);
+    HttpUtils.optionsSSL(options, HttpUtils.requestOpts.ignoreSSL);
+    HttpUtils.optionsProxy(options, url, HttpUtils.requestOpts.proxy);
     return options;
   }