@secondlayer/sdk 10.2.0 → 10.3.1

package/dist/subgraphs/index.js

@@ -172,33 +172,55 @@ function raceAbort(promise, signal) {
   });
 }
 var LOCAL_API_URL = "http://127.0.0.1:3800";
+var INSTANCE_TOKEN_ENV = "INSTANCE_TOKEN";
+var ACCOUNT_KEY_ENV = "SECONDLAYER_API_KEY";
+var warnedUrlAlias = false;
 function resolveBaseUrl(explicit) {
   if (explicit && explicit.length > 0)
     return explicit.replace(/\/+$/, "");
   if (typeof process !== "undefined") {
-    const fromEnv = process.env?.SL_API_URL || process.env?.SECONDLAYER_API_URL;
-    if (fromEnv)
-      return fromEnv.replace(/\/+$/, "");
+    const primary = process.env?.SECONDLAYER_API_URL || undefined;
+    if (primary)
+      return primary.replace(/\/+$/, "");
+    const legacy = process.env?.SL_API_URL || undefined;
+    if (legacy) {
+      if (!warnedUrlAlias) {
+        warnedUrlAlias = true;
+        console.warn("[secondlayer] SL_API_URL is a legacy alias of SECONDLAYER_API_URL; using the alias this once.");
+      }
+      return legacy.replace(/\/+$/, "");
+    }
   }
   return LOCAL_API_URL;
 }
-var CREDENTIAL_ENV_VARS = ["INSTANCE_TOKEN", "SL_API_KEY"];
-var warnedConflicts = new Set;
 function resolveApiKey(apiKey) {
   if (apiKey !== undefined)
     return apiKey;
   if (typeof process === "undefined")
     return;
-  const instanceToken = process.env?.INSTANCE_TOKEN || undefined;
-  const legacyKey = process.env?.SL_API_KEY || undefined;
-  if (instanceToken && legacyKey && instanceToken !== legacyKey) {
-    const pair = `${instanceToken}\x00${legacyKey}`;
-    if (!warnedConflicts.has(pair)) {
-      warnedConflicts.add(pair);
-      console.warn("[secondlayer] INSTANCE_TOKEN and SL_API_KEY are set to different values — using INSTANCE_TOKEN (SL_API_KEY is a legacy alias for it).");
-    }
+  const token = process.env?.INSTANCE_TOKEN || undefined;
+  return token;
+}
+var warnedArchiveAlias = false;
+function resolveAccountKey(accountKey) {
+  if (accountKey !== undefined)
+    return accountKey;
+  if (typeof process === "undefined")
+    return;
+  const primary = process.env?.SECONDLAYER_API_KEY || undefined;
+  const slAlias = process.env?.SL_API_KEY || undefined;
+  const archiveAlias = process.env?.SL_ARCHIVE_API_KEY || undefined;
+  if (primary)
+    return primary;
+  const legacy = slAlias ?? archiveAlias;
+  if (legacy) {
+    if (!warnedArchiveAlias) {
+      warnedArchiveAlias = true;
+      console.warn("[secondlayer] SL_API_KEY / SL_ARCHIVE_API_KEY are legacy aliases of SECONDLAYER_API_KEY; using the alias this once.");
+    }
+    return legacy;
   }
-  return instanceToken ?? legacyKey;
+  return;
 }
 function seg(value) {
   return encodeURIComponent(String(value));
@@ -857,6 +879,7 @@ var OFFICIAL_ARCHIVE_HOST = "archive.secondlayer.tools";
 var DEFAULT_ARCHIVE_BASE_URL = "https://archive.secondlayer.tools";
 var DEFAULT_ARCHIVE_OPS_URL = "https://api.secondlayer.tools";
 var MAX_FETCH_BATCH = 64;
+var ARCHIVE_CREDENTIAL_RE = /^s[ks]-sl_/;
 function quoteFromBody(body) {
   return {
     partitions: body.partitions,
@@ -873,7 +896,7 @@ function stripSlash(url) {
   return url.replace(/\/+$/, "");
 }
 function createArchiveClient(options = {}) {
-  const apiKey = resolveApiKey(options.apiKey);
+  const accountKey = resolveAccountKey(options.accountKey ?? options.apiKey);
   const fetchImpl = options.fetchImpl ?? ((input, init) => fetch(input, init));
   const archiveBaseUrl = stripSlash(options.archiveBaseUrl ?? DEFAULT_ARCHIVE_BASE_URL);
   const archiveOpsUrl = stripSlash(options.archiveOpsUrl ?? DEFAULT_ARCHIVE_OPS_URL);
@@ -921,8 +944,12 @@ function createArchiveClient(options = {}) {
     const headers = {
       "Content-Type": "application/json"
     };
-    if (authed && apiKey)
-      headers.Authorization = `Bearer ${apiKey}`;
+    if (authed && accountKey) {
+      if (!ARCHIVE_CREDENTIAL_RE.test(accountKey)) {
+        throw new ArchiveAuthError("archive ops need SECONDLAYER_API_KEY (sk-sl_*), not INSTANCE_TOKEN");
+      }
+      headers.Authorization = `Bearer ${accountKey}`;
+    }
     const response = await fetchImpl(`${archiveOpsUrl}${path}`, {
       method,
       headers,
@@ -956,7 +983,7 @@ function createArchiveClient(options = {}) {
     if (!response.ok) {
       throw new ApiError(response.status, `Could not fetch archive status (${response.status}).`);
     }
-    return response.json();
+    return await response.json();
   }
   function partitions(ref, filter) {
     let list = ref.manifest.partitions ?? [];
@@ -2518,7 +2545,7 @@ class SecondLayer extends BaseClient {
     const request = (method, path, body) => this.request(method, path, body);
     this.archive = {
       ...createArchiveClient({
-        apiKey: this.apiKey,
+        accountKey: options.accountKey,
         fetchImpl: options.fetchImpl,
         archiveBaseUrl: options.archiveBaseUrl,
         archiveOpsUrl: options.archiveOpsUrl
@@ -2617,5 +2644,5 @@ export {
   Subgraphs
 };
 
-//# debugId=59EE80259E1C9AEC64756E2164756E21
+//# debugId=19288C06BA36D64664756E2164756E21
 //# sourceMappingURL=index.js.map