From 0db97851cdaab27c008c2043feed2c9514cb97f7 Mon Sep 17 00:00:00 2001 From: ziggi Date: Tue, 21 Jan 2020 21:14:10 +0300 Subject: [PATCH] Fix call procedure rejection with no args provided --- src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 41bfbeb..06b7cd2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -55,13 +55,13 @@ if(!glob[PROCESS_EVENT]){ } if(ret){ const promise = callProcedure(data.name, data.args, info); - if(!data.noRet) promise.then(res => ret({ ...part, res })).catch(err => ret({ ...part, err })); + if(!data.noRet) promise.then(res => ret({ ...part, res })).catch(err => ret({ ...part, err: err ? err : null })); } }else if(data.ret){ // a previously called remote procedure has returned const info = glob.__rpcPending[data.id]; if(environment === "server" && info.player !== player) return; if(info){ - info.resolve(data.err ? util.promiseReject(data.err) : util.promiseResolve(data.res)); + info.resolve(data.hasOwnProperty('err') ? util.promiseReject(data.err) : util.promiseResolve(data.res)); delete glob.__rpcPending[data.id]; } }