Add metadata shared library

lib/metadata/extras.go

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Hypermode Inc.
+ * Licensed under the terms of the Apache License, Version 2.0
+ * See the LICENSE file that accompanied this code for further details.
+ *
+ * SPDX-FileCopyrightText: 2024 Hypermode Inc. <hello@hypermode.com>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package metadata
+
+import (
+	"github.com/hypermodeinc/modus/lib/wasmextractor"
+)
+
+func GetMetadataFromCompiledModule(cm []byte) (*Metadata, error) {
+	customSections, err := getCustomSections(cm)
+	if err != nil {
+		return nil, err
+	}
+	return GetMetadata(customSections)
+}
+
+func getCustomSections(cm []byte) (map[string][]byte, error) {
+	info, err := wasmextractor.ExtractWasmInfo(cm)
+	if err != nil {
+		return nil, err
+	}
+	return info.CustomSections, nil
+}

lib/metadata/go.mod

@@ -0,0 +1,25 @@
+module github.com/hypermodeinc/modus/lib/metadata
+
+go 1.23.0
+
+require github.com/hypermodeinc/modus/lib/wasmextractor v0.0.0
+
+replace github.com/hypermodeinc/modus/lib/wasmextractor => ../wasmextractor
+
+require (
+	github.com/hypermodeinc/modus/runtime v0.13.0-test.3
+	github.com/tidwall/gjson v1.18.0
+)
+
+require (
+	github.com/getsentry/sentry-go v0.29.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+)

lib/metadata/go.sum

@@ -0,0 +1,49 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/getsentry/sentry-go v0.29.1 h1:DyZuChN8Hz3ARxGVV8ePaNXh1dQ7d76AiB117xcREwA=
+github.com/getsentry/sentry-go v0.29.1/go.mod h1:x3AtIzN01d6SiWkderzaH28Tm0lgkafpJ5Bm3li39O0=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+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/hypermodeinc/modus/runtime v0.13.0-test.3 h1:C+B+10Bn+axzpChzIzt9+A1Pgqa18QnGmaH2E5Wz4ng=
+github.com/hypermodeinc/modus/runtime v0.13.0-test.3/go.mod h1:n5QMRjrF3yDnKDEUg2dv8NbCpy0M1Gzq701S0Rl0J/s=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+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=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

runtime/plugins/metadata/reader.go → lib/metadata/reader.go

