fix: fixes #21

GolosChain · Sep 23, 2019 · 19d3ae8 · 19d3ae8
1 parent 95531c1
commit 19d3ae8
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 11 deletions.
diff --git a/src/Main.js b/src/Main.js
@@ -2,12 +2,13 @@ const core = require('gls-core-service');
 const BasicMain = core.services.BasicMain;
 const env = require('./data/env');
 const Connector = require('./services/Connector');
+const Cleaner = require('./services/Cleaner');
 const MongoDB = core.services.MongoDB;
 
 class Main extends BasicMain {
     constructor() {
         super(env);
-        this.addNested(new Connector(), new MongoDB());
+        this.addNested(new MongoDB(), new Connector(), new Cleaner());
     }
 }
 

diff --git a/src/controllers/BandwidthProvider.js b/src/controllers/BandwidthProvider.js
@@ -224,8 +224,8 @@ class BandwidthProvider extends BasicController {
                 userId: auth.actor,
                 permission: auth.permission,
             },
-            expirationTime: new Date(Date.now() + 3600000),
-            action: JSON.stringify(action),
+            expirationTime: new Date(trx.expiration + 'Z'),
+            action,
             serializedTransaction: transaction.serializedTransaction,
             signatures: finalTrx.signatures,
         });
@@ -277,10 +277,12 @@ class BandwidthProvider extends BasicController {
         };
     }
 
-    async getProposals({ auth: { user } }) {
+    async getProposals({ auth: { user }, params: { contract, method } }) {
         const items = await ProposalModel.find(
             {
                 'waitingFor.userId': user,
+                'action.account': contract,
+                'action.name': method,
                 expirationTime: {
                     $gt: new Date(),
                 },
@@ -297,14 +299,22 @@ class BandwidthProvider extends BasicController {
             }
         );
 
-        const { usernames } = await this.callService('prism', 'getUsernames', {
-            userIds: items.map(({ initiatorId }) => initiatorId),
-        });
+        let usernames = {};
+
+        try {
+            const results = await this.callService('prism', 'getUsernames', {
+                userIds: items.map(({ initiatorId }) => initiatorId),
+            });
+
+            usernames = results.usernames;
+        } catch (err) {
+            Logger.warn('getUsernames failed:', err.message);
+        }
 
         for (const item of items) {
-            item.id = item._id;
+            item.proposalId = item._id;
             item._id = undefined;
-            item.initiatorUsername = usernames[item.initiatorId];
+            item.initiatorUsername = usernames[item.initiatorId] || null;
         }
 
         return {

diff --git a/src/model/Proposal.js b/src/model/Proposal.js
@@ -21,7 +21,7 @@ module.exports = MongoDB.makeModel(
             },
         },
         action: {
-            type: String,
+            type: Object,
             required: true,
         },
         serializedTransaction: {
@@ -43,6 +43,8 @@ module.exports = MongoDB.makeModel(
             {
                 fields: {
                     'waitingFor.userId': 1,
+                    'action.account': 1,
+                    'action.name': 1,
                 },
             },
             {

diff --git a/src/services/Cleaner.js b/src/services/Cleaner.js
@@ -0,0 +1,31 @@
+const core = require('gls-core-service');
+const BasicService = core.services.Basic;
+const Logger = core.utils.Logger;
+
+const ProposalModel = require('../model/Proposal');
+
+const CLEAR_EVERY = 120000;
+
+class Cleaner extends BasicService {
+    async start() {
+        this.startLoop(CLEAR_EVERY, CLEAR_EVERY);
+    }
+
+    async iteration() {
+        try {
+            await this._clear();
+        } catch (err) {
+            Logger.warn('Clearing failed:', err);
+        }
+    }
+
+    async _clear() {
+        await ProposalModel.deleteMany({
+            expirationTime: {
+                $lte: new Date(),
+            },
+        });
+    }
+}
+
+module.exports = Cleaner;
diff --git a/src/services/StorageService.js b/src/services/StorageService.js
@@ -22,7 +22,7 @@ class Storage extends BasicService {
         try {
             this._cleanup();
         } catch (error) {
-            Logger.error(`Cleanup error - ${error.stack}`);
+            Logger.error('Cleanup error:', error);
         }
     }