@secondlayer/sdk 16.1.0 → 16.2.1

package/README.md

@@ -19,7 +19,7 @@ const sl = new SecondLayer({
 });
 ```
 
-Hosted: set `SECONDLAYER_API_KEY` (`sk-sl_*`) and the client uses
+Hosted: set `SECONDLAYER_API_KEY` or pass `apiKey` (`sk-sl_*`) and the client uses
 `https://api.secondlayer.tools`. Self-host: use `INSTANCE_TOKEN` as below, which
 keeps the client on your instance even with an account key set. The key follows the host.
 

package/dist/index.d.ts

@@ -305,7 +305,12 @@ declare const LOCAL_API_URL = "http://127.0.0.1:3800";
 declare const INSTANCE_TOKEN_ENV = "INSTANCE_TOKEN";
 /** Hosted account key (`sk-sl_*`) for api.secondlayer.tools. */
 declare const ACCOUNT_KEY_ENV = "SECONDLAYER_API_KEY";
-declare function resolveBaseUrl(explicit?: string): string;
+/** The API to call. A named URL wins (`explicit`, then `SECONDLAYER_API_URL`).
+*  Otherwise the key picks the host, so a credential never reaches the wrong
+*  one: `apiKey` if the caller passed one, else a lone account key in the env.
+*  Self-hosters often hold an account key for archive credits too, so an env
+*  instance token keeps them on their instance. */
+declare function resolveBaseUrl(explicit?: string, apiKey?: string): string;
 /** True when `url` is the hosted Secondlayer API (`api.secondlayer.tools`). */
 declare function isHostedApiUrl(url: string): boolean;
 /** Resolve the bearer credential; the key follows the host. Precedence:
@@ -3770,9 +3775,9 @@ declare class Webhooks extends BaseClient {
 	/** Get a webhook's hourly delivery counts for the last 7 days.
 	*
 	*  Each hour has delivered, waiting, and gave-up counts, plus the current
-	*  queue depth, failed attempts per hour, and the usual band. Pass
-	*  `{ days: 30 }` to also get 30 daily totals. This is the events chart on
-	*  the detail page. */
+	*  queue depth, failed attempts per hour, the usual band, and 30 daily
+	*  totals. This is the events chart on the detail page. `{ days: 30 }` is
+	*  accepted for older servers, which only send the daily totals when asked. */
 	activity(id: string, opts?: {
 		days?: 30;
 	}): Promise<WebhookActivity>;

package/dist/index.js

@@ -60,7 +60,9 @@ ${detailBlocks.join(`
     };
   }
 }
-function statusRetryable(status) {
+function statusRetryable(status, code) {
+  if (code === "STACK_ASLEEP")
+    return false;
   return status === 429 || status >= 500;
 }
 function docsFor(status, code) {
@@ -77,7 +79,7 @@ class ApiError extends SecondLayerError {
   constructor(status, message, body, code, options = {}) {
     super(message, {
       code,
-      retryable: options.retryable ?? statusRetryable(status),
+      retryable: options.retryable ?? statusRetryable(status, code),
       docsUrl: options.docsUrl ?? docsFor(status, code),
       ...options.cause ? { cause: options.cause } : {},
       ...options.details ? { details: options.details } : {},
@@ -217,18 +219,15 @@ var LOCAL_API_URL = "http://127.0.0.1:3800";
 var HOSTED_API_URL = "https://api.secondlayer.tools";
 var INSTANCE_TOKEN_ENV = "INSTANCE_TOKEN";
 var ACCOUNT_KEY_ENV = "SECONDLAYER_API_KEY";
-function resolveBaseUrl(explicit) {
+function resolveBaseUrl(explicit, apiKey) {
   if (explicit && explicit.length > 0)
     return explicit.replace(/\/+$/, "");
-  if (typeof process !== "undefined") {
-    const primary = process.env?.SECONDLAYER_API_URL || undefined;
-    if (primary)
-      return primary.replace(/\/+$/, "");
-    if (process.env?.[ACCOUNT_KEY_ENV]?.startsWith("sk-sl_") && !process.env?.[INSTANCE_TOKEN_ENV]) {
-      return HOSTED_API_URL;
-    }
-  }
-  return LOCAL_API_URL;
+  const env = typeof process !== "undefined" ? process.env : undefined;
+  const primary = env?.SECONDLAYER_API_URL || undefined;
+  if (primary)
+    return primary.replace(/\/+$/, "");
+  const key = apiKey ?? (env?.[INSTANCE_TOKEN_ENV] ? undefined : env?.[ACCOUNT_KEY_ENV]);
+  return key?.startsWith("sk-sl_") ? HOSTED_API_URL : LOCAL_API_URL;
 }
 function isHostedApiUrl(url) {
   try {
@@ -300,7 +299,7 @@ class BaseClient {
   requestTimeoutMs;
   etagCache;
   constructor(options = {}) {
-    this.baseUrl = resolveBaseUrl(options.baseUrl);
+    this.baseUrl = resolveBaseUrl(options.baseUrl, options.apiKey);
     this.apiKey = resolveApiKey(options.apiKey, this.baseUrl);
     this.origin = options.origin ?? "cli";
     this.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
@@ -2075,7 +2074,7 @@ function isLoopbackUrl(baseUrl) {
   }
 }
 function createStreamsClient(options) {
-  const baseUrl = normalizeBaseUrl(resolveBaseUrl(options.baseUrl));
+  const baseUrl = normalizeBaseUrl(resolveBaseUrl(options.baseUrl, options.apiKey));
   const apiKey = resolveApiKey(options.apiKey, baseUrl);
   const origin = options.origin ?? "cli";
   const authHeaders = () => ({
@@ -3422,5 +3421,5 @@ export {
   verifyWebhookSignature
 };
 
-//# debugId=8E37F0B7E094194F64756E2164756E21
+//# debugId=F50384CF029DB60E64756E2164756E21
 //# sourceMappingURL=index.js.map