refactor(js引擎): 替换goja_nodejs为自定义require模块并支持os文件系统访问

Author: Zing

go.mod

@@ -14,10 +14,8 @@ require (
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
-	github.com/dop251/goja_nodejs v0.0.0-20260212111938-1f56ff5bcf14 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
 	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )
-
-replace github.com/Dasongzi1366/AutoGo => ./AutoGo

go.sum

@@ -6,16 +6,10 @@ github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yA
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dop251/goja v0.0.0-20260311135729-065cd970411c h1:OcLmPfx1T1RmZVHHFwWMPaZDdRf0DBMZOFMVWJa7Pdk=
 github.com/dop251/goja v0.0.0-20260311135729-065cd970411c/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
-github.com/dop251/goja_nodejs v0.0.0-20260212111938-1f56ff5bcf14 h1:3U8dTgyNBhEQ/GVw0jZW5q+93Zw2gAZPRWhJ9TwV3rM=
-github.com/dop251/goja_nodejs v0.0.0-20260212111938-1f56ff5bcf14/go.mod h1:Tb7Xxye4LX7cT3i8YLvmPMGCV92IOi4CDZvm/V8ylc0=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U=
-github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
 github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
 github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -24,8 +18,6 @@ github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9
 github.com/makiuchi-d/gozxing v0.1.1/go.mod h1:eRIHbOjX7QWxLIDJoQuMLhuXg9LAuw6znsUtRkNw9DU=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
 github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=

js_engine/.DS_Store

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/ZingYao/autogo_scriptengine/js_engine/model"
+	"github.com/ZingYao/autogo_scriptengine/js_engine/model/require"
 
 	"github.com/dop251/goja"
-	noderequire "github.com/dop251/goja_nodejs/require"
 )
 
 // EngineState 引擎状态
@@ -97,9 +97,19 @@ func (e *JSEngine) init() {
 
 // registerNodeJS 注册 Node.js 能力
 func (e *JSEngine) registerNodeJS() {
-	// 注册 Node.js require 功能
-	registry := new(noderequire.Registry)
-	registry.Enable(e.vm)
+	// 使用自定义的 require 模块
+	var requireModule *require.RequireModule
+
+	if e.config.FileSystem != nil {
+		// 如果配置了自定义文件系统，使用 fs.FS
+		requireModule = require.NewRequireModule(e.vm, e.config.FileSystem)
+	} else {
+		// 否则使用 os 包直接访问文件系统（支持绝对路径）
+		requireModule = require.NewRequireModuleWithOS(e.vm)
+	}
+
+	// 注册 require 模块
+	requireModule.Register()
 
 	// 注册 console 模块
 	consoleObj := e.vm.NewObject()
@@ -112,10 +122,6 @@ func (e *JSEngine) registerNodeJS() {
 	// 注册 process 模块
 	processObj := e.vm.NewObject()
 	e.vm.Set("process", processObj)
-
-	// 注册 __dirname 和 __filename
-	e.vm.Set("__dirname", ".")
-	e.vm.Set("__filename", "script.js")
 }
 
 // Start 启动引擎
@@ -429,17 +435,12 @@ func (e *JSEngine) executeStringOnce(script string, dir ...string) error {
 		return fmt.Errorf("JavaScript engine not initialized")
 	}
 
-	// 如果配置了文件系统且 __dirname 未设置，设置 __dirname
-	if e.config.FileSystem != nil {
-		currentDir := e.vm.Get("__dirname")
-		if currentDir == goja.Undefined() || currentDir.String() == "" {
-			__dirname := "scripts"
-			if len(dir) > 0 && dir[0] != "" {
-				__dirname = dir[0]
-			}
-			e.vm.Set("__dirname", __dirname)
-		}
+	// 设置 __dirname（每次执行都更新，确保使用正确的工作目录）
+	__dirname := "scripts"
+	if len(dir) > 0 && dir[0] != "" {
+		__dirname = dir[0]
 	}
+	e.vm.Set("__dirname", __dirname)
 
 	// 注册特殊的 process.exit 函数，用于控制退出动作
 	e.registerExitControl()

js_engine/define/.DS_Store

@@ -3,6 +3,7 @@ package require
 import (
 	"fmt"
 	"io/fs"
+	"os"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -17,6 +18,7 @@ type RequireModule struct {
 	mu         sync.RWMutex
 	fileSys    fs.FS
 	initialDir string // 初始目录，用于主脚本
+	useOS      bool   // 是否使用 os 包直接访问文件系统（支持绝对路径）
 }
 
 // NewRequireModule 创建新的 require 模块
@@ -26,6 +28,17 @@ func NewRequireModule(vm *goja.Runtime, fileSys fs.FS) *RequireModule {
 		cache:      make(map[string]goja.Value),
 		fileSys:    fileSys,
 		initialDir: "scripts", // 默认初始目录
+		useOS:      false,
+	}
+}
+
+// NewRequireModuleWithOS 创建支持直接文件系统访问的 require 模块
+func NewRequireModuleWithOS(vm *goja.Runtime) *RequireModule {
+	return &RequireModule{
+		vm:         vm,
+		cache:      make(map[string]goja.Value),
+		initialDir: "scripts",
+		useOS:      true,
 	}
 }
 
@@ -135,35 +148,53 @@ func (r *RequireModule) resolveModule(modulePath string) (string, error) {
 // resolveExtension 解析文件扩展名
 func (r *RequireModule) resolveExtension(path string) (string, error) {
 	// 尝试直接读取
-	if _, err := fs.Stat(r.fileSys, path); err == nil {
+	if r.fileExists(path) {
 		return path, nil
 	}
 
 	// 尝试添加 .js 扩展名
 	jsPath := path + ".js"
-	if _, err := fs.Stat(r.fileSys, jsPath); err == nil {
+	if r.fileExists(jsPath) {
 		return jsPath, nil
 	}
 
 	// 尝试添加 .json 扩展名
 	jsonPath := path + ".json"
-	if _, err := fs.Stat(r.fileSys, jsonPath); err == nil {
+	if r.fileExists(jsonPath) {
 		return jsonPath, nil
 	}
 
 	// 尝试 index.js
 	indexPath := filepath.Join(path, "index.js")
-	if _, err := fs.Stat(r.fileSys, indexPath); err == nil {
+	if r.fileExists(indexPath) {
 		return indexPath, nil
 	}
 
 	return "", fmt.Errorf("module not found: %s", path)
 }
 
+// fileExists 检查文件是否存在
+func (r *RequireModule) fileExists(path string) bool {
+	if r.useOS {
+		_, err := os.Stat(path)
+		return err == nil
+	}
+	_, err := fs.Stat(r.fileSys, path)
+	return err == nil
+}
+
+// readFile 读取文件内容
+func (r *RequireModule) readFile(path string) ([]byte, error) {
+	if r.useOS {
+		return os.ReadFile(path)
+	}
+	return fs.ReadFile(r.fileSys, path)
+}
+
 // loadModule 加载模块
 func (r *RequireModule) loadModule(path string) (goja.Value, error) {
 	// 读取文件内容
-	content, err := fs.ReadFile(r.fileSys, path)
+	content, err := r.readFile(path)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read file: %v", err)
 	}