Fix for RPC memory leak (#1044)

* Clear current invocation once resolved * Interfaces may not be registered -- unauthorized access or tests scenarios -- so try/catch (cherry picked from commit 777c9bd)
iTwin · Mar 30, 2021 · ab49944 · ab49944
1 parent d92e00b
commit ab49944
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/common/changes/@bentley/imodeljs-common/rpc-leak_2021-03-25-17-42.json b/common/changes/@bentley/imodeljs-common/rpc-leak_2021-03-25-17-42.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@bentley/imodeljs-common",
+      "comment": "Memory leak fix",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-common",
+  "email": "69857376+swbsi@users.noreply.github.com"
+}
diff --git a/core/common/src/rpc/core/RpcInvocation.ts b/core/common/src/rpc/core/RpcInvocation.ts
@@ -227,6 +227,13 @@ export class RpcInvocation {
       interfaceName: (typeof (this.operation) === "undefined") ? "" : this.operation.interfaceDefinition.interfaceName,
     };
 
+    try {
+      const impl = RpcRegistry.instance.getImplForInterface(this.operation.interfaceDefinition) as any;
+      if (impl[CURRENT_INVOCATION] === this) {
+        impl[CURRENT_INVOCATION] = undefined;
+      }
+    } catch (_err) { }
+
     return fulfillment;
   }