提交 8d803205 编写于 作者: fxy060608's avatar fxy060608

chore(uts): add error

上级 aa8039a8
...@@ -27,14 +27,22 @@ function getProxy() { ...@@ -27,14 +27,22 @@ function getProxy() {
} }
return proxy; return proxy;
} }
function resolveSyncResult(res, returnOptions, instanceId, proxy) { function resolveSyncResult(args, res, returnOptions, instanceId, proxy) {
// devtools 环境是字符串?
if (isString(res)) {
res = JSON.parse(res);
}
if ((process.env.NODE_ENV !== 'production')) { if ((process.env.NODE_ENV !== 'production')) {
console.log('uts.invokeSync.result', res, returnOptions, instanceId, typeof proxy); console.log('uts.invokeSync.result', res, returnOptions, instanceId, typeof proxy);
} }
if (!res) {
throw new Error(JSON.stringify(args));
}
// devtools 环境是字符串?
if (isString(res)) {
try {
res = JSON.parse(res);
}
catch (e) {
throw new Error(`JSON.parse(${res}): ` + e);
}
}
if (res.errMsg) { if (res.errMsg) {
throw new Error(res.errMsg); throw new Error(res.errMsg);
} }
...@@ -63,7 +71,7 @@ function invokePropGetter(args) { ...@@ -63,7 +71,7 @@ function invokePropGetter(args) {
if ((process.env.NODE_ENV !== 'production')) { if ((process.env.NODE_ENV !== 'production')) {
console.log('uts.invokePropGetter.args', args); console.log('uts.invokePropGetter.args', args);
} }
return resolveSyncResult(getProxy().invokeSync(args, () => { })); return resolveSyncResult(args, getProxy().invokeSync(args, () => { }));
} }
function initProxyFunction(async, { moduleName, moduleType, package: pkg, class: cls, name: propOrMethod, method, companion, params: methodParams, return: returnOptions, errMsg, }, instanceId, proxy) { function initProxyFunction(async, { moduleName, moduleType, package: pkg, class: cls, name: propOrMethod, method, companion, params: methodParams, return: returnOptions, errMsg, }, instanceId, proxy) {
const invokeCallback = ({ id, name, params, keepAlive, }) => { const invokeCallback = ({ id, name, params, keepAlive, }) => {
...@@ -128,7 +136,7 @@ function initProxyFunction(async, { moduleName, moduleType, package: pkg, class: ...@@ -128,7 +136,7 @@ function initProxyFunction(async, { moduleName, moduleType, package: pkg, class:
if ((process.env.NODE_ENV !== 'production')) { if ((process.env.NODE_ENV !== 'production')) {
console.log('uts.invokeSync.args', invokeArgs); console.log('uts.invokeSync.args', invokeArgs);
} }
return resolveSyncResult(getProxy().invokeSync(invokeArgs, invokeCallback), returnOptions, instanceId, proxy); return resolveSyncResult(invokeArgs, getProxy().invokeSync(invokeArgs, invokeCallback), returnOptions, instanceId, proxy);
}; };
} }
function initUTSStaticMethod(async, opts) { function initUTSStaticMethod(async, opts) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册