@freesignal/protocol 0.7.8 → 0.7.10

package/dist/node.d.ts

@@ -32,19 +32,22 @@ export declare class BootstrapRequest extends EventEmitter<'change', BootstrapRe
     accept(): void;
     deny(): void;
 }
-type NodeEventData = {
+export type NodeEventData = {
     session?: KeySession;
     payload?: Uint8Array;
     datagram?: Datagram;
     request?: BootstrapRequest;
     userId?: UserId;
 };
-type SendEventData = {
+export type HandshakeEventData = {
+    session: KeySession;
+};
+export type SendEventData = {
     session?: KeySession;
     datagram: Datagram;
     userId: UserId;
 };
-type MessageEventData = {
+export type MessageEventData = {
     session: KeySession;
     payload: Uint8Array;
 };
@@ -86,7 +89,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

@@ -66,14 +66,16 @@ class BootstrapRequest extends easyemitter_ts_1.default {
         return __classPrivateFieldGet(this, _BootstrapRequest_status, "f") === 'accepted' ? this.keyExchangeData : undefined;
     }
     accept() {
-        if (this.status === 'pending')
+        if (this.status === 'pending') {
             __classPrivateFieldSet(this, _BootstrapRequest_status, 'accepted', "f");
-        this.emit('change', this);
+            this.emit('change', this);
+        }
     }
     deny() {
-        if (this.status === 'pending')
+        if (this.status === 'pending') {
             __classPrivateFieldSet(this, _BootstrapRequest_status, 'denied', "f");
-        this.emit('change', this);
+            this.emit('change', this);
+        }
     }
 }
 exports.BootstrapRequest = BootstrapRequest;
@@ -198,7 +200,7 @@ class FreeSignalNode {
     sendBootstrap(receiverId) {
         return __awaiter(this, void 0, void 0, function* () {
             //console.debug("Sending Bootstrap");
-            if (receiverId && (yield this.sessions.has(receiverId.toString())))
+            if (yield this.sessions.has(receiverId.toString()))
                 throw new Error("Session exists");
             const datagram = yield this.packBootstrap();
             this.emitter.emit('send', { datagram, userId: types_1.UserId.from(receiverId) });
@@ -234,7 +236,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 +246,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 +254,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.10",
   "description": "Signal Protocol implementation in javascript",
   "license": "GPL-3.0-or-later",
   "author": "Christian Braghette",