完善 wasm4 的支持

chai2010 · chai2010 · commit da2b585c2ad9 · 2024-08-28T23:47:34.000+08:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,6 +26,8 @@ jobs:
       - run: make wasm-js
       - run: make wasm-wasip1
       - run: make -C waroot/examples/snake publish
+      - run: make -C waroot/examples/w4-snake publish
+      - run: make -C waroot/examples/w4-2048 publish
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
diff --git a/internal/app/appbuild/appbuild.go b/internal/app/appbuild/appbuild.go
@@ -3,9 +3,11 @@
 package appbuild
 
 import (
+	_ "embed"
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"wa-lang.org/wa/internal/3rdparty/cli"
 	"wa-lang.org/wa/internal/app/appbase"
@@ -15,6 +17,18 @@ import (
 	"wa-lang.org/wa/internal/wat/watutil"
 )
 
+//go:embed assets/favicon.ico
+var favicon_ico string
+
+//go:embed assets/index.html
+var w4index_html string
+
+//go:embed assets/wasm4.js
+var w4js string
+
+//go:embed assets/wasm4.css
+var w4css string
+
 var CmdBuild = &cli.Command{
 	Name:  "build",
 	Usage: "compile Wa source code",
@@ -209,6 +223,21 @@ func BuildApp(opt *appbase.Option, input, outfile string) (mainFunc string, wasm
 			os.Exit(1)
 		}
 
+		if opt.TargetOS == config.WaOS_wasm4 {
+			icoOutfile := filepath.Join(filepath.Dir(outfile), "favicon.ico")
+			w4JsOutfile := filepath.Join(filepath.Dir(outfile), "wasm4.js")
+			w4CssOutfile := filepath.Join(filepath.Dir(outfile), "wasm4.css")
+			w4IndexOutfile := filepath.Join(filepath.Dir(outfile), "index.html")
+
+			wasm4Cart := filepath.Base(outfile)
+			wasm4JsCode := strings.Replace(w4js, `"cart.wasm"`, `"`+wasm4Cart+`"`, -1)
+
+			os.WriteFile(icoOutfile, []byte(favicon_ico), 0666)
+			os.WriteFile(w4JsOutfile, []byte(wasm4JsCode), 0666)
+			os.WriteFile(w4CssOutfile, []byte(w4css), 0666)
+			os.WriteFile(w4IndexOutfile, []byte(w4index_html), 0666)
+		}
+
 		// 主函数
 		mainFunc := manifest.MainPkg + ".main"
 
diff --git a/internal/app/appbuild/assets/favicon.ico b/internal/app/appbuild/assets/favicon.ico
diff --git a/internal/app/appbuild/assets/index.html b/internal/app/appbuild/assets/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+  <link rel="shortcut icon" href="/favicon.ico">
+  <title>Wa-lang/WASM-4 Game</title>
+  <style>wasm4.css</style>
+</head>
+<body>
+  <script src="wasm4.js"></script>
+  <wasm4-app></wasm4-app>
+</body>
+</html>
diff --git a/internal/app/appbuild/assets/wasm4.css b/internal/app/appbuild/assets/wasm4.css
diff --git a/internal/app/appbuild/assets/wasm4.js b/internal/app/appbuild/assets/wasm4.js
diff --git a/internal/app/apprun/apprun.go b/internal/app/apprun/apprun.go
@@ -15,7 +15,6 @@ import (
 	"wa-lang.org/wa/internal/3rdparty/cli"
 	"wa-lang.org/wa/internal/app/appbase"
 	"wa-lang.org/wa/internal/app/appbuild"
-	"wa-lang.org/wa/internal/config"
 	"wa-lang.org/wa/internal/wat/watutil"
 	"wa-lang.org/wa/internal/wazero"
 )
@@ -88,27 +87,13 @@ func CmdRunAction(c *cli.Context) error {
 		return nil
 	}
 
-	if opt.Config().WaOS == config.WaOS_wasm4 {
-		fmt.Println("please use `w4` to run wasm4 game!")
-		os.Exit(0)
-		return nil
-	}
-
 	var appArgs []string
 	if c.NArg() > 1 {
 		appArgs = c.Args().Slice()[1:]
 	}
 
-	m, err := wazero.BuildModule(input, wasmBytes, appArgs...)
-	if err != nil {
-		fmt.Println("wazero.BuildModule:", err)
-		os.Exit(1)
-		return nil
-	}
-	defer m.Close()
-
 	// Web 模式启动服务器
-	if (m.HasUnknownImportFunc() || c.Bool("web")) && !c.Bool("console") {
+	if (wazero.HasUnknownImportFunc(wasmBytes) || c.Bool("web")) && !c.Bool("console") {
 		var addr = c.String("http")
 		if strings.HasPrefix(addr, ":") {
 			addr = "localhost" + addr
@@ -145,6 +130,14 @@ func CmdRunAction(c *cli.Context) error {
 		return nil
 	}
 
+	m, err := wazero.BuildModule(input, wasmBytes, appArgs...)
+	if err != nil {
+		fmt.Println("wazero.BuildModule:", err)
+		os.Exit(1)
+		return nil
+	}
+	defer m.Close()
+
 	stdout, stderr, err := m.RunMain(mainFunc)
 	if err != nil {
 		if len(stdout) > 0 {
diff --git a/internal/wazero/module.go b/internal/wazero/module.go
@@ -114,8 +114,17 @@ func (p *Module) Close() error {
 }
 
 // 是否包含用户自定义的宿主函数
-func (p *Module) HasUnknownImportFunc() bool {
-	for _, importedFunc := range p.wazeroCompileModule.ImportedFunctions() {
+func HasUnknownImportFunc(wasmBytes []byte) bool {
+	wazeroCtx := context.Background()
+	rt := wazero.NewRuntime(wazeroCtx)
+
+	var err error
+	wazeroCompileModule, err := rt.CompileModule(wazeroCtx, wasmBytes)
+	if err != nil {
+		return false
+	}
+
+	for _, importedFunc := range wazeroCompileModule.ImportedFunctions() {
 		moduleName, _, isImport := importedFunc.Import()
 		if !isImport {
 			continue
diff --git a/waroot/examples/w4-2048/.gitignore b/waroot/examples/w4-2048/.gitignore
@@ -0,0 +1 @@
+/output
diff --git a/waroot/examples/w4-2048/Makefile b/waroot/examples/w4-2048/Makefile
@@ -6,4 +6,10 @@ dev:
 run:
 	go run ../../../main.go run -target=wasm4 .
 
+publish:
+	go run ../../../main.go build -target=wasm4 .
+	-rm -rf ../../../docs/w4-2048/
+	mkdir -p ../../../docs/w4-2048
+	cp ./output/* ../../../docs/w4-2048/
+
 clean:
diff --git a/waroot/examples/w4-snake/Makefile b/waroot/examples/w4-snake/Makefile
@@ -6,4 +6,10 @@ dev:
 run:
 	go run ../../../main.go run -target=wasm4 .
 
+publish:
+	go run ../../../main.go build -target=wasm4 .
+	-rm -rf ../../../docs/w4-snake/
+	mkdir -p ../../../docs/w4-snake
+	cp ./output/* ../../../docs/w4-snake/
+
 clean:
