@freesignal/protocol 0.8.1 → 0.8.3

package/dist/node.d.ts

@@ -58,7 +58,7 @@ export declare class FreeSignalNode {
     protected readonly keyExchange: KeyExchange;
     protected readonly discovers: Set<string>;
     protected readonly bootstraps: LocalStorage<string, BootstrapRequest>;
-    protected readonly emitter: EventEmitter<"message" | "send" | "handshake" | "ping" | "bootstrap", NodeEventData>;
+    protected readonly emitter: EventEmitter<"message" | "send" | "handshake" | "bootstrap", NodeEventData>;
     constructor(storage: Database<{
         sessions: LocalStorage<string, ExportedKeySession>;
         users: LocalStorage<string, string>;
@@ -84,7 +84,6 @@ export declare class FreeSignalNode {
     sendHandshake(userId: UserId | string): Promise<void>;
     sendData<T>(receiverId: string | UserId, data: T): Promise<void>;
     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>;

package/dist/node.js

@@ -97,13 +97,14 @@ export class FreeSignalNode {
         return this.bootstraps.get(userId);
     }
     waitHandshaked(userId, timeout) {
-        return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (timeout)
-                setTimeout(() => { throw new Error(); }, timeout);
+                setTimeout(() => reject(), timeout);
             while (((_b = (_a = (yield this.emitter.wait('handshake', timeout))) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.userId.toString()) !== userId.toString())
                 ;
-        });
+            resolve();
+        }));
     }
     get identityKey() {
         return this.privateIdentityKey.identityKey;
@@ -160,19 +161,17 @@ export class FreeSignalNode {
             this.emitter.emit('send', yield this.encrypt(relayId, Protocols.RELAY, concatBytes(UserId.from(receiverId).toBytes(), data.toBytes())));
         });
     }
-    sendPing(receiverId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            //console.debug("Sending Ping");
-            const sessionTag = yield this.users.get(receiverId.toString());
-            if (!sessionTag)
-                throw new Error("Session not found for user: " + receiverId);
-            const session = yield this.sessions.get(sessionTag);
-            if (!session)
-                throw new Error("Session not found for sessionTag: " + sessionTag);
-            const datagram = new Datagram(Protocols.PING, undefined, session.sessionTag);
-            this.emitter.emit('send', { session, datagram, userId: session.userId });
-        });
-    }
+    /*public async sendPing(receiverId: string | UserId): Promise<void> {
+        //console.debug("Sending Ping");
+        const sessionTag = await this.users.get(receiverId.toString());
+        if (!sessionTag)
+            throw new Error("Session not found for user: " + receiverId);
+        const session = await this.sessions.get(sessionTag);
+        if (!session)
+            throw new Error("Session not found for sessionTag: " + sessionTag);
+        const datagram = new Datagram(Protocols.PING, undefined, session.sessionTag);
+        this.emitter.emit('send', { session, datagram, userId: session.userId });
+    }*/
     sendDiscover(receiverId, discoverId) {
         return __awaiter(this, void 0, void 0, function* () {
             //console.debug("Sending Discover");
@@ -254,12 +253,12 @@ export class FreeSignalNode {
                     const encrypted = EncryptedDatagram.from(datagram);
                     if (!encrypted.payload)
                         throw new Error("Missing payload");
-                    if ((yield this.openHandshake(datagram)) === 'ack')
-                        return;
+                    const handshakeState = yield this.openHandshake(datagram);
                     const session = yield this.sessions.get(encrypted.sessionTag);
                     if (!session)
                         throw new Error("Session not found for sessionTag: " + encrypted.sessionTag);
-                    yield this.sendHandshake(session);
+                    if (handshakeState === 'syn')
+                        yield this.sendHandshake(session);
                     this.emitter.emit('handshake', { session });
                     return;
                 }
@@ -335,13 +334,13 @@ export class FreeSignalNode {
                     this.emitter.emit('bootstrap', { request });
                     return;
                 }
-                case Protocols.PING:
+                /*case Protocols.PING:
                     datagram = EncryptedDatagram.from(datagram);
-                    const session = yield this.sessions.get(datagram.sessionTag);
+                    const session = await this.sessions.get(datagram.sessionTag!);
                     if (!session)
                         throw new Error("Session not found for sessionTag: " + datagram.sessionTag);
                     this.emitter.emit('ping', { session });
-                    return;
+                    return;*/
                 default:
                     throw new Error("Invalid protocol");
             }

package/dist/types.d.ts

@@ -25,6 +25,7 @@ export declare class UserId implements Encodable {
     static readonly keyLength = 32;
     private constructor();
     toString(): string;
+    toUrl(): string;
     toJSON(): string;
     toBytes(): Uint8Array;
     static fromKey(identityKey: string | Uint8Array | IdentityKey): UserId;
@@ -72,7 +73,7 @@ export interface DiscoverMessage {
     data?: KeyExchangeData;
 }
 export declare enum Protocols {
-    PING = "/freesignal/ping",
+    NULL = "",
     MESSAGE = "/freesignal/message",
     RELAY = "/freesignal/relay",
     HANDSHAKE = "/freesignal/handshake",

package/dist/types.js

@@ -25,7 +25,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { concatBytes, decodeBase64, encodeBase64, bytesToNumber, numberToBytes, compareBytes } from "@freesignal/utils";
+import { concatBytes, decodeBase64, encodeBase64, bytesToNumber, numberToBytes, compareBytes, decodeBase64URL } from "@freesignal/utils";
 import crypto from "@freesignal/crypto";
 export function encryptData(session, data) {
     const key = session.getSendingKey();
@@ -71,6 +71,9 @@ export class UserId {
     toString() {
         return decodeBase64(this.array);
     }
+    toUrl() {
+        return decodeBase64URL(this.array);
+    }
     toJSON() {
         return this.toString();
     }
@@ -191,7 +194,8 @@ export var DiscoverType;
 })(DiscoverType || (DiscoverType = {}));
 export var Protocols;
 (function (Protocols) {
-    Protocols["PING"] = "/freesignal/ping";
+    Protocols["NULL"] = "";
+    //PING = '/freesignal/ping',
     Protocols["MESSAGE"] = "/freesignal/message";
     Protocols["RELAY"] = "/freesignal/relay";
     Protocols["HANDSHAKE"] = "/freesignal/handshake";

package/package.json

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