From 1e17b9925bb1956d0cb9e4fc4ad700bf36a26299 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Sat, 21 Dec 2019 15:00:36 +0000 Subject: [PATCH] FIX --- class/User.js | 15 ++++++++------- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/class/User.js b/class/User.js index 1e91054..cc92305 100644 --- a/class/User.js +++ b/class/User.js @@ -252,7 +252,7 @@ export class User { invoice.ispaid = _invoice_ispaid_cache[invoice.payment_hash] || !!(await this.getPaymentHashPaid(invoice.payment_hash)); if (!invoice.ispaid) { - if (decoded && decoded.timestamp > ((+new Date()) / 1000 - 3600 * 24 * 5)) { + if (decoded && decoded.timestamp > +new Date() / 1000 - 3600 * 24 * 5) { // if invoice is not too old we query lnd to find out if its paid let lookup_info = await this.lookupInvoice(invoice.payment_hash); invoice.ispaid = lookup_info.settled; // TODO: start using `state` instead as its future proof, and this one might get deprecated @@ -347,12 +347,12 @@ export class User { if (+new Date() > _listtransactions_cache_expiry_ts) { // invalidate cache response = _listtransactions_cache = false; - } - - try { - return JSON.parse(response); - } catch (_) { - // nop + } else { + try { + return JSON.parse(response); + } catch (_) { + // nop + } } } @@ -370,6 +370,7 @@ export class User { } _listtransactions_cache = JSON.stringify(ret); _listtransactions_cache_expiry_ts = +new Date() + 5 * 60 * 1000; // 5 min + this._redis.set('listtransactions', _listtransactions_cache); // backup, will use later TODO return ret; } diff --git a/package-lock.json b/package-lock.json index 8a60a2c..41904fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "LndHub", - "version": "1.1.1", + "version": "1.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 438cd2d..d15c963 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LndHub", - "version": "1.1.1", + "version": "1.1.3", "description": "", "main": "index.js", "scripts": {