shipthis 0.1.31 → 0.1.32

package/dist/{index-DKQjnJrC.js → index-CS9Gwcb0.js}

@@ -1,37 +1,37 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Box, Text } from 'ink';
-import { useState, useRef, useEffect, useContext } from 'react';
 import Spinner from 'ink-spinner';
-import { b as GameContext } from './index-CyvGh-kt.js';
-import { p as getAuthedHeaders, q as API_URL, a1 as castObjectDates, P as Platform, C as CredentialsType, Q as getGoogleStatus } from './index-w3lHxk5O.js';
-import axios from 'axios';
-import 'crypto-js';
-import 'uuid';
-import 'fs';
-import 'luxon';
-import '@inkjs/ui';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import 'yazl';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+import { useState, useRef, useEffect, useContext } from 'react';
+import 'node:crypto';
+import 'node:fs';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
+import 'luxon';
+import axios from 'axios';
 import 'isomorphic-git';
+import { p as getAuthedHeaders, o as API_URL, a1 as castObjectDates, P as Platform, C as CredentialsType, Q as getGoogleStatus } from './index-BhhiXbey.js';
 import '@oclif/core';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DZk5SMxI.js';
 import 'fast-glob';
+import 'uuid';
+import 'yazl';
 import 'socket.io-client';
-import { u as useWebSocket } from './useWebSocket-gyuCsore.js';
-import { u as useProjectCredentials } from './useProjectCredentials-DpeXZcHP.js';
+import 'fullscreen-ink';
+import { u as useWebSocket } from './useWebSocket-5PYa2QER.js';
+import { u as useProjectCredentials } from './useProjectCredentials-BEphqa18.js';
+import 'crypto-js';
+import 'string-length';
+import 'strip-ansi';
 import 'open';
+import '@inkjs/ui';
 import 'marked';
 import 'marked-terminal';
-import 'path';
-import { P as ProgressSpinner } from './ProgressSpinner-6pw1T8Iw.js';
+import { P as ProgressSpinner } from './ProgressSpinner-DGcakQSK.js';
 import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
