caller.go

@@ -22,10 +22,7 @@ func NewCaller(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 
 func makeResult(r *httpclient.Result, vm *goja.Runtime) goja.Value {
 	if r.Error != nil {
-		// panic(vm.NewGoError(r.Error))
+		panic(vm.NewGoError(r.Error))
-		vm.SetData("_lastError", r.Error)
-		gojs.GetLogger(vm).Error(r.Error.Error())
-		return nil
 	}
 	headers := map[string]string{}
 	for k, v := range r.Response.Header {

go.mod

@@ -3,7 +3,7 @@ module apigo.cc/gojs/service
 go 1.24.0
 
 require (
-	apigo.cc/gojs v0.0.32
+	apigo.cc/gojs v0.0.30
 	apigo.cc/gojs/console v0.0.4
 	apigo.cc/gojs/file v0.0.7
 	apigo.cc/gojs/http v0.0.8
@@ -14,7 +14,7 @@ require (
 	github.com/ssgo/config v1.7.10
 	github.com/ssgo/discover v1.7.10
 	github.com/ssgo/httpclient v1.7.8
-	github.com/ssgo/log v1.7.10
+	github.com/ssgo/log v1.7.9
 	github.com/ssgo/redis v1.7.8
 	github.com/ssgo/s v1.7.25
 	github.com/ssgo/standard v1.7.7
@@ -46,9 +46,9 @@ require (
 	github.com/ysmood/gson v0.7.3 // indirect
 	github.com/ysmood/leakless v0.9.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/crypto v0.44.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

request.go

@@ -91,10 +91,7 @@ func (r *Request) MakeURL(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value
 func (r *Request) ReadAll(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 	data, err := io.ReadAll(r.req.Body)
 	if err != nil {
-		// panic(vm.NewGoError(err))
+		panic(vm.NewGoError(err))
-		vm.SetData("_lastError", err)
-		gojs.GetLogger(vm).Error(err.Error())
-		return nil
 	}
 	return vm.ToValue(data)
 }
@@ -105,10 +102,7 @@ func (r *Request) Read(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 	data := make([]byte, size)
 	n, err := r.req.Body.Read(data)
 	if err != nil {
-		// panic(vm.NewGoError(err))
+		panic(vm.NewGoError(err))
-		vm.SetData("_lastError", err)
-		gojs.GetLogger(vm).Error(err.Error())
-		return nil
 	}
 	return vm.ToValue(data[0:n])
 }
@@ -116,10 +110,7 @@ func (r *Request) Read(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 func (r *Request) Close(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 	err := r.req.Body.Close()
 	if err != nil {
-		// panic(vm.NewGoError(err))
+		panic(vm.NewGoError(err))
-		vm.SetData("_lastError", err)
-		gojs.GetLogger(vm).Error(err.Error())
-		return nil
 	}
 	return nil
 }

response.go

@@ -93,10 +93,7 @@ func (r *Response) Write(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value
 	args := gojs.MakeArgs(&argsIn, vm).Check(1)
 	n, err := r.resp.Write(args.Bytes(0))
 	if err != nil {
-		// panic(vm.NewGoError(err))
+		panic(vm.NewGoError(err))
-		vm.SetData("_lastError", err)
-		gojs.GetLogger(vm).Error(err.Error())
-		return vm.ToValue(false)
 	}
 	return vm.ToValue(n)
 }

service.go

@@ -50,11 +50,10 @@ type TplCache struct {
 	Tpl         *template.Template
 }
 
-// var tplFunc = map[string]any{}
+var tplFunc = map[string]any{}
-var tplReplaces = map[string]string{}
+var tplFuncLock = sync.RWMutex{}
-var tplLock = sync.RWMutex{}
+var tplCache = map[string]*TplCache{}
-
+var tplCacheLock = sync.RWMutex{}
-// var tplCache = map[string]*TplCache{}
 
 type LimiterConfig struct {
 	From  string
@@ -75,7 +74,6 @@ type Config struct {
 	Limiters           map[string]*LimiterConfig
 	LimiterRedis       string
 	HotLoad            int
-	TplSafePaths       []string
 
 	Proxy   map[string]string
 	Rewrite map[string]string
@@ -95,12 +93,9 @@ func initConfig(opt *gojs.Obj, logger *log.Logger, vm *goja.Runtime) {
 		s.SetWorkPath(u.String(startPath))
 	}
 	// 处理配置
-	serviceConfig = Config{"Session", "Device", "Client", "id", "", 3600, "auth failed", "verify failed", "too many requests", nil, "", 0, []string{}, map[string]string{}, map[string]string{}, map[string]string{}}
+	serviceConfig = Config{"Session", "Device", "Client", "id", "", 3600, "auth failed", "verify failed", "too many requests", nil, "", 0, map[string]string{}, map[string]string{}, map[string]string{}}
 	if errs := config.LoadConfig("service", &serviceConfig); len(errs) > 0 {
-		// panic(vm.NewGoError(errs[0]))
+		panic(vm.NewGoError(errs[0]))
-		vm.SetData("_lastError", errs[0])
-		gojs.GetLogger(vm).Error(errs[0].Error())
-		return
 	}
 	config.LoadConfig("service", &discover.Config)
 	// var auth goja.Callable
@@ -143,7 +138,6 @@ func initConfig(opt *gojs.Obj, logger *log.Logger, vm *goja.Runtime) {
 					}
 				}
 			}
-
 			// 如果没有session中的authLevel验证失败，则使用Access-Token中的authLevel（服务间调用）
 			if authAccessToken && setAuthLevel < authLevel {
 				setAuthLevel = s.GetAuthTokenLevel(request.Header.Get("Access-Token"))
@@ -257,10 +251,7 @@ func init() {
 				// panic(vm.NewGoError(errors.New("must run service.config frist")))
 			}
 			if server != nil {
-				// panic(vm.NewGoError(errors.New("server already started")))
+				panic(vm.NewGoError(errors.New("server already started")))
-				vm.SetData("_lastError", errors.New("server already started"))
-				gojs.GetLogger(vm).Error("server already started")
-				return vm.ToValue(false)
 			}
 			// 处理静态文件
 			if len(serviceConfig.Static) > 0 {
@@ -299,9 +290,8 @@ func init() {
 					onWatchLock.Unlock()
 				}, "")
 				s.SetOutFilter(func(in map[string]any, request *s.Request, response *s.Response, out any, logger *log.Logger) (newOut any, isOver bool) {
-					contentType := response.Header().Get("Content-Type")
+					if strings.HasPrefix(response.Header().Get("Content-Type"), "text/html") {
 						outStr := u.String(out)
-					if strings.HasPrefix(contentType, "text/html") || (contentType == "" && strings.Contains(outStr, "<html")) {
 						if strings.Contains(outStr, "let _watchWS = null") {
 							return nil, false
 						}
@@ -371,14 +361,11 @@ func init() {
 		},
 		"stop": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			if server == nil {
-				// panic(vm.NewGoError(errors.New("server not started")))
+				panic(vm.NewGoError(errors.New("server not started")))
-				vm.SetData("_lastError", errors.New("server not started"))
-				gojs.GetLogger(vm).Error("server not started")
-				return vm.ToValue(false)
 			}
 			server.Stop()
 			s.ResetAllSets()
-			return vm.ToValue(true)
+			return nil
 		},
 		// "uniqueId": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 		// 	args := gojs.MakeArgs(&argsIn, vm)
@@ -492,10 +479,7 @@ func init() {
 			o := args.Obj(0)
 			action := args.Func(1)
 			if action == nil {
-				// panic(vm.NewGoError(errors.New("action must be a callback function")))
+				panic(vm.NewGoError(errors.New("action must be a callback function")))
-				vm.SetData("_lastError", errors.New("action must be a callback function"))
-				gojs.GetLogger(vm).Error("action must be a callback function")
-				return vm.ToValue(false)
 			}
 
 			authLevel := o.Int("authLevel")
@@ -589,7 +573,7 @@ func init() {
 				// 无对象池，直接调用（单线程）
 				s.RestfulWithOptions(authLevel, method, path, makeInnerAction(action, vm, args.This), memo, opt)
 			}
-			return vm.ToValue(true)
+			return nil
 		},
 		"load": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args := gojs.MakeArgs(&argsIn, vm).Check(1)
@@ -612,17 +596,11 @@ func init() {
 			fi := u.GetFileInfo(actionFile)
 			if fi == nil {
 				fullActionFile, _ := filepath.Abs(actionFile)
-				// panic(vm.NewGoError(errors.New("actionFile must be a js file path: " + fullActionFile)))
+				panic(vm.NewGoError(errors.New("actionFile must be a js file path: " + fullActionFile)))
-				vm.SetData("_lastError", errors.New("actionFile must be a js file path: "+fullActionFile))
-				gojs.GetLogger(vm).Error("actionFile must be a js file path: " + fullActionFile)
-				return vm.ToValue(false)
 			}
 			actionCode := u.ReadFileN(actionFile)
 			if !strings.Contains(actionCode, "function main(") { // || !strings.Contains(actionCode, ".register(")
-				// panic(vm.NewGoError(errors.New("actionFile must be a js file with main function")))
+				panic(vm.NewGoError(errors.New("actionFile must be a js file with main function")))
-				vm.SetData("_lastError", errors.New("actionFile must be a js file with main function"))
-				gojs.GetLogger(vm).Error("actionFile must be a js file with main function")
-				return vm.ToValue(false)
 			}
 			poolsLock.Lock()
 			poolExists[actionFile] = true
@@ -646,7 +624,7 @@ func init() {
 			poolsMTime[actionFile] = mtime
 			poolsConfig[actionFile] = poolOpt
 			poolsLock.Unlock()
-			return vm.ToValue(true)
+			return nil
 		},
 		// "task": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 		// 	args := gojs.MakeArgs(&argsIn, vm).Check(1)
@@ -675,80 +653,49 @@ func init() {
 		// 	})
 		// 	return nil
 		// },
-		// "setTplFunc": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
+		"setTplFunc": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
-		// 	args := gojs.MakeArgs(&argsIn, vm).Check(1)
-		// 	fnObj := args.Obj(0)
-		// 	if fnObj != nil {
-		// 		fnList := map[string]any{}
-		// 		for _, k := range fnObj.O.Keys() {
-		// 			if jsFunc := fnObj.Func(k); jsFunc != nil {
-		// 				fn := func(args ...any) any {
-		// 					jsArgs := make([]goja.Value, len(args))
-		// 					for i := 0; i < len(args); i++ {
-		// 						jsArgs[i] = vm.ToValue(args[i])
-		// 					}
-		// 					// vm.CallbackLocker.Lock()
-		// 					r, err := jsFunc(argsIn.This, jsArgs...)
-		// 					// vm.CallbackLocker.Unlock()
-		// 					if err == nil {
-		// 						return r.Export()
-		// 					} else {
-		// 						panic(vm.NewGoError(err))
-		// 					}
-		// 				}
-		// 				fnList[k] = fn
-		// 			}
-		// 		}
-		// 		if len(fnList) > 0 {
-		// 			tplLock.Lock()
-		// 			for k, v := range fnList {
-		// 				tplFunc[k] = v
-		// 			}
-		// 			tplLock.Unlock()
-		// 		}
-		// 	}
-		// 	return nil
-		// },
-		"setTplReplaces": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args := gojs.MakeArgs(&argsIn, vm).Check(1)
-			replaces := args.Map(0)
+			fnObj := args.Obj(0)
-			tplLock.Lock()
+			if fnObj != nil {
-			for k, v := range replaces {
+				fnList := map[string]any{}
-				tplReplaces[k] = u.String(v)
+				for _, k := range fnObj.O.Keys() {
+					if jsFunc := fnObj.Func(k); jsFunc != nil {
+						fn := func(args ...any) any {
+							jsArgs := make([]goja.Value, len(args))
+							for i := 0; i < len(args); i++ {
+								jsArgs[i] = vm.ToValue(args[i])
+							}
+							if r, err := jsFunc(argsIn.This, jsArgs...); err == nil {
+								return r.Export()
+							} else {
+								panic(vm.NewGoError(err))
+							}
+						}
+						fnList[k] = fn
+					}
+				}
+				if len(fnList) > 0 {
+					tplFuncLock.Lock()
+					for k, v := range fnList {
+						tplFunc[k] = v
+					}
+					tplFuncLock.Unlock()
+				}
 			}
-			tplLock.Unlock()
 			return nil
 		},
 		"tpl": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args := gojs.MakeArgs(&argsIn, vm).Check(2)
 			filename := args.Path(0)
-			if !tplIsSafe(filename) {
-				// panic(vm.NewGoError(errors.New("tpl file " + filename + " not in safe paths")))
-				vm.SetData("_lastError", errors.New("tpl file "+filename+" not in safe paths"))
-				gojs.GetLogger(vm).Error("tpl file " + filename + " not in safe paths")
-				return nil
-			}
-
-			basepath := filepath.Dir(filename)
 			info := u.GetFileInfo(filename)
 			if info == nil {
-				// panic(vm.NewGoError(errors.New("tpl file " + filename + " not exists")))
+				panic(vm.NewGoError(errors.New("tpl file " + filename + " not exists")))
-				vm.SetData("_lastError", errors.New("tpl file "+filename+" not exists"))
-				gojs.GetLogger(vm).Error("tpl file " + filename + " not exists")
-				return nil
 			}
 
 			data := args.Any(1)
-			// tplLock.RLock()
+			tplCacheLock.RLock()
-			// t := tplCache[filename]
+			t := tplCache[filename]
-			var t *TplCache
+			tplCacheLock.RUnlock()
-			if t1 := vm.GetData("TPL_" + filename); t1 != nil {
-				if t2, ok := t1.(*TplCache); ok {
-					t = t2
-				}
-			}
-			// t := vm.GetData("TPL_" + filename).(*TplCache)
-			// tplLock.RUnlock()
 			if t != nil {
 				for f, tm := range t.FileModTime {
 					info := u.GetFileInfo(f)
@@ -759,110 +706,44 @@ func init() {
 				}
 			}
 			if t == nil {
-				tpl := template.New(filename)
+				tpl := template.New("main")
-				fnList := map[string]any{}
+				if len(tplFunc) > 0 {
-				if fnObj := args.Obj(2); fnObj != nil {
+					tpl = tpl.Funcs(tplFunc)
-					for _, k := range fnObj.O.Keys() {
-						if jsFunc := fnObj.Func(k); jsFunc != nil {
-							fn := func(args ...any) any {
-								jsArgs := make([]goja.Value, len(args))
-								for i := 0; i < len(args); i++ {
-									jsArgs[i] = vm.ToValue(args[i])
-								}
-								r, err := jsFunc(argsIn.This, jsArgs...)
-								if err == nil {
-									return r.Export()
-								} else {
-									// panic(vm.NewGoError(err))
-									vm.SetData("_lastError", err)
-									gojs.GetLogger(vm).Error(err.Error())
-									return nil
-								}
-							}
-							fnList[k] = fn
-						}
-					}
-				}
-				if len(fnList) > 0 {
-					tpl = tpl.Funcs(fnList)
 				}
 
 				fileModTime := map[string]int64{
 					filename: info.ModTime.UnixMilli(),
 				}
 				var err error
-				code := tplReplace(u.ReadFileN(filename))
+				for _, m := range tplIncludeMatcher.FindAllStringSubmatch(u.ReadFileN(filename), -1) {
-				for _, m := range tplIncludeMatcher.FindAllStringSubmatch(code, -1) {
+					includeFilename := m[1]
-					a := strings.SplitN(m[1], ":", 2)
+					info2 := u.GetFileInfo(includeFilename)
-					includeFilename := a[0]
+					if info2 == nil {
-					includeFilepath := filepath.Join(basepath, includeFilename)
+						includeFilename = filepath.Join(filepath.Dir(filename), m[1])
-					if !tplIsSafe(includeFilepath) {
+						info2 = u.GetFileInfo(includeFilename)
-						// panic(vm.NewGoError(errors.New("tpl file " + includeFilepath + " not in safe paths")))
-						vm.SetData("_lastError", errors.New("tpl file "+includeFilepath+" not in safe paths"))
-						gojs.GetLogger(vm).Error("tpl file " + includeFilepath + " not in safe paths")
-						return nil
 					}
-
-					// 每个被包含的文件只解析一次（统一修正）
-					if fileModTime[includeFilepath] == 0 {
-						info2 := u.GetFileInfo(includeFilepath)
 					if info2 != nil {
-							includeCode := tplReplace(u.ReadFileN(includeFilepath))
+						tpl, err = tpl.Parse(`{{ define "` + m[1] + `" }}` + u.ReadFileN(includeFilename) + `{{ end }}`)
-							foundBlock := false
-							includeCode = tplDefineMatcher.ReplaceAllStringFunc(includeCode, func(str string) string {
-								if m := tplDefineMatcher.FindStringSubmatch(str); len(m) > 1 {
-									foundBlock = true
-									if m[1] == "main" {
-										return `{{ define "` + includeFilename + `" }}`
-									}
-									return `{{ define "` + includeFilename + ":" + m[1] + `" }}`
-								}
-								return str
-							})
-							if !foundBlock {
-								includeCode = `{{ define "` + includeFilename + `" }}` + includeCode + `{{ end }}`
-							}
-							tpl, err = tpl.Parse(includeCode)
 						if err != nil {
-								// panic(vm.NewGoError(err))
+							panic(vm.NewGoError(err))
-								vm.SetData("_lastError", err)
-								gojs.GetLogger(vm).Error(err.Error())
-								return nil
 						}
-							fileModTime[includeFilepath] = info2.ModTime.UnixMilli()
+						fileModTime[includeFilename] = info2.ModTime.UnixMilli()
-						} else {
-							// panic(vm.NewGoError(errors.New("tpl file " + includeFilepath + " not exists")))
-							vm.SetData("_lastError", errors.New("tpl file "+includeFilepath+" not exists"))
-							gojs.GetLogger(vm).Error("tpl file " + includeFilepath + " not exists")
-							return nil
 					}
 				}
-				}
+				tpl, err = tpl.ParseFiles(filename)
-
-				tpl, err = tpl.Parse(code)
 				if err != nil {
-					// panic(vm.NewGoError(err))
+					panic(vm.NewGoError(err))
-					vm.SetData("_lastError", err)
-					gojs.GetLogger(vm).Error(err.Error())
-					return nil
 				}
 				t = &TplCache{
 					Tpl:         tpl,
 					FileModTime: fileModTime,
 				}
-				// tplLock.Lock()
-				// tplCache[filename] = t
-				// tplLock.Unlock()
-				vm.SetData("TPL_"+filename, t)
 			}
 
 			buf := bytes.NewBuffer(make([]byte, 0))
-			err := t.Tpl.ExecuteTemplate(buf, filename, data)
+			err := t.Tpl.ExecuteTemplate(buf, filepath.Base(filename), data)
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return nil
 			}
 			return vm.ToValue(buf.String())
 		},
@@ -902,53 +783,10 @@ func init() {
 	})
 }
 
-var regexpCache = map[string]*regexp.Regexp{}
-var regexpLock = sync.RWMutex{}
-
-func getRegexp(regexpStr string) (*regexp.Regexp, error) {
-	regexpLock.RLock()
-	rx, ok := regexpCache[regexpStr]
-	regexpLock.RUnlock()
-	if ok {
-		return rx, nil
-	}
-	rx, err := regexp.Compile(regexpStr)
-	if err == nil {
-		regexpLock.Lock()
-		defer regexpLock.Unlock()
-		regexpCache[regexpStr] = rx
-	}
-	return rx, err
-}
-
-func tplReplace(code string) string {
-	for k, v := range tplReplaces {
-		if rx, err := getRegexp(k); err == nil {
-			code = rx.ReplaceAllString(code, v)
-		}
-	}
-	return code
-}
-
-func tplIsSafe(filename string) bool {
-	if len(serviceConfig.TplSafePaths) > 0 {
-		isSafe := false
-		for _, safePath := range serviceConfig.TplSafePaths {
-			if strings.HasPrefix(filename, safePath) {
-				isSafe = true
-				break
-			}
-		}
-		return isSafe
-	}
-	return true
-}
-
 var tplIncludeMatcher = regexp.MustCompile(`{{\s*template\s+"([^"]+)"`)
-var tplDefineMatcher = regexp.MustCompile(`{{\s*define\s+"([^"]+)"\s*}}`)
 
 func verifyRegexp(regexpStr string) func(any, *goja.Runtime) bool {
-	if rx, err := getRegexp(regexpStr); err != nil {
+	if rx, err := regexp.Compile(regexpStr); err != nil {
 		return func(value any, vm *goja.Runtime) bool {
 			return rx.MatchString(u.String(value))
 		}
@@ -1068,15 +906,6 @@ func runAction(action goja.Callable, vm *goja.Runtime, thisArg goja.Value, args
 		}
 	}
 
-	// force set userId to vm
-	vmUserId := "_guest"
-	if session != nil {
-		if userId, ok := session.data[serviceConfig.UserIdKey]; ok {
-			vmUserId = u.String(userId)
-		}
-	}
-	vm.SetData("userId", vmUserId)
-
 	requestParams, resp := makeRequestParams(args, headers, request, response, client, caller, session, logger)
 	var r any
 

service.ts

@@ -22,8 +22,7 @@ export default {
     // idL,
     // uniqueId,
     // uniqueIdL,
-	// setTplFunc,
+    setTplFunc,
-	setTplReplaces,
     tpl,
 }
 
@@ -53,11 +52,10 @@ function id(size?: number): string { return '' }
 // function idL(space: string, size?: number): string { return '' }
 // function uniqueId(size?: number): string { return '' }
 // function uniqueIdL(size?: number): string { return '' }
-// function setTplFunc(fnList: Object): void { }
+function setTplFunc(fnList: Object): void { }
-function setTplReplaces(replaces: Object): void { }
+function tpl(file: string, data: Object): string { return '' }
-function tpl(file: string, data: Object, fnList?: Object): string { return '' }
 
-export interface Config {
+interface Config {
     // github.com/ssgo/s 的配置参数
     listen: string                              // 监听端口（|隔开多个监听）（,隔开多个选项）（如果不指定IP则监听在0.0.0.0，如果不指定端口则使用h2c协议监听在随机端口，80端口默认使用http协议，443端口默认使用https协议），例如 80,http|443|443:h2|127.0.0.1:8080,h2c
     ssl: Map<string, CertSet>                   // SSL证书配置，key为域名，value为cert和key的文件路径
@@ -120,7 +118,6 @@ export interface Config {
     limiterRedis: string                        // 限流器使用的Redis连接，默认使用内存存储
     limiters: Map<string, LimiterConfig>        // 限流器配置，from 为数据来源，例如：ip、user、device、header.User-Agent、in.phone 等（in表示从请求参数中获取），time为时间间隔，单位ms，times为 时间间隔内允许访问的次数
     hotLoad: number                             // 热加载配置，单位s，默认值：0，0表示不检测热加载
-	tplSafePaths: string[]                      // 模板文件的安全路径，默认不开启安全检查
 
     // gateway 的配置参数
     proxy: Map<string, string>                  // 代理配置，key为[host][path]，value为代理的目标应用或URL
@@ -137,24 +134,24 @@ export interface Config {
     ipPrefix: string                            // discover服务发现时指定使用的IP网段，默认排除 172.17.（Docker）
 }
 
-export interface CertSet {
+interface CertSet {
     certFile: string
     keyFile: string
 }
 
-export interface PoolConfig {
+interface PoolConfig {
     min: number
     max: string
     idle: number
 }
 
-export interface LimiterConfig {
+interface LimiterConfig {
     from: string
     time: number
     times: number
 }
 
-export interface RegisterOption {
+interface RegisterOption {
     authLevel: number
     host: string
     method: string
@@ -170,7 +167,7 @@ export interface RegisterOption {
     onClose: (params: RequestParams) => void
 }
 
-export interface RequestParams {
+interface RequestParams {
     args: Object
     headers: Object
     request: Request
@@ -181,7 +178,7 @@ export interface RequestParams {
     logger: Logger
 }
 
-export interface OnMessageParams {
+interface OnMessageParams {
     type: string
     data: string | Object
     client: WSClient
@@ -189,7 +186,7 @@ export interface OnMessageParams {
     logger: Logger
 }
 
-export interface WSClient {
+interface WSClient {
     id: string
     read: () => WSMessage
     write: (data: any) => void
@@ -198,12 +195,12 @@ export interface WSClient {
     close: () => void
 }
 
-export interface WSMessage {
+interface WSMessage {
     type: string
     data: string | Object
 }
 
-export interface Session {
+interface Session {
     set: (key: string | Object, value?: any) => void
     get: (...keys: string[]) => any | Object
     remove: (...keys: string[]) => void
@@ -211,7 +208,7 @@ export interface Session {
     save: () => void
 }
 
-export interface Caller {
+interface Caller {
     get(url: string, headers?: Object): Result
     head(url: string, headers?: Object): Result
     post(url: string, data: any, headers?: Object): Result
@@ -220,7 +217,7 @@ export interface Caller {
     do(method: string, url: string, data: any, callback?: (data: string) => void, headers?: Object): Result
 }
 
-export interface Result {
+interface Result {
     status: string
     statusCode: number
     headers: Object
@@ -229,7 +226,7 @@ export interface Result {
     object(): Object
 }
 
-export interface CookieOption {
+interface CookieOption {
     path: string
     domain: string
     expires: any
@@ -238,7 +235,7 @@ export interface CookieOption {
     httpOnly: boolean
 }
 
-export interface Request {
+interface Request {
     id: string
     proto: string
     scheme: string
@@ -267,7 +264,7 @@ export interface Request {
     setUserID: (id: string) => void
 }
 
-export interface Response {
+interface Response {
     id: string
     setStatus: (code: number) => void
     setCookie: (name: string, value: string, option?: CookieOption) => void
@@ -282,14 +279,14 @@ export interface Response {
     end: (data: any) => void
 }
 
-export interface Logger {
+interface Logger {
     debug: (message: string, info?: Object) => void
     info: (message: string, info?: Object) => void
     warn: (message: string, info?: Object) => void
     error: (message: string, info?: Object) => void
 }
 
-export interface UploadFile {
+interface UploadFile {
     name: string
     size: number
     data: any

tests/service_ws_test.go

@@ -45,9 +45,7 @@ func TestWS(t *testing.T) {
 }
 
 func TestStopWSByPool(t *testing.T) {
-	fmt.Println(u.BGreen("stop ws"))
 	_, err := rt3.RunCode("s.stop();task.stop();")
-	fmt.Println(u.BGreen("stop ws ok"), err)
 	if err != nil {
 		t.Fatal("stop failed", err)
 	}

tests/task.js

@@ -15,7 +15,10 @@ function onRun() {
         let conns = task.getAll('wsTest_')
         for (let id in conns) {
             let conn = conns[id]
-			if (!conn.write(i++)) {
+            try {
+                conn.write(i++)
+            } catch (e) {
+                co.error(e)
                 task.remove(id)
             }
         }

tests/tpl.js

@@ -1,7 +1,8 @@
 import s from "apigo.cc/gojs/service"
 
 function main(args) {
-	return s.tpl('tpl/page.html', { title: 'Abc' }, {
+    s.setTplFunc({
         bb: text => { return '<b>' + text + '</b>' }
     })
+    return s.tpl('tpl/page.html', { title: 'Abc' })
 }

ws.go

@@ -18,10 +18,7 @@ func MakeWSClient(client *websocket.Conn, id string) gojs.Map {
 		"read": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			typ, data, err := readWSMessage(client)
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return vm.ToValue(false)
 			}
 			return vm.ToValue(gojs.Map{
 				"type": typ,
@@ -40,22 +37,16 @@ func MakeWSClient(client *websocket.Conn, id string) gojs.Map {
 				err = client.WriteMessage(websocket.TextMessage, u.JsonBytes(args.Any(0)))
 			}
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return vm.ToValue(false)
 			}
-			return vm.ToValue(true)
+			return nil
 		},
 		"ping": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			err := client.WriteMessage(websocket.PingMessage, nil)
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return vm.ToValue(false)
 			}
-			return vm.ToValue(true)
+			return nil
 		},
 		"writeMessage": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args := gojs.MakeArgs(&argsIn, vm).Check(2)
@@ -77,22 +68,16 @@ func MakeWSClient(client *websocket.Conn, id string) gojs.Map {
 				err = client.WriteMessage(websocket.TextMessage, args.Bytes(1))
 			}
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return vm.ToValue(false)
 			}
-			return vm.ToValue(true)
+			return nil
 		},
 		"close": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			err := client.Close()
 			if err != nil {
-				// panic(vm.NewGoError(err))
+				panic(vm.NewGoError(err))
-				vm.SetData("_lastError", err)
-				gojs.GetLogger(vm).Error(err.Error())
-				return vm.ToValue(false)
 			}
-			return vm.ToValue(true)
+			return nil
 		},
 	}
 }