Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A preliminary PR for message persistence and notifications #342

Open
wants to merge 1 commit into
base: message-history
Choose a base branch
from
Open

A preliminary PR for message persistence and notifications #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/notification.wav
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions src/components/DeviceSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ import { useAppStore } from "@core/stores/appStore.ts";
import { useDeviceStore } from "@core/stores/deviceStore.ts";
import { Hashicon } from "@emeraldpay/hashicon-react";
import {
BellIcon,
BellOffIcon,
HomeIcon,
LanguagesIcon,
MoonIcon,
PlusIcon,
SearchIcon,
SunIcon,
TerminalIcon,
} from "lucide-react";

export const DeviceSelector = (): JSX.Element => {
Expand All @@ -20,6 +23,8 @@ export const DeviceSelector = (): JSX.Element => {
setSelectedDevice,
darkMode,
setDarkMode,
notifications,
setNotifications,
setCommandPaletteOpen,
setConnectDialogOpen,
} = useAppStore();
Expand Down Expand Up @@ -61,6 +66,13 @@ export const DeviceSelector = (): JSX.Element => {
</ul>
</div>
<div className="flex w-20 flex-col items-center space-y-5 bg-transparent px-5 pb-5">
<button
type="button"
className="transition-all hover:text-accent"
onClick={() => setNotifications(!notifications)}
>
{notifications ? <BellIcon /> : <BellOffIcon />}
</button>
<button
type="button"
className="transition-all hover:text-accent"
Expand Down
6 changes: 4 additions & 2 deletions src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
const { hardware, nodes, metadata } = useDevice();
const myNode = nodes.get(hardware.myNodeNum);
const myMetadata = metadata.get(0);
const { activePage, setActivePage, setDialogOpen } = useDevice();
const { activePage, setActivePage, setDialogOpen, hasUnread } = useDevice();

interface NavLink {
name: string;
Expand Down Expand Up @@ -94,7 +94,8 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
</div>
</div>

<SidebarSection label="Navigation">
<SidebarSection label="Navigation">

{pages.map((link) => (
<SidebarButton
key={link.name}
Expand All @@ -104,6 +105,7 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
setActivePage(link.page);
}}
active={link.page === activePage}
unread={link.name == "Messages" ? hasUnread(null, null) : false}
/>
))}
</SidebarSection>
Expand Down
8 changes: 7 additions & 1 deletion src/components/UI/Sidebar/sidebarButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Button } from "@components/UI/Button.tsx";
import type { LucideIcon } from "lucide-react";
import {LucideMessageSquareDot, type LucideIcon } from "lucide-react";

export interface SidebarButtonProps {
label: string;
active?: boolean;
Icon?: LucideIcon;
element?: JSX.Element;
unread: boolean;
onClick?: () => void;
}

