@openlv/session 0.0.1-beta.9 → 0.0.2

package/dist/events.d.ts

@@ -1,4 +1,10 @@
-import type { SessionStateObject } from "./base.js";
+import type { SessionStateObject } from "./index.js";
 export type SessionEvents = {
     state_change: (state?: SessionStateObject) => void;
+    /**
+       * Emitted when a request arrives from the remote peer — before the reply
+       * is sent. Useful for observability, logging, or UI integration without
+       * needing to intercept the `onMessage` callback.
+       */
+    request: (payload: object | string) => void;
 };

package/dist/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":""}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"","sourcesContent":["import type { SessionStateObject } from \"./index.js\";\n\nexport type SessionEvents = {\n  state_change: (state?: SessionStateObject) => void;\n  /**\n     * Emitted when a request arrives from the remote peer — before the reply\n     * is sent. Useful for observability, logging, or UI integration without\n     * needing to intercept the `onMessage` callback.\n     */\n  request: (payload: object | string) => void;\n};\n"]}

package/dist/index.d.ts

@@ -1,8 +1,58 @@
-/** biome-ignore-all lint/performance/noBarrelFile: package entrypoint */
+import { type SessionHandshakeParameters, type SessionLinkParameters } from "@openlv/core";
+import { type SignalingLayer, type SignalingProtocol, type SignalState } from "@openlv/signaling";
+import { type TLayer, type TransportLayer } from "@openlv/transport";
+import { EventEmitter } from "eventemitter3";
+import type { SessionEvents } from "./events.js";
+export declare const SESSION_STATE: {
+    readonly CREATED: "created";
+    readonly SIGNALING: "signaling";
+    readonly READY: "ready";
+    readonly LINKING: "linking";
+    readonly CONNECTED: "connected";
+    readonly DISCONNECTED: "disconnected";
+};
+export type SessionState = (typeof SESSION_STATE)[keyof typeof SESSION_STATE];
+export type SessionStateObject = {
+    status: SessionState;
+    signaling?: {
+        state: SignalState;
+    };
+};
 /**
- * Open Lavatory Protocol - Decentralized Wallet Connection Library
+ * an OpenLV Session
  *
- * A privacy-first, peer-to-peer protocol for connecting dApps with wallets
- * without relying on centralized infrastructure.
+ * https://openlv.sh/api/session
  */
-export * from "./base.js";
+export type Session = {
+    getState(): SessionStateObject;
+    getHandshakeParameters(): SessionHandshakeParameters;
+    connect(): Promise<void>;
+    waitForLink(): Promise<void>;
+    close(): Promise<void>;
+    /**
+       * Send a request to the remote peer and await a correlated response.
+       *
+       * Two-phase timeout:
+       * - `ackTimeout` (default 10 s): the remote peer must send back an ack
+       *   within this window, confirming it received the message.
+       * - After an ack arrives the wait is extended to `responseTimeout`
+       *   (default 1 hour) — enough for user-interactive flows such as
+       *   `eth_sendTransaction` or `personal_sign`.
+       */
+    send(message: object, ackTimeout?: number, responseTimeout?: number): Promise<unknown>;
+    emitter: EventEmitter<SessionEvents>;
+    _internal: {
+        signal: SignalingLayer;
+        transport: TransportLayer;
+    };
+};
+/**
+ * OpenLV Session
+ *
+ * https://openlv.sh/api/session
+ */
+export declare const createSession: (initParameters: SessionLinkParameters, signalLayer: SignalingProtocol, transportLayer: TLayer, onMessage: (message: object) => Promise<object | string>) => Promise<Session>;
+/**
+ * Connect to a session from its openlv:// URL
+ */
+export declare const connectSession: (connectionUrl: string, onMessage: (message: object) => Promise<object | string>, transport: TLayer) => Promise<Session>;

package/dist/index.js

@@ -1,10 +1,273 @@
-/** biome-ignore-all lint/performance/noBarrelFile: package entrypoint */
+import { decodeConnectionURL, OPENLV_PROTOCOL_VERSION, } from "@openlv/core";
+import { deriveSymmetricKey, generateHandshakeKey, generateSessionId, initEncryptionKeys, initHash, parseEncryptionKey, } from "@openlv/core/encryption";
+import { SIGNAL_STATE, } from "@openlv/signaling";
+import { dynamicSignalingLayer } from "@openlv/signaling/dynamic";
+import { TRANSPORT_STATE, } from "@openlv/transport";
+import { EventEmitter } from "eventemitter3";
+import { log } from "./utils/log.js";
+export const SESSION_STATE = {
+    CREATED: "created",
+    SIGNALING: "signaling",
+    READY: "ready",
+    LINKING: "linking",
+    CONNECTED: "connected",
+    DISCONNECTED: "disconnected",
+};
 /**
- * Open Lavatory Protocol - Decentralized Wallet Connection Library
+ * OpenLV Session
  *
- * A privacy-first, peer-to-peer protocol for connecting dApps with wallets
- * without relying on centralized infrastructure.
+ * https://openlv.sh/api/session
  */
