@s2-dev/streamstore 0.3.17 → 0.5.0

package/models/components/endpoints.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientKind = exports.S2Endpoints = exports.BasinEndpointKind = exports.S2Cloud = void 0;
+/**
+ * S2 cloud environment to connect with.
+ */
+var S2Cloud;
+(function (S2Cloud) {
+    /** S2 running on AWS */
+    S2Cloud["Aws"] = "aws";
+})(S2Cloud || (exports.S2Cloud = S2Cloud = {}));
+/**
+ * Endpoint for connecting to an S2 basin.
+ */
+var BasinEndpointKind;
+(function (BasinEndpointKind) {
+    BasinEndpointKind["ParentZone"] = "ParentZone";
+    BasinEndpointKind["Direct"] = "Direct";
+})(BasinEndpointKind || (exports.BasinEndpointKind = BasinEndpointKind = {}));
+class S2EndpointError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'S2EndpointError';
+    }
+}
+/**
+ * Endpoints for the S2 environment.
+ *
+ * You can find the S2 endpoints in our [documentation](https://s2.dev/docs/interface/endpoints)
+ */
+class S2Endpoints {
+    constructor(account, basin) {
+        this.account = account;
+        this.basin = basin;
+    }
+    /**
+     * Get S2 endpoints for the specified cloud.
+     */
+    static forCloud(cloud) {
+        const authority = `${cloud}.s2.dev`;
+        return new S2Endpoints(authority, {
+            kind: BasinEndpointKind.ParentZone,
+            authority: `b.${cloud}.s2.dev`
+        });
+    }
+    /**
+     * Get S2 endpoints for the specified cell.
+     */
+    static forCell(cloud, cellId) {
+        const cellEndpoint = `${cellId}.o.${cloud}.s2.dev`;
+        return new S2Endpoints(cellEndpoint, {
+            kind: BasinEndpointKind.Direct,
+            authority: cellEndpoint
+        });
+    }
+    /**
+     * Get S2 endpoints from environment variables.
+     *
+     * The following environment variables are used:
+     * - `S2_CLOUD`: Valid S2 cloud name. Defaults to AWS.
+     * - `S2_ACCOUNT_ENDPOINT`: Overrides the account endpoint.
+     * - `S2_BASIN_ENDPOINT`: Overrides the basin endpoint. The prefix `"{basin}."` indicates the
+     *   basin endpoint is `ParentZone` else `Direct`.
+     */
+    static fromEnv() {
+        let cloud;
+        try {
+            const cloudEnv = process.env['S2_CLOUD'] || S2Cloud.Aws;
+            if (Object.values(S2Cloud).includes(cloudEnv)) {
+                cloud = cloudEnv;
+            }
+            else {
+                throw new S2EndpointError(`Invalid S2_CLOUD: ${cloudEnv}`);
+            }
+        }
+        catch (err) {
+            const error = err;
+            throw new S2EndpointError(`Invalid S2_CLOUD: ${error.message}`);
+        }
+        const endpoints = S2Endpoints.forCloud(cloud);
+        const accountEndpoint = process.env['S2_ACCOUNT_ENDPOINT'];
+        if (accountEndpoint !== undefined) {
+            if (typeof accountEndpoint !== 'string') {
+                throw new S2EndpointError('Invalid S2_ACCOUNT_ENDPOINT: not string');
+            }
+            endpoints.account = accountEndpoint;
+        }
+        const basinEndpoint = process.env['S2_BASIN_ENDPOINT'];
+        if (basinEndpoint !== undefined) {
+            if (typeof basinEndpoint !== 'string') {
+                throw new S2EndpointError('Invalid S2_BASIN_ENDPOINT: not string');
+            }
+            if (basinEndpoint.startsWith('{basin}.')) {
+                const parentZone = basinEndpoint.substring(7);
+                endpoints.basin = {
+                    kind: BasinEndpointKind.ParentZone,
+                    authority: parentZone
+                };
+            }
+            else {
+                endpoints.basin = {
+                    kind: BasinEndpointKind.Direct,
+                    authority: basinEndpoint
+                };
+            }
+        }
+        return endpoints;
+    }
+}
+exports.S2Endpoints = S2Endpoints;
+exports.ClientKind = {
+    toAuthority(kind, endpoints) {
+        switch (kind.kind) {
+            case 'Account':
+                return endpoints.account;
+            case 'Basin':
+                switch (endpoints.basin.kind) {
+                    case BasinEndpointKind.ParentZone:
+                        return `${kind.basin}.${endpoints.basin.authority}`;
+                    case BasinEndpointKind.Direct:
+                        return endpoints.basin.authority;
+                }
+        }
+    }
+};
+//# sourceMappingURL=endpoints.js.map

