Rework base with request instead of got. Add proxy support

Author: kriskbx

gtt-report.js

@@ -48,6 +48,7 @@ program
     .option('--user_columns', 'include user columns in the report')
     .option('--quiet', 'only output report')
     .option('--show_without_times', 'show issues/merge requests without time records')
+    .option('-p --proxy <proxy>', 'use a proxy server with the given url')
     .parse(process.argv);
 
 // init helpers
@@ -80,7 +81,8 @@ config
     .set('noWarnings', program.no_warnings)
     .set('quiet', program.quiet)
     .set('showWithoutTimes', program.show_without_times)
-    .set('userColumns', program.user_columns);
+    .set('userColumns', program.user_columns)
+    .set('proxy', program.proxy);
 
 Cli.quiet = config.get('quiet');
 

gtt-sync.js

@@ -8,11 +8,15 @@ const MergeRequest = require('./models/mergeRequest');
 const Config = require('./include/file-config');
 const Cli = require('./include/cli');
 
-program.parse(process.argv);
+program
+    .option('-p --proxy <proxy>', 'use a proxy server with the given url')
+    .parse(process.argv);
 
 let config = new Config(process.cwd());
 let frames = new FrameCollection(config);
 
+config.set('proxy', program.proxy);
+
 let classes = {
     issue: Issue,
     merge_request: MergeRequest
@@ -43,7 +47,7 @@ frames.filter(frame => {
     return !(Math.ceil(frame.duration) === _.reduce(frame.notes, (n, m) => (n + m.time), 0));
 });
 
-if(frames.length === 0) process.exit(0);
+if (frames.length === 0) process.exit(0);
 
 Cli.bar(`${Cli.process}  Syncing time records...`, frames.length);
 

include/config.js

@@ -6,6 +6,7 @@ const dates = ['from', 'to'];
 const defaults = {
     url: 'https://gitlab.com/api/v4',
     token: false,
+    proxy: false,
     project: false,
     from: "1970-01-01",
     to: moment().format(),

models/base.js

@@ -1,6 +1,6 @@
-const got = require('got');
+const request = require('request-promise-native');
+const url = require('url');
 const async = require('async');
-const querystring = require('querystring');
 
 /**
  * base model
@@ -18,6 +18,7 @@ class base {
 
         this._perPage = this.config ? this.config.get('_perPage') : 100;
         this._parallel = this.config ? this.config.get('_parallel') : 4;
+        this._proxy = this.config && this.config.get('proxy') ? this.config.get('proxy') : undefined;
     }
 
     /**
@@ -29,10 +30,11 @@ class base {
     post(path, data) {
         data.private_token = this.token;
 
-        return got(`${this.url}${path}`, {
-            query: querystring.stringify(data),
-            method: 'POST',
+        return request.post(`${this.url}${path}`, {
             json: true,
+            body: data,
+            proxy: this._proxy,
+            resolveWithFullResponse: true,
             headers: {
                 'PRIVATE-TOKEN': this.token
             }
@@ -50,8 +52,10 @@ class base {
         path += (path.includes('?') ? '&' : '?') + `private_token=${this.token}`;
         path += `&page=${page}&per_page=${perPage}`;
 
-        return got(`${this.url}${path}`, {
+        return request(`${this.url}${path}`, {
             json: true,
+            proxy: this._proxy,
+            resolveWithFullResponse: true,
             headers: {
                 'PRIVATE-TOKEN': this.token
             }

models/project.js

@@ -14,6 +14,10 @@ class project extends Base {
         this.data = data;
     }
 
+    /**
+     * make
+     * @param name
+     */
     make(name) {
         let promise = this.get(`projects/${encodeURIComponent(name)}`);
         promise.then(project => this.data = project.body);

package.json

@@ -18,7 +18,6 @@
     "commander": "^2.9.0",
     "csv-string": "^2.3.2",
     "find-in-files": "^0.4.0",
-    "got": "^6.7.1",
     "hashids": "^1.1.1",
     "markdown-pdf": "^8.0.0",
     "markdown-table": "^1.1.0",
@@ -28,6 +27,8 @@
     "progress": "^2.0.0",
     "prompt": "^1.0.0",
     "read-yaml": "^1.1.0",
+    "request": "^2.81.0",
+    "request-promise-native": "^1.0.4",
     "underscore": "^1.8.3"
   }
 }

readme.md

@@ -200,6 +200,9 @@ gtt report --exclude_labels=bug --exclude_labels=feature
 # include issues and merge requests in the report hat have no time records
 gtt report --show_without_times
 
+# use a proxy server
+gtt report --proxy="http://localhost:8080"
+
 # choose a different output than a stdout table
 gtt report --output=markdown --file=filename.md
 gtt report --output=csv --file=filename.csv
@@ -217,6 +220,9 @@ url: http://gitlab.com/api/v4/
 # your api token
 token: abcdefghijklmnopqrst
 
+# use a proxy server (defaults to false)
+proxy: http://localhost:8080
+
 # default project
 project: namespace/projectname