shipthis 0.1.50 → 0.1.52

package/dist/{baseCommand-C7OdounZ.js → baseCommand-CpAJaJoG.js}

@@ -5,13 +5,13 @@ import { Flags, Command } from '@oclif/core';
 import chalk from 'chalk';
 import axios from 'axios';
 import { DateTime } from 'luxon';
-import * as expo from '@expo/apple-utils/build/index.js';
 import 'node:crypto';
 import 'node:readline';
 import 'node:url';
 import 'readline-sync';
 import 'isomorphic-git';
 import { getMajorVersion, loadExportPresets, findPreset, getBasePreset, saveExportPresets, mergePresets, ConfigFile } from 'godot-export-presets';
+import * as expo from '@expo/apple-utils/build/index.js';
 import { QueryClient } from '@tanstack/react-query';
 import 'react';
 import 'uuid';
@@ -168,232 +168,6 @@ function getShortTimeDelta(start, end) {
   });
 }
 
-let currentAuthToken;
-function setAuthToken(token) {
-  currentAuthToken = token;
-}
-function getAuthToken() {
-  return currentAuthToken;
-}
-function getAuthedHeaders() {
-  return {
-    Authorization: `Bearer ${currentAuthToken}`
-  };
-}
-async function createProject(props) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/projects`, props, opt);
-  return castObjectDates(data);
-}
-async function getProject(projectId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/projects/${projectId}`, opt);
-  return castObjectDates(data);
-}
-async function getProjects(params) {
-  const headers = getAuthedHeaders();
-  const opt = { headers, params };
-  const { data: rawData } = await axios.get(`${API_URL}/projects`, opt);
-  const data = castArrayObjectDates(rawData.data);
-  return {
-    data,
-    pageCount: rawData.pageCount
-  };
-}
-async function updateProject(projectId, edits) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.put(`${API_URL}/projects/${projectId}`, edits, opt);
-  return castObjectDates(data);
-}
-async function getProjectPlatformProgress(projectId, platform) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/projects/${projectId}/${platform}/progress`, opt);
-  return data;
-}
-async function getNewUploadTicket(projectId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/upload/${projectId}/url`, {}, opt);
-  return data;
-}
-async function startJobsFromUpload(uploadTicketId, startOptions) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/upload/start/${uploadTicketId}`, startOptions, opt);
-  return castArrayObjectDates(data);
-}
-async function getProjectJobs(projectId, params) {
-  const headers = getAuthedHeaders();
-  const opt = { headers, params };
-  const { data: rawData } = await axios.get(`${API_URL}/projects/${projectId}/jobs`, opt);
-  const data = castArrayObjectDates(rawData.data);
-  return {
-    data,
-    pageCount: rawData.pageCount
-  };
-}
-async function getJob(jobId, projectId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/projects/${projectId}/jobs/${jobId}`, opt);
-  return castJobDates(data);
-}
-async function getSingleUseUrl(destination) {
-  const headers = await getAuthedHeaders();
-  const { data } = await axios.post(`${API_URL}/me/otp`, {}, { headers });
-  const queryString = Object.entries({ ...data, destination }).map(([key, value]) => `${key}=${encodeURIComponent(`${value}`)}`).join("&");
-  const url = `${WEB_URL}exchange/?${queryString}`;
-  return url;
-}
-async function getShortAuthRequiredUrl(destination) {
-  const headers = await getAuthedHeaders();
-  const { data } = await axios.post(
-    `${API_URL}/me/login-link`,
-    {
-      destination,
-      webUrl: WEB_URL
-    },
-    { headers }
-  );
-  return data.url;
-}
-async function getBuild(projectId, buildId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/projects/${projectId}/builds/${buildId}`, opt);
-  return castObjectDates(data);
-}
-async function getSelf() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/me`, opt);
-  return castObjectDates(data);
-}
-async function getTerms() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/me/terms`, opt);
-  return {
-    // Any agreements which have changed since the user last accepted terms
-    changes: castArrayObjectDates(data.changes),
-    // Current versions of any agreements
-    current: castArrayObjectDates(data.current)
-  };
-}
-async function acceptTerms() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/me/terms`, {}, opt);
-  return castObjectDates(data);
-}
-async function getGoogleAuthUrl(projectId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const web = encodeURIComponent(new URL("/google/redirect/", WEB_URL).href);
-  const url = `${API_URL}/projects/${projectId}/credentials/android/key/connect`;
-  const { data } = await axios.get(`${url}?redirectUri=${web}`, opt);
-  const response = data;
-  return await getShortAuthRequiredUrl(response.url);
-}
-async function disconnectGoogle() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  await axios.delete(`${API_URL}/me/google/connect`, opt);
-}
-async function getGoogleStatus() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.get(`${API_URL}/me/google/status`, opt);
-  return castObjectDates(data, ["orgCreatedAt"]);
-}
-async function enforcePolicy() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/me/google/policy`, null, opt);
-  return castObjectDates(data, ["orgCreatedAt"]);
-}
-async function revokePolicy() {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.delete(`${API_URL}/me/google/policy`, opt);
-  return castObjectDates(data, ["orgCreatedAt"]);
-}
-async function inviteServiceAccount(projectId, developerId) {
-  try {
-    const headers = getAuthedHeaders();
-    const { data } = await axios.post(
-      `${API_URL}/projects/${projectId}/credentials/android/key/invite/`,
-      { developerId },
-      {
-        headers
-      }
-    );
-    return data;
-  } catch (error) {
-    console.error("inviteServiceAccount Error", error);
-    throw error;
-  }
-}
-async function downloadBuildById(projectId, buildId, fileName) {
-  const build = await getBuild(projectId, buildId);
-  const { url } = build;
-  const writer = fs.createWriteStream(fileName);
-  const response = await axios({
-    method: "GET",
-    responseType: "stream",
-    url
-  });
-  response.data.pipe(writer);
-  return new Promise((resolve, reject) => {
-    writer.on("finish", resolve);
-    writer.on("error", reject);
-  });
-}
-const APIKEYS_DATE_FIELDS = ["createdAt", "updatedAt", "expiresAt", "lastUsedAt", "revokedAt"];
-async function getAPIKeys(params) {
-  const headers = getAuthedHeaders();
-  const opt = { headers, params };
-  const { data: rawData } = await axios.get(`${API_URL}/me/keys`, opt);
-  const data = castArrayObjectDates(rawData.data, APIKEYS_DATE_FIELDS);
-  return {
-    data,
-    pageCount: rawData.pageCount
-  };
-}
-async function createAPIKey(createProps) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  const { data } = await axios.post(`${API_URL}/me/keys`, createProps, opt);
-  return castObjectDates(data, APIKEYS_DATE_FIELDS);
-}
-async function revokeAPIKey(apiKeyId) {
-  const headers = getAuthedHeaders();
-  const opt = { headers };
-  await axios.delete(`${API_URL}/me/keys/${apiKeyId}`, opt);
-}
-
-const defaultExport = expo.default;
-const {
-  ApiKey,
-  ApiKeyType,
-  App,
-  Auth,
-  BetaGroup,
-  BundleId,
-  CapabilityType,
-  CapabilityTypeOption,
-  Certificate,
-  CertificateType,
-  Profile,
-  ProfileType,
-  Session,
-  UserRole
-} = defaultExport;
-
 var Platform = /* @__PURE__ */ ((Platform2) => {
   Platform2["ANDROID"] = "ANDROID";
   Platform2["IOS"] = "IOS";
@@ -436,6 +210,77 @@ var BuildType = /* @__PURE__ */ ((BuildType2) => {
   return BuildType2;
 })(BuildType || {});
 
+class HandledError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "HandledError";
+  }
+}
+
+function getShortUUID(originalUuid) {
+  return originalUuid.slice(0, 8);
+}
+
+function isNetworkError(exception) {
+  if (!axios.isAxiosError(exception)) return false;
+  return ["ECONNABORTED", "ERR_NETWORK"].includes(`${exception.code}`);
+}
+function getErrorMessage(error) {
+  try {
+    if (isNetworkError(error)) {
+      return "Please check your internet connection.";
+    }
+    const data = error?.response?.data;
+    const apiValidation = Array.isArray(data) ? data.map((r) => "message" in r ? `Error - ${r.message}` : r.toString()).join(" ") : "";
+    const apiErr = error?.response?.data?.error || "";
+    const apiMsg = `${apiErr}${apiValidation ? " " + apiValidation : ""}`;
+    if (apiMsg.length === 0) {
+      return "message" in error ? error.message : error.toString();
+    }
+    return apiMsg;
+  } catch {
+    return error ? error.toString() : "Error";
+  }
+}
+function toHandledError(error, context = {}) {
+  if (isNetworkError(error)) {
+    return new HandledError("Please check your internet connection.");
+  }
+  const { projectId } = context || {};
+  const statusCode = error?.response?.status || error.status;
+  switch (statusCode) {
+    case 404: {
+      const msg = projectId ? `Game "${getShortUUID(projectId)}" not found. You may not have access to this game.
+Run \`shipthis game list\` to see your games.` : "Requested resource not found.";
+      return new HandledError(msg);
+    }
+    case 401:
+      return new HandledError(`Unauthorized. Please run \`shipthis login\` to log in.`);
+    case 500:
+      return new HandledError(`Server error. Please try again later.`);
+    default:
+      return error;
+  }
+}
+
+const defaultExport = expo.default;
+const {
+  ApiKey,
+  ApiKeyType,
+  App,
+  Auth,
+  BetaGroup,
+  BundleId,
+  CapabilityType,
+  CapabilityTypeOption,
+  Certificate,
+  CertificateType,
+  Profile,
+  ProfileType,
+  Session,
+  UserRole
+} = defaultExport;
+
 const ENTITLEMENT_KEY_TO_CAPABILITY = {
   "com.apple.developer.applesignin": { name: "Sign in with Apple", type: CapabilityType.APPLE_ID_AUTH },
   "com.apple.developer.game-center": { name: "Game Center", type: CapabilityType.GAME_CENTER },
@@ -692,6 +537,222 @@ const queryClient = new QueryClient({
   }
 });
 
