@s2-dev/streamstore 0.5.2 → 0.7.1

package/src/mcp-server/resources.ts

@@ -2,12 +2,16 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import {
+  McpServer,
+  ResourceMetadata,
+  ResourceTemplate,
+} from "@modelcontextprotocol/sdk/server/mcp.js";
 import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import { Variables } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
 import { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { S2Core } from "../core.js";
-import { Result } from "../types/fp.js";
+import { ConsoleLogger } from "./console-logger.js";
 import { MCPScope } from "./scopes.js";
 import { isAsyncIterable, isBinaryData, valueToBase64 } from "./shared.js";
 
@@ -19,7 +23,8 @@ export type ReadResourceCallback = (
 
 export type ResourceDefinition = {
   name: string;
-  description: string;
+  description?: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: string;
   read: ReadResourceCallback;
@@ -35,30 +40,27 @@ export type ReadResourceTemplateCallback = (
 export type ResourceTemplateDefinition = {
   name: string;
   description: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: ResourceTemplate;
   read: ReadResourceTemplateCallback;
 };
 
 export async function formatResult(
-  result: Result<unknown, Error>,
+  value: unknown,
   uri: URL,
-  init: { response?: Response | undefined },
+  init: { mimeType?: string | undefined; response?: Response | undefined },
 ): Promise<ReadResourceResult> {
-  if (!result.ok) {
-    throw result.error;
-  }
-
-  const { value } = result;
   if (typeof value === "undefined") {
     return { contents: [] };
   }
 
-  const { response } = init;
-  const mimeType = response?.headers.get("content-type") ?? "";
   let contents: ReadResourceResult["contents"] = [];
 
-  if (mimeType.search(/\bjson\b/g)) {
+  const mimeType = init.mimeType ?? init.response?.headers.get("content-type")
+    ?? "";
+
+  if (mimeType.search(/\bjson\b/g) !== -1) {
     contents = [{ uri: uri.toString(), mimeType, text: JSON.stringify(value) }];
   } else if (
     mimeType.startsWith("text/event-stream")
@@ -71,7 +73,10 @@ export async function formatResult(
         text: await stringifySSEToJSON(value),
       },
     ];
-  } else if (mimeType.startsWith("text/") && typeof value === "string") {
+  } else if (
+    (mimeType.startsWith("text/") || mimeType.startsWith("application/"))
+    && typeof value === "string"
+  ) {
     contents = [{ uri: uri.toString(), mimeType, text: value }];
   } else if (isBinaryData(value)) {
     const blob = await valueToBase64(value);
@@ -94,3 +99,59 @@ async function stringifySSEToJSON(
 
   return JSON.stringify(payloads);
 }
+
+export function createRegisterResource(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: S2Core,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceDefinition) => void {
+  return (resource: ResourceDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, ctx) => resource.read(sdk, uri, ctx),
+    );
+
+    logger.debug("Registered resource", { name: resource.name });
+  };
+}
+
+export function createRegisterResourceTemplate(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: S2Core,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceTemplateDefinition) => void {
+  return (resource: ResourceTemplateDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, vars, ctx) => resource.read(sdk, uri, vars, ctx),
+    );
+
+    logger.debug("Registered resource template", { name: resource.name });
+  };
+}

package/src/mcp-server/server.ts

@@ -6,6 +6,10 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { S2Core } from "../core.js";
 import { SDKOptions } from "../lib/config.js";
 import type { ConsoleLogger } from "./console-logger.js";
+import {
+  createRegisterResource,
+  createRegisterResourceTemplate,
+} from "./resources.js";
 import { MCPScope, mcpScopes } from "./scopes.js";
 import { createRegisterTool } from "./tools.js";
 import { tool$accountCreateBasin } from "./tools/accountCreateBasin.js";
@@ -24,6 +28,7 @@ import { tool$streamRead } from "./tools/streamRead.js";
 
 export function createMCPServer(deps: {
   logger: ConsoleLogger;
+  allowedTools?: string[] | undefined;
   scopes?: MCPScope[] | undefined;
   serverURL?: string | undefined;
   bearerAuth?: SDKOptions["bearerAuth"] | undefined;
@@ -31,7 +36,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "S2",
-    version: "0.5.2",
+    version: "0.7.1",
   });
 
   const client = new S2Core({
@@ -39,8 +44,26 @@ export function createMCPServer(deps: {
     serverURL: deps.serverURL,
     serverIdx: deps.serverIdx,
   });
+
   const scopes = new Set(deps.scopes ?? mcpScopes);
-  const tool = createRegisterTool(deps.logger, server, client, scopes);
+
+  const allowedTools = deps.allowedTools && new Set(deps.allowedTools);
+  const tool = createRegisterTool(
+    deps.logger,
+    server,
+    client,
+    scopes,
+    allowedTools,
+  );
+  const resource = createRegisterResource(deps.logger, server, client, scopes);
+  const resourceTemplate = createRegisterResourceTemplate(
+    deps.logger,
+    server,
+    client,
+    scopes,
+  );
+  const register = { tool, resource, resourceTemplate };
+  void register; // suppress unused warnings
 
   tool(tool$accountListBasins);
   tool(tool$accountGetBasinConfig);

package/src/mcp-server/tools.ts

@@ -94,8 +94,13 @@ export function createRegisterTool(
   server: McpServer,
   sdk: S2Core,
   allowedScopes: Set<MCPScope>,
+  allowedTools?: Set<string>,
 ): <A extends ZodRawShape | undefined>(tool: ToolDefinition<A>) => void {
   return <A extends ZodRawShape | undefined>(tool: ToolDefinition<A>): void => {
+    if (allowedTools && !allowedTools.has(tool.name)) {
+      return;
+    }
+
     const toolScopes = tool.scopes ?? [];
     if (!toolScopes.every((s) => allowedScopes.has(s))) {
       return;

package/src/models/components/basininfo.ts

@@ -6,6 +6,11 @@ import * as z from "zod";
 import { safeParse } from "../../lib/schemas.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+import {
+  BasinScope,
+  BasinScope$inboundSchema,
+  BasinScope$outboundSchema,
+} from "./basinscope.js";
 import {
   BasinState,
   BasinState$inboundSchema,
@@ -16,10 +21,6 @@ import {
  * Basin information.
  */
 export type BasinInfo = {
-  /**
-   * Cell assignment.
-   */
-  cell: string;
   /**
    * Basin name.
    */
@@ -27,7 +28,7 @@ export type BasinInfo = {
   /**
    * Basin scope.
    */
-  scope: string;
+  scope: BasinScope;
   /**
    * Current state of the basin.
    */
@@ -40,15 +41,13 @@ export const BasinInfo$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.object({
-  cell: z.string(),
   name: z.string(),
-  scope: z.string(),
+  scope: BasinScope$inboundSchema,
   state: BasinState$inboundSchema,
 });
 
 /** @internal */
 export type BasinInfo$Outbound = {
-  cell: string;
   name: string;
   scope: string;
   state: string;
@@ -60,9 +59,8 @@ export const BasinInfo$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   BasinInfo
 > = z.object({
-  cell: z.string(),
   name: z.string(),
-  scope: z.string(),
+  scope: BasinScope$outboundSchema,
   state: BasinState$outboundSchema,
 });
 

package/src/models/components/basinscope.ts

@@ -0,0 +1,37 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { ClosedEnum } from "../../types/enums.js";
+
+/**
+ * Basin scope.
+ */
+export const BasinScope = {
+  Unspecified: "unspecified",
+  AwsUsEast1: "aws:us-east-1",
+} as const;
+/**
+ * Basin scope.
+ */
+export type BasinScope = ClosedEnum<typeof BasinScope>;
+
+/** @internal */
+export const BasinScope$inboundSchema: z.ZodNativeEnum<typeof BasinScope> = z
+  .nativeEnum(BasinScope);
+
+/** @internal */
+export const BasinScope$outboundSchema: z.ZodNativeEnum<typeof BasinScope> =
+  BasinScope$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace BasinScope$ {
+  /** @deprecated use `BasinScope$inboundSchema` instead. */
+  export const inboundSchema = BasinScope$inboundSchema;
+  /** @deprecated use `BasinScope$outboundSchema` instead. */
+  export const outboundSchema = BasinScope$outboundSchema;
+}

package/src/models/components/createbasinrequest.ts

@@ -6,25 +6,27 @@ import * as z from "zod";
 import { safeParse } from "../../lib/schemas.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
-import {
-  Assignment,
-  Assignment$inboundSchema,
-  Assignment$Outbound,
-  Assignment$outboundSchema,
-} from "./assignment.js";
 import {
   BasinConfig,
   BasinConfig$inboundSchema,
   BasinConfig$Outbound,
   BasinConfig$outboundSchema,
 } from "./basinconfig.js";
+import {
+  BasinScope,
+  BasinScope$inboundSchema,
+  BasinScope$outboundSchema,
+} from "./basinscope.js";
 
 /**
  * Create basin request.
  */
 export type CreateBasinRequest = {
-  assignment?: Assignment | null | undefined;
   config?: BasinConfig | null | undefined;
+  /**
+   * Basin scope.
+   */
+  scope?: BasinScope | undefined;
 };
 
 /** @internal */
@@ -33,14 +35,14 @@ export const CreateBasinRequest$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.object({
-  assignment: z.nullable(Assignment$inboundSchema).optional(),
   config: z.nullable(BasinConfig$inboundSchema).optional(),
+  scope: BasinScope$inboundSchema.optional(),
 });
 
 /** @internal */
 export type CreateBasinRequest$Outbound = {
-  assignment?: Assignment$Outbound | null | undefined;
   config?: BasinConfig$Outbound | null | undefined;
+  scope?: string | undefined;
 };
 
 /** @internal */
@@ -49,8 +51,8 @@ export const CreateBasinRequest$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   CreateBasinRequest
 > = z.object({
-  assignment: z.nullable(Assignment$outboundSchema).optional(),
   config: z.nullable(BasinConfig$outboundSchema).optional(),
+  scope: BasinScope$outboundSchema.optional(),
 });
 
 /**

package/src/models/components/index.ts

@@ -5,9 +5,9 @@
 export * from "./appendinput.js";
 export * from "./appendoutput.js";
 export * from "./appendrecord.js";
-export * from "./assignment.js";
 export * from "./basinconfig.js";
 export * from "./basininfo.js";
+export * from "./basinscope.js";
 export * from "./basinstate.js";
 export * from "./checktailresponse.js";
 export * from "./createbasinrequest.js";

package/src/models/components/readresponse.ts

@@ -4,6 +4,7 @@
 
 import * as z from "zod";
 import { safeParse } from "../../lib/schemas.js";
+import { ClosedEnum } from "../../types/enums.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
 import {
@@ -13,26 +14,131 @@ import {
   Output$outboundSchema,
 } from "./output.js";
 
+export const ReadResponse3Event = {
+  Ping: "ping",
+} as const;
+export type ReadResponse3Event = ClosedEnum<typeof ReadResponse3Event>;
+
+export type Ping = {
+  event: ReadResponse3Event;
+};
+
+export const ReadResponseEvent = {
+  Error: "error",
+} as const;
+export type ReadResponseEvent = ClosedEnum<typeof ReadResponseEvent>;
+
 export type ErrorT = {
   data: string;
-  event: string;
+  event: ReadResponseEvent;
 };
 
-export type ReadResponseOutput = {
+export const Event = {
+  Message: "message",
+} as const;
+export type Event = ClosedEnum<typeof Event>;
+
+export type Message = {
   /**
    * Reply which can be a batch of records, or a sequence number if the request could not be satisfied.
    */
   data: Output;
+  event: Event;
+};
+
+export type ReadResponse = Ping | Message | ErrorT;
+
+/** @internal */
+export const ReadResponse3Event$inboundSchema: z.ZodNativeEnum<
+  typeof ReadResponse3Event
+> = z.nativeEnum(ReadResponse3Event);
+
+/** @internal */
+export const ReadResponse3Event$outboundSchema: z.ZodNativeEnum<
+  typeof ReadResponse3Event
+> = ReadResponse3Event$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace ReadResponse3Event$ {
+  /** @deprecated use `ReadResponse3Event$inboundSchema` instead. */
+  export const inboundSchema = ReadResponse3Event$inboundSchema;
+  /** @deprecated use `ReadResponse3Event$outboundSchema` instead. */
+  export const outboundSchema = ReadResponse3Event$outboundSchema;
+}
+
+/** @internal */
+export const Ping$inboundSchema: z.ZodType<Ping, z.ZodTypeDef, unknown> = z
+  .object({
+    event: ReadResponse3Event$inboundSchema,
+  });
+
+/** @internal */
+export type Ping$Outbound = {
   event: string;
 };
 
-export type ReadResponse = ReadResponseOutput | ErrorT;
+/** @internal */
+export const Ping$outboundSchema: z.ZodType<Ping$Outbound, z.ZodTypeDef, Ping> =
+  z.object({
+    event: ReadResponse3Event$outboundSchema,
+  });
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace Ping$ {
+  /** @deprecated use `Ping$inboundSchema` instead. */
+  export const inboundSchema = Ping$inboundSchema;
+  /** @deprecated use `Ping$outboundSchema` instead. */
+  export const outboundSchema = Ping$outboundSchema;
+  /** @deprecated use `Ping$Outbound` instead. */
+  export type Outbound = Ping$Outbound;
+}
+
+export function pingToJSON(ping: Ping): string {
+  return JSON.stringify(Ping$outboundSchema.parse(ping));
+}
+
+export function pingFromJSON(
+  jsonString: string,
+): SafeParseResult<Ping, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => Ping$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Ping' from JSON`,
+  );
+}
+
+/** @internal */
+export const ReadResponseEvent$inboundSchema: z.ZodNativeEnum<
+  typeof ReadResponseEvent
+> = z.nativeEnum(ReadResponseEvent);
+
+/** @internal */
+export const ReadResponseEvent$outboundSchema: z.ZodNativeEnum<
+  typeof ReadResponseEvent
+> = ReadResponseEvent$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace ReadResponseEvent$ {
+  /** @deprecated use `ReadResponseEvent$inboundSchema` instead. */
+  export const inboundSchema = ReadResponseEvent$inboundSchema;
+  /** @deprecated use `ReadResponseEvent$outboundSchema` instead. */
+  export const outboundSchema = ReadResponseEvent$outboundSchema;
+}
 
 /** @internal */
 export const ErrorT$inboundSchema: z.ZodType<ErrorT, z.ZodTypeDef, unknown> = z
   .object({
     data: z.string(),
-    event: z.string(),
+    event: ReadResponseEvent$inboundSchema,
   });
 
 /** @internal */
@@ -48,7 +154,7 @@ export const ErrorT$outboundSchema: z.ZodType<
   ErrorT
 > = z.object({
   data: z.string(),
-  event: z.string(),
+  event: ReadResponseEvent$outboundSchema,
 });
 
 /**
@@ -79,69 +185,82 @@ export function errorFromJSON(
 }
 
 /** @internal */
-export const ReadResponseOutput$inboundSchema: z.ZodType<
-  ReadResponseOutput,
-  z.ZodTypeDef,
-  unknown
-> = z.object({
-  data: z.string().transform((v, ctx) => {
-    try {
-      return JSON.parse(v);
-    } catch (err) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `malformed json: ${err}`,
-      });
-      return z.NEVER;
-    }
-  }).pipe(Output$inboundSchema),
-  event: z.string(),
-});
+export const Event$inboundSchema: z.ZodNativeEnum<typeof Event> = z.nativeEnum(
+  Event,
+);
+
+/** @internal */
+export const Event$outboundSchema: z.ZodNativeEnum<typeof Event> =
+  Event$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace Event$ {
+  /** @deprecated use `Event$inboundSchema` instead. */
+  export const inboundSchema = Event$inboundSchema;
+  /** @deprecated use `Event$outboundSchema` instead. */
+  export const outboundSchema = Event$outboundSchema;
+}
 
 /** @internal */
-export type ReadResponseOutput$Outbound = {
+export const Message$inboundSchema: z.ZodType<Message, z.ZodTypeDef, unknown> =
+  z.object({
+    data: z.string().transform((v, ctx) => {
+      try {
+        return JSON.parse(v);
+      } catch (err) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `malformed json: ${err}`,
+        });
+        return z.NEVER;
+      }
+    }).pipe(Output$inboundSchema),
+    event: Event$inboundSchema,
+  });
+
+/** @internal */
+export type Message$Outbound = {
   data: Output$Outbound;
   event: string;
 };
 
 /** @internal */
-export const ReadResponseOutput$outboundSchema: z.ZodType<
-  ReadResponseOutput$Outbound,
+export const Message$outboundSchema: z.ZodType<
+  Message$Outbound,
   z.ZodTypeDef,
-  ReadResponseOutput
+  Message
 > = z.object({
   data: Output$outboundSchema,
-  event: z.string(),
+  event: Event$outboundSchema,
 });
 
 /**
  * @internal
  * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
  */
-export namespace ReadResponseOutput$ {
-  /** @deprecated use `ReadResponseOutput$inboundSchema` instead. */
-  export const inboundSchema = ReadResponseOutput$inboundSchema;
-  /** @deprecated use `ReadResponseOutput$outboundSchema` instead. */
-  export const outboundSchema = ReadResponseOutput$outboundSchema;
-  /** @deprecated use `ReadResponseOutput$Outbound` instead. */
-  export type Outbound = ReadResponseOutput$Outbound;
+export namespace Message$ {
+  /** @deprecated use `Message$inboundSchema` instead. */
+  export const inboundSchema = Message$inboundSchema;
+  /** @deprecated use `Message$outboundSchema` instead. */
+  export const outboundSchema = Message$outboundSchema;
+  /** @deprecated use `Message$Outbound` instead. */
+  export type Outbound = Message$Outbound;
 }
 
-export function readResponseOutputToJSON(
-  readResponseOutput: ReadResponseOutput,
-): string {
-  return JSON.stringify(
-    ReadResponseOutput$outboundSchema.parse(readResponseOutput),
-  );
+export function messageToJSON(message: Message): string {
+  return JSON.stringify(Message$outboundSchema.parse(message));
 }
 
-export function readResponseOutputFromJSON(
+export function messageFromJSON(
   jsonString: string,
-): SafeParseResult<ReadResponseOutput, SDKValidationError> {
+): SafeParseResult<Message, SDKValidationError> {
   return safeParse(
     jsonString,
-    (x) => ReadResponseOutput$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'ReadResponseOutput' from JSON`,
+    (x) => Message$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Message' from JSON`,
   );
 }
 
@@ -151,13 +270,15 @@ export const ReadResponse$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.union([
-  z.lazy(() => ReadResponseOutput$inboundSchema),
+  z.lazy(() => Ping$inboundSchema),
+  z.lazy(() => Message$inboundSchema),
   z.lazy(() => ErrorT$inboundSchema),
 ]);
 
 /** @internal */
 export type ReadResponse$Outbound =
-  | ReadResponseOutput$Outbound
+  | Ping$Outbound
+  | Message$Outbound
   | ErrorT$Outbound;
 
 /** @internal */
@@ -166,7 +287,8 @@ export const ReadResponse$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   ReadResponse
 > = z.union([
-  z.lazy(() => ReadResponseOutput$outboundSchema),
+  z.lazy(() => Ping$outboundSchema),
+  z.lazy(() => Message$outboundSchema),
   z.lazy(() => ErrorT$outboundSchema),
 ]);