arcadible 0.1.19 → 0.1.21

package/bin/arc-open.js

@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+"use strict";
+
+// [import]
+
+const path = require("node:path");
+
+// [import]
+
+const hideBin = require("yargs/helpers").hideBin;
+const yargs = require("yargs/yargs");
+
+// [import]
+
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
+const cfguri = require("../src/config/uri");
+const log = require("../src/util/log");
+const open = require("../src/cli/open");
+const phrase = require("../src/phrase");
+const rc = require("../src/util/rc");
+const shell = require("../src/util/shell");
+
+// [use]
+
+const findRc = rc.findRc;
+const launch = shell.launch;
+const resolve = path.resolve;
+
+// [declare]
+
+const COMMAND = "open";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
+
+// [define]
+
+const conf = {
+  browser: false,
+  game: "self",
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+};
+
+// [function]
+
+const start = function (argv) {
+  return open({
+    game: argv.game,
+    root: resolve(process.cwd(), argv.cwd),
+  })
+    .then((data) => {
+      const page = data?.page;
+      if (!page) {
+        throw new Error(phrase.noGameId());
+      }
+      if (argv.browser) {
+        launch(`${cfguri.HOST_HTTP_WWW}${page}`);
+        return;
+      }
+      launch(
+        `${cfguri.HOST_APP_STORE}${page}`,
+        `${cfguri.HOST_HTTP_WWW}${page}`,
+      );
+    })
+    .catch((ex) => {
+      log.hd("Open aborted.");
+      log.p(ex.message);
+      process.exit(1);
+    });
+};
+
+// [function]
+
+const main = function (argv) {
+  return start(
+    yargs(hideBin(argv))
+      .scriptName(`${TOOL} ${COMMAND}`)
+      .usage("$0 [game] [options]")
+      .command("$0 [game]", false, (cli) =>
+        cli.positional("game", {
+          default: conf.game,
+          describe: "Game handle or ID",
+          type: "string",
+        }),
+      )
+      .option("browser", {
+        default: conf.browser,
+        describe: "Open in a web browser",
+        type: "boolean",
+      })
+      .option("cwd", {
+        alias: "C",
+        default: ".",
+        describe: "Set the working directory",
+        type: "string",
+      })
+      .help("help")
+      .alias("help", "h")
+      .version(VERSION)
+      .alias("version", "v")
+      .strict()
+      .parse(),
+  );
+};
+
+// [main]
+
+if (require.main === module) {
+  main(process.argv);
+}
+
+// [export]
+
+module.exports = { main };

package/bin/arc-pack.js

@@ -12,11 +12,12 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
 const pack = require("../src/cli/pack");
 const phrase = require("../src/phrase");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 const validate = require("../src/cli/validate");
@@ -30,8 +31,9 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "pack";
+const COMMAND = "pack";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
@@ -40,7 +42,7 @@ const conf = {
   json: false,
   output: null,
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -94,7 +96,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("input", {
         alias: "i",
@@ -128,7 +130,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-play.js

@@ -12,41 +12,78 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
+const cfguri = require("../src/config/uri");
 const log = require("../src/util/log");
-const pkg = require("../package.json");
+const phrase = require("../src/phrase");
 const play = require("../src/cli/play");
 const rc = require("../src/util/rc");
+const shell = require("../src/util/shell");
+const spinner = require("../src/util/spinner");
 
 // [use]
 
 const findRc = rc.findRc;
+const launch = shell.launch;
 const resolve = path.resolve;
+const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "play";
+const COMMAND = "play";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
-  browser: true,
+  browser: false,
   game: "self",
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  quiet: false,
+  release: "production",
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+};
+
+// [function]
+
+const handler = function ({ quiet, sw }) {
+  return {
+    onPlayFetch() {
+      sw.start(quiet);
+    },
+  };
 };
 
 // [function]
 
 const start = function (argv) {
+  const sw = new SpinnerWheel("Opening... %s");
   return play({
-    browser: argv.browser,
     game: argv.game,
+    handler: handler({ quiet: argv.quiet, sw }),
+    release: argv.release,
     root: resolve(process.cwd(), argv.cwd),
-  }).catch((ex) => {
-    log.hd("Play aborted.");
-    log.p(ex.message);
-    process.exit(1);
-  });
+  })
+    .then((data) => {
+      const orientation = data?.orientation;
+      const url = data?.url;
+      if (!orientation || !url) {
+        throw new Error(phrase.noGameId());
+      }
+      sw.stop(true);
+      if (argv.browser) {
+        launch(url);
+        return;
+      }
+      launch(`${cfguri.HOST_APP_PLAY}/${orientation}/${url}`, url);
+    })
+    .catch((ex) => {
+      sw.stop(true);
+      log.hd("Play aborted.");
+      log.p(ex.message);
+      process.exit(1);
+    });
 };
 
 // [function]
