@freesignal/protocol 0.4.6 → 0.4.7

package/dist/node.d.ts

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
 import { Database, LocalStorage, Crypto, KeyExchangeDataBundle, KeyExchangeData } from "@freesignal/interfaces";
-import { Datagram, DatagramHeader, DiscoverType, IdentityKey, PrivateIdentityKey, Protocols, UserId } from "./types";
+import { Datagram, DatagramHeader, IdentityKey, PrivateIdentityKey, Protocols, UserId } from "./types";
 import { KeyExchange } from "./x3dh";
 import { ExportedKeySession, KeySession } from "./double-ratchet";
 export declare class BootstrapRequest {
@@ -65,7 +65,7 @@ export declare class FreeSignalNode {
     open(datagram: Datagram | Uint8Array): Promise<{
         header: DatagramHeader;
         payload?: Uint8Array;
-        discoverType?: DiscoverType;
+        datagram?: Datagram;
     }>;
 }
 declare class SessionMap implements LocalStorage<string, KeySession> {

package/dist/node.js

@@ -168,6 +168,7 @@ class FreeSignalNode {
      */
     open(datagram) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (datagram instanceof Uint8Array)
                 datagram = types_1.Datagram.from(datagram);
             let out = {
@@ -218,15 +219,12 @@ class FreeSignalNode {
                             };
                         }
                         const response = { type: types_1.DiscoverType.RESPONSE, discoverId: message.discoverId, data };
-                        out.payload = (yield this.encrypt(datagram.sender, types_1.Protocols.DISCOVER, (0, utils_1.encodeData)(response))).toBytes();
-                        out.discoverType = types_1.DiscoverType.REQUEST;
+                        out.datagram = yield this.encrypt(datagram.sender, types_1.Protocols.DISCOVER, (0, utils_1.encodeData)(response));
                     }
                     else if (message.type === types_1.DiscoverType.RESPONSE && this.discovers.has(message.discoverId)) {
                         this.discovers.delete(message.discoverId);
-                        if (message.data) {
-                            out.payload = (0, utils_1.encodeData)(message.data);
-                            out.discoverType = types_1.DiscoverType.RESPONSE;
-                        }
+                        if (message.data)
+                            out.datagram = yield this.packHandshake(message.data);
                     }
                     return out;
                 case types_1.Protocols.BOOTSTRAP:
@@ -239,12 +237,9 @@ class FreeSignalNode {
                         this.onRequest(request);
                     }
                     ;
-                    const request = yield this.bootstraps.get(datagram.sender);
-                    if (request) {
-                        const data = yield request.get();
-                        if (data)
-                            out.payload = (0, utils_1.encodeData)(data);
-                    }
+                    const bootstrap = yield ((_a = (yield this.bootstraps.get(datagram.sender))) === null || _a === void 0 ? void 0 : _a.get());
+                    if (bootstrap)
+                        out.datagram = yield this.packHandshake(bootstrap);
                     return out;
                 default:
                     throw new Error("Invalid protocol");

package/dist/test.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@freesignal/utils");
 const _1 = require(".");
 console.log("FreeSignal protocol test");
 const bob = (0, _1.createNode)({ keyExchange: new _1.AsyncMap(), sessions: new _1.AsyncMap(), users: new _1.AsyncMap(), bundles: new _1.AsyncMap(), bootstraps: new _1.AsyncMap() });
@@ -16,22 +17,23 @@ const alice = (0, _1.createNode)({ keyExchange: new _1.AsyncMap(), sessions: new
 setImmediate(() => __awaiter(void 0, void 0, void 0, function* () {
     const bobBootstrap = yield bob.packBootstrap(alice.userId);
     alice.onRequest = (request) => { request.accept(); };
-    yield alice.open(bobBootstrap);
+    const test = (yield alice.open(bobBootstrap)).datagram;
+    console.log(_1.Datagram.from(test).toJSON());
     const bobRequest = yield alice.getRequest(bob.userId.toString());
     if (!bobRequest)
         throw new Error("Bootstrap Failed");
     const aliceHandshake = yield alice.packHandshake(bobRequest);
     yield bob.open(aliceHandshake);
     const first = (yield bob.packData(alice.userId, "Hi Alice!")).toBytes();
-    console.log("Bob: ", (yield alice.open(first)).payload);
+    console.log("Bob: ", (0, utils_1.decodeData)((yield alice.open(first)).payload));
     const second = yield alice.packData(bob.userId, "Hi Bob!");
-    console.log("Alice: ", (yield bob.open(second)).payload);
+    console.log("Alice: ", (0, utils_1.decodeData)((yield bob.open(second)).payload));
     const third = yield Promise.all(["How are you?", "How are this days?", "For me it's a good time"].map(msg => bob.packData(alice.userId, msg)));
     third.forEach((data) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log("Bob: ", (yield alice.open(data)).payload);
+        console.log("Bob: ", (0, utils_1.decodeData)((yield alice.open(data)).payload));
     }));
     const fourth = yield alice.packData(bob.userId, "Not so bad my man");
-    console.log("Alice: ", (yield bob.open(fourth)).payload);
+    console.log("Alice: ", (0, utils_1.decodeData)((yield bob.open(fourth)).payload));
     //const testone = await Promise.all(Array(400).fill(0).map(() => alice.packData(bob.userId, decodeBase64(crypto.randomBytes(64)))));
     //console.log(((await bob.open(testone[350])).payload));
 }));

package/dist/types.js

@@ -330,10 +330,10 @@ class Datagram {
         }
         else if (data instanceof Datagram) {
             const datagram = new Datagram(data.sender, data.receiver, data.protocol, data.payload);
-            datagram._id = datagram.id;
-            datagram._version = datagram.version;
-            datagram._createdAt = datagram._createdAt;
-            datagram._signature = datagram._signature;
+            datagram._id = data.id;
+            datagram._version = data.version;
+            datagram._createdAt = data._createdAt;
+            datagram._signature = data._signature;
             return datagram;
         }
         else

package/package.json

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