urllib to axios

examples/pfops_video_plus.js

@@ -1,5 +1,4 @@
 var qiniu = require('qiniu');
-var urllib = require('urllib');
 
 qiniu.conf.ACCESS_KEY = 'ak';
 qiniu.conf.SECRET_KEY = 'sk';
@@ -44,13 +43,9 @@ var json = {
 
 var accessToken = qiniu.util.generateAccessTokenV2(mac, url, 'POST', 'application/json', JSON.stringify(json));
 
-urllib.request(url, {
-    method: 'POST',
-    headers: {
-        Authorization: accessToken,
-        'Content-Type': 'application/json'
-    },
-    data: JSON.stringify(json)
+qiniu.rpc.post(url, JSON.stringify(json), {
+    Authorization: accessToken,
+    'Content-Type': 'application/json'
 }, function (err, data, res) {
     if (err) {
         console.log(err);

examples/sms.js

@@ -4,7 +4,7 @@ const should = require('should');
 const assert = require('assert');
 
 // eslint-disable-next-line no-undef
-before(function(done) {
+before(function (done) {
     if (!process.env.QINIU_ACCESS_KEY || !process.env.QINIU_SECRET_KEY) {
         console.log('should run command `source test-env.sh` first\n');
         process.exit(0);
@@ -13,83 +13,83 @@ before(function(done) {
 });
 
 // message
-describe('test Message', function() {
+describe('test Message', function () {
     var accessKey = proc.env.QINIU_ACCESS_KEY;
     var secretKey = proc.env.QINIU_SECRET_KEY;
     var mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
     // eslint-disable-next-line no-undef
-    describe('test sendMessage', function() {
+    describe('test sendMessage', function () {
         // eslint-disable-next-line no-undef
-        it('test sendMessage', function(done) {
-            var num = new Array("17321129884","18120582893");
+        it('test sendMessage', function (done) {
+            var num = ['17321129884', '18120582893'];
             var reqBody = {
-                "template_id": "1199572412090290176",
-                "mobiles": num,
-                "parameters": {
-                    "prize": "3333",
-                    "name": "sendMessage",
-                    "time": "1238"
+                template_id: '1199572412090290176',
+                mobiles: num,
+                parameters: {
+                    prize: '3333',
+                    name: 'sendMessage',
+                    time: '1238'
                 }
             };
-            qiniu.sms.message.sendMessage(reqBody, mac, function(respErr, respBody,
+            qiniu.sms.message.sendMessage(reqBody, mac, function (respErr, respBody,
                 respInfo) {
                 should.not.exist(respErr);
                 assert.strictEqual(respInfo.statusCode, 200);
                 done();
             });
         });
     });
-    describe('test sendSingleMessage', function() {
-        it('test sendSingleMessage', function(done) {
+    describe('test sendSingleMessage', function () {
+        it('test sendSingleMessage', function (done) {
             var reqBody = {
-                "template_id": "1199572412090290176",
-                "mobile": "17321129884",
-                "parameters": {
-                    "prize": "3333",
-                    "name": "sendSingleMessage",
-                    "time": "1238"
+                template_id: '1199572412090290176',
+                mobile: '17321129884',
+                parameters: {
+                    prize: '3333',
+                    name: 'sendSingleMessage',
+                    time: '1238'
                 }
             };
-            qiniu.sms.message.sendSingleMessage(reqBody, mac, function(respErr, respBody,
+            qiniu.sms.message.sendSingleMessage(reqBody, mac, function (respErr, respBody,
                 respInfo) {
                 should.not.exist(respErr);
                 assert.strictEqual(respInfo.statusCode, 200);
                 done();
             });
         });
     });
-    describe('test sendOverseaMessage', function() {
-        it('test sendOverseaMessage', function(done) {
+    describe('test sendOverseaMessage', function () {
+        it('test sendOverseaMessage', function (done) {
             var reqBody = {
-                "template_id": "1199572412090290176",
-                "mobile": "17321129884",
-                "parameters": {
-                    "prize": "3333",
-                    "name": "1111",
-                    "time": "1238"
+                template_id: '1199572412090290176',
+                mobile: '17321129884',
+                parameters: {
+                    prize: '3333',
+                    name: '1111',
+                    time: '1238'
                 }
             };
-            qiniu.sms.message.sendOverseaMessage(reqBody, mac, function(respErr, respBody,
+            qiniu.sms.message.sendOverseaMessage(reqBody, mac, function (respErr, respBody,
                 respInfo) {
                 should.not.exist(respErr);
                 assert.strictEqual(respInfo.statusCode, 200);
                 done();
             });
         });
     });
-    describe('test sendFulltextMessage', function() {
-        it('test sendFulltextMessage', function(done) {
-            var num = new Array("17321129884","18120582893");
+    describe('test sendFulltextMessage', function () {
+        it('test sendFulltextMessage', function (done) {
+            var num = ['17321129884', '18120582893'];
             var reqBody = {
-                "mobiles": num,
-                "content": "【七牛云-测试】您的验证码为1121，该验证码5分钟内有效",
-                "template_type": "verification"
+                mobiles: num,
+                content: '【七牛云-测试】您的验证码为1121，该验证码5分钟内有效',
+                template_type: 'verification'
             };
-            qiniu.sms.message.sendFulltextMessage(reqBody, mac, function(respErr, respBody,
+            qiniu.sms.message.sendFulltextMessage(reqBody, mac, function (respErr, respBody,
                 respInfo) {
-                    if(respErr!=null){
-                        console.log(respErr);
-                    }
+                if (respErr != null) {
+                    console.log(respErr);
+                }
                 should.not.exist(respErr);
                 assert.strictEqual(respInfo.statusCode, 200);
                 done();

index.js

@@ -15,6 +15,6 @@ module.exports = {
     room: require('./qiniu/rtc/room.js'),
     Credentials: require('./qiniu/rtc/credentials.js'),
     sms: {
-        message: require('./qiniu/sms/message.js'),
+        message: require('./qiniu/sms/message.js')
     }
 };

package.json

@@ -49,26 +49,24 @@
     "node >= 6"
   ],
   "dependencies": {
-    "agentkeepalive": "^4.0.2",
+    "axios": "^0.19.2",
     "block-stream2": "^2.0.0",
     "crc32": "^0.2.2",
     "destroy": "^1.0.4",
     "encodeurl": "^1.0.1",
-    "formstream": "^1.1.0",
-    "mime": "^2.4.4",
-    "tunnel-agent": "^0.6.0",
-    "urllib": "^2.34.1"
+    "form-data": "^3.0.0",
+    "mime": "^2.4.4"
   },
   "devDependencies": {
-    "@types/node": "^8.0.3",
+    "@types/node": "^13.9.2",
     "eslint": "^6.5.1",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.11.0",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "mocha": "^6.2.1",
-    "nyc": "^14.1.1",
+    "mocha": "^6.2.2",
+    "nyc": "^15.0.0",
     "should": "^13.2.3"
   },
   "license": "MIT"

qiniu/cdn.js

@@ -1,6 +1,6 @@
 const url = require('url');
 const crypto = require('crypto');
-const urllib = require('urllib');
+const rpc = require('./rpc');
 const util = require('./util');
 const digest = require('./auth/digest.js');
 const encodeUrl = require('encodeurl');
@@ -107,12 +107,7 @@ function req (mac, reqPath, reqBody, callbackFunc) {
         'Content-Type': 'application/json',
         Authorization: accessToken
     };
-    urllib.request(url, {
-        method: 'POST',
-        headers: headers,
-        data: reqBody,
-        dataType: 'json'
-    }, callbackFunc);
+    rpc.post(url, reqBody, headers, callbackFunc);
 }
 
 // 构建标准的基于时间戳的防盗链

qiniu/rpc.js

@@ -1,13 +1,14 @@
-var urllib = require('urllib');
-var conf = require('./conf');
+const axios = require('axios');
+const conf = require('./conf');
 
+exports.get = get;
 exports.post = post;
 exports.postMultipart = postMultipart;
 exports.postWithForm = postWithForm;
 exports.postWithoutForm = postWithoutForm;
 
 function postMultipart (requestURI, requestForm, callbackFunc) {
-    return post(requestURI, requestForm, requestForm.headers(), callbackFunc);
+    return post(requestURI, requestForm, requestForm.getHeaders(), callbackFunc);
 }
 
 function postWithForm (requestURI, requestForm, token, callbackFunc) {
@@ -30,50 +31,56 @@ function postWithoutForm (requestURI, token, callbackFunc) {
     return post(requestURI, null, headers, callbackFunc);
 }
 
+function get (requestURI, callbackFunc) {
+    return axios.get(requestURI).then((res) => {
+        res.statusCode = res.status;
+        callbackFunc(null, res.data, res);
+    }).catch((err) => {
+        let respBody = null;
+        if (err.response) {
+            err.response.statusCode = err.response.status;
+            respBody = err.response.data;
+        }
+        callbackFunc(err, respBody, err.response);
+    });
+}
+
 function post (requestURI, requestForm, headers, callbackFunc) {
-    // var start = parseInt(Date.now() / 1000);
     headers = headers || {};
     headers['User-Agent'] = headers['User-Agent'] || conf.USER_AGENT;
     headers.Connection = 'keep-alive';
 
-    var data = {
+    const data = {
+        url: requestURI,
         headers: headers,
         method: 'POST',
-        dataType: 'json',
+        responseType: 'json',
         timeout: conf.RPC_TIMEOUT,
-        gzip: true
-    //  timing: true,
+        decompress: false
     };
 
     if (conf.RPC_HTTP_AGENT) {
-        data.agent = conf.RPC_HTTP_AGENT;
+        data.httpAgent = conf.RPC_HTTP_AGENT;
     }
 
     if (conf.RPC_HTTPS_AGENT) {
         data.httpsAgent = conf.RPC_HTTPS_AGENT;
     }
 
-    if (Buffer.isBuffer(requestForm) || typeof requestForm === 'string') {
-        data.content = requestForm;
-    } else if (requestForm) {
-        data.stream = requestForm;
+    if (requestForm) {
+        data.data = requestForm;
     } else {
         data.headers['Content-Length'] = 0;
     }
-
-    var req = urllib.request(requestURI, data, function (respErr, respBody,
-        respInfo) {
-    // var end = parseInt(Date.now() / 1000);
-    // console.log((end - start) + " seconds");
-    // console.log("queuing:\t" + respInfo.timing.queuing);
-    // console.log("dnslookup:\t" + respInfo.timing.dnslookup);
-    // console.log("connected:\t" + respInfo.timing.connected);
-    // console.log("requestSent:\t" + respInfo.timing.requestSent);
-    // console.log("waiting:\t" + respInfo.timing.waiting);
-    // console.log("contentDownload:\t" + respInfo.timing.contentDownload);
-
-        callbackFunc(respErr, respBody, respInfo);
+    return axios.request(data).then((res) => {
+        res.statusCode = res.status;
+        callbackFunc(null, res.data, res);
+    }).catch((err) => {
+        let respBody = null;
+        if (err.response) {
+            err.response.statusCode = err.response.status;
+            respBody = err.response.data;
+        }
+        callbackFunc(err, respBody, err.response);
     });
-
-    return req;
 }