fedipod 1.40.0 → 1.42.0

package/web/app/agent.mjs

@@ -34,7 +34,7 @@ import { AcctFeed } from '../../lib/connections/acctfeed.mjs';
 import { followActor, unfollowActor, resolveHandle } from '../../lib/core/social.mjs';
 import { podBaseOfWebId } from '../../lib/pod/urls.mjs';
 import { ImportWorker } from '../../lib/connections/import.mjs';
-import { openCopy, copyStorage, copyLeaseOf, moveIntoCopy, leaveCopy, renewCopyToken, standDown, ensureCopyLease, handOverCopy } from './copy-mode.mjs';
+import { openCopy, copyStorage, copyLeaseOf, moveIntoCopy, leaveCopy, renewCopyToken, standDown, ensureCopyLease, handOverCopy, forgetFailedOpen } from './copy-mode.mjs';
 
 // The authorities this identity answers on: exactly one, this origin. The Node
 // agent gets this from lib/guard.mjs, which is not in the browser bundle and
@@ -191,6 +191,8 @@ export class BrowserAgent {
     if (!on) return { status: 200, ok: true, kept: false };
     const said = await this.tellGateway('keeper', { handle: this.doorKey, on: true });
     if (said?.status === 200) {
+      // A copy that could not be had while the account was not kept may be now.
+      await forgetFailedOpen(this, this.frontOrigin);
       this._keeper.kept = true;
       if (this.masto) this.masto.scheduling = true;
       this.log('the gateway keeps this account running while the app is closed');
@@ -420,7 +422,7 @@ export class BrowserAgent {
     // is read, since it decides where the state is read from.
     this.holderId = await this.deviceId();
     this.frontOrigin = frontOrigin || null;
-    this.copy = await openCopy(this, this.frontOrigin, { kept: isWarm(warmFrom) ? warmFrom.copy : null });
+    this.copy = await openCopy(this, this.frontOrigin, { kept: isWarm(warmFrom) ? warmFrom.copy : null, askAnyway: !restart });
     const warmRoot = isWarm(warmFrom) && !!warmFrom.copy === !!this.copy ? warmFrom.root : null;
     const copyRoot = this.copy?.podHome?.startsWith(remotePod) ? this.copy.podHome.slice(remotePod.length) : null;
     this._sweptAt = { ...(warmFrom?.sweptAt || {}) };

package/web/app/copy-mode.mjs

@@ -8,19 +8,38 @@
 // gateway writes the copy to the pod every fifteen minutes.
 import { HttpStorage, StateApiStorage, podOnly } from '../../lib/core/storage.mjs';
 import { Lease } from '../../lib/core/lease.mjs';
+import { kvGet, kvPut, kvDel } from './idb-kv.mjs';
 
 // A token this much short of its end is renewed before it is used again.
 const RENEW_BEFORE_MS = 2 * 3600_000;
 
+// After the gateway could not find or make the copy, this browser does not
+// ask again for this long: its worker is restarted whenever a client checks
+// for posts, about once a minute, and every ask cost the gateway a try at the
+// pod. The account works from its pod meanwhile, as after any failed ask. A
+// sign-in, as against a restart, asks anyway, and turning keeping on forgets
+// the failure (agent.mjs setKeeper). A network failure or a refused sign-in is
+// not remembered: those are this browser's to put right. Nor is "held by
+// another device" after this browser lets go of the pod (moveIntoCopy): what
+// the gateway found held may have been this browser's own lease.
+const ASK_AGAIN_MS = 15 * 60_000;
+const REMEMBERED = [404, 409, 501, 502, 503];
+const failedKey = (agent, frontOrigin) => `copy-open-failed:${frontOrigin}:${agent.webId}`;
+export const forgetFailedOpen = (agent, frontOrigin) => kvDel(failedKey(agent, frontOrigin)).catch(() => {});
+
 /**
  * Ask the gateway for this account's copy, making it if there is none yet.
  * `handle` names the account when the agent knows it. Returns the copy
  * ({ handle, base, token, expiresAt }) or null, in which case the account
  * works from its pod.
  */
-export async function openCopy(agent, frontOrigin, { handle = null, kept = null } = {}) {
+export async function openCopy(agent, frontOrigin, { handle = null, kept = null, askAnyway = false, letGo = false } = {}) {
   if (kept && kept.expiresAt - Date.now() > RENEW_BEFORE_MS) return kept;
   if (!agent.sessionFetch || !frontOrigin) return null;
+  const key = failedKey(agent, frontOrigin);
+  const failed = await kvGet(key).catch(() => null);
+  const held = letGo && failed?.status === 409;
+  if (!askAnyway && !held && failed && Date.now() - failed.at < ASK_AGAIN_MS) return null;
   let res;
   try {
     res = await agent.sessionFetch(`${frontOrigin.replace(/\/$/u, '')}/api/state/open`, {
@@ -30,9 +49,14 @@ export async function openCopy(agent, frontOrigin, { handle = null, kept = null
   if (res.status !== 200) {
     // 404, 409 and 501 are answers (no copy for this account here); anything
     // else is worth saying.
-    if (![404, 409, 501].includes(res.status)) agent.log(`the account's copy: the gateway answered ${res.status}`);
+    if (![404, 409, 501].includes(res.status)) {
+      const why = (await res.json().catch(() => null))?.error;
+      agent.log(`the account's copy: the gateway answered ${res.status}${why ? ` (${why})` : ''}`);
+    }
+    if (REMEMBERED.includes(res.status)) await kvPut(key, { at: Date.now(), status: res.status }).catch(() => {});
     return null;
   }
+  if (failed) await kvDel(key).catch(() => {});
   const copy = await res.json().catch(() => null);
   return copy?.base && copy?.token
     ? { handle: copy.handle, base: copy.base, token: copy.token, expiresAt: copy.expiresAt, podHome: copy.podHome || null }
@@ -140,7 +164,7 @@ export async function moveIntoCopy(agent, frontOrigin) {
   if (agent.copy) return true;
   await agent.store.commit();
   await agent.lease.release();
-  const copy = await openCopy(agent, frontOrigin, { handle: agent.doorKey });
+  const copy = await openCopy(agent, frontOrigin, { handle: agent.doorKey, letGo: true });
   if (!copy) {
     if (await agent.lease.acquire()) agent.lease.startRenewal();
     return false;