@s2-dev/streamstore 0.10.0 → 0.11.0

package/src/funcs/streamsListStreams.ts

@@ -0,0 +1,243 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { JsonValue, query as jpQuery } from "jsonpath-rfc9535";
+import { S2Core } from "../core.js";
+import { encodeFormQuery } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+import { compactMap } from "../lib/primitives.js";
+import { safeParse } from "../lib/schemas.js";
+import { RequestOptions } from "../lib/sdks.js";
+import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
+import { pathToFunc } from "../lib/url.js";
+import { APIError } from "../models/errors/apierror.js";
+import {
+  ConnectionError,
+  InvalidRequestError,
+  RequestAbortedError,
+  RequestTimeoutError,
+  UnexpectedClientError,
+} from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
+import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import * as operations from "../models/operations/index.js";
+import { ListStreamsServerList } from "../models/operations/liststreams.js";
+import { APICall, APIPromise } from "../types/async.js";
+import { Result } from "../types/fp.js";
+import {
+  createPageIterator,
+  haltIterator,
+  PageIterator,
+  Paginator,
+} from "../types/operations.js";
+
+/**
+ * List streams.
+ */
+export function streamsListStreams(
+  client: S2Core,
+  request: operations.ListStreamsRequest,
+  options?: RequestOptions,
+): APIPromise<
+  PageIterator<
+    Result<
+      operations.ListStreamsResponse,
+      | errors.ErrorResponse
+      | errors.RetryableError
+      | errors.RetryableError
+      | APIError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    { cursor: string }
+  >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.ListStreamsRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    PageIterator<
+      Result<
+        operations.ListStreamsResponse,
+        | errors.ErrorResponse
+        | errors.RetryableError
+        | errors.RetryableError
+        | APIError
+        | SDKValidationError
+        | UnexpectedClientError
+        | InvalidRequestError
+        | RequestAbortedError
+        | RequestTimeoutError
+        | ConnectionError
+      >,
+      { cursor: string }
+    >,
+    APICall,
+  ]
+> {
+  const parsed = safeParse(
+    request,
+    (value) => operations.ListStreamsRequest$outboundSchema.parse(value),
+    "Input validation failed",
+  );
+  if (!parsed.ok) {
+    return [haltIterator(parsed), { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = null;
+
+  const baseURL = options?.serverURL
+    || pathToFunc(ListStreamsServerList[0], { charEncoding: "percent" })({
+      basin: "",
+    });
+
+  const path = pathToFunc("/streams")();
+
+  const query = encodeFormQuery({
+    "limit": payload.limit,
+    "prefix": payload.prefix,
+    "start_after": payload.start_after,
+  });
+
+  const headers = new Headers(compactMap({
+    Accept: "application/json",
+  }));
+
+  const secConfig = await extractSecurity(client._options.bearerAuth);
+  const securityInput = secConfig == null ? {} : { bearerAuth: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+
+  const context = {
+    baseURL: baseURL ?? "",
+    operationID: "list_streams",
+    oAuth2Scopes: [],
+
+    resolvedSecurity: requestSecurity,
+
+    securitySource: client._options.bearerAuth,
+    retryConfig: options?.retries
+      || client._options.retryConfig
+      || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+  };
+
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "GET",
+    baseURL: baseURL,
+    path: path,
+    headers: headers,
+    query: query,
+    body: body,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
+  }, options);
+  if (!requestRes.ok) {
+    return [haltIterator(requestRes), { status: "invalid" }];
+  }
+  const req = requestRes.value;
+
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["400", "401", "499", "4XX", "500", "503", "504", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes,
+  });
+  if (!doResult.ok) {
+    return [haltIterator(doResult), { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
+  const [result, raw] = await M.match<
+    operations.ListStreamsResponse,
+    | errors.ErrorResponse
+    | errors.RetryableError
+    | errors.RetryableError
+    | APIError
+    | SDKValidationError
+    | UnexpectedClientError
+    | InvalidRequestError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | ConnectionError
+  >(
+    M.json(200, operations.ListStreamsResponse$inboundSchema, {
+      key: "Result",
+    }),
+    M.jsonErr([400, 401], errors.ErrorResponse$inboundSchema),
+    M.jsonErr(499, errors.RetryableError$inboundSchema),
+    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.fail("4XX"),
+    M.fail("5XX"),
+  )(response, { extraFields: responseFields });
+  if (!result.ok) {
+    return [haltIterator(result), {
+      status: "complete",
+      request: req,
+      response,
+    }];
+  }
+
+  const nextFunc = (
+    responseData: unknown,
+  ): {
+    next: Paginator<
+      Result<
+        operations.ListStreamsResponse,
+        | errors.ErrorResponse
+        | errors.RetryableError
+        | errors.RetryableError
+        | APIError
+        | SDKValidationError
+        | UnexpectedClientError
+        | InvalidRequestError
+        | RequestAbortedError
+        | RequestTimeoutError
+        | ConnectionError
+      >
+    >;
+    "~next"?: { cursor: string };
+  } => {
+    const nextCursor =
+      jpQuery(responseData as JsonValue, "$.streams[-1].name")[0];
+    if (typeof nextCursor !== "string") {
+      return { next: () => null };
+    }
+
+    const nextVal = () =>
+      streamsListStreams(
+        client,
+        {
+          ...request,
+          startAfter: nextCursor,
+        },
+        options,
+      );
+
+    return { next: nextVal, "~next": { cursor: nextCursor } };
+  };
+
+  const page = { ...result, ...nextFunc(raw) };
+  return [{ ...page, ...createPageIterator(page, (v) => !v.ok) }, {
+    status: "complete",
+    request: req,
+    response,
+  }];
+}

package/src/funcs/streamsReconfigureStream.ts

@@ -0,0 +1,184 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { S2Core } from "../core.js";
+import { encodeJSON, encodeSimple } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+import { compactMap } from "../lib/primitives.js";
+import { safeParse } from "../lib/schemas.js";
+import { RequestOptions } from "../lib/sdks.js";
+import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
+import { pathToFunc } from "../lib/url.js";
+import * as components from "../models/components/index.js";
+import { APIError } from "../models/errors/apierror.js";
+import {
+  ConnectionError,
+  InvalidRequestError,
+  RequestAbortedError,
+  RequestTimeoutError,
+  UnexpectedClientError,
+} from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
+import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import * as operations from "../models/operations/index.js";
+import { ReconfigureStreamServerList } from "../models/operations/reconfigurestream.js";
+import { APICall, APIPromise } from "../types/async.js";
+import { Result } from "../types/fp.js";
+
+/**
+ * Reconfigure a stream.
+ */
+export function streamsReconfigureStream(
+  client: S2Core,
+  request: operations.ReconfigureStreamRequest,
+  options?: RequestOptions,
+): APIPromise<
+  Result<
+    components.StreamConfig,
+    | errors.ErrorResponse
+    | errors.RetryableError
+    | errors.RetryableError
+    | APIError
+    | SDKValidationError
+    | UnexpectedClientError
+    | InvalidRequestError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | ConnectionError
+  >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.ReconfigureStreamRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      components.StreamConfig,
+      | errors.ErrorResponse
+      | errors.RetryableError
+      | errors.RetryableError
+      | APIError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    APICall,
+  ]
+> {
+  const parsed = safeParse(
+    request,
+    (value) => operations.ReconfigureStreamRequest$outboundSchema.parse(value),
+    "Input validation failed",
+  );
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = encodeJSON("body", payload.StreamReconfiguration, {
+    explode: true,
+  });
+
+  const baseURL = options?.serverURL
+    || pathToFunc(ReconfigureStreamServerList[0], { charEncoding: "percent" })({
+      basin: "",
+    });
+
+  const pathParams = {
+    stream: encodeSimple("stream", payload.stream, {
+      explode: false,
+      charEncoding: "percent",
+    }),
+  };
+
+  const path = pathToFunc("/streams/{stream}")(pathParams);
+
+  const headers = new Headers(compactMap({
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  }));
+
+  const secConfig = await extractSecurity(client._options.bearerAuth);
+  const securityInput = secConfig == null ? {} : { bearerAuth: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+
+  const context = {
+    baseURL: baseURL ?? "",
+    operationID: "reconfigure_stream",
+    oAuth2Scopes: [],
+
+    resolvedSecurity: requestSecurity,
+
+    securitySource: client._options.bearerAuth,
+    retryConfig: options?.retries
+      || client._options.retryConfig
+      || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+  };
+
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "PATCH",
+    baseURL: baseURL,
+    path: path,
+    headers: headers,
+    body: body,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["400", "401", "499", "4XX", "500", "503", "504", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes,
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
+  const [result] = await M.match<
+    components.StreamConfig,
+    | errors.ErrorResponse
+    | errors.RetryableError
+    | errors.RetryableError
+    | APIError
+    | SDKValidationError
+    | UnexpectedClientError
+    | InvalidRequestError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | ConnectionError
+  >(
+    M.json(200, components.StreamConfig$inboundSchema),
+    M.jsonErr([400, 401], errors.ErrorResponse$inboundSchema),
+    M.jsonErr(499, errors.RetryableError$inboundSchema),
+    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.fail("4XX"),
+    M.fail("5XX"),
+  )(response, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+
+  return [result, { status: "complete", request: req, response }];
+}

package/src/index.ts

@@ -5,5 +5,3 @@
 export * from "./lib/config.js";
 export * as files from "./lib/files.js";
 export * from "./sdk/sdk.js";
-
-export * from "./index.extras.js";

package/src/lib/config.ts

@@ -11,7 +11,7 @@ import { Params, pathToFunc } from "./url.js";
  * Contains the list of servers available to the SDK
  */
 export const ServerList = [
-  "https://aws.s2.dev/v1alpha",
+  "https://aws.s2.dev/v1",
 ] as const;
 
 export type SDKOptions = {
@@ -54,8 +54,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.10.0",
-  genVersion: "2.563.0",
+  sdkVersion: "0.11.0",
+  genVersion: "2.593.4",
   userAgent:
-    "speakeasy-sdk/typescript 0.10.0 2.563.0 1.0.0 @s2-dev/streamstore",
+    "speakeasy-sdk/typescript 0.11.0 2.593.4 1.0.0 @s2-dev/streamstore",
 } as const;

package/src/lib/matchers.ts

@@ -5,12 +5,12 @@
 import { APIError } from "../models/errors/apierror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import { Result } from "../types/fp.js";
-import { discardSentinel } from "./event-streams.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
 import { safeParse } from "./schemas.js";
 
 export type Encoding =
+  | "jsonl"
   | "json"
   | "text"
   | "bytes"
@@ -20,6 +20,7 @@ export type Encoding =
   | "fail";
 
 const DEFAULT_CONTENT_TYPES: Record<Encoding, string> = {
+  jsonl: "application/jsonl",
   json: "application/json",
   text: "text/plain",
   bytes: "application/octet-stream",
@@ -73,6 +74,21 @@ export function json<T>(
   return { ...options, enc: "json", codes, schema };
 }
 
+export function jsonl<T>(
+  codes: StatusCodePredicate,
+  schema: Schema<T>,
+  options?: MatchOptions,
+): ValueMatcher<T> {
+  return { ...options, enc: "jsonl", codes, schema };
+}
+
+export function jsonlErr<E>(
+  codes: StatusCodePredicate,
+  schema: Schema<E>,
+  options?: MatchOptions,
+): ErrorMatcher<E> {
+  return { ...options, err: true, enc: "jsonl", codes, schema };
+}
 export function textErr<E>(
   codes: StatusCodePredicate,
   schema: Schema<E>,
@@ -205,6 +221,9 @@ export function match<T, E>(
       case "json":
         raw = await response.json();
         break;
+      case "jsonl":
+        raw = response.body;
+        break;
       case "bytes":
         raw = new Uint8Array(await response.arrayBuffer());
         break;
@@ -215,9 +234,7 @@ export function match<T, E>(
         raw = await response.text();
         break;
       case "sse":
-        raw = response.body && matcher.sseSentinel
-          ? discardSentinel(response.body, matcher.sseSentinel)
-          : response.body;
+        raw = response.body;
         break;
       case "nil":
         raw = await discardResponseBody(response);

package/src/lib/sdks.ts

@@ -302,7 +302,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^application\/(?:.{0,100}\+)?json/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
+const jsonlLikeContentTypeRE =
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -368,9 +370,13 @@ async function logResponse(
   logger.group("Body:");
   switch (true) {
     case matchContentType(res, "application/json")
-      || jsonLikeContentTypeRE.test(ct):
+      || jsonLikeContentTypeRE.test(ct) && !jsonlLikeContentTypeRE.test(ct):
       logger.log(await res.clone().json());
       break;
+    case matchContentType(res, "application/jsonl")
+      || jsonlLikeContentTypeRE.test(ct):
+      logger.log(await res.clone().text());
+      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

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

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

package/src/mcp-server/prompts.ts

@@ -74,7 +74,14 @@ export function createRegisterPrompt(
     prompt: PromptDefinition<A>,
   ): void => {
     const scopes = prompt.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 

package/src/mcp-server/resources.ts

@@ -109,7 +109,14 @@ export function createRegisterResource(
 ): (resource: ResourceDefinition) => void {
   return (resource: ResourceDefinition): void => {
     const scopes = resource.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 
@@ -137,7 +144,14 @@ export function createRegisterResourceTemplate(
 ): (resource: ResourceTemplateDefinition) => void {
   return (resource: ResourceTemplateDefinition): void => {
     const scopes = resource.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 

package/src/mcp-server/server.ts

@@ -11,21 +11,21 @@ import {
   createRegisterResource,
   createRegisterResourceTemplate,
 } from "./resources.js";
-import { MCPScope, mcpScopes } from "./scopes.js";
+import { MCPScope } from "./scopes.js";
 import { createRegisterTool } from "./tools.js";
-import { tool$accountCreateBasin } from "./tools/accountCreateBasin.js";
-import { tool$accountDeleteBasin } from "./tools/accountDeleteBasin.js";
-import { tool$accountGetBasinConfig } from "./tools/accountGetBasinConfig.js";
-import { tool$accountListBasins } from "./tools/accountListBasins.js";
-import { tool$accountReconfigureBasin } from "./tools/accountReconfigureBasin.js";
-import { tool$basinCreateStream } from "./tools/basinCreateStream.js";
-import { tool$basinDeleteStream } from "./tools/basinDeleteStream.js";
-import { tool$basinGetStreamConfig } from "./tools/basinGetStreamConfig.js";
-import { tool$basinListStreams } from "./tools/basinListStreams.js";
-import { tool$basinReconfigureStream } from "./tools/basinReconfigureStream.js";
-import { tool$streamAppend } from "./tools/streamAppend.js";
-import { tool$streamCheckTail } from "./tools/streamCheckTail.js";
-import { tool$streamRead } from "./tools/streamRead.js";
+import { tool$accessTokensIssueAccessToken } from "./tools/accessTokensIssueAccessToken.js";
+import { tool$accessTokensListAccessTokens } from "./tools/accessTokensListAccessTokens.js";
+import { tool$accessTokensRevokeAccessToken } from "./tools/accessTokensRevokeAccessToken.js";
+import { tool$basinsCreateOrReconfigureBasin } from "./tools/basinsCreateOrReconfigureBasin.js";
+import { tool$basinsDeleteBasin } from "./tools/basinsDeleteBasin.js";
+import { tool$basinsGetBasinConfig } from "./tools/basinsGetBasinConfig.js";
+import { tool$basinsListBasins } from "./tools/basinsListBasins.js";
+import { tool$basinsReconfigureBasin } from "./tools/basinsReconfigureBasin.js";
+import { tool$streamsCreateOrReconfigureStream } from "./tools/streamsCreateOrReconfigureStream.js";
+import { tool$streamsDeleteStream } from "./tools/streamsDeleteStream.js";
+import { tool$streamsGetStreamConfig } from "./tools/streamsGetStreamConfig.js";
+import { tool$streamsListStreams } from "./tools/streamsListStreams.js";
+import { tool$streamsReconfigureStream } from "./tools/streamsReconfigureStream.js";
 
 export function createMCPServer(deps: {
   logger: ConsoleLogger;
@@ -37,7 +37,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "S2",
-    version: "0.10.0",
+    version: "0.11.0",
   });
 
   const client = new S2Core({
@@ -46,7 +46,7 @@ export function createMCPServer(deps: {
     serverIdx: deps.serverIdx,
   });
 
-  const scopes = new Set(deps.scopes ?? mcpScopes);
+  const scopes = new Set(deps.scopes);
 
   const allowedTools = deps.allowedTools && new Set(deps.allowedTools);
   const tool = createRegisterTool(
@@ -67,19 +67,19 @@ export function createMCPServer(deps: {
   const register = { tool, resource, resourceTemplate, prompt };
   void register; // suppress unused warnings
 
-  tool(tool$accountListBasins);
-  tool(tool$accountGetBasinConfig);
-  tool(tool$accountCreateBasin);
-  tool(tool$accountDeleteBasin);
-  tool(tool$accountReconfigureBasin);
-  tool(tool$basinListStreams);
-  tool(tool$basinGetStreamConfig);
-  tool(tool$basinCreateStream);
-  tool(tool$basinDeleteStream);
-  tool(tool$basinReconfigureStream);
-  tool(tool$streamRead);
-  tool(tool$streamAppend);
-  tool(tool$streamCheckTail);
+  tool(tool$accessTokensListAccessTokens);
+  tool(tool$accessTokensIssueAccessToken);
+  tool(tool$accessTokensRevokeAccessToken);
+  tool(tool$basinsListBasins);
+  tool(tool$basinsGetBasinConfig);
+  tool(tool$basinsCreateOrReconfigureBasin);
+  tool(tool$basinsDeleteBasin);
+  tool(tool$basinsReconfigureBasin);
+  tool(tool$streamsListStreams);
+  tool(tool$streamsGetStreamConfig);
+  tool(tool$streamsCreateOrReconfigureStream);
+  tool(tool$streamsDeleteStream);
+  tool(tool$streamsReconfigureStream);
 
   return server;
 }