-// biome-ignore lint/performance/noReExportAll: package entrypoint
-export * from "./base.js";
+export const createSession = async (initParameters, signalLayer, transportLayer, onMessage) => {
+    const emitter = new EventEmitter();
+    const messages = new EventEmitter();
+    const sessionId = "sessionId" in initParameters
+        ? initParameters.sessionId
+        : generateSessionId();
+    const { encryptionKey, decryptionKey: { decrypt }, } = await initEncryptionKeys(initParameters);
+    let relyingPublicKey;
+    const handshakeKey = "k" in initParameters
+        ? await deriveSymmetricKey(initParameters.k)
+        : await generateHandshakeKey();
+    const { hash, isHost } = await initHash("h" in initParameters ? initParameters.h : undefined, encryptionKey);
+    let status = SESSION_STATE.CREATED;
+    const protocol = initParameters.p;
+    const server = initParameters.s;
+    const updateStatus = (newStatus) => {
+        log("updateStatus", newStatus);
+        status = newStatus;
+        emitter.emit("state_change", { status, signaling: signal.getState() });
+    };
+    const signaling = await signalLayer({
+        topic: sessionId,
+        url: server,
+    });
+    const signal = await signaling({
+        h: hash,
+        canEncrypt() {
+            return relyingPublicKey !== undefined;
+        },
+        async encrypt(message) {
+            if (!relyingPublicKey) {
+                throw new Error("Relying party public key not found");
+            }
+            log(`encrypting to ${relyingPublicKey.toString()}`, message);
+            return await relyingPublicKey.encrypt(message);
+        },
+        decrypt,
+        publicKey: encryptionKey,
+        k: handshakeKey,
+        async rpDiscovered(rpKey) {
+            const role = isHost ? "host" : "client";
+            log(`rpKey discovered by ${role}`, rpKey);
+            relyingPublicKey = await parseEncryptionKey(rpKey);
+        },
+        isHost,
+    });
+    const transport = transportLayer({
+        encrypt(message) {
+            if (!relyingPublicKey) {
+                throw new Error("Relying party public key not found");
+            }
+            return relyingPublicKey?.encrypt(message);
+        },
+        decrypt,
+        isHost,
+        onmessage: async (message) => {
+            log("Session: received message from transport", message);
+            if (message["type"] === "request") {
+                const messageId = message["messageId"];
+                // Immediately acknowledge receipt so the sender's ack-timeout does
+                // not fire while the handler (which may await user interaction) runs.
+                await transport.send({ type: "ack", messageId });
+                // Notify observers before processing (e.g. wallet UI can show a
+                // pending indicator before the handler resolves).
+                emitter.emit("request", message["payload"]);
+                const data = await onMessage(message["payload"]);
+                const response = {
+                    type: "response",
+                    messageId,
+                    payload: data,
+                };
+                await transport.send(response);
+            }
+            if (message["type"] === "response" || message["type"] === "ack") {
+                // Both acks and responses are forwarded to the send() correlator.
+                messages.emit("message", message);
+            }
+        },
+        async subsend(message) {
+            log("Session: sending trans msg to signal", message);
+            const sessionMessage = {
+                type: "request",
+                messageId: crypto.randomUUID(),
+                payload: message,
+            };
+            await signal.send(sessionMessage);
+        },
+    });
+    transport.emitter.on("state_change", (state) => {
+        log("transport state change", state);
+        if (state === TRANSPORT_STATE.CONNECTED) {
+            updateStatus(SESSION_STATE.CONNECTED);
+        }
+    });
+    const startTransport = async () => {
+        await transport.setup();
+    };
+    // let transport: TransportLayer | undefined;
+    const onSignalMessage = async (message) => {
+        log("Session: received message from signaling", message);
+        const sessionMsg = message;
+        if (sessionMsg.type === "response") {
+            log("Session: received data message", sessionMsg.payload);
+            messages.emit("message", sessionMsg);
+        }
+        if (sessionMsg.type === "request") {
+            log("Session: received request message", sessionMsg.payload);
+            await transport.handle(sessionMsg.payload);
+        }
+    };
+    return {
+        connect: async () => {
+            updateStatus(SESSION_STATE.SIGNALING);
+            log("connecting to session, isHost:", isHost);
+            // TODO: implement
+            log("connecting to session");
+            signal.on("message", onSignalMessage);
+            signal.on("state_change", (state) => {
+                log("signal state change", state);
+                if (state === SIGNAL_STATE.READY) {
+                    updateStatus(SESSION_STATE.READY);
+                }
+                if ([
+                    SIGNAL_STATE.HANDSHAKE,
+                    SIGNAL_STATE.HANDSHAKE_PARTIAL,
+                ].includes(state)) {
+                    updateStatus(SESSION_STATE.LINKING);
+                }
+                if (state === SIGNAL_STATE.ENCRYPTED) {
+                    startTransport();
+                }
+                if (state === SIGNAL_STATE.ERROR) {
+                    log("signaling error — marking session disconnected");
+                    updateStatus(SESSION_STATE.DISCONNECTED);
+                }
+            });
+            // TODO: handle errors in setup nicely in modal UI
+            await signal.setup();
+        },
+        async close() {
+            log("session teardown");
+            signal.off("message", onSignalMessage);
+            await Promise.all([
+                transport.teardown(),
+                signal.teardown(),
+            ]);
+            updateStatus(SESSION_STATE.DISCONNECTED);
+        },
+        getState() {
+            return {
+                status,
+                signaling: signal.getState(),
+                // transport: transport.getState(),
+            };
+        },
+        getHandshakeParameters() {
+            return {
+                version: OPENLV_PROTOCOL_VERSION,
+                sessionId,
+                h: hash,
+                k: handshakeKey.toString(),
+                p: protocol,
+                s: server,
+            };
+        },
+        waitForLink: async () => {
+            if (status === SESSION_STATE.CONNECTED)
+                return;
+            if (status === SESSION_STATE.DISCONNECTED) {
+                throw new Error("Session failed to connect");
+            }
+            return new Promise((resolve, reject) => {
+                const handler = (state) => {
+                    if (state?.status === SESSION_STATE.CONNECTED) {
+                        emitter.off("state_change", handler);
+                        resolve();
+                    }
+                    else if (state?.status === SESSION_STATE.DISCONNECTED) {
+                        emitter.off("state_change", handler);
+                        reject(new Error("Session failed to connect"));
+                    }
+                };
+                emitter.on("state_change", handler);
+            });
+        },
+        async send(message, ackTimeout = 10000, responseTimeout = 60 * 60000) {
+            if (signal.getState().state !== SIGNAL_STATE.ENCRYPTED) {
+                throw new Error("Session not ready");
+            }
+            const messageId = crypto.randomUUID();
+            const sessionMessage = {
+                type: "request",
+                messageId,
+                payload: message,
+            };
+            await transport.send(sessionMessage);
+            return new Promise((resolve, reject) => {
+                let ackReceived = false;
+                // eslint-disable-next-line prefer-const
+                let ackTimer;
+                let responseTimer;
+                const cleanup = () => {
+                    clearTimeout(ackTimer);
+                    clearTimeout(responseTimer);
+                    messages.off("message", handler);
+                };
+                const handler = (msg) => {
+                    if (msg.messageId !== messageId)
+                        return;
+                    if (msg.type === "ack" && !ackReceived) {
+                        ackReceived = true;
+                        clearTimeout(ackTimer);
+                        // The other side confirmed receipt; wait for the full response.
+                        responseTimer = setTimeout(() => {
+                            cleanup();
+                            reject(new Error("Request timed out: no response after acknowledgement"));
+                        }, responseTimeout);
+                        return;
+                    }
+                    if (msg.type === "response") {
+                        cleanup();
+                        resolve(msg.payload);
+                    }
+                };
+                messages.on("message", handler);
+                // Short window for the ack — tells us the peer is alive and processing.
+                ackTimer = setTimeout(() => {
+                    if (!ackReceived) {
+                        cleanup();
+                        reject(new Error("Request timed out: remote peer did not acknowledge"));
+                    }
+                }, ackTimeout);
+            });
+        },
+        _internal: {
+            signal,
+            transport,
+        },
+        emitter,
+    };
+};
+/**
+ * Connect to a session from its openlv:// URL
+ */
+export const connectSession = async (connectionUrl, onMessage, transport) => {
+    const initParameters = decodeConnectionURL(connectionUrl);
+    const signaling = await dynamicSignalingLayer(initParameters.p);
+    if (!signaling) {
+        throw new Error(`Invalid signaling protocol: ${initParameters.p}`);
+    }
+    return createSession(initParameters, signaling, transport, onMessage);
+};
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE;;;;;GAKG;AAEH,kEAAkE;AAClE,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  decodeConnectionURL,\n  OPENLV_PROTOCOL_VERSION,\n  type SessionHandshakeParameters,\n  type SessionLinkParameters,\n} from \"@openlv/core\";\nimport {\n  deriveSymmetricKey,\n  type EncryptionKey,\n  generateHandshakeKey,\n  generateSessionId,\n  initEncryptionKeys,\n  initHash,\n  parseEncryptionKey,\n} from \"@openlv/core/encryption\";\nimport {\n  SIGNAL_STATE,\n  type SignalingLayer,\n  type SignalingProtocol,\n  type SignalState,\n} from \"@openlv/signaling\";\nimport { dynamicSignalingLayer } from \"@openlv/signaling/dynamic\";\nimport {\n  type TLayer,\n  TRANSPORT_STATE,\n  type TransportLayer,\n  type TransportMessage,\n} from \"@openlv/transport\";\nimport { EventEmitter } from \"eventemitter3\";\n\nimport type { SessionEvents } from \"./events.js\";\nimport type { SessionMessage } from \"./messages/index.js\";\nimport { log } from \"./utils/log.js\";\n\nexport const SESSION_STATE = {\n  CREATED: \"created\",\n  SIGNALING: \"signaling\",\n  READY: \"ready\",\n  LINKING: \"linking\",\n  CONNECTED: \"connected\",\n  DISCONNECTED: \"disconnected\",\n} as const;\nexport type SessionState = (typeof SESSION_STATE)[keyof typeof SESSION_STATE];\n\nexport type SessionStateObject = {\n  status: SessionState;\n  signaling?: {\n    state: SignalState;\n  };\n};\n\n/**\n * an OpenLV Session\n *\n * https://openlv.sh/api/session\n */\nexport type Session = {\n  getState(): SessionStateObject;\n  getHandshakeParameters(): SessionHandshakeParameters;\n  connect(): Promise<void>;\n  waitForLink(): Promise<void>;\n  close(): Promise<void>;\n  /**\n     * Send a request to the remote peer and await a correlated response.\n     *\n     * Two-phase timeout:\n     * - `ackTimeout` (default 10 s): the remote peer must send back an ack\n     *   within this window, confirming it received the message.\n     * - After an ack arrives the wait is extended to `responseTimeout`\n     *   (default 1 hour) — enough for user-interactive flows such as\n     *   `eth_sendTransaction` or `personal_sign`.\n     */\n  send(message: object, ackTimeout?: number, responseTimeout?: number): Promise<unknown>;\n  emitter: EventEmitter<SessionEvents>;\n  _internal: {\n    signal: SignalingLayer;\n    transport: TransportLayer;\n  };\n};\n\n/**\n * OpenLV Session\n *\n * https://openlv.sh/api/session\n */\nexport const createSession = async (\n  initParameters: SessionLinkParameters,\n  signalLayer: SignalingProtocol,\n  transportLayer: TLayer,\n  onMessage: (message: object) => Promise<object | string>,\n): Promise<Session> => {\n  const emitter = new EventEmitter<SessionEvents>();\n  const messages = new EventEmitter<{ message: SessionMessage; }>();\n  const sessionId\n    = \"sessionId\" in initParameters\n      ? initParameters.sessionId\n      : generateSessionId();\n  const {\n    encryptionKey,\n    decryptionKey: { decrypt },\n  } = await initEncryptionKeys(initParameters);\n  let relyingPublicKey: EncryptionKey | undefined;\n  const handshakeKey\n    = \"k\" in initParameters\n      ? await deriveSymmetricKey(initParameters.k)\n      : await generateHandshakeKey();\n  const { hash, isHost } = await initHash(\n    \"h\" in initParameters ? initParameters.h : undefined,\n    encryptionKey,\n  );\n  let status: SessionState = SESSION_STATE.CREATED;\n  const protocol = initParameters.p;\n  const server = initParameters.s;\n\n  const updateStatus = (newStatus: SessionState) => {\n    log(\"updateStatus\", newStatus);\n    status = newStatus;\n    emitter.emit(\"state_change\", { status, signaling: signal.getState() });\n  };\n\n  const signaling = await signalLayer({\n    topic: sessionId,\n    url: server,\n  });\n  const signal = await signaling({\n    h: hash,\n    canEncrypt() {\n      return relyingPublicKey !== undefined;\n    },\n    async encrypt(message) {\n      if (!relyingPublicKey) {\n        throw new Error(\"Relying party public key not found\");\n      }\n\n      log(`encrypting to ${relyingPublicKey.toString()}`, message);\n\n      return await relyingPublicKey.encrypt(message);\n    },\n    decrypt,\n    publicKey: encryptionKey,\n    k: handshakeKey,\n    async rpDiscovered(rpKey) {\n      const role = isHost ? \"host\" : \"client\";\n\n      log(`rpKey discovered by ${role}`, rpKey);\n\n      relyingPublicKey = await parseEncryptionKey(rpKey);\n    },\n    isHost,\n  });\n\n  const transport = transportLayer({\n    encrypt(message) {\n      if (!relyingPublicKey) {\n        throw new Error(\"Relying party public key not found\");\n      }\n\n      return relyingPublicKey?.encrypt(message);\n    },\n    decrypt,\n    isHost,\n    onmessage: async (message: { type: string; payload: object; messageId: string; }) => {\n      log(\"Session: received message from transport\", message);\n\n      if (message[\"type\"] === \"request\") {\n        const messageId = message[\"messageId\"] as string;\n\n        // Immediately acknowledge receipt so the sender's ack-timeout does\n        // not fire while the handler (which may await user interaction) runs.\n        await transport.send({ type: \"ack\", messageId } satisfies SessionMessage);\n\n        // Notify observers before processing (e.g. wallet UI can show a\n        // pending indicator before the handler resolves).\n        emitter.emit(\"request\", message[\"payload\"] as object);\n\n        const data = await onMessage(message[\"payload\"] as object);\n        const response: SessionMessage = {\n          type: \"response\",\n          messageId,\n          payload: data,\n        };\n\n        await transport.send(response);\n      }\n\n      if (message[\"type\"] === \"response\" || message[\"type\"] === \"ack\") {\n        // Both acks and responses are forwarded to the send() correlator.\n        messages.emit(\"message\", message as SessionMessage);\n      }\n    },\n    async subsend(message) {\n      log(\"Session: sending trans msg to signal\", message);\n      const sessionMessage: SessionMessage = {\n        type: \"request\",\n        messageId: crypto.randomUUID(),\n        payload: message,\n      };\n\n      await signal.send(sessionMessage);\n    },\n  });\n\n  transport.emitter.on(\"state_change\", (state) => {\n    log(\"transport state change\", state);\n\n    if (state === TRANSPORT_STATE.CONNECTED) {\n      updateStatus(SESSION_STATE.CONNECTED);\n    }\n  });\n\n  const startTransport = async () => {\n    await transport.setup();\n  };\n\n  // let transport: TransportLayer | undefined;\n  const onSignalMessage = async (message: object) => {\n    log(\"Session: received message from signaling\", message);\n\n    const sessionMsg = message as SessionMessage;\n\n    if (sessionMsg.type === \"response\") {\n      log(\"Session: received data message\", sessionMsg.payload);\n      messages.emit(\"message\", sessionMsg);\n    }\n\n    if (sessionMsg.type === \"request\") {\n      log(\"Session: received request message\", sessionMsg.payload);\n\n      await transport.handle(sessionMsg.payload as TransportMessage);\n    }\n  };\n\n  return {\n    connect: async () => {\n      updateStatus(SESSION_STATE.SIGNALING);\n      log(\"connecting to session, isHost:\", isHost);\n      // TODO: implement\n      log(\"connecting to session\");\n\n      signal.on(\"message\", onSignalMessage);\n\n      signal.on(\"state_change\", (state) => {\n        log(\"signal state change\", state);\n\n        if (state === SIGNAL_STATE.READY) {\n          updateStatus(SESSION_STATE.READY);\n        }\n\n        if (\n          (\n            [\n              SIGNAL_STATE.HANDSHAKE,\n              SIGNAL_STATE.HANDSHAKE_PARTIAL,\n            ] as SignalState[]\n          ).includes(state)\n        ) {\n          updateStatus(SESSION_STATE.LINKING);\n        }\n\n        if (state === SIGNAL_STATE.ENCRYPTED) {\n          startTransport();\n        }\n\n        if (state === SIGNAL_STATE.ERROR) {\n          log(\"signaling error — marking session disconnected\");\n          updateStatus(SESSION_STATE.DISCONNECTED);\n        }\n      });\n\n      // TODO: handle errors in setup nicely in modal UI\n      await signal.setup();\n    },\n    async close() {\n      log(\"session teardown\");\n      signal.off(\"message\", onSignalMessage);\n      await Promise.all([\n        transport.teardown(),\n        signal.teardown(),\n      ]);\n      updateStatus(SESSION_STATE.DISCONNECTED);\n    },\n    getState() {\n      return {\n        status,\n        signaling: signal.getState(),\n        // transport: transport.getState(),\n      };\n    },\n    getHandshakeParameters() {\n      return {\n        version: OPENLV_PROTOCOL_VERSION,\n        sessionId,\n        h: hash,\n        k: handshakeKey.toString(),\n        p: protocol,\n        s: server,\n      };\n    },\n    waitForLink: async () => {\n      if (status === SESSION_STATE.CONNECTED) return;\n\n      if (status === SESSION_STATE.DISCONNECTED) {\n        throw new Error(\"Session failed to connect\");\n      }\n\n      return new Promise<void>((resolve, reject) => {\n        const handler = (state?: SessionStateObject) => {\n          if (state?.status === SESSION_STATE.CONNECTED) {\n            emitter.off(\"state_change\", handler);\n            resolve();\n          }\n          else if (state?.status === SESSION_STATE.DISCONNECTED) {\n            emitter.off(\"state_change\", handler);\n            reject(new Error(\"Session failed to connect\"));\n          }\n        };\n\n        emitter.on(\"state_change\", handler);\n      });\n    },\n    async send(\n      message: object,\n      ackTimeout: number = 10_000,\n      responseTimeout: number = 60 * 60_000,\n    ) {\n      if (signal.getState().state !== SIGNAL_STATE.ENCRYPTED) {\n        throw new Error(\"Session not ready\");\n      }\n\n      const messageId = crypto.randomUUID();\n      const sessionMessage: SessionMessage = {\n        type: \"request\",\n        messageId,\n        payload: message,\n      };\n\n      await transport.send(sessionMessage);\n\n      return new Promise<unknown>((resolve, reject) => {\n        let ackReceived = false;\n        // eslint-disable-next-line prefer-const\n        let ackTimer: ReturnType<typeof setTimeout> | undefined;\n        let responseTimer: ReturnType<typeof setTimeout> | undefined;\n\n        const cleanup = () => {\n          clearTimeout(ackTimer);\n          clearTimeout(responseTimer);\n          messages.off(\"message\", handler);\n        };\n\n        const handler = (msg: SessionMessage) => {\n          if (msg.messageId !== messageId) return;\n\n          if (msg.type === \"ack\" && !ackReceived) {\n            ackReceived = true;\n            clearTimeout(ackTimer);\n            // The other side confirmed receipt; wait for the full response.\n            responseTimer = setTimeout(() => {\n              cleanup();\n              reject(new Error(\"Request timed out: no response after acknowledgement\"));\n            }, responseTimeout);\n\n            return;\n          }\n\n          if (msg.type === \"response\") {\n            cleanup();\n            resolve(msg.payload);\n          }\n        };\n\n        messages.on(\"message\", handler);\n\n        // Short window for the ack — tells us the peer is alive and processing.\n        ackTimer = setTimeout(() => {\n          if (!ackReceived) {\n            cleanup();\n            reject(new Error(\"Request timed out: remote peer did not acknowledge\"));\n          }\n        }, ackTimeout);\n      });\n    },\n    _internal: {\n      signal,\n      transport,\n    },\n    emitter,\n  };\n};\n\n/**\n * Connect to a session from its openlv:// URL\n */\nexport const connectSession = async (\n  connectionUrl: string,\n  onMessage: (message: object) => Promise<object | string>,\n  transport: TLayer,\n): Promise<Session> => {\n  const initParameters = decodeConnectionURL(connectionUrl);\n\n  const signaling = await dynamicSignalingLayer(initParameters.p);\n\n  if (!signaling) {\n    throw new Error(`Invalid signaling protocol: ${initParameters.p}`);\n  }\n\n  return createSession(initParameters, signaling, transport, onMessage);\n};\n"]}

