@s2-dev/streamstore 0.5.0 → 0.7.0

package/package.json

@@ -1,11 +1,26 @@
 {
   "name": "@s2-dev/streamstore",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "author": "Speakeasy",
+  "type": "module",
   "bin": {
     "mcp": "bin/mcp-server.js"
   },
-  "main": "./index.js",
+  "tshy": {
+    "sourceDialects": [
+      "@s2-dev/streamstore/source"
+    ],
+    "exports": {
+      ".": "./src/index.ts",
+      "./package.json": "./package.json",
+      "./types": "./src/types/index.ts",
+      "./models/errors": "./src/models/errors/index.ts",
+      "./models/components": "./src/models/components/index.ts",
+      "./models/operations": "./src/models/operations/index.ts",
+      "./*.js": "./src/*.ts",
+      "./*": "./src/*.ts"
+    }
+  },
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -14,7 +29,7 @@
   "scripts": {
     "lint": "eslint --cache --max-warnings=0 src",
     "build:mcp": "bun src/mcp-server/build.mts",
-    "build": "npm run build:mcp && tsc",
+    "build": "npm run build:mcp && tshy",
     "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
@@ -22,7 +37,9 @@
     "zod": ">= 3"
   },
   "peerDependenciesMeta": {
-    "@modelcontextprotocol/sdk": {"optional":true}
+    "@modelcontextprotocol/sdk": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@eslint/js": "^9.19.0",
@@ -36,6 +53,7 @@
     "eslint": "^9.19.0",
     "express": "^4.21.2",
     "globals": "^15.14.0",
+    "tshy": "^2.0.0",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.22.0",
     "zod": "^3.23.4"
@@ -43,5 +61,88 @@
   "dependencies": {
     "jsonpath-rfc9535": "1.1.0",
     "uuid": "^9.0.1"
-  }
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/index.ts",
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    },
+    "./package.json": "./package.json",
+    "./types": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/types/index.ts",
+        "types": "./dist/esm/types/index.d.ts",
+        "default": "./dist/esm/types/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/types/index.d.ts",
+        "default": "./dist/commonjs/types/index.js"
+      }
+    },
+    "./models/errors": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/models/errors/index.ts",
+        "types": "./dist/esm/models/errors/index.d.ts",
+        "default": "./dist/esm/models/errors/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/models/errors/index.d.ts",
+        "default": "./dist/commonjs/models/errors/index.js"
+      }
+    },
+    "./models/components": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/models/components/index.ts",
+        "types": "./dist/esm/models/components/index.d.ts",
+        "default": "./dist/esm/models/components/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/models/components/index.d.ts",
+        "default": "./dist/commonjs/models/components/index.js"
+      }
+    },
+    "./models/operations": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/models/operations/index.ts",
+        "types": "./dist/esm/models/operations/index.d.ts",
+        "default": "./dist/esm/models/operations/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/models/operations/index.d.ts",
+        "default": "./dist/commonjs/models/operations/index.js"
+      }
+    },
+    "./*.js": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/*.ts",
+        "types": "./dist/esm/*.d.ts",
+        "default": "./dist/esm/*.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/*.d.ts",
+        "default": "./dist/commonjs/*.js"
+      }
+    },
+    "./*": {
+      "import": {
+        "@s2-dev/streamstore/source": "./src/*.ts",
+        "types": "./dist/esm/*.d.ts",
+        "default": "./dist/esm/*.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/*.d.ts",
+        "default": "./dist/commonjs/*.js"
+      }
+    }
+  },
+  "main": "./dist/commonjs/index.js",
+  "types": "./dist/commonjs/index.d.ts",
+  "module": "./dist/esm/index.js"
 }

package/src/index.extras.ts

@@ -1,4 +1,4 @@
-import { accountDeleteBasin } from "./funcs/accountDeleteBasin";
+import { accountDeleteBasin } from "./funcs/accountDeleteBasin.js";
 import {
     AppendOutput,
     BasinConfig,
@@ -6,15 +6,15 @@ import {
     CheckTailResponse,
     CreateBasinRequest,
     CreateStreamRequest,
+    Message,
     Output,
     ReadResponse,
-    ReadResponseOutput,
     SequencedRecord,
     SequencedRecordBatch,
     StreamConfig,
     StreamInfo,
-} from "./models/components";
-import { NotFoundError, RetryableError } from "./models/errors";
+} from "./models/components/index.js";
+import { NotFoundError, RetryableError } from "./models/errors/index.js";
 import {
     GetBasinConfigRequest,
     ListBasinsRequest,
@@ -26,18 +26,18 @@ import {
     CreateStreamRequest as CreateStreamRequestInner,
     ReadRequest as ReadRequestInner,
     AppendRequest as AppendRequestInner,
-} from "./models/operations";
-import { PageIterator } from "./types";
+} from "./models/operations/index.js";
+import { PageIterator } from "./types/index.js";
 
-import { Stream as InnerStream, ReadAcceptEnum } from "./sdk/stream";
-import { Basin as InnerBasin } from "./sdk/basin";
-import { Account as InnerAccount } from "./sdk/account";
+import { Stream as InnerStream, ReadAcceptEnum } from "./sdk/stream.js";
+import { Basin as InnerBasin } from "./sdk/basin.js";
+import { Account as InnerAccount } from "./sdk/account.js";
 
 import { v4 as uuidv4 } from "uuid";
-import { basinDeleteStream } from "./funcs/basinDeleteStream";
-import { EventStream } from "./lib/event-streams";
-import { ClientKind, S2Cloud, S2Endpoints } from "./endpoints";
-import { HTTPClient } from "./lib/http";
+import { basinDeleteStream } from "./funcs/basinDeleteStream.js";
+import { EventStream } from "./lib/event-streams.js";
+import { ClientKind, S2Cloud, S2Endpoints } from "./endpoints.js";
+import { HTTPClient } from "./lib/http.js";
 
 export type ReadRequest = Omit<ReadRequestInner, "stream">;
 export type AppendRequest = Omit<AppendRequestInner, "stream">;
@@ -48,7 +48,7 @@ export type {
     ListStreamsRequest,
     ListStreamsResponse,
     ReconfigureBasinRequest,
-} from "./models/operations";
+} from "./models/operations/index.js";
 export type {
     BasinConfig,
     BasinInfo,
@@ -59,9 +59,9 @@ export type {
     ReadResponse,
     StreamConfig,
     StreamInfo,
-} from "./models/components";
+} from "./models/components/index.js";
 
-export * from "./endpoints";
+export * from "./endpoints.js";
 
 export type S2ClientConfig = {
     authToken?: string;
@@ -438,7 +438,7 @@ class Stream {
                     yield event;
 
                     if (event.event === 'message') {
-                        const output = event as ReadResponseOutput;
+                        const output = event as Message;
                         if ('batch' in output.data) {
                             const batch = output.data.batch;
                             if (batch.records && batch.records.length > 0) {
@@ -518,4 +518,4 @@ async function retryWithExponentialBackoff<T>(
     }
 
     throw new Error("Max retry attempts reached");
-}
+}

package/src/lib/config.ts

@@ -54,7 +54,7 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.5.0",
-  genVersion: "2.531.0",
-  userAgent: "speakeasy-sdk/typescript 0.5.0 2.531.0 1.0.0 @s2-dev/streamstore",
+  sdkVersion: "0.7.0",
+  genVersion: "2.545.2",
+  userAgent: "speakeasy-sdk/typescript 0.7.0 2.545.2 1.0.0 @s2-dev/streamstore",
 } as const;

package/src/mcp-server/cli/start/command.ts

@@ -28,6 +28,15 @@ export const startCommand = buildCommand({
         parse: (val: string) =>
           z.coerce.number().int().gte(0).lt(65536).parse(val),
       },
+      tool: {
+        kind: "parsed",
+        brief: "Specify tools to mount on the server",
+        optional: true,
+        variadic: true,
+        parse: (value) => {
+          return z.string().parse(value);
+        },
+      },
       ...(mcpScopes.length
         ? {
           scope: {

package/src/mcp-server/cli/start/impl.ts

@@ -17,6 +17,7 @@ import { createMCPServer } from "../../server.js";
 interface StartCommandFlags {
   readonly transport: "stdio" | "sse";
   readonly port: number;
+  readonly tool?: string[];
   readonly scope?: MCPScope[];
   readonly "bearer-auth"?: string | undefined;
   readonly "server-url"?: string;
@@ -47,6 +48,7 @@ async function startStdio(flags: StartCommandFlags) {
   const transport = new StdioServerTransport();
   const server = createMCPServer({
     logger,
+    allowedTools: flags.tool,
     scopes: flags.scope,
     ...{ bearerAuth: flags["bearer-auth"] },
     serverURL: flags["server-url"],
@@ -67,6 +69,7 @@ async function startSSE(flags: StartCommandFlags) {
   const app = express();
   const mcpServer = createMCPServer({
     logger,
+    allowedTools: flags.tool,
     scopes: flags.scope,
     ...{ bearerAuth: flags["bearer-auth"] },
     serverURL: flags["server-url"],

package/src/mcp-server/extensions.ts

@@ -0,0 +1,13 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { ZodRawShape } from "zod";
+import { ResourceDefinition, ResourceTemplateDefinition } from "./resources.js";
+import { ToolDefinition } from "./tools.js";
+
+export type Register = {
+  tool: <A extends ZodRawShape | undefined>(def: ToolDefinition<A>) => void;
+  resource: (def: ResourceDefinition) => void;
+  resourceTemplate: (def: ResourceTemplateDefinition) => void;
+};

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.5.0",
+    currentVersion: "0.7.0",
   },
 });
 

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.0",
+    version: "0.7.0",
   });
 
   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;