[next] per ref instance of wazero runtime

Dockerfile

@@ -23,6 +23,7 @@ RUN apk --update add \
   sudo \
   ruby \
   vim \
+  make \
   zsh \
   zsh-autosuggestions \
   zsh-history-substring-search \

internal/search/adapter/multi/test/plugin_test.go

@@ -0,0 +1,68 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bitmagnet-io/bitmagnet/internal/plugin/registry"
+	"github.com/bitmagnet-io/bitmagnet/internal/search"
+	"github.com/bitmagnet-io/bitmagnet/internal/search/adapter/multi"
+	"github.com/bitmagnet-io/bitmagnet/internal/wasm/plugin"
+	"github.com/bitmagnet-io/bitmagnet/internal/wasm/plugin/test"
+	"github.com/bitmagnet-io/bitmagnet/pkg/env"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/fx"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"go.uber.org/zap/zaptest"
+)
+
+func TestAdapter(t *testing.T) {
+	t.Parallel()
+
+	logger := zaptest.NewLogger(t, zaptest.Level(zapcore.InfoLevel))
+	undo := zap.ReplaceGlobals(logger)
+
+	t.Cleanup(func() {
+		undo()
+	})
+	test.BuildTestPlugins(t)
+
+	opts := make([]plugin.ProviderOption, 0, 2)
+	for _, p := range []string{"fake_search", "fake_search2"} {
+		opts = append(opts, plugin.LoadPlugin(test.PluginTestDataDir(1)+"/"+p, ""))
+	}
+	bundle, err := plugin.NewProvider(opts...)
+	require.NoError(t, err)
+
+	penv := env.NewDefault()
+
+	rplugins, err := registry.New(bundle).Resolve(penv)
+	require.NoError(t, err)
+	assert.NotNil(t, rplugins)
+
+	type searchParams struct {
+		fx.In
+		Search []multi.Index `group:"search_adapters"`
+	}
+
+	testSearch := func(p searchParams) {
+		for _, splugin := range p.Search {
+			r, err := (splugin.Adapter).(search.TorrentContent).TorrentContent(t.Context(), search.Params{})
+			require.NoError(t, err)
+			assert.Equal(t, uint(99), r.TotalCount.Uint)
+		}
+	}
+
+	fxopt := []fx.Option{
+		fx.Provide(
+			func() *zap.Logger { return logger },
+			func() env.Env { return penv },
+		),
+		fx.Invoke(
+			testSearch,
+		),
+	}
+	app := rplugins.Build(fxopt...)
+	require.NoError(t, app.Err())
+}

internal/search/adapter/multi/test/testdata/.gitignore

@@ -0,0 +1 @@
+*.wasm

internal/search/adapter/multi/test/testdata/Makefile

@@ -0,0 +1,13 @@
+# Fake sample plugins used for testing
+PLUGINS := fake_search fake_search2
+
+all: $(PLUGINS:%=%/plugin.wasm)
+
+clean:
+	rm -f $(PLUGINS:%=%/plugin.wasm)
+
+%/plugin.wasm: %/plugin.go
+	GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o $@ ./$*
+
+%/plugin.wasm: %/plugin.ts
+	cd $(@D) && npm run build

internal/search/adapter/multi/test/testdata/fake_search/manifest.json

@@ -0,0 +1,34 @@
+{
+  "name": "opensearch_fake",
+  "description": "OpenSearch indexer and search adapter",
+  "version": "0.1.0",
+  "concurrency": 4,
+  "capabilities": {
+    "indexer": {
+      "name": "OpenSearch"
+    },
+    "search_adapter": {
+      "name": "OpenSearch"
+    }
+  },
+  "permissions": {
+    "http": {}
+  },
+  "config": {
+    "addresses": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of OpenSearch node addresses",
+      "default": [
+        "http://localhost:9200"
+      ]
+    },
+    "index_prefix": {
+      "type": "string",
+      "description": "Prefix for OpenSearch indices",
+      "default": "bitmagnet-"
+    }
+  }
+}

internal/search/adapter/multi/test/testdata/fake_search/plugin.go

@@ -0,0 +1,39 @@
+//go:build wasip1
+
+package main
+
+import (
+	"context"
+
+	"github.com/bitmagnet-io/bitmagnet/proto/api"
+	"github.com/bitmagnet-io/bitmagnet/proto/common/search"
+
+	"github.com/bitmagnet-io/bitmagnet/proto/host/configurator"
+)
+
+type FakeTest struct {
+	cfg configurator.Service
+}
+
+func main() {}
+
+var plugin = &FakeTest{
+	cfg: configurator.NewService(),
+}
+
+func init() {
+	api.RegisterSearchAdapter(plugin)
+}
+
+func (t *FakeTest) SearchTorrentContent(ctx context.Context, params *search.Params) (*search.TorrentContentResult, error) {
+
+	var c int32
+	c = 99
+	return &search.TorrentContentResult{
+		TotalCount: &c,
+	}, nil
+}
+
+func (t *FakeTest) SearchTorrentFiles(ctx context.Context, params *search.Params) (*search.TorrentFilesResult, error) {
+	return nil, nil
+}

