shipthis 0.1.8 → 0.1.10

package/dist/commands/game/wizard.js

@@ -1,32 +1,506 @@
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { Args } from '@oclif/core';
-import prompts from 'prompts';
-import { B as BaseAuthenticatedCommand, j as isCWDGodotGame, P as Platform } from '../../index-DdABTtYO.js';
-import 'path';
-import 'fs';
-import '@expo/apple-utils/build/index.js';
-import 'axios';
+import { Text, Box, render } from 'ink';
+import { p as getAuthedHeaders, q as API_URL, K as castArrayObjectDates, $ as queryClient, a8 as updateProject, u as getGodotVersion, t as GameEngine, v as createProject, w as DEFAULT_IGNORED_FILES_GLOBS, x as DEFAULT_SHIPPED_FILES_GLOBS, P as Platform, J as JobStatus, X as WEB_URL, H as getProject, C as CredentialsType, Q as getGoogleStatus, B as BaseAuthenticatedCommand, j as isCWDGodotGame } from '../../index-BB7X1Pqp.js';
+import React, { useState, useContext, useEffect, useRef } from 'react';
+import { c as CommandContext, b as GameContext, d as useBuilds, M as Markdown, q as queryBuilds, G as GameProvider, e as CreateGooglePlayGame, C as Command } from '../../Command-D6rWEZRM.js';
+import Spinner from 'ink-spinner';
+import { Alert, TextInput } from '@inkjs/ui';
+import axios from 'axios';
 import 'crypto-js';
 import 'uuid';
 import 'luxon';
+import 'fs';
+import { useQuery, useMutation } from '@tanstack/react-query';
+import 'open';
 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';
