liftbay 0.4.0 → 0.4.1

package/dist/index.js

@@ -25899,7 +25899,7 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync }
 import { homedir } from "os";
 import { join } from "path";
 
-// node_modules/openapi-fetch/dist/index.mjs
+// ../sdk/node_modules/openapi-fetch/dist/index.mjs
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var supportsRequestInitExt = () => {
   return typeof process === "object" && Number.parseInt(process?.versions?.node?.substring(0, 2)) >= 18 && process.versions.undici;
@@ -26375,7 +26375,7 @@ function removeTrailingSlash(url) {
   return url;
 }
 
-// node_modules/@liftbay/sdk/dist/index.js
+// ../sdk/dist/index.js
 var LiftbayApiError = class extends Error {
   constructor(status2, code, message, fields = {}) {
     super(message);
@@ -27222,6 +27222,7 @@ function cancelled(value) {
   }
   return value;
 }
+var slugifyProject = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
 var slugify = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
 async function createFirstOrg(lb, given) {
   const me = await unwrap(lb.GET("/v1/auth/me"));
@@ -27254,21 +27255,37 @@ async function ensureLinked(app, opts) {
   }
   const projects = await unwrap(lb.GET("/v1/orgs/{org}/projects", { params: { path: { org } } }));
   let slug = opts.project;
+  let projectName;
   if (!slug) {
     const match = projects.find((pr) => pr.slug === app.slug);
     if (opts.yes || !isInteractive()) slug = match?.slug ?? app.slug;
     else {
+      const taken = projects.some((pr) => pr.slug === app.slug);
       const choice = cancelled(
         await select({
           message: "Liftbay project",
           options: [
-            { value: "__new__", label: `Create "${app.slug}"`, hint: "new project" },
-            ...projects.map((pr) => ({ value: pr.slug, label: pr.name, hint: pr.slug }))
+            ...taken ? [] : [{ value: "__new__", label: `Create "${app.name}"`, hint: `new project \xB7 liftbay.dev/${org}/${app.slug}` }],
+            { value: "__named__", label: "Create a project with another name" },
+            ...projects.map((pr) => ({ value: pr.slug, label: pr.name, hint: `existing \xB7 ${pr.slug}` }))
           ],
-          initialValue: match?.slug ?? "__new__"
+          initialValue: match?.slug ?? (taken ? "__named__" : "__new__")
         })
       );
-      slug = choice === "__new__" ? app.slug : choice;
+      if (choice === "__named__") {
+        projectName = cancelled(
+          await text({
+            message: "Project name",
+            initialValue: app.name,
+            validate: (v) => {
+              const s = slugifyProject(v ?? "");
+              if (s.length < 2) return "At least 2 letters or digits";
+              if (projects.some((pr) => pr.slug === s)) return `${s} already exists: pick it from the list instead`;
+            }
+          })
+        );
+        slug = slugifyProject(projectName);
+      } else slug = choice === "__new__" ? app.slug : choice;
     }
   }
   let project2 = projects.find((pr) => pr.slug === slug);
@@ -27276,7 +27293,7 @@ async function ensureLinked(app, opts) {
     project2 = await unwrap(
       lb.POST("/v1/orgs/{org}/projects", {
         params: { path: { org } },
-        body: { name: app.name, slug, framework: app.framework, bundleId: app.bundleId, androidPackage: app.androidPackage }
+        body: { name: projectName ?? app.name, slug, framework: app.framework, bundleId: app.bundleId, androidPackage: app.androidPackage }
       })
     );
     log.success(`Created project ${import_picocolors4.default.bold(`${org}/${project2.slug}`)} with development, preview and production environments`);
@@ -27574,6 +27591,34 @@ async function waitFor(lb, config, message, done) {
   spin.error("Stopped waiting");
   return null;
 }
+async function waitForInstall(lb, config, attempt) {
+  const spin = spinner();
+  spin.start(`Waiting for the GitHub App to be installed ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+  const until = Date.now() + WAIT_MINUTES * 6e4;
+  let last = "waiting";
+  while (Date.now() < until) {
+    await sleep2(3e3);
+    const a2 = attempt ? (await lb.GET("/v1/orgs/{org}/github/install/{attempt}", { params: { path: { org: config.org, attempt } } })).data : void 0;
+    if (a2 && a2.status !== last) {
+      last = a2.status;
+      if (a2.status === "needs_sign_in") spin.message(`GitHub is done. Sign in to Liftbay in that browser to finish linking ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+      else if (a2.status !== "waiting" && a2.status !== "connected") {
+        spin.error("GitHub didn't connect");
+        return { ok: false, message: a2.message };
+      }
+    }
+    const s = await status(lb, config);
+    if (s.connected) {
+      spin.stop(`GitHub App installed for ${s.repo}`);
+      return { ok: true, status: s };
+    }
+    if (a2?.status === "connected") {
+      spin.message(`Installed on ${s.repo.split("/")[0]}, but without access to ${s.repo}: on GitHub, Configure the app and select the repository ${import_picocolors6.default.dim("(Ctrl-C to stop)")}`);
+    }
+  }
+  spin.error("Stopped waiting");
+  return { ok: false, message: "The GitHub App wasn't installed within 15 minutes." };
+}
 async function ensureGithub(opts) {
   const config = requireConfig();
   const lb = client();
@@ -27586,28 +27631,36 @@ async function ensureGithub(opts) {
   }
   const owner = s.repo.split("/")[0];
   if (!s.connected) {
-    const { url } = await unwrap(lb.POST("/v1/orgs/{org}/github/install", { params: { path: { org: config.org } } }));
     log.warn(`The Liftbay GitHub App isn't installed for ${import_picocolors6.default.bold(s.repo)} yet. Builds run through it.`);
-    if (!interactive) {
-      if (opts.soft) return { ...s, installUrl: url };
-      fail(`Install the Liftbay GitHub App on ${owner} (give it access to ${s.repo}): ${url}
+    for (let round = 0; ; round++) {
+      const { url, attempt } = await unwrap(lb.POST("/v1/orgs/{org}/github/install", { params: { path: { org: config.org } } }));
+      if (!interactive) {
+        if (opts.soft) return { ...s, installUrl: url };
+        fail(`Install the Liftbay GitHub App on ${owner} (give it access to ${s.repo}): ${url}
 Then run this again. In the dashboard: ${dashboardUrl()}/${config.org}/github`);
-    }
-    log.step("Install the Liftbay GitHub App");
-    log.message(
-      import_picocolors6.default.dim(`Pick ${import_picocolors6.default.bold(owner)}, give it access to ${import_picocolors6.default.bold(s.repo.split("/")[1])} (or all repositories) and save.
-Already installed on GitHub? Choose Configure, check the repository is selected and save.`)
-    );
-    console.log(`
+      }
+      log.step(round ? "Install the Liftbay GitHub App (new link)" : "Install the Liftbay GitHub App");
+      log.message(
+        import_picocolors6.default.dim(
+          `Pick ${import_picocolors6.default.bold(owner)}, give it access to ${import_picocolors6.default.bold(s.repo.split("/")[1])} (or all repositories), and install.
+Already installed on ${owner}? Choose Configure, make sure the repository is selected, and save.
+Copying the link instead? Open it in a browser signed in to ${dashboardUrl().replace(/^https?:\/\//, "")}, or sign in when asked.`
+        )
+      );
+      console.log(`
 ${import_picocolors6.default.cyan(url)}
 `);
-    if (!cancelled(await confirm({ message: "Open this in your browser now?", initialValue: true }))) {
-      fail(`Install it from the link above, or at ${dashboardUrl()}/${config.org}/github, then run this again.`);
+      openBrowser2(url);
+      const result = await waitForInstall(lb, config, attempt);
+      if (result.ok) {
+        s = result.status;
+        break;
+      }
+      log.error(result.message);
+      if (!cancelled(await confirm({ message: "Try again with a new link?", initialValue: true }))) {
+        fail(`GitHub isn't connected. Finish at ${dashboardUrl()}/${config.org}/github, or run \`liftbay github connect\` again.`);
+      }
     }
-    openBrowser2(url);
-    const done = await waitFor(lb, config, "Waiting for the GitHub App to be installed", (x) => x.connected);
-    if (!done) fail(`The GitHub App isn't installed yet. Finish at ${dashboardUrl()}/${config.org}/github, then run this again.`);
-    s = done;
   }
   if (opts.needWorkflow && s.workflow !== "present") {
     const branch = s.defaultBranch ?? "the default branch";
@@ -29129,7 +29182,7 @@ async function channels() {
 }
 
 // src/index.ts
-var program2 = new Command("liftbay").description("Build, ship and update React Native apps").version("0.4.0").option("--json", "print the result as JSON on stdout (progress goes to stderr; never prompts). Also LIFTBAY_JSON=1").hook("preAction", () => {
+var program2 = new Command("liftbay").description("Build, ship and update React Native apps").version("0.4.1").option("--json", "print the result as JSON on stdout (progress goes to stderr; never prompts). Also LIFTBAY_JSON=1").hook("preAction", () => {
   if (program2.opts().json || process.env.LIFTBAY_JSON === "1") enableJson();
 });
 var wrap = (fn) => async (...args) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftbay",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Build, sign, submit and update React Native apps from your own CI.",
   "keywords": [
     "react-native",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@clack/core": "1.5.1",
     "@clack/prompts": "^1.8.1",
-    "@liftbay/sdk": "^0.1.0",
+    "@liftbay/sdk": "^0.1.1",
     "@types/node": "^26.6.4",
     "@types/qrcode": "^1.5.6",
     "@types/node-forge": "^1.3.14",