@wishknish/knishio-client-js 0.4.39 → 0.4.42

package/src/libraries/ApolloLink/EchoLink.js

@@ -46,9 +46,7 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 import {
-  ApolloLink,
-  Operation,
-  NextLink
+  ApolloLink
 } from '@apollo/client/core';
 import Echo from 'laravel-echo';
 import createRequestHandler from './handler';

package/src/libraries/ApolloLink/HttpLink.js

@@ -46,8 +46,6 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 import {
-  Operation,
-  NextLink,
   HttpLink as RootHttpLink
 } from '@apollo/client/core';
 

package/src/libraries/ApolloLink/handler.js

@@ -46,10 +46,7 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 import {
-  Observable,
-  Operation,
-  FetchResult,
-  Observer
+  Observable
 } from '@apollo/client/core';
 
 /**

package/src/libraries/check.js

@@ -243,35 +243,31 @@ export default class CheckMolecule {
 
     for ( let atom of CheckMolecule.isotopeFilter( 'R', molecule.atoms ) ) {
       const metas = atom.aggregatedMeta();
-      for ( let key of [ 'callback', 'conditions', 'rule' ] ) {
 
-        if ( !metas.hasOwnProperty( key ) ) {
-          throw new MetaMissingException( `Check::isotopeR() - Required meta field "${ key }" is missing!` );
+      if ( metas.policy ) {
+        const policy = JSON.parse( metas.policy );
+
+        if ( !Object.keys( policy ).every( i => [ 'read', 'write' ].includes( i ) ) ) {
+          throw new MetaMissingException( 'Check::isotopeR() - Mixing rules with politics!' );
         }
       }
 
-      try {
-        const conditions = JSON.parse( metas[ 'conditions' ] ),
-          callback = JSON.parse( metas[ 'callback' ] );
-      } catch ( err ) {
-        throw new MetaMissingException( 'Check::isotopeR() - Condition is formatted incorrectly!' );
-      }
+      if ( metas.rule ) {
+        const rules = JSON.parse( metas.rule );
 
-      if ( conditions === 'policy' &&
-        callback.length &&
-        !callback.every( i => [ 'read', 'write' ].includes( i[ 'action' ] ) ) ) {
-        throw new MetaMissingException( 'Check::isotopeR() - Mixing rules with politics!' );
-      }
+        if ( !Array.isArray( rules ) ) {
+          throw new MetaMissingException( 'Check::isotopeR() - Incorrect rule format!' );
+        }
 
-      if ( Array.isArray( conditions ) && conditions.length ) {
+        if ( rules.length < 1 ) {
+          throw new MetaMissingException( 'Check::isotopeR() - No rules!' );
+        }
 
-        for ( let condition of conditions ) {
-          const keys = Object.keys( condition ),
-            property = keys.filter( n => [ 'key', 'value', 'comparison' ].indexOf( n ) !== -1 ),
-            property2 = keys.filter( n => [ 'managedBy' ].indexOf( n ) !== -1 );
+        for ( const rule of rules ) {
+          const keys = Object.keys(rule).filter( value => [ 'key', 'value', 'callback' ].includes( value ) );
 
-          if ( property.length < 3 && property2.length ) {
-            throw new MetaMissingException( 'Check::isotopeR() - Required condition field is missing!' );
+          if ( keys.length < 3 ) {
+            throw new MetaMissingException( 'Check::isotopeR() - Necessary rule fields are missing!' );
           }
         }
       }

package/src/mutation/Mutation.js

@@ -46,7 +46,6 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 import Query from '../query/Query';
-import { Operation } from '@apollo/client/core';
 
 /**
  * Base class used to construct various GraphQL mutations

package/src/mutation/MutationCreateRule.js

@@ -0,0 +1,91 @@
+/*
+                               (
+                              (/(
+                              (//(
+                              (///(
+                             (/////(
+                             (//////(                          )
+                            (////////(                        (/)
+                            (////////(                       (///)
+                           (//////////(                      (////)
+                           (//////////(                     (//////)
+                          (////////////(                    (///////)
+                         (/////////////(                   (/////////)
+                        (//////////////(                  (///////////)
+                        (///////////////(                (/////////////)
+                       (////////////////(               (//////////////)
+                      (((((((((((((((((((              (((((((((((((((
+                     (((((((((((((((((((              ((((((((((((((
+                     (((((((((((((((((((            ((((((((((((((
+                    ((((((((((((((((((((           (((((((((((((
+                    ((((((((((((((((((((          ((((((((((((
+                    (((((((((((((((((((         ((((((((((((
+                    (((((((((((((((((((        ((((((((((
+                    ((((((((((((((((((/      (((((((((
+                    ((((((((((((((((((     ((((((((
+                    (((((((((((((((((    (((((((
+                   ((((((((((((((((((  (((((
+                   #################  ##
+                   ################  #
+                  ################# ##
+                 %################  ###
+                 ###############(   ####
+                ###############      ####
+               ###############       ######
+              %#############(        (#######
+             %#############           #########
+            ############(              ##########
+           ###########                  #############
+          #########                      ##############
+        %######
+
+        Powered by Knish.IO: Connecting a Decentralized World
+
+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 ResponseCreateRule from '../response/ResponseCreateRule';
+
+
+/**
+ * Query for creating new Meta attached to some MetaType
+ */
+export default class MutationCreateRule extends MutationProposeMolecule {
+  /**
+   *
+   * @param {string} metaType
+   * @param {string} metaId
+   * @param {object[]} rule
+   * @param {object} policy
+   */
+  fillMolecule ( {
+    metaType,
+    metaId,
+    rule,
+    policy
+  } ) {
+    this.$__molecule.createRule( {
+      metaType,
+      metaId,
+      rule,
+      policy
+    } );
+    this.$__molecule.sign( {} );
+    this.$__molecule.check();
+  }
+
+  /**
+   * Builds a new Response object from a JSON string
+   *
+   * @param {object} json
+   * @return {ResponseCreateRule}
+   */
+  createResponse ( json ) {
+    return new ResponseCreateRule( {
+      query: this,
+      json
+    } );
+  }
+}

