fixed PR comments

package.json

@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "test": "TS_NODE_PROJECT='./src/test/tsconfig.commonjs.json' TS_NODE_TRANSPILE_ONLY=true ./node_modules/.bin/mocha  --exit --require ts-node/register --require mock-local-storage --require jsdom-global/register --allow-uncaught --colors --reporter mocha-reporter --timeout 50000 src/test/*.ts src/test/crux-messenger/*.ts",
+    "test": "TS_NODE_PROJECT='./src/test/tsconfig.commonjs.json' TS_NODE_TRANSPILE_ONLY=true ./node_modules/.bin/mocha  --exit --require ts-node/register --require mock-local-storage --require jsdom-global/register --allow-uncaught --colors --reporter mocha-reporter --timeout 5000 src/test/*.ts src/test/crux-messenger/*.ts",
     "start-bridge-server": "node dist/crux-gateway-bridge-without-auth.js &",
     "stop-bridge-server": "pkill -- signal SIGINT crux-gateway-bridge-server-without-auth",
     "integration-test": "TS_NODE_PROJECT='./src/test/tsconfig.commonjs.json' TS_NODE_TRANSPILE_ONLY=true ./node_modules/.bin/mocha --exit --require ts-node/register --require mock-local-storage --require jsdom-global/register --allow-uncaught --colors --reporter mocha-reporter --timeout 80000  src/test/integration-tests/crux-messenger/*.ts",

src/application/clients/crux-service-client.ts

