Merge branch 'unstable' into codex/update-adminliststore-for-relay-publish

js/adminListStore.js

@@ -16,7 +16,7 @@ import {
   buildAdminListEvent,
   ADMIN_LIST_IDENTIFIERS,
 } from "./nostrEventSchemas.js";
-import { publishEventToRelays } from "./nostrPublish.js";
+import { publishEventToRelay } from "./nostrPublish.js";
 
 const LEGACY_STORAGE_KEYS = {
   editors: "bitvid_admin_editors",
@@ -304,7 +304,16 @@ function ensureNostrReady() {
     );
   }
 
-  const relays = Array.isArray(nostrClient.relays) ? nostrClient.relays : [];
+  const writeRelays =
+    Array.isArray(nostrClient.writeRelays) && nostrClient.writeRelays.length
+      ? nostrClient.writeRelays
+      : [];
+  const relays = writeRelays.length
+    ? writeRelays
+    : Array.isArray(nostrClient.relays)
+    ? nostrClient.relays
+    : [];
+
   if (!relays.length) {
     throw createError("nostr-unavailable", "No Nostr relays configured.");
   }
@@ -533,6 +542,94 @@ function buildListEvent(listKey, npubs, actorHex) {
   });
 }
 
+function publishListWithFirstAcceptance(pool, relays, event, options = {}) {
+  const publishRelay =
+    typeof options.publishRelay === "function"
+      ? options.publishRelay
+      : publishEventToRelay;
+  const listKey = typeof options.listKey === "string" ? options.listKey : "";
+  const publishOptions =
+    options && typeof options.publishOptions === "object"
+      ? options.publishOptions
+      : undefined;
+
+  const relayPromises = Array.isArray(relays)
+    ? relays.map((url) => publishRelay(pool, url, event, publishOptions))
+    : [];
+  const resultsBuffer = new Array(relayPromises.length);
+
+  let resolved = false;
+  let remaining = relayPromises.length;
+
+  const firstAcceptance = new Promise((resolve, reject) => {
+    if (!relayPromises.length) {
+      reject(
+        createError(
+          "publish-failed",
+          listKey
+            ? `Failed to publish ${listKey} list to any relay.`
+            : "Failed to publish admin list to any relay.",
+        )
+      );
+      return;
+    }
+
+    relayPromises.forEach((promise, index) => {
+      promise
+        .then((result) => {
+          resultsBuffer[index] = result;
+          if (result?.success && !resolved) {
+            resolved = true;
+            resolve(result);
+          }
+        })
+        .catch((error) => {
+          resultsBuffer[index] = {
+            url: Array.isArray(relays) ? relays[index] : "",
+            success: false,
+            error,
+          };
+        })
+        .finally(() => {
+          remaining -= 1;
+          if (!resolved && remaining === 0) {
+            reject(
+              createError(
+                "publish-failed",
+                listKey
+                  ? `Failed to publish ${listKey} list to any relay.`
+                  : "Failed to publish admin list to any relay.",
+              )
+            );
+          }
+        });
+    });
+  });
+
+  const allResults = Promise.allSettled(relayPromises).then((entries) => {
+    for (let index = 0; index < entries.length; index += 1) {
+      const entry = entries[index];
+      const fallbackUrl = Array.isArray(relays) ? relays[index] : "";
+      const result =
+        entry?.status === "fulfilled"
+          ? entry.value
+          : {
+              url: fallbackUrl,
+              success: false,
+              error: entry?.reason || new Error("publish failed"),
+            };
+
+      if (typeof resultsBuffer[index] === "undefined") {
+        resultsBuffer[index] = result;
+      }
+    }
+
+    return resultsBuffer;
+  });
+
+  return { firstAcceptance, allResults, resultsBuffer };
+}
+
 async function persistNostrState(actorNpub, updates = {}) {
   ensureNostrReady();
   const permissionResult = await requestDefaultExtensionPermissions();
@@ -620,29 +717,41 @@ async function persistNostrState(actorNpub, updates = {}) {
     }
 
     const relays = ensureNostrReady();
-    const publishResults = await publishEventToRelays(
+    const { firstAcceptance, allResults } = publishListWithFirstAcceptance(
       nostrClient.pool,
       relays,
       signedEvent,
+      { listKey },
     );
 
-    if (isDevMode) {
-      publishResults
-        .filter((result) => !result.success)
-        .forEach((result) => {
-          userLogger.warn(
-            `[adminListStore] Publish failed for ${listKey} on ${result.url}:`,
-            result.error,
-          );
-        });
+    const logSettledResults = allResults.then((results) => {
+      if (isDevMode) {
+        results
+          .filter((result) => !result?.success)
+          .forEach((result) => {
+            userLogger.warn(
+              `[adminListStore] Publish failed for ${listKey} on ${result.url}:`,
+              result.error,
+            );
+          });
+      }
+
+      return results;
+    });
+
+    try {
+      await firstAcceptance;
+    } catch (error) {
+      await logSettledResults.catch(() => {});
+      throw error;
     }
 
-    if (!publishResults.some((result) => result.success)) {
-      throw createError(
-        "publish-failed",
-        `Failed to publish ${listKey} list to any relay.`
+    logSettledResults.catch((loggingError) => {
+      devLogger.warn(
+        `[adminListStore] Failed to summarize publish results for ${listKey}:`,
+        loggingError,
       );
-    }
+    });
 
     clearLegacyStorageFor(listKey);
   }
@@ -682,4 +791,5 @@ export async function persistAdminState(actorNpub, updates) {
 export const __adminListStoreTestHooks = Object.freeze({
   extractNpubsFromEvent,
   normalizeParticipantTagValue,
+  publishListWithFirstAcceptance,
 });

js/app.js

@@ -2732,20 +2732,42 @@ class Application {
 
     try {
       await this.nostrService.publishVideoNote(publishPayload, this.pubkey);
-      if (typeof onSuccess === "function") {
-        await onSuccess();
-      }
-      if (suppressModalClose !== true && this.uploadModal) {
-        this.uploadModal.close();
-      }
-      await this.loadVideos();
-      this.showSuccess("Video shared successfully!");
-      return true;
     } catch (err) {
       devLogger.error("Failed to publish video:", err);
       this.showError("Failed to share video. Please try again later.");
       return false;
     }
+
+    if (typeof onSuccess === "function") {
+      await onSuccess();
+    }
+
+    if (suppressModalClose !== true && this.uploadModal) {
+      this.uploadModal.close();
+    }
+
+    let loadVideosError = null;
+
+    try {
+      await this.loadVideos();
+    } catch (error) {
+      loadVideosError = error;
+      devLogger.error(
+        "[Application] Failed to refresh videos after publishing:",
+        error
+      );
+    }
+
+    this.showSuccess("Video shared successfully!");
+
+    if (loadVideosError) {
+      this.showStatus(
+        "Video shared, but the feed may be out of date. Refresh the page to see the latest posts.",
+        { autoHideMs: 8000 }
+      );
+    }
+
+    return true;
   }
 
   /**

tests/admin-list-store.test.mjs

@@ -50,8 +50,11 @@ const { persistAdminState, __adminListStoreTestHooks } = await import(
 const { nostrClient } = await import("../js/nostr.js");
 const { ADMIN_SUPER_NPUB } = await import("../js/config.js");
 
-const { extractNpubsFromEvent, normalizeParticipantTagValue } =
-  __adminListStoreTestHooks;
+const {
+  extractNpubsFromEvent,
+  normalizeParticipantTagValue,
+  publishListWithFirstAcceptance,
+} = __adminListStoreTestHooks;
 
 const sampleHex = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
 const sampleNpub = "npub1existingparticipant";