fix: never remove ipc callback & mem never be released (#4274)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
tauri-apps · Jun 5, 2022 · f72cace · f72cace
1 parent 53ae13d
commit f72cace
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.changes/fix-memory-leak-command.md b/.changes/fix-memory-leak-command.md
@@ -0,0 +1,6 @@
+---
+"tauri": patch
+"api": patch
+---
+
+Fixes a memory leak in the command system.
diff --git a/core/tauri/scripts/bundle.js b/core/tauri/scripts/bundle.js
diff --git a/core/tauri/scripts/core.js b/core/tauri/scripts/core.js
@@ -52,11 +52,11 @@
     return new Promise(function (resolve, reject) {
       var callback = window.__TAURI__.transformCallback(function (r) {
         resolve(r)
-        delete window[error]
+        delete window[`_${error}`]
       }, true)
       var error = window.__TAURI__.transformCallback(function (e) {
         reject(e)
-        delete window[callback]
+        delete window[`_${callback}`]
       }, true)
 
       if (typeof cmd === 'string') {

diff --git a/tooling/api/src/tauri.ts b/tooling/api/src/tauri.ts
@@ -69,11 +69,11 @@ async function invoke<T>(cmd: string, args: InvokeArgs = {}): Promise<T> {
   return new Promise((resolve, reject) => {
     const callback = transformCallback((e: T) => {
       resolve(e)
-      Reflect.deleteProperty(window, error)
+      Reflect.deleteProperty(window, `_${error}`)
     }, true)
     const error = transformCallback((e) => {
       reject(e)
-      Reflect.deleteProperty(window, callback)
+      Reflect.deleteProperty(window, `_${callback}`)
     }, true)
 
     window.__TAURI_IPC__({