ephemeral sessions working now

Author: nullagent

package.json

@@ -62,8 +62,9 @@
     "mkssl": "openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem"
   },
   "dependencies": {
+    "@babel/runtime": "^7.28.4",
     "@dataparty/bouncer-db": "1.0.1",
-    "@dataparty/crypto": "github:datapartyjs/dataparty-crypto#postquantum-bson",
+    "@dataparty/crypto": "github:datapartyjs/dataparty-crypto",
     "@dataparty/tasker": "^0.0.3",
     "@diva.exchange/i2p-sam": "^4.1.8",
     "@markwylde/liferaft": "^1.3.4",

src/comms/op/auth-op.js

@@ -19,7 +19,14 @@ class AuthOp extends SocketOp {
     this.stream = aesStreamOffer.stream
 
     const offer = {
-      sender: aesStreamOffer.sender,
+      sender: {
+        id: aesStreamOffer.sender.key.id,
+        key: {
+          type: aesStreamOffer.sender.key.type,
+          hash: aesStreamOffer.sender.key.hash,
+          public: aesStreamOffer.sender.key.public
+        }
+      },
       pqCipherText: aesStreamOffer.pqCipherText,
       streamNonce: aesStreamOffer.streamNonce
     }

src/comms/rest-comms.js

@@ -49,20 +49,20 @@ class RestComms extends EventEmitter {
     await this.loadCloud()
     await this.party.loadIdentity()
     await this.party.loadActor()
-    await this.loadSession()
+    //await this.loadSession()
 
     if (this.authed) {
       return
     }
 
     if (this.party.hasActor() && this.party.hasIdentity()) {
-      if (this.hasSession()) {
+      /*if (this.hasSession()) {
         debug('RECOVERING SESSION')
         return this.authRecover().catch(this.allocateSession.bind(this))
       }
 
       debug('ALLOCATING SESSION')
-      return this.allocateSession()
+      return this.allocateSession()*/
     }
 
     throw new Error('client needs to be enrolled')

src/party/peer/match-maker-client.js

@@ -75,6 +75,8 @@ class MatchMakerClient extends EventEmitter {
           party:this.restParty,
           config: this.restParty.config
         })
+
+        this.restParty.comms.sessionId = this.sessionKey.key.hash
       }
 
       await this.announcePublicKeys()
@@ -86,7 +88,7 @@ class MatchMakerClient extends EventEmitter {
           uri: this.wsUrl,
           discoverRemoteIdentity: false,
           remoteIdentity: await this.restParty.comms.getServiceIdentity(),
-          session: Math.random().toString(36).slice(2)
+          session: this.sessionKey.key.hash
         }),
         config: this.restParty.config
       })
@@ -208,9 +210,13 @@ annoucement: {
       }
     }
 
+
     const actorSigMsg = await this.identity.sign(announceData.annoucement, true)
     const sessionSigMsg = await this.sessionKey.sign(announceData.annoucement, true)
 
+    debug('actorSigMsg', actorSigMsg)
+    debug('sessionSigMsg', sessionSigMsg)
+
     announceData.trust.actorSig =  dataparty_crypto.Routines.Utils.base64.encode( actorSigMsg.sig )
     announceData.trust.sessionSig = dataparty_crypto.Routines.Utils.base64.encode( sessionSigMsg.sig )
 
@@ -240,7 +246,7 @@ annoucement: {
     const lookupResult = await this.restParty.comms.call('key/lookup', lookupData, {
       expectClearTextReply: false,
       sendClearTextRequest: false,
-      useSessions: false
+      useSessions: true
     })
 
     if(!lookupResult.done){
@@ -297,7 +303,7 @@ annoucement: {
     const inviteResult = await this.restParty.comms.call('invite/create', invitePostData, {
       expectClearTextReply: false,
       sendClearTextRequest: false,
-      useSessions: false
+      useSessions: true
     })
 
     const inviteDoc = inviteResult.invite
@@ -328,7 +334,7 @@ annoucement: {
     const lookupResult = await this.restParty.comms.call('invite/lookup', lookup, {
       expectClearTextReply: false,
       sendClearTextRequest: false,
-      useSessions: false
+      useSessions: true
     })
 
     if(!lookupResult.done){
@@ -387,14 +393,14 @@ annoucement: {
 
     const inviteState = {
       invite: invite.inviteDoc.$meta.id,
-      actor,
+      //actor,
       state: newState
     }
 
     const inviteStateResult = await this.restParty.comms.call('invite/set-state', inviteState, {
       expectClearTextReply: false,
       sendClearTextRequest: false,
-      useSessions: false
+      useSessions: true
     })
 
     console.log('setInviteState result', inviteStateResult)
@@ -405,6 +411,35 @@ annoucement: {
 
     return inviteStateResult.invite
   }
+
+  async createShortCode(uses=3, expiry){
+    debug('setInviteState')
+    let actor = this.identity.key.hash
+
+    const request = {
+      invite: invite.inviteDoc.$meta.id,
+      actor,
+      state: newState
+    }
+
+    const result = await this.restParty.comms.call('short-code/create', request, {
+      expectClearTextReply: false,
+      sendClearTextRequest: false,
+      useSessions: true
+    })
+
+    console.log('setInviteState result', result)
+
+    if(!result.done){
+      return null
+    }
+
+    return result.invite
+  }
+
+  async lookupPublicKeyByShortCode( code ){
+    //
+  }
 }
 
 module.exports = MatchMakerClient

src/venue/public/p2p-test.html

@@ -260,7 +260,7 @@ <h2>Offers recieved</h2>
 
   await matchMaker.start()
 
-  let myHash = matchMaker.restParty.identity.key.hash
+  let myHash = matchMaker.identity.key.hash
 
   userHashInput.value = myHash