@zapier/zapier-sdk-cli 0.13.10 → 0.13.12

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @zapier/zapier-sdk-cli
 
+## 0.13.12
+
+### Patch Changes
+
+- 492e2f9: - Add new `batch` utility method to handle concurency limits, retries, timeouts and exponential backoffs.
+  - Refactor `generateAppTypes` in CLI to use the new `batch` utility
+- Updated dependencies [492e2f9]
+  - @zapier/zapier-sdk@0.13.9
+  - @zapier/zapier-sdk-mcp@0.3.22
+
+## 0.13.11
+
+### Patch Changes
+
+- 6de89a9: Allow overriding ZAPIER_BASE_URL with env vars, and also add new ZAPIER_TRACKING_BASE_URL, ZAPIER_AUTH_BASE_URL, and ZAPIER_AUTH_CLIENT_ID env vars and parameters.
+- Updated dependencies [6de89a9]
+  - @zapier/zapier-sdk-cli-login@0.3.4
+  - @zapier/zapier-sdk@0.13.8
+  - @zapier/zapier-sdk-mcp@0.3.21
+
 ## 0.13.10
 
 ### Patch Changes

package/dist/cli.cjs

@@ -1305,7 +1305,15 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
-var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+var login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl: baseUrl2,
+  authBaseUrl: authBaseUrl2,
+  authClientId: authClientId2
+}) => {
+  const authOptions = { baseUrl: baseUrl2, authBaseUrl: authBaseUrl2 };
+  const tokenUrl = zapierSdkCliLogin.getAuthTokenUrl(authOptions);
+  const authorizeUrl = zapierSdkCliLogin.getAuthAuthorizeUrl(authOptions);
   zapierSdkCliLogin.logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -1331,9 +1339,9 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge__default.default();
-  const authUrl = `${zapierSdkCliLogin.ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
+  const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: zapierSdkCliLogin.LOGIN_CLIENT_ID,
+    client_id: authClientId2 || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
     redirect_uri: redirectUri,
     scope: "internal offline_access",
     state: generateRandomString(),
@@ -1376,12 +1384,12 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   }
   log_default.info("Exchanging authorization code for tokens...");
   const { data } = await client_default.post(
-    `${zapierSdkCliLogin.ZAPIER_BASE}/oauth/token/`,
+    tokenUrl,
     {
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: zapierSdkCliLogin.LOGIN_CLIENT_ID,
+      client_id: authClientId2 || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
       code_verifier: codeVerifier
     },
     {
@@ -1402,7 +1410,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1460,23 +1468,35 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-var loginWithSdk = zapierSdk.createFunction(async function loginWithSdk2(options) {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
-  }
-  await login_default(timeoutSeconds * 1e3);
-  const user = await zapierSdkCliLogin.getLoggedInUser();
-  console.log(`\u2705 Successfully logged in as ${user.email}`);
-  setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+var loginWithSdk = zapierSdk.createFunction(
+  async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      baseUrl: options.baseUrl,
+      authBaseUrl: options.authBaseUrl,
+      authClientId: options.authClientId
+    });
+    const user = await zapierSdkCliLogin.getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
+    setTimeout(() => process.exit(0), 100);
+  }
+);
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
     try {
-      await loginWithSdk(options);
+      await loginWithSdk({
+        ...options,
+        baseUrl: context.options?.baseUrl,
+        authBaseUrl: context.options?.authBaseUrl,
+        authClientId: context.options?.authClientId
+      });
       success = true;
     } catch (error) {
       success = false;
@@ -1841,44 +1861,56 @@ var AstTypeGenerator = class {
     });
     const actions = actionsResult.data;
     const actionsWithFields = [];
-    if (authenticationId) {
-      for (const action of actions) {
-        try {
-          const fieldsResult = await sdk2.listInputFields({
-            appKey: app.implementation_id,
-            actionKey: action.key,
-            actionType: action.action_type,
-            authenticationId
-          });
-          const fields = fieldsResult.data;
-          actionsWithFields.push({
-            ...action,
-            inputFields: fields,
-            name: action.title || action.key
-          });
-        } catch {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key
-          });
-        }
+    const inputFieldsTasks = actions.map(
+      (action) => () => sdk2.listInputFields({
+        appKey: app.implementation_id,
+        actionKey: action.key,
+        actionType: action.action_type,
+        authenticationId
+      })
+    );
+    const results = await zapierSdk.batch(inputFieldsTasks, {
+      concurrency: 50,
+      // Limit to 50 concurrent requests
+      retry: true,
+      // Automatically retry transient failures
+      timeoutMs: 18e4,
+      // 3 minute overall timeout
+      taskTimeoutMs: 3e4
+      // 30 seconds per-task timeout (API calls shouldn't take longer)
+    });
+    const failedActions = [];
+    results.forEach((result, i) => {
+      const action = actions[i];
+      if (result.status === "fulfilled") {
+        actionsWithFields.push({
+          ...action,
+          inputFields: result.value.data,
+          name: action.title || action.key
+        });
+      } else {
+        failedActions.push(
+          `${action.key} (${action.action_type}): ${result.reason?.message || "Unknown error"}`
+        );
+        actionsWithFields.push({
+          ...action,
+          inputFields: [],
+          name: action.title || action.key,
+          app_key: action.app_key || app.implementation_id,
+          action_type: action.action_type || "write",
+          title: action.title || action.key,
+          type: "action",
+          description: action.description || ""
+        });
       }
-    } else {
-      actions.forEach(
-        (action) => {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key,
-            app_key: action.app_key || app.implementation_id,
-            action_type: action.action_type || "write",
-            title: action.title || action.key,
-            type: "action",
-            description: action.description || ""
-          });
-        }
+    });
+    if (failedActions.length > 0) {
+      console.warn(
+        `Failed to fetch input fields for ${failedActions.length} action(s):`
       );
+      failedActions.forEach((failedAction) => {
+        console.warn(`  - ${failedAction}`);
+      });
     }
     const sourceFile = this.createSourceFile(app, actionsWithFields);
     return this.printer.printFile(sourceFile);
@@ -2650,14 +2682,32 @@ function createZapierCliSdk(options = {}) {
 
 // package.json with { type: 'json' }
 var package_default2 = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/cli.ts
 var program = new commander.Command();
-program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging");
+program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging").option("--base-url <url>", "Base URL for Zapier API endpoints").option(
+  "--auth-base-url <url>",
+  "Base URL for Zapier authentication endpoints"
+).option("--auth-client-id <id>", "OAuth client ID for Zapier authentication").option(
+  "--tracking-base-url <url>",
+  "Base URL for Zapier tracking endpoints"
+);
 var isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
+var baseUrlIndex = process.argv.indexOf("--base-url");
+var authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
+var authClientIdIndex = process.argv.indexOf("--auth-client-id");
+var trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
+var baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : void 0;
+var authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : void 0;
+var authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : void 0;
+var trackingBaseUrl = trackingBaseUrlIndex !== -1 ? process.argv[trackingBaseUrlIndex + 1] : void 0;
 var sdk = createZapierCliSdk({
-  debug: isDebugMode
+  debug: isDebugMode,
+  baseUrl,
+  authBaseUrl,
+  authClientId,
+  trackingBaseUrl
 });
 generateCliCommands(program, sdk);
 program.parse();

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { z } from 'zod';
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, ZapierValidationError, ZapierUnknownError, toSnakeCase, ZapierError, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, ZapierError, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
 import chalk3 from 'chalk';
 import util from 'util';
@@ -9,7 +9,7 @@ import open from 'open';
 import crypto from 'crypto';
 import express from 'express';
 import pkceChallenge from 'pkce-challenge';
-import { getLoggedInUser, logout, ZAPIER_BASE, LOGIN_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
+import { getLoggedInUser, logout, getAuthTokenUrl, getAuthAuthorizeUrl, ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
 import ora from 'ora';
 import { startMcpServerAsProcess } from '@zapier/zapier-sdk-mcp';
 import { buildSync } from 'esbuild';
@@ -1272,7 +1272,15 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
-var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+var login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl: baseUrl2,
+  authBaseUrl: authBaseUrl2,
+  authClientId: authClientId2
+}) => {
+  const authOptions = { baseUrl: baseUrl2, authBaseUrl: authBaseUrl2 };
+  const tokenUrl = getAuthTokenUrl(authOptions);
+  const authorizeUrl = getAuthAuthorizeUrl(authOptions);
   logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -1298,9 +1306,9 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
-  const authUrl = `${ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
+  const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: LOGIN_CLIENT_ID,
+    client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
     redirect_uri: redirectUri,
     scope: "internal offline_access",
     state: generateRandomString(),
@@ -1343,12 +1351,12 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   }
   log_default.info("Exchanging authorization code for tokens...");
   const { data } = await client_default.post(
-    `${ZAPIER_BASE}/oauth/token/`,
+    tokenUrl,
     {
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: LOGIN_CLIENT_ID,
+      client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
       code_verifier: codeVerifier
     },
     {
@@ -1369,7 +1377,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1427,23 +1435,35 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-var loginWithSdk = createFunction(async function loginWithSdk2(options) {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
-  }
-  await login_default(timeoutSeconds * 1e3);
-  const user = await getLoggedInUser();
-  console.log(`\u2705 Successfully logged in as ${user.email}`);
-  setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+var loginWithSdk = createFunction(
+  async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      baseUrl: options.baseUrl,
+      authBaseUrl: options.authBaseUrl,
+      authClientId: options.authClientId
+    });
+    const user = await getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
+    setTimeout(() => process.exit(0), 100);
+  }
+);
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
     try {
-      await loginWithSdk(options);
+      await loginWithSdk({
+        ...options,
+        baseUrl: context.options?.baseUrl,
+        authBaseUrl: context.options?.authBaseUrl,
+        authClientId: context.options?.authClientId
+      });
       success = true;
     } catch (error) {
       success = false;
@@ -1808,44 +1828,56 @@ var AstTypeGenerator = class {
     });
     const actions = actionsResult.data;
     const actionsWithFields = [];
-    if (authenticationId) {
-      for (const action of actions) {
-        try {
-          const fieldsResult = await sdk2.listInputFields({
-            appKey: app.implementation_id,
-            actionKey: action.key,
-            actionType: action.action_type,
-            authenticationId
-          });
-          const fields = fieldsResult.data;
-          actionsWithFields.push({
-            ...action,
-            inputFields: fields,
-            name: action.title || action.key
-          });
-        } catch {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key
-          });
-        }
+    const inputFieldsTasks = actions.map(
+      (action) => () => sdk2.listInputFields({
+        appKey: app.implementation_id,
+        actionKey: action.key,
+        actionType: action.action_type,
+        authenticationId
+      })
+    );
+    const results = await batch(inputFieldsTasks, {
+      concurrency: 50,
+      // Limit to 50 concurrent requests
+      retry: true,
+      // Automatically retry transient failures
+      timeoutMs: 18e4,
+      // 3 minute overall timeout
+      taskTimeoutMs: 3e4
+      // 30 seconds per-task timeout (API calls shouldn't take longer)
+    });
+    const failedActions = [];
+    results.forEach((result, i) => {
+      const action = actions[i];
+      if (result.status === "fulfilled") {
+        actionsWithFields.push({
+          ...action,
+          inputFields: result.value.data,
+          name: action.title || action.key
+        });
+      } else {
+        failedActions.push(
+          `${action.key} (${action.action_type}): ${result.reason?.message || "Unknown error"}`
+        );
+        actionsWithFields.push({
+          ...action,
+          inputFields: [],
+          name: action.title || action.key,
+          app_key: action.app_key || app.implementation_id,
+          action_type: action.action_type || "write",
+          title: action.title || action.key,
+          type: "action",
+          description: action.description || ""
+        });
       }
-    } else {
-      actions.forEach(
-        (action) => {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key,
-            app_key: action.app_key || app.implementation_id,
-            action_type: action.action_type || "write",
-            title: action.title || action.key,
-            type: "action",
-            description: action.description || ""
-          });
-        }
+    });
+    if (failedActions.length > 0) {
+      console.warn(
+        `Failed to fetch input fields for ${failedActions.length} action(s):`
       );
+      failedActions.forEach((failedAction) => {
+        console.warn(`  - ${failedAction}`);
+      });
     }
     const sourceFile = this.createSourceFile(app, actionsWithFields);
     return this.printer.printFile(sourceFile);
@@ -2617,14 +2649,32 @@ function createZapierCliSdk(options = {}) {
 
 // package.json with { type: 'json' }
 var package_default2 = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/cli.ts
 var program = new Command();
-program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging");
+program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging").option("--base-url <url>", "Base URL for Zapier API endpoints").option(
+  "--auth-base-url <url>",
+  "Base URL for Zapier authentication endpoints"
+).option("--auth-client-id <id>", "OAuth client ID for Zapier authentication").option(
+  "--tracking-base-url <url>",
+  "Base URL for Zapier tracking endpoints"
+);
 var isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
+var baseUrlIndex = process.argv.indexOf("--base-url");
+var authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
+var authClientIdIndex = process.argv.indexOf("--auth-client-id");
+var trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
+var baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : void 0;
+var authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : void 0;
+var authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : void 0;
+var trackingBaseUrl = trackingBaseUrlIndex !== -1 ? process.argv[trackingBaseUrlIndex + 1] : void 0;
 var sdk = createZapierCliSdk({
-  debug: isDebugMode
+  debug: isDebugMode,
+  baseUrl,
+  authBaseUrl,
+  authClientId,
+  trackingBaseUrl
 });
 generateCliCommands(program, sdk);
 program.parse();