@@ -32,7 +32,7 @@ func GetMetadata(wasmCustomSections map[string][]byte) (*Metadata, error) {
 }
 
 func getPluginMetadataVersion(wasmCustomSections map[string][]byte) (byte, error) {
-	verData, found := wasmCustomSections["hypermode_version"]
+	verData, found := wasmCustomSections["modus_metadata_version"]
 	if !found || len(verData) != 1 {
 		return 0, errors.New("failed to parse plugin metadata version")
 	}
@@ -41,7 +41,7 @@ func getPluginMetadataVersion(wasmCustomSections map[string][]byte) (byte, error
 }
 
 func getPluginMetadata(wasmCustomSections map[string][]byte) (*Metadata, error) {
-	metadataJson, found := wasmCustomSections["hypermode_meta"]
+	metadataJson, found := wasmCustomSections["modus_meta"]
 	if !found {
 		return nil, ErrMetadataNotFound
 	}

lib/wasmextractor/wasmextractor.go

@@ -17,8 +17,9 @@ import (
 )
 
 type WasmInfo struct {
-	Imports []WasmItem
-	Exports []WasmItem
+	Imports        []WasmItem
+	Exports        []WasmItem
+	CustomSections map[string][]byte
 }
 
 type WasmItem struct {
@@ -74,7 +75,9 @@ func ExtractWasmInfo(wasmBytes []byte) (*WasmInfo, error) {
 		return nil, err
 	}
 
-	info := &WasmInfo{}
+	info := &WasmInfo{
+		CustomSections: make(map[string][]byte),
+	}
 	offset := 8
 	for offset < len(wasmBytes) {
 		sectionID := wasmBytes[offset]
@@ -84,6 +87,11 @@ func ExtractWasmInfo(wasmBytes []byte) (*WasmInfo, error) {
 		offset += n
 
 		switch sectionID {
+		case 0: // Custom section
+			nameLen, n := binary.Uvarint(wasmBytes[offset:])
+			name := string(wasmBytes[offset+n : offset+n+int(nameLen)])
+			data := wasmBytes[offset+n+int(nameLen) : offset+int(size)]
+			info.CustomSections[name] = data
 		case 2: // Import section
 			info.Imports = readImports(wasmBytes[offset : offset+int(size)])
 

runtime/functions/fninfo.go

@@ -10,9 +10,9 @@
 package functions
 
 import (
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/plugins"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 )
 
 type FunctionInfo interface {

runtime/functions/helpers.go

@@ -12,7 +12,7 @@ package functions
 import (
 	"fmt"
 
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
+	"github.com/hypermodeinc/modus/lib/metadata"
 )
 
 func CreateParametersMap(fn *metadata.Function, paramValues ...any) (map[string]any, error) {

runtime/go.mod

@@ -4,14 +4,21 @@ go 1.23.0
 
 require github.com/hypermodeinc/modus/lib/manifest v0.0.0
 
+require github.com/hypermodeinc/modus/lib/metadata v0.0.0
+
+require github.com/hypermodeinc/modus/lib/wasmextractor v0.0.0 // indirect
+
 replace github.com/hypermodeinc/modus/lib/manifest => ../lib/manifest
 
+replace github.com/hypermodeinc/modus/lib/metadata => ../lib/metadata
+
+replace github.com/hypermodeinc/modus/lib/wasmextractor => ../lib/wasmextractor
+
 require (
 	github.com/OneOfOne/xxhash v1.2.8
 	github.com/archdx/zerolog-sentry v1.8.4
 	github.com/aws/aws-sdk-go-v2 v1.32.2
 	github.com/aws/aws-sdk-go-v2/config v1.27.43
-	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.19.2
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3
 	github.com/aws/aws-sdk-go-v2/service/sts v1.32.2
 	github.com/buger/jsonparser v1.1.1

runtime/go.sum

@@ -31,8 +31,6 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 h1:7edmS3VOBDhK00b/MwGtGglCm7hhwNYnjJs/PgFdMQE=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21/go.mod h1:Q9o5h4HoIWG8XfzxqiuK/CGUbepCJ8uTlaE3bAbxytQ=
-github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.19.2 h1:mG1XmnVc8qspnTIawXsmWTQMFjAVk3oc+rqj08ECf8M=
-github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.19.2/go.mod h1:wS7FzQ5CEjVx5R+2/p4VJzwVVZYK3xmU3kVUfMu/tbc=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 h1:4FMHqLfk0efmTqhXVRL5xYRqlEBNBiRI7N6w4jsEdd4=

runtime/graphql/engine/engine.go

@@ -16,11 +16,11 @@ import (
 	"context"
 	"strings"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/config"
 	"github.com/hypermodeinc/modus/runtime/graphql/datasource"
 	"github.com/hypermodeinc/modus/runtime/graphql/schemagen"
 	"github.com/hypermodeinc/modus/runtime/logger"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 	"github.com/hypermodeinc/modus/runtime/wasmhost"
 

runtime/graphql/schemagen/schemagen.go

@@ -18,9 +18,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/languages"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/graphql/schemagen/schemagen_as_test.go

@@ -16,9 +16,9 @@ import (
 	"testing"
 
 	"github.com/hypermodeinc/modus/lib/manifest"
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/languages"
 	"github.com/hypermodeinc/modus/runtime/manifestdata"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 
 	"github.com/stretchr/testify/require"

runtime/graphql/schemagen/schemagen_go_test.go

@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/hypermodeinc/modus/lib/manifest"
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/languages"
 	"github.com/hypermodeinc/modus/runtime/manifestdata"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 
 	"github.com/stretchr/testify/require"

runtime/langsupport/executionplan.go

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	"runtime/debug"
 
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 
 	wasm "github.com/tetratelabs/wazero/api"

runtime/langsupport/language.go

@@ -10,7 +10,7 @@
 package langsupport
 
 import (
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
+	"github.com/hypermodeinc/modus/lib/metadata"
 
 	wasm "github.com/tetratelabs/wazero/api"
 )

runtime/langsupport/planner.go

@@ -12,7 +12,7 @@ package langsupport
 import (
 	"context"
 
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
+	"github.com/hypermodeinc/modus/lib/metadata"
 
 	wasm "github.com/tetratelabs/wazero/api"
 )

runtime/langsupport/typeinfo.go

@@ -13,7 +13,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
+	"github.com/hypermodeinc/modus/lib/metadata"
 )
 
 type TypeInfo interface {

runtime/languages/assemblyscript/handler_arrays.go

@@ -15,8 +15,8 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_classes.go

@@ -15,8 +15,8 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_dates.go

@@ -15,8 +15,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_maps.go

@@ -15,9 +15,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/languages/assemblyscript/hash"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_objects.go

@@ -15,9 +15,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/logger"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_primitivearrays.go

@@ -14,9 +14,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/langsupport/primitives"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 )
 

runtime/languages/assemblyscript/handler_typedarrays.go

@@ -14,9 +14,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
 	"github.com/hypermodeinc/modus/runtime/langsupport/primitives"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 
 	"golang.org/x/exp/constraints"

runtime/languages/assemblyscript/planner.go

@@ -13,8 +13,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/hypermodeinc/modus/lib/metadata"
 	"github.com/hypermodeinc/modus/runtime/langsupport"
-	"github.com/hypermodeinc/modus/runtime/plugins/metadata"
 	"github.com/hypermodeinc/modus/runtime/utils"
 
 	wasm "github.com/tetratelabs/wazero/api"