runtime: debug9p config option, always handle export9p requests

Author: progrium

cmd/wanix/serve.go

@@ -32,7 +32,6 @@ func serveCmd() *cli.Command {
 	var (
 		listenAddr string
 		bundle     string
-		export9p   bool
 	)
 	cmd := &cli.Command{
 		Usage: "serve [dir]",
@@ -81,10 +80,7 @@ func serveCmd() *cli.Command {
 
 			http.Handle("/.well-known/", http.NotFoundHandler())
 			http.Handle("/.well-known/ethernet", ethernetHandler(vn))
-
-			if export9p {
-				http.Handle("/.well-known/export9p", export9pHandler())
-			}
+			http.Handle("/.well-known/export9p", export9pHandler())
 
 			p9srv := p9.NewServer(p9kit.Attacher(dirfs, p9kit.WithXattrAttrStore()))
 
@@ -116,7 +112,6 @@ func serveCmd() *cli.Command {
 	}
 	cmd.Flags().StringVar(&listenAddr, "listen", ":7654", "addr to serve on")
 	cmd.Flags().StringVar(&bundle, "bundle", "", "default bundle to use")
-	cmd.Flags().BoolVar(&export9p, "export9p", false, "export 9p server")
 	return cmd
 }
 
@@ -194,7 +189,7 @@ func export9pHandler() http.Handler {
 			log.Fatal(err)
 		}
 		addr := l.Addr().(*net.TCPAddr).String()
-		log.Println("* 9p export at", addr)
+		log.Println("9p export on", addr)
 
 		for {
 			c, err := l.Accept()

runtime/assets/index.html

@@ -11,6 +11,7 @@
     const w = new WanixRuntime({ 
         helpers: true, 
         export9p: queryParams.get('export9p') === 'true',
+        debug9p: queryParams.get('debug9p') === 'true',
         wasm: queryParams.get('wasm') || "./wanix.wasm", 
         bundle: queryParams.get('bundle') || "/shell/bundle.tgz",
         network: queryParams.get('network') || "ws://localhost:7654/.well-known/ethernet"

runtime/wasm/main.go

@@ -49,6 +49,10 @@ func main() {
 	root.Bind("#vm", "vm")
 	root.Bind("#|", "#console")
 
+	// if err := root.Namespace().Bind(idbfs.New("test"), ".", "idbfs"); err != nil {
+	// 	log.Fatal(err)
+	// }
+
 	bundleBytes := inst.Get("_bundle")
 	if !bundleBytes.IsUndefined() {
 		jsBuf := js.Global().Get("Uint8Array").New(bundleBytes)
@@ -90,6 +94,7 @@ func main() {
 
 	go api.PortResponder(inst.Call("_portConn", inst.Get("_sys").Get("port1")), root)
 
+	// this is still a bit of a hack and wip
 	export9p := inst.Get("config").Get("export9p")
 	if export9p.IsUndefined() {
 		export9p = js.ValueOf(false)
@@ -123,6 +128,11 @@ func main() {
 
 	inst.Call("_wasmReady")
 
-	virtio9p.Serve(root.Namespace(), inst, false)
+	debug := inst.Get("config").Get("debug9p")
+	if debug.IsUndefined() {
+		debug = js.ValueOf(false)
+	}
+
+	virtio9p.Serve(root.Namespace(), inst, debug.Bool())
 
 }