space-data-module-sdk 0.2.9 → 0.3.1

package/README.md

@@ -231,7 +231,7 @@ This repo exposes that deployment surface from
 `space-data-module-sdk/deployment`. Use it to:
 
 - validate resolved protocol installations
-- describe input bindings from producers to module ports
+- describe input and publication bindings by declared `interfaceId`
 - attach a deployment plan to `sds.bundle`
 
 The full contract split is documented in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "space-data-module-sdk",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Module SDK for building, validating, signing, and deploying WebAssembly modules on the Space Data Network.",
   "type": "module",
   "types": "./src/index.d.ts",

package/src/deployment/index.d.ts

@@ -29,13 +29,11 @@ export interface ResolvedProtocolInstallation {
 
 export interface InputBinding {
   bindingId: string;
+  interfaceId: string;
   targetPluginId?: string | null;
   targetMethodId: string;
   targetInputPortId: string;
   sourceKind: InputBindingSourceKindName | string;
-  topic?: string | null;
-  wireId?: string | null;
-  nodeInfoUrl?: string | null;
   multiaddrs?: string[];
   allowPeerIds?: string[];
   allowServerKeys?: string[];
@@ -96,18 +94,17 @@ export interface AuthPolicy {
 
 export interface PublicationBinding {
   publicationId: string;
+  interfaceId: string;
   bindingMode: DeploymentBindingModeName | string;
   sourceKind: string;
   sourceMethodId?: string | null;
   sourceOutputPortId?: string | null;
   sourceNodeId?: string | null;
   sourceTriggerId?: string | null;
-  topic?: string | null;
-  wireId?: string | null;
   schemaName?: string | null;
   mediaType?: string | null;
   archivePath?: string | null;
-  queryServiceId?: string | null;
+  queryInterfaceId?: string | null;
   emitPnm?: boolean;
   emitFlatbufferArchive?: boolean;
   pinPolicy?: string | null;

package/src/deployment/index.js

@@ -7,7 +7,11 @@ import {
   SDS_DEPLOYMENT_MEDIA_TYPE,
   SDS_DEPLOYMENT_SECTION_NAME,
 } from "../bundle/constants.js";
-import { ProtocolRole, ProtocolTransportKind } from "../runtime/constants.js";
+import {
+  ExternalInterfaceDirection,
+  ProtocolRole,
+  ProtocolTransportKind,
+} from "../runtime/constants.js";
 
 export const DEPLOYMENT_PLAN_FORMAT_VERSION = 1;
 
@@ -33,6 +37,14 @@ const DeploymentBindingModeSet = new Set(Object.values(DeploymentBindingMode));
 const ProtocolRoleSet = new Set(Object.values(ProtocolRole));
 const ProtocolTransportKindSet = new Set(Object.values(ProtocolTransportKind));
 const ScheduleBindingKindSet = new Set(Object.values(ScheduleBindingKind));
+const InputBindingInterfaceDirectionSet = new Set([
+  ExternalInterfaceDirection.INPUT,
+  ExternalInterfaceDirection.BIDIRECTIONAL,
+]);
+const PublicationBindingInterfaceDirectionSet = new Set([
+  ExternalInterfaceDirection.OUTPUT,
+  ExternalInterfaceDirection.BIDIRECTIONAL,
+]);
 
 function normalizeString(value) {
   if (value === undefined || value === null) {
@@ -163,13 +175,11 @@ function normalizeProtocolInstallation(value = {}) {
 function normalizeInputBinding(value = {}) {
   return {
     bindingId: normalizeString(value.bindingId),
+    interfaceId: normalizeString(value.interfaceId),
     targetPluginId: normalizeString(value.targetPluginId),
     targetMethodId: normalizeString(value.targetMethodId),
     targetInputPortId: normalizeString(value.targetInputPortId),
     sourceKind: normalizeInputBindingSourceKindName(value.sourceKind),
-    topic: normalizeString(value.topic),
-    wireId: normalizeString(value.wireId),
-    nodeInfoUrl: normalizeString(value.nodeInfoUrl),
     multiaddrs: normalizeStringArray(value.multiaddrs),
     allowPeerIds: normalizeStringArray(value.allowPeerIds),
     allowServerKeys: normalizeStringArray(value.allowServerKeys),
@@ -238,18 +248,17 @@ function normalizeAuthPolicy(value = {}) {
 function normalizePublicationBinding(value = {}) {
   return {
     publicationId: normalizeString(value.publicationId),
+    interfaceId: normalizeString(value.interfaceId),
     bindingMode: normalizeDeploymentBindingModeName(value.bindingMode),
     sourceKind: normalizeString(value.sourceKind),
     sourceMethodId: normalizeString(value.sourceMethodId),
     sourceOutputPortId: normalizeString(value.sourceOutputPortId),
     sourceNodeId: normalizeString(value.sourceNodeId),
     sourceTriggerId: normalizeString(value.sourceTriggerId),
-    topic: normalizeString(value.topic),
-    wireId: normalizeString(value.wireId),
     schemaName: normalizeString(value.schemaName),
     mediaType: normalizeString(value.mediaType),
     archivePath: normalizeString(value.archivePath),
-    queryServiceId: normalizeString(value.queryServiceId),
+    queryInterfaceId: normalizeString(value.queryInterfaceId),
     emitPnm: normalizeBoolean(value.emitPnm),
     emitFlatbufferArchive: normalizeBoolean(value.emitFlatbufferArchive),
     pinPolicy: normalizeString(value.pinPolicy),
@@ -392,6 +401,68 @@ function buildMethodLookup(manifest) {
   return lookup;
 }
 
+function buildExternalInterfaceLookup(manifest) {
+  if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
+    return null;
+  }
+  const lookup = new Map();
+  if (!Array.isArray(manifest?.externalInterfaces)) {
+    return lookup;
+  }
+  for (const externalInterface of manifest.externalInterfaces) {
+    if (
+      typeof externalInterface?.interfaceId === "string" &&
+      externalInterface.interfaceId.trim().length > 0
+    ) {
+      lookup.set(externalInterface.interfaceId, externalInterface);
+    }
+  }
+  return lookup;
+}
+
+function validateDeclaredInterface(
+  issues,
+  interfaceId,
+  location,
+  bindingLabel,
+  missingCode,
+  directionCode,
+  externalInterfaceLookup,
+  allowedDirections,
+) {
+  if (!externalInterfaceLookup) {
+    return;
+  }
+  const normalizedInterfaceId = normalizeString(interfaceId);
+  if (!normalizedInterfaceId) {
+    return;
+  }
+  const externalInterface = externalInterfaceLookup.get(normalizedInterfaceId);
+  if (!externalInterface) {
+    pushIssue(
+      issues,
+      "error",
+      missingCode,
+      `${bindingLabel} references unknown interface "${normalizedInterfaceId}".`,
+      location,
+    );
+    return;
+  }
+  if (
+    allowedDirections &&
+    typeof externalInterface.direction === "string" &&
+    !allowedDirections.has(externalInterface.direction)
+  ) {
+    pushIssue(
+      issues,
+      "error",
+      directionCode,
+      `${bindingLabel} references interface "${normalizedInterfaceId}" with direction "${externalInterface.direction}", which is incompatible with this binding.`,
+      location,
+    );
+  }
+}
+
 function validateProtocolInstallation(
   installation,
   issues,
@@ -583,6 +654,7 @@ function validateInputBinding(
   location,
   manifest,
   manifestMethodLookup,
+  externalInterfaceLookup,
 ) {
   if (!binding || typeof binding !== "object" || Array.isArray(binding)) {
     pushIssue(
@@ -600,6 +672,12 @@ function validateInputBinding(
     `${location}.bindingId`,
     "Input binding bindingId",
   );
+  const interfaceIdValid = validateStringField(
+    issues,
+    binding.interfaceId,
+    `${location}.interfaceId`,
+    "Input binding interfaceId",
+  );
   const targetPluginId = normalizeString(binding.targetPluginId);
   const targetMethodIdValid = validateStringField(
     issues,
@@ -639,24 +717,6 @@ function validateInputBinding(
     `${location}.targetPluginId`,
     "Input binding targetPluginId",
   );
-  validateOptionalStringField(
-    issues,
-    binding.topic,
-    `${location}.topic`,
-    "Input binding topic",
-  );
-  validateOptionalStringField(
-    issues,
-    binding.wireId,
-    `${location}.wireId`,
-    "Input binding wireId",
-  );
-  validateOptionalStringField(
-    issues,
-    binding.nodeInfoUrl,
-    `${location}.nodeInfoUrl`,
-    "Input binding nodeInfoUrl",
-  );
   validateStringArrayField(
     issues,
     binding.multiaddrs,
@@ -687,27 +747,17 @@ function validateInputBinding(
     `${location}.description`,
     "Input binding description",
   );
-  if (
-    sourceKind === InputBindingSourceKind.PUBSUB &&
-    !validateStringField(
+  if (interfaceIdValid) {
+    validateDeclaredInterface(
       issues,
-      binding.topic,
-      `${location}.topic`,
-      "Pubsub input binding topic",
-    )
-  ) {
-    // error already recorded
-  }
-  if (
-    sourceKind === InputBindingSourceKind.PROTOCOL_STREAM &&
-    !validateStringField(
-      issues,
-      binding.wireId,
-      `${location}.wireId`,
-      "Protocol-stream input binding wireId",
-    )
-  ) {
-    // error already recorded
+      binding.interfaceId,
+      `${location}.interfaceId`,
+      `Input binding "${binding.bindingId ?? "binding"}"`,
+      "unknown-input-binding-interface",
+      "input-binding-interface-direction-mismatch",
+      externalInterfaceLookup,
+      InputBindingInterfaceDirectionSet,
+    );
   }
   const targetsCurrentManifest =
     !targetPluginId ||
@@ -1161,6 +1211,7 @@ function validatePublicationBinding(
   location,
   manifest,
   manifestMethodLookup,
+  externalInterfaceLookup,
 ) {
   if (!binding || typeof binding !== "object" || Array.isArray(binding)) {
     pushIssue(
@@ -1178,6 +1229,12 @@ function validatePublicationBinding(
     `${location}.publicationId`,
     "Publication binding publicationId",
   );
+  const interfaceIdValid = validateStringField(
+    issues,
+    binding.interfaceId,
+    `${location}.interfaceId`,
+    "Publication binding interfaceId",
+  );
   validateBindingModeField(
     issues,
     binding.bindingMode,
@@ -1214,18 +1271,6 @@ function validatePublicationBinding(
     `${location}.sourceTriggerId`,
     "Publication binding sourceTriggerId",
   );
-  validateOptionalStringField(
-    issues,
-    binding.topic,
-    `${location}.topic`,
-    "Publication binding topic",
-  );
-  validateOptionalStringField(
-    issues,
-    binding.wireId,
-    `${location}.wireId`,
-    "Publication binding wireId",
-  );
   validateOptionalStringField(
     issues,
     binding.schemaName,
@@ -1246,9 +1291,9 @@ function validatePublicationBinding(
   );
   validateOptionalStringField(
     issues,
-    binding.queryServiceId,
-    `${location}.queryServiceId`,
-    "Publication binding queryServiceId",
+    binding.queryInterfaceId,
+    `${location}.queryInterfaceId`,
+    "Publication binding queryInterfaceId",
   );
   validateOptionalStringField(
     issues,
@@ -1287,18 +1332,28 @@ function validatePublicationBinding(
       location,
     );
   }
-  if (
-    binding.emitPnm === true &&
-    !binding.topic &&
-    !binding.wireId &&
-    !binding.schemaName
-  ) {
-    pushIssue(
+  if (interfaceIdValid) {
+    validateDeclaredInterface(
       issues,
-      "warning",
-      "pnm-without-routing-hint",
-      "PNM-emitting publication bindings should declare a topic, wireId, or schemaName.",
-      location,
+      binding.interfaceId,
+      `${location}.interfaceId`,
+      `Publication binding "${binding.publicationId ?? "publication"}"`,
+      "unknown-publication-binding-interface",
+      "publication-binding-interface-direction-mismatch",
+      externalInterfaceLookup,
+      PublicationBindingInterfaceDirectionSet,
+    );
+  }
+  if (binding.queryInterfaceId) {
+    validateDeclaredInterface(
+      issues,
+      binding.queryInterfaceId,
+      `${location}.queryInterfaceId`,
+      `Publication binding "${binding.publicationId ?? "publication"}" query interface`,
+      "unknown-publication-query-interface",
+      "publication-query-interface-direction-mismatch",
+      externalInterfaceLookup,
+      null,
     );
   }
   if (binding.sourceMethodId && manifest) {
@@ -1344,6 +1399,7 @@ export function validateDeploymentPlan(plan, options = {}) {
   const issues = [];
   const manifest = options.manifest ?? null;
   const methodLookup = buildMethodLookup(manifest);
+  const externalInterfaceLookup = buildExternalInterfaceLookup(manifest);
   const protocolLookup = new Map(
     Array.isArray(manifest?.protocols)
       ? manifest.protocols
@@ -1403,6 +1459,7 @@ export function validateDeploymentPlan(plan, options = {}) {
       `deploymentPlan.inputBindings[${index}]`,
       manifest,
       methodLookup,
+      externalInterfaceLookup,
     );
   });
   normalizedPlan.scheduleBindings.forEach((binding, index) => {
@@ -1435,6 +1492,7 @@ export function validateDeploymentPlan(plan, options = {}) {
       `deploymentPlan.publicationBindings[${index}]`,
       manifest,
       methodLookup,
+      externalInterfaceLookup,
     );
   });
 
@@ -1454,23 +1512,6 @@ export function validateDeploymentPlan(plan, options = {}) {
       );
     }
   });
-  const serviceIds = new Set(
-    normalizedPlan.serviceBindings
-      .map((entry) => entry.serviceId)
-      .filter((entry) => typeof entry === "string" && entry.length > 0),
-  );
-  normalizedPlan.publicationBindings.forEach((binding, index) => {
-    if (binding.queryServiceId && !serviceIds.has(binding.queryServiceId)) {
-      pushIssue(
-        issues,
-        "error",
-        "unknown-publication-query-service",
-        `Publication binding "${binding.publicationId ?? "publication"}" references unknown query service "${binding.queryServiceId}".`,
-        `deploymentPlan.publicationBindings[${index}].queryServiceId`,
-      );
-    }
-  });
-
   const errors = issues.filter((issue) => issue.severity === "error");
   const warnings = issues.filter((issue) => issue.severity === "warning");
   return {