@alienplatform/manager-api 3.3.0 → 3.3.2

package/src/funcs/{credentialsResolveCredentials.ts → syncRenew.ts}

@@ -2,9 +2,9 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
+import * as z from "zod/v4";
 import { AlienManagerCore } from "../core.js";
 import { encodeJSON } from "../lib/encodings.js";
-import { matchStatusCode } from "../lib/http.js";
 import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
@@ -25,13 +25,16 @@ import * as models from "../models/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
-export function credentialsResolveCredentials(
+/**
+ * Renew an acquired deployment lease without writing deployment state.
+ */
+export function syncRenew(
   client: AlienManagerCore,
-  request: models.ResolveCredentialsRequest,
+  request: models.RenewRequest,
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    models.ResolveCredentialsResponse,
+    void,
     | AlienManagerError
     | ResponseValidationError
     | ConnectionError
@@ -51,12 +54,12 @@ export function credentialsResolveCredentials(
 
 async function $do(
   client: AlienManagerCore,
-  request: models.ResolveCredentialsRequest,
+  request: models.RenewRequest,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
-      models.ResolveCredentialsResponse,
+      void,
       | AlienManagerError
       | ResponseValidationError
       | ConnectionError
@@ -71,7 +74,7 @@ async function $do(
 > {
   const parsed = safeParse(
     request,
-    (value) => models.ResolveCredentialsRequest$outboundSchema.parse(value),
+    (value) => models.RenewRequest$outboundSchema.parse(value),
     "Input validation failed",
   );
   if (!parsed.ok) {
@@ -80,11 +83,11 @@ async function $do(
   const payload = parsed.value;
   const body = encodeJSON("body", payload, { explode: true });
 
-  const path = pathToFunc("/v1/resolve-credentials")();
+  const path = pathToFunc("/v1/sync/renew")();
 
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
-    Accept: "application/json",
+    Accept: "*/*",
   }));
 
   const secConfig = await extractSecurity(client._options.bearer);
@@ -94,7 +97,7 @@ async function $do(
   const context = {
     options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
-    operationID: "resolve_credentials",
+    operationID: "renew",
     oAuth2Scopes: null,
 
     resolvedSecurity: requestSecurity,
@@ -123,8 +126,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    isErrorStatusCode: (statusCode: number) =>
-      matchStatusCode({ status: statusCode } as Response, ["4XX", "5XX"]),
+    errorCodes: ["4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -134,7 +136,7 @@ async function $do(
   const response = doResult.value;
 
   const [result] = await M.match<
-    models.ResolveCredentialsResponse,
+    void,
     | AlienManagerError
     | ResponseValidationError
     | ConnectionError
@@ -144,7 +146,7 @@ async function $do(
     | UnexpectedClientError
     | SDKValidationError
   >(
-    M.json(200, models.ResolveCredentialsResponse$inboundSchema),
+    M.nil(200, z.void()),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, req);

package/src/funcs/whoamiWhoami.ts

@@ -3,7 +3,6 @@
  */
 
 import { AlienManagerCore } from "../core.js";
-import { matchStatusCode } from "../lib/http.js";
 import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { RequestOptions } from "../lib/sdks.js";
@@ -105,8 +104,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    isErrorStatusCode: (statusCode: number) =>
-      matchStatusCode({ status: statusCode } as Response, ["4XX", "5XX"]),
+    errorCodes: ["4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });

package/src/hooks/types.ts

@@ -15,7 +15,6 @@ export type HookContext = {
   retryConfig: RetryConfig;
   resolvedSecurity: SecurityState | null;
   options: SDKOptions;
-  timeoutMs?: number;
 };
 
 export type Awaitable<T> = T | Promise<T>;

package/src/lib/config.ts

@@ -5,12 +5,23 @@
 import { HTTPClient } from "./http.js";
 import { Logger } from "./logger.js";
 import { RetryConfig } from "./retries.js";
-import { pathToFunc } from "./url.js";
+import { Params, pathToFunc } from "./url.js";
+
+/**
+ * Contains the list of servers available to the SDK
+ */
+export const ServerList = [
+  "/",
+] as const;
 
 export type SDKOptions = {
   bearer?: string | (() => Promise<string>) | undefined;
 
   httpClient?: HTTPClient;
+  /**
+   * Allows overriding the default server used by the SDK
+   */
+  serverIdx?: number | undefined;
   /**
    * Specifies the server URL to be used by the SDK
    */
@@ -28,14 +39,18 @@ export type SDKOptions = {
 };
 
 export function serverURLFromOptions(options: SDKOptions): URL | null {
-  const serverURL = options.serverURL;
+  let serverURL = options.serverURL;
+
+  const params: Params = {};
 
   if (!serverURL) {
-    return null;
+    const serverIdx = options.serverIdx ?? 0;
+    if (serverIdx < 0 || serverIdx >= ServerList.length) {
+      throw new Error(`Invalid server index ${serverIdx}`);
+    }
+    serverURL = ServerList[serverIdx] || "";
   }
 
-  const params: Record<string, string | undefined> = {};
-
   const u = pathToFunc(serverURL)(params);
   return new URL(u);
 }
@@ -43,8 +58,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "1.15.0",
-  genVersion: "2.918.1",
+  sdkVersion: "3.3.2",
+  genVersion: "2.788.15",
   userAgent:
-    "speakeasy-sdk/typescript 1.15.0 2.918.1 1.0.0 @alienplatform/manager-api",
+    "speakeasy-sdk/typescript 3.3.2 2.788.15 1.0.0 @alienplatform/manager-api",
 } as const;

package/src/lib/dlv.ts

@@ -0,0 +1,53 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+/*
+MIT License
+
+Copyright (c) 2024 Jason Miller <jason@developit.ca> (http://jasonformat.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/**
+ * @param obj The object to walk
+ * @param key The key path to walk the object with
+ * @param def A default value to return if the result is undefined
+ *
+ * @example
+ * dlv(obj, "a.b.c.d")
+ * @example
+ * dlv(object, ["a", "b", "c", "d"])
+ * @example
+ * dlv(object, "foo.bar.baz", "Hello, default value!")
+ */
+export function dlv<T = any>(
+  obj: any,
+  key: string | string[],
+  def?: T,
+  p?: number,
+  undef?: never,
+): T | undefined {
+  key = Array.isArray(key) ? key : key.split(".");
+  for (p = 0; p < key.length; p++) {
+    const k = key[p];
+    obj = k != null && obj ? obj[k] : undef;
+  }
+  return obj === undef ? def : obj;
+}

package/src/lib/encodings.ts

@@ -3,7 +3,7 @@
  */
 
 import { bytesToBase64 } from "./base64.js";
-import { isPlainObject } from "./primitives.js";
+import { isPlainObject } from "./is-plain-object.js";
 
 export class EncodingError extends Error {
   constructor(message: string) {
@@ -479,23 +479,6 @@ export const encodeSpaceDelimitedQuery = queryEncoder(encodeSpaceDelimited);
 export const encodePipeDelimitedQuery = queryEncoder(encodePipeDelimited);
 export const encodeDeepObjectQuery = queryEncoder(encodeDeepObject);
 
-function isBlobLike(val: unknown): val is Blob {
-  if (val instanceof Blob) {
-    return true;
-  }
-
-  if (typeof val !== "object" || val == null || !(Symbol.toStringTag in val)) {
-    return false;
-  }
-
-  const tag = val[Symbol.toStringTag];
-  if (tag !== "Blob" && tag !== "File") {
-    return false;
-  }
-
-  return "stream" in val && typeof val.stream === "function";
-}
-
 export function appendForm(
   fd: FormData,
   key: string,
@@ -504,22 +487,11 @@ export function appendForm(
 ): void {
   if (value == null) {
     return;
-  } else if (isBlobLike(value)) {
-    if (fileName) {
-      fd.append(key, value as Blob, fileName);
-    } else {
-      fd.append(key, value as Blob);
-    }
+  } else if (value instanceof Blob && fileName) {
+    fd.append(key, value, fileName);
+  } else if (value instanceof Blob) {
+    fd.append(key, value);
   } else {
     fd.append(key, String(value));
   }
 }
-
-export async function normalizeBlob(
-  value: Pick<Blob, "arrayBuffer" | "type">,
-): Promise<Blob> {
-  if (value instanceof Blob) {
-    return value;
-  }
-  return new Blob([await value.arrayBuffer()], { type: value.type });
-}

package/src/lib/env.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod/v4";
+import { dlv } from "./dlv.js";
 
 export interface Env {
   ALIEN_MANAGER_BEARER?: string | undefined;
@@ -37,16 +38,11 @@ export function env(): Env {
     return envMemo;
   }
 
-  const globals = globalThis as {
-    Deno?: { env?: { toObject?: () => Record<string, string | undefined> } };
-    process?: { env?: Record<string, string | undefined> };
-  };
-
   let envObject: Record<string, unknown> = {};
   if (isDeno()) {
-    envObject = globals.Deno?.env?.toObject?.() ?? {};
+    envObject = (globalThis as any).Deno?.env?.toObject?.() ?? {};
   } else {
-    envObject = globals.process?.env ?? {};
+    envObject = dlv(globalThis, "process.env") ?? {};
   }
 
   envMemo = envSchema.parse(envObject);

package/src/lib/files.ts

@@ -80,25 +80,3 @@ export function getContentTypeFromFileName(fileName: string): string | null {
 
   return mimeTypes[ext] || null;
 }
-
-/**
- * Creates a Blob from file content with the given MIME type.
- *
- * Node.js Buffers are Uint8Array subclasses that may share a pooled
- * ArrayBuffer (byteOffset > 0, byteLength < buffer.byteLength). Passing
- * such a Buffer directly to `new Blob([buf])` can include the entire
- * underlying pool on some runtimes, producing a Blob with extra bytes
- * that corrupts multipart uploads.
- *
- * Copying into a standalone Uint8Array ensures the Blob receives only the
- * intended bytes regardless of runtime behaviour.
- */
-export function bytesToBlob(
-  content: Uint8Array<ArrayBufferLike> | ArrayBuffer | Blob | string,
-  contentType: string,
-): Blob {
-  if (content instanceof Uint8Array) {
-    return new Blob([new Uint8Array(content)], { type: contentType });
-  }
-  return new Blob([content as BlobPart], { type: contentType });
-}

package/src/lib/http.ts

@@ -45,10 +45,8 @@ export class HTTPClient {
   private requestHooks: BeforeRequestHook[] = [];
   private requestErrorHooks: RequestErrorHook[] = [];
   private responseHooks: ResponseHook[] = [];
-  private options: HTTPClientOptions;
 
-  constructor(options: HTTPClientOptions = {}) {
-    this.options = options;
+  constructor(private options: HTTPClientOptions = {}) {
     this.fetcher = options.fetcher || DEFAULT_FETCHER;
   }
 

package/src/lib/is-plain-object.ts

@@ -0,0 +1,43 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+/*
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Taken from https://github.com/sindresorhus/is-plain-obj/blob/97f38e8836f86a642cce98fc6ab3058bc36df181/index.js
+
+export function isPlainObject(value: unknown): value is object {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+
+  const prototype = Object.getPrototypeOf(value);
+  return (
+    (prototype === null ||
+      prototype === Object.prototype ||
+      Object.getPrototypeOf(prototype) === null) &&
+    !(Symbol.toStringTag in value) &&
+    !(Symbol.iterator in value)
+  );
+}

package/src/lib/matchers.ts

@@ -6,7 +6,7 @@ import { AlienManagerDefaultError } from "../models/errors/alienmanagerdefaulter
 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 "./primitives.js";
+import { isPlainObject } from "./is-plain-object.js";
 
 export type Encoding =
   | "jsonl"
@@ -254,9 +254,8 @@ export function match<T, E>(
         raw = body;
         break;
       default:
-        throw new Error(
-          `Unsupported response type: ${encoding satisfies never}`,
-        );
+        encoding satisfies never;
+        throw new Error(`Unsupported response type: ${encoding}`);
     }
 
     if (matcher.enc === "fail") {

package/src/lib/primitives.ts

@@ -148,19 +148,3 @@ export function allRequired<V extends Record<string, unknown>>(
 
   return v as ReturnType<typeof allRequired<V>>;
 }
-
-export function isPlainObject(
-  value: unknown,
-): value is Record<string, unknown> {
-  if (value === null || typeof value !== "object") return false;
-  if (Object.prototype.toString.call(value) !== "[object Object]") return false;
-  const proto = Object.getPrototypeOf(value);
-  if (proto === null || proto === Object.prototype) return true;
-  // cross-realm plain objects (vm contexts, iframes) inherit from a
-  // different realm's Object.prototype, which itself has a null prototype
-  try {
-    return Object.getPrototypeOf(proto) === null;
-  } catch {
-    return false;
-  }
-}

package/src/lib/retries.ts

@@ -194,14 +194,6 @@ async function retryBackoff(
 }
 
 function retryIntervalFromResponse(res: Response): number {
-  const retryAfterMsVal = res.headers.get("retry-after-ms");
-  if (retryAfterMsVal) {
-    const parsedMs = Number(retryAfterMsVal);
-    if (Number.isFinite(parsedMs) && parsedMs >= 0) {
-      return parsedMs;
-    }
-  }
-
   const retryVal = res.headers.get("retry-after") || "";
   if (!retryVal) {
     return 0;

package/src/lib/sdks.ts

@@ -22,9 +22,9 @@ import {
   isConnectionError,
   isTimeoutError,
   matchContentType,
+  matchStatusCode,
 } from "./http.js";
 import { Logger } from "./logger.js";
-import { combineSignals } from "./primitives.js";
 import { retry, RetryConfig } from "./retries.js";
 import { SecurityState } from "./security.js";
 
@@ -127,60 +127,30 @@ export class ClientSDK {
     if (!base) {
       return ERR(new InvalidRequestError("No base URL provided for operation"));
     }
-    const baseURL = new URL(base);
-    let reqURL: URL;
+    const reqURL = new URL(base);
+    const inputURL = new URL(path, reqURL);
+
     if (path) {
-      baseURL.pathname = baseURL.pathname.replace(/\/+$/, "") + "/";
-      reqURL = new URL(path, baseURL);
-      if (!reqURL.search && baseURL.search) {
-        reqURL.search = baseURL.search;
-      }
-    } else {
-      reqURL = baseURL;
+      reqURL.pathname += reqURL.pathname.endsWith("/") ? "" : "/";
+      reqURL.pathname += inputURL.pathname.replace(/^\/+/, "");
     }
-    reqURL.hash = "";
-
-    // Appends already-encoded query pairs to a query string, replacing any
-    // existing pairs with the same key so later sources take precedence.
-    const mergeQuery = (current: string, additions: string): string => {
-      if (!additions) {
-        return current;
-      }
-      const additionKeys = new Set(
-        additions
-          .split("&")
-          .filter((pair) => pair !== "")
-          .map((pair) => pair.split("=")[0] ?? ""),
-      );
-      const kept = current.split("&").filter((pair) => {
-        return pair !== "" && !additionKeys.has(pair.split("=")[0] ?? "");
-      });
-      return [...kept, additions].join("&");
-    };
 
-    const encodeQueryRecord = (record: Record<string, unknown>): string => {
-      return Object.entries(record)
-        .map(([k, v]) => {
-          if (v == null) {
-            return undefined;
-          }
-          const value = v;
-          return encodeForm(k, value, {
-            explode: Array.isArray(value),
-            charEncoding: "percent",
-          });
-        })
-        .filter((pair): pair is string => typeof pair !== "undefined")
-        .join("&");
-    };
+    let finalQuery = query || "";
 
-    const finalQuery = [
-      query || "",
-      encodeQueryRecord(security?.queryParams || {}),
-    ].reduce(mergeQuery, reqURL.search.slice(1));
+    const secQuery: string[] = [];
+    for (const [k, v] of Object.entries(security?.queryParams || {})) {
+      const q = encodeForm(k, v, { charEncoding: "percent" });
+      if (typeof q !== "undefined") {
+        secQuery.push(q);
+      }
+    }
+    if (secQuery.length) {
+      finalQuery += `&${secQuery.join("&")}`;
+    }
 
     if (finalQuery) {
-      reqURL.search = `?${finalQuery}`;
+      const q = finalQuery.startsWith("&") ? finalQuery.slice(1) : finalQuery;
+      reqURL.search = `?${q}`;
     }
 
     const headers = new Headers(opHeaders);
@@ -226,8 +196,9 @@ export class ClientSDK {
       ...options?.fetchOptions,
       ...options,
     };
-    if (!fetchOptions?.signal && conf.timeoutMs != null && conf.timeoutMs > 0) {
-      context.timeoutMs = conf.timeoutMs;
+    if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
+      const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
+      fetchOptions.signal = timeoutSignal;
     }
 
     if (conf.body instanceof ReadableStream) {
@@ -260,7 +231,7 @@ export class ClientSDK {
     request: Request,
     options: {
       context: HookContext;
-      isErrorStatusCode: (statusCode: number) => boolean;
+      errorCodes: number | string | (number | string)[];
       retryConfig: RetryConfig;
       retryCodes: string[];
     },
@@ -273,20 +244,11 @@ export class ClientSDK {
       | UnexpectedClientError
     >
   > {
-    const { context, isErrorStatusCode } = options;
-    const timeoutMs = context.timeoutMs;
+    const { context, errorCodes } = options;
 
     return retry(
       async () => {
-        const cloned = request.clone();
-        let attempt = cloned;
-        if (timeoutMs != null && timeoutMs > 0) {
-          const timeoutSignal = AbortSignal.timeout(timeoutMs);
-          const combined = combineSignals(cloned.signal, timeoutSignal)
-            ?? timeoutSignal;
-          attempt = new Request(cloned, { signal: combined });
-        }
-        const req = await this.#hooks.beforeRequest(context, attempt);
+        const req = await this.#hooks.beforeRequest(context, request.clone());
         await logRequest(this.#logger, req).catch((e) =>
           this.#logger?.log("Failed to log request:", e)
         );
@@ -294,7 +256,7 @@ export class ClientSDK {
         let response = await this.#httpClient.request(req);
 
         try {
-          if (isErrorStatusCode(response.status)) {
+          if (matchStatusCode(response, errorCodes)) {
             const result = await this.#hooks.afterError(
               context,
               response,
@@ -345,9 +307,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^(application|text)\/([^+]+\+)*json.*/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
 const jsonlLikeContentTypeRE =
-  /^(application|text)\/([^+]+\+)*(jsonl|x-ndjson)\b.*/;
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -418,6 +380,8 @@ async function logResponse(
       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;