- Relay status -
- Videos tagged with these hashtags will be highlighted for you. -
+ Videos tagged with these hashtags will be highlighted for you. +
- We’ll de-emphasize or hide videos using these hashtags. -
+ We’ll de-emphasize or hide videos using these hashtags. +
Super Admin only
Creators listed here remain visible when whitelist mode is enabled. Accounts can appear in both lists, and the blacklist always takes precedence. @@ -1623,18 +1494,7 @@
Creators on the blacklist are hidden from bitvid everywhere. Accounts can appear in both lists, and the blacklist always takes precedence. diff --git a/dist/config/instance-config.js b/dist/config/instance-config.js index c953973d..a391e0a2 100644 --- a/dist/config/instance-config.js +++ b/dist/config/instance-config.js @@ -17,13 +17,11 @@ * Whether the current deployment should enable developer-centric behavior. * * When `true`, bitvid surfaces extra logging, debug helpers, and experimental - * UI affordances intended for development environments. Leave the value - * `false` for production so end users receive the stable experience; use the - * runtime overrides documented in `js/config.js` when you need to toggle dev - * mode without editing this file. Downstream modules read this flag via - * `js/config.js`. + * UI affordances intended for development environments. Set the value to + * `false` before deploying to production so that end users receive the stable + * experience. Downstream modules read this flag via `js/config.js`. */ -export const IS_DEV_MODE = false; +export const IS_DEV_MODE = true; /** * Whether development builds should surface extra verbose diagnostics. @@ -31,10 +29,8 @@ export const IS_DEV_MODE = false; * Set this to `true` to keep high-volume development warnings (like COUNT * request failures) visible in the console. Flip it to `false` when you want * a quieter dev mode without disabling other development helpers entirely. - * Use the runtime override documented in `js/config.js` if you need to toggle - * verbosity without editing this file. */ -export const IS_VERBOSE_DEV_MODE = false; +export const IS_VERBOSE_DEV_MODE = true; /** * Whether the current deployment should operate in lockdown mode. diff --git a/dist/css/docs.css b/dist/css/docs.css index 8b833c45..95c7f003 100644 --- a/dist/css/docs.css +++ b/dist/css/docs.css @@ -45,8 +45,7 @@ border-radius: var(--radius-md); color: var(--text-muted); text-decoration: none; - transition: - background-color var(--motion-duration-fast) ease, + transition: background-color var(--motion-duration-fast) ease, color var(--motion-duration-fast) ease; } diff --git a/dist/docs/instance-config.md b/dist/docs/instance-config.md index 05da1ec3..c8997e51 100644 --- a/dist/docs/instance-config.md +++ b/dist/docs/instance-config.md @@ -28,30 +28,14 @@ an operator might change it. debug affordances. The value is re-exported as `isDevMode` in `js/config.js` and controls `window.__BITVID_DEV_MODE__` as well as logger routing. - - **Why change it:** Defaults to `false` for production builds. Set to `true` - for local development, or use the runtime override described below to - toggle dev mode without editing this file. + - **Why change it:** Set to `false` for production builds so only the stable + UX and user-facing logging remain. - **`IS_VERBOSE_DEV_MODE`** - **What it does:** Enables high-volume diagnostics inside dev mode (for example, repeated COUNT failures). - **Why change it:** Keep `true` while debugging noisy workflows and set to `false` when you want a quieter dev console without disabling dev mode. - Defaults to `false` for production. - -To override the dev flags at runtime (for example in a staging build) without -changing `config/instance-config.js`, inject one or both of the following -globals **before** `js/config.js` loads: - -```html - -``` - -The overrides accept boolean values or the strings `"true"` / `"false"` so they -can be injected at build time. - **`IS_LOCKDOWN_MODE`** - **What it does:** Toggles a lockdown posture that limits access and switches diff --git a/dist/docs/logging.md b/dist/docs/logging.md index 5afd4d18..0f5f81bb 100644 --- a/dist/docs/logging.md +++ b/dist/docs/logging.md @@ -59,23 +59,10 @@ The source of truth lives in `config/instance-config.js`: - Set `IS_DEV_MODE = true` while developing locally so the dev logger and other diagnostics are available. -- Keep `IS_DEV_MODE = false` for production builds. This value propagates to - `isDevMode` (the module export), `window.__BITVID_DEV_MODE__`, and - `logger.dev`, silencing development-only messages. +- Flip `IS_DEV_MODE = false` before shipping a production build. This change + propagates to `isDevMode` (the module export), `window.__BITVID_DEV_MODE__`, + and `logger.dev`, silencing development-only messages. Always commit the flag change alongside deployment-ready configuration tweaks. Forgetting to update the flag leaves verbose traces in user consoles and can expose experimental behavior intended only for QA environments. - -If you need to enable dev logging without editing `config/instance-config.js`, -inject a runtime override before `js/config.js` loads: - -```html - -``` - -Overrides accept boolean values or the strings `"true"` / `"false"` so they can -be injected by a build pipeline. diff --git a/dist/docs/nostr-client-overview.md b/dist/docs/nostr-client-overview.md index cf4407bc..5ddcbaea 100644 --- a/dist/docs/nostr-client-overview.md +++ b/dist/docs/nostr-client-overview.md @@ -1,76 +1,92 @@ -# NostrClient Architecture Overview +# NostrClient Overview -The `NostrClient` (`js/nostr/client.js`) is the central controller for all Nostr network interactions in the application. It acts as a singleton facade over the `nostr-tools` library, managing relay connections, event subscriptions, state synchronization, and cryptographic signing. +`NostrClient` (`js/nostr/client.js`) is the central controller for all Nostr network interactions, state management, and persistence in the application. It acts as the bridge between the raw Nostr protocol (relays, events) and the application's UI domain model (Videos, Profiles). ## Core Responsibilities -1. **Connection Management**: Maintains a persistent connection pool (`SimplePool`) to multiple relays. -2. **State Management**: Tracks the global state of video events, including history, active versions, and deletions. -3. **Event Ingestion**: Handles high-volume event streams with buffering and deduplication. -4. **Caching**: Implements a persistent IndexedDB cache to support "Stale-While-Revalidate" loading (instant UI render). -5. **Signer Orchestration**: Manages NIP-07 (Browser Extension), NIP-46 (Remote Signer), and Local (nsec) signers seamlessly. +1. **Connection Management**: Maintains a pool of WebSocket connections to relays via `nostr-tools/SimplePool`. +2. **Event Processing**: Subscribes to event streams, buffers incoming bursts, validates schemas, and converts raw events into domain objects. +3. **State Management**: + * **`allEvents`**: A complete history of every video version fetched. + * **`activeMap`**: A materialized view of the *latest* valid version of each video series (deduplicated by Root ID). + * **`tombstones`**: A set of deletion timestamps to prevent "zombie" events (deleted items reappearing from old caches) from being displayed. +4. **Persistence**: Implements a "Stale-While-Revalidate" strategy using IndexedDB (with LocalStorage fallback) to restore the UI instantly on load. +5. **Signer Orchestration**: Manages NIP-07 (Browser Extension), NIP-46 (Remote/Bunker), and Local (nsec) signers. -## State Management +## State Management Architecture -The client maintains three primary state maps to ensure data consistency: +The client maintains three primary maps to handle the "Eventual Consistency" nature of Nostr: -* **`allEvents`** (`Map`): - * Stores *every* valid video event fetched from relays, indexed by Event ID. - * Used for history preservation and resolving direct links to specific versions. +* **`allEvents` (`Map`)**: + * Stores every valid video event received. + * Used for history hydration (viewing edit logs) and debugging. +* **`activeMap` (`Map`)**: + * Stores only the *most recent* version of a video. + * Keyed by `videoRootId` (or `pubkey:dTag` for legacy). + * **Invariant**: `activeMap.get(id).created_at` is always >= any other version of that ID. +* **`tombstones` (`Map`)**: + * Stores the timestamp of the latest deletion event for a video. + * **Invariant**: Any event with `created_at <= tombstone` is implicitly treated as deleted, even if the "deleted" flag isn't set on the event itself. This handles out-of-order delivery where a "delete" arrives before the "video" it deletes. -* **`activeMap`** (`Map`): - * The "materialized view" used by the UI. - * Keys are `videoRootId` (prefixed with `ROOT:`) for versioned edits, or `pubkey:dTag` for addressable events. - * Values are the *latest* valid version of the video. - * **Invariant**: Only one entry exists per "video entity", ensuring the UI displays the most recent edit. +## Caching Strategy -* **`tombstones`** (`Map`): - * Tracks deletions (Kind 5). - * Keys are the `activeKey` of the deleted item. - * Values are the timestamp of the deletion. - * **Invariant**: Events older than the tombstone are strictly ignored, preventing "zombie" events from reappearing. +The client uses a multi-layered approach to ensure fast boot times: -## Data Ingestion Flow +1. **IndexedDB (`events` store)**: + * Primary cache for video events. + * Stores fingerprints of objects to avoid redundant writes. +2. **LocalStorage (`bitvid:eventsCache:v1`)**: + * Fallback if IndexedDB is unavailable. + * Size-limited (typically < 5MB). +3. **Buffering**: + * Incoming events are buffered in memory and flushed to IDB periodically (debounced) to avoid I/O thrashing during heavy relay traffic. -The `subscribeVideos` method implements a buffered ingestion pipeline to handle high-throughput streams without freezing the UI: +## Event Processing (Buffering & Debouncing) -1. **Subscription**: Opens a subscription to all connected relays. -2. **Buffering**: Incoming events are pushed to an `eventBuffer` array immediately. -3. **Debouncing**: A timer flushes the buffer every ~75ms (or when full). -4. **Processing (Flush)**: - * Events are parsed and validated. - * **Tombstone Check**: If an event predates a known deletion, it is discarded. - * **Latest-Wins Resolution**: The new event's `created_at` is compared against the existing entry in `activeMap`. - * **Update**: If the new event is newer, `activeMap` is updated, and the UI callback is triggered. -5. **Persistence**: The updated state is asynchronously persisted to IndexedDB. +When `subscribeVideos` is called, the client expects a flood of events (e.g., 500+ items from relay history). Processing these one-by-one would freeze the UI. + +### Flow ```mermaid -graph TD - Relay[Relays] -->|Event Stream| Buffer[Event Buffer] - Buffer -->|Debounce Timer| Processor[Processor] - Processor -->|Check| Tombstones{Is Deleted?} - Tombstones -->|Yes| Discard[Discard] - Tombstones -->|No| Compare{Is Newer?} - Compare -->|No| Discard - Compare -->|Yes| ActiveMap[Update ActiveMap] - ActiveMap --> UI[Update UI] - ActiveMap --> IDB[(IndexedDB Cache)] +sequenceDiagram + participant Relay + participant ClientBuffer + participant Processor + participant UI + + Relay->>ClientBuffer: Event 1 + Relay->>ClientBuffer: Event 2 + Relay->>ClientBuffer: ... Event 50 + ClientBuffer->>ClientBuffer: Buffer (Debounce 75ms) + + loop Flush Timer + ClientBuffer->>Processor: Flush Batch (50 events) + Processor->>Processor: Validate & Convert + Processor->>Processor: Apply Tombstones + Processor->>Processor: Update activeMap (Last-Write-Wins) + Processor->>UI: Callback(onVideo) (Single Render) + Processor->>IndexedDB: Persist Snapshot + end ``` -## Caching Strategy (`EventsCacheStore`) +## History Reconstruction -To provide an "app-like" experience, the client persists its state to IndexedDB (`bitvid-events-cache`). +Videos in Nostr are immutable events. "Editing" means publishing a new event with the same identifier. `NostrClient` reconstructs the history chain using: -* **Fingerprinting**: To minimize I/O, the store tracks JSON fingerprints (hashes) of all persisted events. -* **Incremental Persistence**: Only changed events (where fingerprint differs) are written to IDB during a snapshot. -* **Stale-While-Revalidate**: On startup (`init()`), the client immediately loads data from IDB to render the UI, then connects to relays to fetch updates. +1. **`videoRootId` (V3)**: The canonical identifier for a video series. +2. **`d` Tag (NIP-33)**: The addressable identifier. +3. **Legacy IDs**: Fallback to Event ID for V1/V2 posts. -## Signer Integration +`hydrateVideoHistory` fetches all events matching these identifiers, sorts them by `created_at` descending, and returns the full edit log. -The client abstracts the signing mechanism, allowing the user to switch between methods without changing application logic: +## Why it works this way -1. **NIP-07 (Extension)**: Delegates signing to a browser extension (e.g., Alby, nos2x). -2. **NIP-46 (Remote/Bunker)**: Uses a partial `NostrClient` instance to communicate with a remote signer via a relay. -3. **Local (NIP-01)**: Uses a local private key (nsec) stored in `sessionStorage` (encrypted). +* **Eventual Consistency**: The `tombstones` map is essential because relays guarantee neither order nor completeness. A client might receive a "delete" event for a video it hasn't seen yet, or receive an old version of a video after receiving the deletion. Tombstones ensure that once something is known to be deleted, it stays deleted (until a newer re-creation event appears). +* **Performance**: The `eventBuffer` mechanism allows the client to ingest thousands of events without blocking the main thread, as React rendering is expensive. Batching updates reduces render cycles from O(N) to O(1) per batch. +* **Offline-First**: Restoring from IndexedDB immediately allows the app to be interactive before any network connection is established. -The `activeSigner` object is normalized to expose a standard interface (`signEvent`, `nip04Encrypt`, `nip44Encrypt`), regardless of the underlying implementation. +## When to change + +* **Storage Backend**: If the cache schema becomes too complex for IndexedDB, or if we move to a native wrapper (React Native/Tauri) with a SQL backend, the `EventsCacheStore` class should be swapped out. +* **Event Loop**: If we switch to a worker-based architecture (off-main-thread processing), the `subscribeVideos` logic would move to a Web Worker, and `NostrClient` would become a message passer. +* **Protocol Upgrades**: If NIP-33 (Parameterized Replaceable Events) is superseded or the video event kind (30078) changes, the filters in `subscribeVideos` and `fetchVideos` must be updated. diff --git a/dist/docs/nostr-event-schemas.md b/dist/docs/nostr-event-schemas.md index ec12fc73..11901ef1 100644 --- a/dist/docs/nostr-event-schemas.md +++ b/dist/docs/nostr-event-schemas.md @@ -341,12 +341,11 @@ valid events: ```bash # Run the validation script -node scripts/agent/validate-events.mjs +node scripts/agent/validate-events.test.mjs # Run the unit test suite npm run test:unit ``` -When modifying schemas or builders, use `scripts/agent/validate-events.mjs` to -verify your changes locally. This tool also scans the codebase to ensure all -active event builders are covered by tests. +When modifying schemas or builders, use `scripts/agent/validate-events.test.mjs` to +verify your changes locally. diff --git a/dist/js/app.js b/dist/js/app.js index 0a5ea507..6858bec8 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -31,7 +31,7 @@ import { collectVideoTags } from "./utils/videoTags.js"; import { normalizeHashtag } from "./utils/hashtagNormalization.js"; import { sanitizeProfileMediaUrl } from "./utils/profileMedia.js"; import { ADMIN_INITIAL_EVENT_BLACKLIST } from "./lists.js"; -import { userBlocks, USER_BLOCK_EVENTS } from "./userBlocks.js"; +import { userBlocks } from "./userBlocks.js"; import { relayManager } from "./relayManager.js"; import { createFeedEngine, @@ -64,10 +64,6 @@ import getAuthProvider, { import hashtagPreferences, { HASHTAG_PREFERENCES_EVENTS, } from "./services/hashtagPreferencesService.js"; -import { - fetchProfileMetadata, - ensureProfileMetadataSubscription, -} from "./services/profileMetadataService.js"; import { getSidebarLoadingMarkup } from "./sidebarLoading.js"; import { subscriptions } from "./subscriptions.js"; import { @@ -77,6 +73,7 @@ import { import { isWatchHistoryDebugEnabled } from "./watchHistoryDebug.js"; import { devLogger, userLogger } from "./utils/logger.js"; import createPopover from "./ui/overlay/popoverEngine.js"; +import { createVideoSettingsMenuPanel } from "./ui/components/videoMenuRenderers.js"; import moderationService from "./services/moderationService.js"; import { sanitizeRelayList } from "./nostr/nip46Client.js"; import { buildDmRelayListEvent, buildShareEvent } from "./nostrEventSchemas.js"; @@ -89,7 +86,7 @@ import { onActiveSignerChanged, } from "./nostrClientRegistry.js"; import { queueSignEvent } from "./nostr/signRequestQueue.js"; -import { DEFAULT_NIP07_CORE_METHODS } from "./nostr/nip07Permissions.js"; +import { DEFAULT_NIP07_PERMISSION_METHODS } from "./nostr/nip07Permissions.js"; import { initViewCounter, subscribeToVideoViewCount, @@ -173,7 +170,6 @@ import EngagementController from "./ui/engagementController.js"; import SimilarContentController from "./ui/similarContentController.js"; import UrlHealthController from "./ui/urlHealthController.js"; import VideoModalCommentController from "./ui/videoModalCommentController.js"; -import VideoModalController from "./ui/videoModalController.js"; import TorrentStatusController from "./ui/torrentStatusController.js"; import ShareNostrController from "./ui/shareNostrController.js"; import ModerationActionController from "./services/moderationActionController.js"; @@ -188,7 +184,6 @@ const UNSUPPORTED_BTITH_MESSAGE = const FALLBACK_THUMBNAIL_SRC = "/assets/jpg/video-thumbnail-fallback.jpg"; const VIDEO_EVENT_KIND = 30078; const HEX64_REGEX = /^[0-9a-f]{64}$/i; -const RELAY_UI_BATCH_DELAY_MS = 250; /** * Simple IntersectionObserver-based lazy loader for images (or videos). * @@ -224,14 +219,6 @@ class Application { setStoredCurrentVideo(value ?? null); } - get activeProfilePubkey() { - return getActiveProfilePubkey(); - } - - get savedProfiles() { - return getSavedProfiles(); - } - constructor({ services = {}, ui = {}, helpers = {}, loadView: viewLoader } = {}) { this.loadView = typeof viewLoader === "function" ? viewLoader : null; @@ -260,33 +247,9 @@ class Application { const { modalManager } = this.bootstrapper.initialize(); this.modalManager = modalManager; - this.videoModalController = new VideoModalController({ - getVideoModal: () => this.videoModal, - callbacks: { - showError: (msg) => this.showError(msg), - getLastModalTrigger: () => this.lastModalTrigger, - setLastModalTrigger: (val) => this.setLastModalTrigger(val), - getCurrentVideo: () => this.currentVideo, - }, - }); - this.modalCreatorProfileRequestToken = null; this.dmRecipientPubkey = null; this.dmRelayHints = new Map(); - this.authLoadingState = { profile: "idle", lists: "idle", dms: "idle" }; - this.permissionPromptShownForSession = false; - this.permissionPromptVisible = false; - this.permissionPromptInFlight = false; - this.permissionPromptPending = new Set(); - this.relayUiRefreshTimeout = null; - this.lastRelayHealthWarningAt = 0; - this.appStartedAt = Date.now(); - this.activeIntervals = []; - this.torrentStatusIntervalId = null; - this.torrentStatusNodes = null; - this.torrentStatusVisibilityHandler = null; - this.torrentStatusPageHideHandler = null; - this.urlProbePromises = new Map(); this.commentController = null; this.initializeCommentController(); @@ -609,10 +572,6 @@ class Application { this.loadView = module?.loadView || null; } - if (nostrClient && typeof nostrClient.warmupExtension === "function") { - nostrClient.warmupExtension(); - } - // Force update of any registered service workers to ensure latest code is used. if ("serviceWorker" in navigator) { navigator.serviceWorker.getRegistrations().then((registrations) => { @@ -1131,43 +1090,6 @@ class Application { } } - dispatchAuthLoadingState(detail = {}) { - if (typeof window === "undefined" || typeof window.dispatchEvent !== "function") { - return false; - } - - try { - const payload = { ...(typeof detail === "object" && detail ? detail : {}) }; - window.dispatchEvent(new CustomEvent("bitvid:auth-loading-state", { detail: payload })); - return true; - } catch (error) { - devLogger.warn("[Application] Failed to dispatch auth loading state:", error); - return false; - } - } - - updateAuthLoadingState(partial = {}) { - const baseState = - this.authLoadingState && typeof this.authLoadingState === "object" - ? this.authLoadingState - : { profile: "idle", lists: "idle", dms: "idle" }; - const nextState = { - ...baseState, - ...(partial && typeof partial === "object" ? partial : {}), - }; - this.authLoadingState = nextState; - - const root = typeof document !== "undefined" ? document.documentElement : null; - if (root) { - root.dataset.authProfileLoading = nextState.profile || "idle"; - root.dataset.authListsLoading = nextState.lists || "idle"; - root.dataset.authDmsLoading = nextState.dms || "idle"; - } - - this.dispatchAuthLoadingState(nextState); - return nextState; - } - normalizeModalTrigger(candidate) { if (!candidate) { return null; @@ -1207,23 +1129,162 @@ class Application { * Show the modal and set the "Please stand by" poster on the video. */ async showModalWithPoster(video = this.currentVideo, options = {}) { - const result = await this.videoModalController.showModalWithPoster(video, options); - this.cacheTorrentStatusNodes(); - return result; + if (!this.videoModal) { + return null; + } + + if (Object.prototype.hasOwnProperty.call(options || {}, "trigger")) { + this.setLastModalTrigger(options.trigger); + } + + const targetVideo = video || this.currentVideo; + if (!targetVideo) { + this.log( + "[Application] Skipping video modal open; no target video is available.", + ); + return null; + } + + try { + const { root } = await this.ensureVideoModalReady({ + ensureVideoElement: true, + }); + + if (!this.videoModal) { + return root || null; + } + + this.videoModal.open(targetVideo, { + triggerElement: this.lastModalTrigger, + }); + this.applyModalLoadingPoster(); + + return ( + root || + (typeof this.videoModal.getRoot === "function" + ? this.videoModal.getRoot() + : null) + ); + } catch (error) { + devLogger.error( + "[Application] Failed to open the video modal before playback:", + error + ); + this.showError("Could not open the video player. Please try again."); + return null; + } } applyModalLoadingPoster() { - this.videoModalController.applyModalLoadingPoster(); + if (!this.videoModal) { + return; + } + this.videoModal.applyLoadingPoster(); } forceRemoveModalPoster(reason = "manual-clear") { - return this.videoModalController.forceRemoveModalPoster(reason); + if (!this.videoModal) { + return false; + } + return this.videoModal.forceRemovePoster(reason); } async ensureVideoModalReady({ ensureVideoElement = false } = {}) { - const result = await this.videoModalController.ensureVideoModalReady({ ensureVideoElement }); - this.modalVideo = result.videoElement; - return result; + if (!this.videoModal) { + throw new Error("Video modal instance is not available."); + } + + const getRoot = () => + typeof this.videoModal.getRoot === "function" + ? this.videoModal.getRoot() + : null; + const getVideoElement = () => + typeof this.videoModal.getVideoElement === "function" + ? this.videoModal.getVideoElement() + : null; + + const existingRoot = getRoot(); + const existingVideoElement = getVideoElement(); + const rootConnected = Boolean(existingRoot && existingRoot.isConnected); + const hasVideoElement = Boolean(existingVideoElement); + const videoConnected = Boolean( + existingVideoElement && existingVideoElement.isConnected, + ); + + const needsRehydrate = + !rootConnected || !hasVideoElement || !videoConnected; + + if (!needsRehydrate) { + this.modalVideo = existingVideoElement; + + if ( + existingVideoElement && + this.videoModal && + typeof this.videoModal.setVideoElement === "function" + ) { + const modalVideo = + typeof this.videoModal.getVideoElement === "function" + ? this.videoModal.getVideoElement() + : null; + if (modalVideo !== existingVideoElement) { + this.videoModal.setVideoElement(existingVideoElement); + } + } + + return { + root: existingRoot, + videoElement: existingVideoElement, + }; + } + + if (!videoConnected) { + this.modalVideo = null; + } + + if (!this.videoModalReadyPromise) { + if (typeof this.videoModal.load !== "function") { + throw new Error("Video modal does not expose a load() method."); + } + this.videoModalReadyPromise = Promise.resolve(this.videoModal.load()); + } + + try { + await this.videoModalReadyPromise; + } catch (error) { + this.videoModalReadyPromise = null; + throw error; + } + + this.videoModalReadyPromise = null; + + const readyRoot = getRoot(); + const readyVideoElement = getVideoElement(); + const readyVideoConnected = Boolean( + readyVideoElement && readyVideoElement.isConnected, + ); + + if (readyVideoConnected) { + this.modalVideo = readyVideoElement; + if ( + this.videoModal && + typeof this.videoModal.setVideoElement === "function" + ) { + this.videoModal.setVideoElement(readyVideoElement); + } + } else { + this.modalVideo = null; + } + + if (ensureVideoElement && !readyVideoConnected) { + throw new Error( + "Video modal video element is missing after load().", + ); + } + + return { + root: readyRoot, + videoElement: readyVideoConnected ? readyVideoElement : null, + }; } initializeSimilarContentController() { @@ -1428,7 +1489,7 @@ class Application { this.videoModal.setViewCountPointer(pointerKey); } try { - const token = subscribeToVideoViewCount(pointer, ({ total, status, partial }) => { + const token = subscribeToVideoViewCount(pointer, ({ total, status }) => { const latestViewEl = this.videoModal?.getViewCountElement() || null; if (!latestViewEl) { return; @@ -1437,12 +1498,10 @@ class Application { if (Number.isFinite(total)) { const numeric = Number(total); if (this.videoModal) { - const label = this.formatViewCountLabel(numeric); this.videoModal.updateViewCountLabel( - partial ? `${label} (partial)` : label + this.formatViewCountLabel(numeric) ); } - latestViewEl.dataset.viewCountState = partial ? "partial" : "ready"; return; } @@ -1450,12 +1509,10 @@ class Application { if (this.videoModal) { this.videoModal.updateViewCountLabel("Loading views…"); } - latestViewEl.dataset.viewCountState = "hydrating"; } else { if (this.videoModal) { this.videoModal.updateViewCountLabel("– views"); } - latestViewEl.dataset.viewCountState = status; } }); @@ -2033,9 +2090,7 @@ class Application { case "nip04-missing": return "Your Nostr extension must support NIP-04 to manage private block lists."; case "extension-permission-denied": - return "Your Nostr extension denied the encryption permissions needed to update your block list."; - case "extension-encryption-permission-denied": - return "Your Nostr extension denied the encryption permissions needed to update your block list."; + return "Permission to update your block list was denied by your Nostr extension."; case "sign-event-missing": case "signer-missing": return "Connect a Nostr signer that can encrypt and sign updates before managing block lists."; @@ -2066,9 +2121,7 @@ class Application { case "hashtag-preferences-missing-signer": return "Connect a Nostr signer that supports encryption before managing hashtag preferences."; case "hashtag-preferences-extension-denied": - return "Your signer denied the encryption permissions needed to manage hashtag preferences."; - case "hashtag-preferences-permission-required": - return "Your Nostr extension must grant encryption permissions to read hashtag preferences."; + return "Permission to manage hashtag preferences was denied by your signer."; case "hashtag-preferences-no-decryptors": return "Unable to decrypt hashtag preferences with the active signer."; case "hashtag-preferences-decrypt-failed": @@ -2097,100 +2150,6 @@ class Application { return fallback; } - resetPermissionPromptState() { - this.permissionPromptShownForSession = false; - this.permissionPromptVisible = false; - this.permissionPromptInFlight = false; - if (this.permissionPromptPending instanceof Set) { - this.permissionPromptPending.clear(); - } else { - this.permissionPromptPending = new Set(); - } - this.updatePermissionPromptCta(); - } - - capturePermissionPromptRequirement(source) { - const normalized = - typeof source === "string" ? source.trim().toLowerCase() : ""; - if (!normalized) { - return; - } - - this.permissionPromptPending.add(normalized); - - if (!this.permissionPromptShownForSession) { - this.permissionPromptShownForSession = true; - this.permissionPromptVisible = true; - } - - this.updatePermissionPromptCta(); - } - - capturePermissionPromptFromError(error) { - const code = - error && typeof error.code === "string" ? error.code.trim() : ""; - - switch (code) { - case "subscriptions-permission-required": - this.capturePermissionPromptRequirement("subscriptions"); - break; - case "user-blocklist-permission-required": - this.capturePermissionPromptRequirement("user-blocks"); - break; - case "hashtag-preferences-permission-required": - this.capturePermissionPromptRequirement("hashtag-preferences"); - break; - default: - break; - } - } - - resolvePermissionPromptMessage() { - const needsSubscriptions = this.permissionPromptPending.has("subscriptions"); - const needsHashtags = this.permissionPromptPending.has("hashtag-preferences"); - const needsBlocks = this.permissionPromptPending.has("user-blocks"); - - if (needsBlocks && needsSubscriptions && needsHashtags) { - return "Unlock private lists and enable permissions to load your subscriptions and hashtag preferences."; - } - if (needsBlocks && needsSubscriptions) { - return "Unlock private lists and enable permissions to load your subscriptions."; - } - if (needsBlocks && needsHashtags) { - return "Unlock private lists and enable permissions to load your hashtag preferences."; - } - if (needsSubscriptions && needsHashtags) { - return "Enable permissions to load your subscriptions and hashtag preferences."; - } - if (needsBlocks) { - return "Unlock private lists to load your block list."; - } - if (needsSubscriptions) { - return "Enable permissions to load your subscriptions."; - } - if (needsHashtags) { - return "Enable permissions to load your hashtag preferences."; - } - return ""; - } - - updatePermissionPromptCta() { - if (!this.profileController?.setPermissionPromptCtaState) { - return; - } - - const shouldShow = - this.permissionPromptVisible && this.permissionPromptPending.size > 0; - const message = shouldShow ? this.resolvePermissionPromptMessage() : ""; - - this.profileController.setPermissionPromptCtaState({ - visible: shouldShow, - message, - buttonLabel: "Enable permissions", - busy: this.permissionPromptInFlight, - }); - } - normalizeHashtagPreferenceList(list) { if (!Array.isArray(list)) { return []; @@ -2423,7 +2382,7 @@ class Application { this.tagPreferenceMenuController.refreshActiveMenus(); } - async loadHashtagPreferencesForPubkey(pubkey, options = {}) { + async loadHashtagPreferencesForPubkey(pubkey) { if ( !this.hashtagPreferences || typeof this.hashtagPreferences.load !== "function" @@ -2432,7 +2391,7 @@ class Application { } try { - await this.hashtagPreferences.load(pubkey, options); + await this.hashtagPreferences.load(pubkey); return true; } catch (error) { devLogger.error( @@ -2615,14 +2574,6 @@ class Application { }); } - if (userBlocks && typeof userBlocks.on === "function") { - userBlocks.on(USER_BLOCK_EVENTS.STATUS, (detail) => { - if (detail?.status === "permission-required") { - this.capturePermissionPromptRequirement("user-blocks"); - } - }); - } - if (this.appChromeController) { this.appChromeController.initialize(); return; @@ -2702,7 +2653,7 @@ class Application { } const messageContext = - reason === "login" && postLoginResult?.blocksLoaded === true + reason === "login" && postLoginResult?.blocksLoaded !== false ? "Applying your filters…" : "Refreshing videos…"; @@ -2806,9 +2757,7 @@ class Application { } if (signer.type === "extension" && nostrClient.ensureExtensionPermissions) { - const permissionResult = await nostrClient.ensureExtensionPermissions( - DEFAULT_NIP07_CORE_METHODS, - ); + const permissionResult = await nostrClient.ensureExtensionPermissions(); if (!permissionResult?.ok) { userLogger.warn( "[Application] Signer permissions denied while publishing DM relays.", @@ -3323,20 +3272,17 @@ class Application { ); } - const activePubkey = this.pubkey; - if (activePubkey) { - try { - await this.nostrService.loadDirectMessages({ - actorPubkey: activePubkey, - limit: 50, - initialLoad: true, - }); - } catch (error) { - devLogger.warn( - "[Application] Failed to sync direct messages during login:", - error, - ); - } + try { + await this.nostrService.loadDirectMessages({ + actorPubkey: activePubkey, + limit: 50, + initialLoad: true, + }); + } catch (error) { + devLogger.warn( + "[Application] Failed to sync direct messages during login:", + error, + ); } } @@ -4146,131 +4092,11 @@ class Application { ); } - async handlePermissionPromptRequest() { - if (this.permissionPromptInFlight) { - return; - } - - const activePubkey = this.normalizeHexPubkey(this.pubkey); - if (!activePubkey) { - return; - } - - const needsSubscriptions = this.permissionPromptPending.has("subscriptions"); - const needsHashtags = this.permissionPromptPending.has("hashtag-preferences"); - const needsBlocks = this.permissionPromptPending.has("user-blocks"); - - if (!needsSubscriptions && !needsHashtags && !needsBlocks) { - return; - } - - this.permissionPromptInFlight = true; - this.updatePermissionPromptCta(); - - const tasks = []; - - if (needsSubscriptions && subscriptions?.ensureLoaded) { - const subscriptionTask = subscriptions - .ensureLoaded(activePubkey, { allowPermissionPrompt: true }) - .then(() => { - this.capturePermissionPromptFromError(subscriptions?.lastLoadError); - if ( - subscriptions?.lastLoadError?.code !== - "subscriptions-permission-required" - ) { - this.permissionPromptPending.delete("subscriptions"); - if (this.profileController) { - this.profileController.populateSubscriptionsList(); - } - if (typeof subscriptions?.refreshActiveFeed === "function") { - return subscriptions.refreshActiveFeed({ - reason: "permission-prompt", - }); - } - } - return null; - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to refresh subscriptions after permission prompt:", - error, - ); - this.capturePermissionPromptFromError(error); - }); - tasks.push(subscriptionTask); - } - - if (needsBlocks && userBlocks?.loadBlocks) { - let permissionRequired = false; - const blocksTask = userBlocks - .loadBlocks(activePubkey, { - allowPermissionPrompt: true, - statusCallback: (detail) => { - if (detail?.status === "permission-required") { - permissionRequired = true; - } - }, - }) - .then(() => { - if (!permissionRequired) { - this.permissionPromptPending.delete("user-blocks"); - } - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to refresh block list after permission prompt:", - error, - ); - this.capturePermissionPromptFromError(error); - }); - tasks.push(blocksTask); - } - - if (needsHashtags && this.hashtagPreferences?.load) { - const hashtagTask = this.hashtagPreferences - .load(activePubkey, { allowPermissionPrompt: true }) - .then(() => { - this.capturePermissionPromptFromError( - this.hashtagPreferences?.lastLoadError, - ); - if ( - this.hashtagPreferences?.lastLoadError?.code !== - "hashtag-preferences-permission-required" - ) { - this.permissionPromptPending.delete("hashtag-preferences"); - this.updateCachedHashtagPreferences(); - this.refreshTagPreferenceUi(); - if (this.profileController) { - this.profileController.populateHashtagPreferences(); - } - } - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to refresh hashtag preferences after permission prompt:", - error, - ); - this.capturePermissionPromptFromError(error); - }); - tasks.push(hashtagTask); - } - - await Promise.allSettled(tasks); - - if (this.permissionPromptPending.size === 0) { - this.permissionPromptVisible = false; - } - - this.permissionPromptInFlight = false; - this.updatePermissionPromptCta(); - } - async handleAuthLogin(detail = {}) { const postLoginPromise = detail && typeof detail.postLoginPromise?.then === "function" ? detail.postLoginPromise : Promise.resolve(detail?.postLogin ?? null); - const postLoginResult = detail?.postLogin ?? null; if (detail && typeof detail === "object") { try { @@ -4284,8 +4110,6 @@ class Application { this.resetViewLoggingState(); } - this.resetPermissionPromptState(); - // Stop existing feed subscription to prioritize user data sync if ( this.videoSubscription && @@ -4308,6 +4132,10 @@ class Application { const urlParams = new URLSearchParams(window.location.search); const hasVideoParam = urlParams.has("v"); + if (!normalizedView || normalizedView === "most-recent-videos") { + setHashView("for-you", { preserveVideoParam: hasVideoParam }); + } + const rawProviderId = typeof detail?.providerId === "string" ? detail.providerId.trim() : ""; const rawAuthType = @@ -4322,37 +4150,85 @@ class Application { previousPubkey: detail?.previousPubkey, identityChanged: Boolean(detail?.identityChanged), }; - const activePubkey = detail?.pubkey || this.pubkey; - const initialLoadingState = { - profile: activePubkey ? "loading" : "idle", - lists: activePubkey ? "loading" : "idle", - dms: activePubkey ? "loading" : "idle", - }; - this.updateAuthLoadingState(initialLoadingState); + try { + await this.handleModerationSettingsChange({ + settings: getModerationSettings(), + skipRefresh: true, + }); + } catch (error) { + devLogger.warn( + "Failed to sync moderation settings after login:", + error, + ); + } + + if (loginContext.identityChanged) { + this.resetHashtagPreferencesState(); + try { + this.watchHistoryTelemetry?.resetPlaybackLoggingState?.(); + this.watchHistoryTelemetry?.refreshPreferenceSettings?.(); + } catch (error) { + devLogger.warn( + "Failed to refresh watch history telemetry after identity change:", + error, + ); + } + } + + const hashtagPreferencesPromise = Promise.resolve( + this.loadHashtagPreferencesForPubkey(loginContext.pubkey), + ).catch((error) => { + devLogger.warn( + "[Application] Background hashtag preferences load failed:", + error + ); + }); + + if (this.zapController) { + try { + this.zapController.setVisibility( + Boolean(this.currentVideo?.lightningAddress), + ); + } catch (error) { + devLogger.warn("[Application] Failed to refresh zap visibility after login:", error); + } + } + + const shouldReopenZap = this.pendingModalZapOpen; + this.pendingModalZapOpen = false; + if (shouldReopenZap) { + const hasLightning = Boolean(this.currentVideo?.lightningAddress); + if (hasLightning && this.videoModal?.openZapDialog) { + Promise.resolve() + .then(() => this.videoModal.openZapDialog()) + .then((opened) => { + if (opened) { + this.zapController?.open(); + } + }) + .catch((error) => { + devLogger.warn( + "[Application] Failed to reopen zap dialog after login:", + error, + ); + }); + } + } this.dispatchAuthChange({ status: "login", loggedIn: true, pubkey: loginContext.pubkey || null, previousPubkey: loginContext.previousPubkey || null, - authLoadingState: this.authLoadingState, }); - const cachedProfile = - detail?.postLogin && typeof detail.postLogin === "object" - ? detail.postLogin.profile || null - : null; - if (activePubkey && cachedProfile) { - try { - this.updateActiveProfileUI(activePubkey, cachedProfile); - } catch (error) { - devLogger.warn( - "[Application] Failed to apply cached profile during login:", - error, - ); - } - } + const nwcPromise = Promise.resolve() + .then(() => this.nwcSettingsService.onLogin(loginContext)) + .catch((error) => { + devLogger.error("Failed to process NWC settings during login:", error); + return null; + }); if (this.profileController) { try { @@ -4375,189 +4251,47 @@ class Application { this.renderSavedProfiles(); } - const accessControlReadyPromise = - accessControl && typeof accessControl.ensureReady === "function" - ? Promise.resolve() - .then(() => accessControl.ensureReady()) - .catch((error) => { - userLogger.error( - "[Application] Failed to refresh admin lists after login:", - error, - ); - throw error; - }) - : null; - - const profileStatePromise = Promise.resolve(postLoginPromise) - .then(async (postLogin) => { - // 1. Relays and Profile are now loaded (sequentially or efficiently by authService) - const nextProfile = postLogin?.profile || cachedProfile; - if (activePubkey && nextProfile) { - this.updateActiveProfileUI(activePubkey, nextProfile); + const activePubkey = detail?.pubkey || this.pubkey; + postLoginPromise + .then((postLogin) => { + if (activePubkey && postLogin?.profile) { + this.updateActiveProfileUI(activePubkey, postLogin.profile); } this.forceRefreshAllProfiles(); - this.updateAuthLoadingState({ - profile: nextProfile ? "ready" : "error", - }); - return postLogin; }) .catch((error) => { devLogger.error("Post-login hydration failed:", error); - this.updateAuthLoadingState({ profile: "error" }); - return null; }); - // Chain list loading to profile state to ensure relays are loaded first. - const listStatePromise = profileStatePromise.then(() => { - const tasks = []; - if (activePubkey && typeof this.authService.loadBlocksForPubkey === "function") { - tasks.push( - this.authService - .loadBlocksForPubkey(activePubkey, { allowPermissionPrompt: false }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to load blocks during login:", - error, - ); - throw error; - }), - ); - } + let postLoginResult = null; + try { + postLoginResult = await postLoginPromise; + } catch (error) { + devLogger.error("Post-login processing failed:", error); + } - if ( - activePubkey && - subscriptions && - typeof subscriptions.ensureLoaded === "function" - ) { - tasks.push( - subscriptions.ensureLoaded(activePubkey, { - allowPermissionPrompt: false, - }) - .then(() => { - this.capturePermissionPromptFromError( - subscriptions?.lastLoadError, - ); - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to load subscriptions during login:", - error, - ); - this.capturePermissionPromptFromError(error); - throw error; - }), - ); - } + await nwcPromise; + // We do not await hashtagPreferencesPromise here; it loads in the background. - if (!tasks.length) { - this.updateAuthLoadingState({ lists: "idle" }); - return Promise.resolve(true); - } - - return Promise.allSettled(tasks).then((results) => { - const success = results.every( - (result) => result.status === "fulfilled", - ); - this.updateAuthLoadingState({ - lists: success ? "ready" : "error", - }); - return success; - }); - }); - - const dmStatePromise = profileStatePromise.then(() => { - if ( - activePubkey && - this.nostrService && - typeof this.nostrService.loadDirectMessages === "function" - ) { - return this.nostrService - .loadDirectMessages({ - actorPubkey: activePubkey, - limit: 50, - initialLoad: true, - }) - .then(() => { - this.updateAuthLoadingState({ dms: "ready" }); - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to load direct messages during login:", - error, - ); - this.updateAuthLoadingState({ dms: "error" }); - }); - } - this.updateAuthLoadingState({ dms: "idle" }); - return Promise.resolve(); - }); - - const nwcPromise = profileStatePromise.then(() => { - if ( - activePubkey && - this.nwcSettingsService && - typeof this.nwcSettingsService.hydrateNwcSettingsForPubkey === "function" - ) { - return this.nwcSettingsService - .hydrateNwcSettingsForPubkey(activePubkey) - .catch((error) => { - devLogger.warn( - "[Application] Failed to hydrate NWC settings during login:", - error, - ); - }); - } - return Promise.resolve(); - }); - - const hashtagPreferencesPromise = profileStatePromise.then(() => { - if ( - activePubkey && - this.hashtagPreferences && - typeof this.hashtagPreferences.load === "function" - ) { - return this.hashtagPreferences - .load(activePubkey, { - allowPermissionPrompt: false, - }) - .then(() => { - this.capturePermissionPromptFromError( - this.hashtagPreferences?.lastLoadError, - ); - }) - .catch((error) => { - devLogger.warn( - "[Application] Failed to load hashtag preferences during login:", - error, - ); - this.capturePermissionPromptFromError(error); - }); - } - return Promise.resolve(); - }); - - void Promise.allSettled([ - profileStatePromise, - listStatePromise, - dmStatePromise, - ]); - void nwcPromise; - void hashtagPreferencesPromise; + try { + await accessControl.ensureReady(); + } catch (error) { + userLogger.error( + "[Application] Failed to refresh admin lists after login:", + error, + ); + } if (activePubkey) { - const seedBlacklist = () => { - const aggregatedBlacklist = accessControl.getBlacklist(); - return userBlocks.seedWithNpubs( - activePubkey, - Array.isArray(aggregatedBlacklist) ? aggregatedBlacklist : [], - ); - }; + const aggregatedBlacklist = accessControl.getBlacklist(); // Background the seeding process because it involves publishing events, // which can block the login flow significantly. - Promise.resolve(accessControlReadyPromise) - .catch(() => null) - .then(() => seedBlacklist()) + userBlocks + .seedWithNpubs( + activePubkey, + Array.isArray(aggregatedBlacklist) ? aggregatedBlacklist : [] + ) .catch((error) => { if ( error?.code === "extension-permission-denied" || @@ -4566,17 +4300,38 @@ class Application { ) { userLogger.error( "[Application] Failed to seed shared block list after login:", - error, + error ); } else { devLogger.error( "[Application] Unexpected error while seeding shared block list:", - error, + error ); } }); - // Subscriptions are loaded in list tasks to align with per-category loading states. + // Attempt to load blocks with a short timeout so we don't block the UI forever. + // If it times out, the UI will refresh reactively when the data arrives. + const blockLoadPromise = userBlocks.ensureLoaded(activePubkey); + const blockLoadTimeout = new Promise((resolve) => + setTimeout(resolve, 2000) + ); + try { + await Promise.race([blockLoadPromise, blockLoadTimeout]); + } catch (error) { + devLogger.warn( + "[Application] Block list load timed out or failed:", + error + ); + } + + // Load subscriptions in the background to avoid blocking the main feed. + subscriptions.ensureLoaded(activePubkey).catch((error) => { + devLogger.warn( + "[Application] Failed to load subscriptions during login:", + error + ); + }); } try { @@ -4585,103 +4340,22 @@ class Application { devLogger.warn("Failed to reinitialize video list view after login:", error); } - this.lastIdentityRefreshPromise = this.refreshAllVideoGrids({ - reason: "auth-login", - forceMainReload: true, - }); - this.lastIdentityRefreshPromise - .catch((error) => { - devLogger.error("Failed to refresh video grids after login:", error); - }) - .finally(() => { - this.lastIdentityRefreshPromise = null; + try { + this.lastIdentityRefreshPromise = this.refreshAllVideoGrids({ + reason: "auth-login", + forceMainReload: true, }); + await this.lastIdentityRefreshPromise; + } catch (error) { + devLogger.error("Failed to refresh video grids after login:", error); + } finally { + this.lastIdentityRefreshPromise = null; + } this.forceRefreshAllProfiles(); if (this.uploadModal?.refreshCloudflareBucketPreview) { - Promise.resolve() - .then(() => this.uploadModal.refreshCloudflareBucketPreview()) - .catch((error) => { - devLogger.warn( - "[Application] Failed to refresh cloudflare bucket preview after login:", - error, - ); - }); - } - } - - handleBlocksLoaded(detail = {}) { - if (detail?.blocksLoaded !== true) { - return; - } - - if (this.profileController) { - try { - this.profileController.populateBlockedList(); - } catch (error) { - devLogger.warn( - "[Application] Failed to refresh blocked list after blocks loaded:", - error, - ); - } - } - - try { - void this.onVideosShouldRefresh({ reason: "blocks-loaded" }); - } catch (error) { - devLogger.warn( - "[Application] Failed to refresh videos after blocks loaded:", - error, - ); - } - } - - handleRelaysLoaded(detail = {}) { - if (detail?.relaysLoaded !== true) { - return; - } - - this.scheduleRelayUiRefresh(); - } - - scheduleRelayUiRefresh() { - if (this.relayUiRefreshTimeout) { - return; - } - - const scheduleTimeout = - typeof window !== "undefined" && typeof window.setTimeout === "function" - ? window.setTimeout.bind(window) - : setTimeout; - - this.relayUiRefreshTimeout = scheduleTimeout(() => { - this.relayUiRefreshTimeout = null; - this.flushRelayUiRefresh(); - }, RELAY_UI_BATCH_DELAY_MS); - } - - flushRelayUiRefresh() { - if (!this.profileController) { - return; - } - - try { - this.profileController.populateProfileRelays(); - } catch (error) { - devLogger.warn( - "[Application] Failed to refresh profile relays after relays loaded:", - error, - ); - } - - try { - void this.profileController.refreshDmRelayPreferences({ force: true }); - } catch (error) { - devLogger.warn( - "[Application] Failed to refresh DM relay preferences after relays loaded:", - error, - ); + await this.uploadModal.refreshCloudflareBucketPreview(); } } @@ -4717,8 +4391,6 @@ class Application { this.pendingModalZapOpen = false; this.resetHashtagPreferencesState(); - this.resetPermissionPromptState(); - this.updateAuthLoadingState({ profile: "idle", lists: "idle", dms: "idle" }); await this.nwcSettingsService.onLogout({ pubkey: detail?.pubkey || this.pubkey, @@ -4795,22 +4467,6 @@ class Application { } } - if (typeof this.nostrService?.stopDirectMessageSubscription === "function") { - try { - this.nostrService.stopDirectMessageSubscription(); - } catch (error) { - devLogger.warn("Failed to stop DM subscription during logout:", error); - } - } - - if (typeof this.nostrService?.clearDirectMessages === "function") { - try { - this.nostrService.clearDirectMessages({ emit: true }); - } catch (error) { - devLogger.warn("Failed to clear cached DMs during logout:", error); - } - } - if (typeof this.nostrService?.clearVideoSubscription === "function") { try { this.nostrService.clearVideoSubscription(); @@ -5043,81 +4699,11 @@ class Application { } clearActiveIntervals() { - if (Array.isArray(this.activeIntervals)) { - this.activeIntervals.forEach((id) => clearInterval(id)); + if (!Array.isArray(this.activeIntervals) || !this.activeIntervals.length) { + return; } + this.activeIntervals.forEach((id) => clearInterval(id)); this.activeIntervals = []; - this.torrentStatusIntervalId = null; - } - - cacheTorrentStatusNodes() { - const doc = - (this.videoModal && this.videoModal.document) || - (typeof document !== "undefined" ? document : null); - if (!doc || typeof doc.getElementById !== "function") { - this.torrentStatusNodes = null; - return; - } - this.torrentStatusNodes = { - status: doc.getElementById("status"), - progress: doc.getElementById("progress"), - peers: doc.getElementById("peers"), - speed: doc.getElementById("speed"), - downloaded: doc.getElementById("downloaded"), - }; - } - - clearTorrentStatusNodes() { - this.torrentStatusNodes = null; - } - - removeActiveInterval(intervalId) { - if (!intervalId || !Array.isArray(this.activeIntervals)) { - return; - } - this.activeIntervals = this.activeIntervals.filter((id) => id !== intervalId); - } - - addTorrentStatusVisibilityHandlers({ onPause, onResume, onClose } = {}) { - this.removeTorrentStatusVisibilityHandlers(); - const handleVisibilityChange = () => { - if (!document.body.contains(this.modalVideo)) { - if (typeof onClose === "function") { - onClose(); - } - this.removeTorrentStatusVisibilityHandlers(); - return; - } - if (document.visibilityState === "hidden") { - if (typeof onPause === "function") { - onPause(); - } - return; - } - if (typeof onResume === "function") { - onResume(); - } - }; - const handlePageHide = () => { - if (typeof onPause === "function") { - onPause(); - } - }; - this.torrentStatusVisibilityHandler = handleVisibilityChange; - this.torrentStatusPageHideHandler = handlePageHide; - document.addEventListener("visibilitychange", handleVisibilityChange); - window.addEventListener("pagehide", handlePageHide); - } - - removeTorrentStatusVisibilityHandlers() { - if (this.torrentStatusVisibilityHandler) { - document.removeEventListener("visibilitychange", this.torrentStatusVisibilityHandler); - this.torrentStatusVisibilityHandler = null; - } - if (this.torrentStatusPageHideHandler) { - window.removeEventListener("pagehide", this.torrentStatusPageHideHandler); - this.torrentStatusPageHideHandler = null; - } } cancelPendingViewLogging() { @@ -5623,16 +5209,25 @@ class Application { return; } - this.cacheTorrentStatusNodes(); - - const updateMirrorStatus = () => { + const updateInterval = setInterval(() => { if (!document.body.contains(this.modalVideo)) { - this.stopTorrentStatusInterval(); - this.removeTorrentStatusVisibilityHandlers(); + clearInterval(updateInterval); return; } this.updateTorrentStatus(torrentInstance); - const { status, progress, peers, speed, downloaded } = this.torrentStatusNodes || {}; + }, 3000); + this.activeIntervals.push(updateInterval); + + const mirrorInterval = setInterval(() => { + if (!document.body.contains(this.modalVideo)) { + clearInterval(mirrorInterval); + return; + } + const status = document.getElementById("status"); + const progress = document.getElementById("progress"); + const peers = document.getElementById("peers"); + const speed = document.getElementById("speed"); + const downloaded = document.getElementById("downloaded"); if (this.videoModal) { if (status) { this.videoModal.updateStatus(status.textContent); @@ -5660,37 +5255,8 @@ class Application { this.videoModal.updateDownloaded(downloaded.textContent); } } - }; - - this.stopTorrentStatusInterval(); - this.startTorrentStatusInterval(updateMirrorStatus); - - this.addTorrentStatusVisibilityHandlers({ - onPause: () => this.stopTorrentStatusInterval(), - onResume: () => this.startTorrentStatusInterval(updateMirrorStatus), - onClose: () => this.stopTorrentStatusInterval(), - }); - } - - startTorrentStatusInterval(callback) { - if (this.torrentStatusIntervalId) { - return; - } - if (document.visibilityState === "hidden") { - return; - } - const intervalId = setInterval(callback, 3000); - this.torrentStatusIntervalId = intervalId; - this.activeIntervals.push(intervalId); - } - - stopTorrentStatusInterval() { - if (!this.torrentStatusIntervalId) { - return; - } - clearInterval(this.torrentStatusIntervalId); - this.removeActiveInterval(this.torrentStatusIntervalId); - this.torrentStatusIntervalId = null; + }, 3000); + this.activeIntervals.push(mirrorInterval); } /** @@ -5700,7 +5266,6 @@ class Application { // 1) Clear timers/listeners immediately so playback stats stop updating this.cancelPendingViewLogging(); this.clearActiveIntervals(); - this.removeTorrentStatusVisibilityHandlers(); this.teardownModalViewCountSubscription(); if (this.reactionController) { this.reactionController.unsubscribe(); @@ -5745,7 +5310,6 @@ class Application { this.lastModalTrigger = null; this.currentMagnetUri = null; - this.clearTorrentStatusNodes(); // 3) Kick off heavy cleanup work asynchronously. We still await it so // callers that depend on teardown finishing behave the same, but the @@ -6724,41 +6288,6 @@ class Application { }); } - checkRelayHealthWarning() { - if (!nostrClient || typeof nostrClient.getHealthyRelays !== "function") { - return false; - } - - // Give the app a grace period to establish initial connections before complaining. - const now = Date.now(); - const GRACE_PERIOD_MS = 10000; - if (now - (this.appStartedAt || now) < GRACE_PERIOD_MS) { - return false; - } - - const relayCandidates = Array.isArray(nostrClient.relays) ? nostrClient.relays : []; - if (!relayCandidates.length) { - return false; - } - - const healthyRelays = nostrClient.getHealthyRelays(relayCandidates); - if (healthyRelays.length) { - return false; - } - - const cooldownMs = 30000; - if (now - (this.lastRelayHealthWarningAt || 0) < cooldownMs) { - return true; - } - - this.lastRelayHealthWarningAt = now; - this.showStatus( - "All configured relays are unhealthy. Data may be missing until a relay reconnects.", - { autoHideMs: 12000, showSpinner: false }, - ); - return true; - } - /** * Subscribe to videos (older + new) and render them as they come in. */ @@ -6778,7 +6307,6 @@ class Application { this.loadVideosPromise = (async () => { devLogger.log("Starting loadVideos... (forceFetch =", forceFetch, ")"); this.setFeedTelemetryContext("recent"); - this.checkRelayHealthWarning(); const container = this.mountVideoListView(); const hasCachedVideos = @@ -6834,7 +6362,6 @@ class Application { async loadForYouVideos(forceFetch = false) { devLogger.log("Starting loadForYouVideos... (forceFetch =", forceFetch, ")"); this.setFeedTelemetryContext("for-you"); - this.checkRelayHealthWarning(); const container = this.mountVideoListView({ includeTags: false }); const hasCachedVideos = @@ -7981,17 +7508,139 @@ class Application { return true; } - requestVideoSettingsMenu(detail = {}) { - if (this.videoSettingsMenuController) { - this.videoSettingsMenuController.requestMenu(detail); + ensureSettingsPopover(detail = {}) { + const trigger = detail.trigger || null; + if (!trigger) { + return null; } + + let entry = this.videoSettingsPopovers.get(trigger); + if (!entry) { + entry = { + trigger, + context: { + card: detail.card || null, + video: detail.video || null, + index: Number.isFinite(detail.index) ? Math.floor(detail.index) : 0, + capabilities: detail.capabilities || {}, + restoreFocusOnClose: detail.restoreFocus !== false, + }, + popover: null, + }; + + const render = ({ document: documentRef, close }) => { + const panel = createVideoSettingsMenuPanel({ + document: documentRef, + video: entry.context.video, + index: entry.context.index, + capabilities: entry.context.capabilities, + designSystem: this.designSystemContext, + }); + + if (!panel) { + return null; + } + + const buttons = panel.querySelectorAll("button[data-action]"); + buttons.forEach((button) => { + button.addEventListener("click", (event) => { + event.preventDefault(); + event.stopPropagation(); + + const action = button.dataset.action || ""; + const handled = entry.context.card?.handleSettingsMenuAction?.( + action, + { event }, + ); + + if (!handled && this.isDevMode) { + userLogger.warn(`[SettingsMenu] Unhandled action: ${action}`); + } + + close(); + }); + }); + + return panel; + }; + + const documentRef = + trigger.ownerDocument || + (typeof document !== "undefined" ? document : null); + + const popover = createPopover(trigger, render, { + document: documentRef, + placement: "bottom-end", + }); + + const originalDestroy = popover.destroy?.bind(popover); + if (typeof originalDestroy === "function") { + popover.destroy = (...args) => { + originalDestroy(...args); + if (this.videoSettingsPopovers.get(trigger) === entry) { + this.videoSettingsPopovers.delete(trigger); + } + }; + } + + entry.popover = popover; + this.videoSettingsPopovers.set(trigger, entry); + } + + entry.context = { + ...entry.context, + card: detail.card || entry.context.card, + video: detail.video || entry.context.video, + index: Number.isFinite(detail.index) + ? Math.floor(detail.index) + : entry.context.index, + capabilities: detail.capabilities || entry.context.capabilities, + restoreFocusOnClose: detail.restoreFocus !== false, + }; + + return entry; + } + + requestVideoSettingsMenu(detail = {}) { + const entry = this.ensureSettingsPopover(detail); + if (!entry?.popover) { + return; + } + + if (typeof entry.popover.isOpen === "function" && entry.popover.isOpen()) { + entry.popover.close({ + restoreFocus: entry.context.restoreFocusOnClose !== false, + }); + return; + } + + entry.popover + .open() + .catch((error) => + userLogger.error("[SettingsMenu] Failed to open popover:", error), + ); } closeVideoSettingsMenu(detail = {}) { - if (this.videoSettingsMenuController) { - return this.videoSettingsMenuController.closeMenu(detail); + const trigger = detail.trigger || null; + const restoreFocus = detail.restoreFocus !== false; + + if (trigger) { + const entry = this.videoSettingsPopovers.get(trigger); + if (entry?.popover && typeof entry.popover.close === "function") { + return entry.popover.close({ restoreFocus }); + } + return false; } - return false; + + let closed = false; + this.videoSettingsPopovers.forEach((entry) => { + if (entry?.popover && typeof entry.popover.close === "function") { + const result = entry.popover.close({ restoreFocus }); + closed = closed || result; + } + }); + return closed; } ensureTagPreferencePopover(detail) { @@ -8401,23 +8050,7 @@ class Application { } async probeUrl(url, options = {}) { - const trimmed = typeof url === "string" ? url.trim() : ""; - if (!trimmed) { - return this.urlHealthController.probeUrl(url, options); - } - const existing = this.urlProbePromises.get(trimmed); - if (existing) { - return existing; - } - const probePromise = (async () => { - try { - return await this.urlHealthController.probeUrl(trimmed, options); - } finally { - this.urlProbePromises.delete(trimmed); - } - })(); - this.urlProbePromises.set(trimmed, probePromise); - return probePromise; + return this.urlHealthController.probeUrl(url, options); } async playHttp(videoEl, url) { @@ -9759,43 +9392,45 @@ class Application { Array.isArray(nostrClient?.relays) && nostrClient.relays.length ? nostrClient.relays : null; - if (!relayList) { + if (!relayList || !nostrClient?.pool || typeof nostrClient.pool.list !== "function") { return; } - const profileEntry = await fetchProfileMetadata(normalized, { - nostr: nostrClient, - relays: relayList, - logger: devLogger, - }); + const events = await nostrClient.pool.list(relayList, [ + { kinds: [0], authors: [normalized], limit: 1 }, + ]); if (this.modalCreatorProfileRequestToken !== requestToken) { return; } - if (!profileEntry?.event) { + const newest = Array.isArray(events) + ? events.reduce((latest, event) => { + if (!event || typeof event !== "object") { + return latest; + } + const eventPubkey = this.normalizeHexPubkey(event.pubkey); + if (eventPubkey && eventPubkey !== normalized) { + return latest; + } + const createdAt = Number.isFinite(event.created_at) ? event.created_at : 0; + if (!latest || createdAt > latest.createdAt) { + return { createdAt, event }; + } + return latest; + }, null) + : null; + + if (!newest || !newest.event) { if (this.modalCreatorProfileRequestToken === requestToken) { this.modalCreatorProfileRequestToken = null; } return; } - ensureProfileMetadataSubscription({ - pubkey: normalized, - nostr: nostrClient, - relays: relayList, - onProfile: ({ profile }) => { - if (typeof this.setProfileCacheEntry === "function" && profile) { - this.setProfileCacheEntry(normalized, profile); - } - }, - }); - let parsed = null; try { - parsed = profileEntry.event.content - ? JSON.parse(profileEntry.event.content) - : null; + parsed = newest.event.content ? JSON.parse(newest.event.content) : null; } catch (error) { devLogger.warn( `[Application] Failed to parse creator profile content for ${normalized}:`, @@ -10218,6 +9853,7 @@ class Application { destroy() { this.clearActiveIntervals(); this.teardownModalViewCountSubscription(); + this.videoModalReadyPromise = null; if (this.moderationActionController) { try { @@ -10403,11 +10039,6 @@ class Application { this.moreMenuController = null; } - if (this.videoSettingsMenuController) { - this.videoSettingsMenuController.destroy(); - this.videoSettingsMenuController = null; - } - if (this.profileController) { if (typeof this.profileController.destroy === "function") { try { diff --git a/dist/js/channelProfile.js b/dist/js/channelProfile.js index 83cf0913..554fdb2b 100644 --- a/dist/js/channelProfile.js +++ b/dist/js/channelProfile.js @@ -16,10 +16,6 @@ import { createChannelProfileMenuPanel } from "./ui/components/videoMenuRenderer import { ALLOW_NSFW_CONTENT } from "./config.js"; import { sanitizeProfileMediaUrl } from "./utils/profileMedia.js"; import moderationService from "./services/moderationService.js"; -import { - fetchProfileMetadata, - ensureProfileMetadataSubscription, -} from "./services/profileMetadataService.js"; import { createModerationStage } from "./feedEngine/stages.js"; import { DEFAULT_AUTOPLAY_BLOCK_THRESHOLD, @@ -2799,23 +2795,13 @@ async function runZapAttempt({ amount, overrideFee = null, walletSettings }) { }); const videoEvent = getZapVideoEvent(); - let previousOverride; - const hasGlobal = typeof globalThis !== "undefined"; - if ( - hasGlobal && - typeof overrideFee === "number" && - Number.isFinite(overrideFee) - ) { - previousOverride = globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__; - globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__ = overrideFee; - } - try { const result = await splitAndZap( { videoEvent, amountSats: context.shares.total, - walletSettings: settings + walletSettings: settings, + overrideFee }, dependencies ); @@ -2836,21 +2822,6 @@ async function runZapAttempt({ amount, overrideFee = null, walletSettings }) { error ); throw error; - } finally { - if ( - hasGlobal && - typeof overrideFee === "number" && - Number.isFinite(overrideFee) - ) { - if (typeof previousOverride === "number") { - globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__ = previousOverride; - } else if ( - globalThis && - "__BITVID_PLATFORM_FEE_OVERRIDE__" in globalThis - ) { - delete globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__; - } - } } } @@ -2877,25 +2848,37 @@ async function executePendingRetry({ walletSettings }) { const aggregatedReceipts = []; const aggregatedTracker = []; + const nextRetryShares = []; + let lastError = null; - for (const share of shares) { - const overrideFee = share.type === "platform" ? 100 : 0; - try { - const attempt = await runZapAttempt({ + const results = await Promise.allSettled( + shares.map((share) => { + const overrideFee = share.type === "platform" ? 100 : 0; + return runZapAttempt({ amount: share.amount, overrideFee, walletSettings }); + }) + ); + + for (let i = 0; i < results.length; i++) { + const result = results[i]; + const share = shares[i]; + + if (result.status === "fulfilled") { + const attempt = result.value; if (!attempt) { - setZapStatus("", "neutral"); - return; + continue; } if (attempt?.result?.receipts) { aggregatedReceipts.push(...attempt.result.receipts); } else if (Array.isArray(attempt?.shareTracker)) { aggregatedTracker.push(...attempt.shareTracker); } - } catch (error) { + } else { + const error = result.reason; + lastError = error; const tracker = Array.isArray(error?.__zapShareTracker) ? error.__zapShareTracker : []; @@ -2916,20 +2899,28 @@ async function executePendingRetry({ walletSettings }) { const failureShares = tracker.filter( (entry) => entry && entry.status !== "success" && entry.amount > 0 ); - markZapRetryPending(failureShares.length ? failureShares : [share]); - const message = error?.message || "Retry failed."; - setZapStatus(message, "error"); - app?.showError?.(message); - renderZapReceipts( - aggregatedTracker.length ? aggregatedTracker : tracker, - { - partial: true - } - ); - return; + if (failureShares.length) { + nextRetryShares.push(...failureShares); + } else { + nextRetryShares.push(share); + } } } + if (nextRetryShares.length > 0) { + markZapRetryPending(nextRetryShares); + const message = lastError?.message || "Retry failed."; + setZapStatus(message, "error"); + app?.showError?.(message); + renderZapReceipts( + aggregatedTracker.length ? aggregatedTracker : [], + { + partial: true + } + ); + return; + } + renderZapReceipts( aggregatedReceipts.length ? aggregatedReceipts : aggregatedTracker, { partial: false } @@ -5103,20 +5094,31 @@ async function fetchChannelProfileFromRelays(pubkey) { } try { - const profileEntry = await fetchProfileMetadata(pubkey, { - nostr: nostrClient, - relays: relayUrls, - logger: devLogger, - }); + const events = await pool.list(relayUrls, [ + { kinds: [0], authors: [pubkey], limit: 1 } + ]); - if (!profileEntry) { - return { event: null, profile: {} }; + let newestEvent = null; + for (const event of Array.isArray(events) ? events : []) { + if (!event || !event.content) { + continue; + } + if (!newestEvent || event.created_at > newestEvent.created_at) { + newestEvent = event; + } } - return { - event: profileEntry.event || null, - profile: profileEntry.profile || {}, - }; + if (newestEvent?.content) { + try { + const meta = JSON.parse(newestEvent.content); + return { event: newestEvent, profile: meta }; + } catch (error) { + userLogger.warn("Failed to parse channel metadata payload:", error); + return { event: newestEvent, profile: {} }; + } + } + + return { event: newestEvent, profile: {} }; } catch (error) { throw error; } @@ -5206,23 +5208,6 @@ async function loadUserProfile(pubkey) { npub: currentChannelNpub, loadToken }); - - ensureProfileMetadataSubscription({ - pubkey, - nostr: nostrClient, - onProfile: ({ profile, event }) => { - if (loadToken !== currentProfileLoadToken) { - return; - } - applyChannelProfileMetadata({ - profile, - event, - pubkey, - npub: currentChannelNpub, - loadToken, - }); - }, - }); } catch (error) { if (loadToken === currentProfileLoadToken) { userLogger.error("Failed to fetch user profile data:", error); diff --git a/dist/js/config.js b/dist/js/config.js index d8c31343..73d5fe76 100644 --- a/dist/js/config.js +++ b/dist/js/config.js @@ -47,39 +47,10 @@ import { export const WATCH_HISTORY_VERSION_TAG_VALUE = "2"; -const runtimeScope = typeof globalThis === "undefined" ? null : globalThis; - -const parseBooleanOverride = (value) => { - if (typeof value === "boolean") { - return value; - } - if (typeof value === "string") { - const normalized = value.trim().toLowerCase(); - if (normalized === "true") { - return true; - } - if (normalized === "false") { - return false; - } - } - return null; -}; - -const devModeOverride = parseBooleanOverride( - runtimeScope?.__BITVID_DEV_MODE_OVERRIDE__ -); -const verboseDevModeOverride = parseBooleanOverride( - runtimeScope?.__BITVID_VERBOSE_DEV_MODE_OVERRIDE__ -); - -export const isDevMode = - devModeOverride === null ? Boolean(IS_DEV_MODE) : devModeOverride; +export const isDevMode = Boolean(IS_DEV_MODE); export { IS_DEV_MODE }; -export const isVerboseDevMode = - verboseDevModeOverride === null - ? Boolean(IS_VERBOSE_DEV_MODE) - : verboseDevModeOverride; +export const isVerboseDevMode = Boolean(IS_VERBOSE_DEV_MODE); export { IS_VERBOSE_DEV_MODE }; export const isLockdownMode = Boolean(IS_LOCKDOWN_MODE); diff --git a/dist/js/embed.js b/dist/js/embed.js index ed785957..9cdcbec3 100644 --- a/dist/js/embed.js +++ b/dist/js/embed.js @@ -1,7 +1,6 @@ import Application from "./app.js"; import { nostrClient } from "./nostrClientFacade.js"; import { convertEventToVideo, getDTagValueFromTags } from "./nostr/index.js"; -import { sanitizeRelayList } from "./nostr/nip46Client.js"; import { resolveVideoPointer } from "./utils/videoPointer.js"; import { devLogger, userLogger } from "./utils/logger.js"; import { nostrToolsReady } from "./nostrToolsBootstrap.js"; @@ -181,7 +180,13 @@ const buildRelayList = (relays) => { ...(Array.isArray(nostrClient.relays) ? nostrClient.relays : []), ]; - const result = sanitizeRelayList(combined); + const result = Array.from( + new Set( + combined + .map((relay) => (typeof relay === "string" ? relay.trim() : "")) + .filter(Boolean) + ) + ); diag?.emit("relay-list", { relays: result }); return result; }; diff --git a/dist/js/feedEngine/stages.js b/dist/js/feedEngine/stages.js index ffd7fc18..892be012 100644 --- a/dist/js/feedEngine/stages.js +++ b/dist/js/feedEngine/stages.js @@ -261,11 +261,10 @@ export function createResolvePostedAtStage({ }); } - for (const task of tasks) { - try { - await task(); - } catch (error) { - context?.log?.(`[${stageName}] resolution task failed`, error); + const results = await Promise.allSettled(tasks.map((task) => task())); + for (const result of results) { + if (result.status === "rejected") { + context?.log?.(`[${stageName}] resolution task failed`, result.reason); } } diff --git a/dist/js/magnets.js b/dist/js/magnets.js index 56cb3b94..c280014d 100644 --- a/dist/js/magnets.js +++ b/dist/js/magnets.js @@ -49,36 +49,14 @@ export function trackersFromMagnet(magnet) { return Array.from(deduped); } -export function webSeedsFromMagnet(magnet) { - if (typeof magnet !== "string") { - return []; - } - const parsed = parseMagnetLite(magnet); - if (!parsed || !Array.isArray(parsed.ws)) { - return []; - } - const deduped = new Set(); - parsed.ws.forEach((url) => { - if (typeof url !== "string") { - return; - } - const trimmed = url.trim(); - if (!trimmed) { - return; - } - deduped.add(trimmed); - }); - return Array.from(deduped); -} - function parseMagnetLite(magnet) { if (typeof magnet !== "string") { - return { infoHash: "", announce: [], ws: [] }; + return { infoHash: "", announce: [] }; } const trimmed = magnet.trim(); if (!trimmed) { - return { infoHash: "", announce: [], ws: [] }; + return { infoHash: "", announce: [] }; } const lower = trimmed.toLowerCase(); @@ -86,7 +64,6 @@ function parseMagnetLite(magnet) { const paramsPart = queryIndex >= 0 ? trimmed.slice(queryIndex + 1) : ""; const params = paramsPart.split("&"); const announce = []; - const ws = []; let infoHash = ""; for (const param of params) { @@ -112,12 +89,8 @@ function parseMagnetLite(magnet) { if (value) { announce.push(value); } - } else if (key === "ws" || key === "webseed") { - if (value) { - ws.push(value); - } } } - return { infoHash, announce, ws }; + return { infoHash, announce }; } diff --git a/dist/js/nostr/adapters/nip07Adapter.js b/dist/js/nostr/adapters/nip07Adapter.js index 37bf5068..0c52dd4b 100644 --- a/dist/js/nostr/adapters/nip07Adapter.js +++ b/dist/js/nostr/adapters/nip07Adapter.js @@ -42,7 +42,7 @@ function resolveNip44Module(extension) { return nip44; } -export async function createNip07Adapter(initialExtension, { preloadedPubkey } = {}) { +export async function createNip07Adapter(initialExtension) { const getExtension = () => { if (typeof window !== "undefined" && window.nostr) { return window.nostr; @@ -86,10 +86,15 @@ export async function createNip07Adapter(initialExtension, { preloadedPubkey } = }; const pubkey = - preloadedPubkey || - (typeof bootstrapExtension.getPublicKey === "function" + typeof bootstrapExtension.getPublicKey === "function" ? normalizeActorKey(await getPublicKey()) - : ""); + : ""; + + const hasNip04 = + bootstrapExtension.nip04 && typeof bootstrapExtension.nip04 === "object"; + + const bootstrapNip44 = resolveNip44Module(bootstrapExtension); + const hasNip44 = !!bootstrapNip44; // Wrapper builders to ensure dynamic lookup at call time const createNip04Encrypt = () => (pubkey, plaintext, options = {}) => { @@ -201,29 +206,30 @@ export async function createNip07Adapter(initialExtension, { preloadedPubkey } = requestPermissions, destroy: async () => {}, canSign: () => typeof getExtension()?.signEvent === "function", - // Always expose these methods; they perform their own existence checks at runtime. - // This handles race conditions where NIP-04/44 APIs are injected lazily. - nip04Encrypt: createNip04Encrypt(), - nip04Decrypt: createNip04Decrypt(), - nip44Encrypt: createNip44Encrypt(), - nip44Decrypt: createNip44Decrypt(), + capabilities: { + sign: typeof bootstrapExtension.signEvent === "function", + nip44: hasNip44, + nip04: hasNip04, + }, }; - // Define capabilities as dynamic properties to reflect current extension state - Object.defineProperty(signer, "capabilities", { - get: () => { - const ext = getExtension(); - const hasNip04 = !!(ext?.nip04 && typeof ext.nip04 === "object"); - const hasNip44 = !!resolveNip44Module(ext); - return { - sign: typeof ext?.signEvent === "function", - nip44: hasNip44, - nip04: hasNip04, - }; - }, - enumerable: true, - configurable: true, - }); + if (hasNip04) { + if (typeof bootstrapExtension.nip04.encrypt === "function") { + signer.nip04Encrypt = createNip04Encrypt(); + } + if (typeof bootstrapExtension.nip04.decrypt === "function") { + signer.nip04Decrypt = createNip04Decrypt(); + } + } + + if (hasNip44) { + if (typeof bootstrapNip44.encrypt === "function") { + signer.nip44Encrypt = createNip44Encrypt(); + } + if (typeof bootstrapNip44.decrypt === "function") { + signer.nip44Decrypt = createNip44Decrypt(); + } + } return signer; } diff --git a/dist/js/nostr/client.js b/dist/js/nostr/client.js index 1ab71bac..019ef8a0 100644 --- a/dist/js/nostr/client.js +++ b/dist/js/nostr/client.js @@ -137,7 +137,6 @@ import { resolveDmRelaySelection, } from "../services/dmNostrService.js"; import { - DEFAULT_NIP07_CORE_METHODS, DEFAULT_NIP07_ENCRYPTION_METHODS, DEFAULT_NIP07_PERMISSION_METHODS, NIP07_PRIORITY, @@ -307,26 +306,24 @@ function resolveSignerCapabilities(signer) { return { sign: - (typeof capabilities.sign === "boolean" && capabilities.sign) || - typeof signer.signEvent === "function", + typeof capabilities.sign === "boolean" + ? capabilities.sign + : typeof signer.signEvent === "function", nip44: - (typeof capabilities.nip44 === "boolean" && capabilities.nip44) || - typeof signer.nip44Encrypt === "function" || - typeof signer.nip44Decrypt === "function", + typeof capabilities.nip44 === "boolean" + ? capabilities.nip44 + : typeof signer.nip44Encrypt === "function" || + typeof signer.nip44Decrypt === "function", nip04: - (typeof capabilities.nip04 === "boolean" && capabilities.nip04) || - typeof signer.nip04Encrypt === "function" || - typeof signer.nip04Decrypt === "function", + typeof capabilities.nip04 === "boolean" + ? capabilities.nip04 + : typeof signer.nip04Encrypt === "function" || + typeof signer.nip04Decrypt === "function", }; } function hydrateExtensionSignerCapabilities(signer) { - if (!signer || typeof signer !== "object") { - return; - } - - const signerType = typeof signer.type === "string" ? signer.type : ""; - if (signerType !== "extension" && signerType !== "nip07") { + if (!signer || typeof signer !== "object" || signer.type !== "extension") { return; } @@ -358,13 +355,7 @@ function setActiveSigner(signer) { hydrateExtensionSignerCapabilities(signer); attachNipMethodAliases(signer); - - const capsDescriptor = Object.getOwnPropertyDescriptor(signer, "capabilities"); - const isGetter = capsDescriptor && typeof capsDescriptor.get === "function"; - - if (!isGetter) { - signer.capabilities = resolveSignerCapabilities(signer); - } + signer.capabilities = resolveSignerCapabilities(signer); const pubkey = typeof signer.pubkey === "string" && signer.pubkey.trim() @@ -380,18 +371,6 @@ function setActiveSigner(signer) { function getActiveSigner() { const signer = getActiveSignerFromRegistry(); hydrateExtensionSignerCapabilities(signer); - attachNipMethodAliases(signer); - if (signer && typeof signer === "object") { - const capsDescriptor = Object.getOwnPropertyDescriptor( - signer, - "capabilities", - ); - const isGetter = capsDescriptor && typeof capsDescriptor.get === "function"; - - if (!isGetter) { - signer.capabilities = resolveSignerCapabilities(signer); - } - } return signer; } @@ -406,18 +385,6 @@ function logoutSigner(pubkey) { function resolveActiveSigner(pubkey) { const signer = resolveActiveSignerFromRegistry(pubkey); hydrateExtensionSignerCapabilities(signer); - attachNipMethodAliases(signer); - if (signer && typeof signer === "object") { - const capsDescriptor = Object.getOwnPropertyDescriptor( - signer, - "capabilities", - ); - const isGetter = capsDescriptor && typeof capsDescriptor.get === "function"; - - if (!isGetter) { - signer.capabilities = resolveSignerCapabilities(signer); - } - } return signer; } @@ -428,65 +395,6 @@ function shouldRequestExtensionPermissions(signer) { return signer.type === "extension"; } -const PERMISSION_STATUS_AUTO_HIDE_MS = 12_000; -const ENCRYPTION_METHOD_PREFIXES = ["nip04.", "nip44."]; - -function hasEncryptionPermissionMethods(methods) { - if (!Array.isArray(methods)) { - return false; - } - return methods.some((method) => - ENCRYPTION_METHOD_PREFIXES.some((prefix) => method.startsWith(prefix)), - ); -} - -function hasSigningPermissionMethods(methods) { - if (!Array.isArray(methods)) { - return false; - } - return methods.some( - (method) => method === "sign_event" || method === "get_public_key", - ); -} - -function resolvePermissionStatusMessage(methods, context) { - const normalizedContext = - typeof context === "string" ? context.trim().toLowerCase() : ""; - - if (normalizedContext === "dm") { - return "Approve the extension prompt to enable encrypted direct messages."; - } - if (normalizedContext === "lists") { - return "Approve the extension prompt to access your encrypted lists."; - } - - const includesEncryption = hasEncryptionPermissionMethods(methods); - const includesSigning = hasSigningPermissionMethods(methods); - - if (includesEncryption && includesSigning) { - return "Approve the extension prompt to enable signing and encrypted features (DMs, subscriptions, block lists)."; - } - if (includesEncryption) { - return "Approve the extension prompt to enable encrypted features like DMs and private lists."; - } - if (includesSigning) { - return "Approve the extension prompt to enable signing."; - } - - return "Approve the extension prompt to continue."; -} - -const RELAY_CONNECT_TIMEOUT_MS = 5000; -const RELAY_RECONNECT_BASE_DELAY_MS = 2000; -const RELAY_RECONNECT_MAX_DELAY_MS = 60000; -const RELAY_RECONNECT_MAX_ATTEMPTS = 5; -const RELAY_BACKOFF_BASE_DELAY_MS = 1000; -const RELAY_BACKOFF_MAX_DELAY_MS = 8000; -const RELAY_CIRCUIT_BREAKER_THRESHOLD = 3; -const RELAY_CIRCUIT_BREAKER_COOLDOWN_MS = 10 * 60 * 1000; -const RELAY_FAILURE_WINDOW_MS = 5 * 60 * 1000; -const RELAY_FAILURE_WINDOW_THRESHOLD = 3; -const RELAY_SUMMARY_LOG_INTERVAL_MS = 30000; const EVENTS_CACHE_STORAGE_KEY = "bitvid:eventsCache:v1"; // We use the policy TTL, but currently the storage backend is hardcoded to IDB (with localStorage fallback). // Future refactors should make EventsCacheStore dynamic based on CACHE_POLICIES[NOTE_TYPES.VIDEO_POST].storage. @@ -554,12 +462,6 @@ class EventsCacheStore { return typeof indexedDB !== "undefined"; } - /** - * Opens (or returns existing) connection to the IndexedDB database. - * Handles schema upgrades (creating object stores). - * - * @returns {Promise} The database instance or null if not supported. - */ async getDb() { if (!this.isSupported()) { return null; @@ -605,14 +507,6 @@ class EventsCacheStore { return `ts:${timestamp}`; } - /** - * Pre-loads fingerprints of all persisted items into memory. - * - * This is critical for the "Incremental Persistence" strategy. By knowing - * what is already on disk (via fingerprints), we can avoid writing unchanged records. - * - * @param {IDBDatabase} db - The database instance. - */ async ensureFingerprintsLoaded(db) { if (this.hasLoadedFingerprints || !db) { return; @@ -1077,8 +971,8 @@ function buildDmFilters(actorPubkey, { since, until, limit } = {}) { const normalizedSince = Number.isFinite(since) ? Math.floor(since) : undefined; const normalizedUntil = Number.isFinite(until) ? Math.floor(until) : undefined; - const baseFilterPayload = (kinds) => { - const payload = { kinds: Array.isArray(kinds) ? kinds : [kinds] }; + const baseFilterPayload = (kind) => { + const payload = { kinds: [kind] }; if (normalizedLimit !== undefined) { payload.limit = normalizedLimit; } @@ -1092,15 +986,20 @@ function buildDmFilters(actorPubkey, { since, until, limit } = {}) { }; if (normalizedActor) { - const authorFilter = baseFilterPayload(DM_EVENT_KINDS); + const authorFilter = baseFilterPayload(4); authorFilter.authors = [normalizedActor]; filters.push(authorFilter); - const directFilter = baseFilterPayload(DM_EVENT_KINDS); + const directFilter = baseFilterPayload(4); directFilter["#p"] = [normalizedActor]; filters.push(directFilter); + + const giftWrapFilter = baseFilterPayload(1059); + giftWrapFilter["#p"] = [normalizedActor]; + filters.push(giftWrapFilter); } else { - const fallbackFilter = baseFilterPayload(DM_EVENT_KINDS); + const fallbackFilter = baseFilterPayload(DM_EVENT_KINDS[0]); + fallbackFilter.kinds = DM_EVENT_KINDS.slice(); filters.push(fallbackFilter); } @@ -1187,8 +1086,6 @@ export class NostrClient { * - State tracking (allEvents, activeMap). * - Signer negotiation (NIP-07, NIP-46, local). * - Background caching with IndexedDB. - * - * For a detailed architectural overview, see `docs/nostr-client-overview.md`. */ constructor() { /** @@ -1364,13 +1261,6 @@ export class NostrClient { this.sessionActorCipherClosuresPrivateKey = null; this.countUnsupportedRelays = new Set(); this.unreachableRelays = new Set(); - this.relayBackoff = new Map(); - this.relayFailureCounts = new Map(); - this.relayFailureWindows = new Map(); - this.relayCircuitBreakers = new Map(); - this.relaySummaryLogTimestamps = new Map(); - this.relayReconnectTimer = null; - this.relayReconnectAttempt = 0; this.isInitialized = false; this.nip46Client = null; this.pendingHandshakeCancel = null; @@ -1411,11 +1301,6 @@ export class NostrClient { this.extensionPermissionCache = storedPermissions instanceof Set ? storedPermissions : new Set(); - this.extensionReady = false; - this.extensionPermissionsGranted = this.hasCachedExtensionPermissions( - DEFAULT_NIP07_PERMISSION_METHODS, - ); - this.extensionPermissionStatusHandler = null; } getStoredNip46Metadata() { @@ -2021,16 +1906,8 @@ export class NostrClient { const maxAttempts = 3; // Optimistic check: if window.nostr is already there, use it immediately. - if (this.extensionReady && typeof window !== "undefined") { - extension = window.nostr || null; - if (!extension) { - this.extensionReady = false; - } - } - - if (!extension && typeof window !== "undefined" && window.nostr) { + if (typeof window !== "undefined" && window.nostr) { extension = window.nostr; - this.extensionReady = true; } else { while (!extension && attempts < maxAttempts) { try { @@ -2038,7 +1915,6 @@ export class NostrClient { const timeout = attempts === 0 ? 1500 : 3000; await waitForNip07Extension(timeout); extension = window.nostr; - this.extensionReady = Boolean(extension); } catch (waitError) { devLogger.log( `Timed out waiting for extension injection (attempt ${ @@ -2079,8 +1955,7 @@ export class NostrClient { } const permissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_CORE_METHODS, - { context: "login", logMetrics: true, showStatus: false }, + DEFAULT_NIP07_PERMISSION_METHODS, ); if (!permissionResult.ok) { const denialMessage = @@ -2160,12 +2035,19 @@ export class NostrClient { } } - const adapter = await createNip07Adapter(extension, { - preloadedPubkey: pubkey, - }); + const adapter = await createNip07Adapter(extension); adapter.pubkey = pubkey; setActiveSigner(adapter); + this.ensureExtensionPermissions(DEFAULT_NIP07_PERMISSION_METHODS).catch( + (err) => { + userLogger.warn( + "[nostr] Extension permissions were not fully granted after login:", + err, + ); + }, + ); + return { pubkey, signer: adapter }; } @@ -2929,75 +2811,13 @@ export class NostrClient { // Ignore storage persistence issues in non-browser environments } } - - this.extensionPermissionsGranted = this.hasCachedExtensionPermissions( - DEFAULT_NIP07_PERMISSION_METHODS, - ); } - hasCachedExtensionPermissions(methods = DEFAULT_NIP07_PERMISSION_METHODS) { - if (!Array.isArray(methods)) { - return true; - } - - const normalized = methods - .map((method) => normalizePermissionMethod(method)) - .filter(Boolean); - - if (!normalized.length) { - return true; - } - - if (!this.extensionPermissionCache) { - return false; - } - - return normalized.every((method) => this.extensionPermissionCache.has(method)); - } - - setExtensionPermissionStatusHandler(handler) { - this.extensionPermissionStatusHandler = - typeof handler === "function" ? handler : null; - } - - emitExtensionPermissionStatus(status) { - if (typeof this.extensionPermissionStatusHandler !== "function") { - return; - } - - try { - this.extensionPermissionStatusHandler(status); - } catch (error) { - devLogger.warn( - "[nostr] Extension permission status handler threw:", - error, - ); - } - } - - warmupExtension() { - const extension = - typeof window !== "undefined" && window && window.nostr ? window.nostr : null; - this.extensionReady = Boolean(extension); - this.extensionPermissionsGranted = this.hasCachedExtensionPermissions( - DEFAULT_NIP07_PERMISSION_METHODS, - ); - return { - ready: this.extensionReady, - permissionsGranted: this.extensionPermissionsGranted, - }; - } - - async ensureExtensionPermissions( - methods = DEFAULT_NIP07_PERMISSION_METHODS, - options = {}, - ) { + async ensureExtensionPermissions(methods = DEFAULT_NIP07_PERMISSION_METHODS) { if (!Array.isArray(methods)) { methods = []; } - const config = options && typeof options === "object" ? options : {}; - const normalized = Array.from( new Set( methods @@ -3027,90 +2847,20 @@ export class NostrClient { return { ok: false, error: new Error("extension-unavailable") }; } } - this.extensionReady = - typeof window !== "undefined" && window && Boolean(window.nostr); - this.extensionPermissionsGranted = this.hasCachedExtensionPermissions( - DEFAULT_NIP07_PERMISSION_METHODS, - ); return { ok: true }; } const extension = typeof window !== "undefined" ? window.nostr : null; if (!extension) { - this.extensionReady = false; return { ok: false, error: new Error("extension-unavailable") }; } - this.extensionReady = true; - - const statusHandler = - typeof config.onStatus === "function" - ? config.onStatus - : this.extensionPermissionStatusHandler; - const shouldShowStatus = config.showStatus !== false; - const statusMessage = - typeof config.statusMessage === "string" && config.statusMessage.trim() - ? config.statusMessage.trim() - : resolvePermissionStatusMessage(normalized, config.context); - const statusAutoHideMs = Number.isFinite(config.autoHideMs) - ? config.autoHideMs - : PERMISSION_STATUS_AUTO_HIDE_MS; - const shouldShowSpinner = config.showSpinner !== false; - - if (statusHandler && shouldShowStatus && statusMessage) { - try { - statusHandler({ - phase: "permission", - state: "prompt", - context: - typeof config.context === "string" ? config.context.trim() : "", - message: statusMessage, - methods: outstanding.slice(), - autoHideMs: statusAutoHideMs, - showSpinner: shouldShowSpinner, - }); - } catch (error) { - devLogger.warn( - "[nostr] Failed to emit extension permission status:", - error, - ); - } - } - - const shouldLogMetrics = config.logMetrics === true; - const now = - typeof performance !== "undefined" && - typeof performance.now === "function" - ? () => performance.now() - : () => Date.now(); - const metricsStart = shouldLogMetrics ? now() : null; const enableResult = await requestEnablePermissions(extension, outstanding, { isDevMode, }); - if (shouldLogMetrics && metricsStart !== null) { - const metricsContext = - typeof config.metricsLabel === "string" && config.metricsLabel.trim() - ? config.metricsLabel.trim() - : typeof config.context === "string" && config.context.trim() - ? config.context.trim() - : "permissions"; - const durationMs = Math.max(0, Math.round(now() - metricsStart)); - userLogger.info( - `[nostr] extension.enable duration (${metricsContext})`, - { - durationMs, - requestedCount: outstanding.length, - ok: Boolean(enableResult?.ok), - }, - ); - } - if (enableResult?.ok) { this.markExtensionPermissions(outstanding); - this.extensionPermissionsGranted = this.hasCachedExtensionPermissions( - DEFAULT_NIP07_PERMISSION_METHODS, - ); return enableResult; } @@ -3179,19 +2929,11 @@ export class NostrClient { return existingSigner; } - // Optimization: Check if a signer was registered while we were waiting for the extension call - const raceWinner = resolveActiveSigner(extensionPubkey || normalizedPubkey); - if (raceWinner && typeof raceWinner.signEvent === "function") { - return raceWinner; - } - if (typeof extension.signEvent !== "function") { return existingSigner; } - const adapter = await createNip07Adapter(extension, { - preloadedPubkey: extensionPubkey, - }); + const adapter = await createNip07Adapter(extension); if (extensionPubkey) { adapter.pubkey = extensionPubkey; } @@ -3941,18 +3683,6 @@ export class NostrClient { return this.allEvents.size > 0; } - /** - * Restores application state from the best available local cache. - * - * 1. Attempts to load from `IndexedDB` (preferred). - * 2. Falls back to `localStorage` if IDB fails or is empty. - * 3. Rehydrates `allEvents`, `activeMap`, and `tombstones`. - * - * This implements the "Stale-While-Revalidate" pattern: the UI renders - * immediately with this data while network requests proceed in the background. - * - * @returns {Promise} True if data was successfully restored. - */ async restoreLocalData() { if (this.hasRestoredLocalData) { return this.allEvents.size > 0; @@ -4042,7 +3772,7 @@ export class NostrClient { * - Updates the `SyncMetadataStore` with the new max `created_at` on success. * * **Concurrency:** - * - Batches relay requests in chunks of 8 to avoid saturating network connections. + * - Batches relay requests in chunks of 4 to avoid saturating network connections. * * @param {object} params * @param {number} params.kind - The event kind to fetch (e.g. 10000 for mute list). @@ -4050,7 +3780,6 @@ export class NostrClient { * @param {string} [params.dTag] - Optional d-tag for addressable events (NIP-33). * @param {string[]} [params.relayUrls] - List of relays to query. Defaults to client's configured relays. * @param {function} [params.fetchFn] - Custom fetch function (mocks or specialized logic). Defaults to `pool.list`. - * @param {number} [params.since] - Explicit start timestamp (overrides storage). * @param {number} [params.timeoutMs] - Optional per-relay timeout for list fetches; defaults to a higher list-friendly baseline. * @returns {Promise} Deduplicated list of events found across all relays. */ @@ -4083,27 +3812,10 @@ export class NostrClient { : this.relays; const healthyCandidates = this.getHealthyRelays(relaysToUse); - let relayCandidates = healthyCandidates; - if (!healthyCandidates.length && relaysToUse.length) { - const sanitizedFallback = sanitizeRelayList(relaysToUse); - const defaultFallback = sanitizeRelayList(Array.from(DEFAULT_RELAY_URLS)); - relayCandidates = sanitizedFallback.length - ? sanitizedFallback - : defaultFallback.length - ? defaultFallback - : sanitizeRelayList(Array.from(RELAY_URLS)); - devLogger.warn( - "[fetchListIncrementally] Healthy relays exhausted; using fallback relay list for one-off fetch.", - { - requested: relaysToUse, - fallback: relayCandidates, - }, - ); - } const readPreferences = new Set(Array.isArray(this.readRelays) ? this.readRelays : []); // Sort relays: prefer user's read relays first - const sortedRelays = relayCandidates.sort((a, b) => { + const sortedRelays = healthyCandidates.sort((a, b) => { const aPreferred = readPreferences.has(a); const bPreferred = readPreferences.has(b); if (aPreferred && !bPreferred) return -1; @@ -4130,7 +3842,7 @@ export class NostrClient { const pool = await this.ensurePool(); const actualFetchFn = typeof fetchFn === "function" ? fetchFn - : (r, f, timeout) => pool.list([r], [f], { timeout }); + : (r, f) => pool.list([r], [f]); const chunks = []; for (let i = 0; i < normalizedRelays.length; i += concurrencyLimit) { @@ -4188,7 +3900,7 @@ export class NostrClient { try { // Wrap fetch with a timeout to prevent hanging on slow relays let events = await withRequestTimeout( - actualFetchFn(relayUrl, filter, listTimeoutMs), + actualFetchFn(relayUrl, filter), listTimeoutMs, null, `Fetch from ${relayUrl} timed out` @@ -4223,7 +3935,7 @@ export class NostrClient { try { delete filter.since; const events = await withRequestTimeout( - actualFetchFn(relayUrl, filter, listTimeoutMs), + actualFetchFn(relayUrl, filter), listTimeoutMs, null, `Full fetch fallback from ${relayUrl} timed out` @@ -4482,16 +4194,6 @@ export class NostrClient { * * @returns {Promise} Resolves when the relay pool is initialized and connections are attempted. */ - /** - * Main entry point for the client. - * - * 1. Restores local state from IndexedDB (Stale-While-Revalidate). - * 2. Initializes the relay connection pool. - * 3. Connects to configured relays. - * 4. Restores any persistent remote signer sessions. - * - * @returns {Promise} Resolves after the initial relay connection attempt completes. - */ async init() { if (this.isInitialized) { return; @@ -4516,16 +4218,11 @@ export class NostrClient { .filter((r) => r.success) .map((r) => r.url); if (successfulRelays.length === 0) { - userLogger.warn( - "[nostr] No relays connected during init. Retrying in the background.", - ); - this.scheduleRelayReconnect({ reason: "initial-connect-failed" }); - } else { - this.resetRelayReconnectState(); - devLogger.log( - `Connected to ${successfulRelays.length} relay(s)`, - ); + throw new Error("No relays connected"); } + devLogger.log( + `Connected to ${successfulRelays.length} relay(s)`, + ); } catch (err) { userLogger.error("Nostr init failed:", err); throw err; @@ -4605,29 +4302,16 @@ export class NostrClient { // while the 5s timer guards against relays that never respond. We immediately // `unsub` to avoid leaking subscriptions. Note: any future change must still // provide a lightweight readiness check with similar timeout semantics. - /** - * Connects to all configured relays in parallel. - * - * - Skips relays that are already connected. - * - Updates internal connectivity state. - * - Does NOT throw if individual relays fail, but returns a summary. - * - * @returns {Promise>} Connection results. - */ async connectToRelays() { - const relayTargets = this.getHealthyRelays(this.relays); - if (!relayTargets.length) { - return []; - } const results = await Promise.all( - relayTargets.map( + this.relays.map( (url) => new Promise((resolve) => { const sub = this.pool.sub([url], [{ kinds: [0], limit: 1 }]); const timeout = setTimeout(() => { sub.unsub(); resolve({ url, success: false }); - }, RELAY_CONNECT_TIMEOUT_MS); + }, 5000); const succeed = () => { clearTimeout(timeout); @@ -4642,11 +4326,9 @@ export class NostrClient { for (const result of results) { if (result.success) { - this.clearRelayBackoff(result.url); + this.unreachableRelays.delete(result.url); } else { - this.markRelayUnreachable(result.url, 60000, { - reason: "connect-timeout", - }); + this.unreachableRelays.add(result.url); if (isDevMode) { devLogger.warn(`[nostr] Marked relay as unreachable: ${result.url}`); } @@ -4656,105 +4338,7 @@ export class NostrClient { return results; } - resolveRelayReconnectDelayMs(attempt) { - const safeAttempt = Number.isFinite(attempt) ? Math.max(0, attempt) : 0; - const computed = RELAY_RECONNECT_BASE_DELAY_MS * Math.pow(2, safeAttempt); - return Math.min(RELAY_RECONNECT_MAX_DELAY_MS, computed); - } - - resetRelayReconnectState() { - this.relayReconnectAttempt = 0; - if (this.relayReconnectTimer) { - clearTimeout(this.relayReconnectTimer); - this.relayReconnectTimer = null; - } - } - - scheduleRelayReconnect({ reason = "retry" } = {}) { - if (this.relayReconnectTimer) { - return; - } - if (this.relayReconnectAttempt >= RELAY_RECONNECT_MAX_ATTEMPTS) { - if (isDevMode) { - devLogger.debug( - "[nostr] Relay reconnect attempts exhausted.", - { - attempts: this.relayReconnectAttempt, - reason, - }, - ); - } - return; - } - - const delayMs = this.resolveRelayReconnectDelayMs(this.relayReconnectAttempt); - const attemptNumber = this.relayReconnectAttempt + 1; - this.relayReconnectAttempt = attemptNumber; - - if (isDevMode) { - devLogger.debug("[nostr] Scheduling relay reconnect attempt.", { - attempt: attemptNumber, - delayMs, - reason, - }); - } - - this.relayReconnectTimer = setTimeout(async () => { - this.relayReconnectTimer = null; - try { - const results = await this.connectToRelays(); - const successful = results.some((result) => result.success); - if (successful) { - this.resetRelayReconnectState(); - return; - } - } catch (error) { - devLogger.warn("[nostr] Relay reconnect attempt failed:", error); - } - this.scheduleRelayReconnect({ reason: "reconnect-failed" }); - }, delayMs); - } - - logRelaySummary({ - key, - level = "warn", - message, - payload, - } = {}) { - if (!key || !message) { - return; - } - const now = Date.now(); - const lastLogged = this.relaySummaryLogTimestamps.get(key) || 0; - if (now - lastLogged < RELAY_SUMMARY_LOG_INTERVAL_MS) { - return; - } - this.relaySummaryLogTimestamps.set(key, now); - const channel = isDevMode ? devLogger : userLogger; - const logFn = - typeof channel[level] === "function" ? channel[level] : channel.warn; - if (payload) { - logFn(`[nostr] ${message}`, payload); - } else { - logFn(`[nostr] ${message}`); - } - } - - resolveRelayBackoffMs(failureCount, ttlOverride) { - const baseMs = RELAY_BACKOFF_BASE_DELAY_MS; - const maxMs = RELAY_BACKOFF_MAX_DELAY_MS; - const computed = Math.min( - maxMs, - baseMs * Math.pow(2, Math.max(0, failureCount - 1)) - ); - const override = Number(ttlOverride); - if (Number.isFinite(override) && override > 0) { - return Math.min(computed, Math.floor(override)); - } - return computed; - } - - clearRelayBackoff(url) { + markRelayUnreachable(url, ttlMs = 60000) { if (!url || typeof url !== "string") { return; } @@ -4762,110 +4346,15 @@ export class NostrClient { if (!normalized) { return; } - const hadBackoffState = - this.relayBackoff.has(normalized) || - this.unreachableRelays.has(normalized) || - this.relayFailureCounts.has(normalized) || - this.relayCircuitBreakers.has(normalized); - this.relayBackoff.delete(normalized); - this.relayFailureCounts.delete(normalized); - this.relayFailureWindows.delete(normalized); - this.unreachableRelays.delete(normalized); - this.relayCircuitBreakers.delete(normalized); - if (hadBackoffState) { - this.logRelaySummary({ - key: `relay-recovered:${normalized}`, - level: "info", - message: "Relay recovered; backoff cleared.", - payload: { relay: normalized }, - }); - } - } - - recordRelayFailureWindow(url) { - if (!url || typeof url !== "string") { - return 0; - } - const normalized = url.trim(); - if (!normalized) { - return 0; - } - const now = Date.now(); - const cutoff = now - RELAY_FAILURE_WINDOW_MS; - const history = this.relayFailureWindows.get(normalized) || []; - const filtered = history.filter( - (timestamp) => Number.isFinite(timestamp) && timestamp >= cutoff, - ); - filtered.push(now); - this.relayFailureWindows.set(normalized, filtered); - return filtered.length; - } - - markRelayUnreachable(url, ttlMs = 60000, { reason = null } = {}) { - if (!url || typeof url !== "string") { - return; - } - const normalized = url.trim(); - if (!normalized) { - return; - } - const windowFailureCount = this.recordRelayFailureWindow(normalized); - const nextFailureCount = (this.relayFailureCounts.get(normalized) || 0) + 1; - this.relayFailureCounts.set(normalized, nextFailureCount); - const backoffMs = this.resolveRelayBackoffMs(nextFailureCount, ttlMs); - const retryAt = Date.now() + backoffMs; - this.relayBackoff.set(normalized, { - retryAt, - backoffMs, - failureCount: nextFailureCount, - reason, - }); this.unreachableRelays.add(normalized); - const shouldOpenCircuit = - nextFailureCount >= RELAY_CIRCUIT_BREAKER_THRESHOLD || - windowFailureCount >= RELAY_FAILURE_WINDOW_THRESHOLD; - if (shouldOpenCircuit) { - const now = Date.now(); - const openUntil = now + RELAY_CIRCUIT_BREAKER_COOLDOWN_MS; - const existing = this.relayCircuitBreakers.get(normalized); - const nextOpenUntil = - existing && Number.isFinite(existing.openUntil) - ? Math.max(existing.openUntil, openUntil) - : openUntil; - const circuitReason = - reason || - (nextFailureCount >= RELAY_CIRCUIT_BREAKER_THRESHOLD - ? "consecutive-failures" - : "windowed-failures"); - this.relayCircuitBreakers.set(normalized, { - openUntil: nextOpenUntil, - failureCount: nextFailureCount, - reason: circuitReason, - }); - this.logRelaySummary({ - key: `relay-circuit:${normalized}`, - level: "warn", - message: "Circuit breaker opened for relay.", - payload: { - relay: normalized, - openUntil: nextOpenUntil, - failureCount: nextFailureCount, - reason: circuitReason, - }, - }); + if (ttlMs > 0) { + setTimeout(() => { + this.unreachableRelays.delete(normalized); + if (isDevMode) { + devLogger.debug(`[nostr] Cleared temporary failure mark for ${normalized}`); + } + }, ttlMs); } - this.logRelaySummary({ - key: `relay-backoff:${normalized}`, - level: "warn", - message: "Relay backoff applied.", - payload: { - relay: normalized, - backoffMs, - failureCount: nextFailureCount, - retryAt, - reason, - }, - }); } getHealthyRelays(candidates) { @@ -4873,47 +4362,7 @@ export class NostrClient { if (!this.unreachableRelays.size) { return source; } - const now = Date.now(); - return source.filter((url) => { - const circuit = this.relayCircuitBreakers.get(url); - if (circuit && Number.isFinite(circuit.openUntil)) { - if (circuit.openUntil > now) { - return false; - } - this.relayCircuitBreakers.delete(url); - this.relayFailureCounts.delete(url); - this.relayFailureWindows.delete(url); - this.unreachableRelays.delete(url); - this.relayBackoff.delete(url); - this.logRelaySummary({ - key: `relay-circuit-reset:${url}`, - level: "info", - message: "Circuit breaker reset for relay.", - payload: { relay: url }, - }); - } - if (!this.unreachableRelays.has(url)) { - return true; - } - const entry = this.relayBackoff.get(url); - if (!entry) { - return false; - } - if (Number.isFinite(entry.retryAt) && entry.retryAt > now) { - return false; - } - this.relayBackoff.delete(url); - this.relayFailureCounts.delete(url); - this.relayFailureWindows.delete(url); - this.unreachableRelays.delete(url); - this.logRelaySummary({ - key: `relay-backoff-expired:${url}`, - level: "info", - message: "Relay backoff expired.", - payload: { relay: url }, - }); - return true; - }); + return source.filter((url) => !this.unreachableRelays.has(url)); } /** @@ -4967,8 +4416,6 @@ export class NostrClient { this.extensionPermissionCache.clear(); } clearStoredNip07Permissions(); - this.extensionReady = false; - this.extensionPermissionsGranted = false; devLogger.log("User logged out."); } @@ -5060,24 +4507,7 @@ export class NostrClient { activeSigner = getActiveSigner(); } - let extensionPermissionResult = null; - if ( - activeSigner?.type === "extension" && - typeof this.ensureExtensionPermissions === "function" - ) { - extensionPermissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - { context: "dm" }, - ); - if (!extensionPermissionResult?.ok) { - devLogger.warn( - "[nostr] Extension encryption permissions missing for DM decryption.", - extensionPermissionResult?.error, - ); - } - } - - if (activeSigner && extensionPermissionResult?.ok !== false) { + if (activeSigner) { const capabilities = resolveSignerCapabilities(activeSigner); if ( capabilities.nip44 && @@ -5524,17 +4954,16 @@ export class NostrClient { if (shouldRequestExtensionPermissions(signer)) { const permissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - { context: "dm" }, + DEFAULT_NIP07_PERMISSION_METHODS, ); if (!permissionResult.ok) { userLogger.warn( - "[nostr] Cannot send direct message without encryption permissions.", + "[nostr] Cannot send direct message without extension permissions.", permissionResult.error, ); return { ok: false, - error: "extension-encryption-permission-denied", + error: "extension-permission-denied", details: permissionResult.error, }; } @@ -6804,7 +6233,7 @@ export class NostrClient { if (shouldRequestExtensionPermissions(signer)) { const permissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_CORE_METHODS, + DEFAULT_NIP07_PERMISSION_METHODS, ); if (!permissionResult.ok) { userLogger.warn( @@ -6812,7 +6241,7 @@ export class NostrClient { permissionResult.error, ); const error = new Error( - "The active signer must allow signing before editing a video.", + "The active signer must grant decrypt and sign permissions before editing a video.", ); error.code = "extension-permission-denied"; error.cause = permissionResult.error; @@ -6983,7 +6412,7 @@ export class NostrClient { if (shouldRequestExtensionPermissions(signer)) { const permissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_CORE_METHODS, + DEFAULT_NIP07_PERMISSION_METHODS, ); if (!permissionResult.ok) { userLogger.warn( @@ -6991,7 +6420,7 @@ export class NostrClient { permissionResult.error, ); const error = new Error( - "The active signer must allow signing before reverting a video.", + "The active signer must grant decrypt and sign permissions before reverting a video.", ); error.code = "extension-permission-denied"; error.cause = permissionResult.error; @@ -7291,7 +6720,7 @@ export class NostrClient { if (shouldRequestExtensionPermissions(signer)) { const permissionResult = await this.ensureExtensionPermissions( - DEFAULT_NIP07_CORE_METHODS, + DEFAULT_NIP07_PERMISSION_METHODS, ); if (!permissionResult.ok) { userLogger.warn( @@ -7299,7 +6728,7 @@ export class NostrClient { permissionResult.error, ); const error = new Error( - "The active signer must allow signing before deleting a video.", + "The active signer must grant decrypt and sign permissions before deleting a video.", ); error.code = "extension-permission-denied"; error.cause = permissionResult.error; @@ -7308,7 +6737,13 @@ export class NostrClient { } const chunkSize = 100; - for (let index = 0; index < identifierRecords.length; index += chunkSize) { + const publishPromises = []; + + for ( + let index = 0; + index < identifierRecords.length; + index += chunkSize + ) { const chunk = identifierRecords.slice(index, index + chunkSize); const eventIds = chunk .filter((record) => record.type === "e") @@ -7328,50 +6763,58 @@ export class NostrClient { }); const signedDelete = await queueSignEvent(signer, deleteEvent); - const publishResults = await publishEventToRelays( - this.pool, - this.relays, - signedDelete, - ); - const publishSummary = summarizePublishResults(publishResults); - publishSummary.accepted.forEach(({ url }) => - devLogger.log(`Delete event published to ${url}`), - ); + const publishPromise = (async () => { + const publishResults = await publishEventToRelays( + this.pool, + this.relays, + signedDelete, + ); + const publishSummary = summarizePublishResults(publishResults); - if (publishSummary.failed.length) { - publishSummary.failed.forEach(({ url, error: relayError }) => { - const reason = - relayError instanceof Error - ? relayError.message - : relayError - ? String(relayError) - : "publish failed"; - userLogger.warn( - `[nostr] Delete event not accepted by ${url}: ${reason}`, - relayError, - ); - }); - } + publishSummary.accepted.forEach(({ url }) => + devLogger.log(`Delete event published to ${url}`) + ); - if (signedDelete?.id) { - this.rawEvents.set(signedDelete.id, signedDelete); - } + if (publishSummary.failed.length) { + publishSummary.failed.forEach(({ url, error: relayError }) => { + const reason = + relayError instanceof Error + ? relayError.message + : relayError + ? String(relayError) + : "publish failed"; + userLogger.warn( + `[nostr] Delete event not accepted by ${url}: ${reason}`, + relayError + ); + }); + } - deleteSummaries.push({ - event: signedDelete, - publishResults, - summary: publishSummary, - identifiers: { - events: chunk - .filter((record) => record.type === "e") - .map((record) => record.value), - addresses: chunk - .filter((record) => record.type === "a") - .map((record) => record.value), - }, - }); + if (signedDelete?.id) { + this.rawEvents.set(signedDelete.id, signedDelete); + } + + return { + event: signedDelete, + publishResults, + summary: publishSummary, + identifiers: { + events: chunk + .filter((record) => record.type === "e") + .map((record) => record.value), + addresses: chunk + .filter((record) => record.type === "a") + .map((record) => record.value), + }, + }; + })(); + + publishPromises.push(publishPromise); } + + const chunkResults = await Promise.all(publishPromises); + deleteSummaries.push(...chunkResults); } this.saveLocalData("delete-events", { immediate: true }); @@ -7412,16 +6855,12 @@ export class NostrClient { } /** - * Schedules a persistence operation to save current state to cache. - * - * - Uses a debounce strategy (75ms) to prevent write thrashing during bursts. - * - Can be forced to run immediately via `options.immediate`. - * - Coordinates with `requestIdleCallback` to avoid blocking the main thread. + * Schedules a persistence task to save the current state (events, tombstones) to local storage. * * @param {string} [reason="unspecified"] - Debug label for why persistence was triggered. - * @param {object} [options] - Configuration. - * @param {boolean} [options.immediate=false] - If true, bypasses debounce and persists immediately. - * @returns {Promise|null} The persistence promise or null if debounced. + * @param {object} [options] + * @param {boolean} [options.immediate=false] - If true, bypasses the debounce timer and saves immediately. + * @returns {Promise} A promise resolving to whether persistence succeeded. */ saveLocalData(reason = "unspecified", options = {}) { const { immediate = false } = options; @@ -8339,25 +7778,13 @@ export class NostrClient { try { relay = await this.pool.ensureRelay(normalizedUrl); } catch (error) { - const connectError = new Error( - `Failed to connect to relay ${normalizedUrl}` - ); - connectError.code = "relay-connect-failed"; - this.markRelayUnreachable(normalizedUrl, 60000, { - reason: "connect-failed", - }); - throw connectError; + throw new Error(`Failed to connect to relay ${normalizedUrl}`); } if (!relay) { - const relayError = new Error( + throw new Error( `Relay ${normalizedUrl} is unavailable for COUNT requests.` ); - relayError.code = "relay-unavailable"; - this.markRelayUnreachable(normalizedUrl, 60000, { - reason: "relay-unavailable", - }); - throw relayError; } const frame = ["COUNT", requestId, ...normalizedFilters]; @@ -8409,27 +7836,16 @@ export class NostrClient { } const timeoutMs = this.getRequestTimeoutMs(options.timeoutMs); - let rawResult; - try { - rawResult = await withRequestTimeout( - countPromise, - timeoutMs, - () => { - if (relay?.openCountRequests instanceof Map) { - relay.openCountRequests.delete(requestId); - } - }, - `COUNT request timed out after ${timeoutMs}ms` - ); - } catch (error) { - if ( - error instanceof Error && - error.message.includes("COUNT request timed out") - ) { - error.code = "count-timeout"; - } - throw error; - } + const rawResult = await withRequestTimeout( + countPromise, + timeoutMs, + () => { + if (relay?.openCountRequests instanceof Map) { + relay.openCountRequests.delete(requestId); + } + }, + `COUNT request timed out after ${timeoutMs}ms` + ); const countValue = this.extractCountValue(rawResult); return ["COUNT", requestId, { count: countValue }]; @@ -8438,7 +7854,7 @@ export class NostrClient { async countEventsAcrossRelays(filters, options = {}) { const normalizedFilters = this.normalizeCountFilters(filters); if (!normalizedFilters.length) { - return { total: 0, best: null, perRelay: [], partial: false }; + return { total: 0, best: null, perRelay: [] }; } const relayList = @@ -8452,8 +7868,6 @@ export class NostrClient { .map((url) => (typeof url === "string" ? url.trim() : "")) .filter(Boolean); - const eligibleRelays = this.getHealthyRelays(normalizedRelayList); - const eligibleRelaySet = new Set(eligibleRelays); const activeRelays = []; const precomputedEntries = []; @@ -8468,15 +7882,6 @@ export class NostrClient { }); continue; } - if (!eligibleRelaySet.has(url)) { - precomputedEntries.push({ - url, - ok: false, - skipped: true, - reason: "backoff", - }); - continue; - } activeRelays.push(url); } @@ -8487,28 +7892,15 @@ export class NostrClient { timeoutMs: options.timeoutMs, }); const count = this.extractCountValue(frame?.[2]); - this.clearRelayBackoff(url); return { url, ok: true, frame, count }; } catch (error) { const isUnsupported = error?.code === "count-unsupported"; - const isTimeout = - error?.code === "count-timeout" || error?.code === "timeout"; if (isUnsupported) { this.countUnsupportedRelays.add(url); } else { logRelayCountFailure(url, error); - this.markRelayUnreachable(url, 60000, { - reason: isTimeout ? "count-timeout" : "count-error", - }); } - return { - url, - ok: false, - error, - unsupported: isUnsupported, - timedOut: isTimeout, - errorCode: error?.code || null, - }; + return { url, ok: false, error, unsupported: isUnsupported }; } }) ); @@ -8562,15 +7954,11 @@ export class NostrClient { }); const total = bestEstimate ? bestEstimate.count : 0; - const partial = perRelayResults.some( - (entry) => entry?.timedOut || entry?.skipped - ); return { total, best: bestEstimate, perRelay, - partial, }; } diff --git a/dist/js/nostr/commentEvents.js b/dist/js/nostr/commentEvents.js index 76f96a4b..8d930ed3 100644 --- a/dist/js/nostr/commentEvents.js +++ b/dist/js/nostr/commentEvents.js @@ -13,7 +13,6 @@ import { CACHE_POLICIES } from "./cachePolicies.js"; import { isSessionActor } from "./sessionActor.js"; import { queueSignEvent } from "./signRequestQueue.js"; import { getActiveSigner } from "../nostrClientRegistry.js"; -import { sanitizeRelayList as sanitizeRelayUrls } from "./nip46Client.js"; const COMMENT_EVENT_SCHEMA = getNostrEventSchema(NOTE_TYPES.VIDEO_COMMENT); const CACHE_POLICY = CACHE_POLICIES[NOTE_TYPES.VIDEO_COMMENT]; @@ -33,15 +32,13 @@ function getAllowedCommentKinds() { return ALLOWED_COMMENT_KINDS.slice(); } function sanitizeRelayList(primary, fallback) { - const primaryList = sanitizeRelayUrls(Array.isArray(primary) ? primary : []); - if (primaryList.length) { - return primaryList; + if (Array.isArray(primary) && primary.length) { + return primary; } - const fallbackList = sanitizeRelayUrls(Array.isArray(fallback) ? fallback : []); - if (fallbackList.length) { - return fallbackList; + if (Array.isArray(fallback) && fallback.length) { + return fallback; } - return sanitizeRelayUrls(RELAY_URLS); + return RELAY_URLS; } function normalizeRelay(candidate) { diff --git a/dist/js/nostr/defaultClient.js b/dist/js/nostr/defaultClient.js index dd7cf776..13363919 100644 --- a/dist/js/nostr/defaultClient.js +++ b/dist/js/nostr/defaultClient.js @@ -2,7 +2,6 @@ import { NostrClient } from "./client.js"; import { - DEFAULT_NIP07_CORE_METHODS, DEFAULT_NIP07_ENCRYPTION_METHODS, DEFAULT_NIP07_PERMISSION_METHODS, } from "./nip07Permissions.js"; @@ -27,7 +26,6 @@ export function requestDefaultExtensionPermissions( export { NostrClient, - DEFAULT_NIP07_CORE_METHODS, DEFAULT_NIP07_ENCRYPTION_METHODS, DEFAULT_NIP07_PERMISSION_METHODS, }; diff --git a/dist/js/nostr/dmSignalEvents.js b/dist/js/nostr/dmSignalEvents.js index 1deca098..b138d497 100644 --- a/dist/js/nostr/dmSignalEvents.js +++ b/dist/js/nostr/dmSignalEvents.js @@ -9,20 +9,17 @@ import { devLogger, userLogger } from "../utils/logger.js"; import { queueSignEvent } from "./signRequestQueue.js"; import { getActiveSigner } from "../nostrClientRegistry.js"; import { isSessionActor } from "./sessionActor.js"; -import { sanitizeRelayList as sanitizeRelayUrls } from "./nip46Client.js"; const DEFAULT_TYPING_EXPIRY_SECONDS = 15; function sanitizeRelayList(primary, fallback) { - const primaryList = sanitizeRelayUrls(Array.isArray(primary) ? primary : []); - if (primaryList.length) { - return primaryList; + if (Array.isArray(primary) && primary.length) { + return primary; } - const fallbackList = sanitizeRelayUrls(Array.isArray(fallback) ? fallback : []); - if (fallbackList.length) { - return fallbackList; + if (Array.isArray(fallback) && fallback.length) { + return fallback; } - return sanitizeRelayUrls(RELAY_URLS); + return RELAY_URLS; } function normalizeString(value) { diff --git a/dist/js/nostr/nip07Permissions.js b/dist/js/nostr/nip07Permissions.js index f08edd87..f85a3a03 100644 --- a/dist/js/nostr/nip07Permissions.js +++ b/dist/js/nostr/nip07Permissions.js @@ -21,16 +21,12 @@ export const DEFAULT_NIP07_ENCRYPTION_METHODS = Object.freeze([ "nip44.v2.decrypt", ]); -export const DEFAULT_NIP07_CORE_METHODS = Object.freeze([ +export const DEFAULT_NIP07_PERMISSION_METHODS = Object.freeze([ // Core auth + relay metadata "get_public_key", "sign_event", "read_relays", "write_relays", -]); - -export const DEFAULT_NIP07_PERMISSION_METHODS = Object.freeze([ - ...DEFAULT_NIP07_CORE_METHODS, ...DEFAULT_NIP07_ENCRYPTION_METHODS, ]); diff --git a/dist/js/nostr/nip46Client.js b/dist/js/nostr/nip46Client.js index 9f31f957..e0832b57 100644 --- a/dist/js/nostr/nip46Client.js +++ b/dist/js/nostr/nip46Client.js @@ -43,28 +43,6 @@ export const NIP46_ENCRYPTION_ALGORITHMS = Object.freeze([ "nip04", ]); -function isSecureRelayContext() { - if (typeof window === "undefined") { - return false; - } - const protocol = window?.location?.protocol; - return protocol === "https:"; -} - -function resolveRelayProtocol(protocol, { enforceTls = false } = {}) { - if (!protocol) { - return null; - } - const normalized = protocol.toLowerCase(); - if (normalized === "wss:") { - return "wss:"; - } - if (normalized === "ws:") { - return enforceTls ? "wss:" : "ws:"; - } - return null; -} - /** * resolves the appropriate storage mechanism (localStorage or polyfill) for NIP-46 sessions. * @returns {Storage|null} The storage interface or null if unavailable. @@ -94,7 +72,6 @@ export function sanitizeRelayList(list) { if (!Array.isArray(list)) { return sanitized; } - const enforceTls = isSecureRelayContext(); list.forEach((value) => { if (typeof value !== "string") { @@ -113,29 +90,16 @@ export function sanitizeRelayList(list) { let normalized = trimmed.replace(/\/+$/, ""); try { - const parsed = new URL(normalized); + const parsed = new URL(trimmed); if (!parsed.hostname) { return; } - const resolvedProtocol = resolveRelayProtocol(parsed.protocol, { - enforceTls, - }); - if (!resolvedProtocol) { - return; - } - if (parsed.protocol !== resolvedProtocol) { - parsed.protocol = resolvedProtocol; - } const pathname = parsed.pathname.replace(/\/+$/, ""); normalized = `${parsed.protocol}//${parsed.host}${pathname}${parsed.search || ""}`; } catch (error) { // Ignore URL parsing failures and fall back to the trimmed string. } - if (enforceTls && normalized.startsWith("ws://")) { - return; - } - if (seen.has(normalized)) { return; } diff --git a/dist/js/nostr/nip71.js b/dist/js/nostr/nip71.js index 25e5cf6a..514242ed 100644 --- a/dist/js/nostr/nip71.js +++ b/dist/js/nostr/nip71.js @@ -6,10 +6,6 @@ import { resolveInfoJsonUrl, } from "../utils/storagePointer.js"; import { getCachedNostrTools } from "./toolkit.js"; -import { - validateEventAgainstSchema, - NOTE_TYPES, -} from "../nostrEventSchemas.js"; function stringFromInput(value) { if (value === null || value === undefined) { @@ -938,20 +934,13 @@ export function buildNip71VideoEvent({ tags.push(...pointerTags); } - const event = { + return { kind: normalizeNip71Kind(metadata.kind), pubkey: normalizedPubkey, created_at: timestamp, tags, content: summary, }; - - validateEventAgainstSchema( - event.kind === 22 ? NOTE_TYPES.NIP71_SHORT_VIDEO : NOTE_TYPES.NIP71_VIDEO, - event, - ); - - return event; } export function collectNip71PointerRequests(videos = []) { diff --git a/dist/js/nostr/reactionEvents.js b/dist/js/nostr/reactionEvents.js index 3311f9b3..d059f2cc 100644 --- a/dist/js/nostr/reactionEvents.js +++ b/dist/js/nostr/reactionEvents.js @@ -7,21 +7,18 @@ import { LRUCache } from "../utils/lruCache.js"; import { CACHE_POLICIES } from "./cachePolicies.js"; import { NOTE_TYPES } from "../nostrEventSchemas.js"; import { queueSignEvent } from "./signRequestQueue.js"; -import { sanitizeRelayList as sanitizeRelayUrls } from "./nip46Client.js"; const CACHE_POLICY = CACHE_POLICIES[NOTE_TYPES.VIDEO_REACTION]; const reactionCache = new LRUCache({ maxSize: 100 }); function sanitizeRelayList(primary, fallback) { - const primaryList = sanitizeRelayUrls(Array.isArray(primary) ? primary : []); - if (primaryList.length) { - return primaryList; + if (Array.isArray(primary) && primary.length) { + return primary; } - const fallbackList = sanitizeRelayUrls(Array.isArray(fallback) ? fallback : []); - if (fallbackList.length) { - return fallbackList; + if (Array.isArray(fallback) && fallback.length) { + return fallback; } - return sanitizeRelayUrls(RELAY_URLS); + return RELAY_URLS; } function normalizeString(value) { diff --git a/dist/js/nostr/sessionActor.js b/dist/js/nostr/sessionActor.js index bbbafc2f..eaf51127 100644 --- a/dist/js/nostr/sessionActor.js +++ b/dist/js/nostr/sessionActor.js @@ -487,21 +487,10 @@ export function isSessionActor(nostrClient) { return !!sa && sa.source !== "nsec"; } -function _closeSessionActorDb() { - if (sessionActorDbPromise) { - return sessionActorDbPromise.then((db) => { - db.close(); - sessionActorDbPromise = null; - }); - } - return Promise.resolve(); -} - export const __testExports = { arrayBufferToBase64, base64ToUint8Array, deriveSessionEncryptionKey, generateRandomBytes, isSubtleCryptoAvailable, - _closeSessionActorDb, }; diff --git a/dist/js/nostr/viewEvents.js b/dist/js/nostr/viewEvents.js index fc93c988..284e5d92 100644 --- a/dist/js/nostr/viewEvents.js +++ b/dist/js/nostr/viewEvents.js @@ -14,7 +14,6 @@ import { normalizePointerInput } from "./watchHistory.js"; import { devLogger, userLogger } from "../utils/logger.js"; import { logViewCountFailure } from "./countDiagnostics.js"; import { queueSignEvent } from "./signRequestQueue.js"; -import { sanitizeRelayList as sanitizeRelayUrls } from "./nip46Client.js"; const VIEW_EVENT_GUARD_PREFIX = "bitvid:viewed"; @@ -341,15 +340,13 @@ function flattenListResults(input) { } function sanitizeRelayList(primary, fallback) { - const primaryList = sanitizeRelayUrls(Array.isArray(primary) ? primary : []); - if (primaryList.length) { - return primaryList; + if (Array.isArray(primary) && primary.length) { + return primary; } - const fallbackList = sanitizeRelayUrls(Array.isArray(fallback) ? fallback : []); - if (fallbackList.length) { - return fallbackList; + if (Array.isArray(fallback) && fallback.length) { + return fallback; } - return sanitizeRelayUrls(RELAY_URLS); + return RELAY_URLS; } export async function listVideoViewEvents(client, pointer, options = {}) { @@ -566,7 +563,6 @@ export async function countVideoViewEvents(client, pointer, options = {}) { perRelay: [], best: null, fallback: true, - partial: false, }; } @@ -592,26 +588,19 @@ export async function countVideoViewEvents(client, pointer, options = {}) { throw normalizeAbortError(); } - let countAttemptPartial = false; - try { const result = await client.countEventsAcrossRelays([pointerFilter], { relays: sanitizeRelayList(relayList, client.relays), timeoutMs: options?.timeoutMs, }); - countAttemptPartial = Boolean(result?.partial); - if (result?.perRelay?.some((entry) => entry && entry.ok)) { - return { ...result, fallback: false, partial: countAttemptPartial }; + return { ...result, fallback: false }; } } catch (error) { if (error?.code !== "count-unsupported") { logViewCountFailure(error); } - if (error?.code === "count-timeout" || error?.code === "timeout") { - countAttemptPartial = true; - } } if (signal?.aborted) { @@ -658,7 +647,6 @@ export async function countVideoViewEvents(client, pointer, options = {}) { perRelay: [], best: null, fallback: true, - partial: countAttemptPartial, }; } diff --git a/dist/js/payments/zapSplit.js b/dist/js/payments/zapSplit.js index 8363c618..39fc73db 100644 --- a/dist/js/payments/zapSplit.js +++ b/dist/js/payments/zapSplit.js @@ -520,7 +520,13 @@ async function processShare({ } export async function splitAndZap( - { videoEvent, amountSats, comment = "", walletSettings } = {}, + { + videoEvent, + amountSats, + comment = "", + walletSettings, + overrideFee = null, + } = {}, dependencies = {} ) { if (!videoEvent || typeof videoEvent !== "object") { @@ -538,7 +544,11 @@ export async function splitAndZap( throw new Error("This creator has not configured a Lightning address yet."); } - const platformFee = clampPercent(getOverridePlatformFee()); + const platformFee = clampPercent( + typeof overrideFee !== "undefined" && overrideFee !== null + ? resolvePlatformFeePercent(overrideFee) + : getOverridePlatformFee() + ); const platformShare = Math.floor((amount * platformFee) / 100); const creatorShare = amount - platformShare; diff --git a/dist/js/relayManager.js b/dist/js/relayManager.js index a7d20bfe..aa809074 100644 --- a/dist/js/relayManager.js +++ b/dist/js/relayManager.js @@ -39,10 +39,6 @@ function normalizeRelayUrl(input) { return null; } - const enforceTls = - typeof window !== "undefined" && - window?.location?.protocol === "https:"; - let candidate = input.trim(); if (!candidate) { return null; @@ -63,18 +59,6 @@ function normalizeRelayUrl(input) { return null; } - if (enforceTls && parsed.protocol === "ws:") { - try { - parsed = new URL(candidate.replace(/^ws:/i, "wss:")); - } catch (error) { - return null; - } - } - - if (enforceTls && parsed.protocol !== "wss:") { - return null; - } - const hostname = parsed.hostname.toLowerCase(); const port = parsed.port ? `:${parsed.port}` : ""; let pathname = parsed.pathname || ""; diff --git a/dist/js/services/authService.js b/dist/js/services/authService.js index 0e0cf847..0a6525a9 100644 --- a/dist/js/services/authService.js +++ b/dist/js/services/authService.js @@ -26,7 +26,6 @@ import { profileCache } from "../state/profileCache.js"; import getDefaultAuthProvider, { providers as defaultAuthProviders, } from "./authProviders/index.js"; -import { fetchProfileMetadata } from "./profileMetadataService.js"; class SimpleEventEmitter { constructor(logger = null) { @@ -623,12 +622,8 @@ export default class AuthService { postLoginError: null, }; - const { detail: postLoginDetail, completionPromise } = this.applyPostLoginState({ - deferBlocks: true, - }); - detail.postLogin = postLoginDetail; - - const postLoginPromise = Promise.resolve(completionPromise) + const postLoginPromise = Promise.resolve() + .then(() => this.applyPostLoginState()) .then((postLogin) => { detail.postLogin = postLogin; detail.postLoginError = null; @@ -682,151 +677,75 @@ export default class AuthService { return detail; } - applyPostLoginState({ deferBlocks = false } = {}) { + async applyPostLoginState() { const activePubkey = this.normalizeHexPubkey(getPubkey()) || getPubkey(); - const cachedEntry = activePubkey ? this.getProfileCacheEntry(activePubkey) : null; - const cachedProfile = cachedEntry?.profile || FALLBACK_PROFILE; const detail = { pubkey: activePubkey || null, - blocksLoaded: deferBlocks ? null : false, + blocksLoaded: false, relaysLoaded: false, - profile: cachedProfile, + profile: null, }; if (!activePubkey) { - return { detail, completionPromise: Promise.resolve(detail) }; + return detail; } - const runOperation = async (operation) => { - try { - const value = await operation.promise; - const resolved = operation.onFulfilled(value); - detail[operation.name] = resolved; - if (typeof operation.emit === "function") { - operation.emit(resolved, null); - } - return resolved; - } catch (error) { - const resolved = operation.onRejected(error); - detail[operation.name] = resolved; - if (typeof operation.emit === "function") { - operation.emit(resolved, error); - } - return resolved; - } - }; - const schedule = (callback) => Promise.resolve().then(() => callback()); - const completionPromise = (async () => { - if (this.relayManager && typeof this.relayManager.loadRelayList === "function") { - const relayOp = { - name: "relaysLoaded", - promise: schedule(() => this.relayManager.loadRelayList(activePubkey)), - onFulfilled: () => true, - onRejected: (error) => { - this.log("[AuthService] Failed to load relay list", error); - return false; - }, - emit: (value, error) => { - this.emit("relaysLoaded", { - pubkey: activePubkey, - relaysLoaded: value, - error: error ?? null, - }); - }, - }; - await runOperation(relayOp); - } + const operations = []; - const concurrentOps = []; - - if (!deferBlocks) { - const blocksOperation = this.createBlocksLoadOperation(activePubkey, schedule); - if (blocksOperation) { - concurrentOps.push(blocksOperation); - } - } - - concurrentOps.push({ - name: "profile", - promise: schedule(() => this.loadOwnProfile(activePubkey)), - onFulfilled: (value) => { - const profile = value || FALLBACK_PROFILE; - this.setProfileCacheEntry(activePubkey, profile, { - persist: true, - reason: "post-login", - }); - return profile; - }, + if (this.userBlocks && typeof this.userBlocks.loadBlocks === "function") { + operations.push({ + name: "blocksLoaded", + promise: schedule(() => this.userBlocks.loadBlocks(activePubkey)), + onFulfilled: () => true, onRejected: (error) => { - this.log("[AuthService] Failed to load own profile", error); - const fallbackProfile = cachedProfile || FALLBACK_PROFILE; - this.setProfileCacheEntry(activePubkey, fallbackProfile, { - persist: true, - reason: "post-login-fallback", - }); - return fallbackProfile; + this.log("[AuthService] Failed to load block list", error); + return false; }, }); - - await Promise.allSettled(concurrentOps.map(runOperation)); - - return detail; - })(); - - return { detail, completionPromise }; - } - - createBlocksLoadOperation( - activePubkey, - schedule = (callback) => Promise.resolve().then(() => callback()), - options = {}, - ) { - if (!this.userBlocks || typeof this.userBlocks.loadBlocks !== "function") { - return null; } - return { - name: "blocksLoaded", - promise: schedule(() => this.userBlocks.loadBlocks(activePubkey, options)), - onFulfilled: () => true, + if (this.relayManager && typeof this.relayManager.loadRelayList === "function") { + operations.push({ + name: "relaysLoaded", + promise: schedule(() => this.relayManager.loadRelayList(activePubkey)), + onFulfilled: () => true, + onRejected: (error) => { + this.log("[AuthService] Failed to load relay list", error); + return false; + }, + }); + } + + operations.push({ + name: "profile", + promise: schedule(() => this.loadOwnProfile(activePubkey)), + onFulfilled: (value) => value, onRejected: (error) => { - this.log("[AuthService] Failed to load block list", error); - return false; + this.log("[AuthService] Failed to load own profile", error); + return null; }, - emit: (value, error) => { - this.emit("blocksLoaded", { - pubkey: activePubkey, - blocksLoaded: value, - error: error ?? null, - }); - }, - }; - } + }); - async loadBlocksForPubkey(pubkey, options = {}) { - const normalized = this.normalizeHexPubkey(pubkey) || - (typeof pubkey === "string" ? pubkey.trim() : ""); - if (!normalized) { - return false; - } + const settled = await Promise.allSettled( + operations.map((operation) => operation.promise) + ); - const operation = this.createBlocksLoadOperation(normalized, undefined, options); - if (!operation) { - return false; - } + settled.forEach((result, index) => { + const operation = operations[index]; + if (!operation) { + return; + } - try { - const value = await operation.promise; - const resolved = operation.onFulfilled(value); - operation.emit?.(resolved, null); - return resolved; - } catch (error) { - const resolved = operation.onRejected(error); - operation.emit?.(resolved, error); - return resolved; - } + if (result.status === "fulfilled") { + detail[operation.name] = operation.onFulfilled(result.value); + } else { + detail[operation.name] = operation.onRejected(result.reason); + } + }); + + return detail; } async logout() { @@ -844,14 +763,6 @@ export default class AuthService { setCurrentUserNpub(null); setActiveProfilePubkey(null, { persist: true }); - try { - if (profileCache && typeof profileCache.reset === "function") { - profileCache.reset(); - } - } catch (error) { - this.log("[AuthService] profileCache.reset threw", error); - } - try { resetModerationSettings({ persist: true }); } catch (error) { @@ -1212,16 +1123,44 @@ export default class AuthService { } try { - const result = await fetchProfileMetadata(normalized, { - nostr: this.nostrClient, - }); + const results = await Promise.all( + this.nostrClient.relays.map((relayUrl) => + this.nostrClient.pool.list([relayUrl], [ + { kinds: [0], authors: [normalized], limit: 1 }, + ]) + ) + ); - if (result?.event && typeof this.nostrClient?.handleEvent === "function") { - this.nostrClient.handleEvent(result.event); + const events = results.flat(); + let newest = null; + for (const event of events) { + if (!event || event.pubkey !== normalized || !event.content) { + continue; + } + if (!newest || event.created_at > newest.created_at) { + newest = event; + } } - if (result?.profile) { - return result.profile; + if (newest) { + if (this.nostrClient && typeof this.nostrClient.handleEvent === "function") { + this.nostrClient.handleEvent(newest); + } + if (newest.content) { + const data = JSON.parse(newest.content); + const profile = { + name: data.display_name || data.name || FALLBACK_PROFILE.name, + picture: data.picture || FALLBACK_PROFILE.picture, + about: typeof data.about === "string" ? data.about : FALLBACK_PROFILE.about, + website: + typeof data.website === "string" ? data.website : FALLBACK_PROFILE.website, + banner: + typeof data.banner === "string" ? data.banner : FALLBACK_PROFILE.banner, + lud16: typeof data.lud16 === "string" ? data.lud16 : FALLBACK_PROFILE.lud16, + lud06: typeof data.lud06 === "string" ? data.lud06 : FALLBACK_PROFILE.lud06, + }; + return profile; + } } } catch (error) { this.log("[AuthService] Failed to fetch profile", error); diff --git a/dist/js/services/discussionCountService.js b/dist/js/services/discussionCountService.js index a519a7e0..a47e3020 100644 --- a/dist/js/services/discussionCountService.js +++ b/dist/js/services/discussionCountService.js @@ -4,8 +4,6 @@ import { COMMENT_EVENT_KIND } from "../nostr/commentEvents.js"; const DEFAULT_MAX_DISCUSSION_COUNT_VIDEOS = 24; const COUNT_UNSUPPORTED_TITLE = "Relay does not support NIP-45 COUNT queries."; -const COUNT_PARTIAL_TITLE = - "Some relays timed out. Comment counts may be partial."; function toPositiveInteger(value, fallback) { const numeric = Number(value); @@ -101,11 +99,10 @@ export default class DiscussionCountService { } const total = Number(result?.total); - const isPartial = Boolean(result?.partial); const normalized = Number.isFinite(total) && total >= 0 ? Math.floor(total) : 0; this.videoDiscussionCountCache.set(video.id, normalized); - this.updateDiscussionCountElement(container, normalized, { partial: isPartial }); + this.updateDiscussionCountElement(container, normalized); return result; }) .catch((error) => { @@ -207,7 +204,7 @@ export default class DiscussionCountService { element.removeAttribute("title"); } - updateDiscussionCountElement(element, count, { partial = false } = {}) { + updateDiscussionCountElement(element, count) { if (!element) { return; } @@ -220,13 +217,9 @@ export default class DiscussionCountService { const numeric = Number(count); const safeValue = Number.isFinite(numeric) && numeric >= 0 ? Math.floor(numeric) : 0; - element.dataset.countState = partial ? "partial" : "ready"; + element.dataset.countState = "ready"; valueEl.textContent = safeValue.toLocaleString(); - if (partial) { - element.title = COUNT_PARTIAL_TITLE; - } else { - element.removeAttribute("title"); - } + element.removeAttribute("title"); } markDiscussionCountError(element, { unsupported = false } = {}) { diff --git a/dist/js/services/dmNostrService.js b/dist/js/services/dmNostrService.js index b1c07390..deafcc2a 100644 --- a/dist/js/services/dmNostrService.js +++ b/dist/js/services/dmNostrService.js @@ -1,9 +1,4 @@ -import { - DEFAULT_RELAY_URLS, - ensureNostrTools, - resolveSimplePoolConstructor, - shimLegacySimplePoolMethods, -} from "../nostr/toolkit.js"; +import { ensureNostrTools, resolveSimplePoolConstructor, shimLegacySimplePoolMethods } from "../nostr/toolkit.js"; import { sanitizeRelayList } from "../nostr/nip46Client.js"; import { publishEventToRelay } from "../nostrPublish.js"; import logger from "../utils/logger.js"; @@ -15,7 +10,6 @@ const DEFAULT_BACKOFF = { }; const MAX_SEEN_EVENT_IDS = 5000; -const DM_RELAY_LIST_TIMEOUT_MS = 5000; export const DM_RELAY_WARNING_FALLBACK = "dm-relays-fallback"; function normalizeRelayList(relays) { @@ -61,29 +55,6 @@ function extractRelayHintsFromEvent(event) { ); } -function withTimeout(promise, timeoutMs, errorCode) { - if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) { - return promise; - } - - let timeoutId = null; - const timeoutPromise = new Promise((_, reject) => { - timeoutId = setTimeout(() => { - const error = new Error("DM relay discovery timed out."); - if (errorCode) { - error.code = errorCode; - } - reject(error); - }, timeoutMs); - }); - - return Promise.race([promise, timeoutPromise]).finally(() => { - if (timeoutId) { - clearTimeout(timeoutId); - } - }); -} - export async function resolveDmRelaySelection({ pubkey, relayHints = [], @@ -103,14 +74,11 @@ export async function resolveDmRelaySelection({ const discoveryList = sanitizeRelayList( Array.isArray(discoveryRelays) ? discoveryRelays : [], ); - const candidateFallbackList = sanitizeRelayList( + const fallbackList = sanitizeRelayList( Array.isArray(fallbackRelays) && fallbackRelays.length ? fallbackRelays : discoveryRelays, ); - const defaultFallbackList = sanitizeRelayList(Array.from(DEFAULT_RELAY_URLS)); - const fallbackList = - candidateFallbackList.length > 0 ? candidateFallbackList : defaultFallbackList; if ( normalizedPubkey && @@ -119,13 +87,9 @@ export async function resolveDmRelaySelection({ discoveryList.length ) { try { - const events = await withTimeout( - pool.list(discoveryList, [ - { kinds: [10050], authors: [normalizedPubkey], limit: 1 }, - ]), - DM_RELAY_LIST_TIMEOUT_MS, - "dm-relay-discovery-timeout", - ); + const events = await pool.list(discoveryList, [ + { kinds: [10050], authors: [normalizedPubkey], limit: 1 }, + ]); const sorted = Array.isArray(events) ? events .filter((entry) => entry && entry.pubkey === normalizedPubkey) @@ -139,13 +103,6 @@ export async function resolveDmRelaySelection({ } } catch (error) { resolvedLogger.dev.warn("[dmNostrService] Failed to fetch DM relay hints.", error); - if (fallbackList.length) { - return { - relays: fallbackList, - source: "fallback", - warning: DM_RELAY_WARNING_FALLBACK, - }; - } } } diff --git a/dist/js/services/dmNotificationManager.js b/dist/js/services/dmNotificationManager.js index 0e45ed83..5670071d 100644 --- a/dist/js/services/dmNotificationManager.js +++ b/dist/js/services/dmNotificationManager.js @@ -46,11 +46,6 @@ export class DmNotificationManager { return this.focusedConversationId; } - reset() { - this.conversationCache.clear(); - this.focusedConversationId = ""; - } - setFocusedConversation(conversationId, isFocused = true) { if (typeof conversationId !== "string") { return; diff --git a/dist/js/services/exploreDataService.js b/dist/js/services/exploreDataService.js index 3a4fc77b..67a69297 100644 --- a/dist/js/services/exploreDataService.js +++ b/dist/js/services/exploreDataService.js @@ -6,9 +6,6 @@ import { buildVideoAddressPointer } from "../utils/videoPointer.js"; const DEFAULT_IDF_REFRESH_INTERVAL_MS = 5 * 60 * 1000; const DEFAULT_HISTORY_REFRESH_INTERVAL_MS = 60 * 1000; const DEFAULT_REFRESH_DEBOUNCE_MS = 200; -const YIELD_CHUNK_SIZE = 500; - -const yieldToMain = () => new Promise((resolve) => setTimeout(resolve, 0)); function normalizeAddressKey(value) { if (typeof value !== "string") { @@ -102,8 +99,7 @@ export async function buildWatchHistoryTagCounts({ return counts; } - for (let i = 0; i < items.length; i++) { - const entry = items[i]; + for (const entry of items) { const pointer = normalizePointerInput(entry?.pointer || entry); let video = entry?.video || entry?.metadata?.video || null; @@ -127,16 +123,12 @@ export async function buildWatchHistoryTagCounts({ for (const tag of tags) { counts.set(tag, (counts.get(tag) || 0) + 1); } - - if (i > 0 && i % YIELD_CHUNK_SIZE === 0) { - await yieldToMain(); - } } return counts; } -export async function buildTagIdf({ videos } = {}) { +export function buildTagIdf({ videos } = {}) { const idf = new Map(); const list = Array.isArray(videos) ? videos : []; if (!list.length) { @@ -146,31 +138,23 @@ export async function buildTagIdf({ videos } = {}) { const docFrequency = new Map(); const totalDocs = list.length; - for (let i = 0; i < list.length; i++) { - const video = list[i]; + for (const video of list) { const tags = collectVideoTags(video); - if (tags.size) { - for (const tag of tags) { - docFrequency.set(tag, (docFrequency.get(tag) || 0) + 1); - } + if (!tags.size) { + continue; } - if (i > 0 && i % YIELD_CHUNK_SIZE === 0) { - await yieldToMain(); + for (const tag of tags) { + docFrequency.set(tag, (docFrequency.get(tag) || 0) + 1); } } - let processedCount = 0; for (const [tag, df] of docFrequency.entries()) { const ratio = (totalDocs + 1) / (df + 1); const value = 1 + Math.log(ratio); if (Number.isFinite(value) && value > 0) { idf.set(tag, value); } - processedCount++; - if (processedCount % YIELD_CHUNK_SIZE === 0) { - await yieldToMain(); - } } return idf; @@ -326,7 +310,7 @@ export default class ExploreDataService { } } - async refreshTagIdf({ force = false, videos, reason } = {}) { + refreshTagIdf({ force = false, videos, reason } = {}) { const now = Date.now(); if (!force && this.tagIdfUpdatedAt) { const elapsed = now - this.tagIdfUpdatedAt; @@ -342,7 +326,7 @@ export default class ExploreDataService { : []; try { - this.tagIdf = await buildTagIdf({ videos: sourceVideos }); + this.tagIdf = buildTagIdf({ videos: sourceVideos }); this.tagIdfUpdatedAt = now; } catch (error) { if (this.logger?.warn) { diff --git a/dist/js/services/hashtagPreferencesService.js b/dist/js/services/hashtagPreferencesService.js index bc481a51..2e4ce5c2 100644 --- a/dist/js/services/hashtagPreferencesService.js +++ b/dist/js/services/hashtagPreferencesService.js @@ -15,17 +15,11 @@ import { assertAnyRelayAccepted, } from "../nostrPublish.js"; import { userLogger, devLogger } from "../utils/logger.js"; -import { sanitizeRelayList } from "../nostr/nip46Client.js"; import { normalizeHashtag } from "../utils/hashtagNormalization.js"; import { profileCache } from "../state/profileCache.js"; import { DEFAULT_RELAY_URLS } from "../nostr/toolkit.js"; import { relayManager } from "../relayManager.js"; -import { - DEFAULT_NIP07_ENCRYPTION_METHODS, - runNip07WithRetry, - NIP07_PRIORITY, -} from "../nostr/nip07Permissions.js"; -import { relaySubscriptionService } from "./relaySubscriptionService.js"; +import { runNip07WithRetry, NIP07_PRIORITY } from "../nostr/nip07Permissions.js"; const LOG_PREFIX = "[HashtagPreferences]"; const HASHTAG_IDENTIFIER = "bitvid:tag-preferences"; @@ -99,6 +93,14 @@ function normalizeHexPubkey(pubkey) { return null; } +function sanitizeRelayList(candidate) { + return Array.isArray(candidate) + ? candidate + .map((url) => (typeof url === "string" ? url.trim() : "")) + .filter(Boolean) + : []; +} + function normalizeEncryptionToken(value) { if (typeof value !== "string") { return ""; @@ -236,24 +238,19 @@ class HashtagPreferencesService { this.eventId = null; this.eventCreatedAt = null; this.loaded = false; - this.backgroundLoading = false; this.preferencesVersion = DEFAULT_VERSION; this.decryptRetryTimeoutId = null; - this.loadPromise = null; - this.loadingPubkey = null; - this.subscriptionKey = null; - this.lastLoadError = null; profileCache.subscribe((event, detail) => { if (event === "profileChanged") { this.reset(); if (detail.pubkey) { - this.load(detail.pubkey, { allowPermissionPrompt: false }); + this.load(detail.pubkey); } } else if (event === "runtimeCleared" && detail.pubkey === this.activePubkey) { this.reset(); if (this.activePubkey) { - this.load(this.activePubkey, { allowPermissionPrompt: false }); + this.load(this.activePubkey); } } }); @@ -264,74 +261,19 @@ class HashtagPreferencesService { } reset() { - this.stopHashtagPreferencesSubscription(); this.interests = new Set(); this.disinterests = new Set(); this.eventId = null; this.eventCreatedAt = null; this.loaded = false; - this.backgroundLoading = false; this.preferencesVersion = DEFAULT_VERSION; - this.lastLoadError = null; if (this.decryptRetryTimeoutId) { clearTimeout(this.decryptRetryTimeoutId); this.decryptRetryTimeoutId = null; } - this.loadPromise = null; - this.loadingPubkey = null; this.emitChange("reset"); } - stopHashtagPreferencesSubscription() { - if (this.subscriptionKey) { - relaySubscriptionService.stopSubscription(this.subscriptionKey, "reset"); - this.subscriptionKey = null; - } - } - - ensureHashtagPreferencesSubscription(pubkey, relays) { - const normalized = normalizeHexPubkey(pubkey); - if (!normalized || !nostrClient?.pool) { - return null; - } - - const schema = getNostrEventSchema(NOTE_TYPES.HASHTAG_PREFERENCES); - const canonicalKind = schema?.kind ?? 30015; - const legacyKind = 30005; - const kinds = canonicalKind === legacyKind - ? [canonicalKind] - : [canonicalKind, legacyKind]; - - const filters = kinds.map((kind) => ({ - kinds: [kind], - authors: [normalized], - "#d": [HASHTAG_IDENTIFIER], - })); - - const key = `hashtags:${normalized}`; - this.subscriptionKey = key; - - return relaySubscriptionService.ensureSubscription({ - key, - pool: nostrClient.pool, - relays, - filters, - label: "hashtag-preferences", - onEvent: (event) => this.handleHashtagPreferencesEvent(event), - }); - } - - handleHashtagPreferencesEvent(event) { - const normalized = normalizeHexPubkey(event?.pubkey); - if (!normalized || normalized !== this.activePubkey) { - return; - } - - this.load(normalized, { allowPermissionPrompt: false }).catch((error) => { - devLogger.warn(`${LOG_PREFIX} Failed to refresh after hashtag event`, error); - }); - } - saveToCache() { const interests = this.getInterests(); const disinterests = this.getDisinterests(); @@ -483,7 +425,7 @@ class HashtagPreferencesService { } } - scheduleDecryptRetry(pubkey, error, options = {}) { + scheduleDecryptRetry(pubkey, error) { const normalized = normalizeHexPubkey(pubkey); if (!normalized) { return; @@ -496,7 +438,7 @@ class HashtagPreferencesService { if (this.activePubkey && this.activePubkey !== normalized) { return; } - this.load(normalized, options).catch((retryError) => { + this.load(normalized).catch((retryError) => { userLogger.warn(`${LOG_PREFIX} Decryption retry failed`, retryError); }); }, DECRYPT_RETRY_DELAY_MS); @@ -506,51 +448,14 @@ class HashtagPreferencesService { ); } - async load(pubkey, options = {}) { + async load(pubkey) { const normalized = normalizeHexPubkey(pubkey); - - if (this.loadPromise && this.loadingPubkey === normalized) { - devLogger.log(`${LOG_PREFIX} Reusing in-flight preferences load.`, { - pubkey: normalized, - }); - return this.loadPromise; - } - - if (this.loadPromise && this.loadingPubkey && this.loadingPubkey !== normalized) { - devLogger.log(`${LOG_PREFIX} Waiting for existing preferences load to settle.`, { - previous: this.loadingPubkey, - next: normalized, - }); - await this.loadPromise.catch(() => {}); - } - - const loadPromise = this.loadInternal(normalized, options); - this.loadPromise = loadPromise; - this.loadingPubkey = normalized; - - try { - return await loadPromise; - } finally { - if (this.loadPromise === loadPromise) { - this.loadPromise = null; - this.loadingPubkey = null; - } - } - } - - async loadInternal(pubkey, options = {}) { - const normalized = normalizeHexPubkey(pubkey); - const allowPermissionPrompt = options?.allowPermissionPrompt !== false; - this.lastLoadError = null; let wasLoadedForUser = this.activePubkey && this.activePubkey === normalized && (this.interests.size > 0 || this.disinterests.size > 0 || this.loaded); this.activePubkey = normalized; - if (allowPermissionPrompt) { - this.backgroundLoading = false; - } if (!normalized) { this.reset(); @@ -561,12 +466,7 @@ class HashtagPreferencesService { // Try cache first if (this.loadFromCache(normalized)) { wasLoadedForUser = true; - if (!allowPermissionPrompt && !this.backgroundLoading) { - this.backgroundLoading = true; - this.emitChange("background-loading", { background: true }); - } } - const wasBackgroundLoading = this.backgroundLoading; if ( !nostrClient || @@ -581,18 +481,10 @@ class HashtagPreferencesService { userLogger.warn( `${LOG_PREFIX} Keeping existing preferences despite client unavailability.`, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } this.reset(); this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } @@ -603,31 +495,12 @@ class HashtagPreferencesService { userLogger.warn( `${LOG_PREFIX} Keeping existing preferences; no relays available for refresh.`, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } this.reset(); this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } - if (!nostrClient?.pool && typeof nostrClient?.ensurePool === "function") { - try { - await nostrClient.ensurePool(); - } catch (error) { - devLogger.warn( - `${LOG_PREFIX} Failed to initialize relay pool for subscription`, - error, - ); - } - } - this.ensureHashtagPreferencesSubscription(normalized, relays); const schema = getNostrEventSchema(NOTE_TYPES.HASHTAG_PREFERENCES); const canonicalKind = schema?.kind ?? 30015; @@ -680,10 +553,6 @@ class HashtagPreferencesService { `${LOG_PREFIX} Failed to load hashtag preferences (keeping local state if any).`, fetchError, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } @@ -694,19 +563,11 @@ class HashtagPreferencesService { userLogger.warn( `${LOG_PREFIX} Keeping existing preferences despite empty relay response.`, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } this.reset(); this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } @@ -739,18 +600,10 @@ class HashtagPreferencesService { if (!latest) { if (wasLoadedForUser) { - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } this.reset(); this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } @@ -763,18 +616,12 @@ class HashtagPreferencesService { devLogger.log( `${LOG_PREFIX} Ignoring stale/concurrent preferences event (remote: ${latestCreatedAt}, local: ${currentCreatedAt}).`, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } let decryptResult; try { - const decryptPromise = this.decryptEvent(latest, normalized, { - allowPermissionPrompt, - }); + const decryptPromise = this.decryptEvent(latest, normalized); const timeoutPromise = new Promise((_, reject) => setTimeout( () => { @@ -793,7 +640,6 @@ class HashtagPreferencesService { } if (!decryptResult.ok) { - this.lastLoadError = decryptResult.error || null; userLogger.warn( `${LOG_PREFIX} Failed to decrypt hashtag preferences`, decryptResult.error, @@ -803,15 +649,7 @@ class HashtagPreferencesService { if (!wasLoadedForUser && !this.loaded) { this.loaded = true; } - this.scheduleDecryptRetry(normalized, decryptResult.error, { - allowPermissionPrompt, - }); - return; - } - if ( - !allowPermissionPrompt && - decryptResult.error?.code === "hashtag-preferences-permission-required" - ) { + this.scheduleDecryptRetry(normalized, decryptResult.error); return; } @@ -821,19 +659,11 @@ class HashtagPreferencesService { userLogger.warn( `${LOG_PREFIX} Preserving cached preferences despite decryption failure.`, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } this.reset(); this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitChange("background-loaded", { background: false }); - } return; } @@ -851,9 +681,6 @@ class HashtagPreferencesService { ? latest.created_at : null; this.loaded = true; - if (this.backgroundLoading) { - this.backgroundLoading = false; - } this.saveToCache(); this.emitChange("sync", { scheme: decryptResult.scheme }); } catch (error) { @@ -866,7 +693,7 @@ class HashtagPreferencesService { } } - async decryptEvent(event, userPubkey, options = {}) { + async decryptEvent(event, userPubkey) { const ciphertext = typeof event?.content === "string" ? event.content : ""; if (!ciphertext) { const error = new Error("Preference event missing ciphertext content."); @@ -874,13 +701,8 @@ class HashtagPreferencesService { return { ok: false, error }; } - const allowPermissionPrompt = options?.allowPermissionPrompt !== false; let signer = getActiveSigner(); - if ( - !signer && - typeof nostrClient?.ensureActiveSignerForPubkey === "function" && - allowPermissionPrompt - ) { + if (!signer && typeof nostrClient?.ensureActiveSignerForPubkey === "function") { signer = await nostrClient.ensureActiveSignerForPubkey(userPubkey); } const signerHasNip04 = typeof signer?.nip04Decrypt === "function"; @@ -894,36 +716,13 @@ class HashtagPreferencesService { (!signerHasNip44 && requiresNip44) || (!signerHasNip04 && requiresNip04) ) { - if (!allowPermissionPrompt) { - const error = new Error( - "Decrypt permissions are required to read hashtag preferences.", - ); - error.code = "hashtag-preferences-permission-required"; - return { ok: false, error }; - } try { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); - if (!permissionResult?.ok) { - const error = - permissionResult?.error instanceof Error - ? permissionResult.error - : new Error( - "Extension encryption permissions are required to read hashtag preferences.", - ); - error.code = "hashtag-preferences-permission-required"; - return { ok: false, error }; - } + await requestDefaultExtensionPermissions(); } catch (error) { userLogger.warn( `${LOG_PREFIX} Extension permissions request failed while loading preferences`, error, ); - const wrapped = - error instanceof Error ? error : new Error(String(error)); - wrapped.code = "hashtag-preferences-permission-required"; - return { ok: false, error: wrapped }; } } @@ -967,11 +766,7 @@ class HashtagPreferencesService { ); } - const nostrApi = allowPermissionPrompt - ? typeof window !== "undefined" - ? window?.nostr - : null - : null; + const nostrApi = typeof window !== "undefined" ? window?.nostr : null; if (nostrApi) { if (typeof nostrApi.nip04?.decrypt === "function") { registerDecryptor( @@ -1125,12 +920,10 @@ class HashtagPreferencesService { } if (signer.type === "extension") { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); + const permissionResult = await requestDefaultExtensionPermissions(); if (!permissionResult?.ok) { const error = new Error( - "The active signer must allow encryption before publishing preferences.", + "The active signer must allow encryption and signing before publishing preferences.", ); error.code = "hashtag-preferences-extension-denied"; error.cause = permissionResult?.error || null; diff --git a/dist/js/services/nostrService.js b/dist/js/services/nostrService.js index 9170378f..5d7dfe7e 100644 --- a/dist/js/services/nostrService.js +++ b/dist/js/services/nostrService.js @@ -176,30 +176,6 @@ function sanitizeSnapshotTimestamp(value) { return floored; } -function resolveDirectMessageCreatedAt(message) { - const createdAt = sanitizeSnapshotTimestamp( - message?.message?.created_at ?? - message?.event?.created_at ?? - message?.created_at ?? - message?.timestamp, - ); - - if (createdAt) { - return createdAt; - } - - return Math.floor(Date.now() / 1000); -} - -function resolveDirectMessageSortValue(message) { - return sanitizeSnapshotTimestamp( - message?.created_at ?? - message?.timestamp ?? - message?.message?.created_at ?? - message?.event?.created_at, - ); -} - const SNAPSHOT_PREVIEW_LIMIT = 160; function sanitizeSnapshotPreview(value) { @@ -264,7 +240,11 @@ function resolvePreviewCacheKey(message) { : typeof message?.remotePubkey === "string" ? message.remotePubkey.trim() : ""; - const timestamp = resolveDirectMessageSortValue(message); + const timestamp = Number.isFinite(message?.timestamp) + ? Math.floor(message.timestamp) + : Number.isFinite(message?.message?.created_at) + ? Math.floor(message.message.created_at) + : 0; if (remote && timestamp) { return `snapshot:${remote}:${timestamp}`; @@ -421,7 +401,11 @@ function normalizeDirectMessageRecord(message, actorPubkey = "") { receiverPubkey = senderPubkey === actor ? remote : actor; } - const createdAt = resolveDirectMessageCreatedAt(message); + const createdAt = sanitizeSnapshotTimestamp( + message?.message?.created_at ?? + message?.event?.created_at ?? + message?.timestamp, + ); const kind = Number.isFinite(message?.message?.kind) @@ -475,7 +459,7 @@ function buildSnapshotFromMessages(messages, actorPubkey = "", resolvePreview = continue; } - const timestamp = resolveDirectMessageSortValue(message); + const timestamp = sanitizeSnapshotTimestamp(message.timestamp); const preview = typeof resolvePreview === "function" ? resolvePreview(message) @@ -496,60 +480,6 @@ function buildSnapshotFromMessages(messages, actorPubkey = "", resolvePreview = ); } -function normalizeDirectMessagePayload(message) { - if (!message || message.ok !== true) { - return null; - } - - const eventId = typeof message?.event?.id === "string" ? message.event.id : ""; - if (!eventId) { - return null; - } - - const createdAt = resolveDirectMessageCreatedAt(message); - - return { - ...message, - created_at: createdAt, - timestamp: createdAt, - }; -} - -function mergeDirectMessageCache(existingMessages, incomingMessages) { - const mergedIndex = new Map(); - - const upsert = (message) => { - const normalized = normalizeDirectMessagePayload(message); - if (!normalized) { - return; - } - - const eventId = normalized.event.id; - const existing = mergedIndex.get(eventId); - if ( - !existing || - normalized.created_at >= resolveDirectMessageSortValue(existing) - ) { - mergedIndex.set(eventId, normalized); - } - }; - - for (const message of Array.isArray(existingMessages) ? existingMessages : []) { - upsert(message); - } - - for (const message of Array.isArray(incomingMessages) ? incomingMessages : []) { - upsert(message); - } - - const mergedMessages = Array.from(mergedIndex.values()); - mergedMessages.sort( - (a, b) => resolveDirectMessageSortValue(b) - resolveDirectMessageSortValue(a), - ); - - return { messages: mergedMessages, index: mergedIndex }; -} - function hydrateMessagesFromSnapshot(snapshot, actorPubkey = "") { const normalizedActor = normalizeHexPubkey(actorPubkey); const hydrated = []; @@ -629,7 +559,6 @@ export class NostrService { this.dmMessageIndex = new Map(); this.dmSubscription = null; this.dmActorPubkey = null; - this.dmSubscriptionRelays = null; this.dmHydratedFromSnapshot = false; this.dmNotificationManager = new DmNotificationManager({ logger: userLogger, @@ -770,13 +699,6 @@ export class NostrService { if (this.dmPreviewCache) { this.dmPreviewCache.clear(); } - if (this.dmNotificationManager?.reset) { - try { - this.dmNotificationManager.reset(); - } catch (error) { - userLogger.warn("[nostrService] Failed to reset DM notifications cache", error); - } - } const activeActor = normalizeHexPubkey( typeof actorPubkey === "string" && actorPubkey ? actorPubkey @@ -871,10 +793,17 @@ export class NostrService { return; } - const normalized = normalizeDirectMessagePayload(message); - if (!normalized) { - return; - } + const normalized = { + ...message, + timestamp: + Number.isFinite(message?.timestamp) + ? message.timestamp + : Number.isFinite(message?.message?.created_at) + ? message.message.created_at + : Number.isFinite(message?.event?.created_at) + ? message.event.created_at + : Date.now() / 1000, + }; this.dmMessageIndex.set(eventId, normalized); @@ -899,9 +828,7 @@ export class NostrService { this.dmMessages.push(normalized); } - this.dmMessages.sort( - (a, b) => resolveDirectMessageSortValue(b) - resolveDirectMessageSortValue(a), - ); + this.dmMessages.sort((a, b) => (b?.timestamp || 0) - (a?.timestamp || 0)); if (actor) { this.dmActorPubkey = actor; } @@ -964,14 +891,8 @@ export class NostrService { return this.getDirectMessages(); } - if (force) { - this.dmMessages = []; - this.dmMessageIndex = new Map(); - } - - const merged = mergeDirectMessageCache(this.dmMessages, hydrated); - this.dmMessageIndex = merged.index; - this.dmMessages = merged.messages; + this.dmMessages = hydrated; + this.dmMessageIndex = new Map(); this.dmHydratedFromSnapshot = hydrated.length > 0; const snapshot = this.getDirectMessages(); @@ -1006,8 +927,6 @@ export class NostrService { : Number.isFinite(decryptLimitCandidate) && decryptLimitCandidate > 0 ? Math.floor(decryptLimitCandidate) : null; - const sinceCandidate = Number(options.since); - const untilCandidate = Number(options.until); if (resolvedDecryptLimit && resolvedDecryptLimit > resolvedLimit) { resolvedDecryptLimit = resolvedLimit; @@ -1032,27 +951,6 @@ export class NostrService { this.dmActorPubkey = normalizedActor; - let resolvedSince = - Number.isFinite(sinceCandidate) && sinceCandidate >= 0 - ? Math.floor(sinceCandidate) - : null; - const resolvedUntil = - Number.isFinite(untilCandidate) && untilCandidate >= 0 - ? Math.floor(untilCandidate) - : null; - if (resolvedSince === null && initialLoad) { - let latestTimestamp = 0; - for (const message of Array.isArray(this.dmMessages) ? this.dmMessages : []) { - const timestamp = resolveDirectMessageSortValue(message); - if (timestamp > latestTimestamp) { - latestTimestamp = timestamp; - } - } - if (latestTimestamp > 0) { - resolvedSince = Math.max(latestTimestamp - 60, 0); - } - } - let messages = []; try { messages = await this.nostrClient.listDirectMessages(normalizedActor, { @@ -1060,8 +958,6 @@ export class NostrService { ...options, limit: resolvedLimit, decryptLimit: resolvedDecryptLimit, - ...(resolvedSince !== null ? { since: resolvedSince } : {}), - ...(resolvedUntil !== null ? { until: resolvedUntil } : {}), onMessage: (message) => { this.applyDirectMessage(message, { reason: "load-incremental" }); }, @@ -1072,19 +968,37 @@ export class NostrService { } const collected = []; + const index = new Map(); for (const message of Array.isArray(messages) ? messages : []) { - const normalized = normalizeDirectMessagePayload(message); - if (!normalized) { + if (!message || message.ok !== true) { continue; } + const eventId = message?.event?.id; + if (typeof eventId !== "string" || !eventId) { + continue; + } + + const normalized = { + ...message, + timestamp: + Number.isFinite(message?.timestamp) + ? message.timestamp + : Number.isFinite(message?.message?.created_at) + ? message.message.created_at + : Number.isFinite(message?.event?.created_at) + ? message.event.created_at + : Date.now() / 1000, + }; + + index.set(eventId, normalized); collected.push(normalized); } - const merged = mergeDirectMessageCache(this.dmMessages, collected); - this.dmMessageIndex = merged.index; - this.dmMessages = merged.messages; + collected.sort((a, b) => (b?.timestamp || 0) - (a?.timestamp || 0)); + this.dmMessageIndex = index; + this.dmMessages = collected; const snapshot = this.getDirectMessages(); @@ -1118,38 +1032,16 @@ export class NostrService { } async ensureDirectMessageSubscription({ actorPubkey, relays, ...handlers } = {}) { + if (this.dmSubscription) { + return this.dmSubscription; + } + const activeActor = actorPubkey || this.resolveActiveDmActor(); const normalizedActor = normalizeHexPubkey(activeActor); if (!normalizedActor) { return null; } - if (this.dmSubscription) { - if (this.dmActorPubkey === normalizedActor) { - devLogger.log( - "[nostrService] Reusing existing DM subscription for active actor.", - { - actorPubkey: normalizedActor, - relays: Array.isArray(this.dmSubscriptionRelays) - ? this.dmSubscriptionRelays - : [], - }, - ); - return this.dmSubscription; - } - devLogger.log( - "[nostrService] Replacing existing DM subscription for new actor.", - { - previous: this.dmActorPubkey, - next: normalizedActor, - previousRelays: Array.isArray(this.dmSubscriptionRelays) - ? this.dmSubscriptionRelays - : [], - }, - ); - this.stopDirectMessageSubscription(); - } - let resolvedRelays = Array.isArray(relays) ? relays : null; let relaySelection = null; @@ -1250,13 +1142,6 @@ export class NostrService { this.dmSubscription = subscription; this.dmActorPubkey = normalizedActor; - this.dmSubscriptionRelays = Array.isArray(resolvedRelays) - ? resolvedRelays.slice() - : []; - devLogger.log("[nostrService] DM subscription activated.", { - actorPubkey: normalizedActor, - relays: resolvedRelays, - }); this.emit("directMessages:subscribed", { subscription }); if (relaySelection?.warning === DM_RELAY_WARNING_FALLBACK) { this.emit("directMessages:relayWarning", { @@ -1288,7 +1173,6 @@ export class NostrService { } } this.dmSubscription = null; - this.dmSubscriptionRelays = null; } async persistDirectMessageSnapshot(actorPubkey = null, messages = null) { diff --git a/dist/js/services/playbackService.js b/dist/js/services/playbackService.js index 6b665a31..800bde0c 100644 --- a/dist/js/services/playbackService.js +++ b/dist/js/services/playbackService.js @@ -62,160 +62,6 @@ class SimpleEventEmitter { const HOSTED_URL_SUCCESS_MESSAGE = "✅ Streaming from hosted URL"; const DEFAULT_UNSUPPORTED_BTITH_MESSAGE = "This magnet link is missing a compatible BitTorrent v1 info hash."; -const AUTH_STATUS_CODES = new Set([401, 403]); -const SSL_ERROR_PATTERN = /(ssl|cert|certificate)/i; -const CORS_ERROR_PATTERN = /cors/i; -const PROBE_CACHE_TTL_MS = 45000; - -const getHostedUrlFailureDetails = (probeResult = {}) => { - const outcome = probeResult?.outcome || "error"; - const status = Number.isFinite(probeResult?.status) - ? probeResult.status - : null; - const error = probeResult?.error; - const isAuthStatus = status !== null && AUTH_STATUS_CODES.has(status); - - if (outcome === "timeout") { - return { - category: "external", - message: - "Hosted URL timed out. We’ll try WebTorrent if available.", - status, - }; - } - - if (outcome === "bad") { - if (isAuthStatus) { - return { - category: "auth", - message: - "Hosted URL requires authorization or a signed request. Please log in or re-sign.", - status, - }; - } - - if (status === 404) { - return { - category: "external", - message: "Hosted URL not found (404).", - status, - }; - } - - if (status === 403) { - return { - category: "external", - message: "Hosted URL blocked (403).", - status, - }; - } - - if (status && status >= 500) { - return { - category: "external", - message: `Hosted URL unavailable (HTTP ${status}).`, - status, - }; - } - - if (status) { - return { - category: "external", - message: `Hosted URL failed (HTTP ${status}).`, - status, - }; - } - } - - if (outcome === "opaque" || outcome === "unknown") { - return { - category: "external", - message: - "Hosted URL blocked by browser security (CORS/SSL). We’ll try WebTorrent if available.", - status, - }; - } - - if (outcome === "error") { - const message = error?.message || ""; - if (SSL_ERROR_PATTERN.test(message)) { - return { - category: "external", - message: - "Hosted URL blocked due to SSL certificate issues.", - status, - }; - } - if (CORS_ERROR_PATTERN.test(message)) { - return { - category: "external", - message: - "Hosted URL blocked by CORS. We’ll try WebTorrent if available.", - status, - }; - } - return { - category: "external", - message: - "Hosted URL failed to load due to network or security restrictions.", - status, - }; - } - - return { - category: "external", - message: "Hosted URL failed to load.", - status, - }; -}; - -const getHostedVideoErrorMessage = (videoElement) => { - if (!videoElement?.error) { - return ""; - } - - const error = videoElement.error; - const code = error.code; - const mediaErrorCodes = - typeof MediaError !== "undefined" - ? MediaError - : { - MEDIA_ERR_ABORTED: 1, - MEDIA_ERR_NETWORK: 2, - MEDIA_ERR_DECODE: 3, - MEDIA_ERR_SRC_NOT_SUPPORTED: 4, - }; - - switch (code) { - case mediaErrorCodes.MEDIA_ERR_ABORTED: - return "Hosted playback was interrupted."; - case mediaErrorCodes.MEDIA_ERR_NETWORK: - return "Hosted playback failed due to network/CORS restrictions."; - case mediaErrorCodes.MEDIA_ERR_DECODE: - return "Hosted playback failed to decode the video."; - case mediaErrorCodes.MEDIA_ERR_SRC_NOT_SUPPORTED: - return "Hosted playback failed: source not supported or blocked."; - default: - return "Hosted playback failed to load."; - } -}; - -const getTorrentErrorMessage = (error) => { - if (!error) { - return "WebTorrent could not start. Please try again."; - } - const message = error.message || ""; - if (message.includes(DEFAULT_UNSUPPORTED_BTITH_MESSAGE)) { - return DEFAULT_UNSUPPORTED_BTITH_MESSAGE; - } - if (/tracker|announce|peer/i.test(message)) { - return "WebTorrent could not reach any peers or trackers."; - } - if (/permission|blocked|denied/i.test(message)) { - return "WebTorrent was blocked by the browser or network."; - } - return "WebTorrent could not start. Please try again."; -}; export class PlaybackService { constructor({ @@ -242,9 +88,6 @@ export class PlaybackService { this.analyticsCallbacks = analyticsCallbacks || {}; this.playbackStartTimeout = playbackStartTimeout; this.currentSession = null; - this.probeCache = new Map(); - this.probeInFlight = new Map(); - this.probeCacheTtlMs = PROBE_CACHE_TTL_MS; } log(...args) { @@ -274,76 +117,6 @@ export class PlaybackService { } } - getProbeCacheKey({ url, magnet }) { - const trimmedUrl = typeof url === "string" ? url.trim() : ""; - const trimmedMagnet = typeof magnet === "string" ? magnet.trim() : ""; - return `${trimmedUrl}::${trimmedMagnet}`; - } - - pruneProbeCache(now = Date.now()) { - for (const [key, entry] of this.probeCache.entries()) { - if (!entry || !Number.isFinite(entry.expiresAt) || entry.expiresAt <= now) { - this.probeCache.delete(key); - } - } - } - - getCachedProbeResult(cacheKey, now = Date.now()) { - this.pruneProbeCache(now); - const entry = this.probeCache.get(cacheKey); - if (!entry || entry.expiresAt <= now) { - return null; - } - return entry.result; - } - - storeProbeResult(cacheKey, result, now = Date.now()) { - const ttl = - Number.isFinite(this.probeCacheTtlMs) && this.probeCacheTtlMs > 0 - ? this.probeCacheTtlMs - : PROBE_CACHE_TTL_MS; - this.probeCache.set(cacheKey, { result, expiresAt: now + ttl }); - } - - async probeHostedUrl({ url, magnet, probeUrl } = {}) { - const sanitizedUrl = typeof url === "string" ? url.trim() : ""; - if (!sanitizedUrl) { - return { outcome: "invalid" }; - } - const cacheKey = this.getProbeCacheKey({ - url: sanitizedUrl, - magnet, - }); - const cachedResult = this.getCachedProbeResult(cacheKey); - if (cachedResult) { - return cachedResult; - } - const inFlight = this.probeInFlight.get(cacheKey); - if (inFlight) { - return inFlight; - } - - const probePromise = (async () => { - try { - const result = - typeof probeUrl === "function" - ? await probeUrl(sanitizedUrl) - : { outcome: "error" }; - this.storeProbeResult(cacheKey, result); - return result; - } catch (error) { - const result = { outcome: "error", error }; - this.storeProbeResult(cacheKey, result); - return result; - } finally { - this.probeInFlight.delete(cacheKey); - } - })(); - - this.probeInFlight.set(cacheKey, probePromise); - return probePromise; - } - prepareVideoElement(videoElement) { if (!videoElement) { return; @@ -829,19 +602,10 @@ class PlaybackSession extends SimpleEventEmitter { throw new Error("No torrent playback handler provided."); } - let torrentInstance; - try { - torrentInstance = await playViaWebTorrent(this.magnetForPlayback, { - fallbackMagnet: this.fallbackMagnet, - urlList: webSeedCandidates, - }); - } catch (err) { - const errorMessage = getTorrentErrorMessage(err); - if (errorMessage) { - this.emit("status", { message: errorMessage }); - } - throw new Error(errorMessage, { cause: err }); - } + const torrentInstance = await playViaWebTorrent(this.magnetForPlayback, { + fallbackMagnet: this.fallbackMagnet, + urlList: webSeedCandidates, + }); this.service.handleAnalyticsEvent("sourcechange", { source: "torrent" }); this.emit("sourcechange", { source: "torrent" }); @@ -916,11 +680,8 @@ class PlaybackSession extends SimpleEventEmitter { { once: true } ); - const probeResult = await this.service.probeHostedUrl({ - url: httpsUrl, - magnet: this.trimmedMagnet, - probeUrl, - }); + const probeResult = + typeof probeUrl === "function" ? await probeUrl(httpsUrl) : null; const probeOutcome = probeResult?.outcome || "error"; const probeStatus = probeResult?.status || "unknown"; const shouldAttemptHosted = @@ -965,11 +726,7 @@ class PlaybackSession extends SimpleEventEmitter { attachWatchdogs({ stallMs: 0 }); return; } - const errorMessage = getHostedVideoErrorMessage(activeVideoEl); - if (errorMessage) { - this.emit("status", { message: errorMessage }); - } - outcomeResolver({ status: "fallback", reason, errorMessage }); + outcomeResolver({ status: "fallback", reason }); }, }); }; @@ -1035,25 +792,12 @@ class PlaybackSession extends SimpleEventEmitter { // Fallback triggered const fallbackReason = playbackOutcome?.reason || "watchdog-triggered"; - return { - status: "fallback", - reason: fallbackReason, - errorMessage: playbackOutcome?.errorMessage, - }; - } - - const failureDetails = getHostedUrlFailureDetails(probeResult); - if (failureDetails?.message) { - this.emit("status", { message: failureDetails.message }); + return { status: "fallback", reason: fallbackReason }; } cleanupHostedUrlStatusListeners(); cleanupDebugListeners(); - return { - status: "fallback", - reason: "probe-failed", - errorMessage: failureDetails?.message, - }; + return { status: "fallback", reason: "probe-failed" }; }; // --- Timeout Wrapper --- @@ -1085,8 +829,6 @@ class PlaybackSession extends SimpleEventEmitter { const effectiveTimeout = forcedSource ? 0 : playbackStartTimeout; - let hostedErrorMessage = ""; - if (tryUrlFirst) { if (httpsUrl) { // Wrap URL attempt in timeout @@ -1100,10 +842,6 @@ class PlaybackSession extends SimpleEventEmitter { return urlResult; } - if (typeof urlResult?.errorMessage === "string") { - hostedErrorMessage = urlResult.errorMessage; - } - // If timeout or failure, proceed to fallback if (urlResult?.reason === "timeout") { // Need to ensure URL probing/playback is effectively cancelled @@ -1167,18 +905,13 @@ class PlaybackSession extends SimpleEventEmitter { if (urlResult && urlResult.source === "url") { return urlResult; } - - if (typeof urlResult?.errorMessage === "string") { - hostedErrorMessage = urlResult.errorMessage; - } } } const message = - hostedErrorMessage || - (this.magnetProvided && !this.magnetForPlayback + this.magnetProvided && !this.magnetForPlayback ? unsupportedBtihMessage - : "No playable source found."); + : "No playable source found."; this.emit("status", { message }); this.service.handleAnalyticsEvent("sourcechange", { source: null }); this.emit("sourcechange", { source: null }); diff --git a/dist/js/services/profileMetadataService.js b/dist/js/services/profileMetadataService.js deleted file mode 100644 index 84b11405..00000000 --- a/dist/js/services/profileMetadataService.js +++ /dev/null @@ -1,293 +0,0 @@ -import { nostrClient } from "../nostrClientFacade.js"; -import { devLogger } from "../utils/logger.js"; -import { relaySubscriptionService } from "./relaySubscriptionService.js"; - -const DEFAULT_PROFILE_IMAGE = "assets/svg/default-profile.svg"; -const HEX64_REGEX = /^[0-9a-f]{64}$/i; -const inFlight = new Map(); - -function normalizePubkey(pubkey) { - if (typeof pubkey !== "string") { - return ""; - } - - const trimmed = pubkey.trim(); - if (!trimmed || !HEX64_REGEX.test(trimmed)) { - return ""; - } - - return trimmed.toLowerCase(); -} - -function resolveRelays(relays, nostr) { - if (Array.isArray(relays) && relays.length) { - return relays.filter((relay) => typeof relay === "string" && relay.trim()); - } - - if (Array.isArray(nostr?.readRelays) && nostr.readRelays.length) { - return nostr.readRelays.filter((relay) => typeof relay === "string" && relay.trim()); - } - - if (Array.isArray(nostr?.relays) && nostr.relays.length) { - return nostr.relays.filter((relay) => typeof relay === "string" && relay.trim()); - } - - return []; -} - -function parseProfileEvent(event, defaultProfileImage) { - if (!event || typeof event !== "object" || !event.content) { - return null; - } - - try { - const data = JSON.parse(event.content); - const profile = { - name: data?.display_name || data?.name || "Unknown", - picture: data?.picture || defaultProfileImage, - }; - - const about = typeof data?.about === "string" ? data.about : ""; - if (about) { - profile.about = about; - } - - const website = typeof data?.website === "string" ? data.website : ""; - if (website) { - profile.website = website; - } - - const banner = typeof data?.banner === "string" ? data.banner : ""; - if (banner) { - profile.banner = banner; - } - - const lud16 = typeof data?.lud16 === "string" ? data.lud16 : ""; - if (lud16) { - profile.lud16 = lud16; - } - - const lud06 = typeof data?.lud06 === "string" ? data.lud06 : ""; - if (lud06) { - profile.lud06 = lud06; - } - - return profile; - } catch (error) { - devLogger.warn("[profileMetadata] Failed to parse profile event", error); - return null; - } -} - -async function performProfileFetch({ - pubkeys, - nostr, - relays, - logger, - defaultProfileImage, -} = {}) { - if (!nostr?.pool || typeof nostr.pool.list !== "function") { - logger.warn("[profileMetadata] Relay pool is not ready; skipping profile fetch."); - return new Map(); - } - - const relayUrls = resolveRelays(relays, nostr); - if (!relayUrls.length) { - logger.warn("[profileMetadata] No relays configured; skipping profile fetch."); - return new Map(); - } - - const filter = { - kinds: [0], - authors: pubkeys, - limit: pubkeys.length, - }; - - const newestProfiles = new Map(); - - const results = await Promise.allSettled( - relayUrls.map((relayUrl) => - nostr.pool - .list([relayUrl], [filter]) - .then((events) => ({ relayUrl, events })) - ) - ); - - results.forEach((result, index) => { - const relayUrl = - result.status === "fulfilled" - ? result.value.relayUrl - : relayUrls[index]; - - if (result.status !== "fulfilled") { - logger.warn( - `[profileMetadata] Failed to fetch profiles from relay ${relayUrl}:`, - result.reason, - ); - return; - } - - const events = Array.isArray(result.value.events) - ? result.value.events - : []; - if (!events.length) { - return; - } - - for (const event of events) { - const pubkey = normalizePubkey(event?.pubkey); - if (!pubkey) { - continue; - } - - const createdAt = Number.isFinite(event?.created_at) - ? event.created_at - : 0; - const previous = newestProfiles.get(pubkey); - if (previous && previous.createdAt >= createdAt) { - continue; - } - - const profile = parseProfileEvent(event, defaultProfileImage); - if (!profile) { - continue; - } - - newestProfiles.set(pubkey, { - createdAt, - profile, - event, - }); - } - }); - - return newestProfiles; -} - -export async function fetchProfileMetadataBatch({ - pubkeys, - nostr = nostrClient, - relays = null, - logger = devLogger, - defaultProfileImage = DEFAULT_PROFILE_IMAGE, -} = {}) { - const normalizedPubkeys = Array.isArray(pubkeys) - ? pubkeys.map(normalizePubkey).filter(Boolean) - : []; - - if (!normalizedPubkeys.length) { - return new Map(); - } - - const uniquePubkeys = Array.from(new Set(normalizedPubkeys)); - const results = new Map(); - const waiters = []; - const toFetch = []; - - uniquePubkeys.forEach((pubkey) => { - const existing = inFlight.get(pubkey); - if (existing) { - logger.debug?.("[profileMetadata] Reusing in-flight profile fetch", { - pubkey, - }); - waiters.push( - existing.then((entry) => { - if (entry) { - results.set(pubkey, entry); - } - }), - ); - return; - } - toFetch.push(pubkey); - }); - - let batchPromise = null; - if (toFetch.length) { - logger.debug?.("[profileMetadata] Fetching profile metadata", { - count: toFetch.length, - }); - const fetchPromise = performProfileFetch({ - pubkeys: toFetch, - nostr, - relays, - logger, - defaultProfileImage, - }); - - toFetch.forEach((pubkey) => { - const perPubkeyPromise = fetchPromise - .then((map) => map.get(pubkey) || null) - .finally(() => { - if (inFlight.get(pubkey) === perPubkeyPromise) { - inFlight.delete(pubkey); - } - }); - inFlight.set(pubkey, perPubkeyPromise); - }); - - batchPromise = fetchPromise.then((map) => { - map.forEach((value, pubkey) => results.set(pubkey, value)); - }); - } - - await Promise.all([...waiters, batchPromise].filter(Boolean)); - - return results; -} - -export async function fetchProfileMetadata(pubkey, options = {}) { - const normalized = normalizePubkey(pubkey); - if (!normalized) { - return null; - } - - const results = await fetchProfileMetadataBatch({ - pubkeys: [normalized], - ...options, - }); - - return results.get(normalized) || null; -} - -export function ensureProfileMetadataSubscription({ - pubkey, - nostr = nostrClient, - relays = null, - logger = devLogger, - defaultProfileImage = DEFAULT_PROFILE_IMAGE, - onProfile, -} = {}) { - const normalized = normalizePubkey(pubkey); - if (!normalized || !nostr?.pool) { - return null; - } - - const relayUrls = resolveRelays(relays, nostr); - const filters = [{ kinds: [0], authors: [normalized], limit: 1 }]; - const key = `profile:${normalized}`; - - return relaySubscriptionService.ensureSubscription({ - key, - pool: nostr.pool, - relays: relayUrls, - filters, - label: "profile-metadata", - onEvent: (event) => { - if (!event || event.pubkey !== normalized) { - return; - } - const profile = parseProfileEvent(event, defaultProfileImage); - if (!profile) { - return; - } - if (typeof onProfile === "function") { - try { - onProfile({ profile, event }); - } catch (error) { - logger.warn("[profileMetadata] onProfile callback threw", error); - } - } - }, - }); -} diff --git a/dist/js/services/relayHealthService.js b/dist/js/services/relayHealthService.js index 98eddea6..87ed52fc 100644 --- a/dist/js/services/relayHealthService.js +++ b/dist/js/services/relayHealthService.js @@ -1,8 +1,6 @@ import { devLogger, userLogger } from "../utils/logger.js"; const TELEMETRY_STORAGE_KEY = "bitvid:relay-health-telemetry-opt-in"; -const PERSISTENT_FAILURE_THRESHOLD = 3; -const USER_LOG_COOLDOWN_MS = 5 * 60 * 1000; function resolveLogger(logger) { if (logger && logger.dev && logger.user) { @@ -92,10 +90,8 @@ class RelayHealthService { connected: false, lastLatencyMs: null, errorCount: 0, - consecutiveFailures: 0, lastCheckedAt: null, lastErrorAt: null, - lastUserLogAt: null, }); } @@ -133,47 +129,22 @@ class RelayHealthService { const state = this.ensureRelayState(relayUrl); state.connected = true; state.lastCheckedAt = Date.now(); - state.consecutiveFailures = 0; if (Number.isFinite(latencyMs)) { state.lastLatencyMs = Math.max(0, Math.round(latencyMs)); } - - if (this.nostrClient && typeof this.nostrClient.clearRelayBackoff === "function") { - this.nostrClient.clearRelayBackoff(relayUrl); - } } recordRelayFailure(relayUrl, error) { const state = this.ensureRelayState(relayUrl); - const now = Date.now(); state.connected = false; state.errorCount += 1; - state.consecutiveFailures += 1; - state.lastCheckedAt = now; - state.lastErrorAt = now; - - if (this.nostrClient && typeof this.nostrClient.markRelayUnreachable === "function") { - this.nostrClient.markRelayUnreachable(relayUrl, 60000, { - reason: "relay-health-failed", - }); - } + state.lastCheckedAt = Date.now(); + state.lastErrorAt = Date.now(); this.logger.dev.warn("[relayHealth] Relay check failed.", { relayUrl, error, }); - - if ( - state.consecutiveFailures >= PERSISTENT_FAILURE_THRESHOLD && - (!state.lastUserLogAt || now - state.lastUserLogAt >= USER_LOG_COOLDOWN_MS) - ) { - state.lastUserLogAt = now; - this.logger.user.warn("[relayHealth] Relay unreachable after repeated failures.", { - relayUrl, - errorCount: state.consecutiveFailures, - lastError: error, - }); - } } async checkRelay(relayUrl) { diff --git a/dist/js/services/relaySubscriptionService.js b/dist/js/services/relaySubscriptionService.js deleted file mode 100644 index b5457449..00000000 --- a/dist/js/services/relaySubscriptionService.js +++ /dev/null @@ -1,250 +0,0 @@ -import { devLogger, userLogger } from "../utils/logger.js"; - -function normalizeRelayList(relays) { - if (!Array.isArray(relays)) { - return []; - } - - const seen = new Set(); - const normalized = []; - relays - .map((relay) => (typeof relay === "string" ? relay.trim() : "")) - .filter(Boolean) - .forEach((relay) => { - if (!seen.has(relay)) { - seen.add(relay); - normalized.push(relay); - } - }); - - normalized.sort(); - return normalized; -} - -function normalizeFilterValue(value) { - if (Array.isArray(value)) { - const normalizedArray = value.map((entry) => normalizeFilterValue(entry)); - const isPrimitiveArray = normalizedArray.every( - (entry) => typeof entry === "string" || typeof entry === "number", - ); - if (isPrimitiveArray) { - return normalizedArray - .slice() - .sort((a, b) => String(a).localeCompare(String(b))); - } - return normalizedArray; - } - - if (value && typeof value === "object") { - return normalizeFilter(value); - } - - return value; -} - -function normalizeFilter(filter) { - if (!filter || typeof filter !== "object") { - return {}; - } - - const entries = Object.entries(filter) - .filter(([key]) => typeof key === "string") - .sort(([a], [b]) => a.localeCompare(b)); - - const normalized = {}; - entries.forEach(([key, value]) => { - normalized[key] = normalizeFilterValue(value); - }); - - return normalized; -} - -function normalizeFilters(filters) { - if (!Array.isArray(filters)) { - return []; - } - - return filters.map((filter) => normalizeFilter(filter)); -} - -function stableStringify(value) { - if (Array.isArray(value)) { - return `[${value.map((entry) => stableStringify(entry)).join(",")}]`; - } - - if (value && typeof value === "object") { - const keys = Object.keys(value).sort(); - return `{${keys - .map((key) => `${JSON.stringify(key)}:${stableStringify(value[key])}`) - .join(",")}}`; - } - - return JSON.stringify(value); -} - -function buildSignature({ relays, filters }) { - return stableStringify({ - relays: normalizeRelayList(relays), - filters: normalizeFilters(filters), - }); -} - -class RelaySubscriptionService { - constructor() { - this.subscriptions = new Map(); - } - - ensureSubscription({ - key, - pool, - relays, - filters, - label = "subscription", - onEvent, - onEose, - onClose, - } = {}) { - if (!key || typeof key !== "string") { - return null; - } - - if (!pool || typeof pool.sub !== "function") { - devLogger.warn("[relaySubscriptions] Pool unavailable; skipping subscription", { - key, - label, - }); - return null; - } - - const signature = buildSignature({ relays, filters }); - const existing = this.subscriptions.get(key); - - if (existing && existing.signature === signature && existing.subscription) { - devLogger.log("[relaySubscriptions] Reusing existing subscription", { - key, - label, - relays: existing.relays, - }); - return existing.subscription; - } - - if (existing && existing.unsubscribe) { - devLogger.warn("[relaySubscriptions] Replacing existing subscription", { - key, - label, - }); - try { - existing.unsubscribe(); - } catch (error) { - userLogger.warn("[relaySubscriptions] Failed to unsubscribe existing subscription", error); - } - } - - const relayList = normalizeRelayList(relays); - const filterList = normalizeFilters(filters); - - if (!relayList.length || !filterList.length) { - devLogger.warn("[relaySubscriptions] Missing relays or filters; skipping subscription", { - key, - label, - relays: relayList, - filters: filterList, - }); - return null; - } - - let subscription; - try { - subscription = pool.sub(relayList, filterList); - } catch (error) { - userLogger.warn("[relaySubscriptions] Failed to create relay subscription", error); - return null; - } - - const unsubscribe = () => { - try { - if (typeof subscription?.unsub === "function") { - subscription.unsub(); - } - } catch (error) { - userLogger.warn("[relaySubscriptions] Failed to unsubscribe relay subscription", error); - } - }; - - if (subscription && typeof subscription.on === "function") { - if (typeof onEvent === "function") { - subscription.on("event", (event) => { - try { - onEvent(event); - } catch (error) { - userLogger.warn("[relaySubscriptions] Event handler threw", error); - } - }); - } - if (typeof onEose === "function") { - subscription.on("eose", () => { - try { - onEose(); - } catch (error) { - userLogger.warn("[relaySubscriptions] EOSE handler threw", error); - } - }); - } - if (typeof onClose === "function") { - subscription.on("close", (reasons) => { - try { - onClose(reasons); - } catch (error) { - userLogger.warn("[relaySubscriptions] Close handler threw", error); - } - }); - } - } - - this.subscriptions.set(key, { - signature, - subscription, - unsubscribe, - label, - relays: relayList, - filters: filterList, - }); - - devLogger.log("[relaySubscriptions] Subscription activated", { - key, - label, - relays: relayList, - filters: filterList, - }); - - return subscription; - } - - stopSubscription(key, reason = "") { - if (!key || typeof key !== "string") { - return; - } - - const existing = this.subscriptions.get(key); - if (!existing) { - return; - } - - try { - existing.unsubscribe?.(); - } finally { - this.subscriptions.delete(key); - devLogger.log("[relaySubscriptions] Subscription stopped", { - key, - label: existing.label, - reason, - }); - } - } - - getSignature({ relays, filters }) { - return buildSignature({ relays, filters }); - } -} - -export const relaySubscriptionService = new RelaySubscriptionService(); diff --git a/dist/js/state/profileCache.js b/dist/js/state/profileCache.js index 3907eb3b..eacf26f4 100644 --- a/dist/js/state/profileCache.js +++ b/dist/js/state/profileCache.js @@ -166,39 +166,21 @@ class ProfileCache { return null; } - const existingEntry = this.getProfileData(normalizedPubkey, "profile"); - const existingProfile = existingEntry?.profile || {}; - - const existingName = sanitizeProfileString(existingProfile.name); - const existingPicture = sanitizeProfileMediaUrl(existingProfile.picture); - const existingAbout = sanitizeProfileString(existingProfile.about); - const existingWebsite = sanitizeProfileString(existingProfile.website); - const existingBanner = sanitizeProfileMediaUrl(existingProfile.banner); - const existingLud16 = sanitizeProfileString(existingProfile.lud16); - const existingLud06 = sanitizeProfileString(existingProfile.lud06); - const existingLightningAddress = sanitizeProfileString( - existingProfile.lightningAddress, - ); - const normalized = { name: sanitizeProfileString(profile.name || profile.display_name) || - existingName || "Unknown", picture: sanitizeProfileMediaUrl(profile.picture || profile.image) || - existingPicture || "assets/svg/default-profile.svg", }; - const about = - sanitizeProfileString(profile.about || profile.aboutMe) || existingAbout; + const about = sanitizeProfileString(profile.about || profile.aboutMe); if (about) { normalized.about = about; } - const website = - sanitizeProfileString(profile.website || profile.url) || existingWebsite; + const website = sanitizeProfileString(profile.website || profile.url); if (website) { normalized.website = website; } @@ -209,19 +191,18 @@ class ProfileCache { profile.background || profile.cover || profile.cover_image || - profile.coverImage, + profile.coverImage ); - const resolvedBanner = banner || existingBanner; - if (resolvedBanner) { - normalized.banner = resolvedBanner; + if (banner) { + normalized.banner = banner; } - const lud16 = sanitizeProfileString(profile.lud16) || existingLud16; + const lud16 = sanitizeProfileString(profile.lud16); if (lud16) { normalized.lud16 = lud16; } - const lud06 = sanitizeProfileString(profile.lud06) || existingLud06; + const lud06 = sanitizeProfileString(profile.lud06); if (lud06) { normalized.lud06 = lud06; } @@ -231,11 +212,8 @@ class ProfileCache { lud16, lud06, ].filter(Boolean); - const resolvedLightningAddress = lightningCandidates.length - ? lightningCandidates[0] - : existingLightningAddress; - if (resolvedLightningAddress) { - normalized.lightningAddress = resolvedLightningAddress; + if (lightningCandidates.length) { + normalized.lightningAddress = lightningCandidates[0]; } const entry = { @@ -368,14 +346,6 @@ class ProfileCache { this.emit("runtimeCleared", { pubkey: normalized }); } - reset() { - const previousPubkey = this.activePubkey; - this.activePubkey = null; - this.memoryCache.clear(); - this.emit("profileChanged", { pubkey: null, previousPubkey: previousPubkey || null }); - this.emit("reset", { previousPubkey: previousPubkey || null }); - } - subscribe(callback) { this.listeners.add(callback); return () => this.listeners.delete(callback); diff --git a/dist/js/subscriptions.js b/dist/js/subscriptions.js index 10c7a7ec..4c2bfc21 100644 --- a/dist/js/subscriptions.js +++ b/dist/js/subscriptions.js @@ -5,7 +5,7 @@ import { requestDefaultExtensionPermissions, } from "./nostrClientFacade.js"; import { convertEventToVideo as sharedConvertEventToVideo } from "./nostr/index.js"; -import { normalizeNostrPubkey, sanitizeRelayList } from "./nostr/nip46Client.js"; +import { normalizeNostrPubkey } from "./nostr/nip46Client.js"; import { listVideoViewEvents, subscribeVideoViewEvents, @@ -31,16 +31,11 @@ import { devLogger, userLogger } from "./utils/logger.js"; import moderationService from "./services/moderationService.js"; import nostrService from "./services/nostrService.js"; import { profileCache } from "./state/profileCache.js"; -import { - DEFAULT_NIP07_ENCRYPTION_METHODS, - runNip07WithRetry, - NIP07_PRIORITY, -} from "./nostr/nip07Permissions.js"; -import { relaySubscriptionService } from "./services/relaySubscriptionService.js"; +import { runNip07WithRetry, NIP07_PRIORITY } from "./nostr/nip07Permissions.js"; const SUBSCRIPTION_SET_KIND = getNostrEventSchema(NOTE_TYPES.SUBSCRIPTION_LIST)?.kind ?? 30000; -const DECRYPT_TIMEOUT_MS = 15000; +const DECRYPT_TIMEOUT_MS = 90000; const DECRYPT_RETRY_DELAY_MS = 10000; function normalizeHexPubkey(value) { @@ -334,12 +329,10 @@ class SubscriptionsManager { this.currentUserPubkey = null; this.loaded = false; this.loadingPromise = null; - this.backgroundLoading = false; this.subscriptionListView = null; this.lastRunOptions = null; this.lastResult = null; this.lastContainerId = null; - this.lastLoadError = null; this.unsubscribeFromNostrUpdates = null; this.pendingRefreshPromise = null; this.scheduledRefreshDetail = null; @@ -348,7 +341,6 @@ class SubscriptionsManager { this.emitter = new TinyEventEmitter(); this.decryptRetryTimeoutId = null; this.ensureNostrServiceListener(); - this.subscriptionKey = null; profileCache.subscribe((event, detail) => { if (event === "profileChanged") { @@ -358,9 +350,7 @@ class SubscriptionsManager { } else if (event === "runtimeCleared" && detail.pubkey === this.currentUserPubkey) { this.reset(); if (this.currentUserPubkey) { - this.loadSubscriptions(this.currentUserPubkey, { - allowPermissionPrompt: false, - }); + this.loadSubscriptions(this.currentUserPubkey); } } }); @@ -369,13 +359,12 @@ class SubscriptionsManager { /** * Decrypt the subscription list from kind=30000 (d="subscriptions"). */ - async loadSubscriptions(userPubkey, options = {}) { + async loadSubscriptions(userPubkey) { if (!userPubkey) { userLogger.warn("[SubscriptionsManager] No pubkey => cannot load subs."); return; } - const allowPermissionPrompt = options?.allowPermissionPrompt !== false; const normalizedUserPubkey = normalizeHexPubkey(userPubkey) || userPubkey; // 1. Attempt to load from cache first @@ -390,25 +379,14 @@ class SubscriptionsManager { this.loaded = true; // Trigger background update - if (!allowPermissionPrompt && !this.backgroundLoading) { - this.backgroundLoading = true; - this.emitter.emit("change", { - action: "background-loading", - subscribedPubkeys: Array.from(this.subscribedPubkeys), - background: true, - }); - } else if (allowPermissionPrompt) { - this.backgroundLoading = false; - } - - this.updateFromRelays(userPubkey, { allowPermissionPrompt }).catch((err) => { + this.updateFromRelays(userPubkey).catch((err) => { devLogger.warn("[SubscriptionsManager] Background update failed:", err); }); return; } // 2. If no cache, must wait for relays - await this.updateFromRelays(userPubkey, { allowPermissionPrompt }); + await this.updateFromRelays(userPubkey); } saveToCache(userPubkey) { @@ -424,7 +402,7 @@ class SubscriptionsManager { return this.emitter.on(eventName, handler); } - scheduleDecryptRetry(userPubkey, error, options = {}) { + scheduleDecryptRetry(userPubkey, error) { const normalized = normalizeHexPubkey(userPubkey) || userPubkey; if (!normalized) { return; @@ -437,7 +415,7 @@ class SubscriptionsManager { if (this.currentUserPubkey && this.currentUserPubkey !== normalized) { return; } - this.updateFromRelays(normalized, options).catch((retryError) => { + this.updateFromRelays(normalized).catch((retryError) => { userLogger.warn("[SubscriptionsManager] Decryption retry failed:", retryError); }); }, DECRYPT_RETRY_DELAY_MS); @@ -447,14 +425,11 @@ class SubscriptionsManager { ); } - async updateFromRelays(userPubkey, options = {}) { + async updateFromRelays(userPubkey) { if (!userPubkey) return; try { - const allowPermissionPrompt = options?.allowPermissionPrompt !== false; - const wasBackgroundLoading = this.backgroundLoading; const normalizedUserPubkey = normalizeHexPubkey(userPubkey) || userPubkey; - this.lastLoadError = null; const readRelays = relayManager.getReadRelayUrls(); const relayUrls = readRelays.length > 0 ? readRelays : Array.from(DEFAULT_RELAY_URLS); @@ -462,26 +437,8 @@ class SubscriptionsManager { devLogger.warn( "[SubscriptionsManager] No relay URLs available while loading subscriptions.", ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitter.emit("change", { - action: "background-loaded", - subscribedPubkeys: Array.from(this.subscribedPubkeys), - }); - } return; } - if (!nostrClient?.pool && typeof nostrClient?.ensurePool === "function") { - try { - await nostrClient.ensurePool(); - } catch (error) { - devLogger.warn( - "[SubscriptionsManager] Failed to initialize relay pool for subscription", - error, - ); - } - } - this.ensureSubscriptionListSubscription(normalizedUserPubkey, relayUrls); // Use incremental fetch helper const cachedSnapshot = parseCachedSubscriptionSnapshot( @@ -493,7 +450,7 @@ class SubscriptionsManager { pubkey: normalizedUserPubkey, dTag: SUBSCRIPTION_LIST_IDENTIFIER, relayUrls, - since: shouldForceFullFetch ? 0 : (cachedSnapshot.createdAt || 0), + since: shouldForceFullFetch ? 0 : undefined, timeoutMs: 12000, }); @@ -516,7 +473,7 @@ class SubscriptionsManager { pubkey: normalizedSessionActorPubkey, dTag: SUBSCRIPTION_LIST_IDENTIFIER, relayUrls, - since: shouldForceSessionFetch ? 0 : (sessionCachedSnapshot.createdAt || 0), + since: shouldForceSessionFetch ? 0 : undefined, timeoutMs: 12000, }); if (sessionEvents.length) { @@ -559,13 +516,6 @@ class SubscriptionsManager { // This means no updates. We keep what we have. devLogger.log("[SubscriptionsManager] No updates from relays."); } - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitter.emit("change", { - action: "background-loaded", - subscribedPubkeys: Array.from(this.subscribedPubkeys), - }); - } return; } @@ -584,9 +534,7 @@ class SubscriptionsManager { let decryptResult; try { - const decryptPromise = this.decryptSubscriptionEvent(newest, userPubkey, { - allowPermissionPrompt, - }); + const decryptPromise = this.decryptSubscriptionEvent(newest, userPubkey); const timeoutPromise = new Promise((_, reject) => setTimeout( () => { @@ -605,33 +553,17 @@ class SubscriptionsManager { } if (!decryptResult.ok) { - this.lastLoadError = decryptResult.error || null; if (decryptResult.error?.code === "subscriptions-decrypt-timeout") { if (!this.loaded && !cachedSnapshot.hasSnapshot) { this.loaded = true; } - this.scheduleDecryptRetry(normalizedUserPubkey, decryptResult.error, { - allowPermissionPrompt, - }); - return; - } - if ( - !allowPermissionPrompt && - decryptResult.error?.code === "subscriptions-permission-required" - ) { + this.scheduleDecryptRetry(normalizedUserPubkey, decryptResult.error); return; } userLogger.error( "[SubscriptionsManager] Failed to decrypt subscription list:", decryptResult.error, ); - if (wasBackgroundLoading) { - this.backgroundLoading = false; - this.emitter.emit("change", { - action: "background-loaded", - subscribedPubkeys: Array.from(this.subscribedPubkeys), - }); - } if (!this.loaded) { this.subscribedPubkeys.clear(); this.subsEventId = null; @@ -651,9 +583,6 @@ class SubscriptionsManager { this.subscribedPubkeys = newSet; this.currentUserPubkey = normalizedUserPubkey; this.loaded = true; - if (wasBackgroundLoading) { - this.backgroundLoading = false; - } // Update persistent cache this.saveToCache(normalizedUserPubkey); @@ -681,31 +610,22 @@ class SubscriptionsManager { error ); }); - } else if (wasBackgroundLoading) { - this.emitter.emit("change", { - action: "background-loaded", - subscribedPubkeys: Array.from(this.subscribedPubkeys), - }); } } catch (err) { - this.lastLoadError = err || null; userLogger.error("[SubscriptionsManager] Failed to update subs from relays:", err); } } reset() { - this.stopSubscriptionListSubscription(); this.subscribedPubkeys.clear(); this.subsEventId = null; this.subsEventCreatedAt = null; this.currentUserPubkey = null; this.loaded = false; - this.backgroundLoading = false; this.lastRunOptions = null; this.lastResult = null; this.hasRenderedOnce = false; - this.lastLoadError = null; if (this.decryptRetryTimeoutId) { clearTimeout(this.decryptRetryTimeoutId); this.decryptRetryTimeoutId = null; @@ -713,56 +633,7 @@ class SubscriptionsManager { this.emitter.emit("change", { action: "reset", subscribedPubkeys: [] }); } - stopSubscriptionListSubscription() { - if (this.subscriptionKey) { - relaySubscriptionService.stopSubscription(this.subscriptionKey, "reset"); - this.subscriptionKey = null; - } - } - - ensureSubscriptionListSubscription(userPubkey, relays) { - const normalized = normalizeHexPubkey(userPubkey); - if (!normalized || !nostrClient?.pool) { - return null; - } - - const key = `subscriptions:${normalized}`; - this.subscriptionKey = key; - - const filters = [ - { - kinds: [SUBSCRIPTION_SET_KIND], - authors: [normalized], - "#d": [SUBSCRIPTION_LIST_IDENTIFIER], - }, - ]; - - return relaySubscriptionService.ensureSubscription({ - key, - pool: nostrClient.pool, - relays, - filters, - label: "subscription-list", - onEvent: (event) => this.handleSubscriptionListEvent(event), - }); - } - - handleSubscriptionListEvent(event) { - const normalized = normalizeHexPubkey(event?.pubkey); - if (!normalized || normalized !== this.currentUserPubkey) { - return; - } - - this.updateFromRelays(normalized, { allowPermissionPrompt: false }) - .catch((error) => { - devLogger.warn( - "[SubscriptionsManager] Failed to refresh after subscription list event", - error, - ); - }); - } - - async ensureLoaded(actorHex, options = {}) { + async ensureLoaded(actorHex) { devLogger.log("[SubscriptionsManager] ensureLoaded start", actorHex); const normalizedActor = normalizeHexPubkey(actorHex) || actorHex; if (!normalizedActor) { @@ -784,7 +655,7 @@ class SubscriptionsManager { return; } - const loader = this.loadSubscriptions(normalizedActor, options); + const loader = this.loadSubscriptions(normalizedActor); this.loadingPromise = loader; try { @@ -838,7 +709,7 @@ class SubscriptionsManager { return Array.from(this.subscribedPubkeys); } - async decryptSubscriptionEvent(event, userPubkey, options = {}) { + async decryptSubscriptionEvent(event, userPubkey) { const ciphertext = typeof event?.content === "string" ? event.content : ""; if (!ciphertext) { const error = new Error("Subscription event is missing ciphertext content."); @@ -846,7 +717,6 @@ class SubscriptionsManager { return { ok: false, error }; } - const allowPermissionPrompt = options?.allowPermissionPrompt !== false; const hints = extractEncryptionHints(event); const requiresNip44 = hints.includes("nip44") || hints.includes("nip44_v2"); const requiresNip04 = !hints.length || hints.includes("nip04") || !requiresNip44; @@ -861,8 +731,7 @@ class SubscriptionsManager { if ( !signer || (!signerHasRequiredDecryptors(signer) && - typeof nostrClient?.ensureActiveSignerForPubkey === "function" && - allowPermissionPrompt) + typeof nostrClient?.ensureActiveSignerForPubkey === "function") ) { signer = await nostrClient.ensureActiveSignerForPubkey(userPubkey); } @@ -870,11 +739,7 @@ class SubscriptionsManager { const signerHasNip04 = typeof signer?.nip04Decrypt === "function"; const signerHasNip44 = typeof signer?.nip44Decrypt === "function"; - const nostrApi = allowPermissionPrompt - ? typeof window !== "undefined" - ? window?.nostr - : null - : null; + const nostrApi = typeof window !== "undefined" ? window?.nostr : null; const windowHasNip04 = typeof nostrApi?.nip04?.decrypt === "function"; const windowHasNip44 = (nostrApi?.nip44 && typeof nostrApi.nip44.decrypt === "function") || @@ -884,17 +749,8 @@ class SubscriptionsManager { (!signerHasNip44 && !windowHasNip44 && requiresNip44) || (!signerHasNip04 && !windowHasNip04 && requiresNip04) ) { - if (!allowPermissionPrompt) { - const error = new Error( - "Decrypt permissions are required to read subscriptions." - ); - error.code = "subscriptions-permission-required"; - return { ok: false, error }; - } try { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); + const permissionResult = await requestDefaultExtensionPermissions(); if (!permissionResult?.ok) { const error = permissionResult?.error instanceof Error @@ -942,19 +798,13 @@ class SubscriptionsManager { } if (nostrApi) { - const decrypterOptions = { - priority: NIP07_PRIORITY.HIGH, - timeoutMs: 12000, - retryMultiplier: 1, - }; - if (typeof nostrApi.nip04?.decrypt === "function") { registerDecryptor("nip04", (payload) => runNip07WithRetry( () => nostrApi.nip04.decrypt(userPubkey, payload), { label: "nip04.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }, ), ); @@ -971,7 +821,7 @@ class SubscriptionsManager { () => nip44.decrypt(userPubkey, payload), { label: "nip44.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }, ), ); @@ -985,7 +835,7 @@ class SubscriptionsManager { () => nip44v2.decrypt(userPubkey, payload), { label: "nip44.v2.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }, ), ); @@ -995,7 +845,7 @@ class SubscriptionsManager { () => nip44v2.decrypt(userPubkey, payload), { label: "nip44.v2.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }, ), ); @@ -1129,9 +979,7 @@ class SubscriptionsManager { } if (signer.type === "extension") { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); + const permissionResult = await requestDefaultExtensionPermissions(); if (!permissionResult.ok) { userLogger.warn( "[SubscriptionsManager] Signer permissions denied while updating subscriptions.", @@ -1240,6 +1088,13 @@ class SubscriptionsManager { throw signErr; } + const sanitizeRelayList = (candidate) => + Array.isArray(candidate) + ? candidate + .map((url) => (typeof url === "string" ? url.trim() : "")) + .filter(Boolean) + : []; + const writeRelays = sanitizeRelayList(nostrClient.writeRelays); const fallbackRelays = writeRelays.length ? writeRelays diff --git a/dist/js/ui/ambientBackground.js b/dist/js/ui/ambientBackground.js index fea7c153..47ee7131 100644 --- a/dist/js/ui/ambientBackground.js +++ b/dist/js/ui/ambientBackground.js @@ -135,7 +135,7 @@ export function attachAmbientBackground(videoElement, canvasElement, options = { let destroyed = false; let lastTime = 0; let tainted = false; - let resizeObserver = null; + let resizeBound = false; const clearCanvas = () => { if (!canvasElement) { @@ -152,12 +152,9 @@ export function attachAmbientBackground(videoElement, canvasElement, options = { cancelFrame(rafId); rafId = 0; } - if (resizeObserver) { - resizeObserver.disconnect(); - resizeObserver = null; - } - if (win) { + if (resizeBound && win) { win.removeEventListener("resize", handleResize); + resizeBound = false; } }; @@ -179,11 +176,7 @@ export function attachAmbientBackground(videoElement, canvasElement, options = { lastTime = timestamp; try { - // Optimization: Rely on ResizeObserver for dimensions. - // Do NOT call resizeCanvas() here to avoid layout thrashing. - const width = canvasElement.width || 0; - const height = canvasElement.height || 0; - + const { width, height } = resizeCanvas(canvasElement, videoElement); if (!width || !height) { schedule(); return; @@ -210,26 +203,10 @@ export function attachAmbientBackground(videoElement, canvasElement, options = { running = true; lastTime = 0; resizeCanvas(canvasElement, videoElement); - - if (!resizeObserver && win && typeof win.ResizeObserver === "function") { - try { - resizeObserver = new win.ResizeObserver(() => { - if (!destroyed) { - resizeCanvas(canvasElement, videoElement); - } - }); - const host = canvasElement.parentElement || canvasElement; - resizeObserver.observe(host); - } catch (err) { - if (logger && typeof logger.warn === "function") { - logger.warn("[ambientBackground] Failed to initialize ResizeObserver", err); - } - } - } else if (win && !resizeObserver) { - // Fallback for browsers without ResizeObserver + if (win && !resizeBound) { win.addEventListener("resize", handleResize); + resizeBound = true; } - step(); }; diff --git a/dist/js/ui/applicationBootstrap.js b/dist/js/ui/applicationBootstrap.js index 519f87e6..3079413c 100644 --- a/dist/js/ui/applicationBootstrap.js +++ b/dist/js/ui/applicationBootstrap.js @@ -34,7 +34,6 @@ import ProfileModalController from "./profileModalController.js"; import LoginModalController from "./loginModalController.js"; import { VideoListView } from "./views/VideoListView.js"; import MoreMenuController from "./moreMenuController.js"; -import VideoSettingsMenuController from "./videoSettingsMenuController.js"; import AppChromeController from "./appChromeController.js"; import { getSidebarLoadingMarkup } from "../sidebarLoading.js"; import { isWatchHistoryDebugEnabled } from "../watchHistoryDebug.js"; @@ -409,30 +408,6 @@ export default class ApplicationBootstrap { } }), ); - app.authEventUnsubscribes.push( - app.authService.on("blocksLoaded", (detail) => { - try { - app.handleBlocksLoaded(detail); - } catch (error) { - devLogger.warn( - "Failed to process blocks loaded event:", - error, - ); - } - }), - ); - app.authEventUnsubscribes.push( - app.authService.on("relaysLoaded", (detail) => { - try { - app.handleRelaysLoaded(detail); - } catch (error) { - devLogger.warn( - "Failed to process relays loaded event:", - error, - ); - } - }), - ); app.commentThreadService = this.services.commentThreadService || @@ -604,7 +579,6 @@ export default class ApplicationBootstrap { app.handleProfilePrivacyToggle(payload), onPublishDmRelayPreferences: (payload) => app.handleProfilePublishDmRelayPreferences(payload), - onRequestPermissionPrompt: () => app.handlePermissionPromptRequest(), }; app.profileController = new ProfileModalController({ @@ -697,10 +671,7 @@ export default class ApplicationBootstrap { }, }); app.moreMenuController.setVideoModal(app.videoModal); - app.videoSettingsMenuController = new VideoSettingsMenuController({ - designSystem: app.designSystemContext, - isDevMode, - }); + app.videoSettingsPopovers = new Map(); app.tagPreferencePopovers = new Map(); app.subscriptionsLink = null; @@ -717,29 +688,6 @@ export default class ApplicationBootstrap { app.lastExperimentalWarningKey = null; app.lastExperimentalWarningAt = 0; - if ( - nostrClient && - typeof nostrClient.setExtensionPermissionStatusHandler === "function" - ) { - nostrClient.setExtensionPermissionStatusHandler((status) => { - if (!status || typeof status !== "object") { - return; - } - const message = - typeof status.message === "string" ? status.message.trim() : ""; - if (!message) { - return; - } - const autoHideMs = Number.isFinite(status.autoHideMs) - ? status.autoHideMs - : 12000; - const showSpinner = status.showSpinner !== false; - if (typeof app.showStatus === "function") { - app.showStatus(message, { autoHideMs, showSpinner }); - } - }); - } - app.pubkey = null; app.currentMagnetUri = null; app.currentVideo = null; diff --git a/dist/js/ui/components/SimilarContentCard.js b/dist/js/ui/components/SimilarContentCard.js index 93705b69..b0f39e8e 100644 --- a/dist/js/ui/components/SimilarContentCard.js +++ b/dist/js/ui/components/SimilarContentCard.js @@ -985,15 +985,6 @@ export class SimilarContentCard { avatarImg.decoding = "async"; avatarImg.loading = "lazy"; avatarImg.alt = ""; - if (!avatarImg.dataset.avatarFallbackBound) { - avatarImg.addEventListener("error", () => { - if (avatarImg.getAttribute("src") !== DEFAULT_PROFILE_AVATAR) { - avatarImg.src = DEFAULT_PROFILE_AVATAR; - } - avatarImg.dataset.avatarLoadFailed = "true"; - }); - avatarImg.dataset.avatarFallbackBound = "true"; - } avatarWrapper.appendChild(avatarImg); // Append avatar then text diff --git a/dist/js/ui/components/VideoCard.js b/dist/js/ui/components/VideoCard.js index 576db2ba..4e36c461 100644 --- a/dist/js/ui/components/VideoCard.js +++ b/dist/js/ui/components/VideoCard.js @@ -916,15 +916,6 @@ export class VideoCard { "rounded-full", "object-cover" ); - if (!avatar.dataset.avatarFallbackBound) { - avatar.addEventListener("error", () => { - if (avatar.getAttribute("src") !== DEFAULT_PROFILE_AVATAR) { - avatar.src = DEFAULT_PROFILE_AVATAR; - } - avatar.dataset.avatarLoadFailed = "true"; - }); - avatar.dataset.avatarFallbackBound = "true"; - } if (this.video.pubkey) { avatar.dataset.pubkey = this.video.pubkey; } diff --git a/dist/js/ui/components/VideoModal.js b/dist/js/ui/components/VideoModal.js index 722e535f..8bf412dd 100644 --- a/dist/js/ui/components/VideoModal.js +++ b/dist/js/ui/components/VideoModal.js @@ -6201,16 +6201,11 @@ export class VideoModal { try { const token = subscribeToVideoViewCount( pointerInfo.pointer, - ({ total, status, partial }) => { + ({ total, status }) => { if (!viewEl || !viewEl.isConnected) { return; } - viewEl.textContent = this.getViewCountLabel(total, status, partial); - if (partial) { - viewEl.dataset.viewCountState = "partial"; - } else { - viewEl.dataset.viewCountState = status; - } + viewEl.textContent = this.getViewCountLabel(total, status); } ); return { pointer: pointerInfo.pointer, token }; @@ -6221,10 +6216,9 @@ export class VideoModal { } } - getViewCountLabel(total, status, partial) { + getViewCountLabel(total, status) { if (Number.isFinite(total)) { - const label = this.formatViewCountLabel(Number(total)); - return partial ? `${label} (partial)` : label; + return this.formatViewCountLabel(Number(total)); } if (status === "hydrating") { return "Loading…"; diff --git a/dist/js/ui/components/tagPillList.js b/dist/js/ui/components/tagPillList.js index 3f4dac02..36153e0a 100644 --- a/dist/js/ui/components/tagPillList.js +++ b/dist/js/ui/components/tagPillList.js @@ -237,3 +237,32 @@ export function renderTagPillStrip({ return { root, buttons }; } + +export function updateTagPillStrip({ + root, + tags = [], + onTagActivate, + getTagState, + document: doc, +} = {}) { + if (!root) { + throw new Error("A root element is required to update the tag pill strip."); + } + + const resolvedDocument = resolveDocument(doc ?? root?.ownerDocument); + assertDocument(resolvedDocument); + + cleanupExistingButtons(root); + + const buttons = tags.map((tag) => + createTagButton({ + doc: resolvedDocument, + tag, + onTagActivate, + getTagState, + }), + ); + root.append(...buttons); + + return { root, buttons }; +} diff --git a/dist/js/ui/dm/AppShell.js b/dist/js/ui/dm/AppShell.js index 5a050e5a..53799f73 100644 --- a/dist/js/ui/dm/AppShell.js +++ b/dist/js/ui/dm/AppShell.js @@ -2,7 +2,6 @@ import { Composer } from "./Composer.js"; import { ConversationList } from "./ConversationList.js"; import { MessageThread } from "./MessageThread.js"; import { DMPrivacySettings } from "./DMPrivacySettings.js"; -import { DMRelaySettings } from "./DMRelaySettings.js"; import { aggregateZapTotals } from "./zapHelpers.js"; import { createZapInterface } from "./ZapInterface.js"; @@ -137,7 +136,6 @@ export class AppShell { onToggleTypingIndicators, onRefreshConversations, onBack, - onOpenSettings, } = {}) { if (!doc) { throw new Error("AppShell requires a document reference."); @@ -184,23 +182,15 @@ export class AppShell { popover.remove(); return; } - popover = createElement(doc, "div", "dm-settings-popover absolute z-50 right-4 top-12 flex flex-col gap-4"); - - const privacySettings = DMPrivacySettings({ + popover = DMPrivacySettings({ document: doc, readReceiptsEnabled: dmPrivacySettings.readReceiptsEnabled, typingIndicatorsEnabled: dmPrivacySettings.typingIndicatorsEnabled, onToggleReadReceipts, onToggleTypingIndicators, }); - popover.appendChild(privacySettings); - - const relaySettings = DMRelaySettings({ document: doc }); - popover.appendChild(relaySettings); + popover.classList.add("dm-settings-popover", "absolute", "z-50", "right-4", "top-12", "bg-surface", "border", "border-border", "rounded-xl"); sidebarHeader.appendChild(popover); - if (typeof onOpenSettings === "function") { - onOpenSettings(popover); - } const closeHandler = (event) => { if (!popover.contains(event.target) && event.target !== settingsBtn && !settingsBtn.contains(event.target)) { diff --git a/dist/js/ui/dm/DMRelaySettings.js b/dist/js/ui/dm/DMRelaySettings.js deleted file mode 100644 index 6f2331e2..00000000 --- a/dist/js/ui/dm/DMRelaySettings.js +++ /dev/null @@ -1,80 +0,0 @@ -export function DMRelaySettings({ document: doc } = {}) { - if (!doc) { - throw new Error("DMRelaySettings requires a document reference."); - } - - const root = doc.createElement("div"); - root.id = "profileMessagesRelayPanel"; - root.className = "dm-relay-settings card space-y-4 p-5"; - - const heading = doc.createElement("div"); - heading.className = "space-y-2"; - - const title = doc.createElement("h3"); - title.className = "text-base font-semibold text-text"; - title.textContent = "DM relay hints"; - heading.appendChild(title); - - const description = doc.createElement("p"); - description.className = "text-sm text-muted"; - description.innerHTML = - 'Publish relay hints for direct messages as kind:10050 events. Use WSS-only relay URLs so encrypted DM delivery stays secure.'; - heading.appendChild(description); - root.appendChild(heading); - - const addRow = doc.createElement("div"); - addRow.className = "flex flex-col gap-3 sm:flex-row sm:items-end"; - - const label = doc.createElement("label"); - label.className = "flex-1 text-sm text-muted-strong"; - label.setAttribute("for", "profileMessagesRelayInput"); - - const labelTitle = doc.createElement("span"); - labelTitle.className = "mb-2 block font-medium"; - labelTitle.textContent = "Add a DM relay"; - label.appendChild(labelTitle); - - const input = doc.createElement("input"); - input.id = "profileMessagesRelayInput"; - input.type = "text"; - input.inputMode = "url"; - input.autocomplete = "off"; - input.className = "input"; - input.placeholder = "wss://relay.example.com"; - label.appendChild(input); - addRow.appendChild(label); - - const addButton = doc.createElement("button"); - addButton.id = "profileMessagesRelayAdd"; - addButton.type = "button"; - addButton.className = "btn focus-ring"; - addButton.textContent = "Add relay"; - addRow.appendChild(addButton); - root.appendChild(addRow); - - const publishRow = doc.createElement("div"); - publishRow.className = "flex flex-wrap items-center gap-2"; - - const publishButton = doc.createElement("button"); - publishButton.id = "profileMessagesRelayPublish"; - publishButton.type = "button"; - publishButton.className = "btn-ghost focus-ring text-xs"; - publishButton.textContent = "Publish relay hints"; - publishRow.appendChild(publishButton); - - const status = doc.createElement("span"); - status.id = "profileMessagesRelayStatus"; - status.className = "text-xs text-muted"; - status.setAttribute("role", "status"); - status.setAttribute("aria-live", "polite"); - publishRow.appendChild(status); - root.appendChild(publishRow); - - const list = doc.createElement("ul"); - list.id = "profileMessagesRelayList"; - list.className = "grid-stack"; - list.dataset.orientation = "vertical"; - root.appendChild(list); - - return root; -} diff --git a/dist/js/ui/moderationCopy.js b/dist/js/ui/moderationCopy.js index df2b33ed..4ddfaea0 100644 --- a/dist/js/ui/moderationCopy.js +++ b/dist/js/ui/moderationCopy.js @@ -1,6 +1,6 @@ // js/ui/moderationCopy.js -function buildModerationReasonText(context) { +export function buildModerationReasonText(context) { if (!context) { return ""; } @@ -31,7 +31,7 @@ function buildModerationReasonText(context) { return combined.charAt(0).toUpperCase() + combined.slice(1); } -function buildHiddenSummaryLabel(context) { +export function buildHiddenSummaryLabel(context) { if (!context) { return ""; } diff --git a/dist/js/ui/moreMenuController.js b/dist/js/ui/moreMenuController.js index 7b2082f1..601d89fe 100644 --- a/dist/js/ui/moreMenuController.js +++ b/dist/js/ui/moreMenuController.js @@ -1520,8 +1520,6 @@ export default class MoreMenuController { const message = error?.code === "nip04-missing" ? "Your Nostr extension must support NIP-04 to manage private lists." - : error?.code === "extension-encryption-permission-denied" - ? "Your Nostr extension must allow encryption to update your block list." : "Failed to update your block list. Please try again."; this.callbacks.showError(message); } diff --git a/dist/js/ui/profileModalController.js b/dist/js/ui/profileModalController.js index 678e27eb..46d0edc5 100644 --- a/dist/js/ui/profileModalController.js +++ b/dist/js/ui/profileModalController.js @@ -58,7 +58,6 @@ const TRUSTED_MUTE_HIDE_HELPER_TEXT = "Reaching this count hides cards (with “Show anyway”); lower signals only blur thumbnails or block autoplay."; const TYPING_INDICATOR_TTL_SECONDS = 15; const TYPING_INDICATOR_COOLDOWN_MS = 4000; -const DIRECT_MESSAGES_BATCH_DELAY_MS = 250; const ADD_PROFILE_CANCELLATION_CODES = new Set([ "login-cancelled", @@ -1195,7 +1194,6 @@ export class ProfileModalController { onTogglePrivacy: callbacks.onTogglePrivacy || noop, onOpenRelays: callbacks.onOpenRelays || noop, onPublishDmRelayPreferences: callbacks.onPublishDmRelayPreferences || noop, - onRequestPermissionPrompt: callbacks.onRequestPermissionPrompt || noop, }; this.profileModal = null; @@ -1253,9 +1251,6 @@ export class ProfileModalController { this.addRelayButton = null; this.restoreRelaysButton = null; this.relayHealthPanel = null; - this.relayHealthSummary = null; - this.relayHealthCounts = null; - this.relayHealthMessage = null; this.relayHealthList = null; this.relayHealthStatus = null; this.relayHealthRefreshButton = null; @@ -1319,32 +1314,14 @@ export class ProfileModalController { this.walletStatusText = null; this.profileWalletStatusText = null; this.hashtagStatusText = null; - this.hashtagBackgroundLoading = false; this.hashtagInterestList = null; this.hashtagInterestEmpty = null; this.hashtagInterestInput = null; this.addHashtagInterestButton = null; - this.profileHashtagInterestRefreshBtn = null; this.hashtagDisinterestList = null; this.hashtagDisinterestEmpty = null; this.hashtagDisinterestInput = null; this.addHashtagDisinterestButton = null; - this.profileHashtagDisinterestRefreshBtn = null; - this.subscriptionsStatusText = null; - this.subscriptionsBackgroundLoading = false; - this.permissionPromptCta = null; - this.permissionPromptCtaMessage = null; - this.permissionPromptCtaButton = null; - this.permissionPromptCtaState = { - visible: false, - message: "", - buttonLabel: "Enable permissions", - busy: false, - }; - this.profileSubscriptionsRefreshBtn = null; - this.profileFriendsRefreshBtn = null; - this.profileBlockedRefreshBtn = null; - this.profileRelayRefreshBtn = null; this.moderationSettingsCard = null; this.moderationBlurInput = null; this.moderationAutoplayInput = null; @@ -1363,7 +1340,6 @@ export class ProfileModalController { this.adminModeratorList = null; this.addModeratorButton = null; this.moderatorInput = null; - this.adminModeratorsRefreshBtn = null; this.adminModeratorsSection = null; this.adminModeratorsEmpty = null; this.adminAddModeratorButton = null; @@ -1373,7 +1349,6 @@ export class ProfileModalController { this.whitelistList = null; this.addWhitelistButton = null; this.whitelistInput = null; - this.adminWhitelistRefreshBtn = null; this.adminWhitelistSection = null; this.adminWhitelistEmpty = null; this.adminWhitelistList = null; @@ -1384,7 +1359,6 @@ export class ProfileModalController { this.blacklistList = null; this.addBlacklistButton = null; this.blacklistInput = null; - this.adminBlacklistRefreshBtn = null; this.adminBlacklistSection = null; this.adminBlacklistEmpty = null; this.adminBlacklistList = null; @@ -1399,8 +1373,6 @@ export class ProfileModalController { this.directMessagesLastActor = null; this.directMessagesSubscription = null; this.directMessagesUnsubscribes = []; - this.directMessagesRenderTimeout = null; - this.pendingDirectMessagesUpdate = null; this.pendingMessagesRender = null; this.messagesStatusClearTimeout = null; this.dmPrivacyToggleTouched = false; @@ -1440,8 +1412,8 @@ export class ProfileModalController { this.subscriptionsService && typeof this.subscriptionsService.on === "function" ) { - this.subscriptionsService.on("change", (detail) => { - this.handleSubscriptionsChange(detail); + this.subscriptionsService.on("change", () => { + void this.populateSubscriptionsList(); }); } @@ -1522,12 +1494,6 @@ export class ProfileModalController { this.profileModalPaneWrapper = this.profileModalRoot?.querySelector("[data-profile-mobile-pane]") || null; this.profileModal = this.profileModalRoot; - this.permissionPromptCta = - document.getElementById("profilePermissionPrompt") || null; - this.permissionPromptCtaMessage = - document.getElementById("profilePermissionPromptMessage") || null; - this.permissionPromptCtaButton = - document.getElementById("profilePermissionPromptButton") || null; this.closeButton = document.getElementById("closeProfileModal") || null; this.profileModalBackButton = document.getElementById("profileModalBack") || null; @@ -1598,12 +1564,6 @@ export class ProfileModalController { document.getElementById("restoreRelaysBtn") || null; this.relayHealthPanel = document.getElementById("relayHealthPanel") || null; - this.relayHealthSummary = - document.getElementById("relayHealthSummary") || null; - this.relayHealthCounts = - document.getElementById("relayHealthCounts") || null; - this.relayHealthMessage = - document.getElementById("relayHealthMessage") || null; this.relayHealthList = document.getElementById("relayHealthList") || null; this.relayHealthStatus = @@ -1612,28 +1572,20 @@ export class ProfileModalController { document.getElementById("relayHealthRefreshBtn") || null; this.relayHealthTelemetryToggle = document.getElementById("relayHealthTelemetryOptIn") || null; - this.profileRelayRefreshBtn = - document.getElementById("relayListRefreshBtn") || null; this.subscriptionList = document.getElementById("subscriptionsList") || null; this.subscriptionListEmpty = document.getElementById("subscriptionsEmpty") || null; - this.profileSubscriptionsRefreshBtn = - document.getElementById("subscriptionsRefreshBtn") || null; this.friendList = document.getElementById("friendsList") || null; this.friendListEmpty = document.getElementById("friendsEmpty") || null; this.friendInput = document.getElementById("friendsInput") || null; this.addFriendButton = document.getElementById("addFriendBtn") || null; - this.profileFriendsRefreshBtn = - document.getElementById("friendsRefreshBtn") || null; this.blockList = document.getElementById("blockedList") || null; this.blockListEmpty = document.getElementById("blockedEmpty") || null; this.blockInput = document.getElementById("blockedInput") || null; this.addBlockedButton = document.getElementById("addBlockedBtn") || null; - this.profileBlockedRefreshBtn = - document.getElementById("blockedRefreshBtn") || null; this.profileMessagesPane = document.getElementById("profilePaneMessages") || null; @@ -1677,7 +1629,16 @@ export class ProfileModalController { document.getElementById("profileMessagesPrivacyToggle") || null; this.profileMessagesPrivacyMode = document.getElementById("profileMessagesPrivacyMode") || null; - this.cacheDmRelayElements(); + this.profileMessagesRelayList = + document.getElementById("profileMessagesRelayList") || null; + this.profileMessagesRelayInput = + document.getElementById("profileMessagesRelayInput") || null; + this.profileMessagesRelayAddButton = + document.getElementById("profileMessagesRelayAdd") || null; + this.profileMessagesRelayPublishButton = + document.getElementById("profileMessagesRelayPublish") || null; + this.profileMessagesRelayStatus = + document.getElementById("profileMessagesRelayStatus") || null; this.profileMessagesUnreadDot = document.getElementById("profileMessagesUnreadDot") || null; this.dmAppShellContainer = @@ -1737,8 +1698,6 @@ export class ProfileModalController { document.getElementById("profileHashtagInterestInput") || null; this.addHashtagInterestButton = document.getElementById("profileAddHashtagInterestBtn") || null; - this.profileHashtagInterestRefreshBtn = - document.getElementById("profileHashtagInterestRefreshBtn") || null; this.hashtagDisinterestList = document.getElementById("profileHashtagDisinterestList") || null; this.hashtagDisinterestEmpty = @@ -1747,11 +1706,6 @@ export class ProfileModalController { document.getElementById("profileHashtagDisinterestInput") || null; this.addHashtagDisinterestButton = document.getElementById("profileAddHashtagDisinterestBtn") || null; - this.profileHashtagDisinterestRefreshBtn = - document.getElementById("profileHashtagDisinterestRefreshBtn") || null; - this.subscriptionsStatusText = - document.getElementById("subscriptionsStatus") || null; - this.applyPermissionPromptCtaState(); this.profileRelayList = this.relayList; this.profileRelayInput = this.relayInput; @@ -1820,8 +1774,6 @@ export class ProfileModalController { document.getElementById("adminAddModeratorBtn") || null; this.moderatorInput = document.getElementById("adminModeratorInput") || null; - this.adminModeratorsRefreshBtn = - document.getElementById("adminModeratorsRefreshBtn") || null; this.storageUnlockBtn = document.getElementById("profileStorageUnlockBtn") || null; this.storageSaveBtn = document.getElementById("storageSaveBtn") || null; @@ -1863,8 +1815,6 @@ export class ProfileModalController { document.getElementById("adminAddWhitelistBtn") || null; this.whitelistInput = document.getElementById("adminWhitelistInput") || null; - this.adminWhitelistRefreshBtn = - document.getElementById("adminWhitelistRefreshBtn") || null; this.blacklistSection = document.getElementById("adminBlacklistSection") || null; this.blacklistEmpty = @@ -1875,33 +1825,6 @@ export class ProfileModalController { document.getElementById("adminAddBlacklistBtn") || null; this.blacklistInput = document.getElementById("adminBlacklistInput") || null; - this.adminBlacklistRefreshBtn = - document.getElementById("adminBlacklistRefreshBtn") || null; - - const ensureAriaLabel = (button, label) => { - if (!(button instanceof HTMLElement)) { - return; - } - if (!button.getAttribute("aria-label")) { - button.setAttribute("aria-label", label); - } - }; - - ensureAriaLabel(this.profileRelayRefreshBtn, "Refresh relay list"); - ensureAriaLabel( - this.profileHashtagInterestRefreshBtn, - "Refresh interest hashtags", - ); - ensureAriaLabel( - this.profileHashtagDisinterestRefreshBtn, - "Refresh disinterest hashtags", - ); - ensureAriaLabel(this.profileSubscriptionsRefreshBtn, "Refresh subscriptions"); - ensureAriaLabel(this.profileFriendsRefreshBtn, "Refresh friends"); - ensureAriaLabel(this.profileBlockedRefreshBtn, "Refresh blocked creators"); - ensureAriaLabel(this.adminModeratorsRefreshBtn, "Refresh moderators"); - ensureAriaLabel(this.adminWhitelistRefreshBtn, "Refresh whitelist"); - ensureAriaLabel(this.adminBlacklistRefreshBtn, "Refresh blacklist"); this.adminWhitelistSection = this.whitelistSection; this.adminWhitelistEmpty = this.whitelistEmpty; @@ -2276,63 +2199,6 @@ export class ProfileModalController { setLinkPreviewAutoFetch(Boolean(enabled)); } - cacheDmRelayElements() { - this.profileMessagesRelayList = - document.getElementById("profileMessagesRelayList") || null; - this.profileMessagesRelayInput = - document.getElementById("profileMessagesRelayInput") || null; - this.profileMessagesRelayAddButton = - document.getElementById("profileMessagesRelayAdd") || null; - this.profileMessagesRelayPublishButton = - document.getElementById("profileMessagesRelayPublish") || null; - this.profileMessagesRelayStatus = - document.getElementById("profileMessagesRelayStatus") || null; - } - - bindDmRelayControls() { - const bindOnce = (element, eventName, handler, key) => { - if (!(element instanceof HTMLElement)) { - return; - } - const datasetKey = key || "dmRelayBound"; - if (element.dataset[datasetKey] === "true") { - return; - } - element.dataset[datasetKey] = "true"; - element.addEventListener(eventName, handler); - }; - - bindOnce( - this.profileMessagesRelayAddButton, - "click", - () => { - void this.handleAddDmRelayPreference(); - }, - "dmRelayAddBound", - ); - - bindOnce( - this.profileMessagesRelayInput, - "keydown", - (event) => { - if (event.key === "Enter") { - event.preventDefault(); - void this.handleAddDmRelayPreference(); - } - }, - "dmRelayInputBound", - ); - - bindOnce( - this.profileMessagesRelayPublishButton, - "click", - () => { - void this.handlePublishDmRelayPreferences(); - }, - "dmRelayPublishBound", - ); - } - async refreshDmRelayPreferences({ force = false } = {}) { const owner = this.resolveActiveDmRelayOwner(); if (!owner) { @@ -3605,8 +3471,6 @@ export class ProfileModalController { return "We couldn’t create secure wrapper keys for NIP-17 delivery."; case "extension-permission-denied": return "Please grant your Nostr extension permission to send messages."; - case "extension-encryption-permission-denied": - return "Please grant your Nostr extension encryption permission to send messages."; case "missing-actor-pubkey": return "We couldn’t determine your public key to send this message."; case "nostr-uninitialized": @@ -4629,11 +4493,6 @@ export class ProfileModalController { onToggleTypingIndicators: (enabled) => { this.handleTypingIndicatorsToggle(enabled); }, - onOpenSettings: () => { - this.cacheDmRelayElements(); - this.bindDmRelayControls(); - this.populateDmRelayPreferences(); - }, }); } catch (error) { this.dmAppShell = null; @@ -5110,49 +4969,28 @@ export class ProfileModalController { this.updateMessagesReloadState(); } - clearDirectMessagesUpdateQueue() { - if (this.directMessagesRenderTimeout) { - const clearTimeoutFn = - typeof window !== "undefined" && typeof window.clearTimeout === "function" - ? window.clearTimeout.bind(window) - : clearTimeout; - clearTimeoutFn(this.directMessagesRenderTimeout); - this.directMessagesRenderTimeout = null; - } - this.pendingDirectMessagesUpdate = null; - } - - scheduleDirectMessagesRender(payload = null) { - if (!payload) { + handleDirectMessagesUpdated(detail = {}) { + if ( + this.activeMessagesRequest && + detail?.reason !== "load-incremental" + ) { return; } - this.pendingDirectMessagesUpdate = payload; + const messages = Array.isArray(detail?.messages) + ? detail.messages + : []; + this.directMessagesCache = messages; - if (this.directMessagesRenderTimeout) { + const actor = this.resolveActiveDmActor(); + if (!actor) { + this.setMessagesLoadingState("unauthenticated"); return; } - const scheduleTimeout = - typeof window !== "undefined" && typeof window.setTimeout === "function" - ? window.setTimeout.bind(window) - : setTimeout; + this.directMessagesLastActor = actor; - this.directMessagesRenderTimeout = scheduleTimeout(() => { - this.directMessagesRenderTimeout = null; - this.flushDirectMessagesRender(); - }, DIRECT_MESSAGES_BATCH_DELAY_MS); - } - - flushDirectMessagesRender() { - const pending = this.pendingDirectMessagesUpdate; - this.pendingDirectMessagesUpdate = null; - if (!pending) { - return; - } - - const { messages, actorPubkey, reason } = pending; - void this.renderProfileMessages(messages, { actorPubkey }) + void this.renderProfileMessages(messages, { actorPubkey: actor }) .then(() => { if (!messages.length) { this.setMessagesLoadingState("empty"); @@ -5160,6 +4998,8 @@ export class ProfileModalController { this.setMessagesLoadingState("ready"); } + const reason = + typeof detail?.reason === "string" ? detail.reason : ""; if (reason === "subscription") { this.setMessagesAnnouncement("New direct message received."); } else if (reason === "load") { @@ -5178,40 +5018,11 @@ export class ProfileModalController { }); } - handleDirectMessagesUpdated(detail = {}) { - if ( - this.activeMessagesRequest && - detail?.reason !== "load-incremental" - ) { - return; - } - - const messages = Array.isArray(detail?.messages) - ? detail.messages - : []; - this.directMessagesCache = messages; - - const actor = this.resolveActiveDmActor(); - if (!actor) { - this.setMessagesLoadingState("unauthenticated"); - this.clearDirectMessagesUpdateQueue(); - return; - } - - this.directMessagesLastActor = actor; - this.scheduleDirectMessagesRender({ - messages, - actorPubkey: actor, - reason: typeof detail?.reason === "string" ? detail.reason : "", - }); - } - handleDirectMessagesCleared() { if (this.activeMessagesRequest) { return; } - this.clearDirectMessagesUpdateQueue(); this.directMessagesCache = []; this.setDirectMessageRecipient(null, { reason: "clear" }); if (this.profileMessagesList instanceof HTMLElement) { @@ -5238,15 +5049,6 @@ export class ProfileModalController { const error = detail?.error || detail?.failure || detail; const reason = detail?.context?.reason || ""; const errorCode = error?.code || ""; - const errorMessage = - typeof error === "string" - ? error - : typeof error?.message === "string" - ? error.message - : ""; - const requiresNip44Decryptor = - typeof errorMessage === "string" && - errorMessage.includes("Gift wrap events require a NIP-44 decryptor"); const isBenign = reason === "no-decryptors" || @@ -5266,21 +5068,6 @@ export class ProfileModalController { return; } - if (requiresNip44Decryptor) { - const nip44Message = - "NIP-17 direct messages require a NIP-44-capable signer or extension. Unlock or update your extension to continue."; - if (!this.directMessagesCache.length) { - this.setMessagesLoadingState("error", { - message: nip44Message, - }); - return; - } - - this.setMessagesAnnouncement(nip44Message); - this.updateMessagesReloadState(); - return; - } - if (!this.directMessagesCache.length) { this.setMessagesLoadingState("error", { message: "Unable to sync direct messages right now.", @@ -5351,12 +5138,6 @@ export class ProfileModalController { }); } - if (this.permissionPromptCtaButton instanceof HTMLElement) { - this.permissionPromptCtaButton.addEventListener("click", () => { - this.callbacks.onRequestPermissionPrompt({ controller: this }); - }); - } - Object.entries(this.navButtons).forEach(([name, button]) => { if (button instanceof HTMLElement) { button.addEventListener("click", () => { @@ -5377,27 +5158,6 @@ export class ProfileModalController { }); } - if (this.profileRelayRefreshBtn instanceof HTMLElement) { - this.profileRelayRefreshBtn.addEventListener("click", () => { - const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); - if (!activeHex) { - return; - } - const service = this.services.relayManager; - if (!service || typeof service.loadRelayList !== "function") { - return; - } - void service - .loadRelayList(activeHex) - .then(() => { - this.populateProfileRelays(); - }) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh relay list:", error); - }); - }); - } - if (this.relayHealthRefreshButton instanceof HTMLElement) { this.relayHealthRefreshButton.addEventListener("click", () => { void this.refreshRelayHealthPanel({ forceRefresh: true, reason: "manual" }); @@ -5416,27 +5176,6 @@ export class ProfileModalController { }); } - if (this.profileBlockedRefreshBtn instanceof HTMLElement) { - this.profileBlockedRefreshBtn.addEventListener("click", () => { - const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); - if (!activeHex) { - return; - } - const blocksService = this.services.userBlocks; - if (!blocksService || typeof blocksService.loadBlocks !== "function") { - return; - } - void blocksService - .loadBlocks(activeHex) - .then(() => { - this.populateBlockedList(); - }) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh blocked list:", error); - }); - }); - } - if (this.blockInput instanceof HTMLElement) { this.blockInput.addEventListener("keydown", (event) => { if (event.key === "Enter") { @@ -5446,95 +5185,12 @@ export class ProfileModalController { }); } - if (this.profileSubscriptionsRefreshBtn instanceof HTMLElement) { - this.profileSubscriptionsRefreshBtn.addEventListener("click", () => { - const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); - if (!activeHex) { - return; - } - const service = this.subscriptionsService; - if (!service || typeof service.loadSubscriptions !== "function") { - return; - } - void service - .loadSubscriptions(activeHex, { allowPermissionPrompt: true }) - .then(() => { - void this.populateSubscriptionsList(); - }) - .catch((error) => { - devLogger.warn( - "[profileModal] Failed to refresh subscriptions list:", - error, - ); - }); - }); - } - - if (this.profileFriendsRefreshBtn instanceof HTMLElement) { - this.profileFriendsRefreshBtn.addEventListener("click", () => { - const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); - if (!activeHex) { - return; - } - const moderationService = this.moderationService; - const refreshPromise = - moderationService && - typeof moderationService.ensureViewerContactsLoaded === "function" - ? moderationService.ensureViewerContactsLoaded(activeHex) - : this.subscriptionsService && - typeof this.subscriptionsService.ensureLoaded === "function" - ? this.subscriptionsService.ensureLoaded(activeHex) - : null; - - void Promise.resolve(refreshPromise) - .then(() => { - this.populateFriendsList(); - }) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh friends list:", error); - }); - }); - } - if (this.addHashtagInterestButton instanceof HTMLElement) { this.addHashtagInterestButton.addEventListener("click", () => { void this.handleAddHashtagPreference("interest"); }); } - const handleHashtagRefresh = () => { - const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); - if (!activeHex) { - return; - } - const service = this.hashtagPreferencesService; - if (!service || typeof service.load !== "function") { - return; - } - void service - .load(activeHex, { allowPermissionPrompt: true }) - .catch((error) => { - devLogger.warn( - "[profileModal] Failed to refresh hashtag preferences:", - error, - ); - }); - }; - - if (this.profileHashtagInterestRefreshBtn instanceof HTMLElement) { - this.profileHashtagInterestRefreshBtn.addEventListener( - "click", - handleHashtagRefresh, - ); - } - - if (this.profileHashtagDisinterestRefreshBtn instanceof HTMLElement) { - this.profileHashtagDisinterestRefreshBtn.addEventListener( - "click", - handleHashtagRefresh, - ); - } - if (this.hashtagInterestInput instanceof HTMLElement) { this.hashtagInterestInput.addEventListener("keydown", (event) => { if (event.key === "Enter") { @@ -5597,7 +5253,26 @@ export class ProfileModalController { }); } - this.bindDmRelayControls(); + if (this.profileMessagesRelayAddButton instanceof HTMLElement) { + this.profileMessagesRelayAddButton.addEventListener("click", () => { + void this.handleAddDmRelayPreference(); + }); + } + + if (this.profileMessagesRelayInput instanceof HTMLElement) { + this.profileMessagesRelayInput.addEventListener("keydown", (event) => { + if (event.key === "Enter") { + event.preventDefault(); + void this.handleAddDmRelayPreference(); + } + }); + } + + if (this.profileMessagesRelayPublishButton instanceof HTMLElement) { + this.profileMessagesRelayPublishButton.addEventListener("click", () => { + void this.handlePublishDmRelayPreferences(); + }); + } if (this.profileMessageSendButton instanceof HTMLElement) { this.profileMessageSendButton.addEventListener("click", () => { @@ -5739,21 +5414,6 @@ export class ProfileModalController { }); } - if (this.adminModeratorsRefreshBtn instanceof HTMLElement) { - this.adminModeratorsRefreshBtn.addEventListener("click", () => { - const service = this.services.accessControl; - if (!service || typeof service.refresh !== "function") { - return; - } - void service - .refresh() - .then(() => this.refreshAdminPaneState()) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh moderators:", error); - }); - }); - } - if (this.moderatorInput instanceof HTMLElement) { this.moderatorInput.addEventListener("keydown", (event) => { if (event.key === "Enter") { @@ -5769,21 +5429,6 @@ export class ProfileModalController { }); } - if (this.adminWhitelistRefreshBtn instanceof HTMLElement) { - this.adminWhitelistRefreshBtn.addEventListener("click", () => { - const service = this.services.accessControl; - if (!service || typeof service.refresh !== "function") { - return; - } - void service - .refresh() - .then(() => this.refreshAdminPaneState()) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh whitelist:", error); - }); - }); - } - if (this.whitelistInput instanceof HTMLElement) { this.whitelistInput.addEventListener("keydown", (event) => { if (event.key === "Enter") { @@ -5799,21 +5444,6 @@ export class ProfileModalController { }); } - if (this.adminBlacklistRefreshBtn instanceof HTMLElement) { - this.adminBlacklistRefreshBtn.addEventListener("click", () => { - const service = this.services.accessControl; - if (!service || typeof service.refresh !== "function") { - return; - } - void service - .refresh() - .then(() => this.refreshAdminPaneState()) - .catch((error) => { - devLogger.warn("[profileModal] Failed to refresh blacklist:", error); - }); - }); - } - if (this.blacklistInput instanceof HTMLElement) { this.blacklistInput.addEventListener("keydown", (event) => { if (event.key === "Enter") { @@ -7188,20 +6818,11 @@ export class ProfileModalController { this.populateStoragePane(); } else if (target === "hashtags") { this.populateHashtagPreferences(); - if (activeHex && this.hashtagPreferencesService) { - this.hashtagPreferencesService - .load(activeHex, { allowPermissionPrompt: true }) - .catch(noop); - } - this.refreshHashtagBackgroundStatus(); } else if (target === "subscriptions") { if (activeHex && this.subscriptionsService) { - this.subscriptionsService - .loadSubscriptions(activeHex, { allowPermissionPrompt: true }) - .catch(noop); + this.subscriptionsService.loadSubscriptions(activeHex).catch(noop); } void this.populateSubscriptionsList(); - this.refreshSubscriptionsBackgroundStatus(); } else if (target === "blocked") { if (activeHex && this.services.userBlocks) { this.services.userBlocks.loadBlocks(activeHex).catch(noop); @@ -7326,45 +6947,11 @@ export class ProfileModalController { this.relayHealthStatus.textContent = text; } - updateRelayHealthSummary(snapshot = []) { - if (!this.relayHealthCounts || !this.relayHealthMessage) { - return; - } - - const entries = Array.isArray(snapshot) ? snapshot : []; - const total = entries.length; - const healthy = entries.filter((entry) => entry.connected).length; - const failed = Math.max(0, total - healthy); - - this.relayHealthCounts.textContent = `${healthy} healthy • ${failed} failed`; - - let message = ""; - if (!total) { - message = "No relays configured."; - } else if (failed > 0) { - message = - failed === total - ? "All relays are unreachable. Check your connection or update your relay list." - : `${failed} relay${failed === 1 ? "" : "s"} unreachable. Playback and publishing may be delayed.`; - } else { - message = "All relays reachable."; - } - - this.relayHealthMessage.className = "mt-1 text-xs text-muted"; - if (failed > 0) { - this.relayHealthMessage.classList.add("text-status-warning"); - } else if (total > 0) { - this.relayHealthMessage.classList.add("text-status-success"); - } - this.relayHealthMessage.textContent = message; - } - renderRelayHealthSnapshot(snapshot = []) { if (!this.relayHealthList) { return; } - this.updateRelayHealthSummary(snapshot); this.relayHealthList.innerHTML = ""; if (!snapshot.length) { @@ -7878,58 +7465,6 @@ export class ProfileModalController { }; } - setPermissionPromptCtaState(nextState = {}) { - if (!nextState || typeof nextState !== "object") { - return; - } - - this.permissionPromptCtaState = { - ...this.permissionPromptCtaState, - ...nextState, - }; - - this.applyPermissionPromptCtaState(); - } - - applyPermissionPromptCtaState() { - if (!(this.permissionPromptCta instanceof HTMLElement)) { - return; - } - - const fallbackMessage = - "Enable permissions to load your subscriptions and hashtag preferences."; - const { - visible, - message, - buttonLabel, - busy, - } = this.permissionPromptCtaState || {}; - const normalizedMessage = - typeof message === "string" && message.trim() - ? message.trim() - : fallbackMessage; - - this.permissionPromptCta.classList.toggle("hidden", !visible); - this.permissionPromptCta.setAttribute("aria-hidden", (!visible).toString()); - - if (this.permissionPromptCtaMessage instanceof HTMLElement) { - this.permissionPromptCtaMessage.textContent = normalizedMessage; - } - - if (this.permissionPromptCtaButton instanceof HTMLButtonElement) { - const normalizedLabel = - typeof buttonLabel === "string" && buttonLabel.trim() - ? buttonLabel.trim() - : "Enable permissions"; - this.permissionPromptCtaButton.textContent = normalizedLabel; - this.permissionPromptCtaButton.disabled = Boolean(busy); - this.permissionPromptCtaButton.setAttribute( - "aria-busy", - busy ? "true" : "false", - ); - } - } - setHashtagStatus(message = "", tone = "muted") { if (!(this.hashtagStatusText instanceof HTMLElement)) { return; @@ -7973,89 +7508,6 @@ export class ProfileModalController { } } - setSubscriptionsStatus(message = "", tone = "muted") { - if (!(this.subscriptionsStatusText instanceof HTMLElement)) { - return; - } - - const classList = this.subscriptionsStatusText.classList; - classList.remove( - "text-status-success", - "text-status-warning", - "text-status-danger", - "text-status-info", - "text-muted", - ); - - const normalized = - typeof message === "string" && message.trim() ? message.trim() : ""; - - if (!normalized) { - this.subscriptionsStatusText.textContent = ""; - this.subscriptionsStatusText.classList.add("text-muted", "hidden"); - return; - } - - this.subscriptionsStatusText.textContent = normalized; - this.subscriptionsStatusText.classList.remove("hidden"); - - switch (tone) { - case "success": - classList.add("text-status-success"); - break; - case "warning": - case "error": - classList.add("text-status-warning"); - break; - case "info": - classList.add("text-status-info"); - break; - default: - classList.add("text-muted"); - break; - } - } - - refreshHashtagBackgroundStatus() { - const isBackground = this.hashtagPreferencesService?.backgroundLoading === true; - const statusText = this.hashtagStatusText?.textContent?.trim?.() || ""; - - if (isBackground && !this.hashtagBackgroundLoading) { - this.hashtagBackgroundLoading = true; - if (!statusText) { - this.setHashtagStatus("Loading in background…", "info"); - } - return; - } - - if (!isBackground && this.hashtagBackgroundLoading) { - if (statusText === "Loading in background…") { - this.setHashtagStatus("", "muted"); - } - this.hashtagBackgroundLoading = false; - } - } - - refreshSubscriptionsBackgroundStatus() { - const isBackground = this.subscriptionsService?.backgroundLoading === true; - const statusText = this.subscriptionsStatusText?.textContent?.trim?.() || ""; - - if (isBackground && !this.subscriptionsBackgroundLoading) { - this.subscriptionsBackgroundLoading = true; - if (!statusText) { - this.setSubscriptionsStatus("Loading in background…", "info"); - } - return; - } - - if (!isBackground && this.subscriptionsBackgroundLoading) { - if (statusText === "Loading in background…") { - this.setSubscriptionsStatus("", "muted"); - } - this.subscriptionsBackgroundLoading = false; - } - } - clearHashtagInputs() { if (this.hashtagInterestInput instanceof HTMLInputElement) { this.hashtagInterestInput.value = ""; @@ -8074,7 +7526,6 @@ export class ProfileModalController { if (!snapshot.interests.length && !snapshot.disinterests.length) { this.setHashtagStatus("", "muted"); } - this.refreshHashtagBackgroundStatus(); } renderHashtagList(type, tags) { @@ -8392,45 +7843,7 @@ export class ProfileModalController { detail && typeof detail.preferences === "object" ? detail.preferences : detail; - const action = typeof detail?.action === "string" ? detail.action : ""; - - if (action === "background-loading") { - this.hashtagBackgroundLoading = true; - this.setHashtagStatus("Loading in background…", "info"); - } else if ( - (action === "sync" || action === "background-loaded" || action === "reset") && - this.hashtagBackgroundLoading - ) { - const statusText = this.hashtagStatusText?.textContent?.trim?.() || ""; - if (statusText === "Loading in background…") { - this.setHashtagStatus("", "muted"); - } - this.hashtagBackgroundLoading = false; - } - this.populateHashtagPreferences(preferences); - this.refreshHashtagBackgroundStatus(); - } - - handleSubscriptionsChange(detail = {}) { - const action = typeof detail?.action === "string" ? detail.action : ""; - - if (action === "background-loading") { - this.subscriptionsBackgroundLoading = true; - this.setSubscriptionsStatus("Loading in background…", "info"); - } else if ( - (action === "sync" || action === "background-loaded" || action === "reset") && - this.subscriptionsBackgroundLoading - ) { - const statusText = this.subscriptionsStatusText?.textContent?.trim?.() || ""; - if (statusText === "Loading in background…") { - this.setSubscriptionsStatus("", "muted"); - } - this.subscriptionsBackgroundLoading = false; - } - - void this.populateSubscriptionsList(); - this.refreshSubscriptionsBackgroundStatus(); } populateBlockedList(blocked = null) { @@ -8624,14 +8037,12 @@ export class ProfileModalController { const service = this.subscriptionsService; if (!service) { this.clearSubscriptionsList(); - this.refreshSubscriptionsBackgroundStatus(); return; } const activeHex = this.normalizeHexPubkey(this.getActivePubkey()); if (!activeHex) { this.clearSubscriptionsList(); - this.refreshSubscriptionsBackgroundStatus(); return; } @@ -8730,7 +8141,6 @@ export class ProfileModalController { if (!deduped.length) { this.subscriptionListEmpty.classList.remove("hidden"); this.subscriptionList.classList.add("hidden"); - this.refreshSubscriptionsBackgroundStatus(); return; } @@ -8827,7 +8237,6 @@ export class ProfileModalController { ); } } - this.refreshSubscriptionsBackgroundStatus(); } catch (error) { devLogger.warn("[profileModal] Failed to populate subscriptions list:", error); } @@ -9357,9 +8766,6 @@ export class ProfileModalController { const message = mutationResult?.error?.code === "nip04-missing" ? "Your Nostr extension must support NIP-04 to manage private lists." - : mutationResult?.error?.code === - "extension-encryption-permission-denied" - ? "Your Nostr extension must allow encryption to update your block list." : mutationResult?.error?.message || "Failed to update your block list. Please try again."; context.error = mutationResult?.error || null; @@ -9380,8 +8786,6 @@ export class ProfileModalController { const message = error?.code === "nip04-missing" ? "Your Nostr extension must support NIP-04 to manage private lists." - : error?.code === "extension-encryption-permission-denied" - ? "Your Nostr extension must allow encryption to update your block list." : "Failed to update your block list. Please try again."; this.showError(message); } @@ -9432,9 +8836,6 @@ export class ProfileModalController { const message = mutationResult.error.code === "nip04-missing" ? "Your Nostr extension must support NIP-04 to manage private lists." - : mutationResult.error.code === - "extension-encryption-permission-denied" - ? "Your Nostr extension must allow encryption to update your block list." : mutationResult.error.message || "Failed to update your block list. Please try again."; if (message) { @@ -9451,8 +8852,6 @@ export class ProfileModalController { const message = error?.code === "nip04-missing" ? "Your Nostr extension must support NIP-04 to manage private lists." - : error?.code === "extension-encryption-permission-denied" - ? "Your Nostr extension must allow encryption to update your block list." : "Failed to update your block list. Please try again."; this.showError(message); } @@ -13352,9 +12751,7 @@ export class ProfileModalController { this.services.userBlocks.loadBlocks(activePubkey).catch(noop); } if (this.subscriptionsService) { - this.subscriptionsService - .loadSubscriptions(activePubkey, { allowPermissionPrompt: false }) - .catch(noop); + this.subscriptionsService.loadSubscriptions(activePubkey).catch(noop); } } diff --git a/dist/js/ui/torrentStatusController.js b/dist/js/ui/torrentStatusController.js index f3f2204d..855aae11 100644 --- a/dist/js/ui/torrentStatusController.js +++ b/dist/js/ui/torrentStatusController.js @@ -1,4 +1,3 @@ -import { isVerboseDevMode } from "../config.js"; import { devLogger } from "../utils/logger.js"; export default class TorrentStatusController { @@ -8,36 +7,14 @@ export default class TorrentStatusController { } this.getVideoModal = getVideoModal; this.onRemovePoster = typeof onRemovePoster === "function" ? onRemovePoster : () => {}; - this.lastEmitted = { - status: null, - progress: null, - peers: null, - speed: null, - downloaded: null, - }; - this.lastVerboseLogAt = 0; - this.lastVerboseSummaryKey = ""; - this.verboseLogIntervalMs = 3000; } update(torrent) { - if (!torrent) { - if (isVerboseDevMode) { - this.logVerboseSummary({ hasTorrent: false }); - } - return; - } + devLogger.log("[DEBUG] TorrentStatusController.update called with torrent:", torrent); - if (isVerboseDevMode) { - this.logVerboseSummary({ - hasTorrent: true, - progress: torrent.progress, - numPeers: torrent.numPeers, - downloadSpeed: torrent.downloadSpeed, - downloaded: torrent.downloaded, - length: torrent.length, - ready: torrent.ready, - }); + if (!torrent) { + devLogger.log("[DEBUG] torrent is null/undefined!"); + return; } if (torrent.ready || (typeof torrent.progress === "number" && torrent.progress > 0)) { @@ -49,79 +26,48 @@ export default class TorrentStatusController { ); } + // Log only fields that actually exist on the torrent: + devLogger.log("[DEBUG] torrent.progress =", torrent.progress); + devLogger.log("[DEBUG] torrent.numPeers =", torrent.numPeers); + devLogger.log("[DEBUG] torrent.downloadSpeed =", torrent.downloadSpeed); + devLogger.log("[DEBUG] torrent.downloaded =", torrent.downloaded); + devLogger.log("[DEBUG] torrent.length =", torrent.length); + devLogger.log("[DEBUG] torrent.ready =", torrent.ready); + const videoModal = this.getVideoModal(); // Use "Complete" vs. "Downloading" as the textual status. if (videoModal) { - const fullyDownloaded = Number(torrent.progress) >= 1; - const status = torrent.ready - ? "Ready to play" - : fullyDownloaded - ? "Complete" - : "Downloading"; - this.updateIfChanged("status", status, () => { - if (typeof videoModal.updateStatus === "function") { - videoModal.updateStatus(status); - } - }); + const fullyDownloaded = torrent.progress >= 1; + if (typeof videoModal.updateStatus === "function") { + videoModal.updateStatus(fullyDownloaded ? "Complete" : "Downloading"); + } - const progressValue = Number.isFinite(torrent.progress) - ? `${(torrent.progress * 100).toFixed(2)}%` - : "0.00%"; - this.updateIfChanged("progress", progressValue, () => { - if (typeof videoModal.updateProgress === "function") { - videoModal.updateProgress(progressValue); - } - }); + if (typeof videoModal.updateProgress === "function") { + const percent = (torrent.progress * 100).toFixed(2); + videoModal.updateProgress(`${percent}%`); + } - const peersValue = `Peers: ${Number.isFinite(torrent.numPeers) ? torrent.numPeers : 0}`; - this.updateIfChanged("peers", peersValue, () => { - if (typeof videoModal.updatePeers === "function") { - videoModal.updatePeers(peersValue); - } - }); + if (typeof videoModal.updatePeers === "function") { + videoModal.updatePeers(`Peers: ${torrent.numPeers}`); + } - const speedValue = Number.isFinite(torrent.downloadSpeed) - ? `${(torrent.downloadSpeed / 1024).toFixed(2)} KB/s` - : "0.00 KB/s"; - this.updateIfChanged("speed", speedValue, () => { - if (typeof videoModal.updateSpeed === "function") { - videoModal.updateSpeed(speedValue); - } - }); + if (typeof videoModal.updateSpeed === "function") { + const kb = (torrent.downloadSpeed / 1024).toFixed(2); + videoModal.updateSpeed(`${kb} KB/s`); + } - const downloadedMb = Number.isFinite(torrent.downloaded) - ? (torrent.downloaded / (1024 * 1024)).toFixed(2) - : "0.00"; - const lengthMb = Number.isFinite(torrent.length) - ? (torrent.length / (1024 * 1024)).toFixed(2) - : "0.00"; - const downloadedValue = `${downloadedMb} MB / ${lengthMb} MB`; - this.updateIfChanged("downloaded", downloadedValue, () => { - if (typeof videoModal.updateDownloaded === "function") { - videoModal.updateDownloaded(downloadedValue); - } - }); + if (typeof videoModal.updateDownloaded === "function") { + const downloadedMb = (torrent.downloaded / (1024 * 1024)).toFixed(2); + const lengthMb = (torrent.length / (1024 * 1024)).toFixed(2); + videoModal.updateDownloaded( + `${downloadedMb} MB / ${lengthMb} MB` + ); + } + + if (torrent.ready && typeof videoModal.updateStatus === "function") { + videoModal.updateStatus("Ready to play"); + } } } - - updateIfChanged(key, nextValue, updater) { - if (this.lastEmitted[key] === nextValue) { - return; - } - this.lastEmitted[key] = nextValue; - updater(); - } - - logVerboseSummary(summary) { - const summaryKey = JSON.stringify(summary); - const now = Date.now(); - const shouldSample = now - this.lastVerboseLogAt >= this.verboseLogIntervalMs; - if (summaryKey === this.lastVerboseSummaryKey && !shouldSample) { - return; - } - this.lastVerboseSummaryKey = summaryKey; - this.lastVerboseLogAt = now; - devLogger.debug("[DEBUG] TorrentStatusController.update", summary); - } } diff --git a/dist/js/ui/urlHealthController.js b/dist/js/ui/urlHealthController.js index 62a7a921..4591f095 100644 --- a/dist/js/ui/urlHealthController.js +++ b/dist/js/ui/urlHealthController.js @@ -11,10 +11,6 @@ export default class UrlHealthController { this.logger = logger; this.constants = constants; this.callbacks = callbacks; - - this.activeVideoProbes = 0; - this.videoProbeQueue = []; - this.MAX_CONCURRENT_VIDEO_PROBES = 3; } getUrlHealthPlaceholderMarkup(options = {}) { @@ -258,85 +254,67 @@ export default class UrlHealthController { return { outcome: "error" }; } - if (this.activeVideoProbes >= this.MAX_CONCURRENT_VIDEO_PROBES) { - await new Promise((resolve) => { - this.videoProbeQueue.push(resolve); - }); - } + return new Promise((resolve) => { + const video = document.createElement("video"); + let settled = false; + let timeoutId = null; - this.activeVideoProbes++; - - try { - return await new Promise((resolve) => { - const video = document.createElement("video"); - let settled = false; - let timeoutId = null; - - const cleanup = () => { - if (timeoutId) { - clearTimeout(timeoutId); - } - video.removeEventListener("loadeddata", handleSuccess); - video.removeEventListener("canplay", handleSuccess); - video.removeEventListener("error", handleError); - try { - video.pause(); - } catch (err) { - // ignore pause failures - } - try { - video.removeAttribute("src"); - video.load(); - } catch (err) { - // ignore cleanup failures - } - }; - - const settle = (result) => { - if (settled) { - return; - } - settled = true; - cleanup(); - resolve(result); - }; - - const handleSuccess = () => { - settle({ outcome: "ok" }); - }; - - const handleError = () => { - settle({ outcome: "error" }); - }; - - if (Number.isFinite(effectiveTimeout) && effectiveTimeout > 0) { - timeoutId = setTimeout(() => { - settle({ outcome: "timeout" }); - }, effectiveTimeout); + const cleanup = () => { + if (timeoutId) { + clearTimeout(timeoutId); } - + video.removeEventListener("loadeddata", handleSuccess); + video.removeEventListener("canplay", handleSuccess); + video.removeEventListener("error", handleError); try { - video.preload = "metadata"; - video.muted = true; - video.playsInline = true; - video.addEventListener("loadeddata", handleSuccess, { once: true }); - video.addEventListener("canplay", handleSuccess, { once: true }); - video.addEventListener("error", handleError, { once: true }); - video.src = trimmed; + video.pause(); + } catch (err) { + // ignore pause failures + } + try { + video.removeAttribute("src"); video.load(); } catch (err) { - settle({ outcome: "error", error: err }); + // ignore cleanup failures } - }); - } finally { - this.activeVideoProbes--; - if (this.videoProbeQueue.length > 0) { - const next = this.videoProbeQueue.shift(); - if (typeof next === "function") { - next(); + }; + + const settle = (result) => { + if (settled) { + return; } + settled = true; + cleanup(); + resolve(result); + }; + + const handleSuccess = () => { + settle({ outcome: "ok" }); + }; + + const handleError = () => { + settle({ outcome: "error" }); + }; + + if (Number.isFinite(effectiveTimeout) && effectiveTimeout > 0) { + timeoutId = setTimeout(() => { + settle({ outcome: "timeout" }); + }, effectiveTimeout); } - } + + try { + video.preload = "metadata"; + video.muted = true; + video.playsInline = true; + video.addEventListener("loadeddata", handleSuccess, { once: true }); + video.addEventListener("canplay", handleSuccess, { once: true }); + video.addEventListener("error", handleError, { once: true }); + video.src = trimmed; + video.load(); + } catch (err) { + settle({ outcome: "error", error: err }); + } + }); } async probeUrl(url, options = {}) { diff --git a/dist/js/ui/videoListViewController.js b/dist/js/ui/videoListViewController.js index 2879e96a..46ae2f44 100644 --- a/dist/js/ui/videoListViewController.js +++ b/dist/js/ui/videoListViewController.js @@ -79,7 +79,7 @@ export default class VideoListViewController { } const messageContext = - reason === "login" && postLoginResult?.blocksLoaded === true + reason === "login" && postLoginResult?.blocksLoaded !== false ? "Applying your filters…" : "Refreshing videos…"; diff --git a/dist/js/ui/videoModalController.js b/dist/js/ui/videoModalController.js deleted file mode 100644 index 7f32497a..00000000 --- a/dist/js/ui/videoModalController.js +++ /dev/null @@ -1,202 +0,0 @@ -import { devLogger } from "../utils/logger.js"; - -export default class VideoModalController { - constructor({ - getVideoModal, - callbacks: { - showError, - getLastModalTrigger, - setLastModalTrigger, - getCurrentVideo, - } = {}, - }) { - this.getVideoModal = getVideoModal; - this.showError = showError; - this.getLastModalTrigger = getLastModalTrigger; - this.setLastModalTrigger = setLastModalTrigger; - this.getCurrentVideo = getCurrentVideo; - - this.videoModalReadyPromise = null; - } - - get videoModal() { - return this.getVideoModal ? this.getVideoModal() : null; - } - - log(message, ...args) { - devLogger.log("[VideoModalController]", message, ...args); - } - - /** - * Show the modal and set the "Please stand by" poster on the video. - */ - async showModalWithPoster(video = null, options = {}) { - if (!this.videoModal) { - return null; - } - - if (Object.prototype.hasOwnProperty.call(options || {}, "trigger")) { - if (this.setLastModalTrigger) { - this.setLastModalTrigger(options.trigger); - } - } - - const targetVideo = - video || (this.getCurrentVideo ? this.getCurrentVideo() : null); - if (!targetVideo) { - this.log("Skipping video modal open; no target video is available."); - return null; - } - - try { - const { root } = await this.ensureVideoModalReady({ - ensureVideoElement: true, - }); - - if (!this.videoModal) { - return root || null; - } - - const trigger = this.getLastModalTrigger - ? this.getLastModalTrigger() - : null; - this.videoModal.open(targetVideo, { - triggerElement: trigger, - }); - this.applyModalLoadingPoster(); - - return ( - root || - (typeof this.videoModal.getRoot === "function" - ? this.videoModal.getRoot() - : null) - ); - } catch (error) { - devLogger.error( - "[VideoModalController] Failed to open the video modal before playback:", - error, - ); - if (this.showError) { - this.showError("Could not open the video player. Please try again."); - } - return null; - } - } - - applyModalLoadingPoster() { - if (!this.videoModal) { - return; - } - this.videoModal.applyLoadingPoster(); - } - - forceRemoveModalPoster(reason = "manual-clear") { - if (!this.videoModal) { - return false; - } - return this.videoModal.forceRemovePoster(reason); - } - - async ensureVideoModalReady({ ensureVideoElement = false } = {}) { - if (!this.videoModal) { - throw new Error("Video modal instance is not available."); - } - - const getRoot = () => - typeof this.videoModal.getRoot === "function" - ? this.videoModal.getRoot() - : null; - const getVideoElement = () => - typeof this.videoModal.getVideoElement === "function" - ? this.videoModal.getVideoElement() - : null; - - const existingRoot = getRoot(); - const existingVideoElement = getVideoElement(); - const rootConnected = Boolean(existingRoot && existingRoot.isConnected); - const hasVideoElement = Boolean(existingVideoElement); - const videoConnected = Boolean( - existingVideoElement && existingVideoElement.isConnected, - ); - - const needsRehydrate = - !rootConnected || !hasVideoElement || !videoConnected; - - if (!needsRehydrate) { - if ( - existingVideoElement && - this.videoModal && - typeof this.videoModal.setVideoElement === "function" - ) { - const currentModalVideo = - typeof this.videoModal.getVideoElement === "function" - ? this.videoModal.getVideoElement() - : null; - if (currentModalVideo !== existingVideoElement) { - this.videoModal.setVideoElement(existingVideoElement); - } - } - - return { - root: existingRoot, - videoElement: existingVideoElement, - }; - } - - if (!videoConnected) { - if ( - this.videoModal && - typeof this.videoModal.setVideoElement === "function" - ) { - this.videoModal.setVideoElement(null); - } - } - - if (!this.videoModalReadyPromise) { - if (typeof this.videoModal.load !== "function") { - throw new Error("Video modal does not expose a load() method."); - } - this.videoModalReadyPromise = Promise.resolve(this.videoModal.load()); - } - - try { - await this.videoModalReadyPromise; - } catch (error) { - this.videoModalReadyPromise = null; - throw error; - } - - this.videoModalReadyPromise = null; - - const readyRoot = getRoot(); - const readyVideoElement = getVideoElement(); - const readyVideoConnected = Boolean( - readyVideoElement && readyVideoElement.isConnected, - ); - - if (readyVideoConnected) { - if ( - this.videoModal && - typeof this.videoModal.setVideoElement === "function" - ) { - this.videoModal.setVideoElement(readyVideoElement); - } - } else { - if ( - this.videoModal && - typeof this.videoModal.setVideoElement === "function" - ) { - this.videoModal.setVideoElement(null); - } - } - - if (ensureVideoElement && !readyVideoConnected) { - throw new Error("Video modal video element is missing after load()."); - } - - return { - root: readyRoot, - videoElement: readyVideoConnected ? readyVideoElement : null, - }; - } -} diff --git a/dist/js/ui/videoSettingsMenuController.js b/dist/js/ui/videoSettingsMenuController.js deleted file mode 100644 index 11dd2918..00000000 --- a/dist/js/ui/videoSettingsMenuController.js +++ /dev/null @@ -1,171 +0,0 @@ -import createPopoverDefault from "./overlay/popoverEngine.js"; -import { createVideoSettingsMenuPanel as createVideoSettingsMenuPanelDefault } from "./components/videoMenuRenderers.js"; -import { userLogger } from "../utils/logger.js"; -import { normalizeDesignSystemContext } from "../designSystem.js"; - -export default class VideoSettingsMenuController { - constructor(options = {}) { - const { - designSystem = null, - isDevMode = false, - createPopover = createPopoverDefault, - createVideoSettingsMenuPanel = createVideoSettingsMenuPanelDefault, - } = options; - - this.createPopover = createPopover; - this.createVideoSettingsMenuPanel = createVideoSettingsMenuPanel; - this.designSystem = normalizeDesignSystemContext(designSystem); - this.isDevMode = Boolean(isDevMode); - this.popovers = new Map(); - } - - ensurePopover(detail = {}) { - const trigger = detail.trigger || null; - if (!trigger) { - return null; - } - - let entry = this.popovers.get(trigger); - if (!entry) { - entry = { - trigger, - context: { - card: detail.card || null, - video: detail.video || null, - index: Number.isFinite(detail.index) ? Math.floor(detail.index) : 0, - capabilities: detail.capabilities || {}, - restoreFocusOnClose: detail.restoreFocus !== false, - }, - popover: null, - }; - - const render = ({ document: documentRef, close }) => { - const panel = this.createVideoSettingsMenuPanel({ - document: documentRef, - video: entry.context.video, - index: entry.context.index, - capabilities: entry.context.capabilities, - designSystem: this.designSystem, - }); - - if (!panel) { - return null; - } - - const buttons = panel.querySelectorAll("button[data-action]"); - buttons.forEach((button) => { - button.addEventListener("click", (event) => { - event.preventDefault(); - event.stopPropagation(); - - const action = button.dataset.action || ""; - const handled = entry.context.card?.handleSettingsMenuAction?.( - action, - { event }, - ); - - if (!handled && this.isDevMode) { - userLogger.warn(`[SettingsMenu] Unhandled action: ${action}`); - } - - close(); - }); - }); - - return panel; - }; - - const documentRef = - trigger.ownerDocument || - (typeof document !== "undefined" ? document : null); - - const popover = this.createPopover(trigger, render, { - document: documentRef, - placement: "bottom-end", - }); - - const originalDestroy = popover.destroy?.bind(popover); - if (typeof originalDestroy === "function") { - popover.destroy = (...args) => { - originalDestroy(...args); - if (this.popovers.get(trigger) === entry) { - this.popovers.delete(trigger); - } - }; - } - - entry.popover = popover; - this.popovers.set(trigger, entry); - } - - entry.context = { - ...entry.context, - card: detail.card || entry.context.card, - video: detail.video || entry.context.video, - index: Number.isFinite(detail.index) - ? Math.floor(detail.index) - : entry.context.index, - capabilities: detail.capabilities || entry.context.capabilities, - restoreFocusOnClose: detail.restoreFocus !== false, - }; - - return entry; - } - - requestMenu(detail = {}) { - const entry = this.ensurePopover(detail); - if (!entry?.popover) { - return; - } - - if (typeof entry.popover.isOpen === "function" && entry.popover.isOpen()) { - entry.popover.close({ - restoreFocus: entry.context.restoreFocusOnClose !== false, - }); - return; - } - - entry.popover - .open() - .catch((error) => - userLogger.error("[SettingsMenu] Failed to open popover:", error), - ); - } - - closeMenu(detail = {}) { - const trigger = detail.trigger || null; - const restoreFocus = detail.restoreFocus !== false; - - if (trigger) { - const entry = this.popovers.get(trigger); - if (entry?.popover && typeof entry.popover.close === "function") { - return entry.popover.close({ restoreFocus }); - } - return false; - } - - return this.closeAll({ restoreFocus }); - } - - closeAll(options = {}) { - let closed = false; - const restoreFocus = options?.restoreFocus !== false; - - this.popovers.forEach((entry) => { - if (entry?.popover && typeof entry.popover.close === "function") { - const result = entry.popover.close({ restoreFocus }); - closed = closed || result; - } - }); - return closed; - } - - destroy() { - this.popovers.forEach((entry) => { - if (entry?.popover && typeof entry.popover.destroy === "function") { - entry.popover.destroy(); - } - }); - this.popovers.clear(); - } -} diff --git a/dist/js/ui/views/VideoListView.js b/dist/js/ui/views/VideoListView.js index 099a0b3d..b6965f95 100644 --- a/dist/js/ui/views/VideoListView.js +++ b/dist/js/ui/views/VideoListView.js @@ -1134,20 +1134,16 @@ export class VideoListView { elements: new Set(), lastTotal: null, lastStatus: "idle", - lastPartial: false, lastText: "– views", }; try { - const token = subscribeToVideoViewCount(pointerInfo.pointer, ({ total, status, partial }) => { + const token = subscribeToVideoViewCount(pointerInfo.pointer, ({ total, status }) => { let text; if (Number.isFinite(total)) { const numeric = Number(total); entry.lastTotal = numeric; text = this.formatters.formatViewCountLabel(numeric); - if (partial) { - text = `${text} (partial)`; - } } else if (status === "hydrating") { text = "Loading views…"; } else { @@ -1155,7 +1151,6 @@ export class VideoListView { } entry.lastStatus = status; - entry.lastPartial = Boolean(partial); entry.lastText = text; for (const el of Array.from(entry.elements)) { @@ -1164,11 +1159,6 @@ export class VideoListView { continue; } el.textContent = text; - if (entry.lastPartial) { - el.dataset.viewCountState = "partial"; - } else { - el.dataset.viewCountState = status; - } } }); entry.token = token; @@ -1203,9 +1193,6 @@ export class VideoListView { if (typeof pointerInfo.key === "string") { viewCountEl.dataset.viewPointer = pointerInfo.key; } - viewCountEl.dataset.viewCountState = entry.lastPartial - ? "partial" - : entry.lastStatus; viewCountEl.textContent = entry.lastText; } diff --git a/dist/js/ui/zapController.js b/dist/js/ui/zapController.js index c4985272..2b506fca 100644 --- a/dist/js/ui/zapController.js +++ b/dist/js/ui/zapController.js @@ -398,7 +398,7 @@ export default class ZapController { this.resetRetryState(); this.modalZapCommentValue = ""; - this.videoModal?.setZapComment(""); + this.videoModal?.resetZapForm({ amount: "", comment: "" }); this.videoModal?.setZapCompleted(true); this.applyDefaultAmount(); } catch (error) { @@ -881,13 +881,6 @@ export default class ZapController { }); const videoEvent = this.getActiveVideoEvent(); - let previousOverride; - const hasGlobal = typeof globalThis !== "undefined"; - if (hasGlobal && typeof overrideFee === "number" && Number.isFinite(overrideFee)) { - previousOverride = globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__; - globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__ = overrideFee; - } - try { const result = await this.splitAndZap( { @@ -895,6 +888,7 @@ export default class ZapController { amountSats: context.shares.total, comment: typeof comment === "string" ? comment : "", walletSettings: settings, + overrideFee, }, dependencies ); @@ -937,17 +931,6 @@ export default class ZapController { error ); throw error; - } finally { - if (hasGlobal && typeof overrideFee === "number" && Number.isFinite(overrideFee)) { - if (typeof previousOverride === "number") { - globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__ = previousOverride; - } else if ( - globalThis && - Object.prototype.hasOwnProperty.call(globalThis, "__BITVID_PLATFORM_FEE_OVERRIDE__") - ) { - delete globalThis.__BITVID_PLATFORM_FEE_OVERRIDE__; - } - } } } diff --git a/dist/js/userBlocks.js b/dist/js/userBlocks.js index 2ab1b1e7..1687fc2f 100644 --- a/dist/js/userBlocks.js +++ b/dist/js/userBlocks.js @@ -20,12 +20,7 @@ import { import { profileCache } from "./state/profileCache.js"; import { DEFAULT_RELAY_URLS } from "./nostr/toolkit.js"; import { relayManager } from "./relayManager.js"; -import { - DEFAULT_NIP07_ENCRYPTION_METHODS, - runNip07WithRetry, - NIP07_PRIORITY, -} from "./nostr/nip07Permissions.js"; -import { relaySubscriptionService } from "./services/relaySubscriptionService.js"; +import { runNip07WithRetry, NIP07_PRIORITY } from "./nostr/nip07Permissions.js"; class TinyEventEmitter { constructor() { @@ -79,10 +74,8 @@ export const USER_BLOCK_EVENTS = Object.freeze({ const FAST_BLOCKLIST_RELAY_LIMIT = 3; const FAST_BLOCKLIST_TIMEOUT_MS = 2500; const BACKGROUND_BLOCKLIST_TIMEOUT_MS = 6000; -const DECRYPT_TIMEOUT_MS = 15000; -const BACKGROUND_DECRYPT_TIMEOUT_MS = 2500; +const DECRYPT_TIMEOUT_MS = 90000; const DECRYPT_RETRY_DELAY_MS = 10000; -const MAX_BLOCKLIST_ENTRIES = 5000; function sanitizeRelayList(candidate) { return Array.isArray(candidate) @@ -310,16 +303,13 @@ function serializeBlockListTagMatrix(values, ownerPubkey, options = {}) { return JSON.stringify(tags); } -function extractPubkeysFromTags(tags, ownerPubkey = null, options = {}) { +function extractPubkeysFromTags(tags, ownerPubkey = null) { if (!Array.isArray(tags)) { return []; } const collected = []; const seen = new Set(); const owner = ownerPubkey ? normalizeHex(ownerPubkey) : null; - const limit = Number.isFinite(options?.limit) - ? Math.max(0, Math.floor(options.limit)) - : null; for (const entry of tags) { if (!Array.isArray(entry) || entry.length < 2) { @@ -335,14 +325,11 @@ function extractPubkeysFromTags(tags, ownerPubkey = null, options = {}) { } seen.add(normalized); collected.push(normalized); - if (limit !== null && collected.length >= limit) { - break; - } } return collected; } -function parseBlockListPlaintext(plaintext, ownerPubkey, options = {}) { +function parseBlockListPlaintext(plaintext, ownerPubkey) { if (typeof plaintext !== "string" || !plaintext) { return []; } @@ -359,45 +346,20 @@ function parseBlockListPlaintext(plaintext, ownerPubkey, options = {}) { } const owner = normalizeHex(ownerPubkey); - const limit = Number.isFinite(options?.limit) - ? Math.max(0, Math.floor(options.limit)) - : null; if (Array.isArray(parsed)) { - if (limit !== null && parsed.length > limit) { - devLogger.warn( - "[UserBlockList] Block list payload exceeds entry limit; truncating.", - { limit, payloadSize: parsed.length }, - ); - } - return extractPubkeysFromTags(parsed, owner, { limit }); + return extractPubkeysFromTags(parsed, owner); } if (parsed && typeof parsed === "object") { if (Array.isArray(parsed.tags) && parsed.tags.length) { - if (limit !== null && parsed.tags.length > limit) { - devLogger.warn( - "[UserBlockList] Block list tag payload exceeds entry limit; truncating.", - { limit, payloadSize: parsed.tags.length }, - ); - } - return extractPubkeysFromTags(parsed.tags, owner, { limit }); + return extractPubkeysFromTags(parsed.tags, owner); } const legacy = Array.isArray(parsed.blockedPubkeys) ? parsed.blockedPubkeys : []; - if (limit !== null && legacy.length > limit) { - devLogger.warn( - "[UserBlockList] Legacy block list payload exceeds entry limit; truncating.", - { limit, payloadSize: legacy.length }, - ); - } - const normalizedLegacy = legacy + return legacy .map((value) => normalizeHex(value)) .filter((value) => value && value !== owner); - if (limit === null) { - return normalizedLegacy; - } - return normalizedLegacy.slice(0, limit); } return []; @@ -686,9 +648,6 @@ class UserBlockListManager { this.emitter = new TinyEventEmitter(); this.seedStateCache = new Map(); this.decryptRetryTimeoutId = null; - this.loadPromise = null; - this.loadingPubkey = null; - this.blockListSubscriptionKey = null; profileCache.subscribe((event, detail) => { if (event === "profileChanged") { @@ -703,7 +662,6 @@ class UserBlockListManager { } reset() { - this.stopBlockListSubscription(); this.blockedPubkeys.clear(); this.blockEventId = null; this.blockEventCreatedAt = null; @@ -715,56 +673,6 @@ class UserBlockListManager { clearTimeout(this.decryptRetryTimeoutId); this.decryptRetryTimeoutId = null; } - this.loadPromise = null; - this.loadingPubkey = null; - } - - stopBlockListSubscription() { - if (this.blockListSubscriptionKey) { - relaySubscriptionService.stopSubscription( - this.blockListSubscriptionKey, - "reset", - ); - this.blockListSubscriptionKey = null; - } - } - - ensureBlockListSubscription(userPubkey, relays) { - const normalized = normalizeHex(userPubkey); - if (!normalized || !nostrClient?.pool) { - return null; - } - - const key = `block-list:${normalized}`; - this.blockListSubscriptionKey = key; - - const filters = [ - { kinds: [10000], authors: [normalized] }, - { kinds: [30002], authors: [normalized], "#d": [BLOCK_LIST_IDENTIFIER] }, - ]; - - return relaySubscriptionService.ensureSubscription({ - key, - pool: nostrClient.pool, - relays, - filters, - label: "block-list", - onEvent: (event) => this.handleBlockListEvent(event), - }); - } - - handleBlockListEvent(event) { - const normalized = normalizeHex(event?.pubkey); - if (!normalized || normalized !== this.activePubkey) { - return; - } - if (!isUserBlockListEvent(event)) { - return; - } - - this.loadBlocks(normalized).catch((error) => { - devLogger.warn("[UserBlockList] Failed to refresh after block list event", error); - }); } on(eventName, handler) { @@ -775,32 +683,29 @@ class UserBlockListManager { return Array.from(this.blockedPubkeys); } - scheduleDecryptRetry(userPubkey, detail = {}) { + scheduleDecryptRetry(userPubkey, error) { if (!userPubkey) { return; } if (this.decryptRetryTimeoutId) { clearTimeout(this.decryptRetryTimeoutId); } - const retryMeta = detail && typeof detail === "object" ? detail : {}; - const signerStatus = retryMeta.signerStatus || "unknown"; this.decryptRetryTimeoutId = setTimeout(() => { this.decryptRetryTimeoutId = null; if (this.activePubkey !== userPubkey) { return; } - const sinceValue = Number.isFinite(this.blockEventCreatedAt) - ? Math.max(0, this.blockEventCreatedAt - 1) - : undefined; this.loadBlocks(userPubkey, { - since: sinceValue, + since: Number.isFinite(this.blockEventCreatedAt) + ? this.blockEventCreatedAt + : undefined, }).catch((retryError) => { userLogger.warn("[UserBlockList] Decryption retry failed:", retryError); }); }, DECRYPT_RETRY_DELAY_MS); devLogger.log( - `[UserBlockList] Decryption stalled (${signerStatus}); retrying in ${DECRYPT_RETRY_DELAY_MS / 1000}s.`, - retryMeta.error || retryMeta, + `[UserBlockList] Decryption timed out; scheduling retry in ${DECRYPT_RETRY_DELAY_MS / 1000}s.`, + error, ); } @@ -827,38 +732,6 @@ class UserBlockListManager { async loadBlocks(userPubkey, options = {}) { const normalized = normalizeHex(userPubkey); - - if (this.loadPromise && this.loadingPubkey === normalized) { - devLogger.log("[UserBlockList] Reusing in-flight block list load.", { - pubkey: normalized, - }); - return this.loadPromise; - } - - if (this.loadPromise && this.loadingPubkey && this.loadingPubkey !== normalized) { - devLogger.log("[UserBlockList] Waiting for existing block list load to settle.", { - previous: this.loadingPubkey, - next: normalized, - }); - await this.loadPromise.catch(() => {}); - } - - const loadPromise = this.loadBlocksInternal(normalized, options); - this.loadPromise = loadPromise; - this.loadingPubkey = normalized; - - try { - return await loadPromise; - } finally { - if (this.loadPromise === loadPromise) { - this.loadPromise = null; - this.loadingPubkey = null; - } - } - } - - async loadBlocksInternal(userPubkey, options = {}) { - const normalized = normalizeHex(userPubkey); this.activePubkey = normalized; if (!normalized) { @@ -872,15 +745,6 @@ class UserBlockListManager { : null; const statusCallback = typeof options?.statusCallback === "function" ? options.statusCallback : null; - const loadMode = options?.mode === "background" ? "background" : "interactive"; - const allowPermissionPrompt = - options?.allowPermissionPrompt !== false && loadMode !== "background"; - const decryptTimeoutMs = Number.isFinite(options?.decryptTimeoutMs) - ? Math.max(0, Math.floor(options.decryptTimeoutMs)) - : allowPermissionPrompt - ? DECRYPT_TIMEOUT_MS - : BACKGROUND_DECRYPT_TIMEOUT_MS; - const nip07DecryptTimeoutMs = allowPermissionPrompt ? 12000 : 3000; const emitStatus = (detail) => { if (!detail || typeof detail !== "object") { @@ -909,23 +773,12 @@ class UserBlockListManager { const readRelays = relayManager.getReadRelayUrls(); const relays = readRelays.length > 0 ? readRelays : Array.from(DEFAULT_RELAY_URLS); emitStatus({ status: "loading", relays }); - if (!nostrClient?.pool && typeof nostrClient?.ensurePool === "function") { - try { - await nostrClient.ensurePool(); - } catch (error) { - devLogger.warn("[UserBlockList] Failed to initialize relay pool for subscription", error); - } - } - this.ensureBlockListSubscription(normalized, relays); - const localData = this._loadLocal(normalized); - const hasLocalData = !!localData; + const localBlocks = this._loadLocal(normalized); + const hasLocalData = !!localBlocks; - if (localData) { - this.blockedPubkeys = localData.blockedPubkeys; - if (Number.isFinite(localData.createdAt)) { - this.blockEventCreatedAt = localData.createdAt; - } + if (localBlocks) { + this.blockedPubkeys = localBlocks; this.loaded = true; this.emitter.emit(USER_BLOCK_EVENTS.CHANGE, { action: "sync", @@ -968,44 +821,21 @@ class UserBlockListManager { const signerHasNip04 = typeof signer?.nip04Decrypt === "function"; const signerHasNip44 = typeof signer?.nip44Decrypt === "function"; - const signerAvailable = Boolean(signer); - const signerHasDecryptors = signerHasNip04 || signerHasNip44; - const signerStatus = signerAvailable - ? signerHasDecryptors - ? "present" - : "present-missing-decryptor" - : "missing"; let permissionError = null; if ((!signerHasNip44 && requiresNip44) || (!signerHasNip04 && requiresNip04)) { - if (!allowPermissionPrompt) { - const error = new Error( - "Encryption permissions are required to decrypt the block list.", - ); - error.code = "user-blocklist-permission-required"; - error.permissionRequestDeferred = true; - permissionError = error; - } else { - try { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); - if (!permissionResult?.ok) { - const error = - permissionResult?.error instanceof Error - ? permissionResult.error - : new Error( - "Extension encryption permissions are required to use the browser decryptor.", - ); - error.code = "user-blocklist-permission-required"; - permissionError = error; - } - } catch (error) { - const wrapped = - error instanceof Error ? error : new Error(String(error)); - wrapped.code = "user-blocklist-permission-required"; - permissionError = wrapped; + try { + const permissionResult = await requestDefaultExtensionPermissions(); + if (!permissionResult?.ok) { + permissionError = + permissionResult?.error instanceof Error + ? permissionResult.error + : new Error( + "Extension permissions are required to use the browser decryptor.", + ); } + } catch (error) { + permissionError = error instanceof Error ? error : new Error(String(error)); } } @@ -1050,12 +880,6 @@ class UserBlockListManager { } const nostrApi = typeof window !== "undefined" ? window?.nostr : null; - const decrypterOptions = { - priority: NIP07_PRIORITY.HIGH, - timeoutMs: nip07DecryptTimeoutMs, - retryMultiplier: 1, - }; - if (nostrApi) { if (typeof nostrApi.nip04?.decrypt === "function") { registerDecryptor( @@ -1063,7 +887,7 @@ class UserBlockListManager { (payload) => runNip07WithRetry( () => nostrApi.nip04.decrypt(normalized, payload), - { label: "nip04.decrypt", ...decrypterOptions }, + { label: "nip04.decrypt", priority: NIP07_PRIORITY.HIGH }, ), "extension", ); @@ -1080,7 +904,7 @@ class UserBlockListManager { (payload) => runNip07WithRetry(() => nip44.decrypt(normalized, payload), { label: "nip44.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }), "extension", ); @@ -1094,7 +918,7 @@ class UserBlockListManager { (payload) => runNip07WithRetry(() => nip44v2.decrypt(normalized, payload), { label: "nip44.v2.decrypt", - ...decrypterOptions, + priority: NIP07_PRIORITY.HIGH, }), "extension", ); @@ -1104,7 +928,7 @@ class UserBlockListManager { (payload) => runNip07WithRetry( () => nip44v2.decrypt(normalized, payload), - { label: "nip44.v2.decrypt", ...decrypterOptions }, + { label: "nip44.v2.decrypt", priority: NIP07_PRIORITY.HIGH }, ), "extension", ); @@ -1113,16 +937,11 @@ class UserBlockListManager { } } - if (permissionError) { - permissionError.signerStatus = signerStatus; - } - return { decryptors, sources, permissionError, order: determineDecryptionOrder(event, Array.from(decryptors.keys())), - signerStatus, }; }; @@ -1227,35 +1046,26 @@ class UserBlockListManager { this.blockEventCreatedAt = newestCreatedAt; // Helper to decrypt a single event - const decryptEvent = async (ev, meta = {}) => { + const decryptEvent = async (ev) => { if (!ev) return []; const isContentEmpty = !ev.content || !ev.content.trim(); if (isContentEmpty) { // Handle tag-only lists (e.g. Kind 10000 with empty content but populated p tags) if (Array.isArray(ev.tags) && ev.tags.length) { - return extractPubkeysFromTags(ev.tags, normalized, { - limit: MAX_BLOCKLIST_ENTRIES, - }); + return extractPubkeysFromTags(ev.tags, normalized); } return []; } - const { decryptors, order, sources, permissionError, signerStatus } = + const { decryptors, order, sources, permissionError } = await resolveDecryptors(ev); - meta.signerStatus = signerStatus; - meta.decryptorSources = Array.from(sources.entries()).map( - ([scheme, source]) => ({ scheme, source }), - ); if (!decryptors.size) { if (permissionError) { throw permissionError; } - const error = new Error("No decryptor available for block list event."); - error.code = "user-blocklist-no-decryptor"; - error.signerStatus = signerStatus; - throw error; + return []; } let decryptedText = ""; @@ -1279,48 +1089,27 @@ class UserBlockListManager { return []; } - return parseBlockListPlaintext(decryptedText, normalized, { - limit: MAX_BLOCKLIST_ENTRIES, - }); + return parseBlockListPlaintext(decryptedText, normalized); }; const mergedPubkeys = new Set(); let decryptionError = null; - const decryptMeta = { - mute: { eventId: newestMute?.id || null }, - block: { eventId: newestBlock?.id || null }, - }; - const resolveSignerStatus = () => { - const statuses = [decryptMeta.mute.signerStatus, decryptMeta.block.signerStatus] - .filter(Boolean); - if (!statuses.length) { - return "unknown"; - } - if (statuses.every((status) => status === "missing")) { - return "missing"; - } - if (statuses.some((status) => status === "present-missing-decryptor")) { - return "present-missing-decryptor"; - } - return "present"; - }; try { const decryptPromise = Promise.all([ - decryptEvent(newestMute, decryptMeta.mute), - decryptEvent(newestBlock, decryptMeta.block), + decryptEvent(newestMute), + decryptEvent(newestBlock), ]); const timeoutPromise = new Promise((_, reject) => setTimeout( () => { const timeoutError = new Error( - `Decryption timed out after ${decryptTimeoutMs / 1000}s`, + `Decryption timed out after ${DECRYPT_TIMEOUT_MS / 1000}s`, ); timeoutError.code = "user-blocklist-decrypt-timeout"; - timeoutError.signerStatus = resolveSignerStatus(); reject(timeoutError); }, - decryptTimeoutMs, + DECRYPT_TIMEOUT_MS, ), ); @@ -1337,54 +1126,13 @@ class UserBlockListManager { } if (decryptionError) { - if (decryptionError.code === "user-blocklist-permission-required") { - const signerStatus = - decryptionError.signerStatus || resolveSignerStatus(); + if (decryptionError.code === "user-blocklist-decrypt-timeout") { this.blockedPubkeys = previousState.blockedPubkeys; this.blockEventId = previousState.blockEventId; this.blockEventCreatedAt = previousState.blockEventCreatedAt; this.loaded = true; - emitStatus({ - status: "permission-required", - signerStatus, - source, - reason: "decryptor-permission", - allowPermissionPrompt, - mode: loadMode, - events: [newestMute?.id, newestBlock?.id].filter(Boolean), - error: decryptionError, - }); emitStatus({ status: "settled" }); - return; - } - if (decryptionError.code === "user-blocklist-decrypt-timeout") { - const signerStatus = - decryptionError.signerStatus || resolveSignerStatus(); - applyBlockedPubkeys([], { - source, - reason: "decrypt-timeout", - signerStatus, - events: [newestMute?.id, newestBlock?.id].filter(Boolean), - }); - this.loaded = true; - emitStatus({ - status: "applied-empty", - reason: "decrypt-timeout", - signerStatus, - source, - }); - emitStatus({ status: "settled" }); - userLogger.warn( - "[UserBlockList] Decryption timed out; applying empty list and retrying in background.", - { - signerStatus, - events: [newestMute?.id, newestBlock?.id].filter(Boolean), - }, - ); - this.scheduleDecryptRetry(normalized, { - error: decryptionError, - signerStatus, - }); + this.scheduleDecryptRetry(normalized, decryptionError); return; } userLogger.warn( @@ -1395,13 +1143,10 @@ class UserBlockListManager { this.blockEventId = previousState.blockEventId; this.blockEventCreatedAt = previousState.blockEventCreatedAt; this.loaded = true; - const signerStatus = - decryptionError.signerStatus || resolveSignerStatus(); emitStatus({ status: "error", error: decryptionError, decryptor: "mixed", - signerStatus, }); emitStatus({ status: "settled" }); return; @@ -1437,13 +1182,9 @@ class UserBlockListManager { } }; - // Anchor the fetch to the service's current state to prevent desync. - // If we have cached data, we ask for updates since that timestamp. - // If we have no data, we force a full fetch (since=0). - const fetchSince = - hasLocalData && Number.isFinite(this.blockEventCreatedAt) - ? this.blockEventCreatedAt - : 0; + // If we don't have local data, we must ignore the sync metadata and force a full fetch (since: 0). + // Otherwise, we might miss data if the metadata store says we are up-to-date but the actual list is missing. + const fetchSince = hasLocalData ? undefined : 0; // Concurrent incremental fetch for both kinds const [muteEvents, blockEvents] = await Promise.all([ @@ -1493,15 +1234,7 @@ class UserBlockListManager { } const cached = profileCache.getProfileData(normalizedActorHex, "blocks"); if (Array.isArray(cached)) { - return { blockedPubkeys: new Set(cached), createdAt: null }; - } - if (cached && typeof cached === "object") { - return { - blockedPubkeys: new Set( - Array.isArray(cached.blockedPubkeys) ? cached.blockedPubkeys : [], - ), - createdAt: Number.isFinite(cached.createdAt) ? cached.createdAt : null, - }; + return new Set(cached); } return null; } @@ -1511,11 +1244,11 @@ class UserBlockListManager { if (!normalizedActorHex) { return; } - profileCache.setProfileData(normalizedActorHex, "blocks", { - blockedPubkeys: Array.from(this.blockedPubkeys), - createdAt: this.blockEventCreatedAt, - version: 1, - }); + profileCache.setProfileData( + normalizedActorHex, + "blocks", + Array.from(this.blockedPubkeys), + ); } _getSeedState(actorHex) { @@ -2056,18 +1789,16 @@ class UserBlockListManager { } if (signer.type === "extension") { - const permissionResult = await requestDefaultExtensionPermissions( - DEFAULT_NIP07_ENCRYPTION_METHODS, - ); + const permissionResult = await requestDefaultExtensionPermissions(); if (!permissionResult.ok) { userLogger.warn( "[UserBlockList] Signer permissions denied while updating the block list.", permissionResult.error, ); const err = new Error( - "The active signer must allow encryption before updating the block list.", + "The active signer must allow encryption and signing before updating the block list.", ); - err.code = "extension-encryption-permission-denied"; + err.code = "extension-permission-denied"; err.cause = permissionResult.error; throw err; } diff --git a/dist/js/utils/profileBatchFetcher.js b/dist/js/utils/profileBatchFetcher.js index 365f0fd1..9a5111e6 100644 --- a/dist/js/utils/profileBatchFetcher.js +++ b/dist/js/utils/profileBatchFetcher.js @@ -2,7 +2,6 @@ import { nostrClient } from "../nostrClientFacade.js"; import { devLogger } from "./logger.js"; -import { fetchProfileMetadataBatch } from "../services/profileMetadataService.js"; const DEFAULT_PROFILE_IMAGE = "assets/svg/default-profile.svg"; const HEX64_REGEX = /^[0-9a-f]{64}$/i; @@ -58,18 +57,117 @@ export async function batchFetchProfilesFromRelays({ return; } - const profileResults = await fetchProfileMetadataBatch({ - pubkeys: toFetch, - nostr, - logger, - defaultProfileImage, - }); + if (!nostr?.pool || typeof nostr.pool.list !== "function") { + logger.warn( + "[batchFetchProfiles] Relay pool is not ready; skipping profile fetch.", + ); + return; + } - profileResults.forEach((entry, pubkey) => { - if (!entry?.profile) { + const filter = { + kinds: [0], + authors: toFetch, + limit: toFetch.length, + }; + + const newestProfiles = new Map(); + + const applyProfileEvent = (evt, relayUrl) => { + if (!evt || typeof evt !== "object") { return; } - setProfileCacheEntry(pubkey, entry.profile); - updateProfileInDOM(pubkey, entry.profile); + + const pubkey = + typeof evt.pubkey === "string" && hex64Regex.test(evt.pubkey) + ? evt.pubkey + : null; + if (!pubkey) { + return; + } + + const createdAt = Number.isFinite(evt.created_at) ? evt.created_at : 0; + const previous = newestProfiles.get(pubkey); + if (previous && previous.createdAt >= createdAt) { + return; + } + + try { + const data = JSON.parse(evt.content); + const profile = { + name: data?.name || data?.display_name || "Unknown", + picture: data?.picture || defaultProfileImage, + }; + + newestProfiles.set(pubkey, { createdAt, profile }); + setProfileCacheEntry(pubkey, profile); + updateProfileInDOM(pubkey, profile); + } catch (error) { + logger.warn( + `[batchFetchProfiles] Profile parse error for ${pubkey} from ${relayUrl}:`, + error, + ); + } + }; + + const relayPromises = (Array.isArray(nostr.relays) ? nostr.relays : []).map( + (relayUrl) => + nostr.pool + .list([relayUrl], [filter]) + .then((events) => ({ relayUrl, events })), + ); + + if (!relayPromises.length) { + logger.warn( + "[batchFetchProfiles] No relays configured; skipping profile fetch.", + ); + return; + } + + const results = await Promise.allSettled(relayPromises); + + results.forEach((result, index) => { + const relayUrl = + result.status === "fulfilled" + ? result.value.relayUrl + : nostr.relays[index]; + + if (result.status === "fulfilled") { + const events = Array.isArray(result.value.events) + ? result.value.events + : []; + if (!events.length) { + return; + } + + const newestByPubkey = new Map(); + for (const evt of events) { + if (!evt || typeof evt !== "object") { + continue; + } + const pubkey = + typeof evt.pubkey === "string" && hex64Regex.test(evt.pubkey) + ? evt.pubkey + : null; + if (!pubkey) { + continue; + } + const createdAt = Number.isFinite(evt.created_at) + ? evt.created_at + : 0; + const prior = newestByPubkey.get(pubkey); + if (!prior || createdAt > prior.createdAt) { + newestByPubkey.set(pubkey, { createdAt, event: evt }); + } + } + + newestByPubkey.forEach(({ event }) => { + applyProfileEvent(event, relayUrl); + }); + } else if (relayUrl) { + logger.warn( + `[batchFetchProfiles] Failed to fetch profiles from relay ${relayUrl}:`, + result.reason, + ); + } }); } diff --git a/dist/js/utils/profileMedia.js b/dist/js/utils/profileMedia.js index 4de331ed..07cb2dfd 100644 --- a/dist/js/utils/profileMedia.js +++ b/dist/js/utils/profileMedia.js @@ -46,10 +46,6 @@ export function sanitizeProfileMediaUrl(value) { return trimmed; } - if (trimmed === "images/robot.png") { - return ""; - } - if (/^ipfs:\/\//i.test(trimmed)) { return normalizeIpfsGatewayUrl(trimmed); } diff --git a/dist/js/utils/storage.js b/dist/js/utils/storage.js index 8efc8e00..16457392 100644 --- a/dist/js/utils/storage.js +++ b/dist/js/utils/storage.js @@ -4,11 +4,11 @@ import { userLogger } from "./logger.js"; const URL_HEALTH_STORAGE_PREFIX = "bitvid:urlHealth:"; const TORRENT_PROBE_STORAGE_PREFIX = "bitvid:torrentProbe:"; -function getUrlHealthStorageKey(eventId) { +export function getUrlHealthStorageKey(eventId) { return `${URL_HEALTH_STORAGE_PREFIX}${eventId}`; } -function getTorrentProbeStorageKey(infoHash) { +export function getTorrentProbeStorageKey(infoHash) { return `${TORRENT_PROBE_STORAGE_PREFIX}${infoHash}`; } diff --git a/dist/js/utils/storagePointer.js b/dist/js/utils/storagePointer.js index 15fd58a2..5155cec9 100644 --- a/dist/js/utils/storagePointer.js +++ b/dist/js/utils/storagePointer.js @@ -8,7 +8,7 @@ export function normalizeStoragePointer(value) { return safeTrim(value); } -function parseStoragePointer(value) { +export function parseStoragePointer(value) { const normalized = normalizeStoragePointer(value); if (!normalized) { return null; @@ -38,7 +38,7 @@ export function buildStoragePointerValue({ provider, prefix } = {}) { return `${normalizedProvider}:${normalizedPrefix}`; } -function deriveStoragePrefixFromUrl(url) { +export function deriveStoragePrefixFromUrl(url) { const trimmed = safeTrim(url); if (!trimmed || !/^https?:\/\//i.test(trimmed)) { return ""; diff --git a/dist/js/utils/videoTags.js b/dist/js/utils/videoTags.js index ec841d2e..0a7188d3 100644 --- a/dist/js/utils/videoTags.js +++ b/dist/js/utils/videoTags.js @@ -44,7 +44,7 @@ function normalizeTagValue(rawValue) { * @returns {string} The tag prefixed with `#` when a tag exists, otherwise an * empty string. */ -function formatTagDisplay(tag) { +export function formatTagDisplay(tag) { if (typeof tag !== "string") { return ""; } diff --git a/dist/js/viewCounter.js b/dist/js/viewCounter.js index 7013faa3..f9bf799b 100644 --- a/dist/js/viewCounter.js +++ b/dist/js/viewCounter.js @@ -50,7 +50,6 @@ restoreCacheSnapshot(); * @property {Map} dedupeBuckets * @property {number} lastSyncedAt * @property {"idle"|"hydrating"|"live"|"stale"} status - * @property {boolean} partial */ /** @@ -279,7 +278,6 @@ function restoreCacheSnapshot() { dedupeBuckets, lastSyncedAt, status: status === "hydrating" || status === "live" ? "idle" : status, - partial: Boolean(state.partial), }); } } catch (error) { @@ -301,7 +299,6 @@ function persistCacheSnapshot() { dedupeBuckets: Array.from(state.dedupeBuckets.entries()), lastSyncedAt: state.lastSyncedAt, status: state.status, - partial: Boolean(state.partial), }, ]); } @@ -324,7 +321,6 @@ function ensurePointerState(key) { dedupeBuckets: new Map(), lastSyncedAt: 0, status: "idle", - partial: false, }; pointerStates.set(key, state); } else if (!(state.dedupeBuckets instanceof Map)) { @@ -377,7 +373,6 @@ function notifyHandlers(key) { total: state.total, lastSyncedAt: state.lastSyncedAt, status: state.status, - partial: Boolean(state.partial), }; for (const handler of listeners.handlers.values()) { try { @@ -499,15 +494,6 @@ async function hydratePointer(key, listeners) { ? Number(countResult.total) : null; - if (countResult && typeof countResult === "object") { - const state = ensurePointerState(key); - const nextPartial = Boolean(countResult.partial); - if (state.partial !== nextPartial) { - state.partial = nextPartial; - mutated = true; - } - } - if (bestCount !== null) { const state = ensurePointerState(key); const shouldUpdate = bestCount > state.total || state.total === 0; @@ -611,7 +597,6 @@ export function subscribeToVideoViewCount(pointerInput, handler, options = {}) { total: state.total, lastSyncedAt: state.lastSyncedAt, status: state.status, - partial: Boolean(state.partial), }); } catch (error) { userLogger.warn("[viewCounter] Initial handler invocation threw:", error); diff --git a/dist/js/webtorrent.js b/dist/js/webtorrent.js index bfe232bf..84dbaf38 100644 --- a/dist/js/webtorrent.js +++ b/dist/js/webtorrent.js @@ -23,33 +23,9 @@ import { WSS_TRACKERS } from "./constants.js"; import { safeDecodeURIComponent } from "./utils/safeDecode.js"; import { devLogger, userLogger } from "./utils/logger.js"; import { emit } from "./embedDiagnostics.js"; -import { infoHashFromMagnet, webSeedsFromMagnet } from "./magnets.js"; const DEFAULT_PROBE_TRACKERS = Object.freeze([...WSS_TRACKERS]); -function stripXsParameter(magnetURI) { - const trimmed = typeof magnetURI === "string" ? magnetURI.trim() : ""; - if ( - typeof window !== "undefined" && - (window.location.hostname === "localhost" || - window.location.hostname === "127.0.0.1") - ) { - try { - const [prefix, queryString] = trimmed.split("?"); - if (queryString) { - const params = new URLSearchParams(queryString); - if (params.has("xs")) { - params.delete("xs"); - return `${prefix}?${params.toString()}`; - } - } - } catch (err) { - // ignore - } - } - return trimmed; -} - function normalizeTrackerList(trackers) { const normalized = []; const seen = new Set(); @@ -185,8 +161,6 @@ export class TorrentClient { // Timeout for SW operations this.TIMEOUT_DURATION = 60000; - - this.probeInFlight = new Map(); } ensureClientForProbe() { @@ -205,10 +179,9 @@ export class TorrentClient { */ async probePeers( magnetURI, - { timeoutMs = 8000, maxWebConns = 2, polls = 2, urlList = [] } = {} + { timeoutMs = 8000, maxWebConns = 2, polls = 3, urlList = [] } = {} ) { - const magnet = stripXsParameter(magnetURI); - + const magnet = typeof magnetURI === "string" ? magnetURI.trim() : ""; if (!magnet) { return { healthy: false, @@ -241,21 +214,14 @@ export class TorrentClient { }; } - const infoHash = infoHashFromMagnet(magnet); - const probeKey = infoHash || null; - - if (probeKey && this.probeInFlight.has(probeKey)) { - return this.probeInFlight.get(probeKey); - } - const client = this.ensureClientForProbe(); const safeTimeout = Math.max(0, normalizeNumber(timeoutMs, 8000)); - const safePolls = Math.max(0, Math.floor(normalizeNumber(polls, 2))); + const safePolls = Math.max(1, Math.floor(normalizeNumber(polls, 3))); const safeMaxWebConns = Math.max(1, Math.floor(normalizeNumber(maxWebConns, 2))); - const pollInterval = - safePolls > 0 - ? Math.max(1000, Math.floor(safeTimeout / Math.max(1, safePolls))) - : 0; + const pollInterval = Math.max( + 250, + Math.floor(safeTimeout / Math.max(1, safePolls)) + ); const startedAt = typeof performance !== "undefined" && performance?.now @@ -264,12 +230,11 @@ export class TorrentClient { emit("torrent-probe-start", { magnet: augmentedMagnet }); - const probePromise = new Promise((resolve) => { + return new Promise((resolve) => { let settled = false; let torrent = null; let timeoutId = null; let pollId = null; - let pollStartId = null; const finalize = (overrides = {}) => { if (settled) { @@ -284,10 +249,6 @@ export class TorrentClient { clearInterval(pollId); pollId = null; } - if (pollStartId) { - clearTimeout(pollStartId); - pollStartId = null; - } if (torrent) { try { torrent.destroy({ destroyStore: true }); @@ -367,34 +328,16 @@ export class TorrentClient { }, safeTimeout); } - if (safePolls > 0 && pollInterval > 0) { - pollStartId = setTimeout(() => { - if (!torrent || settled) { - return; - } - pollId = setInterval(() => { - if (!torrent || settled) { - return; - } - const peers = Math.max(0, Math.floor(normalizeNumber(torrent.numPeers, 0))); - if (peers > 0) { - finalize({ healthy: true, peers, reason: "peer" }); - } - }, pollInterval); - }, pollInterval); - } - }); - - if (probeKey) { - this.probeInFlight.set(probeKey, probePromise); - probePromise.finally(() => { - if (this.probeInFlight.get(probeKey) === probePromise) { - this.probeInFlight.delete(probeKey); + pollId = setInterval(() => { + if (!torrent || settled) { + return; } - }); - } - - return probePromise; + const peers = Math.max(0, Math.floor(normalizeNumber(torrent.numPeers, 0))); + if (peers > 0) { + finalize({ healthy: true, peers, reason: "peer" }); + } + }, pollInterval); + }); } log(...args) { @@ -927,24 +870,9 @@ export class TorrentClient { */ async streamVideo(magnetURI, videoElement, opts = {}) { try { - const effectiveMagnetURI = stripXsParameter(magnetURI); - if ( - effectiveMagnetURI !== - (typeof magnetURI === "string" ? magnetURI.trim() : "") - ) { - this.log( - "[WebTorrent] Stripped 'xs' parameter to prevent CORS errors on localhost.", - ); - } - - emit("torrent-stream-start", { magnet: effectiveMagnetURI }); + emit("torrent-stream-start", { magnet: magnetURI }); // 1) Make sure we have a WebTorrent client and a valid SW registration. const initResult = await this.init(); - - if (!this.client) { - throw new Error("Client destroyed during initialization"); - } - const serviceWorkerReady = !!(initResult?.serviceWorkerReady && this.swRegistration); @@ -960,18 +888,15 @@ export class TorrentClient { } const isFirefoxBrowser = this.isFirefox(); - const explicitUrls = Array.isArray(opts?.urlList) + const candidateUrls = Array.isArray(opts?.urlList) ? opts.urlList .map((entry) => (typeof entry === "string" ? entry.trim() : "")) .filter((entry) => /^https?:\/\//i.test(entry)) : []; - const magnetUrls = webSeedsFromMagnet(effectiveMagnetURI); - const combinedUrls = [...new Set([...explicitUrls, ...magnetUrls])]; - const chromeOptions = { strategy: "sequential" }; - if (combinedUrls.length) { - chromeOptions.urlList = combinedUrls; + if (candidateUrls.length) { + chromeOptions.urlList = candidateUrls; } return new Promise((resolve, reject) => { @@ -979,7 +904,7 @@ export class TorrentClient { if (isFirefoxBrowser) { this.log("Starting torrent download (Firefox path)"); this.client.add( - effectiveMagnetURI, + magnetURI, { ...chromeOptions, maxWebConns: 4 }, (torrent) => { this.log("Torrent added (Firefox path):", torrent.name); @@ -988,7 +913,7 @@ export class TorrentClient { ); } else { this.log("Starting torrent download (Chrome path)"); - this.client.add(effectiveMagnetURI, chromeOptions, (torrent) => { + this.client.add(magnetURI, chromeOptions, (torrent) => { this.log("Torrent added (Chrome path):", torrent.name); this.handleChromeTorrent(torrent, videoElement, resolve, reject); }); diff --git a/dist/releases/draft-20260124.md b/dist/releases/draft-20260124.md deleted file mode 100644 index ba52cd1a..00000000 --- a/dist/releases/draft-20260124.md +++ /dev/null @@ -1,17 +0,0 @@ -# Release Draft - 2026-01-24 - -## Highlights - -### S3 Multipart Upload Support -We have introduced a new helper module `js/storage/s3-multipart.js` to facilitate reliable uploads of large files to S3-compatible storage providers. This module handles: -- Multipart upload orchestration (initiate, upload parts, complete/abort). -- Automatic part sizing calculation. -- Bucket existence checks and creation (with region support). -- CORS configuration helper. -- Intelligent `Cache-Control` header generation based on file type. - -This addition paves the way for more robust video upload capabilities directly to object storage. - -## Upgrade Notes - -No breaking changes or dependency bumps in this release. diff --git a/dist/torrent/dist/beacon.js b/dist/torrent/dist/beacon.js index 4810c2bb..7c59bfb1 100644 --- a/dist/torrent/dist/beacon.js +++ b/dist/torrent/dist/beacon.js @@ -1 +1 @@ -import{IS_DEV_MODE as Le,IS_VERBOSE_DEV_MODE as Ae,IS_LOCKDOWN_MODE as Ce,LOCKDOWN_TITLE as yt,LOCKDOWN_MESSAGE as Et,ADMIN_SUPER_NPUB as Tt,ADMIN_DM_IMAGE_URL as gt,BITVID_WEBSITE_URL as _t,BLOG_URL as St,COMMUNITY_URL as wt,NOSTR_URL as Lt,GITHUB_URL as At,BETA_URL as Ct,DNS_URL as xt,TIP_JAR_URL as vt,MAX_WALLET_DEFAULT_ZAP as It,PLATFORM_FEE_PERCENT as Ot,PLATFORM_LUD16_OVERRIDE as Nt,DEFAULT_RELAY_URLS_OVERRIDE as Bt,ADMIN_WHITELIST_MODE_STORAGE_KEY as Mt,DEFAULT_WHITELIST_MODE_ENABLED as Dt,ALLOW_NSFW_CONTENT as Rt,DEFAULT_TRUST_SEED_NPUBS as Ut,DEFAULT_BLUR_THRESHOLD as Ht,DEFAULT_AUTOPLAY_BLOCK_THRESHOLD as kt,DEFAULT_TRUSTED_MUTE_HIDE_THRESHOLD as Ft,DEFAULT_TRUSTED_SPAM_HIDE_THRESHOLD as Pt,WATCH_HISTORY_KIND as Vt,WATCH_HISTORY_LIST_IDENTIFIER as Wt,WATCH_HISTORY_MAX_ITEMS as qt,WATCH_HISTORY_BATCH_RESOLVE as jt,WATCH_HISTORY_BATCH_PAGE_SIZE as $t,WATCH_HISTORY_PAYLOAD_MAX_BYTES as Yt,WATCH_HISTORY_FETCH_EVENT_LIMIT as Kt,WATCH_HISTORY_CACHE_TTL_MS as Gt,VIEW_COUNT_DEDUPE_WINDOW_SECONDS as zt,VIEW_COUNT_BACKFILL_MAX_DAYS as Xt,VIEW_COUNT_CACHE_TTL_MS as Zt,ENSURE_PRESENCE_REBROADCAST_COOLDOWN_SECONDS as Jt,DEFAULT_PLAYBACK_SOURCE as Qt,DEFAULT_PLAYBACK_START_TIMEOUT as er}from"../config/instance-config.js";var U=!!Le;var xe=!!Ae;var ve=!!Ce;typeof window<"u"&&(window.__BITVID_DEV_MODE__=U,window.__BITVID_VERBOSE_DEV_MODE__=xe,window.__BITVID_LOCKDOWN_MODE__=ve);var k=()=>{};function Ie(){return typeof console>"u"||console===null?null:console}function Oe(){let e=Ie();if(!e)return{log:k,info:k,debug:k,warn:k,error:k};let t=typeof e.log=="function"?e.log.bind(e):k;return{log:typeof e.log=="function"?e.log.bind(e):t,info:typeof e.info=="function"?e.info.bind(e):t,debug:typeof e.debug=="function"?e.debug.bind(e):t,warn:typeof e.warn=="function"?e.warn.bind(e):t,error:typeof e.error=="function"?e.error.bind(e):t}}var _=Oe(),M="[bitvid]";function ee(e){if(e.length===0)return{args:e,force:!1};let t=e[e.length-1];if(t&&typeof t=="object"&&!Array.isArray(t)&&Object.prototype.hasOwnProperty.call(t,"force")){let r=[...e],o=r.pop();return{args:r,force:!!o.force}}return{args:e,force:!1}}var S=Object.freeze({log:(...e)=>{U&&_.log(...e)},info:(...e)=>{U&&_.info(...e)},debug:(...e)=>{U&&_.debug(...e)},warn:(...e)=>{U&&_.warn(...e)},error:(...e)=>{U&&_.error(...e)}}),b=Object.freeze({log:(...e)=>{let{args:t,force:r}=ee(e);if(!r&&t.length===0)return;if(r){_.log(M,...t);return}let[o,...n]=t;if(typeof o=="string"&&n.length===0){_.log(`${M} ${o}`);return}o!==void 0&&_.log(M,o)},info:(...e)=>{let{args:t,force:r}=ee(e);if(!r&&t.length===0)return;if(r){_.info(M,...t);return}let[o,...n]=t;if(typeof o=="string"&&n.length===0){_.info(`${M} ${o}`);return}o!==void 0&&_.info(M,o)},warn:(...e)=>{_.warn(M,...e)},error:(...e)=>{_.error(M,...e)}}),te=Object.freeze({dev:S,user:b});function Ne(e){return!e||typeof e!="object"?!1:Object.entries({dev:["log","info","debug","warn","error"],user:["log","info","warn","error"]}).every(([r,o])=>{let n=e[r];return!n||typeof n!="object"?!1:o.every(c=>typeof n[c]=="function")})}typeof window<"u"&&(Ne(window.bitvidLogger)||(window.bitvidLogger=te));Object.freeze(te);import{THEME_ACCENT_OVERRIDES as re}from"../config/instance-config.js";var z="bitvid:theme",v="dark",Be=new Set(["light","dark"]),ne={dark:"rgb(15, 23, 42)",light:"rgb(248, 250, 252)"},oe=["[data-theme-toggle]",'[data-action="toggle-theme"]',".js-theme-toggle","#themeToggle"],ie=Object.freeze({accent:"--color-accent",accentStrong:"--color-accent-strong",accentPressed:"--color-accent-pressed"}),ae=new WeakSet,W=new Set,D=null,se=!1,F=null,I=()=>typeof window<"u"&&typeof document<"u",q=e=>{if(typeof e!="string")return null;let t=e.trim().toLowerCase();return t==="default"||t===""?v:Be.has(t)?t:null},Me=()=>{if(!I())return null;try{let e=window.localStorage.getItem(z);return q(e)}catch(e){return b.warn("Unable to read stored theme preference:",e),null}},De=e=>{if(I())try{window.localStorage.setItem(z,e)}catch(t){b.warn("Unable to persist theme preference:",t)}},K=()=>{if(!I())return null;let{documentElement:e}=document;return e instanceof HTMLElement?e:null},Re=e=>typeof e=="string"?e.trim():"",Ue=e=>{if(!e||typeof e!="object")return null;let t=Object.entries(e).reduce((r,[o,n])=>{if(!n||typeof n!="object")return r;let c=Object.entries(n).reduce((a,[u,d])=>(Object.prototype.hasOwnProperty.call(ie,u)&&(a[u]=d),a),{});return Object.keys(c).length>0&&(r[o]=c),r},{});return Object.keys(t).length>0?t:null},ce=e=>{F=Ue(e)};ce(typeof re<"u"?re:null);var le=(e,t)=>{if(!e)return;let r=F&&typeof F=="object"&&F[t]&&typeof F[t]=="object"?F[t]:null,o=!1;Object.entries(ie).forEach(([n,c])=>{let a=r?r[n]:null,u=Re(a);u?(e.style.setProperty(c,u),o=!0):e.style.removeProperty(c)}),o?e.dataset.themeAccent="override":e.removeAttribute("data-theme-accent")},He=e=>{if(!I())return;let t=document.querySelector('meta[name="theme-color"]');if(!t)return;let r=K();if(!r)return;let o="";try{typeof window.getComputedStyle=="function"&&(o=getComputedStyle(r).getPropertyValue("--color-page").trim())}catch(a){b.warn("Unable to compute theme color token:",a)}let n=ne[e]||ne[v],c=o||n;c&&t.setAttribute("content",c)},de=(e,t)=>{if(!(e instanceof HTMLElement))return;e.dataset.themeState=t,e.setAttribute("aria-pressed",t==="dark"?"true":"false");let r=t==="dark"?"Switch to light theme":"Switch to dark theme";e.setAttribute("aria-label",r),e.setAttribute("title",r);let o=e.querySelector("[data-theme-toggle-label]")||e.querySelector(".sr-only");o&&(o.textContent=r);let n=e.querySelector("[data-theme-toggle-icon]")||e.querySelector('[aria-hidden="true"]');if(n){let c=typeof SVGElement<"u"?SVGElement:null;if(c&&n instanceof c||n instanceof Element&&!!n.querySelector("svg"))n instanceof Element&&n.setAttribute("data-theme-icon-state",t);else{let u=e.dataset.iconLight||"\u2600\uFE0F",d=e.dataset.iconDark||"\u{1F319}";n.textContent=t==="dark"?u:d}}},ke=()=>{if(!I()){W.clear();return}W.forEach(e=>{(!(e instanceof HTMLElement)||!document.contains(e))&&W.delete(e)})},Fe=e=>{ke(),W.forEach(t=>{de(t,e)})},Pe=e=>{!(e instanceof HTMLElement)||ae.has(e)||(e.addEventListener("click",t=>{t.preventDefault(),We(D==="dark"?"light":"dark")}),e.dataset.themeToggleBound="true",ae.add(e))},Ve=(e=document)=>{if(!I())return[];let t=new Set,r=e&&typeof e.querySelectorAll=="function"?e:document;return oe.forEach(o=>{try{r.querySelectorAll(o).forEach(n=>{n instanceof HTMLElement&&t.add(n)})}catch(n){b.warn(`Invalid selector for theme toggle: ${o}`,n)}}),e instanceof HTMLElement&&oe.forEach(o=>{e.matches(o)&&t.add(e)}),Array.from(t)},X=(e,{persist:t=!0}={})=>{let r=q(e)||v;D=r;let o=K();return o&&(o.dataset.theme=r,le(o,r)),t&&De(r),He(r),Fe(r),r},ue=e=>{ce(e);let t=K();if(!t)return;le(t,D||v)},We=e=>I()?X(e,{persist:!0}):(D=q(e)||v,D),qe=(e=document)=>{if(!I())return;Ve(e).forEach(r=>{W.add(r),Pe(r),de(r,D||v)})},je=()=>{if(!I())return v;let e=K();return(e?q(e.dataset.theme):null)||Me()||v},$e=e=>{if(!e||e.key!==z)return;let t=q(e.newValue)||v;t!==D&&X(t,{persist:!1})},fe=()=>{if(!I()){D=v;return}se||(window.addEventListener("storage",$e),se=!0);let e=je();X(e,{persist:!0}),qe(document)};var pe={info:"torrent-toast torrent-toast--info",success:"torrent-toast torrent-toast--success",error:"torrent-toast torrent-toast--error",warn:"torrent-toast torrent-toast--warn"},me="transition duration-200 ease-out",Ye="beacon-toast-motion",Z="data-beacon-motion";function Ke(e,t){let r=e?.defaultView;if(r&&typeof r.requestAnimationFrame=="function"){r.requestAnimationFrame(t);return}setTimeout(t,16)}function Ge(e){let t=e||(typeof document<"u"?document:null);if(!t)return null;let r=t.getElementById("beacon-toast-container");if(!r){r=t.createElement("div"),r.id="beacon-toast-container",r.setAttribute("role","region"),r.setAttribute("aria-live","polite"),r.className=["pointer-events-none","fixed","inset-x-0","top-0","z-overlay-toast","flex","w-full","flex-col","items-center","gap-3","px-4","pt-6","sm:items-end","sm:px-6","sm:pt-8"].join(" ");let o=t.body||t.getElementsByTagName?.("body")?.[0];o&&o.appendChild(r)}return r}function ze(e,t,r){let o=e.createElement("div");o.className=[me,r].join(" "),o.setAttribute("role","status"),o.setAttribute("tabindex","0"),o.textContent=t;let n=e.createElement("button");n.type="button",n.className=["notification-dismiss","focus-ring","absolute","right-3","top-3"].join(" "),n.setAttribute("aria-label","Dismiss notification"),n.innerHTML='';let c=e.createElement("div");return c.className=["relative","w-full",me,Ye].join(" "),c.setAttribute(Z,"exit"),c.appendChild(o),o.appendChild(n),{wrapper:c,toast:o,closeButton:n}}function Xe(e,t=setTimeout,r=clearTimeout){return{show(o,n={}){if(!o)return;let c=n.type&&pe[n.type]?n.type:"info",a=Ge(e);if(!a)return;let{wrapper:u,toast:d,closeButton:L}=ze(e,o,pe[c]);a.appendChild(u),Ke(e,()=>{u.setAttribute(Z,"enter")});let w=typeof n.duration=="number"?n.duration:3500,m=()=>{u.setAttribute(Z,"exit");let B=t(()=>{u.parentNode&&u.parentNode.removeChild(u)},200);return L.removeEventListener("click",A),d.removeEventListener("keydown",y),L.removeEventListener("keydown",y),B},A=()=>m(),y=B=>{B.key==="Escape"&&(B.stopPropagation(),m())};L.addEventListener("click",A),d.addEventListener("keydown",y),L.addEventListener("keydown",y);let N=null;return n.sticky||(N=t(()=>{m()},w)),{dismiss(){N&&r(N),m()}}},set(o,n){return typeof n=="string"?this.show(o,{type:n}):this.show(o,n)},info(o,n={}){return this.show(o,{...n,type:"info"})},success(o,n={}){return this.show(o,{...n,type:"success"})},error(o,n={}){return this.show(o,{...n,type:"error"})},warn(o,n={}){return this.show(o,{...n,type:"warn"})}}}function he(e,t=setTimeout,r=clearTimeout){return Xe(e,t,r)}var J=[{key:"name",label:"Name",headerClass:"w-full sm:w-1/3 text-left",cellClass:"font-medium text-text truncate"},{key:"progress",label:"Progress",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"progress"},{key:"downloadSpeed",label:"\u2193 Speed",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"bytesPerSecond"},{key:"uploadSpeed",label:"\u2191 Speed",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"bytesPerSecond"},{key:"numPeers",label:"Peers",headerClass:"w-20 text-right",cellClass:"tabular-nums text-right",formatter:"integer"},{key:"ratio",label:"Ratio",headerClass:"w-20 text-right",cellClass:"tabular-nums text-right",formatter:"ratio"}];function Ze(e){return e?e.infoHash||e.magnetURI||e.name||String(Math.random()):""}function Je(e,t){return!e||!t?!1:e===t||e.magnetURI&&e.magnetURI===t.magnetURI||e.infoHash&&e.infoHash===t.infoHash}function Qe(e){return typeof e!="number"||Number.isNaN(e)?"":`${(e*100).toFixed(1)}%`}function et(e){return typeof e!="number"||!Number.isFinite(e)?"0.00":e.toFixed(2)}function tt(e){return typeof e!="number"||!Number.isFinite(e)?"0":Math.max(0,Math.floor(e)).toString()}function rt(e,t){if(typeof t=="function")return t(e,!0)||"";if(typeof e!="number"||Number.isNaN(e)||e<1)return"";let r=["B","kB","MB","GB","TB"],o=Math.min(Math.floor(Math.log(e)/Math.log(1e3)),r.length-1);return`${(e/Math.pow(1e3,o)).toFixed(1)} ${r[o]}/s`}function nt(e,t){let r=e.formatter;if(typeof r=="function")return r;let o=t?.[r];if(typeof o=="function")return o;switch(r){case"progress":return Qe;case"ratio":return et;case"integer":return tt;case"bytesPerSecond":return n=>rt(n,t?.bytes);default:return n=>n}}function be({documentRef:e=typeof document<"u"?document:null,root:t,onSelect:r,formatters:o={}}={}){if(!e)throw new Error("createTorrentTable requires a document reference");if(!(t instanceof e.defaultView.HTMLElement))throw new Error("createTorrentTable requires a valid root element");let n=e;t.innerHTML="";let c=n.createElement("div");c.className="overflow-hidden rounded-xl border border-border-translucent bg-surface shadow-sm";let a=n.createElement("div");a.className="overflow-x-auto",c.appendChild(a);let u=n.createElement("table");u.className="min-w-full divide-y divide-border-translucent text-sm",a.appendChild(u);let d=n.createElement("thead");d.className="bg-surface-alt text-muted-strong";let L=n.createElement("tr");J.forEach(E=>{let x=n.createElement("th");x.setAttribute("scope","col"),x.className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide",E.headerClass&&(x.className+=` ${E.headerClass}`),x.textContent=E.label,L.appendChild(x)}),d.appendChild(L),u.appendChild(d);let w=n.createElement("tbody");w.className="divide-y divide-border-translucent",u.appendChild(w);let m=n.createElement("tbody"),A=n.createElement("tr"),y=n.createElement("td");y.className="px-4 py-8 text-center text-sm text-muted",y.colSpan=J.length,y.textContent="No active torrents yet. Add a magnet link to get started.",A.appendChild(y),m.appendChild(A),u.appendChild(m),t.appendChild(c);function N(E=[],x=null){let P=Array.isArray(E)?E:[];if(w.innerHTML="",!P.length){w.hidden=!0,m.hidden=!1;return}w.hidden=!1,m.hidden=!0;for(let O of P){let g=n.createElement("tr");g.className=["group","align-middle","cursor-pointer","transition","hover:bg-panel-hover","focus-visible:outline","focus-visible:outline-2","focus-visible:outline-offset-2","focus-visible:outline-info"].join(" "),g.setAttribute("role","button"),g.setAttribute("tabindex","0"),g.dataset.torrentId=Ze(O),Je(x,O)?(g.classList.add("bg-info/10","text-text"),g.setAttribute("aria-pressed","true")):g.setAttribute("aria-pressed","false"),g.addEventListener("click",()=>{typeof r=="function"&&r(O)}),g.addEventListener("keydown",C=>{(C.key==="Enter"||C.key===" ")&&(C.preventDefault(),typeof r=="function"&&r(O))}),J.forEach(C=>{let H=n.createElement("td");H.className="px-4 py-3",C.cellClass&&(H.className+=` ${C.cellClass}`);let G=O?O[C.key]:void 0,s=nt(C,o)(G,O,C),i=n.createElement("span");i.textContent=s==null?"":String(s),H.appendChild(i),g.appendChild(H)}),w.appendChild(g)}}function B(){t.innerHTML=""}return{render:N,destroy:B}}var ot="2.0",ge=["wss://tracker.btorrent.xyz","wss://tracker.openwebtorrent.com"],ye={announce:ge},at={announce:ge};function j(e,t=!1){if(typeof e!="number"||Number.isNaN(e))return"";if(e<1)return t?"":"0 B";let r=["B","kB","MB","GB","TB"],o=Math.min(Math.floor(Math.log(e)/Math.log(1e3)),r.length-1);return`${(e/Math.pow(1e3,o)).toFixed(1)} ${r[o]}${t?"/s":""}`}function st(e){return typeof e!="number"||Number.isNaN(e)?"":`${(e*100).toFixed(1)}%`}function Ee(e){return typeof e!="number"||!Number.isFinite(e)?"0.00":e.toFixed(2)}function it(e,t){return!e||!t?!1:!!(e===t||e.infoHash&&t.infoHash&&e.infoHash===t.infoHash||e.magnetURI&&t.magnetURI&&e.magnetURI===t.magnetURI)}function ct(e){if(!(!e||!Array.isArray(e.files))&&(e.files.forEach(t=>{typeof t.priority!="string"&&(t.priority="0"),typeof t.getBlobURL=="function"&&t.getBlobURL((r,o)=>{r||!o||(t.url=o)})}),e.torrentFile&&typeof Blob=="function"&&typeof URL<"u"))try{let t=new Blob([e.torrentFile],{type:"application/x-bittorrent"});if(e.torrentFileBlobURL=URL.createObjectURL(t),!e.fileName){let r=e.name||"download";e.fileName=`${r}.torrent`}}catch(t){S.warn("[beacon] Failed to create torrent blob URL",t)}}function lt(e,t){if(!e)return;let r=typeof t=="string"?t:String(t??"0");if(e.priority=r,r==="-1"){typeof e.deselect=="function"&&e.deselect();return}let o=Number.parseInt(r,10);Number.isFinite(o)&&typeof e.select=="function"&&e.select(o)}function Te(e,t){if(!Array.isArray(t)||t.length===0)return null;if(!e)return t[0];let r=t.find(o=>it(o,e));return r||t[0]}function _e({documentRef:e=typeof document<"u"?document:null,WebTorrentCtor:t}={}){if(!e)throw new Error("createBeaconApp requires a document reference");let r=e.defaultView||globalThis,o=typeof t=="function"?t:typeof r?.WebTorrent=="function"?r.WebTorrent:null;if(!o)throw new Error("createBeaconApp requires a WebTorrent constructor");let n=he(e),c=new o({tracker:at}),a={form:e.querySelector('[data-beacon="magnet-form"]'),magnetInput:e.querySelector('[data-beacon="magnet-input"]'),seedButton:e.querySelector('[data-beacon="seed-button"]'),seedInput:e.querySelector('[data-beacon="seed-input"]'),tableRoot:e.querySelector('[data-beacon="torrent-table"]'),selectedSection:e.querySelector('[data-beacon="selected"]'),selectedName:e.querySelector('[data-beacon="selected-name"]'),pauseButton:e.querySelector('[data-beacon-action="pause"]'),resumeButton:e.querySelector('[data-beacon-action="resume"]'),downloadAllButton:e.querySelector('[data-beacon-action="download-all"]'),removeButton:e.querySelector('[data-beacon-action="remove"]'),copyMagnetButton:e.querySelector('[data-beacon-action="copy-magnet"]'),infoHashValue:e.querySelector('[data-beacon="info-hash"]'),fileList:e.querySelector('[data-beacon="file-list"]'),stats:e.querySelector('[data-beacon="client-stats"]'),overlay:e.querySelector('[data-beacon="processing-overlay"]')},u=a.tableRoot?be({documentRef:e,root:a.tableRoot,formatters:{bytes:(s,i=!1)=>j(s,i),progress:s=>st(s),ratio:s=>Ee(s),integer:s=>typeof s=="number"&&Number.isFinite(s)?Math.floor(s).toString():"0",bytesPerSecond:s=>j(s,!0)},onSelect(s){d.selectedTorrent=s,E()}}):null,d={selectedTorrent:null,processing:!1},L=[],w=[];function m(s){L.push(s)}function A(s){if(d.processing=!!s,!a.overlay)return;let i=d.processing;a.overlay.hidden=!i,a.overlay.setAttribute("aria-hidden",i?"false":"true"),i?a.overlay.style.removeProperty("display"):a.overlay.style.display="none"}function y(){return Array.isArray(c.torrents)?[...c.torrents]:[]}function N(){if(!a.stats)return;let s=j(c.downloadSpeed,!0)||"0 B/s",i=j(c.uploadSpeed,!0)||"0 B/s",p=Ee(c.ratio);a.stats.textContent=`Client stats: \u2193 ${s} \xB7 \u2191 ${i} \xB7 Ratio: ${p}`}function B(s){a.fileList&&(a.fileList.innerHTML="",!(!s||!Array.isArray(s.files)||!s.files.length)&&s.files.forEach((i,p)=>{let f=e.createElement("tr");f.className="align-top";let l=e.createElement("td");if(l.className="px-3 py-2",i.done&&i.url){let T=e.createElement("a");T.className="text-info hover:text-info-strong",T.href=i.url,T.download=i.name||`file-${p+1}`,T.textContent=i.name||`File ${p+1}`,l.appendChild(T)}else{let T=e.createElement("span");T.textContent=i.name||`File ${p+1}`,l.appendChild(T)}f.appendChild(l);let h=e.createElement("td");h.className="px-3 py-2 text-muted-strong",h.textContent=j(i.length)||"0 B",f.appendChild(h);let V=e.createElement("td");V.className="px-3 py-2";let R=e.createElement("select");R.className="select",R.name=`${i.name||`file-${p+1}`}-priority`,R.setAttribute("aria-label",`Set priority for ${i.name||`file ${p+1}`}`),[{value:"1",label:"High priority"},{value:"0",label:"Low priority"},{value:"-1",label:"Don't download"}].forEach(T=>{let Y=e.createElement("option");Y.value=T.value,Y.textContent=T.label,T.value===i.priority&&(Y.selected=!0),R.appendChild(Y)}),R.value=i.priority??"0",R.addEventListener("change",T=>{lt(i,T.target.value)}),V.appendChild(R),f.appendChild(V),a.fileList.appendChild(f)}))}function E(){if(!a.selectedSection)return;let s=y();d.selectedTorrent=Te(d.selectedTorrent,s);let i=d.selectedTorrent;a.selectedSection.hidden=!i,i&&(a.selectedName&&(a.selectedName.textContent=i.name||"Untitled torrent"),a.pauseButton&&(a.pauseButton.hidden=i.paused===!0,a.pauseButton.disabled=i.paused===!0),a.resumeButton&&(a.resumeButton.hidden=i.paused!==!0,a.resumeButton.disabled=i.paused!==!0),a.downloadAllButton&&(a.downloadAllButton.disabled=!(i.progress>=1)),a.infoHashValue&&(a.infoHashValue.textContent=i.infoHash||""),B(i))}function x(s,{isSeed:i=!1}={}){A(!1),ct(s),i||n.info(`Received ${s.name||"torrent"} metadata`),d.selectedTorrent||(d.selectedTorrent=s),E(),u?.render(y(),d.selectedTorrent)}function P(s){let i=typeof s=="string"?s.trim():"";i&&(A(!0),c.add(i,ye,p=>{x(p,{isSeed:!1})}))}function O(s){!Array.isArray(s)||s.length===0||(A(!0),c.seed(s,ye,i=>{x(i,{isSeed:!0}),n.success(`Seeding ${i.files.length} file(s)`)}))}function g(s){if(s){if(s.progress<1){n.warn("Torrent is not finished downloading yet.");return}s.files.forEach(i=>{typeof i.getBlob=="function"&&i.getBlob((p,f)=>{if(p||!f){b.error("[beacon] Failed to get blob for file",i?.name,p),n.error("Failed to prepare file for download.");return}let l=URL.createObjectURL(f),h=e.createElement("a");h.className="beacon-hidden-download",h.setAttribute("data-beacon-hidden-download","true"),h.href=l,h.download=i.name||"download",e.body.appendChild(h),h.click(),e.body.removeChild(h),URL.revokeObjectURL(l)})})}}function C(s){if(!s?.magnetURI)return;let i=s.magnetURI,p=r?.navigator?.clipboard;if(p&&typeof p.writeText=="function"){p.writeText(i).then(()=>{n.success("Magnet URI copied to clipboard!")}).catch(f=>{b.error("[beacon] Clipboard error",f),n.error("Failed to copy magnet URI")});return}try{let f=e.createElement("textarea");f.value=i,f.className="beacon-clipboard-offscreen",f.setAttribute("data-beacon-clipboard-state","offscreen"),e.body.appendChild(f),f.select(),e.execCommand?.("copy"),e.body.removeChild(f),n.success("Magnet URI copied (fallback)!")}catch(f){b.error("[beacon] Clipboard fallback error",f),n.error("Failed to copy magnet URI")}}function H(s){s&&s.destroy(i=>{i&&(b.error("[beacon] Failed to destroy torrent",i),n.error("Failed to remove torrent"));let p=y();d.selectedTorrent=Te(null,p),u?.render(p,d.selectedTorrent),E()})}function G(){if(S.info(`[beacon] Starting beacon runtime v${ot}`),n||S.warn("[beacon] Toast service unavailable"),o.WEBRTC_SUPPORT||n?.error("Please use a browser with WebRTC support.",{sticky:!0}),a.form){let l=h=>{h.preventDefault(),P(a.magnetInput?.value||""),a.magnetInput&&(a.magnetInput.value="")};a.form.addEventListener("submit",l),m(()=>a.form.removeEventListener("submit",l))}if(a.seedButton&&a.seedInput){let l=()=>{a.seedInput.click()},h=()=>{let V=Array.from(a.seedInput.files||[]);a.seedInput.value="",O(V)};a.seedButton.addEventListener("click",l),a.seedInput.addEventListener("change",h),m(()=>{a.seedButton.removeEventListener("click",l),a.seedInput.removeEventListener("change",h)})}if(a.pauseButton){let l=()=>{d.selectedTorrent&&typeof d.selectedTorrent.pause=="function"&&(d.selectedTorrent.pause(),E())};a.pauseButton.addEventListener("click",l),m(()=>a.pauseButton.removeEventListener("click",l))}if(a.resumeButton){let l=()=>{d.selectedTorrent&&typeof d.selectedTorrent.resume=="function"&&(d.selectedTorrent.resume(),E())};a.resumeButton.addEventListener("click",l),m(()=>a.resumeButton.removeEventListener("click",l))}if(a.downloadAllButton){let l=()=>g(d.selectedTorrent);a.downloadAllButton.addEventListener("click",l),m(()=>a.downloadAllButton.removeEventListener("click",l))}if(a.removeButton){let l=()=>H(d.selectedTorrent);a.removeButton.addEventListener("click",l),m(()=>a.removeButton.removeEventListener("click",l))}if(a.copyMagnetButton){let l=()=>C(d.selectedTorrent);a.copyMagnetButton.addEventListener("click",l),m(()=>a.copyMagnetButton.removeEventListener("click",l))}let s=l=>{b.error("[beacon] Torrent client error",l),n?.error(l?.message||String(l)),A(!1)};c.on("error",s),m(()=>c.removeListener("error",s));let i=l=>{if(c.torrents&&c.torrents.length>0)return l.preventDefault(),l.returnValue="Transfers are in progress. Are you sure you want to leave or refresh?",l.returnValue};r&&typeof r.addEventListener=="function"&&(r.addEventListener("beforeunload",i),m(()=>r.removeEventListener("beforeunload",i))),u?.render(y(),d.selectedTorrent),E(),N(),A(!1);let p=r.setInterval(()=>{u?.render(y(),d.selectedTorrent),E(),N()},1e3);w.push(p);let f=r?.location?.hash;typeof f=="string"&&f.length>1&&P(f.slice(1))}function Q(){w.forEach(s=>r.clearInterval(s)),w.length=0,L.forEach(s=>{try{s()}catch(i){S.warn("[beacon] Cleanup task failed",i)}}),L.length=0,u?.destroy();try{c.destroy()}catch(s){S.warn("[beacon] Failed to destroy client",s)}}return{mount:G,destroy:Q}}var Se="../../config/instance-config.js";function dt(){return typeof window<"u"&&window||typeof globalThis<"u"&&globalThis||null}function ut(){let e=dt();if(e&&typeof e.WebTorrent=="function")return e.WebTorrent;throw new Error("WebTorrent runtime is not available on the global scope")}var $=null,ft=async()=>{try{let e=await import(Se);if(e&&typeof e.THEME_ACCENT_OVERRIDES<"u")return e.THEME_ACCENT_OVERRIDES}catch(e){S.warn(`[beacon] Failed to load theme accent overrides from ${Se}`,e)}return null},pt=async()=>{try{let e=await ft();e&&ue(e)}catch(e){S.warn("[beacon] Unable to hydrate theme accent overrides",e)}try{fe()}catch(e){S.warn("[beacon] Failed to initialize theme controller",e)}};pt();function we(){if($)return S.info("[beacon] Reusing existing beacon app instance"),$;if(typeof document>"u")throw new Error("Beacon runtime requires a document environment");let e=ut();return S.info("[beacon] Creating beacon app instance"),$=_e({documentRef:document,WebTorrentCtor:e}),$.mount(),$}if(typeof document<"u")if(document.readyState==="loading")document.addEventListener("DOMContentLoaded",()=>{try{we()}catch(e){b.error("[beacon] Failed to mount app",e)}});else try{we()}catch(e){b.error("[beacon] Failed to mount app",e)}export{_e as createBeaconApp,we as mountBeaconApp}; +import{IS_DEV_MODE as Le,IS_VERBOSE_DEV_MODE as Ce,IS_LOCKDOWN_MODE as Ae,LOCKDOWN_TITLE as bt,LOCKDOWN_MESSAGE as Et,ADMIN_SUPER_NPUB as Tt,ADMIN_DM_IMAGE_URL as gt,BITVID_WEBSITE_URL as _t,BLOG_URL as St,COMMUNITY_URL as wt,NOSTR_URL as Lt,GITHUB_URL as Ct,BETA_URL as At,DNS_URL as xt,TIP_JAR_URL as vt,MAX_WALLET_DEFAULT_ZAP as It,PLATFORM_FEE_PERCENT as Ot,PLATFORM_LUD16_OVERRIDE as Nt,DEFAULT_RELAY_URLS_OVERRIDE as Bt,ADMIN_WHITELIST_MODE_STORAGE_KEY as Mt,DEFAULT_WHITELIST_MODE_ENABLED as Dt,ALLOW_NSFW_CONTENT as Rt,DEFAULT_TRUST_SEED_NPUBS as Ht,DEFAULT_BLUR_THRESHOLD as Ut,DEFAULT_AUTOPLAY_BLOCK_THRESHOLD as kt,DEFAULT_TRUSTED_MUTE_HIDE_THRESHOLD as Ft,DEFAULT_TRUSTED_SPAM_HIDE_THRESHOLD as Pt,WATCH_HISTORY_KIND as Vt,WATCH_HISTORY_LIST_IDENTIFIER as Wt,WATCH_HISTORY_MAX_ITEMS as qt,WATCH_HISTORY_BATCH_RESOLVE as jt,WATCH_HISTORY_BATCH_PAGE_SIZE as $t,WATCH_HISTORY_PAYLOAD_MAX_BYTES as Yt,WATCH_HISTORY_FETCH_EVENT_LIMIT as Gt,WATCH_HISTORY_CACHE_TTL_MS as zt,VIEW_COUNT_DEDUPE_WINDOW_SECONDS as Kt,VIEW_COUNT_BACKFILL_MAX_DAYS as Xt,VIEW_COUNT_CACHE_TTL_MS as Zt,ENSURE_PRESENCE_REBROADCAST_COOLDOWN_SECONDS as Jt}from"../config/instance-config.js";var H=!!Le;var xe=!!Ce;var ve=!!Ae;typeof window<"u"&&(window.__BITVID_DEV_MODE__=H,window.__BITVID_VERBOSE_DEV_MODE__=xe,window.__BITVID_LOCKDOWN_MODE__=ve);var k=()=>{};function Ie(){return typeof console>"u"||console===null?null:console}function Oe(){let e=Ie();if(!e)return{log:k,info:k,debug:k,warn:k,error:k};let t=typeof e.log=="function"?e.log.bind(e):k;return{log:typeof e.log=="function"?e.log.bind(e):t,info:typeof e.info=="function"?e.info.bind(e):t,debug:typeof e.debug=="function"?e.debug.bind(e):t,warn:typeof e.warn=="function"?e.warn.bind(e):t,error:typeof e.error=="function"?e.error.bind(e):t}}var _=Oe(),M="[bitvid]";function ee(e){if(e.length===0)return{args:e,force:!1};let t=e[e.length-1];if(t&&typeof t=="object"&&!Array.isArray(t)&&Object.prototype.hasOwnProperty.call(t,"force")){let r=[...e],o=r.pop();return{args:r,force:!!o.force}}return{args:e,force:!1}}var S=Object.freeze({log:(...e)=>{H&&_.log(...e)},info:(...e)=>{H&&_.info(...e)},debug:(...e)=>{H&&_.debug(...e)},warn:(...e)=>{H&&_.warn(...e)},error:(...e)=>{H&&_.error(...e)}}),y=Object.freeze({log:(...e)=>{let{args:t,force:r}=ee(e);if(!r&&t.length===0)return;if(r){_.log(M,...t);return}let[o,...n]=t;if(typeof o=="string"&&n.length===0){_.log(`${M} ${o}`);return}o!==void 0&&_.log(M,o)},info:(...e)=>{let{args:t,force:r}=ee(e);if(!r&&t.length===0)return;if(r){_.info(M,...t);return}let[o,...n]=t;if(typeof o=="string"&&n.length===0){_.info(`${M} ${o}`);return}o!==void 0&&_.info(M,o)},warn:(...e)=>{_.warn(M,...e)},error:(...e)=>{_.error(M,...e)}}),te=Object.freeze({dev:S,user:y});function Ne(e){return!e||typeof e!="object"?!1:Object.entries({dev:["log","info","debug","warn","error"],user:["log","info","warn","error"]}).every(([r,o])=>{let n=e[r];return!n||typeof n!="object"?!1:o.every(c=>typeof n[c]=="function")})}typeof window<"u"&&(Ne(window.bitvidLogger)||(window.bitvidLogger=te));Object.freeze(te);import{THEME_ACCENT_OVERRIDES as re}from"../config/instance-config.js";var K="bitvid:theme",v="dark",Be=new Set(["light","dark"]),ne={dark:"#0f172a",light:"#f8fafc"},oe=["[data-theme-toggle]",'[data-action="toggle-theme"]',".js-theme-toggle","#themeToggle"],ie=Object.freeze({accent:"--color-accent",accentStrong:"--color-accent-strong",accentPressed:"--color-accent-pressed"}),ae=new WeakSet,W=new Set,D=null,se=!1,F=null,I=()=>typeof window<"u"&&typeof document<"u",q=e=>{if(typeof e!="string")return null;let t=e.trim().toLowerCase();return t==="default"||t===""?v:Be.has(t)?t:null},Me=()=>{if(!I())return null;try{let e=window.localStorage.getItem(K);return q(e)}catch(e){return y.warn("Unable to read stored theme preference:",e),null}},De=e=>{if(I())try{window.localStorage.setItem(K,e)}catch(t){y.warn("Unable to persist theme preference:",t)}},G=()=>{if(!I())return null;let{documentElement:e}=document;return e instanceof HTMLElement?e:null},Re=e=>typeof e=="string"?e.trim():"",He=e=>{if(!e||typeof e!="object")return null;let t=Object.entries(e).reduce((r,[o,n])=>{if(!n||typeof n!="object")return r;let c=Object.entries(n).reduce((a,[u,d])=>(Object.prototype.hasOwnProperty.call(ie,u)&&(a[u]=d),a),{});return Object.keys(c).length>0&&(r[o]=c),r},{});return Object.keys(t).length>0?t:null},ce=e=>{F=He(e)};ce(typeof re<"u"?re:null);var le=(e,t)=>{if(!e)return;let r=F&&typeof F=="object"&&F[t]&&typeof F[t]=="object"?F[t]:null,o=!1;Object.entries(ie).forEach(([n,c])=>{let a=r?r[n]:null,u=Re(a);u?(e.style.setProperty(c,u),o=!0):e.style.removeProperty(c)}),o?e.dataset.themeAccent="override":e.removeAttribute("data-theme-accent")},Ue=e=>{if(!I())return;let t=document.querySelector('meta[name="theme-color"]');if(!t)return;let r=G();if(!r)return;let o="";try{typeof window.getComputedStyle=="function"&&(o=getComputedStyle(r).getPropertyValue("--color-page").trim())}catch(a){y.warn("Unable to compute theme color token:",a)}let n=ne[e]||ne[v],c=o||n;c&&t.setAttribute("content",c)},de=(e,t)=>{if(!(e instanceof HTMLElement))return;e.dataset.themeState=t,e.setAttribute("aria-pressed",t==="dark"?"true":"false");let r=t==="dark"?"Switch to light theme":"Switch to dark theme";e.setAttribute("aria-label",r),e.setAttribute("title",r);let o=e.querySelector("[data-theme-toggle-label]")||e.querySelector(".sr-only");o&&(o.textContent=r);let n=e.querySelector("[data-theme-toggle-icon]")||e.querySelector('[aria-hidden="true"]');if(n){let c=typeof SVGElement<"u"?SVGElement:null;if(c&&n instanceof c||n instanceof Element&&!!n.querySelector("svg"))n instanceof Element&&n.setAttribute("data-theme-icon-state",t);else{let u=e.dataset.iconLight||"\u2600\uFE0F",d=e.dataset.iconDark||"\u{1F319}";n.textContent=t==="dark"?u:d}}},ke=()=>{if(!I()){W.clear();return}W.forEach(e=>{(!(e instanceof HTMLElement)||!document.contains(e))&&W.delete(e)})},Fe=e=>{ke(),W.forEach(t=>{de(t,e)})},Pe=e=>{!(e instanceof HTMLElement)||ae.has(e)||(e.addEventListener("click",t=>{t.preventDefault(),We(D==="dark"?"light":"dark")}),e.dataset.themeToggleBound="true",ae.add(e))},Ve=(e=document)=>{if(!I())return[];let t=new Set,r=e&&typeof e.querySelectorAll=="function"?e:document;return oe.forEach(o=>{try{r.querySelectorAll(o).forEach(n=>{n instanceof HTMLElement&&t.add(n)})}catch(n){y.warn(`Invalid selector for theme toggle: ${o}`,n)}}),e instanceof HTMLElement&&oe.forEach(o=>{e.matches(o)&&t.add(e)}),Array.from(t)},X=(e,{persist:t=!0}={})=>{let r=q(e)||v;D=r;let o=G();return o&&(o.dataset.theme=r,le(o,r)),t&&De(r),Ue(r),Fe(r),r},ue=e=>{ce(e);let t=G();if(!t)return;le(t,D||v)};var We=e=>I()?X(e,{persist:!0}):(D=q(e)||v,D),qe=(e=document)=>{if(!I())return;Ve(e).forEach(r=>{W.add(r),Pe(r),de(r,D||v)})},je=()=>{if(!I())return v;let e=G();return(e?q(e.dataset.theme):null)||Me()||v},$e=e=>{if(!e||e.key!==K)return;let t=q(e.newValue)||v;t!==D&&X(t,{persist:!1})},fe=()=>{if(!I()){D=v;return}se||(window.addEventListener("storage",$e),se=!0);let e=je();X(e,{persist:!0}),qe(document)};var pe={info:"torrent-toast torrent-toast--info",success:"torrent-toast torrent-toast--success",error:"torrent-toast torrent-toast--error",warn:"torrent-toast torrent-toast--warn"},me="transition duration-200 ease-out",Ye="beacon-toast-motion",Z="data-beacon-motion";function Ge(e,t){let r=e?.defaultView;if(r&&typeof r.requestAnimationFrame=="function"){r.requestAnimationFrame(t);return}setTimeout(t,16)}function ze(e){let t=e||(typeof document<"u"?document:null);if(!t)return null;let r=t.getElementById("beacon-toast-container");if(!r){r=t.createElement("div"),r.id="beacon-toast-container",r.setAttribute("role","region"),r.setAttribute("aria-live","polite"),r.className=["pointer-events-none","fixed","inset-x-0","top-0","z-overlay-toast","flex","w-full","flex-col","items-center","gap-3","px-4","pt-6","sm:items-end","sm:px-6","sm:pt-8"].join(" ");let o=t.body||t.getElementsByTagName?.("body")?.[0];o&&o.appendChild(r)}return r}function Ke(e,t,r){let o=e.createElement("div");o.className=[me,r].join(" "),o.setAttribute("role","status"),o.setAttribute("tabindex","0"),o.textContent=t;let n=e.createElement("button");n.type="button",n.className=["notification-dismiss","focus-ring","absolute","right-3","top-3"].join(" "),n.setAttribute("aria-label","Dismiss notification"),n.innerHTML='';let c=e.createElement("div");return c.className=["relative","w-full",me,Ye].join(" "),c.setAttribute(Z,"exit"),c.appendChild(o),o.appendChild(n),{wrapper:c,toast:o,closeButton:n}}function Xe(e,t=setTimeout,r=clearTimeout){return{show(o,n={}){if(!o)return;let c=n.type&&pe[n.type]?n.type:"info",a=ze(e);if(!a)return;let{wrapper:u,toast:d,closeButton:L}=Ke(e,o,pe[c]);a.appendChild(u),Ge(e,()=>{u.setAttribute(Z,"enter")});let w=typeof n.duration=="number"?n.duration:3500,m=()=>{u.setAttribute(Z,"exit");let B=t(()=>{u.parentNode&&u.parentNode.removeChild(u)},200);return L.removeEventListener("click",C),d.removeEventListener("keydown",b),L.removeEventListener("keydown",b),B},C=()=>m(),b=B=>{B.key==="Escape"&&(B.stopPropagation(),m())};L.addEventListener("click",C),d.addEventListener("keydown",b),L.addEventListener("keydown",b);let N=null;return n.sticky||(N=t(()=>{m()},w)),{dismiss(){N&&r(N),m()}}},set(o,n){return typeof n=="string"?this.show(o,{type:n}):this.show(o,n)},info(o,n={}){return this.show(o,{...n,type:"info"})},success(o,n={}){return this.show(o,{...n,type:"success"})},error(o,n={}){return this.show(o,{...n,type:"error"})},warn(o,n={}){return this.show(o,{...n,type:"warn"})}}}function he(e,t=setTimeout,r=clearTimeout){return Xe(e,t,r)}var J=[{key:"name",label:"Name",headerClass:"w-full sm:w-1/3 text-left",cellClass:"font-medium text-text truncate"},{key:"progress",label:"Progress",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"progress"},{key:"downloadSpeed",label:"\u2193 Speed",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"bytesPerSecond"},{key:"uploadSpeed",label:"\u2191 Speed",headerClass:"w-24 text-right",cellClass:"tabular-nums text-right",formatter:"bytesPerSecond"},{key:"numPeers",label:"Peers",headerClass:"w-20 text-right",cellClass:"tabular-nums text-right",formatter:"integer"},{key:"ratio",label:"Ratio",headerClass:"w-20 text-right",cellClass:"tabular-nums text-right",formatter:"ratio"}];function Ze(e){return e?e.infoHash||e.magnetURI||e.name||String(Math.random()):""}function Je(e,t){return!e||!t?!1:e===t||e.magnetURI&&e.magnetURI===t.magnetURI||e.infoHash&&e.infoHash===t.infoHash}function Qe(e){return typeof e!="number"||Number.isNaN(e)?"":`${(e*100).toFixed(1)}%`}function et(e){return typeof e!="number"||!Number.isFinite(e)?"0.00":e.toFixed(2)}function tt(e){return typeof e!="number"||!Number.isFinite(e)?"0":Math.max(0,Math.floor(e)).toString()}function rt(e,t){if(typeof t=="function")return t(e,!0)||"";if(typeof e!="number"||Number.isNaN(e)||e<1)return"";let r=["B","kB","MB","GB","TB"],o=Math.min(Math.floor(Math.log(e)/Math.log(1e3)),r.length-1);return`${(e/Math.pow(1e3,o)).toFixed(1)} ${r[o]}/s`}function nt(e,t){let r=e.formatter;if(typeof r=="function")return r;let o=t?.[r];if(typeof o=="function")return o;switch(r){case"progress":return Qe;case"ratio":return et;case"integer":return tt;case"bytesPerSecond":return n=>rt(n,t?.bytes);default:return n=>n}}function ye({documentRef:e=typeof document<"u"?document:null,root:t,onSelect:r,formatters:o={}}={}){if(!e)throw new Error("createTorrentTable requires a document reference");if(!(t instanceof e.defaultView.HTMLElement))throw new Error("createTorrentTable requires a valid root element");let n=e;t.innerHTML="";let c=n.createElement("div");c.className="overflow-hidden rounded-xl border border-border-translucent bg-surface shadow-sm";let a=n.createElement("div");a.className="overflow-x-auto",c.appendChild(a);let u=n.createElement("table");u.className="min-w-full divide-y divide-border-translucent text-sm",a.appendChild(u);let d=n.createElement("thead");d.className="bg-surface-alt text-muted-strong";let L=n.createElement("tr");J.forEach(E=>{let x=n.createElement("th");x.setAttribute("scope","col"),x.className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide",E.headerClass&&(x.className+=` ${E.headerClass}`),x.textContent=E.label,L.appendChild(x)}),d.appendChild(L),u.appendChild(d);let w=n.createElement("tbody");w.className="divide-y divide-border-translucent",u.appendChild(w);let m=n.createElement("tbody"),C=n.createElement("tr"),b=n.createElement("td");b.className="px-4 py-8 text-center text-sm text-muted",b.colSpan=J.length,b.textContent="No active torrents yet. Add a magnet link to get started.",C.appendChild(b),m.appendChild(C),u.appendChild(m),t.appendChild(c);function N(E=[],x=null){let P=Array.isArray(E)?E:[];if(w.innerHTML="",!P.length){w.hidden=!0,m.hidden=!1;return}w.hidden=!1,m.hidden=!0;for(let O of P){let g=n.createElement("tr");g.className=["group","align-middle","cursor-pointer","transition","hover:bg-panel-hover","focus-visible:outline","focus-visible:outline-2","focus-visible:outline-offset-2","focus-visible:outline-info"].join(" "),g.setAttribute("role","button"),g.setAttribute("tabindex","0"),g.dataset.torrentId=Ze(O),Je(x,O)?(g.classList.add("bg-info/10","text-text"),g.setAttribute("aria-pressed","true")):g.setAttribute("aria-pressed","false"),g.addEventListener("click",()=>{typeof r=="function"&&r(O)}),g.addEventListener("keydown",A=>{(A.key==="Enter"||A.key===" ")&&(A.preventDefault(),typeof r=="function"&&r(O))}),J.forEach(A=>{let U=n.createElement("td");U.className="px-4 py-3",A.cellClass&&(U.className+=` ${A.cellClass}`);let z=O?O[A.key]:void 0,s=nt(A,o)(z,O,A),i=n.createElement("span");i.textContent=s==null?"":String(s),U.appendChild(i),g.appendChild(U)}),w.appendChild(g)}}function B(){t.innerHTML=""}return{render:N,destroy:B}}var ot="2.0",ge=["wss://tracker.btorrent.xyz","wss://tracker.openwebtorrent.com"],be={announce:ge},at={announce:ge};function j(e,t=!1){if(typeof e!="number"||Number.isNaN(e))return"";if(e<1)return t?"":"0 B";let r=["B","kB","MB","GB","TB"],o=Math.min(Math.floor(Math.log(e)/Math.log(1e3)),r.length-1);return`${(e/Math.pow(1e3,o)).toFixed(1)} ${r[o]}${t?"/s":""}`}function st(e){return typeof e!="number"||Number.isNaN(e)?"":`${(e*100).toFixed(1)}%`}function Ee(e){return typeof e!="number"||!Number.isFinite(e)?"0.00":e.toFixed(2)}function it(e,t){return!e||!t?!1:!!(e===t||e.infoHash&&t.infoHash&&e.infoHash===t.infoHash||e.magnetURI&&t.magnetURI&&e.magnetURI===t.magnetURI)}function ct(e){if(!(!e||!Array.isArray(e.files))&&(e.files.forEach(t=>{typeof t.priority!="string"&&(t.priority="0"),typeof t.getBlobURL=="function"&&t.getBlobURL((r,o)=>{r||!o||(t.url=o)})}),e.torrentFile&&typeof Blob=="function"&&typeof URL<"u"))try{let t=new Blob([e.torrentFile],{type:"application/x-bittorrent"});if(e.torrentFileBlobURL=URL.createObjectURL(t),!e.fileName){let r=e.name||"download";e.fileName=`${r}.torrent`}}catch(t){S.warn("[beacon] Failed to create torrent blob URL",t)}}function lt(e,t){if(!e)return;let r=typeof t=="string"?t:String(t??"0");if(e.priority=r,r==="-1"){typeof e.deselect=="function"&&e.deselect();return}let o=Number.parseInt(r,10);Number.isFinite(o)&&typeof e.select=="function"&&e.select(o)}function Te(e,t){if(!Array.isArray(t)||t.length===0)return null;if(!e)return t[0];let r=t.find(o=>it(o,e));return r||t[0]}function _e({documentRef:e=typeof document<"u"?document:null,WebTorrentCtor:t}={}){if(!e)throw new Error("createBeaconApp requires a document reference");let r=e.defaultView||globalThis,o=typeof t=="function"?t:typeof r?.WebTorrent=="function"?r.WebTorrent:null;if(!o)throw new Error("createBeaconApp requires a WebTorrent constructor");let n=he(e),c=new o({tracker:at}),a={form:e.querySelector('[data-beacon="magnet-form"]'),magnetInput:e.querySelector('[data-beacon="magnet-input"]'),seedButton:e.querySelector('[data-beacon="seed-button"]'),seedInput:e.querySelector('[data-beacon="seed-input"]'),tableRoot:e.querySelector('[data-beacon="torrent-table"]'),selectedSection:e.querySelector('[data-beacon="selected"]'),selectedName:e.querySelector('[data-beacon="selected-name"]'),pauseButton:e.querySelector('[data-beacon-action="pause"]'),resumeButton:e.querySelector('[data-beacon-action="resume"]'),downloadAllButton:e.querySelector('[data-beacon-action="download-all"]'),removeButton:e.querySelector('[data-beacon-action="remove"]'),copyMagnetButton:e.querySelector('[data-beacon-action="copy-magnet"]'),infoHashValue:e.querySelector('[data-beacon="info-hash"]'),fileList:e.querySelector('[data-beacon="file-list"]'),stats:e.querySelector('[data-beacon="client-stats"]'),overlay:e.querySelector('[data-beacon="processing-overlay"]')},u=a.tableRoot?ye({documentRef:e,root:a.tableRoot,formatters:{bytes:(s,i=!1)=>j(s,i),progress:s=>st(s),ratio:s=>Ee(s),integer:s=>typeof s=="number"&&Number.isFinite(s)?Math.floor(s).toString():"0",bytesPerSecond:s=>j(s,!0)},onSelect(s){d.selectedTorrent=s,E()}}):null,d={selectedTorrent:null,processing:!1},L=[],w=[];function m(s){L.push(s)}function C(s){if(d.processing=!!s,!a.overlay)return;let i=d.processing;a.overlay.hidden=!i,a.overlay.setAttribute("aria-hidden",i?"false":"true"),i?a.overlay.style.removeProperty("display"):a.overlay.style.display="none"}function b(){return Array.isArray(c.torrents)?[...c.torrents]:[]}function N(){if(!a.stats)return;let s=j(c.downloadSpeed,!0)||"0 B/s",i=j(c.uploadSpeed,!0)||"0 B/s",p=Ee(c.ratio);a.stats.textContent=`Client stats: \u2193 ${s} \xB7 \u2191 ${i} \xB7 Ratio: ${p}`}function B(s){a.fileList&&(a.fileList.innerHTML="",!(!s||!Array.isArray(s.files)||!s.files.length)&&s.files.forEach((i,p)=>{let f=e.createElement("tr");f.className="align-top";let l=e.createElement("td");if(l.className="px-3 py-2",i.done&&i.url){let T=e.createElement("a");T.className="text-info hover:text-info-strong",T.href=i.url,T.download=i.name||`file-${p+1}`,T.textContent=i.name||`File ${p+1}`,l.appendChild(T)}else{let T=e.createElement("span");T.textContent=i.name||`File ${p+1}`,l.appendChild(T)}f.appendChild(l);let h=e.createElement("td");h.className="px-3 py-2 text-muted-strong",h.textContent=j(i.length)||"0 B",f.appendChild(h);let V=e.createElement("td");V.className="px-3 py-2";let R=e.createElement("select");R.className="select",R.name=`${i.name||`file-${p+1}`}-priority`,R.setAttribute("aria-label",`Set priority for ${i.name||`file ${p+1}`}`),[{value:"1",label:"High priority"},{value:"0",label:"Low priority"},{value:"-1",label:"Don't download"}].forEach(T=>{let Y=e.createElement("option");Y.value=T.value,Y.textContent=T.label,T.value===i.priority&&(Y.selected=!0),R.appendChild(Y)}),R.value=i.priority??"0",R.addEventListener("change",T=>{lt(i,T.target.value)}),V.appendChild(R),f.appendChild(V),a.fileList.appendChild(f)}))}function E(){if(!a.selectedSection)return;let s=b();d.selectedTorrent=Te(d.selectedTorrent,s);let i=d.selectedTorrent;a.selectedSection.hidden=!i,i&&(a.selectedName&&(a.selectedName.textContent=i.name||"Untitled torrent"),a.pauseButton&&(a.pauseButton.hidden=i.paused===!0,a.pauseButton.disabled=i.paused===!0),a.resumeButton&&(a.resumeButton.hidden=i.paused!==!0,a.resumeButton.disabled=i.paused!==!0),a.downloadAllButton&&(a.downloadAllButton.disabled=!(i.progress>=1)),a.infoHashValue&&(a.infoHashValue.textContent=i.infoHash||""),B(i))}function x(s,{isSeed:i=!1}={}){C(!1),ct(s),i||n.info(`Received ${s.name||"torrent"} metadata`),d.selectedTorrent||(d.selectedTorrent=s),E(),u?.render(b(),d.selectedTorrent)}function P(s){let i=typeof s=="string"?s.trim():"";i&&(C(!0),c.add(i,be,p=>{x(p,{isSeed:!1})}))}function O(s){!Array.isArray(s)||s.length===0||(C(!0),c.seed(s,be,i=>{x(i,{isSeed:!0}),n.success(`Seeding ${i.files.length} file(s)`)}))}function g(s){if(s){if(s.progress<1){n.warn("Torrent is not finished downloading yet.");return}s.files.forEach(i=>{typeof i.getBlob=="function"&&i.getBlob((p,f)=>{if(p||!f){y.error("[beacon] Failed to get blob for file",i?.name,p),n.error("Failed to prepare file for download.");return}let l=URL.createObjectURL(f),h=e.createElement("a");h.className="beacon-hidden-download",h.setAttribute("data-beacon-hidden-download","true"),h.href=l,h.download=i.name||"download",e.body.appendChild(h),h.click(),e.body.removeChild(h),URL.revokeObjectURL(l)})})}}function A(s){if(!s?.magnetURI)return;let i=s.magnetURI,p=r?.navigator?.clipboard;if(p&&typeof p.writeText=="function"){p.writeText(i).then(()=>{n.success("Magnet URI copied to clipboard!")}).catch(f=>{y.error("[beacon] Clipboard error",f),n.error("Failed to copy magnet URI")});return}try{let f=e.createElement("textarea");f.value=i,f.className="beacon-clipboard-offscreen",f.setAttribute("data-beacon-clipboard-state","offscreen"),e.body.appendChild(f),f.select(),e.execCommand?.("copy"),e.body.removeChild(f),n.success("Magnet URI copied (fallback)!")}catch(f){y.error("[beacon] Clipboard fallback error",f),n.error("Failed to copy magnet URI")}}function U(s){s&&s.destroy(i=>{i&&(y.error("[beacon] Failed to destroy torrent",i),n.error("Failed to remove torrent"));let p=b();d.selectedTorrent=Te(null,p),u?.render(p,d.selectedTorrent),E()})}function z(){if(S.info(`[beacon] Starting beacon runtime v${ot}`),n||S.warn("[beacon] Toast service unavailable"),o.WEBRTC_SUPPORT||n?.error("Please use a browser with WebRTC support.",{sticky:!0}),a.form){let l=h=>{h.preventDefault(),P(a.magnetInput?.value||""),a.magnetInput&&(a.magnetInput.value="")};a.form.addEventListener("submit",l),m(()=>a.form.removeEventListener("submit",l))}if(a.seedButton&&a.seedInput){let l=()=>{a.seedInput.click()},h=()=>{let V=Array.from(a.seedInput.files||[]);a.seedInput.value="",O(V)};a.seedButton.addEventListener("click",l),a.seedInput.addEventListener("change",h),m(()=>{a.seedButton.removeEventListener("click",l),a.seedInput.removeEventListener("change",h)})}if(a.pauseButton){let l=()=>{d.selectedTorrent&&typeof d.selectedTorrent.pause=="function"&&(d.selectedTorrent.pause(),E())};a.pauseButton.addEventListener("click",l),m(()=>a.pauseButton.removeEventListener("click",l))}if(a.resumeButton){let l=()=>{d.selectedTorrent&&typeof d.selectedTorrent.resume=="function"&&(d.selectedTorrent.resume(),E())};a.resumeButton.addEventListener("click",l),m(()=>a.resumeButton.removeEventListener("click",l))}if(a.downloadAllButton){let l=()=>g(d.selectedTorrent);a.downloadAllButton.addEventListener("click",l),m(()=>a.downloadAllButton.removeEventListener("click",l))}if(a.removeButton){let l=()=>U(d.selectedTorrent);a.removeButton.addEventListener("click",l),m(()=>a.removeButton.removeEventListener("click",l))}if(a.copyMagnetButton){let l=()=>A(d.selectedTorrent);a.copyMagnetButton.addEventListener("click",l),m(()=>a.copyMagnetButton.removeEventListener("click",l))}let s=l=>{y.error("[beacon] Torrent client error",l),n?.error(l?.message||String(l)),C(!1)};c.on("error",s),m(()=>c.removeListener("error",s));let i=l=>{if(c.torrents&&c.torrents.length>0)return l.preventDefault(),l.returnValue="Transfers are in progress. Are you sure you want to leave or refresh?",l.returnValue};r&&typeof r.addEventListener=="function"&&(r.addEventListener("beforeunload",i),m(()=>r.removeEventListener("beforeunload",i))),u?.render(b(),d.selectedTorrent),E(),N(),C(!1);let p=r.setInterval(()=>{u?.render(b(),d.selectedTorrent),E(),N()},1e3);w.push(p);let f=r?.location?.hash;typeof f=="string"&&f.length>1&&P(f.slice(1))}function Q(){w.forEach(s=>r.clearInterval(s)),w.length=0,L.forEach(s=>{try{s()}catch(i){S.warn("[beacon] Cleanup task failed",i)}}),L.length=0,u?.destroy();try{c.destroy()}catch(s){S.warn("[beacon] Failed to destroy client",s)}}return{mount:z,destroy:Q}}var Se="../../config/instance-config.js";function dt(){return typeof window<"u"&&window||typeof globalThis<"u"&&globalThis||null}function ut(){let e=dt();if(e&&typeof e.WebTorrent=="function")return e.WebTorrent;throw new Error("WebTorrent runtime is not available on the global scope")}var $=null,ft=async()=>{try{let e=await import(Se);if(e&&typeof e.THEME_ACCENT_OVERRIDES<"u")return e.THEME_ACCENT_OVERRIDES}catch(e){S.warn(`[beacon] Failed to load theme accent overrides from ${Se}`,e)}return null},pt=async()=>{try{let e=await ft();e&&ue(e)}catch(e){S.warn("[beacon] Unable to hydrate theme accent overrides",e)}try{fe()}catch(e){S.warn("[beacon] Failed to initialize theme controller",e)}};pt();function we(){if($)return S.info("[beacon] Reusing existing beacon app instance"),$;if(typeof document>"u")throw new Error("Beacon runtime requires a document environment");let e=ut();return S.info("[beacon] Creating beacon app instance"),$=_e({documentRef:document,WebTorrentCtor:e}),$.mount(),$}if(typeof document<"u")if(document.readyState==="loading")document.addEventListener("DOMContentLoaded",()=>{try{we()}catch(e){y.error("[beacon] Failed to mount app",e)}});else try{we()}catch(e){y.error("[beacon] Failed to mount app",e)}export{_e as createBeaconApp,we as mountBeaconApp}; diff --git a/dist/vendor/floating-ui.dom.bundle.min.js b/dist/vendor/floating-ui.dom.bundle.min.js index aa3ba55a..41865e7e 100644 --- a/dist/vendor/floating-ui.dom.bundle.min.js +++ b/dist/vendor/floating-ui.dom.bundle.min.js @@ -1 +1 @@ -var $=Math.min,B=Math.max,ot=Math.round,it=Math.floor,E=t=>({x:t,y:t}),qt={left:"right",right:"left",bottom:"top",top:"bottom"},Ut={start:"end",end:"start"};function lt(t,e,n){return B(t,$(e,n))}function U(t,e){return typeof t=="function"?t(e):t}function V(t){return t.split("-")[0]}function K(t){return t.split("-")[1]}function pt(t){return t==="x"?"y":"x"}function at(t){return t==="y"?"height":"width"}var Kt=new Set(["top","bottom"]);function W(t){return Kt.has(V(t))?"y":"x"}function ft(t){return pt(W(t))}function At(t,e,n){n===void 0&&(n=!1);let o=K(t),i=ft(t),r=at(i),s=i==="x"?o===(n?"end":"start")?"right":"left":o==="start"?"bottom":"top";return e.reference[r]>e.floating[r]&&(s=nt(s)),[s,nt(s)]}function Ot(t){let e=nt(t);return[ct(t),e,ct(e)]}function ct(t){return t.replace(/start|end/g,e=>Ut[e])}var vt=["left","right"],bt=["right","left"],Gt=["top","bottom"],Jt=["bottom","top"];function Qt(t,e,n){switch(t){case"top":case"bottom":return n?e?bt:vt:e?vt:bt;case"left":case"right":return e?Gt:Jt;default:return[]}}function Rt(t,e,n,o){let i=K(t),r=Qt(V(t),n==="start",o);return i&&(r=r.map(s=>s+"-"+i),e&&(r=r.concat(r.map(ct)))),r}function nt(t){return t.replace(/left|right|bottom|top/g,e=>qt[e])}function Zt(t){return{top:0,right:0,bottom:0,left:0,...t}}function wt(t){return typeof t!="number"?Zt(t):{top:t,right:t,bottom:t,left:t}}function X(t){let{x:e,y:n,width:o,height:i}=t;return{width:o,height:i,top:n,left:e,right:e+o,bottom:n+i,x:e,y:n}}function St(t,e,n){let{reference:o,floating:i}=t,r=W(e),s=ft(e),c=at(s),l=V(e),a=r==="y",d=o.x+o.width/2-i.width/2,u=o.y+o.height/2-i.height/2,m=o[c]/2-i[c]/2,f;switch(l){case"top":f={x:d,y:o.y-i.height};break;case"bottom":f={x:d,y:o.y+o.height};break;case"right":f={x:o.x+o.width,y:u};break;case"left":f={x:o.x-i.width,y:u};break;default:f={x:o.x,y:o.y}}switch(K(e)){case"start":f[s]-=m*(n&&a?-1:1);break;case"end":f[s]+=m*(n&&a?-1:1);break}return f}async function Ct(t,e){var n;e===void 0&&(e={});let{x:o,y:i,platform:r,rects:s,elements:c,strategy:l}=t,{boundary:a="clippingAncestors",rootBoundary:d="viewport",elementContext:u="floating",altBoundary:m=!1,padding:f=0}=U(e,t),g=wt(f),w=c[m?u==="floating"?"reference":"floating":u],h=X(await r.getClippingRect({element:(n=await(r.isElement==null?void 0:r.isElement(w)))==null||n?w:w.contextElement||await(r.getDocumentElement==null?void 0:r.getDocumentElement(c.floating)),boundary:a,rootBoundary:d,strategy:l})),x=u==="floating"?{x:o,y:i,width:s.floating.width,height:s.floating.height}:s.reference,y=await(r.getOffsetParent==null?void 0:r.getOffsetParent(c.floating)),v=await(r.isElement==null?void 0:r.isElement(y))?await(r.getScale==null?void 0:r.getScale(y))||{x:1,y:1}:{x:1,y:1},O=X(r.convertOffsetParentRelativeRectToViewportRelativeRect?await r.convertOffsetParentRelativeRectToViewportRelativeRect({elements:c,rect:x,offsetParent:y,strategy:l}):x);return{top:(h.top-O.top+g.top)/v.y,bottom:(O.bottom-h.bottom+g.bottom)/v.y,left:(h.left-O.left+g.left)/v.x,right:(O.right-h.right+g.right)/v.x}}var Pt=async(t,e,n)=>{let{placement:o="bottom",strategy:i="absolute",middleware:r=[],platform:s}=n,c=r.filter(Boolean),l=await(s.isRTL==null?void 0:s.isRTL(e)),a=await s.getElementRects({reference:t,floating:e,strategy:i}),{x:d,y:u}=St(a,o,l),m=o,f={},g=0;for(let w=0;w({name:"arrow",options:t,async fn(e){let{x:n,y:o,placement:i,rects:r,platform:s,elements:c,middlewareData:l}=e,{element:a,padding:d=0}=U(t,e)||{};if(a==null)return{};let u=wt(d),m={x:n,y:o},f=ft(i),g=at(f),p=await s.getDimensions(a),w=f==="y",h=w?"top":"left",x=w?"bottom":"right",y=w?"clientHeight":"clientWidth",v=r.reference[g]+r.reference[f]-m[f]-r.floating[g],O=m[f]-r.reference[f],b=await(s.getOffsetParent==null?void 0:s.getOffsetParent(a)),S=b?b[y]:0;(!S||!await(s.isElement==null?void 0:s.isElement(b)))&&(S=c.floating[y]||r.floating[g]);let Z=v/2-O/2,z=S/2-p[g]/2-1,F=$(u[h],z),tt=$(u[x],z),_=F,et=S-p[g]-tt,A=S/2-p[g]/2+Z,I=lt(_,A,et),k=!l.arrow&&K(i)!=null&&A!==I&&r.reference[g]/2-(A<_?F:tt)-p[g]/2<0,T=k?A<_?A-_:A-et:0;return{[f]:m[f]+T,data:{[f]:I,centerOffset:A-I-T,...k&&{alignmentOffset:T}},reset:k}}});var Lt=function(t){return t===void 0&&(t={}),{name:"flip",options:t,async fn(e){var n,o;let{placement:i,middlewareData:r,rects:s,initialPlacement:c,platform:l,elements:a}=e,{mainAxis:d=!0,crossAxis:u=!0,fallbackPlacements:m,fallbackStrategy:f="bestFit",fallbackAxisSideDirection:g="none",flipAlignment:p=!0,...w}=U(t,e);if((n=r.arrow)!=null&&n.alignmentOffset)return{};let h=V(i),x=W(c),y=V(c)===c,v=await(l.isRTL==null?void 0:l.isRTL(a.floating)),O=m||(y||!p?[nt(c)]:Ot(c)),b=g!=="none";!m&&b&&O.push(...Rt(c,p,g,v));let S=[c,...O],Z=await l.detectOverflow(e,w),z=[],F=((o=r.flip)==null?void 0:o.overflows)||[];if(d&&z.push(Z[h]),u){let A=At(i,s,v);z.push(Z[A[0]],Z[A[1]])}if(F=[...F,{placement:i,overflows:z}],!z.every(A=>A<=0)){var tt,_;let A=(((tt=r.flip)==null?void 0:tt.index)||0)+1,I=S[A];if(I&&(!(u==="alignment"?x!==W(I):!1)||F.every(L=>W(L.placement)===x?L.overflows[0]>0:!0)))return{data:{index:A,overflows:F},reset:{placement:I}};let k=(_=F.filter(T=>T.overflows[0]<=0).sort((T,L)=>T.overflows[1]-L.overflows[1])[0])==null?void 0:_.placement;if(!k)switch(f){case"bestFit":{var et;let T=(et=F.filter(L=>{if(b){let H=W(L.placement);return H===x||H==="y"}return!0}).map(L=>[L.placement,L.overflows.filter(H=>H>0).reduce((H,Yt)=>H+Yt,0)]).sort((L,H)=>L[1]-H[1])[0])==null?void 0:et[0];T&&(k=T);break}case"initialPlacement":k=c;break}if(i!==k)return{reset:{placement:k}}}return{}}}};var te=new Set(["left","top"]);async function ee(t,e){let{placement:n,platform:o,elements:i}=t,r=await(o.isRTL==null?void 0:o.isRTL(i.floating)),s=V(n),c=K(n),l=W(n)==="y",a=te.has(s)?-1:1,d=r&&l?-1:1,u=U(e,t),{mainAxis:m,crossAxis:f,alignmentAxis:g}=typeof u=="number"?{mainAxis:u,crossAxis:0,alignmentAxis:null}:{mainAxis:u.mainAxis||0,crossAxis:u.crossAxis||0,alignmentAxis:u.alignmentAxis};return c&&typeof g=="number"&&(f=c==="end"?g*-1:g),l?{x:f*d,y:m*a}:{x:m*a,y:f*d}}var Et=function(t){return t===void 0&&(t=0),{name:"offset",options:t,async fn(e){var n,o;let{x:i,y:r,placement:s,middlewareData:c}=e,l=await ee(e,t);return s===((n=c.offset)==null?void 0:n.placement)&&(o=c.arrow)!=null&&o.alignmentOffset?{}:{x:i+l.x,y:r+l.y,data:{...l,placement:s}}}}},Dt=function(t){return t===void 0&&(t={}),{name:"shift",options:t,async fn(e){let{x:n,y:o,placement:i,platform:r}=e,{mainAxis:s=!0,crossAxis:c=!1,limiter:l={fn:h=>{let{x,y}=h;return{x,y}}},...a}=U(t,e),d={x:n,y:o},u=await r.detectOverflow(e,a),m=W(V(i)),f=pt(m),g=d[f],p=d[m];if(s){let h=f==="y"?"top":"left",x=f==="y"?"bottom":"right",y=g+u[h],v=g-u[x];g=lt(y,g,v)}if(c){let h=m==="y"?"top":"left",x=m==="y"?"bottom":"right",y=p+u[h],v=p-u[x];p=lt(y,p,v)}let w=l.fn({...e,[f]:g,[m]:p});return{...w,data:{x:w.x-n,y:w.y-o,enabled:{[f]:s,[m]:c}}}}}};function ut(){return typeof window<"u"}function j(t){return Ft(t)?(t.nodeName||"").toLowerCase():"#document"}function R(t){var e;return(t==null||(e=t.ownerDocument)==null?void 0:e.defaultView)||window}function D(t){var e;return(e=(Ft(t)?t.ownerDocument:t.document)||window.document)==null?void 0:e.documentElement}function Ft(t){return ut()?t instanceof Node||t instanceof R(t).Node:!1}function C(t){return ut()?t instanceof Element||t instanceof R(t).Element:!1}function M(t){return ut()?t instanceof HTMLElement||t instanceof R(t).HTMLElement:!1}function Mt(t){return!ut()||typeof ShadowRoot>"u"?!1:t instanceof ShadowRoot||t instanceof R(t).ShadowRoot}var ne=new Set(["inline","contents"]);function J(t){let{overflow:e,overflowX:n,overflowY:o,display:i}=P(t);return/auto|scroll|overlay|hidden|clip/.test(e+o+n)&&!ne.has(i)}var oe=new Set(["table","td","th"]);function kt(t){return oe.has(j(t))}var ie=[":popover-open",":modal"];function st(t){return ie.some(e=>{try{return t.matches(e)}catch{return!1}})}var se=["transform","translate","scale","rotate","perspective"],re=["transform","translate","scale","rotate","perspective","filter"],ce=["paint","layout","strict","content"];function dt(t){let e=mt(),n=C(t)?P(t):t;return se.some(o=>n[o]?n[o]!=="none":!1)||(n.containerType?n.containerType!=="normal":!1)||!e&&(n.backdropFilter?n.backdropFilter!=="none":!1)||!e&&(n.filter?n.filter!=="none":!1)||re.some(o=>(n.willChange||"").includes(o))||ce.some(o=>(n.contain||"").includes(o))}function Bt(t){let e=N(t);for(;M(e)&&!Y(e);){if(dt(e))return e;if(st(e))return null;e=N(e)}return null}function mt(){return typeof CSS>"u"||!CSS.supports?!1:CSS.supports("-webkit-backdrop-filter","none")}var le=new Set(["html","body","#document"]);function Y(t){return le.has(j(t))}function P(t){return R(t).getComputedStyle(t)}function rt(t){return C(t)?{scrollLeft:t.scrollLeft,scrollTop:t.scrollTop}:{scrollLeft:t.scrollX,scrollTop:t.scrollY}}function N(t){if(j(t)==="html")return t;let e=t.assignedSlot||t.parentNode||Mt(t)&&t.host||D(t);return Mt(e)?e.host:e}function Wt(t){let e=N(t);return Y(e)?t.ownerDocument?t.ownerDocument.body:t.body:M(e)&&J(e)?e:Wt(e)}function G(t,e,n){var o;e===void 0&&(e=[]),n===void 0&&(n=!0);let i=Wt(t),r=i===((o=t.ownerDocument)==null?void 0:o.body),s=R(i);if(r){let c=gt(s);return e.concat(s,s.visualViewport||[],J(i)?i:[],c&&n?G(c):[])}return e.concat(i,G(i,[],n))}function gt(t){return t.parent&&Object.getPrototypeOf(t.parent)?t.frameElement:null}function Vt(t){let e=P(t),n=parseFloat(e.width)||0,o=parseFloat(e.height)||0,i=M(t),r=i?t.offsetWidth:n,s=i?t.offsetHeight:o,c=ot(n)!==r||ot(o)!==s;return c&&(n=r,o=s),{width:n,height:o,$:c}}function yt(t){return C(t)?t:t.contextElement}function Q(t){let e=yt(t);if(!M(e))return E(1);let n=e.getBoundingClientRect(),{width:o,height:i,$:r}=Vt(e),s=(r?ot(n.width):n.width)/o,c=(r?ot(n.height):n.height)/i;return(!s||!Number.isFinite(s))&&(s=1),(!c||!Number.isFinite(c))&&(c=1),{x:s,y:c}}var ae=E(0);function zt(t){let e=R(t);return!mt()||!e.visualViewport?ae:{x:e.visualViewport.offsetLeft,y:e.visualViewport.offsetTop}}function fe(t,e,n){return e===void 0&&(e=!1),!n||e&&n!==R(t)?!1:e}function q(t,e,n,o){e===void 0&&(e=!1),n===void 0&&(n=!1);let i=t.getBoundingClientRect(),r=yt(t),s=E(1);e&&(o?C(o)&&(s=Q(o)):s=Q(t));let c=fe(r,n,o)?zt(r):E(0),l=(i.left+c.x)/s.x,a=(i.top+c.y)/s.y,d=i.width/s.x,u=i.height/s.y;if(r){let m=R(r),f=o&&C(o)?R(o):o,g=m,p=gt(g);for(;p&&o&&f!==g;){let w=Q(p),h=p.getBoundingClientRect(),x=P(p),y=h.left+(p.clientLeft+parseFloat(x.paddingLeft))*w.x,v=h.top+(p.clientTop+parseFloat(x.paddingTop))*w.y;l*=w.x,a*=w.y,d*=w.x,u*=w.y,l+=y,a+=v,g=R(p),p=gt(g)}}return X({width:d,height:u,x:l,y:a})}function ht(t,e){let n=rt(t).scrollLeft;return e?e.left+n:q(D(t)).left+n}function _t(t,e){let n=t.getBoundingClientRect(),o=n.left+e.scrollLeft-ht(t,n),i=n.top+e.scrollTop;return{x:o,y:i}}function ue(t){let{elements:e,rect:n,offsetParent:o,strategy:i}=t,r=i==="fixed",s=D(o),c=e?st(e.floating):!1;if(o===s||c&&r)return n;let l={scrollLeft:0,scrollTop:0},a=E(1),d=E(0),u=M(o);if((u||!u&&!r)&&((j(o)!=="body"||J(s))&&(l=rt(o)),M(o))){let f=q(o);a=Q(o),d.x=f.x+o.clientLeft,d.y=f.y+o.clientTop}let m=s&&!u&&!r?_t(s,l):E(0);return{width:n.width*a.x,height:n.height*a.y,x:n.x*a.x-l.scrollLeft*a.x+d.x+m.x,y:n.y*a.y-l.scrollTop*a.y+d.y+m.y}}function de(t){return Array.from(t.getClientRects())}function me(t){let e=D(t),n=rt(t),o=t.ownerDocument.body,i=B(e.scrollWidth,e.clientWidth,o.scrollWidth,o.clientWidth),r=B(e.scrollHeight,e.clientHeight,o.scrollHeight,o.clientHeight),s=-n.scrollLeft+ht(t),c=-n.scrollTop;return P(o).direction==="rtl"&&(s+=B(e.clientWidth,o.clientWidth)-i),{width:i,height:r,x:s,y:c}}var Nt=25;function ge(t,e){let n=R(t),o=D(t),i=n.visualViewport,r=o.clientWidth,s=o.clientHeight,c=0,l=0;if(i){r=i.width,s=i.height;let d=mt();(!d||d&&e==="fixed")&&(c=i.offsetLeft,l=i.offsetTop)}let a=ht(o);if(a<=0){let d=o.ownerDocument,u=d.body,m=getComputedStyle(u),f=d.compatMode==="CSS1Compat"&&parseFloat(m.marginLeft)+parseFloat(m.marginRight)||0,g=Math.abs(o.clientWidth-u.clientWidth-f);g<=Nt&&(r-=g)}else a<=Nt&&(r+=a);return{width:r,height:s,x:c,y:l}}var he=new Set(["absolute","fixed"]);function pe(t,e){let n=q(t,!0,e==="fixed"),o=n.top+t.clientTop,i=n.left+t.clientLeft,r=M(t)?Q(t):E(1),s=t.clientWidth*r.x,c=t.clientHeight*r.y,l=i*r.x,a=o*r.y;return{width:s,height:c,x:l,y:a}}function Ht(t,e,n){let o;if(e==="viewport")o=ge(t,n);else if(e==="document")o=me(D(t));else if(C(e))o=pe(e,n);else{let i=zt(t);o={x:e.x-i.x,y:e.y-i.y,width:e.width,height:e.height}}return X(o)}function It(t,e){let n=N(t);return n===e||!C(n)||Y(n)?!1:P(n).position==="fixed"||It(n,e)}function we(t,e){let n=e.get(t);if(n)return n;let o=G(t,[],!1).filter(c=>C(c)&&j(c)!=="body"),i=null,r=P(t).position==="fixed",s=r?N(t):t;for(;C(s)&&!Y(s);){let c=P(s),l=dt(s);!l&&c.position==="fixed"&&(i=null),(r?!l&&!i:!l&&c.position==="static"&&!!i&&he.has(i.position)||J(s)&&!l&&It(t,s))?o=o.filter(d=>d!==s):i=c,s=N(s)}return e.set(t,o),o}function xe(t){let{element:e,boundary:n,rootBoundary:o,strategy:i}=t,s=[...n==="clippingAncestors"?st(e)?[]:we(e,this._c):[].concat(n),o],c=s[0],l=s.reduce((a,d)=>{let u=Ht(e,d,i);return a.top=B(u.top,a.top),a.right=$(u.right,a.right),a.bottom=$(u.bottom,a.bottom),a.left=B(u.left,a.left),a},Ht(e,c,i));return{width:l.right-l.left,height:l.bottom-l.top,x:l.left,y:l.top}}function ye(t){let{width:e,height:n}=Vt(t);return{width:e,height:n}}function ve(t,e,n){let o=M(e),i=D(e),r=n==="fixed",s=q(t,!0,r,e),c={scrollLeft:0,scrollTop:0},l=E(0);function a(){l.x=ht(i)}if(o||!o&&!r)if((j(e)!=="body"||J(i))&&(c=rt(e)),o){let f=q(e,!0,r,e);l.x=f.x+e.clientLeft,l.y=f.y+e.clientTop}else i&&a();r&&!o&&i&&a();let d=i&&!o&&!r?_t(i,c):E(0),u=s.left+c.scrollLeft-l.x-d.x,m=s.top+c.scrollTop-l.y-d.y;return{x:u,y:m,width:s.width,height:s.height}}function xt(t){return P(t).position==="static"}function $t(t,e){if(!M(t)||P(t).position==="fixed")return null;if(e)return e(t);let n=t.offsetParent;return D(t)===n&&(n=n.ownerDocument.body),n}function Xt(t,e){let n=R(t);if(st(t))return n;if(!M(t)){let i=N(t);for(;i&&!Y(i);){if(C(i)&&!xt(i))return i;i=N(i)}return n}let o=$t(t,e);for(;o&&kt(o)&&xt(o);)o=$t(o,e);return o&&Y(o)&&xt(o)&&!dt(o)?n:o||Bt(t)||n}var be=async function(t){let e=this.getOffsetParent||Xt,n=this.getDimensions,o=await n(t.floating);return{reference:ve(t.reference,await e(t.floating),t.strategy),floating:{x:0,y:0,width:o.width,height:o.height}}};function Ae(t){return P(t).direction==="rtl"}var Oe={convertOffsetParentRelativeRectToViewportRelativeRect:ue,getDocumentElement:D,getClippingRect:xe,getOffsetParent:Xt,getElementRects:be,getClientRects:de,getDimensions:ye,getScale:Q,isElement:C,isRTL:Ae};function jt(t,e){return t.x===e.x&&t.y===e.y&&t.width===e.width&&t.height===e.height}function Re(t,e){let n=null,o,i=D(t);function r(){var c;clearTimeout(o),(c=n)==null||c.disconnect(),n=null}function s(c,l){c===void 0&&(c=!1),l===void 0&&(l=1),r();let a=t.getBoundingClientRect(),{left:d,top:u,width:m,height:f}=a;if(c||e(),!m||!f)return;let g=it(u),p=it(i.clientWidth-(d+m)),w=it(i.clientHeight-(u+f)),h=it(d),y={rootMargin:-g+"px "+-p+"px "+-w+"px "+-h+"px",threshold:B(0,$(1,l))||1},v=!0;function O(b){let S=b[0].intersectionRatio;if(S!==l){if(!v)return s();S?s(!1,S):o=setTimeout(()=>{s(!1,1e-7)},1e3)}S===1&&!jt(a,t.getBoundingClientRect())&&s(),v=!1}try{n=new IntersectionObserver(O,{...y,root:i.ownerDocument})}catch{n=new IntersectionObserver(O,y)}n.observe(t)}return s(!0),r}function Se(t,e,n,o){o===void 0&&(o={});let{ancestorScroll:i=!0,ancestorResize:r=!0,elementResize:s=typeof ResizeObserver=="function",layoutShift:c=typeof IntersectionObserver=="function",animationFrame:l=!1}=o,a=yt(t),d=i||r?[...a?G(a):[],...G(e)]:[];d.forEach(h=>{i&&h.addEventListener("scroll",n,{passive:!0}),r&&h.addEventListener("resize",n)});let u=a&&c?Re(a,n):null,m=-1,f=null;s&&(f=new ResizeObserver(h=>{let[x]=h;x&&x.target===a&&f&&(f.unobserve(e),cancelAnimationFrame(m),m=requestAnimationFrame(()=>{var y;(y=f)==null||y.observe(e)})),n()}),a&&!l&&f.observe(a),f.observe(e));let g,p=l?q(t):null;l&&w();function w(){let h=q(t);p&&!jt(p,h)&&n(),p=h,g=requestAnimationFrame(w)}return n(),()=>{var h;d.forEach(x=>{i&&x.removeEventListener("scroll",n),r&&x.removeEventListener("resize",n)}),u?.(),(h=f)==null||h.disconnect(),f=null,l&&cancelAnimationFrame(g)}}var Ce=Et;var Pe=Dt,Te=Lt;var Le=Tt;var Ee=(t,e,n)=>{let o=new Map,i={platform:Oe,...n},r={...i.platform,_c:o};return Pt(t,e,{...i,platform:r})};export{Le as arrow,Se as autoUpdate,Ee as computePosition,Te as flip,Ce as offset,Pe as shift}; +var H=Math.min,B=Math.max,ot=Math.round,it=Math.floor,L=t=>({x:t,y:t}),qt={left:"right",right:"left",bottom:"top",top:"bottom"},Ut={start:"end",end:"start"};function lt(t,e,n){return B(t,H(e,n))}function U(t,e){return typeof t=="function"?t(e):t}function V(t){return t.split("-")[0]}function K(t){return t.split("-")[1]}function pt(t){return t==="x"?"y":"x"}function at(t){return t==="y"?"height":"width"}var Kt=new Set(["top","bottom"]);function W(t){return Kt.has(V(t))?"y":"x"}function ft(t){return pt(W(t))}function Ot(t,e,n){n===void 0&&(n=!1);let o=K(t),i=ft(t),r=at(i),s=i==="x"?o===(n?"end":"start")?"right":"left":o==="start"?"bottom":"top";return e.reference[r]>e.floating[r]&&(s=nt(s)),[s,nt(s)]}function Rt(t){let e=nt(t);return[ct(t),e,ct(e)]}function ct(t){return t.replace(/start|end/g,e=>Ut[e])}var bt=["left","right"],At=["right","left"],Gt=["top","bottom"],Jt=["bottom","top"];function Qt(t,e,n){switch(t){case"top":case"bottom":return n?e?At:bt:e?bt:At;case"left":case"right":return e?Gt:Jt;default:return[]}}function St(t,e,n,o){let i=K(t),r=Qt(V(t),n==="start",o);return i&&(r=r.map(s=>s+"-"+i),e&&(r=r.concat(r.map(ct)))),r}function nt(t){return t.replace(/left|right|bottom|top/g,e=>qt[e])}function Zt(t){return{top:0,right:0,bottom:0,left:0,...t}}function wt(t){return typeof t!="number"?Zt(t):{top:t,right:t,bottom:t,left:t}}function X(t){let{x:e,y:n,width:o,height:i}=t;return{width:o,height:i,top:n,left:e,right:e+o,bottom:n+i,x:e,y:n}}function Ct(t,e,n){let{reference:o,floating:i}=t,r=W(e),s=ft(e),c=at(s),a=V(e),l=r==="y",d=o.x+o.width/2-i.width/2,u=o.y+o.height/2-i.height/2,g=o[c]/2-i[c]/2,f;switch(a){case"top":f={x:d,y:o.y-i.height};break;case"bottom":f={x:d,y:o.y+o.height};break;case"right":f={x:o.x+o.width,y:u};break;case"left":f={x:o.x-i.width,y:u};break;default:f={x:o.x,y:o.y}}switch(K(e)){case"start":f[s]-=g*(n&&l?-1:1);break;case"end":f[s]+=g*(n&&l?-1:1);break}return f}var Pt=async(t,e,n)=>{let{placement:o="bottom",strategy:i="absolute",middleware:r=[],platform:s}=n,c=r.filter(Boolean),a=await(s.isRTL==null?void 0:s.isRTL(e)),l=await s.getElementRects({reference:t,floating:e,strategy:i}),{x:d,y:u}=Ct(l,o,a),g=o,f={},m=0;for(let h=0;h({name:"arrow",options:t,async fn(e){let{x:n,y:o,placement:i,rects:r,platform:s,elements:c,middlewareData:a}=e,{element:l,padding:d=0}=U(t,e)||{};if(l==null)return{};let u=wt(d),g={x:n,y:o},f=ft(i),m=at(f),h=await s.getDimensions(l),w=f==="y",p=w?"top":"left",x=w?"bottom":"right",y=w?"clientHeight":"clientWidth",b=r.reference[m]+r.reference[f]-g[f]-r.floating[m],v=g[f]-r.reference[f],M=await(s.getOffsetParent==null?void 0:s.getOffsetParent(l)),R=M?M[y]:0;(!R||!await(s.isElement==null?void 0:s.isElement(M)))&&(R=c.floating[y]||r.floating[m]);let Z=b/2-v/2,_=R/2-h[m]/2-1,F=H(u[p],_),tt=H(u[x],_),z=F,et=R-h[m]-tt,A=R/2-h[m]/2+Z,I=lt(z,A,et),k=!a.arrow&&K(i)!=null&&A!==I&&r.reference[m]/2-(AA<=0)){var tt,z;let A=(((tt=r.flip)==null?void 0:tt.index)||0)+1,I=R[A];if(I&&(!(u==="alignment"?x!==W(I):!1)||F.every(T=>W(T.placement)===x?T.overflows[0]>0:!0)))return{data:{index:A,overflows:F},reset:{placement:I}};let k=(z=F.filter(P=>P.overflows[0]<=0).sort((P,T)=>P.overflows[1]-T.overflows[1])[0])==null?void 0:z.placement;if(!k)switch(f){case"bestFit":{var et;let P=(et=F.filter(T=>{if(M){let $=W(T.placement);return $===x||$==="y"}return!0}).map(T=>[T.placement,T.overflows.filter($=>$>0).reduce(($,Yt)=>$+Yt,0)]).sort((T,$)=>T[1]-$[1])[0])==null?void 0:et[0];P&&(k=P);break}case"initialPlacement":k=c;break}if(i!==k)return{reset:{placement:k}}}return{}}}};var te=new Set(["left","top"]);async function ee(t,e){let{placement:n,platform:o,elements:i}=t,r=await(o.isRTL==null?void 0:o.isRTL(i.floating)),s=V(n),c=K(n),a=W(n)==="y",l=te.has(s)?-1:1,d=r&&a?-1:1,u=U(e,t),{mainAxis:g,crossAxis:f,alignmentAxis:m}=typeof u=="number"?{mainAxis:u,crossAxis:0,alignmentAxis:null}:{mainAxis:u.mainAxis||0,crossAxis:u.crossAxis||0,alignmentAxis:u.alignmentAxis};return c&&typeof m=="number"&&(f=c==="end"?m*-1:m),a?{x:f*d,y:g*l}:{x:g*l,y:f*d}}var Et=function(t){return t===void 0&&(t=0),{name:"offset",options:t,async fn(e){var n,o;let{x:i,y:r,placement:s,middlewareData:c}=e,a=await ee(e,t);return s===((n=c.offset)==null?void 0:n.placement)&&(o=c.arrow)!=null&&o.alignmentOffset?{}:{x:i+a.x,y:r+a.y,data:{...a,placement:s}}}}},Dt=function(t){return t===void 0&&(t={}),{name:"shift",options:t,async fn(e){let{x:n,y:o,placement:i}=e,{mainAxis:r=!0,crossAxis:s=!1,limiter:c={fn:w=>{let{x:p,y:x}=w;return{x:p,y:x}}},...a}=U(t,e),l={x:n,y:o},d=await xt(e,a),u=W(V(i)),g=pt(u),f=l[g],m=l[u];if(r){let w=g==="y"?"top":"left",p=g==="y"?"bottom":"right",x=f+d[w],y=f-d[p];f=lt(x,f,y)}if(s){let w=u==="y"?"top":"left",p=u==="y"?"bottom":"right",x=m+d[w],y=m-d[p];m=lt(x,m,y)}let h=c.fn({...e,[g]:f,[u]:m});return{...h,data:{x:h.x-n,y:h.y-o,enabled:{[g]:r,[u]:s}}}}}};function ut(){return typeof window<"u"}function j(t){return Ft(t)?(t.nodeName||"").toLowerCase():"#document"}function O(t){var e;return(t==null||(e=t.ownerDocument)==null?void 0:e.defaultView)||window}function E(t){var e;return(e=(Ft(t)?t.ownerDocument:t.document)||window.document)==null?void 0:e.documentElement}function Ft(t){return ut()?t instanceof Node||t instanceof O(t).Node:!1}function S(t){return ut()?t instanceof Element||t instanceof O(t).Element:!1}function D(t){return ut()?t instanceof HTMLElement||t instanceof O(t).HTMLElement:!1}function Mt(t){return!ut()||typeof ShadowRoot>"u"?!1:t instanceof ShadowRoot||t instanceof O(t).ShadowRoot}var ne=new Set(["inline","contents"]);function J(t){let{overflow:e,overflowX:n,overflowY:o,display:i}=C(t);return/auto|scroll|overlay|hidden|clip/.test(e+o+n)&&!ne.has(i)}var oe=new Set(["table","td","th"]);function kt(t){return oe.has(j(t))}var ie=[":popover-open",":modal"];function st(t){return ie.some(e=>{try{return t.matches(e)}catch{return!1}})}var se=["transform","translate","scale","rotate","perspective"],re=["transform","translate","scale","rotate","perspective","filter"],ce=["paint","layout","strict","content"];function dt(t){let e=mt(),n=S(t)?C(t):t;return se.some(o=>n[o]?n[o]!=="none":!1)||(n.containerType?n.containerType!=="normal":!1)||!e&&(n.backdropFilter?n.backdropFilter!=="none":!1)||!e&&(n.filter?n.filter!=="none":!1)||re.some(o=>(n.willChange||"").includes(o))||ce.some(o=>(n.contain||"").includes(o))}function Bt(t){let e=N(t);for(;D(e)&&!Y(e);){if(dt(e))return e;if(st(e))return null;e=N(e)}return null}function mt(){return typeof CSS>"u"||!CSS.supports?!1:CSS.supports("-webkit-backdrop-filter","none")}var le=new Set(["html","body","#document"]);function Y(t){return le.has(j(t))}function C(t){return O(t).getComputedStyle(t)}function rt(t){return S(t)?{scrollLeft:t.scrollLeft,scrollTop:t.scrollTop}:{scrollLeft:t.scrollX,scrollTop:t.scrollY}}function N(t){if(j(t)==="html")return t;let e=t.assignedSlot||t.parentNode||Mt(t)&&t.host||E(t);return Mt(e)?e.host:e}function Wt(t){let e=N(t);return Y(e)?t.ownerDocument?t.ownerDocument.body:t.body:D(e)&&J(e)?e:Wt(e)}function G(t,e,n){var o;e===void 0&&(e=[]),n===void 0&&(n=!0);let i=Wt(t),r=i===((o=t.ownerDocument)==null?void 0:o.body),s=O(i);if(r){let c=gt(s);return e.concat(s,s.visualViewport||[],J(i)?i:[],c&&n?G(c):[])}return e.concat(i,G(i,[],n))}function gt(t){return t.parent&&Object.getPrototypeOf(t.parent)?t.frameElement:null}function Vt(t){let e=C(t),n=parseFloat(e.width)||0,o=parseFloat(e.height)||0,i=D(t),r=i?t.offsetWidth:n,s=i?t.offsetHeight:o,c=ot(n)!==r||ot(o)!==s;return c&&(n=r,o=s),{width:n,height:o,$:c}}function vt(t){return S(t)?t:t.contextElement}function Q(t){let e=vt(t);if(!D(e))return L(1);let n=e.getBoundingClientRect(),{width:o,height:i,$:r}=Vt(e),s=(r?ot(n.width):n.width)/o,c=(r?ot(n.height):n.height)/i;return(!s||!Number.isFinite(s))&&(s=1),(!c||!Number.isFinite(c))&&(c=1),{x:s,y:c}}var ae=L(0);function _t(t){let e=O(t);return!mt()||!e.visualViewport?ae:{x:e.visualViewport.offsetLeft,y:e.visualViewport.offsetTop}}function fe(t,e,n){return e===void 0&&(e=!1),!n||e&&n!==O(t)?!1:e}function q(t,e,n,o){e===void 0&&(e=!1),n===void 0&&(n=!1);let i=t.getBoundingClientRect(),r=vt(t),s=L(1);e&&(o?S(o)&&(s=Q(o)):s=Q(t));let c=fe(r,n,o)?_t(r):L(0),a=(i.left+c.x)/s.x,l=(i.top+c.y)/s.y,d=i.width/s.x,u=i.height/s.y;if(r){let g=O(r),f=o&&S(o)?O(o):o,m=g,h=gt(m);for(;h&&o&&f!==m;){let w=Q(h),p=h.getBoundingClientRect(),x=C(h),y=p.left+(h.clientLeft+parseFloat(x.paddingLeft))*w.x,b=p.top+(h.clientTop+parseFloat(x.paddingTop))*w.y;a*=w.x,l*=w.y,d*=w.x,u*=w.y,a+=y,l+=b,m=O(h),h=gt(m)}}return X({width:d,height:u,x:a,y:l})}function ht(t,e){let n=rt(t).scrollLeft;return e?e.left+n:q(E(t)).left+n}function zt(t,e){let n=t.getBoundingClientRect(),o=n.left+e.scrollLeft-ht(t,n),i=n.top+e.scrollTop;return{x:o,y:i}}function ue(t){let{elements:e,rect:n,offsetParent:o,strategy:i}=t,r=i==="fixed",s=E(o),c=e?st(e.floating):!1;if(o===s||c&&r)return n;let a={scrollLeft:0,scrollTop:0},l=L(1),d=L(0),u=D(o);if((u||!u&&!r)&&((j(o)!=="body"||J(s))&&(a=rt(o)),D(o))){let f=q(o);l=Q(o),d.x=f.x+o.clientLeft,d.y=f.y+o.clientTop}let g=s&&!u&&!r?zt(s,a):L(0);return{width:n.width*l.x,height:n.height*l.y,x:n.x*l.x-a.scrollLeft*l.x+d.x+g.x,y:n.y*l.y-a.scrollTop*l.y+d.y+g.y}}function de(t){return Array.from(t.getClientRects())}function me(t){let e=E(t),n=rt(t),o=t.ownerDocument.body,i=B(e.scrollWidth,e.clientWidth,o.scrollWidth,o.clientWidth),r=B(e.scrollHeight,e.clientHeight,o.scrollHeight,o.clientHeight),s=-n.scrollLeft+ht(t),c=-n.scrollTop;return C(o).direction==="rtl"&&(s+=B(e.clientWidth,o.clientWidth)-i),{width:i,height:r,x:s,y:c}}var Nt=25;function ge(t,e){let n=O(t),o=E(t),i=n.visualViewport,r=o.clientWidth,s=o.clientHeight,c=0,a=0;if(i){r=i.width,s=i.height;let d=mt();(!d||d&&e==="fixed")&&(c=i.offsetLeft,a=i.offsetTop)}let l=ht(o);if(l<=0){let d=o.ownerDocument,u=d.body,g=getComputedStyle(u),f=d.compatMode==="CSS1Compat"&&parseFloat(g.marginLeft)+parseFloat(g.marginRight)||0,m=Math.abs(o.clientWidth-u.clientWidth-f);m<=Nt&&(r-=m)}else l<=Nt&&(r+=l);return{width:r,height:s,x:c,y:a}}var he=new Set(["absolute","fixed"]);function pe(t,e){let n=q(t,!0,e==="fixed"),o=n.top+t.clientTop,i=n.left+t.clientLeft,r=D(t)?Q(t):L(1),s=t.clientWidth*r.x,c=t.clientHeight*r.y,a=i*r.x,l=o*r.y;return{width:s,height:c,x:a,y:l}}function $t(t,e,n){let o;if(e==="viewport")o=ge(t,n);else if(e==="document")o=me(E(t));else if(S(e))o=pe(e,n);else{let i=_t(t);o={x:e.x-i.x,y:e.y-i.y,width:e.width,height:e.height}}return X(o)}function It(t,e){let n=N(t);return n===e||!S(n)||Y(n)?!1:C(n).position==="fixed"||It(n,e)}function we(t,e){let n=e.get(t);if(n)return n;let o=G(t,[],!1).filter(c=>S(c)&&j(c)!=="body"),i=null,r=C(t).position==="fixed",s=r?N(t):t;for(;S(s)&&!Y(s);){let c=C(s),a=dt(s);!a&&c.position==="fixed"&&(i=null),(r?!a&&!i:!a&&c.position==="static"&&!!i&&he.has(i.position)||J(s)&&!a&&It(t,s))?o=o.filter(d=>d!==s):i=c,s=N(s)}return e.set(t,o),o}function xe(t){let{element:e,boundary:n,rootBoundary:o,strategy:i}=t,s=[...n==="clippingAncestors"?st(e)?[]:we(e,this._c):[].concat(n),o],c=s[0],a=s.reduce((l,d)=>{let u=$t(e,d,i);return l.top=B(u.top,l.top),l.right=H(u.right,l.right),l.bottom=H(u.bottom,l.bottom),l.left=B(u.left,l.left),l},$t(e,c,i));return{width:a.right-a.left,height:a.bottom-a.top,x:a.left,y:a.top}}function ye(t){let{width:e,height:n}=Vt(t);return{width:e,height:n}}function ve(t,e,n){let o=D(e),i=E(e),r=n==="fixed",s=q(t,!0,r,e),c={scrollLeft:0,scrollTop:0},a=L(0);function l(){a.x=ht(i)}if(o||!o&&!r)if((j(e)!=="body"||J(i))&&(c=rt(e)),o){let f=q(e,!0,r,e);a.x=f.x+e.clientLeft,a.y=f.y+e.clientTop}else i&&l();r&&!o&&i&&l();let d=i&&!o&&!r?zt(i,c):L(0),u=s.left+c.scrollLeft-a.x-d.x,g=s.top+c.scrollTop-a.y-d.y;return{x:u,y:g,width:s.width,height:s.height}}function yt(t){return C(t).position==="static"}function Ht(t,e){if(!D(t)||C(t).position==="fixed")return null;if(e)return e(t);let n=t.offsetParent;return E(t)===n&&(n=n.ownerDocument.body),n}function Xt(t,e){let n=O(t);if(st(t))return n;if(!D(t)){let i=N(t);for(;i&&!Y(i);){if(S(i)&&!yt(i))return i;i=N(i)}return n}let o=Ht(t,e);for(;o&&kt(o)&&yt(o);)o=Ht(o,e);return o&&Y(o)&&yt(o)&&!dt(o)?n:o||Bt(t)||n}var be=async function(t){let e=this.getOffsetParent||Xt,n=this.getDimensions,o=await n(t.floating);return{reference:ve(t.reference,await e(t.floating),t.strategy),floating:{x:0,y:0,width:o.width,height:o.height}}};function Ae(t){return C(t).direction==="rtl"}var Oe={convertOffsetParentRelativeRectToViewportRelativeRect:ue,getDocumentElement:E,getClippingRect:xe,getOffsetParent:Xt,getElementRects:be,getClientRects:de,getDimensions:ye,getScale:Q,isElement:S,isRTL:Ae};function jt(t,e){return t.x===e.x&&t.y===e.y&&t.width===e.width&&t.height===e.height}function Re(t,e){let n=null,o,i=E(t);function r(){var c;clearTimeout(o),(c=n)==null||c.disconnect(),n=null}function s(c,a){c===void 0&&(c=!1),a===void 0&&(a=1),r();let l=t.getBoundingClientRect(),{left:d,top:u,width:g,height:f}=l;if(c||e(),!g||!f)return;let m=it(u),h=it(i.clientWidth-(d+g)),w=it(i.clientHeight-(u+f)),p=it(d),y={rootMargin:-m+"px "+-h+"px "+-w+"px "+-p+"px",threshold:B(0,H(1,a))||1},b=!0;function v(M){let R=M[0].intersectionRatio;if(R!==a){if(!b)return s();R?s(!1,R):o=setTimeout(()=>{s(!1,1e-7)},1e3)}R===1&&!jt(l,t.getBoundingClientRect())&&s(),b=!1}try{n=new IntersectionObserver(v,{...y,root:i.ownerDocument})}catch{n=new IntersectionObserver(v,y)}n.observe(t)}return s(!0),r}function Se(t,e,n,o){o===void 0&&(o={});let{ancestorScroll:i=!0,ancestorResize:r=!0,elementResize:s=typeof ResizeObserver=="function",layoutShift:c=typeof IntersectionObserver=="function",animationFrame:a=!1}=o,l=vt(t),d=i||r?[...l?G(l):[],...G(e)]:[];d.forEach(p=>{i&&p.addEventListener("scroll",n,{passive:!0}),r&&p.addEventListener("resize",n)});let u=l&&c?Re(l,n):null,g=-1,f=null;s&&(f=new ResizeObserver(p=>{let[x]=p;x&&x.target===l&&f&&(f.unobserve(e),cancelAnimationFrame(g),g=requestAnimationFrame(()=>{var y;(y=f)==null||y.observe(e)})),n()}),l&&!a&&f.observe(l),f.observe(e));let m,h=a?q(t):null;a&&w();function w(){let p=q(t);h&&!jt(h,p)&&n(),h=p,m=requestAnimationFrame(w)}return n(),()=>{var p;d.forEach(x=>{i&&x.removeEventListener("scroll",n),r&&x.removeEventListener("resize",n)}),u?.(),(p=f)==null||p.disconnect(),f=null,a&&cancelAnimationFrame(m)}}var Ce=Et;var Pe=Dt,Te=Lt;var Le=Tt;var Ee=(t,e,n)=>{let o=new Map,i={platform:Oe,...n},r={...i.platform,_c:o};return Pt(t,e,{...i,platform:r})};export{Le as arrow,Se as autoUpdate,Ee as computePosition,Te as flip,Ce as offset,Pe as shift}; diff --git a/netlify.toml b/netlify.toml index c0d3b4e6..a1680b2f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,3 +1,3 @@ [build] command = "npm run build" - publish = "." + publish = "dist" diff --git a/package-lock.json b/package-lock.json index 5a96352f..04ef8a81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,27 +11,27 @@ "dependencies": { "@floating-ui/dom": "^1.7.4", "@noble/hashes": "^2.0.1", + "@tailwindcss/typography": "^0.5.15", + "autoprefixer": "^10.4.23", + "esbuild": "^0.25.12", "jsdom": "^27.4.0", + "postcss": "^8.4.41", + "tailwindcss": "^3.4.19", "ws": "^8.19.0" }, "devDependencies": { "@noble/hashes": "^2.0.1", "@playwright/test": "^1.58.0", - "@tailwindcss/typography": "^0.5.15", - "autoprefixer": "^10.4.23", "cross-env": "^7.0.3", - "esbuild": "^0.25.12", "fake-indexeddb": "^6.2.5", "nostr-tools": "^2.19.4", "pixelmatch": "^5.3.0", "playwright": "^1.58.0", "pngjs": "^7.0.0", - "postcss": "^8.4.41", "prettier": "^3.8.1", "prettier-plugin-tailwindcss": "^0.6.5", "serve": "^14.2.5", - "stylelint": "^16.26.1", - "tailwindcss": "^3.4.19" + "stylelint": "^16.26.1" } }, "node_modules/@acemir/cssom": { @@ -44,7 +44,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -302,7 +301,6 @@ "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -319,7 +317,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -336,7 +333,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -353,7 +349,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -370,7 +365,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -387,7 +381,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -404,7 +397,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -421,7 +413,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -438,7 +429,6 @@ "cpu": [ "arm" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -455,7 +445,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -472,7 +461,6 @@ "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -489,7 +477,6 @@ "cpu": [ "loong64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -506,7 +493,6 @@ "cpu": [ "mips64el" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -523,7 +509,6 @@ "cpu": [ "ppc64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -540,7 +525,6 @@ "cpu": [ "riscv64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -557,7 +541,6 @@ "cpu": [ "s390x" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -574,7 +557,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -591,7 +573,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -608,7 +589,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -625,7 +605,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -642,7 +621,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -659,7 +637,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -676,7 +653,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -693,7 +669,6 @@ "cpu": [ "arm64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -710,7 +685,6 @@ "cpu": [ "ia32" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -727,7 +701,6 @@ "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -783,7 +756,6 @@ "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -794,7 +766,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -804,14 +775,12 @@ "version": "1.5.5", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -895,7 +864,6 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", @@ -909,7 +877,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, "license": "MIT", "engines": { "node": ">= 8" @@ -919,7 +886,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -1043,7 +1009,6 @@ "version": "0.5.19", "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.19.tgz", "integrity": "sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==", - "dev": true, "license": "MIT", "dependencies": { "postcss-selector-parser": "6.0.10" @@ -1173,14 +1138,12 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "dev": true, "license": "MIT" }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -1215,7 +1178,6 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true, "license": "MIT" }, "node_modules/argparse": { @@ -1249,7 +1211,6 @@ "version": "10.4.23", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz", "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==", - "dev": true, "funding": [ { "type": "opencollective", @@ -1293,7 +1254,6 @@ "version": "2.9.18", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.18.tgz", "integrity": "sha512-e23vBV1ZLfjb9apvfPk4rHVu2ry6RIr2Wfs+O324okSidrX7pTAnEJPCh/O5BtRlr7QtZI7ktOP3vsqr7Z5XoA==", - "dev": true, "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -1312,7 +1272,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -1372,7 +1331,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -1385,7 +1343,6 @@ "version": "4.28.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", - "dev": true, "funding": [ { "type": "opencollective", @@ -1466,7 +1423,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -1476,7 +1432,6 @@ "version": "1.0.30001766", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz", "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==", - "dev": true, "funding": [ { "type": "opencollective", @@ -1530,7 +1485,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, "license": "MIT", "dependencies": { "anymatch": "~3.1.2", @@ -1613,7 +1567,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -1794,7 +1747,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, "license": "MIT", "bin": { "cssesc": "bin/cssesc" @@ -1877,7 +1829,6 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", - "dev": true, "license": "Apache-2.0" }, "node_modules/dir-glob": { @@ -1897,7 +1848,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", - "dev": true, "license": "MIT" }, "node_modules/eastasianwidth": { @@ -1911,7 +1861,6 @@ "version": "1.5.279", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.279.tgz", "integrity": "sha512-0bblUU5UNdOt5G7XqGiJtpZMONma6WAfq9vsFmtn9x1+joAObr6x1chfqyxFSDCAFwFhCQDrqeAr6MYdpwJ9Hg==", - "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { @@ -1957,7 +1906,6 @@ "version": "0.25.12", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", - "dev": true, "hasInstallScript": true, "license": "MIT", "bin": { @@ -1999,7 +1947,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -2057,7 +2004,6 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -2084,7 +2030,6 @@ "version": "1.20.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", - "dev": true, "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -2104,7 +2049,6 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -2136,7 +2080,6 @@ "version": "5.3.4", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==", - "dev": true, "license": "MIT", "engines": { "node": "*" @@ -2150,7 +2093,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -2165,7 +2107,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2188,7 +2129,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -2303,7 +2243,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -2433,7 +2372,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -2446,7 +2384,6 @@ "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -2478,7 +2415,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -2498,7 +2434,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -2511,7 +2446,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -2583,7 +2517,6 @@ "version": "1.21.7", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", - "dev": true, "license": "MIT", "bin": { "jiti": "bin/jiti.js" @@ -2705,7 +2638,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", - "dev": true, "license": "MIT", "engines": { "node": ">=14" @@ -2718,7 +2650,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, "license": "MIT" }, "node_modules/lodash.truncate": { @@ -2778,7 +2709,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 8" @@ -2788,7 +2718,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -2874,7 +2803,6 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, "license": "MIT", "dependencies": { "any-promise": "^1.0.0", @@ -2886,7 +2814,6 @@ "version": "3.3.11", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "dev": true, "funding": [ { "type": "github", @@ -2915,14 +2842,12 @@ "version": "2.0.27", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", - "dev": true, "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -2989,7 +2914,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -2999,7 +2923,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -3096,7 +3019,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, "license": "MIT" }, "node_modules/path-to-regexp": { @@ -3120,14 +3042,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -3140,7 +3060,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -3150,7 +3069,6 @@ "version": "4.0.7", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -3225,7 +3143,6 @@ "version": "8.5.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3254,7 +3171,6 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", - "dev": true, "license": "MIT", "dependencies": { "postcss-value-parser": "^4.0.0", @@ -3272,7 +3188,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz", "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3298,7 +3213,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz", "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3341,7 +3255,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3367,7 +3280,6 @@ "version": "6.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", - "dev": true, "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -3415,7 +3327,6 @@ "version": "6.0.10", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", - "dev": true, "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -3429,7 +3340,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true, "license": "MIT" }, "node_modules/prettier": { @@ -3561,7 +3471,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, "funding": [ { "type": "github", @@ -3608,7 +3517,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", - "dev": true, "license": "MIT", "dependencies": { "pify": "^2.3.0" @@ -3618,7 +3526,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -3664,7 +3571,6 @@ "version": "1.22.11", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", - "dev": true, "license": "MIT", "dependencies": { "is-core-module": "^2.16.1", @@ -3695,7 +3601,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true, "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -3706,7 +3611,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, "funding": [ { "type": "github", @@ -4094,7 +3998,6 @@ "version": "3.35.1", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz", "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", @@ -4147,7 +4050,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4234,7 +4136,6 @@ "version": "3.4.19", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz", "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==", - "dev": true, "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -4272,7 +4173,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.3" @@ -4285,7 +4185,6 @@ "version": "6.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", - "dev": true, "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -4299,7 +4198,6 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "dev": true, "license": "MIT", "dependencies": { "any-promise": "^1.0.0" @@ -4309,7 +4207,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "dev": true, "license": "MIT", "dependencies": { "thenify": ">= 3.1.0 < 4" @@ -4322,7 +4219,6 @@ "version": "0.2.15", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", - "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -4339,7 +4235,6 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -4357,7 +4252,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -4388,7 +4282,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -4425,7 +4318,6 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", - "dev": true, "license": "Apache-2.0" }, "node_modules/type-fest": { @@ -4445,7 +4337,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", - "dev": true, "funding": [ { "type": "opencollective", @@ -4497,7 +4388,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, "license": "MIT" }, "node_modules/vary": { diff --git a/package.json b/package.json index 35ac73b0..bfe3b5a4 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "type": "module", "version": "1.0.0", "scripts": { - "start": "npm run build && npx serve", + "start": "npm run build && npx serve dist", "serve": "npx serve", - "build": "npm run build:css", + "build": "node scripts/build-dist.mjs", "build:css": "tailwindcss -c tailwind.config.cjs -i css/tailwind.source.css -o css/tailwind.generated.css --minify", "build:beacon:bundle": "node scripts/build-beacon.mjs", "build:beacon": "npm run build:beacon:bundle && npm run lint:inline-styles", diff --git a/scripts/build-dist.mjs b/scripts/build-dist.mjs new file mode 100644 index 00000000..756f5532 --- /dev/null +++ b/scripts/build-dist.mjs @@ -0,0 +1,69 @@ +import fs from 'node:fs/promises'; +import path from 'node:path'; +import { exec } from 'node:child_process'; +import { promisify } from 'node:util'; + +const execAsync = promisify(exec); + +const FILES_TO_COPY = [ + 'index.html', + 'embed.html', + 'site.webmanifest', + 'sw.min.js', + '_headers', + '_redirects', + 'assets', + 'bitvid_logo', + 'components', + 'config', + 'content', + 'css', + 'docs', + 'js', + 'torrent', + 'vendor', + 'views' +]; + +async function build() { + const distDir = 'dist'; + + console.log(`[build] Cleaning ${distDir}...`); + await fs.rm(distDir, { recursive: true, force: true }); + await fs.mkdir(distDir, { recursive: true }); + + console.log('[build] Building CSS...'); + try { + const { stdout, stderr } = await execAsync('npm run build:css'); + if (stdout) console.log(stdout); + if (stderr) console.error(stderr); + } catch (error) { + console.error('[build] CSS build failed:', error); + process.exit(1); + } + + console.log('[build] Copying files...'); + for (const item of FILES_TO_COPY) { + const source = item; + const destination = path.join(distDir, item); + + try { + // Check if source exists + await fs.access(source); + + console.log(` -> Copying ${source}`); + await fs.cp(source, destination, { recursive: true }); + } catch (error) { + if (error.code === 'ENOENT') { + console.warn(` [warn] Source file/directory not found: ${source}`); + } else { + console.error(` [error] Failed to copy ${source}:`, error); + process.exit(1); + } + } + } + + console.log('[build] Build complete!'); +} + +build();