arcadible 0.1.44 → 0.1.45

package/package.json

@@ -75,5 +75,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "0.1.44"
+  "version": "0.1.45"
 }

package/src/action/open/tool.js

@@ -3,7 +3,7 @@
 // [import]
 
 const links = require("../../util/links");
-const project = require("../../parser/project");
+const self = require("../../parser/self");
 
 // [function]
 
@@ -20,7 +20,7 @@ const open = function (id) {
 // [function]
 
 const openSelf = function (root) {
-  return project(root).then(({ game }) => openUrl(game?.handle ?? game?.id));
+  return self(root).then((game) => openUrl(game?.handle ?? game?.id));
 };
 
 // [function]

package/src/action/pack/tool.js

@@ -44,6 +44,8 @@ const SIZE_PARTIAL = size.mb(64);
 
 // [function]
 
+// the files' own limits come first, since they name what to fix, such as
+// the one file over 64 MB that makes the zip too large.
 const verifyPartial = function (zip) {
   if (!zip.has(MAIN)) {
     throw new ArcError(
@@ -51,6 +53,7 @@ const verifyPartial = function (zip) {
       phrase.packageFileMissing(MAIN),
     );
   }
+  limits.check(zip.entries());
   if (zip.stat().size > SIZE_PARTIAL) {
     throw new ArcError(
       cfgcode.PACKAGE_TOO_LARGE,

package/src/action/play/tool.js

@@ -7,7 +7,7 @@ const cfgcode = require("../../config/code");
 const error = require("../../util/error");
 const links = require("../../util/links");
 const phrase = require("../../phrase");
-const project = require("../../parser/project");
+const self = require("../../parser/self");
 
 // [use]
 
@@ -78,8 +78,8 @@ const play = function (id, release) {
 // this project's game: its orientation comes from the manifest. With a
 // chosen release, it makes no API call.
 const playSelf = function (root, release) {
-  return project(root)
-    .then(({ game }) => {
+  return self(root)
+    .then((game) => {
       const id = game?.handle ?? game?.id;
       if (!id) {
         return [null, null];

package/src/action/predeploy/ac.js

@@ -14,16 +14,19 @@ const ArcError = error.ArcError;
 
 // [function]
 
-// fails when `idOrHandle` is another game's, or this game's on another
-// account. A game that isn't on Arcadible yet passes.
-const ensureGame = function (current, idOrHandle, id) {
-  return api.discoverGame(idOrHandle).then(
+// fails when the game is on Arcadible on another account: it was deleted
+// (the API doesn't find it, and the upload is refused), or it's someone
+// else's. A game that isn't on Arcadible yet passes.
+const ensureOwned = function (current, id) {
+  return api.discoverGame(id).then(
     (game) => {
-      // a token's account isn't known yet, so only the id is compared; the
-      // server checks ownership when it authorizes the upload.
-      const owned = current?.token || game.account === current?.user?.id;
-      if (!owned || game.id !== id) {
-        throw new ArcError(cfgcode.GAME_EXISTS, phrase.gameExists(idOrHandle));
+      // a token's account isn't known yet; the server checks ownership when
+      // it authorizes the upload.
+      if (!current?.token && game.account !== current?.user?.id) {
+        throw new ArcError(
+          cfgcode.GAME_UNAVAILABLE,
+          phrase.gameUnavailable(id),
+        );
       }
     },
     (err) => {
@@ -36,12 +39,27 @@ const ensureGame = function (current, idOrHandle, id) {
 
 // [function]
 
-// a game without a handle has none to check.
-const ensureHandle = function (current, { handle, id }) {
+// fails when the handle is another game's, whoever owns it. A game without a
+// handle has none to check.
+const ensureHandle = function ({ handle, id }) {
   if ((handle ?? null) === null) {
     return Promise.resolve(null);
   }
-  return ensureGame(current, handle, id);
+  return api.discoverGame(handle).then(
+    (game) => {
+      if (game.id !== id) {
+        throw new ArcError(
+          cfgcode.GAME_HANDLE_TAKEN,
+          phrase.gameHandleTaken(handle),
+        );
+      }
+    },
+    (err) => {
+      if (err.status !== 404) {
+        throw err;
+      }
+    },
+  );
 };
 
 // [function]
@@ -49,8 +67,8 @@ const ensureHandle = function (current, { handle, id }) {
 // resolves with the game once its id, and its handle if it has one, are
 // free or already its own.
 const ensureId = function (current, game) {
-  return ensureGame(current, game.id, game.id)
-    .then(() => ensureHandle(current, game))
+  return ensureOwned(current, game.id)
+    .then(() => ensureHandle(game))
     .then(() => game);
 };
 

package/src/config/code.js

@@ -13,7 +13,7 @@ const CLI = {
   ARGUMENT_INVALID: "argument_invalid",
   BUILD_FAILED: "build_failed",
   DEPLOY_DIR_MISSING: "deploy_dir_missing",
-  GAME_EXISTS: "game_exists",
+  GAME_HANDLE_TAKEN: "game_handle_taken",
   GAME_ID_MISSING: "game_id_missing",
   GAME_NOT_DEPLOYED: "game_not_deployed",
   GAME_NOT_FOUND: "game_not_found",

package/src/parser/self.js

@@ -0,0 +1,27 @@
+"use strict";
+
+// [import]
+
+const cfgcode = require("../config/code");
+const project = require("./project");
+
+// [function]
+
+// the game of the project at `root`, for `arc play` and `arc open` with no
+// game named; null outside a project, so they ask for a game
+// (game_id_missing) rather than for a project.
+const main = function (root) {
+  return project(root).then(
+    ({ game }) => game,
+    (ex) => {
+      if (ex.code === cfgcode.MANIFEST_MISSING) {
+        return null;
+      }
+      throw ex;
+    },
+  );
+};
+
+// [export]
+
+module.exports = main;

package/src/phrase.js

@@ -165,8 +165,11 @@ const errorCode = function (code) {
 
 // [function]
 
-const gameExists = function (idOrHandle) {
-  return `Game exists: ${idOrHandle}`;
+const gameHandleTaken = function (handle) {
+  return blocks(
+    `Handle taken: ${handle}`,
+    "Choose another handle in arcadible.toml.",
+  );
 };
 
 // [function]
@@ -390,7 +393,7 @@ const loginFailed = function () {
 const noGameId = function () {
   return blocks(
     "No game handle or ID.",
-    `Pass one, or run ${cmdInit()} to add an ID.`,
+    `Pass one, or run it in a project after ${cmdInit()} has added an ID.`,
   );
 };
 
@@ -794,7 +797,7 @@ module.exports = {
   docTagUnallowed,
   docUnsupported,
   errorCode,
-  gameExists,
+  gameHandleTaken,
   gameNotDeployed,
   gameNotFound,
   gameRepoMissing,