fix: set default host function namespace to extism:host/user (#37)

See extism/extism/issues/504
extism · Nov 9, 2023 · d502225 · d502225
1 parent 9beb289
commit d502225
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -152,7 +152,6 @@ kvStore := make(map[string][]byte)
 
 kvRead := extism.NewHostFunctionWithStack(
     "kv_read",
-    "env",
     func(ctx context.Context, p *extism.CurrentPlugin, stack []uint64) {
         key, err := p.ReadString(stack[0])
         if err != nil {
@@ -173,7 +172,6 @@ kvRead := extism.NewHostFunctionWithStack(
 
 kvWrite := extism.NewHostFunctionWithStack(
     "kv_write",
-    "env",
     func(ctx context.Context, p *extism.CurrentPlugin, stack []uint64) {
         key, err := p.ReadString(stack[0])
         if err != nil {

diff --git a/extism_test.go b/extism_test.go
@@ -226,7 +226,6 @@ func TestHost_simple(t *testing.T) {
 
 	mult := NewHostFunctionWithStack(
 		"mult",
-		"env",
 		func(ctx context.Context, plugin *CurrentPlugin, stack []uint64) {
 			a := api.DecodeI32(stack[0])
 			b := api.DecodeI32(stack[1])
@@ -256,7 +255,6 @@ func TestHost_memory(t *testing.T) {
 
 	mult := NewHostFunctionWithStack(
 		"to_upper",
-		"host",
 		func(ctx context.Context, plugin *CurrentPlugin, stack []uint64) {
 			offset := stack[0]
 			buffer, err := plugin.ReadBytes(offset)
@@ -280,6 +278,8 @@ func TestHost_memory(t *testing.T) {
 		[]api.ValueType{PTR},
 	)
 
+	mult.SetNamespace("host")
+
 	if plugin, ok := plugin(t, manifest, mult); ok {
 		defer plugin.Close()
 
@@ -304,7 +304,6 @@ func TestHost_multiple(t *testing.T) {
 
 	green_message := NewHostFunctionWithStack(
 		"hostGreenMessage",
-		"env",
 		func(ctx context.Context, plugin *CurrentPlugin, stack []uint64) {
 			offset := stack[0]
 			input, err := plugin.ReadString(offset)
@@ -330,7 +329,6 @@ func TestHost_multiple(t *testing.T) {
 
 	purple_message := NewHostFunctionWithStack(
 		"hostPurpleMessage",
-		"env",
 		func(ctx context.Context, plugin *CurrentPlugin, stack []uint64) {
 			offset := stack[0]
 			input, err := plugin.ReadString(offset)

diff --git a/host.go b/host.go
@@ -57,13 +57,16 @@ type HostFunction struct {
 	Returns       []api.ValueType
 }
 
+func (f *HostFunction) SetNamespace(namespace string) {
+	f.Namespace = namespace
+}
+
 // NewHostFunctionWithStack creates a new instance of a HostFunction, which is designed
 // to provide custom functionality in a given host environment.
 // Here's an example multiplication function that loads operands from memory:
 //
 //	 mult := NewHostFunctionWithStack(
 //		"mult",
-//		"env",
 //		func(ctx context.Context, plugin *CurrentPlugin, stack []uint64) {
 //			a := api.DecodeI32(stack[0])
 //			b := api.DecodeI32(stack[1])
@@ -75,15 +78,14 @@ type HostFunction struct {
 //	 )
 func NewHostFunctionWithStack(
 	name string,
-	namespace string,
 	callback HostFunctionStackCallback,
 	params []api.ValueType,
 	returnTypes []api.ValueType) HostFunction {
 
 	return HostFunction{
 		stackCallback: callback,
 		Name:          name,
-		Namespace:     namespace,
+		Namespace:     "extism:host/user",
 		Params:        params,
 		Returns:       returnTypes,
 	}

diff --git a/plugins/host/go.mod b/plugins/host/go.mod
@@ -1,8 +1,7 @@
 module github.com/extism/extism-sdk-plugins-host
 
-go 1.20
+go 1.21.0
 
-require (
-	github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 // indirect
-	github.com/valyala/fastjson v1.6.3 // indirect
-)
+toolchain go1.21.1
+
+require github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263
diff --git a/plugins/host/go.sum b/plugins/host/go.sum
@@ -1,6 +1,2 @@
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64 h1:IfR1k741q+yQLvv5sLShCkvt3FgKU4wQVJfp7hhb/iY=
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64/go.mod h1:1wdiAoG8306g4WK+6laBrS+75089/0V4XRVTllt8b5U=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 h1:uSo+K1JhsMlamDmaxyAGj0dGExZHLsL+Edyug0dC+uk=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
-github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
-github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
diff --git a/plugins/host/main.go b/plugins/host/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/extism/go-pdk"
 )
 
-//go:wasm-module env
+//go:wasm-module extism:host/user
 //export mult
 func mult(x, y uint64) uint64
 

diff --git a/plugins/host_memory/go.mod b/plugins/host_memory/go.mod
@@ -1,8 +1,7 @@
 module github.com/extism/extism-sdk-plugins-host-memory
 
-go 1.20
+go 1.21.0
 
-require (
-	github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 // indirect
-	github.com/valyala/fastjson v1.6.3 // indirect
-)
+toolchain go1.21.1
+
+require github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263
diff --git a/plugins/host_memory/go.sum b/plugins/host_memory/go.sum
@@ -1,6 +1,2 @@
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64 h1:IfR1k741q+yQLvv5sLShCkvt3FgKU4wQVJfp7hhb/iY=
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64/go.mod h1:1wdiAoG8306g4WK+6laBrS+75089/0V4XRVTllt8b5U=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 h1:uSo+K1JhsMlamDmaxyAGj0dGExZHLsL+Edyug0dC+uk=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
-github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
-github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
diff --git a/plugins/host_multiple/go.mod b/plugins/host_multiple/go.mod
@@ -1,8 +1,7 @@
 module github.com/extism/extism-sdk-plugins-host-multiple
 
-go 1.20
+go 1.21.0
 
-require (
-	github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 // indirect
-	github.com/valyala/fastjson v1.6.3 // indirect
-)
+toolchain go1.21.1
+
+require github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263
diff --git a/plugins/host_multiple/go.sum b/plugins/host_multiple/go.sum
@@ -1,6 +1,2 @@
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64 h1:IfR1k741q+yQLvv5sLShCkvt3FgKU4wQVJfp7hhb/iY=
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64/go.mod h1:1wdiAoG8306g4WK+6laBrS+75089/0V4XRVTllt8b5U=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 h1:uSo+K1JhsMlamDmaxyAGj0dGExZHLsL+Edyug0dC+uk=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
-github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
-github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
diff --git a/plugins/host_multiple/main.go b/plugins/host_multiple/main.go
@@ -4,6 +4,7 @@ import (
 	"github.com/extism/go-pdk"
 )
 
+//go:wasm-module extism:host/user
 //export hostPurpleMessage
 func hostPurpleMessage(offset uint64) uint64
 
@@ -13,6 +14,7 @@ func purpleMessage(message string) pdk.Memory {
 	return pdk.FindMemory(off)
 }
 
+//go:wasm-module extism:host/user
 //export hostGreenMessage
 func hostGreenMessage(offset uint64) uint64
 
@@ -22,6 +24,7 @@ func greenMessage(message string) pdk.Memory {
 	return pdk.FindMemory(off)
 }
 
+//go:wasm-module extism:host/user
 //export say_purple
 func say_purple() int32 {
 	input := pdk.InputString()
@@ -34,6 +37,7 @@ func say_purple() int32 {
 
 }
 
+//go:wasm-module extism:host/user
 //export say_green
 func say_green() int32 {
 	input := pdk.Input()

diff --git a/plugins/log/main.go b/plugins/log/main.go
@@ -11,7 +11,7 @@ func run_test() int32 {
 	pdk.Log(pdk.LogDebug, "this is a debug log")
 	pdk.Log(pdk.LogInfo, "this is an info log")
 	pdk.Log(pdk.LogWarn, "this is a warning log")
-	pdk.Log(pdk.LogError, "this is an erorr log")
+	pdk.Log(pdk.LogError, "this is an error log")
 
 	return 0
 }

diff --git a/plugins/noop/go.mod b/plugins/noop/go.mod
@@ -1,8 +1,7 @@
 module github.com/extism/extism-sdk-plugins-noop
 
-go 1.20
+go 1.21.0
 
-require (
-	github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 // indirect
-	github.com/valyala/fastjson v1.6.3 // indirect
-)
+toolchain go1.21.1
+
+require github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263
diff --git a/plugins/noop/go.sum b/plugins/noop/go.sum
@@ -1,6 +1,2 @@
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64 h1:IfR1k741q+yQLvv5sLShCkvt3FgKU4wQVJfp7hhb/iY=
-github.com/extism/go-pdk v0.0.0-20230119214914-65bffbeb3e64/go.mod h1:1wdiAoG8306g4WK+6laBrS+75089/0V4XRVTllt8b5U=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263 h1:uSo+K1JhsMlamDmaxyAGj0dGExZHLsL+Edyug0dC+uk=
 github.com/extism/go-pdk v1.0.0-rc1.0.20231019212020-62d54a6e0263/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
-github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
-github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
diff --git a/plugins/noop/main.go b/plugins/noop/main.go
@@ -1,8 +1,11 @@
 package main
 
+import "github.com/extism/go-pdk"
+
 //export run_test
 func run_test() int32 {
-	return 0
+	pdk.SetErrorString("my custom error")
+	return 1
 }
 
 func main() {}
diff --git a/plugins/noop/throw.wasm b/plugins/noop/throw.wasm
diff --git a/wasm/host.wasm b/wasm/host.wasm
diff --git a/wasm/host_memory.wasm b/wasm/host_memory.wasm
diff --git a/wasm/host_multiple.wasm b/wasm/host_multiple.wasm