Skip to content

Commit 034d0fd

Browse files
authored
Merge pull request #144 from livehigh/fix/error-type
fix:兼容错误类型
2 parents 30e9ffb + 7aa9610 commit 034d0fd

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

sdk/util.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,21 @@ var error = function (err, opt) {
654654

655655
err.name = opt && opt.name || err.name || err.code || 'Error';
656656
if (!err.code) err.code = err.name;
657-
if (!err.error) err.error = clone(sourceErr); // 兼容老的错误格式
658-
657+
658+
if (!err.error) {
659+
var objectType = Object.prototype.toString.call(err);
660+
if (objectType === '[object Object]') {
661+
// 兼容老的错误格式
662+
err.error = clone(sourceErr);
663+
} else if (objectType === '[object Error]') {
664+
// 有环境报出[object Error]对象的情况,兼容处理一下
665+
err = {
666+
code: err.code || err.name || 'Error',
667+
name: err.name || err.code || 'Error',
668+
message: err.reason || err.message || 'Error',
669+
};
670+
}
671+
}
659672
return err;
660673
}
661674

0 commit comments

Comments
 (0)