package/src/query/Query.js

@@ -46,7 +46,6 @@ 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 { Operation } from '@apollo/client/core';
 import Response from '../response/Response';
 
 export default class Query {

package/src/query/QueryMetaTypeViaAtom.js

@@ -59,11 +59,11 @@ export default class QueryMetaTypeViaAtom extends Query {
   constructor ( apolloClient ) {
     super( apolloClient );
 
-    this.$__query = gql`query ($metaTypes: [String!], $metaIds: [String!], $values: [String!], $latest: Boolean, $filter: [MetaFilter!], $queryArgs: QueryArgs, $countBy: String) {
+    this.$__query = gql`query ($metaTypes: [String!], $metaIds: [String!], $values: [String!], $keys: [String!], $latest: Boolean, $filter: [MetaFilter!], $queryArgs: QueryArgs, $countBy: String, $atomValues: [String!] ) {
       MetaTypeViaAtom(
         metaTypes: $metaTypes
         metaIds: $metaIds
-        values: $values
+        atomValues: $atomValues
         filter: $filter,
         latest: $latest,
         queryArgs: $queryArgs
@@ -78,7 +78,7 @@ export default class QueryMetaTypeViaAtom extends Query {
           metaType,
           metaId,
           createdAt,
-          metas {
+          metas( values: $values, keys: $keys ) {
             molecularHash,
             position,
             key,
@@ -114,6 +114,9 @@ export default class QueryMetaTypeViaAtom extends Query {
    * @param {string|array|null} metaId
    * @param {string|null} key
    * @param {string|null} value
+   * @param {array|null} values
+   * @param {array|null} keys
+   * @param {array|null} atomValues
    * @param {boolean|null} latest
    * @param {boolean|null} latestMetas
    * @param {array|null} filter
@@ -126,6 +129,9 @@ export default class QueryMetaTypeViaAtom extends Query {
     metaId = null,
     key = null,
     value = null,
+    keys = null,
+    values = null,
+    atomValues = null,
     latest = null,
     latestMetas = true,
     filter = null,
@@ -134,12 +140,24 @@ export default class QueryMetaTypeViaAtom extends Query {
   } ) {
     const variables = {};
 
+    if ( atomValues ) {
+      variables[ 'atomValues' ] = atomValues;
+    }
+
+    if ( keys ) {
+      variables[ 'keys' ] = keys;
+    }
+
+    if ( values ) {
+      variables[ 'values' ] = values;
+    }
+
     if ( metaType ) {
-      variables[ 'metaTypes' ] = [ metaType ];
+      variables[ 'metaTypes' ] = typeof metaType === 'string' ? [ metaType ] : metaType;
     }
 
     if ( metaId ) {
-      variables[ 'metaIds' ] = [ metaId ];
+      variables[ 'metaIds' ] = typeof metaId === 'string' ? [ metaId ] : metaId;
     }
 
     if ( countBy ) {

package/src/response/ResponseCreateRule.js

@@ -0,0 +1,55 @@
+/*
+                               (
+                              (/(
+                              (//(
+                              (///(
+                             (/////(
+                             (//////(                          )
+                            (////////(                        (/)
+                            (////////(                       (///)
+                           (//////////(                      (////)
+                           (//////////(                     (//////)
+                          (////////////(                    (///////)
+                         (/////////////(                   (/////////)
+                        (//////////////(                  (///////////)
+                        (///////////////(                (/////////////)
+                       (////////////////(               (//////////////)
+                      (((((((((((((((((((              (((((((((((((((
+                     (((((((((((((((((((              ((((((((((((((
+                     (((((((((((((((((((            ((((((((((((((
+                    ((((((((((((((((((((           (((((((((((((
+                    ((((((((((((((((((((          ((((((((((((
+                    (((((((((((((((((((         ((((((((((((
+                    (((((((((((((((((((        ((((((((((
+                    ((((((((((((((((((/      (((((((((
+                    ((((((((((((((((((     ((((((((
+                    (((((((((((((((((    (((((((
+                   ((((((((((((((((((  (((((
+                   #################  ##
+                   ################  #
+                  ################# ##
+                 %################  ###
+                 ###############(   ####
+                ###############      ####
+               ###############       ######
+              %#############(        (#######
+             %#############           #########
+            ############(              ##########
+           ###########                  #############
+          #########                      ##############
+        %######
+
+        Powered by Knish.IO: Connecting a Decentralized World
+
+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 './ResponseProposeMolecule';
+
+/**
+ * Response for rule creation
+ */
+export default class ResponseCreateRule extends ResponseProposeMolecule {
+
+}

package/src/subscribe/Subscribe.js

@@ -1,5 +1,4 @@
 import CodeException from '../exception/CodeException';
-import { Operation } from '@apollo/client/core';
 
 export default class Subscribe {
   /**

package/src/test/Test.js

@@ -58,6 +58,12 @@ export default class Test {
       [ 'unit_id_10' ],
       [ 'unit_id_11' ]
     ];
+    this.replenishTokenUnits = [
+      [ 'unit_id_12' ],
+      [ 'unit_id_13' ],
+      [ 'unit_id_14' ],
+      [ 'unit_id_15' ]
+    ];
   }
 
 
@@ -65,8 +71,12 @@ export default class Test {
    * Test all KnishIOClient functions
    */
   async testAll () {
-    await this.client( this.secrets[ 0 ] );
+    /*
+    await this.testTokenExpiration();
     return;
+    */
+
+    await this.client( this.secrets[ 0 ] );
     await this.client( this.secrets[ 1 ] );
 
     await this.testCreateToken();
@@ -76,6 +86,7 @@ export default class Test {
     await this.testRequestTokens();
     await this.testTransferToken();
     await this.testBurnToken();
+    await this.testReplenishToken();
     await this.testClaimShadowWallet();
     await this.testQueryMeta();
     await this.testQueryWallets();
@@ -84,6 +95,28 @@ export default class Test {
     await this.testQueryBalance();
   }
 
+
+  /**
+   *
+   * @returns {Promise<void>}
+   */
+  async testTokenExpiration () {
+    const client = await this.client( this.secrets[ 0 ] );
+    const fnTimeout = ( timeout ) => {
+      setTimeout( client => {
+        console.warn( `setTimeout ${ timeout }` );
+        client.queryMeta( {
+          metaType: 'metaType',
+          metaId: 'metaId'
+        } );
+      }, timeout, client, timeout );
+    };
+    fnTimeout( 3000 );
+    fnTimeout( 30000 );
+    fnTimeout( 61000 );
+    fnTimeout( 64000 );
+  }
+
   /**
    * @throws \Exception
    */
@@ -252,26 +285,45 @@ export default class Test {
    *
    */
   async testBurnToken () {
-
-    let bundleHash = generateBundleHash( this.secrets[ 1 ] );
     let response;
 
     let client = await this.client( this.secrets[ 0 ] );
     response = await client.burnTokens( {
       token: this.tokenSlugs[ 0 ],
-      amount: 10,
-      batchId: 'batch_3'
+      amount: 10
     } );
     this.checkResponse( response, 'testBurnToken' );
 
     response = await client.burnTokens( {
       token: this.tokenSlugs[ 2 ],
-      units: [ 'unit_id_3', 'unit_id_4' ],
-      batchId: 'batch_4'
+      units: [ 'unit_id_3', 'unit_id_4' ]
     } );
     this.checkResponse( response, 'testBurnUnitToken' );
   }
 
+
+  /**
+   *
+   */
+  async testReplenishToken () {
+
+    let response;
+
+    let client = await this.client( this.secrets[ 0 ] );
+    response = await client.replenishToken( {
+      token: this.tokenSlugs[ 0 ],
+      amount: 25
+    } );
+    this.checkResponse( response, 'testReplenishToken' );
+
+    response = await client.replenishToken( {
+      token: this.tokenSlugs[ 2 ],
+      amount: 0,
+      units: this.replenishTokenUnits
+    } );
+    this.checkResponse( response, 'testReplenishUnitToken' );
+  }
+
   /**
    *
    */