shipthis 0.1.31 → 0.1.32

package/dist/commands/game/ship.js

@@ -1,48 +1,48 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Flags } from '@oclif/core';
 import { useInput, Box, Text, render } from 'ink';
-import { L as LogLevel, a2 as getShortAuthRequiredUrl, W as WEB_URL, c as BaseGameCommand, E as getJob, H as downloadBuildById } from '../../index-w3lHxk5O.js';
-import { useContext, useState, useEffect } from 'react';
-import { d as CommandContext, b as GameContext, M as Markdown } from '../../index-CyvGh-kt.js';
+import { M as LogLevel, a2 as getShortAuthRequiredUrl, W as WEB_URL, c as BaseGameCommand, z as getJob, H as downloadBuildById } from '../../index-BhhiXbey.js';
 import 'ink-spinner';
-import '@inkjs/ui';
-import axios from 'axios';
-import '@tanstack/react-query';
-import 'fs';
-import 'uuid';
-import 'yazl';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+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 '@tanstack/react-query';
+import { useContext, useState, useEffect } from 'react';
 import 'fast-glob';
+import 'uuid';
+import 'yazl';
 import 'socket.io-client';
-import open from 'open';
-import 'marked';
-import 'marked-terminal';
-import 'path';
-import 'qrcode';
+import 'fullscreen-ink';
 import 'string-length';
 import 'strip-ansi';
-import { C as CommandGame } from '../../CommandGame-Dif-oSky.js';
-import { g as getShortUUID } from '../../index-DJ078v-U.js';
-import { u as useShip, J as JobProgress } from '../../JobProgress-DjIkuk5U.js';
+import open from 'open';
+import { g as getShortUUID } from '../../index-CGBdOm1q.js';
 import 'crypto-js';
-import { u as useJobWatching, J as JobLogTail } from '../../JobLogTail-BWzbQBZz.js';
-import { J as JobStatusTable } from '../../JobStatusTable-CEqWU73q.js';
+import { u as useJobWatching, J as JobLogTail } from '../../JobLogTail-0CBLoG8N.js';
+import { J as JobStatusTable } from '../../JobStatusTable-C_ZsZJCm.js';
+import '@inkjs/ui';
+import { u as useShip, J as JobProgress } from '../../JobProgress-lKqVT88m.js';
+import { C as CommandContext, G as GameContext, M as Markdown } from '../../index-C66Dd8Xc.js';
+import 'qrcode';
+import 'marked';
+import 'marked-terminal';
+import { C as CommandGame } from '../../CommandGame-cxzWG4nT.js';
 import '@expo/apple-utils/build/index.js';
-import 'ini';
 import 'deepmerge';
-import '../../useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
-import '../../Command-DFdHXDiU.js';
-import '../../git-DREGq-jc.js';
-import '../../ProgressSpinner-6pw1T8Iw.js';
-import '../../useWebSocket-gyuCsore.js';
+import 'ini';
+import '../../useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import '../../useWebSocket-5PYa2QER.js';
 import '../../Title-BCQtayg6.js';
-import '../../StatusTable-Dm5St4g-.js';
+import '../../StatusTable-DzRWcMr4.js';
+import '../../git-BpsfNFZ_.js';
+import '../../ProgressSpinner-DGcakQSK.js';
+import '../../Command-WPpmLPkL.js';
 
 function isNetworkError(exception) {
   if (!axios.isAxiosError(exception)) return false;
@@ -66,17 +66,17 @@ function getErrorMessage(error) {
   }
 }
 