+let currentAuthToken;
+function setAuthToken(token) {
+  currentAuthToken = token;
+}
+function getAuthToken() {
+  return currentAuthToken;
+}
+function getAuthedHeaders() {
+  return {
+    Authorization: `Bearer ${currentAuthToken}`
+  };
+}
+async function createProject(props) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/projects`, props, opt);
+  return castObjectDates(data);
+}
+async function getProject(projectId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  try {
+    const { data } = await axios.get(`${API_URL}/projects/${projectId}`, opt);
+    return castObjectDates(data);
+  } catch (error) {
+    throw toHandledError(error, { projectId });
+  }
+}
+async function getProjects(params) {
+  const headers = getAuthedHeaders();
+  const opt = { headers, params };
+  const { data: rawData } = await axios.get(`${API_URL}/projects`, opt);
+  const data = castArrayObjectDates(rawData.data);
+  return {
+    data,
+    pageCount: rawData.pageCount
+  };
+}
+async function updateProject(projectId, edits) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.put(`${API_URL}/projects/${projectId}`, edits, opt);
+  return castObjectDates(data);
+}
+async function getProjectPlatformProgress(projectId, platform) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.get(`${API_URL}/projects/${projectId}/${platform}/progress`, opt);
+  return data;
+}
+async function getNewUploadTicket(projectId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/upload/${projectId}/url`, {}, opt);
+  return data;
+}
+async function startJobsFromUpload(uploadTicketId, startOptions) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/upload/start/${uploadTicketId}`, startOptions, opt);
+  return castArrayObjectDates(data);
+}
+async function getProjectJobs(projectId, params) {
+  const headers = getAuthedHeaders();
+  const opt = { headers, params };
+  const { data: rawData } = await axios.get(`${API_URL}/projects/${projectId}/jobs`, opt);
+  const data = castArrayObjectDates(rawData.data);
+  return {
+    data,
+    pageCount: rawData.pageCount
+  };
+}
+async function getJob(jobId, projectId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.get(`${API_URL}/projects/${projectId}/jobs/${jobId}`, opt);
+  return castJobDates(data);
+}
+async function getSingleUseUrl(destination) {
+  const headers = await getAuthedHeaders();
+  const { data } = await axios.post(`${API_URL}/me/otp`, {}, { headers });
+  const queryString = Object.entries({ ...data, destination }).map(([key, value]) => `${key}=${encodeURIComponent(`${value}`)}`).join("&");
+  const url = `${WEB_URL}exchange/?${queryString}`;
+  return url;
+}
+async function getShortAuthRequiredUrl(destination) {
+  const headers = await getAuthedHeaders();
+  const { data } = await axios.post(
+    `${API_URL}/me/login-link`,
+    {
+      destination,
+      webUrl: WEB_URL
+    },
+    { headers }
+  );
+  return data.url;
+}
+async function getBuild(projectId, buildId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.get(`${API_URL}/projects/${projectId}/builds/${buildId}`, opt);
+  return castObjectDates(data);
+}
+async function getSelf() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  try {
+    const { data } = await axios.get(`${API_URL}/me`, opt);
+    return castObjectDates(data);
+  } catch (error) {
+    throw toHandledError(error);
+  }
+}
+async function getTerms() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.get(`${API_URL}/me/terms`, opt);
+  return {
+    // Any agreements which have changed since the user last accepted terms
+    changes: castArrayObjectDates(data.changes),
+    // Current versions of any agreements
+    current: castArrayObjectDates(data.current)
+  };
+}
+async function acceptTerms() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/me/terms`, {}, opt);
+  return castObjectDates(data);
+}
+async function getGoogleAuthUrl(projectId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const web = encodeURIComponent(new URL("/google/redirect/", WEB_URL).href);
+  const url = `${API_URL}/projects/${projectId}/credentials/android/key/connect`;
+  const { data } = await axios.get(`${url}?redirectUri=${web}`, opt);
+  const response = data;
+  return await getShortAuthRequiredUrl(response.url);
+}
+async function disconnectGoogle() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  await axios.delete(`${API_URL}/me/google/connect`, opt);
+}
+async function getGoogleStatus() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.get(`${API_URL}/me/google/status`, opt);
+  return castObjectDates(data, ["orgCreatedAt"]);
+}
+async function enforcePolicy() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/me/google/policy`, null, opt);
+  return castObjectDates(data, ["orgCreatedAt"]);
+}
+async function revokePolicy() {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.delete(`${API_URL}/me/google/policy`, opt);
+  return castObjectDates(data, ["orgCreatedAt"]);
+}
+async function inviteServiceAccount(projectId, developerId) {
+  try {
+    const headers = getAuthedHeaders();
+    const { data } = await axios.post(
+      `${API_URL}/projects/${projectId}/credentials/android/key/invite/`,
+      { developerId },
+      {
+        headers
+      }
+    );
+    return data;
+  } catch (error) {
+    console.error("inviteServiceAccount Error", error);
+    throw error;
+  }
+}
+async function downloadBuildById(projectId, buildId, fileName) {
+  const build = await getBuild(projectId, buildId);
+  const { url } = build;
+  const writer = fs.createWriteStream(fileName);
+  const response = await axios({
+    method: "GET",
+    responseType: "stream",
+    url
+  });
+  response.data.pipe(writer);
+  return new Promise((resolve, reject) => {
+    writer.on("finish", resolve);
+    writer.on("error", reject);
+  });
+}
+const APIKEYS_DATE_FIELDS = ["createdAt", "updatedAt", "expiresAt", "lastUsedAt", "revokedAt"];
+async function getAPIKeys(params) {
+  const headers = getAuthedHeaders();
+  const opt = { headers, params };
+  const { data: rawData } = await axios.get(`${API_URL}/me/keys`, opt);
+  const data = castArrayObjectDates(rawData.data, APIKEYS_DATE_FIELDS);
+  return {
+    data,
+    pageCount: rawData.pageCount
+  };
+}
+async function createAPIKey(createProps) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  const { data } = await axios.post(`${API_URL}/me/keys`, createProps, opt);
+  return castObjectDates(data, APIKEYS_DATE_FIELDS);
+}
+async function revokeAPIKey(apiKeyId) {
+  const headers = getAuthedHeaders();
+  const opt = { headers };
+  await axios.delete(`${API_URL}/me/keys/${apiKeyId}`, opt);
+}
+
 class BaseCommand extends Command {
   // define flags that can be inherited by any command that extends BaseCommand
   static baseFlags = {};
@@ -807,8 +868,6 @@ class BaseCommand extends Command {
     }
   }
   async init() {
-    process.on("SIGINT", () => process.exit(0));
-    process.on("SIGTERM", () => process.exit(0));
     await super.init();
     const { args, flags } = await this.parse({
       args: this.ctor.args,
@@ -869,4 +928,4 @@ class BaseCommand extends Command {
   }
 }
 
-export { setAuthToken as $, ApiKey as A, BaseCommand as B, CredentialsType as C, DetailsFlags as D, getJob as E, castArrayObjectDates as F, GODOT_CAPABILITIES as G, queryClient as H, WS_URL as I, JobStatus as J, getAuthToken as K, getProjectPlatformProgress as L, downloadBuildById as M, getGoogleStatus as N, getGodotAndroidPackageName as O, Platform as P, enforcePolicy as Q, revokePolicy as R, inviteServiceAccount as S, disconnectGoogle as T, UserRole as U, getAPIKeys as V, WEB_URL as W, createAPIKey as X, revokeAPIKey as Y, getSingleUseUrl as Z, acceptTerms as _, ApiKeyType as a, Auth as a0, LogLevel as a1, getShortAuthRequiredUrl as a2, castObjectDates as a3, getGoogleAuthUrl as a4, castJobDates as a5, getShortTime as a6, LEGACY_DEFAULT_IGNORED_FILES_GLOBS as a7, LEGACY_DEFAULT_SHIPPED_FILES_GLOBS as a8, getNewUploadTicket as a9, startJobsFromUpload as aa, updateProject as ab, getGradleBuildOptionKey as ac, BuildType as ad, getShortDateTime as ae, getShortTimeDelta as af, JobStage as ag, getSelf as ah, getTerms as ai, Certificate as b, getShortDate as c, getGodotAppleBundleIdentifier as d, BundleId as e, App as f, getProjects as g, CapabilityTypeOption as h, isGradleBuildEnabled as i, BetaGroup as j, isCWDGodotGame as k, getProject as l, CertificateType as m, Profile as n, ProfileType as o, API_URL as p, getAuthedHeaders as q, getGodotProjectCapabilities as r, setGradleBuildEnabled as s, CapabilityType as t, GameEngine as u, getGodotVersion as v, createProject as w, DEFAULT_PLATFORM_GLOBS as x, getGodotProjectName as y, getProjectJobs as z };
+export { getSingleUseUrl as $, ApiKey as A, BaseCommand as B, CredentialsType as C, DetailsFlags as D, castArrayObjectDates as E, queryClient as F, GODOT_CAPABILITIES as G, HandledError as H, WS_URL as I, JobStatus as J, getAuthToken as K, getProjectPlatformProgress as L, getProjectJobs as M, getJob as N, downloadBuildById as O, Platform as P, getGoogleStatus as Q, getGodotAndroidPackageName as R, enforcePolicy as S, revokePolicy as T, UserRole as U, inviteServiceAccount as V, WEB_URL as W, disconnectGoogle as X, getAPIKeys as Y, createAPIKey as Z, revokeAPIKey as _, ApiKeyType as a, acceptTerms as a0, setAuthToken as a1, Auth as a2, LogLevel as a3, getShortAuthRequiredUrl as a4, getErrorMessage as a5, castObjectDates as a6, getGoogleAuthUrl as a7, castJobDates as a8, getShortTime as a9, LEGACY_DEFAULT_IGNORED_FILES_GLOBS as aa, LEGACY_DEFAULT_SHIPPED_FILES_GLOBS as ab, getNewUploadTicket as ac, startJobsFromUpload as ad, updateProject as ae, getGradleBuildOptionKey as af, BuildType as ag, getShortDateTime as ah, getShortTimeDelta as ai, JobStage as aj, getSelf as ak, getTerms as al, Certificate as b, getProjects as c, getShortDate as d, getGodotAppleBundleIdentifier as e, BundleId as f, getShortUUID as g, App as h, isGradleBuildEnabled as i, CapabilityTypeOption as j, BetaGroup as k, isCWDGodotGame as l, getProject as m, CertificateType as n, Profile as o, ProfileType as p, API_URL as q, getAuthedHeaders as r, setGradleBuildEnabled as s, getGodotProjectCapabilities as t, CapabilityType as u, GameEngine as v, getGodotVersion as w, createProject as x, DEFAULT_PLATFORM_GLOBS as y, getGodotProjectName as z };

package/dist/{baseGameAndroidCommand-BE6hsL-c.js → baseGameAndroidCommand-HO8as-RL.js}

@@ -1,5 +1,5 @@
-import { N as getGoogleStatus, O as getGodotAndroidPackageName } from './baseCommand-C7OdounZ.js';
-import { c as BaseGameCommand, d as generatePackageName, b as getInput } from './baseGameCommand-Bap2bDqP.js';
+import { Q as getGoogleStatus, R as getGodotAndroidPackageName } from './baseCommand-CpAJaJoG.js';
+import { b as BaseGameCommand, c as generatePackageName, a as getInput } from './baseGameCommand-Cbx4ywHl.js';
 
 class BaseGameAndroidCommand extends BaseGameCommand {
   async checkGoogleAuth(waitForAuth = false) {

package/dist/{baseGameCommand-Bap2bDqP.js → baseGameCommand-Cbx4ywHl.js}

@@ -1,5 +1,5 @@
 import { Flags } from '@oclif/core';
-import { p as API_URL, q as getAuthedHeaders, P as Platform, ae as getShortDateTime, F as castArrayObjectDates, J as JobStatus, af as getShortTimeDelta, E as getJob, ag as JobStage, a1 as LogLevel, l as getProject, a2 as getShortAuthRequiredUrl, H as queryClient, ad as BuildType, W as WEB_URL, B as BaseCommand, ah as getSelf, ai as getTerms, ab as updateProject } from './baseCommand-C7OdounZ.js';
+import { q as API_URL, r as getAuthedHeaders, P as Platform, g as getShortUUID, ah as getShortDateTime, E as castArrayObjectDates, J as JobStatus, ai as getShortTimeDelta, N as getJob, aj as JobStage, a3 as LogLevel, m as getProject, a4 as getShortAuthRequiredUrl, F as queryClient, ag as BuildType, W as WEB_URL, B as BaseCommand, ak as getSelf, H as HandledError, al as getTerms, ae as updateProject } from './baseCommand-CpAJaJoG.js';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { useStdin, useInput, Text, Box } from 'ink';
 import Spinner from 'ink-spinner';
@@ -152,9 +152,6 @@ const useSafeInput = (handler, options = { isActive: true }) => {
   );
 };
 
-function getShortUUID(originalUuid) {
-  return originalUuid.slice(0, 8);
-}
 function getStageColor(stage) {
   switch (stage) {
     case JobStage.SETUP: {
@@ -1039,6 +1036,7 @@ const CommandProvider = (props) => {
 const GameContext = React.createContext({
   game: null,
   gameId: null,
+  error: null,
   setGameId(gameId) {
   }
 });
@@ -1046,18 +1044,25 @@ const GameProvider = ({ children }) => {
   const { command } = React.useContext(CommandContext);
   const [gameId, setGameId] = useState(command?.getGameId() || null);
   const [game, setGame] = useState(null);
+  const [error, setError] = useState(null);
   const handleGameIdChange = async () => {
     if (!gameId) {
       setGame(null);
       return;
     }
-    const game2 = await getProject(gameId);
-    setGame(game2);
+    try {
+      const game2 = await getProject(gameId);
+      setGame(game2);
+      setError(null);
+    } catch (err) {
+      setError(err);
+      setGame(null);
+    }
   };
   useEffect(() => {
     handleGameIdChange();
   }, [gameId]);
-  return /* @__PURE__ */ jsx(GameContext.Provider, { value: { game, gameId, setGameId }, children });
+  return /* @__PURE__ */ jsx(GameContext.Provider, { value: { game, gameId, error, setGameId }, children });
 };
 
 scriptDir(import.meta);
@@ -1120,12 +1125,20 @@ class BaseAuthenticatedCommand extends BaseCommand {
     if (!this.isAuthenticated()) {
       this.error("No auth config found. Please run `shipthis login` to authenticate.", { exit: 1 });
     }
-    const self = await getSelf();
-    const accepted = Boolean(self.details?.hasAcceptedTerms);
-    if (!accepted) {
-      this.error("You must accept the agreements first. Please run `shipthis login --acceptAgreements` to do this.", {
-        exit: 1
-      });
+    try {
+      const self = await getSelf();
+      const accepted = Boolean(self.details?.hasAcceptedTerms);
+      if (!accepted) {
+        this.error("You must accept the agreements first. Please run `shipthis login --acceptAgreements` to do this.", {
+          exit: 1
+        });
+      }
+    } catch (error) {
+      if (error instanceof HandledError) {
+        return this.error(error.message, { exit: 1 });
+      } else {
+        throw error;
+      }
     }
     const terms = await getTerms();
     if (terms.changes.length > 0) {
@@ -1156,9 +1169,11 @@ class BaseGameCommand extends BaseAuthenticatedCommand {
       if (!gameId) this.error("No game ID found.");
       return await getProject(gameId);
     } catch (error) {
-      if (error?.response?.status === 404) {
-        this.error("Game not found - please check you have access");
-      } else throw error;
+      if (error instanceof HandledError) {
+        return this.error(error.message, { exit: 1 });
+      } else {
+        throw error;
+      }
     }
   }
   async updateGame(update) {
@@ -1173,4 +1188,4 @@ class BaseGameCommand extends BaseAuthenticatedCommand {
   }
 }
 
-export { CreateGooglePlayGame as A, BaseAuthenticatedCommand as B, CommandProvider as C, GameProvider as G, KeyTestStatus as K, Markdown as M, getRenderedMarkdown as a, getInput as b, BaseGameCommand as c, generatePackageName as d, getJobSummary as e, getJobStatusColor as f, getShortUUID as g, getStageColor as h, cacheKeys as i, GameContext as j, CommandContext as k, isValidSemVer as l, makeHumanReadable as m, fetchKeyTestResult as n, niceError as o, KeyTestError as p, ejs as q, getMaskedInput as r, getBuildSummary as s, useSafeInput as t, useBuilds as u, useJob as v, getMessageColor as w, getFileHash as x, getPlatformName as y, queryBuilds as z };
+export { BaseAuthenticatedCommand as B, CommandProvider as C, GameProvider as G, KeyTestStatus as K, Markdown as M, getInput as a, BaseGameCommand as b, generatePackageName as c, GameContext as d, getJobSummary as e, getStageColor as f, getRenderedMarkdown as g, getJobStatusColor as h, cacheKeys as i, CommandContext as j, isValidSemVer as k, fetchKeyTestResult as l, makeHumanReadable as m, niceError as n, KeyTestError as o, ejs as p, getMaskedInput as q, getBuildSummary as r, useSafeInput as s, useJob as t, useBuilds as u, getMessageColor as v, getFileHash as w, getPlatformName as x, queryBuilds as y, CreateGooglePlayGame as z };