@greensecurity/javascript-sdk 0.35.55 → 0.36.2

package/src/funcs/zonesSecurityZoneCheckin.ts

@@ -10,7 +10,7 @@ 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 { GreenSecurityError } from "../models/errors/greensecurityerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -19,6 +19,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -38,13 +39,14 @@ export function zonesSecurityZoneCheckin(
   Result<
     operations.SecurityZoneCheckinResponseBody,
     | errors.ApiErrorResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | GreenSecurityError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -63,13 +65,14 @@ async function $do(
     Result<
       operations.SecurityZoneCheckinResponseBody,
       | errors.ApiErrorResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | GreenSecurityError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -144,20 +147,21 @@ async function $do(
   const [result] = await M.match<
     operations.SecurityZoneCheckinResponseBody,
     | errors.ApiErrorResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | GreenSecurityError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.SecurityZoneCheckinResponseBody$inboundSchema),
     M.jsonErr([400, 401, 403, 404], errors.ApiErrorResponse$inboundSchema),
     M.jsonErr(500, errors.ApiErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/lib/config.ts

@@ -80,8 +80,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "0.0.3",
-  sdkVersion: "0.35.55",
-  genVersion: "2.620.2",
+  sdkVersion: "0.36.2",
+  genVersion: "2.638.5",
   userAgent:
-    "speakeasy-sdk/typescript 0.35.55 2.620.2 0.0.3 @greensecurity/javascript-sdk",
+    "speakeasy-sdk/typescript 0.36.2 2.638.5 0.0.3 @greensecurity/javascript-sdk",
 } as const;

package/src/lib/files.ts

@@ -38,3 +38,45 @@ export async function readableStreamToArrayBuffer(
 
   return concatenatedChunks.buffer as ArrayBuffer;
 }
+
+/**
+ * Determines the MIME content type based on a file's extension.
+ * Returns null if the extension is not recognized.
+ */
+export function getContentTypeFromFileName(fileName: string): string | null {
+  if (!fileName) return null;
+
+  const ext = fileName.toLowerCase().split(".").pop();
+  if (!ext) return null;
+
+  const mimeTypes: Record<string, string> = {
+    json: "application/json",
+    xml: "application/xml",
+    html: "text/html",
+    htm: "text/html",
+    txt: "text/plain",
+    csv: "text/csv",
+    pdf: "application/pdf",
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    gif: "image/gif",
+    svg: "image/svg+xml",
+    js: "application/javascript",
+    css: "text/css",
+    zip: "application/zip",
+    tar: "application/x-tar",
+    gz: "application/gzip",
+    mp4: "video/mp4",
+    mp3: "audio/mpeg",
+    wav: "audio/wav",
+    webp: "image/webp",
+    ico: "image/x-icon",
+    woff: "font/woff",
+    woff2: "font/woff2",
+    ttf: "font/ttf",
+    otf: "font/otf",
+  };
+
+  return mimeTypes[ext] || null;
+}

package/src/lib/matchers.ts

@@ -3,11 +3,10 @@
  */
 
 import { APIError } from "../models/errors/apierror.js";
-import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { Result } from "../types/fp.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
+import { ERR, OK, Result } from "../types/fp.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
-import { safeParse } from "./schemas.js";
 
 export type Encoding =
   | "jsonl"
@@ -176,17 +175,19 @@ export type MatchedError<Matchers> = Matchers extends Matcher<any, infer E>[]
   : never;
 export type MatchFunc<T, E> = (
   response: Response,
+  request: Request,
   options?: { resultKey?: string; extraFields?: Record<string, unknown> },
 ) => Promise<[result: Result<T, E>, raw: unknown]>;
 
 export function match<T, E>(
   ...matchers: Array<Matcher<T, E>>
-): MatchFunc<T, E | APIError | SDKValidationError> {
+): MatchFunc<T, E | APIError | ResponseValidationError> {
   return async function matchFunc(
     response: Response,
+    request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
-    [result: Result<T, E | APIError | SDKValidationError>, raw: unknown]
+    [result: Result<T, E | APIError | ResponseValidationError>, raw: unknown]
   > {
     let raw: unknown;
     let matcher: Matcher<T, E> | undefined;
@@ -205,21 +206,22 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      const responseBody = await response.text();
       return [{
         ok: false,
-        error: new APIError(
-          "Unexpected API response status or content-type",
+        error: new APIError("Unexpected Status or Content-Type", {
           response,
-          responseBody,
-        ),
-      }, responseBody];
+          request,
+          body: await response.text().catch(() => ""),
+        }),
+      }, raw];
     }
 
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
         break;
       case "jsonl":
         raw = response.body;
@@ -231,16 +233,19 @@ export function match<T, E>(
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
         raw = response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       default:
         encoding satisfies never;
@@ -250,11 +255,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new APIError(
-          "API error occurred",
-          response,
-          typeof raw === "string" ? raw : "",
-        ),
+        error: new APIError("API error occurred", { request, response, body }),
       }, raw];
     }
 