-const JobFollow = ({ projectId, jobId, onComplete, onFailure }) => {
+const JobFollow = ({ jobId, onComplete, onFailure, projectId }) => {
   useJobWatching({
-    projectId,
-    jobId,
     isWatching: true,
-    onNewLogEntry: (logEntry) => {
+    jobId,
+    onComplete,
+    onFailure,
+    onNewLogEntry(logEntry) {
       if (logEntry.level == LogLevel.ERROR) console.error(logEntry.message);
       else console.log(logEntry.message);
     },
-    onComplete,
-    onFailure
+    projectId
   });
   return null;
 };
@@ -103,14 +103,16 @@ const Ship = ({ onComplete, onError }) => {
   useInput(async (input) => {
     if (!gameId) return;
     switch (input) {
-      case "l":
+      case "l": {
         setShowLog((prev) => !prev);
         break;
-      case "b":
-        const dashUrl = jobs?.length !== 1 ? `/games/${gameId}` : `/games/${gameId}/job/${jobs[0].id}`;
+      }
+      case "b": {
+        const dashUrl = jobs?.length === 1 ? `/games/${gameId}/job/${jobs[0].id}` : `/games/${gameId}`;
         const url = await getShortAuthRequiredUrl(dashUrl);
         await open(url);
         break;
+      }
     }
   });
   const handleJobComplete = (job) => {
@@ -134,16 +136,16 @@ const Ship = ({ onComplete, onError }) => {
   if (!gameId) return /* @__PURE__ */ jsx(Fragment, {});
   if (flags?.follow) {
     if (jobs && jobs.length > 0) {
-      return /* @__PURE__ */ jsx(JobFollow, { projectId: gameId, jobId: jobs[0].id, onComplete: handleJobComplete, onFailure: handleJobFailure });
+      return /* @__PURE__ */ jsx(JobFollow, { jobId: jobs[0].id, onComplete: handleJobComplete, onFailure: handleJobFailure, projectId: gameId });
     }
     return /* @__PURE__ */ jsx(Fragment, {});
   }
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     jobs == null && /* @__PURE__ */ jsx(Text, { children: shipLog }),
     jobs && jobs.map((job) => /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ jsx(JobStatusTable, { jobId: job.id, projectId: job.project.id, isWatching: true }),
+      /* @__PURE__ */ jsx(JobStatusTable, { isWatching: true, jobId: job.id, projectId: job.project.id }),
       /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: /* @__PURE__ */ jsx(JobProgress, { job, onComplete: handleJobComplete, onFailure: handleJobFailure }) }),
-      showLog && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(JobLogTail, { jobId: job.id, projectId: job.project.id, isWatching: true, length: 10 }) })
+      showLog && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(JobLogTail, { isWatching: true, jobId: job.id, length: 10, projectId: job.project.id }) })
     ] }, job.id)),
     jobs && !isComplete && /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(Text, { children: "Press L to show and hide the job logs." }),
@@ -151,13 +153,13 @@ const Ship = ({ onComplete, onError }) => {
       /* @__PURE__ */ jsx(Text, { bold: true, children: "Please wait while ShipThis builds your game..." })
     ] }),
     isComplete && /* @__PURE__ */ jsxs(Fragment, { children: [
-      failedJobs.length == 0 && /* @__PURE__ */ jsx(
+      failedJobs.length === 0 && /* @__PURE__ */ jsx(
         Markdown,
         {
           filename: "ship-success.md",
           templateVars: {
-            wasPublished: flags?.skipPublish ? false : true,
-            gameBuildsUrl: `${WEB_URL}games/${getShortUUID(gameId)}/builds`
+            gameBuildsUrl: `${WEB_URL}games/${getShortUUID(gameId)}/builds`,
+            wasPublished: !flags?.skipPublish
           }
         }
       ),
@@ -171,7 +173,7 @@ const Ship = ({ onComplete, onError }) => {
             }
           }
         ),
-        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: failedJobs.map((fj) => /* @__PURE__ */ jsx(JobLogTail, { jobId: fj.id, projectId: fj.project.id, isWatching: false, length: 10 }, fj.id)) })
+        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: failedJobs.map((fj) => /* @__PURE__ */ jsx(JobLogTail, { isWatching: false, jobId: fj.id, length: 10, projectId: fj.project.id }, fj.id)) })
       ] })
     ] })
   ] });