@@ -7,9 +7,9 @@ export class CruxServiceClient {
     private selfIdClaim: any;
     private cruxProtocolMessenger: any;
 
-    constructor(selfIdClaim: any, secureCruxNetwork: any, protocolSchema?: any) {
+    constructor(selfIdClaim: any, secureCruxNetwork: any, protocolSchema: any) {
         this.selfIdClaim = selfIdClaim;
-        this.cruxProtocolMessenger = new CruxProtocolMessenger(secureCruxNetwork, protocolSchema ? protocolSchema : keyManagementProtocol);
+        this.cruxProtocolMessenger = new CruxProtocolMessenger(secureCruxNetwork, protocolSchema);
     }
 
     public async getWalletClientForUser(remoteUserId: CruxId) {

src/application/clients/crux-wallet-client.ts

@@ -206,14 +206,10 @@ export class CruxWalletClient {
 
     @throwCruxClientError
     public getAddressMap = async (): Promise<IAddressMapping> => {
-        console.log("CruxWalletClient::getAddressMap::keyManager: ", this.getKeyManager());
         await this.initPromise;
-        console.log("CruxWalletClient::getAddressMap::publickKey: ", await this.getKeyManager().getPubKey());
         const cruxUser = await this.cruxUserRepository.getWithKey(this.getKeyManager());
-        console.log("CruxWalletClient::getAddressMap::cruxUser: ", cruxUser);
         if (cruxUser) {
             const assetIdAddressMap = cruxUser.getAddressMap();
-            console.log("CruxWalletClient::getAddressMap::assetIdAddressMap");
             return this.cruxAssetTranslator.assetIdAddressMapToSymbolAddressMap(assetIdAddressMap);
         }
         return {};
@@ -259,7 +255,6 @@ export class CruxWalletClient {
 
     @throwCruxClientError
     public putAddressMap = async (newAddressMap: IAddressMapping): Promise<{success: IPutAddressMapSuccess, failures: IPutAddressMapFailures}> => {
-        console.log("+++==", newAddressMap);
         await this.initPromise;
         const cruxUser = await this.getCruxUserByKey();
         if (!cruxUser) {
@@ -448,7 +443,7 @@ export class CruxWalletClient {
         const selfIdClaim = await this.getSelfClaim();
         if (selfIdClaim) {
             try {
-                await this.setupCruxMessenger(selfIdClaim, options);
+                await this.setupCruxMessenger(selfIdClaim);
             } catch (err) {
                 console.log(err);
             }
@@ -471,13 +466,10 @@ export class CruxWalletClient {
         }
         return selfClaim;
     }
-    private setupCruxMessenger = async (selfIdClaim: ICruxIdClaim | undefined, options: ICruxWalletClientOptions) => {
+    private setupCruxMessenger = async (selfIdClaim: ICruxIdClaim | undefined) => {
         if (!selfIdClaim) {
             throw Error("Self ID Claim is required to setup messenger");
         }
-        if (options && options.disableCruxMessenger) {
-            throw Error("Secure Crux Network hasn't been initiated for Wallet");
-        }
         const pubsubClientFactory = getPubsubClientFactory();
         this.secureCruxNetwork = new SecureCruxNetwork(this.cruxUserRepository, pubsubClientFactory, selfIdClaim);
         this.paymentProtocolMessenger = new CruxProtocolMessenger(this.secureCruxNetwork, cruxPaymentProtocol);

src/core/domain-services/crux-messenger.ts

@@ -252,9 +252,6 @@ export class SecureContext {
             data,
         };
         const serializedSecurePacket = JSON.stringify(securePacket);
-        if (typeof recipientId === "string") {
-            recipientId = CruxId.fromString(recipientId);
-        }
         const recipientCruxUser: CruxUser | undefined = await this.cruxUserRepo.getByCruxId(recipientId);
         if (!recipientCruxUser) {
             throw Error("No Such CRUX User Found");

src/core/domain-services/remote-key-service.ts

@@ -1,6 +1,6 @@
 import {makeUUID4} from "blockstack/lib";
 import { createNanoEvents, DefaultEvents, Emitter } from "nanoevents";
-import { CruxId } from "src/packages";
+import { CruxId } from "../../packages";
 import { IKeyManager } from "../interfaces";
 import { CruxProtocolMessenger, SecureCruxNetwork } from "./crux-messenger";
 
@@ -71,7 +71,7 @@ export class RemoteKeyHost {
             console.log("Inside RemoteKeyHost::in::Msg, senderId: ", msg, senderId);
             const data = await this.handleMessage(msg);
             console.log("Inside RemoteKeyHost::initialize::Data(handleMessage): ", data);
-            this.sendInvocationResult(data, senderId!);
+            await this.sendInvocationResult(data, CruxId.fromString(senderId!));
         });
     }
     private async sendInvocationResult(result: any, receiverId: CruxId) {
@@ -80,40 +80,19 @@ export class RemoteKeyHost {
         }
         const resultData = this.generateInvocationResponse(result);
         console.log("RemoteKeyHost::Inside sendInvocationResult::resultData: ", resultData);
-        // @ts-ignore
         await this.cruxProtocolMessenger.send({
             content: resultData,
             type: "KEY_MANAGER_RESPONSE",
         }, receiverId);
     }
 
     private async handleMessage(message: any) {
-        if (!VALID_METHODS.includes(message.method)) {
-            throw new Error("Invalid key manager method");
-        }
         if (!this.keyManager) {
             throw new Error("Key Manager not available");
         }
         let data;
-        if (message.method === "signWebToken") {
-            console.log("HandleMessage entrance:signWebToken");
-            data = await this.keyManager.signWebToken(message.args[0]);
-            console.log("HandleMessage exit:signWebToken", data);
-        } else if (message.method === "getPubKey") {
-            console.log("HandleMessage entrance:getPubKey");
-            data = await this.keyManager.getPubKey();
-            console.log("HandleMessage exit:getPubKey", data);
-        } else if (message.method === "deriveSharedSecret") {
-            console.log("HandleMessage entrance:deriveSharedSecret");
-            // @ts-ignore
-            data = await this.keyManager.deriveSharedSecret(message.args[0]);
-            console.log("HandleMessage exit:deriveSharedSecret", data);
-        } else if (message.method === "decryptMessage") {
-            console.log("HandleMessage entrance:decryptMessage");
-            // @ts-ignore
-            data = await this.keyManager.decryptMessage(message.args[0]);
-            console.log("HandleMessage exit:decryptMessage", data);
-        }
+        // @ts-ignore
+        data = await this.keyManager[message.method](message.args[0]);
         return {
             data,
             invocationId: message.invocationId,
@@ -141,52 +120,29 @@ export class RemoteKeyManager implements IKeyManager {
         await this.remoteKeyClient.initialize();
     }
     // @ts-ignore
-    public signWebToken = async (token: any) => {
-        return new Promise(async (resolve, reject) => {
-            const invocationId = await this.remoteKeyClient.invoke("signWebToken", [token]);
-            console.log("RemoteKeyManager::signWebToken::invokationId: ", invocationId);
-            this.remoteKeyClient.listenToInvocation(invocationId, (msg, senderId) => {
-                console.log("RemoteKeyManager::signWebToken::msg: ", msg);
-                resolve(msg.result.data);
-            }, (err) => {
-                reject(err);
-            });
-        });
+    public signWebToken = async (args: any) => {
+        return this.makeRemoteMessageCall("signWebToken", [args]);
     }
     // @ts-ignore
     public getPubKey = async () => {
-        return new Promise(async (resolve, reject) => {
-            const invocationId = await this.remoteKeyClient.invoke("getPubKey", []);
-            console.log("RemoteKeyManager::getPubKey::invokationId: ", invocationId);
-            this.remoteKeyClient.listenToInvocation(invocationId, (msg, senderId) => {
-                console.log("RemoteKeyManager::getPubKey::msg: ", msg);
-                resolve(msg.result.data);
-            }, (err) => {
-                reject(err);
-            });
-        });
+        return this.makeRemoteMessageCall("getPubKey");
     }
     // @ts-ignore
-    public deriveSharedSecret = async (publicKey: string) => {
-        const invocationId = await this.remoteKeyClient.invoke("deriveSharedSecret", [publicKey]);
-        console.log("RemoteKeyManager::deriveSharedSecret::invokationId: ", invocationId);
-        return new Promise(async (resolve, reject) => {
-            this.remoteKeyClient.listenToInvocation(invocationId, (msg, senderId) => {
-                console.log("RemoteKeyManager::deriveSharedSecret::msg: ", msg);
-                resolve(msg.result.data);
-            }, (err) => {
-                reject(err);
-            });
-        });
+    public deriveSharedSecret = async (args: string) => {
+        return this.makeRemoteMessageCall("deriveSharedSecret", [args]);
     }
     // @ts-ignore
-    public decryptMessage = async (encryptedMessage: string) => {
-        console.log("RemoteKeyManager::decryptMessage::entry: encryptedMessage: ", encryptedMessage);
-        const invocationId = await this.remoteKeyClient.invoke("decryptMessage", [encryptedMessage]);
-        console.log("RemoteKeyManager::decryptMessage::invokationId: ", invocationId);
+    public decryptMessage = async (args: string) => {
+        return this.makeRemoteMessageCall("decryptMessage", [args]);
+    }
+
+    private makeRemoteMessageCall = async (method: string, args: any = []) => {
+        console.log("makeRemoteMessageCall::", method, args);
+        const invocationId = await this.remoteKeyClient.invoke(method, args);
+        console.log("RemoteKeyManager::makeRemoteMessageCall::invokationId: ", invocationId);
         return new Promise(async (resolve, reject) => {
             this.remoteKeyClient.listenToInvocation(invocationId, (msg, senderId) => {
-                console.log("RemoteKeyManager::decryptMessage::msg: ", msg);
+                console.log("RemoteKeyManager::deriveSharedSecret::msg: ", msg);
                 resolve(msg.result.data);
             }, (err) => {
                 reject(err);

src/infrastructure/implementations/blockstack-crux-user-repository.ts

@@ -98,7 +98,7 @@ export class BlockstackCruxUserRepository implements ICruxUserRepository {
         }
         return new CruxUser(cruxID.components.subdomain, await this.getUserCruxDomain(cruxID) as CruxDomain, addressMap, cruxUserInformation, cruxUserData, cruxpayPubKey);
     }
-    public  getWithKey = async (keyManager: IKeyManager): Promise<CruxUser|undefined> => {
+    public getWithKey = async (keyManager: IKeyManager): Promise<CruxUser|undefined> => {
         const cruxID = await this.blockstackService.getCruxIdWithKeyManager(keyManager, this.getCruxDomain().id);
         if (!cruxID) {
             return;

src/infrastructure/implementations/crux-messenger.ts

@@ -186,19 +186,20 @@ export class CruxNetPubSubClientFactory implements IPubSubClientFactory {
         };
     }
     public getClient = (from: CruxId, keyManager: IKeyManager, to?: CruxId): IPubSubClient => {
-        if (this.bufferPahoClient[from.toString()]) { return this.bufferPahoClient[from.toString()]; }
+        const fromCruxIdString = from.toString();
+        if (this.bufferPahoClient[fromCruxIdString]) { return this.bufferPahoClient[fromCruxIdString]; }
         const overrideOpts = this.getDomainLevelClientOptions(to ? to : from);
-        this.bufferPahoClient[from.toString()] = new PahoClient({
+        this.bufferPahoClient[fromCruxIdString] = new PahoClient({
             clientOptions: {
-                clientId: from.toString(),
+                clientId: fromCruxIdString,
                 host: overrideOpts ? overrideOpts.host : this.options.defaultLinkServer.host,
                 path: overrideOpts ? overrideOpts.path : this.options.defaultLinkServer.path,
                 port: overrideOpts ? overrideOpts.port : this.options.defaultLinkServer.port,
                 // tslint:disable-next-line: object-literal-sort-keys
             },
             subscribeOptions: this.defaultSubscribeOptions,
         });
-        return this.bufferPahoClient[from.toString()];
+        return this.bufferPahoClient[fromCruxIdString];
     }
     private getDomainLevelClientOptions = (cruxId: CruxId): {host: string, port: number, path: string} | undefined => {
         // TODO Implement

src/test/integration-tests/crux-messenger/test-crux-service-client-prod.ts

@@ -52,7 +52,6 @@ describe('Test CruxServiceClient - Prod', function() {
         const cruxWalletClient = new CruxWalletClient({
             privateKey: user1PvtKey,
             walletClientName: "cruxdev",
-            isHost: true,
             cacheStorage: new InMemStorage(),
         });
         const cruxServiceClient = new CruxServiceClient({
@@ -69,7 +68,6 @@ describe('Test CruxServiceClient - Prod', function() {
         const cruxWalletClient = new CruxWalletClient({
             privateKey: user1PvtKey,
             walletClientName: "cruxdev",
-            isHost: true,
             cacheStorage: new InMemStorage(),
         });
         const cruxServiceClient = new CruxServiceClient({