+import 'qrcode';
+import 'string-length';
+import 'strip-ansi';
+import { C as CreateKeystore } from '../../CreateKeystore-g1z6DsU5.js';
+import { C as ConnectGoogle } from '../../index-DgbQBx6x.js';
+import { C as CreateServiceAccountKey } from '../../index-m4HTrJ5J.js';
+import { c as cacheKeys, f as fetchKeyTestResult, K as KeyTestStatus, a as KeyTestError } from '../../useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
+import { u as useShip, J as JobProgress } from '../../JobProgress-jmGAzvxS.js';
+import { a as getProjectCredentials } from '../../index-DOgF4dFK.js';
+import { T as Title } from '../../Title-BCQtayg6.js';
+import 'path';
+import '@expo/apple-utils/build/index.js';
+import 'ini';
+import 'deepmerge';
+import '../../index-Cz_KLwWf.js';
+import 'marked';
+import 'marked-terminal';
+import '../../RunWithSpinner-BVXNWGD3.js';
+import '../../useWebSocket-CBqsjHbt.js';
+import '../../useProjectCredentials-vjedBbKl.js';
+import '../../ProgressSpinner-6pw1T8Iw.js';
+import '../../git-DREGq-jc.js';
+import '../../useJobWatching-D-YzSlK8.js';
+
+async function queryJobs({ projectId, ...pageAndSortParams }) {
+  try {
+    const headers = getAuthedHeaders();
+    const url = `${API_URL}/projects/${projectId}/jobs`;
+    const response = await axios.get(url, { headers, params: pageAndSortParams });
+    return {
+      ...response.data,
+      data: castArrayObjectDates(response.data.data)
+    };
+  } catch (error) {
+    console.warn("queryJobs Error", error);
+    throw error;
+  }
+}
+const useJobs = (props) => {
+  const queryResult = useQuery({
+    queryKey: cacheKeys.jobs(props),
+    queryFn: async () => queryJobs(props)
+  });
+  return queryResult;
+};
+
+const useInviteServiceAccount = () => {
+  return useMutation({
+    mutationFn: async ({ 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("useInviteMutation Error", error);
+        throw error;
+      }
+    },
+    onSuccess: async (data) => {
+      const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+      await sleep(1e3);
+      queryClient.invalidateQueries({
+        queryKey: cacheKeys.androidKeyTestResult({ projectId: data.projectId })
+      });
+    }
+  });
+};
+
+const GameInfoForm = ({ gameInfo, onSubmit }) => {
+  const [activeInput, setActiveInput] = useState("name");
+  const [error, setError] = useState(null);
+  const [name, setName] = useState(gameInfo.name);
+  const [androidPackageName, setAndroidPackageName] = useState(gameInfo?.details?.androidPackageName);
+  const handleSubmitName = () => {
+    setError(null);
+    if (name.length === 0) {
+      setError("Please enter a name for your game");
+      return;
+    }
+    setActiveInput("androidPackageName");
+  };
+  const handleSubmitPackageName = () => {
+    setError(null);
+    const packageRegex = /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/;
+    if (!packageRegex.test(`${androidPackageName}`)) {
+      setError("Please enter a valid package name e.g. com.flappy.souls");
+      return;
+    }
+    onSubmit({
+      ...gameInfo,
+      name,
+      details: {
+        ...gameInfo.details,
+        androidPackageName
+      }
+    });
+  };
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Text, { bold: true, children: "Please confirm the following information about your game" }),
+    error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error }),
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          label: "Game name:",
+          isDisabled: activeInput !== "name",
+          defaultValue: name,
+          placeholder: "Enter the name of your game...",
+          onChange: setName,
+          onSubmit: handleSubmitName
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          label: "Android package name :",
+          isDisabled: activeInput !== "androidPackageName",
+          defaultValue: androidPackageName,
+          placeholder: "e.g. com.flappy.souls",
+          onChange: setAndroidPackageName,
+          onSubmit: handleSubmitPackageName
+        }
+      )
+    ] })
+  ] });
+};
+
+const getGameInfo = (flagValues, project) => {
+  const androidPackageName = flagValues.androidPackageName || project?.details?.androidPackageName || "";
+  const gameInfo = {
+    name: project?.name || flagValues.name || "",
+    details: {
+      ...project?.details,
+      androidPackageName
+    }
+  };
+  return gameInfo;
+};
+const CreateGame = (props) => {
+  const [isLoading, setIsLoading] = useState(true);
+  const [gameInfo, setGameInfo] = useState(null);
+  const [showForm, setShowForm] = useState(false);
+  const { command } = useContext(CommandContext);
+  const { setGameId, game } = useContext(GameContext);
+  const handleLoad = async () => {
+    if (!command) throw new Error("No command");
+    const flags = command.getDetailsFlagsValues();
+    const config = await command.getProjectConfigSafe();
+    setShowForm(true);
+    setIsLoading(false);
+    const info = getGameInfo(flags, config.project);
+    setGameInfo(info);
+  };
+  useEffect(() => {
+    handleLoad().catch(props.onError);
+  }, []);
+  const handleSubmitForm = async (gameInfo2) => {
+    try {
+      setShowForm(false);
+      setIsLoading(true);
+      if (!command) throw new Error("No command");
+      const projectConfig = await command.getProjectConfigSafe();
+      const existingGame = projectConfig.project;
+      const isNew = !existingGame;
+      if (!isNew) {
+        const project2 = await updateProject(existingGame.id, gameInfo2);
+        const updatedConfig = {
+          ...projectConfig,
+          project: project2
+        };
+        await command.setProjectConfig(updatedConfig);
+        return props.onComplete();
+      }
+      const { name, details } = gameInfo2;
+      const projectDetails = {
+        ...details,
+        gameEngine: GameEngine.GODOT,
+        gameEngineVersion: getGodotVersion()
+      };
+      const project = await createProject({ name, details: projectDetails });
+      await command.setProjectConfig({
+        project,
+        shippedFilesGlobs: DEFAULT_SHIPPED_FILES_GLOBS,
+        ignoredFilesGlobs: DEFAULT_IGNORED_FILES_GLOBS
+      });
+      setGameId(project.id);
+      props.onComplete();
+    } catch (e) {
+      props.onError(e);
+    }
+  };
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, borderStyle: "single", margin: 1, children: [
+    isLoading && /* @__PURE__ */ jsx(Spinner, {}),
+    showForm && gameInfo && /* @__PURE__ */ jsx(GameInfoForm, { gameInfo, onSubmit: handleSubmitForm })
+  ] });
+};
+
+const FormTextInput = ({ label, labelProps, ...rest }) => /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+  /* @__PURE__ */ jsx(Text, { ...labelProps, children: label }),
+  /* @__PURE__ */ jsx(TextInput, { ...rest })
+] });
+
+const CreateInitialBuild = (props) => {
+  const { gameId } = useContext(GameContext);
+  return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(CreateForGame, { gameId, ...props }) });
+};
+const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
+  const { command } = useContext(CommandContext);
+  const { data: buildData, isLoading: isLoadingBuilds } = useBuilds({ projectId: gameId, pageNumber: 0 });
+  const { data: jobData, isLoading: isLoadingJobs } = useJobs({
+    projectId: gameId,
+    pageNumber: 0
+  });
+  const prevHasBuild = useRef(false);
+  const shipMutation = useShip();
+  const [shipLog, setShipLog] = useState("");
+  useEffect(() => {
+    if (isLoadingBuilds || isLoadingJobs) return;
+    if (!buildData) return;
+    if (!jobData) return;
+    if (!command) return;
+    const hasAndroidBuild = buildData.data.some((build) => build.platform === Platform.ANDROID);
+    if (!prevHasBuild.current && hasAndroidBuild) return onComplete();
+    prevHasBuild.current = hasAndroidBuild;
+    const hasAndroidJob = jobData.data.some((job) => job.type === Platform.ANDROID);
+    const shouldRun = !hasAndroidBuild && !hasAndroidJob;
+    if (shouldRun)
+      shipMutation.mutateAsync({
+        command,
+        log: setShipLog
+      }).catch(onError);
+  }, [buildData, jobData, command]);
+  const androidJob = jobData?.data.find(
+    (job) => job.type === Platform.ANDROID && [JobStatus.PENDING, JobStatus.PROCESSING].includes(job.status)
+  );
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+      /* @__PURE__ */ jsx(Text, { children: "Create an initial build..." }),
+      (isLoadingBuilds || isLoadingJobs || shipMutation.isPending) && /* @__PURE__ */ jsx(Spinner, { type: "dots" })
+    ] }),
+    androidJob == null && /* @__PURE__ */ jsx(Text, { children: shipLog }),
+    androidJob && /* @__PURE__ */ jsx(JobProgress, { job: androidJob, onComplete })
+  ] }) });
+};
+
+const InviteForm = ({ onSubmit }) => {
+  const [error, setError] = useState(null);
+  const [accountId, setAccountId] = useState("");
+  const handleSubmitAccountId = () => {
+    setError(null);
+    const idRegEx = /^\d{10,20}$/;
+    if (!idRegEx.test(`${accountId}`)) {
+      setError("Please enter a valid Google Play Account ID (10-20 digits)");
+      return;
+    }
+    return onSubmit(accountId);
+  };
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [
+    /* @__PURE__ */ jsx(
+      FormTextInput,
+      {
+        label: "Please enter your Google Play Account ID:",
+        labelProps: { bold: true },
+        defaultValue: accountId,
+        placeholder: "e.g. 8110853839480950872",
+        onChange: setAccountId,
+        onSubmit: handleSubmitAccountId
+      }
+    ),
+    error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error })
+  ] }) });
+};
+
+const InviteServiceAccount = ({ onComplete, onError, ...boxProps }) => {
+  const { gameId } = useContext(GameContext);
+  const inviteMutation = useInviteServiceAccount();
+  const handleSubmit = async (developerId) => {
+    try {
+      if (!gameId) return;
+      await inviteMutation.mutateAsync({ projectId: gameId, developerId });
+      onComplete();
+    } catch (error) {
+      onError(error);
+    }
+  };
+  const templateVars = {
+    guideURL: new URL("/docs/guides/google-play-account-id", WEB_URL).toString()
+  };
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsx(Markdown, { filename: "invite-service-account.md", templateVars }),
+    /* @__PURE__ */ jsxs(Box, { children: [
+      inviteMutation.isPending && /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
+      !inviteMutation.isPending && /* @__PURE__ */ jsx(InviteForm, { onSubmit: handleSubmit })
+    ] })
+  ] }) });
+};
+
+var StepStatus = /* @__PURE__ */ ((StepStatus2) => {
+  StepStatus2["PENDING"] = "PENDING";
+  StepStatus2["RUNNING"] = "RUNNING";
+  StepStatus2["SUCCESS"] = "SUCCESS";
+  StepStatus2["FAILURE"] = "FAILURE";
+  StepStatus2["WARN"] = "WARN";
+  return StepStatus2;
+})(StepStatus || {});
+const Steps = [
+  "createGame",
+  "createKeystore",
+  "connectGoogle",
+  "createServiceAccount",
+  "createInitialBuild",
+  "createGooglePlayGame",
+  "inviteServiceAccount"
+];
+const getStepInitialStatus = (step, statusFlags) => {
+  if (step === "connectGoogle") {
+    if (!statusFlags.hasGoogleConnection && statusFlags.hasServiceAccountKey && statusFlags.hasInvitedServiceAccount)
+      return "WARN" /* WARN */;
+    return statusFlags.hasGoogleConnection ? "SUCCESS" /* SUCCESS */ : "PENDING" /* PENDING */;
+  }
+  if (step === "createInitialBuild") {
+    if (!statusFlags.hasInitialBuild && statusFlags.hasGooglePlayGame) return "WARN" /* WARN */;
+    return statusFlags.hasInitialBuild ? "SUCCESS" /* SUCCESS */ : "PENDING" /* PENDING */;
+  }
+  const base = {
+    createGame: statusFlags.hasGameName && statusFlags.hasAndroidPackageName,
+    createKeystore: statusFlags.hasAndroidKeystore,
+    createServiceAccount: statusFlags.hasServiceAccountKey,
+    createGooglePlayGame: statusFlags.hasGooglePlayGame,
+    inviteServiceAccount: statusFlags.hasInvitedServiceAccount,
+    connectGoogle: false,
+    createInitialBuild: false
+  };
+  return base[step] ? "SUCCESS" /* SUCCESS */ : "PENDING" /* PENDING */;
+};
+const getStatusFlags = async (cmd) => {
+  const projectConfig = await cmd.getProjectConfigSafe();
+  const projectId = projectConfig.project?.id;
+  const project = !!projectId && await getProject(projectId);
+  const hasShipThisProject = !!project;
+  const hasGameName = project && !!project?.name;
+  const hasAndroidPackageName = project && !!project?.details?.androidPackageName;
+  const projectCredentials = hasShipThisProject ? await getProjectCredentials(project.id) : [];
+  const hasAndroidKeystore = projectCredentials.some(
+    (cred) => cred.isActive && cred.platform === Platform.ANDROID && cred.type == CredentialsType.CERTIFICATE
+  );
+  const googleStatus = await getGoogleStatus();
+  const hasGoogleConnection = googleStatus.isAuthenticated;
+  const hasServiceAccountKey = projectCredentials.some(
+    (cred) => cred.isActive && cred.platform == Platform.ANDROID && cred.type == CredentialsType.KEY
+  );
+  const buildsResponse = !!projectId && hasShipThisProject && await queryBuilds({ projectId, pageNumber: 0 });
+  const hasInitialBuild = !!buildsResponse && buildsResponse.data.some((build) => build.platform === Platform.ANDROID);
+  const testResult = projectId ? await fetchKeyTestResult({ projectId }) : null;
+  const hasGooglePlayGame = testResult && testResult?.status === KeyTestStatus.SUCCESS || testResult?.status === KeyTestStatus.ERROR && testResult?.error === KeyTestError.NOT_INVITED;
+  const hasInvitedServiceAccount = testResult ? testResult?.status === KeyTestStatus.SUCCESS : false;
+  return {
+    hasShipThisProject,
+    hasGameName,
+    hasAndroidPackageName,
+    hasAndroidKeystore,
+    hasGoogleConnection,
+    hasServiceAccountKey,
+    hasInitialBuild,
+    hasGooglePlayGame,
+    hasInvitedServiceAccount
+  };
+};
+
+const StepLabels = {
+  createGame: "Create game in ShipThis",
+  createKeystore: "Create an Android Keystore",
+  connectGoogle: "Connect ShipThis with Google",
+  createServiceAccount: "Create a Service Account & API Key",
+  createInitialBuild: "Create an initial build",
+  createGooglePlayGame: "Create the game in Google Play",
+  inviteServiceAccount: "Invite the Service Account"
+};
+const StepWithStatus = ({ position, title, status }) => {
+  const indicator = {
+    [StepStatus.PENDING]: "  ",
+    // double space
+    [StepStatus.RUNNING]: /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
+      " "
+    ] }),
+    [StepStatus.SUCCESS]: "\u2705",
+    // this is 2 wide?
+    [StepStatus.FAILURE]: "\u274C",
+    // this is 2 wide?
+    [StepStatus.WARN]: "\u26A0\uFE0F "
+    // double
+  }[status];
+  const isBold = status !== StepStatus.PENDING;
+  return /* @__PURE__ */ jsxs(Text, { bold: isBold, children: [
+    /* @__PURE__ */ jsx(Fragment, { children: indicator }),
+    " ",
+    position,
+    ". ",
+    title
+  ] });
+};
+const StepStatusTable = ({ stepStatuses }) => {
+  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 1, children: Steps.map((step, index) => {
+    return /* @__PURE__ */ jsx(StepWithStatus, { position: index + 1, title: StepLabels[step], status: stepStatuses[index] }, step);
+  }) });
+};
+
+const stepComponentMap = {
+  createGame: CreateGame,
+  createKeystore: CreateKeystore,
+  connectGoogle: ConnectGoogle,
+  createServiceAccount: CreateServiceAccountKey,
+  createInitialBuild: CreateInitialBuild,
+  createGooglePlayGame: CreateGooglePlayGame,
+  inviteServiceAccount: InviteServiceAccount
+};
+const ON_COMPLETE_DELAY_MS = 500;
+const AndroidWizard = (props) => {
+  const { command } = React.useContext(CommandContext);
+  const [currentStep, setCurrentStep] = useState(null);
+  const [stepStatuses, setStepStatuses] = useState(null);
+  const [showSuccess, setShowSuccess] = useState(false);
+  const determineStep = async () => {
+    if (!command) return;
+    const statusFlags = await getStatusFlags(command);
+    const initStatuses = Steps.map((step) => getStepInitialStatus(step, statusFlags));
+    const firstPending = initStatuses.findIndex((status) => status === StepStatus.PENDING);
+    const pendingStep = firstPending === -1 ? null : Steps[firstPending];
+    const withPending = initStatuses.map((status, index) => {
+      if (index === firstPending) return StepStatus.RUNNING;
+      return status;
+    });
+    setCurrentStep(pendingStep);
+    setStepStatuses(withPending);
+    const isAllDone = firstPending === -1;
+    setShowSuccess(isAllDone);
+    if (isAllDone) setTimeout(props.onComplete, ON_COMPLETE_DELAY_MS);
+  };
+  useEffect(() => {
+    determineStep().catch(props.onError);
+  }, [command]);
+  const handleStepComplete = () => determineStep().catch(props.onError);
+  const StepInterface = currentStep ? stepComponentMap[currentStep] : null;
+  const templateVars = {
+    iosSetupURL: new URL("/docs/ios", WEB_URL).toString(),
+    docsURL: new URL("/docs", WEB_URL).toString()
+  };
+  return /* @__PURE__ */ jsxs(GameProvider, { children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Title, { children: "ShipThis Android Wizard" }) }),
+      stepStatuses && /* @__PURE__ */ jsx(StepStatusTable, { stepStatuses })
+    ] }),
+    StepInterface && /* @__PURE__ */ jsx(
+      StepInterface,
+      {
+        onComplete: handleStepComplete,
+        onError: props.onError,
+        margin: 1,
+        borderStyle: "single",
+        padding: 1
+      }
+    ),
+    showSuccess && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Markdown, { filename: "android-success.md", templateVars }) })
+  ] });
+};
 
 class GameWizard extends BaseAuthenticatedCommand {
   static args = {
     platform: Args.string({
       description: 'The platform to run the wizard for. This can be "android" or "ios"',
-      required: false
+      required: true,
+      options: ["android", "ios"]
     })
   };
   static description = "Runs all the steps for the specific platform";
@@ -37,30 +511,12 @@ class GameWizard extends BaseAuthenticatedCommand {
     if (!isCWDGodotGame()) {
       this.error("No Godot project detected. Please run this from a godot project directory.", { exit: 1 });
     }
-    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");
-      }
-      process.exit(0);
-    };
-    if (args.platform) {
-      await runForPlatform(args.platform);
-      return;
+    if (args.platform === "ios") {
+      return this.config.runCommand("game:ios:wizard");
     }
-    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);
+    render(
+      /* @__PURE__ */ jsx(Command, { command: this, children: /* @__PURE__ */ jsx(AndroidWizard, { onComplete: () => process.exit(0), onError: (e) => this.error(e) }) })
+    );
   }
 }
 

package/dist/commands/internal/fastlane.js

@@ -1,7 +1,7 @@
 import fs__default, { promises } from 'fs';
 import path from 'path';
 import { Args, Flags } from '@oclif/core';
-import { T as BaseCommand } from '../../index-DdABTtYO.js';
+import { T as BaseCommand } from '../../index-BB7X1Pqp.js';
 import '@expo/apple-utils/build/index.js';
 import 'axios';
 import 'crypto-js';