mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-11-07 21:32:51 +00:00
Fix(startup): Defer trusted seed bootstrapping until after Nostr init
- Moves `bootstrapTrustedSeeds` logic from `js/bootstrap.js` to a new service `js/services/trustBootstrap.js`. - Updates `js/app.js` to explicitly await `nostrClient.init()` before calling `bootstrapTrustedSeeds()`, resolving race conditions where admin lists were fetched before the relay pool was ready. - Ensures `waitForRelaysReady` checks for `nostrClient.pool` existence.
This commit is contained in:
google-labs-jules[bot] committed
1 parent
ac071cb74e
commit
acd2104067
3 files changed
+189
-188
No files matched your search
@@ -144,6 +144,7 @@ import {
|
||||
import ApplicationBootstrap from "./ui/applicationBootstrap.js";
|
||||
import VideoModalCommentController from "./ui/videoModalCommentController.js";
|
||||
import ModerationActionController from "./services/moderationActionController.js";
|
||||
import { bootstrapTrustedSeeds } from "./services/trustBootstrap.js";
|
||||
|
||||
const recordVideoViewApi = (...args) => recordVideoView(nostrClient, ...args);
|
||||
|
||||
@@ -421,6 +422,12 @@ class Application {
|
||||
|
||||
await Promise.all([modalBootstrapPromise, nostrInitPromise]);
|
||||
|
||||
try {
|
||||
await bootstrapTrustedSeeds();
|
||||
} catch (error) {
|
||||
devLogger.warn("[app.init()] Trusted seed bootstrap failed:", error);
|
||||
}
|
||||
|
||||
try {
|
||||
initViewCounter({ nostrClient });
|
||||
} catch (error) {
|
||||
|
||||
Vendored
+1
-188
@@ -1,189 +1,11 @@
|
||||
// js/bootstrap.js
|
||||
|
||||
import Application from "./app.js";
|
||||
import {
|
||||
DEFAULT_TRUST_SEED_NPUBS,
|
||||
FEATURE_TRUST_SEEDS,
|
||||
} from "./constants.js";
|
||||
import { ADMIN_SUPER_NPUB } from "./config.js";
|
||||
import { accessControl } from "./accessControl.js";
|
||||
import moderationService from "./services/moderationService.js";
|
||||
import nostrService from "./services/nostrService.js";
|
||||
import r2Service from "./services/r2Service.js";
|
||||
import { loadView } from "./viewManager.js";
|
||||
import hashtagPreferences from "./services/hashtagPreferencesService.js";
|
||||
import { devLogger, userLogger } from "./utils/logger.js";
|
||||
|
||||
const TRUST_SEED_READY_TIMEOUT_MS = 3500;
|
||||
|
||||
function normalizeNpub(value) {
|
||||
return typeof value === "string" ? value.trim() : "";
|
||||
}
|
||||
|
||||
function buildTrustedSeeds({ superAdmin, editors, fallbackSeeds }) {
|
||||
const seeds = new Set();
|
||||
|
||||
const addSeed = (value) => {
|
||||
const normalized = normalizeNpub(value);
|
||||
if (normalized) {
|
||||
seeds.add(normalized);
|
||||
}
|
||||
};
|
||||
|
||||
addSeed(superAdmin);
|
||||
|
||||
if (editors && typeof editors[Symbol.iterator] === "function") {
|
||||
for (const value of editors) {
|
||||
addSeed(value);
|
||||
}
|
||||
}
|
||||
|
||||
if (!seeds.size && fallbackSeeds && typeof fallbackSeeds[Symbol.iterator] === "function") {
|
||||
for (const value of fallbackSeeds) {
|
||||
addSeed(value);
|
||||
}
|
||||
}
|
||||
|
||||
return seeds;
|
||||
}
|
||||
|
||||
function delay(ms = 0) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
async function waitForRelaysReady({ timeoutMs = TRUST_SEED_READY_TIMEOUT_MS } = {}) {
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < timeoutMs) {
|
||||
if (
|
||||
nostrService?.nostrClient?.relays &&
|
||||
Array.isArray(nostrService.nostrClient.relays) &&
|
||||
nostrService.nostrClient.relays.length > 0
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
await delay(125);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
async function waitForAccessControl({ timeoutMs = TRUST_SEED_READY_TIMEOUT_MS } = {}) {
|
||||
if (!accessControl || typeof accessControl.ensureReady !== "function") {
|
||||
return { ok: true, timedOut: false };
|
||||
}
|
||||
|
||||
let timedOut = false;
|
||||
const timeoutPromise = new Promise((_, reject) => {
|
||||
setTimeout(() => {
|
||||
timedOut = true;
|
||||
reject(new Error("accessControl ensureReady timed out"));
|
||||
}, timeoutMs);
|
||||
});
|
||||
|
||||
try {
|
||||
await Promise.race([accessControl.ensureReady(), timeoutPromise]);
|
||||
return { ok: true, timedOut: false };
|
||||
} catch (error) {
|
||||
if (timedOut) {
|
||||
devLogger.warn(
|
||||
"[bootstrap] access control hydration timed out; falling back to default trust seeds.",
|
||||
error,
|
||||
);
|
||||
return { ok: true, timedOut: true };
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function bootstrapTrustedSeeds() {
|
||||
if (
|
||||
!(
|
||||
FEATURE_TRUST_SEEDS &&
|
||||
moderationService &&
|
||||
typeof moderationService.setTrustedSeeds === "function"
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
const applySeeds = () => {
|
||||
try {
|
||||
const editors =
|
||||
accessControl && typeof accessControl.getEditors === "function"
|
||||
? accessControl.getEditors()
|
||||
: [];
|
||||
const seeds = buildTrustedSeeds({
|
||||
superAdmin: ADMIN_SUPER_NPUB,
|
||||
editors,
|
||||
fallbackSeeds: DEFAULT_TRUST_SEED_NPUBS,
|
||||
});
|
||||
moderationService.setTrustedSeeds(seeds);
|
||||
if (
|
||||
moderationService &&
|
||||
typeof moderationService.recomputeAllSummaries === "function"
|
||||
) {
|
||||
moderationService.recomputeAllSummaries();
|
||||
}
|
||||
} catch (error) {
|
||||
userLogger.warn("[bootstrap] Failed to apply trusted seeds", error);
|
||||
}
|
||||
};
|
||||
|
||||
let attempts = 0;
|
||||
const hydrate = async () => {
|
||||
attempts += 1;
|
||||
try {
|
||||
const result = await waitForAccessControl();
|
||||
applySeeds();
|
||||
return result;
|
||||
} catch (error) {
|
||||
userLogger.warn(
|
||||
"[bootstrap] Failed to hydrate admin lists for trusted seeds",
|
||||
error,
|
||||
);
|
||||
return { ok: false, timedOut: false, error };
|
||||
}
|
||||
};
|
||||
|
||||
const hydrateResult = await hydrate();
|
||||
|
||||
const runAsyncRetry = async () => {
|
||||
if (hydrateResult?.ok || attempts >= 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
const relaysReady = await waitForRelaysReady();
|
||||
if (relaysReady) {
|
||||
await hydrate();
|
||||
} else {
|
||||
devLogger.warn(
|
||||
"[bootstrap] Skipping trusted seed retry because relays were not ready in time.",
|
||||
);
|
||||
applySeeds();
|
||||
}
|
||||
};
|
||||
|
||||
runAsyncRetry().catch((error) => {
|
||||
userLogger.warn("[bootstrap] Trusted seed retry failed", error);
|
||||
});
|
||||
|
||||
if (!hydrateResult?.ok) {
|
||||
applySeeds();
|
||||
}
|
||||
|
||||
const applyOnChange = () => {
|
||||
applySeeds();
|
||||
};
|
||||
|
||||
if (accessControl && typeof accessControl.onWhitelistChange === "function") {
|
||||
accessControl.onWhitelistChange(applyOnChange);
|
||||
}
|
||||
|
||||
if (accessControl && typeof accessControl.onEditorsChange === "function") {
|
||||
accessControl.onEditorsChange(applyOnChange);
|
||||
}
|
||||
}
|
||||
|
||||
export const trustedSeedsReadyPromise = bootstrapTrustedSeeds();
|
||||
import { userLogger } from "./utils/logger.js";
|
||||
|
||||
function mergeServices(overrides = {}) {
|
||||
const merged = { nostrService, r2Service, hashtagPreferences };
|
||||
@@ -204,15 +26,6 @@ function mergeServices(overrides = {}) {
|
||||
}
|
||||
|
||||
export async function createApplication({ services, loadView: loadViewOverride } = {}) {
|
||||
try {
|
||||
await trustedSeedsReadyPromise;
|
||||
} catch (error) {
|
||||
userLogger.warn(
|
||||
"[bootstrap] Failed to await trusted seed hydration before creating application",
|
||||
error,
|
||||
);
|
||||
}
|
||||
|
||||
return new Application({
|
||||
services: mergeServices(services),
|
||||
loadView: typeof loadViewOverride === "function" ? loadViewOverride : loadView,
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
// js/services/trustBootstrap.js
|
||||
|
||||
import {
|
||||
DEFAULT_TRUST_SEED_NPUBS,
|
||||
FEATURE_TRUST_SEEDS,
|
||||
} from "../constants.js";
|
||||
import { ADMIN_SUPER_NPUB } from "../config.js";
|
||||
import { accessControl } from "../accessControl.js";
|
||||
import moderationService from "./moderationService.js";
|
||||
import nostrService from "./nostrService.js";
|
||||
import { devLogger, userLogger } from "../utils/logger.js";
|
||||
|
||||
const TRUST_SEED_READY_TIMEOUT_MS = 3500;
|
||||
|
||||
function normalizeNpub(value) {
|
||||
return typeof value === "string" ? value.trim() : "";
|
||||
}
|
||||
|
||||
function buildTrustedSeeds({ superAdmin, editors, fallbackSeeds }) {
|
||||
const seeds = new Set();
|
||||
|
||||
const addSeed = (value) => {
|
||||
const normalized = normalizeNpub(value);
|
||||
if (normalized) {
|
||||
seeds.add(normalized);
|
||||
}
|
||||
};
|
||||
|
||||
addSeed(superAdmin);
|
||||
|
||||
if (editors && typeof editors[Symbol.iterator] === "function") {
|
||||
for (const value of editors) {
|
||||
addSeed(value);
|
||||
}
|
||||
}
|
||||
|
||||
if (!seeds.size && fallbackSeeds && typeof fallbackSeeds[Symbol.iterator] === "function") {
|
||||
for (const value of fallbackSeeds) {
|
||||
addSeed(value);
|
||||
}
|
||||
}
|
||||
|
||||
return seeds;
|
||||
}
|
||||
|
||||
function delay(ms = 0) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
async function waitForRelaysReady({ timeoutMs = TRUST_SEED_READY_TIMEOUT_MS } = {}) {
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < timeoutMs) {
|
||||
if (
|
||||
nostrService?.nostrClient?.pool &&
|
||||
nostrService?.nostrClient?.relays &&
|
||||
Array.isArray(nostrService.nostrClient.relays) &&
|
||||
nostrService.nostrClient.relays.length > 0
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
await delay(125);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
async function waitForAccessControl({ timeoutMs = TRUST_SEED_READY_TIMEOUT_MS } = {}) {
|
||||
if (!accessControl || typeof accessControl.ensureReady !== "function") {
|
||||
return { ok: true, timedOut: false };
|
||||
}
|
||||
|
||||
let timedOut = false;
|
||||
const timeoutPromise = new Promise((_, reject) => {
|
||||
setTimeout(() => {
|
||||
timedOut = true;
|
||||
reject(new Error("accessControl ensureReady timed out"));
|
||||
}, timeoutMs);
|
||||
});
|
||||
|
||||
try {
|
||||
await Promise.race([accessControl.ensureReady(), timeoutPromise]);
|
||||
return { ok: true, timedOut: false };
|
||||
} catch (error) {
|
||||
if (timedOut) {
|
||||
devLogger.warn(
|
||||
"[bootstrap] access control hydration timed out; falling back to default trust seeds.",
|
||||
error,
|
||||
);
|
||||
return { ok: true, timedOut: true };
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export async function bootstrapTrustedSeeds() {
|
||||
if (
|
||||
!(
|
||||
FEATURE_TRUST_SEEDS &&
|
||||
moderationService &&
|
||||
typeof moderationService.setTrustedSeeds === "function"
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
const applySeeds = () => {
|
||||
try {
|
||||
const editors =
|
||||
accessControl && typeof accessControl.getEditors === "function"
|
||||
? accessControl.getEditors()
|
||||
: [];
|
||||
const seeds = buildTrustedSeeds({
|
||||
superAdmin: ADMIN_SUPER_NPUB,
|
||||
editors,
|
||||
fallbackSeeds: DEFAULT_TRUST_SEED_NPUBS,
|
||||
});
|
||||
moderationService.setTrustedSeeds(seeds);
|
||||
if (
|
||||
moderationService &&
|
||||
typeof moderationService.recomputeAllSummaries === "function"
|
||||
) {
|
||||
moderationService.recomputeAllSummaries();
|
||||
}
|
||||
} catch (error) {
|
||||
userLogger.warn("[bootstrap] Failed to apply trusted seeds", error);
|
||||
}
|
||||
};
|
||||
|
||||
let attempts = 0;
|
||||
const hydrate = async () => {
|
||||
attempts += 1;
|
||||
try {
|
||||
const result = await waitForAccessControl();
|
||||
applySeeds();
|
||||
return result;
|
||||
} catch (error) {
|
||||
userLogger.warn(
|
||||
"[bootstrap] Failed to hydrate admin lists for trusted seeds",
|
||||
error,
|
||||
);
|
||||
return { ok: false, timedOut: false, error };
|
||||
}
|
||||
};
|
||||
|
||||
const hydrateResult = await hydrate();
|
||||
|
||||
const runAsyncRetry = async () => {
|
||||
if (hydrateResult?.ok || attempts >= 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
const relaysReady = await waitForRelaysReady();
|
||||
if (relaysReady) {
|
||||
await hydrate();
|
||||
} else {
|
||||
devLogger.warn(
|
||||
"[bootstrap] Skipping trusted seed retry because relays were not ready in time.",
|
||||
);
|
||||
applySeeds();
|
||||
}
|
||||
};
|
||||
|
||||
runAsyncRetry().catch((error) => {
|
||||
userLogger.warn("[bootstrap] Trusted seed retry failed", error);
|
||||
});
|
||||
|
||||
if (!hydrateResult?.ok) {
|
||||
applySeeds();
|
||||
}
|
||||
|
||||
const applyOnChange = () => {
|
||||
applySeeds();
|
||||
};
|
||||
|
||||
if (accessControl && typeof accessControl.onWhitelistChange === "function") {
|
||||
accessControl.onWhitelistChange(applyOnChange);
|
||||
}
|
||||
|
||||
if (accessControl && typeof accessControl.onEditorsChange === "function") {
|
||||
accessControl.onEditorsChange(applyOnChange);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user