@wishknish/knishio-client-js 0.4.39 → 0.4.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wishknish/knishio-client-js",
-  "version": "0.4.39",
+  "version": "0.4.42",
   "productName": "Knish.IO Javascript SDK Client",
   "description": "JavaScript implementation of the Knish.IO SDK to consume Knish.IO GraphQL APIs.",
   "license": "GPL-3.0-or-later",
@@ -45,6 +45,7 @@
     "base-x": "^3.0.8",
     "big-integer": "^1.6.48",
     "buffer": "^6.0.3",
+    "core-js": "3.21.1",
     "get-random-values": "^1.2.2",
     "graphql": "^15.5.0",
     "isomorphic-fetch": "^3.0.0",
@@ -58,50 +59,48 @@
     "/src"
   ],
   "devDependencies": {
-    "@babel/core": "^7.12.13",
-    "@babel/plugin-external-helpers": "^7.12.13",
-    "@babel/plugin-proposal-class-properties": "^7.12.13",
-    "@babel/plugin-proposal-decorators": "^7.12.13",
-    "@babel/plugin-proposal-do-expressions": "^7.12.13",
-    "@babel/plugin-proposal-export-default-from": "^7.12.13",
-    "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-    "@babel/plugin-proposal-function-bind": "^7.12.13",
-    "@babel/plugin-proposal-function-sent": "^7.12.13",
-    "@babel/plugin-proposal-json-strings": "^7.12.13",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.12.13",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.13",
-    "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.13",
-    "@babel/plugin-proposal-pipeline-operator": "^7.12.13",
-    "@babel/plugin-proposal-throw-expressions": "^7.12.13",
+    "@babel/core": "^7.17.8",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/eslint-plugin": "^7.17.7",
+    "@babel/plugin-external-helpers": "^7.16.7",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-decorators": "^7.17.8",
+    "@babel/plugin-proposal-do-expressions": "^7.16.7",
+    "@babel/plugin-proposal-export-default-from": "^7.16.7",
+    "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+    "@babel/plugin-proposal-function-bind": "^7.16.7",
+    "@babel/plugin-proposal-function-sent": "^7.16.7",
+    "@babel/plugin-proposal-json-strings": "^7.16.7",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+    "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-proposal-pipeline-operator": "^7.17.6",
+    "@babel/plugin-proposal-throw-expressions": "^7.16.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-transform-arrow-functions": "^7.12.13",
-    "@babel/plugin-transform-async-to-generator": "^7.12.13",
-    "@babel/plugin-transform-classes": "^7.12.13",
-    "@babel/plugin-transform-for-of": "^7.12.13",
-    "@babel/plugin-transform-property-mutators": "^7.12.13",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-transform-arrow-functions": "^7.16.7",
+    "@babel/plugin-transform-async-to-generator": "^7.16.8",
+    "@babel/plugin-transform-classes": "^7.16.7",
+    "@babel/plugin-transform-for-of": "^7.16.7",
+    "@babel/plugin-transform-property-mutators": "^7.16.7",
     "@babel/plugin-transform-runtime": "^7.12.15",
     "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-    "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.12.13",
     "@babel/runtime": "^7.12.13",
     "@rollup/plugin-babel": "^5.2.3",
     "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-inject": "^4.0.4",
     "@rollup/plugin-node-resolve": "^13.0.0",
-    "babel-eslint": "^10.1.0",
+    "@rollup/plugin-replace": "^4.0.0",
     "babel-loader": "^8.2.2",
-    "babel-preset-es2015-rollup": "^3.0.0",
     "eslint": "^7.23.0",
     "eslint-plugin-vue": "^7.8.0",
-    "nodemon": "^2.0.7",
-    "rollup": "^2.38.5",
-    "rollup-plugin-node-polyfills": "^0.2.1",
+    "nodemon": "^2.0.15",
+    "rollup": "^2.70.1",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-uglify": "^6.0.4",
-    "uglify-es": "^3.3.9",
+    "uglify-js": "^3.15.3",
     "webpack": "^5.21.1",
     "webpack-cli": "^4.5.0",
     "webpack-merge": "^5.7.3"

package/src/Atom.js

@@ -319,6 +319,11 @@ export default class Atom {
           continue;
         }
 
+        // Excluded keys
+        if ( [ 'otsFragment', 'index' ].includes( property ) ) {
+          continue;
+        }
+
         // Hashing individual meta keys and values
         if ( property === 'meta' ) {
           for ( const meta of value ) {

package/src/KnishIOClient.js

@@ -93,6 +93,7 @@ import QueryAtom from './query/QueryAtom';
 import QueryPolicy from './query/QueryPolicy';
 import MutationCreatePolicy from './mutation/MutationCreatePolicy';
 import QueryMetaTypeViaAtom from './query/QueryMetaTypeViaAtom';
+import MutationCreateRule from './mutation/MutationCreateRule';
 
 
 /**
@@ -153,7 +154,7 @@ export default class KnishIOClient {
     this.$__authTokenObjects = {};
     this.$__authInProcess = false;
 
-    if( cellSlug ) {
+    if ( cellSlug ) {
       this.setCellSlug( cellSlug );
     }
 
@@ -460,30 +461,29 @@ export default class KnishIOClient {
       console.info( 'KnishIOClient::createMolecule() - Creating a new molecule...' );
     }
 
-    const _secret = secret || this.getSecret();
-    let _sourceWallet = sourceWallet;
+    secret = secret || this.getSecret();
 
     // Sets the source wallet as the last remainder wallet (to maintain ContinuID)
-    if ( !sourceWallet && this.lastMoleculeQuery && this.getRemainderWallet().token !== 'AUTH' && this.lastMoleculeQuery && this.lastMoleculeQuery.response() && this.lastMoleculeQuery.response().success() ) {
-      _sourceWallet = this.getRemainderWallet();
+    if ( !sourceWallet && this.lastMoleculeQuery && this.getRemainderWallet().token !== 'AUTH' && this.lastMoleculeQuery.response() && this.lastMoleculeQuery.response().success() ) {
+      sourceWallet = this.getRemainderWallet();
     }
 
     // Unable to use last remainder wallet; Figure out what wallet to use:
-    if ( _sourceWallet === null ) {
-      _sourceWallet = await this.getSourceWallet();
+    if ( sourceWallet === null ) {
+      sourceWallet = await this.getSourceWallet();
     }
 
     // Set the remainder wallet for the next transaction
     this.remainderWallet = remainderWallet || Wallet.create( {
-      secretOrBundle: _secret,
+      secretOrBundle: secret,
       token: 'USER',
-      batchId: _sourceWallet.batchId,
-      characters: _sourceWallet.characters
+      batchId: sourceWallet.batchId,
+      characters: sourceWallet.characters
     } );
 
     return new Molecule( {
-      secret: _secret,
-      sourceWallet: _sourceWallet,
+      secret,
+      sourceWallet,
       remainderWallet: this.getRemainderWallet(),
       cellSlug: this.cellSlug()
     } );
@@ -546,15 +546,17 @@ export default class KnishIOClient {
    * @returns {Promise<*>}
    */
   async executeQuery ( query, variables = null ) {
-    /*
-    if ( true || this.$__authToken && this.$__authToken.isExpired() ) {
+    // console.info( `KnishIOClient::executeQuery() - Check token expiration... ${ this.$__authToken.$__expiresAt * 1000 } == ${ Date.now() } ` );
+    if ( this.$__authToken && this.$__authToken.isExpired() ) {
+      console.info( 'KnishIOClient::executeQuery() - Access token is expired. Getting new one...' );
+
       await this.requestAuthToken( {
         secret: this.$__secret,
         cellSlug: this.$__cellSlug,
         encrypt: this.$__encrypt
       } );
     }
-    */
+
     return query.execute( {
       variables
     } );
@@ -691,34 +693,6 @@ export default class KnishIOClient {
     this.subscribe().unsubscribeAll();
   }
 
-
-  /**
-   * @param {string} metaType
-   * @param {string} metaId
-   * @param {object[]|null} filter
-   * @param {object[]|null} queryArgs
-   * @returns {Promise<ResponseAtom>}
-   */
-  async queryMetaViaAtom ( {
-    metaType,
-    metaId,
-    filter = null,
-    queryArgs = {
-      limit: 15,
-      offset: 1
-    }
-  } ) {
-
-    return await this.queryAtom( {
-      metaType,
-      metaId,
-      filter,
-      isotopes: [ 'C', 'M' ],
-      latest: true,
-      queryArgs
-    } );
-  }
-
   /**
    * Retrieves metadata for the given metaType and provided parameters
    *
@@ -734,6 +708,9 @@ export default class KnishIOClient {
    * @param {string|null} count
    * @param {string|null} countBy
    * @param {boolean} throughAtom
+   * @param {array|null} values
+   * @param {array|null} keys
+   * @param {array|null} atomValues
    * @return {Promise<ResponseMetaType>}
    */
   queryMeta ( {
@@ -748,7 +725,10 @@ export default class KnishIOClient {
     queryArgs = null,
     count = null,
     countBy = null,
-    throughAtom = false
+    throughAtom = false,
+    values = null,
+    keys = null,
+    atomValues = null
   } ) {
 
     if ( this.$__logging ) {
@@ -772,7 +752,10 @@ export default class KnishIOClient {
         latestMetas,
         filter,
         queryArgs,
-        countBy
+        countBy,
+        values,
+        keys,
+        atomValues
       } );
     } else {
       /**
@@ -1195,6 +1178,42 @@ export default class KnishIOClient {
     return await this.executeQuery( query );
   }
 
+  /**
+   *
+   * @param {string} metaType
+   * @param {string} metaId
+   * @param {object[]} rule
+   * @param {object} policy
+   * @returns {Promise<ResponseCreateRule>}
+   */
+  async createRule ( {
+    metaType,
+    metaId,
+    rule,
+    policy = {}
+  } ) {
+    /**
+     * @type {MutationCreateRule}
+     */
+    const query = await this.createMoleculeMutation( {
+        mutationClass: MutationCreateRule,
+        molecule: await this.createMolecule( {
+          secret: this.getSecret(),
+          sourceWallet: await this.getSourceWallet()
+        } )
+      }
+    );
+
+    query.fillMolecule( {
+      metaType,
+      metaId,
+      rule,
+      policy
+    } );
+
+    return await this.executeQuery( query );
+  }
+
   /**
    * Builds and executes a molecule to convey new metadata to the ledger
    *
@@ -1776,6 +1795,66 @@ export default class KnishIOClient {
   }
 
 
+
+  /**
+   * Builds and executes a molecule to destroy the specified Token units
+   *
+   * @param {string} token
+   * @param {number|null} amount
+   * @param {array|null} units
+   * @param {Wallet|null} sourceWallet
+   * @return {Promise<unknown>}
+   */
+  async replenishToken ( {
+    token,
+    amount = null,
+    units = [],
+    sourceWallet = null
+  } ) {
+
+
+    if ( sourceWallet === null ) {
+      sourceWallet = ( await this.queryBalance( { token } ) ).payload();
+    }
+    /*
+    if ( !sourceWallet ) {
+      throw new TransferWalletException( 'Source wallet is missing or invalid.' );
+    }
+    */
+
+    // Remainder wallet
+    let remainderWallet = Wallet.create( {
+      secretOrBundle: this.getSecret(),
+      token,
+      characters: sourceWallet.characters
+    } );
+
+    // Batch ID default initialization
+    remainderWallet.initBatchId( {
+      sourceWallet,
+      isRemainder: true
+    } );
+
+
+    // Burn tokens
+    let molecule = await this.createMolecule( {
+      secret: null,
+      sourceWallet,
+      remainderWallet
+    } );
+    molecule.replenishToken( {
+      amount,
+      units
+    } );
+    molecule.sign( {} );
+    molecule.check();
+
+
+    const query = ( new MutationProposeMolecule( this.client(), molecule ) );
+    return this.executeQuery( query );
+  }
+
+
   /**
    * Request a guest auth token
    *
@@ -1803,7 +1882,7 @@ export default class KnishIOClient {
     /**
      * @type {ResponseRequestAuthorizationGuest}
      */
-    const response = await this.executeQuery( query, {
+    const response = await query.execute( {
       cellSlug,
       pubkey: wallet.pubkey,
       encrypt
@@ -1864,7 +1943,8 @@ export default class KnishIOClient {
     /**
      * @type {ResponseRequestAuthorization}
      */
-    const response = await this.executeQuery( query );
+    const response = await query.execute( {} );
+
 
     // Did the authorization molecule get accepted?
     if ( response.success() ) {
@@ -1936,7 +2016,7 @@ export default class KnishIOClient {
 
     // Set auth token
     if ( this.$__logging ) {
-      console.info( `KnishIOClient::authorize() - Successfully retrieved auth token ${ this.$__authToken.token }...` );
+      console.info( `KnishIOClient::authorize() - Successfully retrieved auth token ${ this.$__authToken.getToken() }...` );
     }
 
     // Switch encryption mode if it has been changed

package/src/Meta.js

@@ -119,35 +119,23 @@ export default class Meta {
    */
   static policy ( meta, policy ) {
     const metas = {
-      conditions: 'policy',
-      rule: meta[ 'rule' ] || [],
-      callback: meta[ 'callback' ] || {}
+      policy: {}
     };
 
     if ( policy ) {
       for ( const [ policyKey, value ] of Object.entries( policy || {} ) ) {
 
         if ( value !== null && [ 'read', 'write' ].includes( policyKey ) ) {
-          metas[ 'callback' ][ policyKey ] = {};
+          metas.policy[ policyKey ] = {};
 
           for ( const [ key, content ] of Object.entries( value ) ) {
-            metas[ 'callback' ][ policyKey ][ key ] = content;
+            metas.policy[ policyKey ][ key ] = content;
           }
         }
       }
     }
 
-    metas[ 'callback' ] = Meta.__defaultPolicy( metas[ 'callback' ], meta );
-
-    for ( const policyKey of [ 'conditions', 'rule', 'callback' ] ) {
-      metas[ policyKey ] = Array.isArray( metas[ policyKey ] ) ||
-      Object.prototype.toString.call( metas[ policyKey ] ) === '[object Object]' ?
-        JSON.stringify( metas[ policyKey ] ) : metas[ policyKey ];
-
-      if ( policyKey === 'conditions' && Object.prototype.toString.call( metas[ policyKey ] ) === '[object String]' ) {
-        metas[ policyKey ] = JSON.stringify( metas[ policyKey ] );
-      }
-    }
+    metas.policy = JSON.stringify( Meta.__defaultPolicy( metas.policy, meta ) );
 
     return metas;
   }