Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-01 18:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

update all gopkg imports (#330)

Browse Source
This commit is contained in:
Mike Sawka 2024-09-05 14:25:45 -07:00 committed by GitHub
parent a5f563b52d
commit 8ad84fd78a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
73 changed files with 270 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/generatego/main-generatego.go
View File

@ -9,11 +9,11 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/gogen" "github.com/wavetermdev/waveterm/pkg/gogen"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
const WshClientFileName = "pkg/wshrpc/wshclient/wshclient.go" const WshClientFileName = "pkg/wshrpc/wshclient/wshclient.go"
@ -24,10 +24,10 @@ func GenerateWshClient() {
fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName) fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName)
var buf strings.Builder var buf strings.Builder
gogen.GenerateBoilerplate(&buf, "wshclient", []string{ gogen.GenerateBoilerplate(&buf, "wshclient", []string{
"github.com/wavetermdev/thenextwave/pkg/wshutil", "github.com/wavetermdev/waveterm/pkg/wshutil",
"github.com/wavetermdev/thenextwave/pkg/wshrpc", "github.com/wavetermdev/waveterm/pkg/wshrpc",
"github.com/wavetermdev/thenextwave/pkg/waveobj", "github.com/wavetermdev/waveterm/pkg/waveobj",
"github.com/wavetermdev/thenextwave/pkg/wconfig", "github.com/wavetermdev/waveterm/pkg/wconfig",
}) })
wshDeclMap := wshrpc.GenerateWshCommandDeclMap() wshDeclMap := wshrpc.GenerateWshCommandDeclMap()
for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) { for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) {

8
cmd/generatets/main-generatets.go
View File

@ -10,10 +10,10 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/tsgen" "github.com/wavetermdev/waveterm/pkg/tsgen"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
func generateTypesFile(tsTypesMap map[reflect.Type]string) error { func generateTypesFile(tsTypesMap map[reflect.Type]string) error {

36
cmd/server/main-server.go
View File

@ -17,24 +17,24 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/authkey" "github.com/wavetermdev/waveterm/pkg/authkey"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/telemetry" "github.com/wavetermdev/waveterm/pkg/telemetry"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcloud" "github.com/wavetermdev/waveterm/pkg/wcloud"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/web" "github.com/wavetermdev/waveterm/pkg/web"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
// these are set at build time // these are set at build time

4
cmd/test/test-main.go
View File

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/wavetermdev/thenextwave/pkg/vdom" "github.com/wavetermdev/waveterm/pkg/vdom"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func Page(ctx context.Context, props map[string]any) any { func Page(ctx context.Context, props map[string]any) any {

6
cmd/wsh/cmd/wshcmd-conn.go
View File

@ -7,9 +7,9 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var connCmd = &cobra.Command{ var connCmd = &cobra.Command{

2
cmd/wsh/cmd/wshcmd-connserver.go
View File

@ -7,7 +7,7 @@ import (
"os" "os"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote"
) )
var serverCmd = &cobra.Command{ var serverCmd = &cobra.Command{

2
cmd/wsh/cmd/wshcmd-deleteblock.go
View File

@ -5,7 +5,7 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var deleteBlockCmd = &cobra.Command{ var deleteBlockCmd = &cobra.Command{

6
cmd/wsh/cmd/wshcmd-editor.go
View File

@ -9,9 +9,9 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var editMagnified bool var editMagnified bool

4
cmd/wsh/cmd/wshcmd-getmeta.go
View File

@ -7,8 +7,8 @@ import (
"encoding/json" "encoding/json"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var getMetaCmd = &cobra.Command{ var getMetaCmd = &cobra.Command{

2
cmd/wsh/cmd/wshcmd-html.go
View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func init() { func init() {

4
cmd/wsh/cmd/wshcmd-rcfiles.go
View File

@ -7,8 +7,8 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
var WshBinDir = ".waveterm/bin" var WshBinDir = ".waveterm/bin"

4
cmd/wsh/cmd/wshcmd-readfile.go
View File

@ -7,8 +7,8 @@ import (
"encoding/base64" "encoding/base64"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var readFileCmd = &cobra.Command{ var readFileCmd = &cobra.Command{

8
cmd/wsh/cmd/wshcmd-root.go
View File

@ -16,10 +16,10 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
var ( var (

6
cmd/wsh/cmd/wshcmd-setconfig.go
View File

@ -5,9 +5,9 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var setConfigCmd = &cobra.Command{ var setConfigCmd = &cobra.Command{

2
cmd/wsh/cmd/wshcmd-setmeta.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var setMetaCmd = &cobra.Command{ var setMetaCmd = &cobra.Command{

2
cmd/wsh/cmd/wshcmd-shell-unix.go
View File

@ -13,7 +13,7 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
) )
func init() { func init() {

6
cmd/wsh/cmd/wshcmd-ssh.go
View File

@ -5,9 +5,9 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var sshCmd = &cobra.Command{ var sshCmd = &cobra.Command{

8
cmd/wsh/cmd/wshcmd-term.go
View File

@ -8,10 +8,10 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var termMagnified bool var termMagnified bool

2
cmd/wsh/cmd/wshcmd-version.go
View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
func init() { func init() {

4
cmd/wsh/cmd/wshcmd-view.go
View File

@ -10,8 +10,8 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var viewMagnified bool var viewMagnified bool

4
cmd/wsh/main-wsh.go
View File

@ -4,8 +4,8 @@
package main package main
import ( import (
"github.com/wavetermdev/thenextwave/cmd/wsh/cmd" "github.com/wavetermdev/waveterm/cmd/wsh/cmd"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
// set by main-server.go // set by main-server.go

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/wavetermdev/thenextwave module github.com/wavetermdev/waveterm
go 1.22.4 go 1.22.4

22
pkg/blockcontroller/blockcontroller.go
View File

@ -14,17 +14,17 @@ import (
"sync" "sync"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" "github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
"github.com/wavetermdev/thenextwave/pkg/shellexec" "github.com/wavetermdev/waveterm/pkg/shellexec"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
const ( const (

2
pkg/eventbus/eventbus.go
View File

@ -11,7 +11,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
) )
const ( const (

2
pkg/filestore/blockstore.go
View File

@ -17,7 +17,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/ijson" "github.com/wavetermdev/waveterm/pkg/ijson"
) )
const ( const (

2
pkg/filestore/blockstore_dbops.go
View File

@ -9,7 +9,7 @@ import (
"io/fs" "io/fs"
"os" "os"
"github.com/wavetermdev/thenextwave/pkg/util/dbutil" "github.com/wavetermdev/waveterm/pkg/util/dbutil"
) )
// can return fs.ErrExist // can return fs.ErrExist

6
pkg/filestore/blockstore_dbsetup.go
View File

@ -13,14 +13,14 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/util/migrateutil" "github.com/wavetermdev/waveterm/pkg/util/migrateutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"github.com/sawka/txwrap" "github.com/sawka/txwrap"
dbfs "github.com/wavetermdev/thenextwave/db" dbfs "github.com/wavetermdev/waveterm/db"
) )
const FilestoreDBName = "filestore.db" const FilestoreDBName = "filestore.db"

2
pkg/filestore/blockstore_test.go
View File

@ -17,7 +17,7 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/ijson" "github.com/wavetermdev/waveterm/pkg/ijson"
) )
func initDb(t *testing.T) { func initDb(t *testing.T) {

4
pkg/gogen/gogen.go
View File

@ -8,8 +8,8 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
func GenerateBoilerplate(buf *strings.Builder, pkgName string, imports []string) { func GenerateBoilerplate(buf *strings.Builder, pkgName string, imports []string) {

16
pkg/remote/conncontroller/conncontroller.go
View File

@ -20,14 +20,14 @@ import (
"github.com/kevinburke/ssh_config" "github.com/kevinburke/ssh_config"
"github.com/skeema/knownhosts" "github.com/skeema/knownhosts"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/userinput" "github.com/wavetermdev/waveterm/pkg/userinput"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )

4
pkg/remote/sshclient.go
View File

@ -23,8 +23,8 @@ import (
"github.com/kevinburke/ssh_config" "github.com/kevinburke/ssh_config"
"github.com/skeema/knownhosts" "github.com/skeema/knownhosts"
"github.com/wavetermdev/thenextwave/pkg/userinput" "github.com/wavetermdev/waveterm/pkg/userinput"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
xknownhosts "golang.org/x/crypto/ssh/knownhosts" xknownhosts "golang.org/x/crypto/ssh/knownhosts"
) )

12
pkg/service/blockservice/blockservice.go
View File

@ -9,12 +9,12 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
type BlockService struct{} type BlockService struct{}

14
pkg/service/clientservice/clientservice.go
View File

@ -8,13 +8,13 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" "github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wlayout"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
type ClientService struct{} type ClientService struct{}

14
pkg/service/fileservice/fileservice.go
View File

@ -9,13 +9,13 @@ import (
"io" "io"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
const MaxFileSize = 10 * 1024 * 1024 // 10M const MaxFileSize = 10 * 1024 * 1024 // 10M

10
pkg/service/objectservice/objectservice.go
View File

@ -9,11 +9,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wlayout"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
type ObjectService struct{} type ObjectService struct{}

20
pkg/service/service.go
View File

@ -9,16 +9,16 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/service/blockservice" "github.com/wavetermdev/waveterm/pkg/service/blockservice"
"github.com/wavetermdev/thenextwave/pkg/service/clientservice" "github.com/wavetermdev/waveterm/pkg/service/clientservice"
"github.com/wavetermdev/thenextwave/pkg/service/fileservice" "github.com/wavetermdev/waveterm/pkg/service/fileservice"
"github.com/wavetermdev/thenextwave/pkg/service/objectservice" "github.com/wavetermdev/waveterm/pkg/service/objectservice"
"github.com/wavetermdev/thenextwave/pkg/service/userinputservice" "github.com/wavetermdev/waveterm/pkg/service/userinputservice"
"github.com/wavetermdev/thenextwave/pkg/service/windowservice" "github.com/wavetermdev/waveterm/pkg/service/windowservice"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/web/webcmd" "github.com/wavetermdev/waveterm/pkg/web/webcmd"
) )
var ServiceMap = map[string]any{ var ServiceMap = map[string]any{

2
pkg/service/userinputservice/userinputservice.go
View File

@ -4,7 +4,7 @@
package userinputservice package userinputservice
import ( import (
"github.com/wavetermdev/thenextwave/pkg/userinput" "github.com/wavetermdev/waveterm/pkg/userinput"
) )
type UserInputService struct { type UserInputService struct {

16
pkg/service/windowservice/windowservice.go
View File

@ -9,14 +9,14 @@ import (
"log" "log"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wlayout"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
const DefaultTimeout = 2 * time.Second const DefaultTimeout = 2 * time.Second

12
pkg/shellexec/shellexec.go
View File

@ -18,12 +18,12 @@ import (
"time" "time"
"github.com/creack/pty" "github.com/creack/pty"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" "github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
const DefaultGracefulKillWait = 400 * time.Millisecond const DefaultGracefulKillWait = 400 * time.Millisecond

10
pkg/telemetry/telemetry.go
View File

@ -9,11 +9,11 @@ import (
"log" "log"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/util/daystr" "github.com/wavetermdev/waveterm/pkg/util/daystr"
"github.com/wavetermdev/thenextwave/pkg/util/dbutil" "github.com/wavetermdev/waveterm/pkg/util/dbutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
const MaxTzNameLen = 50 const MaxTzNameLen = 50

24
pkg/tsgen/tsgen.go
View File

@ -10,18 +10,18 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/userinput" "github.com/wavetermdev/waveterm/pkg/userinput"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/vdom" "github.com/wavetermdev/waveterm/pkg/vdom"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/web/webcmd" "github.com/wavetermdev/waveterm/pkg/web/webcmd"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
// add extra types to generate here // add extra types to generate here

2
pkg/userinput/userinput.go
View File

@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/google/uuid" "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)} var MainUserInputHandler = UserInputHandler{Channels: make(map[string](chan *UserInputResponse), 1)}

2
pkg/util/daystr/daystr.go
View File

@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"time" "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])*)$`) var customDayStrRe = regexp.MustCompile(`^((?:\d{4}-\d{2}-\d{2})|today|yesterday|bom|bow)?((?:[+-]\d+[dwm])*)$`)

6
pkg/util/shellutil/shellutil.go
View File

@ -17,9 +17,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
) )
const DefaultTermType = "xterm-256color" const DefaultTermType = "xterm-256color"

6
pkg/waveai/waveai.go
View File

@ -13,9 +13,9 @@ import (
"time" "time"
openaiapi "github.com/sashabaranov/go-openai" openaiapi "github.com/sashabaranov/go-openai"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/wcloud" "github.com/wavetermdev/waveterm/pkg/wcloud"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )

2
pkg/waveobj/waveobj.go
View File

@ -13,7 +13,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
) )
const ( const (

6
pkg/wcloud/wcloud.go
View File

@ -17,9 +17,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/telemetry" "github.com/wavetermdev/waveterm/pkg/telemetry"
"github.com/wavetermdev/thenextwave/pkg/util/daystr" "github.com/wavetermdev/waveterm/pkg/util/daystr"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
const WCloudEndpoint = "https://api.waveterm.dev/central" const WCloudEndpoint = "https://api.waveterm.dev/central"

2
pkg/wcloud/wclouddata.go
View File

@ -4,7 +4,7 @@
package wcloud package wcloud
import ( import (
"github.com/wavetermdev/thenextwave/pkg/telemetry" "github.com/wavetermdev/waveterm/pkg/telemetry"
) )
type NoTelemetryInputType struct { type NoTelemetryInputType struct {

4
pkg/wconfig/filewatcher.go
View File

@ -10,8 +10,8 @@ import (
"sync" "sync"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
const configDir = "config" const configDir = "config"

6
pkg/wconfig/settingsconfig.go
View File

@ -13,9 +13,9 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig/defaultconfig" "github.com/wavetermdev/waveterm/pkg/wconfig/defaultconfig"
) )
const SettingsFile = "settings.json" const SettingsFile = "settings.json"

10
pkg/wcore/wcore.go
View File

@ -10,11 +10,11 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
// the wcore package coordinates actions across the storage layer // the wcore package coordinates actions across the storage layer

22
pkg/web/web.go
View File

@ -21,17 +21,17 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/wavetermdev/thenextwave/pkg/authkey" "github.com/wavetermdev/waveterm/pkg/authkey"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/telemetry" "github.com/wavetermdev/waveterm/pkg/telemetry"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
type WebFnType = func(http.ResponseWriter, *http.Request) type WebFnType = func(http.ResponseWriter, *http.Request)

8
pkg/web/webcmd/webcmd.go
View File

@ -7,10 +7,10 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta" "github.com/wavetermdev/waveterm/pkg/tsgen/tsgenmeta"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
const ( const (

10
pkg/web/ws.go
View File

@ -16,11 +16,11 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/wavetermdev/thenextwave/pkg/authkey" "github.com/wavetermdev/waveterm/pkg/authkey"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/web/webcmd" "github.com/wavetermdev/waveterm/pkg/web/webcmd"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
const wsReadWaitTimeout = 15 * time.Second const wsReadWaitTimeout = 15 * time.Second

6
pkg/wlayout/wlayout.go
View File

@ -9,9 +9,9 @@ import (
"log" "log"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
const ( const (

4
pkg/wps/wps.go
View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
// this broker interface is mostly generic // this broker interface is mostly generic

8
pkg/wshrpc/wshclient/wshclient.go
View File

@ -6,10 +6,10 @@
package wshclient package wshclient
import ( import (
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
) )
// command "announce", wshserver.AnnounceCommand // command "announce", wshserver.AnnounceCommand

6
pkg/wshrpc/wshclient/wshclientutil.go
View File

@ -6,9 +6,9 @@ package wshclient
import ( import (
"errors" "errors"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func sendRpcRequestCallHelper[T any](w *wshutil.WshRpc, command string, data interface{}, opts *wshrpc.RpcOpts) (T, error) { func sendRpcRequestCallHelper[T any](w *wshutil.WshRpc, command string, data interface{}, opts *wshrpc.RpcOpts) (T, error) {

6
pkg/wshrpc/wshremote/sysinfo.go
View File

@ -10,9 +10,9 @@ import (
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/mem"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func getCpuData(values map[string]float64) { func getCpuData(values map[string]float64) {

6
pkg/wshrpc/wshremote/wshremote.go
View File

@ -15,9 +15,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
const MaxFileSize = 50 * 1024 * 1024 // 10M const MaxFileSize = 50 * 1024 * 1024 // 10M

8
pkg/wshrpc/wshrpctypes.go
View File

@ -10,10 +10,10 @@ import (
"os" "os"
"reflect" "reflect"
"github.com/wavetermdev/thenextwave/pkg/ijson" "github.com/wavetermdev/waveterm/pkg/ijson"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
) )
const LocalConnName = "local" const LocalConnName = "local"

30
pkg/wshrpc/wshserver/wshserver.go
View File

@ -17,21 +17,21 @@ import (
"strings" "strings"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/eventbus" "github.com/wavetermdev/waveterm/pkg/eventbus"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/remote/conncontroller" "github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
"github.com/wavetermdev/thenextwave/pkg/waveai" "github.com/wavetermdev/waveterm/pkg/waveai"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wlayout"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
const SimpleId_This = "this" const SimpleId_This = "this"

4
pkg/wshrpc/wshserver/wshserverutil.go
View File

@ -6,8 +6,8 @@ package wshserver
import ( import (
"sync" "sync"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
const ( const (

4
pkg/wshutil/wshadapter.go
View File

@ -8,8 +8,8 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var WshCommandDeclMap = wshrpc.GenerateWshCommandDeclMap() var WshCommandDeclMap = wshrpc.GenerateWshCommandDeclMap()

2
pkg/wshutil/wshevent.go
View File

@ -7,7 +7,7 @@ import (
"sync" "sync"
"github.com/google/uuid" "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 // event inverter. converts WaveEvents to a listener.On() API

2
pkg/wshutil/wshproxy.go
View File

@ -10,7 +10,7 @@ import (
"sync" "sync"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
type WshRpcProxy struct { type WshRpcProxy struct {

4
pkg/wshutil/wshrouter.go
View File

@ -12,8 +12,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
const DefaultRoute = "wavesrv" const DefaultRoute = "wavesrv"

4
pkg/wshutil/wshrpc.go
View File

@ -16,8 +16,8 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
const DefaultTimeoutMs = 5000 const DefaultTimeoutMs = 5000

4
pkg/wshutil/wshutil.go
View File

@ -19,8 +19,8 @@ import (
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"golang.org/x/term" "golang.org/x/term"
) )

4
pkg/wstore/wstore.go
View File

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
) )
func init() { func init() {

4
pkg/wstore/wstore_dboldmigration.go
View File

@ -10,8 +10,8 @@ import (
"time" "time"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
) )
const OldDBName = "~/.waveterm/waveterm.db" const OldDBName = "~/.waveterm/waveterm.db"

6
pkg/wstore/wstore_dbops.go
View File

@ -10,9 +10,9 @@ import (
"reflect" "reflect"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/util/dbutil" "github.com/wavetermdev/waveterm/pkg/util/dbutil"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
) )
var ErrNotFound = fmt.Errorf("not found") var ErrNotFound = fmt.Errorf("not found")

8
pkg/wstore/wstore_dbsetup.go
View File

@ -12,11 +12,11 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/sawka/txwrap" "github.com/sawka/txwrap"
"github.com/wavetermdev/thenextwave/pkg/util/migrateutil" "github.com/wavetermdev/waveterm/pkg/util/migrateutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
dbfs "github.com/wavetermdev/thenextwave/db" dbfs "github.com/wavetermdev/waveterm/db"
) )
const WStoreDBName = "waveterm.db" const WStoreDBName = "waveterm.db"