Fix compilation error caused by wrong WebSocket message type for SDP
This fixes an error introduced in https://review.jami.net/c/jami-web/+/23075.
Changes:
- Replace WebSocketRTCOffer and WebSocketRTCAnswer imports with WebRTCSDP
- Group all WebSocket interfaces in one file
Change-Id: Ie49aabc34647a5bb9cd983e6ae4e1b691cee6040
diff --git a/common/src/interfaces/conversation-view.ts b/common/src/interfaces/conversation-view.ts
deleted file mode 100644
index cc4a038..0000000
--- a/common/src/interfaces/conversation-view.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 Savoir-faire Linux Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see
- * <https://www.gnu.org/licenses/>.
- */
-export interface ConversationView {
- accountId: string;
- conversationId: string;
-}
diff --git a/common/src/interfaces/webrtc-ice-candidate.ts b/common/src/interfaces/webrtc-ice-candidate.ts
deleted file mode 100644
index 9a64465..0000000
--- a/common/src/interfaces/webrtc-ice-candidate.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2022 Savoir-faire Linux Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see
- * <https://www.gnu.org/licenses/>.
- */
-export interface WebRTCIceCandidate {
- candidate: RTCIceCandidate;
-}
diff --git a/common/src/interfaces/webrtc-sdp.ts b/common/src/interfaces/webrtc-sdp.ts
deleted file mode 100644
index cd75fbb..0000000
--- a/common/src/interfaces/webrtc-sdp.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2022 Savoir-faire Linux Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see
- * <https://www.gnu.org/licenses/>.
- */
-export interface WebRTCSDP {
- sdp: RTCSessionDescriptionInit;
-}
diff --git a/common/src/interfaces/conversation-message.ts b/common/src/interfaces/websocket-interfaces.ts
similarity index 79%
rename from common/src/interfaces/conversation-message.ts
rename to common/src/interfaces/websocket-interfaces.ts
index e921a28..cfbefb2 100644
--- a/common/src/interfaces/conversation-message.ts
+++ b/common/src/interfaces/websocket-interfaces.ts
@@ -21,3 +21,16 @@
conversationId: string;
message: Message;
}
+
+export interface ConversationView {
+ accountId: string;
+ conversationId: string;
+}
+
+export interface WebRTCSDP {
+ sdp: RTCSessionDescriptionInit;
+}
+
+export interface WebRTCIceCandidate {
+ candidate: RTCIceCandidate;
+}
diff --git a/common/src/interfaces/websocket-message.ts b/common/src/interfaces/websocket-message.ts
index f94c20f..829e0da 100644
--- a/common/src/interfaces/websocket-message.ts
+++ b/common/src/interfaces/websocket-message.ts
@@ -17,10 +17,7 @@
*/
import { WebSocketMessageType } from '../enums/websocket-message-type.js';
import { AccountTextMessage } from './account-text-message.js';
-import { ConversationMessage } from './conversation-message.js';
-import { ConversationView } from './conversation-view.js';
-import { WebRTCIceCandidate } from './webrtc-ice-candidate.js';
-import { WebRTCSDP } from './webrtc-sdp.js';
+import { ConversationMessage, ConversationView, WebRTCIceCandidate, WebRTCSDP } from './websocket-interfaces.js';
export interface WebSocketMessageTable {
[WebSocketMessageType.ConversationMessage]: ConversationMessage;