fix: support async child process methods without callback in asar (im…

…proved)
electron · Dec 4, 2018 · c58517f · c58517f
1 parent 398fc6a
commit c58517f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/common/asar.js b/lib/common/asar.js
@@ -143,10 +143,10 @@
     return error
   }
 
-  const overrideAPISync = function (module, name, pathArgumentIndex) {
+  const overrideAPISync = function (module, name, pathArgumentIndex, fromAsync) {
     if (pathArgumentIndex == null) pathArgumentIndex = 0
     const old = module[name]
-    module[name] = function () {
+    const func = function () {
       const pathArgument = arguments[pathArgumentIndex]
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return old.apply(this, arguments)
@@ -160,6 +160,10 @@
       arguments[pathArgumentIndex] = newPath
       return old.apply(this, arguments)
     }
+    if (fromAsync) {
+      return func
+    }
+    module[name] = func
   }
 
   const overrideAPI = function (module, name, pathArgumentIndex) {
@@ -171,6 +175,9 @@
       if (!isAsar) return old.apply(this, arguments)
 
       const callback = arguments[arguments.length - 1]
+      if (typeof callback !== 'function') {
+        return overrideAPISync(module, name, pathArgumentIndex, true).apply(this, arguments)
+      }
 
       const archive = getOrCreateArchive(asarPath)
       if (!archive) {