lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(psql): psql interface cleanup

Browse source
This commit is contained in:
Damian Mee 2014-09-09 06:58:09 +02:00
parent 88c17120ab
commit be6900a7a9
2 changed files with 85 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/app.js
View file

@ -6,7 +6,7 @@ var express = require('express');
var LamassuConfig = require('lamassu-config');
var routes = require('./routes');
var plugins = require('./plugins');
var PostgresqlInterface = require('./postgresql_interface');
var db = require('./postgresql_interface');
var logger = require('./logger');
module.exports = function (options) {
@ -14,15 +14,14 @@ module.exports = function (options) {
var connectionString;
var server;
var lamassuConfig;
var db;
connectionString = options.postgres ||
'postgres://lamassu:lamassu@localhost/lamassu';
lamassuConfig = new LamassuConfig(connectionString);
db = new PostgresqlInterface(connectionString);
plugins.init(db);
db.init(connectionString);
plugins.init(db);
lamassuConfig.load(function (err, config) {
if (err) {

131
lib/postgresql_interface.js
View file

@ -7,82 +7,115 @@ var PG_ERRORS = {
23505: 'uniqueViolation'
};
var PostgresqlInterface = function (conString) {
var client = null;
exports.init = function init(conString) {
if (client !== null) return;
if (!conString) {
throw new Error('Postgres connection string is required');
}
this.client = new pg.Client(conString);
this.client.on('error', function (err) { logger.error(err); });
client = new pg.Client(conString);
client.on('error', function (err) { logger.error(err); });
this.client.connect();
client.connect();
};
PostgresqlInterface.factory = function factory(conString) { return new PostgresqlInterface(conString); };
module.exports = PostgresqlInterface;
PostgresqlInterface.prototype.recordBill =
function recordBill(deviceFingerprint, rec, cb) {
this.client.query('INSERT INTO bills (device_fingerprint, denomination, currency_code, ' +
exports.recordBill = function recordBill(deviceFingerprint, rec, cb) {
client.query('INSERT INTO bills (device_fingerprint, denomination, currency_code, ' +
'satoshis, to_address, transaction_id, device_time) ' +
'VALUES ($1, $2, $3, $4, $5, $6, $7)',
[deviceFingerprint, rec.fiat, rec.currency, rec.satoshis, rec.toAddress, rec.txId, rec.deviceTime],
cb);
};
PostgresqlInterface.prototype.recordDeviceEvent =
function recordBillValidatorEvent(deviceFingerprint, event, cb) {
this.client.query('INSERT INTO device_events (device_fingerprint, event_type, note, device_time)' +
exports.recordDeviceEvent = function recordDeviceEvent(deviceFingerprint, event, cb) {
client.query('INSERT INTO device_events (device_fingerprint, event_type, note, device_time)' +
'VALUES ($1, $2, $3, $4)',
[deviceFingerprint, event.eventType, event.note, event.deviceTime],
cb);
};
PostgresqlInterface.prototype.summonTransaction =
function summonTransaction(deviceFingerprint, tx, cb) {
// First do an INSERT
// each received "partial transaction" contains sum of all previous bills
// (vel. no need to do any server-side summing)
function updatePartialTransaction(values, cb) {
var values2 = [
values[4],
values[6],
values[0],
'partial'
];
client.query('UPDATE transactions SET ' +
'satoshis=$1, ' +
'fiat=$2 ' +
'WHERE id=$3 AND status=$4',
values2,
cb);
}
function fetchTransaction(txId, cb) {
client.query('SELECT status, tx_hash, error FROM transactions WHERE id=$1',
[txId],
function (err, results) {
if (err) return cb(err);
// This should never happen, since we already checked for existence
if (results.rows.length === 0) return cb(new Error('Couldn\'t find transaction.'));
var result = results.rows[0];
cb(null, {txHash: result.tx_hash, err: result.error, status: result.status});
});
}
exports.summonTransaction = function summonTransaction(deviceFingerprint, tx, cb) {
var status = tx.status || 'pending';
var values = [
tx.txId,
status,
deviceFingerprint,
tx.toAddress,
tx.satoshis,
tx.currencyCode,
tx.fiat
];
// First attampt an INSERT
// If it worked, go ahead with transaction
// If duplicate, fetch status and return
var self = this;
this.client.query('INSERT INTO transactions (id, status, device_fingerprint, ' +
'to_address, satoshis, currency_code, fiat) ' +
'VALUES ($1, $2, $3, $4, $5, $6, $7)', [tx.txId, 'pending', deviceFingerprint,
tx.toAddress, tx.satoshis, tx.currencyCode, tx.fiat],
function (err) {
if (err && PG_ERRORS[err.code] === 'uniqueViolation')
return self._fetchTransaction(tx.txId, cb);
if (err) return cb(err);
cb();
});
// If duplicate and partial update with new bills
// If duplicate, but not partial fetch status and return
client.query('INSERT INTO transactions ' +
'(id, status, device_fingerprint, to_address, satoshis, currency_code, fiat) ' +
'VALUES ($1, $2, $3, $4, $5, $6, $7)',
values,
function(err) {
if (err) {
if (PG_ERRORS[err.code] === 'uniqueViolation') {
if (status === 'partial')
return updatePartialTransaction(values, cb);
return fetchTransaction(tx.txId, cb);
}
return cb(err);
}
cb();
});
};
PostgresqlInterface.prototype.reportTransactionError =
function reportTransactionError(tx, errString, status) {
this.client.query('UPDATE transactions SET status=$1, error=$2 WHERE id=$3',
exports.reportTransactionError = function reportTransactionError(tx, errString, status) {
client.query('UPDATE transactions SET status=$1, error=$2 WHERE id=$3',
[status, errString, tx.txId]);
};
PostgresqlInterface.prototype.completeTransaction =
function completeTransaction(tx, txHash) {
exports.completeTransaction = function completeTransaction(tx, txHash) {
if (txHash)
this.client.query('UPDATE transactions SET tx_hash=$1, status=$2, completed=now() WHERE id=$3',
client.query('UPDATE transactions SET tx_hash=$1, status=$2, completed=now() WHERE id=$3',
[txHash, 'completed', tx.txId]);
else
this.client.query('UPDATE transactions SET status=$1, error=$2 WHERE id=$3',
client.query('UPDATE transactions SET status=$1, error=$2 WHERE id=$3',
['failed', 'No txHash received', tx.txId]);
};
PostgresqlInterface.prototype._fetchTransaction =
function _fetchTransaction(txId, cb) {
this.client.query('SELECT status, tx_hash, error FROM transactions WHERE id=$1',
[txId], function (err, results) {
if (err) return cb(err);
// This should never happen, since we already checked for existence
if (results.rows.length === 0) return cb(new Error('Couldn\'t find transaction.'));
var result = results.rows[0];
cb(null, {txHash: result.tx_hash, err: result.error, status: result.status});
});
};