very large refactor of wshrouter

.gitignore

@@ -16,6 +16,7 @@ out/
 make/
 artifacts/
 mikework/
+manifests/
 .env
 out
 

Taskfile.yml

@@ -8,7 +8,6 @@ vars:
     BIN_DIR: "bin"
     VERSION:
         sh: node version.cjs
-    RM: '{{if eq OS "windows"}}powershell Remove-Item -Force -ErrorAction SilentlyContinue{{else}}rm -f{{end}}'
     RMRF: '{{if eq OS "windows"}}powershell Remove-Item -Force -Recurse -ErrorAction SilentlyContinue{{else}}rm -rf{{end}}'
     DATE: '{{if eq OS "windows"}}powershell Get-Date -UFormat{{else}}date{{end}}'
     ARTIFACTS_BUCKET: waveterm-github-artifacts/staging-w2
@@ -177,7 +176,7 @@ tasks:
         desc: Build the wavesrv component for macOS (Darwin) platforms (generates artifacts for both arm64 and amd64).
         platforms: [darwin]
         cmds:
-            - cmd: "{{.RM}} dist/bin/wavesrv*"
+            - cmd: rm -f dist/bin/wavesrv*
               ignore_error: true
             - task: build:server:internal
               vars:
@@ -224,7 +223,7 @@ tasks:
         desc: Build the wavesrv component for Windows platforms (only generates artifacts for the current architecture).
         platforms: [windows]
         cmds:
-            - cmd: "{{.RM}} dist/bin/wavesrv*"
+            - cmd: powershell -Command "Remove-Item -Force -ErrorAction SilentlyContinue -Path dist/bin/wavesrv*"
               ignore_error: true
             - task: build:server:internal
               vars:
@@ -237,7 +236,7 @@ tasks:
         desc: Build the wavesrv component for Linux platforms (only generates artifacts for the current architecture).
         platforms: [linux]
         cmds:
-            - cmd: "{{.RM}} dist/bin/wavesrv*"
+            - cmd: rm -f dist/bin/wavesrv*
               ignore_error: true
             - task: build:server:internal
               vars:
@@ -261,7 +260,11 @@ tasks:
     build:wsh:
         desc: Build the wsh component for all possible targets.
         cmds:
-            - cmd: "{{.RM}} dist/bin/wsh*"
+            - cmd: rm -f dist/bin/wsh*
+              platforms: [darwin, linux]
+              ignore_error: true
+            - cmd: powershell -Command "Remove-Item -Force -ErrorAction SilentlyContinue -Path dist/bin/wsh*"
+              platforms: [windows]
               ignore_error: true
             - task: build:wsh:internal
               vars:
@@ -527,7 +530,11 @@ tasks:
         desc: Create package.json for tsunami scaffold using npm commands
         dir: tsunami/frontend/scaffold
         cmds:
-            - cmd: "{{.RM}} package.json"
+            - cmd: rm -f package.json
+              platforms: [darwin, linux]
+              ignore_error: true
+            - cmd: powershell -Command "Remove-Item -Force -ErrorAction SilentlyContinue -Path package.json"
+              platforms: [windows]
               ignore_error: true
             - npm --no-workspaces init -y --init-license Apache-2.0
             - npm pkg set name=tsunami-scaffold
@@ -588,7 +595,11 @@ tasks:
     tsunami:build:
         desc: Build the tsunami binary.
         cmds:
-            - cmd: "{{.RM}} bin/tsunami*"
+            - cmd: rm -f bin/tsunami*
+              platforms: [darwin, linux]
+              ignore_error: true
+            - cmd: powershell -Command "Remove-Item -Force -ErrorAction SilentlyContinue -Path bin/tsunami*"
+              platforms: [windows]
               ignore_error: true
             - mkdir -p bin
             - cd tsunami && go build -ldflags "-X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.TsunamiVersion={{.VERSION}}" -o ../bin/tsunami{{exeExt}} cmd/main-tsunami.go

cmd/server/main-server.go

@@ -389,11 +389,11 @@ func shutdownActivityUpdate() {
 func createMainWshClient() {
 	rpc := wshserver.GetMainRpcClient()
 	wshfs.RpcClient = rpc
-	wshutil.DefaultRouter.RegisterRoute(wshutil.DefaultRoute, rpc, true)
+	wshutil.DefaultRouter.RegisterTrustedLeaf(rpc, wshutil.DefaultRoute)
 	wps.Broker.SetClient(wshutil.DefaultRouter)
-	localConnWsh := wshutil.MakeWshRpc(nil, nil, wshrpc.RpcContext{Conn: wshrpc.LocalConnName}, &wshremote.ServerImpl{}, "conn:local")
+	localConnWsh := wshutil.MakeWshRpc(wshrpc.RpcContext{Conn: wshrpc.LocalConnName}, &wshremote.ServerImpl{}, "conn:local")
 	go wshremote.RunSysInfoLoop(localConnWsh, wshrpc.LocalConnName)
-	wshutil.DefaultRouter.RegisterRoute(wshutil.MakeConnectionRouteId(wshrpc.LocalConnName), localConnWsh, true)
+	wshutil.DefaultRouter.RegisterTrustedLeaf(localConnWsh, wshutil.MakeConnectionRouteId(wshrpc.LocalConnName))
 }
 
 func grabAndRemoveEnvVars() error {
@@ -457,10 +457,12 @@ func maybeStartPprofServer() {
 }
 
 func main() {
-	log.SetFlags(log.LstdFlags | log.Lmicroseconds)
+	log.SetFlags(0) // disable timestamp since electron's winston logger already wraps with timestamp
 	log.SetPrefix("[wavesrv] ")
 	wavebase.WaveVersion = WaveVersion
 	wavebase.BuildTime = BuildTime
+	wshutil.DefaultRouter = wshutil.NewWshRouter()
+	wshutil.DefaultRouter.SetAsRootRouter()
 
 	err := grabAndRemoveEnvVars()
 	if err != nil {
@@ -546,6 +548,11 @@ func main() {
 		log.Printf("error clearing temp files: %v\n", err)
 		return
 	}
+	err = wcore.InitMainServer()
+	if err != nil {
+		log.Printf("error initializing mainserver: %v\n", err)
+		return
+	}
 
 	err = shellutil.FixupWaveZshHistory()
 	if err != nil {