arcadible 0.1.19 → 0.1.21

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/inspect/tool.js

@@ -13,33 +13,49 @@ const project = require("../../parser/project");
 
 // [function]
 
-const inspect = function (proj, key) {
+const select = function (proj, key) {
   return key ? dotProp.get(proj, key, null) : proj;
 };
 
 // [function]
 
-const main = function ({ game, root, selector }) {
-  if (!game || game === "self") {
-    return project(root).then((proj) => inspect(proj, selector));
-  }
+const inspect = function (id) {
   return api
-    .discoverGameBuilds(game, {
+    .discoverGameBuilds(id, {
       channel: "production",
       select: "manifest",
     })
     .then((builds) => {
       if (!builds.length) {
-        throw new Error(phrase.noProductionBuild(game));
+        throw new Error(phrase.noProductionBuild(id));
       }
-      const manifest = builds[0].manifest || {};
+      const manifest = builds[0]?.manifest ?? {};
       if (manifest.game) {
         media.dehydrate(manifest.game);
       }
-      return inspect(manifest, selector);
+      return manifest;
     });
 };
 
+// [function]
+
+const main = function ({ game: id, root, selector }, { onInspectFetch }) {
+  const local = !id;
+  if (onInspectFetch && !local) {
+    onInspectFetch({ game: id });
+  }
+  if (local) {
+    return project(root).then((data) => select(data, selector));
+  }
+  if (id === "self") {
+    return project(root)
+      .then(({ game }) => game?.handle ?? game?.id)
+      .then(inspect)
+      .then((data) => select(data, selector));
+  }
+  return inspect(id).then((data) => select(data, selector));
+};
+
 // [export]
 
 module.exports = main;

package/src/action/open/tool.js

@@ -0,0 +1,24 @@
+"use strict";
+
+// [import]
+
+const project = require("../../parser/project");
+
+// [function]
+
+const open = function (id) {
+  return id ? { page: `/play/${id}` } : null;
+};
+
+// [function]
+
+const main = function ({ game: id, root }) {
+  if (id === "self") {
+    return project(root).then(({ game }) => open(game?.handle ?? game?.id));
+  }
+  return Promise.resolve(open(id));
+};
+
+// [export]
+
+module.exports = main;

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/play/tool.js

@@ -2,42 +2,39 @@
 
 // [import]
 
-const dotProp = require("dot-prop");
-
-// [import]
-
 const api = require("../../api");
-const media = require("./media");
-const phrase = require("../../phrase");
+const cfguri = require("../../config/uri");
 const project = require("../../parser/project");
 
 // [function]
 
-const inspect = function (proj, key) {
-  return key ? dotProp.get(proj, key, null) : proj;
+const play = function (id, release) {
+  if (!id) {
+    return Promise.resolve(null);
+  }
+  const target = release === "production" ? "" : `:${release}`;
+  const url = `${cfguri.HOST_HTTP_PLAY}/${id}${target}/`;
+  return api
+    .discoverGame(id, { select: "orientation" })
+    .catch(() => null)
+    .then((game) => ({
+      orientation: game?.orientation ?? "natural",
+      url,
+    }));
 };
 
 // [function]
 
-const main = function ({ game, root, selector }) {
-  if (!game || game === "self") {
-    return project(root).then((proj) => inspect(proj, selector));
+const main = function ({ game: id, release, root }, { onPlayFetch }) {
+  if (onPlayFetch) {
+    onPlayFetch({ game: id });
   }
-  return api
-    .discoverGameBuilds(game, {
-      channel: "production",
-      select: "manifest",
-    })
-    .then((builds) => {
-      if (!builds.length) {
-        throw new Error(phrase.noProductionBuild(game));
-      }
-      const manifest = builds[0].manifest || {};
-      if (manifest.game) {
-        media.dehydrate(manifest.game);
-      }
-      return inspect(manifest, selector);
-    });
+  if (id === "self") {
+    return project(root).then(({ game }) =>
+      play(game?.handle ?? game?.id, release),
+    );
+  }
+  return play(id, release);
 };
 
 // [export]

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,18 @@ 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);
+};
+
+// [function]
+
 const discoverGameBuilds = function (id, opts) {
   return request.get(endpoint(`/discover/games/${id}/builds`), opts);
 };
@@ -55,8 +66,10 @@ const gameBuild = function (id, version, opts) {
 // [export]
 
 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]

package/src/cli/index.js

@@ -3,12 +3,12 @@
 // [import]
 
 const build = require("./build");
-const count = require("./count");
 const deploy = require("./deploy");
 const init = require("./init");
 const inspect = require("./inspect");
 const login = require("./login");
 const logout = require("./logout");
+const open = require("./open");
 const pack = require("./pack");
 const play = require("./play");
 const predeploy = require("./predeploy");
@@ -19,12 +19,12 @@ const whoami = require("./whoami");
 
 module.exports = {
   build,
-  count,
   deploy,
   init,
   inspect,
   login,
   logout,
+  open,
   pack,
   play,
   predeploy,

package/src/cli/inspect.js

@@ -6,8 +6,8 @@ const inspectTool = require("../action/inspect/tool");
 
 // [function]
 
-const main = function (conf) {
-  return inspectTool(conf);
+const main = function ({ handler, ...conf }) {
+  return inspectTool(conf, handler);
 };
 
 // [export]

package/src/cli/{count.js → open.js}

@@ -2,12 +2,12 @@
 
 // [import]
 
-const countTool = require("../action/count/tool");
+const openTool = require("../action/open/tool");
 
 // [function]
 
 const main = function (conf) {
-  return countTool(conf);
+  return openTool(conf);
 };
 
 // [export]

package/src/cli/play.js

@@ -6,8 +6,8 @@ const playTool = require("../action/play/tool");
 
 // [function]
 
-const main = function (conf) {
-  return playTool(conf);
+const main = function ({ handler, ...conf }) {
+  return playTool(conf, handler);
 };
 
 // [export]

package/src/cli/predeploy.js

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

package/src/config/package.js

@@ -0,0 +1,5 @@
+"use strict";
+
+// [export]
+
+module.exports = require("../../package.json");

package/src/config/product.js

@@ -0,0 +1,5 @@
+"use strict";
+
+// [export]
+
+module.exports = require("../../product.json");

package/src/config/uri.js

@@ -1,14 +1,22 @@
 "use strict";
 
+// [import]
+
+const cfgproduct = require("./product");
+
 // [declare]
 
-const SLD = "arcadible";
+const DOMAIN = cfgproduct.domain;
+const PROTOCOL = cfgproduct.protocol;
 
 // [export]
 
 module.exports = {
-  HOST_HTTP_ACCOUNT: `https://account.${SLD}.com`,
-  HOST_HTTP_API: `https://api.${SLD}.com`,
-  HOST_HTTP_DEVELOPER: `https://developer.${SLD}.com`,
-  HOST_HTTP_WWW: `https://${SLD}.com`,
+  HOST_APP_PLAY: `${PROTOCOL}://play`,
+  HOST_APP_STORE: `${PROTOCOL}://store`,
+  HOST_HTTP_ACCOUNT: `https://account.${DOMAIN}`,
+  HOST_HTTP_API: `https://api.${DOMAIN}`,
+  HOST_HTTP_DEVELOPER: `https://developer.${DOMAIN}`,
+  HOST_HTTP_PLAY: `https://play.${DOMAIN}`,
+  HOST_HTTP_WWW: `https://${DOMAIN}`,
 };

package/src/config/url.js

@@ -2,16 +2,17 @@
 
 // [import]
 
+const cfgproduct = require("./product");
 const cfguri = require("./uri");
 
 // [declare]
 
-const SLD = "arcadible";
+const HANDLE = cfgproduct.handle;
 
 // [export]
 
 module.exports = {
   GETTING_STARTED: `${cfguri.HOST_HTTP_DEVELOPER}/guides/games/getting-started`,
   LINK: `${cfguri.HOST_HTTP_ACCOUNT}/link`,
-  MANIFEST: `${cfguri.HOST_HTTP_DEVELOPER}/references/${SLD}-manifest`,
+  MANIFEST: `${cfguri.HOST_HTTP_DEVELOPER}/references/${HANDLE}-manifest`,
 };