Merge pull request #34 from Akachain/develop

ok

Author: eledra89

lib/helper/InvokeService.js

@@ -44,7 +44,7 @@ class InvokeService {
         try {
             // first setup the client for this org
             client = await common.getClientForOrg(orgName, userName)
-            
+
             channel = await common.getChannel(orgName, userName, channelName);
 
             if (!channel) {
@@ -116,7 +116,12 @@ class InvokeService {
                     }
 
                 } else if (proposalResponses[i].response && proposalResponses[i].response.status === 200) {
-                    logger.debug('invoke chaincode proposal was good');
+                    logger.info('invoke chaincode proposal was good');
+                    logger.debug(util.format(
+                        'Successfully sent Proposal and received ProposalResponse: Status - %s, message - "%s", metadata - "%s", endorsement signature: %s',
+                        proposalResponses[i].response.status, proposalResponses[i].response.message,
+                        proposalResponses[i].response.payload, proposalResponses[i].endorsement.signature));
+                    logger.info("Endored by:", proposalResponses[i].peer.name);
                 } else {
                     // increase counter
                     common.errorRequestCounter.inc();
@@ -128,10 +133,12 @@ class InvokeService {
             }
 
             if (all_good) {
-                logger.debug(util.format(
-                    'Successfully sent Proposal and received ProposalResponse: Status - %s, message - "%s", metadata - "%s", endorsement signature: %s',
-                    proposalResponses[0].response.status, proposalResponses[0].response.message,
-                    proposalResponses[0].response.payload, proposalResponses[0].endorsement.signature));
+                // Check write sets
+                if (channel.compareProposalResponseResults(proposalResponses)) {
+                    logger.info('All proposals compare equally!');
+                } else {
+                    logger.warn('All proposals compare differently!')
+                }
 
                 // wait for the channel-based event hub to tell us
                 // that the commit was good or bad on each peer in our organization
@@ -212,14 +219,8 @@ class InvokeService {
 
                 // now see what each of the event hubs reported
                 for (let i in resultsPromise) {
-                    let event_hub_result = resultsPromise[i];
-                    let event_hub = event_hubs[i];
-                    logger.debug('Event results for event hub :%s', event_hub.getPeerAddr());
-                    if (typeof event_hub_result === 'string') {
-                        logger.debug(event_hub_result);
-                    } else {
-                        if (!error_message) error_message = event_hub_result.toString();
-                        logger.debug(event_hub_result.toString());
+                    if (typeof resultsPromise[i] === 'string') {
+                        committedCount++
                     }
                 }
             }

lib/utils/common.js

@@ -15,8 +15,8 @@ const logger = require('./logger').getLogger('akc-node-sdk');
 hfc.setLogger(logger);
 
 // Declare sigleton variables
-global.CLIENT = null;
-global.CHANNEL = null;
+global.CLIENTS = {};
+global.CHANNELS = {};
 
 /**
  * FUNCTION SECTION
@@ -67,8 +67,8 @@ const getClientForOrg = async (orgName, userName, isRefresh) => {
     logger.debug('getClientForOrg - ****** START %s', orgName);
 
     // Check current singleton value
-    if (!isRefresh && CLIENT) {
-        return CLIENT;
+    if (!isRefresh && CLIENTS[userName]) {
+        return CLIENTS[userName];
     }
 
     orgName = orgName || process.env.ORG_NAME;
@@ -95,7 +95,7 @@ const getClientForOrg = async (orgName, userName, isRefresh) => {
     }
 
     // Set singleton value
-    CLIENT = client
+    CLIENTS[userName] = client;
 
     return client;
 }
@@ -110,19 +110,20 @@ const getChannel = async (orgName, userName, channelName, isRefresh) => {
     logger.debug('getChannel - ****** START %s %s %s', orgName, channelName);
 
     // Check current singleton value
-    if (!isRefresh && CHANNEL) {
-        return CHANNEL;
+    if (!isRefresh && CHANNELS[userName]) {
+        return CHANNELS[userName];
     }
 
     orgName = orgName || process.env.ORG_NAME;
     userName = userName || process.env.USER_NAME;
     channelName = channelName || process.env.CHANNEL_NAME;
 
-    if (!CLIENT) {
-        CLIENT = await getClientForOrg(orgName, userName);
+    if (!CLIENTS[userName]) {
+        CLIENTS[userName] = await getClientForOrg(orgName, userName);
     }
-    CHANNEL = CLIENT.getChannel(channelName);
-    return CHANNEL;
+
+    CHANNELS[userName] = CLIENTS[userName].getChannel(channelName);
+    return CHANNELS[userName];
 };
 
 /**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akachain/akc-node-sdk",
-  "author": "hoangnh, hongsongp97, longnh, hainq",
-  "version": "v2.1.6",
+  "author": "hoangnh, hongsongp97, longnh, hainq, huanlv",
+  "version": "v2.1.9-a",
   "description": "AKC node.js SDK for Decentralized Application to connect to Fabric Peers",
   "main": "index.js",
   "scripts": {},