@ih8e/express-cli 0.1.2 → 0.1.3

package/dist/index.js

@@ -6,6 +6,9 @@ import { Command as Command15 } from "commander";
 // src/cli/auth.ts
 import { Command } from "commander";
 
+// src/config/loader.ts
+import { ZodError } from "zod";
+
 // src/types/config.ts
 import { z } from "zod";
 var configSchema = z.object({
@@ -135,7 +138,18 @@ function loadConfig(cliOverrides = {}) {
     const storedToken = getAuthToken();
     if (storedToken) merged.token = storedToken;
   }
-  return configSchema.parse(merged);
+  try {
+    return configSchema.parse(merged);
+  } catch (err) {
+    if (err instanceof ZodError) {
+      const details = err.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n");
+      throw new Error(`Configuration error:
+${details}
+
+Run: express-cli config set host <hostname>`);
+    }
+    throw err;
+  }
 }
 function getBaseUrl(config) {
   return `${config.protocol}://${config.host}`;
@@ -1946,6 +1960,7 @@ import { Command as Command5 } from "commander";
 import chalk2 from "chalk";
 
 // src/api/websocket.ts
+import WebSocket from "ws";
 import { randomUUID as randomUUID3 } from "crypto";
 async function fetchChatListViaWebSocket(params) {
   const { host, ctsToken, encryptionKeyId, timeoutMs = 15e3 } = params;
@@ -2037,20 +2052,24 @@ var ChatsApi = class {
     const ctsToken = getAuthToken();
     const keys = loadApigwKeys();
     const ctsKeyId = (keys?.ctsKey ?? keys?.encryptionKey)?.keyId;
-    if (ctsToken && ctsKeyId) {
-      try {
-        return await fetchChatListViaWebSocket({
-          host,
-          ctsToken,
-          encryptionKeyId: ctsKeyId
-        });
-      } catch (err) {
-        if (process.env.EXPRESS_DEBUG) {
-          console.error(`  [DEBUG] WebSocket failed, falling back to directory: ${err.message}`);
-        }
-      }
+    if (!ctsToken || !ctsKeyId) {
+      console.error(
+        !ctsToken ? "Warning: no auth token \u2014 run `express-cli auth import <token>` or `express-cli auth qr`" : "Warning: no encryption keys \u2014 run `express-cli auth qr` to authenticate"
+      );
+      console.error("Falling back to corporate directory (shows only global/public chats).\n");
+      return this.listChatsViaDirectory();
+    }
+    try {
+      return await fetchChatListViaWebSocket({
+        host,
+        ctsToken,
+        encryptionKeyId: ctsKeyId
+      });
+    } catch (err) {
+      console.error(`Warning: WebSocket failed (${err.message}), falling back to corporate directory.
+`);
+      return this.listChatsViaDirectory();
     }
-    return this.listChatsViaDirectory();
   }
   async listChatsViaDirectory() {
     const data = await this.client.get("/api/v1/corporate_directory/entries");
@@ -2529,6 +2548,7 @@ var MessagingApi = class {
 };
 
 // src/api/messaging-ws.ts
+import WebSocket2 from "ws";
 import { randomBytes as randomBytes3, randomUUID as randomUUID4 } from "crypto";
 import nacl4 from "tweetnacl";
 import sodium from "libsodium-wrappers-sumo";
@@ -2635,7 +2655,7 @@ async function getChatKeyIds(host, webOrigin, ctsToken, encKeyId, chatId) {
       }
       done(() => reject(new Error("Timeout getting chat key_ids")));
     }, 1e4);
-    const ws = new WebSocket(wsUrl, {
+    const ws = new WebSocket2(wsUrl, {
       headers: { Origin: webOrigin, "User-Agent": "Mozilla/5.0" }
     });
     let ref = 0;
@@ -2688,7 +2708,7 @@ async function sendMessageNew(params) {
       }
       done(() => reject(new Error("Timeout sending message")));
     }, timeoutMs);
-    const ws = new WebSocket(wsUrl, {
+    const ws = new WebSocket2(wsUrl, {
       headers: { Origin: webOrigin, "User-Agent": "Mozilla/5.0" }
     });
     let ref = 0;
@@ -2926,6 +2946,7 @@ function createDownloadCommand() {
 import { Command as Command11 } from "commander";
 
 // src/api/messages-read.ts
+import WebSocket3 from "ws";
 import { randomUUID as randomUUID5 } from "crypto";
 
 // src/api/decrypt.ts
@@ -3029,7 +3050,7 @@ async function fetchEventsHistory(host, webOrigin, ctsToken, encKeyId, chatId, l
       }
       done(() => reject(new Error("Timeout fetching messages")));
     }, timeoutMs);
-    const ws = new WebSocket(wsUrl, {
+    const ws = new WebSocket3(wsUrl, {
       headers: { Origin: webOrigin, "User-Agent": "Mozilla/5.0" }
     });
     let ref = 0;
@@ -3122,6 +3143,7 @@ import { Command as Command12 } from "commander";
 import chalk4 from "chalk";
 
 // src/session/session.ts
+import WebSocket4 from "ws";
 import { EventEmitter } from "events";
 import { randomUUID as randomUUID6 } from "crypto";
 var HEARTBEAT_MS = 25e3;
@@ -3175,7 +3197,7 @@ var ExpressSession = class _ExpressSession extends EventEmitter {
       throw new Error("Not authenticated. Run 'express auth qr'.");
     }
     const url = `wss://${this.host}/socket/user/websocket?vsn=1.0.0&auto_join=true&key_id=${this.keyId}&version=6&background=false&voex_unencrypted=true&voex_multistream=true&voex_audio_bridge=true&instance_id=${randomUUID6()}`;
-    const ws = new WebSocket(url, {
+    const ws = new WebSocket4(url, {
       headers: { Origin: this.webOrigin, "User-Agent": "Mozilla/5.0" }
     });
     this.ws = ws;
@@ -4033,7 +4055,7 @@ function createMcpCommand() {
 // src/cli/root.ts
 function createRootCommand() {
   const program2 = new Command15();
-  program2.name("express-cli").description("CLI client for eXpress Chat").version("0.1.2");
+  program2.name("express-cli").description("CLI client for eXpress Chat").version("0.1.3");
   program2.addCommand(createAuthCommand());
   program2.addCommand(createApiCommand());
   program2.addCommand(createConfigCommand());