reimplemented vc logic from scratch, Should hopefully be more stable 🤞

src/chat-api/events/connectionEvents.ts

@@ -210,8 +210,8 @@ export const onAuthenticated = (payload: AuthenticatedPayload) => {
  }
 
  for (let i = 0; i < payload.voiceChannelUsers.length; i++) {
- const voiceChannelUser = payload.voiceChannelUsers[i];
- voiceUsers.set(voiceChannelUser);
+ const voiceChannelUser = payload.voiceChannelUsers[i]!;
+ voiceUsers.createVoiceUser(voiceChannelUser);
  }
  });
 

src/chat-api/events/serverEvents.ts

@@ -60,8 +60,8 @@ export const onServerJoined = (payload: ServerJoinedPayload) => {
  users.setPresence(presence.userId, presence);
  }
  for (let i = 0; i < payload.voiceChannelUsers.length; i++) {
- const rawVoice = payload.voiceChannelUsers[i];
- voiceUsers.set(rawVoice);
+ const rawVoice = payload.voiceChannelUsers[i]!;
+ voiceUsers.createVoiceUser(rawVoice);
  }
  });
 };
@@ -75,7 +75,7 @@ export const onServerLeft = (payload: { serverId: string }) =>
  const roles = useServerRoles();
  const voiceUsers = useVoiceUsers();
 
- const currentVoiceChannelId = voiceUsers.currentVoiceChannelId();
+ const currentVoiceChannelId = voiceUsers.currentUser()?.channelId;
 
  const serverChannels = channels.getChannelsByServerId(payload.serverId);
 
@@ -90,7 +90,7 @@ export const onServerLeft = (payload: { serverId: string }) =>
  const channel = serverChannels[i]!;
  account.removeNotificationSettings(channel.id);
  if (currentVoiceChannelId === channel.id) {
- voiceUsers.setCurrentVoiceChannelId(null);
+ voiceUsers.setCurrentChannelId(null);
  }
  }
  });

src/chat-api/events/voiceEvents.ts

@@ -4,19 +4,19 @@ import useAccount from "../store/useAccount";
 import useVoiceUsers from "../store/useVoiceUsers";
 
 export function onVoiceUserJoined(payload: RawVoice) {
- const {set} = useVoiceUsers();
+ const {createVoiceUser} = useVoiceUsers();
 
- set(payload);
+ createVoiceUser(payload);
 }
 export function onVoiceUserLeft(payload: {userId: string, channelId: string}) {
- const {removeUserInVoice, setCurrentVoiceChannelId} = useVoiceUsers();
+ const {removeVoiceUser, setCurrentChannelId} = useVoiceUsers();
  const {user} = useAccount();
 
  if (user()?.id === payload.userId) {
- setCurrentVoiceChannelId(null);
+ setCurrentChannelId(null);
  }
 
- removeUserInVoice(payload.channelId, payload.userId);
+ removeVoiceUser(payload.channelId, payload.userId);
 }
 
 interface VoiceSignalReceivedPayload {
@@ -31,8 +31,8 @@ export function onVoiceSignalReceived(payload: VoiceSignalReceivedPayload) {
  if (!voiceUser) return;
 
  if (!voiceUser.peer) {
- return voiceUser.addPeer(payload.signal);
+ return voiceUsers.createPeer(voiceUser, payload.signal);
  }
 
- voiceUser.addSignal(payload.signal);
+ voiceUsers.signal(voiceUser, payload.signal);
 }

src/chat-api/services/VoiceService.ts

@@ -28,6 +28,9 @@ const lastCredentials = {
  generatedAt: null as null | number,
  result: null as null | any
 };
+
+
+export const getCachedCredentials = () => lastCredentials.result;
 export const postGenerateCredential = async () => {
  if (lastCredentials.generatedAt) {
  const diff = Date.now() - lastCredentials.generatedAt;

src/chat-api/store/useAccount.ts

@@ -114,6 +114,9 @@ const updateUserNotificationSettings = (opts: {serverId?: string, channelId?: st
 };
 
 
+const isMe = (userId: string) => account.user && account.user.id === userId;
+
+
 export default function useAccount() {
  return {
  user,
@@ -129,6 +132,7 @@ export default function useAccount() {
  updateUserNotificationSettings,
  removeNotificationSettings,
  hasModeratorPerm,
- lastAuthenticatedAt
+ lastAuthenticatedAt,
+ isMe
  };
 }

src/chat-api/store/useChannels.ts

@@ -109,17 +109,18 @@ function recipient(this: Channel) {
  return users.get(this.recipientId!);
 }
 
+
 async function joinCall(this: Channel) {
- const { setCurrentVoiceChannelId } = useVoiceUsers();
+ const { setCurrentChannelId } = useVoiceUsers();
  await postGenerateCredential();
  postJoinVoice(this.id, socketClient.id()!).then(() => {
- setCurrentVoiceChannelId(this.id);
+ setCurrentChannelId(this.id);
  });
 }
 function leaveCall(this: Channel) {
- const { setCurrentVoiceChannelId } = useVoiceUsers();
+ const { setCurrentChannelId } = useVoiceUsers();
  postLeaveVoice(this.id).then(() => {
- setCurrentVoiceChannelId(null);
+ setCurrentChannelId(null);
  });
 }
 function update(this: Channel, update: Partial<RawChannel>) {
@@ -154,7 +155,7 @@ const deleteChannel = (channelId: string, serverId?: string) =>
  runWithContext(() => {
  const messages = useMessages();
  const voice = useVoiceUsers();
- const voiceChannelId = voice.currentVoiceChannelId();
+ const voiceChannelId = voice.currentUser();
 
  if (serverId) {
  const servers = useServers();
@@ -172,7 +173,7 @@ const deleteChannel = (channelId: string, serverId?: string) =>
 
  batch(() => {
  if (voiceChannelId && voiceChannelId === channelId) {
- voice.setCurrentVoiceChannelId(null);
+ voice.setCurrentChannelId(null);
  }
 
  messages.deleteChannelMessages(channelId);

src/chat-api/store/useServerMembers.ts

@@ -164,7 +164,7 @@ const remove = (serverId: string, userId: string) => {
  if (voiceChannelId) {
  const channel = channels.get(voiceChannelId);
  if (serverId === channel?.serverId) {
- voiceUsers.removeUserInVoice(voiceChannelId, userId);
+ voiceUsers.removeVoiceUser(voiceChannelId, userId);
  }
  }