Expand All @@ -14,6 +15,7 @@ export const SidebarButton = ({
active,
Icon,
element,
unread,
onClick,
}: SidebarButtonProps): JSX.Element => (
<Button
Expand All @@ -25,5 +27,9 @@ export const SidebarButton = ({
{Icon && <Icon size={16} />}
{element && element}
{label}
{unread ?
<div className="notifyBadge"><LucideMessageSquareDot size={12} /></div>
: null
}
</Button>
);
10 changes: 10 additions & 0 deletions src/core/stores/appStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ interface AppState {
rasterSources: RasterSource[];
commandPaletteOpen: boolean;
darkMode: boolean;
notifications: boolean;
nodeNumToBeRemoved: number;
accent: AccentColor;
connectDialogOpen: boolean;
Expand All @@ -39,6 +40,7 @@ interface AppState {
removeDevice: (deviceId: number) => void;
setCommandPaletteOpen: (open: boolean) => void;
setDarkMode: (enabled: boolean) => void;
setNotifications: (enabled: boolean) => void;
setNodeNumToBeRemoved: (nodeNum: number) => void;
setAccent: (color: AccentColor) => void;
setConnectDialogOpen: (open: boolean) => void;
Expand All @@ -50,6 +52,7 @@ export const useAppStore = create<AppState>()((set) => ({
currentPage: "messages",
rasterSources: [],
commandPaletteOpen: false,
notifications: true,
darkMode:
localStorage.getItem("theme-dark") !== null
? localStorage.getItem("theme-dark") === "true"
Expand Down Expand Up @@ -106,6 +109,13 @@ export const useAppStore = create<AppState>()((set) => ({
}),
);
},
setNotifications: (enabled: boolean) => {
set(
produce<AppState>((draft) => {
draft.notifications = enabled;
}),
);
},
setNodeNumToBeRemoved: (nodeNum) =>
set((state) => ({
nodeNumToBeRemoved: nodeNum,
Expand Down
166 changes: 154 additions & 12 deletions src/core/stores/deviceStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type Page = "messages" | "map" | "config" | "channels" | "nodes";

export interface MessageWithState extends Types.PacketMetadata<string> {
state: MessageState;
unread: boolean;
}

export type MessageState = "ack" | "waiting" | Protobuf.Mesh.Routing_Error;
Expand Down Expand Up @@ -95,6 +96,8 @@ export interface Device {
setDialogOpen: (dialog: DialogVariant, open: boolean) => void;
processPacket: (data: ProcessPacketParams) => void;
setMessageDraft: (message: string) => void;
hasUnread: (channel: number | null, nodeNum: number | null) => boolean;
markAllRead: (channel: number | null, nodeNum: number | null) => void;
}

export interface DeviceState {
Expand All @@ -112,7 +115,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
remoteDevices: new Map(),

addDevice: (id: number) => {
set(
set(
produce<DeviceState>((draft) => {
draft.devices.set(id, {
id,
Expand Down Expand Up @@ -312,10 +315,10 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
},
setHardware: (hardware: Protobuf.Mesh.MyNodeInfo) => {
set(
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
if (device) {
device.hardware = hardware;
device.hardware = hardware;
}
}),
);
Expand Down Expand Up @@ -392,6 +395,30 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
return;
}
device.channels.set(channel.index, channel);

const messageGroup = device.messages["broadcast"];

let msgJson = localStorage.getItem("msg_" + channel.index)
if (msgJson !== null) {
let storedMsgs = JSON.parse(msgJson)
for (let a = 0; a < storedMsgs.length; a++) {
let message = <MessageWithState>storedMsgs[a]
if (channel.index == 0) {
message.unread = false
}
message.rxTime = new Date(message.rxTime)
message.state = "ack"
let messageIndex = message.channel
let messages = messageGroup.get(messageIndex);
if (messages === undefined) {
messages = [message]
} else {
messages.push(message);
}
messageGroup.set(messageIndex, messages)
}
}

}),
);
},
Expand Down Expand Up @@ -421,6 +448,26 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
return;
}
device.nodes.set(nodeInfo.num, nodeInfo);

const messageGroup = device.messages["direct"];

let msgJson = localStorage.getItem("msg_" + nodeInfo.num)
if (msgJson !== null) {
let storedMsgs = JSON.parse(msgJson)
for (let a = 0; a < storedMsgs.length; a++) {
let message = <MessageWithState>storedMsgs[a]
message.rxTime = new Date(message.rxTime)
message.state = "ack"
let messageIndex = (message.from === device.hardware.myNodeNum) ? message.to : message.from
let messages = messageGroup.get(messageIndex);
if (messages === undefined) {
messages = [message]
} else {
messages.push(message);
}
messageGroup.set(messageIndex, messages)
}
}
}),
);
},
Expand Down Expand Up @@ -474,9 +521,10 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
);
},
addMessage: (message) => {

set(
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
let device = draft.devices.get(id);
if (!device) {
return;
}
Expand All @@ -487,14 +535,19 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
? message.to
: message.from
: message.channel;
const messages = messageGroup.get(messageIndex);
let messages = messageGroup.get(messageIndex);

if (messages) {
messages.push(message);
messageGroup.set(messageIndex, messages);
if (message.from !== device.hardware.myNodeNum) {
message.unread = true;
}

if (messages === undefined) {
messages = [message];
} else {
messageGroup.set(messageIndex, [message]);
messages.push(message);
}
messageGroup.set(messageIndex, messages);
localStorage.setItem("msg_" + messageIndex, JSON.stringify(messages))
}),
);
},
Expand All @@ -513,8 +566,8 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
addTraceRoute: (traceroute) => {
set(
produce<DeviceState>((draft) => {
console.log("addTraceRoute called");
console.log(traceroute);
//console.log("addTraceRoute called");
//console.log(traceroute);
const device = draft.devices.get(id);
if (!device) {
return;
Expand Down Expand Up @@ -632,6 +685,94 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
}),
);
},
hasUnread: (channel: number | null, nodeNum: number | null) => {
const device = get().devices.get(id);

if (device == null) {
return false
}

if (channel == null && nodeNum == null) {
let channelsWithMessages = device.messages["broadcast"]
for (let [channelIndex, messages] of channelsWithMessages) {
for (let msg of messages) {
if (msg.unread) {
return true
}
}
}
channelsWithMessages = device.messages["direct"]
for (let [nodeIndex, messages] of channelsWithMessages) {
for (let msg of messages) {
if (msg.unread) {
return true
}
}
}
}

if (channel !== null) {
const channelsWithMessages = device.messages["broadcast"]
let messages = channelsWithMessages.get(channel)
if (messages == null) {
return false
}
for (let msg of messages) {
if (msg.unread) {
return true
}
}
}

if (nodeNum !== null) {
const channelsWithMessages = device.messages["direct"]
let messages = channelsWithMessages.get(nodeNum)
if (messages == null) {
return false
}
for (let msg of messages) {
if (msg.unread) {
return true
}
}
}

return false
},
markAllRead: (channel: number | null, nodeNum: number | null) => {
set(
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
if (device == null) {
return
}
if (channel !== null) {
const channelsWithMessages = device.messages["broadcast"]
let messages = channelsWithMessages.get(channel)
if (messages == null) {
return
}
for (let msg of messages) {
msg.unread = false
}
channelsWithMessages.set(channel, messages);
localStorage.setItem("msg_" + channel, JSON.stringify(messages))
}
if (nodeNum !== null) {
const directsWithMessages = device.messages["direct"]
let messages = directsWithMessages.get(nodeNum)
if (messages == null) {
return
}
for (let msg of messages) {
msg.unread = false
}
directsWithMessages.set(nodeNum, messages);
localStorage.setItem("msg_" + nodeNum, JSON.stringify(messages))
}
})
)
}
});
}),
);
Expand All @@ -654,6 +795,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
getDevices: () => Array.from(get().devices.values()),

getDevice: (id) => get().devices.get(id),

}));

export const DeviceContext = createContext<Device | undefined>(undefined);
Expand Down
Loading