Update go mod and imports to v2

README.md

@@ -78,7 +78,7 @@ docker run -p 1883:1883 -p 1882:1882 -p 8080:8080 mochi:latest
 Importing Mochi MQTT as a package requires just a few lines of code to get started.
 ``` go
 import (
-  "github.com/mochi-co/mqtt"
+  "github.com/mochi-co/mqtt/v2"
 )
 
 func main() {

clients.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/rs/xid"
 
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 const (

clients_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/stretchr/testify/require"
 )

cmd/main.go

@@ -10,9 +10,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

examples/auth/basic/main.go

@@ -9,9 +9,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

examples/auth/encoded/main.go

@@ -10,9 +10,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

examples/debug/main.go

@@ -9,10 +9,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/hooks/debug"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/hooks/debug"
+	"github.com/mochi-co/mqtt/v2/listeners"
 	"github.com/rs/zerolog"
 )
 

examples/hooks/main.go

@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 func main() {

examples/paho.testing/main.go

@@ -10,9 +10,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/listeners"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/listeners"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 func main() {

examples/persistence/badger/main.go

@@ -9,10 +9,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/hooks/storage/badger"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/hooks/storage/badger"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

examples/persistence/bolt/main.go

@@ -10,10 +10,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/hooks/storage/bolt"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/hooks/storage/bolt"
+	"github.com/mochi-co/mqtt/v2/listeners"
 	"go.etcd.io/bbolt"
 )
 

examples/persistence/redis/main.go

@@ -9,10 +9,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/hooks/storage/redis"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/hooks/storage/redis"
+	"github.com/mochi-co/mqtt/v2/listeners"
 	"github.com/rs/zerolog"
 
 	rv8 "github.com/go-redis/redis/v8"

examples/tcp/main.go

@@ -9,9 +9,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

examples/tls/main.go

@@ -10,9 +10,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 var (

examples/websocket/main.go

@@ -9,9 +9,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/auth"
-	"github.com/mochi-co/mqtt/listeners"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/auth"
+	"github.com/mochi-co/mqtt/v2/listeners"
 )
 
 func main() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/mochi-co/mqtt
+module github.com/mochi-co/mqtt/v2
 
 go 1.19
 

hooks.go

@@ -9,9 +9,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/rs/zerolog"
 )

hooks/auth/allow_all.go

@@ -6,8 +6,8 @@ package auth
 import (
 	"bytes"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 // AllowHook is an authentication hook which allows connection access

hooks/auth/allow_all_test.go

@@ -6,8 +6,8 @@ package auth
 import (
 	"testing"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"github.com/stretchr/testify/require"
 )
 

hooks/auth/auth.go

@@ -6,8 +6,8 @@ package auth
 import (
 	"bytes"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 // Options contains the configuration/rules data for the auth ledger.

hooks/auth/auth_test.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 )

hooks/auth/ledger.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"gopkg.in/yaml.v3"
 )
 

hooks/auth/ledger_test.go

@@ -6,8 +6,8 @@ package auth
 import (
 	"testing"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"github.com/stretchr/testify/require"
 )
 

hooks/debug/debug.go

@@ -6,9 +6,9 @@ package debug
 import (
 	"strings"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
 
 	"github.com/rs/zerolog"
 )

hooks/storage/badger/badger.go

@@ -8,10 +8,10 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/timshannon/badgerhold"
 )

hooks/storage/badger/badger_test.go

@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"github.com/asdine/storm/v3"
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 	"github.com/timshannon/badgerhold"

hooks/storage/bolt/bolt.go

@@ -9,10 +9,10 @@ import (
 	"errors"
 	"time"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	sgob "github.com/asdine/storm/codec/gob"
 	"github.com/asdine/storm/v3"

hooks/storage/bolt/bolt_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/asdine/storm/v3"
 	"github.com/rs/zerolog"

hooks/storage/redis/redis.go

@@ -9,10 +9,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	redis "github.com/go-redis/redis/v8"
 )

hooks/storage/redis/redis_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt"
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	miniredis "github.com/alicebob/miniredis/v2"
 	redis "github.com/go-redis/redis/v8"

hooks/storage/storage.go

@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 )
 
 const (

hooks/storage/storage_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 	"github.com/stretchr/testify/require"
 )
 

hooks_test.go

@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/stretchr/testify/require"
 )

inflight.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 // Inflight is a map of InflightMessage keyed on packet id.

inflight_test.go

@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"github.com/stretchr/testify/require"
 )
 

listeners/http_sysinfo.go

@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/rs/zerolog"
 )

listeners/http_sysinfo_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/stretchr/testify/require"
 )

server.go

@@ -16,10 +16,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/listeners"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/listeners"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/rs/zerolog"
 )

server_test.go

@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mochi-co/mqtt/hooks/storage"
-	"github.com/mochi-co/mqtt/listeners"
-	"github.com/mochi-co/mqtt/packets"
-	"github.com/mochi-co/mqtt/system"
+	"github.com/mochi-co/mqtt/v2/hooks/storage"
+	"github.com/mochi-co/mqtt/v2/listeners"
+	"github.com/mochi-co/mqtt/v2/packets"
+	"github.com/mochi-co/mqtt/v2/system"
 
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"

topics.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2/packets"
 )
 
 var (

topics_test.go

@@ -6,7 +6,7 @@ package mqtt
 import (
 	"testing"
 
-	"github.com/mochi-co/mqtt/packets"
+	"github.com/mochi-co/mqtt/v2/packets"
 	"github.com/stretchr/testify/require"
 )