@novu/api 0.6.2 → 1.0.0

package/src/funcs/{topicsSubscribersRemove.ts → topicsSubscriptionsDelete.ts}

@@ -26,20 +26,18 @@ import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
 /**
- * Subscribers removal
- *
- * @remarks
- * Remove subscribers from a topic
+ * Delete topic subscriptions
  */
-export function topicsSubscribersRemove(
+export function topicsSubscriptionsDelete(
   client: NovuCore,
-  removeSubscribersRequestDto: components.RemoveSubscribersRequestDto,
+  deleteTopicSubscriptionsRequestDto:
+    components.DeleteTopicSubscriptionsRequestDto,
   topicKey: string,
   idempotencyKey?: string | undefined,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.TopicsControllerRemoveSubscribersResponse | undefined,
+    operations.TopicsControllerDeleteTopicSubscriptionsResponse,
     | errors.ErrorDto
     | errors.ErrorDto
     | errors.ValidationErrorDto
@@ -55,7 +53,7 @@ export function topicsSubscribersRemove(
 > {
   return new APIPromise($do(
     client,
-    removeSubscribersRequestDto,
+    deleteTopicSubscriptionsRequestDto,
     topicKey,
     idempotencyKey,
     options,
@@ -64,14 +62,15 @@ export function topicsSubscribersRemove(
 
 async function $do(
   client: NovuCore,
-  removeSubscribersRequestDto: components.RemoveSubscribersRequestDto,
+  deleteTopicSubscriptionsRequestDto:
+    components.DeleteTopicSubscriptionsRequestDto,
   topicKey: string,
   idempotencyKey?: string | undefined,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
-      operations.TopicsControllerRemoveSubscribersResponse | undefined,
+      operations.TopicsControllerDeleteTopicSubscriptionsResponse,
       | errors.ErrorDto
       | errors.ErrorDto
       | errors.ValidationErrorDto
@@ -87,8 +86,8 @@ async function $do(
     APICall,
   ]
 > {
-  const input: operations.TopicsControllerRemoveSubscribersRequest = {
-    removeSubscribersRequestDto: removeSubscribersRequestDto,
+  const input: operations.TopicsControllerDeleteTopicSubscriptionsRequest = {
+    deleteTopicSubscriptionsRequestDto: deleteTopicSubscriptionsRequestDto,
     topicKey: topicKey,
     idempotencyKey: idempotencyKey,
   };
@@ -96,16 +95,15 @@ async function $do(
   const parsed = safeParse(
     input,
     (value) =>
-      operations.TopicsControllerRemoveSubscribersRequest$outboundSchema.parse(
-        value,
-      ),
+      operations.TopicsControllerDeleteTopicSubscriptionsRequest$outboundSchema
+        .parse(value),
     "Input validation failed",
   );
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
-  const body = encodeJSON("body", payload.RemoveSubscribersRequestDto, {
+  const body = encodeJSON("body", payload.DeleteTopicSubscriptionsRequestDto, {
     explode: true,
   });
 
@@ -116,9 +114,7 @@ async function $do(
     }),
   };
 
-  const path = pathToFunc("/v1/topics/{topicKey}/subscribers/removal")(
-    pathParams,
-  );
+  const path = pathToFunc("/v2/topics/{topicKey}/subscriptions")(pathParams);
 
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
@@ -136,7 +132,7 @@ async function $do(
 
   const context = {
     baseURL: options?.serverURL ?? client._baseURL ?? "",
-    operationID: "TopicsController_removeSubscribers",
+    operationID: "TopicsController_deleteTopicSubscriptions",
     oAuth2Scopes: [],
 
     resolvedSecurity: requestSecurity,
@@ -160,7 +156,7 @@ async function $do(
 
   const requestRes = client._createRequest(context, {
     security: requestSecurity,
-    method: "POST",
+    method: "DELETE",
     baseURL: options?.serverURL,
     path: path,
     headers: headers,
@@ -204,7 +200,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.TopicsControllerRemoveSubscribersResponse | undefined,
+    operations.TopicsControllerDeleteTopicSubscriptionsResponse,
     | errors.ErrorDto
     | errors.ErrorDto
     | errors.ValidationErrorDto
@@ -217,11 +213,10 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.nil(
-      204,
-      operations.TopicsControllerRemoveSubscribersResponse$inboundSchema
-        .optional(),
-      { hdrs: true },
+    M.json(
+      200,
+      operations.TopicsControllerDeleteTopicSubscriptionsResponse$inboundSchema,
+      { hdrs: true, key: "Result" },
     ),
     M.jsonErr(414, errors.ErrorDto$inboundSchema),
     M.jsonErr(

package/src/funcs/topicsSubscriptionsList.ts

@@ -0,0 +1,232 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { NovuCore } from "../core.js";
+import { encodeFormQuery, 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 {
+  ConnectionError,
+  InvalidRequestError,
+  RequestAbortedError,
+  RequestTimeoutError,
+  UnexpectedClientError,
+} from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
+import { SDKError } from "../models/errors/sdkerror.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";
+
+/**
+ * List topic subscriptions
+ */
+export function topicsSubscriptionsList(
+  client: NovuCore,
+  request: operations.TopicsControllerListTopicSubscriptionsRequest,
+  options?: RequestOptions,
+): APIPromise<
+  Result<
+    operations.TopicsControllerListTopicSubscriptionsResponse,
+    | errors.ErrorDto
+    | errors.ErrorDto
+    | errors.ValidationErrorDto
+    | errors.ErrorDto
+    | SDKError
+    | SDKValidationError
+    | UnexpectedClientError
+    | InvalidRequestError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | ConnectionError
+  >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: NovuCore,
+  request: operations.TopicsControllerListTopicSubscriptionsRequest,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      operations.TopicsControllerListTopicSubscriptionsResponse,
+      | errors.ErrorDto
+      | errors.ErrorDto
+      | errors.ValidationErrorDto
+      | errors.ErrorDto
+      | SDKError
+      | SDKValidationError
+      | UnexpectedClientError
+      | InvalidRequestError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | ConnectionError
+    >,
+    APICall,
+  ]
+> {
+  const parsed = safeParse(
+    request,
+    (value) =>
+      operations.TopicsControllerListTopicSubscriptionsRequest$outboundSchema
+        .parse(value),
+    "Input validation failed",
+  );
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = null;
+
+  const pathParams = {
+    topicKey: encodeSimple("topicKey", payload.topicKey, {
+      explode: false,
+      charEncoding: "percent",
+    }),
+  };
+
+  const path = pathToFunc("/v2/topics/{topicKey}/subscriptions")(pathParams);
+
+  const query = encodeFormQuery({
+    "after": payload.after,
+    "before": payload.before,
+    "includeCursor": payload.includeCursor,
+    "limit": payload.limit,
+    "orderBy": payload.orderBy,
+    "orderDirection": payload.orderDirection,
+    "subscriberId": payload.subscriberId,
+  });
+
+  const headers = new Headers(compactMap({
+    Accept: "application/json",
+    "idempotency-key": encodeSimple(
+      "idempotency-key",
+      payload["idempotency-key"],
+      { explode: false, charEncoding: "none" },
+    ),
+  }));
+
+  const secConfig = await extractSecurity(client._options.secretKey);
+  const securityInput = secConfig == null ? {} : { secretKey: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+
+  const context = {
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "TopicsController_listTopicSubscriptions",
+    oAuth2Scopes: [],
+
+    resolvedSecurity: requestSecurity,
+
+    securitySource: client._options.secretKey,
+    retryConfig: options?.retries
+      || client._options.retryConfig
+      || {
+        strategy: "backoff",
+        backoff: {
+          initialInterval: 1000,
+          maxInterval: 30000,
+          exponent: 1.5,
+          maxElapsedTime: 3600000,
+        },
+        retryConnectionErrors: true,
+      }
+      || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["408", "409", "429", "5XX"],
+  };
+
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "GET",
+    baseURL: options?.serverURL,
+    path: path,
+    headers: headers,
+    query: query,
+    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",
+      "403",
+      "404",
+      "405",
+      "409",
+      "413",
+      "414",
+      "415",
+      "422",
+      "429",
+      "4XX",
+      "500",
+      "503",
+      "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<
+    operations.TopicsControllerListTopicSubscriptionsResponse,
+    | errors.ErrorDto
+    | errors.ErrorDto
+    | errors.ValidationErrorDto
+    | errors.ErrorDto
+    | SDKError
+    | SDKValidationError
+    | UnexpectedClientError
+    | InvalidRequestError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | ConnectionError
+  >(
+    M.json(
+      200,
+      operations.TopicsControllerListTopicSubscriptionsResponse$inboundSchema,
+      { hdrs: true, key: "Result" },
+    ),
+    M.jsonErr(414, errors.ErrorDto$inboundSchema),
+    M.jsonErr(
+      [400, 401, 403, 404, 405, 409, 413, 415],
+      errors.ErrorDto$inboundSchema,
+      { hdrs: true },
+    ),
+    M.jsonErr(422, errors.ValidationErrorDto$inboundSchema, { hdrs: true }),
+    M.fail(429),
+    M.jsonErr(500, errors.ErrorDto$inboundSchema, { hdrs: true }),
+    M.fail(503),
+    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/funcs/{topicsRename.ts → topicsUpdate.ts}

@@ -26,20 +26,17 @@ import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
 /**
- * Rename a topic
- *
- * @remarks
- * Rename a topic by providing a new name
+ * Update topic by key
  */
-export function topicsRename(
+export function topicsUpdate(
   client: NovuCore,
-  renameTopicRequestDto: components.RenameTopicRequestDto,
+  updateTopicRequestDto: components.UpdateTopicRequestDto,
   topicKey: string,
   idempotencyKey?: string | undefined,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.TopicsControllerRenameTopicResponse,
+    operations.TopicsControllerUpdateTopicResponse,
     | errors.ErrorDto
     | errors.ErrorDto
     | errors.ValidationErrorDto
@@ -55,7 +52,7 @@ export function topicsRename(
 > {
   return new APIPromise($do(
     client,
-    renameTopicRequestDto,
+    updateTopicRequestDto,
     topicKey,
     idempotencyKey,
     options,
@@ -64,14 +61,14 @@ export function topicsRename(
 
 async function $do(
   client: NovuCore,
-  renameTopicRequestDto: components.RenameTopicRequestDto,
+  updateTopicRequestDto: components.UpdateTopicRequestDto,
   topicKey: string,
   idempotencyKey?: string | undefined,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
-      operations.TopicsControllerRenameTopicResponse,
+      operations.TopicsControllerUpdateTopicResponse,
       | errors.ErrorDto
       | errors.ErrorDto
       | errors.ValidationErrorDto
@@ -87,8 +84,8 @@ async function $do(
     APICall,
   ]
 > {
-  const input: operations.TopicsControllerRenameTopicRequest = {
-    renameTopicRequestDto: renameTopicRequestDto,
+  const input: operations.TopicsControllerUpdateTopicRequest = {
+    updateTopicRequestDto: updateTopicRequestDto,
     topicKey: topicKey,
     idempotencyKey: idempotencyKey,
   };
@@ -96,14 +93,14 @@ async function $do(
   const parsed = safeParse(
     input,
     (value) =>
-      operations.TopicsControllerRenameTopicRequest$outboundSchema.parse(value),
+      operations.TopicsControllerUpdateTopicRequest$outboundSchema.parse(value),
     "Input validation failed",
   );
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
-  const body = encodeJSON("body", payload.RenameTopicRequestDto, {
+  const body = encodeJSON("body", payload.UpdateTopicRequestDto, {
     explode: true,
   });
 
@@ -114,7 +111,7 @@ async function $do(
     }),
   };
 
-  const path = pathToFunc("/v1/topics/{topicKey}")(pathParams);
+  const path = pathToFunc("/v2/topics/{topicKey}")(pathParams);
 
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
@@ -132,7 +129,7 @@ async function $do(
 
   const context = {
     baseURL: options?.serverURL ?? client._baseURL ?? "",
-    operationID: "TopicsController_renameTopic",
+    operationID: "TopicsController_updateTopic",
     oAuth2Scopes: [],
 
     resolvedSecurity: requestSecurity,
@@ -200,7 +197,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.TopicsControllerRenameTopicResponse,
+    operations.TopicsControllerUpdateTopicResponse,
     | errors.ErrorDto
     | errors.ErrorDto
     | errors.ValidationErrorDto
@@ -213,7 +210,7 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.TopicsControllerRenameTopicResponse$inboundSchema, {
+    M.json(200, operations.TopicsControllerUpdateTopicResponse$inboundSchema, {
       hdrs: true,
       key: "Result",
     }),

package/src/lib/config.ts

@@ -54,8 +54,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 
 export const SDK_METADATA = {
   language: "typescript",
-  openapiDocVersion: "1.0",
-  sdkVersion: "0.6.2",
-  genVersion: "2.563.1",
-  userAgent: "speakeasy-sdk/typescript 0.6.2 2.563.1 1.0 @novu/api",
+  openapiDocVersion: "2.1.13",
+  sdkVersion: "1.0.0",
+  genVersion: "2.599.0",
+  userAgent: "speakeasy-sdk/typescript 1.0.0 2.599.0 2.1.13 @novu/api",
 } as const;

package/src/lib/matchers.ts

@@ -10,6 +10,7 @@ import { isPlainObject } from "./is-plain-object.js";
 import { safeParse } from "./schemas.js";
 
 export type Encoding =
+  | "jsonl"
   | "json"
   | "text"
   | "bytes"
@@ -19,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",
@@ -72,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>,
@@ -204,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;

package/src/lib/sdks.ts

@@ -46,12 +46,14 @@ export type RequestOptions = {
    */
   serverURL?: string | URL;
   /**
+   * @deprecated `fetchOptions` has been flattened into `RequestOptions`.
+   *
    * Sets various request options on the `fetch` call made by an SDK method.
    *
    * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options|Request}
    */
   fetchOptions?: Omit<RequestInit, "method" | "body">;
-};
+} & Omit<RequestInit, "method" | "body">;
 
 type RequestConfig = {
   method: string;
@@ -168,7 +170,9 @@ export class ClientSDK {
     cookie = cookie.startsWith("; ") ? cookie.slice(2) : cookie;
     headers.set("cookie", cookie);
 
-    const userHeaders = new Headers(options?.fetchOptions?.headers);
+    const userHeaders = new Headers(
+      options?.headers ?? options?.fetchOptions?.headers,
+    );
     for (const [k, v] of userHeaders) {
       headers.set(k, v);
     }
@@ -179,20 +183,16 @@ export class ClientSDK {
       headers.set(conf.uaHeader ?? "user-agent", SDK_METADATA.userAgent);
     }
 
-    let fetchOptions = options?.fetchOptions;
+    const fetchOptions: Omit<RequestInit, "method" | "body"> = {
+      ...options?.fetchOptions,
+      ...options,
+    };
     if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
       const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
-      if (!fetchOptions) {
-        fetchOptions = { signal: timeoutSignal };
-      } else {
-        fetchOptions.signal = timeoutSignal;
-      }
+      fetchOptions.signal = timeoutSignal;
     }
 
     if (conf.body instanceof ReadableStream) {
-      if (!fetchOptions) {
-        fetchOptions = {};
-      }
       Object.assign(fetchOptions, { duplex: "half" });
     }
 
@@ -298,7 +298,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;
@@ -364,9 +366,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.6.2",
+    currentVersion: "1.0.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;
     }