arcadible 0.1.20 → 0.1.21

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,15 +27,16 @@ 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]
@@ -48,7 +50,7 @@ const start = function (argv) {
         print({ issues });
       } else if (count) {
         log.hd(`${count} ${count === 1 ? "issue" : "issues"} found.`);
-        log.p(issues.map((error) => `✗ ${error}`));
+        log.p(issues.map((issue) => `✗ ${issue}`));
       } else if (!argv.quiet) {
         log.hs("No issues found.");
       }
@@ -71,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",
@@ -93,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]
@@ -51,10 +53,10 @@ const start = function (argv) {
   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

@@ -61,5 +61,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.20"
+  "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]

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]
 

package/src/action/inspect/media.js

@@ -1,5 +1,9 @@
 "use strict";
 
+// [import]
+
+const cfgproduct = require("../../config/product");
+
 // [declare]
 
 const ART = [
@@ -17,7 +21,8 @@ const ART = [
 
 // [declare]
 
-const MEDIA = ".arcadible";
+const HANDLE = cfgproduct.handle;
+const MEDIA = `.${HANDLE}`;
 
 // [function]
 

package/src/action/pack/tool.js

@@ -10,6 +10,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const cfgproduct = require("../../config/product");
 const phrase = require("../../phrase");
 const project = require("../../parser/project");
 const size = require("../../util/size");
@@ -23,10 +24,15 @@ const resolve = path.resolve;
 
 // [declare]
 
+const HANDLE = cfgproduct.handle;
+const TOOL = cfgproduct.tool;
+
+// [declare]
+
 const MAIN = "index.html";
-const MANIFEST = "arcadible.json";
-const MEDIA = ".arcadible";
-const OUTPUT = ".arc/package";
+const MANIFEST = `${HANDLE}.json`;
+const MEDIA = `.${HANDLE}`;
+const OUTPUT = `.${TOOL}/package`;
 
 // [declare]
 
@@ -65,7 +71,7 @@ const pack = function (name, game, { inputPath, mediaPath, outputPath }) {
       if (existsInput) {
         zip.addDir(inputPath);
       }
-      return zip;
+      throw new Error(phrase.unableToFind(inputPath));
     })
     .then(verifyPartial)
     .then(() => pathExists(mediaPath))

package/src/action/predeploy/ac.js

@@ -9,7 +9,7 @@ const s3 = require("../../util/s3");
 // [function]
 
 const uploadBuild = function (
-  session,
+  current,
   artifact,
   { id, version },
   onUploadProgress,
@@ -21,18 +21,24 @@ const uploadBuild = function (
   form.append("sha256", artifact.sha256);
   form.append("size", artifact.size);
   // api
-  const token = session?.access_token;
-  return api.postUpload(form, { token }).then((upload) => {
-    s3.upload(upload.upload_url, artifact, onUploadProgress, cb);
-  }, cb);
+  return api
+    .postUpload(form, { token: current?.session?.access_token })
+    .then((upload) => {
+      s3.upload(upload.upload_url, artifact, onUploadProgress, cb);
+    }, cb);
 };
 
 // [function]
 
-const ensureVersion = function (session, { id, version }, cb) {
-  const token = session?.access_token;
-  return api.gameBuild(id, version, { token }).then(
-    () => cb(new Error(phrase.versionExists(version))),
+const ensureGame = function (current, idOrHandle, id, cb) {
+  return api.discoverGame(idOrHandle).then(
+    (game) => {
+      if (game.account === current?.user?.id && game.id === id) {
+        cb(null);
+        return;
+      }
+      cb(new Error(phrase.gameExists(idOrHandle)));
+    },
     (err) => {
       if (err.status === 404) {
         cb(null);
@@ -45,10 +51,39 @@ const ensureVersion = function (session, { id, version }, cb) {
 
 // [function]
 
-const release = function (session, artifact, game, onUploadProgress, cb) {
-  uploadBuild(session, artifact, game, onUploadProgress, cb);
+const ensureId = function (current, { handle, id }, cb) {
+  return ensureGame(current, id, id, (err) => {
+    if (err || handle === null) {
+      cb(err);
+      return;
+    }
+    ensureGame(current, handle, id, cb);
+  });
+};
+
+// [function]
+
+const ensureVersion = function (current, { id, version }, cb) {
+  return api
+    .gameBuild(id, version, { token: current?.session?.access_token })
+    .then(
+      () => cb(new Error(phrase.gameVersionExists(version))),
+      (err) => {
+        if (err.status === 404) {
+          cb(null);
+          return;
+        }
+        cb(err);
+      },
+    );
+};
+
+// [function]
+
+const release = function (current, artifact, game, onUploadProgress, cb) {
+  uploadBuild(current, artifact, game, onUploadProgress, cb);
 };
 
 // [export]
 
-module.exports = { ensureVersion, release };
+module.exports = { ensureId, ensureVersion, release };

package/src/action/predeploy/git.js

@@ -10,6 +10,7 @@ const semver = require("semver");
 
 // [import]
 
+const cfgproduct = require("../../config/product");
 const phrase = require("../../phrase");
 
 // [use]
@@ -19,7 +20,8 @@ const prereleaseSemver = semver.prerelease;
 
 // [declare]
 
-const PREFIX = "arcadible/release/v";
+const HANDLE = cfgproduct.handle;
+const PREFIX = `${HANDLE}/release/v`;
 
 // [function]
 

package/src/action/predeploy/pm.js

@@ -0,0 +1,41 @@
+"use strict";
+
+// [import]
+
+const fs = require("node:fs");
+const path = require("node:path");
+
+// [use]
+
+const existsSync = fs.existsSync; // eslint-disable-line no-sync
+const join = path.join;
+
+// [import]
+
+const phrase = require("../../phrase");
+
+// [function]
+
+const ensureLockFile = function (root, cb) {
+  if (!existsSync(join(root, "package.json"))) {
+    cb(null);
+    return;
+  }
+  if (
+    // npm
+    existsSync(join(root, "package-lock.json")) ||
+    existsSync(join(root, "npm-shrinkwrap.json")) ||
+    // pnpm
+    existsSync(join(root, "pnpm-lock.yaml")) ||
+    // yarn
+    existsSync(join(root, "yarn.lock"))
+  ) {
+    cb(null);
+    return;
+  }
+  cb(new Error(phrase.noLockFile()));
+};
+
+// [export]
+
+module.exports = { ensureLockFile };

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

@@ -3,11 +3,13 @@
 // [import]
 
 const git = require("./git");
+const pm = require("./pm");
 const project = require("../../parser/project");
 
 // [use]
 
 const ensureClean = git.ensureClean;
+const ensureLockFile = pm.ensureLockFile;
 const ensureRemote = git.ensureRemote;
 const ensureRepo = git.ensureRepo;
 const ensureVersion = git.ensureVersion;
@@ -26,7 +28,7 @@ const deployRelease = function (version, { root }, handler, cb) {
 
 // [function]
 
-const deployEnsure = function ({ root }, { onLogInfo }, cb) {
+const deployEnsureGit = function ({ root }, { onLogInfo }, cb) {
   ensureRepo(root, (err) => {
     if (err) {
       cb(err);
@@ -50,13 +52,31 @@ const deployEnsure = function ({ root }, { onLogInfo }, cb) {
 
 // [function]
 
-const deploy = function ({ version }, { root }, handler, cb) {
-  deployEnsure({ root }, handler, (err) => {
+const deployEnsurePm = function ({ root }, handler, cb) {
+  ensureLockFile(root, cb);
+};
+
+// [function]
+
+const deployEnsure = function (conf, handler, cb) {
+  deployEnsurePm(conf, handler, (err) => {
+    if (err) {
+      cb(err);
+      return;
+    }
+    deployEnsureGit(conf, handler, cb, cb);
+  });
+};
+
+// [function]
+
+const deploy = function ({ version }, conf, handler, cb) {
+  deployEnsure(conf, handler, (err) => {
     if (err) {
       cb(err);
       return;
     }
-    deployRelease(version, { root }, handler, cb);
+    deployRelease(version, conf, handler, cb);
   });
 };
 
@@ -64,7 +84,7 @@ const deploy = function ({ version }, { root }, handler, cb) {
 
 const main = function ({ root }, { onPredeployBegin, ...handler }) {
   if (onPredeployBegin) {
-    onPredeployBegin({ root });
+    onPredeployBegin();
   }
   return project(root).then(
     ({ game }) =>

package/src/action/predeploy/tool.js

@@ -7,36 +7,43 @@ const project = require("../../parser/project");
 
 // [use]
 
+const ensureId = ac.ensureId;
 const ensureVersion = ac.ensureVersion;
 
 // [function]
 
-const deployRelease = function (session, game, handler, cb) {
-  ensureVersion(session, game, (err) => {
+const deployRelease = function (current, game, handler, cb) {
+  ensureId(current, game, (err) => {
     if (err) {
       cb(err);
       return;
     }
-    cb(null, { to: game.version });
+    ensureVersion(current, game, (err) => {
+      if (err) {
+        cb(err);
+        return;
+      }
+      cb(null, { to: game.version });
+    });
   });
 };
 
 // [function]
 
-const deploy = function (session, game, handler, cb) {
-  deployRelease(session, game, handler, cb);
+const deploy = function (current, game, handler, cb) {
+  deployRelease(current, game, handler, cb);
 };
 
 // [function]
 
-const main = function (session, { root }, { onPredeployBegin, ...handler }) {
+const main = function (current, { root }, { onPredeployBegin, ...handler }) {
   if (onPredeployBegin) {
     onPredeployBegin({ root });
   }
   return project(root).then(
     ({ game }) =>
       new Promise((resolve, reject) => {
-        deploy(session, game, handler, (err, data) => {
+        deploy(current, game, handler, (err, data) => {
           if (err) {
             reject(err);
             return;

package/src/api.js

@@ -7,13 +7,12 @@ const request = require("./util/request");
 
 // [declare]
 
-const API_HOST = cfguri.HOST_HTTP_API;
-const API_VERSION = "v1";
+const VERSION = "v1";
 
 // [function]
 
 const endpoint = function (path) {
-  return `${API_HOST}/${API_VERSION}${path}`;
+  return `${cfguri.HOST_HTTP_API}/${VERSION}${path}`;
 };
 
 // [function]
@@ -42,6 +41,12 @@ const postUpload = function (form, opts) {
 
 // [function]
 
+const game = function (id, opts) {
+  return request.get(endpoint(`/games/${id}`), opts);
+};
+
+// [function]
+
 const discoverGame = function (id, opts) {
   return request.get(endpoint(`/discover/games/${id}`), opts);
 };
@@ -64,6 +69,7 @@ module.exports = {
   discoverGame,
   discoverGameBuilds,
   flow,
+  game,
   gameBuild,
   postAuthRefresh,
   postFlow,

package/src/cli/deploy.js

@@ -7,10 +7,10 @@ const deployToolGit = require("../action/deploy/tool-git");
 
 // [function]
 
-const main = function ({ artifact, git, handler, session, ...conf }) {
+const main = function ({ artifact, current, git, handler, ...conf }) {
   return git
     ? deployToolGit(conf, handler)
-    : deployTool(session, artifact, conf, handler);
+    : deployTool(current, artifact, conf, handler);
 };
 
 // [export]