@apps-in-toss/cli 2.7.1 → 2.9.0

package/dist/index.cjs

@@ -1539,15 +1539,56 @@ async function handleFetchResponse(response) {
 // src/utils/withRetry.ts
 init_cjs_shims();
 var import_promises6 = require("timers/promises");
+var WindowRetryStrategy = class {
+  constructor(delayMs = 1e4) {
+    this.delayMs = delayMs;
+  }
+  getDelayMs(attempt) {
+    return this.delayMs;
+  }
+};
+var ExponentialBackOffRetryStrategy = class {
+  constructor(options) {
+    this.options = options;
+    this.factor = options.factor ?? 2;
+  }
+  factor;
+  getDelayMs(attempt) {
+    return Math.min(this.options.initialDelayMs * this.factor ** attempt, this.options.maxDelayMs);
+  }
+};
 async function withRetry(fn, options = {}) {
-  const { maxRetries = 60, delayMs = 1e4, shouldRetryOnResult, shouldRetryOnError, onRetry } = options;
+  const {
+    maxRetries = 60,
+    initialDelayMs = 0,
+    retryStrategy = new WindowRetryStrategy(),
+    maxElapsedMs,
+    shouldRetryOnResult,
+    shouldRetryOnError,
+    onRetry
+  } = options;
   let attempt = 0;
+  const startedAt = Date.now();
+  const initialDelay = getBoundedDelayMs({ delay: initialDelayMs, maxElapsedMs, startedAt });
+  if (initialDelay < 0) {
+    throw new Error("\uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04\uC744 \uCD08\uACFC\uD588\uC5B4\uC694.");
+  }
+  if (initialDelay > 0) {
+    await (0, import_promises6.setTimeout)(initialDelay);
+  }
   while (attempt < maxRetries) {
+    if (maxElapsedMs != null && Date.now() - startedAt >= maxElapsedMs) {
+      break;
+    }
     try {
       const result = await fn();
       if (shouldRetryOnResult && shouldRetryOnResult(result)) {
+        const delay = getRetryDelayMs({ attempt, retryStrategy, maxElapsedMs, startedAt });
+        if (delay < 0) {
+          break;
+        }
         onRetry?.(attempt + 1, { result });
-        await (0, import_promises6.setTimeout)(delayMs);
+        await (0, import_promises6.setTimeout)(delay);
         attempt++;
         continue;
       }
@@ -1557,16 +1598,40 @@ async function withRetry(fn, options = {}) {
       if (!retryable) {
         throw error;
       }
+      const delay = getRetryDelayMs({ attempt, retryStrategy, maxElapsedMs, startedAt });
+      if (delay < 0) {
+        break;
+      }
       onRetry?.(attempt + 1, { error });
-      await (0, import_promises6.setTimeout)(delayMs);
+      await (0, import_promises6.setTimeout)(delay);
       attempt++;
     }
   }
   throw new Error("\uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04\uC744 \uCD08\uACFC\uD588\uC5B4\uC694.");
 }
+function getRetryDelayMs(params) {
+  const delay = params.retryStrategy.getDelayMs(params.attempt);
+  return getBoundedDelayMs({ delay, maxElapsedMs: params.maxElapsedMs, startedAt: params.startedAt });
+}
+function getBoundedDelayMs(params) {
+  if (params.maxElapsedMs == null) {
+    return params.delay;
+  }
+  const remainingMs = params.maxElapsedMs - (Date.now() - params.startedAt);
+  if (remainingMs <= 0) {
+    return -1;
+  }
+  return Math.min(params.delay, remainingMs);
+}
 
 // src/utils/upload.ts
 var debug2 = (0, import_debug2.default)("cli:deploy");
+var DEFAULT_DEPLOY_TIMEOUT_SECONDS = 100;
+var MIN_DEPLOY_TIMEOUT_SECONDS = 10;
+var MAX_DEPLOY_TIMEOUT_SECONDS = 300;
+var DEPLOY_STATUS_INITIAL_POLLING_DELAY_MS = 5e3;
+var DEPLOY_STATUS_INITIAL_RETRY_INTERVAL_MS = 1e4;
+var DEPLOY_STATUS_MAX_POLLING_INTERVAL_MS = 3e4;
 async function uploadArtifact(config) {
   debug2("uploadArtifact", config);
   return flowAsync(uploadStart(), uploadArtifactToRemote(), uploadComplete(), checkBundleStatus())(config);
@@ -1631,9 +1696,19 @@ function uploadComplete() {
     return config;
   };
 }
-function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
+function checkBundleStatus(option = {}) {
+  const {
+    initialDelayMs = DEPLOY_STATUS_INITIAL_POLLING_DELAY_MS,
+    maxRetries = Number.POSITIVE_INFINITY,
+    retryStrategy = new ExponentialBackOffRetryStrategy({
+      initialDelayMs: DEPLOY_STATUS_INITIAL_RETRY_INTERVAL_MS,
+      maxDelayMs: DEPLOY_STATUS_MAX_POLLING_INTERVAL_MS
+    })
+  } = option;
   return async (config) => {
     const baseUrl = config.baseUrl ?? DEFAULT_API_BASE_URL;
+    const timeoutSeconds = config.timeoutSeconds ?? DEFAULT_DEPLOY_TIMEOUT_SECONDS;
+    const timeoutMs = timeoutSeconds * 1e3;
     function assertBuildNotFailed(config2, reviewStatus2) {
       if (reviewStatus2 === "BUILD_FAILED") {
         throw new Error(
@@ -1657,7 +1732,9 @@ function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
     }
     const reviewStatus = await withRetry(pollBundleStatus, {
       maxRetries,
-      delayMs,
+      initialDelayMs,
+      maxElapsedMs: timeoutMs,
+      retryStrategy,
       shouldRetryOnResult: (reviewStatus2) => reviewStatus2 === "BUILDING" || reviewStatus2 === "PREPARE",
       shouldRetryOnError: () => false,
       onRetry: (attempt, info) => debug2("checkBundleStatus: retry", { attempt, ...info })
@@ -1667,6 +1744,21 @@ function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
 }
 
 // src/DeployCommand.ts
+function parseDeployTimeoutSeconds(timeout) {
+  if (timeout == null) {
+    return DEFAULT_DEPLOY_TIMEOUT_SECONDS;
+  }
+  const timeoutSeconds = Number(timeout);
+  if (!Number.isInteger(timeoutSeconds)) {
+    throw new Error("--timeout\uC740 \uC815\uC218(\uCD08)\uB85C \uC785\uB825\uD574\uC8FC\uC138\uC694.");
+  }
+  if (timeoutSeconds < MIN_DEPLOY_TIMEOUT_SECONDS || timeoutSeconds > MAX_DEPLOY_TIMEOUT_SECONDS) {
+    throw new Error(
+      `--timeout\uC740 ${MIN_DEPLOY_TIMEOUT_SECONDS}\uCD08 \uC774\uC0C1 ${MAX_DEPLOY_TIMEOUT_SECONDS}\uCD08 \uC774\uD558\uB85C \uC785\uB825\uD574\uC8FC\uC138\uC694.`
+    );
+  }
+  return timeoutSeconds;
+}
 var DeployCommand = class extends import_clipanion2.Command {
   static paths = [["deploy"]];
   static usage = import_clipanion2.Command.Usage({
@@ -1677,6 +1769,7 @@ var DeployCommand = class extends import_clipanion2.Command {
       ["\uD2B9\uC815 .ait \uD30C\uC77C \uBC30\uD3EC", "ait deploy --location ./dist/my-app.ait"],
       ["\uD504\uB85C\uD544\uC5D0 \uC800\uC7A5\uB41C \uD1A0\uD070\uC73C\uB85C \uBC30\uD3EC", "ait deploy --profile dev"],
       ["\uCD9C\uC2DC \uBA54\uBAA8\uC640 \uD568\uAED8 \uBC30\uD3EC", 'ait deploy -m "\uCD9C\uC2DC \uBA54\uBAA8(\uCD5C\uB300 1000\uC790)"'],
+      ["\uBC30\uD3EC \uC0C1\uD0DC \uD655\uC778 \uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04 \uC9C0\uC815", "ait deploy --timeout 100"],
       ["\uBC30\uD3EC \uACB0\uACFC scheme\uB9CC \uCD9C\uB825", "ait deploy --scheme-only"]
     ]
   });
@@ -1708,6 +1801,10 @@ var DeployCommand = class extends import_clipanion2.Command {
     required: false,
     description: "\uCD9C\uC2DC \uBA54\uBAA8\uB97C \uC785\uB825\uD574\uC694. \uCD5C\uB300 1000\uC790\uAE4C\uC9C0 \uC785\uB825\uD560 \uC218 \uC788\uC5B4\uC694."
   });
+  timeout = import_clipanion2.Option.String("--timeout", {
+    required: false,
+    description: `\uBC30\uD3EC \uC0C1\uD0DC \uD655\uC778\uC744 \uAE30\uB2E4\uB9B4 \uCD5C\uB300 \uC2DC\uAC04(\uCD08)\uC744 \uC785\uB825\uD574\uC694. \uAE30\uBCF8\uAC12\uC740 ${DEFAULT_DEPLOY_TIMEOUT_SECONDS}\uCD08, \uCD5C\uB300\uAC12\uC740 ${MAX_DEPLOY_TIMEOUT_SECONDS}\uCD08\uC608\uC694.`
+  });
   async execute() {
     const baseUrl = this.baseUrl;
     const profile = this.profile || this.workspace || "default";
@@ -1722,6 +1819,7 @@ var DeployCommand = class extends import_clipanion2.Command {
       if (this.memo != null && this.memo.length > 1e3) {
         throw new Error("memo\uB294 \uCD5C\uB300 1000\uC790\uAE4C\uC9C0 \uC785\uB825\uD560 \uC218 \uC788\uC5B4\uC694.");
       }
+      const timeoutSeconds = parseDeployTimeoutSeconds(this.timeout);
       const resolvedArtifactPath = this.getArtifactPath(this.location);
       const buffer = import_fs3.default.readFileSync(resolvedArtifactPath);
       const format = import_ait_format.AppsInTossBundle.detect(buffer);
@@ -1763,7 +1861,8 @@ var DeployCommand = class extends import_clipanion2.Command {
           deploymentId,
           apiKey,
           memo: this.memo,
-          baseUrl
+          baseUrl,
+          timeoutSeconds
         });
       } else {
         await p4.tasks([
@@ -1776,7 +1875,8 @@ var DeployCommand = class extends import_clipanion2.Command {
                 deploymentId,
                 apiKey,
                 memo: this.memo,
-                baseUrl
+                baseUrl,
+                timeoutSeconds
               });
               return `${colorAppName} \uBC30\uD3EC\uAC00 \uC644\uB8CC\uB418\uC5C8\uC5B4\uC694`;
             }

package/dist/index.js

@@ -1531,15 +1531,56 @@ async function handleFetchResponse(response) {
 // src/utils/withRetry.ts
 init_esm_shims();
 import { setTimeout as sleep } from "node:timers/promises";
+var WindowRetryStrategy = class {
+  constructor(delayMs = 1e4) {
+    this.delayMs = delayMs;
+  }
+  getDelayMs(attempt) {
+    return this.delayMs;
+  }
+};
+var ExponentialBackOffRetryStrategy = class {
+  constructor(options) {
+    this.options = options;
+    this.factor = options.factor ?? 2;
+  }
+  factor;
+  getDelayMs(attempt) {
+    return Math.min(this.options.initialDelayMs * this.factor ** attempt, this.options.maxDelayMs);
+  }
+};
 async function withRetry(fn, options = {}) {
-  const { maxRetries = 60, delayMs = 1e4, shouldRetryOnResult, shouldRetryOnError, onRetry } = options;
+  const {
+    maxRetries = 60,
+    initialDelayMs = 0,
+    retryStrategy = new WindowRetryStrategy(),
+    maxElapsedMs,
+    shouldRetryOnResult,
+    shouldRetryOnError,
+    onRetry
+  } = options;
   let attempt = 0;
+  const startedAt = Date.now();
+  const initialDelay = getBoundedDelayMs({ delay: initialDelayMs, maxElapsedMs, startedAt });
+  if (initialDelay < 0) {
+    throw new Error("\uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04\uC744 \uCD08\uACFC\uD588\uC5B4\uC694.");
+  }
+  if (initialDelay > 0) {
+    await sleep(initialDelay);
+  }
   while (attempt < maxRetries) {
+    if (maxElapsedMs != null && Date.now() - startedAt >= maxElapsedMs) {
+      break;
+    }
     try {
       const result = await fn();
       if (shouldRetryOnResult && shouldRetryOnResult(result)) {
+        const delay = getRetryDelayMs({ attempt, retryStrategy, maxElapsedMs, startedAt });
+        if (delay < 0) {
+          break;
+        }
         onRetry?.(attempt + 1, { result });
-        await sleep(delayMs);
+        await sleep(delay);
         attempt++;
         continue;
       }
@@ -1549,16 +1590,40 @@ async function withRetry(fn, options = {}) {
       if (!retryable) {
         throw error;
       }
+      const delay = getRetryDelayMs({ attempt, retryStrategy, maxElapsedMs, startedAt });
+      if (delay < 0) {
+        break;
+      }
       onRetry?.(attempt + 1, { error });
-      await sleep(delayMs);
+      await sleep(delay);
       attempt++;
     }
   }
   throw new Error("\uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04\uC744 \uCD08\uACFC\uD588\uC5B4\uC694.");
 }
+function getRetryDelayMs(params) {
+  const delay = params.retryStrategy.getDelayMs(params.attempt);
+  return getBoundedDelayMs({ delay, maxElapsedMs: params.maxElapsedMs, startedAt: params.startedAt });
+}
+function getBoundedDelayMs(params) {
+  if (params.maxElapsedMs == null) {
+    return params.delay;
+  }
+  const remainingMs = params.maxElapsedMs - (Date.now() - params.startedAt);
+  if (remainingMs <= 0) {
+    return -1;
+  }
+  return Math.min(params.delay, remainingMs);
+}
 
 // src/utils/upload.ts
 var debug2 = (0, import_debug2.default)("cli:deploy");
+var DEFAULT_DEPLOY_TIMEOUT_SECONDS = 100;
+var MIN_DEPLOY_TIMEOUT_SECONDS = 10;
+var MAX_DEPLOY_TIMEOUT_SECONDS = 300;
+var DEPLOY_STATUS_INITIAL_POLLING_DELAY_MS = 5e3;
+var DEPLOY_STATUS_INITIAL_RETRY_INTERVAL_MS = 1e4;
+var DEPLOY_STATUS_MAX_POLLING_INTERVAL_MS = 3e4;
 async function uploadArtifact(config) {
   debug2("uploadArtifact", config);
   return flowAsync(uploadStart(), uploadArtifactToRemote(), uploadComplete(), checkBundleStatus())(config);
@@ -1623,9 +1688,19 @@ function uploadComplete() {
     return config;
   };
 }
-function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
+function checkBundleStatus(option = {}) {
+  const {
+    initialDelayMs = DEPLOY_STATUS_INITIAL_POLLING_DELAY_MS,
+    maxRetries = Number.POSITIVE_INFINITY,
+    retryStrategy = new ExponentialBackOffRetryStrategy({
+      initialDelayMs: DEPLOY_STATUS_INITIAL_RETRY_INTERVAL_MS,
+      maxDelayMs: DEPLOY_STATUS_MAX_POLLING_INTERVAL_MS
+    })
+  } = option;
   return async (config) => {
     const baseUrl = config.baseUrl ?? DEFAULT_API_BASE_URL;
+    const timeoutSeconds = config.timeoutSeconds ?? DEFAULT_DEPLOY_TIMEOUT_SECONDS;
+    const timeoutMs = timeoutSeconds * 1e3;
     function assertBuildNotFailed(config2, reviewStatus2) {
       if (reviewStatus2 === "BUILD_FAILED") {
         throw new Error(
@@ -1649,7 +1724,9 @@ function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
     }
     const reviewStatus = await withRetry(pollBundleStatus, {
       maxRetries,
-      delayMs,
+      initialDelayMs,
+      maxElapsedMs: timeoutMs,
+      retryStrategy,
       shouldRetryOnResult: (reviewStatus2) => reviewStatus2 === "BUILDING" || reviewStatus2 === "PREPARE",
       shouldRetryOnError: () => false,
       onRetry: (attempt, info) => debug2("checkBundleStatus: retry", { attempt, ...info })
@@ -1659,6 +1736,21 @@ function checkBundleStatus(delayMs = 1e4, maxRetries = 10) {
 }
 
 // src/DeployCommand.ts
+function parseDeployTimeoutSeconds(timeout) {
+  if (timeout == null) {
+    return DEFAULT_DEPLOY_TIMEOUT_SECONDS;
+  }
+  const timeoutSeconds = Number(timeout);
+  if (!Number.isInteger(timeoutSeconds)) {
+    throw new Error("--timeout\uC740 \uC815\uC218(\uCD08)\uB85C \uC785\uB825\uD574\uC8FC\uC138\uC694.");
+  }
+  if (timeoutSeconds < MIN_DEPLOY_TIMEOUT_SECONDS || timeoutSeconds > MAX_DEPLOY_TIMEOUT_SECONDS) {
+    throw new Error(
+      `--timeout\uC740 ${MIN_DEPLOY_TIMEOUT_SECONDS}\uCD08 \uC774\uC0C1 ${MAX_DEPLOY_TIMEOUT_SECONDS}\uCD08 \uC774\uD558\uB85C \uC785\uB825\uD574\uC8FC\uC138\uC694.`
+    );
+  }
+  return timeoutSeconds;
+}
 var DeployCommand = class extends Command2 {
   static paths = [["deploy"]];
   static usage = Command2.Usage({
@@ -1669,6 +1761,7 @@ var DeployCommand = class extends Command2 {
       ["\uD2B9\uC815 .ait \uD30C\uC77C \uBC30\uD3EC", "ait deploy --location ./dist/my-app.ait"],
       ["\uD504\uB85C\uD544\uC5D0 \uC800\uC7A5\uB41C \uD1A0\uD070\uC73C\uB85C \uBC30\uD3EC", "ait deploy --profile dev"],
       ["\uCD9C\uC2DC \uBA54\uBAA8\uC640 \uD568\uAED8 \uBC30\uD3EC", 'ait deploy -m "\uCD9C\uC2DC \uBA54\uBAA8(\uCD5C\uB300 1000\uC790)"'],
+      ["\uBC30\uD3EC \uC0C1\uD0DC \uD655\uC778 \uCD5C\uB300 \uB300\uAE30\uC2DC\uAC04 \uC9C0\uC815", "ait deploy --timeout 100"],
       ["\uBC30\uD3EC \uACB0\uACFC scheme\uB9CC \uCD9C\uB825", "ait deploy --scheme-only"]
     ]
   });
@@ -1700,6 +1793,10 @@ var DeployCommand = class extends Command2 {
     required: false,
     description: "\uCD9C\uC2DC \uBA54\uBAA8\uB97C \uC785\uB825\uD574\uC694. \uCD5C\uB300 1000\uC790\uAE4C\uC9C0 \uC785\uB825\uD560 \uC218 \uC788\uC5B4\uC694."
   });
+  timeout = Option.String("--timeout", {
+    required: false,
+    description: `\uBC30\uD3EC \uC0C1\uD0DC \uD655\uC778\uC744 \uAE30\uB2E4\uB9B4 \uCD5C\uB300 \uC2DC\uAC04(\uCD08)\uC744 \uC785\uB825\uD574\uC694. \uAE30\uBCF8\uAC12\uC740 ${DEFAULT_DEPLOY_TIMEOUT_SECONDS}\uCD08, \uCD5C\uB300\uAC12\uC740 ${MAX_DEPLOY_TIMEOUT_SECONDS}\uCD08\uC608\uC694.`
+  });
   async execute() {
     const baseUrl = this.baseUrl;
     const profile = this.profile || this.workspace || "default";
@@ -1714,6 +1811,7 @@ var DeployCommand = class extends Command2 {
       if (this.memo != null && this.memo.length > 1e3) {
         throw new Error("memo\uB294 \uCD5C\uB300 1000\uC790\uAE4C\uC9C0 \uC785\uB825\uD560 \uC218 \uC788\uC5B4\uC694.");
       }
+      const timeoutSeconds = parseDeployTimeoutSeconds(this.timeout);
       const resolvedArtifactPath = this.getArtifactPath(this.location);
       const buffer = fs8.readFileSync(resolvedArtifactPath);
       const format = AppsInTossBundle.detect(buffer);
@@ -1755,7 +1853,8 @@ var DeployCommand = class extends Command2 {
           deploymentId,
           apiKey,
           memo: this.memo,
-          baseUrl
+          baseUrl,
+          timeoutSeconds
         });
       } else {
         await p4.tasks([
@@ -1768,7 +1867,8 @@ var DeployCommand = class extends Command2 {
                 deploymentId,
                 apiKey,
                 memo: this.memo,
-                baseUrl
+                baseUrl,
+                timeoutSeconds
               });
               return `${colorAppName} \uBC30\uD3EC\uAC00 \uC644\uB8CC\uB418\uC5C8\uC5B4\uC694`;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apps-in-toss/cli",
   "type": "module",
-  "version": "2.7.1",
+  "version": "2.9.0",
   "description": "CLI for Apps In Toss",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@apps-in-toss/ait-format": "1.0.0",
-    "@apps-in-toss/plugins": "2.7.1",
-    "@apps-in-toss/web-config": "2.7.1",
+    "@apps-in-toss/plugins": "2.9.0",
+    "@apps-in-toss/web-config": "2.9.0",
     "@clack/prompts": "^0.10.0",
     "@granite-js/utils": "1.0.20",
     "@sentry/cli": "^2.46.0",