@ -1,25 +1,30 @@
import { describe , it , expect , beforeEach , vi } from 'vitest' ; import { beforeEach , describe , expect , it , vi } from "vitest" ;
import { import {
useMessageStore ,
MessageType ,
MessageState ,
getConversationId , getConversationId ,
} from './index.ts' ; MessageState ,
import type { ConversationId , ChannelId , MessageLogMap , Message } from './types.ts' ; MessageType ,
import { Types } from '@meshtastic/core' ; useMessageStore ,
} from "./index.ts" ;
vi . mock ( '../storage/indexDB.ts' , ( ) = > { import type {
let memoryStorage : Record < string , string > = { } ; ChannelId ,
ConversationId ,
Message ,
MessageLogMap ,
} from "./types.ts" ;
import { Types } from "@meshtastic/core" ;
vi . mock ( "../storage/indexDB.ts" , ( ) = > {
const memoryStorage : Record < string , string > = { } ;
return { return {
storageWithMapSupport : { storageWithMapSupport : {
getItem : vi.fn ( async ( name : string ) : Promise < string | null > = > { getItem : vi.fn ( async ( name : string ) : Promise < string | null > = > {
return memoryStorage [ name ] ? ? null ; return await memoryStorage [ name ] ? ? null ;
} ) , } ) ,
setItem : vi.fn ( async ( name : string , value : string ) : Promise < void > = > { setItem : vi.fn ( async ( name : string , value : string ) : Promise < void > = > {
memoryStorage [ name ] = value ; memoryStorage [ name ] = await value ;
} ) , } ) ,
removeItem : vi.fn ( async ( name : string ) : Promise < void > = > { removeItem : vi.fn ( async ( name : string ) : Promise < void > = > {
delete memoryStorage [ name ] ; await delete memoryStorage [ name ] ;
} ) , } ) ,
} , } ,
} ; } ;
@ -38,7 +43,7 @@ const directMessageToOther1: Message = {
date : Date.now ( ) , date : Date.now ( ) ,
messageId : 101 , messageId : 101 ,
state : MessageState.Waiting , state : MessageState.Waiting ,
message : 'Hello other 1 from me' , message : "Hello other 1 from me" ,
} ; } ;
const directMessageFromOther1 : Message = { const directMessageFromOther1 : Message = {
@ -49,7 +54,7 @@ const directMessageFromOther1: Message = {
date : Date.now ( ) + 1000 , date : Date.now ( ) + 1000 ,
messageId : 102 , messageId : 102 ,
state : MessageState.Waiting , state : MessageState.Waiting ,
message : 'Hello me from other 1' , message : "Hello me from other 1" ,
} ; } ;
const directMessageToOther2 : Message = { const directMessageToOther2 : Message = {
@ -60,7 +65,7 @@ const directMessageToOther2: Message = {
date : Date.now ( ) + 2000 , date : Date.now ( ) + 2000 ,
messageId : 103 , messageId : 103 ,
state : MessageState.Waiting , state : MessageState.Waiting ,
message : 'Hello other 2 from me' , message : "Hello other 2 from me" ,
} ; } ;
const broadcastMessage1 : Message = { const broadcastMessage1 : Message = {
@ -71,7 +76,7 @@ const broadcastMessage1: Message = {
date : Date.now ( ) + 3000 , date : Date.now ( ) + 3000 ,
messageId : 201 , messageId : 201 ,
state : MessageState.Waiting , state : MessageState.Waiting ,
message : 'Broadcast message 1' , message : "Broadcast message 1" ,
} ; } ;
const broadcastMessage2 : Message = { const broadcastMessage2 : Message = {
@ -82,10 +87,10 @@ const broadcastMessage2: Message = {
date : Date.now ( ) + 4000 , date : Date.now ( ) + 4000 ,
messageId : 202 , messageId : 202 ,
state : MessageState.Waiting , state : MessageState.Waiting ,
message : 'Broadcast message 2' , message : "Broadcast message 2" ,
} ; } ;
describe ( 'useMessageStore' , ( ) = > { describe ( "useMessageStore" , ( ) = > {
const initialState = useMessageStore . getState ( ) ; const initialState = useMessageStore . getState ( ) ;
beforeEach ( ( ) = > { beforeEach ( ( ) = > {
@ -97,10 +102,9 @@ describe('useMessageStore', () => {
} , } ,
draft : new Map < Types.Destination , string > ( ) , draft : new Map < Types.Destination , string > ( ) ,
} , true ) ; } , true ) ;
} ) ; } ) ;
it ( 'should have correct initial state' , ( ) = > { it ( "should have correct initial state" , ( ) = > {
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
expect ( state . messages . direct ) . toBeInstanceOf ( Map ) ; expect ( state . messages . direct ) . toBeInstanceOf ( Map ) ;
expect ( state . messages . direct . size ) . toBe ( 0 ) ; expect ( state . messages . direct . size ) . toBe ( 0 ) ;
@ -113,23 +117,26 @@ describe('useMessageStore', () => {
expect ( state . chatType ) . toBe ( MessageType . Broadcast ) ; expect ( state . chatType ) . toBe ( MessageType . Broadcast ) ;
} ) ; } ) ;
it ( 'should set nodeNum' , ( ) = > { it ( "should set nodeNum" , ( ) = > {
useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ; useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ;
expect ( useMessageStore . getState ( ) . nodeNum ) . toBe ( myNodeNum ) ; expect ( useMessageStore . getState ( ) . nodeNum ) . toBe ( myNodeNum ) ;
} ) ; } ) ;
it ( 'should set activeChat and chatType' , ( ) = > { it ( "should set activeChat and chatType" , ( ) = > {
useMessageStore . getState ( ) . setActiveChat ( otherNodeNum1 ) ; useMessageStore . getState ( ) . setActiveChat ( otherNodeNum1 ) ;
useMessageStore . getState ( ) . setChatType ( MessageType . Direct ) ; useMessageStore . getState ( ) . setChatType ( MessageType . Direct ) ;
expect ( useMessageStore . getState ( ) . activeChat ) . toBe ( otherNodeNum1 ) ; expect ( useMessageStore . getState ( ) . activeChat ) . toBe ( otherNodeNum1 ) ;
expect ( useMessageStore . getState ( ) . chatType ) . toBe ( MessageType . Direct ) ; expect ( useMessageStore . getState ( ) . chatType ) . toBe ( MessageType . Direct ) ;
} ) ; } ) ;
describe ( 'saveMessage' , ( ) = > { describe ( "saveMessage" , ( ) = > {
it ( 'should save a direct message with correct Map structure' , ( ) = > { it ( "should save a direct message with correct Map structure" , ( ) = > {
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
const conversationId = getConversationId ( directMessageToOther1 . from , directMessageToOther1 . to ) ; const conversationId = getConversationId (
directMessageToOther1 . from ,
directMessageToOther1 . to ,
) ;
// Check if the conversation Map exists
// Check if the conversation Map exists
expect ( state . messages . direct . has ( conversationId ) ) . toBe ( true ) ; expect ( state . messages . direct . has ( conversationId ) ) . toBe ( true ) ;
@ -139,10 +146,12 @@ describe('useMessageStore', () => {
// Check if the message exists within the inner Map
// Check if the message exists within the inner Map
expect ( conversationLog ? . has ( directMessageToOther1 . messageId ) ) . toBe ( true ) ; expect ( conversationLog ? . has ( directMessageToOther1 . messageId ) ) . toBe ( true ) ;
// Check the message content
// Check the message content
expect ( conversationLog ? . get ( directMessageToOther1 . messageId ) ) . toEqual ( directMessageToOther1 ) ; expect ( conversationLog ? . get ( directMessageToOther1 . messageId ) ) . toEqual (
directMessageToOther1 ,
) ;
} ) ; } ) ;
it ( 'should save a broadcast message with correct Map structure' , ( ) = > { it ( "should save a broadcast message with correct Map structure" , ( ) = > {
useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
const channelId = broadcastMessage1 . channel ; const channelId = broadcastMessage1 . channel ;
@ -151,10 +160,12 @@ describe('useMessageStore', () => {
const channelLog = state . messages . broadcast . get ( channelId ) ; const channelLog = state . messages . broadcast . get ( channelId ) ;
expect ( channelLog ) . toBeInstanceOf ( Map ) ; expect ( channelLog ) . toBeInstanceOf ( Map ) ;
expect ( channelLog ? . has ( broadcastMessage1 . messageId ) ) . toBe ( true ) ; expect ( channelLog ? . has ( broadcastMessage1 . messageId ) ) . toBe ( true ) ;
expect ( channelLog ? . get ( broadcastMessage1 . messageId ) ) . toEqual ( broadcastMessage1 ) ; expect ( channelLog ? . get ( broadcastMessage1 . messageId ) ) . toEqual (
broadcastMessage1 ,
) ;
} ) ; } ) ;
it ( 'should save multiple messages correctly' , ( ) = > { it ( "should save multiple messages correctly" , ( ) = > {
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
useMessageStore . getState ( ) . saveMessage ( directMessageFromOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageFromOther1 ) ;
useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ;
@ -162,16 +173,28 @@ describe('useMessageStore', () => {
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
const convId1 = getConversationId ( myNodeNum , otherNodeNum1 ) ; const convId1 = getConversationId ( myNodeNum , otherNodeNum1 ) ;
expect ( state . messages . direct . get ( convId1 ) ? . get ( directMessageToOther1 . messageId ) ) . toEqual ( directMessageToOther1 ) ; expect (
state . messages . direct . get ( convId1 ) ? . get (
expect ( state . messages . direct . get ( convId1 ) ? . get ( directMessageFromOther1 . messageId ) ) . toEqual ( directMessageFromOther1 ) ; directMessageToOther1 . messageId ,
) ,
) . toEqual ( directMessageToOther1 ) ;
expect (
state . messages . direct . get ( convId1 ) ? . get (
directMessageFromOther1 . messageId ,
) ,
) . toEqual ( directMessageFromOther1 ) ;
const channelId = broadcastMessage1 . channel ; const channelId = broadcastMessage1 . channel ;
expect ( state . messages . broadcast . get ( channelId ) ? . get ( broadcastMessage1 . messageId ) ) . toEqual ( broadcastMessage1 ) ; expect (
state . messages . broadcast . get ( channelId ) ? . get (
broadcastMessage1 . messageId ,
) ,
) . toEqual ( broadcastMessage1 ) ;
} ) ; } ) ;
} ) ; } ) ;
describe ( 'getMessages' , ( ) = > { describe ( "getMessages" , ( ) = > {
beforeEach ( ( ) = > { beforeEach ( ( ) = > {
useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ; useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ;
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
@ -181,56 +204,56 @@ describe('useMessageStore', () => {
useMessageStore . getState ( ) . saveMessage ( broadcastMessage2 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage2 ) ;
} ) ; } ) ;
it ( 'should return broadcast messages for a channel, sorted by date' , ( ) = > { it ( "should return broadcast messages for a channel, sorted by date" , ( ) = > {
const messages = useMessageStore . getState ( ) . getMessages ( { const messages = useMessageStore . getState ( ) . getMessages ( {
type : MessageType . Broadcast , type : MessageType . Broadcast ,
channelId : broadcastChannel channelId : broadcastChannel ,
} ) ; } ) ;
expect ( messages ) . toHaveLength ( 2 ) ; expect ( messages ) . toHaveLength ( 2 ) ;
expect ( messages [ 0 ] ) . toEqual ( broadcastMessage1 ) ; expect ( messages [ 0 ] ) . toEqual ( broadcastMessage1 ) ;
expect ( messages [ 1 ] ) . toEqual ( broadcastMessage2 ) ; expect ( messages [ 1 ] ) . toEqual ( broadcastMessage2 ) ;
} ) ; } ) ;
it ( 'should return empty array for broadcast if channel has no messages' , ( ) = > { it ( "should return empty array for broadcast if channel has no messages" , ( ) = > {
const messages = useMessageStore . getState ( ) . getMessages ( { const messages = useMessageStore . getState ( ) . getMessages ( {
type : MessageType . Broadcast , type : MessageType . Broadcast ,
channelId : Types.ChannelNumber.Channel1 channelId : Types.ChannelNumber.Channel1 ,
} ) ; } ) ;
expect ( messages ) . toEqual ( [ ] ) ; expect ( messages ) . toEqual ( [ ] ) ;
} ) ; } ) ;
it ( 'should return combined direct messages for a specific chat pair, sorted by date' , ( ) = > { it ( "should return combined direct messages for a specific chat pair, sorted by date" , ( ) = > {
const messages = useMessageStore . getState ( ) . getMessages ( { const messages = useMessageStore . getState ( ) . getMessages ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
nodeB : otherNodeNum1 nodeB : otherNodeNum1 ,
} ) ; } ) ;
expect ( messages ) . toHaveLength ( 2 ) ; expect ( messages ) . toHaveLength ( 2 ) ;
expect ( messages [ 0 ] ) . toEqual ( directMessageToOther1 ) ; expect ( messages [ 0 ] ) . toEqual ( directMessageToOther1 ) ;
expect ( messages [ 1 ] ) . toEqual ( directMessageFromOther1 ) ; expect ( messages [ 1 ] ) . toEqual ( directMessageFromOther1 ) ;
} ) ; } ) ;
it ( 'should return only relevant direct messages for a different chat pair' , ( ) = > { it ( "should return only relevant direct messages for a different chat pair" , ( ) = > {
const messages = useMessageStore . getState ( ) . getMessages ( { const messages = useMessageStore . getState ( ) . getMessages ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
nodeB : otherNodeNum2 nodeB : otherNodeNum2 ,
} ) ; } ) ;
expect ( messages ) . toHaveLength ( 1 ) ; expect ( messages ) . toHaveLength ( 1 ) ;
expect ( messages [ 0 ] ) . toEqual ( directMessageToOther2 ) ; expect ( messages [ 0 ] ) . toEqual ( directMessageToOther2 ) ;
} ) ; } ) ;
it ( 'should return empty array for direct chat if no messages exist' , ( ) = > { it ( "should return empty array for direct chat if no messages exist" , ( ) = > {
const messages = useMessageStore . getState ( ) . getMessages ( { const messages = useMessageStore . getState ( ) . getMessages ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
nodeB : 999 nodeB : 999 ,
} ) ; } ) ;
expect ( messages ) . toEqual ( [ ] ) ; expect ( messages ) . toEqual ( [ ] ) ;
} ) ; } ) ;
} ) ; } ) ;
describe ( 'setMessageState' , ( ) = > { describe ( "setMessageState" , ( ) = > {
beforeEach ( ( ) = > { beforeEach ( ( ) = > {
useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ; useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ;
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
@ -238,7 +261,7 @@ describe('useMessageStore', () => {
useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ;
} ) ; } ) ;
it ( 'should update state for a direct message' , ( ) = > { it ( "should update state for a direct message" , ( ) = > {
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : directMessageToOther1.from , nodeA : directMessageToOther1.from ,
@ -246,12 +269,17 @@ describe('useMessageStore', () => {
messageId : directMessageToOther1.messageId , messageId : directMessageToOther1.messageId ,
newState : MessageState.Ack , newState : MessageState.Ack ,
} ) ; } ) ;
const conversationId = getConversationId ( directMessageToOther1 . from , directMessageToOther1 . to ) ; const conversationId = getConversationId (
const message = useMessageStore . getState ( ) . messages . direct . get ( conversationId ) ? . get ( directMessageToOther1 . messageId ) ; directMessageToOther1 . from ,
directMessageToOther1 . to ,
) ;
const message = useMessageStore . getState ( ) . messages . direct . get (
conversationId ,
) ? . get ( directMessageToOther1 . messageId ) ;
expect ( message ? . state ) . toBe ( MessageState . Ack ) ; expect ( message ? . state ) . toBe ( MessageState . Ack ) ;
} ) ; } ) ;
it ( 'should update state for another direct message in the same conversation' , ( ) = > { it ( "should update state for another direct message in the same conversation" , ( ) = > {
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : directMessageFromOther1.from , nodeA : directMessageFromOther1.from ,
@ -259,24 +287,31 @@ describe('useMessageStore', () => {
messageId : directMessageFromOther1.messageId , messageId : directMessageFromOther1.messageId ,
newState : MessageState.Failed , newState : MessageState.Failed ,
} ) ; } ) ;
const conversationId = getConversationId ( directMessageFromOther1 . from , directMessageFromOther1 . to ) ; const conversationId = getConversationId (
const message = useMessageStore . getState ( ) . messages . direct . get ( conversationId ) ? . get ( directMessageFromOther1 . messageId ) ; directMessageFromOther1 . from ,
directMessageFromOther1 . to ,
) ;
const message = useMessageStore . getState ( ) . messages . direct . get (
conversationId ,
) ? . get ( directMessageFromOther1 . messageId ) ;
expect ( message ? . state ) . toBe ( MessageState . Failed ) ; expect ( message ? . state ) . toBe ( MessageState . Failed ) ;
} ) ; } ) ;
it ( 'should update state for a broadcast message' , ( ) = > { it ( "should update state for a broadcast message" , ( ) = > {
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Broadcast , type : MessageType . Broadcast ,
channelId : broadcastChannel , channelId : broadcastChannel ,
messageId : broadcastMessage1.messageId , messageId : broadcastMessage1.messageId ,
newState : MessageState.Ack , newState : MessageState.Ack ,
} ) ; } ) ;
const message = useMessageStore . getState ( ) . messages . broadcast . get ( broadcastChannel ) ? . get ( broadcastMessage1 . messageId ) ; const message = useMessageStore . getState ( ) . messages . broadcast . get (
broadcastChannel ,
) ? . get ( broadcastMessage1 . messageId ) ;
expect ( message ? . state ) . toBe ( MessageState . Ack ) ; expect ( message ? . state ) . toBe ( MessageState . Ack ) ;
} ) ; } ) ;
it ( 'should warn if message is not found (direct)' , ( ) = > { it ( "should warn if message is not found (direct)" , ( ) = > {
const warnSpy = vi . spyOn ( console , 'warn' ) . mockImplementation ( ( ) = > { } ) ; const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) = > { } ) ;
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
@ -284,24 +319,32 @@ describe('useMessageStore', () => {
messageId : 999 , messageId : 999 ,
newState : MessageState.Ack , newState : MessageState.Ack ,
} ) ; } ) ;
expect ( warnSpy ) . toHaveBeenCalledWith ( expect . stringContaining ( 'Message or conversation/channel not found for state update' ) ) ; expect ( warnSpy ) . toHaveBeenCalledWith (
expect . stringContaining (
"Message or conversation/channel not found for state update" ,
) ,
) ;
warnSpy . mockRestore ( ) ; warnSpy . mockRestore ( ) ;
} ) ; } ) ;
it ( 'should warn if message is not found (broadcast)' , ( ) = > { it ( "should warn if message is not found (broadcast)" , ( ) = > {
const warnSpy = vi . spyOn ( console , 'warn' ) . mockImplementation ( ( ) = > { } ) ; const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) = > { } ) ;
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Broadcast , type : MessageType . Broadcast ,
channelId : broadcastChannel , channelId : broadcastChannel ,
messageId : 999 , messageId : 999 ,
newState : MessageState.Ack , newState : MessageState.Ack ,
} ) ; } ) ;
expect ( warnSpy ) . toHaveBeenCalledWith ( expect . stringContaining ( 'Message or conversation/channel not found for state update' ) ) ; expect ( warnSpy ) . toHaveBeenCalledWith (
expect . stringContaining (
"Message or conversation/channel not found for state update" ,
) ,
) ;
warnSpy . mockRestore ( ) ; warnSpy . mockRestore ( ) ;
} ) ; } ) ;
it ( 'should warn if conversation/channel is not found' , ( ) = > { it ( "should warn if conversation/channel is not found" , ( ) = > {
const warnSpy = vi . spyOn ( console , 'warn' ) . mockImplementation ( ( ) = > { } ) ; const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) = > { } ) ;
useMessageStore . getState ( ) . setMessageState ( { useMessageStore . getState ( ) . setMessageState ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
@ -309,22 +352,30 @@ describe('useMessageStore', () => {
messageId : 101 , messageId : 101 ,
newState : MessageState.Ack , newState : MessageState.Ack ,
} ) ; } ) ;
expect ( warnSpy ) . toHaveBeenCalledWith ( expect . stringContaining ( 'Message or conversation/channel not found for state update' ) ) ; expect ( warnSpy ) . toHaveBeenCalledWith (
expect . stringContaining (
"Message or conversation/channel not found for state update" ,
) ,
) ;
warnSpy . mockRestore ( ) ; warnSpy . mockRestore ( ) ;
} ) ; } ) ;
} ) ; } ) ;
describe ( 'clearMessageByMessageId' , ( ) = > { describe ( "clearMessageByMessageId" , ( ) = > {
const extraDirectMessageId = 1011 ; const extraDirectMessageId = 1011 ;
beforeEach ( ( ) = > { beforeEach ( ( ) = > {
useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ; useMessageStore . getState ( ) . setNodeNum ( myNodeNum ) ;
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
useMessageStore . getState ( ) . saveMessage ( directMessageFromOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageFromOther1 ) ;
useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ;
useMessageStore . getState ( ) . saveMessage ( { . . . directMessageToOther1 , messageId : extraDirectMessageId , date : Date.now ( ) + 50 } ) ; useMessageStore . getState ( ) . saveMessage ( {
. . . directMessageToOther1 ,
messageId : extraDirectMessageId ,
date : Date.now ( ) + 50 ,
} ) ;
} ) ; } ) ;
it ( 'should delete a specific direct message' , ( ) = > { it ( "should delete a specific direct message" , ( ) = > {
const messageIdToDelete = directMessageToOther1 . messageId ; const messageIdToDelete = directMessageToOther1 . messageId ;
const nodeA = directMessageToOther1 . from ; const nodeA = directMessageToOther1 . from ;
const nodeB = directMessageToOther1 . to ; const nodeB = directMessageToOther1 . to ;
@ -334,19 +385,20 @@ describe('useMessageStore', () => {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : nodeA , nodeA : nodeA ,
nodeB : nodeB , nodeB : nodeB ,
messageId : messageIdToDelete messageId : messageIdToDelete ,
} ) ; } ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
const conversationLog = state . messages . direct . get ( conversationId ) ; const conversationLog = state . messages . direct . get ( conversationId ) ;
expect ( conversationLog ? . has ( messageIdToDelete ) ) . toBe ( false ) ; expect ( conversationLog ? . has ( messageIdToDelete ) ) . toBe ( false ) ;
expect ( conversationLog ? . has ( extraDirectMessageId ) ) . toBe ( true ) ; expect ( conversationLog ? . has ( extraDirectMessageId ) ) . toBe ( true ) ;
expect ( conversationLog ? . has ( directMessageFromOther1 . messageId ) ) . toBe ( true ) ; expect ( conversationLog ? . has ( directMessageFromOther1 . messageId ) ) . toBe (
true ,
) ;
expect ( state . messages . direct . has ( conversationId ) ) . toBe ( true ) ; expect ( state . messages . direct . has ( conversationId ) ) . toBe ( true ) ;
} ) ; } ) ;
it ( 'should delete another specific direct message' , ( ) = > { it ( "should delete another specific direct message" , ( ) = > {
const messageIdToDelete = directMessageFromOther1 . messageId ; const messageIdToDelete = directMessageFromOther1 . messageId ;
const nodeA = directMessageFromOther1 . from ; const nodeA = directMessageFromOther1 . from ;
const nodeB = directMessageFromOther1 . to ; const nodeB = directMessageFromOther1 . to ;
@ -356,7 +408,7 @@ describe('useMessageStore', () => {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : nodeA , nodeA : nodeA ,
nodeB : nodeB , nodeB : nodeB ,
messageId : messageIdToDelete messageId : messageIdToDelete ,
} ) ; } ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
@ -366,38 +418,63 @@ describe('useMessageStore', () => {
expect ( conversationLog ? . has ( extraDirectMessageId ) ) . toBe ( true ) ; expect ( conversationLog ? . has ( extraDirectMessageId ) ) . toBe ( true ) ;
} ) ; } ) ;
it ( "should delete a specific broadcast message" , ( ) = > {
it ( 'should delete a specific broadcast message' , ( ) = > {
const messageIdToDelete = broadcastMessage1 . messageId ; const messageIdToDelete = broadcastMessage1 . messageId ;
const channelId = broadcastMessage1 . channel ; const channelId = broadcastMessage1 . channel ;
useMessageStore . getState ( ) . clearMessageByMessageId ( { useMessageStore . getState ( ) . clearMessageByMessageId ( {
type : MessageType . Broadcast , type : MessageType . Broadcast ,
channelId : channelId , channelId : channelId ,
messageId : messageIdToDelete messageId : messageIdToDelete ,
} ) ; } ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
expect ( state . messages . broadcast . get ( channelId ) ? . get ( messageIdToDelete ) ) . toBeUndefined ( ) ; expect ( state . messages . broadcast . get ( channelId ) ? . get ( messageIdToDelete ) )
. toBeUndefined ( ) ;
} ) ; } ) ;
it ( 'should clean up empty conversation/channel Maps' , ( ) = > { it ( "should clean up empty conversation/channel Maps" , ( ) = > {
const directConvId = getConversationId ( directMessageFromOther1 . from , directMessageFromOther1 . to ) ; const directConvId = getConversationId (
directMessageFromOther1 . from ,
directMessageFromOther1 . to ,
) ;
const broadcastChanId = broadcastMessage1 . channel ; const broadcastChanId = broadcastMessage1 . channel ;
useMessageStore . getState ( ) . clearMessageByMessageId ( { type : MessageType . Direct , nodeA : directMessageToOther1.from , nodeB : directMessageToOther1.to , messageId : directMessageToOther1.messageId } ) ; useMessageStore . getState ( ) . clearMessageByMessageId ( {
useMessageStore . getState ( ) . clearMessageByMessageId ( { type : MessageType . Direct , nodeA : directMessageFromOther1.from , nodeB : directMessageFromOther1.to , messageId : directMessageFromOther1.messageId } ) ; type : MessageType . Direct ,
useMessageStore . getState ( ) . clearMessageByMessageId ( { type : MessageType . Direct , nodeA : directMessageToOther1.from , nodeB : directMessageToOther1.to , messageId : extraDirectMessageId } ) ; nodeA : directMessageToOther1.from ,
nodeB : directMessageToOther1.to ,
messageId : directMessageToOther1.messageId ,
} ) ;
useMessageStore . getState ( ) . clearMessageByMessageId ( {
type : MessageType . Direct ,
nodeA : directMessageFromOther1.from ,
nodeB : directMessageFromOther1.to ,
messageId : directMessageFromOther1.messageId ,
} ) ;
useMessageStore . getState ( ) . clearMessageByMessageId ( {
type : MessageType . Direct ,
nodeA : directMessageToOther1.from ,
nodeB : directMessageToOther1.to ,
messageId : extraDirectMessageId ,
} ) ;
expect ( useMessageStore . getState ( ) . messages . direct . has ( directConvId ) ) . toBe ( false ) ; expect ( useMessageStore . getState ( ) . messages . direct . has ( directConvId ) ) . toBe (
false ,
) ;
useMessageStore . getState ( ) . clearMessageByMessageId ( { type : MessageType . Broadcast , channelId : broadcastChanId , messageId : broadcastMessage1.messageId } ) ; useMessageStore . getState ( ) . clearMessageByMessageId ( {
type : MessageType . Broadcast ,
channelId : broadcastChanId ,
messageId : broadcastMessage1.messageId ,
} ) ;
expect ( useMessageStore . getState ( ) . messages . broadcast . has ( broadcastChanId ) ) . toBe ( false ) ; expect ( useMessageStore . getState ( ) . messages . broadcast . has ( broadcastChanId ) )
. toBe ( false ) ;
} ) ; } ) ;
it ( 'should not error when trying to delete non-existent message' , ( ) = > { it ( "should not error when trying to delete non-existent message" , ( ) = > {
const warnSpy = vi . spyOn ( console , 'warn' ) . mockImplementation ( ( ) = > { } ) ; const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) = > { } ) ;
const conversationId = getConversationId ( myNodeNum , otherNodeNum1 ) ; const conversationId = getConversationId ( myNodeNum , otherNodeNum1 ) ;
expect ( ( ) = > { expect ( ( ) = > {
@ -405,30 +482,34 @@ describe('useMessageStore', () => {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
nodeB : otherNodeNum1 , nodeB : otherNodeNum1 ,
messageId : 9999 messageId : 9999 ,
} ) ; } ) ;
} ) . not . toThrow ( ) ; } ) . not . toThrow ( ) ;
const state = useMessageStore . getState ( ) ; const state = useMessageStore . getState ( ) ;
const conversationLog = state . messages . direct . get ( conversationId ) ; const conversationLog = state . messages . direct . get ( conversationId ) ;
expect ( conversationLog ? . size ) . toBe ( 3 ) ; // 101, 102, 1011
expect ( conversationLog ? . size ) . toBe ( 3 ) ; // 101, 102, 1011
expect ( warnSpy ) . toHaveBeenCalledWith ( expect . stringContaining ( 'not found in direct chat' ) ) ; expect ( warnSpy ) . toHaveBeenCalledWith (
expect . stringContaining ( "not found in direct chat" ) ,
) ;
warnSpy . mockRestore ( ) ; warnSpy . mockRestore ( ) ;
} ) ; } ) ;
it ( 'should not error when trying to delete from non-existent conversation/channel' , ( ) = > { it ( "should not error when trying to delete from non-existent conversation/channel" , ( ) = > {
const warnSpy = vi . spyOn ( console , 'warn' ) . mockImplementation ( ( ) = > { } ) ; const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) = > { } ) ;
expect ( ( ) = > { expect ( ( ) = > {
useMessageStore . getState ( ) . clearMessageByMessageId ( { useMessageStore . getState ( ) . clearMessageByMessageId ( {
type : MessageType . Direct , type : MessageType . Direct ,
nodeA : myNodeNum , nodeA : myNodeNum ,
nodeB : 9998 , nodeB : 9998 ,
messageId : 101 messageId : 101 ,
} ) ; } ) ;
} ) . not . toThrow ( ) ; } ) . not . toThrow ( ) ;
expect ( warnSpy ) . toHaveBeenCalledWith ( expect . stringContaining ( "Message entry" ) ) ; expect ( warnSpy ) . toHaveBeenCalledWith (
expect . stringContaining ( "Message entry" ) ,
) ;
expect ( warnSpy ) . toHaveBeenCalledTimes ( 1 ) ; expect ( warnSpy ) . toHaveBeenCalledTimes ( 1 ) ;
@ -436,43 +517,54 @@ describe('useMessageStore', () => {
} ) ; } ) ;
} ) ; } ) ;
describe ( 'Drafts' , ( ) = > { describe ( "Drafts" , ( ) = > {
const draftKeyDirect = otherNodeNum1 ; const draftKeyDirect = otherNodeNum1 ;
const draftKeyBroadcast = broadcastChannel ; const draftKeyBroadcast = broadcastChannel ;
const draftMessage = 'This is a draft' ; const draftMessage = "This is a draft" ;
it ( 'should set and get a draft for direct chat' , ( ) = > { it ( "should set and get a draft for direct chat" , ( ) = > {
useMessageStore . getState ( ) . setDraft ( draftKeyDirect , draftMessage ) ; useMessageStore . getState ( ) . setDraft ( draftKeyDirect , draftMessage ) ;
expect ( useMessageStore . getState ( ) . draft . get ( draftKeyDirect ) ) . toBe ( draftMessage ) ; expect ( useMessageStore . getState ( ) . draft . get ( draftKeyDirect ) ) . toBe (
expect ( useMessageStore . getState ( ) . getDraft ( draftKeyDirect ) ) . toBe ( draftMessage ) ; draftMessage ,
) ;
expect ( useMessageStore . getState ( ) . getDraft ( draftKeyDirect ) ) . toBe (
draftMessage ,
) ;
} ) ; } ) ;
it ( 'should set and get a draft for broadcast chat' , ( ) = > { it ( "should set and get a draft for broadcast chat" , ( ) = > {
useMessageStore . getState ( ) . setDraft ( draftKeyBroadcast , draftMessage ) ; useMessageStore . getState ( ) . setDraft ( draftKeyBroadcast , draftMessage ) ;
expect ( useMessageStore . getState ( ) . draft . get ( draftKeyBroadcast ) ) . toBe ( draftMessage ) ; expect ( useMessageStore . getState ( ) . draft . get ( draftKeyBroadcast ) ) . toBe (
expect ( useMessageStore . getState ( ) . getDraft ( draftKeyBroadcast ) ) . toBe ( draftMessage ) ; draftMessage ,
) ;
expect ( useMessageStore . getState ( ) . getDraft ( draftKeyBroadcast ) ) . toBe (
draftMessage ,
) ;
} ) ; } ) ;
it ( 'should return empty string for non-existent draft' , ( ) = > { it ( "should return empty string for non-existent draft" , ( ) = > {
expect ( useMessageStore . getState ( ) . getDraft ( 999 ) ) . toBe ( '' ) ; expect ( useMessageStore . getState ( ) . getDraft ( 999 ) ) . toBe ( "" ) ;
} ) ; } ) ;
it ( 'should clear a draft' , ( ) = > { it ( "should clear a draft" , ( ) = > {
useMessageStore . getState ( ) . setDraft ( draftKeyDirect , draftMessage ) ; useMessageStore . getState ( ) . setDraft ( draftKeyDirect , draftMessage ) ;
expect ( useMessageStore . getState ( ) . draft . has ( draftKeyDirect ) ) . toBe ( true ) ; expect ( useMessageStore . getState ( ) . draft . has ( draftKeyDirect ) ) . toBe ( true ) ;
useMessageStore . getState ( ) . clearDraft ( draftKeyDirect ) ; useMessageStore . getState ( ) . clearDraft ( draftKeyDirect ) ;
expect ( useMessageStore . getState ( ) . draft . has ( draftKeyDirect ) ) . toBe ( false ) ; expect ( useMessageStore . getState ( ) . draft . has ( draftKeyDirect ) ) . toBe ( false ) ;
expect ( useMessageStore . getState ( ) . getDraft ( draftKeyDirect ) ) . toBe ( '' ) ; expect ( useMessageStore . getState ( ) . getDraft ( draftKeyDirect ) ) . toBe ( "" ) ;
} ) ; } ) ;
} ) ; } ) ;
describe ( 'deleteAllMessages' , ( ) = > { describe ( "deleteAllMessages" , ( ) = > {
it ( 'should clear all direct and broadcast messages, leaving empty Maps' , ( ) = > { it ( "should clear all direct and broadcast messages, leaving empty Maps" , ( ) = > {
useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ; useMessageStore . getState ( ) . saveMessage ( directMessageToOther1 ) ;
useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ; useMessageStore . getState ( ) . saveMessage ( broadcastMessage1 ) ;
expect ( useMessageStore . getState ( ) . messages . direct . size ) . toBeGreaterThan ( 0 ) ; expect ( useMessageStore . getState ( ) . messages . direct . size ) . toBeGreaterThan (
expect ( useMessageStore . getState ( ) . messages . broadcast . size ) . toBeGreaterThan ( 0 ) ; 0 ,
) ;
expect ( useMessageStore . getState ( ) . messages . broadcast . size )
. toBeGreaterThan ( 0 ) ;
useMessageStore . getState ( ) . deleteAllMessages ( ) ; useMessageStore . getState ( ) . deleteAllMessages ( ) ;
@ -483,4 +575,4 @@ describe('useMessageStore', () => {
expect ( state . messages . broadcast . size ) . toBe ( 0 ) ; expect ( state . messages . broadcast . size ) . toBe ( 0 ) ;
} ) ; } ) ;
} ) ; } ) ;
} ) ; } ) ;
Dan Ditomaso
1 year ago
GitHub