mercuryworkshop-mirror/adrift
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/adrift.git synced 2025-05-12 22:00:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

split server into dev and cli

Browse source
This commit is contained in:
CoolElectronics 2023-08-15 21:07:49 -04:00
parent 9ec17943c2
commit ee8ae5a3f8
No known key found for this signature in database
GPG key ID: F63593D168636C50
5 changed files with 96 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/App.svelte
View file

@ -105,7 +105,7 @@
const { answer, candidates } = data;
connectionState = "Linking to node...";
await new Promise((r) => {
setTimeout(r, 500);
setTimeout(r, 1000);
});
rtctransport?.answer(answer, candidates);
}

4
server/package.json
View file

@ -4,8 +4,8 @@
"description": "",
"main": "src/main.ts",
"scripts": {
"dev": "nodemon src/main.ts",
"start": "ts-node src/main.ts"
"start": "ts-node src/main.ts",
"dev": "nodemon src/dev.ts"
},
"keywords": [],
"author": "",

30
server/src/cli.ts
View file

@ -1,30 +0,0 @@
import { getAuth, signInWithEmailAndPassword } from "firebase/auth";
import { getDatabase, onValue, ref, set } from "firebase/database";
import { answerRtc } from "./rtc";
async function connectFirebase() {
let creds = await signInWithEmailAndPassword(getAuth(), "test@test.com", "123456");
const db = getDatabase();
let peer = ref(db, `/peers/${creds.user.uid}`);
set(peer, "");
onValue(peer, (snapshot) => {
const str = snapshot.val();
if (str) {
let data = JSON.parse(str);
if (data && data.offer && data.localCandidates) {
answerRtc(data, (answer) => {
console.log("answering");
set(peer, JSON.stringify(answer));
});
}
}
});
}
connectFirebase();

62
server/src/dev.ts
View file

@ -0,0 +1,62 @@
import dotenv from "dotenv";
import express from "express";
import expressWs from "express-ws";
import { AdriftServer, connectTracker } from "./server";
import WebSocket from "isomorphic-ws";
import { answerRtc, bufferToArrayBuffer, connect } from "./rtc";
dotenv.config();
const app = express() as unknown as expressWs.Application;
expressWs(app);
app.use(express.json());
app.use((_req, res, next) => {
res.header("x-robots-tag", "noindex");
res.header("access-control-allow-headers", "*");
res.header("access-control-allow-origin", "*");
res.header("access-control-allow-methods", "*");
res.header("access-control-expose-headers", "*");
next();
});
app.post("/connect", (req, res) => {
const data = req.body;
answerRtc(data, (d) => {
res.json(d);
});
});
app.ws("/dev-ws", (ws, _req) => {
console.log("ws connect");
const client = new AdriftServer((msg) => ws.send(msg));
ws.on("message", (msg) => {
if (typeof msg === "string") {
msg = Buffer.from(msg);
}
if (msg instanceof Buffer) {
client.onMsg(bufferToArrayBuffer(msg));
return;
}
throw new Error("Unexpected message type");
});
});
try {
let tracker = new WebSocket("ws://localhost:17776/join");
tracker.onerror = console.error;
connectTracker(tracker);
} catch (_) {
}
app.listen(3000, () => console.log("listening"));

80
server/src/main.ts
View file

@ -1,61 +1,43 @@
import dotenv from "dotenv";
import express from "express";
import expressWs from "express-ws";
import { AdriftServer, connectTracker } from "./server";
import WebSocket from "isomorphic-ws";
import { answerRtc, bufferToArrayBuffer, connect } from "./rtc";
dotenv.config();
import { getAuth, signInWithEmailAndPassword } from "firebase/auth";
import { initializeApp } from "firebase/app";
const app = express() as unknown as expressWs.Application;
expressWs(app);
import { getDatabase, onValue, ref, set } from "firebase/database";
import { answerRtc } from "./rtc";
app.use(express.json());
app.use((_req, res, next) => {
res.header("x-robots-tag", "noindex");
res.header("access-control-allow-headers", "*");
res.header("access-control-allow-origin", "*");
res.header("access-control-allow-methods", "*");
res.header("access-control-expose-headers", "*");
next();
});
import { WebSocket } from "isomorphic-ws";
import TrackerList from "tracker-list";
import { connectTracker } from "./server";
async function connectFirebase() {
let creds = await signInWithEmailAndPassword(getAuth(), "test@test.com", "123456");
const db = getDatabase();
let peer = ref(db, `/peers/${creds.user.uid}`);
app.post("/connect", (req, res) => {
const data = req.body;
answerRtc(data, (d) => {
res.json(d);
});
});
set(peer, "");
app.ws("/dev-ws", (ws, _req) => {
console.log("ws connect");
const client = new AdriftServer((msg) => ws.send(msg));
ws.on("message", (msg) => {
if (typeof msg === "string") {
msg = Buffer.from(msg);
}
if (msg instanceof Buffer) {
client.onMsg(bufferToArrayBuffer(msg));
return;
}
throw new Error("Unexpected message type");
});
});
try {
let tracker = new WebSocket("ws://localhost:17776/join");
connectTracker(tracker);
} catch (_) {
onValue(peer, (snapshot) => {
const str = snapshot.val();
if (str) {
let data = JSON.parse(str);
if (data && data.offer && data.localCandidates) {
answerRtc(data, (answer) => {
console.log("answering");
set(peer, JSON.stringify(answer));
});
}
}
});
}
app.listen(3000, () => console.log("listening"));
let tracker = TrackerList["us-central-1"];
initializeApp(tracker.firebase);
let trackerws = new WebSocket(tracker.tracker + "/join");
connectTracker(trackerws);
connectFirebase();
console.log("main server, use dev server for dev server things");