From 8d53041aafa32e2ebca4c6b27bd018d75d59af12 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Thu, 11 Jul 2024 01:18:34 +0200 Subject: [PATCH] implement outbox for items --- bun.lockb | Bin 11435 -> 11435 bytes dist/index.js | 11 +++++++++++ package.json | 2 +- src/Model/chatModel.ts | 7 +++++++ src/utility.ts | 4 ++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/bun.lockb b/bun.lockb index 6c715ad7a80084ba987d14ae2cc9a5562057f993..ba1e0d010ae927894ccc6ef5f54676f264f1abe5 100755 GIT binary patch delta 137 zcmV;40CxYYS*ux)E+C_ExWNhU%NzQgm_@n6#Zu-@uBHUwU_g}_<+h^|i(j!$+6Vyz zlTiXEvrq|b3qazTZ<0ZR2u{KnlOHwSt*0zj^eTZ#A2B$>|8mLXp1_oJrp~>TgP;@N rALQYCb3ag+qrfkNtlMKSkzI#t@*A`L6bcFfGqVUE$P58AlhG^Mqr5;1 delta 137 zcmV;40CxYYS*ux)E+9^-^g;^Jkh`;b9XMv&>zDmu=X2AJ@T1nA1ha<79!IfG+6Vyy zlTiXEvrq|b3qWl%nr?Gz3GnBNiLCm~z;8WCjFy!nR!R!_kQZfi{Ar}CQfLHe3SBdw rO`ZuLCLb+{2Ci6Qyqu2%`5bTps93Z86bcFfGP4LD$P589lhG^MM0Gp1 diff --git a/dist/index.js b/dist/index.js index 5535c79f..3d509265 100644 --- a/dist/index.js +++ b/dist/index.js @@ -132,6 +132,7 @@ } // list set(key, item) { + this.remove(key); this.value.set(key, item); this.additionHandlers.forEach((handler) => handler(item)); this.callSubscriptions(); @@ -404,6 +405,9 @@ outbox(id) { return id + "outbox"; }, + itemOutbox(id) { + return id + "item-outbox"; + }, composingMessage(id) { return id + "composing-message"; } @@ -420,6 +424,7 @@ messages; items; outbox; + itemOutbox; isOutBoxEmpty; composingMessage; primaryChannelInput; @@ -448,6 +453,7 @@ this.messages = restoreListState(storageKeys.messages(id)); this.items = restoreMapState(storageKeys.items(id)); this.outbox = restoreListState(storageKeys.outbox(id)); + this.itemOutbox = restoreListState(storageKeys.itemOutbox(id)); this.isOutBoxEmpty = createProxyState( [this.outbox], () => this.outbox.value.size == 0 @@ -563,6 +569,7 @@ const messageString = JSON.stringify(chatMessage); UDN.sendMessage(chatMessage.channel, messageString); } else { + if (chatMessage.itemData) return this.itemOutbox.add(chatMessage); this.outbox.add(chatMessage); } }; @@ -571,6 +578,10 @@ this.sendMessage(message); this.outbox.remove(message); }); + this.itemOutbox.value.forEach((message) => { + this.sendMessage(message); + this.itemOutbox.remove(message); + }); }; clearMessages = () => { this.messages.clear(); diff --git a/package.json b/package.json index 27152464..aba530a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "bloatless-react": "^1.3.3", + "bloatless-react": "^1.3.4", "esbuild": "latest", "udn-frontend": "^1.0.7-beta1" }, diff --git a/src/Model/chatModel.ts b/src/Model/chatModel.ts index 551947f5..b553c92c 100644 --- a/src/Model/chatModel.ts +++ b/src/Model/chatModel.ts @@ -48,6 +48,7 @@ export class Chat { messages: React.ListState; items: React.MapState; outbox: React.ListState; + itemOutbox: React.ListState; isOutBoxEmpty: React.State; composingMessage: React.State; @@ -83,6 +84,7 @@ export class Chat { this.messages = React.restoreListState(storageKeys.messages(id)); this.items = React.restoreMapState(storageKeys.items(id)); this.outbox = React.restoreListState(storageKeys.outbox(id)); + this.itemOutbox = React.restoreListState(storageKeys.itemOutbox(id)); this.isOutBoxEmpty = React.createProxyState( [this.outbox], () => this.outbox.value.size == 0 @@ -236,6 +238,7 @@ export class Chat { const messageString = JSON.stringify(chatMessage); UDN.sendMessage(chatMessage.channel, messageString); } else { + if (chatMessage.itemData) return this.itemOutbox.add(chatMessage); this.outbox.add(chatMessage); } }; @@ -245,6 +248,10 @@ export class Chat { this.sendMessage(message); this.outbox.remove(message); }); + this.itemOutbox.value.forEach((message) => { + this.sendMessage(message); + this.itemOutbox.remove(message); + }); }; clearMessages = (): void => { diff --git a/src/utility.ts b/src/utility.ts index 8e71f43e..249ed8cb 100644 --- a/src/utility.ts +++ b/src/utility.ts @@ -27,6 +27,10 @@ export const storageKeys = { return id + "outbox"; }, + itemOutbox(id: string): string { + return id + "item-outbox"; + }, + composingMessage(id: string): string { return id + "composing-message"; },