@freesignal/protocol 0.7.8 → 0.7.9

package/dist/node.d.ts

@@ -86,7 +86,7 @@ export declare class FreeSignalNode {
     packBootstrap(): Promise<Datagram>;
     sendBootstrap(receiverId: string | UserId): Promise<void>;
     protected decrypt(datagram: EncryptedDatagram | Datagram | Uint8Array): Promise<MessageEventData>;
-    protected openHandshake(datagram: Datagram | EncryptedDatagram | Uint8Array): Promise<KeySession>;
+    protected openHandshake(datagram: Datagram | EncryptedDatagram | Uint8Array): Promise<'syn' | 'ack'>;
     protected open(datagram: Datagram | EncryptedDatagram | Uint8Array): Promise<void>;
 }
 declare class SessionMap implements LocalStorage<string, KeySession> {

package/dist/node.js

@@ -234,7 +234,7 @@ class FreeSignalNode {
                     throw new Error("Session not found for sessionTag: " + encrypted.sessionTag);
                 if (!(0, utils_1.compareBytes)(payload, crypto_1.default.ECDH.scalarMult(this.privateIdentityKey.exchangeKey, session.identityKey.exchangeKey)))
                     throw new Error("Error validating handshake data");
-                return session;
+                return 'ack';
             }
             //console.debug("Opening Handshake Syn");
             const data = (0, utils_1.decodeData)(encrypted.payload);
@@ -244,8 +244,7 @@ class FreeSignalNode {
             yield this.sessions.set(session.sessionTag, session);
             yield this.users.set(session.userId.toString(), session.sessionTag);
             yield this.bundles.set(session.userId.toString(), (0, utils_1.decodeData)(associatedData));
-            yield this.sendHandshake(session);
-            return session;
+            return 'syn';
         });
     }
     open(datagram) {
@@ -253,9 +252,19 @@ class FreeSignalNode {
             if (datagram instanceof Uint8Array)
                 datagram = types_1.Datagram.from(datagram);
             switch (datagram.protocol) {
-                case types_1.Protocols.HANDSHAKE:
-                    this.emitter.emit('handshake', { session: yield this.openHandshake(datagram) });
+                case types_1.Protocols.HANDSHAKE: {
+                    const encrypted = types_1.EncryptedDatagram.from(datagram);
+                    if (!encrypted.payload)
+                        throw new Error("Missing payload");
+                    if ((yield this.openHandshake(datagram)) === 'ack')
+                        return;
+                    const session = yield this.sessions.get(encrypted.sessionTag);
+                    if (!session)
+                        throw new Error("Session not found for sessionTag: " + encrypted.sessionTag);
+                    yield this.sendHandshake(session);
+                    this.emitter.emit('handshake', { session });
                     return;
+                }
                 case types_1.Protocols.MESSAGE:
                     //console.debug("Opening Message");
                     this.emitter.emit('message', yield this.decrypt(datagram));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesignal/protocol",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Signal Protocol implementation in javascript",
   "license": "GPL-3.0-or-later",
   "author": "Christian Braghette",