karl-common-util
Advanced tools
Comparing version 1.2.3 to 1.3.0
@@ -28,3 +28,4 @@ "use strict"; | ||
promise = new Promise(function _callee(resolve, reject) { | ||
var json, paramArr, k, responese, status, message; | ||
var json, paramArr, k, responese, _responese, status, message; | ||
return regeneratorRuntime.async(function _callee$(_context) { | ||
@@ -59,13 +60,27 @@ while (1) { | ||
} | ||
_context.next = 6; | ||
responese = void 0; | ||
_context.prev = 5; | ||
_context.next = 8; | ||
return regeneratorRuntime.awrap(fetch(url, json)); | ||
case 6: | ||
case 8: | ||
responese = _context.sent; | ||
status = responese.status; | ||
_context.next = 15; | ||
break; | ||
case 11: | ||
_context.prev = 11; | ||
_context.t0 = _context["catch"](5); | ||
//url请求失败 | ||
reject({ status: undefined, message: _context.t0 }); | ||
return _context.abrupt("return"); | ||
case 15: | ||
_responese = responese, status = _responese.status; | ||
//204和205没有返回内容 | ||
if (!(status === 204 || status === 205)) { | ||
_context.next = 11; | ||
_context.next = 19; | ||
break; | ||
@@ -77,33 +92,33 @@ } | ||
case 11: | ||
case 19: | ||
//将返回结果解析为json | ||
message = void 0; | ||
_context.prev = 12; | ||
_context.next = 15; | ||
_context.prev = 20; | ||
_context.next = 23; | ||
return regeneratorRuntime.awrap(responese.json()); | ||
case 15: | ||
case 23: | ||
message = _context.sent; | ||
_context.next = 22; | ||
_context.next = 30; | ||
break; | ||
case 18: | ||
_context.prev = 18; | ||
_context.t0 = _context["catch"](12); | ||
case 26: | ||
_context.prev = 26; | ||
_context.t1 = _context["catch"](20); | ||
//结果类型不为json(例如nginx直接返回404错误) | ||
reject({ status: status, message: _context.t0 }); | ||
reject({ status: status, message: _context.t1 }); | ||
return _context.abrupt("return"); | ||
case 22: | ||
_context.t1 = status; | ||
_context.next = _context.t1 === 200 ? 25 : _context.t1 === 201 ? 25 : _context.t1 === 202 ? 25 : _context.t1 === 204 ? 25 : _context.t1 === 401 ? 27 : 30; | ||
case 30: | ||
_context.t2 = status; | ||
_context.next = _context.t2 === 200 ? 33 : _context.t2 === 201 ? 33 : _context.t2 === 202 ? 33 : _context.t2 === 204 ? 33 : _context.t2 === 401 ? 35 : 38; | ||
break; | ||
case 25: | ||
case 33: | ||
resolve({ status: status, message: message }); | ||
return _context.abrupt("break", 32); | ||
return _context.abrupt("break", 40); | ||
case 27: | ||
case 35: | ||
//请求未授权,重新登录 | ||
@@ -114,9 +129,9 @@ if (isBrowser) { | ||
reject({ status: 401, message: "重新登录" }); | ||
return _context.abrupt("break", 32); | ||
return _context.abrupt("break", 40); | ||
case 30: | ||
case 38: | ||
reject({ status: status, message: message }); | ||
return _context.abrupt("break", 32); | ||
return _context.abrupt("break", 40); | ||
case 32: | ||
case 40: | ||
case "end": | ||
@@ -126,3 +141,3 @@ return _context.stop(); | ||
} | ||
}, null, undefined, [[12, 18]]); | ||
}, null, undefined, [[5, 11], [20, 26]]); | ||
}); | ||
@@ -129,0 +144,0 @@ return _context2.abrupt("return", promise); |
{ | ||
"name": "karl-common-util", | ||
"version": "1.2.3", | ||
"version": "1.3.0", | ||
"description": "karl common lib for client and server", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -28,3 +28,10 @@ import "isomorphic-fetch" | ||
} | ||
let responese = await fetch(url, json) | ||
let responese | ||
try { | ||
responese = await fetch(url, json) | ||
} catch (e) { | ||
//url请求失败 | ||
reject({status: undefined, message: e}) | ||
return | ||
} | ||
let {status} = responese | ||
@@ -31,0 +38,0 @@ |
44312
1028