oxen-io/oxen-electron-gui-wallet
1
0
Fork 0
mirror of https://github.com/oxen-io/oxen-electron-gui-wallet.git synced 2023-12-14 06:13:02 +01:00
Code Issues Projects Releases Wiki Activity

Use queue for RPC calls

Browse source
This commit is contained in:
mosu forge 2019-02-06 23:27:41 -08:00
parent 6f49d6e988
commit ff6c511536
3 changed files with 69 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -16,6 +16,7 @@
"electron-window-state": "^5.0.2",
"object-assign-deep": "^0.4.0",
"portscanner": "^2.2.0",
"promise-queue": "^2.2.5",
"qrcode.vue": "^1.6.0",
"request": "^2.87.0",
"request-promise": "^4.2.2",

59
src-electron/main-process/modules/daemon.js
View file

@ -1,6 +1,8 @@
import child_process from "child_process";
import request from "request-promise";
const fs = require('fs');
const request = require("request-promise");
const queue = require("promise-queue");
const http = require("http");
const fs = require("fs");
const path = require("path");
export class Daemon {
@ -11,6 +13,10 @@ export class Daemon {
this.id = 0
this.testnet = false
this.local = false // do we have a local daemon ?
this.agent = new http.Agent({keepAlive: true, maxSockets: 1})
this.queue = new queue(1, Infinity)
}
@ -341,42 +347,46 @@ export class Daemon {
sendRPC(method, params={}) {
let id = this.id++
let options = {
forever: true,
uri: `${this.protocol}${this.hostname}:${this.port}/json_rpc`,
method: "POST",
json: {
jsonrpc: "2.0",
id: id,
method: method
},
agent: this.agent
};
if (Object.keys(params).length !== 0) {
if(Object.keys(params).length !== 0) {
options.json.params = params;
}
return request.post(`${this.protocol}${this.hostname}:${this.port}/json_rpc`, options)
.then((response) => {
if(response.hasOwnProperty("error")) {
return this.queue.add(() => {
return request(options)
.then((response) => {
if(response.hasOwnProperty("error")) {
return {
method: method,
params: params,
error: response.error
}
}
return {
method: method,
params: params,
error: response.error
result: response.result
}
}
return {
method: method,
params: params,
result: response.result
}
}).catch(error => {
return {
method: method,
params: params,
error: {
code: -1,
message: "Cannot connect to daemon-rpc",
cause: error.cause
}).catch(error => {
return {
method: method,
params: params,
error: {
code: -1,
message: "Cannot connect to daemon-rpc",
cause: error.cause
}
}
}
})
})
})
}
/**
@ -391,6 +401,7 @@ export class Daemon {
return new Promise((resolve, reject) => {
if (this.daemonProcess) {
this.daemonProcess.on("close", code => {
this.agent.destroy()
resolve()
})
this.daemonProcess.kill()

60
src-electron/main-process/modules/wallet-rpc.js
View file

@ -1,5 +1,7 @@
import child_process from "child_process";
const request = require("request-promise");
const queue = require("promise-queue");
const http = require("http");
const os = require("os");
const fs = require("fs");
const path = require("path");
@ -28,6 +30,8 @@ export class WalletRPC {
this.height_regex2 = /Skipped block by height: (\d+)/
this.height_regex3 = /Skipped block by timestamp, height: (\d+)/
this.agent = new http.Agent({keepAlive: true, maxSockets: 1})
this.queue = new queue(1, Infinity)
}
@ -52,8 +56,7 @@ export class WalletRPC {
]
const args = [
//"--rpc-login", this.auth[0]+":"+this.auth[1],
"--disable-rpc-login",
"--rpc-login", this.auth[0]+":"+this.auth[1],
"--rpc-bind-port", options.wallet.rpc_bind_port,
"--daemon-address", daemon_address,
//"--log-level", options.wallet.log_level,
@ -1228,52 +1231,54 @@ export class WalletRPC {
sendRPC(method, params={}, timeout=0) {
let id = this.id++
let options = {
forever: true,
uri: `${this.protocol}${this.hostname}:${this.port}/json_rpc`,
method: "POST",
json: {
jsonrpc: "2.0",
id: id,
method: method
},
/*
auth: {
user: this.auth[0],
pass: this.auth[1],
sendImmediately: false
}
*/
},
agent: this.agent
};
if (Object.keys(params).length !== 0) {
if(Object.keys(params).length !== 0) {
options.json.params = params
}
if(timeout) {
options.timeout = timeout
}
return request.post(`${this.protocol}${this.hostname}:${this.port}/json_rpc`, options)
.then((response) => {
if(response.hasOwnProperty("error")) {
return this.queue.add(() => {
return request(options)
.then((response) => {
if(response.hasOwnProperty("error")) {
return {
method: method,
params: params,
error: response.error
}
}
return {
method: method,
params: params,
error: response.error
result: response.result
}
}
return {
method: method,
params: params,
result: response.result
}
}).catch(error => {
return {
method: method,
params: params,
error: {
code: -1,
message: "Cannot connect to wallet-rpc",
cause: error.cause
}).catch(error => {
return {
method: method,
params: params,
error: {
code: -1,
message: "Cannot connect to wallet-rpc",
cause: error.cause
}
}
}
})
})
})
}
getRPC(parameter, params={}) {
@ -1290,6 +1295,7 @@ export class WalletRPC {
})
setTimeout(() => {
this.walletRPCProcess.on("close", code => {
this.agent.destroy()
resolve()
})
this.walletRPCProcess.kill()