lunel-cli 0.1.88 → 0.1.91

package/dist/transport/protocol.d.ts

@@ -74,5 +74,4 @@ export declare function decodeV2BinaryFrame(data: Uint8Array): {
     type: number;
     payload: Uint8Array;
 } | null;
-export declare function buildSessionV1WsUrl(gatewayUrl: string, role: "cli" | "app", channel: "control" | "data", password: string): string;
 export declare function buildSessionV2WsUrl(gatewayUrl: string, role: "cli" | "app", password: string): string;

package/dist/transport/protocol.js

@@ -66,14 +66,6 @@ export function decodeV2BinaryFrame(data) {
         payload: data.subarray(3),
     };
 }
-export function buildSessionV1WsUrl(gatewayUrl, role, channel, password) {
-    const wsBase = gatewayUrl.replace(/^https:/, "wss:");
-    if (!wsBase.startsWith("wss://")) {
-        throw new Error("Gateway URL must use https://");
-    }
-    const query = new URLSearchParams({ password });
-    return `${wsBase}/v1/ws/${role}/${channel}?${query.toString()}`;
-}
 export function buildSessionV2WsUrl(gatewayUrl, role, password) {
     const wsBase = gatewayUrl.replace(/^https:/, "wss:");
     if (!wsBase.startsWith("wss://")) {

package/dist/transport/v2.js

@@ -1,6 +1,6 @@
 import { WebSocket } from "ws";
 import { createRequire } from "module";
-import { V2_FRAME_ENCRYPTED_MESSAGE, buildSessionV2WsUrl, decodeV2BinaryFrame, encodeV2EncryptedFrame, isEncryptedProtocolEnvelope, isProtocolRequest, isProtocolResponse, isV2HandshakeFrame, } from "./protocol.js";
+import { V2_FRAME_ENCRYPTED_MESSAGE, buildSessionV2WsUrl, decodeV2BinaryFrame, encodeV2EncryptedFrame, isEncryptedProtocolEnvelope, isV2HandshakeFrame, } from "./protocol.js";
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
 const require = createRequire(import.meta.url);
@@ -132,19 +132,9 @@ export class V2SessionTransport {
                 await this.handleHandshakeFrame(raw);
                 return;
             }
-            if (this.state !== "secure") {
-                throw new Error("received plaintext app message before secure transport");
-            }
-            if (isProtocolResponse(raw)) {
-                await this.options.handlers.onProtocolResponse?.(raw);
-                return;
-            }
-            if (isProtocolRequest(raw)) {
-                const response = await this.options.handlers.onProtocolRequest(raw);
-                await this.sendResponse(response);
-                return;
-            }
-            return;
+            throw new Error(this.state === "secure"
+                ? "received plaintext app message after secure transport"
+                : "received plaintext app message before secure transport");
         }
         const bytes = toUint8Array(data);
         const frame = decodeV2BinaryFrame(bytes);
@@ -225,7 +215,7 @@ export class V2SessionTransport {
                 s2c: sodium.to_base64(s2cKey, sodium.base64_variants.URLSAFE_NO_PADDING),
             };
             const boxed = sodium.crypto_box_easy(encodeUtf8(JSON.stringify(payload)), nonce, this.remotePublicKey, keyPair.privateKey);
-            const auth = this.computeHandshakeAuth("client_key", "app", frame.pubkey, nonce, boxed);
+            const auth = this.computeHandshakeAuth("client_key", "app", sodium.to_base64(keyPair.publicKey, sodium.base64_variants.URLSAFE_NO_PADDING), nonce, boxed);
             this.sessionKeys = { rx: s2cKey, tx: c2sKey };
             this.sendJsonFrame({
                 t: "lunel_v2",
@@ -256,10 +246,11 @@ export class V2SessionTransport {
                 rx: sodium.from_base64(payload.c2s, sodium.base64_variants.URLSAFE_NO_PADDING),
                 tx: sodium.from_base64(payload.s2c, sodium.base64_variants.URLSAFE_NO_PADDING),
             };
+            const auth = this.computeHandshakeAuth("server_ready", "cli", sodium.to_base64(keyPair.publicKey, sodium.base64_variants.URLSAFE_NO_PADDING));
             this.sendJsonFrame({
                 t: "lunel_v2",
                 kind: "server_ready",
-                auth: this.computeHandshakeAuth("server_ready", "cli", sodium.to_base64(this.remotePublicKey, sodium.base64_variants.URLSAFE_NO_PADDING)),
+                auth,
             });
             this.markSecure();
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.88",
+  "version": "0.1.91",
   "author": [
     {
       "name": "Soham Bharambe",