package/dist/index.test.js

@@ -1,14 +1,15 @@
 import { decodeConnectionURL, encodeConnectionURL } from "@openlv/core";
 import { ntfy } from "@openlv/signaling/ntfy";
+import { webrtc } from "@openlv/transport/webrtc";
 import { describe, expect, test } from "vitest";
-import { connectSession, createSession } from "./base.js";
+import { connectSession, createSession } from "./index.js";
 describe("Session", () => {
     test("Should be able to create a session", async () => {
         const sessionA = await createSession({
             sessionId: "mytestsession111",
             p: "ntfy",
             s: "https://ntfy.sh/",
-        }, ntfy, async (message) => {
+        }, ntfy, webrtc(), async (message) => {
             console.log("sessionA received message", message);
             return { result: "success" };
         });
@@ -21,12 +22,12 @@ describe("Session", () => {
         const decodedUrl = decodeConnectionURL(encodedUrl);
         expect(decodedUrl).toEqual(handshakeParametersA);
         //
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await new Promise(resolve => setTimeout(resolve, 1000));
         console.log("Connecting to session B");
         const sessionB = await connectSession(encodedUrl, async (message) => {
             console.log("sessionB received message", message);
             return { result: "success" };
-        });
+        }, webrtc());
         console.log(sessionB.getState());
         await sessionB.connect();
         await Promise.all([sessionA.waitForLink(), sessionB.waitForLink()]);

package/dist/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAClC;YACE,SAAS,EAAE,kBAAkB;YAC7B,CAAC,EAAE,MAAM;YACT,CAAC,EAAE,kBAAkB;SACtB,EACD,IAAI,EACJ,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;YAElD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC,CACF,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEzB,MAAM,oBAAoB,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;QAE7D,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAExB,MAAM,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAEnD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAEjD,EAAE;QACF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAE1D,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAClE,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;YAElD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEzB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAEpE,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAElC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAClC;YACE,SAAS,EAAE,kBAAkB;YAC7B,CAAC,EAAE,MAAM;YACT,CAAC,EAAE,kBAAkB;SACtB,EACD,IAAI,EACJ,MAAM,EAAE,EACR,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;YAElD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC,CACF,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEzB,MAAM,oBAAoB,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;QAE7D,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAExB,MAAM,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAEnD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAEjD,EAAE;QACF,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAExD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAG,MAAM,cAAc,CACnC,UAAU,EACV,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;YAElD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC,EACD,MAAM,EAAE,CACT,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEzB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAEpE,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAElC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { decodeConnectionURL, encodeConnectionURL } from \"@openlv/core\";\nimport { ntfy } from \"@openlv/signaling/ntfy\";\nimport { webrtc } from \"@openlv/transport/webrtc\";\nimport { describe, expect, test } from \"vitest\";\n\nimport { connectSession, createSession } from \"./index.js\";\n\ndescribe(\"Session\", () => {\n  test(\"Should be able to create a session\", async () => {\n    const sessionA = await createSession(\n      {\n        sessionId: \"mytestsession111\",\n        p: \"ntfy\",\n        s: \"https://ntfy.sh/\",\n      },\n      ntfy,\n      webrtc(),\n      async (message) => {\n        console.log(\"sessionA received message\", message);\n\n        return { result: \"success\" };\n      },\n    );\n\n    expect(sessionA).toBeDefined();\n    console.log(sessionA.getState());\n\n    await sessionA.connect();\n\n    const handshakeParametersA = sessionA.getHandshakeParameters();\n    const encodedUrl = encodeConnectionURL(handshakeParametersA);\n\n    console.log(encodedUrl);\n\n    const decodedUrl = decodeConnectionURL(encodedUrl);\n\n    expect(decodedUrl).toEqual(handshakeParametersA);\n\n    //\n    await new Promise(resolve => setTimeout(resolve, 1000));\n\n    console.log(\"Connecting to session B\");\n\n    const sessionB = await connectSession(\n      encodedUrl,\n      async (message) => {\n        console.log(\"sessionB received message\", message);\n\n        return { result: \"success\" };\n      },\n      webrtc(),\n    );\n\n    console.log(sessionB.getState());\n    await sessionB.connect();\n\n    await Promise.all([sessionA.waitForLink(), sessionB.waitForLink()]);\n\n    //\n    console.log(\"A\", sessionA.getState());\n    console.log(\"B\", sessionB.getState());\n\n    const response = await sessionA.send({ data: \"test\" });\n\n    console.log(\"response\", response);\n\n    expect(response).toEqual({ result: \"success\" });\n  });\n});\n"]}

package/dist/messages/index.d.ts

@@ -1,4 +1,4 @@
-export type SessionMessage = SessionMessageRequest | SessionMessageResponse;
+export type SessionMessage = SessionMessageRequest | SessionMessageResponse | SessionMessageAck;
 export type SessionMessageRequest = {
     type: "request";
     messageId: string;
@@ -9,3 +9,7 @@ export type SessionMessageResponse = {
     messageId: string;
     payload: object | string;
 };
+export type SessionMessageAck = {
+    type: "ack";
+    messageId: string;
+};

package/dist/messages/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/messages/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/messages/index.ts"],"names":[],"mappings":"","sourcesContent":["export type SessionMessage =\n  | SessionMessageRequest\n  | SessionMessageResponse\n  | SessionMessageAck;\n\nexport type SessionMessageRequest = {\n  type: \"request\";\n  messageId: string;\n  payload: object | string;\n};\n\nexport type SessionMessageResponse = {\n  type: \"response\";\n  messageId: string;\n  payload: object | string;\n};\n\nexport type SessionMessageAck = {\n  type: \"ack\";\n  messageId: string;\n};\n"]}

package/dist/utils/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,CAAiC,EAAE,EAAE,CAC1D,OAAO,CAAC,GAAG,CACT,WAAW;AACX,sCAAsC;AACtC,yCAAyC;AACzC,GAAG,CAAC,CACL,CAAC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,CAAiC,EAAE,EAAE,CAC1D,OAAO,CAAC,GAAG,CACT,WAAW;AACX,sCAAsC;AACtC,yCAAyC;AACzC,GAAG,CAAC,CACL,CAAC","sourcesContent":["export const log = (...x: Parameters<typeof console.log>) =>\n  console.log(\n    \"[session]\",\n    // \"color: orange; font-weight: bold\",\n    // \"color: inherit; font-weight: normal\",\n    ...x,\n  );\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openlv/session",
-  "version": "0.0.1-beta.9",
+  "version": "0.0.2",
   "keywords": [
     "open-lavatory"
   ],
@@ -25,11 +25,6 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "default": "./dist/index.js"
-    },
-    "./provider": {
-      "types": "./dist/provider.d.ts",
-      "import": "./dist/provider.js",
-      "default": "./dist/provider.js"
     }
   },
   "main": "./dist/index.js",
@@ -42,13 +37,13 @@
     "eventemitter3": "^5.0.1",
     "globals": "^16.2.0",
     "ts-pattern": "^5",
-    "@openlv/core": "0.0.1-beta.8",
-    "@openlv/signaling": "0.0.1-beta.7",
-    "@openlv/transport": "0.0.1-beta.6"
+    "@openlv/signaling": "0.0.2",
+    "@openlv/transport": "0.0.2",
+    "@openlv/core": "0.0.1"
   },
   "devDependencies": {
     "@vitest/browser-playwright": "^4.0.8",
-    "playwright": "^1.56.1",
+    "playwright": "1.58.1",
     "typescript": "^5",
     "vitest": "^4"
   },
