@freesignal/socketio 0.1.7 → 0.2.1

package/dist/base.d.ts

@@ -1,21 +1,15 @@
-import { Database, LocalStorage, Crypto, KeyExchangeDataBundle } from "@freesignal/interfaces";
-import { Datagram, PrivateIdentityKey, UserId } from "@freesignal/protocol";
-import { ExportedKeySession } from "@freesignal/protocol/double-ratchet";
-import { BootstrapRequest, FreeSignalNode } from "@freesignal/protocol/node";
+import { Datagram, UserId } from "@freesignal/protocol";
+import { FreeSignalNode, FreeSignalNodeState } from "@freesignal/protocol/node";
 export declare enum TransportEvent {
     MESSAGE = "transport:message",
     HANDSHAKE = "transport:handshake"
 }
+export interface FreeSignalSocketioState extends FreeSignalNodeState {
+    outbox: Array<[string, Uint8Array[]]>;
+}
 export declare class FreeSignalSocketio extends FreeSignalNode {
-    protected readonly outbox: LocalStorage<string, Uint8Array[]>;
-    constructor(storage: Database<{
-        sessions: LocalStorage<string, ExportedKeySession>;
-        keyExchange: LocalStorage<string, Crypto.KeyPair>;
-        users: LocalStorage<string, string>;
-        bundles: LocalStorage<string, KeyExchangeDataBundle>;
-        bootstraps: LocalStorage<string, BootstrapRequest>;
-        outbox: LocalStorage<string, Uint8Array[]>;
-    }>, privateIdentityKey?: PrivateIdentityKey);
+    protected readonly outbox: Map<string, Uint8Array[]>;
+    constructor(opts?: Partial<FreeSignalSocketioState>);
     protected addToOutbox(userId: string | UserId, datagram: Datagram | Uint8Array): Promise<void>;
     protected flushOutbox(): Promise<void>;
     onClose: () => void;

package/dist/base.js

@@ -16,11 +16,11 @@ export var TransportEvent;
     TransportEvent["HANDSHAKE"] = "transport:handshake";
 })(TransportEvent || (TransportEvent = {}));
 export class FreeSignalSocketio extends FreeSignalNode {
-    constructor(storage, privateIdentityKey) {
-        super(storage, privateIdentityKey);
+    constructor(opts) {
+        super(opts);
         this.onClose = () => { };
         this.onError = () => { };
-        this.outbox = storage.outbox;
+        this.outbox = new Map(opts === null || opts === void 0 ? void 0 : opts.outbox);
     }
     addToOutbox(userId, datagram) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/client.d.ts

@@ -1,20 +1,12 @@
-import { Database, LocalStorage, Crypto, KeyExchangeDataBundle } from "@freesignal/interfaces";
-import { Datagram, PrivateIdentityKey, UserId } from "@freesignal/protocol";
-import { ExportedKeySession, KeySession } from "@freesignal/protocol/double-ratchet";
+import { Datagram, UserId } from "@freesignal/protocol";
+import { KeySession } from "@freesignal/protocol/double-ratchet";
 import { BootstrapRequest } from "@freesignal/protocol/node";
 import { EventCallback } from "easyemitter.ts";
-import { FreeSignalSocketio } from "./base.js";
+import { FreeSignalSocketio, FreeSignalSocketioState } from "./base.js";
 export declare class FreeSignalClient extends FreeSignalSocketio {
     private _serverId?;
     private socket?;
-    constructor(storage: Database<{
-        sessions: LocalStorage<string, ExportedKeySession>;
-        keyExchange: LocalStorage<string, Crypto.KeyPair>;
-        users: LocalStorage<string, string>;
-        bundles: LocalStorage<string, KeyExchangeDataBundle>;
-        bootstraps: LocalStorage<string, BootstrapRequest>;
-        outbox: LocalStorage<string, Uint8Array[]>;
-    }>, privateIdentityKey?: PrivateIdentityKey);
+    constructor(opts?: Partial<FreeSignalSocketioState>);
     get connected(): boolean;
     get serverId(): UserId | undefined;
     protected sendHandler: EventCallback<{

package/dist/client.js

@@ -11,8 +11,8 @@ import { UserId } from "@freesignal/protocol";
 import { io } from "socket.io-client";
 import { FreeSignalSocketio, TransportEvent } from "./base.js";
 export class FreeSignalClient extends FreeSignalSocketio {
-    constructor(storage, privateIdentityKey) {
-        super(storage, privateIdentityKey);
+    constructor(opts) {
+        super(opts);
         this.sendHandler = (eventData) => {
             const { session, datagram, userId } = eventData;
             if (!userId && !session)

package/dist/run.js

@@ -1,4 +1,3 @@
-import { AsyncMap } from "@freesignal/protocol";
 import { FreeSignalServer } from "./server.js";
-const server = new FreeSignalServer({ keyExchange: new AsyncMap(), sessions: new AsyncMap(), users: new AsyncMap(), bundles: new AsyncMap(), bootstraps: new AsyncMap(), outbox: new AsyncMap() }).listen();
+const server = new FreeSignalServer().listen();
 console.log("Freesignal Server started!");

package/dist/server.d.ts

@@ -16,24 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
-import { Database, LocalStorage, Crypto, KeyExchangeDataBundle } from "@freesignal/interfaces";
-import { Datagram, PrivateIdentityKey, UserId } from "@freesignal/protocol";
-import { ExportedKeySession, KeySession } from "@freesignal/protocol/double-ratchet";
-import { BootstrapRequest } from "@freesignal/protocol/node";
+import { Datagram, UserId } from "@freesignal/protocol";
+import { KeySession } from "@freesignal/protocol/double-ratchet";
 import { EventCallback } from "easyemitter.ts";
 import { type Server as HttpServer } from "http";
-import { FreeSignalSocketio } from "./base.js";
+import { FreeSignalSocketio, FreeSignalSocketioState } from "./base.js";
 export declare class FreeSignalServer extends FreeSignalSocketio {
     private wss?;
     private readonly connections;
-    constructor(storage: Database<{
-        sessions: LocalStorage<string, ExportedKeySession>;
-        keyExchange: LocalStorage<string, Crypto.KeyPair>;
-        users: LocalStorage<string, string>;
-        bundles: LocalStorage<string, KeyExchangeDataBundle>;
-        bootstraps: LocalStorage<string, BootstrapRequest>;
-        outbox: LocalStorage<string, Uint8Array[]>;
-    }>, privateIdentityKey?: PrivateIdentityKey);
+    constructor(opts?: Partial<FreeSignalSocketioState>);
     protected sendHandler: EventCallback<{
         session?: KeySession;
         datagram?: Datagram;

package/dist/server.js

@@ -16,20 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Server } from 'socket.io';
 import { FreeSignalSocketio, TransportEvent } from "./base.js";
 export class FreeSignalServer extends FreeSignalSocketio {
-    constructor(storage, privateIdentityKey) {
-        super(storage, privateIdentityKey);
+    constructor(opts) {
+        super(opts);
         this.connections = new Map();
         this.sendHandler = (eventData) => {
             const { session, datagram, userId } = eventData;
@@ -56,7 +47,7 @@ export class FreeSignalServer extends FreeSignalSocketio {
                 origin: (origin, callback) => callback(null, origin)
             }
         });
-        this.wss.on('connection', (socket) => __awaiter(this, void 0, void 0, function* () {
+        this.wss.on('connection', (socket) => {
             const userId = socket.handshake.auth.userId;
             if (!userId) {
                 socket.disconnect();
@@ -67,13 +58,14 @@ export class FreeSignalServer extends FreeSignalSocketio {
             socket.on(TransportEvent.MESSAGE, (data) => this.open(data));
             socket.on('disconnect', () => this.connections.delete(userId));
             socket.emit(TransportEvent.HANDSHAKE, this.userId.toString());
-            if (!(yield this.sessions.has(userId))) {
-                this.sendBootstrap(userId);
+            const sessionTag = this.users.get(userId);
+            if (sessionTag && this.sessions.has(sessionTag)) {
+                this.sendHandshake(userId);
             }
             else {
-                this.sendHandshake(userId);
+                this.sendBootstrap(userId);
             }
-        }));
+        });
         return this;
     }
     close() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesignal/socketio",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Socket.io trasnport package for FreeSignal protocol",
   "homepage": "https://github.com/christianbraghette/freesignal-socketio#readme",
   "bugs": {
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@freesignal/interfaces": "^0.3.1",
-    "@freesignal/protocol": "^0.8.0",
+    "@freesignal/protocol": "^0.9.0",
     "@freesignal/utils": "^1.5.1",
     "socket.io": "^4.8.1",
     "socket.io-client": "^4.8.1"