@wishknish/knishio-client-js 0.4.45 → 0.4.48

package/src/libraries/ApolloLink/PusherLink.js

@@ -45,182 +45,190 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import { ApolloLink, Observable } from '@apollo/client/core';
+import {
+  ApolloLink,
+  Observable
+} from '@apollo/client/core';
 import Pusher from 'pusher-js';
 import { parse } from 'uri-js';
 import CodeException from '../../exception/CodeException';
+import Dot from '../Dot';
 
 
 class PusherLink extends ApolloLink {
 
-    // constructor( options ) {
-    constructor( { socketUri, authEndpoint, appKey = 'app-key' } ) {
-        console.log( 'PusherLink::constructor()...' );
-        super();
+  // constructor( options ) {
+  constructor ( {
+    socketUri,
+    authEndpoint,
+    appKey = 'knishio'
+  } ) {
+    console.log( 'PusherLink::constructor()...' );
+    super();
 
-        this.socketUri = socketUri;
-        this.authEndpoint = authEndpoint;
-        this.appKey = appKey;
+    this.socketUri = socketUri;
+    this.authEndpoint = authEndpoint;
+    this.appKey = appKey;
 
-        this.setAuthToken( '' );
-        this.setTransport( this.getSocketUri() );
-    }
-
-    /**
-     *
-     * @param {string} socketUri
-     */
-    setTransport ( socketUri ) {
-
-        console.log( `Connecting to socket endpoint ${ socketUri }...` );
-
-        const wsPath = parse( socketUri );
-
-        if ( ![ 'ws', 'wss' ].includes( wsPath.scheme ) ) {
-            throw new CodeException( 'Incorrect scheme for the socket' );
-        }
-
-        this.transport = new Pusher( this.appKey, {
-            auth: {
-                headers: {
-                    'X-Auth-Token': this.getAuthToken(),
-                    Accept: 'application/json'
-                }
-            },
-            wsHost: wsPath.host,
-            wsPort: wsPath.port,
-            forceTLS: wsPath.scheme === 'wss',
-            encrypted: true,
-            enabledTransports: [ wsPath.scheme ],
-            authEndpoint: this.authEndpoint
-        } );
-    }
+    this.setAuthToken( '' );
+    this.setTransport( this.getSocketUri() );
+  }
 
-    disconnect() {
-        this.transport.disconnect();
-    }
-
-    /**
-     *
-     * @param {string} name
-     * @returns {Channel|null}
-     */
-    channel( name ) {
-        return this.transport.channel( name ) || null;
-    }
+  /**
+   *
+   * @param {string} socketUri
+   */
+  setTransport ( socketUri ) {
 
-    /**
-     *
-     * @return {string}
-     */
-    getAuthToken () {
-        return this.auth;
-    }
+    console.log( `Connecting to socket endpoint ${ socketUri }...` );
 
-    /**
-     * @param {string} auth
-     */
-    setAuthToken ( auth ) {
-        this.auth = auth;
-    }
+    const wsPath = parse( socketUri );
 
-    /**
-     * @return {string|null}
-     */
-    getSocketUri () {
-        return this.socketUri;
+    if ( ![ 'ws', 'wss' ].includes( wsPath.scheme ) ) {
+      throw new CodeException( 'Incorrect scheme for the socket' );
     }
 
-    request( operation, forward ) {
-        this.transport.config.auth.headers[ 'X-Auth-Token' ] = this.getAuthToken();
-
-        const subscribeObservable = new Observable( ( _observer ) => {
-            //
-        } );
-
-        // Capture the super method
-        const prevSubscribe = subscribeObservable.subscribe.bind( subscribeObservable );
-
-        // Override subscribe to return an `unsubscribe` object, see
-        // https://github.com/apollographql/subscriptions-transport-ws/blob/master/src/client.ts#L182-L212
-        subscribeObservable.subscribe = ( observerOrNext, onError, onComplete ) => {
-            prevSubscribe( observerOrNext, onError, onComplete );
-
-            const observer = getObserver( observerOrNext, onError, onComplete );
-
-            let subscriptionChannel;
-
-            forward( operation ).subscribe({
-                next: ( data ) => {
-                    // If the operation has the subscription channel, it's a subscription
-                    subscriptionChannel = data?.extensions?.lighthouse_subscriptions.channel ?? null;
-
-                    // No subscription found in the response, pipe data through
-                    if ( !subscriptionChannel ) {
-                        observer.next( data );
-                        observer.complete();
-
-                        return;
-                    }
-
-                    this.subscribeToChannel( subscriptionChannel, observer );
-                }
-            });
-
-            // Return an object that will unsubscribe_if the query was a subscription
-            return {
-                closed: false,
-                unsubscribe: () => {
-                    subscriptionChannel &&
-                    this.unsubscribeFromChannel( subscriptionChannel );
-                }
-            };
-        };
+    this.transport = new Pusher( this.appKey, {
+      auth: {
+        headers: {
+          'X-Auth-Token': this.getAuthToken(),
+          Accept: 'application/json'
+        }
+      },
+      wsHost: wsPath.host,
+      wsPort: wsPath.port,
+      forceTLS: wsPath.scheme === 'wss',
+      encrypted: true,
+      enabledTransports: [ wsPath.scheme ],
+      authEndpoint: this.authEndpoint
+    } );
+  }
+
+  disconnect () {
+    this.transport.disconnect();
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns {Channel|null}
+   */
+  channel ( name ) {
+    return this.transport.channel( name ) || null;
+  }
+
+  /**
+   *
+   * @return {string}
+   */
+  getAuthToken () {
+    return this.auth;
+  }
+
+  /**
+   * @param {string} auth
+   */
+  setAuthToken ( auth ) {
+    this.auth = auth;
+  }
+
+  /**
+   * @return {string|null}
+   */
+  getSocketUri () {
+    return this.socketUri;
+  }
+
+  request ( operation, forward ) {
+    this.transport.config.auth.headers[ 'X-Auth-Token' ] = this.getAuthToken();
+
+    const subscribeObservable = new Observable( ( _observer ) => {
+      //
+    } );
+
+    // Capture the super method
+    const prevSubscribe = subscribeObservable.subscribe.bind( subscribeObservable );
+
+    // Override subscribe to return an `unsubscribe` object, see
+    // https://github.com/apollographql/subscriptions-transport-ws/blob/master/src/client.ts#L182-L212
+    subscribeObservable.subscribe = ( observerOrNext, onError, onComplete ) => {
+      prevSubscribe( observerOrNext, onError, onComplete );
+
+      const observer = getObserver( observerOrNext, onError, onComplete );
+
+      let subscriptionChannel;
+
+      forward( operation ).subscribe( {
+        next: ( data ) => {
+          // If the operation has the subscription channel, it's a subscription
+          subscriptionChannel = Dot.get( data, 'extensions.lighthouse_subscriptions.channel' );
+
+          // No subscription found in the response, pipe data through
+          if ( !subscriptionChannel ) {
+            observer.next( data );
+            observer.complete();
+
+            return;
+          }
+
+          this.subscribeToChannel( subscriptionChannel, observer );
+        }
+      } );
+
+      // Return an object that will unsubscribe_if the query was a subscription
+      return {
+        closed: false,
+        unsubscribe: () => {
+          subscriptionChannel &&
+          this.unsubscribeFromChannel( subscriptionChannel );
+        }
+      };
+    };
 
-        return subscribeObservable;
-    }
+    return subscribeObservable;
+  }
 
-    subscribeToChannel( subscriptionChannel, observer ) {
-        this.transport
-            .subscribe( subscriptionChannel )
-            .bind('lighthouse-subscription', ( payload ) => {
-                if ( !payload.more ) {
-                    this.unsubscribeFromChannel( subscriptionChannel );
+  subscribeToChannel ( subscriptionChannel, observer ) {
+    this.transport
+      .subscribe( subscriptionChannel )
+      .bind( 'lighthouse-subscription', ( payload ) => {
+        if ( !payload.more ) {
+          this.unsubscribeFromChannel( subscriptionChannel );
 
-                    observer.complete();
-                }
+          observer.complete();
+        }
 
-                const result = payload.result;
+        const result = payload.result;
 
-                if (result) {
-                    observer.next( result );
-                }
-            });
-    }
+        if ( result ) {
+          observer.next( result );
+        }
+      } );
+  }
 
-    unsubscribeFromChannel( subscriptionChannel ) {
-        this.transport.unsubscribe( subscriptionChannel );
-    }
+  unsubscribeFromChannel ( subscriptionChannel ) {
+    this.transport.unsubscribe( subscriptionChannel );
+  }
 }
 
 // Turn `subscribe` arguments into an observer-like thing, see getObserver
 // https://github.com/apollographql/subscriptions-transport-ws/blob/master/src/client.ts#L329-L343
-function getObserver( observerOrNext, onError, onComplete ) {
-    if ( typeof observerOrNext === 'function' ) {
-        // Duck-type an observer
-        return {
-            next: ( v ) => observerOrNext( v ),
-            error: ( e ) => onError && onError( e ),
-            complete: () => onComplete && onComplete()
-        };
-    } else {
-        // Make an object that calls to the given object, with safety checks
-        return {
-            next: ( v ) => observerOrNext.next && observerOrNext.next( v ),
-            error: ( e ) => observerOrNext.error && observerOrNext.error( e ),
-            complete: () => observerOrNext.complete && observerOrNext.complete()
-        };
-    }
+function getObserver ( observerOrNext, onError, onComplete ) {
+  if ( typeof observerOrNext === 'function' ) {
+    // Duck-type an observer
+    return {
+      next: ( v ) => observerOrNext( v ),
+      error: ( e ) => onError && onError( e ),
+      complete: () => onComplete && onComplete()
+    };
+  } else {
+    // Make an object that calls to the given object, with safety checks
+    return {
+      next: ( v ) => observerOrNext.next && observerOrNext.next( v ),
+      error: ( e ) => observerOrNext.error && observerOrNext.error( e ),
+      complete: () => observerOrNext.complete && observerOrNext.complete()
+    };
+  }
 }
 
 export default PusherLink;

package/src/libraries/check.js

@@ -264,7 +264,7 @@ export default class CheckMolecule {
         }
 
         for ( const rule of rules ) {
-          const keys = Object.keys(rule).filter( value => [ 'key', 'value', 'callback' ].includes( value ) );
+          const keys = Object.keys( rule ).filter( value => [ 'key', 'value', 'callback' ].includes( value ) );
 
           if ( keys.length < 3 ) {
             throw new MetaMissingException( 'Check::isotopeR() - Necessary rule fields are missing!' );

package/src/test/Test.js

@@ -5,6 +5,7 @@ import {
   generateSecret
 } from '../libraries/crypto';
 import ResponseMolecule from '../response/ResponseProposeMolecule';
+import TokenUnit from '../TokenUnit';
 
 /*
 
@@ -21,7 +22,7 @@ export default class Test {
   /**
    * Run all
    */
-  static async run( uris ) {
+  static async run ( uris ) {
     for ( let i in uris ) {
       let test = new Test( uris[ i ] );
       await test.testAll();
@@ -36,7 +37,7 @@ export default class Test {
   constructor ( graphqlUrl, encrypt = false ) {
     this.encrypt = encrypt;
     this.secrets = [ generateSecret(), generateSecret() ];
-    this.tokenSlugs = [ 'TESTTOKEN', 'UTENVSTACKABLE', 'UTSTACKUNIT', 'UTENVSTACKUNIT' ];
+    this.tokenSlugs = [ 'TESTTOKEN', 'UTENVSTACKABLE', 'UTSTACKUNIT', 'UTENVSTACKUNIT', 'UTSTACKUNITZONES' ];
     this.graphqlUrl = graphqlUrl;
     console.log( `---------- GraphQL URI: ${ this.graphqlUrl }` );
 
@@ -60,6 +61,26 @@ export default class Test {
       [ 'unit_id_14', 'unit_id_14' ],
       [ 'unit_id_15', 'unit_id_15' ]
     ];
+
+    // Generate token units with fragment zones
+    let getTokenUnitsFZ = ( tokenUnits, from = 0 ) => {
+      let result = [];
+      tokenUnits.forEach( ( tokenUnit, key ) => {
+        let tokenUnitFZ = Array.from( tokenUnit );
+        tokenUnitFZ.push( { fragmentZone: from + key } );
+        result.push( tokenUnitFZ );
+      } );
+      return result;
+    };
+    this.tokenUnitsFZ = getTokenUnitsFZ( this.tokenUnits );
+    this.replenishTokenUnitsFZ = getTokenUnitsFZ( Array.from( this.replenishTokenUnits ), this.tokenUnits.length );
+    this.fragmentZones = this.tokenUnitsFZ.length + this.replenishTokenUnitsFZ.length;
+
+    // Init fused token unit IDs
+    this.fusedTokenUnitIds = [];
+    this.tokenUnitsFZ.slice( 0, 5 ).forEach( ( tokenUnitData ) => {
+      this.fusedTokenUnitIds.push( tokenUnitData[ 0 ] );
+    } );
   }
 
 
@@ -67,17 +88,14 @@ export default class Test {
    * Test all KnishIOClient functions
    */
   async testAll () {
-    console.info(`Executing test for: ${ this.graphqlUrl }...`);
-
-    /*
-    await this.testTokenExpiration();
-    return;
-    */
+    console.info( `Executing test for: ${ this.graphqlUrl }...` );
 
     await this.client( this.secrets[ 0 ] );
     await this.client( this.secrets[ 1 ] );
 
     await this.testCreateToken();
+    await this.testFuseToken();
+    return;
     await this.testCreateWallet();
     await this.testCreateMeta();
     await this.testCreateIdentifier();
@@ -185,6 +203,21 @@ export default class Test {
       batchId: 'server_unit_batch_0'
     } );
     this.checkResponse( responses[ 3 ], 'testCreateToken.3' );
+
+
+    // Create stackable unit token
+    responses[ 4 ] = await client.createToken( {
+      token: this.tokenSlugs[ 4 ],
+      units: this.tokenUnitsFZ,
+      meta: {
+        name: this.tokenSlugs[ 4 ],
+        supply: 'replenishable',
+        fungibility: 'stackable',
+        fragmentZones: this.fragmentZones
+      },
+      batchId: 'unit_fz_batch_0'
+    } );
+    this.checkResponse( responses[ 4 ], 'testCreateToken.4' );
   }
 
   /**
@@ -226,9 +259,9 @@ export default class Test {
       code: '1234'
     } );
 
-    console.log( ` ############### testCreateIdentifier ###############` );
+    console.log( ' ############### testCreateIdentifier ###############' );
     if ( response.reason() !== 'Outdated code' ) {
-      console.error( 'Error with response.' )
+      console.error( 'Error with response.' );
     }
     this.debug( response );
   }
@@ -327,6 +360,59 @@ export default class Test {
     this.checkResponse( response, 'testReplenishUnitToken' );
   }
 
+
+  /**
+   *
+   * @returns {Promise<void>}
+   */
+  async testFuseToken () {
+
+    let tokenSlug = this.tokenSlugs[ 4 ];
+
+    let recipientSecret = generateSecret();
+    let recipientClient = await this.client( recipientSecret );
+
+    let fusedTokenUnit = new TokenUnit( 'fusedTokenUnitId' );
+
+    let client = await this.client( this.secrets[ 0 ] );
+    let response = await client.fuseToken( {
+      recipient: recipientSecret,
+      tokenSlug: tokenSlug,
+      newTokenUnit: fusedTokenUnit,
+      fusedTokenUnitIds: this.fusedTokenUnitIds
+    } );
+    this.checkResponse( response, 'testReplenishToken' );
+
+    let walletRecipient = ( await recipientClient.queryBalance( { token: tokenSlug } ) ).payload();
+    let walletRemainder = ( await client.queryBalance( { token: tokenSlug } ) ).payload();
+
+    // Check recipient wallet
+    console.assert( walletRecipient.tokenUnits.length, 1 );
+    console.assert( walletRecipient.tokenUnits[ 0 ].id, 'fusedTokenUnitId' );
+
+
+    // --- Check fused token units in the recipient wallet
+    let fusedTokenUnits = walletRecipient.tokenUnits[ 0 ].getFusedTokenUnits();
+    console.assert( fusedTokenUnits.length, this.fusedTokenUnitIds.length );
+    // Get token unit IDs from the fused meta data of the fused token unit
+    let dbFusedTokenUnitIds = [];
+    fusedTokenUnits.forEach( ( tokenUnit ) => {
+      dbFusedTokenUnitIds.push( tokenUnit[ 0 ] );
+    } );
+    // ---
+
+    // --- Check remainder token units
+    console.assert( walletRemainder.tokenUnits.length, 6 );
+    let remainderTokenUnitIds = [];
+    walletRemainder.tokenUnits.forEach( ( tokenUnit ) => {
+      remainderTokenUnitIds.push( tokenUnit.id );
+    } );
+    console.assert(
+      remainderTokenUnitIds,
+      [ 'unit_id_6', 'unit_id_7', 'unit_id_8', 'unit_id_9', 'unit_id_10', 'unit_id_11' ]
+    );
+  }
+
   /**
    *
    */