@secondlayer/cli 1.6.1 → 1.6.3

package/dist/cli.js

@@ -12433,22 +12433,26 @@ function parseContractId(contractId) {
 
 // src/utils/api.ts
 class StacksApiClient {
-  static hasWarnedAboutApiKey = false;
   baseUrl;
   headers;
-  usingHiro;
-  constructor(network = "mainnet", apiKey, apiUrl) {
-    const nodeRpcUrl = process.env.STACKS_NODE_RPC_URL;
-    this.baseUrl = apiUrl || nodeRpcUrl || HIRO_URLS[network];
-    this.usingHiro = !apiUrl && !nodeRpcUrl;
-    this.headers = apiKey ? { "x-api-key": apiKey } : {};
-    if (this.usingHiro && !apiKey && !StacksApiClient.hasWarnedAboutApiKey) {
-      console.warn(`⚠️  Using Hiro public API (no STACKS_NODE_RPC_URL set). You may be rate-limited.
-` + `   Set STACKS_NODE_RPC_URL to use your own node, or set HIRO_API_KEY for Hiro.
-` + "   Get a free Hiro key at: https://platform.hiro.so/");
-      StacksApiClient.hasWarnedAboutApiKey = true;
+  useProxy;
+  constructor(network = "mainnet", apiKey, apiUrl, slApiUrl) {
+    this.useProxy = !apiUrl && network !== "devnet";
+    if (this.useProxy) {
+      this.baseUrl = slApiUrl || "";
+      this.headers = {};
+    } else {
+      this.baseUrl = apiUrl || process.env.STACKS_NODE_RPC_URL || "http://localhost:3999";
+      this.headers = apiKey ? { "x-api-key": apiKey } : {};
     }
   }
+  async ensureProxy() {
+    if (!this.useProxy || this.baseUrl)
+      return;
+    const config = await loadConfig();
+    this.baseUrl = resolveApiUrl(config);
+    this.headers = authHeaders(config);
+  }
   async fetchWithErrorHandling(url, resourceType, resourceId) {
     try {
       const response2 = await gotWithRetry(url, {
@@ -12457,30 +12461,38 @@ class StacksApiClient {
       });
       return response2.body;
     } catch (error2) {
+      if (error2.response?.statusCode === 401) {
+        throw new Error("Authentication required. Run: secondlayer auth login");
+      }
       if (error2.response?.statusCode === 404) {
         throw new Error(`${resourceType} not found: ${resourceId}`);
       }
-      if (error2.response?.statusCode === 429) {
-        throw new Error("Rate limited. Please provide an API key in your config.");
-      }
       throw new Error(`Failed to fetch ${resourceType.toLowerCase()}: ${error2.message}`);
     }
   }
   async getContractInfo(contractId) {
+    await this.ensureProxy();
+    if (this.useProxy) {
+      const url2 = `${this.baseUrl}/api/node/contracts/${contractId}/abi`;
+      return this.fetchWithErrorHandling(url2, "Contract", contractId);
+    }
     const { address, contractName } = parseContractId(contractId);
     const url = `${this.baseUrl}/v2/contracts/interface/${address}/${contractName}`;
     return this.fetchWithErrorHandling(url, "Contract", contractId);
   }
   async getContractSource(contractId) {
     const { address, contractName } = parseContractId(contractId);
-    const url = `${this.baseUrl}/v2/contracts/source/${address}/${contractName}`;
+    const rpcUrl = process.env.STACKS_NODE_RPC_URL || this.baseUrl;
+    const url = `${rpcUrl}/v2/contracts/source/${address}/${contractName}`;
     const data = await this.fetchWithErrorHandling(url, "Contract source", contractId);
     return data.source;
   }
 }
-var gotWithRetry, HIRO_URLS;
+var gotWithRetry;
 var init_api = __esm(() => {
   init_source3();
+  init_config();
+  init_api_client();
   gotWithRetry = source_default2.extend({
     timeout: { request: 30000 },
     retry: {
@@ -12490,11 +12502,6 @@ var init_api = __esm(() => {
       calculateDelay: ({ attemptCount }) => attemptCount * 1000
     }
   });
-  HIRO_URLS = {
-    mainnet: "https://api.hiro.so",
-    testnet: "https://api.testnet.hiro.so",
-    devnet: "http://localhost:3999"
-  };
 });
 
 // src/utils/network.ts
@@ -32275,7 +32282,7 @@ function deriveContractName(filePath) {
   const basename = path10.basename(filePath, ".clar");
   return basename.replace(/[-_](.)/g, (_2, char) => char.toUpperCase()).replace(/^(.)/, (_2, char) => char.toLowerCase()).replace(/^\d/, "_$&");
 }
-async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddress, nodeRpcUrl) {
+async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddress) {
   const contracts = [];
   const deployer = defaultAddress || DEFAULT_DEVNET_ADDRESS;
   if (parsedInputs.files.length > 0 && !defaultAddress) {
@@ -32297,7 +32304,7 @@ async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddre
     const { address, contractName } = parseContractId(contractId);
     const network = inferNetwork(address) ?? "mainnet";
     try {
-      const apiClient = new StacksApiClient(network, apiKey, nodeRpcUrl);
+      const apiClient = new StacksApiClient(network, apiKey);
       const contractInfo = await apiClient.getContractInfo(contractId);
       const abi = parseApiResponse(contractInfo);
       const name = toCamelCase7(contractName);
@@ -32340,8 +32347,7 @@ No .clar files or contract addresses matched the provided inputs`));
         process.exit(1);
       }
       const apiKey = options3.apiKey || process.env.HIRO_API_KEY;
-      const cliConfig = await loadConfig();
-      config = await buildConfigFromInputs(parsedInputs, options3.out, apiKey, undefined, cliConfig.nodeRpcUrl);
+      config = await buildConfigFromInputs(parsedInputs, options3.out, apiKey);
     } else {
       config = await loadConfig2(options3.config);
     }
@@ -32470,7 +32476,6 @@ var import_fast_glob, DEFAULT_DEVNET_ADDRESS = "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZ
 var init_generate = __esm(() => {
   init_source4();
   init_config2();
-  init_config();
   init_api();
   init_clarity();
   init_contract();
@@ -32547,7 +32552,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "1.6.1",
+  version: "1.6.3",
   description: "CLI for streams, subgraphs, and real-time blockchain indexing on Stacks",
   type: "module",
   bin: {
@@ -35407,11 +35412,12 @@ Stopped watching.`);
           write: false
         });
         const handlerCode = new TextDecoder().decode(buildResult.outputFiles[0].contents);
+        const { sourceKey } = await import("@secondlayer/subgraphs");
         const result = await deploySubgraphApi({
           name: def.name,
           version: def.version,
           description: def.description,
-          sources: def.sources,
+          sources: def.sources.map(sourceKey),
           schema: def.schema,
           handlerCode,
           reindex: options2.reindex
@@ -35596,10 +35602,9 @@ ${rows.length} row(s)`));
       }
       const outPath = resolve(options2.output);
       const network = inferNetwork(contractAddress) ?? "mainnet";
-      const config = await loadConfig();
       const apiKey = options2.apiKey ?? process.env.HIRO_API_KEY;
       info(`Fetching ABI for ${contractAddress}...`);
-      const client = new StacksApiClient(network, apiKey, config.nodeRpcUrl);
+      const client = new StacksApiClient(network, apiKey);
       const contractInfo = await client.getContractInfo(contractAddress);
       const abi = parseApiResponse(contractInfo);
       info(`Generating scaffold...`);
@@ -36778,5 +36783,5 @@ registerWhoamiCommand(program);
 registerReceiverCommand(program);
 program.parse();
 
-//# debugId=9817C710C5B4B19A64756E2164756E21
+//# debugId=02594D245228FE5164756E2164756E21
 //# sourceMappingURL=cli.js.map