Merge pull request #10 from knqyf263/close

Adds Plugin.Close
knqyf263 · Nov 21, 2022 · 55122e4 · 55122e4
2 parents 83330ad + c038056
commit 55122e4
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -158,7 +158,6 @@ import (
 // main is required for TinyGo to compile to Wasm.
 func main() {
 	greeting.RegisterGreeter(MyPlugin{})
-
 }
 
 type MyPlugin struct{}
@@ -196,6 +195,7 @@ func main() {
 	// Initialize a plugin loader
 	p, err := greeting.NewGreeterPlugin(ctx, greeting.GreeterPluginOption{})
 	if err != nil {...}
+	defer p.Close(ctx)
 
 	// Load a plugin
 	plugin, err := p.Load(ctx, "path/to/plugin.wasm")

diff --git a/examples/helloworld/greeting/greet_host.pb.go b/examples/helloworld/greeting/greet_host.pb.go
diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go
@@ -20,6 +20,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
+	defer p.Close(ctx)
 
 	morningPlugin, err := p.Load(ctx, "plugin-morning/morning.wasm")
 	if err != nil {

diff --git a/examples/host-functions/greeting/greet_host.pb.go b/examples/host-functions/greeting/greet_host.pb.go
diff --git a/examples/host-functions/main.go b/examples/host-functions/main.go
@@ -23,6 +23,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
+	defer p.Close(ctx)
 
 	// Pass my host functions that are embedded into the plugin.
 	greetingPlugin, err := p.Load(ctx, "plugin/plugin.wasm", myHostFunctions{})

diff --git a/examples/known-types/known/known_host.pb.go b/examples/known-types/known/known_host.pb.go
diff --git a/examples/known-types/main.go b/examples/known-types/main.go
@@ -24,6 +24,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
+	defer p.Close(ctx)
 
 	plugin, err := p.Load(ctx, "plugin/plugin.wasm")
 	if err != nil {

diff --git a/examples/wasi/cat/cat_host.pb.go b/examples/wasi/cat/cat_host.pb.go
diff --git a/examples/wasi/main.go b/examples/wasi/main.go
@@ -30,6 +30,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
+	defer p.Close(ctx)
 
 	wasiPlugin, err := p.Load(ctx, "plugin/plugin.wasm")
 	if err != nil {

diff --git a/gen/host.go b/gen/host.go
@@ -146,7 +146,20 @@ func genHost(g *protogen.GeneratedFile, f *fileInfo, service *serviceInfo) {
 				runtime: r,
 				config:  config,
 			}, nil
-		}`)
+		}
+	`)
+
+	// Close plugin
+	g.P(fmt.Sprintf(`func (p *%s) Close(ctx %s) (err error) {
+	if r := p.runtime; r != nil {
+		err = r.Close(ctx)
+	}
+	return
+}
+`,
+		pluginName,
+		g.QualifiedGoIdent(contextPackage.Ident("Context")),
+	))
 
 	// Plugin loading
 	structName := strings.ToLower(service.GoName[:1]) + service.GoName[1:] + "Plugin"
@@ -160,6 +173,7 @@ func genHost(g *protogen.GeneratedFile, f *fileInfo, service *serviceInfo) {
 			return nil, err
 		}`
 	}
+
 	g.P(fmt.Sprintf("func (p *%s) Load(ctx %s, pluginPath string %s) (%s, error) {",
 		pluginName,
 		g.QualifiedGoIdent(contextPackage.Ident("Context")),

diff --git a/tests/fields/fields_test.go b/tests/fields/fields_test.go
@@ -14,6 +14,7 @@ func TestFields(t *testing.T) {
 	ctx := context.Background()
 	p, err := proto.NewFieldTestPlugin(ctx, proto.FieldTestPluginOption{})
 	require.NoError(t, err)
+	defer p.Close(ctx)
 
 	plugin, err := p.Load(ctx, "plugin/plugin.wasm")
 	require.NoError(t, err)

diff --git a/tests/fields/proto/fields_host.pb.go b/tests/fields/proto/fields_host.pb.go
diff --git a/tests/host-functions/host_functions_test.go b/tests/host-functions/host_functions_test.go
@@ -16,6 +16,7 @@ func TestHostFunctions(t *testing.T) {
 	ctx := context.Background()
 	p, err := proto.NewGreeterPlugin(ctx, proto.GreeterPluginOption{Stdout: os.Stdout})
 	require.NoError(t, err)
+	defer p.Close(ctx)
 
 	// Pass my host functions that are embedded into the plugin.
 	plugin, err := p.Load(ctx, "plugin/plugin.wasm", myHostFunctions{})

diff --git a/tests/host-functions/proto/host_host.pb.go b/tests/host-functions/proto/host_host.pb.go
diff --git a/tests/import/import_test.go b/tests/import/import_test.go
@@ -15,6 +15,7 @@ func TestImport(t *testing.T) {
 	ctx := context.Background()
 	p, err := foo.NewFooPlugin(ctx, foo.FooPluginOption{})
 	require.NoError(t, err)
+	defer p.Close(ctx)
 
 	plugin, err := p.Load(ctx, "plugin/plugin.wasm")
 	require.NoError(t, err)

diff --git a/tests/import/proto/bar/bar_host.pb.go b/tests/import/proto/bar/bar_host.pb.go
diff --git a/tests/import/proto/foo/foo_host.pb.go b/tests/import/proto/foo/foo_host.pb.go
diff --git a/tests/well-known/proto/known_host.pb.go b/tests/well-known/proto/known_host.pb.go
diff --git a/tests/well-known/well_known_test.go b/tests/well-known/well_known_test.go
@@ -20,6 +20,7 @@ func TestWellKnownTypes(t *testing.T) {
 	ctx := context.Background()
 	p, err := proto.NewKnownTypesTestPlugin(ctx, proto.KnownTypesTestPluginOption{})
 	require.NoError(t, err)
+	defer p.Close(ctx)
 
 	plugin, err := p.Load(ctx, "plugin/plugin.wasm")
 	require.NoError(t, err)