flatten mplexer into telebit package

mplexer/admin/assets.go → 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

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"

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"

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"
 )
 

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"

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"

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"

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() {

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"

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 {

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"

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"

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"

mplexer/connwrap.go → 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

debug.sh

@@ -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 .

mplexer/decoder.go → 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

mplexer/encoder.go → 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?

mplexer/files/assets.go → 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

go.mod

@@ -1,4 +1,4 @@
-module git.coolaj86.com/coolaj86/go-telebitd
+module git.rootprojects.org/root/telebit
 
 go 1.14
 

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 {

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"
 )
 

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'

mplexer/parser.go → 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 {

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"
 )
 

mplexer/v1.go → v1.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.coolaj86.com/coolaj86/go-telebitd/dbg"
+	"git.rootprojects.org/root/telebit/dbg"
 )
 
 const (

mplexer/websockettunnel.go → 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"
 )