diff --git a/.gitignore b/.gitignore index 66147be..e66a907 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *~ data/*.pem -sfu -sfu-password-generator/sfu-password-generator +galene +galene-password-generator/galene-password-generator passwd groups/*.json static/*.d.ts diff --git a/README b/README index eef4fa5..97014e1 100644 --- a/README +++ b/README @@ -63,21 +63,21 @@ options are described below. ## Copy the necessary files to your server: -Assuming you have set up a user *sfu*: +Assuming you have set up a user *galene*: - rsync -a sfu static data groups sfu@server.example.org: + rsync -a galene static data groups galene@server.example.org: ## Run the server binary: - ssh sfu@server.example.org - nohup ./sfu & + ssh galene@server.example.org + nohup ./galene & If you are using *runit*, use a script like the following: #!/bin/sh exec 2>&1 - cd ~sfu - exec setuidgid sfu ./sfu + cd ~galene + exec setuidgid galene ./galene If you are using *systemd*, use `Type=simple` in your service file. @@ -130,7 +130,7 @@ A user definition is a dictionary with the following fields: allowed; - `password`: if omitted, then no password is required. Otherwise, this can either be a string, specifying a plain text password, or - a dictionary generated by the `sfu-password-generator` utility. + a dictionary generated by the `galene-password-generator` utility. For example, diff --git a/README.FRONTEND b/README.FRONTEND index af858b4..5d667c5 100644 --- a/README.FRONTEND +++ b/README.FRONTEND @@ -4,7 +4,7 @@ The frontend is written in JavaScript and is split into two files: - `protocol.js` contains the low-level functions that interact with the server; - - `sfu.js` contains the user interface. + - `galene.js` contains the user interface. If you wish to develop your own frontend, I recommend using `protocol.js`, which is likely to remain reasonably stable as the protocol evolves. This diff --git a/diskwriter/diskwriter.go b/diskwriter/diskwriter.go index fb7ab12..9b29fc3 100644 --- a/diskwriter/diskwriter.go +++ b/diskwriter/diskwriter.go @@ -16,8 +16,8 @@ import ( "github.com/pion/rtp/codecs" "github.com/pion/webrtc/v3/pkg/media/samplebuilder" - "sfu/conn" - "sfu/group" + "galene/conn" + "galene/group" ) var Directory string diff --git a/estimator/estimator.go b/estimator/estimator.go index 792f064..f507c21 100644 --- a/estimator/estimator.go +++ b/estimator/estimator.go @@ -4,7 +4,7 @@ import ( "sync/atomic" "time" - "sfu/rtptime" + "galene/rtptime" ) type Estimator struct { diff --git a/estimator/estimator_test.go b/estimator/estimator_test.go index 7876347..ff519dd 100644 --- a/estimator/estimator_test.go +++ b/estimator/estimator_test.go @@ -3,7 +3,7 @@ package estimator import ( "testing" - "sfu/rtptime" + "galene/rtptime" ) func TestEstimator(t *testing.T) { diff --git a/sfu-password-generator/sfu-password-generator.go b/galene-password-generator/galene-password.generator.go similarity index 98% rename from sfu-password-generator/sfu-password-generator.go rename to galene-password-generator/galene-password.generator.go index fca9138..b3411c9 100644 --- a/sfu-password-generator/sfu-password-generator.go +++ b/galene-password-generator/galene-password.generator.go @@ -11,7 +11,7 @@ import ( "golang.org/x/crypto/pbkdf2" - "sfu/group" + "galene/group" ) func main() { diff --git a/sfu.go b/galene.go similarity index 97% rename from sfu.go rename to galene.go index 33bbd6d..107a124 100644 --- a/sfu.go +++ b/galene.go @@ -16,9 +16,9 @@ import ( "syscall" "time" - "sfu/diskwriter" - "sfu/group" - "sfu/webserver" + "galene/diskwriter" + "galene/group" + "galene/webserver" ) func main() { diff --git a/go.mod b/go.mod index 0b4c74c..d992f9c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sfu +module galene go 1.13 diff --git a/group/client.go b/group/client.go index 275c33f..f4f5e29 100644 --- a/group/client.go +++ b/group/client.go @@ -7,9 +7,10 @@ import ( "encoding/json" "errors" "hash" - "sfu/conn" "golang.org/x/crypto/pbkdf2" + + "galene/conn" ) type RawPassword struct { diff --git a/jitter/jitter.go b/jitter/jitter.go index 7292bb1..8dacad2 100644 --- a/jitter/jitter.go +++ b/jitter/jitter.go @@ -3,7 +3,7 @@ package jitter import ( "sync/atomic" - "sfu/rtptime" + "galene/rtptime" ) type Estimator struct { diff --git a/rtpconn/rtpconn.go b/rtpconn/rtpconn.go index 1c8f00b..8e851a4 100644 --- a/rtpconn/rtpconn.go +++ b/rtpconn/rtpconn.go @@ -13,12 +13,12 @@ import ( "github.com/pion/rtp" "github.com/pion/webrtc/v3" - "sfu/conn" - "sfu/estimator" - "sfu/group" - "sfu/jitter" - "sfu/packetcache" - "sfu/rtptime" + "galene/conn" + "galene/estimator" + "galene/group" + "galene/jitter" + "galene/packetcache" + "galene/rtptime" ) type bitrate struct { diff --git a/rtpconn/rtpreader.go b/rtpconn/rtpreader.go index 5b0771a..8ffa1e9 100644 --- a/rtpconn/rtpreader.go +++ b/rtpconn/rtpreader.go @@ -9,8 +9,8 @@ import ( "github.com/pion/rtp/codecs" "github.com/pion/webrtc/v3" - "sfu/packetcache" - "sfu/rtptime" + "galene/packetcache" + "galene/rtptime" ) func isVP8Keyframe(packet *rtp.Packet) bool { diff --git a/rtpconn/rtpstats.go b/rtpconn/rtpstats.go index 83e3fe6..b441779 100644 --- a/rtpconn/rtpstats.go +++ b/rtpconn/rtpstats.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - "sfu/rtptime" - "sfu/stats" + "galene/rtptime" + "galene/stats" ) func (c *webClient) GetStats() *stats.Client { diff --git a/rtpconn/rtpwriter.go b/rtpconn/rtpwriter.go index f6d71fa..a5c5da7 100644 --- a/rtpconn/rtpwriter.go +++ b/rtpconn/rtpwriter.go @@ -9,9 +9,9 @@ import ( "github.com/pion/rtp" - "sfu/conn" - "sfu/packetcache" - "sfu/rtptime" + "galene/conn" + "galene/packetcache" + "galene/rtptime" ) // packetIndex is a request to send a packet from the cache. diff --git a/rtpconn/webclient.go b/rtpconn/webclient.go index f5555a8..00cb5de 100644 --- a/rtpconn/webclient.go +++ b/rtpconn/webclient.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/websocket" "github.com/pion/webrtc/v3" - "sfu/conn" - "sfu/diskwriter" - "sfu/estimator" - "sfu/group" + "galene/conn" + "galene/diskwriter" + "galene/estimator" + "galene/group" ) func errorToWSCloseMessage(id string, err error) (*clientMessage, []byte) { diff --git a/static/sfu.css b/static/galene.css similarity index 99% rename from static/sfu.css rename to static/galene.css index 0a91c1f..804731c 100644 --- a/static/sfu.css +++ b/static/galene.css @@ -1020,7 +1020,7 @@ legend { z-index: 1039; } -#left-sidebar .sfu-header { +#left-sidebar .galene-header { display: inline-block; } @@ -1033,7 +1033,7 @@ header .collapse { margin-left: 5px; } -.sfu-header { +.galene-header { font-size: 1.3rem; font-weight: 900; color: #dbd9d9; diff --git a/static/sfu.html b/static/galene.html similarity index 98% rename from static/sfu.html rename to static/galene.html index 48bc87d..02b126e 100644 --- a/static/sfu.html +++ b/static/galene.html @@ -1,11 +1,11 @@ - SFU + Galène - + @@ -19,7 +19,7 @@
diff --git a/static/tsconfig.json b/static/tsconfig.json index a47eef7..6081949 100644 --- a/static/tsconfig.json +++ b/static/tsconfig.json @@ -14,6 +14,6 @@ }, "files": [ "protocol.js", - "sfu.js" + "galene.js" ] } diff --git a/stats/stats.go b/stats/stats.go index e65e74f..3fc0e6f 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -4,7 +4,7 @@ import ( "sort" "time" - "sfu/group" + "galene/group" ) type GroupStats struct { diff --git a/webserver/webserver.go b/webserver/webserver.go index f811691..bad681c 100644 --- a/webserver/webserver.go +++ b/webserver/webserver.go @@ -21,10 +21,10 @@ import ( "github.com/gorilla/websocket" - "sfu/diskwriter" - "sfu/group" - "sfu/rtpconn" - "sfu/stats" + "galene/diskwriter" + "galene/group" + "galene/rtpconn" + "galene/stats" ) var server atomic.Value @@ -267,7 +267,7 @@ func groupHandler(w http.ResponseWriter, r *http.Request) { return } - serveFile(w, r, filepath.Join(StaticRoot, "sfu.html")) + serveFile(w, r, filepath.Join(StaticRoot, "galene.html")) } func publicHandler(w http.ResponseWriter, r *http.Request) {