@aeternity/aepp-sdk 10.0.0 → 11.0.0

package/es/utils/aepp-wallet-communication/rpc/{aepp-rpc.js → aepp-rpc.mjs}

@@ -7,22 +7,32 @@
  * import ContentScriptBridge
  * from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc'
  */
-import { v4 as uuid } from 'uuid';
-import Ae from '../../../ae';
-import RpcClient from './rpc-client';
-import { getHandler, message, voidFn } from '../helpers';
-import { METHODS, RPC_STATUS, VERSION } from '../schema';
+import { v4 as uuid } from '@aeternity/uuid';
+import Ae from "../../../ae/index.mjs";
+import RpcClient from "./rpc-client.mjs";
+import { getHandler, message } from "../helpers.mjs";
+import { METHODS, RPC_STATUS, VERSION } from "../schema.mjs";
+import { AlreadyConnectedError, NoWalletConnectedError, UnsubscribedAccountError, UnAuthorizedAccountError, ArgumentError, RpcConnectionError } from "../../errors.mjs";
+import { Node } from "../../../index.mjs";
 const NOTIFICATIONS = {
-  [METHODS.wallet.updateAddress]: instance => _ref => {
+  [METHODS.updateAddress]: instance => _ref => {
     let {
       params
     } = _ref;
     instance.rpcClient.accounts = params;
     instance.onAddressChange(params);
   },
-  [METHODS.updateNetwork]: instance => msg => {
-    instance.rpcClient.info.networkId = msg.params.networkId;
-    instance.onNetworkChange(msg.params);
+  [METHODS.updateNetwork]: instance => async _ref2 => {
+    let {
+      params
+    } = _ref2;
+    const {
+      networkId,
+      node
+    } = params;
+    instance.rpcClient.info.networkId = networkId;
+    node && instance.addNode(node.name, await Node(node), true);
+    instance.onNetworkChange(params);
   },
   [METHODS.closeConnection]: instance => msg => {
     instance.disconnectWallet();
@@ -30,12 +40,12 @@ const NOTIFICATIONS = {
   }
 };
 const RESPONSES = {
-  [METHODS.aepp.address]: instance => msg => instance.rpcClient.processResponse(msg),
-  [METHODS.aepp.connect]: instance => msg => {
+  [METHODS.address]: instance => msg => instance.rpcClient.processResponse(msg),
+  [METHODS.connect]: instance => msg => {
     if (msg.result) instance.rpcClient.info.status = RPC_STATUS.CONNECTED;
     instance.rpcClient.processResponse(msg);
   },
-  [METHODS.aepp.subscribeAddress]: instance => msg => {
+  [METHODS.subscribeAddress]: instance => msg => {
     if (msg.result) {
       if (msg.result.address) {
         instance.rpcClient.accounts = msg.result.address;
@@ -46,29 +56,29 @@ const RESPONSES = {
       }
     }
 
-    instance.rpcClient.processResponse(msg, _ref2 => {
+    instance.rpcClient.processResponse(msg, _ref3 => {
       let {
         id,
         result
-      } = _ref2;
+      } = _ref3;
       return [result];
     });
   },
-  [METHODS.aepp.sign]: instance => msg => {
-    instance.rpcClient.processResponse(msg, _ref3 => {
+  [METHODS.sign]: instance => msg => {
+    instance.rpcClient.processResponse(msg, _ref4 => {
       let {
         id,
         result
-      } = _ref3;
+      } = _ref4;
       return [result.signedTransaction || result.transactionHash];
     });
   },
-  [METHODS.aepp.signMessage]: instance => msg => {
-    instance.rpcClient.processResponse(msg, _ref4 => {
+  [METHODS.signMessage]: instance => msg => {
+    instance.rpcClient.processResponse(msg, _ref5 => {
       let {
         id,
         result
-      } = _ref4;
+      } = _ref5;
       return [result.signature];
     });
   }
@@ -106,17 +116,20 @@ const handleMessage = instance => async msg => {
 
 
 export default Ae.compose({
-  async init(_ref5) {
+  async init(_ref6) {
     let {
       name,
-      onAddressChange = voidFn,
-      onDisconnect = voidFn,
-      onNetworkChange = voidFn,
       connection,
-      forceValidation = false,
-      debug = false
-    } = _ref5;
-    const eventsHandlers = ['onDisconnect', 'onAddressChange', 'onNetworkChange'];
+      debug = false,
+      ...other
+    } = _ref6;
+    ['onAddressChange', 'onDisconnect', 'onNetworkChange'].forEach(event => {
+      var _other$event;
+
+      const handler = (_other$event = other[event]) !== null && _other$event !== void 0 ? _other$event : () => {};
+      if (typeof handler !== 'function') throw new ArgumentError(event, 'a function', handler);
+      this[event] = handler;
+    });
     this.connection = connection;
     this.name = name;
     this.debug = debug;
@@ -124,16 +137,7 @@ export default Ae.compose({
     if (connection) {
       // Init RPCClient
       await this.connectToWallet(connection);
-    } // Event callbacks
-
-
-    this.onDisconnect = onDisconnect;
-    this.onAddressChange = onAddressChange;
-    this.onNetworkChange = onNetworkChange; // validation
-
-    eventsHandlers.forEach(event => {
-      if (!forceValidation && typeof this[event] !== 'function') throw new Error(`Call-back for ${event} must be an function!`);
-    });
+    }
   },
 
   deepProps: {
@@ -147,7 +151,7 @@ export default Ae.compose({
     sign() {},
 
     addresses() {
-      if (!this.rpcClient.currentAccount) throw new Error('You are not subscribed for an account.');
+      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError();
       return [this.rpcClient.currentAccount, ...Object.keys(this.rpcClient.accounts.connected)];
     },
 
@@ -157,10 +161,19 @@ export default Ae.compose({
      * @instance
      * @rtype (connection: Object) => void
      * @param {Object} connection Wallet connection object
-     * @return {void}
+     * @param {Object} [options={}]
+     * @param {Boolean} [options.connectNode=true] - Request wallet to bind node
+     * @param {String}  [options.name=wallet-node] - Node name
+     * @param {Boolean} [options.select=false] - Select this node as current
+     * @return {Object}
      */
     async connectToWallet(connection) {
-      if (this.rpcClient && this.rpcClient.isConnected()) throw new Error('You are already connected to wallet ' + this.rpcClient);
+      let {
+        connectNode = false,
+        name = 'wallet-node',
+        select = false
+      } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      if (this.rpcClient && this.rpcClient.isConnected()) throw new AlreadyConnectedError('You are already connected to wallet ' + this.rpcClient);
       this.rpcClient = RpcClient({
         connection,
         networkId: this.getNetworkId({
@@ -170,7 +183,14 @@ export default Ae.compose({
         id: uuid(),
         handlers: [handleMessage(this), this.onDisconnect]
       });
-      return this.sendConnectRequest();
+      const walletInfo = await this.sendConnectRequest(connectNode);
+
+      if (connectNode && !Object.prototype.hasOwnProperty.call(walletInfo, 'node')) {
+        throw new RpcConnectionError('Missing URLs of the Node');
+      }
+
+      connectNode && this.addNode(name, await Node(walletInfo.node), select);
+      return walletInfo;
     },
 
     /**
@@ -183,7 +203,7 @@ export default Ae.compose({
      */
     async disconnectWallet() {
       let sendDisconnect = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
       sendDisconnect && this.rpcClient.sendMessage(message(METHODS.closeConnection, {
         reason: 'bye'
       }), true);
@@ -195,10 +215,14 @@ export default Ae.compose({
       let {
         onAccount
       } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
       const current = this.rpcClient.currentAccount;
-      if (!current) throw new Error('You are not subscribed for an account.');
-      if (onAccount && !this.rpcClient.hasAccessToAccount(onAccount)) throw new Error(`You do not have access to account ${onAccount}`);
+      if (!current) throw new UnsubscribedAccountError();
+
+      if (onAccount && !this.rpcClient.hasAccessToAccount(onAccount)) {
+        throw new UnAuthorizedAccountError(onAccount);
+      }
+
       return onAccount || current;
     },
 
@@ -210,9 +234,9 @@ export default Ae.compose({
      * @return {Promise} Address from wallet
      */
     async askAddresses() {
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
-      if (!this.rpcClient.currentAccount) throw new Error('You are not subscribed for an account.');
-      return this.rpcClient.request(METHODS.aepp.address);
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
+      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError();
+      return this.rpcClient.request(METHODS.address);
     },
 
     /**
@@ -225,8 +249,8 @@ export default Ae.compose({
      * @return {Promise} Address from wallet
      */
     async subscribeAddress(type, value) {
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
-      return this.rpcClient.request(METHODS.aepp.subscribeAddress, {
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
+      return this.rpcClient.request(METHODS.subscribeAddress, {
         type,
         value
       });
@@ -242,10 +266,14 @@ export default Ae.compose({
      */
     async signTransaction(tx) {
       let opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
-      if (!this.rpcClient.currentAccount) throw new Error('You are not subscribed for an account.');
-      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) throw new Error(`You do not have access to account ${opt.onAccount}`);
-      return this.rpcClient.request(METHODS.aepp.sign, { ...opt,
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
+      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError();
+
+      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) {
+        throw new UnAuthorizedAccountError(opt.onAccount);
+      }
+
+      return this.rpcClient.request(METHODS.sign, { ...opt,
         tx,
         returnSigned: true,
         networkId: this.getNetworkId()
@@ -262,10 +290,14 @@ export default Ae.compose({
      */
     async signMessage(msg) {
       let opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
-      if (!this.rpcClient.currentAccount) throw new Error('You are not subscribed for an account.');
-      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) throw new Error(`You do not have access to account ${opt.onAccount}`);
-      return this.rpcClient.request(METHODS.aepp.signMessage, { ...opt,
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
+      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError();
+
+      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) {
+        throw new UnAuthorizedAccountError(opt.onAccount);
+      }
+
+      return this.rpcClient.request(METHODS.signMessage, { ...opt,
         message: msg
       });
     },
@@ -274,16 +306,18 @@ export default Ae.compose({
      * Send connection request to wallet
      * @function sendConnectRequest
      * @instance
+     * @param {Boolean} connectNode - Request wallet to bind node
      * @rtype () => Promise
      * @return {Promise} Connection response
      */
-    async sendConnectRequest() {
-      return this.rpcClient.request(METHODS.aepp.connect, {
+    async sendConnectRequest(connectNode) {
+      return this.rpcClient.request(METHODS.connect, {
         name: this.name,
         version: VERSION,
         networkId: this.getNetworkId({
           force: true
-        })
+        }),
+        connectNode
       });
     },
 
@@ -302,9 +336,13 @@ export default Ae.compose({
      */
     async send(tx) {
       let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      if (!this.rpcClient || !this.rpcClient.isConnected()) throw new Error('You are not connected to Wallet');
-      if (!this.rpcClient.currentAccount) throw new Error('You are not subscribed for an account.');
-      if (options.onAccount && !this.rpcClient.hasAccessToAccount(options.onAccount)) throw new Error(`You do not have access to account ${options.onAccount}`);
+      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet');
+      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError();
+
+      if (options.onAccount && !this.rpcClient.hasAccessToAccount(options.onAccount)) {
+        throw new UnAuthorizedAccountError(options.onAccount);
+      }
+
       const opt = { ...this.Ae.defaults,
         ...options
       };
@@ -316,14 +354,22 @@ export default Ae.compose({
         return this.sendTransaction(signed, opt);
       }
 
-      return this.rpcClient.request(METHODS.aepp.sign, {
+      return this.rpcClient.request(METHODS.sign, {
         onAccount: opt.onAccount,
         tx,
         returnSigned: false,
         networkId: this.getNetworkId()
       });
+    },
+
+    isConnected() {
+      return this.rpcClient && this.rpcClient.isConnected();
+    },
+
+    isSubscribedAccount() {
+      return typeof this.rpcClient.currentAccount !== 'undefined';
     }
 
   }
 });
-//# sourceMappingURL=aepp-rpc.js.map
+//# sourceMappingURL=aepp-rpc.mjs.map

package/es/utils/aepp-wallet-communication/rpc/aepp-rpc.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/utils/aepp-wallet-communication/rpc/aepp-rpc.js"],"names":["v4","uuid","Ae","RpcClient","getHandler","message","METHODS","RPC_STATUS","VERSION","AlreadyConnectedError","NoWalletConnectedError","UnsubscribedAccountError","UnAuthorizedAccountError","ArgumentError","RpcConnectionError","Node","NOTIFICATIONS","updateAddress","instance","params","rpcClient","accounts","onAddressChange","updateNetwork","networkId","node","info","addNode","name","onNetworkChange","closeConnection","msg","disconnectWallet","onDisconnect","RESPONSES","address","processResponse","connect","result","status","CONNECTED","subscribeAddress","subscription","addressSubscription","id","sign","signedTransaction","transactionHash","signMessage","signature","REQUESTS","handleMessage","debug","Object","prototype","hasOwnProperty","call","callbacks","compose","init","connection","other","forEach","event","handler","connectToWallet","deepProps","defaults","walletBroadcast","methods","addresses","isSubscribedAccount","currentAccount","keys","connected","connectNode","select","isConnected","getNetworkId","force","connectionInfo","handlers","walletInfo","sendConnectRequest","sendDisconnect","sendMessage","reason","disconnect","onAccount","current","hasAccessToAccount","askAddresses","request","type","value","signTransaction","tx","opt","returnSigned","version","send","options","signed","sendTransaction"],"mappings":"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","sourcesContent":["/**\n * RPC handler for AEPP side\n *\n * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc\n * @export AeppRpc\n * @example\n * import ContentScriptBridge\n * from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc'\n */\nimport { v4 as uuid } from '@aeternity/uuid'\nimport Ae from '../../../ae'\nimport RpcClient from './rpc-client'\nimport { getHandler, message } from '../helpers'\nimport { METHODS, RPC_STATUS, VERSION } from '../schema'\nimport {\n  AlreadyConnectedError,\n  NoWalletConnectedError,\n  UnsubscribedAccountError,\n  UnAuthorizedAccountError,\n  ArgumentError,\n  RpcConnectionError\n} from '../../errors'\nimport { Node } from '../../../index'\n\nconst NOTIFICATIONS = {\n  [METHODS.updateAddress]: (instance) =>\n    ({ params }) => {\n      instance.rpcClient.accounts = params\n      instance.onAddressChange(params)\n    },\n  [METHODS.updateNetwork]: (instance) =>\n    async ({ params }) => {\n      const { networkId, node } = params\n      instance.rpcClient.info.networkId = networkId\n      node && instance.addNode(node.name, await Node(node), true)\n      instance.onNetworkChange(params)\n    },\n  [METHODS.closeConnection]: (instance) =>\n    (msg) => {\n      instance.disconnectWallet()\n      instance.onDisconnect(msg.params)\n    }\n}\n\nconst RESPONSES = {\n  [METHODS.address]: (instance) =>\n    (msg) => instance.rpcClient.processResponse(msg),\n  [METHODS.connect]: (instance) =>\n    (msg) => {\n      if (msg.result) instance.rpcClient.info.status = RPC_STATUS.CONNECTED\n      instance.rpcClient.processResponse(msg)\n    },\n  [METHODS.subscribeAddress]: (instance) =>\n    (msg) => {\n      if (msg.result) {\n        if (msg.result.address) {\n          instance.rpcClient.accounts = msg.result.address\n        }\n        if (msg.result.subscription) {\n          instance.rpcClient.addressSubscription = msg.result.subscription\n        }\n      }\n\n      instance.rpcClient.processResponse(msg, ({ id, result }) => [result])\n    },\n  [METHODS.sign]: (instance) =>\n    (msg) => {\n      instance.rpcClient.processResponse(\n        msg, ({ id, result }) => [result.signedTransaction || result.transactionHash]\n      )\n    },\n  [METHODS.signMessage]: (instance) =>\n    (msg) => {\n      instance.rpcClient.processResponse(msg, ({ id, result }) => [result.signature])\n    }\n}\n\nconst REQUESTS = {}\n\nconst handleMessage = (instance) => async (msg) => {\n  if (!msg.id) {\n    return getHandler(NOTIFICATIONS, msg, { debug: instance.debug })(instance)(msg)\n  } else if (Object.prototype.hasOwnProperty.call(instance.rpcClient.callbacks, msg.id)) {\n    return getHandler(RESPONSES, msg, { debug: instance.debug })(instance)(msg)\n  } else {\n    return getHandler(REQUESTS, msg, { debug: instance.debug })(instance)(msg)\n  }\n}\n\n/**\n * Contain functionality for wallet interaction and connect it to sdk\n * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc\n * @function\n * @rtype Stamp\n * @param {Object} param Init params object\n * @param {String=} [param.name] Aepp name\n * @param {Function} onAddressChange Call-back function for update address event\n * @param {Function} onDisconnect Call-back function for disconnect event\n * @param {Function} onNetworkChange Call-back function for update network event\n * @param {Object} connection Wallet connection object\n * @return {Object}\n */\nexport default Ae.compose({\n  async init ({\n    name,\n    connection,\n    debug = false,\n    ...other\n  }) {\n    ['onAddressChange', 'onDisconnect', 'onNetworkChange'].forEach(event => {\n      const handler = other[event] ?? (() => {})\n      if (typeof handler !== 'function') throw new ArgumentError(event, 'a function', handler)\n      this[event] = handler\n    })\n\n    this.connection = connection\n    this.name = name\n    this.debug = debug\n\n    if (connection) {\n      // Init RPCClient\n      await this.connectToWallet(connection)\n    }\n  },\n  deepProps: { Ae: { defaults: { walletBroadcast: true } } },\n  methods: {\n    sign () {\n    },\n    addresses () {\n      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError()\n      return [this.rpcClient.currentAccount, ...Object.keys(this.rpcClient.accounts.connected)]\n    },\n    /**\n     * Connect to wallet\n     * @function connectToWallet\n     * @instance\n     * @rtype (connection: Object) => void\n     * @param {Object} connection Wallet connection object\n     * @param {Object} [options={}]\n     * @param {Boolean} [options.connectNode=true] - Request wallet to bind node\n     * @param {String}  [options.name=wallet-node] - Node name\n     * @param {Boolean} [options.select=false] - Select this node as current\n     * @return {Object}\n     */\n    async connectToWallet (connection, { connectNode = false, name = 'wallet-node', select = false } = {}) {\n      if (this.rpcClient && this.rpcClient.isConnected()) throw new AlreadyConnectedError('You are already connected to wallet ' + this.rpcClient)\n      this.rpcClient = RpcClient({\n        connection,\n        networkId: this.getNetworkId({ force: true }),\n        ...connection.connectionInfo,\n        id: uuid(),\n        handlers: [handleMessage(this), this.onDisconnect]\n      })\n      const walletInfo = await this.sendConnectRequest(connectNode)\n      if (connectNode && !Object.prototype.hasOwnProperty.call(walletInfo, 'node')) {\n        throw new RpcConnectionError('Missing URLs of the Node')\n      }\n      connectNode && this.addNode(name, await Node(walletInfo.node), select)\n      return walletInfo\n    },\n    /**\n     * Disconnect from wallet\n     * @function disconnectWallet\n     * @instance\n     * @rtype (force: Boolean = false) => void\n     * @param {Boolean} sendDisconnect=false Force sending close connection message\n     * @return {void}\n     */\n    async disconnectWallet (sendDisconnect = true) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      sendDisconnect && this.rpcClient.sendMessage(message(METHODS.closeConnection, { reason: 'bye' }), true)\n      this.rpcClient.disconnect()\n      this.rpcClient = null\n    },\n    async address ({ onAccount } = {}) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      const current = this.rpcClient.currentAccount\n      if (!current) throw new UnsubscribedAccountError()\n      if (onAccount && !this.rpcClient.hasAccessToAccount(onAccount)) {\n        throw new UnAuthorizedAccountError(onAccount)\n      }\n      return onAccount || current\n    },\n    /**\n     * Ask address from wallet\n     * @function askAddresses\n     * @instance\n     * @rtype () => Promise\n     * @return {Promise} Address from wallet\n     */\n    async askAddresses () {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError()\n      return this.rpcClient.request(METHODS.address)\n    },\n    /**\n     * Subscribe for addresses from wallet\n     * @function subscribeAddress\n     * @instance\n     * @rtype (type: String, value: String) => Promise\n     * @param {String} type Should be one of 'current' (the selected account), 'connected' (all)\n     * @param {String} value Subscription action('subscribe'|'unsubscribe')\n     * @return {Promise} Address from wallet\n     */\n    async subscribeAddress (type, value) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      return this.rpcClient.request(METHODS.subscribeAddress, { type, value })\n    },\n    /**\n     * Overwriting of `signTransaction` AE method\n     * All sdk API which use it will be send notification to wallet and wait for callBack\n     * @function signTransaction\n     * @instance\n     * @rtype (tx: String, options = {}) => Promise\n     * @return {Promise<String>} Signed transaction\n     */\n    async signTransaction (tx, opt = {}) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError()\n      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) {\n        throw new UnAuthorizedAccountError(opt.onAccount)\n      }\n      return this.rpcClient.request(\n        METHODS.sign,\n        { ...opt, tx, returnSigned: true, networkId: this.getNetworkId() }\n      )\n    },\n    /**\n     * Overwriting of `signMessage` AE method\n     * All sdk API which use it will be send notification to wallet and wait for callBack\n     * @function signMessage\n     * @instance\n     * @rtype (msg: String, options = {}) => Promise\n     * @return {Promise<String>} Signed transaction\n     */\n    async signMessage (msg, opt = {}) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError()\n      if (opt.onAccount && !this.rpcClient.hasAccessToAccount(opt.onAccount)) {\n        throw new UnAuthorizedAccountError(opt.onAccount)\n      }\n      return this.rpcClient.request(METHODS.signMessage, { ...opt, message: msg })\n    },\n    /**\n     * Send connection request to wallet\n     * @function sendConnectRequest\n     * @instance\n     * @param {Boolean} connectNode - Request wallet to bind node\n     * @rtype () => Promise\n     * @return {Promise} Connection response\n     */\n    async sendConnectRequest (connectNode) {\n      return this.rpcClient.request(\n        METHODS.connect, {\n          name: this.name,\n          version: VERSION,\n          networkId: this.getNetworkId({ force: true }),\n          connectNode\n        }\n      )\n    },\n    /**\n     * Overwriting of `send` AE method\n     * All sdk API which use it will be send notification to wallet and wait for callBack\n     * This method will sign, broadcast and wait until transaction will be accepted using rpc\n     * communication with wallet\n     * @function send\n     * @instance\n     * @rtype (tx: String, options = {}) => Promise\n     * @param {String} tx\n     * @param {Object} [options={}]\n     * @param {Object} [options.walletBroadcast=true]\n     * @return {Promise<Object>} Transaction broadcast result\n     */\n    async send (tx, options = {}) {\n      if (!this.isConnected()) throw new NoWalletConnectedError('You are not connected to Wallet')\n      if (!this.isSubscribedAccount()) throw new UnsubscribedAccountError()\n      if (options.onAccount && !this.rpcClient.hasAccessToAccount(options.onAccount)) {\n        throw new UnAuthorizedAccountError(options.onAccount)\n      }\n      const opt = { ...this.Ae.defaults, ...options }\n      if (!opt.walletBroadcast) {\n        const signed = await this.signTransaction(tx, { onAccount: opt.onAccount })\n        return this.sendTransaction(signed, opt)\n      }\n      return this.rpcClient.request(\n        METHODS.sign,\n        { onAccount: opt.onAccount, tx, returnSigned: false, networkId: this.getNetworkId() }\n      )\n    },\n    isConnected () { return (this.rpcClient && this.rpcClient.isConnected()) },\n    isSubscribedAccount () { return typeof this.rpcClient.currentAccount !== 'undefined' }\n  }\n})\n"],"file":"aepp-rpc.mjs"}

package/es/utils/aepp-wallet-communication/rpc/{rpc-client.js → rpc-client.mjs}

@@ -7,8 +7,9 @@
  * import RpcClient from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client'
  */
 import stampit from '@stamp/it';
-import { METHODS, RPC_STATUS, SUBSCRIPTION_TYPES } from '../schema';
-import { sendMessage, message, isValidAccounts } from '../helpers';
+import { METHODS, RPC_STATUS, SUBSCRIPTION_TYPES } from "../schema.mjs";
+import { sendMessage, message, isValidAccounts } from "../helpers.mjs";
+import { InvalidRpcMessageError, TypeError, DuplicateCallbackError, MissingCallbackError } from "../../errors.mjs";
 /**
  * Contain functionality for using RPC conection
  * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client
@@ -55,7 +56,7 @@ export default stampit({
 
     const handleMessage = (msg, origin) => {
       if (!msg || !msg.jsonrpc || msg.jsonrpc !== '2.0' || !msg.method) {
-        throw new Error(`Received invalid message: ${msg}`);
+        throw new InvalidRpcMessageError(msg);
       }
 
       onMessage(msg, origin);
@@ -139,7 +140,7 @@ export default stampit({
      * @return {Boolean} is connected
      */
     isConnected() {
-      return this.connection.isConnected() && this.info.status === RPC_STATUS.CONNECTED;
+      return this.connection.isConnected() && (this.info.status === RPC_STATUS.CONNECTED || this.info.status === RPC_STATUS.NODE_BINDED);
     },
 
     /**
@@ -184,14 +185,14 @@ export default stampit({
       } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
       if (!isValidAccounts(accounts)) {
-        throw new Error('Invalid accounts object. Should be object like: `{ connected: {}, selected: {} }`');
+        throw new TypeError('Invalid accounts object. Should be object like: `{ connected: {}, selected: {} }`');
       }
 
       this.accounts = accounts;
 
       if (!forceNotification) {
         // Sent notification about account updates
-        this.sendMessage(message(METHODS.wallet.updateAddress, this.accounts), true);
+        this.sendMessage(message(METHODS.updateAddress, this.accounts), true);
       }
     },
 
@@ -227,7 +228,11 @@ export default stampit({
      */
     request(name, params) {
       const msgId = this.sendMessage(message(name, params));
-      if (Object.prototype.hasOwnProperty.call(this.callbacks, msgId)) throw new Error('Callback Already exist');
+
+      if (Object.prototype.hasOwnProperty.call(this.callbacks, msgId)) {
+        throw new DuplicateCallbackError();
+      }
+
       return new Promise((resolve, reject) => {
         this.callbacks[msgId] = {
           resolve,
@@ -251,7 +256,7 @@ export default stampit({
         error,
         result
       } = _ref2;
-      if (!this.callbacks[id]) throw new Error(`Can't find callback for this messageId ${id}`);
+      if (!this.callbacks[id]) throw new MissingCallbackError(id);
 
       if (result) {
         this.callbacks[id].resolve(...(typeof transformResult === 'function' ? transformResult({
@@ -267,4 +272,4 @@ export default stampit({
 
   }
 });
-//# sourceMappingURL=rpc-client.js.map
+//# sourceMappingURL=rpc-client.mjs.map

package/es/utils/aepp-wallet-communication/rpc/rpc-client.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/utils/aepp-wallet-communication/rpc/rpc-client.js"],"names":["stampit","METHODS","RPC_STATUS","SUBSCRIPTION_TYPES","sendMessage","message","isValidAccounts","InvalidRpcMessageError","TypeError","DuplicateCallbackError","MissingCallbackError","init","id","name","networkId","icons","connection","handlers","onMessage","onDisconnect","info","callbacks","addressSubscription","accounts","handleMessage","msg","origin","jsonrpc","method","disconnect","aepp","connect","propertyDescriptors","currentAccount","enumerable","configurable","get","isHasAccounts","Object","keys","current","undefined","addresses","connected","methods","updateInfo","assign","isSubscribed","length","hasAccessToAccount","address","find","a","isConnected","status","CONNECTED","NODE_BINDED","getCurrentAccount","onAccount","forceConnectionClose","DISCONNECTED","setAccounts","forceNotification","updateAddress","updateSubscription","type","value","subscribe","includes","push","unsubscribe","filter","s","request","params","msgId","prototype","hasOwnProperty","call","Promise","resolve","reject","processResponse","transformResult","error","result"],"mappings":"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","sourcesContent":["/**\n * RpcClient module\n *\n * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client\n * @export { RpcClient, RpcClients }\n * @example\n * import RpcClient from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client'\n */\nimport stampit from '@stamp/it'\n\nimport { METHODS, RPC_STATUS, SUBSCRIPTION_TYPES } from '../schema'\nimport { sendMessage, message, isValidAccounts } from '../helpers'\nimport {\n  InvalidRpcMessageError,\n  TypeError,\n  DuplicateCallbackError,\n  MissingCallbackError\n} from '../../errors'\n\n/**\n * Contain functionality for using RPC conection\n * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client\n * @function\n * @rtype Stamp\n * @param {Object} param Init params object\n * @param {String} param.name Client name\n * @param {Object} param.connection Connection object\n * @param {Function[]} param.handlers Array with two function for message handling\n * @param {Function} param.handlers[0] Message handler\n * @param {Function} param.handlers[1] Disconnect callback\n * @return {Object}\n */\nexport default stampit({\n  init ({ id, name, networkId, icons, connection, handlers: [onMessage, onDisconnect] }) {\n    this.id = id\n    this.connection = connection\n    this.info = { name, networkId, icons }\n    // {\n    //    [msg.id]: { resolve, reject }\n    // }\n    this.callbacks = {}\n    // ['connected', 'current']\n    this.addressSubscription = []\n    // {\n    //    connected: { [pub]: {...meta} },\n    //    current: { [pub]: {...meta} }\n    // }\n    this.accounts = {}\n\n    this.sendMessage = sendMessage(this.connection)\n\n    const handleMessage = (msg, origin) => {\n      if (!msg || !msg.jsonrpc || msg.jsonrpc !== '2.0' || !msg.method) {\n        throw new InvalidRpcMessageError(msg)\n      }\n      onMessage(msg, origin)\n    }\n\n    const disconnect = (aepp, connection) => {\n      this.disconnect(true)\n      typeof onDisconnect === 'function' && onDisconnect(connection, this)\n    }\n\n    connection.connect(handleMessage, disconnect)\n  },\n  propertyDescriptors: {\n    currentAccount: {\n      enumerable: true,\n      configurable: false,\n      get () {\n        return this.isHasAccounts()\n          ? Object.keys(this.accounts.current)[0]\n          : undefined\n      }\n    },\n    addresses: {\n      enumerable: true,\n      configurable: false,\n      get () {\n        return this.isHasAccounts()\n          ? [...Object.keys(this.accounts.current), ...Object.keys(this.accounts.connected)]\n          : []\n      }\n    },\n    origin: {\n      enumerable: true,\n      configurable: false,\n      get () {\n        return this.connection\n      }\n    }\n  },\n  methods: {\n    /**\n     * Update info\n     * @function updateInfo\n     * @instance\n     * @rtype (info: Object) => void\n     * @param {Object} info Info to update (will be merged with current info object)\n     * @return {void}\n     */\n    updateInfo (info) {\n      Object.assign(this.info, info)\n    },\n    isHasAccounts () {\n      return typeof this.accounts === 'object' &&\n        typeof this.accounts.connected === 'object' &&\n        typeof this.accounts.current === 'object'\n    },\n    isSubscribed () {\n      return this.addressSubscription.length && this.isHasAccounts()\n    },\n    /**\n     * Check if aepp has access to account\n     * @function hasAccessToAccount\n     * @instance\n     * @rtype (address: String) => Boolean\n     * @param {String} address Account address\n     * @return {Boolean} is connected\n     */\n    hasAccessToAccount (address) {\n      return !!address && this.addresses.find(a => a === address)\n    },\n    /**\n     * Check if is connected\n     * @function isConnected\n     * @instance\n     * @rtype () => Boolean\n     * @return {Boolean} is connected\n     */\n    isConnected () {\n      return this.connection.isConnected() &&\n        (this.info.status === RPC_STATUS.CONNECTED || this.info.status === RPC_STATUS.NODE_BINDED)\n    },\n    /**\n     * Get selected account\n     * @function getCurrentAccount\n     * @instance\n     * @rtype ({ onAccount } = {}) => String\n     * @param {Object} options Options\n     * @return {String}\n     */\n    getCurrentAccount ({ onAccount } = {}) {\n      return onAccount || Object.keys(this.accounts.current)[0]\n    },\n    /**\n     * Disconnect\n     * @function disconnect\n     * @instance\n     * @rtype () => void\n     * @return {void}\n     */\n    disconnect (forceConnectionClose = false) {\n      this.info.status = RPC_STATUS.DISCONNECTED\n      this.addressSubscription = []\n      this.accounts = {}\n      forceConnectionClose || this.connection.disconnect()\n    },\n    /**\n     * Update accounts and sent `update.address` notification to AEPP\n     * @param {{ current: Object, connected: Object }} accounts Current and connected accounts\n     * @param {Object} [options]\n     * @param {Boolean} [options.forceNotification] Don't sent update notification to AEPP\n     */\n    setAccounts (accounts, { forceNotification } = {}) {\n      if (!isValidAccounts(accounts)) {\n        throw new TypeError('Invalid accounts object. Should be object like: `{ connected: {}, selected: {} }`')\n      }\n      this.accounts = accounts\n      if (!forceNotification) {\n        // Sent notification about account updates\n        this.sendMessage(message(METHODS.updateAddress, this.accounts), true)\n      }\n    },\n    /**\n     * Update subscription\n     * @function updateSubscription\n     * @instance\n     * @rtype (type: String, value: String) => void\n     * @param {String} type Subscription type\n     * @param {String} value Subscription value\n     * @return {String[]}\n     */\n    updateSubscription (type, value) {\n      if (type === SUBSCRIPTION_TYPES.subscribe && !this.addressSubscription.includes(value)) {\n        this.addressSubscription.push(value)\n      }\n      if (type === SUBSCRIPTION_TYPES.unsubscribe && this.addressSubscription.includes(value)) {\n        this.addressSubscription = this.addressSubscription.filter(s => s !== value)\n      }\n      return this.addressSubscription\n    },\n    /**\n     * Make a request\n     * @function request\n     * @instance\n     * @rtype (name: String, params: Object) => Promise\n     * @param {String} name Method name\n     * @param {Object} params Method params\n     * @return {Promise} Promise which will be resolved after receiving response message\n     */\n    request (name, params) {\n      const msgId = this.sendMessage(message(name, params))\n      if (Object.prototype.hasOwnProperty.call(this.callbacks, msgId)) {\n        throw new DuplicateCallbackError()\n      }\n      return new Promise((resolve, reject) => {\n        this.callbacks[msgId] = { resolve, reject }\n      })\n    },\n    /**\n     * Process response message\n     * @function processResponse\n     * @instance\n     * @rtype (msg: Object, transformResult: Function) => void\n     * @param {Object} msg Message object\n     * @param {Function=} transformResult Optional parser function for message\n     * @return {void}\n     */\n    processResponse ({ id, error, result }, transformResult) {\n      if (!this.callbacks[id]) throw new MissingCallbackError(id)\n      if (result) {\n        this.callbacks[id].resolve(...typeof transformResult === 'function'\n          ? transformResult({ id, result })\n          : [result])\n      } else {\n        this.callbacks[id].reject(error)\n      }\n      delete this.callbacks[id]\n    }\n  }\n})\n"],"file":"rpc-client.mjs"}