+import { G as GameContext } from './index-C66Dd8Xc.js';
 
 async function fetchStatus({ projectId }) {
   try {
@@ -45,37 +45,35 @@ async function fetchStatus({ projectId }) {
     throw error;
   }
 }
-const useAndroidServiceAccountSetupStatus = (props) => {
-  return useQuery({
-    queryKey: cacheKeys.androidSetupStatus(props),
-    queryFn: () => fetchStatus(props),
-    // Status changes frequently, so we want to keep it fresh
-    refetchInterval: 1e3 * 5,
-    staleTime: 1e3 * 5
-  });
-};
+const useAndroidServiceAccountSetupStatus = (props) => useQuery({
+  queryFn: () => fetchStatus(props),
+  queryKey: cacheKeys.androidSetupStatus(props),
+  // Status changes frequently, so we want to keep it fresh
+  refetchInterval: 1e3 * 5,
+  staleTime: 1e3 * 5
+});
 
 const ERR_NOT_AUTHENTICATED = "You must be connected to Google to create a Service Account Key";
 const useHasServiceAccountKey = (projectId) => {
-  const { data, isSuccess } = useProjectCredentials({ projectId, platform: Platform.ANDROID });
+  const { data, isSuccess } = useProjectCredentials({ platform: Platform.ANDROID, projectId });
   return isSuccess && data.data.some((cred) => cred.isActive && cred.platform === Platform.ANDROID && cred.type == CredentialsType.KEY);
 };
-const useAndroidServiceAccount = ({ projectId, onError, onComplete }) => {
+const useAndroidServiceAccount = ({ onComplete, onError, projectId }) => {
   const queryClient = useQueryClient();
   const [isStarting, setIsStarting] = useState(false);
   const hasServiceAccountKey = useHasServiceAccountKey(projectId);
   const listener = {
-    getPattern: () => `project.${projectId}:android-setup-status`,
-    eventHandler: async (pattern, data) => {
+    async eventHandler(pattern, data) {
       const key = cacheKeys.androidSetupStatus({ projectId });
       queryClient.setQueryData(key, () => data);
-    }
+    },
+    getPattern: () => `project.${projectId}:android-setup-status`
   };
   useWebSocket([listener]);
   const { data: setupStatus } = useAndroidServiceAccountSetupStatus({ projectId });
   const prevSetupStatusRef = useRef("unknown");
   useEffect(() => {
-    if (["running", "queued"].includes(prevSetupStatusRef.current)) {
+    if (["queued", "running"].includes(prevSetupStatusRef.current)) {
       if (setupStatus?.status === "complete") onComplete();
       if (setupStatus?.status === "error") onError(new Error(setupStatus.errorMessage));
     }
@@ -91,7 +89,7 @@ const useAndroidServiceAccount = ({ projectId, onError, onComplete }) => {
       const startUrl = `${androidKeyApiBase}/setup/`;
       const { data: updatedStatus } = await axios.post(startUrl, {}, { headers });
       queryClient.invalidateQueries({
-        queryKey: cacheKeys.projectCredentials({ projectId, pageNumber: 0 })
+        queryKey: cacheKeys.projectCredentials({ pageNumber: 0, projectId })
       });
       await queryClient.setQueryData(cacheKeys.androidSetupStatus({ projectId }), (_) => updatedStatus);
       setIsStarting(false);
@@ -106,9 +104,9 @@ const useAndroidServiceAccount = ({ projectId, onError, onComplete }) => {
   const isCreating = isStarting || setupStatus?.status === "queued" || setupStatus?.status === "running";
   return {
     handleStart,
-    setupStatus,
+    hasServiceAccountKey,
     isCreating,
-    hasServiceAccountKey
+    setupStatus
   };
 };
 
@@ -116,12 +114,12 @@ const CreateServiceAccountKey = (props) => {
   const { gameId } = useContext(GameContext);
   return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(CreateForGame, { gameId, ...props }) });
 };
-const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
+const CreateForGame = ({ gameId, onComplete, onError, ...boxProps }) => {
   const [didStart, setDidStart] = useState(false);
-  const { handleStart, setupStatus, isCreating } = useAndroidServiceAccount({
-    projectId: gameId,
+  const { handleStart, isCreating, setupStatus } = useAndroidServiceAccount({
+    onComplete,
     onError,
-    onComplete
+    projectId: gameId
   });
   useEffect(() => {
     handleStart().then(() => setDidStart(true));

package/dist/{index-C6aAyrXW.js → index-CtTI85m-.js}

@@ -1,22 +1,22 @@
 import axios from 'axios';
-import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates } from './index-w3lHxk5O.js';
-import 'fs';
+import { o as API_URL, p as getAuthedHeaders, I as castArrayObjectDates } from './index-BhhiXbey.js';
+import 'node:fs';
 
 async function getUserCredentials(pageSize = 100) {
   const headers = getAuthedHeaders();
   const { data } = await axios({
+    headers,
     method: "get",
-    url: `${API_URL}/credentials?pageSize=${pageSize}`,
-    headers
+    url: `${API_URL}/credentials?pageSize=${pageSize}`
   });
   return castArrayObjectDates(data.data);
 }
 async function getProjectCredentials(projectId, pageSize = 100) {
   const headers = getAuthedHeaders();
   const { data } = await axios({
+    headers,
     method: "get",
-    url: `${API_URL}/projects/${projectId}/credentials?pageSize=${pageSize}`,
-    headers
+    url: `${API_URL}/projects/${projectId}/credentials?pageSize=${pageSize}`
   });
   return castArrayObjectDates(data.data);
 }

package/dist/{upload-BTpxj3QP.js → upload-8y5MQEm9.js}

@@ -1,59 +1,59 @@
 import axios from 'axios';
-import { p as getAuthedHeaders, q as API_URL } from './index-w3lHxk5O.js';
+import { o as API_URL, p as getAuthedHeaders } from './index-BhhiXbey.js';
 
 async function getNewUploadTicket(projectId = null) {
   const url = projectId ? `${API_URL}/projects/${projectId}/credentials/url` : `${API_URL}/credentials/url`;
   const headers = getAuthedHeaders();
   const { data: uploadInfo } = await axios({
+    headers,
     method: "post",
-    url,
-    headers
+    url
   });
   return uploadInfo;
 }
-async function uploadUserCredentials({ contents, platform, type, serialNumber }) {
+async function uploadUserCredentials({ contents, platform, serialNumber, type }) {
   const uploadInfo = await getNewUploadTicket();
   const jsonBuffer = Buffer.from(JSON.stringify(contents));
   await axios.put(uploadInfo.url, jsonBuffer, {
     headers: {
-      "Content-length": jsonBuffer.length,
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      "Content-length": jsonBuffer.length
     }
   });
   const headers = getAuthedHeaders();
   return await axios({
-    method: "post",
-    url: `${API_URL}/credentials`,
-    headers,
     data: {
       platform,
+      serialNumber,
       type,
-      uuid: uploadInfo.uuid,
-      serialNumber
-    }
+      uuid: uploadInfo.uuid
+    },
+    headers,
+    method: "post",
+    url: `${API_URL}/credentials`
   });
 }
-async function uploadProjectCredentials(projectId, { contents, platform, type, serialNumber, identifier }) {
+async function uploadProjectCredentials(projectId, { contents, identifier, platform, serialNumber, type }) {
   const uploadInfo = await getNewUploadTicket(projectId);
   const jsonBuffer = Buffer.from(JSON.stringify(contents));
   await axios.put(uploadInfo.url, jsonBuffer, {
     headers: {
-      "Content-length": jsonBuffer.length,
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      "Content-length": jsonBuffer.length
     }
   });
   const headers = getAuthedHeaders();
   return await axios({
-    method: "post",
-    url: `${API_URL}/projects/${projectId}/credentials`,
-    headers,
     data: {
+      identifier,
       platform,
+      serialNumber,
       type,
-      uuid: uploadInfo.uuid,
-      identifier,
-      serialNumber
-    }
+      uuid: uploadInfo.uuid
+    },
+    headers,
+    method: "post",
+    url: `${API_URL}/projects/${projectId}/credentials`
   });
 }
 

package/dist/{useAndroidServiceAccountTestResult-Dy3Ag7_r.js → useAndroidServiceAccountTestResult-DZk5SMxI.js}

@@ -1,6 +1,6 @@
-import { p as getAuthedHeaders, q as API_URL } from './index-w3lHxk5O.js';
-import axios from 'axios';
 import { useQuery } from '@tanstack/react-query';
+import axios from 'axios';
+import { o as API_URL, p as getAuthedHeaders } from './index-BhhiXbey.js';
 
 const cacheKeys = {
   androidKeyTestResult: (props) => ["androidKeyTestResult", ...Object.values(props)],
@@ -15,21 +15,21 @@ const cacheKeys = {
 };
 
 var KeyTestStatus = /* @__PURE__ */ ((KeyTestStatus2) => {
-  KeyTestStatus2["SUCCESS"] = "success";
   KeyTestStatus2["ERROR"] = "error";
+  KeyTestStatus2["SUCCESS"] = "success";
   return KeyTestStatus2;
 })(KeyTestStatus || {});
 var KeyTestError = /* @__PURE__ */ ((KeyTestError2) => {
-  KeyTestError2["NO_SERVICE_ACCOUNT_KEY"] = "no_service_account_key";
-  KeyTestError2["NO_PACKAGE_NAME"] = "no_package_name";
   KeyTestError2["APP_NOT_FOUND"] = "app_not_found";
+  KeyTestError2["NO_PACKAGE_NAME"] = "no_package_name";
+  KeyTestError2["NO_SERVICE_ACCOUNT_KEY"] = "no_service_account_key";
   KeyTestError2["NOT_INVITED"] = "not_invited";
   return KeyTestError2;
 })(KeyTestError || {});
 const KeyTestErrorMessage = {
-  ["no_service_account_key" /* NO_SERVICE_ACCOUNT_KEY */]: "Service Account API Key not found in your account",
-  ["no_package_name" /* NO_PACKAGE_NAME */]: "Android Package Name has not been set",
   ["app_not_found" /* APP_NOT_FOUND */]: "Application not found in Google Play Console",
+  ["no_package_name" /* NO_PACKAGE_NAME */]: "Android Package Name has not been set",
+  ["no_service_account_key" /* NO_SERVICE_ACCOUNT_KEY */]: "Service Account API Key not found in your account",
   ["not_invited" /* NOT_INVITED */]: "Service Account has not been invited to Google Play"
 };
 function niceError(keyError) {
@@ -42,11 +42,9 @@ const fetchKeyTestResult = async ({ projectId }, config) => {
   const { data } = await axios.post(url, {}, { headers, ...config });
   return data;
 };
-const useAndroidServiceAccountTestResult = (props) => {
-  return useQuery({
-    queryKey: cacheKeys.androidKeyTestResult(props),
-    queryFn: () => fetchKeyTestResult(props)
-  });
-};
+const useAndroidServiceAccountTestResult = (props) => useQuery({
+  queryFn: () => fetchKeyTestResult(props),
+  queryKey: cacheKeys.androidKeyTestResult(props)
+});
 
 export { KeyTestStatus as K, KeyTestError as a, cacheKeys as c, fetchKeyTestResult as f, niceError as n, useAndroidServiceAccountTestResult as u };

package/dist/{useAppleApp-h1Ogi_qc.js → useAppleApp-DWYGURwU.js}

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { f as App } from './index-w3lHxk5O.js';
+import { f as App } from './index-BhhiXbey.js';
 
 const queryAppleApp = async ({ ctx, iosBundleId }) => {
   if (!iosBundleId) {
@@ -14,17 +14,17 @@ const queryAppleApp = async ({ ctx, iosBundleId }) => {
   return {
     app,
     summary: {
+      bundleId: app.attributes.bundleId,
       id: app.id,
       name: app.attributes.name,
-      bundleId: app.attributes.bundleId,
       primaryLocale: app.attributes.primaryLocale
     }
   };
 };
 const useAppleApp = (props) => {
   const queryResult = useQuery({
-    queryKey: ["appleApp", props.iosBundleId],
-    queryFn: () => queryAppleApp(props)
+    queryFn: () => queryAppleApp(props),
+    queryKey: ["appleApp", props.iosBundleId]
   });
   return queryResult;
 };

package/dist/{useAppleBundleId-B3TTNap0.js → useAppleBundleId-PsTJ2g1B.js}

@@ -1,9 +1,9 @@
 import { useQuery } from '@tanstack/react-query';
-import { e as BundleId, r as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, s as CapabilityType } from './index-w3lHxk5O.js';
+import { e as BundleId, q as getGodotProjectCapabilities, P as Platform, G as GODOT_CAPABILITIES, r as CapabilityType } from './index-BhhiXbey.js';
 
 async function getBundleIdCapabilities(bundleId) {
   const current = await bundleId.getBundleIdCapabilitiesAsync();
-  let existing = [];
+  const existing = [];
   for (const capability of current) {
     const capabilityType = Object.values(CapabilityType).find((c) => capability.isType(c));
     if (capabilityType) {
@@ -33,10 +33,10 @@ const fetchBundleId = async ({ ctx, iosBundleId }) => {
     const isEnabledInProject = projectCapabilities.includes(gc.type);
     const isCorrectlyConfigured = isEnabledInBundle === isEnabledInProject;
     return {
-      name: gc.name,
+      isCorrectlyConfigured,
       isEnabledInBundle,
       isEnabledInProject,
-      isCorrectlyConfigured
+      name: gc.name
     };
   });
   return {
@@ -55,8 +55,8 @@ const fetchBundleId = async ({ ctx, iosBundleId }) => {
 };
 const useAppleBundleId = (props) => {
   const queryResult = useQuery({
-    queryKey: ["appleBundleId", props.iosBundleId],
-    queryFn: () => fetchBundleId(props)
+    queryFn: () => fetchBundleId(props),
+    queryKey: ["appleBundleId", props.iosBundleId]
   });
   return queryResult;
 };

package/dist/{useProjectCredentials-DpeXZcHP.js → useProjectCredentials-BEphqa18.js}

@@ -1,8 +1,8 @@
-import axios from 'axios';
 import { useQuery } from '@tanstack/react-query';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
-import { b as getShortDate, p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates } from './index-w3lHxk5O.js';
-import { g as getShortUUID } from './index-DJ078v-U.js';
+import axios from 'axios';
+import { b as getShortDate, p as getAuthedHeaders, o as API_URL, I as castArrayObjectDates } from './index-BhhiXbey.js';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import { g as getShortUUID } from './index-CGBdOm1q.js';
 
 async function queryProjectCredentials({
   projectId,
@@ -23,11 +23,11 @@ async function queryProjectCredentials({
 }
 function getProjectCredentialSummary(credential) {
   return {
+    createdAt: getShortDate(credential.createdAt),
     id: getShortUUID(credential.id),
-    type: credential.type,
-    serial: credential.serialNumber.substring(0, 30) + (credential.serialNumber.length > 30 ? "\u2026" : ""),
     isActive: credential.isActive,
-    createdAt: getShortDate(credential.createdAt)
+    serial: credential.serialNumber.slice(0, 30) + (credential.serialNumber.length > 30 ? "\u2026" : ""),
+    type: credential.type
   };
 }
 const useProjectCredentials = ({
@@ -36,15 +36,13 @@ const useProjectCredentials = ({
   ...fetchProps
 }) => {
   const queryResult = useQuery({
-    queryKey: cacheKeys.projectCredentials(fetchProps),
     queryFn: async () => queryProjectCredentials(fetchProps),
-    select: (data) => {
+    queryKey: cacheKeys.projectCredentials(fetchProps),
+    select(data) {
       if (!(platform || type)) return data;
       return {
         ...data,
-        data: data.data.filter((credential) => {
-          return (!platform || credential.platform === platform) && (!type || credential.type === type);
-        })
+        data: data.data.filter((credential) => (!platform || credential.platform === platform) && (!type || credential.type === type))
       };
     }
   });

package/dist/{useWebSocket-gyuCsore.js → useWebSocket-5PYa2QER.js}

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { io } from 'socket.io-client';
-import { M as getAuthToken, N as WS_URL } from './index-w3lHxk5O.js';
+import { N as WS_URL, O as getAuthToken } from './index-BhhiXbey.js';
 
 function useWebSocket(listeners = []) {
   const log = () => {

package/dist/utils/help.js

@@ -1,14 +1,14 @@
 import { Help } from '@oclif/core';
 
 class CustomHelp extends Help {
-  formatTopics(topics) {
-    const publicTopics = topics.filter((t) => t.name !== "internal");
-    return super.formatTopics(publicTopics);
-  }
   // formatCommand is protected, so we need to override it to make it public
   exposedFormatCommand(command) {
     return super.formatCommand(command);
   }
+  formatTopics(topics) {
+    const publicTopics = topics.filter((t) => t.name !== "internal");
+    return super.formatTopics(publicTopics);
+  }
 }
 
 export { CustomHelp as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shipthis",
   "description": "ShipThis manages building and uploading your Godot games to the App Store and Google Play.",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "author": "Hello Invent Ltd",
   "bin": {
     "shipthis": "./bin/run.js"
@@ -22,7 +22,7 @@
     "deepmerge": "^4.3.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "fullscreen-ink": "^0.0.2",
+    "fullscreen-ink": "^0.1.0",
     "ini": "^5.0.0",
     "ink": "^5.0.1",
     "ink-spinner": "^5.0.0",
@@ -70,6 +70,7 @@
     "eslint-config-oclif": "^5",
     "eslint-config-oclif-typescript": "^3",
     "eslint-config-prettier": "^9",
+    "eslint-plugin-import": "^2.32.0",
     "mocha": "^10",
     "oclif": "^4",
     "pkgroll": "^2.4.2",
@@ -208,7 +209,7 @@
     "build-original": "shx rm -rf dist && tsc -b",
     "build-tsc-alias": "shx rm -rf dist && npx tsc --build && npx tsc-alias -p tsconfig.json",
     "build": "pkgroll --clean-dist",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint . --ext .ts,.tsx",
     "posttest": "npm run lint",
     "prepack": "cp package-lock.json package-lock.dev.json || true && npm run readme && oclif manifest && npm shrinkwrap",
     "postpack": "mv package-lock.dev.json package-lock.json || true && shx rm -f oclif.manifest.json && shx rm -f npm-shrinkwrap.json",

package/dist/Command-DFdHXDiU.js

@@ -1,44 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { useStdout, Box } from 'ink';
-import { QueryClientProvider } from '@tanstack/react-query';
-import { _ as queryClient } from './index-w3lHxk5O.js';
-import 'axios';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'luxon';
-import 'isomorphic-git';
-import '@oclif/core';
-import { useCallback, useState, useEffect } from 'react';
-import 'crypto-js';
-import 'uuid';
-import 'socket.io-client';
-import 'fast-glob';
-import 'yazl';
-import { C as CommandProvider } from './index-CyvGh-kt.js';
-
-function useScreenSize() {
-  const { stdout } = useStdout();
-  const getSize = useCallback(() => ({ height: stdout.rows, width: stdout.columns }), [stdout]);
-  const [size, setSize] = useState(getSize);
-  useEffect(() => {
-    function onResize() {
-      setSize(getSize());
-    }
-    stdout.on("resize", onResize);
-    return () => {
-      stdout.off("resize", onResize);
-    };
-  }, [stdout, getSize]);
-  return size;
-}
-
-const Command = ({ children, command }) => {
-  const { width } = useScreenSize();
-  return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx(CommandProvider, { command, children: /* @__PURE__ */ jsx(Box, { width, flexDirection: "column", children }) }) });
-};
-
-export { Command as C, useScreenSize as u };

package/dist/CommandGame-Dif-oSky.js

@@ -1,9 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { G as GameProvider } from './index-CyvGh-kt.js';
-import { C as Command } from './Command-DFdHXDiU.js';
-
-const CommandGame = ({ children, command }) => {
-  return /* @__PURE__ */ jsx(Command, { command, children: /* @__PURE__ */ jsx(GameProvider, { children }) });
-};
-
-export { CommandGame as C };

package/dist/{RunWithSpinner-BVXNWGD3.js → RunWithSpinner-gMVA07bZ.js}

@@ -1,12 +1,12 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
+import React from 'react';
 
 const RunWithSpinner = ({
   executeMethod,
-  msgInProgress,
   msgComplete,
+  msgInProgress,
   onComplete,
   spinnerType
 }) => {