Merge pull request #79 from lightninglabs/namespace-scoped-callbacks

lnc+util: assign WASM callbacks to a namespaced scope

Author: jamaljsr

lib/lnc.ts

@@ -71,6 +71,10 @@ export default class LNC {
         return globalThis[this._namespace] as WasmGlobal;
     }
 
+    private set wasm(value: any) {
+        globalThis[this._namespace] = value;
+    }
+
     get isReady() {
         return (
             this.wasm &&
@@ -137,27 +141,39 @@ export default class LNC {
         // make sure the WASM client binary is downloaded first
         if (!this.isReady) await this.preload();
 
-        global.onLocalPrivCreate = (keyHex: string) => {
-            log.debug('local private key created: ' + keyHex);
-            this.credentials.localKey = keyHex;
-        };
-
-        global.onRemoteKeyReceive = (keyHex: string) => {
-            log.debug('remote key received: ' + keyHex);
-            this.credentials.remoteKey = keyHex;
-        };
+        // create the namespace object in the global scope if it doesn't exist
+        // so that we can assign the WASM callbacks to it
+        if (typeof this.wasm !== 'object') {
+            this.wasm = {};
+        }
 
-        global.onAuthData = (keyHex: string) => {
-            log.debug('auth data received: ' + keyHex);
-        };
+        // assign the WASM callbacks to the namespace object if they haven't
+        // already been assigned by the consuming app
+        if (!this.wasm.onLocalPrivCreate) {
+            this.wasm.onLocalPrivCreate = (keyHex: string) => {
+                log.debug('local private key created: ' + keyHex);
+                this.credentials.localKey = keyHex;
+            };
+        }
+        if (!this.wasm.onRemoteKeyReceive) {
+            this.wasm.onRemoteKeyReceive = (keyHex: string) => {
+                log.debug('remote key received: ' + keyHex);
+                this.credentials.remoteKey = keyHex;
+            };
+        }
+        if (!this.wasm.onAuthData) {
+            this.wasm.onAuthData = (keyHex: string) => {
+                log.debug('auth data received: ' + keyHex);
+            };
+        }
 
         this.go.argv = [
             'wasm-client',
             '--debuglevel=trace',
             '--namespace=' + this._namespace,
-            '--onlocalprivcreate=onLocalPrivCreate',
-            '--onremotekeyreceive=onRemoteKeyReceive',
-            '--onauthdata=onAuthData'
+            `--onlocalprivcreate=${this._namespace}.onLocalPrivCreate`,
+            `--onremotekeyreceive=${this._namespace}.onRemoteKeyReceive`,
+            `--onauthdata=${this._namespace}.onAuthData`
         ];
 
         if (this.result) {

lib/types/lnc.ts

@@ -48,6 +48,25 @@ export interface WasmGlobal {
      * Returns the WASM client expiry time
      */
     wasmClientGetExpiry: () => number;
+    /**
+     * The callback that is called when the WASM client generates a new local private
+     * key. This is used to reestablish subsequent connections to the proxy server.
+     * @param keyHex the hex encoded private key of the local WASM client
+     */
+    onLocalPrivCreate?: (keyHex: string) => void;
+    /**
+     * The callback that is called when the WASM client receives the remote node's
+     * public key. This is used to reestablish subsequent connections to the proxy
+     * server.
+     * @param keyHex the hex encoded public key of the remote node
+     */
+    onRemoteKeyReceive?: (keyHex: string) => void;
+    /**
+     * The callback that is called when the WASM client receives the macaroon
+     * associated with the LNC session.
+     * @param macaroonHex the hex encoded macaroon associated with the LNC session
+     */
+    onAuthData?: (macaroonHex: string) => void;
 }
 
 export interface LncConfig {

lib/util/credentialStore.ts

@@ -43,10 +43,14 @@ export default class LncCredentialStore implements CredentialStore {
      */
     constructor(namespace?: string, password?: string) {
         if (namespace) this.namespace = namespace;
-        if (password) this.password = password;
 
         // load data stored in localStorage
         this._load();
+
+        // set the password after loading the data, otherwise the data will be
+        // overwritten because the password setter checks for the existence of
+        // persisted data.
+        if (password) this.password = password;
     }
 
     //