Big rewrite

- two way encrypted comms in realtime file transfers
- download/upload storage file transfers
- download/upload realtime transfers

docker-compose.yaml

@@ -8,5 +8,5 @@ services:
   signaling-server:
     build: signaling-server
     restart: unless-stopped
-    # ports:
-    #   - 127.0.0.1:9002:8001
+    ports:
+      - 127.0.0.1:9002:8001

signaling-server/index.js

@@ -133,13 +133,16 @@ function handleMessage(conn, message) {
     } else if (data.type == 3) { // candidate
         // console.log("candidate", conn._session.id + " -> " + data.recipientId, data);
         if (!data.candidate) return closeConnWithReason(conn, "[candidate] Didn't specify candidate");
+        if (!data.sessionId) return closeConnWithReason(conn, "[candidate] Didn't specify sessionId");
+        if (!sessions.get(data.sessionId)) return closeConnWithReason(conn, "[candidate] Specified sessionId does not exist")
 
         let recipientConn;
         if ((recipientConn = sessions.get(data.recipientId))) {
             recipientConn.send(JSON.stringify({
                 type: 13, // answer type
                 targetId: data.recipientId,
                 candidate: data.candidate,
+                callerId: data.sessionId
             }));
             return conn.send(JSON.stringify({
                 targetId: data.sessionId, success: true, type: data.type,

web-server/package.json

@@ -6,6 +6,7 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "@zip.js/zip.js": "^2.7.41",
     "bootstrap": "^5.3.2",
     "bootstrap-icons": "^1.11.3",
     "react": "^18.2.0",

web-server/src/App.js

@@ -9,7 +9,7 @@ import IntentDescription from "./components/IntentDescription"
 import AddContactModal from "./components/modals/AddContactModal";
 import Adsense from "./components/Adsense";
 import SideBar from "./components/app/SideBar";
-import { ApiProvider } from "./providers/ApiProvider";
+import { AuthProvider } from "./providers/AuthProvider";
 
 function App() {
   const { setShowContacts } = useContext(ApplicationContext)

web-server/src/api/Api.js

@@ -106,10 +106,12 @@ export async function deleteTransferFile(transferId, fileId) {
 }
 
 export async function getDownload(secretCode) {
+    if(secretCode[0] == "r") throw "can't download a realtime transfer"
     return await get(`/download/${secretCode}`)
 }
 
 export async function downloadAll(secretCode) {
+    if(secretCode[0] == "r") throw "can't download a realtime transfer"
     // return await get(`/transfers/${transferId}/files/${fileId}/download`)
     window.location.href = `${API_URL}/download/${secretCode}/zip`
 }

web-server/src/components/app/FilesList.js

@@ -4,10 +4,10 @@ import { forwardRef, useContext } from "react";
 import { Dropdown } from "react-bootstrap";
 
 import * as Api from "../../api/Api"
-import { ApiContext } from "../../providers/ApiProvider";
+import { AuthContext } from "../../providers/AuthProvider";
 
 export default function FilesList({ files, onFileChange }) {
-    const { refreshTransfers } = useContext(ApiContext)
+    const { refreshTransfers } = useContext(AuthContext)
 
     const CustomToggle = forwardRef(({ children, onClick }, ref) => (
         <button className="btn" ref={ref} onClick={(e) => { e.preventDefault(); onClick(e) }}>
@@ -58,7 +58,7 @@ export default function FilesList({ files, onFileChange }) {
             </tr>
         )
     }
-
+    console.log(files)
     return (
         <div className="FilesList" style={{ maxWidth: "800px" }}>
 

web-server/src/components/app/TransfersList.js

@@ -3,22 +3,22 @@ import { Dropdown } from "react-bootstrap";
 import { Link } from "react-router-dom"
 
 import * as Api from "../../api/Api"
-import { ApiContext } from "../../providers/ApiProvider";
+// import { AuthContext } from "../../providers/AuthProvider";
 
 import { copyTransferLink } from "../../utils"
+import { ApplicationContext } from "../../providers/ApplicationProvider";
 
 export default function TransfersList({ transfers }) {
-    const { refreshTransfers } = useContext(ApiContext)
+    const { removeTransfer } = useContext(ApplicationContext)
 
     const CustomToggle = forwardRef(({ children, onClick }, ref) => (
         <button className="btn" ref={ref} onClick={(e) => { e.preventDefault(); onClick(e) }}>
             <i className="bi bi-three-dots-vertical"></i>
         </button>
     ))
 
-    const onDeleteTransfer = async (transferId) => {
-        await Api.deleteTransfer(transferId)
-        await refreshTransfers()
+    const onDeleteTransfer = (transfer) => {
+        removeTransfer(transfer)
     }
 
     const TransfersListEntry = ({ transfer }) => {
@@ -41,7 +41,7 @@ export default function TransfersList({ transfers }) {
                         <Dropdown.Menu className="text-small shadow">
                             <Dropdown.Item onClick={() => copyTransferLink(transfer)}>Copy link</Dropdown.Item>
                             <Dropdown.Divider></Dropdown.Divider>
-                            <Dropdown.Item className="text-danger" onClick={() => onDeleteTransfer(transfer.id)}>
+                            <Dropdown.Item className="text-danger" onClick={() => onDeleteTransfer(transfer)}>
                                 Delete
                             </Dropdown.Item>
                         </Dropdown.Menu>