@freesignal/protocol 0.7.9 → 0.7.11

package/dist/node.d.ts

@@ -24,27 +24,29 @@ import EventEmitter, { EventCallback } from "easyemitter.ts";
 export declare class BootstrapRequest extends EventEmitter<'change', BootstrapRequest> {
     #private;
     readonly senderId: UserId | string;
-    private readonly keyExchangeData;
-    constructor(senderId: UserId | string, keyExchangeData: KeyExchangeData);
+    readonly data: KeyExchangeData;
+    constructor(senderId: UserId | string, data: KeyExchangeData);
     onChange: EventCallback<BootstrapRequest, this>;
     get status(): "pending" | "accepted" | "denied";
-    get data(): KeyExchangeData | undefined;
     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;
 };

package/dist/node.js

@@ -51,10 +51,10 @@ const utils_1 = require("@freesignal/utils");
 const crypto_1 = __importDefault(require("@freesignal/crypto"));
 const easyemitter_ts_1 = __importDefault(require("easyemitter.ts"));
 class BootstrapRequest extends easyemitter_ts_1.default {
-    constructor(senderId, keyExchangeData) {
+    constructor(senderId, data) {
         super();
         this.senderId = senderId;
-        this.keyExchangeData = keyExchangeData;
+        this.data = data;
         _BootstrapRequest_status.set(this, 'pending');
         this.onChange = () => { };
         this.on('change', (data, emitter) => this.onChange(data, emitter));
@@ -62,18 +62,17 @@ class BootstrapRequest extends easyemitter_ts_1.default {
     get status() {
         return __classPrivateFieldGet(this, _BootstrapRequest_status, "f");
     }
-    get data() {
-        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 +197,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) });
@@ -326,10 +325,12 @@ class FreeSignalNode {
                     const keyExchangeData = (0, utils_1.decodeData)(datagram.payload);
                     const userId = types_1.UserId.fromKey(keyExchangeData.identityKey);
                     const request = new BootstrapRequest(userId, keyExchangeData);
+                    let sended = false;
                     request.onChange = (request) => {
-                        if (!request.data)
-                            throw new Error("Error sending handshake");
-                        this.sendHandshake(request.data);
+                        if (request.status === 'accepted' && !sended) {
+                            sended = true;
+                            this.sendHandshake(request.data);
+                        }
                     };
                     yield this.bootstraps.set(userId.toString(), request);
                     this.emitter.emit('bootstrap', { request });

package/package.json

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