paid-services 3.7.0 → 3.8.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Versions
 
+## Version 3.8.0
+
+- `encodeTrade`: Add method to encode a trade-secret
+- `serviceAnchoredTrades`: Add method to serve open trade-secrets
+
 ## Version 3.7.0
 
 - `changeChannelCapacity`: Add support for decreasing funds into a new channel

package/index.js

@@ -1,11 +1,13 @@
 const {changeChannelCapacity} = require('./capacity');
 const {confirmServiceUse} = require('./client');
+const {encodeTrade} = require('./trades');
 const {getServiceSchema} = require('./client');
 const {getServicesList} = require('./client');
 const {makePeerRequest} = require('./p2p');
 const {makeServiceRequest} = require('./client');
 const {manageTrades} = require('./trades');
 const {schema} = require('./services');
+const {serviceAnchoredTrades} = require('./trades');
 const {servicePaidRequests} = require('./server');
 const {servicePeerRequests} = require('./p2p');
 
@@ -14,11 +16,13 @@ const serviceIds = schema.types;
 module.exports = {
   changeChannelCapacity,
   confirmServiceUse,
+  encodeTrade,
   getServiceSchema,
   getServicesList,
   makePeerRequest,
   makeServiceRequest,
   manageTrades,
+  serviceAnchoredTrades,
   serviceIds,
   servicePaidRequests,
   servicePeerRequests,

package/package.json

@@ -12,7 +12,7 @@
     "bolt01": "1.2.3",
     "bolt07": "1.8.0",
     "invoices": "2.0.3",
-    "ln-service": "53.4.0",
+    "ln-service": "53.4.2",
     "ln-sync": "3.6.1"
   },
   "description": "Lightning Paid Services library",
@@ -37,8 +37,8 @@
     "url": "https://github.com/alexbosworth/paid-services.git"
   },
   "scripts": {
-    "integration-tests": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 180 test/integration/*.js",
+    "integration-tests": "tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 180 test/integration/*.js",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 test/actions/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/server/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "3.7.0"
+  "version": "3.8.0"
 }

package/trades/index.js

@@ -1,3 +1,5 @@
+const encodeTrade = require('./encode_trade');
 const manageTrades = require('./manage_trades');
+const serviceAnchoredTrades = require('./service_anchored_trades');
 
-module.exports = {manageTrades};
+module.exports = {encodeTrade, manageTrades, serviceAnchoredTrades};

package/trades/service_anchored_trades.js

@@ -13,6 +13,7 @@ const defaultInvoicesLimit = 100;
 const events = ['details', 'error', 'failure', 'settled', 'trade'];
 const fromNow = date => new Date(date) - new Date();
 const {keys} = Object;
+const sumOf = arr => arr.reduce((sum, n) => sum + n, 0);
 
 /** Service trades represented by anchored invoices
 
@@ -47,6 +48,7 @@ const {keys} = Object;
   // Starting service for trade
   @event 'start'
   {
+    created_at: <Open Trade Created At ISO 8601 Date String>
     description: <Trade Description String>
     expires_at: <Trade Expires at ISO 8601 Date String>
     id: <Trade Id Hex String>
@@ -86,6 +88,7 @@ module.exports = ({lnd}) => {
 
     // Pick up the trade to service
     emitter.emit('start', {
+      created_at: trade.created_at,
       description: trade.description,
       expires_at: trade.expires_at,
       id: trade.id,
@@ -129,6 +132,28 @@ module.exports = ({lnd}) => {
   // Listen for any new invoices that represent anchored trades
   const sub = subscribeToInvoices({lnd});
 
+  // Stop servicing all trades
+  const stopService = () => {
+    // Stop paging in progress
+    paging.token = false;
+
+    // Stop listening to all invoices
+    sub.removeAllListeners();
+
+    // Stop listening to all anchor invoices
+    return keys(listening).forEach(id => listening[id].removeAllListeners());
+  };
+
+  // Stop the service when there are no more listeners
+  emitter.on('removeListener', () => {
+    // Exit early when there are still listeners on an event
+    if (!!sumOf(events.map(n => emitter.listenerCount(n)))) {
+      return;
+    }
+
+    return stopService();
+  });
+
   // Listen for new trades to appear
   sub.on('invoice_updated', invoice => {
     const {trade} = tradeFromInvoice(invoice);
@@ -155,13 +180,13 @@ module.exports = ({lnd}) => {
         if (!!err) {
           emitter.emit(err);
 
-          // Stop listening to all invoices
-          sub.removeAllListeners();
-
-          // Stop listening to all anchor invoices
-          keys(listening).forEach(id => listening[id].removeAllListeners());
+          // Stop the service
+          return stopService();
+        }
 
-          return;
+        // Exit early when paging is already stopped
+        if (paging.token === false) {
+          return cbk();
         }
 
         paging.token = res.next || false;

package/trades/trade_from_invoice.js

@@ -3,6 +3,7 @@ const decodeAnchoredTrade = require('./decode_anchored_trade');
 /** Derive open trade details from an invoice
 
   {
+    created_at: <Invoice Created At ISO 8601 Date String>
     description: <Invoice Description String>
     id: <Invoice Id Hex String>
     expires_at: <Invoice Expiration ISO 8601 Date String>
@@ -15,6 +16,7 @@ const decodeAnchoredTrade = require('./decode_anchored_trade');
   @returns
   {
     [trade]: {
+      created_at: <Open Trade Created At ISO 8601 Date String>
       description: <Trade Description String>
       expires_at: <Trade Expires at ISO 8601 Date String>
       id: <Trade Id Hex String>
@@ -41,6 +43,7 @@ module.exports = args => {
 
   return {
     trade: {
+      created_at: args.created_at,
       description: trade.description,
       expires_at: args.expires_at,
       id: args.id,