paid-services 4.2.2 → 4.3.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## Version 4.3.0
+
+- `createGroupChannel`: Show members that are present
+
 ## Version 4.2.2
 
 - `manageSwap`: Add support for P2TR output addresses

package/groups/assemble/coordinate_group.js

@@ -80,6 +80,12 @@ const uniq = arr => Array.from(new Set(arr));
     ids: [<Joined Member Public Key Hex String>]
   }
 
+  // A member signaled they were present
+  @event 'present'
+  {
+    id: <Present Member Public Key Hex String>
+  }
+
   // A member submitted their partial signature
   @event 'signing'
   {
@@ -182,6 +188,9 @@ module.exports = ({capacity, count, identity, lnd, members, rate}) => {
     // Add the group member details to the group
     group.members.push({id: req.from, last_joined: new Date().toISOString()});
 
+    // Notify that the member is present
+    group.emitter.emit('present', {id: req.from});
+
     // Exit with failure when a member dropped out after being locked in
     if (!!group.ids && group.members.length < count) {
       return res.failure([503, 'GroupMemberExited']);

package/groups/assemble_channel_group.js

@@ -61,6 +61,12 @@ const times = 2 * 60 * 10;
     ids: [<Group Member Identity Public Key Hex String>]
   }
 
+  // Member is present
+  @event 'present'
+  {
+    id: <Present Member Public Id Hex String>
+  }
+
   // Members proposed channels to each other
   @event 'proposed'
   {}
@@ -174,6 +180,9 @@ module.exports = ({capacity, count, ecp, identity, lnd, members, rate}) => {
     }
   });
 
+  // Relay presence notifications
+  coordinator.events.on('present', ({id}) => emitter.emit('present', {id}));
+
   // Group members have submitted their partial signatures
   coordinator.events.once('signed', async () => {
     // Collect all the partially signed PSBTs

package/groups/create_group_channel.js

@@ -19,7 +19,9 @@ const maxGroupSize = 420;
 const minChannelSize = 2e4;
 const minGroupSize = 2;
 const niceName = ({alias, id}) => `${alias} ${id}`.trim();
+const {now} = Date;
 const signPsbtEndpoint = '/walletrpc.WalletKit/SignPsbt';
+const staleMs = 1000 * 60 * 5;
 
 /** Create a channel group
 
@@ -137,6 +139,7 @@ module.exports = (args, cbk) => {
         'getIdentity',
         ({ecp, getIdentity}, cbk) =>
       {
+        const announced = [];
         const members = [getIdentity.public_key].concat(args.members);
 
         const coordinate = assembleChannelGroup({
@@ -153,6 +156,29 @@ module.exports = (args, cbk) => {
 
         args.logger.info({group_invite_code: code});
 
+        // Members will join the group
+        coordinate.events.on('present', async ({id}) => {
+          const alreadyAnnounced = announced.slice().reverse().find(node => {
+            return node.id === id;
+          });
+
+          // Exit early when already announced
+          if (!!alreadyAnnounced && (now() - alreadyAnnounced.at) < staleMs) {
+            return;
+          }
+
+          announced.push({at: now(), id});
+
+          // Maintain a fixed size of announced members
+          if (announced.length > args.count) {
+            announced.shift();
+          }
+
+          const joined = await getNodeAlias({id, lnd: args.lnd});
+
+          return args.logger.info({at: new Date(), ready: niceName(joined)});
+        });
+
         // The group must fill up with participants first
         coordinate.events.once('filled', async ({ids}) => {
           const members = ids.filter(n => n !== getIdentity.public_key);

package/package.json

@@ -47,5 +47,5 @@
     "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/balanced/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/swaps/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "4.2.2"
+  "version": "4.3.0"
 }