@@ -54,12 +91,19 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
-      .usage("$0 [options]")
-      .option("game", {
-        alias: "g",
-        default: conf.game,
-        describe: "Game handle or ID",
+      .scriptName(`${TOOL} ${COMMAND}`)
+      .usage("$0 [game] [options]")
+      .command("$0 [game]", false, (cli) =>
+        cli.positional("game", {
+          default: conf.game,
+          describe: "Game handle or ID",
+          type: "string",
+        }),
+      )
+      .option("release", {
+        alias: "r",
+        default: conf.release,
+        describe: "Release channel or version",
         type: "string",
       })
       .option("browser", {
@@ -67,6 +111,12 @@ const main = function (argv) {
         describe: "Open in a web browser",
         type: "boolean",
       })
+      .option("quiet", {
+        alias: "q",
+        default: conf.quiet,
+        describe: "Output only errors",
+        type: "boolean",
+      })
       .option("cwd", {
         alias: "C",
         default: ".",
@@ -75,7 +125,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-validate.js

@@ -12,9 +12,10 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const validate = require("../src/cli/validate");
 
@@ -26,22 +27,22 @@ const resolve = path.resolve;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "validate";
+const COMMAND = "validate";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
   json: false,
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
 
 const start = function (argv) {
   const json = argv.json;
-  const quiet = argv.quiet;
   return validate({ root: resolve(process.cwd(), argv.cwd) })
     .then((issues) => {
       const count = issues.length;
@@ -49,8 +50,8 @@ const start = function (argv) {
         print({ issues });
       } else if (count) {
         log.hd(`${count} ${count === 1 ? "issue" : "issues"} found.`);
-        log.p(issues.map((error) => `✗ ${error}`));
-      } else if (!quiet) {
+        log.p(issues.map((issue) => `✗ ${issue}`));
+      } else if (!argv.quiet) {
         log.hs("No issues found.");
       }
       process.exit(count ? 1 : 0);
@@ -72,7 +73,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("json", {
         alias: "j",
@@ -94,7 +95,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-whoami.js

@@ -8,9 +8,10 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 const whoami = require("../src/cli/whoami");
@@ -23,14 +24,15 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "whoami";
+const COMMAND = "whoami";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
   json: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -48,13 +50,13 @@ const handler = function ({ json, sw }) {
 
 const start = function (argv) {
   const json = argv.json;
-  const sw = new SpinnerWheel("Checking login... %s");
+  const sw = new SpinnerWheel("Checking... %s");
   return whoami({ handler: handler({ json, sw }) })
     .then((current) => {
-      const profile = current?.profile;
-      if (!profile) {
+      const user = current?.user;
+      if (!user) {
         if (json) {
-          print({ profile: null });
+          print({ user: null });
         } else {
           sw.stop(true);
           log.p("Not logged in.");
@@ -62,10 +64,10 @@ const start = function (argv) {
         return;
       }
       if (json) {
-        print({ profile });
+        print({ user });
       } else {
         sw.stop(true);
-        log.p(profile.display_name);
+        log.p(user.display_name);
       }
     })
     .catch((ex) => {
@@ -86,7 +88,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("json", {
         alias: "j",
@@ -96,7 +98,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc.js

@@ -7,8 +7,9 @@ const fs = require("fs-extra");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
-const pkg = require("../package.json");
 
 // [use]
 
@@ -16,15 +17,16 @@ const pathExists = fs.pathExists;
 
 // [declare]
 
-const CMD = "arc";
+const BIN = cfgpackage.bin;
+const TOOL = cfgproduct.tool;
 
 // [function]
 
 const dispatch = function (argv) {
   const args = [...argv];
-  const subcmds = Object.keys(pkg.bin)
-    .filter((key) => key !== CMD)
-    .map((key) => key.slice(CMD.length + 1));
+  const subcmds = Object.keys(BIN)
+    .filter((key) => key !== TOOL)
+    .map((key) => key.slice(TOOL.length + 1));
   if (!subcmds.includes(args[2])) {
     args.splice(2, 0, "default");
   }

package/package.json

@@ -2,15 +2,14 @@
   "bin": {
     "arc": "bin/arc.js",
     "arc-build": "bin/arc-build.js",
-    "arc-count": "bin/arc-count.js",
     "arc-deploy": "bin/arc-deploy.js",
     "arc-init": "bin/arc-init.js",
     "arc-inspect": "bin/arc-inspect.js",
     "arc-login": "bin/arc-login.js",
     "arc-logout": "bin/arc-logout.js",
+    "arc-open": "bin/arc-open.js",
     "arc-pack": "bin/arc-pack.js",
     "arc-play": "bin/arc-play.js",
-    "arc-predeploy": "bin/arc-predeploy.js",
     "arc-validate": "bin/arc-validate.js",
     "arc-whoami": "bin/arc-whoami.js"
   },
@@ -43,12 +42,12 @@
   },
   "exports": {
     "./build": "./src/cli/build.js",
-    "./count": "./src/cli/count.js",
     "./deploy": "./src/cli/deploy.js",
     "./init": "./src/cli/init.js",
     "./inspect": "./src/cli/inspect.js",
     "./login": "./src/cli/login.js",
     "./logout": "./src/cli/logout.js",
+    "./open": "./src/cli/open.js",
     "./pack": "./src/cli/pack.js",
     "./play": "./src/cli/play.js",
     "./predeploy": "./src/cli/predeploy.js",
@@ -62,5 +61,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.19"
+  "version": "0.1.21"
 }

package/product.json

@@ -0,0 +1,9 @@
+{
+  "client": "Arcadible",
+  "domain": "arcadible.com",
+  "handle": "arcadible",
+  "id": "com.offst.arcadible.cli",
+  "protocol": "arcadible",
+  "title": "Arcadible",
+  "tool": "arc"
+}

package/src/account.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 // [import]
 
 const api = require("./api");
+const cfgproduct = require("./config/product");
 const objs = require("./util/objs");
 const os = require("./util/os");
 
@@ -26,12 +27,12 @@ const writeFile = fs.promises.writeFile;
 
 // [declare]
 
-const CMD = "arc";
 const FILE = "account.json";
+const TOOL = cfgproduct.tool;
 
 // [define]
 
-const dir = join(configDir(), CMD);
+const dir = join(configDir(), TOOL);
 const file = join(dir, FILE);
 
 // [function]
@@ -42,22 +43,22 @@ const expired = function (session) {
 
 // [function]
 
-const save = function (account) {
+const save = function (current) {
   return mkdir(dir, { recursive: true })
     .then(() =>
-      writeFile(file, JSON.stringify(deepSort(account), null, 2), "utf8"),
+      writeFile(file, JSON.stringify(deepSort(current), null, 2), "utf8"),
     )
-    .then(() => account);
+    .then(() => current);
 };
 
 // [function]
 
-const refresh = function ({ session, ...account }) {
+const refresh = function ({ session, ...current }) {
   const form = new FormData();
   form.append("refresh_token", session.refresh_token);
   return api
     .postAuthRefresh(form)
-    .then((data) => save({ ...account, session: data }));
+    .then((data) => save({ ...current, session: data }));
 };
 
 // [function]
@@ -71,15 +72,16 @@ const get = function (onRefresh) {
       }
       throw ex;
     })
-    .then((account) => {
-      if (!account || !account.session) {
+    .then((current) => {
+      const session = current?.session;
+      if (!session) {
         return null;
       }
-      return expired(account.session)
+      return expired(session)
         ? (onRefresh &&
-            onRefresh((renew) => (renew ? refresh(account) : null))) ||
+            onRefresh((renew) => (renew ? refresh(current) : null))) ||
             null
-        : account;
+        : current;
     });
 };
 

package/src/action/deploy/tool-git.js

@@ -23,15 +23,15 @@ const deployRelease = function (version, { root }, handler, cb) {
 
 // [function]
 
-const deploy = function ({ version }, { root }, handler, cb) {
-  deployRelease(version, { root }, handler, cb);
+const deploy = function ({ version }, conf, handler, cb) {
+  deployRelease(version, conf, handler, cb);
 };
 
 // [function]
 
 const main = function ({ root }, { onDeployBegin, ...handler }) {
   if (onDeployBegin) {
-    onDeployBegin({ root });
+    onDeployBegin();
   }
   return project(root).then(
     ({ game }) =>

package/src/action/deploy/tool.js

@@ -12,13 +12,13 @@ const release = ac.release;
 // [function]
 
 const deployRelease = function (
-  session,
+  current,
   artifact,
   game,
   { onUploadProgress },
   cb,
 ) {
-  release(session, artifact, game, onUploadProgress, (err) => {
+  release(current, artifact, game, onUploadProgress, (err) => {
     if (err) {
       cb(err);
       return;
@@ -29,14 +29,14 @@ const deployRelease = function (
 
 // [function]
 
-const deploy = function (session, artifact, game, handler, cb) {
-  deployRelease(session, artifact, game, handler, cb);
+const deploy = function (current, artifact, game, handler, cb) {
+  deployRelease(current, artifact, game, handler, cb);
 };
 
 // [function]
 
 const main = function (
-  session,
+  current,
   artifact,
   { root },
   { onDeployBegin, ...handler },
@@ -47,7 +47,7 @@ const main = function (
   return project(root).then(
     ({ game }) =>
       new Promise((resolve, reject) => {
-        deploy(session, artifact, game, handler, (err, data) => {
+        deploy(current, artifact, game, handler, (err, data) => {
           if (err) {
             reject(err);
             return;

package/src/action/init/manifest.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const cfgproduct = require("../../config/product");
 const phrase = require("../../phrase");
 const TOML = require("../../util/toml");
 
@@ -24,7 +25,8 @@ const writeFile = fs.promises.writeFile;
 
 // [declare]
 
-const MANIFEST = "arcadible.toml";
+const HANDLE = cfgproduct.handle;
+const MANIFEST = `${HANDLE}.toml`;
 
 // [function]