rshow 0.0.3 → 0.0.4

package/dist/main.js

@@ -13,7 +13,7 @@ import process from "node:process";
 // src/version.ts
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
-var VERSION = true ? "0.0.3" : versionFromPackage();
+var VERSION = true ? "0.0.4" : versionFromPackage();
 
 // src/binary.ts
 var ASSET_MANIFEST = "assets.json";
@@ -754,6 +754,9 @@ async function choose(env = process8.env, platform = process8.platform) {
   if (canUse(env, platform) && await usable(env)) return storeOf("keyring", env);
   return storeOf("file", env);
 }
+function fileStore(env = process8.env) {
+  return storeOf("file", env);
+}
 async function every(env = process8.env, platform = process8.platform) {
   const stores = [];
   if (canSave(platform, env.RSHOW_SECURITY_BIN)) stores.push(storeOf("keychain", env));
@@ -761,6 +764,23 @@ async function every(env = process8.env, platform = process8.platform) {
   stores.push(storeOf("file", env));
   return stores;
 }
+async function find(env, url, platform = process8.platform) {
+  const forcedBackend = forced(env);
+  const stores = forcedBackend === void 0 ? await every(env, platform) : [storeOf(forcedBackend, env)];
+  let failed = false;
+  let firstError;
+  for (const store2 of stores) {
+    try {
+      const token = await store2.read(url);
+      if (token !== void 0) return { store: store2, token };
+    } catch (err) {
+      if (!failed) firstError = err;
+      failed = true;
+    }
+  }
+  if (failed) throw firstError;
+  return void 0;
+}
 
 // src/config.ts
 var DEFAULT_OUT = "dist";
@@ -894,9 +914,8 @@ function requireArt(config) {
 async function readToken(env, url) {
   const token = (env.RSHOW_TOKEN ?? "").trim();
   if (token !== "") return token;
-  const store2 = await choose(env);
-  const saved = await store2.read(url);
-  if (saved !== void 0) return saved;
+  const found = await find(env, url);
+  if (found !== void 0) return found.token;
   throw new UsageError("no token: run rshow login, or set RSHOW_TOKEN");
 }
 
@@ -4531,9 +4550,8 @@ async function tokenOf(url) {
   if (env !== "") return { token: env, source: "env" };
   if (url === void 0) return {};
   try {
-    const store2 = await choose(process13.env);
-    const saved = await store2.read(url);
-    if (saved !== void 0) return { token: saved, source: store2.detail };
+    const found = await find(process13.env, url);
+    if (found !== void 0) return { token: found.token, source: found.store.detail };
     return {};
   } catch (err) {
     return { error: messageOf10(err) };
@@ -8744,6 +8762,17 @@ async function tokenFromStdin() {
   if (!token.startsWith(TOKEN_PREFIX)) throw new UsageError(`that is not an rshow token: it must start with ${TOKEN_PREFIX}`);
   return token;
 }
+async function saveIn(store2, url, token) {
+  await store2.save(url, token);
+  if (await store2.read(url) !== token) {
+    throw new ApiError(`cannot save the token in ${store2.description}`);
+  }
+}
+function reasonOf(err) {
+  const text = (err instanceof Error ? err.message : String(err)).replace(/^cannot save the token in the keyring: /, "");
+  const lines = text.split("\n").map((part) => part.trim()).filter((part) => part !== "");
+  return lines.at(-1) ?? "";
+}
 async function run19(argv, ctx, platform = process21.platform) {
   const args = parseCommandArgs(argv, { url: { type: "string" } }, 0, 0, LOGIN_USAGE);
   const settings = await ctx.config();
@@ -8753,10 +8782,19 @@ async function run19(argv, ctx, platform = process21.platform) {
   const me = (await new Client(url, token).send("GET", "/api/me")).body;
   const email = typeof me?.email === "string" ? me.email : "";
   const scope = typeof me?.scope === "string" ? me.scope : "";
-  const store2 = await choose(process21.env, platform);
-  await store2.save(url, token);
-  if (await store2.read(url) !== token) {
-    throw new ApiError(`cannot save the token in ${store2.description}`);
+  let store2 = await choose(process21.env, platform);
+  if (store2.backend === "keyring" && forced(process21.env) === void 0) {
+    try {
+      await saveIn(store2, url, token);
+    } catch (err) {
+      warn(`the Linux keyring cannot save the token (${reasonOf(err)}); saving it in a file`);
+      await store2.remove(url).catch(() => {
+      });
+      store2 = fileStore(process21.env);
+      await saveIn(store2, url, token);
+    }
+  } else {
+    await saveIn(store2, url, token);
   }
   ctx.out.data({ email, scope, url });
   ctx.out.line(`logged in as ${email} (scope ${scope}) for ${url}, saved in ${store2.description}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rshow",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Publish static artifacts to rshow",
   "license": "MIT",
   "homepage": "https://rslib.github.io/rshow",