@welshman/app 0.9.5 → 0.9.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAS,SAAS,EAAmD,MAAM,eAAe,CAAA;AACjG,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,EAKZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAA;AAEjG,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,cAAc,EACd;IACE,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED;;;GAGG;AACH,8BAAsB,SAAS;IAC7B,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAK;IAC7B,OAAO,EAAE,qBAAqB,CAAK;IAEnC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAEtB,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;IAUtC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE,GAKvC,MAAM,EAAE;IAG5B,eAAe;IAMf,iBAAiB;IAIjB,aAAa;IAIb,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE;IAInD,UAAU;IAIV,QAAQ;IAYR,YAAY;IAYZ,iBAAiB;CASlB;AAED,qBAAa,KAAM,SAAQ,SAAS;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,IAAI,IAAI,SAEP;IAED,KAAK,CAAC,MAAM,EAAE,MAAM;IAYpB,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAEK,QAAQ,CAAC,KAAK,EAAE,WAAW;IA0C3B,OAAO;IAuEb,KAAK;CAGN;AAED,qBAAa,WAAY,SAAQ,SAAS;IAC5B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;gBAAf,MAAM,EAAE,KAAK,EAAE;IA6BpC,KAAK;CAGN;AAED;;;;;;GAMG;AACH,qBAAa,MAAM;IAWL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAV9B,OAAO,2CAAwB;IAE/B,KAAK,mBAMH;gBAEmB,GAAG,EAAE,IAAI;IAe9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAsBpB,OAAO,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAM5C;IAED,KAAK,GAAI,OAAO,SAAS,yBAGmB;IAE5C,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}
1
+ {"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAS,SAAS,EAAmD,MAAM,eAAe,CAAA;AACjG,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,EAKZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAA;AAEjG,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,cAAc,EACd;IACE,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED;;;GAGG;AACH,8BAAsB,SAAS;IAC7B,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAK;IAC7B,OAAO,EAAE,qBAAqB,CAAK;IAEnC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAEtB,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;IAUtC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE,GAKvC,MAAM,EAAE;IAG5B,eAAe;IAMf,iBAAiB;IAIjB,aAAa;IAIb,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE;IAInD,UAAU;IAIV,QAAQ;IAYR,YAAY;IAYZ,iBAAiB;CASlB;AAED,qBAAa,KAAM,SAAQ,SAAS;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,IAAI,IAAI,SAEP;IAED,KAAK,CAAC,MAAM,EAAE,MAAM;IAYpB,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAEK,QAAQ,CAAC,KAAK,EAAE,WAAW;IA0C3B,OAAO;IA4Eb,KAAK;CAGN;AAED,qBAAa,WAAY,SAAQ,SAAS;IAC5B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;gBAAf,MAAM,EAAE,KAAK,EAAE;IA6BpC,KAAK;CAGN;AAED;;;;;;GAMG;AACH,qBAAa,MAAM;IAWL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAV9B,OAAO,2CAAwB;IAE/B,KAAK,mBAMH;gBAEmB,GAAG,EAAE,IAAI;IAe9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAsBpB,OAAO,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAM5C;IAED,KAAK,GAAI,OAAO,SAAS,yBAGmB;IAE5C,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}
@@ -186,6 +186,10 @@ export class Thunk extends BaseThunk {
186
186
  signal: AbortSignal.timeout(30_000),
187
187
  });
188
188
  }
189
+ // If we aborted during wrapping, signing, or pow, nevermind
190
+ if (this.controller.signal.aborted) {
191
+ return;
192
+ }
189
193
  this.options.app.wrapManager.add({ recipient, wrap: this.wrap, rumor: this.event });
190
194
  return this._publish(this.wrap);
191
195
  }