internal/search/adapter/multi/test/testdata/fake_search2/manifest.json

@@ -0,0 +1,34 @@
+{
+  "name": "opensearch_fake2",
+  "description": "OpenSearch indexer and search adapter",
+  "version": "0.1.0",
+  "concurrency": 4,
+  "capabilities": {
+    "indexer": {
+      "name": "OpenSearch"
+    },
+    "search_adapter": {
+      "name": "OpenSearch"
+    }
+  },
+  "permissions": {
+    "http": {}
+  },
+  "config": {
+    "addresses": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of OpenSearch node addresses",
+      "default": [
+        "http://localhost:9200"
+      ]
+    },
+    "index_prefix": {
+      "type": "string",
+      "description": "Prefix for OpenSearch indices",
+      "default": "bitmagnet-"
+    }
+  }
+}

internal/search/adapter/multi/test/testdata/fake_search2/plugin.go

@@ -0,0 +1,39 @@
+//go:build wasip1
+
+package main
+
+import (
+	"context"
+
+	"github.com/bitmagnet-io/bitmagnet/proto/api"
+	"github.com/bitmagnet-io/bitmagnet/proto/common/search"
+
+	"github.com/bitmagnet-io/bitmagnet/proto/host/configurator"
+)
+
+type FakeTest struct {
+	cfg configurator.Service
+}
+
+func main() {}
+
+var plugin = &FakeTest{
+	cfg: configurator.NewService(),
+}
+
+func init() {
+	api.RegisterSearchAdapter(plugin)
+}
+
+func (t *FakeTest) SearchTorrentContent(ctx context.Context, params *search.Params) (*search.TorrentContentResult, error) {
+
+	var c int32
+	c = 99
+	return &search.TorrentContentResult{
+		TotalCount: &c,
+	}, nil
+}
+
+func (t *FakeTest) SearchTorrentFiles(ctx context.Context, params *search.Params) (*search.TorrentFilesResult, error) {
+	return nil, nil
+}

internal/wasm/plugin/plugin.go

@@ -1,6 +1,8 @@
 package plugin
 
 import (
+	"fmt"
+
 	config_registry "github.com/bitmagnet-io/bitmagnet/internal/config/registry"
 	"github.com/bitmagnet-io/bitmagnet/internal/config/resolver"
 	"github.com/bitmagnet-io/bitmagnet/internal/indexer"
@@ -53,16 +55,20 @@ func (*Plugin) Commands() []plugin.Command {
 func (p *Plugin) FXOption() fx.Option {
 	type instance Instance
 
+	instanceTag := fmt.Sprintf(`name:"%v"`, p.Ref())
 	options := []fx.Option{
 		fx.Provide(
-			func(env env.Env, cfg resolver.Resolved) (instance, error) {
-				instance, err := p.NewInstance(env, cfg)
-				if err != nil {
-					return nil, err
-				}
-
-				return instance, nil
-			},
+			fx.Annotate(
+				func(env env.Env, cfg resolver.Resolved) (instance, error) {
+					instance, err := p.NewInstance(env, cfg)
+					if err != nil {
+						return nil, err
+					}
+
+					return instance, nil
+				},
+				fx.ResultTags(instanceTag),
+			),
 		),
 	}
 
@@ -73,21 +79,23 @@ func (p *Plugin) FXOption() fx.Option {
 					return indexer.NewProto(inst.Indexer())
 				},
 				fx.ResultTags(`group:"indexers"`),
+				fx.ParamTags(instanceTag),
 			),
 		))
 	}
 
-	if cap := p.manifest.Capabilities.SearchAdapter; cap != nil {
+	if caplty := p.manifest.Capabilities.SearchAdapter; caplty != nil {
 		options = append(options, fx.Provide(
 			fx.Annotate(
 				func(inst instance) multi.Index {
 					return multi.Index{
 						Ref:     p.ref,
-						Name:    cap.Name,
+						Name:    caplty.Name,
 						Adapter: proto.New(inst.SearchAdapter()),
 					}
 				},
 				fx.ResultTags(`group:"search_adapters"`),
+				fx.ParamTags(instanceTag),
 			),
 		))
 	}

internal/wasm/plugin/test/utils.go

@@ -0,0 +1,25 @@
+package test
+
+import (
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+func PluginTestDataDir(skip int) string {
+	_, file, _, _ := runtime.Caller(skip)
+	return filepath.Join(filepath.Dir(file), "testdata")
+}
+
+func BuildTestPlugins(t *testing.T) {
+	t.Helper()
+	t.Logf("[BeforeSuite] Current working directory: %s", PluginTestDataDir(2))
+	cmd := exec.Command("make", "-C", PluginTestDataDir(2))
+	out, err := cmd.CombinedOutput()
+	t.Logf("[BeforeSuite] Make output: %s", string(out))
+
+	if err != nil {
+		t.Fatalf("Failed to build test plugins: %v", err)
+	}
+}