package/models/components/endpoints.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../src/models/components/endpoints.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@s2-dev/streamstore",
-  "version": "0.3.17",
+  "version": "0.5.0",
   "author": "Speakeasy",
+  "bin": {
+    "mcp": "bin/mcp-server.js"
+  },
   "main": "./index.js",
   "sideEffects": false,
   "repository": {
@@ -10,25 +13,35 @@
   },
   "scripts": {
     "lint": "eslint --cache --max-warnings=0 src",
-    "build": "tsc",
+    "build:mcp": "bun src/mcp-server/build.mts",
+    "build": "npm run build:mcp && tsc",
     "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
+    "@modelcontextprotocol/sdk": "^1.5.0",
     "zod": ">= 3"
   },
+  "peerDependenciesMeta": {
+    "@modelcontextprotocol/sdk": {"optional":true}
+  },
   "devDependencies": {
     "@eslint/js": "^9.19.0",
-    "@types/jsonpath": "^0.2.4",
+    "@modelcontextprotocol/sdk": "^1.5.0",
+    "@stricli/core": "^1.1.1",
+    "@types/express": "^4.17.21",
     "@types/node": "^22.13.1",
     "@types/uuid": "^9.0.8",
+    "bun": "^1.2.2",
+    "bun-types": "^1.2.2",
     "eslint": "^9.19.0",
+    "express": "^4.21.2",
     "globals": "^15.14.0",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.22.0",
     "zod": "^3.23.4"
   },
   "dependencies": {
-    "jsonpath": "^1.1.1",
+    "jsonpath-rfc9535": "1.1.0",
     "uuid": "^9.0.1"
   }
 }

package/src/funcs/accountCreateBasin.ts

