Skip to content

Simplify request/response association using EventEmitter #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afilini merged 1 commit into from
Oct 21, 2017
Merged

Simplify request/response association using EventEmitter #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

const path = require('path');
const net = require('net');
const {EventEmitter} = require('events');
const _ = require('lodash');

class LightningClient {
class LightningClient extends EventEmitter {
constructor(rpcPath) {
if (!path.isAbsolute(rpcPath)) {
throw new Error('The rpcPath must be an absolute path');
Expand All @@ -14,6 +15,7 @@ class LightningClient {

console.log(`Connecting to ${rpcPath}`);

super();
this.rpcPath = rpcPath;
this.reconnectWait = 0.5;
this.reconnectTimeout = null;
Expand Down Expand Up @@ -41,8 +43,6 @@ class LightningClient {
});
});

this.waitingFor = {};

this.client.on('data', data => {
_.each(LightningClient.splitJSON(data.toString()), str => {
let dataObject = {};
Expand All @@ -52,12 +52,7 @@ class LightningClient {
return;
}

if (!_.isFunction(_self.waitingFor[dataObject.id])) {
return;
}

_self.waitingFor[dataObject.id].call(_self, dataObject);
delete _self.waitingFor[dataObject.id];
_self.emit('res:' + dataObject.id, dataObject);
});
});
}
Expand Down Expand Up @@ -131,22 +126,20 @@ class LightningClient {

// Wait for the client to connect
return this.clientConnectionPromise
.then(() => {
.then(() => new Promise((resolve, reject) => {
// Wait for a response
return new Promise((resolve, reject) => {
this.waitingFor[callInt] = response => {
if (_.isNil(response.error)) {
resolve(response.result);
return;
}

reject(new Error(response.error));
};

// Send the command
_self.client.write(JSON.stringify(sendObj));
this.once('res:' + callInt, response => {
if (_.isNil(response.error)) {
resolve(response.result);
return;
}

reject(new Error(response.error));
});
});

// Send the command
_self.client.write(JSON.stringify(sendObj));
}));
}

devBlockheight() {
Expand Down