@@ -1 +1 @@
1
- {"version":3,"file":"thunk.js","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"thunk.js","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAe,MAAM,EAAa,MAAM,kBAAkB,CAAA;AACjE,OAAO,KAAK,EAAC,GAAG,EAAgB,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAC,iBAAiB,EAAa,MAAM,WAAW,CAAA;AACvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,KAAK,mDAuCH;IAEF,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,4BAM3D;IAED,SAAS,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,KAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAgB7E;IAED;;;;;;;OAOG;IACH,gBAAgB,GACd,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,4BAQtB;IAED,kBAAkB,GAChB,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,8BAStB;IAED,mBAAmB,GACjB,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,oBAMpB;IAEH,gBAAgB,GACd,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,KACpB,UAAU,CAAC,GAAG,EAAE,CAAC,CA2CnB;CACF"}
1
+ {"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAe,MAAM,EAAa,MAAM,kBAAkB,CAAA;AACjE,OAAO,KAAK,EAAC,GAAG,EAAgB,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAC,iBAAiB,EAAa,MAAM,WAAW,CAAA;AACvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,KAAK,mDAwCH;IAEF,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,4BAM3D;IAED,SAAS,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,KAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAgB7E;IAED;;;;;;;OAOG;IACH,gBAAgB,GACd,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,4BAQtB;IAED,kBAAkB,GAChB,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,8BAStB;IAED,mBAAmB,GACjB,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,oBAMpB;IAEH,gBAAgB,GACd,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,KACpB,UAAU,CAAC,GAAG,EAAE,CAAC,CA2CnB;CACF"}
@@ -16,9 +16,10 @@ export class Zappers extends LoadableMapPlugin {
16
16
  const result = new Map();
17
17
  const valid = lnurls.filter(lnurl => lnurl.startsWith("lnurl1"));
18
18
  const addZapper = (lnurl, info) => {
19
- // A zapper is only usable if it carries both the recipient pubkey and the
20
- // nostr pubkey its receipts are signed with; skip anything missing either.
21
- if (info?.pubkey && info?.nostrPubkey) {
19
+ // Gate on what a NIP-57 lnurl-pay response actually carries: the opt-in, and the
20
+ // nostr pubkey its receipts are signed with. The recipient's own pubkey is not
21
+ // part of that response — it comes from whoever looked the lnurl up.
22
+ if (info?.allowsNostr && info?.nostrPubkey) {
22
23
  try {
23
24
  result.set(lnurl, new Zapper({ ...info, lnurl }));
24
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
- import { uniqBy, spec } from "@welshman/lib";
2
- import { BLOCKED_RELAYS, tagSpec, tagValues, normalizeRelayUrl } from "@welshman/util";
1
+ import { uniq, spec } from "@welshman/lib";
2
+ import { BLOCKED_RELAYS, relayTags, tagValues, normalizeRelayUrl } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
6
6
  // NIP-51 kind-10006 blocked relays list.
7
7
  export class BlockedRelayListReader extends EventReader {
8
8
  urls() {
9
- return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
9
+ return uniq(tagValues(relayTags("relay"), this.tags()));
10
10
  }
11
11
  includes(url) {
12
12
  return this.urls().includes(normalizeRelayUrl(url));
@@ -1 +1 @@
1
- {"version":3,"file":"BlockedRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACpF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,yCAAyC;AACzC,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IACrD,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,WAAmC;IAC7E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,WAAW,CAAC;IAC9C,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,sBAAsB;CAC/B,CAAC,CAAA"}
1
+ {"version":3,"file":"BlockedRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACtF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,yCAAyC;AACzC,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IACrD,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,WAAmC;IAC7E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,WAAW,CAAC;IAC9C,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,sBAAsB;CAC/B,CAAC,CAAA"}
@@ -1,12 +1,12 @@
1
- import { uniqBy, spec } from "@welshman/lib";
2
- import { MESSAGING_RELAYS, tagSpec, tagValues, normalizeRelayUrl } from "@welshman/util";
1
+ import { uniq, spec } from "@welshman/lib";
2
+ import { MESSAGING_RELAYS, relayTags, tagValues, normalizeRelayUrl } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
6
6
  // NIP-17 kind-10050 messaging/inbox relays list.
7
7
  export class MessagingRelayListReader extends EventReader {
8
8
  urls() {
9
- return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
9
+ return uniq(tagValues(relayTags("relay"), this.tags()));
10
10
  }
11
11
  }
12
12
  export class MessagingRelayListWriter extends EventWriter {
@@ -1 +1 @@
1
- {"version":3,"file":"MessagingRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/MessagingRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,gBAAgB,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACtF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,iDAAiD;AACjD,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACvD,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,WAAqC;IACjF,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,WAAW,CAAC;IAChD,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,wBAAwB;IAChC,MAAM,EAAE,wBAAwB;CACjC,CAAC,CAAA"}
1
+ {"version":3,"file":"MessagingRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/MessagingRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACxF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,iDAAiD;AACjD,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACvD,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACzD,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,WAAqC;IACjF,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,WAAW,CAAC;IAChD,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,wBAAwB;IAChC,MAAM,EAAE,wBAAwB;CACjC,CAAC,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import { now, uniq, randomId, spec } from "@welshman/lib";
2
- import { POLL, tagSpec, tagValue, tagValues } from "@welshman/util";
2
+ import { POLL, relayTags, tagSpec, tagValue, tagValues } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
@@ -23,7 +23,7 @@ export class PollReader extends EventReader {
23
23
  return endsAt !== undefined && endsAt <= now();
24
24
  }
25
25
  urls() {
26
- return tagValues(tagSpec("relay"), this.event.tags);
26
+ return tagValues(relayTags("relay"), this.event.tags);
27
27
  }
28
28
  results(responses) {
29
29
  const options = this.options().map(option => ({ ...option, votes: 0 }));
@@ -1 +1 @@
1
- {"version":3,"file":"Poll.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Poll.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Poll.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Poll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAc3C,yBAAyB;AACzB,MAAM,OAAO,UAAW,SAAQ,WAAW;IACzC,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAA;IACjC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,KAAK,EAAC,CAAC,CAAC,CAAA;IAC5F,CAAC;IAED,QAAQ;QACN,OAAQ,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAc,IAAI,cAAc,CAAA;IACvF,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAE3E,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3C,CAAC;IAED,QAAQ;QACN,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QAE5B,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,IAAI,GAAG,EAAE,CAAA;IAChD,CAAC;IAED,IAAI;QACF,OAAO,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvD,CAAC;IAED,OAAO,CAAC,SAAyB;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAC,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;QAClE,MAAM,cAAc,GAAG,IAAI,GAAG,EAAwB,CAAA;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAEhC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAEnD,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBACzD,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;YAChE,MAAM,GAAG,GAAG,QAAQ,KAAK,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAEnF,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBAE7B,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,IAAI,CAAC,CAAA;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,IAAI,EAAC,CAAA;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,WAAuB;IACrD,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QAEpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,EAAE,GAAG,QAAQ,EAAE;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;IAC5C,CAAC;IAED,WAAW,CAAC,QAAkB;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;IAC1E,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC;IAClC,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;CACnB,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"RelayList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelayList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAW3C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,IAAI;IAIJ,QAAQ;IAIR,SAAS;CAGV;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;IAGzD,QAAQ;cAQE,YAAY;IAO5B,UAAU,CAAC,GAAG,EAAE,MAAM;IAItB,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,aAAa,CAAC,GAAG,EAAE,MAAM;IAIzB,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,gBAAgB;IAexB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;IAI1B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE;IAI3B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;CAKzB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}
1
+ {"version":3,"file":"RelayList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelayList.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAY3C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,IAAI;IAIJ,QAAQ;IAIR,SAAS;CAGV;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;IAGzD,QAAQ;cAQE,YAAY;IAO5B,UAAU,CAAC,GAAG,EAAE,MAAM;IAItB,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,aAAa,CAAC,GAAG,EAAE,MAAM;IAIzB,cAAc,CAAC,GAAG,EAAE,MAAM;IAI1B,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,gBAAgB;IAexB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;IAI1B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE;IAI3B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;CAKzB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}
@@ -1,11 +1,12 @@
1
- import { nth, uniq, uniqBy, remove } from "@welshman/lib";
2
- import { RELAYS, matchTags, relayTags, normalizeRelayUrl, relays, indexers } from "@welshman/util";
1
+ import { uniq, remove } from "@welshman/lib";
2
+ import { RELAYS, matchTags, relayTags, tagValueExtractor, normalizeRelayUrl, relays, indexers, } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
6
- const getUrls = (tags, mode) => uniqBy(normalizeRelayUrl, matchTags(relayTags(["r", "relay"]), tags)
6
+ const urlSpec = relayTags(["r", "relay"]);
7
+ const getUrls = (tags, mode) => uniq(matchTags(urlSpec, tags)
7
8
  .filter(t => !mode || !t[2] || t[2] === mode)
8
- .map(nth(1)));
9
+ .map(tagValueExtractor(urlSpec)));
9
10
  // NIP-65 kind-10002 relay list.
10
11
  export class RelayListReader extends EventReader {
11
12
  urls() {
@@ -1 +1 @@
1
- {"version":3,"file":"RelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelayList.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelayList.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"RelaySet.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelaySet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,IAAI;CAGL;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}
1
+ {"version":3,"file":"RelaySet.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelaySet.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,IAAI;CAGL;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}
@@ -1,5 +1,5 @@
1
- import { uniqBy, spec } from "@welshman/lib";
2
- import { NAMED_RELAYS, tagSpec, tagValue, tagValues, normalizeRelayUrl } from "@welshman/util";
1
+ import { uniq, spec } from "@welshman/lib";
2
+ import { NAMED_RELAYS, relayTags, tagSpec, tagValue, tagValues, normalizeRelayUrl, } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
@@ -15,7 +15,7 @@ export class RelaySetReader extends EventReader {
15
15
  return tagValue(tagSpec("image"), this.event.tags);
16
16
  }
17
17
  urls() {
18
- return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
18
+ return uniq(tagValues(relayTags("relay"), this.tags()));
19
19
  }
20
20
  }
21
21
  export class RelaySetWriter extends EventWriter {
@@ -1 +1 @@
1
- {"version":3,"file":"RelaySet.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelaySet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAC5F,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IAC7D,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}
1
+ {"version":3,"file":"RelaySet.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RelaySet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACR,SAAS,EACT,iBAAiB,GAClB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACzD,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IAC7D,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}
@@ -1,12 +1,12 @@
1
- import { uniqBy, spec } from "@welshman/lib";
2
- import { SEARCH_RELAYS, tagSpec, tagValues, normalizeRelayUrl } from "@welshman/util";
1
+ import { uniq, spec } from "@welshman/lib";
2
+ import { SEARCH_RELAYS, relayTags, tagValues, normalizeRelayUrl } from "@welshman/util";
3
3
  import { EventReader } from "../core/EventReader.js";
4
4
  import { EventWriter } from "../core/EventWriter.js";
5
5
  import { KindFactory } from "../core/Kind.js";
6
6
  // NIP-51 kind-10007 search relays list.
7
7
  export class SearchRelayListReader extends EventReader {
8
8
  urls() {
9
- return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
9
+ return uniq(tagValues(relayTags("relay"), this.tags()));
10
10
  }
11
11
  includes(url) {
12
12
  return this.urls().includes(normalizeRelayUrl(url));
@@ -1 +1 @@
1
- {"version":3,"file":"SearchRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,wCAAwC;AACxC,MAAM,OAAO,qBAAsB,SAAQ,WAAW;IACpD,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,WAAkC;IAC3E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC;IAC7C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,qBAAqB;CAC9B,CAAC,CAAA"}
1
+ {"version":3,"file":"SearchRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACrF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,wCAAwC;AACxC,MAAM,OAAO,qBAAsB,SAAQ,WAAW;IACpD,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,WAAkC;IAC3E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC;IAC7C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,qBAAqB;CAC9B,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["../../../../util/src/Tags.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,MAAM,IAAI;IAChC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,CAAA;CACtC,CAAA;AAGD,eAAO,MAAM,OAAO,GAAI,CAAC,GAAC,MAAM,EAC9B,MAAM,MAAM,GAAG,MAAM,EAAE,EACvB,aAAa,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,EACvC,iBAAiB,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,KACpC,OAAO,CAAC,CAAC,CAA6D,CAAA;AAEzE,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAA2B,CAAA;AAE1E,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,gCAAyC,CAAA;AAEzF,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAA6C,CAAA;AAE9F,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBACD,CAAA;AAElD,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAA8B,CAAA;AAE/E,eAAO,MAAM,UAAU,GAAI,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,YAK/D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,eAAkC,CAAA;AAEjG,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,yBAAgC,CAAA;AAE9F,eAAO,MAAM,iBAAiB,GAC3B,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,MACnB,KAAK,MAAM,EAAE,KAAG,CACkD,CAAA;AAErE,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,KAAG,WAAW,CAAC,CAAC,CAAC,EACX,CAAA;AAErE,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,KAAG,CAAC,GAAG,SAIpE,CAAA"}
1
+ {"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["../../../../util/src/Tags.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,MAAM,IAAI;IAChC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,CAAA;CACtC,CAAA;AAGD,eAAO,MAAM,OAAO,GAAI,CAAC,GAAC,MAAM,EAC9B,MAAM,MAAM,GAAG,MAAM,EAAE,EACvB,aAAa,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,EACvC,iBAAiB,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,KACpC,OAAO,CAAC,CAAC,CAA6D,CAAA;AAEzE,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAA2B,CAAA;AAE1E,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,gCAAyC,CAAA;AAEzF,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAA6C,CAAA;AAE9F,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBACD,CAAA;AAElD,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,GAAG,MAAM,EAAE,oBAAiD,CAAA;AAElG,eAAO,MAAM,UAAU,GAAI,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,YAK/D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,eAAkC,CAAA;AAEjG,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,yBAAgC,CAAA;AAE9F,eAAO,MAAM,iBAAiB,GAC3B,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,MACnB,KAAK,MAAM,EAAE,KAAG,CACkD,CAAA;AAErE,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,KAAG,WAAW,CAAC,CAAC,CAAC,EACX,CAAA;AAErE,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,EAAE,EAAE,KAAG,CAAC,GAAG,SAIpE,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import { ensurePlural, isHex32, removeUndefined } from "@welshman/lib";
2
- import { isRelayUrl } from "./Relay.js";
2
+ import { isRelayUrl, normalizeRelayUrl } from "./Relay.js";
3
3
  import { Address } from "./Address.js";
4
4
  import { isKind, normalizeKind } from "./Kinds.js";
5
5
  import { normalizeTopic } from "./Topics.js";
@@ -9,7 +9,7 @@ export const hexTags = (keys) => tagSpec(keys, isHex32);
9
9
  export const kindTags = (keys) => tagSpec(keys, isKind, normalizeKind);
10
10
  export const topicTags = (keys) => tagSpec(keys, undefined, normalizeTopic);
11
11
  export const addressTags = (keys) => tagSpec(keys, value => Address.isAddress(value));
12
- export const relayTags = (keys) => tagSpec(keys, isRelayUrl);
12
+ export const relayTags = (keys) => tagSpec(keys, isRelayUrl, normalizeRelayUrl);
13
13
  export const tagMatcher = (spec) => (tag) => {
14
14
  if (!spec.keys.includes(tag[0]))
15
15
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../../util/src/Tags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAA;AACrC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,YAAY,CAAA;AAChD,OAAO,EAAC,cAAc,EAAC,MAAM,aAAa,CAAA;AAQ1C,kBAAkB;AAClB,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,IAAuB,EACvB,UAAuC,EACvC,cAAqC,EACzB,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,cAAc,EAAC,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;AAE9F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAuB,EAAE,EAAE,CACrD,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;AAElD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAkB,EAAE,EAAE,CAAC,CAAC,GAAa,EAAE,EAAE;IAClE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAA;IAC7C,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAA;IAE1E,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,IAAgB,EAAE,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAI,IAAgB,EAAE,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;AAE9F,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAI,IAAgB,EAAE,EAAE,CACxB,CAAC,GAAa,EAAK,EAAE,CACnB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAM,CAAA;AAErE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,IAAgB,EAAE,IAAgB,EAAoB,EAAE,CACnF,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAI,IAAgB,EAAE,IAAgB,EAAiB,EAAE;IAC/E,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAEhC,OAAO,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACvD,CAAC,CAAA"}
1
+ {"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../../util/src/Tags.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@welshman/app",
3
- "version": "0.9.5",
3
+ "version": "0.9.6",
4
4
  "author": "hodlbod",
5
5
  "license": "MIT",
6
6
  "description": "An instance-based, composable client for building nostr applications",
@@ -20,13 +20,13 @@
20
20
  "peerDependencies": {
21
21
  "@pomade/core": "^0.3.3",
22
22
  "svelte": "^4.0.0 || ^5.0.0",
23
- "@welshman/domain": "0.9.5",
24
- "@welshman/net": "0.9.5",
25
- "@welshman/signer": "0.9.5",
26
- "@welshman/store": "0.9.5",
27
- "@welshman/lib": "0.9.5",
28
- "@welshman/util": "0.9.5",
29
- "@welshman/feeds": "0.9.5"
23
+ "@welshman/feeds": "0.9.6",
24
+ "@welshman/lib": "0.9.6",
25
+ "@welshman/store": "0.9.6",
26
+ "@welshman/util": "0.9.6",
27
+ "@welshman/signer": "0.9.6",
28
+ "@welshman/domain": "0.9.6",
29
+ "@welshman/net": "0.9.6"
30
30
  },
31
31
  "devDependencies": {
32
32
  "rimraf": "~6.0.0",
@@ -34,13 +34,13 @@
34
34
  "@pomade/core": "^0.3.3",
35
35
  "@types/throttle-debounce": "^5.0.2",
36
36
  "svelte": "5.55.9",
37
- "@welshman/feeds": "0.9.5",
38
- "@welshman/lib": "0.9.5",
39
- "@welshman/store": "0.9.5",
40
- "@welshman/net": "0.9.5",
41
- "@welshman/domain": "0.9.5",
42
- "@welshman/util": "0.9.5",
43
- "@welshman/signer": "0.9.5"
37
+ "@welshman/domain": "0.9.6",
38
+ "@welshman/lib": "0.9.6",
39
+ "@welshman/signer": "0.9.6",
40
+ "@welshman/store": "0.9.6",
41
+ "@welshman/util": "0.9.6",
42
+ "@welshman/feeds": "0.9.6",
43
+ "@welshman/net": "0.9.6"
44
44
  },
45
45
  "scripts": {
46
46
  "build": "pnpm run clean && pnpm run compile --force",