shipthis 0.1.30 → 0.1.32

package/dist/{index-OZi8bvu8.js → index-C03TV1_J.js}

@@ -2,16 +2,17 @@ import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Text, useInput, Box } from 'ink';
 import open from 'open';
 import { useState, useEffect, useContext } from 'react';
-import { R as getGoogleStatus, a2 as getShortAuthRequiredUrl, a3 as getGoogleAuthUrl, W as WEB_URL } from './index-DxzXU9Hd.js';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
+import 'ink-spinner';
+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 { Q as getGoogleStatus, a2 as getShortAuthRequiredUrl, a3 as getGoogleAuthUrl, W as WEB_URL } from './index-BhhiXbey.js';
 import '@oclif/core';
 import { useQuery } from '@tanstack/react-query';
 import 'crypto-js';
@@ -19,55 +20,52 @@ import 'uuid';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
-import { u as useWebSocket } from './useWebSocket-BOCa8v6o.js';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-CJLIEYmA.js';
-import { b as GameContext, M as Markdown } from './index-BTAL7EB_.js';
-import 'ink-spinner';
-import '@inkjs/ui';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import { u as useWebSocket } from './useWebSocket-5PYa2QER.js';
+import 'fullscreen-ink';
 import 'string-length';
 import 'strip-ansi';
+import '@inkjs/ui';
+import { G as GameContext, M as Markdown } from './index-C66Dd8Xc.js';
 import 'marked';
 import 'marked-terminal';
-import 'path';
 import qrcode from 'qrcode';
 
-const useGoogleStatus = () => {
-  return useQuery({
-    queryKey: cacheKeys.googleStatus(),
-    queryFn: getGoogleStatus
-  });
-};
+const useGoogleStatus = () => useQuery({
+  queryFn: getGoogleStatus,
+  queryKey: cacheKeys.googleStatus()
+});
 
 function useGoogleStatusWatching({
-  projectId,
   isWatching,
-  onGoogleStatusUpdate
+  onGoogleStatusUpdate,
+  projectId
 }) {
   const [wsGoogleStatus, setWsGoogleStatus] = useState(null);
   const listener = {
-    getPattern: () => `project.${projectId}:google-status`,
-    eventHandler: async (pattern, data2) => {
+    async eventHandler(pattern, data2) {
       setWsGoogleStatus(data2);
       if (onGoogleStatusUpdate) onGoogleStatusUpdate(data2);
-    }
+    },
+    getPattern: () => `project.${projectId}:google-status`
   };
   useWebSocket([listener] );
-  const { isLoading, data: googleStatus } = useGoogleStatus();
+  const { data: googleStatus, isLoading } = useGoogleStatus();
   useEffect(() => {
     setWsGoogleStatus(null);
   }, [projectId, isWatching, googleStatus]);
   const fetchedGoogleStatus = googleStatus ? googleStatus : null;
   const data = wsGoogleStatus ? wsGoogleStatus : fetchedGoogleStatus;
   return {
-    isLoading,
-    data
+    data,
+    isLoading
   };
 }
 
 const QRCodeTerminal = ({ url }) => {
   const [code, setCode] = useState(null);
   const handleLoad = async () => {
-    const codeString = await qrcode.toString(url, { type: "terminal", errorCorrectionLevel: "L", small: true });
+    const codeString = await qrcode.toString(url, { errorCorrectionLevel: "L", small: true, type: "terminal" });
     setCode(codeString);
   };
   useEffect(() => {
@@ -97,28 +95,46 @@ const ConnectGoogle = (props) => {
   const { gameId } = useContext(GameContext);
   return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(ConnectForGame, { gameId, ...props }) });
 };
-const ConnectForGame = ({ onComplete, onError, helpPage, gameId, ...boxProps }) => {
+const ConnectForGame = ({ gameId, helpPage, onComplete, onError, ...boxProps }) => {
+  const [showQRCode, setShowQRCode] = useState(false);
   useGoogleStatusWatching({
-    projectId: gameId,
     isWatching: true,
-    onGoogleStatusUpdate: (status) => {
+    onGoogleStatusUpdate(status) {
       if (status.isAuthenticated) return onComplete();
-    }
+    },
+    projectId: gameId
   });
   useInput(async (input) => {
-    if (!gameId) return;
-    if (input !== "d") return;
-    const url = await getConnectUrl(gameId, true);
-    await open(url);
+    switch (input) {
+      case "q": {
+        setShowQRCode(true);
+        return;
+      }
+      case "x": {
+        setShowQRCode(false);
+        return;
+      }
+      case "b": {
+        if (!gameId) return;
+        const url = await getConnectUrl(gameId, true);
+        await open(url);
+      }
+    }
   });
   const templateVars = {
     privacyURL: new URL("/privacy", WEB_URL).toString()
   };
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
-    /* @__PURE__ */ jsx(Markdown, { filename: "privacy-notification.md", templateVars }),
-    /* @__PURE__ */ jsx(Text, { children: "Scan the QR code below to connect your Google account to ShipThis:" }),
-    gameId && /* @__PURE__ */ jsx(GoogleAuthQRCode, { gameId, helpPage: !!helpPage }),
-    /* @__PURE__ */ jsx(Text, { children: "Or press D to sign-in using your browser" })
+    !showQRCode && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx(Markdown, { filename: "privacy-notification.md", templateVars }),
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "#4CE64C", children: "Press B to open your browser and connect your Google account to ShipThis" }),
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "#4CE64C", children: "Press Q to show a QR-code to connect using your mobile phone" })
+    ] }),
+    showQRCode && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx(Text, { children: "Scan the QR code below to connect your Google account to ShipThis:" }),
+      gameId && /* @__PURE__ */ jsx(GoogleAuthQRCode, { gameId, helpPage: Boolean(helpPage) }),
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "#4CE64C", children: "Press X to hide the QR code" })
+    ] })
   ] });
 };
 

