Skip to content

Commit

Permalink
refactor: Rename to weron
Browse files Browse the repository at this point in the history
  • Loading branch information
pojntfx committed Apr 24, 2022
1 parent 02a58fb commit 210378b
Show file tree
Hide file tree
Showing 28 changed files with 115 additions and 100 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ benchmark:
# Clean
clean:
rm -rf out internal/db
docker rm -f webrtcfd-postgres webrtcfd-redis
docker rm -f weron-postgres weron-redis

# Dependencies
depend:
docker run -d --name webrtcfd-postgres -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust -e POSTGRES_DB=webrtcfd_communities postgres
docker run -d --name webrtcfd-redis -p 6379:6379 redis
docker exec webrtcfd-postgres bash -c 'until pg_isready; do sleep 1; done'
docker run -d --name weron-postgres -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust -e POSTGRES_DB=weron_communities postgres
docker run -d --name weron-redis -p 6379:6379 redis
docker exec weron-postgres bash -c 'until pg_isready; do sleep 1; done'
go install github.com/rubenv/sql-migrate/sql-migrate@latest
go install github.com/volatiletech/sqlboiler/v4@latest
go install github.com/jteeuwen/go-bindata/go-bindata@latest
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# webrtcfd
# weron

Share a file or tape drive over WebRTC.
Overlay networks based on WebRTC.

## Overview

🚧 This project is a work-in-progress! Instructions will be added as soon as it is usable. 🚧

## License

webrtcfd (c) 2022 Felicitas Pojtinger and contributors
weron (c) 2022 Felicitas Pojtinger and contributors

SPDX-License-Identifier: AGPL-3.0
6 changes: 3 additions & 3 deletions cmd/weron/cmd/chat.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/pojntfx/webrtcfd/pkg/services"
"github.com/pojntfx/webrtcfd/pkg/wrtcconn"
"github.com/pojntfx/weron/pkg/services"
"github.com/pojntfx/weron/pkg/wrtcconn"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/teivah/broadcast"
Expand Down Expand Up @@ -160,7 +160,7 @@ var chatCmd = &cobra.Command{
}

