arcadible 1.0.6 → 1.0.7

package/package.json

@@ -65,5 +65,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "1.0.6"
+  "version": "1.0.7"
 }

package/src/account.js

@@ -14,6 +14,7 @@ const api = require("./api");
 const cfgcode = require("./config/code");
 const cfgproduct = require("./config/product");
 const error = require("./util/error");
+const http = require("./util/http");
 const objs = require("./util/objs");
 const os = require("./util/os");
 const phrase = require("./phrase");
@@ -24,6 +25,7 @@ const ArcError = error.ArcError;
 const chmod = fs.promises.chmod;
 const configDir = os.configDir;
 const deepSort = objs.deepSort;
+const HttpError = http.HttpError;
 const join = path.join;
 const mkdir = fs.promises.mkdir;
 const readFile = fs.promises.readFile;
@@ -78,8 +80,31 @@ const save = function (current) {
 
 // [function]
 
+const remove = function () {
+  return unlink(file).catch((ex) => {
+    if (ex.code === "ENOENT") {
+      return;
+    }
+    throw ex;
+  });
+};
+
+// [function]
+
+// the error for a session that can't be used again, once it's removed, so
+// arc whoami no longer names its account.
+const expire = function (ex) {
+  return remove().then(() => {
+    throw new ArcError(cfgcode.SESSION_EXPIRED, phrase.sessionExpired(), {
+      cause: ex,
+    });
+  });
+};
+
+// [function]
+
 // renews the session. When the refresh token is rejected, the session can't
-// be used again, and the error says to log in.
+// be used again: it's removed, and the error says to log in.
 const refresh = function ({ session, ...current }) {
   const form = new FormData();
   form.append("refresh_token", session.refresh_token);
@@ -87,9 +112,7 @@ const refresh = function ({ session, ...current }) {
     (data) => save({ ...current, session: data }),
     (ex) => {
       if (REJECTED.includes(ex.status)) {
-        throw new ArcError(cfgcode.SESSION_EXPIRED, phrase.sessionExpired(), {
-          cause: ex,
-        });
+        return expire(ex);
       }
       throw ex;
     },
@@ -144,15 +167,25 @@ const get = function (onRefresh) {
 
 // [function]
 
-const remove = function () {
-  return unlink(file).catch((ex) => {
-    if (ex.code === "ENOENT") {
-      return;
+// a failed request's handler for commands that send the saved session's
+// token: the API refuses it (401) only when Supabase does, such as for a
+// deleted account, so the session is over. It's removed, and the error says
+// to log in, rather than api_refused. An ARC_TOKEN's refusal stays as it is,
+// since logging in doesn't change the token.
+const ended = function (current) {
+  return (ex) => {
+    if (
+      !current?.session ||
+      current.token ||
+      !(ex instanceof HttpError) ||
+      ex.status !== 401
+    ) {
+      throw ex;
     }
-    throw ex;
-  });
+    return expire(ex);
+  };
 };
 
 // [export]
 
-module.exports = { get, remove, save };
+module.exports = { ended, get, remove, save };

package/src/action/deploy/wait.js

@@ -6,10 +6,12 @@ const api = require("../../api");
 const delay = require("../../util/delay");
 const links = require("../../util/links");
 const repo = require("../predeploy/git");
+const saved = require("../../account");
 const time = require("../../util/time");
 
 // [use]
 
+const ended = saved.ended;
 const git = repo.git;
 const sleep = delay.sleep;
 const studioUrl = links.studioUrl;
@@ -146,12 +148,14 @@ const main = function (
   return Promise.all([
     pollRelease(find, timeout, onRelease),
     isGit ? actionsUrl(root) : null,
-  ]).then(([{ release, timedOut }, actions]) => ({
-    actions,
-    release,
-    studio: owns ? studioUrl(game, "builds") : null,
-    timedOut,
-  }));
+  ])
+    .then(([{ release, timedOut }, actions]) => ({
+      actions,
+      release,
+      studio: owns ? studioUrl(game, "builds") : null,
+      timedOut,
+    }))
+    .catch(ended(current));
 };
 
 // [export]

package/src/cli/deploy.js

@@ -2,15 +2,18 @@
 
 // [import]
 
+const account = require("../account");
 const deployTool = require("../action/deploy/tool");
 const deployToolGit = require("../action/deploy/tool-git");
 
 // [function]
 
 const main = function ({ artifact, current, git, handler, ...conf }) {
-  return git
-    ? deployToolGit(conf, handler)
-    : deployTool(current, artifact, conf, handler);
+  return (
+    git
+      ? deployToolGit(conf, handler)
+      : deployTool(current, artifact, conf, handler)
+  ).catch(account.ended(current));
 };
 
 // [export]

package/src/cli/predeploy.js

@@ -2,15 +2,18 @@
 
 // [import]
 
+const account = require("../account");
 const predeployTool = require("../action/predeploy/tool");
 const predeployToolGit = require("../action/predeploy/tool-git");
 
 // [function]
 
 const main = function ({ current, git, handler, ...conf }) {
-  return git
-    ? predeployToolGit(conf, handler)
-    : predeployTool(current, conf, handler);
+  return (
+    git
+      ? predeployToolGit(conf, handler)
+      : predeployTool(current, conf, handler)
+  ).catch(account.ended(current));
 };
 
 // [export]