From 7c4b65004ddaf8fe77e0e717e801a75d0f134126 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Mon, 20 Jul 2020 16:20:59 -0600 Subject: [PATCH] flatten mplexer into telebit package --- mplexer/addr.go => addr.go | 0 {mplexer/admin => admin}/assets.go | 2 +- .../assets/.well-known/security.txt | 0 {mplexer/admin => admin}/assets/humans.txt | 0 {mplexer/admin => admin}/assets/index.html | 0 {mplexer/admin => admin}/assets/robots.txt | 0 {mplexer/admin => admin}/assets_dev.go | 0 cmd/dnsclient/dnsclient.go | 2 +- cmd/machineid/machineid.go | 2 +- cmd/mgmt/devices.go | 2 +- cmd/mgmt/mgmt.go | 2 +- cmd/mgmt/route.go | 2 +- cmd/signjwt/signjwt.go | 4 ++-- cmd/sqlstore/sqlstore.go | 2 +- cmd/telebit/admin.go | 6 +++--- cmd/telebit/authorizer.go | 2 +- cmd/telebit/telebit.go | 14 +++++++------- cmd/wsconnect/wsconnect.go | 6 +++--- cmd/wsserve/wsserve.go | 6 +++--- mplexer/conn.go => conn.go | 0 mplexer/connwrap.go => connwrap.go | 4 ++-- debug.sh | 5 ----- mplexer/decoder.go => decoder.go | 2 +- mplexer/decoder_test.go => decoder_test.go | 0 {mplexer/dns01 => dns01}/LICENSE | 0 {mplexer/dns01 => dns01}/dns01.go | 0 {mplexer/dns01 => dns01}/dns01_test.go | 0 mplexer/encoder.go => encoder.go | 2 +- mplexer/encoder_test.go => encoder_test.go | 0 {mplexer/files => files}/assets.go | 2 +- {mplexer/files => files}/assets/init.sql | 0 {mplexer/files => files}/assets_dev.go | 0 {mplexer/files => files}/files.go | 0 go.mod | 2 +- mplexer/listener.go => listener.go | 0 mplexer/mgmt-active.sh => mgmt-active.sh | 0 mplexer/mgmt-prereg.sh => mgmt-prereg.sh | 0 mplexer/mgmt.sh => mgmt.sh | 0 mgmt/auth.go | 6 +++--- mgmt/authstore/authstore.go | 2 +- mgmt/authstore/postgresql.go | 2 +- mplexer/packer.go => packer.go | 0 mplexer/packer_test.go => packer_test.go | 0 mplexer/parser.go => parser.go | 2 +- mplexer/parser_test.go => parser_test.go | 0 mplexer/routemux.go => routemux.go | 0 table/table.go | 4 ++-- mplexer/telebit.go => telebit.go | 0 mplexer/v1.go => v1.go | 2 +- mplexer/websockettunnel.go => websocket.go | 2 +- 50 files changed, 42 insertions(+), 47 deletions(-) rename mplexer/addr.go => addr.go (100%) rename {mplexer/admin => admin}/assets.go (54%) rename {mplexer/admin => admin}/assets/.well-known/security.txt (100%) rename {mplexer/admin => admin}/assets/humans.txt (100%) rename {mplexer/admin => admin}/assets/index.html (100%) rename {mplexer/admin => admin}/assets/robots.txt (100%) rename {mplexer/admin => admin}/assets_dev.go (100%) rename mplexer/conn.go => conn.go (100%) rename mplexer/connwrap.go => connwrap.go (98%) delete mode 100755 debug.sh rename mplexer/decoder.go => decoder.go (97%) rename mplexer/decoder_test.go => decoder_test.go (100%) rename {mplexer/dns01 => dns01}/LICENSE (100%) rename {mplexer/dns01 => dns01}/dns01.go (100%) rename {mplexer/dns01 => dns01}/dns01_test.go (100%) rename mplexer/encoder.go => encoder.go (98%) rename mplexer/encoder_test.go => encoder_test.go (100%) rename {mplexer/files => files}/assets.go (54%) rename {mplexer/files => files}/assets/init.sql (100%) rename {mplexer/files => files}/assets_dev.go (100%) rename {mplexer/files => files}/files.go (100%) rename mplexer/listener.go => listener.go (100%) rename mplexer/mgmt-active.sh => mgmt-active.sh (100%) rename mplexer/mgmt-prereg.sh => mgmt-prereg.sh (100%) rename mplexer/mgmt.sh => mgmt.sh (100%) rename mplexer/packer.go => packer.go (100%) rename mplexer/packer_test.go => packer_test.go (100%) rename mplexer/parser.go => parser.go (97%) rename mplexer/parser_test.go => parser_test.go (100%) rename mplexer/routemux.go => routemux.go (100%) rename mplexer/telebit.go => telebit.go (100%) rename mplexer/v1.go => v1.go (99%) rename mplexer/websockettunnel.go => websocket.go (99%) diff --git a/mplexer/addr.go b/addr.go similarity index 100% rename from mplexer/addr.go rename to addr.go diff --git a/mplexer/admin/assets.go b/admin/assets.go similarity index 54% rename from mplexer/admin/assets.go rename to admin/assets.go index cb5dbcd..ee19e6c 100644 --- a/mplexer/admin/assets.go +++ b/admin/assets.go @@ -1,4 +1,4 @@ // +build !dev -//go:generate go run -mod vendor github.com/shurcooL/vfsgen/cmd/vfsgendev -source="git.coolaj86.com/coolaj86/go-telebitd/mplexer/admin".AdminFS +//go:generate go run -mod vendor github.com/shurcooL/vfsgen/cmd/vfsgendev -source="git.rootprojects.org/root/telebit/admin".AdminFS package admin diff --git a/mplexer/admin/assets/.well-known/security.txt b/admin/assets/.well-known/security.txt similarity index 100% rename from mplexer/admin/assets/.well-known/security.txt rename to admin/assets/.well-known/security.txt diff --git a/mplexer/admin/assets/humans.txt b/admin/assets/humans.txt similarity index 100% rename from mplexer/admin/assets/humans.txt rename to admin/assets/humans.txt diff --git a/mplexer/admin/assets/index.html b/admin/assets/index.html similarity index 100% rename from mplexer/admin/assets/index.html rename to admin/assets/index.html diff --git a/mplexer/admin/assets/robots.txt b/admin/assets/robots.txt similarity index 100% rename from mplexer/admin/assets/robots.txt rename to admin/assets/robots.txt diff --git a/mplexer/admin/assets_dev.go b/admin/assets_dev.go similarity index 100% rename from mplexer/admin/assets_dev.go rename to admin/assets_dev.go diff --git a/cmd/dnsclient/dnsclient.go b/cmd/dnsclient/dnsclient.go index 87bb29e..2bc5cb3 100644 --- a/cmd/dnsclient/dnsclient.go +++ b/cmd/dnsclient/dnsclient.go @@ -10,7 +10,7 @@ import ( "os" "strings" - dns01 "git.coolaj86.com/coolaj86/go-telebitd/mplexer/dns01" + dns01 "git.rootprojects.org/root/telebit/dns01" jwt "github.com/dgrijalva/jwt-go" "github.com/go-acme/lego/v3/challenge" diff --git a/cmd/machineid/machineid.go b/cmd/machineid/machineid.go index daf1c62..d819e9c 100644 --- a/cmd/machineid/machineid.go +++ b/cmd/machineid/machineid.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" + "git.rootprojects.org/root/telebit/mgmt/authstore" "github.com/denisbrodbeck/machineid" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/mgmt/devices.go b/cmd/mgmt/devices.go index 0151dd8..d67819e 100644 --- a/cmd/mgmt/devices.go +++ b/cmd/mgmt/devices.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" + "git.rootprojects.org/root/telebit/mgmt/authstore" "github.com/go-chi/chi" ) diff --git a/cmd/mgmt/mgmt.go b/cmd/mgmt/mgmt.go index 9ab082b..9ccaab0 100644 --- a/cmd/mgmt/mgmt.go +++ b/cmd/mgmt/mgmt.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" + "git.rootprojects.org/root/telebit/mgmt/authstore" "github.com/go-acme/lego/v3/challenge" "github.com/go-acme/lego/v3/providers/dns/duckdns" diff --git a/cmd/mgmt/route.go b/cmd/mgmt/route.go index c3d1a6f..424b611 100644 --- a/cmd/mgmt/route.go +++ b/cmd/mgmt/route.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" + "git.rootprojects.org/root/telebit/mgmt/authstore" "github.com/dgrijalva/jwt-go" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" diff --git a/cmd/signjwt/signjwt.go b/cmd/signjwt/signjwt.go index 91417ae..60be393 100644 --- a/cmd/signjwt/signjwt.go +++ b/cmd/signjwt/signjwt.go @@ -10,8 +10,8 @@ import ( "os" "strconv" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" + "git.rootprojects.org/root/telebit/mgmt/authstore" + telebit "git.rootprojects.org/root/telebit" "github.com/denisbrodbeck/machineid" _ "github.com/joho/godotenv/autoload" diff --git a/cmd/sqlstore/sqlstore.go b/cmd/sqlstore/sqlstore.go index 8ac2c4c..b33d474 100644 --- a/cmd/sqlstore/sqlstore.go +++ b/cmd/sqlstore/sqlstore.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" + "git.rootprojects.org/root/telebit/mgmt/authstore" ) func main() { diff --git a/cmd/telebit/admin.go b/cmd/telebit/admin.go index 6cf6ae2..6b5cb15 100644 --- a/cmd/telebit/admin.go +++ b/cmd/telebit/admin.go @@ -8,9 +8,9 @@ import ( "net/http" "sync" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" - "git.coolaj86.com/coolaj86/go-telebitd/mplexer/admin" - "git.coolaj86.com/coolaj86/go-telebitd/table" + telebit "git.rootprojects.org/root/telebit" + "git.rootprojects.org/root/telebit/admin" + "git.rootprojects.org/root/telebit/table" "github.com/go-chi/chi" "github.com/gorilla/websocket" diff --git a/cmd/telebit/authorizer.go b/cmd/telebit/authorizer.go index 07eeeb1..943e534 100644 --- a/cmd/telebit/authorizer.go +++ b/cmd/telebit/authorizer.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" + telebit "git.rootprojects.org/root/telebit" ) func NewAuthorizer(authURL string) telebit.Authorizer { diff --git a/cmd/telebit/telebit.go b/cmd/telebit/telebit.go index ba79069..33000e1 100644 --- a/cmd/telebit/telebit.go +++ b/cmd/telebit/telebit.go @@ -18,13 +18,13 @@ import ( "strings" "time" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" - tbDns01 "git.coolaj86.com/coolaj86/go-telebitd/mplexer/dns01" - "git.coolaj86.com/coolaj86/go-telebitd/table" - httpshim "git.coolaj86.com/coolaj86/go-telebitd/tunnel" + "git.rootprojects.org/root/telebit/dbg" + "git.rootprojects.org/root/telebit/mgmt" + "git.rootprojects.org/root/telebit/mgmt/authstore" + telebit "git.rootprojects.org/root/telebit" + tbDns01 "git.rootprojects.org/root/telebit/dns01" + "git.rootprojects.org/root/telebit/table" + httpshim "git.rootprojects.org/root/telebit/tunnel" legoDns01 "github.com/go-acme/lego/v3/challenge/dns01" "github.com/caddyserver/certmagic" diff --git a/cmd/wsconnect/wsconnect.go b/cmd/wsconnect/wsconnect.go index 0fad0ab..b210d19 100644 --- a/cmd/wsconnect/wsconnect.go +++ b/cmd/wsconnect/wsconnect.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" + "git.rootprojects.org/root/telebit/mgmt" + "git.rootprojects.org/root/telebit/mgmt/authstore" + telebit "git.rootprojects.org/root/telebit" "github.com/denisbrodbeck/machineid" "github.com/gorilla/websocket" diff --git a/cmd/wsserve/wsserve.go b/cmd/wsserve/wsserve.go index e5f2f83..3ea68b1 100644 --- a/cmd/wsserve/wsserve.go +++ b/cmd/wsserve/wsserve.go @@ -14,9 +14,9 @@ import ( "sync" "time" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" - tbDns01 "git.coolaj86.com/coolaj86/go-telebitd/mplexer/dns01" - "git.coolaj86.com/coolaj86/go-telebitd/table" + telebit "git.rootprojects.org/root/telebit" + tbDns01 "git.rootprojects.org/root/telebit/dns01" + "git.rootprojects.org/root/telebit/table" "github.com/caddyserver/certmagic" "github.com/dgrijalva/jwt-go" diff --git a/mplexer/conn.go b/conn.go similarity index 100% rename from mplexer/conn.go rename to conn.go diff --git a/mplexer/connwrap.go b/connwrap.go similarity index 98% rename from mplexer/connwrap.go rename to connwrap.go index 12c29a6..2e7c19f 100644 --- a/mplexer/connwrap.go +++ b/connwrap.go @@ -6,8 +6,8 @@ import ( "net" "time" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" - "git.coolaj86.com/coolaj86/go-telebitd/sni" + "git.rootprojects.org/root/telebit/dbg" + "git.rootprojects.org/root/telebit/sni" ) // ConnWrap is just a cheap way to DRY up some switch conn.(type) statements to handle special features of Conn diff --git a/debug.sh b/debug.sh deleted file mode 100755 index 658256d..0000000 --- a/debug.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -godebug build -instrument \ - git.coolaj86.com/coolaj86/go-telebitd/connection,git.coolaj86.com/coolaj86/go-telebitd/connection \ - -o debug . diff --git a/mplexer/decoder.go b/decoder.go similarity index 97% rename from mplexer/decoder.go rename to decoder.go index 4327ec0..1eca398 100644 --- a/mplexer/decoder.go +++ b/decoder.go @@ -5,7 +5,7 @@ import ( "io" "log" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" ) // Decoder handles a Reader stream containing mplexy-encoded clients diff --git a/mplexer/decoder_test.go b/decoder_test.go similarity index 100% rename from mplexer/decoder_test.go rename to decoder_test.go diff --git a/mplexer/dns01/LICENSE b/dns01/LICENSE similarity index 100% rename from mplexer/dns01/LICENSE rename to dns01/LICENSE diff --git a/mplexer/dns01/dns01.go b/dns01/dns01.go similarity index 100% rename from mplexer/dns01/dns01.go rename to dns01/dns01.go diff --git a/mplexer/dns01/dns01_test.go b/dns01/dns01_test.go similarity index 100% rename from mplexer/dns01/dns01_test.go rename to dns01/dns01_test.go diff --git a/mplexer/encoder.go b/encoder.go similarity index 98% rename from mplexer/encoder.go rename to encoder.go index cafd67a..03b5a8d 100644 --- a/mplexer/encoder.go +++ b/encoder.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" ) // TODO: try to be more like encoding/csv, or more like encoding/pem and encoding/json? diff --git a/mplexer/encoder_test.go b/encoder_test.go similarity index 100% rename from mplexer/encoder_test.go rename to encoder_test.go diff --git a/mplexer/files/assets.go b/files/assets.go similarity index 54% rename from mplexer/files/assets.go rename to files/assets.go index 0a9c66b..66808f3 100644 --- a/mplexer/files/assets.go +++ b/files/assets.go @@ -1,4 +1,4 @@ // +build !dev -//go:generate go run -mod vendor github.com/shurcooL/vfsgen/cmd/vfsgendev -source="git.coolaj86.com/coolaj86/go-telebitd/mplexer/files".Assets +//go:generate go run -mod vendor github.com/shurcooL/vfsgen/cmd/vfsgendev -source="git.rootprojects.org/root/telebit/files".Assets package files diff --git a/mplexer/files/assets/init.sql b/files/assets/init.sql similarity index 100% rename from mplexer/files/assets/init.sql rename to files/assets/init.sql diff --git a/mplexer/files/assets_dev.go b/files/assets_dev.go similarity index 100% rename from mplexer/files/assets_dev.go rename to files/assets_dev.go diff --git a/mplexer/files/files.go b/files/files.go similarity index 100% rename from mplexer/files/files.go rename to files/files.go diff --git a/go.mod b/go.mod index 02620f8..961c77d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.coolaj86.com/coolaj86/go-telebitd +module git.rootprojects.org/root/telebit go 1.14 diff --git a/mplexer/listener.go b/listener.go similarity index 100% rename from mplexer/listener.go rename to listener.go diff --git a/mplexer/mgmt-active.sh b/mgmt-active.sh similarity index 100% rename from mplexer/mgmt-active.sh rename to mgmt-active.sh diff --git a/mplexer/mgmt-prereg.sh b/mgmt-prereg.sh similarity index 100% rename from mplexer/mgmt-prereg.sh rename to mgmt-prereg.sh diff --git a/mplexer/mgmt.sh b/mgmt.sh similarity index 100% rename from mplexer/mgmt.sh rename to mgmt.sh diff --git a/mgmt/auth.go b/mgmt/auth.go index 820ad29..ddb2542 100644 --- a/mgmt/auth.go +++ b/mgmt/auth.go @@ -6,9 +6,9 @@ import ( "fmt" "io/ioutil" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" - "git.coolaj86.com/coolaj86/go-telebitd/mgmt/authstore" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" + "git.rootprojects.org/root/telebit/dbg" + "git.rootprojects.org/root/telebit/mgmt/authstore" + telebit "git.rootprojects.org/root/telebit" ) type SuccessResponse struct { diff --git a/mgmt/authstore/authstore.go b/mgmt/authstore/authstore.go index 42473bd..d4a3080 100644 --- a/mgmt/authstore/authstore.go +++ b/mgmt/authstore/authstore.go @@ -9,7 +9,7 @@ import ( "os" "time" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" jwt "github.com/dgrijalva/jwt-go" ) diff --git a/mgmt/authstore/postgresql.go b/mgmt/authstore/postgresql.go index 2bcb65f..4f54877 100644 --- a/mgmt/authstore/postgresql.go +++ b/mgmt/authstore/postgresql.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "time" - "git.coolaj86.com/coolaj86/go-telebitd/mplexer/files" + "git.rootprojects.org/root/telebit/files" "github.com/jmoiron/sqlx" // pq injects itself into sql as 'postgres' diff --git a/mplexer/packer.go b/packer.go similarity index 100% rename from mplexer/packer.go rename to packer.go diff --git a/mplexer/packer_test.go b/packer_test.go similarity index 100% rename from mplexer/packer_test.go rename to packer_test.go diff --git a/mplexer/parser.go b/parser.go similarity index 97% rename from mplexer/parser.go rename to parser.go index d96970c..afc9d74 100644 --- a/mplexer/parser.go +++ b/parser.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" ) type Parser struct { diff --git a/mplexer/parser_test.go b/parser_test.go similarity index 100% rename from mplexer/parser_test.go rename to parser_test.go diff --git a/mplexer/routemux.go b/routemux.go similarity index 100% rename from mplexer/routemux.go rename to routemux.go diff --git a/table/table.go b/table/table.go index c465324..cd5d131 100644 --- a/table/table.go +++ b/table/table.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" - telebit "git.coolaj86.com/coolaj86/go-telebitd/mplexer" + "git.rootprojects.org/root/telebit/dbg" + telebit "git.rootprojects.org/root/telebit" "github.com/gorilla/websocket" ) diff --git a/mplexer/telebit.go b/telebit.go similarity index 100% rename from mplexer/telebit.go rename to telebit.go diff --git a/mplexer/v1.go b/v1.go similarity index 99% rename from mplexer/v1.go rename to v1.go index fa84d6b..3bb0f1d 100644 --- a/mplexer/v1.go +++ b/v1.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" ) const ( diff --git a/mplexer/websockettunnel.go b/websocket.go similarity index 99% rename from mplexer/websockettunnel.go rename to websocket.go index 1f424e6..b93e478 100644 --- a/mplexer/websockettunnel.go +++ b/websocket.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.coolaj86.com/coolaj86/go-telebitd/dbg" + "git.rootprojects.org/root/telebit/dbg" "github.com/gorilla/websocket" )