func init() {
chatCmd.PersistentFlags().String(raddrFlag, "wss://webrtcfd.herokuapp.com/", "Remote address")
chatCmd.PersistentFlags().String(raddrFlag, "wss://weron.up.railway.app/", "Remote address")
chatCmd.PersistentFlags().Duration(timeoutFlag, time.Second*10, "Time to wait for connections")
chatCmd.PersistentFlags().String(communityFlag, "", "ID of community to join")
chatCmd.PersistentFlags().String(passwordFlag, "", "Password for community")
Expand Down
2 changes: 1 addition & 1 deletion cmd/weron/cmd/manager_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"strings"

"github.com/pojntfx/webrtcfd/pkg/wrtcmgr"
"github.com/pojntfx/weron/pkg/wrtcmgr"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/weron/cmd/manager_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"strings"

"github.com/pojntfx/webrtcfd/pkg/wrtcmgr"
"github.com/pojntfx/weron/pkg/wrtcmgr"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/weron/cmd/manager_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"strings"

"github.com/pojntfx/webrtcfd/pkg/wrtcmgr"
"github.com/pojntfx/weron/pkg/wrtcmgr"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
Expand Down Expand Up @@ -85,7 +85,7 @@ func init() {
func addRemoteFlags(f *pflag.FlagSet) {
f.String(apiUsernameFlag, "admin", "Username for the management API (can also be set using the API_USERNAME env variable). Ignored if any of the OIDC parameters are set.")
f.String(apiPasswordFlag, "", "Password for the management API (can also be set using the API_PASSWORD env variable). Ignored if any of the OIDC parameters are set.")
f.String(raddrFlag, "https://webrtcfd.herokuapp.com/", "Remote address")
f.String(raddrFlag, "https://weron.up.railway.app/", "Remote address")
}

func validateRemoteFlags(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/weron/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var rootCmd = &cobra.Command{
Long: `Overlay networks based on WebRTC.
Find more information at:
https://github.com/pojntfx/webrtcfd`,
https://github.com/pojntfx/weron`,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
viper.SetEnvPrefix("weron")
viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
Expand Down
2 changes: 1 addition & 1 deletion cmd/weron/cmd/signaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"syscall"
"time"

"github.com/pojntfx/webrtcfd/pkg/wrtcsgl"
"github.com/pojntfx/weron/pkg/wrtcsgl"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/weron/cmd/utility_latency.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"
"time"

"github.com/pojntfx/webrtcfd/pkg/services"
"github.com/pojntfx/webrtcfd/pkg/wrtcconn"
"github.com/pojntfx/weron/pkg/services"
"github.com/pojntfx/weron/pkg/wrtcconn"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -204,7 +204,7 @@ var utilityLatencyCommand = &cobra.Command{
}

func init() {
utilityLatencyCommand.PersistentFlags().String(raddrFlag, "wss://webrtcfd.herokuapp.com/", "Remote address")
utilityLatencyCommand.PersistentFlags().String(raddrFlag, "wss://weron.up.railway.app/", "Remote address")
utilityLatencyCommand.PersistentFlags().Duration(timeoutFlag, time.Second*10, "Time to wait for connections")
utilityLatencyCommand.PersistentFlags().String(communityFlag, "", "ID of community to join")
utilityLatencyCommand.PersistentFlags().String(passwordFlag, "", "Password for community")
Expand Down
6 changes: 3 additions & 3 deletions cmd/weron/cmd/utility_throughput.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"
"time"

"github.com/pojntfx/webrtcfd/pkg/services"
"github.com/pojntfx/webrtcfd/pkg/wrtcconn"
"github.com/pojntfx/weron/pkg/services"
"github.com/pojntfx/weron/pkg/wrtcconn"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -242,7 +242,7 @@ var utilityThroughputCmd = &cobra.Command{
}

func init() {
utilityThroughputCmd.PersistentFlags().String(raddrFlag, "wss://webrtcfd.herokuapp.com/", "Remote address")
utilityThroughputCmd.PersistentFlags().String(raddrFlag, "wss://weron.up.railway.app/", "Remote address")
utilityThroughputCmd.PersistentFlags().Duration(timeoutFlag, time.Second*10, "Time to wait for connections")
utilityThroughputCmd.PersistentFlags().String(communityFlag, "", "ID of community to join")
utilityThroughputCmd.PersistentFlags().String(passwordFlag, "", "Password for community")
Expand Down
6 changes: 3 additions & 3 deletions cmd/weron/cmd/vpn_ethernet.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"github.com/pojntfx/webrtcfd/pkg/wrtcconn"
"github.com/pojntfx/webrtcfd/pkg/wrtceth"
"github.com/pojntfx/weron/pkg/wrtcconn"
"github.com/pojntfx/weron/pkg/wrtceth"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -96,7 +96,7 @@ var vpnEthernetCmd = &cobra.Command{
}

func init() {
vpnEthernetCmd.PersistentFlags().String(raddrFlag, "wss://webrtcfd.herokuapp.com/", "Remote address")
vpnEthernetCmd.PersistentFlags().String(raddrFlag, "wss://weron.up.railway.app/", "Remote address")
vpnEthernetCmd.PersistentFlags().Duration(timeoutFlag, time.Second*10, "Time to wait for connections")
vpnEthernetCmd.PersistentFlags().String(communityFlag, "", "ID of community to join")
vpnEthernetCmd.PersistentFlags().String(passwordFlag, "", "Password for community")
Expand Down
6 changes: 3 additions & 3 deletions cmd/weron/cmd/vpn_ip.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

"github.com/pojntfx/webrtcfd/pkg/wrtcconn"
"github.com/pojntfx/webrtcfd/pkg/wrtcip"
"github.com/pojntfx/weron/pkg/wrtcconn"
"github.com/pojntfx/weron/pkg/wrtcip"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down Expand Up @@ -111,7 +111,7 @@ var vpnIPCmd = &cobra.Command{
}

func init() {
vpnIPCmd.PersistentFlags().String(raddrFlag, "wss://webrtcfd.herokuapp.com/", "Remote address")
vpnIPCmd.PersistentFlags().String(raddrFlag, "wss://weron.up.railway.app/", "Remote address")
vpnIPCmd.PersistentFlags().Duration(timeoutFlag, time.Second*10, "Time to wait for connections")
vpnIPCmd.PersistentFlags().String(communityFlag, "", "ID of community to join")
vpnIPCmd.PersistentFlags().String(passwordFlag, "", "Password for community")
Expand Down
2 changes: 1 addition & 1 deletion cmd/weron/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/pojntfx/webrtcfd/cmd/weron/cmd"
import "github.com/pojntfx/weron/cmd/weron/cmd"

func main() {
if err := cmd.Execute(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion configs/sql-migrate/communities.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
psql:
dialect: postgres
datasource: dbname=webrtcfd_communities user=postgres sslmode=disable
datasource: dbname=weron_communities user=postgres sslmode=disable
dir: db/psql/migrations/communities/
2 changes: 1 addition & 1 deletion configs/sqlboiler/communities.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
no-tests: true
psql:
dbname: webrtcfd_communities
dbname: weron_communities
user: postgres
sslmode: disable
host: localhost
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/pojntfx/webrtcfd
module github.com/pojntfx/weron

// +heroku goVersion go1.18
go 1.18
Expand All @@ -11,20 +11,19 @@ require (
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/lib/pq v1.10.5
github.com/mitchellh/mapstructure v1.4.3
github.com/pion/webrtc/v3 v3.1.28
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
github.com/mitchellh/mapstructure v1.5.0
github.com/pion/webrtc/v3 v3.1.34
github.com/rubenv/sql-migrate v1.1.1
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.9.0
github.com/teivah/broadcast v0.0.7-0.20220316095729-071f20229a32
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.11.0
github.com/teivah/broadcast v0.0.6
github.com/vishvananda/netlink v1.1.0
github.com/volatiletech/null/v8 v8.1.2
github.com/volatiletech/sqlboiler/v4 v4.10.1
github.com/volatiletech/sqlboiler/v4 v4.10.2
github.com/volatiletech/strmangle v0.0.3
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
)

Expand All @@ -33,16 +32,16 @@ require (
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
github.com/pion/datachannel v1.5.2 // indirect
github.com/pion/dtls/v2 v2.1.3 // indirect
github.com/pion/ice/v2 v2.2.3 // indirect
github.com/pion/ice/v2 v2.2.6 // indirect
github.com/pion/interceptor v0.1.10 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.5 // indirect
Expand All @@ -56,21 +55,22 @@ require (
github.com/pion/transport v0.13.0 // indirect
github.com/pion/turn/v2 v2.0.8 // indirect
github.com/pion/udp v0.1.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
github.com/volatiletech/inflect v0.0.1 // indirect
github.com/volatiletech/randomize v0.0.1 // indirect
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
Loading

0 comments on commit 210378b

Please sign in to comment.