@@ -22,16 +22,17 @@ import {
 import * as errors from "../models/errors/index.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
 /**
  * Create a new basin.
  */
-export async function accountCreateBasin(
+export function accountCreateBasin(
   client: S2Core,
   request: operations.CreateBasinRequest,
   options?: RequestOptions,
-): Promise<
+): APIPromise<
   Result<
     components.BasinInfo,
     | errors.ErrorResponse
@@ -45,6 +46,35 @@ export async function accountCreateBasin(
     | RequestTimeoutError
     | ConnectionError
   >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.CreateBasinRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      components.BasinInfo,
+      | errors.ErrorResponse
+      | errors.RetryableError
+      | errors.RetryableError
+      | APIError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    APICall,
+  ]
 > {
   const parsed = safeParse(
     request,
@@ -52,7 +82,7 @@ export async function accountCreateBasin(
     "Input validation failed",
   );
   if (!parsed.ok) {
-    return parsed;
+    return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
   const body = encodeJSON("body", payload.CreateBasinRequest, {
@@ -83,6 +113,7 @@ export async function accountCreateBasin(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "create_basin",
     oAuth2Scopes: [],
 
@@ -105,7 +136,7 @@ export async function accountCreateBasin(
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
-    return requestRes;
+    return [requestRes, { status: "invalid" }];
   }
   const req = requestRes.value;
 
@@ -116,7 +147,7 @@ export async function accountCreateBasin(
     retryCodes: context.retryCodes,
   });
   if (!doResult.ok) {
-    return doResult;
+    return [doResult, { status: "request-error", request: req }];
   }
   const response = doResult.value;
 
@@ -145,8 +176,8 @@ export async function accountCreateBasin(
     M.fail("5XX"),
   )(response, { extraFields: responseFields });
   if (!result.ok) {
-    return result;
+    return [result, { status: "complete", request: req, response }];
   }
 
-  return result;
+  return [result, { status: "complete", request: req, response }];
 }

package/src/funcs/accountDeleteBasin.ts

@@ -22,16 +22,17 @@ import {
 import * as errors from "../models/errors/index.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
 /**
  * Delete a basin.
  */
-export async function accountDeleteBasin(
+export function accountDeleteBasin(
   client: S2Core,
   request: operations.DeleteBasinRequest,
   options?: RequestOptions,
-): Promise<
+): APIPromise<
   Result<
     void,
     | errors.ErrorResponse
@@ -46,6 +47,36 @@ export async function accountDeleteBasin(
     | RequestTimeoutError
     | ConnectionError
   >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.DeleteBasinRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      void,
+      | errors.ErrorResponse
+      | errors.NotFoundError
+      | errors.RetryableError
+      | errors.RetryableError
+      | APIError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    APICall,
+  ]
 > {
   const parsed = safeParse(
     request,
@@ -53,7 +84,7 @@ export async function accountDeleteBasin(
     "Input validation failed",
   );
   if (!parsed.ok) {
-    return parsed;
+    return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
   const body = null;
@@ -76,6 +107,7 @@ export async function accountDeleteBasin(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "delete_basin",
     oAuth2Scopes: [],
 
@@ -98,7 +130,7 @@ export async function accountDeleteBasin(
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
-    return requestRes;
+    return [requestRes, { status: "invalid" }];
   }
   const req = requestRes.value;
 
@@ -109,7 +141,7 @@ export async function accountDeleteBasin(
     retryCodes: context.retryCodes,
   });
   if (!doResult.ok) {
-    return doResult;
+    return [doResult, { status: "request-error", request: req }];
   }
   const response = doResult.value;
 
@@ -140,8 +172,8 @@ export async function accountDeleteBasin(
     M.fail("5XX"),
   )(response, { extraFields: responseFields });
   if (!result.ok) {
-    return result;
+    return [result, { status: "complete", request: req, response }];
   }
 
-  return result;
+  return [result, { status: "complete", request: req, response }];
 }

package/src/funcs/accountGetBasinConfig.ts

@@ -22,16 +22,17 @@ import {
 import * as errors from "../models/errors/index.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
 /**
  * Get basin configuration.
  */
-export async function accountGetBasinConfig(
+export function accountGetBasinConfig(
   client: S2Core,
   request: operations.GetBasinConfigRequest,
   options?: RequestOptions,
-): Promise<
+): APIPromise<
   Result<
     components.BasinConfig,
     | errors.ErrorResponse
@@ -45,6 +46,35 @@ export async function accountGetBasinConfig(
     | RequestTimeoutError
     | ConnectionError
   >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.GetBasinConfigRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      components.BasinConfig,
+      | errors.ErrorResponse
+      | errors.RetryableError
+      | errors.RetryableError
+      | APIError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    APICall,
+  ]
 > {
   const parsed = safeParse(
     request,
@@ -52,7 +82,7 @@ export async function accountGetBasinConfig(
     "Input validation failed",
   );
   if (!parsed.ok) {
-    return parsed;
+    return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
   const body = null;
@@ -75,6 +105,7 @@ export async function accountGetBasinConfig(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "get_basin_config",
     oAuth2Scopes: [],
 
@@ -97,7 +128,7 @@ export async function accountGetBasinConfig(
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
-    return requestRes;
+    return [requestRes, { status: "invalid" }];
   }
   const req = requestRes.value;
 
@@ -108,7 +139,7 @@ export async function accountGetBasinConfig(
     retryCodes: context.retryCodes,
   });
   if (!doResult.ok) {
-    return doResult;
+    return [doResult, { status: "request-error", request: req }];
   }
   const response = doResult.value;
 
@@ -137,8 +168,8 @@ export async function accountGetBasinConfig(
     M.fail("5XX"),
   )(response, { extraFields: responseFields });
   if (!result.ok) {
-    return result;
+    return [result, { status: "complete", request: req, response }];
   }
 
-  return result;
+  return [result, { status: "complete", request: req, response }];
 }

package/src/funcs/accountListBasins.ts

@@ -2,7 +2,7 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import jp from "jsonpath";
+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";
@@ -22,6 +22,7 @@ import {
 import * as errors from "../models/errors/index.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 import {
   createPageIterator,
@@ -33,11 +34,11 @@ import {
 /**
  * List basins.
  */
-export async function accountListBasins(
+export function accountListBasins(
   client: S2Core,
   request: operations.ListBasinsRequest,
   options?: RequestOptions,
-): Promise<
+): APIPromise<
   PageIterator<
     Result<
       operations.ListBasinsResponse,
@@ -54,6 +55,38 @@ export async function accountListBasins(
     >,
     { cursor: string }
   >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: S2Core,
+  request: operations.ListBasinsRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    PageIterator<
+      Result<
+        operations.ListBasinsResponse,
+        | errors.ErrorResponse
+        | errors.RetryableError
+        | errors.RetryableError
+        | APIError
+        | SDKValidationError
+        | UnexpectedClientError
+        | InvalidRequestError
+        | RequestAbortedError
+        | RequestTimeoutError
+        | ConnectionError
+      >,
+      { cursor: string }
+    >,
+    APICall,
+  ]
 > {
   const parsed = safeParse(
     request,
@@ -61,7 +94,7 @@ export async function accountListBasins(
     "Input validation failed",
   );
   if (!parsed.ok) {
-    return haltIterator(parsed);
+    return [haltIterator(parsed), { status: "invalid" }];
   }
   const payload = parsed.value;
   const body = null;
@@ -83,6 +116,7 @@ export async function accountListBasins(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "list_basins",
     oAuth2Scopes: [],
 
@@ -106,7 +140,7 @@ export async function accountListBasins(
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
-    return haltIterator(requestRes);
+    return [haltIterator(requestRes), { status: "invalid" }];
   }
   const req = requestRes.value;
 
@@ -117,7 +151,7 @@ export async function accountListBasins(
     retryCodes: context.retryCodes,
   });
   if (!doResult.ok) {
-    return haltIterator(doResult);
+    return [haltIterator(doResult), { status: "request-error", request: req }];
   }
   const response = doResult.value;
 
@@ -146,7 +180,11 @@ export async function accountListBasins(
     M.fail("5XX"),
   )(response, { extraFields: responseFields });
   if (!result.ok) {
-    return haltIterator(result);
+    return [haltIterator(result), {
+      status: "complete",
+      request: req,
+      response,
+    }];
   }
 
   const nextFunc = (
@@ -169,8 +207,9 @@ export async function accountListBasins(
     >;
     "~next"?: { cursor: string };
   } => {
-    const nextCursor = jp.value(responseData, "$.basins[(@.length-1)].name");
-    if (nextCursor == null) {
+    const nextCursor =
+      jpQuery(responseData as JsonValue, "$.basins[-1].name")[0];
+    if (typeof nextCursor !== "string") {
       return { next: () => null };
     }
 
@@ -188,5 +227,9 @@ export async function accountListBasins(
   };
 
   const page = { ...result, ...nextFunc(raw) };
-  return { ...page, ...createPageIterator(page, (v) => !v.ok) };
+  return [{ ...page, ...createPageIterator(page, (v) => !v.ok) }, {
+    status: "complete",
+    request: req,
+    response,
+  }];
 }