swith from term:debugconn to term:conndebug for consistency

Author: sawka

frontend/app/view/term/term.tsx

@@ -682,7 +682,7 @@ class TermViewModel implements ViewModel {
                 },
             });
         }
-        const debugConn = blockData?.meta?.["term:debugconn"];
+        const debugConn = blockData?.meta?.["term:conndebug"];
         fullMenu.push({
             label: "Debug Connection",
             submenu: [
@@ -693,7 +693,7 @@ class TermViewModel implements ViewModel {
                     click: () => {
                         RpcApi.SetMetaCommand(TabRpcClient, {
                             oref: WOS.makeORef("block", this.blockId),
-                            meta: { "term:debugconn": null },
+                            meta: { "term:conndebug": null },
                         });
                     },
                 },
@@ -704,7 +704,7 @@ class TermViewModel implements ViewModel {
                     click: () => {
                         RpcApi.SetMetaCommand(TabRpcClient, {
                             oref: WOS.makeORef("block", this.blockId),
-                            meta: { "term:debugconn": "info" },
+                            meta: { "term:conndebug": "info" },
                         });
                     },
                 },
@@ -715,7 +715,7 @@ class TermViewModel implements ViewModel {
                     click: () => {
                         RpcApi.SetMetaCommand(TabRpcClient, {
                             oref: WOS.makeORef("block", this.blockId),
-                            meta: { "term:debugconn": "debug" },
+                            meta: { "term:conndebug": "debug" },
                         });
                     },
                 },

frontend/types/gotypes.d.ts

@@ -303,6 +303,7 @@ declare global {
         "conn:wshenabled"?: boolean;
         "conn:askbeforewshinstall"?: boolean;
         "conn:overrideconfig"?: boolean;
+        "conn:wshpath"?: string;
         "display:hidden"?: boolean;
         "display:order"?: number;
         "term:*"?: boolean;
@@ -508,7 +509,7 @@ declare global {
         "term:vdomtoolbarblockid"?: string;
         "term:transparency"?: number;
         "term:allowbracketedpaste"?: boolean;
-        "term:debugconn"?: string;
+        "term:conndebug"?: string;
         "web:zoom"?: number;
         "web:hidenav"?: boolean;
         "markdown:fontsize"?: number;

pkg/remote/connutil.go

@@ -20,7 +20,6 @@ import (
 	"github.com/wavetermdev/waveterm/pkg/util/shellutil"
 	"github.com/wavetermdev/waveterm/pkg/wavebase"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/mod/semver"
 )
 
 var userHostRe = regexp.MustCompile(`^([a-zA-Z0-9][a-zA-Z0-9._@\\-]*@)?([a-zA-Z0-9][a-zA-Z0-9.-]*)(?::([0-9]+))?$`)
@@ -55,32 +54,6 @@ func DetectShell(client *ssh.Client) (string, error) {
 	return fmt.Sprintf(`"%s"`, strings.TrimSpace(string(out))), nil
 }
 
-// returns a valid semver version string
-func GetWshVersion(client *ssh.Client) (string, error) {
-	wshPath := GetWshPath(client)
-
-	session, err := client.NewSession()
-	if err != nil {
-		return "", err
-	}
-
-	out, err := session.Output(wshPath + " version")
-	if err != nil {
-		return "", err
-	}
-	// output is expected to be in the form of "wsh v0.10.4"
-	// should strip off the "wsh" prefix, and return a semver object
-	fields := strings.Fields(strings.TrimSpace(string(out)))
-	if len(fields) != 2 {
-		return "", fmt.Errorf("unexpected output from wsh version: %s", out)
-	}
-	wshVersion := strings.TrimSpace(fields[1])
-	if !semver.IsValid(wshVersion) {
-		return "", fmt.Errorf("invalid semver version: %s", wshVersion)
-	}
-	return wshVersion, nil
-}
-
 func GetWshPath(client *ssh.Client) string {
 	defaultPath := wavebase.RemoteFullWshBinPath
 	session, err := client.NewSession()

pkg/waveobj/metaconsts.go

@@ -95,7 +95,7 @@ const (
 	MetaKey_TermVDomToolbarBlockId           = "term:vdomtoolbarblockid"
 	MetaKey_TermTransparency                 = "term:transparency"
 	MetaKey_TermAllowBracketedPaste          = "term:allowbracketedpaste"
-	MetaKey_TermDebugConn                    = "term:debugconn"
+	MetaKey_TermConnDebug                    = "term:conndebug"
 
 	MetaKey_WebZoom                          = "web:zoom"
 	MetaKey_WebHideNav                       = "web:hidenav"

pkg/waveobj/wtypemeta.go

@@ -96,7 +96,7 @@ type MetaTSType struct {
 	TermVDomToolbarBlockId  string   `json:"term:vdomtoolbarblockid,omitempty"`
 	TermTransparency        *float64 `json:"term:transparency,omitempty"` // default 0.5
 	TermAllowBracketedPaste *bool    `json:"term:allowbracketedpaste,omitempty"`
-	TermDebugConn           string   `json:"term:debugconn,omitempty"` // null, info, debug
+	TermConnDebug           string   `json:"term:conndebug,omitempty"` // null, info, debug
 
 	WebZoom    float64 `json:"web:zoom,omitempty"`
 	WebHideNav *bool   `json:"web:hidenav,omitempty"`

pkg/wshrpc/wshrpctypes.go

@@ -465,9 +465,10 @@ type CommandRemoteWriteFileData struct {
 }
 
 type ConnKeywords struct {
-	ConnWshEnabled          *bool `json:"conn:wshenabled,omitempty"`
-	ConnAskBeforeWshInstall *bool `json:"conn:askbeforewshinstall,omitempty"`
-	ConnOverrideConfig      bool  `json:"conn:overrideconfig,omitempty"`
+	ConnWshEnabled          *bool  `json:"conn:wshenabled,omitempty"`
+	ConnAskBeforeWshInstall *bool  `json:"conn:askbeforewshinstall,omitempty"`
+	ConnOverrideConfig      bool   `json:"conn:overrideconfig,omitempty"`
+	ConnWshPath             string `json:"conn:wshpath,omitempty"`
 
 	DisplayHidden *bool   `json:"display:hidden,omitempty"`
 	DisplayOrder  float32 `json:"display:order,omitempty"`

pkg/wshrpc/wshserver/wshserver.go

@@ -619,7 +619,7 @@ func termCtxWithLogBlockId(ctx context.Context, logBlockId string) context.Conte
 	if err != nil {
 		return ctx
 	}
-	connDebug := block.Meta.GetString(waveobj.MetaKey_TermDebugConn, "")
+	connDebug := block.Meta.GetString(waveobj.MetaKey_TermConnDebug, "")
 	if connDebug == "" {
 		return ctx
 	}