applesauce-core 2.0.0 → 2.1.1

package/dist/event-store/event-set.d.ts

@@ -15,7 +15,7 @@ export declare class EventSet implements IEventSet {
     protected created_at: NostrEvent[];
     /** LRU cache of last events touched */
     events: LRU<import("nostr-tools").Event>;
-    /** A sorted array of replaceable events by uid */
+    /** A sorted array of replaceable events by address */
     protected replaceable: Map<string, import("nostr-tools").Event[]>;
     /** A stream of events inserted into the database */
     insert$: Subject<import("nostr-tools").Event>;

package/dist/event-store/event-set.js

@@ -1,6 +1,6 @@
 import { binarySearch, insertEventIntoDescendingList } from "nostr-tools/utils";
 import { Subject } from "rxjs";
-import { createReplaceableAddress, getEventUID, getIndexableTags, isReplaceable } from "../helpers/event.js";
+import { createReplaceableAddress, getIndexableTags, getReplaceableAddress, isReplaceable } from "../helpers/event.js";
 import { LRU } from "../helpers/lru.js";
 import { logger } from "../logger.js";
 import { INDEXABLE_TAGS } from "./common.js";
@@ -17,7 +17,7 @@ export class EventSet {
     created_at = [];
     /** LRU cache of last events touched */
     events = new LRU();
-    /** A sorted array of replaceable events by uid */
+    /** A sorted array of replaceable events by address */
     replaceable = new Map();
     /** A stream of events inserted into the database */
     insert$ = new Subject();
@@ -92,12 +92,12 @@ export class EventSet {
         insertEventIntoDescendingList(this.created_at, event);
         // Insert into replaceable index
         if (isReplaceable(event.kind)) {
-            const uid = getEventUID(event);
-            let array = this.replaceable.get(uid);
-            if (!this.replaceable.has(uid)) {
+            const address = getReplaceableAddress(event);
+            let array = this.replaceable.get(address);
+            if (!this.replaceable.has(address)) {
                 // add an empty array if there is no array
                 array = [];
-                this.replaceable.set(uid, array);
+                this.replaceable.set(address, array);
             }
             // insert the event into the sorted array
             insertEventIntoDescendingList(array, event);
@@ -135,8 +135,8 @@ export class EventSet {
         this.events.delete(id);
         // remove from replaceable index
         if (isReplaceable(event.kind)) {
-            const uid = getEventUID(event);
-            const array = this.replaceable.get(uid);
+            const address = getReplaceableAddress(event);
+            const array = this.replaceable.get(address);
             if (array && array.includes(event)) {
                 const idx = array.indexOf(event);
                 array.splice(idx, 1);

package/dist/event-store/event-store.js

@@ -3,7 +3,7 @@ import { isAddressableKind } from "nostr-tools/kinds";
 import { EMPTY, filter, finalize, from, merge, mergeMap, ReplaySubject, share, take, timer } from "rxjs";
 import hash_sum from "hash-sum";
 import { getDeleteCoordinates, getDeleteIds } from "../helpers/delete.js";
-import { FromCacheSymbol, getEventUID, getTagValue, isReplaceable } from "../helpers/event.js";
+import { FromCacheSymbol, getReplaceableAddress, getTagValue, isReplaceable } from "../helpers/event.js";
 import { matchFilters } from "../helpers/filter.js";
 import { parseCoordinate } from "../helpers/pointers.js";
 import { addSeenRelay, getSeenRelays } from "../helpers/relays.js";
@@ -65,7 +65,7 @@ export class EventStore {
             if (this.deletedIds.has(event.id))
                 return true;
             if (isAddressableKind(event.kind)) {
-                const deleted = this.deletedCoords.get(getEventUID(event));
+                const deleted = this.deletedCoords.get(getReplaceableAddress(event));
                 if (deleted)
                     return deleted > event.created_at;
             }

package/dist/helpers/article.d.ts

@@ -6,4 +6,4 @@ export declare function getArticleImage(article: NostrEvent): string | undefined
 /** Returns an articles summary, if it exists */
 export declare function getArticleSummary(article: NostrEvent): string | undefined;
 /** Returns an articles published date, if it exists */
-export declare function getArticlePublishd(article: NostrEvent): number;
+export declare function getArticlePublished(article: NostrEvent): number;

package/dist/helpers/article.js

@@ -12,7 +12,7 @@ export function getArticleSummary(article) {
     return getTagValue(article, "summary");
 }
 /** Returns an articles published date, if it exists */
-export function getArticlePublishd(article) {
+export function getArticlePublished(article) {
     const ts = getTagValue(article, "published_at");
     if (ts && !Number.isNaN(parseInt(ts)))
         return parseInt(ts);

package/dist/helpers/event.d.ts

@@ -1,16 +1,10 @@
 import { NostrEvent, VerifiedEvent } from "nostr-tools";
 import { IEventStore } from "../event-store/interface.js";
 export declare const EventUIDSymbol: unique symbol;
+export declare const ReplaceableAddressSymbol: unique symbol;
 export declare const EventIndexableTagsSymbol: unique symbol;
 export declare const FromCacheSymbol: unique symbol;
 export declare const ReplaceableIdentifierSymbol: unique symbol;
-declare module "nostr-tools" {
-    interface Event {
-        [EventUIDSymbol]?: string;
-        [EventIndexableTagsSymbol]?: Set<string>;
-        [FromCacheSymbol]?: boolean;
-    }
-}
 /**
  * Checks if an object is a nostr event
  * NOTE: does not validation the signature on the event

package/dist/helpers/event.js

@@ -5,6 +5,7 @@ import { EventStoreSymbol } from "../event-store/event-store.js";
 import { getOrComputeCachedValue } from "./cache.js";
 import { getHiddenTags } from "./hidden-tags.js";
 export const EventUIDSymbol = Symbol.for("event-uid");
+export const ReplaceableAddressSymbol = Symbol.for("replaceable-address");
 export const EventIndexableTagsSymbol = Symbol.for("indexable-tags");
 export const FromCacheSymbol = Symbol.for("from-cache");
 export const ReplaceableIdentifierSymbol = Symbol.for("replaceable-identifier");
@@ -38,13 +39,13 @@ export function isReplaceable(kind) {
  * For parametrized replaceable events this is ( event.kind + ":" + event.pubkey + ":" + event.tags.d )
  */
 export function getEventUID(event) {
-    let uid = event[EventUIDSymbol];
+    let uid = Reflect.get(event, EventUIDSymbol);
     if (!uid) {
         if (isReplaceable(event.kind))
             uid = getReplaceableAddress(event);
         else
             uid = event.id;
-        event[EventUIDSymbol] = uid;
+        Reflect.set(event, EventUIDSymbol, uid);
     }
     return uid;
 }
@@ -52,8 +53,10 @@ export function getEventUID(event) {
 export function getReplaceableAddress(event) {
     if (!isReplaceable(event.kind))
         throw new Error("Event is not replaceable or addressable");
-    const identifier = isAddressableKind(event.kind) ? getReplaceableIdentifier(event) : undefined;
-    return createReplaceableAddress(event.kind, event.pubkey, identifier);
+    return getOrComputeCachedValue(event, ReplaceableAddressSymbol, () => {
+        const identifier = isAddressableKind(event.kind) ? getReplaceableIdentifier(event) : undefined;
+        return createReplaceableAddress(event.kind, event.pubkey, identifier);
+    });
 }
 /** Creates a replaceable event address from a kind, pubkey, and identifier */
 export function createReplaceableAddress(kind, pubkey, identifier) {
@@ -63,7 +66,7 @@ export function createReplaceableAddress(kind, pubkey, identifier) {
 export const getReplaceableUID = createReplaceableAddress;
 /** Returns a Set of tag names and values that are indexable */
 export function getIndexableTags(event) {
-    let indexable = event[EventIndexableTagsSymbol];
+    let indexable = Reflect.get(event, EventIndexableTagsSymbol);
     if (!indexable) {
         const tags = new Set();
         for (const tag of event.tags) {
@@ -71,7 +74,8 @@ export function getIndexableTags(event) {
                 tags.add(tag[0] + ":" + tag[1]);
             }
         }
-        indexable = event[EventIndexableTagsSymbol] = tags;
+        indexable = tags;
+        Reflect.set(event, EventIndexableTagsSymbol, tags);
     }
     return indexable;
 }
@@ -93,11 +97,11 @@ export function fakeVerifyEvent(event) {
 }
 /** Marks an event as being from a cache */
 export function markFromCache(event) {
-    event[FromCacheSymbol] = true;
+    Reflect.set(event, FromCacheSymbol, true);
 }
 /** Returns if an event was from a cache */
 export function isFromCache(event) {
-    return !!event[FromCacheSymbol];
+    return Reflect.get(event, FromCacheSymbol) === true;
 }
 /** Returns the EventStore of an event if its been added to one */
 export function getParentEventStore(event) {

package/dist/helpers/lists.d.ts

@@ -28,6 +28,8 @@ export declare function isAddressPointerInList(list: NostrEvent, pointer: string
  * @param type - Which types of tags to check
  */
 export declare function isProfilePointerInList(list: NostrEvent, pointer: string | ProfilePointer, type?: ReadListTags): boolean;
+/** Returns if an event is in a list */
+export declare function isEventInList(list: NostrEvent, event: NostrEvent): boolean;
 /**
  * Returns all the EventPointer in a list or set
  * @param list - The list or set to get the event pointers from

package/dist/helpers/lists.js

@@ -1,7 +1,7 @@
 import { isAddressableKind, isReplaceableKind } from "nostr-tools/kinds";
-import { getReplaceableIdentifier } from "./event.js";
+import { getReplaceableIdentifier, isReplaceable } from "./event.js";
 import { getHiddenTags } from "./hidden-tags.js";
-import { getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "./pointers.js";
+import { getAddressPointerForEvent, getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "./pointers.js";
 import { mergeRelaySets } from "./relays.js";
 import { isATag, isETag, isPTag, processTags } from "./tags.js";
 export const FAVORITE_RELAYS_KIND = 10012;
@@ -53,6 +53,12 @@ export function isProfilePointerInList(list, pointer, type) {
     const tags = getListTags(list, type);
     return tags.some((t) => t[0] === "p" && t[1] === pubkey);
 }
+/** Returns if an event is in a list */
+export function isEventInList(list, event) {
+    return isReplaceable(event.kind)
+        ? isAddressPointerInList(list, getAddressPointerForEvent(event))
+        : isEventPointerInList(list, event);
+}
 /**
  * Returns all the EventPointer in a list or set
  * @param list - The list or set to get the event pointers from

package/dist/helpers/url.d.ts

@@ -16,8 +16,10 @@ export declare function isAudioURL(url: string | URL): boolean;
 export declare function isSameURL(a: string | URL, b: string | URL): boolean;
 /** Adds a protocol to a URL string if its missing one */
 export declare function ensureProtocol(url: string, protocol?: string): string;
-/** Converts a URL to a WebSocket URL */
+/** Converts a domain or HTTP URL to a WebSocket URL */
 export declare function ensureWebSocketURL<T extends string | URL>(url: T): T;
+/** Converts a domain or WS URL to a HTTP URL */
+export declare function ensureHttpURL<T extends string | URL>(url: T): T;
 /**
  * Normalizes a string into a relay URL
  * Does not remove the trailing slash

package/dist/helpers/url.js

@@ -3,7 +3,7 @@ export const getURLFilename = (url) => url.pathname.split("/").pop()?.toLocaleLo
 export const IMAGE_EXT = [".svg", ".gif", ".png", ".jpg", ".jpeg", ".webp", ".avif"];
 export const VIDEO_EXT = [".mp4", ".mkv", ".webm", ".mov"];
 export const STREAM_EXT = [".m3u8"];
-export const AUDIO_EXT = [".mp3", ".wav", ".ogg", ".aac"];
+export const AUDIO_EXT = [".mp3", ".wav", ".ogg", ".aac", ".m4a"];
 /** Checks if a url is a image URL */
 export function isImageURL(url) {
     url = convertToUrl(url);
@@ -46,7 +46,7 @@ export function ensureProtocol(url, protocol = "https:") {
         return url;
     return protocol + "//" + url;
 }
-/** Converts a URL to a WebSocket URL */
+/** Converts a domain or HTTP URL to a WebSocket URL */
 export function ensureWebSocketURL(url) {
     const p = typeof url === "string" ? new URL(ensureProtocol(url, "wss:")) : new URL(url);
     if (p.protocol === "http:")
@@ -59,6 +59,19 @@ export function ensureWebSocketURL(url) {
     // @ts-expect-error
     return typeof url === "string" ? p.toString() : p;
 }
+/** Converts a domain or WS URL to a HTTP URL */
+export function ensureHttpURL(url) {
+    const p = typeof url === "string" ? new URL(ensureProtocol(url, "http:")) : new URL(url);
+    if (p.protocol === "ws:")
+        p.protocol = "http:";
+    else if (p.protocol === "wss:")
+        p.protocol = "https:";
+    else
+        p.protocol = "https:";
+    // return a string if a string was passed in
+    // @ts-expect-error
+    return typeof url === "string" ? p.toString() : p;
+}
 /**
  * Normalizes a string into a relay URL
  * Does not remove the trailing slash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "",
   "type": "module",
   "main": "dist/index.js",