package/dist/{index-BTAL7EB_.js → index-C66Dd8Xc.js}

@@ -1,26 +1,27 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Text, useInput, Box } from 'ink';
-import React, { useState, useEffect, useContext, useRef } from 'react';
 import Spinner from 'ink-spinner';
 import open from 'open';
-import { g as getShortUUID, h as getPlatformName, s as scriptDir } from './index-35Eswf6F.js';
-import { c as cacheKeys, u as useAndroidServiceAccountTestResult, K as KeyTestStatus, a as KeyTestError } from './useAndroidServiceAccountTestResult-CJLIEYmA.js';
-import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates, P as Platform, a6 as getShortDateTime, J as JobStatus, a7 as getShortTimeDelta, E as getJob, F as getProject, a2 as getShortAuthRequiredUrl, K as queryClient, W as WEB_URL } from './index-DxzXU9Hd.js';
-import '@inkjs/ui';
-import axios from 'axios';
+import React, { useState, useEffect, useContext, useRef } from 'react';
+import { p as getAuthedHeaders, o as API_URL, I as castArrayObjectDates, P as Platform, a6 as getShortDateTime, J as JobStatus, a7 as getShortTimeDelta, z as getJob, E as getProject, a2 as getShortAuthRequiredUrl, K as queryClient, a8 as BuildType, W as WEB_URL } from './index-BhhiXbey.js';
+import { h as getPlatformName, g as getShortUUID, s as scriptDir } from './index-CGBdOm1q.js';
 import { useQuery } from '@tanstack/react-query';
-import fs__default from 'fs';
+import axios from 'axios';
+import { c as cacheKeys, u as useAndroidServiceAccountTestResult, K as KeyTestStatus, a as KeyTestError } from './useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import 'luxon';
+import fs__default from 'node:fs';
+import 'fast-glob';
 import 'uuid';
 import 'yazl';
