@wishknish/knishio-client-js 0.5.2 → 0.6.0

package/src/mutation/MutationCreateWallet.js

@@ -45,18 +45,17 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
-import ResponseCreateWallet from '../response/ResponseCreateWallet';
+import MutationProposeMolecule from './MutationProposeMolecule'
+import ResponseCreateWallet from '../response/ResponseCreateWallet'
 
 /**
  * Query for creating new Wallets
  */
 export default class MutationCreateWallet extends MutationProposeMolecule {
-
-  fillMolecule ( newWallet ) {
-    this.$__molecule.initWalletCreation( newWallet );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check();
+  fillMolecule (wallet) {
+    this.$__molecule.initWalletCreation(wallet)
+    this.$__molecule.sign({})
+    this.$__molecule.check()
   }
 
   /**
@@ -65,11 +64,10 @@ export default class MutationCreateWallet extends MutationProposeMolecule {
    * @param {object} json
    * @return {ResponseCreateWallet}
    */
-  createResponse ( json ) {
-    return new ResponseCreateWallet( {
+  createResponse (json) {
+    return new ResponseCreateWallet({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationDepositBufferToken.js

@@ -45,29 +45,27 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
+import MutationProposeMolecule from './MutationProposeMolecule'
 
 /**
  *
  */
 export default class MutationDepositBufferToken extends MutationProposeMolecule {
-
   /**
    * Fills the Molecule with provided wallet and amount data
    *
    * @param amount
    * @param tradeRates
    */
-  fillMolecule ( {
+  fillMolecule ({
     amount,
     tradeRates
-  } ) {
-    this.$__molecule.initDepositBuffer( {
+  }) {
+    this.$__molecule.initDepositBuffer({
       amount,
       tradeRates
-    } );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check( this.$__molecule.sourceWallet );
+    })
+    this.$__molecule.sign({})
+    this.$__molecule.check(this.$__molecule.sourceWallet)
   }
-
 }

package/src/mutation/MutationLinkIdentifier.js

@@ -45,22 +45,21 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Mutation from '../mutation/Mutation';
-import ResponseLinkIdentifier from '../response/ResponseLinkIdentifier';
-import { gql } from '@apollo/client/core';
+import Mutation from '../mutation/Mutation'
+import ResponseLinkIdentifier from '../response/ResponseLinkIdentifier'
+import { gql } from '@apollo/client/core'
 
 /**
  * Query for linking an Identifier to a Wallet Bundle
  */
 export default class MutationLinkIdentifier extends Mutation {
-
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {ApolloClientWrapper} apolloClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (apolloClient, knishIOClient) {
+    super(apolloClient, knishIOClient)
+
     this.$__query = gql`mutation( $bundle: String!, $type: String!, $content: String! ) {
       LinkIdentifier( bundle: $bundle, type: $type, content: $content ) {
         type,
@@ -69,7 +68,7 @@ export default class MutationLinkIdentifier extends Mutation {
         set,
         message
       }
-    }`;
+    }`
   }
 
   /**
@@ -78,11 +77,10 @@ export default class MutationLinkIdentifier extends Mutation {
    * @param {object} json
    * @return {ResponseLinkIdentifier}
    */
-  createResponse ( json ) {
-    return new ResponseLinkIdentifier( {
+  createResponse (json) {
+    return new ResponseLinkIdentifier({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationProposeMolecule.js

@@ -45,21 +45,21 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import ResponseProposeMolecule from '../response/ResponseProposeMolecule';
-import Mutation from './Mutation';
-import { gql } from '@apollo/client/core';
-
+import ResponseProposeMolecule from '../response/ResponseProposeMolecule'
+import Mutation from './Mutation'
+import { gql } from '@apollo/client/core'
 
 export default class MutationProposeMolecule extends Mutation {
   /**
-   *
-   * @param {ApolloClient} apolloClient
+   * @param {ApolloClientWrapper} apolloClient
+   * @param {KnishIOClient} knishIOClient
    * @param molecule
    */
-  constructor ( apolloClient, molecule = null ) {
-    super( apolloClient );
-    this.$__molecule = molecule;
-    this.$__remainderWallet = null;
+  constructor (apolloClient, knishIOClient, molecule) {
+    super(apolloClient, knishIOClient)
+
+    this.$__molecule = molecule
+    this.$__remainderWallet = null
     this.$__query = gql`mutation( $molecule: MoleculeInput! ) {
       ProposeMolecule( molecule: $molecule ) {
         molecularHash,
@@ -73,7 +73,7 @@ export default class MutationProposeMolecule extends Mutation {
         processedAt,
         broadcastedAt,
       }
-    }`;
+    }`
   }
 
   /**
@@ -82,10 +82,10 @@ export default class MutationProposeMolecule extends Mutation {
    * @param {object} variables
    * @return {object}
    */
-  compiledVariables ( variables ) {
-    const _variables = super.compiledVariables( variables );
+  compiledVariables (variables) {
+    const _variables = super.compiledVariables(variables)
 
-    return { ..._variables, ...{ molecule: this.molecule() } };
+    return { ..._variables, ...{ molecule: this.molecule() } }
   }
 
   /**
@@ -94,11 +94,11 @@ export default class MutationProposeMolecule extends Mutation {
    * @param {object} json
    * @return {ResponseProposeMolecule}
    */
-  createResponse ( json ) {
-    return new ResponseProposeMolecule( {
+  createResponse (json) {
+    return new ResponseProposeMolecule({
       query: this,
       json
-    } );
+    })
   }
 
   /**
@@ -107,13 +107,13 @@ export default class MutationProposeMolecule extends Mutation {
    * @param {object} variables
    * @return {Promise}
    */
-  async execute ( { variables = null } ) {
-    variables = variables || {};
-    variables.molecule = this.molecule();
+  async execute ({ variables = null }) {
+    variables = variables || {}
+    variables.molecule = this.molecule()
 
-    return super.execute( {
+    return super.execute({
       variables
-    } );
+    })
   }
 
   /**
@@ -122,7 +122,7 @@ export default class MutationProposeMolecule extends Mutation {
    * @return {null}
    */
   remainderWallet () {
-    return this.$__remainderWallet;
+    return this.$__remainderWallet
   }
 
   /**
@@ -131,7 +131,6 @@ export default class MutationProposeMolecule extends Mutation {
    * @return {Molecule}
    */
   molecule () {
-    return this.$__molecule;
+    return this.$__molecule
   }
-
 }

package/src/mutation/MutationRequestAuthorization.js

@@ -45,8 +45,8 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
-import ResponseRequestAuthorization from '../response/ResponseRequestAuthorization';
+import MutationProposeMolecule from './MutationProposeMolecule'
+import ResponseRequestAuthorization from '../response/ResponseRequestAuthorization'
 
 /**
  * Query for requesting an authorization token from the node
@@ -56,10 +56,10 @@ export default class MutationRequestAuthorization extends MutationProposeMolecul
    *
    * @param {object} meta
    */
-  fillMolecule ( { meta } ) {
-    this.$__molecule.initAuthorization( { meta } );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check();
+  fillMolecule ({ meta }) {
+    this.$__molecule.initAuthorization({ meta })
+    this.$__molecule.sign({})
+    this.$__molecule.check()
   }
 
   /**
@@ -68,11 +68,10 @@ export default class MutationRequestAuthorization extends MutationProposeMolecul
    * @param {object} json
    * @return {ResponseRequestAuthorization}
    */
-  createResponse ( json ) {
-    return new ResponseRequestAuthorization( {
+  createResponse (json) {
+    return new ResponseRequestAuthorization({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationRequestAuthorizationGuest.js

@@ -45,40 +45,37 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import { gql } from '@apollo/client/core';
-import Mutation from '../mutation/Mutation';
-import ResponseRequestAuthorizationGuest from '../response/ResponseRequestAuthorizationGuest';
-
+import { gql } from '@apollo/client/core'
+import Mutation from '../mutation/Mutation'
+import ResponseRequestAuthorizationGuest from '../response/ResponseRequestAuthorizationGuest'
 
 export default class MutationRequestAuthorizationGuest extends Mutation {
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {ApolloClientWrapper} apolloClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (apolloClient, knishIOClient) {
+    super(apolloClient, knishIOClient)
+
     this.$__query = gql`mutation( $cellSlug: String, $pubkey: String, $encrypt: Boolean ) {
       AccessToken( cellSlug: $cellSlug, pubkey: $pubkey, encrypt: $encrypt ) {
         token,
         pubkey,
         expiresAt
       }
-    }`;
+    }`
   }
 
-
   /**
    * Returns a Response object
    *
    * @param {object} json
    * @return {ResponseRequestAuthorizationGuest}
    */
-  createResponse ( json ) {
-    return new ResponseRequestAuthorizationGuest( {
+  createResponse (json) {
+    return new ResponseRequestAuthorizationGuest({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationRequestTokens.js

@@ -45,9 +45,8 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
-import ResponseRequestTokens from '../response/ResponseRequestTokens';
-
+import MutationProposeMolecule from './MutationProposeMolecule'
+import ResponseRequestTokens from '../response/ResponseRequestTokens'
 
 export default class MutationRequestTokens extends MutationProposeMolecule {
   /**
@@ -60,25 +59,24 @@ export default class MutationRequestTokens extends MutationProposeMolecule {
    * @param {object} meta
    * @param {string|null} batchId
    */
-  fillMolecule ( {
+  fillMolecule ({
     token,
     amount,
     metaType,
     metaId,
     meta = null,
     batchId = null
-  } ) {
-
-    this.$__molecule.initTokenRequest( {
+  }) {
+    this.$__molecule.initTokenRequest({
       token,
       amount,
       metaType,
       metaId,
       meta: meta || {},
       batchId
-    } );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check();
+    })
+    this.$__molecule.sign({})
+    this.$__molecule.check()
   }
 
   /**
@@ -87,11 +85,10 @@ export default class MutationRequestTokens extends MutationProposeMolecule {
    * @param {object} json
    * @return {ResponseRequestTokens}
    */
-  createResponse ( json ) {
-    return new ResponseRequestTokens( {
+  createResponse (json) {
+    return new ResponseRequestTokens({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationTransferTokens.js

@@ -45,31 +45,29 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
-import ResponseTransferTokens from '../response/ResponseTransferTokens';
+import MutationProposeMolecule from './MutationProposeMolecule'
+import ResponseTransferTokens from '../response/ResponseTransferTokens'
 
 /**
  * Query for moving tokens between wallets
  */
 export default class MutationTransferTokens extends MutationProposeMolecule {
-
   /**
    * Fills the Molecule with provided wallet and amount data
    *
    * @param recipientWallet
    * @param amount
    */
-  fillMolecule ( {
+  fillMolecule ({
     recipientWallet,
     amount
-  } ) {
-
-    this.$__molecule.initValue( {
+  }) {
+    this.$__molecule.initValue({
       recipientWallet,
       amount
-    } );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check( this.$__molecule.sourceWallet );
+    })
+    this.$__molecule.sign({})
+    this.$__molecule.check(this.$__molecule.sourceWallet)
   }
 
   /**
@@ -78,11 +76,10 @@ export default class MutationTransferTokens extends MutationProposeMolecule {
    * @param {object} json
    * @return {ResponseTransferTokens}
    */
-  createResponse ( json ) {
-    return new ResponseTransferTokens( {
+  createResponse (json) {
+    return new ResponseTransferTokens({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/mutation/MutationWithdrawBufferToken.js

@@ -45,29 +45,26 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import MutationProposeMolecule from './MutationProposeMolecule';
+import MutationProposeMolecule from './MutationProposeMolecule'
 
 /**
  *
  */
 export default class MutationWithdrawBufferToken extends MutationProposeMolecule {
-
   /**
    *
    * @param recipients
    * @param signingWallet
    */
-  fillMolecule ( {
+  fillMolecule ({
     recipients,
     signingWallet
-  } ) {
-
-    this.$__molecule.initWithdrawBuffer( {
+  }) {
+    this.$__molecule.initWithdrawBuffer({
       recipients,
       signingWallet
-    } );
-    this.$__molecule.sign( {} );
-    this.$__molecule.check( this.$__molecule.sourceWallet );
+    })
+    this.$__molecule.sign({})
+    this.$__molecule.check(this.$__molecule.sourceWallet)
   }
-
 }

package/src/query/Query.js

@@ -45,28 +45,30 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import CodeException from '../exception/CodeException';
-import Response from '../response/Response';
+import CodeException from '../exception/CodeException'
+import Response from '../response/Response'
 
 export default class Query {
   /**
-   *
-   * @param {ApolloClient} apolloClient
+   * @param {ApolloClientWrapper} apolloClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    this.client = apolloClient;
-    this.$__variables = null;
-    this.$__query = null;
+  constructor (apolloClient, knishIOClient) {
+    this.client = apolloClient
+    this.knishIOClient = knishIOClient
+    this.$__variables = null
+    this.$__query = null
+    this.$__response = null
+    this.$__request = null
   }
 
-
   /**
    * Return a response object
    * Used at KnishIOClient::createMolecule => sets the source wallet from the remainder one stored in response object
    * @return {Response}
    */
   response () {
-    return this.$__response;
+    return this.$__response
   }
 
   /**
@@ -75,8 +77,8 @@ export default class Query {
    * @param response
    * @return {Promise<Response>}
    */
-  async createResponseRaw ( response ) {
-    return this.createResponse( response );
+  async createResponseRaw (response) {
+    return this.createResponse(response)
   }
 
   /**
@@ -85,11 +87,11 @@ export default class Query {
    * @param {object} json
    * @return {Response}
    */
-  createResponse ( json ) {
-    return new Response( {
+  createResponse (json) {
+    return new Response({
       query: this,
       json
-    } );
+    })
   }
 
   /**
@@ -98,43 +100,62 @@ export default class Query {
    * @param {{}} variables
    * @returns {{variables: (Object|null), query: null}}
    */
-  createQuery ( { variables = null } ) {
-    this.$__variables = this.compiledVariables( variables );
+  createQuery ({ variables = null }) {
+    this.$__variables = this.compiledVariables(variables)
 
     // Uri is a required parameter
-    let uri = this.uri();
+    const uri = this.uri()
 
-    if ( !uri ) {
-      throw new CodeException( 'Query::createQuery() - Node URI was not initialized for this client instance!' );
+    if (!uri) {
+      throw new CodeException('Query::createQuery() - Node URI was not initialized for this client instance!')
     }
 
-    if ( this.$__query === null ) {
-      throw new CodeException( 'Query::createQuery() - GraphQL subscription was not initialized!' );
+    if (this.$__query === null) {
+      throw new CodeException('Query::createQuery() - GraphQL subscription was not initialized!')
     }
 
     return {
       query: this.$__query,
       variables: this.variables()
-    };
+    }
   }
 
   /**
    * Sends the Query to a Knish.IO node and returns the Response
    *
    * @param {object} variables
+   * @param {object} context
    * @return {Promise<Response>}
    */
-  async execute ( { variables = null } ) {
-
-    this.$__request = this.createQuery( {
-      variables
-    } );
-
-    let response = await this.client.query( this.$__request );
+  async execute ({ variables = null, context = {} }) {
+    this.$__request = this.createQuery({ variables })
 
-    this.$__response = await this.createResponseRaw( response );
+    const mergedContext = {
+      ...context,
+      ...this.createQueryContext()
+    }
 
-    return this.$__response;
+    try {
+      const response = await this.client.query({
+        ...this.$__request,
+        context: mergedContext
+      })
+
+      this.$__response = await this.createResponseRaw(response)
+
+      return this.$__response
+    } catch (error) {
+      if (error.name === 'AbortError') {
+        this.knishIOClient.log('warn', 'Query was cancelled')
+        // You might want to create a custom response for cancelled queries
+        return new Response({
+          query: this,
+          json: { data: null, errors: [{ message: 'Query was cancelled' }] }
+        })
+      } else {
+        throw error
+      }
+    }
   }
 
   /**
@@ -143,8 +164,8 @@ export default class Query {
    * @param {object} variables
    * @return {object}
    */
-  compiledVariables ( variables = null ) {
-    return variables || {};
+  compiledVariables (variables = null) {
+    return variables || {}
   }
 
   /**
@@ -153,7 +174,7 @@ export default class Query {
    * @return {string}
    */
   uri () {
-    return this.client.getUri();
+    return this.client.getUri()
   }
 
   /**
@@ -162,6 +183,11 @@ export default class Query {
    * @return {object|null}
    */
   variables () {
-    return this.$__variables;
+    return this.$__variables
+  }
+
+  createQueryContext () {
+    // Override this method in subclasses if needed
+    return {}
   }
 }