@@ -179,45 +181,45 @@ const Ship = ({ onComplete, onError }) => {
 
 class GameShip extends BaseGameCommand {
   static args = {};
+  static description = "Builds the app (for all platforms with valid credentials) and ships it to the stores.";
+  static examples = [
+    "<%= config.bin %> <%= command.id %>",
+    "<%= config.bin %> <%= command.id %> --platform ios",
+    "<%= config.bin %> <%= command.id %> --platform android --skipPublish",
+    "<%= config.bin %> <%= command.id %> --platform android --download game.aab",
+    "<%= config.bin %> <%= command.id %> --platform android --follow --downloadAPK game.apk"
+  ];
   static flags = {
     ...BaseGameCommand.flags,
-    platform: Flags.string({
-      description: 'The platform to ship the game to. This can be "android" or "ios"',
-      required: false,
-      options: ["android", "ios"]
-    }),
-    skipPublish: Flags.boolean({
-      description: "Skip the publish step",
-      required: false,
-      default: false
-    }),
     download: Flags.string({
+      dependsOn: ["platform"],
       description: "Download the build artifact to the specified file",
-      required: false,
-      dependsOn: ["platform"]
+      required: false
     }),
     downloadAPK: Flags.string({
+      dependsOn: ["platform"],
       description: "Download the APK artifact (if available) to the specified file",
-      required: false,
-      dependsOn: ["platform"]
+      required: false
     }),
     follow: Flags.boolean({
+      dependsOn: ["platform"],
       description: "Follow the job logs in real-time. Requires --platform to be specified.",
-      required: false,
-      dependsOn: ["platform"]
+      required: false
+    }),
+    platform: Flags.string({
+      description: 'The platform to ship the game to. This can be "android" or "ios"',
+      options: ["android", "ios"],
+      required: false
+    }),
+    skipPublish: Flags.boolean({
+      default: false,
+      description: "Skip the publish step",
+      required: false
     })
   };
-  static description = "Builds the app (for all platforms with valid credentials) and ships it to the stores.";
-  static examples = [
-    "<%= config.bin %> <%= command.id %>",
-    "<%= config.bin %> <%= command.id %> --platform ios",
-    "<%= config.bin %> <%= command.id %> --platform android --skipPublish",
-    "<%= config.bin %> <%= command.id %> --platform android --download game.aab",
-    "<%= config.bin %> <%= command.id %> --platform android --follow --downloadAPK game.apk"
-  ];
   async run() {
     await this.ensureWeAreInAProjectDir();
-    const gameId = await this.getGameId();
+    const gameId = this.getGameId();
     if (!gameId) {
       this.error("No game ID found");
     }
@@ -232,7 +234,7 @@ class GameShip extends BaseGameCommand {
         if (attempt < MAX_RETRIES) await new Promise((res) => setTimeout(res, RETRY_DELAY_MS));
       }
       if (!job?.builds || job.builds.length === 0) this.error("No builds found for this job after multiple attempts");
-      const platform = this.flags.platform;
+      const { platform } = this.flags;
       const type = platform === "android" ? this.flags.downloadAPK ? "APK" : "AAB" : "IPA";
       const build = job.builds.find((b) => b.buildType === type);
       if (!build) this.error(`No build found for type ${type}`);

package/dist/commands/game/status.js

@@ -1,115 +1,68 @@
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { render } from 'ink';
+import { jsx } from 'react/jsx-runtime';
 import { Flags } from '@oclif/core';
-import 'react';
-import '../../index-CyvGh-kt.js';
-import { B as BaseAuthenticatedCommand, F as getProject, P as Platform, k as getProjectPlatformProgress, b as getShortDate } from '../../index-w3lHxk5O.js';
+import { render } from 'ink';
+import { B as BaseAuthenticatedCommand } from '../../index-BhhiXbey.js';
 import 'ink-spinner';
-import '@inkjs/ui';
+import 'node:crypto';
+import 'node:fs';
+import 'node:path';
+import 'node:readline';
+import 'node:url';
+import 'readline-sync';
+import 'luxon';
 import 'axios';
+import 'isomorphic-git';
 import '@tanstack/react-query';
-import 'fs';
+import 'react';
+import 'crypto-js';
 import 'uuid';
+import 'fast-glob';
 import 'yazl';
-import { g as getShortUUID, m as makeHumanReadable } from '../../index-DJ078v-U.js';
+import 'socket.io-client';
+import 'fullscreen-ink';
+import { a as GameStatus$1 } from '../../GameStatus-BQEtVKvv.js';
+import 'string-length';
+import 'strip-ansi';
 import 'open';
+import '@inkjs/ui';
 import 'marked';
 import 'marked-terminal';
-import 'path';
-import { N as NextSteps } from '../../NextSteps-CK9zHOCt.js';
 import 'qrcode';
-import { S as StatusTable } from '../../StatusTable-Dm5St4g-.js';
-import 'string-length';
-import 'strip-ansi';
-import 'luxon';
-import 'fast-glob';
-import { C as Command } from '../../Command-DFdHXDiU.js';
-import 'socket.io-client';
-import '../../useAndroidServiceAccountTestResult-Dy3Ag7_r.js';
+import '../../index-C66Dd8Xc.js';
+import { C as CommandGame } from '../../CommandGame-cxzWG4nT.js';
 import '@expo/apple-utils/build/index.js';
-import 'crypto-js';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'isomorphic-git';
-import 'ini';
 import 'deepmerge';
+import 'ini';
+import '../../index-CGBdOm1q.js';
+import '../../StatusTable-DzRWcMr4.js';
 import '../../Title-BCQtayg6.js';
+import '../../NextSteps-DbJHmscQ.js';
+import '../../useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import '../../Command-WPpmLPkL.js';
 
-function getSteps(platform, progress) {
-  if (!progress) return [];
-  switch (platform) {
-    case Platform.ANDROID:
-      return [
-        !progress.hasCredentialsForPlatform && "shipthis game android keyStore create",
-        !progress.hasApiKeyForPlatform && "shipthis game android apiKey create",
-        progress.hasCredentialsForPlatform && progress.hasApiKeyForPlatform && "shipthis game ship"
-      ].filter(Boolean);
-    case Platform.IOS:
-      return [
-        !progress.hasApiKeyForPlatform && "shipthis apple apiKey create",
-        !progress.hasCredentialsForPlatform && "shipthis game ios profile create",
-        progress.hasApiKeyForPlatform && progress.hasCredentialsForPlatform && "shipthis game ship"
-      ].filter(Boolean);
-    default:
-      throw new Error("Invalid platform");
-  }
-}
 class GameStatus extends BaseAuthenticatedCommand {
   static args = {};
   static description = "Shows the status of the current game.";
   static examples = [
     "<%= config.bin %> <%= command.id %>",
-    "<%= config.bin %> <%= command.id %> --gameId 0c179fc4"
+    "<%= config.bin %> <%= command.id %> --gameId 0c179fc4",
+    "<%= config.bin %> <%= command.id %> --platform ios"
   ];
   static flags = {
-    gameId: Flags.string({ char: "g", description: "The ID of the game" })
+    gameId: Flags.string({ char: "g", description: "The ID of the game" }),
+    platform: Flags.string({
+      char: "p",
+      description: "The platform to check status for (ios, android)",
+      options: ["android", "ios"]
+    })
   };
   async run() {
-    const gameId = await this.getGameId();
+    const gameId = this.getGameId();
     if (!gameId) {
       this.error("No game found - please run `shipthis game wizard` or specify a game ID with --gameId", { exit: 1 });
     }
-    const game = await getProject(gameId);
-    const hasConfiguredIos = !!game.details?.iosBundleId;
-    const hasConfiguredAndroid = !!game.details?.androidPackageName;
-    let statuses = {
-      [Platform.IOS]: hasConfiguredIos ? await getProjectPlatformProgress(game.id, Platform.IOS) : null,
-      [Platform.ANDROID]: hasConfiguredAndroid ? await getProjectPlatformProgress(game.id, Platform.ANDROID) : null
-    };
-    let steps = [];
-    if (hasConfiguredIos) steps = steps.concat(getSteps(Platform.IOS, statuses[Platform.IOS]));
-    if (hasConfiguredAndroid) steps = steps.concat(getSteps(Platform.ANDROID, statuses[Platform.ANDROID]));
-    if (!hasConfiguredIos && !hasConfiguredAndroid) {
-      steps = steps.concat(["shipthis game wizard android", "shipthis game wizard ios"]);
-    }
-    const progressToStatuses = (progress) => {
-      const { platform, ...rest } = progress;
-      return makeHumanReadable(rest);
-    };
     render(
-      /* @__PURE__ */ jsxs(Command, { command: this, children: [
-        /* @__PURE__ */ jsx(
-          StatusTable,
-          {
-            marginBottom: 1,
-            title: "Game Details",
-            statuses: {
-              "Game ID": getShortUUID(game.id),
-              Name: game.name,
-              Version: `${game.details?.semanticVersion || "0.0.1"}`,
-              "Build Number": `${game.details?.buildNumber || 1}`,
-              "Created At": getShortDate(game.createdAt),
-              "Game Engine": `${game.details?.gameEngine || "godot"} ${game.details?.gameEngineVersion || "4.3"}`
-            }
-          }
-        ),
-        statuses[Platform.IOS] && /* @__PURE__ */ jsx(StatusTable, { title: "iOS Status", statuses: progressToStatuses(statuses[Platform.IOS]) }),
-        statuses[Platform.ANDROID] && /* @__PURE__ */ jsx(StatusTable, { title: "Android Status", statuses: progressToStatuses(statuses[Platform.ANDROID]) }),
-        /* @__PURE__ */ jsx(NextSteps, { steps })
-      ] })
+      /* @__PURE__ */ jsx(CommandGame, { command: this, children: /* @__PURE__ */ jsx(GameStatus$1, { onComplete: (exitCode) => process.exit(exitCode) }) })
     );
   }
 }