+import 'socket.io-client';
+import 'fullscreen-ink';
+import 'string-length';
+import 'strip-ansi';
+import '@inkjs/ui';
+import path from 'node:path';
 import { setOptions, parse } from 'marked';
 import TerminalRenderer from 'marked-terminal';
-import path from 'path';
 import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
-import 'luxon';
-import 'fast-glob';
-import 'socket.io-client';
 
 async function queryBuilds({ projectId, ...pageAndSortParams }) {
   try {
@@ -37,21 +38,21 @@ async function queryBuilds({ projectId, ...pageAndSortParams }) {
   }
 }
 function getBuildSummary(build) {
-  const buildType = build.buildType || (build.platform == Platform.IOS ? "IPA" : "AAB");
-  const filename = `game.${buildType.toLowerCase()}`;
+  const ext = build.buildType || (build.platform == Platform.IOS ? "IPA" : "AAB");
+  const filename = `game.${ext.toLowerCase()}`;
   return {
     id: getShortUUID(build.id),
     jobId: getShortUUID(build.jobId),
     ...getJobDetailsSummary(build.jobDetails),
-    type: `${getPlatformName(build.platform)} ${buildType}`,
+    cmd: `shipthis game build download ${getShortUUID(build.id)} ${filename}`,
     createdAt: getShortDateTime(build.createdAt),
-    cmd: `shipthis game build download ${getShortUUID(build.id)} ${filename}`
+    type: `${getPlatformName(build.platform)} ${build.buildType || ""}`.trim()
   };
 }
 const useBuilds = (props) => {
   const queryResult = useQuery({
-    queryKey: cacheKeys.builds(props),
-    queryFn: async () => queryBuilds(props)
+    queryFn: async () => queryBuilds(props),
+    queryKey: cacheKeys.builds(props)
   });
   return queryResult;
 };
@@ -62,8 +63,8 @@ function getJobDetailsSummary(jobDetails) {
   const gitCommit = jobDetails?.gitCommitHash ? getShortUUID(jobDetails?.gitCommitHash) : "";
   const gitBranch = jobDetails?.gitBranch || "";
   return {
-    version: `${semanticVersion} (${buildNumber})`,
-    gitInfo: gitCommit ? `${gitCommit} (${gitBranch})` : ""
+    gitInfo: gitCommit ? `${gitCommit} (${gitBranch})` : "",
+    version: `${semanticVersion} (${buildNumber})`
   };
 }
 function getJobSummary(job, timeNow) {
@@ -71,22 +72,56 @@ function getJobSummary(job, timeNow) {
   return {
     id: getShortUUID(job.id),
     ...getJobDetailsSummary(job.details),
-    platform: getPlatformName(job.type),
-    status: job.status,
     createdAt: getShortDateTime(job.createdAt),
-    runtime: getShortTimeDelta(job.createdAt, inProgress ? timeNow : job.updatedAt)
+    platform: getPlatformName(job.type),
+    runtime: getShortTimeDelta(job.createdAt, inProgress ? timeNow : job.updatedAt),
+    status: job.status
   };
 }
-const useJob = (props) => {
-  return useQuery({
-    queryKey: cacheKeys.job(props),
-    queryFn: () => getJob(props.jobId, props.projectId)
+const useJob = (props) => useQuery({
+  queryFn: () => getJob(props.jobId, props.projectId),
+  queryKey: cacheKeys.job(props)
+});
+
+const cleanHyperlinks = (input) => (
+  // When we run in a <ScrollArea> the links break
+  // Remove OSC 8 hyperlink wrappers but preserve the styled content inside
+  input.replaceAll(/\u001B]8;;[^\u0007]*\u0007/g, "").replaceAll("\x1B]8;;\x07", "")
+);
+const getRenderedMarkdown = ({ filename, templateVars, ...options }) => {
+  setOptions({
+    renderer: new TerminalRenderer({
+      ...options
+    })
   });
+  const entrypointPath = fs__default.realpathSync(process.argv[1]);
+  const root = path.dirname(entrypointPath);
+  const mdPath = path.join(root, "..", "assets", "markdown", filename);
+  const mdTemplate = fs__default.readFileSync(mdPath, "utf8").trim();
+  let markdown = mdTemplate;
+  if (templateVars) {
+    markdown = markdown.replaceAll(/\${if (.*?)}([\S\s]*?)\${endif}/g, (_, key, content) => templateVars[key.trim()] ? content : "");
+    markdown = markdown.replaceAll(/\${(.*?)}/g, (_, key) => {
+      const trimmed = key.trim();
+      return templateVars[trimmed] ? String(templateVars[trimmed]) : "";
+    });
+  }
+  const rendered = parse(markdown).trim();
+  const cleaned = cleanHyperlinks(rendered);
+  return cleaned;
+};
+const Markdown = ({ filename, templateVars, ...options }) => {
+  const [text, setText] = useState("");
+  useEffect(() => {
+    const cleaned = getRenderedMarkdown({ filename, templateVars, ...options });
+    setText(cleaned);
+  }, [filename, templateVars, options]);
+  return /* @__PURE__ */ jsx(Text, { children: text });
 };
 
 const CommandContext = React.createContext({
   command: null,
-  setCommand: (command) => {
+  setCommand(command) {
   }
 });
 const CommandProvider = (props) => {
@@ -95,21 +130,15 @@ const CommandProvider = (props) => {
 };
 
 const GameContext = React.createContext({
-  gameId: null,
   game: null,
-  setGameId: (gameId) => {
+  gameId: null,
+  setGameId(gameId) {
   }
 });
 const GameProvider = ({ children }) => {
-  const [gameId, setGameId] = useState(null);
-  const [game, setGame] = useState(null);
   const { command } = React.useContext(CommandContext);
-  const handleLoad = async () => {
-    if (command) {
-      const commandGameId = await command.getGameId();
-      if (commandGameId) setGameId(commandGameId);
-    }
-  };
+  const [gameId, setGameId] = useState(command?.getGameId() || null);
+  const [game, setGame] = useState(null);
   const handleGameIdChange = async () => {
     if (!gameId) {
       setGame(null);
@@ -121,37 +150,7 @@ const GameProvider = ({ children }) => {
   useEffect(() => {
     handleGameIdChange();
   }, [gameId]);
-  useEffect(() => {
-    handleLoad();
-  }, [command]);
-  return /* @__PURE__ */ jsx(GameContext.Provider, { value: { gameId, game, setGameId }, children });
-};
-
-const cleanHyperlinks = (input) => {
-  return input.replace(/\x1b]8;;[^\x07]*\x07/g, "").replace(/\x1b]8;;\x07/g, "");
-};
-const getRenderedMarkdown = ({ filename, templateVars, ...options }) => {
-  setOptions({
-    renderer: new TerminalRenderer({
-      ...options
-    })
-  });
-  const entrypointPath = fs__default.realpathSync(process.argv[1]);
-  const root = path.dirname(entrypointPath);
-  const mdPath = path.join(root, "..", "assets", "markdown", filename);
-  const mdTemplate = fs__default.readFileSync(mdPath, "utf8").trim();
-  const markdown = !templateVars ? mdTemplate : mdTemplate.replace(/\${(.*?)}/g, (_, key) => templateVars[key.trim()] || "");
-  const rendered = parse(markdown).trim();
-  const cleaned = cleanHyperlinks(rendered);
-  return cleaned;
-};
-const Markdown = ({ filename, templateVars, ...options }) => {
-  const [text, setText] = useState("");
-  useEffect(() => {
-    const cleaned = getRenderedMarkdown({ filename, templateVars, ...options });
-    setText(cleaned);
-  }, [filename, templateVars, options]);
-  return /* @__PURE__ */ jsx(Text, { children: text });
+  return /* @__PURE__ */ jsx(GameContext.Provider, { value: { game, gameId, setGameId }, children });
 };
 
 scriptDir(import.meta);
@@ -163,9 +162,9 @@ const CreateGooglePlayGame = (props) => {
   const { gameId } = useContext(GameContext);
   return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(Create, { gameId, ...props }) });
 };
-const Create = ({ onComplete, onError, gameId, ...boxProps }) => {
+const Create = ({ gameId, onComplete, onError, ...boxProps }) => {
   const { data: result, isFetching } = useAndroidServiceAccountTestResult({ projectId: gameId });
-  const { data: builds } = useBuilds({ projectId: gameId, pageNumber: 0 });
+  const { data: builds } = useBuilds({ pageNumber: 0, projectId: gameId });
   const previousIsFound = useRef(false);
   useEffect(() => {
     const isFound = getIsAppFound(result);
@@ -177,25 +176,27 @@ const Create = ({ onComplete, onError, gameId, ...boxProps }) => {
   useInput(async (input) => {
     if (!gameId) return;
     switch (input) {
-      case "r":
+      case "r": {
         queryClient.invalidateQueries({
           queryKey: cacheKeys.androidKeyTestResult({ projectId: gameId })
         });
         break;
-      case "d":
+      }
+      case "d": {
         const dashUrl = await getShortAuthRequiredUrl(`/games/${getShortUUID(gameId)}/builds`);
         await open(dashUrl);
+      }
     }
     if (input !== "r") return;
     queryClient.invalidateQueries({
       queryKey: cacheKeys.androidKeyTestResult({ projectId: gameId })
     });
   });
-  const initialBuild = builds?.data.find((build) => build.platform === Platform.ANDROID);
-  const downloadCmd = initialBuild ? `${getBuildSummary(initialBuild).cmd}` : "";
+  const initialBuild = builds?.data.find((build) => build.platform === Platform.ANDROID && build.buildType === BuildType.AAB);
+  const downloadCmd = initialBuild ? `${getBuildSummary(initialBuild).cmd}` : "Initial AAB build not found!";
   const templateVars = {
-    downloadCmd,
-    dashboardURL: new URL(`/games/${getShortUUID(gameId)}/builds`, WEB_URL).toString()
+    dashboardURL: new URL(`/games/${getShortUUID(gameId)}/builds`, WEB_URL).toString(),
+    downloadCmd
   };
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
     /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
@@ -206,4 +207,4 @@ const Create = ({ onComplete, onError, gameId, ...boxProps }) => {
   ] }) });
 };
 
-export { CommandProvider as C, GameProvider as G, Markdown as M, getJobSummary as a, GameContext as b, getBuildSummary as c, CommandContext as d, useJob as e, CreateGooglePlayGame as f, getRenderedMarkdown as g, queryBuilds as q, useBuilds as u };
+export { CommandContext as C, GameContext as G, Markdown as M, getJobSummary as a, CommandProvider as b, GameProvider as c, getBuildSummary as d, useJob as e, CreateGooglePlayGame as f, getRenderedMarkdown as g, queryBuilds as q, useBuilds as u };

package/dist/{index-35Eswf6F.js → index-CGBdOm1q.js}

@@ -1,63 +1,76 @@
-import crypto from 'crypto';
-import fs__default from 'fs';
-import readlineSync from 'readline-sync';
-import { promises } from 'node:readline';
+import crypto from 'node:crypto';
+import fs__default from 'node:fs';
 import path from 'node:path';
+import { promises } from 'node:readline';
 import { fileURLToPath } from 'node:url';
-import { L as JobStage, P as Platform, M as LogLevel, J as JobStatus } from './index-DxzXU9Hd.js';
+import readlineSync from 'readline-sync';
+import { L as JobStage, P as Platform, M as LogLevel, J as JobStatus } from './index-BhhiXbey.js';
 import 'luxon';
 import 'axios';
 import 'isomorphic-git';
 import '@oclif/core';
-import 'react';
 import '@tanstack/react-query';
+import 'react';
 import 'crypto-js';
 import 'uuid';
 import 'fast-glob';
 import 'yazl';
 import 'socket.io-client';
+import 'fullscreen-ink';
 
 function getShortUUID(originalUuid) {
   return originalUuid.slice(0, 8);
 }
 function getStageColor(stage) {
   switch (stage) {
-    case JobStage.SETUP:
+    case JobStage.SETUP: {
       return "#FFB3B3";
+    }
     // pastel red
-    case JobStage.CONFIGURE:
+    case JobStage.CONFIGURE: {
       return "#FFD9B3";
+    }
     // pastel orange
-    case JobStage.EXPORT:
+    case JobStage.EXPORT: {
       return "#FFFACD";
+    }
     // pastel yellow
-    case JobStage.BUILD:
+    case JobStage.BUILD: {
       return "#B3FFB3";
+    }
     // pastel green
-    case JobStage.PUBLISH:
+    case JobStage.PUBLISH: {
       return "#B3D9FF";
+    }
   }
 }
 function getMessageColor(level) {
   switch (level) {
-    case LogLevel.INFO:
+    case LogLevel.INFO: {
       return "white";
-    case LogLevel.WARN:
+    }
+    case LogLevel.WARN: {
       return "yellow";
-    case LogLevel.ERROR:
+    }
+    case LogLevel.ERROR: {
       return "red";
+    }
   }
 }
 function getJobStatusColor(status) {
   switch (status) {
-    case JobStatus.PENDING:
+    case JobStatus.PENDING: {
       return "yellow";
-    case JobStatus.PROCESSING:
+    }
+    case JobStatus.PROCESSING: {
       return "blue";
-    case JobStatus.COMPLETED:
+    }
+    case JobStatus.COMPLETED: {
       return "green";
-    case JobStatus.FAILED:
+    }
+    case JobStatus.FAILED: {
       return "red";
+    }
   }
 }
 async function getFileHash(filename) {
@@ -71,9 +84,9 @@ async function getFileHash(filename) {
 }
 function isValidSemVer(versionString) {
   const [semVer, major, minor, patch, prerelease, buildmetadata] = versionString.match(
-    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[A-Za-z-][\dA-Za-z-]*)(?:\.(?:0|[1-9]\d*|\d*[A-Za-z-][\dA-Za-z-]*))*))?(?:\+([\dA-Za-z-]+(?:\.[\dA-Za-z-]+)*))?$/
   ) ?? [];
-  return !!semVer;
+  return Boolean(semVer);
 }
 function makeHumanReadable(rawObject) {
   const getLabel = (key) => {
@@ -88,12 +101,15 @@ function makeHumanReadable(rawObject) {
 }
 function getPlatformName(platform) {
   switch (platform) {
-    case Platform.IOS:
+    case Platform.IOS: {
       return "iOS";
-    case Platform.ANDROID:
+    }
+    case Platform.ANDROID: {
       return "Android";
-    default:
+    }
+    default: {
       throw new Error(`Unknown platform: ${platform}`);
+    }
   }
 }
 async function getMaskedInput(message) {
@@ -114,11 +130,11 @@ async function getInput(message) {
 }
 function generatePackageName(gameName) {
   let normalizedGameName = gameName.trim().toLowerCase();
-  normalizedGameName = normalizedGameName.replace(/[\s\-_]+/g, ".");
-  normalizedGameName = normalizedGameName.replace(/[^a-z0-9\.]/g, "");
-  normalizedGameName = normalizedGameName.replace(/\.+/g, ".");
+  normalizedGameName = normalizedGameName.replaceAll(/[\s_\-]+/g, ".");
+  normalizedGameName = normalizedGameName.replaceAll(/[^\d.a-z]/g, "");
+  normalizedGameName = normalizedGameName.replaceAll(/\.+/g, ".");
   normalizedGameName = normalizedGameName.replace(/^\./, "").replace(/\.$/, "");
-  if (/^[0-9]/.test(normalizedGameName)) {
+  if (/^\d/.test(normalizedGameName)) {
     normalizedGameName = "app." + normalizedGameName;
   }
   const prefix = "com.";