Skip to content

Commit

Permalink
Merge pull request #21 from kjjuno/bugfix/20-remote-json-fails
Browse files Browse the repository at this point in the history
Replacing axios with native http and https libs
closes #20
  • Loading branch information
kjjuno committed Feb 15, 2019
2 parents 4dc6568 + bf0d395 commit f0545ce
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 44 deletions.
37 changes: 0 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"swagger-compare": "src/swagger-compare-cli.js"
},
"dependencies": {
"axios": "^0.18.0",
"colors": "^1.3.3",
"diff": "^4.0.1",
"js-yaml": "^3.12.1"
Expand Down
31 changes: 26 additions & 5 deletions src/swagger-compare-cli.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
#!/usr/bin/env node

var colors = require('colors');
var axios = require('axios');
var http = require('http');
var https = require('https');
var fs = require('fs');
var yaml = require('js-yaml');
var tui = require('./tui');
var swagger = require('./swagger-compare');

var args = process.argv.slice(2);


async function loadFile(file) {
var text = null;
try {
if (file.startsWith('http')) {
var ret = await axios.get(file);
var buffer = Buffer.from(ret.data, 'binary');
text = buffer.toString();
if (file.startsWith('https')) {
var promise = new Promise((resolve, reject) => {
https.get(file, function(res) {
res.on('data', d => {
resolve(d.toString());
});
}).on('error', e => {
reject(e);
});
});
text = await promise;
}
else if (file.startsWith('http')) {
var promise = new Promise((resolve, reject) => {
http.get(file, function(res) {
res.on('data', d => {
resolve(d.toString());
});
}).on('error', e => {
reject(e);
});
});
text = await promise;
}
else {
text = fs.readFileSync(file, 'utf8');
Expand Down
1 change: 0 additions & 1 deletion test/swagger-compare.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const assert = require('assert');
var axios = require('axios');
var fs = require('fs');
var yaml = require('js-yaml');
const swagger = require('../src/swagger-compare');
Expand Down

0 comments on commit f0545ce

Please sign in to comment.