arcadible 0.1.12 → 0.1.14

package/src/action/build/tool.js

@@ -0,0 +1,68 @@
+"use strict";
+
+// [import]
+
+const cp = require("node:child_process");
+const path = require("node:path");
+
+// [import]
+
+const fs = require("fs-extra");
+
+// [import]
+
+const project = require("../../parser/project");
+
+// [use]
+
+const exec = cp.exec;
+const pathExists = fs.pathExists;
+const resolvePath = path.resolve;
+
+// [function]
+
+const execBuild = function (command, { cwdPath }) {
+  return new Promise((resolve, reject) => {
+    exec(command, { cwd: cwdPath }, (err) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+};
+
+// [function]
+
+const build = function (command, { cwdPath, outputPath }) {
+  return command
+    ? execBuild(command, { cwdPath })
+        .then(() => pathExists(outputPath))
+        .then((exists) => (exists ? { path: outputPath } : null))
+    : Promise.resolve(null);
+};
+
+// [function]
+
+const main = function ({ root }) {
+  return project(root).then(({ workflow }) => {
+    const command = workflow.build;
+    return build(
+      Array.isArray(command)
+        ? command
+            .map((cmd) => cmd.trim())
+            .filter(Boolean)
+            .join(" && ")
+        : command.trim(),
+      {
+        cwdPath: root,
+        outputPath: resolvePath(root, workflow.deploy_dir),
+      },
+    );
+  });
+};
+
+// [export]
+
+module.exports = main;

package/src/action/deploy/ac.js

@@ -0,0 +1,58 @@
+"use strict";
+
+// [import]
+
+const api = require("../../api");
+const phrase = require("../../phrase");
+const s3 = require("../../util/s3");
+
+// [function]
+
+const ensureBuild = function (token, { id, version }, cb) {
+  return api.getGameBuild(id, version, { token }).then(
+    () => cb(new Error(phrase.versionExists(version))),
+    (err) => {
+      if (err.status === 404) {
+        cb(null);
+        return;
+      }
+      cb(err);
+    },
+  );
+};
+
+// [function]
+
+const uploadBuild = function (
+  token,
+  artifact,
+  { id, version },
+  onUploadProgress,
+  cb,
+) {
+  const form = new FormData();
+  form.append("artifact", id);
+  form.append("version", version);
+  form.append("sha256", artifact.sha256);
+  form.append("size", artifact.size);
+  return api.postUpload(form, { token }).then((upload) => {
+    s3.upload(upload.upload_url, artifact, onUploadProgress, cb);
+  }, cb);
+};
+
+// [function]
+
+const release = function (session, artifact, game, onUploadProgress, cb) {
+  const token = session.access_token;
+  ensureBuild(token, game, (err) => {
+    if (err) {
+      cb(err);
+      return;
+    }
+    uploadBuild(token, artifact, game, onUploadProgress, cb);
+  });
+};
+
+// [export]
+
+module.exports = { release };

package/src/action/deploy/git.js

@@ -8,6 +8,10 @@ const cp = require("node:child_process");
 
 const semver = require("semver");
 
+// [import]
+
+const phrase = require("../../phrase");
+
 // [use]
 
 const execFile = cp.execFile;
@@ -26,46 +30,34 @@ const git = function (root, args, cb) {
 // [function]
 
 const ensureRepo = function (root, cb) {
-  const message = [
-    "Unable to find a Git repository.",
-    "Ensure you are in a Git repository, or create one before continuing.",
-  ];
   git(root, ["rev-parse", "--is-inside-work-tree"], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitRepoMissing(), { cause: err }));
       return;
     }
-    cb();
+    cb(null);
   });
 };
 
 // [function]
 
 const ensureRemote = function (root, cb) {
-  const message = [
-    "Unable to access Git remote 'origin'.",
-    "Ensure the remote 'origin' exists and you have permission to access it.",
-  ];
   git(root, ["ls-remote", "origin"], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitRemoteMissing(), { cause: err }));
       return;
     }