@@ -63,7 +58,6 @@
   },
   "scripts": {
     "build": "tsc",
-    "test": "vitest",
-    "test:install": "playwright install --with-deps"
+    "test": "vitest"
   }
 }

package/dist/base.d.ts

@@ -1,48 +0,0 @@
-import { type SessionHandshakeParameters, type SessionLinkParameters } from "@openlv/core";
-import { type CreateSignalLayerFn, type SignalingLayer, type SignalState } from "@openlv/signaling";
-import { type TransportLayer } from "@openlv/transport";
-import { EventEmitter } from "eventemitter3";
-import type { SessionEvents } from "./events.js";
-export declare const SESSION_STATE: {
-    readonly CREATED: "created";
-    readonly SIGNALING: "signaling";
-    readonly READY: "ready";
-    readonly LINKING: "linking";
-    readonly CONNECTED: "connected";
-    readonly DISCONNECTED: "disconnected";
-};
-export type SessionState = (typeof SESSION_STATE)[keyof typeof SESSION_STATE];
-export type SessionStateObject = {
-    status: SessionState;
-    signaling?: {
-        state: SignalState;
-    };
-};
-/**
- * an OpenLV Session
- *
- * https://openlv.sh/api/session
- */
-export type Session = {
-    getState(): SessionStateObject;
-    getHandshakeParameters(): SessionHandshakeParameters;
-    connect(): Promise<void>;
-    waitForLink(): Promise<void>;
-    close(): Promise<void>;
-    send(message: object, timeout?: number): Promise<unknown>;
-    emitter: EventEmitter<SessionEvents>;
-    _internal: {
-        signal: SignalingLayer;
-        transport: TransportLayer;
-    };
-};
-/**
- * OpenLV Session
- *
- * https://openlv.sh/api/session
- */
-export declare const createSession: (initParameters: SessionLinkParameters, signalLayer: CreateSignalLayerFn, onMessage: (message: object) => Promise<object | string>) => Promise<Session>;
-/**
- * Connect to a session from its openlv:// URL
- */
-export declare const connectSession: (connectionUrl: string, onMessage: (message: object) => Promise<object | string>) => Promise<Session>;

