Merge branch 'master' into v18.beta

This commit is contained in:
Steve Seguin 2021-05-30 22:03:17 -04:00 committed by GitHub
commit c701bd4f8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21252 additions and 21254 deletions

View File

@ -2,7 +2,7 @@ name: Update Advanced Settings Markdown TOC
on:
workflow_dispatch:
schedule:
- cron: '0 3 * * *'
- cron: '0 0 29 2 1'
jobs:
update-toc:

View File

@ -33,7 +33,7 @@ Directions on how to deploy a TURN server are listed in the turnserver.md file.
## Server side / API software
Since OBS.Ninja uses peer-2-peer technology, video connections are made directly between viewer and publisher in 90% of cases. Hosting a TURN server yourself may help improve performance, but less than 1% of users will see any benefit of this. Details on how to deploy a TURN server are provided. For those capable of hosting their own TURN server, that would be appreciated if possible, as TURN servers are the only real cost incurred by OBS.Ninja at present. (other than time, of course)
Other than TURN servers, OBS.Ninja also uses public STUN servers and a hosted handshake server. These are used to facilitate the initial setup of peer connections and are generally not required after a peer connection is established. These servers are free to access and use, even for private deployments. The handshake server's code is currently not available, so basic access to the Internet is still required to use OBS.Ninja even with a private deployment.
Other than TURN servers, OBS.Ninja also uses public STUN servers and a hosted handshake server. These are used to facilitate the initial setup of peer connections and are generally not required after a peer connection is established. These servers are free to access and use, even for private deployments. As of Version 17.3 of OBS.Ninja, you can host your own handshake server or use a third-party managed one (such as piesocket.com); please see details here: https://github.com/steveseguin/websocket_server
Development builds of OBS.Ninja may include debugging software, but in-production releases have this removed. Double check to ensure "console.re" debugging is disabled before deployment, just to be safe.
@ -63,9 +63,6 @@ http://chat.overlay.ninja/
A website designed to also work with OBS.Ninja as a Broadcasting tool. Share your webcam, window, desktop, or video file with friends and family. Peer-2-peer, so privacy can be maintained, but you can also list your broadcasts for others to watch.
https://steves.app/
### StageTEN.tv
A browser-based studio solution and simplified alternative to OBS, with built-in OBS.Ninja functionality. It is a server-based approach to group interactions and live production. Steve Seguin is affiliated with StageTEn, yet StageTEN is not affiliated with OBS.Ninja.
## Privacy
I try to avoid data collection whenever possible and video streams are generally designed to be private, but use at your own risk. It is best to not share links created with OBS.Ninja with those you do not trust. I've provided instructions on how to deploy a TURN server if IP-address privacy is an issue for you. See: [turnserver.md](turnserver.md)

File diff suppressed because it is too large Load Diff

View File

@ -605,8 +605,8 @@
</div>
<div>See the
<a style="text-decoration: none; color: blue;" target="_blank" href="https://docs.obs.ninja/advanced-settings">documentation</a> for more options and info.<br /><br />
Try out the advanced <a style="text-decoration: none; color: blue;" target="_blank" href="https://invite.obs.ninja/">invite generator</a> here also.
Try out the advanced <a style="text-decoration: none; color: blue;" target="_blank" href="https://invite.obs.ninja/">invite generator</a> here also.
</div>
</div>
</div>
@ -782,7 +782,6 @@
<li>https://invite.cam is a free service provided that can help obfuscuate the URL parameters of an invite link given to guests.</li>
<li>Adding &showonly=SOME_OBS_VIRTUALCAM to the guest invite links allows for only a single video to be seen by the guests; this can be output of the OBS Virtual Camera for example</li>
<br />
For advanced URL options and parameters, <a href="https://docs.obs.ninja/advanced-settings">see the Wiki.</a>
</font>
</div>

5806
main.css

File diff suppressed because it is too large Load Diff

35543
main.js

File diff suppressed because it is too large Load Diff

View File

@ -260,11 +260,10 @@
var iframe = document.createElement("iframe");
if (urlParams.has('remote') || urlParams.has('rem')) {
var remote = urlParams.get('remote') || urlParams.get('rem') || "nosecurity";
remote = remote.trim();
if (urlParams.has("remote")) {
var remote = urlParams.get("remote");
} else {
var remote = "";
var remote="";
}
if (urlParams.has("sid")) {

File diff suppressed because one or more lines are too long