fix(core): fixed nativeFlushQueueImmediate callID issue

hoist __GLOBAL__._queue reset logic to avoid duplicated callID sent to nativeFlushQueueImmediate
Tencent · Jun 7, 2021 · ea77912 · ea77912
1 parent 61c63eb
commit ea77912
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/core/js/global/ConsoleModule.js b/core/js/global/ConsoleModule.js
@@ -123,11 +123,11 @@ const supportApiList = ['log', 'info', 'warn', 'error', 'debug'];
 
 supportApiList.forEach((api) => {
   global.console[api] = (...args) => {
-    const log = args.map(arg => inspect(arg)).join(' ');
-    consoleModule.Log(log);
     if (vmConsole) {
       vmConsole[api](...args);
     }
+    const log = args.map(arg => inspect(arg)).join(' ');
+    consoleModule.Log(log);
   };
 });
 

diff --git a/core/js/global/ios/global.js b/core/js/global/ios/global.js
@@ -81,8 +81,9 @@ __GLOBAL__.enqueueNativeCall = (moduleID, methodID, params, onFail, onSucc) => {
   __GLOBAL__._queue[2].push(params);
 
   if (typeof nativeFlushQueueImmediate !== 'undefined') {
-    nativeFlushQueueImmediate(__GLOBAL__._queue);
+    const originalQueue = [...__GLOBAL__._queue];
     __GLOBAL__._queue = [[], [], [], __GLOBAL__._callID];
+    nativeFlushQueueImmediate(originalQueue);
   }
 };
 

diff --git a/core/js/global/ios/promise.js b/core/js/global/ios/promise.js
@@ -312,6 +312,6 @@ Promise.prototype['catch'] = function (onRejected) {
   return this.then(null, onRejected);
 };
 
-global.Promise = Promise;
+global.Promise = global.Promise || Promise;
 
 /* eslint-disable */
diff --git a/core/src/napi/jsc/native_source_code_ios.cc b/core/src/napi/jsc/native_source_code_ios.cc