package/dist/base.js

@@ -1,234 +0,0 @@
-import { decodeConnectionURL, OPENLV_PROTOCOL_VERSION, } from "@openlv/core";
-import { deriveSymmetricKey, generateHandshakeKey, generateSessionId, initEncryptionKeys, initHash, parseEncryptionKey, } from "@openlv/core/encryption";
-import { SIGNAL_STATE, } from "@openlv/signaling";
-import { dynamicSignalingLayer } from "@openlv/signaling/dynamic";
-import { TRANSPORT_STATE, } from "@openlv/transport";
-import { webrtc } from "@openlv/transport/webrtc";
-import { EventEmitter } from "eventemitter3";
-import { log } from "./utils/log.js";
-export const SESSION_STATE = {
-    CREATED: "created",
-    SIGNALING: "signaling",
-    READY: "ready",
-    LINKING: "linking",
-    CONNECTED: "connected",
-    DISCONNECTED: "disconnected",
-};
-/**
- * OpenLV Session
- *
- * https://openlv.sh/api/session
- */
-export const createSession = async (initParameters, signalLayer, onMessage) => {
-    const emitter = new EventEmitter();
-    const messages = new EventEmitter();
-    const sessionId = "sessionId" in initParameters
-        ? initParameters.sessionId
-        : generateSessionId();
-    const { encryptionKey, decryptionKey: { decrypt }, } = await initEncryptionKeys(initParameters);
-    let relyingPublicKey;
-    const handshakeKey = "k" in initParameters
-        ? await deriveSymmetricKey(initParameters.k)
-        : await generateHandshakeKey();
-    const { hash, isHost } = await initHash("h" in initParameters ? initParameters.h : undefined, encryptionKey);
-    let status = SESSION_STATE.CREATED;
-    const protocol = initParameters.p;
-    const server = initParameters.s;
-    const updateStatus = (newStatus) => {
-        log("updateStatus", newStatus);
-        status = newStatus;
-        emitter.emit("state_change", { status, signaling: signal.getState() });
-    };
-    const signaling = await signalLayer({
-        topic: sessionId,
-        url: server,
-    });
-    const signal = await signaling({
-        h: hash,
-        canEncrypt() {
-            return relyingPublicKey !== undefined;
-        },
-        async encrypt(message) {
-            if (!relyingPublicKey) {
-                throw new Error("Relying party public key not found");
-            }
-            log(`encrypting to ${relyingPublicKey.toString()}`, message);
-            return await relyingPublicKey.encrypt(message);
-        },
-        decrypt,
-        publicKey: encryptionKey,
-        k: handshakeKey,
-        async rpDiscovered(rpKey) {
-            const role = isHost ? "host" : "client";
-            log(`rpKey discovered by ${role}`, rpKey);
-            relyingPublicKey = await parseEncryptionKey(rpKey);
-        },
-        isHost,
-    });
-    const transport = webrtc({ isHost })({
-        encrypt(message) {
-            if (!relyingPublicKey) {
-                throw new Error("Relying party public key not found");
-            }
-            return relyingPublicKey?.encrypt(message);
-        },
-        decrypt,
-        isHost,
-        onmessage: async (message) => {
-            console.log("Session: received message from transport", message);
-            // @ts-ignore
-            if (message["type"] === "request") {
-                // @ts-ignore
-                const data = await onMessage(message["payload"]);
-                const response = {
-                    type: "response",
-                    // @ts-ignore
-                    messageId: message["messageId"],
-                    payload: data,
-                };
-                await transport.send(response);
-            }
-            // @ts-ignore
-            if (message["type"] === "response") {
-                messages.emit("message", message);
-            }
-        },
-        async subsend(message) {
-            console.log("Session: sending trans msg to signal", message);
-            const sessionMessage = {
-                type: "request",
-                messageId: crypto.randomUUID(),
-                payload: message,
-            };
-            await signal.send(sessionMessage);
-        },
-    });
-    transport.emitter.on("state_change", (state) => {
-        log("transport state change", state);
-        if (state === TRANSPORT_STATE.CONNECTED) {
-            updateStatus(SESSION_STATE.CONNECTED);
-        }
-    });
-    const startTransport = async () => {
-        await transport.setup();
-    };
-    // let transport: TransportLayer | undefined;
-    const onSignalMessage = async (message) => {
-        log("Session: received message from signaling", message);
-        const sessionMsg = message;
-        if (sessionMsg.type === "response") {
-            log("Session: received data message", sessionMsg.payload);
-            messages.emit("message", sessionMsg);
-        }
-        if (sessionMsg.type === "request") {
-            log("Session: received request message", sessionMsg.payload);
-            transport.handle(sessionMsg.payload);
-        }
-    };
-    return {
-        connect: async () => {
-            updateStatus(SESSION_STATE.SIGNALING);
-            log("connecting to session, isHost:", isHost);
-            // TODO: implement
-            log("connecting to session");
-            signal.on("message", onSignalMessage);
-            signal.on("state_change", (state) => {
-                log("signal state change", state);
-                if (state === SIGNAL_STATE.READY) {
-                    updateStatus(SESSION_STATE.READY);
-                }
-                if ([
-                    SIGNAL_STATE.HANDSHAKE,
-                    SIGNAL_STATE.HANDSHAKE_PARTIAL,
-                ].includes(state)) {
-                    updateStatus(SESSION_STATE.LINKING);
-                }
-                if (state === SIGNAL_STATE.ENCRYPTED) {
-                    // for now cuz we just use signaling call this a full connection
-                    // updateStatus("connected");
-                    startTransport();
-                }
-            });
-            // TODO: handle errors in setup nicely in modal UI
-            await signal.setup();
-        },
-        async close() {
-            log("session teardown");
-            await signal?.teardown();
-            updateStatus(SESSION_STATE.DISCONNECTED);
-        },
-        getState() {
-            return {
-                status,
-                signaling: signal.getState(),
-                // transport: transport.getState(),
-            };
-        },
-        getHandshakeParameters() {
-            return {
-                version: OPENLV_PROTOCOL_VERSION,
-                sessionId,
-                h: hash,
-                k: handshakeKey.toString(),
-                p: protocol,
-                s: server,
-            };
-        },
-        waitForLink: async () => {
-            return new Promise((resolve) => {
-                emitter.on("state_change", (state) => {
-                    if (state?.status === SESSION_STATE.CONNECTED) {
-                        resolve();
-                    }
-                });
-            });
-        },
-        async send(message, timeout = 5000) {
-            const ready = signal.getState().state === SIGNAL_STATE.ENCRYPTED;
-            // const transportReady = transport.getState() === TRANSPORT_STATE.CONNECTED;
-            if (!ready) {
-                throw new Error("Session not ready");
-            }
-            const randomID = crypto.randomUUID();
-            const sessionMessage = {
-                type: "request",
-                messageId: randomID,
-                payload: message,
-            };
-            // for now use signaling
-            // await signal.send(sessionMessage);
-            await transport.send(sessionMessage);
-            return Promise.race([
-                new Promise((resolve) => {
-                    messages.on("message", (message) => {
-                        if (message.messageId === randomID && message.type === "response") {
-                            resolve(message.payload);
-                        }
-                    });
-                }),
-                new Promise((resolve) => {
-                    setTimeout(() => {
-                        resolve(new Error("Timeout"));
-                    }, timeout);
-                }),
-            ]);
-        },
-        _internal: {
-            signal,
-            transport,
-        },
-        emitter,
-    };
-};
-/**
- * Connect to a session from its openlv:// URL
- */
-export const connectSession = async (connectionUrl, onMessage) => {
-    const initParameters = decodeConnectionURL(connectionUrl);
-    const signaling = await dynamicSignalingLayer(initParameters.p);
-    if (!signaling) {
-        throw new Error(`Invalid signaling protocol: ${initParameters.p}`);
-    }
-    return createSession(initParameters, signaling, onMessage);
-};
-//# sourceMappingURL=base.js.map

package/dist/base.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}