@cs7player/chat 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@cs7player/chat",
- "version": "1.0.1",
+ "version": "1.0.2",
  "description": "to communicate in terminal",
  "keywords": [
   "chat"

package/src/network/websocket.js

@@ -1,9 +1,9 @@
+import { startUI } from "../tui/welcome.js";
 import WebSocket, { WebSocketServer } from "ws";
-import { addMessage, chatState, removeUser, addUser } from "../state/chatState.js";
-import { addPeer, removePeer, hasPeer, getPeers } from "./peers.js";
 import { createAlertBox } from "../tui/alert.js";
 import { clearFocus, screenExit } from "../utils/screen.js";
-import { startUI } from "../tui/welcome.js";
+import { addPeer, removePeer, hasPeer, getPeers } from "./peers.js";
+import { addMessage, chatState, removeUser, addUser } from "../state/chatState.js";
 
 export const startWSServer = (username) => {
  try {

package/src/state/chatState.js

@@ -1,4 +1,4 @@
-import * as os from "node:os";
+import * as os from "os";
 import { loadUsers } from "../tui/side-bar.js";
 import { renderMessage, renderContent } from "../tui/content.js";
 import { sendPrivateMessage } from "../network/websocket.js";
@@ -34,7 +34,10 @@ export function addMessage(user, msg) {
   chatState.messages[key] = [];
  }
  chatState.messages[key].push(msg);
- if (chatState.selectedUser.username == msg.from) {
+ if (chatState.selectedUser && chatState.selectedUser.username == msg.from) {
+  renderMessage(msg);
+ }
+ if (msg.from == "You") {
   renderMessage(msg);
  }
 }

package/src/tui/msg-bar.js

@@ -69,11 +69,10 @@ const sendButton = blessed.button({
 /* -SEND MESSAGE HANDLER-*/
 const handleSend = () => {
  try {
-  // inputBox.cancel();
   const text = inputBox.getValue().trim();
+  inputBox.clearValue();
   if (!text) {
    clearFocus();
-   createAlertBox("NO Text is Entered!");
    return;
   }
   const user = chatState.selectedUser;
@@ -82,8 +81,8 @@ const handleSend = () => {
    createAlertBox("NO User is Selected!");
    return;
   }
-  sendMessage(user, text);
   inputBox.clearValue();
+  sendMessage(user, text);
  } catch (err) {
   console.log(err)
  }

package/src/utils/dialog.js

@@ -1,6 +1,6 @@
 import blessed from 'blessed';
 import { screen, screenRefresh, addFocusBtn, removeFocusBtn, screenExit } from './screen.js';
-import { color } from './contants.js';
+import { color, tabsfocus } from './contants.js';
 
 const dialogBox = blessed.box({
  top: 'center',
@@ -73,6 +73,7 @@ noBtn.on('press', () => {
  dialogBox.hide();
  removeFocusBtn(5);
  removeFocusBtn(6);
+ tabsfocus.btnIndex = 0;
  screen.remove(dialogBox);
  disableModalMode();
  screenRefresh();
@@ -83,6 +84,7 @@ export function showDialogBox() {
  addFocusBtn({ id: 5, btn: okBtn })
  addFocusBtn({ id: 6, btn: noBtn })
  okBtn.focus();
+ tabsfocus.btnIndex = tabsfocus.btns.findIndex(b => b.id === 5);
  dialogBox.show();
  enableModalMode();
  dialogBox.focus();

package/src/utils/screen.js

@@ -56,6 +56,9 @@ screen.key(['tab'], () => {
  if (!tabsfocus.istoggle) return;
  if (!tabsfocus.btns.length) return;
  tabsfocus.btnIndex = (tabsfocus.btnIndex + 1) % tabsfocus.btns.length;
+ if (tabsfocus.btnIndex == 0 && tabsfocus.btns.length > 5) {
+  tabsfocus.btnIndex = tabsfocus.btns.findIndex(b => b.id === 5);
+ }
  focusButton(tabsfocus.btnIndex);
 });