-    cb();
+    cb(null);
   });
 };
 
 // [function]
 
 const ensureClean = function (root, cb) {
-  const message = [
-    "Unable to continue with Git changes present.",
-    "Ensure all changes are staged, committed, or discarded before continuing.",
-  ];
   git(root, ["diff", "--quiet"], (err) => {
     if (err) {
       if (err.code === 1) {
-        cb(new Error(message.join("\n"), { cause: err }));
+        cb(new Error(phrase.gitChangesPresent(), { cause: err }));
         return;
       }
       cb(err);
@@ -88,10 +80,6 @@ const ensureClean = function (root, cb) {
 // [function]
 
 const createTag = function (root, version, cb) {
-  const message = [
-    "Unable to create Git tag.",
-    "Ensure the release tag does not already exist locally.",
-  ];
   git(
     root,
     [
@@ -105,10 +93,10 @@ const createTag = function (root, version, cb) {
     ],
     (err) => {
       if (err) {
-        cb(new Error(message.join("\n"), { cause: err }));
+        cb(new Error(phrase.gitTagCreateFailed(), { cause: err }));
         return;
       }
-      cb();
+      cb(null);
     },
   );
 };
@@ -116,16 +104,12 @@ const createTag = function (root, version, cb) {
 // [function]
 
 const pushTag = function (root, version, cb) {
-  const message = [
-    "Unable to push Git tag.",
-    "Ensure the release tag does not already exist on remote 'origin'.",
-  ];
   git(root, ["push", "origin", `${PREFIX}${version}`], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitTagPushFailed(), { cause: err }));
       return;
     }
-    cb();
+    cb(null);
   });
 };
 

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

@@ -26,7 +26,7 @@ const deployRelease = function (version, { root }, handler, cb) {
 
 // [function]
 
-const deployEnsure = function ({ root }, { onInfo }, cb) {
+const deployEnsure = function ({ root }, { onLogInfo }, cb) {
   ensureRepo(root, (err) => {
     if (err) {
       cb(err);
@@ -37,8 +37,8 @@ const deployEnsure = function ({ root }, { onInfo }, cb) {
         cb(err);
         return;
       }
-      if (diff.cached) {
-        onInfo({
+      if (diff.cached && onLogInfo) {
+        onLogInfo({
           level: "warn",
           message: "Staged but uncommitted changes will not be included.",
         });
@@ -50,7 +50,7 @@ const deployEnsure = function ({ root }, { onInfo }, cb) {
 
 // [function]
 
-const deploy = function (version, { root }, handler, cb) {
+const deploy = function ({ version }, { root }, handler, cb) {
   deployEnsure({ root }, handler, (err) => {
     if (err) {
       cb(err);
@@ -62,12 +62,14 @@ const deploy = function (version, { root }, handler, cb) {
 
 // [function]
 
-const main = function ({ root }, { onBegin, ...handler }) {
-  onBegin({ root });
+const main = function ({ root }, { onDeployBegin, ...handler }) {
+  if (onDeployBegin) {
+    onDeployBegin({ root });
+  }
   return project(root).then(
     ({ game }) =>
       new Promise((resolve, reject) => {
-        deploy(game.version, { root }, handler, (err, data) => {
+        deploy(game, { root }, handler, (err, data) => {
           if (err) {
             reject(err);
             return;

package/src/action/deploy/tool.js

@@ -1,9 +1,61 @@
 "use strict";
 
+// [import]
+
+const ac = require("./ac");
+const project = require("../../parser/project");
+
+// [use]
+
+const release = ac.release;
+
+// [function]
+
+const deployRelease = function (
+  session,
+  artifact,
+  game,
+  { onUploadProgress },
+  cb,
+) {
+  release(session, artifact, game, onUploadProgress, (err) => {
+    if (err) {
+      cb(err);
+      return;
+    }
+    cb(null, { to: game.version });
+  });
+};
+
+// [function]
+
+const deploy = function (session, artifact, game, handler, cb) {
+  deployRelease(session, artifact, game, handler, cb);
+};
+
 // [function]
 
-const main = function () {
-  return Promise.reject(new Error("Unimplemented command."));
+const main = function (
+  session,
+  artifact,
+  { root },
+  { onDeployBegin, ...handler },
+) {
+  if (onDeployBegin) {
+    onDeployBegin({ root });
+  }
+  return project(root).then(
+    ({ game }) =>
+      new Promise((resolve, reject) => {
+        deploy(session, artifact, game, handler, (err, data) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data);
+        });
+      }),
+  );
 };
 
 // [export]

package/src/action/init/manifest.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const phrase = require("../../phrase");
 const TOML = require("../../util/toml");
 
 // [use]
@@ -31,9 +32,7 @@ const parseToml = function (buf) {
   try {
     return TOML.parse(buf);
   } catch (ex) {
-    throw new Error(`Unable to parse ${MANIFEST}: ${ex.message}`, {
-      cause: ex,
-    });
+    throw new Error(phrase.unableToParse(MANIFEST, ex.message), { cause: ex });
   }
 };
 

package/src/action/init/tool-patch.js

@@ -6,28 +6,48 @@ const path = require("node:path");
 
 // [import]
 
+const fs = require("fs-extra");
+
+// [import]
+
 const env = require("../../parser/env");
 const manifest = require("./manifest");
+const phrase = require("../../phrase");
 
 // [use]
 
+const pathExists = fs.pathExists;
 const prepare = manifest.prepare;
 const resolve = path.resolve;
 
 // [function]
 
-const detectVersion = function (root) {
-  return env(root).then(({ game }) => game?.version ?? null);
+const detectVersion = function (dest) {
+  return env(dest).then(({ game }) => game?.version ?? null);
 };
 
 // [function]
 
-const init = function () {
+const scaffold = function (src, dest, { onInitBegin }) {
+  if (onInitBegin) {
+    onInitBegin({ dest, src });
+  }
   return Promise.resolve();
 };
 
 // [function]
 
+const init = function (dest, { force, template }, handler) {
+  return pathExists(dest).then((exists) => {
+    if (exists && !force) {
+      throw new Error(phrase.overwriteWithForce());
+    }
+    return scaffold(template, dest, handler);
+  });
+};
+
+// [function]
+
 const main = function ({ force, project, root, template }, handler) {
   const dest = resolve(root, project);
   return init(dest, { force, template }, handler)

package/src/action/init/tool.js

@@ -13,6 +13,7 @@ const fs = require("fs-extra");
 
 const env = require("../../parser/env");
 const manifest = require("./manifest");
+const phrase = require("../../phrase");
 
 // [use]
 
@@ -34,16 +35,22 @@ const removeLicense = function (dest) {
 
 // [function]
 
-const detectVersion = function (root) {
-  return env(root).then(({ game }) => game?.version ?? null);
+const detectVersion = function (dest) {
+  return env(dest).then(({ game }) => game?.version ?? null);
 };
 
 // [function]
 
-const scaffold = function (src, dest, { onBegin, onInfo }) {
-  onBegin({ dest, src });
+const scaffold = function (src, dest, { onInitBegin, onLogInfo }) {
+  if (onInitBegin) {
+    onInitBegin({ dest, src });
+  }
   return degit(src, { cache: false, force: true, verbose: false })
-    .on("info", onInfo)
+    .on("info", ({ message }) => {
+      if (onLogInfo) {
+        onLogInfo({ message });
+      }
+    })
     .clone(dest);
 };
 
@@ -52,7 +59,7 @@ const scaffold = function (src, dest, { onBegin, onInfo }) {
 const init = function (dest, { force, template }, handler) {
   return pathExists(dest).then((exists) => {
     if (exists && !force) {
-      throw new Error("Directory already exists (overwrite with `--force`).");
+      throw new Error(phrase.overwriteWithForce());
     }
     return scaffold(template, dest, handler);
   });

package/src/action/login/flow.js

@@ -9,6 +9,7 @@ const crypto = require("node:crypto");
 const api = require("../../api");
 const cfgurl = require("../../config/url");
 const delay = require("../../util/delay");
+const phrase = require("../../phrase");
 const time = require("../../util/time");
 
 // [use]
@@ -23,31 +24,31 @@ const POLL = {
   factor: 2,
   interval: time.s(30),
   maxDelay: time.s(15),
-  timeoutError: "Login request expired.",
+  timeoutError: phrase.loginExpired(),
 };
 
 // [function]
 
-const postFlow = function ({ expiresAt, token, type }) {
+const postFlow = function ({ expiresAt, secret, type }) {
   const form = new FormData();
   form.append("expires_at", expiresAt.toISOString());
-  form.append("token", token);
+  form.append("secret", secret);
   form.append("type", type);
   return api.postFlow(form);
 };
 
 // [function]
 
-const getFlow = function ({ id, token }) {
-  return api.getFlow(id, { token });
+const getFlow = function ({ id, secret }) {
+  return api.getFlow(id, { token: secret });
 };
 
 // [function]
 
-const createFlow = function ({ expiresAt, token, type }, onCreated) {
-  return postFlow({ expiresAt, token, type }).then(({ code, id }) => {
-    if (onCreated) {
-      onCreated({ code, url: cfgurl.LINK });
+const createFlow = function ({ expiresAt, secret, type }, onLoginCreated) {
+  return postFlow({ expiresAt, secret, type }).then(({ code, id }) => {
+    if (onLoginCreated) {
+      onLoginCreated({ code, id, url: cfgurl.LINK });
     }
     return { id };
   });
@@ -55,10 +56,10 @@ const createFlow = function ({ expiresAt, token, type }, onCreated) {
 
 // [function]
 
-const pollFlow = function ({ id, token }, onPoll) {
-  return getFlow({ id, token }).then(({ data, status }) => {
-    if (onPoll) {
-      onPoll({ status });
+const pollFlow = function ({ id, secret }, onLoginPoll) {
+  return getFlow({ id, secret }).then(({ data, status }) => {
+    if (onLoginPoll) {
+      onLoginPoll({ status });
     }
     switch (status) {
       case "pending":
@@ -66,30 +67,30 @@ const pollFlow = function ({ id, token }, onPoll) {
       case "completed":
         return data;
       case "failed":
-        throw new Error("Login request failed.");
+        throw new Error(phrase.loginFailed());
       default:
-        throw new Error("Login request expired.");
+        throw new Error(phrase.loginExpired());
     }
   });
 };
 
 // [function]
 
-const main = function ({ onCreated, onPoll }) {
+const main = function ({ onLoginCreated, onLoginPoll }) {
   const expiresAt = new Date(Date.now() + time.m(5));
-  const token = randomUUID();
+  const secret = randomUUID();
   return createFlow(
     {
       expiresAt,
-      token,
+      secret,
       type: "cli-login",
     },
-    onCreated,
+    onLoginCreated,
   ).then(({ id }) => {
     const timeout = Math.max(0, expiresAt.getTime() - Date.now() - time.s(15));
     return poll(
-      (flow) => pollFlow(flow, onPoll),
-      { id, token },
+      (flow) => pollFlow(flow, onLoginPoll),
+      { id, secret },
       { ...POLL, timeout },
     );
   });

package/src/action/pack/tool.js

@@ -10,6 +10,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const phrase = require("../../phrase");
 const project = require("../../parser/project");
 const size = require("../../util/size");
 const Zip = require("../../util/zip");
@@ -36,11 +37,11 @@ const SIZE_TOTAL = size.mb(256);
 
 const verifyPartial = function (zip) {
   if (!zip.has(MAIN)) {
-    throw new Error(`Package is missing "${MAIN}".`);
+    throw new Error(phrase.packageFileMissing(MAIN));
   }
   if (zip.stat().size > SIZE_PARTIAL) {
     const max = SIZE_PARTIAL / 1024 / 1024;
-    throw new Error(`Package size (excluding store assets) exceeds ${max} MB.`);
+    throw new Error(phrase.packageTooLarge(max, false));
   }
   return zip;
 };
@@ -50,19 +51,19 @@ const verifyPartial = function (zip) {
 const verifyTotal = function (zip) {
   if (zip.stat().size > SIZE_TOTAL) {
     const max = SIZE_TOTAL / 1024 / 1024;
-    throw new Error(`Package size (including store assets) exceeds ${max} MB.`);
+    throw new Error(phrase.packageTooLarge(max, true));
   }
   return zip;
 };
 
 // [function]
 
-const pack = function (name, game, { deployPath, mediaPath, zipPath }) {
+const pack = function (name, game, { inputPath, mediaPath, outputPath }) {
   const zip = new Zip(name);
-  return pathExists(deployPath)
-    .then((existsDeploy) => {
-      if (existsDeploy) {
-        zip.addDir(deployPath);
+  return pathExists(inputPath)
+    .then((existsInput) => {
+      if (existsInput) {
+        zip.addDir(inputPath);
       }
       return zip;
     })
@@ -77,21 +78,21 @@ const pack = function (name, game, { deployPath, mediaPath, zipPath }) {
     })
     .then(verifyTotal)
     .then((file) => {
-      file.write(zipPath);
-      return { path: zipPath, ...file.stat() };
+      file.write(outputPath);
+      return { path: outputPath, ...file.stat() };
     });
 };
 
 // [function]
 
-const main = function ({ output, root }) {
+const main = function ({ input, output, root }) {
   return project(root).then(({ game, workflow }) => {
-    const name = game.handle || game.id;
-    const file = output || `${OUTPUT}/${name}-v${game.version}.zip`;
+    const name = game.handle ?? game.id;
+    const file = output ?? `${OUTPUT}/${name}-v${game.version}.zip`;
     return pack(parse(file).name, game, {
-      deployPath: resolve(root, workflow.deploy_dir),
+      inputPath: resolve(root, input ?? workflow.deploy_dir),
       mediaPath: resolve(root, MEDIA),
-      zipPath: resolve(root, file),
+      outputPath: resolve(root, file),
     });
   });
 };

package/src/action/whoami/tool.js

@@ -6,8 +6,8 @@ const account = require("../../account");
 
 // [function]
 
-const main = function (conf, handler) {
-  return account.get(handler);
+const main = function (conf, { onAccountRefresh }) {
+  return account.get(onAccountRefresh);
 };
 
 // [export]

package/src/api.js

@@ -24,8 +24,14 @@ const authRefresh = function (form, options) {
 
 // [function]
 
-const getFlow = function (id, options) {
-  return request.get(endpoint(`/flows/${id}`), options);
+const getFlow = function (flow, options) {
+  return request.get(endpoint(`/flows/${flow}`), options);
+};
+
+// [function]
+
+const getGameBuild = function (game, version, options) {
+  return request.get(endpoint(`/games/${game}/builds/${version}`), options);
 };
 
 // [function]
@@ -34,6 +40,12 @@ const postFlow = function (form, options) {
   return request.post(endpoint("/flows"), form, options);
 };
 
+// [function]
+
+const postUpload = function (form, options) {
+  return request.post(endpoint("/uploads"), form, options);
+};
+
 // [export]
 
-module.exports = { authRefresh, getFlow, postFlow };
+module.exports = { authRefresh, getFlow, getGameBuild, postFlow, postUpload };