Remove CustomEvent

packages/feeds/src/compiler.ts

@@ -1,5 +1,5 @@
 import {uniq, identity, flatten, pushToMapKey, intersection, tryCatch, now} from '@welshman/lib'
-import type {CustomEvent, Filter} from '@welshman/util'
+import type {TrustedEvent, Filter} from '@welshman/util'
 import {Tags, intersectFilters, matchFilter, getAddress, getIdFilters, unionFilters} from '@welshman/util'
 import type {CreatedAtItem, RequestItem, ListItem, LabelItem, WOTItem, DVMItem, Scope, Feed, FeedOptions} from './core'
 import {getFeedArgs, feedsFromTags} from './utils'
@@ -109,7 +109,7 @@ export class FeedCompiler {
       items.map(({mappings, ...request}) =>
         this.options.requestDVM({
           ...request,
-          onEvent: async (e: CustomEvent) => {
+          onEvent: async (e: TrustedEvent) => {
             const tags = Tags.wrap(await tryCatch(() => JSON.parse(e.content)) || [])
 
             for (const feed of feedsFromTags(tags, mappings)) {
@@ -215,11 +215,11 @@ export class FeedCompiler {
 
   async _compileLists(listItems: ListItem[]): Promise<RequestItem[]> {
     const addresses = uniq(listItems.flatMap(({addresses}) => addresses))
-    const eventsByAddress = new Map<string, CustomEvent>()
+    const eventsByAddress = new Map<string, TrustedEvent>()
 
     await this.options.request({
       filters: getIdFilters(addresses),
-      onEvent: (e: CustomEvent) => eventsByAddress.set(getAddress(e), e),
+      onEvent: (e: TrustedEvent) => eventsByAddress.set(getAddress(e), e),
     })
 
     const feeds = flatten(
@@ -246,14 +246,14 @@ export class FeedCompiler {
   }
 
   async _compileLabels(labelItems: LabelItem[]): Promise<RequestItem[]> {
-    const events: CustomEvent[] = []
+    const events: TrustedEvent[] = []
 
     await Promise.all(
       labelItems.map(({mappings, relays, ...filter}) =>
         this.options.request({
           relays,
           filters: [{kinds: [1985], ...filter}],
-          onEvent: (e: CustomEvent) => events.push(e),
+          onEvent: (e: TrustedEvent) => events.push(e),
         })
       )
     )

packages/feeds/src/core.ts

@@ -1,4 +1,4 @@
-import type {CustomEvent, Filter} from '@welshman/util'
+import type {TrustedEvent, Filter} from '@welshman/util'
 
 export enum FeedType {
   Address = "address",
@@ -110,7 +110,7 @@ export type RequestItem = {
 }
 
 export type RequestOpts = RequestItem & {
-  onEvent: (event: CustomEvent) => void
+  onEvent: (event: TrustedEvent) => void
 }
 
 export type DVMRequest = {
@@ -120,7 +120,7 @@ export type DVMRequest = {
 }
 
 export type DVMOpts = DVMRequest & {
-  onEvent: (event: CustomEvent) => void
+  onEvent: (event: TrustedEvent) => void
 }
 
 export type FeedOptions = {

packages/feeds/src/loader.ts

@@ -1,12 +1,12 @@
 import {inc, max, min, now} from '@welshman/lib'
-import type {CustomEvent, Filter} from '@welshman/util'
+import type {TrustedEvent, Filter} from '@welshman/util'
 import {EPOCH, trimFilters, guessFilterDelta} from '@welshman/util'
 import type {Feed, RequestItem, FeedOptions} from './core'
 import {FeedType} from './core'
 import {FeedCompiler} from './compiler'
 
 export type LoadOpts = {
-  onEvent?: (event: CustomEvent) => void
+  onEvent?: (event: TrustedEvent) => void
   onExhausted?: () => void
   useWindowing?: boolean
 }
@@ -101,7 +101,7 @@ export class FeedLoader {
       await this.options.request({
         relays,
         filters: trimFilters(requestFilters),
-        onEvent: (event: CustomEvent) => {
+        onEvent: (event: TrustedEvent) => {
           count += 1
           until = Math.min(until, event.created_at - 1)
           onEvent?.(event)
@@ -130,14 +130,14 @@ export class FeedLoader {
   async _getDifferenceLoader(feeds: Feed[], {onEvent, onExhausted}: LoadOpts) {
     const exhausted = new Set<number>()
     const skip = new Set<string>()
-    const events: CustomEvent[] = []
+    const events: TrustedEvent[] = []
     const seen = new Set()
 
     const loaders = await Promise.all(
       feeds.map((feed: Feed, i: number) =>
         this.getLoader(feed, {
           onExhausted: () => exhausted.add(i),
-          onEvent: (event: CustomEvent) => {
+          onEvent: (event: TrustedEvent) => {
             if (i === 0) {
               events.push(event)
             } else {
@@ -175,14 +175,14 @@ export class FeedLoader {
   async _getIntersectionLoader(feeds: Feed[], {onEvent, onExhausted}: LoadOpts) {
     const exhausted = new Set<number>()
     const counts = new Map<string, number>()
-    const events: CustomEvent[] = []
+    const events: TrustedEvent[] = []
     const seen = new Set()
 
     const loaders = await Promise.all(
       feeds.map((feed: Feed, i: number) =>
         this.getLoader(feed, {
           onExhausted: () => exhausted.add(i),
-          onEvent: (event: CustomEvent) => {
+          onEvent: (event: TrustedEvent) => {
             events.push(event)
             counts.set(event.id, inc(counts.get(event.id)))
           },
@@ -222,7 +222,7 @@ export class FeedLoader {
       feeds.map((feed: Feed, i: number) =>
         this.getLoader(feed, {
           onExhausted: () => exhausted.add(i),
-          onEvent: (event: CustomEvent) => {
+          onEvent: (event: TrustedEvent) => {
             if (!seen.has(event.id)) {
               onEvent?.(event)
               seen.add(event.id)