Merge pull request #20 from omniviewdev/fix/runtime-types

fix(types): runtime types passing as number[][] instead of any due to json optimization

Author: joshuapare

backend/pkg/plugin/resource/client.go

@@ -7,9 +7,13 @@ import (
 	"github.com/omniviewdev/plugin-sdk/pkg/types"
 )
 
-// Client is a thin wrapper that exposes only the Service interface for Wails binding.
-// The controller has lifecycle methods (OnPluginStart, etc.) that must not be exposed
-// to the frontend — this is a Wails constraint, not a design choice.
+// NOTE: Client intentionally does NOT implement Service. It is the Wails-bound
+// frontend API layer that converts between SDK types (json.RawMessage) and
+// frontend-friendly types (interface{} → "any" in TypeScript).
+
+// Client is a thin Wails-bound wrapper around the Controller.
+// It converts SDK types (json.RawMessage) to frontend-friendly types (interface{})
+// so that Wails generates "any" in TypeScript instead of "number[]".
 type Client struct {
 	controller Controller
 }
@@ -18,37 +22,69 @@ func NewClient(controller Controller) *Client {
 	return &Client{controller: controller}
 }
 
-// compile-time assertion
-var _ Service = (*Client)(nil)
+// Client no longer satisfies Service — it uses frontend-facing types
+// (interface{} instead of json.RawMessage) so Wails generates correct TS.
 
 func (c *Client) ListPlugins() ([]string, error) {
 	return c.controller.ListPlugins()
 }
 
-// CRUD
+// CRUD — converts between SDK types and frontend-facing types
 
