{
- setChannel(uid);
+ setChannel(uid, type);
}}
ref={ref}
>
-
+ {(type === 'text') ? (
+
+ ) : ((type === 'voice') ? (
+
+ ) : (
+
+ ))}
{}}>Delete */}
+
+ {participants.map(participant => (
+
+ {participant.clientId}
+
+ ))}
)
}
\ No newline at end of file
diff --git a/packages/renderer/src/pages/Channels.tsx b/packages/renderer/src/pages/Channels.tsx
index b6044e7..efc5dea 100644
--- a/packages/renderer/src/pages/Channels.tsx
+++ b/packages/renderer/src/pages/Channels.tsx
@@ -10,10 +10,12 @@ import useChannel from '../hooks/useChannel';
import useClientId from '../hooks/useClientId';
import useHomeServer from '../contexts/PersistentState/useHomeServerNative';
import Channel from './Channel';
+import { ChannelType } from '../contexts/EphemeralState/EphemeralState';
interface IChannel {
uid: string;
name: string;
+ type: ChannelType;
}
interface IUnreads {
@@ -25,12 +27,12 @@ export default function Channels() {
const [channels, setChannels] = useState
([]);
const [unreads, setUnreads] = useState({});
- const { channel, setChannel } = useChannel()
- const { clientId } = useClientId()
+ const { channel, setChannel } = useChannel();
+ const { clientId } = useClientId();
const { send } = useApi({
- 'channels:list'(data: IChannel[]) {
- setChannels(data);
+ 'channels:list'(data: any) {
+ setChannels(data.channels);
},
'channel:add'(channel: IChannel) {
setChannels([...channels, channel]);
@@ -53,7 +55,7 @@ export default function Channels() {
useEffect(() => {
if(channels.length === 0) return;
if(channel !== null) return;
- setChannel(channels[0].uid);
+ setChannel(channels[1].uid, channels[1].type);
}, [channel, channels]);
useEffect(() => {
@@ -66,7 +68,7 @@ export default function Channels() {
useEffect(() => {
if(clientId === null) return;
- send('client:get', { clientId });
+ // send('client:get', { clientId });
}, [clientId]);
const textbox = useRef(null);
@@ -90,6 +92,7 @@ export default function Channels() {
diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js
index 373eee1..0904de6 100644
--- a/packages/renderer/vite.config.js
+++ b/packages/renderer/vite.config.js
@@ -21,6 +21,7 @@ const config = {
},
base: '',
server: {
+ host: true,
fs: {
strict: true,
},
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 1ddb084..296b4d2 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1,5 +1,5 @@
import router from './lib/router';
-import { expose } from './lib/WebSocketServer';
+import { expose, reply } from './lib/WebSocketServer';
import message from './routers/message';
import channel from './routers/channel';
@@ -8,7 +8,9 @@ import totp from './routers/totp';
const api = router({
up() {
- console.log(Date.now());
+ return reply({
+ time: Date.now()
+ });
},
message: message,
messages: message,
@@ -19,6 +21,7 @@ const api = router({
totp: totp,
session: session,
sessions: session,
+ voice: voice
});
expose(api, 3000);
@@ -27,6 +30,7 @@ expose(api, 3000);
import { update } from './db/migrate';
import session from './routers/session';
+import voice from './routers/voice';
try {
update();
diff --git a/packages/server/src/lib/get/clientId/by/username.ts b/packages/server/src/lib/get/clientId/by/username.ts
new file mode 100644
index 0000000..e69de29
diff --git a/packages/server/src/lib/get/displayName/by/clientId.ts b/packages/server/src/lib/get/displayName/by/clientId.ts
new file mode 100644
index 0000000..e69de29
diff --git a/packages/server/src/lib/get/totpKey/by/clientId.ts b/packages/server/src/lib/get/totpKey/by/clientId.ts
new file mode 100644
index 0000000..e69de29
diff --git a/packages/server/src/routers/channel.ts b/packages/server/src/routers/channel.ts
index b7bd4ce..728f107 100644
--- a/packages/server/src/routers/channel.ts
+++ b/packages/server/src/routers/channel.ts
@@ -5,10 +5,21 @@ import add from '../db/snippets/channel/new.sql';
import { broadcast, reply } from '../lib/WebSocketServer';
import { v4 } from 'uuid';
+export const mockVoiceChannels = [
+ {
+ uid: v4(),
+ name: 'Voice Test',
+ type: 'voice'
+ }
+]
+
export default router({
async list() {
const res = await query(list);
- return reply(res ?? undefined);
+ if(res === null) return;
+ return reply({
+ channels: [...(res.map(v => ({...v, type: 'text'}))), ...mockVoiceChannels]
+ });
},
async add(channel: any) {
const name = channel.name;
diff --git a/packages/server/src/routers/voice.ts b/packages/server/src/routers/voice.ts
new file mode 100644
index 0000000..c89cc3a
--- /dev/null
+++ b/packages/server/src/routers/voice.ts
@@ -0,0 +1,62 @@
+import router from "../lib/router";
+import { broadcast, reply } from "../lib/WebSocketServer";
+
+function filterInPlace(a: T[], condition: (v: T, i: number, a: T[]) => boolean) {
+ let i = 0, j = 0;
+
+ let copy = [...a];
+ let removed = [];
+
+ while (i < a.length) {
+ const val = a[i];
+ if (condition(val, i, copy)) a[j++] = val;
+ else removed.push(val);
+ i++;
+ }
+
+ a.length = j;
+ return removed;
+}
+
+interface ClientChannelRelationship {
+ clientId: string;
+ channelId: string;
+ peerId: string;
+}
+
+const participants: ClientChannelRelationship[] = [];
+
+export default router({
+ async join(data: any) {
+ const { $clientId, channelId, peerId } = data;
+ // TODO validate channel exists
+ if(participants
+ .filter(v => v.clientId === $clientId)
+ .length !== 0) {
+ // TODO REMOVE USER FROM THIS PLACE
+ }
+
+ const user_channel = {
+ clientId: $clientId,
+ peerId,
+ channelId
+ };
+
+ participants.push(user_channel);
+
+ return broadcast(user_channel)
+ },
+ async list(data: any) {
+ const { uid } = data;
+ return reply({
+ uid,
+ participants: participants.filter(v => uid === v.channelId)
+ });
+ },
+ async leave(data: any) {
+ const { $clientId } = data;
+ const removed = filterInPlace(participants, (v) => v.clientId !== $clientId);
+ console.log('removed', removed);
+ return broadcast(removed[0]);
+ },
+})
\ No newline at end of file
diff --git a/rtc-test/EventEmitter.mjs b/rtc-test/EventEmitter.mjs
new file mode 100644
index 0000000..e69de29
diff --git a/rtc-test/index.html b/rtc-test/index.html
index c428d6d..a64843d 100644
--- a/rtc-test/index.html
+++ b/rtc-test/index.html
@@ -8,11 +8,31 @@
#tracks {
display: grid;
grid-template-columns: 1fr 1fr;
- grid-auto-flow: column;
+ grid-auto-flow: row;
+ }
+ #tracks fieldset {
+ width: '50%'
}
+
+
-
-
-
-