shipthis 0.0.41 → 0.1.1

package/dist/commands/game/status.js

@@ -1,31 +1,63 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
-import { A as App } from '../../App-BfoOFeZ-.js';
-import 'ink-spinner';
-import { d as BaseGameCommand, e as getProjectPlatformProgress, P as Platform, f as getShortDate } from '../../baseGameCommand-B3NbuvDu.js';
-import { g as getShortUUID, m as makeHumanReadable } from '../../index-ZHJdUrwJ.js';
+import { C as Command } from '../../Command-BrfJSeOC.js';
 import 'react';
-import { N as NextSteps } from '../../NextSteps-CK9zHOCt.js';
-import 'luxon';
-import '@tanstack/react-query';
-import '@expo/apple-utils/build/index.js';
+import 'ink-spinner';
+import { B as BaseAuthenticatedCommand, H as getProject, P as Platform, k as getProjectPlatformProgress, b as getShortDate } from '../../index-CF0fIsx2.js';
+import '@inkjs/ui';
+import { g as getShortUUID, m as makeHumanReadable } from '../../index-Df8uXQ4s.js';
 import 'axios';
-import { S as StatusTable } from '../../StatusTable-CxuX_R1D.js';
-import 'socket.io-client';
+import '@tanstack/react-query';
+import 'marked';
+import 'fs';
+import 'marked-terminal';
+import { N as NextSteps } from '../../NextSteps-DKcjSHZ3.js';
+import 'qrcode';
+import { S as StatusTable } from '../../StatusTable-BzsNF75L.js';
 import 'string-length';
 import 'strip-ansi';
-import 'path';
-import 'fs';
+import 'luxon';
+import 'uuid';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import 'open';
+import 'crypto-js';
+import '../../useAndroidServiceAccountTestResult-BnxNuoG3.js';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
+import 'node:path';
+import 'node:url';
 import 'isomorphic-git';
+import '../../git-DREGq-jc.js';
+import '../../index-CFHmtzfq.js';
+import 'path';
+import '@expo/apple-utils/build/index.js';
 import 'ini';
 import 'deepmerge';
-import '../../Title-BCQtayg6.js';
 