-func (c *Client) Get(pluginID, connectionID, key string, input resource.GetInput) (*resource.GetResult, error) {
-	return c.controller.Get(pluginID, connectionID, key, input)
+func (c *Client) Get(pluginID, connectionID, key string, input resource.GetInput) (*ClientResult, error) {
+	result, err := c.controller.Get(pluginID, connectionID, key, input)
+	if err != nil {
+		return nil, err
+	}
+	return toClientResult(result), nil
 }
 
-func (c *Client) List(pluginID, connectionID, key string, input resource.ListInput) (*resource.ListResult, error) {
-	return c.controller.List(pluginID, connectionID, key, input)
+func (c *Client) List(pluginID, connectionID, key string, input resource.ListInput) (*ClientListResult, error) {
+	result, err := c.controller.List(pluginID, connectionID, key, input)
+	if err != nil {
+		return nil, err
+	}
+	return toClientListResult(result), nil
 }
 
-func (c *Client) Find(pluginID, connectionID, key string, input resource.FindInput) (*resource.FindResult, error) {
-	return c.controller.Find(pluginID, connectionID, key, input)
+func (c *Client) Find(pluginID, connectionID, key string, input resource.FindInput) (*ClientListResult, error) {
+	result, err := c.controller.Find(pluginID, connectionID, key, input)
+	if err != nil {
+		return nil, err
+	}
+	return findToClientListResult(result), nil
 }
 
-func (c *Client) Create(pluginID, connectionID, key string, input resource.CreateInput) (*resource.CreateResult, error) {
-	return c.controller.Create(pluginID, connectionID, key, input)
+func (c *Client) Create(pluginID, connectionID, key string, input ClientCreateInput) (*ClientResult, error) {
+	sdkInput, err := toSDKCreateInput(input)
+	if err != nil {
+		return nil, err
+	}
+	result, err := c.controller.Create(pluginID, connectionID, key, sdkInput)
+	if err != nil {
+		return nil, err
+	}
+	return createToClientResult(result), nil
 }
 
-func (c *Client) Update(pluginID, connectionID, key string, input resource.UpdateInput) (*resource.UpdateResult, error) {
-	return c.controller.Update(pluginID, connectionID, key, input)
+func (c *Client) Update(pluginID, connectionID, key string, input ClientUpdateInput) (*ClientResult, error) {
+	sdkInput, err := toSDKUpdateInput(input)
+	if err != nil {
+		return nil, err
+	}
+	result, err := c.controller.Update(pluginID, connectionID, key, sdkInput)
+	if err != nil {
+		return nil, err
+	}
+	return updateToClientResult(result), nil
 }
 
-func (c *Client) Delete(pluginID, connectionID, key string, input resource.DeleteInput) (*resource.DeleteResult, error) {
-	return c.controller.Delete(pluginID, connectionID, key, input)
+func (c *Client) Delete(pluginID, connectionID, key string, input resource.DeleteInput) (*ClientResult, error) {
+	result, err := c.controller.Delete(pluginID, connectionID, key, input)
+	if err != nil {
+		return nil, err
+	}
+	return deleteToClientResult(result), nil
 }
 
 // Connection lifecycle
@@ -171,8 +207,12 @@ func (c *Client) GetFilterFields(pluginID, connectionID, key string) ([]resource
 	return c.controller.GetFilterFields(pluginID, connectionID, key)
 }
 
-func (c *Client) GetResourceSchema(pluginID, connectionID, key string) (json.RawMessage, error) {
-	return c.controller.GetResourceSchema(pluginID, connectionID, key)
+func (c *Client) GetResourceSchema(pluginID, connectionID, key string) (interface{}, error) {
+	raw, err := c.controller.GetResourceSchema(pluginID, connectionID, key)
+	if err != nil {
+		return nil, err
+	}
+	return interface{}(raw), nil
 }
 
 // Actions
@@ -207,8 +247,12 @@ func (c *Client) ResolveRelationships(pluginID, connectionID, key, id, namespace
 
 // Health
 
-func (c *Client) GetHealth(pluginID, connectionID, key string, data json.RawMessage) (*resource.ResourceHealth, error) {
-	return c.controller.GetHealth(pluginID, connectionID, key, data)
+func (c *Client) GetHealth(pluginID, connectionID, key string, data interface{}) (*resource.ResourceHealth, error) {
+	raw, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	return c.controller.GetHealth(pluginID, connectionID, key, json.RawMessage(raw))
 }
 
 func (c *Client) GetResourceEvents(pluginID, connectionID, key, id, namespace string, limit int32) ([]resource.ResourceEvent, error) {

backend/pkg/plugin/resource/client_types.go

@@ -0,0 +1,118 @@
+package resource
+
+import (
+	"encoding/json"
+
+	resource "github.com/omniviewdev/plugin-sdk/pkg/v1/resource"
+)
+
+// --- Result types (SDK → frontend) ---
+// These replace json.RawMessage fields with interface{} so Wails generates
+// "any" in TypeScript instead of "number[]".
+
+// ClientResult wraps a single-resource SDK result for the frontend.
+type ClientResult struct {
+	Result  interface{} `json:"result"`
+	Success bool        `json:"success"`
+}
+
+// ClientListResult wraps a multi-resource SDK result for the frontend.
+type ClientListResult struct {
+	Result     []interface{} `json:"result"`
+	Success    bool          `json:"success"`
+	TotalCount int           `json:"totalCount"`
+	NextCursor string        `json:"nextCursor,omitempty"`
+}
+
+// --- Input types (frontend → SDK) ---
+
+// ClientCreateInput accepts interface{} from the frontend instead of json.RawMessage.
+type ClientCreateInput struct {
+	Input     interface{} `json:"input"`
+	Namespace string      `json:"namespace"`
+}
+
+// ClientUpdateInput accepts interface{} from the frontend instead of json.RawMessage.
+type ClientUpdateInput struct {
+	Input     interface{} `json:"input"`
+	ID        string      `json:"id"`
+	Namespace string      `json:"namespace"`
+}
+
+// --- Converters: zero-copy for results, one marshal for inputs ---
+
+func toClientResult(r *resource.GetResult) *ClientResult {
+	if r == nil {
+		return nil
+	}
+	return &ClientResult{Result: r.Result, Success: r.Success}
+}
+
+func createToClientResult(r *resource.CreateResult) *ClientResult {
+	if r == nil {
+		return nil
+	}
+	return &ClientResult{Result: r.Result, Success: r.Success}
+}
+
+func updateToClientResult(r *resource.UpdateResult) *ClientResult {
+	if r == nil {
+		return nil
+	}
+	return &ClientResult{Result: r.Result, Success: r.Success}
+}
+
+func deleteToClientResult(r *resource.DeleteResult) *ClientResult {
+	if r == nil {
+		return nil
+	}
+	return &ClientResult{Result: r.Result, Success: r.Success}
+}
+
+func toClientListResult(r *resource.ListResult) *ClientListResult {
+	if r == nil {
+		return nil
+	}
+	items := make([]interface{}, len(r.Result))
+	for i, raw := range r.Result {
+		items[i] = raw
+	}
+	return &ClientListResult{
+		Result:     items,
+		Success:    r.Success,
+		TotalCount: r.TotalCount,
+		NextCursor: r.NextCursor,
+	}
+}
+
+func findToClientListResult(r *resource.FindResult) *ClientListResult {
+	if r == nil {
+		return nil
+	}
+	items := make([]interface{}, len(r.Result))
+	for i, raw := range r.Result {
+		items[i] = raw
+	}
+	return &ClientListResult{
+		Result:     items,
+		Success:    r.Success,
+		TotalCount: r.TotalCount,
+		NextCursor: r.NextCursor,
+	}
+}
+
+func toSDKCreateInput(c ClientCreateInput) (resource.CreateInput, error) {
+	raw, err := json.Marshal(c.Input)
+	if err != nil {
+		return resource.CreateInput{}, err
+	}
+	return resource.CreateInput{Input: raw, Namespace: c.Namespace}, nil
+}
+
+func toSDKUpdateInput(c ClientUpdateInput) (resource.UpdateInput, error) {
+	raw, err := json.Marshal(c.Input)
+	if err != nil {
+		return resource.UpdateInput{}, err
+	}
+	return resource.UpdateInput{Input: raw, ID: c.ID, Namespace: c.Namespace}, nil
+}

main.go

@@ -102,16 +102,16 @@ func main() {
 	settingsController := settings.NewController(log, settingsProvider)
 	settingsClient := settings.NewClient(settingsController)
 
-	execController := exec.NewController(log, settingsProvider, resourceClient)
+	execController := exec.NewController(log, settingsProvider, resourceController)
 	execClient := exec.NewClient(execController)
 
-	networkerController := networker.NewController(log, settingsProvider, resourceClient)
+	networkerController := networker.NewController(log, settingsProvider, resourceController)
 	networkerClient := networker.NewClient(networkerController)
 
-	logsController := pluginlogs.NewController(log, settingsProvider, resourceClient)
+	logsController := pluginlogs.NewController(log, settingsProvider, resourceController)
 	logsClient := pluginlogs.NewClient(logsController)
 
-	metricController := pluginmetric.NewController(log, settingsProvider, resourceClient)
+	metricController := pluginmetric.NewController(log, settingsProvider, resourceController)
 	metricClient := pluginmetric.NewClient(metricController)
 
 	dataController := data.NewController(log)

packages/omniviewdev-providers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omniviewdev/providers",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Package to interact with the various providers in Omniview via the UI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

packages/omniviewdev-runtime/package.json

@@ -2,7 +2,7 @@
   "author": "Omniview",
   "license": "AGPL-3.0-only",
   "name": "@omniviewdev/runtime",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "Runtime shared library for Omniview",
   "sideEffects": false,
   "type": "module",