diff --git a/cmd/generatego/main-generatego.go b/cmd/generatego/main-generatego.go index f98fb9efc..9b45b59e3 100644 --- a/cmd/generatego/main-generatego.go +++ b/cmd/generatego/main-generatego.go @@ -9,11 +9,11 @@ import ( "reflect" "strings" - "github.com/wavetermdev/thenextwave/pkg/gogen" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/gogen" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) const WshClientFileName = "pkg/wshrpc/wshclient/wshclient.go" @@ -24,10 +24,10 @@ func GenerateWshClient() { fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName) var buf strings.Builder gogen.GenerateBoilerplate(&buf, "wshclient", []string{ - "github.com/wavetermdev/thenextwave/pkg/wshutil", - "github.com/wavetermdev/thenextwave/pkg/wshrpc", - "github.com/wavetermdev/thenextwave/pkg/waveobj", - "github.com/wavetermdev/thenextwave/pkg/wconfig", + "github.com/wavetermdev/waveterm/pkg/wshutil", + "github.com/wavetermdev/waveterm/pkg/wshrpc", + "github.com/wavetermdev/waveterm/pkg/waveobj", + "github.com/wavetermdev/waveterm/pkg/wconfig", }) wshDeclMap := wshrpc.GenerateWshCommandDeclMap() for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) { diff --git a/cmd/generatets/main-generatets.go b/cmd/generatets/main-generatets.go index 9014ef28e..d1db0cc74 100644 --- a/cmd/generatets/main-generatets.go +++ b/cmd/generatets/main-generatets.go @@ -10,10 +10,10 @@ import ( "sort" "strings" - "github.com/wavetermdev/thenextwave/pkg/service" - "github.com/wavetermdev/thenextwave/pkg/tsgen" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/service" + "github.com/wavetermdev/waveterm/pkg/tsgen" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) func generateTypesFile(tsTypesMap map[reflect.Type]string) error { diff --git a/cmd/server/main-server.go b/cmd/server/main-server.go index 0fd1a2234..ee2b4eb2b 100644 --- a/cmd/server/main-server.go +++ b/cmd/server/main-server.go @@ -17,24 +17,24 @@ import ( "syscall" "time" - "github.com/wavetermdev/thenextwave/pkg/authkey" - "github.com/wavetermdev/thenextwave/pkg/blockcontroller" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/service" - "github.com/wavetermdev/thenextwave/pkg/telemetry" - "github.com/wavetermdev/thenextwave/pkg/util/shellutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wcloud" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/web" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" - "github.com/wavetermdev/thenextwave/pkg/wshutil" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/authkey" + "github.com/wavetermdev/waveterm/pkg/blockcontroller" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/service" + "github.com/wavetermdev/waveterm/pkg/telemetry" + "github.com/wavetermdev/waveterm/pkg/util/shellutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wcloud" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/web" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver" + "github.com/wavetermdev/waveterm/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wstore" ) // these are set at build time diff --git a/cmd/test/test-main.go b/cmd/test/test-main.go index 15264ec33..10d1933fe 100644 --- a/cmd/test/test-main.go +++ b/cmd/test/test-main.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/wavetermdev/thenextwave/pkg/vdom" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/vdom" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) func Page(ctx context.Context, props map[string]any) any { diff --git a/cmd/wsh/cmd/wshcmd-conn.go b/cmd/wsh/cmd/wshcmd-conn.go index 582d6c48a..2158289cd 100644 --- a/cmd/wsh/cmd/wshcmd-conn.go +++ b/cmd/wsh/cmd/wshcmd-conn.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/remote" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/remote" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var connCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-connserver.go b/cmd/wsh/cmd/wshcmd-connserver.go index f9cc5d651..c18e1022f 100644 --- a/cmd/wsh/cmd/wshcmd-connserver.go +++ b/cmd/wsh/cmd/wshcmd-connserver.go @@ -7,7 +7,7 @@ import ( "os" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote" ) var serverCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-deleteblock.go b/cmd/wsh/cmd/wshcmd-deleteblock.go index 7a280cf30..6d30d272b 100644 --- a/cmd/wsh/cmd/wshcmd-deleteblock.go +++ b/cmd/wsh/cmd/wshcmd-deleteblock.go @@ -5,7 +5,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) var deleteBlockCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-editor.go b/cmd/wsh/cmd/wshcmd-editor.go index 4e2fb7643..079532a3b 100644 --- a/cmd/wsh/cmd/wshcmd-editor.go +++ b/cmd/wsh/cmd/wshcmd-editor.go @@ -9,9 +9,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var editMagnified bool diff --git a/cmd/wsh/cmd/wshcmd-getmeta.go b/cmd/wsh/cmd/wshcmd-getmeta.go index 82db28a87..d85cfef45 100644 --- a/cmd/wsh/cmd/wshcmd-getmeta.go +++ b/cmd/wsh/cmd/wshcmd-getmeta.go @@ -7,8 +7,8 @@ import ( "encoding/json" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var getMetaCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-html.go b/cmd/wsh/cmd/wshcmd-html.go index 5ed7198d5..84fb2b32c 100644 --- a/cmd/wsh/cmd/wshcmd-html.go +++ b/cmd/wsh/cmd/wshcmd-html.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) func init() { diff --git a/cmd/wsh/cmd/wshcmd-rcfiles.go b/cmd/wsh/cmd/wshcmd-rcfiles.go index ccedda617..e175bfeee 100644 --- a/cmd/wsh/cmd/wshcmd-rcfiles.go +++ b/cmd/wsh/cmd/wshcmd-rcfiles.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/util/shellutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/util/shellutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" ) var WshBinDir = ".waveterm/bin" diff --git a/cmd/wsh/cmd/wshcmd-readfile.go b/cmd/wsh/cmd/wshcmd-readfile.go index f9d2621fa..ccda2798c 100644 --- a/cmd/wsh/cmd/wshcmd-readfile.go +++ b/cmd/wsh/cmd/wshcmd-readfile.go @@ -7,8 +7,8 @@ import ( "encoding/base64" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var readFileCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-root.go b/cmd/wsh/cmd/wshcmd-root.go index 784a9e203..9d8c746c5 100644 --- a/cmd/wsh/cmd/wshcmd-root.go +++ b/cmd/wsh/cmd/wshcmd-root.go @@ -16,10 +16,10 @@ import ( "github.com/google/uuid" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) var ( diff --git a/cmd/wsh/cmd/wshcmd-setconfig.go b/cmd/wsh/cmd/wshcmd-setconfig.go index aa5e85463..7c859e20a 100644 --- a/cmd/wsh/cmd/wshcmd-setconfig.go +++ b/cmd/wsh/cmd/wshcmd-setconfig.go @@ -5,9 +5,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var setConfigCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-setmeta.go b/cmd/wsh/cmd/wshcmd-setmeta.go index e32d28d2c..c68041b68 100644 --- a/cmd/wsh/cmd/wshcmd-setmeta.go +++ b/cmd/wsh/cmd/wshcmd-setmeta.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) var setMetaCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-shell-unix.go b/cmd/wsh/cmd/wshcmd-shell-unix.go index 4f48477c1..4d33b2ec1 100644 --- a/cmd/wsh/cmd/wshcmd-shell-unix.go +++ b/cmd/wsh/cmd/wshcmd-shell-unix.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/util/shellutil" + "github.com/wavetermdev/waveterm/pkg/util/shellutil" ) func init() { diff --git a/cmd/wsh/cmd/wshcmd-ssh.go b/cmd/wsh/cmd/wshcmd-ssh.go index 4a60e5e05..980479918 100644 --- a/cmd/wsh/cmd/wshcmd-ssh.go +++ b/cmd/wsh/cmd/wshcmd-ssh.go @@ -5,9 +5,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var sshCmd = &cobra.Command{ diff --git a/cmd/wsh/cmd/wshcmd-term.go b/cmd/wsh/cmd/wshcmd-term.go index 066e0e942..7cd3288bb 100644 --- a/cmd/wsh/cmd/wshcmd-term.go +++ b/cmd/wsh/cmd/wshcmd-term.go @@ -8,10 +8,10 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" ) var termMagnified bool diff --git a/cmd/wsh/cmd/wshcmd-version.go b/cmd/wsh/cmd/wshcmd-version.go index a782cf1a7..fadbcd8ec 100644 --- a/cmd/wsh/cmd/wshcmd-version.go +++ b/cmd/wsh/cmd/wshcmd-version.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wavebase" ) func init() { diff --git a/cmd/wsh/cmd/wshcmd-view.go b/cmd/wsh/cmd/wshcmd-view.go index 2d6bdf09e..0a14f0321 100644 --- a/cmd/wsh/cmd/wshcmd-view.go +++ b/cmd/wsh/cmd/wshcmd-view.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) var viewMagnified bool diff --git a/cmd/wsh/main-wsh.go b/cmd/wsh/main-wsh.go index 97a54af6a..cbf262f06 100644 --- a/cmd/wsh/main-wsh.go +++ b/cmd/wsh/main-wsh.go @@ -4,8 +4,8 @@ package main import ( - "github.com/wavetermdev/thenextwave/cmd/wsh/cmd" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/cmd/wsh/cmd" + "github.com/wavetermdev/waveterm/pkg/wavebase" ) // set by main-server.go diff --git a/go.mod b/go.mod index 43e823fc5..d4459799f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/wavetermdev/thenextwave +module github.com/wavetermdev/waveterm go 1.22.4 diff --git a/pkg/blockcontroller/blockcontroller.go b/pkg/blockcontroller/blockcontroller.go index 8156f8317..5dc3e591d 100644 --- a/pkg/blockcontroller/blockcontroller.go +++ b/pkg/blockcontroller/blockcontroller.go @@ -14,17 +14,17 @@ import ( "sync" "time" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/remote" - "github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" - "github.com/wavetermdev/thenextwave/pkg/shellexec" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/remote" + "github.com/wavetermdev/waveterm/pkg/remote/conncontroller" + "github.com/wavetermdev/waveterm/pkg/shellexec" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wstore" ) const ( diff --git a/pkg/eventbus/eventbus.go b/pkg/eventbus/eventbus.go index cf15c1508..d5313074c 100644 --- a/pkg/eventbus/eventbus.go +++ b/pkg/eventbus/eventbus.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/waveobj" ) const ( diff --git a/pkg/filestore/blockstore.go b/pkg/filestore/blockstore.go index fc95cec8b..60980fb9e 100644 --- a/pkg/filestore/blockstore.go +++ b/pkg/filestore/blockstore.go @@ -17,7 +17,7 @@ import ( "sync/atomic" "time" - "github.com/wavetermdev/thenextwave/pkg/ijson" + "github.com/wavetermdev/waveterm/pkg/ijson" ) const ( diff --git a/pkg/filestore/blockstore_dbops.go b/pkg/filestore/blockstore_dbops.go index b1b4f0441..6338d417f 100644 --- a/pkg/filestore/blockstore_dbops.go +++ b/pkg/filestore/blockstore_dbops.go @@ -9,7 +9,7 @@ import ( "io/fs" "os" - "github.com/wavetermdev/thenextwave/pkg/util/dbutil" + "github.com/wavetermdev/waveterm/pkg/util/dbutil" ) // can return fs.ErrExist diff --git a/pkg/filestore/blockstore_dbsetup.go b/pkg/filestore/blockstore_dbsetup.go index 11bf1fd11..d828c4173 100644 --- a/pkg/filestore/blockstore_dbsetup.go +++ b/pkg/filestore/blockstore_dbsetup.go @@ -13,14 +13,14 @@ import ( "path/filepath" "time" - "github.com/wavetermdev/thenextwave/pkg/util/migrateutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/util/migrateutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" "github.com/sawka/txwrap" - dbfs "github.com/wavetermdev/thenextwave/db" + dbfs "github.com/wavetermdev/waveterm/db" ) const FilestoreDBName = "filestore.db" diff --git a/pkg/filestore/blockstore_test.go b/pkg/filestore/blockstore_test.go index 0338e77f1..d137b13a2 100644 --- a/pkg/filestore/blockstore_test.go +++ b/pkg/filestore/blockstore_test.go @@ -17,7 +17,7 @@ import ( "time" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/ijson" + "github.com/wavetermdev/waveterm/pkg/ijson" ) func initDb(t *testing.T) { diff --git a/pkg/gogen/gogen.go b/pkg/gogen/gogen.go index eff2f83d7..13da6b40b 100644 --- a/pkg/gogen/gogen.go +++ b/pkg/gogen/gogen.go @@ -8,8 +8,8 @@ import ( "reflect" "strings" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) func GenerateBoilerplate(buf *strings.Builder, pkgName string, imports []string) { diff --git a/pkg/remote/conncontroller/conncontroller.go b/pkg/remote/conncontroller/conncontroller.go index e5d7ac738..d35109112 100644 --- a/pkg/remote/conncontroller/conncontroller.go +++ b/pkg/remote/conncontroller/conncontroller.go @@ -20,14 +20,14 @@ import ( "github.com/kevinburke/ssh_config" "github.com/skeema/knownhosts" - "github.com/wavetermdev/thenextwave/pkg/remote" - "github.com/wavetermdev/thenextwave/pkg/userinput" - "github.com/wavetermdev/thenextwave/pkg/util/shellutil" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/remote" + "github.com/wavetermdev/waveterm/pkg/userinput" + "github.com/wavetermdev/waveterm/pkg/util/shellutil" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" "golang.org/x/crypto/ssh" ) diff --git a/pkg/remote/sshclient.go b/pkg/remote/sshclient.go index b3f4f8e5e..4032519b1 100644 --- a/pkg/remote/sshclient.go +++ b/pkg/remote/sshclient.go @@ -23,8 +23,8 @@ import ( "github.com/kevinburke/ssh_config" "github.com/skeema/knownhosts" - "github.com/wavetermdev/thenextwave/pkg/userinput" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/userinput" + "github.com/wavetermdev/waveterm/pkg/wavebase" "golang.org/x/crypto/ssh" xknownhosts "golang.org/x/crypto/ssh/knownhosts" ) diff --git a/pkg/service/blockservice/blockservice.go b/pkg/service/blockservice/blockservice.go index 68163c380..8dc6d942f 100644 --- a/pkg/service/blockservice/blockservice.go +++ b/pkg/service/blockservice/blockservice.go @@ -9,12 +9,12 @@ import ( "fmt" "time" - "github.com/wavetermdev/thenextwave/pkg/blockcontroller" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/blockcontroller" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wstore" ) type BlockService struct{} diff --git a/pkg/service/clientservice/clientservice.go b/pkg/service/clientservice/clientservice.go index af0633d31..52da22ab4 100644 --- a/pkg/service/clientservice/clientservice.go +++ b/pkg/service/clientservice/clientservice.go @@ -8,13 +8,13 @@ import ( "fmt" "time" - "github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/wlayout" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/remote/conncontroller" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/wlayout" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wstore" ) type ClientService struct{} diff --git a/pkg/service/fileservice/fileservice.go b/pkg/service/fileservice/fileservice.go index 4172a90f8..b9c1cf662 100644 --- a/pkg/service/fileservice/fileservice.go +++ b/pkg/service/fileservice/fileservice.go @@ -9,13 +9,13 @@ import ( "io" "time" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) const MaxFileSize = 10 * 1024 * 1024 // 10M diff --git a/pkg/service/objectservice/objectservice.go b/pkg/service/objectservice/objectservice.go index e7bab8727..174333047 100644 --- a/pkg/service/objectservice/objectservice.go +++ b/pkg/service/objectservice/objectservice.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/wlayout" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/wlayout" + "github.com/wavetermdev/waveterm/pkg/wstore" ) type ObjectService struct{} diff --git a/pkg/service/service.go b/pkg/service/service.go index d06f83e43..ddbf21494 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -9,16 +9,16 @@ import ( "reflect" "strings" - "github.com/wavetermdev/thenextwave/pkg/service/blockservice" - "github.com/wavetermdev/thenextwave/pkg/service/clientservice" - "github.com/wavetermdev/thenextwave/pkg/service/fileservice" - "github.com/wavetermdev/thenextwave/pkg/service/objectservice" - "github.com/wavetermdev/thenextwave/pkg/service/userinputservice" - "github.com/wavetermdev/thenextwave/pkg/service/windowservice" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/web/webcmd" + "github.com/wavetermdev/waveterm/pkg/service/blockservice" + "github.com/wavetermdev/waveterm/pkg/service/clientservice" + "github.com/wavetermdev/waveterm/pkg/service/fileservice" + "github.com/wavetermdev/waveterm/pkg/service/objectservice" + "github.com/wavetermdev/waveterm/pkg/service/userinputservice" + "github.com/wavetermdev/waveterm/pkg/service/windowservice" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/web/webcmd" ) var ServiceMap = map[string]any{ diff --git a/pkg/service/userinputservice/userinputservice.go b/pkg/service/userinputservice/userinputservice.go index da1693bf1..1de7e4e4a 100644 --- a/pkg/service/userinputservice/userinputservice.go +++ b/pkg/service/userinputservice/userinputservice.go @@ -4,7 +4,7 @@ package userinputservice import ( - "github.com/wavetermdev/thenextwave/pkg/userinput" + "github.com/wavetermdev/waveterm/pkg/userinput" ) type UserInputService struct { diff --git a/pkg/service/windowservice/windowservice.go b/pkg/service/windowservice/windowservice.go index 2d644cfa1..f14245b59 100644 --- a/pkg/service/windowservice/windowservice.go +++ b/pkg/service/windowservice/windowservice.go @@ -9,14 +9,14 @@ import ( "log" "time" - "github.com/wavetermdev/thenextwave/pkg/blockcontroller" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/wlayout" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/blockcontroller" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/wlayout" + "github.com/wavetermdev/waveterm/pkg/wstore" ) const DefaultTimeout = 2 * time.Second diff --git a/pkg/shellexec/shellexec.go b/pkg/shellexec/shellexec.go index f23050100..75a45d096 100644 --- a/pkg/shellexec/shellexec.go +++ b/pkg/shellexec/shellexec.go @@ -18,12 +18,12 @@ import ( "time" "github.com/creack/pty" - "github.com/wavetermdev/thenextwave/pkg/remote" - "github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" - "github.com/wavetermdev/thenextwave/pkg/util/shellutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/remote" + "github.com/wavetermdev/waveterm/pkg/remote/conncontroller" + "github.com/wavetermdev/waveterm/pkg/util/shellutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) const DefaultGracefulKillWait = 400 * time.Millisecond diff --git a/pkg/telemetry/telemetry.go b/pkg/telemetry/telemetry.go index ae5e7ed7f..fda73313b 100644 --- a/pkg/telemetry/telemetry.go +++ b/pkg/telemetry/telemetry.go @@ -9,11 +9,11 @@ import ( "log" "time" - "github.com/wavetermdev/thenextwave/pkg/util/daystr" - "github.com/wavetermdev/thenextwave/pkg/util/dbutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/util/daystr" + "github.com/wavetermdev/waveterm/pkg/util/dbutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wstore" ) const MaxTzNameLen = 50 diff --git a/pkg/tsgen/tsgen.go b/pkg/tsgen/tsgen.go index 08b35a5bc..d25930d59 100644 --- a/pkg/tsgen/tsgen.go +++ b/pkg/tsgen/tsgen.go @@ -10,18 +10,18 @@ import ( "reflect" "strings" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/service" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/userinput" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/vdom" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/web/webcmd" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/service" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/userinput" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/vdom" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/web/webcmd" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) // add extra types to generate here diff --git a/pkg/userinput/userinput.go b/pkg/userinput/userinput.go index 76bd66a3d..e706762be 100644 --- a/pkg/userinput/userinput.go +++ b/pkg/userinput/userinput.go @@ -11,7 +11,7 @@ import ( "time" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/eventbus" ) var MainUserInputHandler = UserInputHandler{Channels: make(map[string](chan *UserInputResponse), 1)} diff --git a/pkg/util/daystr/daystr.go b/pkg/util/daystr/daystr.go index cb07a8436..cda6d9690 100644 --- a/pkg/util/daystr/daystr.go +++ b/pkg/util/daystr/daystr.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" ) var customDayStrRe = regexp.MustCompile(`^((?:\d{4}-\d{2}-\d{2})|today|yesterday|bom|bow)?((?:[+-]\d+[dwm])*)$`) diff --git a/pkg/util/shellutil/shellutil.go b/pkg/util/shellutil/shellutil.go index ac3cfdf22..c3b2bccb8 100644 --- a/pkg/util/shellutil/shellutil.go +++ b/pkg/util/shellutil/shellutil.go @@ -17,9 +17,9 @@ import ( "sync" "time" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" ) const DefaultTermType = "xterm-256color" diff --git a/pkg/waveai/waveai.go b/pkg/waveai/waveai.go index 093684e39..6a9e39e3d 100644 --- a/pkg/waveai/waveai.go +++ b/pkg/waveai/waveai.go @@ -13,9 +13,9 @@ import ( "time" openaiapi "github.com/sashabaranov/go-openai" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/wcloud" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wcloud" + "github.com/wavetermdev/waveterm/pkg/wshrpc" "github.com/gorilla/websocket" ) diff --git a/pkg/waveobj/waveobj.go b/pkg/waveobj/waveobj.go index 50fd86f8d..ba5931316 100644 --- a/pkg/waveobj/waveobj.go +++ b/pkg/waveobj/waveobj.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/mitchellh/mapstructure" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" ) const ( diff --git a/pkg/wcloud/wcloud.go b/pkg/wcloud/wcloud.go index 0b74bacee..43c60491f 100644 --- a/pkg/wcloud/wcloud.go +++ b/pkg/wcloud/wcloud.go @@ -17,9 +17,9 @@ import ( "strings" "time" - "github.com/wavetermdev/thenextwave/pkg/telemetry" - "github.com/wavetermdev/thenextwave/pkg/util/daystr" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/telemetry" + "github.com/wavetermdev/waveterm/pkg/util/daystr" + "github.com/wavetermdev/waveterm/pkg/wavebase" ) const WCloudEndpoint = "https://api.waveterm.dev/central" diff --git a/pkg/wcloud/wclouddata.go b/pkg/wcloud/wclouddata.go index 97d0a547c..8068b457f 100644 --- a/pkg/wcloud/wclouddata.go +++ b/pkg/wcloud/wclouddata.go @@ -4,7 +4,7 @@ package wcloud import ( - "github.com/wavetermdev/thenextwave/pkg/telemetry" + "github.com/wavetermdev/waveterm/pkg/telemetry" ) type NoTelemetryInputType struct { diff --git a/pkg/wconfig/filewatcher.go b/pkg/wconfig/filewatcher.go index 8eca08bfa..6694f140f 100644 --- a/pkg/wconfig/filewatcher.go +++ b/pkg/wconfig/filewatcher.go @@ -10,8 +10,8 @@ import ( "sync" "github.com/fsnotify/fsnotify" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/wavebase" ) const configDir = "config" diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go index 88a04f0c7..691e15983 100644 --- a/pkg/wconfig/settingsconfig.go +++ b/pkg/wconfig/settingsconfig.go @@ -13,9 +13,9 @@ import ( "sort" "strings" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig/defaultconfig" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig/defaultconfig" ) const SettingsFile = "settings.json" diff --git a/pkg/wcore/wcore.go b/pkg/wcore/wcore.go index c817f49bb..0b820bdcc 100644 --- a/pkg/wcore/wcore.go +++ b/pkg/wcore/wcore.go @@ -10,11 +10,11 @@ import ( "time" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/blockcontroller" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/blockcontroller" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wstore" ) // the wcore package coordinates actions across the storage layer diff --git a/pkg/web/web.go b/pkg/web/web.go index 406122e64..ab002504a 100644 --- a/pkg/web/web.go +++ b/pkg/web/web.go @@ -21,17 +21,17 @@ import ( "github.com/google/uuid" "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/wavetermdev/thenextwave/pkg/authkey" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/service" - "github.com/wavetermdev/thenextwave/pkg/telemetry" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" - "github.com/wavetermdev/thenextwave/pkg/wshutil" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/authkey" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/service" + "github.com/wavetermdev/waveterm/pkg/telemetry" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver" + "github.com/wavetermdev/waveterm/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wstore" ) type WebFnType = func(http.ResponseWriter, *http.Request) diff --git a/pkg/web/webcmd/webcmd.go b/pkg/web/webcmd/webcmd.go index 199c4bb18..a025c2626 100644 --- a/pkg/web/webcmd/webcmd.go +++ b/pkg/web/webcmd/webcmd.go @@ -7,10 +7,10 @@ import ( "fmt" "reflect" - "github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) const ( diff --git a/pkg/web/ws.go b/pkg/web/ws.go index e75d290b8..1965a8779 100644 --- a/pkg/web/ws.go +++ b/pkg/web/ws.go @@ -16,11 +16,11 @@ import ( "github.com/google/uuid" "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/wavetermdev/thenextwave/pkg/authkey" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/web/webcmd" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/authkey" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/web/webcmd" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) const wsReadWaitTimeout = 15 * time.Second diff --git a/pkg/wlayout/wlayout.go b/pkg/wlayout/wlayout.go index b68e8187e..2f7766b49 100644 --- a/pkg/wlayout/wlayout.go +++ b/pkg/wlayout/wlayout.go @@ -9,9 +9,9 @@ import ( "log" "time" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/wstore" ) const ( diff --git a/pkg/wps/wps.go b/pkg/wps/wps.go index fb13649e6..b896ad9f0 100644 --- a/pkg/wps/wps.go +++ b/pkg/wps/wps.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) // this broker interface is mostly generic diff --git a/pkg/wshrpc/wshclient/wshclient.go b/pkg/wshrpc/wshclient/wshclient.go index fa3fc7e06..e77652ba9 100644 --- a/pkg/wshrpc/wshclient/wshclient.go +++ b/pkg/wshrpc/wshclient/wshclient.go @@ -6,10 +6,10 @@ package wshclient import ( - "github.com/wavetermdev/thenextwave/pkg/wshutil" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig" ) // command "announce", wshserver.AnnounceCommand diff --git a/pkg/wshrpc/wshclient/wshclientutil.go b/pkg/wshrpc/wshclient/wshclientutil.go index 033a9e7f4..fcddbd7f8 100644 --- a/pkg/wshrpc/wshclient/wshclientutil.go +++ b/pkg/wshrpc/wshclient/wshclientutil.go @@ -6,9 +6,9 @@ package wshclient import ( "errors" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) func sendRpcRequestCallHelper[T any](w *wshutil.WshRpc, command string, data interface{}, opts *wshrpc.RpcOpts) (T, error) { diff --git a/pkg/wshrpc/wshremote/sysinfo.go b/pkg/wshrpc/wshremote/sysinfo.go index 8616f0b95..6f2ca65a0 100644 --- a/pkg/wshrpc/wshremote/sysinfo.go +++ b/pkg/wshrpc/wshremote/sysinfo.go @@ -10,9 +10,9 @@ import ( "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/mem" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) func getCpuData(values map[string]float64) { diff --git a/pkg/wshrpc/wshremote/wshremote.go b/pkg/wshrpc/wshremote/wshremote.go index 28c6a6280..c31513267 100644 --- a/pkg/wshrpc/wshremote/wshremote.go +++ b/pkg/wshrpc/wshremote/wshremote.go @@ -15,9 +15,9 @@ import ( "path/filepath" "strings" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) const MaxFileSize = 50 * 1024 * 1024 // 10M diff --git a/pkg/wshrpc/wshrpctypes.go b/pkg/wshrpc/wshrpctypes.go index a6d3dd15e..dea31b4ba 100644 --- a/pkg/wshrpc/wshrpctypes.go +++ b/pkg/wshrpc/wshrpctypes.go @@ -10,10 +10,10 @@ import ( "os" "reflect" - "github.com/wavetermdev/thenextwave/pkg/ijson" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/ijson" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig" ) const LocalConnName = "local" diff --git a/pkg/wshrpc/wshserver/wshserver.go b/pkg/wshrpc/wshserver/wshserver.go index e0a12005a..c496d6136 100644 --- a/pkg/wshrpc/wshserver/wshserver.go +++ b/pkg/wshrpc/wshserver/wshserver.go @@ -17,21 +17,21 @@ import ( "strings" "time" - "github.com/wavetermdev/thenextwave/pkg/blockcontroller" - "github.com/wavetermdev/thenextwave/pkg/eventbus" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/remote" - "github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" - "github.com/wavetermdev/thenextwave/pkg/waveai" - "github.com/wavetermdev/thenextwave/pkg/waveobj" - "github.com/wavetermdev/thenextwave/pkg/wconfig" - "github.com/wavetermdev/thenextwave/pkg/wcore" - "github.com/wavetermdev/thenextwave/pkg/wlayout" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" - "github.com/wavetermdev/thenextwave/pkg/wshutil" - "github.com/wavetermdev/thenextwave/pkg/wstore" + "github.com/wavetermdev/waveterm/pkg/blockcontroller" + "github.com/wavetermdev/waveterm/pkg/eventbus" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/remote" + "github.com/wavetermdev/waveterm/pkg/remote/conncontroller" + "github.com/wavetermdev/waveterm/pkg/waveai" + "github.com/wavetermdev/waveterm/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wconfig" + "github.com/wavetermdev/waveterm/pkg/wcore" + "github.com/wavetermdev/waveterm/pkg/wlayout" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" + "github.com/wavetermdev/waveterm/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wstore" ) const SimpleId_This = "this" diff --git a/pkg/wshrpc/wshserver/wshserverutil.go b/pkg/wshrpc/wshserver/wshserverutil.go index 333678e82..c70aa79bf 100644 --- a/pkg/wshrpc/wshserver/wshserverutil.go +++ b/pkg/wshrpc/wshserver/wshserverutil.go @@ -6,8 +6,8 @@ package wshserver import ( "sync" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" - "github.com/wavetermdev/thenextwave/pkg/wshutil" + "github.com/wavetermdev/waveterm/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshutil" ) const ( diff --git a/pkg/wshutil/wshadapter.go b/pkg/wshutil/wshadapter.go index b1eac1471..9f21fd300 100644 --- a/pkg/wshutil/wshadapter.go +++ b/pkg/wshutil/wshadapter.go @@ -8,8 +8,8 @@ import ( "reflect" "strings" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) var WshCommandDeclMap = wshrpc.GenerateWshCommandDeclMap() diff --git a/pkg/wshutil/wshevent.go b/pkg/wshutil/wshevent.go index 78968ad17..598078c30 100644 --- a/pkg/wshutil/wshevent.go +++ b/pkg/wshutil/wshevent.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) // event inverter. converts WaveEvents to a listener.On() API diff --git a/pkg/wshutil/wshproxy.go b/pkg/wshutil/wshproxy.go index 25102d5f5..c6a1ecf9f 100644 --- a/pkg/wshutil/wshproxy.go +++ b/pkg/wshutil/wshproxy.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) type WshRpcProxy struct { diff --git a/pkg/wshutil/wshrouter.go b/pkg/wshutil/wshrouter.go index 0d29d6776..2e7f201f3 100644 --- a/pkg/wshutil/wshrouter.go +++ b/pkg/wshutil/wshrouter.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/wavetermdev/thenextwave/pkg/wps" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wps" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) const DefaultRoute = "wavesrv" diff --git a/pkg/wshutil/wshrpc.go b/pkg/wshutil/wshrpc.go index 43dd1dab0..805932cd8 100644 --- a/pkg/wshutil/wshrpc.go +++ b/pkg/wshutil/wshrpc.go @@ -16,8 +16,8 @@ import ( "time" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/wshrpc" ) const DefaultTimeoutMs = 5000 diff --git a/pkg/wshutil/wshutil.go b/pkg/wshutil/wshutil.go index a1562e6af..926fa8353 100644 --- a/pkg/wshutil/wshutil.go +++ b/pkg/wshutil/wshutil.go @@ -19,8 +19,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/wshrpc" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/wshrpc" "golang.org/x/term" ) diff --git a/pkg/wstore/wstore.go b/pkg/wstore/wstore.go index c767fb53f..1c9824350 100644 --- a/pkg/wstore/wstore.go +++ b/pkg/wstore/wstore.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/google/uuid" - "github.com/wavetermdev/thenextwave/pkg/util/utilfn" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/util/utilfn" + "github.com/wavetermdev/waveterm/pkg/waveobj" ) func init() { diff --git a/pkg/wstore/wstore_dboldmigration.go b/pkg/wstore/wstore_dboldmigration.go index 0fcbff5c1..00c8550d6 100644 --- a/pkg/wstore/wstore_dboldmigration.go +++ b/pkg/wstore/wstore_dboldmigration.go @@ -10,8 +10,8 @@ import ( "time" "github.com/jmoiron/sqlx" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" ) const OldDBName = "~/.waveterm/waveterm.db" diff --git a/pkg/wstore/wstore_dbops.go b/pkg/wstore/wstore_dbops.go index fb0c8bc58..c4cd17ba2 100644 --- a/pkg/wstore/wstore_dbops.go +++ b/pkg/wstore/wstore_dbops.go @@ -10,9 +10,9 @@ import ( "reflect" "time" - "github.com/wavetermdev/thenextwave/pkg/filestore" - "github.com/wavetermdev/thenextwave/pkg/util/dbutil" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/filestore" + "github.com/wavetermdev/waveterm/pkg/util/dbutil" + "github.com/wavetermdev/waveterm/pkg/waveobj" ) var ErrNotFound = fmt.Errorf("not found") diff --git a/pkg/wstore/wstore_dbsetup.go b/pkg/wstore/wstore_dbsetup.go index fa255ed87..7df15a021 100644 --- a/pkg/wstore/wstore_dbsetup.go +++ b/pkg/wstore/wstore_dbsetup.go @@ -12,11 +12,11 @@ import ( "github.com/jmoiron/sqlx" "github.com/sawka/txwrap" - "github.com/wavetermdev/thenextwave/pkg/util/migrateutil" - "github.com/wavetermdev/thenextwave/pkg/wavebase" - "github.com/wavetermdev/thenextwave/pkg/waveobj" + "github.com/wavetermdev/waveterm/pkg/util/migrateutil" + "github.com/wavetermdev/waveterm/pkg/wavebase" + "github.com/wavetermdev/waveterm/pkg/waveobj" - dbfs "github.com/wavetermdev/thenextwave/db" + dbfs "github.com/wavetermdev/waveterm/db" ) const WStoreDBName = "waveterm.db"