cleanup routines

Author: nullagent

src/party/index-browser.js

@@ -7,13 +7,13 @@ const ZangoParty = require('./local/zango-party')
 const IDocument = require('./idocument')
 const DocumentFactory = require('./document-factory')
 const CloudDocument = require('./cloud/cloud-document')
-const P2PMatchMaker = require('./peer/p2p-match-maker')
+const MatchMakerClient = require('./peer/match-maker-client')
 
 const LokiDb = require('../bouncer/db/loki-db')
 
 module.exports = {
   IDocument, IParty, DocumentFactory,
   CloudDocument,
   CloudParty, LokiParty, ZangoParty, PeerParty,
-  LokiDb, P2PMatchMaker
+  LokiDb, MatchMakerClient
 }

src/party/index-embedded.js

@@ -7,11 +7,11 @@ const TingoParty = require('./local/tingo-party')
 const IDocument = require('./idocument')
 const DocumentFactory = require('./document-factory')
 const CloudDocument = require('./cloud/cloud-document')
-const P2PMatchMaker = require('./peer/p2p-match-maker')
+const MatchMakerClient = require('./peer/match-maker-client')
 
 module.exports = {
   IDocument, IParty, DocumentFactory,
   CloudDocument,
   CloudParty, LokiParty, PeerParty,
-  TingoParty, P2PMatchMaker
+  TingoParty, MatchMakerClient
 }

src/party/index.js

@@ -9,4 +9,4 @@ exports.MongoParty = require('./mongo/mongo-party')
 exports.IDocument = require('./idocument')
 exports.DocumentFactory = require('./document-factory')
 exports.CloudDocument = require('./cloud/cloud-document')
-exports.P2PMatchMaker = require('./peer/p2p-match-maker')
+exports.MatchMakerClient = require('./peer/match-maker-client')

src/party/peer/p2p-match-maker.js src/party/peer/match-maker-client.jssrc/party/peer/p2p-match-maker.js renamed to src/party/peer/match-maker-client.js

@@ -39,7 +39,6 @@ class MatchMakerClient extends EventEmitter {
       tx: {},
       rx: {}
     }
-    //this.restParty = 
   }
 
 
@@ -211,8 +210,6 @@ class MatchMakerClient extends EventEmitter {
       toIdentity = toHashOrIdentity
     }
 
-
-
     debug('toIdentity', toIdentity)
 
     const invitePayload = {
@@ -255,6 +252,8 @@ class MatchMakerClient extends EventEmitter {
 
     this.pendingInvites.tx[inviteDoc.$meta.id] = invite
 
+    invite.once('done', this.removeInvite.bind(this))
+
     return invite
   }
 
@@ -280,6 +279,22 @@ class MatchMakerClient extends EventEmitter {
     return lookupResult.invites
   }
 
+  removeInvite(invite){
+
+    let txInvite = this.pendingInvites.tx[invite.id]
+    let rxInvite = this.pendingInvites.rx[invite.id]
+
+    if(txInvite){
+      this.pendingInvites.tx[invite.id] = null
+      delete this.pendingInvites.tx[invite.id]
+    }
+
+    if(rxInvite){
+      this.pendingInvites.rx[invite.id] = null
+      delete this.pendingInvites.rx[invite.id]
+    }
+  }
+
   async getPeerInvitesFromInviteDocs(invites){
 
     let peerInvites = []
@@ -292,6 +307,14 @@ class MatchMakerClient extends EventEmitter {
 
       let peerInvite = new PeerInvite( invites[i], to, this, from)
 
+      if(peerInvite.isSender()){
+        this.pendingInvites.tx[ peerInvite.id ] = peerInvite
+      } else {
+        this.pendingInvites.rx[ peerInvite.id ] = peerInvite
+      }
+
+      peerInvite.once('done', this.removeInvite.bind(this))
+
       peerInvites.push(peerInvite)
     }
 
@@ -325,4 +348,4 @@ class MatchMakerClient extends EventEmitter {
   }
 }
 
-module.exports = MatchMakerClient
+module.exports = MatchMakerClient

src/party/peer/peer-invite.js

@@ -6,6 +6,10 @@ const EventEmitter = require('eventemitter3')
 const PeerParty = require('./peer-party')
 const RTCSocketComms = require('../../comms/rtc-socket-comms')
 
+const END_STATES = [
+  'cancelled', 'rejected', 'expired', 'completed'
+]
+
 async function delay(ms){
   return new Promise((resolve,reject)=>{
     setTimeout(resolve, ms)
@@ -47,17 +51,21 @@ class PeerInvite extends EvetEmitter {
   isSender(doc){
 
     if(doc){
-      if(doc.toHash == matchMaker.identity.key.hash){return false }
+      if(doc.toHash == matchMaker.wsParty.identity.key.hash){return false }
       else { return true }
     }
 
-    if(this.inviteDoc.toHash == matchMaker.identity.key.hash){return false }
+    if(this.inviteDoc.toHash == matchMaker.wsParty.identity.key.hash){return false }
     else { return true }
   }
 
+  async cleanup(){
+    //this.removeAllListeners('done')
+  }
 
   async cancel(){
     await this.matchMaker.setInviteState(this, 'cancelled')
+    this.emit('done', this)
   }
 
   async accept(mediaSrc){
@@ -87,19 +95,34 @@ class PeerInvite extends EvetEmitter {
 
   async reject(){
     await this.matchMaker.setInviteState(this, 'rejected')
+    this.emit('done', this)
   }
 
-  //async onAccepted(){}
-
   async onInviteMsg(inviteMsg){
 
+    debug('onInviteMsg', inviteMsg)
     if(inviteMsg.state == this.inviteDoc.state){ return }
 
-    this.latestDoc = inviteMsg
+    this.inviteMsg = inviteMsg
+
+    debug('\t', 'invite.state = ', inviteMsg.state)
     this.emit(inviteMsg.state, this)
+
+    if(this.inviteMsg && END_STATES.indexOf(this.inviteMsg.state) ){
+      this.emit('done', this)
+    }
   }
 
   async waitForAccepted(){
+
+    if(this.inviteMsg && this.inviteMsg.state == 'accepted'){
+      return await Promise.accept()
+    }
+
+    if(this.inviteMsg && END_STATES.indexOf(this.inviteMsg.state) ){
+      return await Promise.reject()
+    }
+
     return new Promise((resolve,reject)=>{
       this.once('accepted', ()=>{
         resolve()