Some improvements
This commit is contained in:
parent
82dd6fd398
commit
46e69ad87b
6 changed files with 134 additions and 69 deletions
|
@ -1,6 +1,15 @@
|
||||||
import { v4 as uuidv4 } from "https://jspm.dev/uuid"
|
import { v4 as uuidv4 } from "https://jspm.dev/uuid"
|
||||||
|
import { type } from "./utils.js"
|
||||||
|
|
||||||
const input = document.querySelector("#go-input")
|
const input = document.querySelector("#go-input")
|
||||||
|
|
||||||
|
input.addEventListener("keydown", (event) => {
|
||||||
|
if (event.code == "Space") {
|
||||||
|
event.preventDefault()
|
||||||
|
type("-")
|
||||||
|
} else if (!/^[-a-z0-9]+$/i.test(event.key)) event.preventDefault()
|
||||||
|
})
|
||||||
|
|
||||||
const setHref = () =>
|
const setHref = () =>
|
||||||
(document.querySelector("#go").href = input.value || uuidv4())
|
(document.querySelector("#go").href = input.value || uuidv4())
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ const dragElement = (element) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const resizer = document.createElement("div")
|
const resizer = document.createElement("div")
|
||||||
resizer.className = "resizer"
|
resizer.classList.add("resizer")
|
||||||
element.appendChild(resizer)
|
element.appendChild(resizer)
|
||||||
resizer.addEventListener("mousedown", initDrag)
|
resizer.addEventListener("mousedown", initDrag)
|
||||||
resizer.addEventListener("touchstart", initDrag)
|
resizer.addEventListener("touchstart", initDrag)
|
||||||
|
@ -58,7 +58,10 @@ const dragElement = (element) => {
|
||||||
document.addEventListener("mouseup", () => removeFunctions())
|
document.addEventListener("mouseup", () => removeFunctions())
|
||||||
}
|
}
|
||||||
|
|
||||||
element.addEventListener("mousedown", dragMouseDown)
|
element.addEventListener(
|
||||||
|
"mousedown",
|
||||||
|
(event) => event.button == 0 && dragMouseDown(event)
|
||||||
|
)
|
||||||
element.addEventListener("touchstart", dragMouseDown)
|
element.addEventListener("touchstart", dragMouseDown)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,9 +83,14 @@ export const addVideoStream = (videoContainer, username, stream, isYours) => {
|
||||||
videos.append(videoContainer)
|
videos.append(videoContainer)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const connectToNewUser = (userId, username, stream) => {
|
export const showNoVideoPrompt = () =>
|
||||||
|
document.querySelector("#novideo").classList.add("show")
|
||||||
|
|
||||||
|
export const connectToNewUser = (userId, username, stream, myPeer) => {
|
||||||
const call = myPeer.call(userId, stream)
|
const call = myPeer.call(userId, stream)
|
||||||
const video = template.content.firstElementChild.cloneNode(true)
|
const video = document
|
||||||
|
.querySelector("#video-template")
|
||||||
|
.content.firstElementChild.cloneNode(true)
|
||||||
|
|
||||||
call.on("stream", (userVideoStream) =>
|
call.on("stream", (userVideoStream) =>
|
||||||
addVideoStream(video, username, userVideoStream)
|
addVideoStream(video, username, userVideoStream)
|
||||||
|
@ -90,3 +98,13 @@ export const connectToNewUser = (userId, username, stream) => {
|
||||||
|
|
||||||
call.on("close", () => video.remove())
|
call.on("close", () => video.remove())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const type = (newText) => {
|
||||||
|
const element = document.activeElement
|
||||||
|
element.setRangeText(
|
||||||
|
newText,
|
||||||
|
element.selectionStart,
|
||||||
|
element.selectionEnd,
|
||||||
|
"end"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
|
@ -1,31 +1,46 @@
|
||||||
import { addVideoStream, connectToNewUser } from "./utils.js"
|
import { addVideoStream, connectToNewUser, showNoVideoPrompt } from "./utils.js"
|
||||||
const socket = io("/")
|
const socket = io("/")
|
||||||
const myPeer = new Peer()
|
const myPeer = new Peer()
|
||||||
const template = document.querySelector("#video-template")
|
const template = document.querySelector("#video-template")
|
||||||
const yourName = localStorage.getItem("name")
|
const yourName = localStorage.getItem("name")
|
||||||
|
|
||||||
myPeer.on("open", async (id) => {
|
myPeer.on("open", async (id) => {
|
||||||
const stream = await navigator.mediaDevices.getUserMedia({
|
try {
|
||||||
video: true,
|
const stream = await navigator.mediaDevices.getUserMedia({
|
||||||
audio: true,
|
video: true,
|
||||||
})
|
audio: true,
|
||||||
|
})
|
||||||
|
|
||||||
const myVideo = template.content.firstElementChild.cloneNode(true)
|
const myVideo = template.content.firstElementChild.cloneNode(true)
|
||||||
addVideoStream(myVideo, yourName, stream, true)
|
addVideoStream(myVideo, yourName, stream, true)
|
||||||
myPeer.on("call", (call) => {
|
myPeer.on("call", (call) => {
|
||||||
call.answer(stream)
|
call.answer(stream)
|
||||||
const video = template.content.firstElementChild.cloneNode(true)
|
const video = template.content.firstElementChild.cloneNode(true)
|
||||||
call.on("close", () => video.remove())
|
call.on("close", () => video.remove())
|
||||||
call.on("stream", (userVideoStream) =>
|
call.on("stream", (userVideoStream) =>
|
||||||
socket.emit("get-username", call.peer, (username) =>
|
socket.emit("get-username", call.peer, (username) =>
|
||||||
addVideoStream(video, username, userVideoStream)
|
addVideoStream(video, username, userVideoStream)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
})
|
||||||
})
|
|
||||||
|
socket.on("user-connected", (userId, username) =>
|
||||||
|
connectToNewUser(userId, username, stream, myPeer)
|
||||||
|
)
|
||||||
|
} catch (error) {
|
||||||
|
if (
|
||||||
|
error.name == "NotAllowedError" ||
|
||||||
|
error.name == "NotFoundError" ||
|
||||||
|
error.name == "PermissionDeniedError" ||
|
||||||
|
error.name == "DevicesNotFoundError"
|
||||||
|
)
|
||||||
|
return showNoVideoPrompt()
|
||||||
|
|
||||||
|
console.log(error.name)
|
||||||
|
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
|
||||||
socket.on("user-connected", (userId, username) =>
|
|
||||||
connectToNewUser(userId, username, stream)
|
|
||||||
)
|
|
||||||
socket.emit("join-room", ROOM_ID, id, yourName)
|
socket.emit("join-room", ROOM_ID, id, yourName)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ body {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
grid-auto-rows: 100vh;
|
grid-auto-rows: 100vh;
|
||||||
display: grid;
|
display: grid;
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#go {
|
#go {
|
||||||
|
@ -32,12 +31,12 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
margin: 0 0.5em;
|
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
color: white;
|
color: white;
|
||||||
grid-template-columns: 1fr 500px;
|
grid-template-columns: 1fr 500px;
|
||||||
}
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
background-color: var(--secondary);
|
background-color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
@ -47,13 +46,14 @@ main {
|
||||||
grid-template-columns: repeat(auto-fit, minmax(33%, 1fr));
|
grid-template-columns: repeat(auto-fit, minmax(33%, 1fr));
|
||||||
grid-template-rows: repeat(auto-fit, minmax(33%, 1fr));
|
grid-template-rows: repeat(auto-fit, minmax(33%, 1fr));
|
||||||
color: white;
|
color: white;
|
||||||
padding: 4px 0 4px 0;
|
max-height: 100vh;
|
||||||
|
background-color: var(--secondary);
|
||||||
gap: 2px;
|
gap: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
video {
|
video {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-height: 100%;
|
max-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.your-video {
|
.your-video {
|
||||||
|
@ -109,13 +109,6 @@ button {
|
||||||
background-color: var(--primary);
|
background-color: var(--primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.medium-header {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
font-weight: 200;
|
|
||||||
line-height: 1.2;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button-secondary {
|
.button-secondary {
|
||||||
background-color: var(--secondary);
|
background-color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
@ -148,12 +141,13 @@ video.your-video {
|
||||||
}
|
}
|
||||||
|
|
||||||
.jumbo {
|
.jumbo {
|
||||||
margin: 20px auto;
|
margin: 10% auto;
|
||||||
width: 50%;
|
width: 90%;
|
||||||
|
max-width: 700px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 20px 40px;
|
padding: 20px 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.jumbo p {
|
.jumbo p {
|
||||||
|
@ -166,10 +160,11 @@ hr {
|
||||||
|
|
||||||
.video .name {
|
.video .name {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 5px;
|
bottom: 2vw;
|
||||||
left: 10px;
|
left: 2vw;
|
||||||
display: flex;
|
display: flex;
|
||||||
padding: 10px;
|
font-size: 1.5vw;
|
||||||
|
padding: 1vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.video.your-video .name {
|
.video.your-video .name {
|
||||||
|
@ -210,13 +205,9 @@ hr {
|
||||||
right: -5px;
|
right: -5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-group {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.medium-header {
|
.medium-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
font-size: 4rem;
|
font-size: 3em;
|
||||||
font-weight: 250;
|
font-weight: 250;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
|
@ -230,9 +221,24 @@ hr {
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.input-group {
|
||||||
|
display: flex;
|
||||||
|
max-width: 90%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-field:first-child,
|
||||||
|
.input-item:first-child {
|
||||||
|
border-radius: 5px 0 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-field:last-child,
|
||||||
|
.input-item:last-child {
|
||||||
|
border-radius: 0 5px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
.input-field {
|
.input-field {
|
||||||
border-left: 1px solid var(--input-border) !important;
|
border-left: 1px solid var(--input-border) !important;
|
||||||
flex: 1;
|
width: 90%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-field:not(:first-child) {
|
.input-field:not(:first-child) {
|
||||||
|
@ -257,16 +263,6 @@ hr {
|
||||||
padding: 0.5em 0.75em;
|
padding: 0.5em 0.75em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-field:first-child,
|
|
||||||
.input-item:first-child {
|
|
||||||
border-radius: 5px 0 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-field:last-child,
|
|
||||||
.input-item:last-child {
|
|
||||||
border-radius: 0 5px 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#is-copied.copied {
|
#is-copied.copied {
|
||||||
opacity: 100;
|
opacity: 100;
|
||||||
}
|
}
|
||||||
|
@ -284,10 +280,13 @@ hr {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#login {
|
#login,
|
||||||
|
#novideo {
|
||||||
background-color: var(--primary);
|
background-color: var(--primary);
|
||||||
color: white;
|
color: white;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: absolute;
|
||||||
|
z-index: 5;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
@ -295,13 +294,22 @@ hr {
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#novideo:not(.show),
|
||||||
#login.done {
|
#login.done {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#login:not(.done) + div,
|
#novideo p {
|
||||||
#login:not(.done) + div + div {
|
font-size: 1.3em;
|
||||||
display: none !important;
|
margin: 10px auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
#novideo * {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
#novideo a {
|
||||||
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
:is(textarea, input[type="text"]) {
|
:is(textarea, input[type="text"]) {
|
||||||
|
@ -310,7 +318,7 @@ hr {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
border-bottom: 0.05em solid white;
|
border-bottom: 0.05em solid white;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-size: 2rem;
|
font-size: 1.3em;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 90%;
|
max-height: 90%;
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,17 +52,17 @@
|
||||||
</div>
|
</div>
|
||||||
<main>
|
<main>
|
||||||
<div class="card jumbo">
|
<div class="card jumbo">
|
||||||
<h1 class="medium-header">Hi there</h1>
|
<h1 class="medium-header">Video Chat</h1>
|
||||||
<hr />
|
<hr />
|
||||||
<p>
|
<p>Enter a room name to join or create a room.</p>
|
||||||
Please create a new room, or join an existing room using the
|
|
||||||
form below. If a room doesn't exist it will be created.<br />
|
|
||||||
If a room name is not specified a random one will be
|
|
||||||
selected
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="input-group full-border">
|
<div class="input-group full-border">
|
||||||
<input type="text" id="go-input" class="input-field" />
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="My room name"
|
||||||
|
id="go-input"
|
||||||
|
class="input-field"
|
||||||
|
/>
|
||||||
<a class="input-item button" id="go">
|
<a class="input-item button" id="go">
|
||||||
<svg
|
<svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
|
|
@ -39,6 +39,21 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="novideo">
|
||||||
|
<h1 class="medium-header">No Video / Audio Device Found</h1>
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
You either denied access to a video/audio device, or one was
|
||||||
|
not found.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Please make sure you have a microphone and webcam/camera.
|
||||||
|
<br />
|
||||||
|
Once you are done please
|
||||||
|
<a href="javascript:window.location.reload()">reload</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<main><div id="videos"></div></main>
|
<main><div id="videos"></div></main>
|
||||||
<div id="options" class="card">
|
<div id="options" class="card">
|
||||||
<div id="change-name">
|
<div id="change-name">
|
||||||
|
|
Reference in a new issue