-class GameStatus extends BaseGameCommand {
+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 = [
@@ -36,21 +68,26 @@ class GameStatus extends BaseGameCommand {
     gameId: Flags.string({ char: "g", description: "The ID of the game" })
   };
   async run() {
-    const game = await this.getGame();
-    const iosPlatformStatus = await getProjectPlatformProgress(game.id, Platform.IOS);
-    const { hasBundleSet, hasApiKeyForPlatform, hasCredentialsForPlatform } = iosPlatformStatus;
-    const steps = [
-      hasBundleSet == false && "$ shipthis game ios app create",
-      hasApiKeyForPlatform == false && "$ shipthis apple apiKey create",
-      hasCredentialsForPlatform == false && "$ shipthis game ios profile create",
-      hasBundleSet && hasApiKeyForPlatform && hasCredentialsForPlatform && "$ shipthis game ship"
-    ].filter(Boolean);
+    const gameId = await 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]));
     const progressToStatuses = (progress) => {
       const { platform, ...rest } = progress;
       return makeHumanReadable(rest);
     };
     render(
-      /* @__PURE__ */ jsxs(App, { children: [
+      /* @__PURE__ */ jsxs(Command, { command: this, children: [
         /* @__PURE__ */ jsx(
           StatusTable,
           {
@@ -66,7 +103,8 @@ class GameStatus extends BaseGameCommand {
             }
           }
         ),
-        /* @__PURE__ */ jsx(StatusTable, { title: "iOS Status", statuses: progressToStatuses(iosPlatformStatus) }),
+        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 })
       ] })
     );

package/dist/commands/game/wizard.js

@@ -1,124 +1,66 @@
-import { Flags } from '@oclif/core';
-import { B as BaseAuthenticatedCommand, i as isCWDGodotGame, g as getUserCredentials, P as Platform, C as CredentialsType, n as getProjectCredentials } from '../../baseGameCommand-B3NbuvDu.js';
+import { Args } from '@oclif/core';
+import prompts from 'prompts';
+import { B as BaseAuthenticatedCommand, j as isCWDGodotGame, P as Platform } from '../../index-CF0fIsx2.js';
 import 'path';
 import 'fs';
 import '@expo/apple-utils/build/index.js';
 import 'axios';
+import 'crypto-js';
+import 'uuid';
 import 'luxon';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
+import 'node:path';
+import 'node:url';
 import 'react';
 import '@tanstack/react-query';
-import 'socket.io-client';
-import 'isomorphic-git';
 import 'ini';
 import 'deepmerge';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import 'isomorphic-git';
 
 class GameWizard extends BaseAuthenticatedCommand {
-  static args = {};
-  static description = "Runs all the steps for the specific platform";
-  static examples = ["<%= config.bin %> <%= command.id %>"];
-  static flags = {
-    forceStep: Flags.string({
-      char: "f",
-      description: "Force a specific step to run."
-    }),
-    platform: Flags.string({
-      char: "p",
-      description: "The platform to run the wizard for",
-      options: [
-        "ios"
-        /* TODO - android */
-      ],
-      required: false,
-      default: "ios"
+  static args = {
+    platform: Args.string({
+      description: 'The platform to run the wizard for. This can be "android" or "ios"',
+      required: false
     })
   };
+  static description = "Runs all the steps for the specific platform";
+  static examples = ["<%= config.bin %> <%= command.id %> ios", "<%= config.bin %> <%= command.id %> android"];
+  static flags = {};
   async run() {
-    const { flags } = this;
+    const { args } = this;
     if (!isCWDGodotGame()) {
       this.error("No Godot project detected. Please run this from a godot project directory.", { exit: 1 });
     }
-    const projectConfig = await this.getProjectConfigSafe();
-    const game = projectConfig.project;
-    const isStepForced = (commandName) => flags.forceStep?.includes(commandName);
-    const steps = [
-      {
-        command: "game:create",
-        args: ["--quiet"],
-        shouldRun: async () => !game
-      },
-      {
-        command: "apple:login",
-        args: ["--quiet"],
-        shouldRun: async () => {
-          const isLoggedIn = await this.hasValidAppleAuthState();
-          return !isLoggedIn;
-        }
-      },
-      {
-        command: "apple:apiKey:create",
-        args: ["--quiet"],
-        shouldRun: async () => {
-          const userCredentials = await getUserCredentials();
-          const userAppleApiKeyCredentials = userCredentials.filter(
-            (cred) => cred.platform == Platform.IOS && cred.type == CredentialsType.KEY
-          );
-          return userAppleApiKeyCredentials.length === 0;
-        }
-      },
-      {
-        command: "apple:certificate:create",
-        args: ["--quiet"],
-        shouldRun: async () => {
-          const userCredentials = await getUserCredentials();
-          const userAppleDistCredentials = userCredentials.filter(
-            (cred) => cred.platform == Platform.IOS && cred.type == CredentialsType.CERTIFICATE
-          );
-          return userAppleDistCredentials.length === 0;
-        }
-      },
-      {
-        command: "game:ios:app:create",
-        args: ["--quiet"],
-        shouldRun: async () => {
-          if (!game) return true;
-          const hasBundleIdSet = !!game.details?.iosBundleId;
-          return !hasBundleIdSet;
-        }
-      },
-      {
-        command: "game:ios:app:sync",
-        args: ["--quiet"],
-        // Can always run this
-        shouldRun: async () => true
-      },
-      {
-        command: "game:ios:profile:create",
-        args: ["--quiet"],
-        shouldRun: async () => {
-          if (!game) return true;
-          const projectCredentials = await getProjectCredentials(game.id);
-          const projectAppleProfileCredentials = projectCredentials.filter(
-            (cred) => cred.platform == Platform.IOS && cred.type == CredentialsType.CERTIFICATE
-          );
-          return projectAppleProfileCredentials.length === 0;
-        }
+    const runForPlatform = async (platform) => {
+      console.clear();
+      if (platform === Platform.ANDROID) {
+        return this.config.runCommand("game:android:wizard");
+      } else if (platform === Platform.IOS) {
+        return this.config.runCommand("game:ios:wizard");
       }
-    ];
-    for (const step of steps) {
-      const command = step.command;
-      const willRun = isStepForced(command) || await step.shouldRun();
-      if (!willRun) {
-        this.debug(`Skipping step: ${command}`);
-        continue;
-      }
-      const args = [...step.args, ...isStepForced(command) ? ["--force"] : []];
-      this.debug(`Running step: ${command} with args: ${args.join(" ")}`);
-      await this.config.runCommand(command, args);
+      process.exit(0);
+    };
+    if (args.platform) {
+      await runForPlatform(args.platform);
+      return;
     }
-    await this.config.runCommand("game:status");
+    const response = await prompts({
+      type: "select",
+      name: "platform",
+      message: "Please select a platform",
+      choices: [
+        { title: "Android", value: Platform.ANDROID },
+        { title: "iOS", value: Platform.IOS }
+      ],
+      initial: 0
+    });
+    await runForPlatform(response.platform);
   }
 }
 

package/dist/commands/internal/fastlane.js

@@ -0,0 +1,74 @@
+import fs__default, { promises } from 'fs';
+import path from 'path';
+import { Args, Flags } from '@oclif/core';
+import { S as BaseCommand } from '../../index-CF0fIsx2.js';
+import '@expo/apple-utils/build/index.js';
+import 'axios';
+import 'crypto-js';
+import 'uuid';
+import 'luxon';
+import 'crypto';
+import 'readline-sync';
+import 'node:readline';
+import 'node:path';
+import 'node:url';
+import 'react';
+import '@tanstack/react-query';
+import 'ini';
+import 'deepmerge';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import 'isomorphic-git';
+
+function generateFastlaneSession(cookieData) {
+  return cookieData.cookies.map((cookie) => {
+    return `- !ruby/object:HTTP::Cookie
+  name: ${cookie.key}
+  value: ${cookie.value}
+  domain: ${cookie.domain}
+  for_domain: ${cookie.hostOnly ? "false" : "true"}
+  path: "${cookie.path}"
+  secure: ${cookie.secure || false}
+  httponly: ${cookie.httpOnly || false}
+  expires: ${cookie.expires ? `"${cookie.expires}"` : ""}
+  max_age: ${cookie.maxAge || ""}
+  created_at: ${cookie.creation}
+  accessed_at: ${cookie.lastAccessed}`;
+  }).join("\n");
+}
+class AppleFastlane extends BaseCommand {
+  static args = {
+    username: Args.string({ description: "Your Apple email address", required: true }),
+    file: Args.string({ description: "Path where the fastlane session will be written", required: true })
+  };
+  static description = "Output a fastlane session file which can be used with xcodes";
+  static examples = [
+    "<%= config.bin %> <%= command.id %>",
+    "<%= config.bin %> <%= command.id %> --force --username me@email.nowhere"
+  ];
+  static flags = {
+    force: Flags.boolean({ char: "f" })
+  };
+  async run() {
+    const { args } = this;
+    const { username, file } = args;
+    const homeDirectory = this.config.home;
+    const inputFilePath = path.join(homeDirectory, ".app-store", "auth", username, "cookie");
+    if (!fs__default.existsSync(inputFilePath)) {
+      throw new Error(`No expo auth file found for ${username}`);
+    }
+    if (fs__default.existsSync(file) && !this.flags.force) {
+      throw new Error(`The file ${file} already exists. Use --force to overwrite it.`);
+    }
+    const outputFilePath = file;
+    const fileContent = await promises.readFile(inputFilePath, "utf-8");
+    const cookieData = JSON.parse(fileContent);
+    const yamlContent = generateFastlaneSession(cookieData);
+    await promises.mkdir(path.dirname(outputFilePath), { recursive: true });
+    await promises.writeFile(outputFilePath, yamlContent, "utf-8");
+    console.log(`FASTLANE_SESSION written to ${outputFilePath}`);
+  }
+}
+
+export { AppleFastlane as default };