Skip to content

Commit

Permalink
migrate to new org
Browse files Browse the repository at this point in the history
  • Loading branch information
@ingon
ingon committed Dec 29, 2024
1 parent 516ba34 commit ca81b38
Show file tree
Hide file tree
Showing 36 changed files with 117 additions and 117 deletions.
20 changes: 10 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default: all
all: build test

build:
go install -v github.com/keihaya-com/connet/cmd/...
go install -v github.com/connet-dev/connet/cmd/...

test:
go test -v -cover -timeout 10s ./...
Expand All @@ -15,7 +15,7 @@ test-always:

gen:
fd --extension ".pb.go" . --exec-batch rm {}
protoc --proto_path=pb/ --proto_path=pbs/ --proto_path=pbc/ --proto_path=pbr/ --go_opt=module=github.com/keihaya-com/connet --go_out=./ pb/*.proto pbs/*.proto pbc/*.proto pbr/*.proto
protoc --proto_path=pb/ --proto_path=pbs/ --proto_path=pbc/ --proto_path=pbr/ --go_opt=module=github.com/connet-dev/connet --go_out=./ pb/*.proto pbs/*.proto pbc/*.proto pbr/*.proto

.PHONY: run-server run-client run-sws
run-server: all
Expand All @@ -42,14 +42,14 @@ release-clean:
rm -rf dist/

release-build:
GOOS=darwin GOARCH=amd64 go build -v -o dist/build/darwin-amd64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=darwin GOARCH=arm64 go build -v -o dist/build/darwin-arm64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=linux GOARCH=amd64 go build -v -o dist/build/linux-amd64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=linux GOARCH=arm64 go build -v -o dist/build/linux-arm64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=freebsd GOARCH=amd64 go build -v -o dist/build/freebsd-amd64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=freebsd GOARCH=arm64 go build -v -o dist/build/freebsd-arm64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=windows GOARCH=amd64 go build -v -o dist/build/windows-amd64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=windows GOARCH=arm64 go build -v -o dist/build/windows-arm64/connet github.com/keihaya-com/connet/cmd/connet
GOOS=darwin GOARCH=amd64 go build -v -o dist/build/darwin-amd64/connet github.com/connet-dev/connet/cmd/connet
GOOS=darwin GOARCH=arm64 go build -v -o dist/build/darwin-arm64/connet github.com/connet-dev/connet/cmd/connet
GOOS=linux GOARCH=amd64 go build -v -o dist/build/linux-amd64/connet github.com/connet-dev/connet/cmd/connet
GOOS=linux GOARCH=arm64 go build -v -o dist/build/linux-arm64/connet github.com/connet-dev/connet/cmd/connet
GOOS=freebsd GOARCH=amd64 go build -v -o dist/build/freebsd-amd64/connet github.com/connet-dev/connet/cmd/connet
GOOS=freebsd GOARCH=arm64 go build -v -o dist/build/freebsd-arm64/connet github.com/connet-dev/connet/cmd/connet
GOOS=windows GOARCH=amd64 go build -v -o dist/build/windows-amd64/connet github.com/connet-dev/connet/cmd/connet
GOOS=windows GOARCH=arm64 go build -v -o dist/build/windows-arm64/connet github.com/connet-dev/connet/cmd/connet

release-version := $(shell git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)

Expand Down
12 changes: 6 additions & 6 deletions client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"strings"
"time"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/client"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/netc"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/client"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/netc"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbs"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
10 changes: 5 additions & 5 deletions client/destination.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net"
"net/netip"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/netc"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbc"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/netc"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbc"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
2 changes: 1 addition & 1 deletion client/direct.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync/atomic"
"time"

"github.com/keihaya-com/connet/certc"
"github.com/connet-dev/connet/certc"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
10 changes: 5 additions & 5 deletions client/peer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"maps"
"net/netip"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/notify"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/notify"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbs"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
)
Expand Down
6 changes: 3 additions & 3 deletions client/peer_control.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package client
import (
"context"

"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbs"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
12 changes: 6 additions & 6 deletions client/peer_direct.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"net/netip"
"time"

"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/netc"
"github.com/keihaya-com/connet/notify"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbc"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/netc"
"github.com/connet-dev/connet/notify"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbc"
"github.com/connet-dev/connet/pbs"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
8 changes: 4 additions & 4 deletions client/peer_relay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"sync/atomic"
"time"

"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/netc"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/netc"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbc"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
10 changes: 5 additions & 5 deletions client/source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"slices"
"sync/atomic"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/netc"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbc"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/netc"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbc"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"golang.org/x/sync/errgroup"
Expand Down
10 changes: 5 additions & 5 deletions cmd/connet/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"os/signal"
"syscall"

"github.com/keihaya-com/connet"
"github.com/keihaya-com/connet/control"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/relay"
"github.com/keihaya-com/connet/selfhosted"
"github.com/connet-dev/connet"
"github.com/connet-dev/connet/control"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/relay"
"github.com/connet-dev/connet/selfhosted"
"github.com/klev-dev/kleverr"
"github.com/pelletier/go-toml/v2"
"github.com/spf13/cobra"
Expand Down
10 changes: 5 additions & 5 deletions control/clients.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"slices"
"sync"

"github.com/keihaya-com/connet/logc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbc"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/logc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbc"
"github.com/connet-dev/connet/pbs"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"github.com/segmentio/ksuid"
Expand Down
10 changes: 5 additions & 5 deletions control/relays.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"maps"
"sync"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/logc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/pb"
"github.com/keihaya-com/connet/pbr"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/logc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/pb"
"github.com/connet-dev/connet/pbr"
"github.com/klev-dev/kleverr"
"github.com/quic-go/quic-go"
"github.com/segmentio/ksuid"
Expand Down
8 changes: 4 additions & 4 deletions control/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os"
"path/filepath"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/logc"
"github.com/keihaya-com/connet/model"
"github.com/keihaya-com/connet/pbs"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/logc"
"github.com/connet-dev/connet/model"
"github.com/connet-dev/connet/pbs"
"github.com/segmentio/ksuid"
)

Expand Down
4 changes: 2 additions & 2 deletions e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"testing"
"time"

"github.com/keihaya-com/connet/certc"
"github.com/keihaya-com/connet/model"
"github.com/connet-dev/connet/certc"
"github.com/connet-dev/connet/model"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/keihaya-com/connet
module github.com/connet-dev/connet

go 1.23.2

Expand Down
2 changes: 1 addition & 1 deletion model/forward.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"io"

"github.com/keihaya-com/connet/pb"
"github.com/connet-dev/connet/pb"
"github.com/mr-tron/base58"
)

Expand Down
2 changes: 1 addition & 1 deletion model/hostport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package model
import (
"fmt"

"github.com/keihaya-com/connet/pb"
"github.com/connet-dev/connet/pb"
)

type HostPort struct {
Expand Down
2 changes: 1 addition & 1 deletion model/role.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package model

import (
"github.com/keihaya-com/connet/pb"
"github.com/connet-dev/connet/pb"
"github.com/klev-dev/kleverr"
)

Expand Down
2 changes: 1 addition & 1 deletion package.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lib.fileset.trace sourceFiles

meta = with lib; {
description = "A reverse proxy, written in Golang";
homepage = "https://github.com/keihaya-com/connet";
homepage = "https://github.com/connet-dev/connet";
license = licenses.asl20;
mainProgram = "connet";
};
Expand Down
8 changes: 4 additions & 4 deletions pb/shared.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pb/shared.proto
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package shared;

option go_package = "github.com/keihaya-com/connet/pb";
option go_package = "github.com/connet-dev/connet/pb";

message Addr {
bytes v4 = 1;
Expand Down
10 changes: 5 additions & 5 deletions pbc/client.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pbc/client.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package client;
import "shared.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/keihaya-com/connet/pbc";
option go_package = "github.com/connet-dev/connet/pbc";

message Request {
// Soft one-of
Expand Down
2 changes: 1 addition & 1 deletion pbc/stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pbc
import (
"io"

"github.com/keihaya-com/connet/pb"
"github.com/connet-dev/connet/pb"
)

func ReadRequest(r io.Reader) (*Request, error) {
Expand Down
8 changes: 4 additions & 4 deletions pbr/relay.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pbr/relay.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package relay;

import "shared.proto";

option go_package = "github.com/keihaya-com/connet/pbr";
option go_package = "github.com/connet-dev/connet/pbr";

message AuthenticateReq {
string token = 1;
Expand Down
Loading

0 comments on commit ca81b38

Please sign in to comment.