@@ -266,6 +267,9 @@ export function match<T, E>(
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         ...(isPlainObject(raw) ? raw : null),
+        request$: request,
+        response$: response,
+        body$: body,
       };
     } else if (resultKey) {
       data = {
@@ -284,18 +288,20 @@ export function match<T, E>(
     }
 
     if ("err" in matcher) {
-      const result = safeParse(
+      const result = safeParseResponse(
         data,
         (v: unknown) => matcher.schema.parse(v),
         "Response validation failed",
+        { request, response, body },
       );
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(
+        safeParseResponse(
           data,
           (v: unknown) => matcher.schema.parse(v),
           "Response validation failed",
+          { request, response, body },
         ),
         raw,
       ];
@@ -318,25 +324,22 @@ export function unpackHeaders(headers: Headers): Record<string, string[]> {
   return out;
 }
 
-/**
- * Discards the response body to free up resources.
- *
- * To learn why this is need, see the undici docs:
- * https://undici.nodejs.org/#/?id=garbage-collection
- */
-export async function discardResponseBody(res: Response) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
-
+function safeParseResponse<Inp, Out>(
+  rawValue: Inp,
+  fn: (value: Inp) => Out,
+  errorMessage: string,
+  httpMeta: { response: Response; request: Request; body: string },
+): Result<Out, ResponseValidationError> {
   try {
-    let done = false;
-    while (!done) {
-      const res = await reader.read();
-      done = res.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK(fn(rawValue));
+  } catch (err) {
+    return ERR(
+      new ResponseValidationError(errorMessage, {
+        cause: err,
+        rawValue,
+        rawMessage: errorMessage,
+        ...httpMeta,
+      }),
+    );
   }
 }

package/src/lib/security.ts

@@ -7,8 +7,8 @@ import { env } from "./env.js";
 
 type OAuth2PasswordFlow = {
   username: string;
-  password?: string | undefined;
-  clientID: string;
+  password: string;
+  clientID?: string | undefined;
   clientSecret?: string | undefined;
   tokenURL: string;
 };

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

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

package/src/mcp-server/server.ts

@@ -31,6 +31,7 @@ import { tool$usersMagiclink } from "./tools/usersMagiclink.js";
 import { tool$usersPassword } from "./tools/usersPassword.js";
 import { tool$usersPasswordResetRequest } from "./tools/usersPasswordResetRequest.js";
 import { tool$usersPostAuthenticate } from "./tools/usersPostAuthenticate.js";
+import { tool$usersRotateApiKey } from "./tools/usersRotateApiKey.js";
 import { tool$vendorsAcceptVendorCredential } from "./tools/vendorsAcceptVendorCredential.js";
 import { tool$vendorsAddVendorCredentialFile } from "./tools/vendorsAddVendorCredentialFile.js";
 import { tool$vendorsAddVendorManagedByCompany } from "./tools/vendorsAddVendorManagedByCompany.js";
@@ -87,7 +88,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "GreenSecurity",
-    version: "0.35.55",
+    version: "0.36.2",
   });
 
   const client = new GreenSecurityCore({
@@ -158,6 +159,7 @@ export function createMCPServer(deps: {
   tool(tool$usersGetCurrentUser);
   tool(tool$usersGetUserById);
   tool(tool$usersPostAuthenticate);
+  tool(tool$usersRotateApiKey);
   tool(tool$usersMagiclink);
   tool(tool$usersPasswordResetRequest);
   tool(tool$usersPassword);

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

@@ -0,0 +1,30 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { usersRotateApiKey } from "../../funcs/usersRotateApiKey.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+export const tool$usersRotateApiKey: ToolDefinition = {
+  name: "users-rotate-api-key",
+  description: `Rotate API key
+
+Allows an API user to rotate their own API key. Note, the key rotation happens immediately so the user should be prepared to update their API key in their application for all subsequent requests.`,
+  tool: async (client, ctx) => {
+    const [result, apiCall] = await usersRotateApiKey(
+      client,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

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

@@ -14,7 +14,13 @@ export const tool$zonesGetSecurityZone: ToolDefinition<typeof args> = {
   name: "zones-get-security-zone",
   description: `Get security zone details
 
-Get security zone details`,
+Get security zone details
+
+Available \`expand\` scopes are:
+
+- zone.facility
+- zone.department
+- zone.rules`,
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await zonesGetSecurityZone(

package/src/models/components/expand.ts

@@ -76,6 +76,9 @@ export const Expand = {
     "vendor_credential_data_request.vendor_credential",
   VendorCredentialDataRequestDataRequest:
     "vendor_credential_data_request.data_request",
+  ZoneFacility: "zone.facility",
+  ZoneDepartment: "zone.department",
+  ZoneRules: "zone.rules",
 } as const;
 /**
  * An expansion scope that is valid for the object being requested.

package/src/models/components/invoice.ts

@@ -28,6 +28,7 @@ export type Invoice = {
   invoiceNumber?: string | null | undefined;
   trackingNumber?: string | null | undefined;
   dateProcessed?: string | null | undefined;
+  dateDue?: string | null | undefined;
   amount?: number | null | undefined;
   status?: string | null | undefined;
   financialStatus?: string | null | undefined;
@@ -47,6 +48,7 @@ export const Invoice$inboundSchema: z.ZodType<Invoice, z.ZodTypeDef, unknown> =
     invoice_number: z.nullable(z.string()).optional(),
     tracking_number: z.nullable(z.string()).optional(),
     date_processed: z.nullable(z.string()).optional(),
+    date_due: z.nullable(z.string()).optional(),
     amount: z.nullable(z.number().int()).optional(),
     status: z.nullable(z.string()).optional(),
     financial_status: z.nullable(z.string()).optional(),
@@ -64,6 +66,7 @@ export const Invoice$inboundSchema: z.ZodType<Invoice, z.ZodTypeDef, unknown> =
       "invoice_number": "invoiceNumber",
       "tracking_number": "trackingNumber",
       "date_processed": "dateProcessed",
+      "date_due": "dateDue",
       "financial_status": "financialStatus",
       "amount_not_paid": "amountNotPaid",
       "convenience_fee": "convenienceFee",
@@ -76,6 +79,7 @@ export type Invoice$Outbound = {
   invoice_number?: string | null | undefined;
   tracking_number?: string | null | undefined;
   date_processed?: string | null | undefined;
+  date_due?: string | null | undefined;
   amount?: number | null | undefined;
   status?: string | null | undefined;
   financial_status?: string | null | undefined;
@@ -98,6 +102,7 @@ export const Invoice$outboundSchema: z.ZodType<
   invoiceNumber: z.nullable(z.string()).optional(),
   trackingNumber: z.nullable(z.string()).optional(),
   dateProcessed: z.nullable(z.string()).optional(),
+  dateDue: z.nullable(z.string()).optional(),
   amount: z.nullable(z.number().int()).optional(),
   status: z.nullable(z.string()).optional(),
   financialStatus: z.nullable(z.string()).optional(),
@@ -114,6 +119,7 @@ export const Invoice$outboundSchema: z.ZodType<
     invoiceNumber: "invoice_number",
     trackingNumber: "tracking_number",
     dateProcessed: "date_processed",
+    dateDue: "date_due",
     financialStatus: "financial_status",
     amountNotPaid: "amount_not_paid",
     convenienceFee: "convenience_fee",

package/src/models/components/vendorfacilitystatusview.ts

@@ -18,6 +18,7 @@ export type VendorFacilityStatusView = {
   facilityStatus?: string | null | undefined;
   vendorScanId?: number | null | undefined;
   vendorScanType?: number | null | undefined;
+  dateScanned?: string | null | undefined;
 };
 
 /** @internal */
@@ -32,6 +33,7 @@ export const VendorFacilityStatusView$inboundSchema: z.ZodType<
   facility_status: z.nullable(z.string()).optional(),
   vendor_scan_id: z.nullable(z.number().int()).optional(),
   vendor_scan_type: z.nullable(z.number().int()).optional(),
+  date_scanned: z.nullable(z.string()).optional(),
 }).transform((v) => {
   return remap$(v, {
     "vendor_id": "vendorId",
@@ -40,6 +42,7 @@ export const VendorFacilityStatusView$inboundSchema: z.ZodType<
     "facility_status": "facilityStatus",
     "vendor_scan_id": "vendorScanId",
     "vendor_scan_type": "vendorScanType",
+    "date_scanned": "dateScanned",
   });
 });
 
@@ -51,6 +54,7 @@ export type VendorFacilityStatusView$Outbound = {
   facility_status?: string | null | undefined;
   vendor_scan_id?: number | null | undefined;
   vendor_scan_type?: number | null | undefined;
+  date_scanned?: string | null | undefined;
 };
 
 /** @internal */
@@ -65,6 +69,7 @@ export const VendorFacilityStatusView$outboundSchema: z.ZodType<
   facilityStatus: z.nullable(z.string()).optional(),
   vendorScanId: z.nullable(z.number().int()).optional(),
   vendorScanType: z.nullable(z.number().int()).optional(),
+  dateScanned: z.nullable(z.string()).optional(),
 }).transform((v) => {
   return remap$(v, {
     vendorId: "vendor_id",
@@ -73,6 +78,7 @@ export const VendorFacilityStatusView$outboundSchema: z.ZodType<
     facilityStatus: "facility_status",
     vendorScanId: "vendor_scan_id",
     vendorScanType: "vendor_scan_type",
+    dateScanned: "date_scanned",
   });
 });
 

package/src/models/components/zone.ts

@@ -31,7 +31,7 @@ export type Two = {
   name?: string | undefined;
 };
 
-export type ZoneFacility = Two | Facility;
+export type ZoneFacility = Facility | Two;
 
 export type ZoneDepartment = Department | number;
 
@@ -104,7 +104,7 @@ export type GpsCheckinPolicy = {
  */
 export type Zone = {
   id?: number | undefined;
-  facility?: Two | Facility | null | undefined;
+  facility?: Facility | Two | null | undefined;
   department?: Department | number | null | undefined;
   name?: string | null | undefined;
   shortName?: string | null | undefined;
@@ -173,17 +173,17 @@ export const ZoneFacility$inboundSchema: z.ZodType<
   ZoneFacility,
   z.ZodTypeDef,
   unknown
-> = z.union([z.lazy(() => Two$inboundSchema), Facility$inboundSchema]);
+> = z.union([Facility$inboundSchema, z.lazy(() => Two$inboundSchema)]);
 
 /** @internal */
-export type ZoneFacility$Outbound = Two$Outbound | Facility$Outbound;
+export type ZoneFacility$Outbound = Facility$Outbound | Two$Outbound;
 
 /** @internal */
 export const ZoneFacility$outboundSchema: z.ZodType<
   ZoneFacility$Outbound,
   z.ZodTypeDef,
   ZoneFacility
-> = z.union([z.lazy(() => Two$outboundSchema), Facility$outboundSchema]);
+> = z.union([Facility$outboundSchema, z.lazy(() => Two$outboundSchema)]);
 
 /**
  * @internal
@@ -839,7 +839,7 @@ export const Zone$inboundSchema: z.ZodType<Zone, z.ZodTypeDef, unknown> = z
   .object({
     id: z.number().int().optional(),
     facility: z.nullable(
-      z.union([z.lazy(() => Two$inboundSchema), Facility$inboundSchema]),
+      z.union([Facility$inboundSchema, z.lazy(() => Two$inboundSchema)]),
     ).optional(),
     department: z.nullable(
       z.union([Department$inboundSchema, z.number().int()]),
@@ -876,7 +876,7 @@ export const Zone$inboundSchema: z.ZodType<Zone, z.ZodTypeDef, unknown> = z
 /** @internal */
 export type Zone$Outbound = {
   id?: number | undefined;
-  facility?: Two$Outbound | Facility$Outbound | null | undefined;
+  facility?: Facility$Outbound | Two$Outbound | null | undefined;
   department?: Department$Outbound | number | null | undefined;
   name?: string | null | undefined;
   short_name?: string | null | undefined;
@@ -898,7 +898,7 @@ export const Zone$outboundSchema: z.ZodType<Zone$Outbound, z.ZodTypeDef, Zone> =
   z.object({
     id: z.number().int().optional(),
     facility: z.nullable(
-      z.union([z.lazy(() => Two$outboundSchema), Facility$outboundSchema]),
+      z.union([Facility$outboundSchema, z.lazy(() => Two$outboundSchema)]),
     ).optional(),
     department: z.nullable(
       z.union([Department$outboundSchema, z.number().int()]),

package/src/models/errors/apierror.ts

@@ -2,41 +2,33 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-export class APIError extends Error {
-  /**
-   * HTTP status code
-   */
-  public readonly statusCode: number;
-  /**
-   * HTTP content type
-   */
-  public readonly contentType: string;
-  /**
-   * HTTP body
-   */
-  public readonly body: string;
-  /**
-   * Raw response
-   */
-  public readonly rawResponse: Response;
+import { GreenSecurityError } from "./greensecurityerror.js";
 
+/** The fallback error class if no more specific error class is matched */
+export class APIError extends GreenSecurityError {
   constructor(
     message: string,
-    rawResponse: Response,
-    body: string = "",
+    httpMeta: {
+      response: Response;
+      request: Request;
+      body: string;
+    },
   ) {
-    const statusCode = rawResponse.status;
-    const contentType = rawResponse.headers.get("content-type") || "";
-    const bodyString = body.length > 0 ? `\n${body}` : "";
-    super(
-      `${message}: Status ${statusCode} Content-Type ${contentType} Body ${bodyString}`,
-    );
-
-    this.body = body;
-    this.rawResponse = rawResponse;
-    this.statusCode = statusCode;
-    this.contentType = contentType;
-
+    if (message) {
+      message += `: `;
+    }
+    message += `Status ${httpMeta.response.status}`;
+    const contentType = httpMeta.response.headers.get("content-type") || `""`;
+    if (contentType !== "application/json") {
+      message += ` Content-Type ${
+        contentType.includes(" ") ? `"${contentType}"` : contentType
+      }`;
+    }
+    const body = httpMeta.body || `""`;
+    message += body.length > 100 ? "\n" : " ";
+    message += `Body ${body}`;
+    message = message.trim();
+    super(message, httpMeta);
     this.name = "APIError";
   }
 }