@freesignal/protocol 0.7.6 → 0.7.8

package/dist/node.d.ts

@@ -83,8 +83,10 @@ export declare class FreeSignalNode {
     sendRelay(relayId: string | UserId, receiverId: string | UserId, data: Datagram): Promise<void>;
     sendPing(receiverId: string | UserId): Promise<void>;
     sendDiscover(receiverId: string | UserId, discoverId: string | UserId): Promise<void>;
+    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 open(datagram: Datagram | EncryptedDatagram | Uint8Array): Promise<void>;
 }
 declare class SessionMap implements LocalStorage<string, KeySession> {

package/dist/node.js

@@ -190,12 +190,17 @@ class FreeSignalNode {
             this.emitter.emit('send', yield this.encrypt(receiverId, types_1.Protocols.DISCOVER, (0, utils_1.encodeData)(message)));
         });
     }
+    packBootstrap() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new types_1.Datagram(types_1.Protocols.BOOTSTRAP, (0, utils_1.encodeData)(yield this.keyExchange.generateData()));
+        });
+    }
     sendBootstrap(receiverId) {
         return __awaiter(this, void 0, void 0, function* () {
             //console.debug("Sending Bootstrap");
-            if (yield this.sessions.has(receiverId.toString()))
+            if (receiverId && (yield this.sessions.has(receiverId.toString())))
                 throw new Error("Session exists");
-            const datagram = new types_1.Datagram(types_1.Protocols.BOOTSTRAP, (0, utils_1.encodeData)(yield this.keyExchange.generateData()));
+            const datagram = yield this.packBootstrap();
             this.emitter.emit('send', { datagram, userId: types_1.UserId.from(receiverId) });
         });
     }
@@ -216,38 +221,41 @@ class FreeSignalNode {
             return { session, payload: decrypted };
         });
     }
+    openHandshake(datagram) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const encrypted = types_1.EncryptedDatagram.from(datagram);
+            if (!encrypted.payload)
+                throw new Error("Missing payload");
+            if (yield this.sessions.has(encrypted.sessionTag)) {
+                //console.debug("Opening Handshake Ack");
+                const session = yield this.sessions.get(encrypted.sessionTag);
+                const { payload } = yield this.decrypt(encrypted);
+                if (!session)
+                    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;
+            }
+            //console.debug("Opening Handshake Syn");
+            const data = (0, utils_1.decodeData)(encrypted.payload);
+            if (!encrypted.verify(types_1.IdentityKey.from(data.identityKey).signatureKey))
+                throw new Error("Signature not verified");
+            const { session, associatedData } = yield this.keyExchange.digestMessage(data);
+            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;
+        });
+    }
     open(datagram) {
         return __awaiter(this, void 0, void 0, function* () {
             if (datagram instanceof Uint8Array)
                 datagram = types_1.Datagram.from(datagram);
             switch (datagram.protocol) {
-                case types_1.Protocols.HANDSHAKE: {
-                    const encrypted = types_1.EncryptedDatagram.from(datagram);
-                    if (!encrypted.payload)
-                        throw new Error("Missing payload");
-                    if (yield this.sessions.has(encrypted.sessionTag)) {
-                        //console.debug("Opening Handshake Ack");
-                        const session = yield this.sessions.get(encrypted.sessionTag);
-                        const { payload } = yield this.decrypt(encrypted);
-                        if (!session)
-                            throw new Error("Session not found for sessionTag: " + datagram.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");
-                        this.emitter.emit('handshake', { session });
-                        return;
-                    }
-                    //console.debug("Opening Handshake Syn");
-                    const data = (0, utils_1.decodeData)(encrypted.payload);
-                    if (!datagram.verify(types_1.IdentityKey.from(data.identityKey).signatureKey))
-                        throw new Error("Signature not verified");
-                    const { session, associatedData } = yield this.keyExchange.digestMessage(data);
-                    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);
-                    this.emitter.emit('handshake', { session });
+                case types_1.Protocols.HANDSHAKE:
+                    this.emitter.emit('handshake', { session: yield this.openHandshake(datagram) });
                     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.6",
+  "version": "0.7.8",
   "description": "Signal Protocol implementation in javascript",
   "license": "GPL-3.0-or-later",
   "author": "Christian Braghette",