@freesignal/protocol 0.7.5 → 0.7.7

package/dist/node.d.ts

@@ -20,13 +20,13 @@ import { Database, LocalStorage, Crypto, KeyExchangeDataBundle, KeyExchangeData
 import { Datagram, EncryptedDatagram, IdentityKey, PrivateIdentityKey, Protocols, UserId } from "./types";
 import { KeyExchange } from "./x3dh";
 import { ExportedKeySession, KeySession } from "./double-ratchet";
-import EventEmitter, { EventCall } from "easyemitter.ts";
+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);
-    onChange: EventCall<'change', BootstrapRequest>;
+    onChange: EventCallback<BootstrapRequest, this>;
     get status(): "pending" | "accepted" | "denied";
     get data(): KeyExchangeData | undefined;
     accept(): void;
@@ -64,10 +64,10 @@ export declare class FreeSignalNode {
         bundles: LocalStorage<string, KeyExchangeDataBundle>;
         bootstraps: LocalStorage<string, BootstrapRequest>;
     }>, privateIdentityKey?: PrivateIdentityKey);
-    protected messageHandler: EventCall<"message", NodeEventData>;
-    protected sendHandler: EventCall<"send", NodeEventData>;
-    protected handshakeHandler: EventCall<"handshake", NodeEventData>;
-    protected bootstrapHandler: EventCall<"bootstrap", NodeEventData>;
+    protected messageHandler: EventCallback<NodeEventData, typeof this.emitter>;
+    protected sendHandler: EventCallback<NodeEventData, typeof this.emitter>;
+    protected handshakeHandler: EventCallback<NodeEventData, typeof this.emitter>;
+    protected bootstrapHandler: EventCallback<NodeEventData, typeof this.emitter>;
     onMessage: (data: MessageEventData) => void;
     onSend: (data: Uint8Array) => void;
     onHandshake: (userId: UserId) => void;
@@ -83,6 +83,7 @@ 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 open(datagram: Datagram | EncryptedDatagram | Uint8Array): Promise<void>;

package/dist/node.js

@@ -57,7 +57,7 @@ class BootstrapRequest extends easyemitter_ts_1.default {
         this.keyExchangeData = keyExchangeData;
         _BootstrapRequest_status.set(this, 'pending');
         this.onChange = () => { };
-        this.on('change', (data) => this.onChange(data));
+        this.on('change', (data, emitter) => this.onChange(data, emitter));
     }
     get status() {
         return __classPrivateFieldGet(this, _BootstrapRequest_status, "f");
@@ -82,10 +82,10 @@ class FreeSignalNode {
     constructor(storage, privateIdentityKey) {
         this.discovers = new Set();
         this.emitter = new easyemitter_ts_1.default();
-        this.messageHandler = (data) => { var _a, _b; return this.onMessage({ session: (_a = data.data) === null || _a === void 0 ? void 0 : _a.session, payload: (_b = data.data) === null || _b === void 0 ? void 0 : _b.payload }); };
-        this.sendHandler = (data) => this.onSend(data.data.datagram.toBytes());
-        this.handshakeHandler = (data) => { var _a, _b; return this.onHandshake(types_1.UserId.from((_b = (_a = data.data) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.userId)); };
-        this.bootstrapHandler = (data) => { var _a; return this.onRequest((_a = data.data) === null || _a === void 0 ? void 0 : _a.request); };
+        this.messageHandler = (data) => this.onMessage({ session: data.session, payload: data.payload });
+        this.sendHandler = (data) => this.onSend(data.datagram.toBytes());
+        this.handshakeHandler = (data) => { var _a; return this.onHandshake(types_1.UserId.from((_a = data.session) === null || _a === void 0 ? void 0 : _a.userId)); };
+        this.bootstrapHandler = (data) => this.onRequest(data.request);
         this.onMessage = () => { };
         this.onSend = () => { };
         this.onHandshake = () => { };
@@ -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) });
         });
     }
@@ -309,11 +314,10 @@ class FreeSignalNode {
                     const keyExchangeData = (0, utils_1.decodeData)(datagram.payload);
                     const userId = types_1.UserId.fromKey(keyExchangeData.identityKey);
                     const request = new BootstrapRequest(userId, keyExchangeData);
-                    request.onChange = (event) => {
-                        var _a;
+                    request.onChange = (request) => {
                         if (!request.data)
                             throw new Error("Error sending handshake");
-                        this.sendHandshake((_a = event.data) === null || _a === void 0 ? void 0 : _a.data);
+                        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.5",
+  "version": "0.7.7",
   "description": "Signal Protocol implementation in javascript",
   "license": "GPL-3.0-or-later",
   "author": "Christian Braghette",