@zapier/zapier-sdk-cli 0.66.4 → 0.67.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/README.md +48 -48
- package/dist/cli.cjs +50 -31
- package/dist/cli.mjs +50 -31
- package/dist/experimental.cjs +17 -17
- package/dist/experimental.d.mts +1 -1
- package/dist/experimental.d.ts +1 -1
- package/dist/experimental.mjs +17 -17
- package/dist/{extensions-DpOnXI9w.d.mts → extensions-B9AXjeN8.d.mts} +4 -0
- package/dist/{extensions-DpOnXI9w.d.ts → extensions-B9AXjeN8.d.ts} +4 -0
- package/dist/index.cjs +18 -18
- package/dist/index.d.mts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.mjs +18 -18
- package/dist/login.cjs +10 -10
- package/dist/login.mjs +10 -10
- package/package.json +3 -3
package/dist/cli.mjs
CHANGED
|
@@ -494,7 +494,7 @@ var SHARED_COMMAND_CLI_OPTIONS = [
|
|
|
494
494
|
|
|
495
495
|
// package.json
|
|
496
496
|
var package_default = {
|
|
497
|
-
version: "0.
|
|
497
|
+
version: "0.67.0"};
|
|
498
498
|
|
|
499
499
|
// src/telemetry/builders.ts
|
|
500
500
|
function createCliBaseEvent(context = {}) {
|
|
@@ -1851,10 +1851,10 @@ function hasLegacyJwtConfig() {
|
|
|
1851
1851
|
}
|
|
1852
1852
|
var SERVICE2 = "zapier-sdk-cache";
|
|
1853
1853
|
var CONFIG_KEY = "cache";
|
|
1854
|
-
var
|
|
1855
|
-
var
|
|
1856
|
-
var
|
|
1857
|
-
var
|
|
1854
|
+
var LOCK_UPDATE_MILLISECONDS = 5e3;
|
|
1855
|
+
var LOCK_STALE_MILLISECONDS = 1e4;
|
|
1856
|
+
var LOCK_RETRY_WAIT_MILLISECONDS = 100;
|
|
1857
|
+
var LOCK_RETRY_MAX_WAIT_MILLISECONDS = 1e3;
|
|
1858
1858
|
var LOCK_RETRY_COUNT = 120;
|
|
1859
1859
|
function keychainAccount(key) {
|
|
1860
1860
|
return createHash("sha256").update(key).digest("hex");
|
|
@@ -1953,13 +1953,13 @@ function createCache() {
|
|
|
1953
1953
|
let release = null;
|
|
1954
1954
|
try {
|
|
1955
1955
|
release = await lockfile.lock(lockTarget, {
|
|
1956
|
-
stale:
|
|
1957
|
-
update:
|
|
1956
|
+
stale: LOCK_STALE_MILLISECONDS,
|
|
1957
|
+
update: LOCK_UPDATE_MILLISECONDS,
|
|
1958
1958
|
retries: {
|
|
1959
1959
|
retries: LOCK_RETRY_COUNT,
|
|
1960
1960
|
factor: 1.2,
|
|
1961
|
-
minTimeout:
|
|
1962
|
-
maxTimeout:
|
|
1961
|
+
minTimeout: LOCK_RETRY_WAIT_MILLISECONDS,
|
|
1962
|
+
maxTimeout: LOCK_RETRY_MAX_WAIT_MILLISECONDS
|
|
1963
1963
|
}
|
|
1964
1964
|
});
|
|
1965
1965
|
} catch {
|
|
@@ -2163,7 +2163,7 @@ async function deleteStoredClientCredentials({
|
|
|
2163
2163
|
|
|
2164
2164
|
// src/login/index.ts
|
|
2165
2165
|
var DEFAULT_AUTH_CLIENT_ID = "grwWZD5hUWGvb4V8ODBuOtXer3h0DBEZ2HR8aay6";
|
|
2166
|
-
var
|
|
2166
|
+
var TOKEN_REFRESH_BUFFER_MILLISECONDS = 5 * 60 * 1e3;
|
|
2167
2167
|
function createDebugLog(enabled) {
|
|
2168
2168
|
if (!enabled) {
|
|
2169
2169
|
return () => {
|
|
@@ -2400,7 +2400,7 @@ async function resolveOrRefreshToken(options = {}) {
|
|
|
2400
2400
|
return void 0;
|
|
2401
2401
|
}
|
|
2402
2402
|
const { jwt: storedJwt, refreshToken, expiresAt } = stored;
|
|
2403
|
-
if (expiresAt > Date.now() +
|
|
2403
|
+
if (expiresAt > Date.now() + TOKEN_REFRESH_BUFFER_MILLISECONDS) {
|
|
2404
2404
|
debugLog("Using cached token (still valid)");
|
|
2405
2405
|
return storedJwt;
|
|
2406
2406
|
}
|
|
@@ -2672,7 +2672,7 @@ async function setupClientCredentials({
|
|
|
2672
2672
|
|
|
2673
2673
|
// src/utils/constants.ts
|
|
2674
2674
|
var LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
|
|
2675
|
-
var
|
|
2675
|
+
var LOGIN_TIMEOUT_MILLISECONDS = 3e5;
|
|
2676
2676
|
|
|
2677
2677
|
// src/utils/getCallablePromise.ts
|
|
2678
2678
|
var getCallablePromise = () => {
|
|
@@ -3118,7 +3118,7 @@ async function runSignupOauthFlow(options) {
|
|
|
3118
3118
|
});
|
|
3119
3119
|
}
|
|
3120
3120
|
async function startPendingOauthFlow({
|
|
3121
|
-
timeoutMs =
|
|
3121
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
3122
3122
|
pkceCredentials,
|
|
3123
3123
|
baseUrl: baseUrl2,
|
|
3124
3124
|
entryPoint,
|
|
@@ -3272,7 +3272,7 @@ function writeHeadlessOauthStatus(message) {
|
|
|
3272
3272
|
`);
|
|
3273
3273
|
}
|
|
3274
3274
|
async function runOauthFlow({
|
|
3275
|
-
timeoutMs =
|
|
3275
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
3276
3276
|
pkceCredentials,
|
|
3277
3277
|
baseUrl: baseUrl2,
|
|
3278
3278
|
entryPoint,
|
|
@@ -3368,7 +3368,7 @@ async function readHeadlessCallbackUrl({
|
|
|
3368
3368
|
}
|
|
3369
3369
|
}
|
|
3370
3370
|
async function runHeadlessOauthFlow({
|
|
3371
|
-
timeoutMs =
|
|
3371
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
3372
3372
|
pkceCredentials,
|
|
3373
3373
|
baseUrl: baseUrl2,
|
|
3374
3374
|
entryPoint,
|
|
@@ -5239,7 +5239,7 @@ var feedbackResolver = defineResolver({
|
|
|
5239
5239
|
});
|
|
5240
5240
|
var DEFAULT_FEEDBACK_WEBHOOK_URL = "https://hooks.zapier.com/hooks/catch/20279515/uc98k9m/";
|
|
5241
5241
|
var MAX_RETRIES = 2;
|
|
5242
|
-
var
|
|
5242
|
+
var RETRY_DELAY_MILLISECONDS = 1e3;
|
|
5243
5243
|
function getFeedbackWebhookUrl() {
|
|
5244
5244
|
return process.env.ZAPIER_FEEDBACK_WEBHOOK_URL || DEFAULT_FEEDBACK_WEBHOOK_URL;
|
|
5245
5245
|
}
|
|
@@ -5253,7 +5253,7 @@ async function postWithRetry({
|
|
|
5253
5253
|
body
|
|
5254
5254
|
});
|
|
5255
5255
|
if (!response.ok && attemptsLeft > 1) {
|
|
5256
|
-
await new Promise((r) => setTimeout(r,
|
|
5256
|
+
await new Promise((r) => setTimeout(r, RETRY_DELAY_MILLISECONDS));
|
|
5257
5257
|
return postWithRetry({ body, attemptsLeft: attemptsLeft - 1 });
|
|
5258
5258
|
}
|
|
5259
5259
|
return response;
|
|
@@ -6725,7 +6725,7 @@ function buildBoxLines(message) {
|
|
|
6725
6725
|
// package.json with { type: 'json' }
|
|
6726
6726
|
var package_default2 = {
|
|
6727
6727
|
name: "@zapier/zapier-sdk-cli",
|
|
6728
|
-
version: "0.
|
|
6728
|
+
version: "0.67.0"};
|
|
6729
6729
|
|
|
6730
6730
|
// src/sdk.ts
|
|
6731
6731
|
var warnedDeprecatedMethods = /* @__PURE__ */ new Set();
|
|
@@ -6917,20 +6917,31 @@ function readEnvSpecs() {
|
|
|
6917
6917
|
if (!raw) return [];
|
|
6918
6918
|
return raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
|
|
6919
6919
|
}
|
|
6920
|
-
var
|
|
6921
|
-
var
|
|
6922
|
-
const {
|
|
6923
|
-
|
|
6924
|
-
|
|
6920
|
+
var ONE_DAY_MILLISECONDS = 24 * 60 * 60 * 1e3;
|
|
6921
|
+
var CACHE_RESET_INTERVAL_MILLISECONDS = (() => {
|
|
6922
|
+
const {
|
|
6923
|
+
ZAPIER_SDK_UPDATE_CHECK_INTERVAL_SECONDS,
|
|
6924
|
+
ZAPIER_SDK_UPDATE_CHECK_INTERVAL_MS
|
|
6925
|
+
} = process.env;
|
|
6926
|
+
let intervalMs;
|
|
6927
|
+
if (ZAPIER_SDK_UPDATE_CHECK_INTERVAL_SECONDS !== void 0) {
|
|
6928
|
+
const seconds = parseInt(ZAPIER_SDK_UPDATE_CHECK_INTERVAL_SECONDS);
|
|
6929
|
+
intervalMs = isNaN(seconds) ? NaN : seconds * 1e3;
|
|
6930
|
+
} else if (ZAPIER_SDK_UPDATE_CHECK_INTERVAL_MS !== void 0) {
|
|
6931
|
+
intervalMs = parseInt(ZAPIER_SDK_UPDATE_CHECK_INTERVAL_MS);
|
|
6932
|
+
} else {
|
|
6933
|
+
intervalMs = ONE_DAY_MILLISECONDS;
|
|
6934
|
+
}
|
|
6935
|
+
if (isNaN(intervalMs) || intervalMs < 0) {
|
|
6925
6936
|
return -1;
|
|
6926
6937
|
}
|
|
6927
|
-
return
|
|
6938
|
+
return intervalMs;
|
|
6928
6939
|
})();
|
|
6929
6940
|
function getVersionCache() {
|
|
6930
6941
|
try {
|
|
6931
6942
|
const cache = getConfig().get("version_cache");
|
|
6932
6943
|
const now = Date.now();
|
|
6933
|
-
if (!cache || !cache.last_reset_timestamp || now - cache.last_reset_timestamp >=
|
|
6944
|
+
if (!cache || !cache.last_reset_timestamp || now - cache.last_reset_timestamp >= CACHE_RESET_INTERVAL_MILLISECONDS) {
|
|
6934
6945
|
const newCache = {
|
|
6935
6946
|
last_reset_timestamp: now,
|
|
6936
6947
|
packages: {}
|
|
@@ -7057,7 +7068,7 @@ async function checkAndNotifyUpdates({
|
|
|
7057
7068
|
packageName,
|
|
7058
7069
|
currentVersion
|
|
7059
7070
|
}) {
|
|
7060
|
-
if (
|
|
7071
|
+
if (CACHE_RESET_INTERVAL_MILLISECONDS < 0) {
|
|
7061
7072
|
return;
|
|
7062
7073
|
}
|
|
7063
7074
|
const versionInfo = await checkForUpdates({ packageName, currentVersion });
|
|
@@ -7113,7 +7124,7 @@ function displayWidth(text) {
|
|
|
7113
7124
|
var FALLBACK_PANEL_WIDTH = 72;
|
|
7114
7125
|
var MIN_PANEL_WIDTH = 36;
|
|
7115
7126
|
var MAX_PANEL_WIDTH = 88;
|
|
7116
|
-
var
|
|
7127
|
+
var SPINNER_INTERVAL_MILLISECONDS = 80;
|
|
7117
7128
|
var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
|
|
7118
7129
|
var ESC = String.fromCharCode(27);
|
|
7119
7130
|
var HIDE_CURSOR = `${ESC}[?25l`;
|
|
@@ -7296,7 +7307,7 @@ function createApprovalProgressRenderer({
|
|
|
7296
7307
|
} catch (error) {
|
|
7297
7308
|
disableAfterError(error);
|
|
7298
7309
|
}
|
|
7299
|
-
},
|
|
7310
|
+
}, SPINNER_INTERVAL_MILLISECONDS);
|
|
7300
7311
|
spinnerTimer.unref?.();
|
|
7301
7312
|
}
|
|
7302
7313
|
function update(nextState, { complete = false } = {}) {
|
|
@@ -7399,7 +7410,7 @@ function createApprovalProgressRenderer({
|
|
|
7399
7410
|
}
|
|
7400
7411
|
|
|
7401
7412
|
// src/cli.ts
|
|
7402
|
-
var
|
|
7413
|
+
var EXIT_GRACE_PERIOD_MILLISECONDS = 500;
|
|
7403
7414
|
var program = new Command();
|
|
7404
7415
|
var versionOption = getReservedCliOption("version" /* Version */);
|
|
7405
7416
|
var helpOption = getReservedCliOption("help" /* Help */);
|
|
@@ -7416,9 +7427,12 @@ program.name("zapier-sdk").description("CLI for Zapier SDK").version(
|
|
|
7416
7427
|
).option("--tracking-base-url <url>", "Base URL for Zapier tracking endpoints").option(
|
|
7417
7428
|
"--max-network-retries <count>",
|
|
7418
7429
|
"Max retries for rate-limited requests (default: 3)"
|
|
7430
|
+
).option(
|
|
7431
|
+
"--max-network-retry-delay-seconds <seconds>",
|
|
7432
|
+
"Max delay in seconds to wait for a rate-limit retry (default: 60)"
|
|
7419
7433
|
).option(
|
|
7420
7434
|
"--max-network-retry-delay-ms <ms>",
|
|
7421
|
-
"
|
|
7435
|
+
"Deprecated. Use --max-network-retry-delay-seconds."
|
|
7422
7436
|
).option(
|
|
7423
7437
|
"--max-concurrent-requests <count>",
|
|
7424
7438
|
"Max concurrent in-flight HTTP requests (default: 200). Pass 'Infinity' to disable."
|
|
@@ -7461,6 +7475,10 @@ var credentialsBaseUrl = getFlagValue("--credentials-base-url");
|
|
|
7461
7475
|
var trackingBaseUrl = getFlagValue("--tracking-base-url");
|
|
7462
7476
|
var maxNetworkRetriesStr = getFlagValue("--max-network-retries");
|
|
7463
7477
|
var maxNetworkRetries = maxNetworkRetriesStr ? parseInt(maxNetworkRetriesStr, 10) : void 0;
|
|
7478
|
+
var maxNetworkRetryDelaySecondsStr = getFlagValue(
|
|
7479
|
+
"--max-network-retry-delay-seconds"
|
|
7480
|
+
);
|
|
7481
|
+
var maxNetworkRetryDelaySeconds = maxNetworkRetryDelaySecondsStr ? parseInt(maxNetworkRetryDelaySecondsStr, 10) : void 0;
|
|
7464
7482
|
var maxNetworkRetryDelayMsStr = getFlagValue("--max-network-retry-delay-ms");
|
|
7465
7483
|
var maxNetworkRetryDelayMs = maxNetworkRetryDelayMsStr ? parseInt(maxNetworkRetryDelayMsStr, 10) : void 0;
|
|
7466
7484
|
var maxConcurrentRequestsStr = getFlagValue("--max-concurrent-requests");
|
|
@@ -7517,6 +7535,7 @@ program.exitOverride();
|
|
|
7517
7535
|
baseUrl,
|
|
7518
7536
|
trackingBaseUrl,
|
|
7519
7537
|
maxNetworkRetries,
|
|
7538
|
+
maxNetworkRetryDelaySeconds,
|
|
7520
7539
|
maxNetworkRetryDelayMs,
|
|
7521
7540
|
maxConcurrentRequests,
|
|
7522
7541
|
onEvent: approvalProgress.onEvent,
|
|
@@ -7548,7 +7567,7 @@ program.exitOverride();
|
|
|
7548
7567
|
renderDeprecationNotices();
|
|
7549
7568
|
const exitTimeout = setTimeout(
|
|
7550
7569
|
() => process.exit(exitCode),
|
|
7551
|
-
|
|
7570
|
+
EXIT_GRACE_PERIOD_MILLISECONDS
|
|
7552
7571
|
);
|
|
7553
7572
|
exitTimeout.unref();
|
|
7554
7573
|
process.exitCode = exitCode;
|
package/dist/experimental.cjs
CHANGED
|
@@ -201,10 +201,10 @@ function hasLegacyJwtConfig() {
|
|
|
201
201
|
}
|
|
202
202
|
var SERVICE2 = "zapier-sdk-cache";
|
|
203
203
|
var CONFIG_KEY = "cache";
|
|
204
|
-
var
|
|
205
|
-
var
|
|
206
|
-
var
|
|
207
|
-
var
|
|
204
|
+
var LOCK_UPDATE_MILLISECONDS = 5e3;
|
|
205
|
+
var LOCK_STALE_MILLISECONDS = 1e4;
|
|
206
|
+
var LOCK_RETRY_WAIT_MILLISECONDS = 100;
|
|
207
|
+
var LOCK_RETRY_MAX_WAIT_MILLISECONDS = 1e3;
|
|
208
208
|
var LOCK_RETRY_COUNT = 120;
|
|
209
209
|
function keychainAccount(key) {
|
|
210
210
|
return crypto.createHash("sha256").update(key).digest("hex");
|
|
@@ -303,13 +303,13 @@ function createCache() {
|
|
|
303
303
|
let release = null;
|
|
304
304
|
try {
|
|
305
305
|
release = await lockfile__namespace.lock(lockTarget, {
|
|
306
|
-
stale:
|
|
307
|
-
update:
|
|
306
|
+
stale: LOCK_STALE_MILLISECONDS,
|
|
307
|
+
update: LOCK_UPDATE_MILLISECONDS,
|
|
308
308
|
retries: {
|
|
309
309
|
retries: LOCK_RETRY_COUNT,
|
|
310
310
|
factor: 1.2,
|
|
311
|
-
minTimeout:
|
|
312
|
-
maxTimeout:
|
|
311
|
+
minTimeout: LOCK_RETRY_WAIT_MILLISECONDS,
|
|
312
|
+
maxTimeout: LOCK_RETRY_MAX_WAIT_MILLISECONDS
|
|
313
313
|
}
|
|
314
314
|
});
|
|
315
315
|
} catch {
|
|
@@ -547,7 +547,7 @@ async function deleteStoredClientCredentials({
|
|
|
547
547
|
|
|
548
548
|
// src/login/index.ts
|
|
549
549
|
var DEFAULT_AUTH_CLIENT_ID = "grwWZD5hUWGvb4V8ODBuOtXer3h0DBEZ2HR8aay6";
|
|
550
|
-
var
|
|
550
|
+
var TOKEN_REFRESH_BUFFER_MILLISECONDS = 5 * 60 * 1e3;
|
|
551
551
|
function createDebugLog(enabled) {
|
|
552
552
|
if (!enabled) {
|
|
553
553
|
return () => {
|
|
@@ -784,7 +784,7 @@ async function resolveOrRefreshToken(options = {}) {
|
|
|
784
784
|
return void 0;
|
|
785
785
|
}
|
|
786
786
|
const { jwt: storedJwt, refreshToken, expiresAt } = stored;
|
|
787
|
-
if (expiresAt > Date.now() +
|
|
787
|
+
if (expiresAt > Date.now() + TOKEN_REFRESH_BUFFER_MILLISECONDS) {
|
|
788
788
|
debugLog("Using cached token (still valid)");
|
|
789
789
|
return storedJwt;
|
|
790
790
|
}
|
|
@@ -1094,7 +1094,7 @@ async function setupClientCredentials({
|
|
|
1094
1094
|
|
|
1095
1095
|
// src/utils/constants.ts
|
|
1096
1096
|
var LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
|
|
1097
|
-
var
|
|
1097
|
+
var LOGIN_TIMEOUT_MILLISECONDS = 3e5;
|
|
1098
1098
|
|
|
1099
1099
|
// src/utils/getCallablePromise.ts
|
|
1100
1100
|
var getCallablePromise = () => {
|
|
@@ -1540,7 +1540,7 @@ async function runSignupOauthFlow(options) {
|
|
|
1540
1540
|
});
|
|
1541
1541
|
}
|
|
1542
1542
|
async function startPendingOauthFlow({
|
|
1543
|
-
timeoutMs =
|
|
1543
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1544
1544
|
pkceCredentials,
|
|
1545
1545
|
baseUrl,
|
|
1546
1546
|
entryPoint,
|
|
@@ -1694,7 +1694,7 @@ function writeHeadlessOauthStatus(message) {
|
|
|
1694
1694
|
`);
|
|
1695
1695
|
}
|
|
1696
1696
|
async function runOauthFlow({
|
|
1697
|
-
timeoutMs =
|
|
1697
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1698
1698
|
pkceCredentials,
|
|
1699
1699
|
baseUrl,
|
|
1700
1700
|
entryPoint,
|
|
@@ -1790,7 +1790,7 @@ async function readHeadlessCallbackUrl({
|
|
|
1790
1790
|
}
|
|
1791
1791
|
}
|
|
1792
1792
|
async function runHeadlessOauthFlow({
|
|
1793
|
-
timeoutMs =
|
|
1793
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1794
1794
|
pkceCredentials,
|
|
1795
1795
|
baseUrl,
|
|
1796
1796
|
entryPoint,
|
|
@@ -3661,7 +3661,7 @@ var feedbackResolver = zapierSdk.defineResolver({
|
|
|
3661
3661
|
});
|
|
3662
3662
|
var DEFAULT_FEEDBACK_WEBHOOK_URL = "https://hooks.zapier.com/hooks/catch/20279515/uc98k9m/";
|
|
3663
3663
|
var MAX_RETRIES = 2;
|
|
3664
|
-
var
|
|
3664
|
+
var RETRY_DELAY_MILLISECONDS = 1e3;
|
|
3665
3665
|
function getFeedbackWebhookUrl() {
|
|
3666
3666
|
return process.env.ZAPIER_FEEDBACK_WEBHOOK_URL || DEFAULT_FEEDBACK_WEBHOOK_URL;
|
|
3667
3667
|
}
|
|
@@ -3675,7 +3675,7 @@ async function postWithRetry({
|
|
|
3675
3675
|
body
|
|
3676
3676
|
});
|
|
3677
3677
|
if (!response.ok && attemptsLeft > 1) {
|
|
3678
|
-
await new Promise((r) => setTimeout(r,
|
|
3678
|
+
await new Promise((r) => setTimeout(r, RETRY_DELAY_MILLISECONDS));
|
|
3679
3679
|
return postWithRetry({ body, attemptsLeft: attemptsLeft - 1 });
|
|
3680
3680
|
}
|
|
3681
3681
|
return response;
|
|
@@ -5109,7 +5109,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
|
|
|
5109
5109
|
// package.json with { type: 'json' }
|
|
5110
5110
|
var package_default = {
|
|
5111
5111
|
name: "@zapier/zapier-sdk-cli",
|
|
5112
|
-
version: "0.
|
|
5112
|
+
version: "0.67.0"};
|
|
5113
5113
|
|
|
5114
5114
|
// src/sdk.ts
|
|
5115
5115
|
var warnedDeprecatedMethods = /* @__PURE__ */ new Set();
|
package/dist/experimental.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ZapierSdkOptions } from '@zapier/zapier-sdk/experimental';
|
|
2
|
-
import { E as Extension, Z as ZapierSdkCli } from './extensions-
|
|
2
|
+
import { E as Extension, Z as ZapierSdkCli } from './extensions-B9AXjeN8.mjs';
|
|
3
3
|
import '@zapier/zapier-sdk';
|
|
4
4
|
import 'zod';
|
|
5
5
|
import 'zod/v4/core';
|
package/dist/experimental.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ZapierSdkOptions } from '@zapier/zapier-sdk/experimental';
|
|
2
|
-
import { E as Extension, Z as ZapierSdkCli } from './extensions-
|
|
2
|
+
import { E as Extension, Z as ZapierSdkCli } from './extensions-B9AXjeN8.js';
|
|
3
3
|
import '@zapier/zapier-sdk';
|
|
4
4
|
import 'zod';
|
|
5
5
|
import 'zod/v4/core';
|
package/dist/experimental.mjs
CHANGED
|
@@ -165,10 +165,10 @@ function hasLegacyJwtConfig() {
|
|
|
165
165
|
}
|
|
166
166
|
var SERVICE2 = "zapier-sdk-cache";
|
|
167
167
|
var CONFIG_KEY = "cache";
|
|
168
|
-
var
|
|
169
|
-
var
|
|
170
|
-
var
|
|
171
|
-
var
|
|
168
|
+
var LOCK_UPDATE_MILLISECONDS = 5e3;
|
|
169
|
+
var LOCK_STALE_MILLISECONDS = 1e4;
|
|
170
|
+
var LOCK_RETRY_WAIT_MILLISECONDS = 100;
|
|
171
|
+
var LOCK_RETRY_MAX_WAIT_MILLISECONDS = 1e3;
|
|
172
172
|
var LOCK_RETRY_COUNT = 120;
|
|
173
173
|
function keychainAccount(key) {
|
|
174
174
|
return createHash("sha256").update(key).digest("hex");
|
|
@@ -267,13 +267,13 @@ function createCache() {
|
|
|
267
267
|
let release = null;
|
|
268
268
|
try {
|
|
269
269
|
release = await lockfile.lock(lockTarget, {
|
|
270
|
-
stale:
|
|
271
|
-
update:
|
|
270
|
+
stale: LOCK_STALE_MILLISECONDS,
|
|
271
|
+
update: LOCK_UPDATE_MILLISECONDS,
|
|
272
272
|
retries: {
|
|
273
273
|
retries: LOCK_RETRY_COUNT,
|
|
274
274
|
factor: 1.2,
|
|
275
|
-
minTimeout:
|
|
276
|
-
maxTimeout:
|
|
275
|
+
minTimeout: LOCK_RETRY_WAIT_MILLISECONDS,
|
|
276
|
+
maxTimeout: LOCK_RETRY_MAX_WAIT_MILLISECONDS
|
|
277
277
|
}
|
|
278
278
|
});
|
|
279
279
|
} catch {
|
|
@@ -511,7 +511,7 @@ async function deleteStoredClientCredentials({
|
|
|
511
511
|
|
|
512
512
|
// src/login/index.ts
|
|
513
513
|
var DEFAULT_AUTH_CLIENT_ID = "grwWZD5hUWGvb4V8ODBuOtXer3h0DBEZ2HR8aay6";
|
|
514
|
-
var
|
|
514
|
+
var TOKEN_REFRESH_BUFFER_MILLISECONDS = 5 * 60 * 1e3;
|
|
515
515
|
function createDebugLog(enabled) {
|
|
516
516
|
if (!enabled) {
|
|
517
517
|
return () => {
|
|
@@ -748,7 +748,7 @@ async function resolveOrRefreshToken(options = {}) {
|
|
|
748
748
|
return void 0;
|
|
749
749
|
}
|
|
750
750
|
const { jwt: storedJwt, refreshToken, expiresAt } = stored;
|
|
751
|
-
if (expiresAt > Date.now() +
|
|
751
|
+
if (expiresAt > Date.now() + TOKEN_REFRESH_BUFFER_MILLISECONDS) {
|
|
752
752
|
debugLog("Using cached token (still valid)");
|
|
753
753
|
return storedJwt;
|
|
754
754
|
}
|
|
@@ -1058,7 +1058,7 @@ async function setupClientCredentials({
|
|
|
1058
1058
|
|
|
1059
1059
|
// src/utils/constants.ts
|
|
1060
1060
|
var LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
|
|
1061
|
-
var
|
|
1061
|
+
var LOGIN_TIMEOUT_MILLISECONDS = 3e5;
|
|
1062
1062
|
|
|
1063
1063
|
// src/utils/getCallablePromise.ts
|
|
1064
1064
|
var getCallablePromise = () => {
|
|
@@ -1504,7 +1504,7 @@ async function runSignupOauthFlow(options) {
|
|
|
1504
1504
|
});
|
|
1505
1505
|
}
|
|
1506
1506
|
async function startPendingOauthFlow({
|
|
1507
|
-
timeoutMs =
|
|
1507
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1508
1508
|
pkceCredentials,
|
|
1509
1509
|
baseUrl,
|
|
1510
1510
|
entryPoint,
|
|
@@ -1658,7 +1658,7 @@ function writeHeadlessOauthStatus(message) {
|
|
|
1658
1658
|
`);
|
|
1659
1659
|
}
|
|
1660
1660
|
async function runOauthFlow({
|
|
1661
|
-
timeoutMs =
|
|
1661
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1662
1662
|
pkceCredentials,
|
|
1663
1663
|
baseUrl,
|
|
1664
1664
|
entryPoint,
|
|
@@ -1754,7 +1754,7 @@ async function readHeadlessCallbackUrl({
|
|
|
1754
1754
|
}
|
|
1755
1755
|
}
|
|
1756
1756
|
async function runHeadlessOauthFlow({
|
|
1757
|
-
timeoutMs =
|
|
1757
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1758
1758
|
pkceCredentials,
|
|
1759
1759
|
baseUrl,
|
|
1760
1760
|
entryPoint,
|
|
@@ -3625,7 +3625,7 @@ var feedbackResolver = defineResolver({
|
|
|
3625
3625
|
});
|
|
3626
3626
|
var DEFAULT_FEEDBACK_WEBHOOK_URL = "https://hooks.zapier.com/hooks/catch/20279515/uc98k9m/";
|
|
3627
3627
|
var MAX_RETRIES = 2;
|
|
3628
|
-
var
|
|
3628
|
+
var RETRY_DELAY_MILLISECONDS = 1e3;
|
|
3629
3629
|
function getFeedbackWebhookUrl() {
|
|
3630
3630
|
return process.env.ZAPIER_FEEDBACK_WEBHOOK_URL || DEFAULT_FEEDBACK_WEBHOOK_URL;
|
|
3631
3631
|
}
|
|
@@ -3639,7 +3639,7 @@ async function postWithRetry({
|
|
|
3639
3639
|
body
|
|
3640
3640
|
});
|
|
3641
3641
|
if (!response.ok && attemptsLeft > 1) {
|
|
3642
|
-
await new Promise((r) => setTimeout(r,
|
|
3642
|
+
await new Promise((r) => setTimeout(r, RETRY_DELAY_MILLISECONDS));
|
|
3643
3643
|
return postWithRetry({ body, attemptsLeft: attemptsLeft - 1 });
|
|
3644
3644
|
}
|
|
3645
3645
|
return response;
|
|
@@ -5073,7 +5073,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
|
|
|
5073
5073
|
// package.json with { type: 'json' }
|
|
5074
5074
|
var package_default = {
|
|
5075
5075
|
name: "@zapier/zapier-sdk-cli",
|
|
5076
|
-
version: "0.
|
|
5076
|
+
version: "0.67.0"};
|
|
5077
5077
|
|
|
5078
5078
|
// src/sdk.ts
|
|
5079
5079
|
var warnedDeprecatedMethods = /* @__PURE__ */ new Set();
|
|
@@ -163,8 +163,10 @@ declare const feedbackPlugin: _zapier_zapier_sdk.MethodPlugin<"feedback", {
|
|
|
163
163
|
baseUrl?: string | undefined;
|
|
164
164
|
trackingBaseUrl?: string | undefined;
|
|
165
165
|
maxNetworkRetries?: number | undefined;
|
|
166
|
+
maxNetworkRetryDelaySeconds?: number | undefined;
|
|
166
167
|
maxNetworkRetryDelayMs?: number | undefined;
|
|
167
168
|
maxConcurrentRequests?: number | undefined;
|
|
169
|
+
approvalTimeoutSeconds?: number | undefined;
|
|
168
170
|
approvalTimeoutMs?: number | undefined;
|
|
169
171
|
maxApprovalRetries?: number | undefined;
|
|
170
172
|
approvalMode?: "disabled" | "poll" | "throw" | undefined;
|
|
@@ -498,8 +500,10 @@ declare const signupPlugin: _zapier_zapier_sdk.MethodPlugin<"signup", {
|
|
|
498
500
|
baseUrl?: string | undefined;
|
|
499
501
|
trackingBaseUrl?: string | undefined;
|
|
500
502
|
maxNetworkRetries?: number | undefined;
|
|
503
|
+
maxNetworkRetryDelaySeconds?: number | undefined;
|
|
501
504
|
maxNetworkRetryDelayMs?: number | undefined;
|
|
502
505
|
maxConcurrentRequests?: number | undefined;
|
|
506
|
+
approvalTimeoutSeconds?: number | undefined;
|
|
503
507
|
approvalTimeoutMs?: number | undefined;
|
|
504
508
|
maxApprovalRetries?: number | undefined;
|
|
505
509
|
approvalMode?: "disabled" | "poll" | "throw" | undefined;
|
|
@@ -163,8 +163,10 @@ declare const feedbackPlugin: _zapier_zapier_sdk.MethodPlugin<"feedback", {
|
|
|
163
163
|
baseUrl?: string | undefined;
|
|
164
164
|
trackingBaseUrl?: string | undefined;
|
|
165
165
|
maxNetworkRetries?: number | undefined;
|
|
166
|
+
maxNetworkRetryDelaySeconds?: number | undefined;
|
|
166
167
|
maxNetworkRetryDelayMs?: number | undefined;
|
|
167
168
|
maxConcurrentRequests?: number | undefined;
|
|
169
|
+
approvalTimeoutSeconds?: number | undefined;
|
|
168
170
|
approvalTimeoutMs?: number | undefined;
|
|
169
171
|
maxApprovalRetries?: number | undefined;
|
|
170
172
|
approvalMode?: "disabled" | "poll" | "throw" | undefined;
|
|
@@ -498,8 +500,10 @@ declare const signupPlugin: _zapier_zapier_sdk.MethodPlugin<"signup", {
|
|
|
498
500
|
baseUrl?: string | undefined;
|
|
499
501
|
trackingBaseUrl?: string | undefined;
|
|
500
502
|
maxNetworkRetries?: number | undefined;
|
|
503
|
+
maxNetworkRetryDelaySeconds?: number | undefined;
|
|
501
504
|
maxNetworkRetryDelayMs?: number | undefined;
|
|
502
505
|
maxConcurrentRequests?: number | undefined;
|
|
506
|
+
approvalTimeoutSeconds?: number | undefined;
|
|
503
507
|
approvalTimeoutMs?: number | undefined;
|
|
504
508
|
maxApprovalRetries?: number | undefined;
|
|
505
509
|
approvalMode?: "disabled" | "poll" | "throw" | undefined;
|
package/dist/index.cjs
CHANGED
|
@@ -201,10 +201,10 @@ function hasLegacyJwtConfig() {
|
|
|
201
201
|
}
|
|
202
202
|
var SERVICE2 = "zapier-sdk-cache";
|
|
203
203
|
var CONFIG_KEY = "cache";
|
|
204
|
-
var
|
|
205
|
-
var
|
|
206
|
-
var
|
|
207
|
-
var
|
|
204
|
+
var LOCK_UPDATE_MILLISECONDS = 5e3;
|
|
205
|
+
var LOCK_STALE_MILLISECONDS = 1e4;
|
|
206
|
+
var LOCK_RETRY_WAIT_MILLISECONDS = 100;
|
|
207
|
+
var LOCK_RETRY_MAX_WAIT_MILLISECONDS = 1e3;
|
|
208
208
|
var LOCK_RETRY_COUNT = 120;
|
|
209
209
|
function keychainAccount(key) {
|
|
210
210
|
return crypto.createHash("sha256").update(key).digest("hex");
|
|
@@ -303,13 +303,13 @@ function createCache() {
|
|
|
303
303
|
let release = null;
|
|
304
304
|
try {
|
|
305
305
|
release = await lockfile__namespace.lock(lockTarget, {
|
|
306
|
-
stale:
|
|
307
|
-
update:
|
|
306
|
+
stale: LOCK_STALE_MILLISECONDS,
|
|
307
|
+
update: LOCK_UPDATE_MILLISECONDS,
|
|
308
308
|
retries: {
|
|
309
309
|
retries: LOCK_RETRY_COUNT,
|
|
310
310
|
factor: 1.2,
|
|
311
|
-
minTimeout:
|
|
312
|
-
maxTimeout:
|
|
311
|
+
minTimeout: LOCK_RETRY_WAIT_MILLISECONDS,
|
|
312
|
+
maxTimeout: LOCK_RETRY_MAX_WAIT_MILLISECONDS
|
|
313
313
|
}
|
|
314
314
|
});
|
|
315
315
|
} catch {
|
|
@@ -547,7 +547,7 @@ async function deleteStoredClientCredentials({
|
|
|
547
547
|
|
|
548
548
|
// src/login/index.ts
|
|
549
549
|
var DEFAULT_AUTH_CLIENT_ID = "grwWZD5hUWGvb4V8ODBuOtXer3h0DBEZ2HR8aay6";
|
|
550
|
-
var
|
|
550
|
+
var TOKEN_REFRESH_BUFFER_MILLISECONDS = 5 * 60 * 1e3;
|
|
551
551
|
function createDebugLog(enabled) {
|
|
552
552
|
if (!enabled) {
|
|
553
553
|
return () => {
|
|
@@ -784,7 +784,7 @@ async function resolveOrRefreshToken(options = {}) {
|
|
|
784
784
|
return void 0;
|
|
785
785
|
}
|
|
786
786
|
const { jwt: storedJwt, refreshToken, expiresAt } = stored;
|
|
787
|
-
if (expiresAt > Date.now() +
|
|
787
|
+
if (expiresAt > Date.now() + TOKEN_REFRESH_BUFFER_MILLISECONDS) {
|
|
788
788
|
debugLog("Using cached token (still valid)");
|
|
789
789
|
return storedJwt;
|
|
790
790
|
}
|
|
@@ -1099,7 +1099,7 @@ async function setupClientCredentials({
|
|
|
1099
1099
|
|
|
1100
1100
|
// src/utils/constants.ts
|
|
1101
1101
|
var LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
|
|
1102
|
-
var
|
|
1102
|
+
var LOGIN_TIMEOUT_MILLISECONDS = 3e5;
|
|
1103
1103
|
|
|
1104
1104
|
// src/utils/getCallablePromise.ts
|
|
1105
1105
|
var getCallablePromise = () => {
|
|
@@ -1545,7 +1545,7 @@ async function runSignupOauthFlow(options) {
|
|
|
1545
1545
|
});
|
|
1546
1546
|
}
|
|
1547
1547
|
async function startPendingOauthFlow({
|
|
1548
|
-
timeoutMs =
|
|
1548
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1549
1549
|
pkceCredentials,
|
|
1550
1550
|
baseUrl,
|
|
1551
1551
|
entryPoint,
|
|
@@ -1699,7 +1699,7 @@ function writeHeadlessOauthStatus(message) {
|
|
|
1699
1699
|
`);
|
|
1700
1700
|
}
|
|
1701
1701
|
async function runOauthFlow({
|
|
1702
|
-
timeoutMs =
|
|
1702
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1703
1703
|
pkceCredentials,
|
|
1704
1704
|
baseUrl,
|
|
1705
1705
|
entryPoint,
|
|
@@ -1795,7 +1795,7 @@ async function readHeadlessCallbackUrl({
|
|
|
1795
1795
|
}
|
|
1796
1796
|
}
|
|
1797
1797
|
async function runHeadlessOauthFlow({
|
|
1798
|
-
timeoutMs =
|
|
1798
|
+
timeoutMs = LOGIN_TIMEOUT_MILLISECONDS,
|
|
1799
1799
|
pkceCredentials,
|
|
1800
1800
|
baseUrl,
|
|
1801
1801
|
entryPoint,
|
|
@@ -3666,7 +3666,7 @@ var feedbackResolver = zapierSdk.defineResolver({
|
|
|
3666
3666
|
});
|
|
3667
3667
|
var DEFAULT_FEEDBACK_WEBHOOK_URL = "https://hooks.zapier.com/hooks/catch/20279515/uc98k9m/";
|
|
3668
3668
|
var MAX_RETRIES = 2;
|
|
3669
|
-
var
|
|
3669
|
+
var RETRY_DELAY_MILLISECONDS = 1e3;
|
|
3670
3670
|
function getFeedbackWebhookUrl() {
|
|
3671
3671
|
return process.env.ZAPIER_FEEDBACK_WEBHOOK_URL || DEFAULT_FEEDBACK_WEBHOOK_URL;
|
|
3672
3672
|
}
|
|
@@ -3680,7 +3680,7 @@ async function postWithRetry({
|
|
|
3680
3680
|
body
|
|
3681
3681
|
});
|
|
3682
3682
|
if (!response.ok && attemptsLeft > 1) {
|
|
3683
|
-
await new Promise((r) => setTimeout(r,
|
|
3683
|
+
await new Promise((r) => setTimeout(r, RETRY_DELAY_MILLISECONDS));
|
|
3684
3684
|
return postWithRetry({ body, attemptsLeft: attemptsLeft - 1 });
|
|
3685
3685
|
}
|
|
3686
3686
|
return response;
|
|
@@ -5109,7 +5109,7 @@ function collectDeprecationNoticeAndForward(event, onEvent) {
|
|
|
5109
5109
|
// package.json with { type: 'json' }
|
|
5110
5110
|
var package_default = {
|
|
5111
5111
|
name: "@zapier/zapier-sdk-cli",
|
|
5112
|
-
version: "0.
|
|
5112
|
+
version: "0.67.0"};
|
|
5113
5113
|
|
|
5114
5114
|
// src/sdk.ts
|
|
5115
5115
|
var warnedDeprecatedMethods = /* @__PURE__ */ new Set();
|
|
@@ -5192,7 +5192,7 @@ function createZapierCliSdk(options = {}) {
|
|
|
5192
5192
|
|
|
5193
5193
|
// package.json
|
|
5194
5194
|
var package_default2 = {
|
|
5195
|
-
version: "0.
|
|
5195
|
+
version: "0.67.0"};
|
|
5196
5196
|
|
|
5197
5197
|
// src/telemetry/builders.ts
|
|
5198
5198
|
function createCliBaseEvent(context = {}) {
|
package/dist/index.d.mts
CHANGED
package/dist/index.d.ts
CHANGED