Change request to fetch

Author: hkmoon

package.json

@@ -53,8 +53,6 @@
     "progress": "^2.0.0",
     "prompt": "^1.0.0",
     "read-yaml": "^1.1.0",
-    "request": "^2.87.0",
-    "request-promise-native": "^1.0.4",
     "shelljs": "^0.8.3",
     "tempfile": "^2.0.0",
     "underscore": "^1.9.1",

src/models/base.js

@@ -1,5 +1,3 @@
-const request = require('request-promise-native');
-const url = require('url');
 const async = require('async');
 const crypto = require('crypto');
 
@@ -36,9 +34,10 @@ class base {
         data.private_token = this.token;
 
         return new Promise((resolve, reject) => {
-            request.post(`${this.url}${path}`, {
+            fetch(`${this.url}${path}`, {
+                method: 'POST',
                 json: true,
-                body: data,
+                body: JSON.stringify(data),
                 insecure: this._insecure,
                 proxy: this._proxy,
                 resolveWithFullResponse: true,
@@ -67,7 +66,7 @@ class base {
         path += `&page=${page}&per_page=${perPage}`;
 
         return new Promise((resolve, reject) => {
-            request(`${this.url}${path}`, {
+            fetch(`${this.url}${path}`, {
                 json: true,
                 insecure: this._insecure,
                 proxy: this._proxy,
@@ -95,15 +94,17 @@ class base {
             let collect = [];
 
             this.get(path, 1, perPage).then(response => {
-                response.body.forEach(item => collect.push(item));
-                let pages = parseInt(response.headers['x-total-pages']);
-
-                if (pages === 1) return resolve(collect);
-
-                let tasks = base.createGetTasks(path, pages, 2, perPage);
-                this.getParallel(tasks, collect, runners).then(() => {
-                    resolve(collect);
-                }).catch(error => reject(error));
+                response.json().then(data => {
+                    data.forEach(item => collect.push(item));
+                    let pages = parseInt(response.headers['x-total-pages']);
+    
+                    if (pages === 1) return resolve(collect);
+    
+                    let tasks = base.createGetTasks(path, pages, 2, perPage);
+                    this.getParallel(tasks, collect, runners).then(() => {
+                        resolve(collect);
+                    }).catch(error => reject(error));
+                })
             }).catch(err => reject(err));
         });
     }
@@ -134,8 +135,10 @@ class base {
      */
     getParallel(tasks, collect = [], runners = this._parallel) {
         return this.parallel(tasks, (task, done) => {
-            this.get(task.path, task.page, task.perPage).then((response) => {
-                response.body.forEach(item => collect.push(item));
+            this.get(task.path, task.page, task.perPage)                
+                .then(response => response.json())
+                .then(items => {
+                items.forEach(item => collect.push(item));
                 done();
             }).catch(error => done(error));
         }, runners);

src/models/hasTimes.js

@@ -34,7 +34,7 @@ class hasTimes extends Base {
      */
     getStats() {
         let promise = this.get(`projects/${this.data.project_id}/${this._type}/${this.iid}/time_stats`);
-        promise.then(response => this.stats = response.body);
+        promise.then(response => response.json()).then(response => this.stats = response);
 
         return promise;
     }

src/models/issue.js

@@ -21,8 +21,8 @@ class issue extends hasTimes {
             promise = this.get(`projects/${encodeURIComponent(project)}/issues/${id}`);
         }
 
-        promise.then(issue => {
-            this.data = issue.body;
+        promise.then(response => response.json()).then(issue => {
+            this.data = issue;
             return promise;
         });
 

src/models/mergeRequest.js

@@ -18,8 +18,8 @@ class mergeRequest extends hasTimes {
             promise = this.get(`projects/${encodeURIComponent(project)}/merge_requests/${id}`);
         }
 
-        promise.then(issue => {
-            this.data = issue.body;
+        promise.then(response => response.json()).then(issue => {
+            this.data = issue;
             return promise;
         });
 

src/models/owner.js

@@ -37,6 +37,7 @@ class owner extends Base {
     getGroup() {
         return new Promise((resolve, reject) => {
             this.get(`groups`)
+                .then(response => response.json())
                 .then(groups => {
                     if (groups.body.length === 0) return reject('Group not found');
                     groups = groups.body;
@@ -57,6 +58,7 @@ class owner extends Base {
     getSubGroups() {
         return new Promise((resolve, reject) => {
             this.get(`groups`)
+                .then(response => response.json())
                 .then(groups => {
                     if (groups.body.length === 0) return resolve();
 
@@ -122,6 +124,7 @@ class owner extends Base {
     getProjectsByGroup() {
         return this.parallel(this.groups, (group, done) => {
             this.get(`groups/${group.id}/projects`)
+                .then(response => response.json())
                 .then(projects => {
                     this.projects = this.projects.concat(projects.body);
                     done();

src/models/project.js

@@ -21,7 +21,7 @@ class project extends Base {
      */
     make(name) {
         let promise = this.get(`projects/${encodeURIComponent(name)}`);
-        promise.then(project => this.data = project.body);
+        promise.then(response => response.json()).then(project => this.data = project);
 
         return promise;
     }
@@ -33,16 +33,18 @@ class project extends Base {
     members() {
         return new Promise((resolve, reject) => {
             this.get(`projects/${this.id}/members`)
+                .then(response => response.json())
                 .then(response => {
-                    this.projectMembers = this.projectMembers.concat(response.body);
+                    this.projectMembers = this.projectMembers.concat(response);
                     return new Promise(r => r());
                 })
                 .then(() => {
                     if (!this.data.namespace || !this.data.namespace.kind || this.data.namespace.kind !== "group") return resolve();
 
                     this.get(`groups/${this.data.namespace.id}/members`)
+                        .then(response => response.json())
                         .then(response => {
-                            this.projectMembers = this.projectMembers.concat(response.body);
+                            this.projectMembers = this.projectMembers.concat(response);
                             resolve();
                         })
                         .catch(e => reject(e));

src/models/report.js

@@ -68,7 +68,7 @@ class report extends Base {
      */
     getProject() {
         let promise = this.get(`projects/${encodeURIComponent(this.config.get('project'))}`);
-        promise.then(project => this.setProject(project.body));
+        promise.then(response => response.json()).then(project => this.setProject(project));
 
         return promise;
     }