@deaduchiha/orbito 0.1.0 → 0.1.1

package/dist/orbito.js

@@ -2157,7 +2157,7 @@ var {
 // package.json
 var package_default = {
   name: "@deaduchiha/orbito",
-  version: "0.1.0",
+  version: "0.1.1",
   description: "Deploy, follow logs and check migrations of apps on an Orbito server",
   license: "UNLICENSED",
   bin: {
@@ -7845,6 +7845,13 @@ function realRuntime() {
         resolve(/^y(es)?$/i.test(a.trim()));
       });
     }),
+    ask: (question) => new Promise((resolve) => {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+      rl.question(question, (a) => {
+        rl.close();
+        resolve(a);
+      });
+    }),
     onInterrupt: (fn) => {
       process.on("SIGINT", fn);
       return () => process.off("SIGINT", fn);
@@ -8036,10 +8043,10 @@ async function run(argv, rt) {
       throw new CliError(`This server does not speak CLI API ${API_VERSION}. Update the CLI or the server.`, EXIT.invalid);
     return caps.data;
   }
-  program.command("login").description("authorize this machine through your browser").requiredOption("--server <url>", "Orbito server, for example https://orbito.example.com").action(async (o) => {
+  async function loginTo(serverUrl) {
     let server;
     try {
-      server = new URL(o.server);
+      server = new URL(serverUrl);
     } catch {
       throw new CliError("--server must be a URL", EXIT.invalid);
     }
@@ -8048,7 +8055,10 @@ async function run(argv, rt) {
       try {
         return await rt.fetch(auth(p), {
           method: "POST",
-          headers: { "content-type": "application/json", origin: server.origin },
+          headers: {
+            "content-type": "application/json",
+            origin: server.origin
+          },
           body: JSON.stringify(body)
         });
       } catch (e) {
@@ -8079,7 +8089,10 @@ async function run(argv, rt) {
           sessionToken: body.access_token,
           label: `orbito cli on ${rt.hostname}`
         });
-        saveCredential(rt, server.origin, { token: ex.token, expiresAt: ex.expiresAt });
+        saveCredential(rt, server.origin, {
+          token: ex.token,
+          expiresAt: ex.expiresAt
+        });
         say(`Logged in to ${server.origin}. Apps: ${ex.apps.map((a) => `${a.id} (${a.level})`).join(", ") || "none yet"}`);
         if (g().json)
           emit({ type: "login", server: server.origin, apps: ex.apps });
@@ -8098,7 +8111,8 @@ async function run(argv, rt) {
       throw new CliError(`Login failed: ${body.error ?? t.status}`, EXIT.failed);
     }
     throw new CliError("The login code expired. Run orbito login again.", EXIT.denied);
-  });
+  }
+  program.command("login").description("authorize this machine through your browser").requiredOption("--server <url>", "Orbito server, for example https://orbito.example.com").action((o) => loginTo(o.server));
   program.command("logout").description("revoke and remove the machine credential").option("--server <url>", "defaults to the server in orbito.json").action(async (o) => {
     const server = o.server ?? cfg().server;
     const token = loadToken(rt, server);
@@ -8125,27 +8139,60 @@ async function run(argv, rt) {
       rt.out(`  ${a.id}  ${a.level}  ${a.name}
 `);
   });
-  program.command("init").description("validate access and create orbito.json").requiredOption("--app <id>", "the app id shown in the Orbito dashboard").option("--server <url>", "Orbito server (defaults to the one in an existing orbito.json)").option("--scripts", "add deploy, tail, deploy:status and db:remote:status to package.json").action(async (o) => {
+  program.command("init").description("link this repository to an Orbito app (asks what it needs)").option("--app <id>", "the app id; omit to pick from the apps you can reach").option("--server <url>", "Orbito server (defaults to the one in an existing orbito.json)").option("--scripts", "add deploy, tail, deploy:status and db:remote:status to package.json").action(async (o) => {
     let server = o.server;
     if (!server) {
       try {
         server = loadConfig(rt, g().config).server;
       } catch {
-        throw new CliError("Pass --server <url> the first time.", EXIT.invalid);
+        if (!rt.isTTY)
+          throw new CliError("Pass --server <url> the first time.", EXIT.invalid);
+        const a = (await rt.ask("Orbito server (for example orbito.example.com): ")).trim();
+        if (!a)
+          throw new CliError("Cancelled.", EXIT.invalid);
+        server = /^https?:\/\//.test(a) ? a : `https://${a}`;
       }
     }
-    const api = clientFor(server);
-    const me = await api.call("GET", "/me");
-    const mine = me.apps.find((a) => a.id === o.app);
+    try {
+      server = new URL(server).origin;
+    } catch {
+      throw new CliError("The server must be a URL, for example https://orbito.example.com", EXIT.invalid);
+    }
+    if (!loadToken(rt, server)) {
+      info(`Not logged in to ${server} yet, logging in first.`);
+      await loginTo(server);
+    }
+    const me = await clientFor(server).call("GET", "/me");
+    let app = o.app;
+    if (!app) {
+      if (me.apps.length === 0)
+        throw new CliError("You have no apps on this server yet. Ask an administrator for access.", EXIT.denied);
+      if (me.apps.length === 1)
+        app = me.apps[0].id;
+      else {
+        const list = me.apps.map((a, i) => `  ${i + 1}) ${a.id}  (${a.level})  ${a.name}`).join(`
+`);
+        if (!rt.isTTY)
+          throw new CliError(`Pass --app <id>. Apps you can use:
+${list}`, EXIT.invalid);
+        info(`Which app is this repository?
+${list}`);
+        const n = Number((await rt.ask("Number: ")).trim());
+        if (!Number.isInteger(n) || n < 1 || n > me.apps.length)
+          throw new CliError("Cancelled.", EXIT.invalid);
+        app = me.apps[n - 1].id;
+      }
+    }
+    const mine = me.apps.find((a) => a.id === app);
     if (!mine)
-      throw new CliError(`You have no access to an app named '${o.app}'. If an administrator just gave you access, run: orbito login --server ${server}`, EXIT.denied);
+      throw new CliError(`You have no access to an app named '${app}'. Apps you can use: ${me.apps.map((a) => a.id).join(", ") || "none"}. If an administrator just gave you access, run: orbito login --server ${server}`, EXIT.denied);
     const file = writeConfig(rt, {
-      $schema: "./node_modules/@orbito/cli/config.schema.json",
+      $schema: "./node_modules/@deaduchiha/orbito/config.schema.json",
       version: 1,
-      server: new URL(server).origin,
-      appId: o.app
+      server,
+      appId: app
     }, g().config);
-    say(`Wrote ${file} (you have '${mine.level}' on ${o.app}). Commit it; credentials stay outside the repository.`);
+    say(`Linked to '${app}' on ${server} (you have '${mine.level}'). Wrote ${file}; commit it, credentials stay outside the repository.`);
     const pkgFile = path3.join(path3.dirname(file), "package.json");
     if (fs3.existsSync(pkgFile)) {
       const pkg = JSON.parse(fs3.readFileSync(pkgFile, "utf8"));
@@ -8154,7 +8201,7 @@ async function run(argv, rt) {
         say(`package.json scripts to add:
 ${add.map(([k, v]) => `  "${k}": "${v}"`).join(`
 `)}`);
-        const yes = o.scripts || rt.isTTY && await rt.confirm("Add them?");
+        const yes = o.scripts || rt.isTTY && !/^n/i.test((await rt.ask("Add them? [Y/n] ")).trim());
         if (yes) {
           pkg.scripts = { ...pkg.scripts, ...Object.fromEntries(add) };
           fs3.writeFileSync(pkgFile, JSON.stringify(pkg, null, 2) + `
@@ -8164,6 +8211,8 @@ ${add.map(([k, v]) => `  "${k}": "${v}"`).join(`
           say("Not added. Pass --scripts to add them.");
       }
     }
+    say(`
+Next: orbito doctor   then   orbito deploy --dry-run`);
   });
   const configCmd = program.command("config").description("configuration commands");
   configCmd.command("validate").description("validate orbito.json and server compatibility").action(async () => {
@@ -8411,7 +8460,11 @@ ${add.map(([k, v]) => `  "${k}": "${v}"`).join(`
       try {
         results.push({ check: name, ok: true, detail: await fn() });
       } catch (e) {
-        results.push({ check: name, ok: false, detail: e.message });
+        results.push({
+          check: name,
+          ok: false,
+          detail: e.message
+        });
       }
     };
     let c = null;
@@ -8455,7 +8508,11 @@ ${add.map(([k, v]) => `  "${k}": "${v}"`).join(`
       return e.exitCode === 0 ? EXIT.ok : EXIT.invalid;
     const err = e;
     if (g().json)
-      emit({ type: "error", error: err.message, code: e instanceof ApiFailure ? e.code : "error" });
+      emit({
+        type: "error",
+        error: err.message,
+        code: e instanceof ApiFailure ? e.code : "error"
+      });
     else
       info(err.message);
     return e instanceof CliError ? e.exit : EXIT.failed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deaduchiha/orbito",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Deploy, follow logs and check migrations of apps on an Orbito server",
   "license": "UNLICENSED",
   "bin": {