diff --git a/plugins/wasm-assemblyscript/assembly/index.ts b/plugins/wasm-assemblyscript/assembly/index.ts index 6ff8a4893..ab36b765c 100644 --- a/plugins/wasm-assemblyscript/assembly/index.ts +++ b/plugins/wasm-assemblyscript/assembly/index.ts @@ -14,5 +14,5 @@ export {SetCtx, ProcessRequestHeadersBy, ProcessResponseBodyBy, ProcessResponseHeadersBy, - Logger, RegisteTickFunc} from "./plugin_wrapper" + Logger, RegisterTickFunc} from "./plugin_wrapper" export {ParseResult} from "./rule_matcher" \ No newline at end of file diff --git a/plugins/wasm-assemblyscript/assembly/plugin_wrapper.ts b/plugins/wasm-assemblyscript/assembly/plugin_wrapper.ts index 52f5b5371..1a7a36e18 100644 --- a/plugins/wasm-assemblyscript/assembly/plugin_wrapper.ts +++ b/plugins/wasm-assemblyscript/assembly/plugin_wrapper.ts @@ -156,7 +156,7 @@ class TickFuncEntry { var globalOnTickFuncs = new Array(); -export function RegisteTickFunc(tickPeriod: i64, tickFunc: () => void): void { +export function RegisterTickFunc(tickPeriod: i64, tickFunc: () => void): void { globalOnTickFuncs.push(new TickFuncEntry(0, tickPeriod, tickFunc)); } diff --git a/plugins/wasm-assemblyscript/extensions/hello-world/assembly/index.ts b/plugins/wasm-assemblyscript/extensions/hello-world/assembly/index.ts index e7fb7b5d1..c222d391c 100644 --- a/plugins/wasm-assemblyscript/extensions/hello-world/assembly/index.ts +++ b/plugins/wasm-assemblyscript/extensions/hello-world/assembly/index.ts @@ -1,5 +1,5 @@ export * from "@higress/proxy-wasm-assemblyscript-sdk/assembly/proxy"; -import { SetCtx, HttpContext, ProcessRequestHeadersBy, Logger, ParseResult, ParseConfigBy, RegisteTickFunc, ProcessResponseHeadersBy } from "@higress/wasm-assemblyscript/assembly"; +import { SetCtx, HttpContext, ProcessRequestHeadersBy, Logger, ParseResult, ParseConfigBy, RegisterTickFunc, ProcessResponseHeadersBy } from "@higress/wasm-assemblyscript/assembly"; import { FilterHeadersStatusValues, send_http_response, stream_context } from "@higress/proxy-wasm-assemblyscript-sdk/assembly" import { JSON } from "assemblyscript-json/assembly"; class HelloWorldConfig { @@ -12,10 +12,10 @@ SetCtx("hello-world", ]) function parseConfig(json: JSON.Obj): ParseResult { - RegisteTickFunc(2000, () => { + RegisterTickFunc(2000, () => { Logger.Debug("tick 2s"); }) - RegisteTickFunc(5000, () => { + RegisterTickFunc(5000, () => { Logger.Debug("tick 5s"); }) return new ParseResult(new HelloWorldConfig(), true); diff --git a/plugins/wasm-go/extensions/ai-proxy/go.mod b/plugins/wasm-go/extensions/ai-proxy/go.mod index f641d07a6..94109058c 100644 --- a/plugins/wasm-go/extensions/ai-proxy/go.mod +++ b/plugins/wasm-go/extensions/ai-proxy/go.mod @@ -8,7 +8,7 @@ toolchain go1.24.4 require ( github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80 - github.com/higress-group/wasm-go v1.0.1 + github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2 github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.18.0 ) diff --git a/plugins/wasm-go/extensions/ai-proxy/go.sum b/plugins/wasm-go/extensions/ai-proxy/go.sum index ae7bfa19f..a59ea6b2e 100644 --- a/plugins/wasm-go/extensions/ai-proxy/go.sum +++ b/plugins/wasm-go/extensions/ai-proxy/go.sum @@ -4,10 +4,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80 h1:xqmtTZI0JQ2O+Lg9/CE6c+Tw9KD6FnvWw8EpLVuuvfg= github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80/go.mod h1:tRI2LfMudSkKHhyv1uex3BWzcice2s/l8Ah8axporfA= -github.com/higress-group/wasm-go v1.0.0 h1:4Ik5n3FsJ5+r13KLQl2ky+8NuAE8dfWQwoKxXYD2KAw= -github.com/higress-group/wasm-go v1.0.0/go.mod h1:ODBV27sjmhIW8Cqv3R74EUcTnbdkE69bmXBQFuRkY1M= -github.com/higress-group/wasm-go v1.0.1 h1:T1m++qTEANp8+jwE0sxltwtaTKmrHCkLOp1m9N+YeqY= -github.com/higress-group/wasm-go v1.0.1/go.mod h1:9k7L730huS/q4V5iH9WLDgf5ZUHEtfhM/uXcegKDG/M= +github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2 h1:2wlbNpFJCQNbPBFYgswz7Zvxo9O3L0PH0AJxwiCc5lk= +github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2/go.mod h1:9k7L730huS/q4V5iH9WLDgf5ZUHEtfhM/uXcegKDG/M= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/plugins/wasm-go/extensions/ai-proxy/provider/failover.go b/plugins/wasm-go/extensions/ai-proxy/provider/failover.go index 0bf7fe419..60aaf36ca 100644 --- a/plugins/wasm-go/extensions/ai-proxy/provider/failover.go +++ b/plugins/wasm-go/extensions/ai-proxy/provider/failover.go @@ -146,7 +146,7 @@ func (c *ProviderConfig) SetApiTokensFailover(activeProvider Provider) error { return fmt.Errorf("failed to init apiTokens: %v", err) } - wrapper.RegisteTickFunc(c.failover.healthCheckInterval, func() { + wrapper.RegisterTickFunc(c.failover.healthCheckInterval, func() { // Only the Wasm VM that successfully acquires the lease will perform health check if c.isFailoverEnabled() && c.tryAcquireOrRenewLease(vmID) { log.Debugf("Successfully acquired or renewed lease for %v: %v", vmID, c.GetType()) diff --git a/plugins/wasm-go/extensions/oidc/go.mod b/plugins/wasm-go/extensions/oidc/go.mod index d68bdc58a..6148fcaa0 100644 --- a/plugins/wasm-go/extensions/oidc/go.mod +++ b/plugins/wasm-go/extensions/oidc/go.mod @@ -7,10 +7,12 @@ toolchain go1.24.4 require ( github.com/higress-group/oauth2-proxy v1.0.1-0.20250702092041-8932d225759a github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80 - github.com/higress-group/wasm-go v1.0.0 + github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2 github.com/tidwall/gjson v1.18.0 ) +require github.com/tidwall/sjson v1.2.5 // indirect + require ( github.com/benbjohnson/clock v1.3.5 // indirect github.com/bitly/go-simplejson v0.5.1 // indirect diff --git a/plugins/wasm-go/extensions/oidc/go.sum b/plugins/wasm-go/extensions/oidc/go.sum index 982f5e9ef..15dd5560e 100644 --- a/plugins/wasm-go/extensions/oidc/go.sum +++ b/plugins/wasm-go/extensions/oidc/go.sum @@ -18,8 +18,8 @@ github.com/higress-group/oauth2-proxy v1.0.1-0.20250702092041-8932d225759a h1:wV github.com/higress-group/oauth2-proxy v1.0.1-0.20250702092041-8932d225759a/go.mod h1:sDlsoo4dx+Cx56vI5kegeXZAoQ4nnd7xWL7Oc4/4hLI= github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80 h1:xqmtTZI0JQ2O+Lg9/CE6c+Tw9KD6FnvWw8EpLVuuvfg= github.com/higress-group/proxy-wasm-go-sdk v0.0.0-20250611100342-5654e89a7a80/go.mod h1:tRI2LfMudSkKHhyv1uex3BWzcice2s/l8Ah8axporfA= -github.com/higress-group/wasm-go v1.0.0 h1:4Ik5n3FsJ5+r13KLQl2ky+8NuAE8dfWQwoKxXYD2KAw= -github.com/higress-group/wasm-go v1.0.0/go.mod h1:ODBV27sjmhIW8Cqv3R74EUcTnbdkE69bmXBQFuRkY1M= +github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2 h1:2wlbNpFJCQNbPBFYgswz7Zvxo9O3L0PH0AJxwiCc5lk= +github.com/higress-group/wasm-go v1.0.2-0.20250819092116-2fd2b083a8e2/go.mod h1:9k7L730huS/q4V5iH9WLDgf5ZUHEtfhM/uXcegKDG/M= github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -36,6 +36,7 @@ github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE= github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -45,6 +46,8 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/resp v0.1.1 h1:Ly20wkhqKTmDUPlyM1S7pWo5kk0tDu8OoC/vFArXmwE= github.com/tidwall/resp v0.1.1/go.mod h1:3/FrruOBAxPTPtundW0VXgmsQ4ZBA0Aw714lVYgwFa0= +github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= +github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= diff --git a/plugins/wasm-go/extensions/oidc/main.go b/plugins/wasm-go/extensions/oidc/main.go index b638e86b8..a2fbd48be 100644 --- a/plugins/wasm-go/extensions/oidc/main.go +++ b/plugins/wasm-go/extensions/oidc/main.go @@ -52,7 +52,7 @@ func parseConfig(json gjson.Result, config *PluginConfig, log log.Log) error { return err } - wrapper.RegisteTickFunc(opts.VerifierInterval.Milliseconds(), func() { + wrapper.RegisterTickFunc(opts.VerifierInterval.Milliseconds(), func() { config.oidcHandler.SetVerifier(opts) }) return nil diff --git a/plugins/wasm-go/pkg/wrapper/plugin_wrapper.go b/plugins/wasm-go/pkg/wrapper/plugin_wrapper.go index b1a2da922..7bfc7b9f9 100644 --- a/plugins/wasm-go/pkg/wrapper/plugin_wrapper.go +++ b/plugins/wasm-go/pkg/wrapper/plugin_wrapper.go @@ -123,11 +123,11 @@ var globalOnTickFuncs []TickFuncEntry = []TickFuncEntry{} // You should call this function in parseConfig phase, for example: // // func parseConfig(json gjson.Result, config *HelloWorldConfig, log wrapper.Log) error { -// wrapper.RegisteTickFunc(1000, func() { proxywasm.LogInfo("onTick 1s") }) -// wrapper.RegisteTickFunc(3000, func() { proxywasm.LogInfo("onTick 3s") }) +// wrapper.RegisterTickFunc(1000, func() { proxywasm.LogInfo("onTick 1s") }) +// wrapper.RegisterTickFunc(3000, func() { proxywasm.LogInfo("onTick 3s") }) // return nil // } -func RegisteTickFunc(tickPeriod int64, tickFunc func()) { +func RegisterTickFunc(tickPeriod int64, tickFunc func()) { globalOnTickFuncs = append(globalOnTickFuncs, TickFuncEntry{0, tickPeriod, tickFunc}) }