@welshman/util 0.0.4 → 0.0.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.
- package/build/Address.cjs +40 -32
- package/build/Address.cjs.map +1 -1
- package/build/Address.d.ts +20 -18
- package/build/Address.mjs +38 -26
- package/build/Address.mjs.map +1 -1
- package/build/Events.cjs +29 -14
- package/build/Events.cjs.map +1 -1
- package/build/Events.d.ts +42 -15
- package/build/Events.mjs +15 -7
- package/build/Events.mjs.map +1 -1
- package/build/Filters.cjs +5 -5
- package/build/Filters.cjs.map +1 -1
- package/build/Filters.d.ts +4 -4
- package/build/Filters.mjs +5 -5
- package/build/Filters.mjs.map +1 -1
- package/build/Kinds.cjs +140 -78
- package/build/Kinds.cjs.map +1 -1
- package/build/Kinds.d.ts +137 -76
- package/build/Kinds.mjs +137 -77
- package/build/Kinds.mjs.map +1 -1
- package/build/Links.cjs +1 -1
- package/build/Links.cjs.map +1 -1
- package/build/Links.mjs +1 -1
- package/build/Links.mjs.map +1 -1
- package/build/Relay.cjs +51 -20
- package/build/Relay.cjs.map +1 -1
- package/build/Relay.d.ts +13 -5
- package/build/Relay.mjs +49 -20
- package/build/Relay.mjs.map +1 -1
- package/build/Repository.cjs +103 -94
- package/build/Repository.cjs.map +1 -1
- package/build/Repository.d.ts +33 -23
- package/build/Repository.mjs +107 -98
- package/build/Repository.mjs.map +1 -1
- package/build/Router.cjs +8 -9
- package/build/Router.cjs.map +1 -1
- package/build/Router.d.ts +12 -18
- package/build/Router.mjs +8 -9
- package/build/Router.mjs.map +1 -1
- package/build/Tags.cjs +6 -8
- package/build/Tags.cjs.map +1 -1
- package/build/Tags.d.ts +1 -3
- package/build/Tags.mjs +6 -8
- package/build/Tags.mjs.map +1 -1
- package/build/index.cjs +0 -1
- package/build/index.cjs.map +1 -1
- package/build/index.d.ts +0 -1
- package/build/index.mjs +0 -1
- package/package.json +2 -2
- package/build/Relays.cjs +0 -38
- package/build/Relays.cjs.map +0 -1
- package/build/Relays.d.ts +0 -8
- package/build/Relays.mjs +0 -33
- package/build/Relays.mjs.map +0 -1
package/build/Tags.cjs
CHANGED
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Tags = exports.Tag = void 0;
|
|
4
4
|
const lib_1 = require("@welshman/lib");
|
|
5
|
-
const
|
|
6
|
-
const Address_1 = require("./Address.cjs");
|
|
5
|
+
const Relay_1 = require("./Relay.cjs");
|
|
7
6
|
const Kinds_1 = require("./Kinds.cjs");
|
|
8
7
|
class Tag extends lib_1.Fluent {
|
|
9
8
|
constructor() {
|
|
@@ -13,11 +12,10 @@ class Tag extends lib_1.Fluent {
|
|
|
13
12
|
this.entry = () => this.xs.slice(0, 2);
|
|
14
13
|
this.setKey = (k) => this.set(0, k);
|
|
15
14
|
this.setValue = (v) => this.set(1, v);
|
|
16
|
-
this.asAddress = () => (0, Address_1.decodeAddress)(this.value());
|
|
17
15
|
this.isAddress = (kind) => { var _a; return this.key() === "a" && ((_a = this.value()) === null || _a === void 0 ? void 0 : _a.startsWith(`${kind}:`)); };
|
|
18
|
-
this.isGroup = () => this.isAddress(Kinds_1.
|
|
19
|
-
this.isCommunity = () => this.isAddress(Kinds_1.
|
|
20
|
-
this.isContext = () => this.isAddress(Kinds_1.
|
|
16
|
+
this.isGroup = () => this.isAddress(Kinds_1.GROUP);
|
|
17
|
+
this.isCommunity = () => this.isAddress(Kinds_1.COMMUNITY);
|
|
18
|
+
this.isContext = () => this.isAddress(Kinds_1.GROUP) || this.isAddress(Kinds_1.COMMUNITY);
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
21
|
exports.Tag = Tag;
|
|
@@ -26,7 +24,7 @@ Tag.fromId = (id) => new Tag(["e", id]);
|
|
|
26
24
|
Tag.fromIdentifier = (identifier) => new Tag(["d", identifier]);
|
|
27
25
|
Tag.fromTopic = (topic) => new Tag(["t", topic]);
|
|
28
26
|
Tag.fromPubkey = (pubkey) => new Tag(["p", pubkey]);
|
|
29
|
-
Tag.fromAddress = (address) => new Tag(["a",
|
|
27
|
+
Tag.fromAddress = (address, relay = "") => new Tag(["a", address, relay]);
|
|
30
28
|
class Tags extends lib_1.Fluent {
|
|
31
29
|
constructor() {
|
|
32
30
|
super(...arguments);
|
|
@@ -41,7 +39,7 @@ class Tags extends lib_1.Fluent {
|
|
|
41
39
|
this.keys = () => this.mapTo(t => t.key());
|
|
42
40
|
this.values = (key) => (key ? this.filterByKey((0, lib_1.ensurePlural)(key)) : this).mapTo(t => t.value());
|
|
43
41
|
this.entries = () => this.mapTo(t => t.entry());
|
|
44
|
-
this.relays = () => this.flatMap((t) => t.valueOf().filter(
|
|
42
|
+
this.relays = () => this.flatMap((t) => t.valueOf().filter(Relay_1.isShareableRelayUrl).map(url => (0, Relay_1.normalizeRelayUrl)(url))).uniq();
|
|
45
43
|
this.topics = () => this.whereKey("t").values().map((t) => t.replace(/^#/, ""));
|
|
46
44
|
this.ancestors = (x) => {
|
|
47
45
|
const tags = this.filterByKey(["a", "e", "q"]).reject(t => t.isContext());
|
package/build/Tags.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tags.cjs","sourceRoot":"","sources":["../Tags.ts"],"names":[],"mappings":";;;AAEA,uCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"Tags.cjs","sourceRoot":"","sources":["../Tags.ts"],"names":[],"mappings":"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"}
|
package/build/Tags.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventTemplate } from 'nostr-tools';
|
|
2
2
|
import { Fluent } from '@welshman/lib';
|
|
3
|
-
import type { Address } from './Address';
|
|
4
3
|
declare const Tag_base: (new (xs: string[]) => Fluent<string>) & Omit<typeof Fluent<string>, "from">;
|
|
5
4
|
export declare class Tag extends Tag_base {
|
|
6
5
|
static from: (xs: Iterable<string>) => Tag;
|
|
@@ -8,13 +7,12 @@ export declare class Tag extends Tag_base {
|
|
|
8
7
|
static fromIdentifier: (identifier: string) => Tag;
|
|
9
8
|
static fromTopic: (topic: string) => Tag;
|
|
10
9
|
static fromPubkey: (pubkey: string) => Tag;
|
|
11
|
-
static fromAddress: (address:
|
|
10
|
+
static fromAddress: (address: string, relay?: string) => Tag;
|
|
12
11
|
key: () => string;
|
|
13
12
|
value: () => string;
|
|
14
13
|
entry: () => string[];
|
|
15
14
|
setKey: (k: string) => this;
|
|
16
15
|
setValue: (v: string) => this;
|
|
17
|
-
asAddress: () => Address;
|
|
18
16
|
isAddress: (kind?: number) => boolean;
|
|
19
17
|
isGroup: () => boolean;
|
|
20
18
|
isCommunity: () => boolean;
|
package/build/Tags.mjs
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Fluent, ensurePlural } from '@welshman/lib';
|
|
2
|
-
import { isShareableRelayUrl, normalizeRelayUrl } from "./
|
|
3
|
-
import {
|
|
4
|
-
import { Kind } from "./Kinds.mjs";
|
|
2
|
+
import { isShareableRelayUrl, normalizeRelayUrl } from "./Relay.mjs";
|
|
3
|
+
import { GROUP, COMMUNITY } from "./Kinds.mjs";
|
|
5
4
|
export class Tag extends Fluent {
|
|
6
5
|
constructor() {
|
|
7
6
|
super(...arguments);
|
|
@@ -10,11 +9,10 @@ export class Tag extends Fluent {
|
|
|
10
9
|
this.entry = () => this.xs.slice(0, 2);
|
|
11
10
|
this.setKey = (k) => this.set(0, k);
|
|
12
11
|
this.setValue = (v) => this.set(1, v);
|
|
13
|
-
this.asAddress = () => decodeAddress(this.value());
|
|
14
12
|
this.isAddress = (kind) => { var _a; return this.key() === "a" && ((_a = this.value()) === null || _a === void 0 ? void 0 : _a.startsWith(`${kind}:`)); };
|
|
15
|
-
this.isGroup = () => this.isAddress(
|
|
16
|
-
this.isCommunity = () => this.isAddress(
|
|
17
|
-
this.isContext = () => this.isAddress(
|
|
13
|
+
this.isGroup = () => this.isAddress(GROUP);
|
|
14
|
+
this.isCommunity = () => this.isAddress(COMMUNITY);
|
|
15
|
+
this.isContext = () => this.isAddress(GROUP) || this.isAddress(COMMUNITY);
|
|
18
16
|
}
|
|
19
17
|
}
|
|
20
18
|
Tag.from = (xs) => new Tag(Array.from(xs));
|
|
@@ -22,7 +20,7 @@ Tag.fromId = (id) => new Tag(["e", id]);
|
|
|
22
20
|
Tag.fromIdentifier = (identifier) => new Tag(["d", identifier]);
|
|
23
21
|
Tag.fromTopic = (topic) => new Tag(["t", topic]);
|
|
24
22
|
Tag.fromPubkey = (pubkey) => new Tag(["p", pubkey]);
|
|
25
|
-
Tag.fromAddress = (address) => new Tag(["a",
|
|
23
|
+
Tag.fromAddress = (address, relay = "") => new Tag(["a", address, relay]);
|
|
26
24
|
export class Tags extends Fluent {
|
|
27
25
|
constructor() {
|
|
28
26
|
super(...arguments);
|
package/build/Tags.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tags.mjs","sourceRoot":"","sources":["../Tags.ts"],"names":[],"mappings":"OAEO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,eAAe;OAC3C,EAAC,mBAAmB,EAAE,iBAAiB,EAAC;
|
|
1
|
+
{"version":3,"file":"Tags.mjs","sourceRoot":"","sources":["../Tags.ts"],"names":[],"mappings":"OAEO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,eAAe;OAC3C,EAAC,mBAAmB,EAAE,iBAAiB,EAAC;OACxC,EAAC,KAAK,EAAE,SAAS,EAAC;AAEzB,MAAM,OAAO,GAAI,SAAS,MAA6D;IAAvF;;QAaE,QAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAEtB,UAAK,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAExB,UAAK,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEjC,WAAM,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEtC,aAAQ,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAExC,cAAS,GAAG,CAAC,IAAa,EAAE,EAAE,WAAC,OAAA,IAAI,CAAC,GAAG,EAAE,KAAK,GAAG,KAAI,MAAA,IAAI,CAAC,KAAK,EAAE,0CAAE,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAA,CAAA,EAAA,CAAA;QAEzF,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAErC,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QAE7C,cAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;;AA7BQ,QAAI,GAAG,CAAC,EAAoB,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,AAApD,CAAoD;AAExD,UAAM,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,AAArC,CAAqC;AAE3C,kBAAc,GAAG,CAAC,UAAkB,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,AAArD,CAAqD;AAEnE,aAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,AAA3C,CAA2C;AAEpD,cAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,AAA7C,CAA6C;AAEvD,eAAW,GAAG,CAAC,OAAe,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,AAAlE,CAAkE;AAqBtF,MAAM,OAAO,IAAK,SAAS,MAAuD;IAAlF;;QAWE,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;QAEhD,aAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAA;QAE7D,eAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,CAAA;QAErE,gBAAW,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QAE1E,kBAAa,GAAG,CAAC,MAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAElF,gBAAW,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QAE1E,kBAAa,GAAG,CAAC,MAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAElF,QAAG,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QAEjD,SAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QAErC,WAAM,GAAG,CAAC,GAAuB,EAAE,EAAE,CACnC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QAE1E,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QAE1C,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAE1H,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QAElF,cAAS,GAAG,CAAC,CAAW,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;YACzE,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;YACtC,MAAM,KAAK,GAAe,EAAE,CAAA;YAC5B,MAAM,OAAO,GAAe,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAe,EAAE,CAAA;YAE/B,MAAM,YAAY,GAAG,CAAC,QAAc,EAAE,EAAE,CACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE;gBACrC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;oBACvB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;wBACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;qBAC1B;yBAAM;wBACL,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;qBACxB;iBACF;qBAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;iBAC1B;qBAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;oBACjC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;iBAC3B;qBAAM,IAAI,CAAC,KAAK,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;oBACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;iBAC1B;qBAAM,IAAI,CAAC,KAAK,CAAC,EAAE;oBAClB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;iBACxB;qBAAM;oBACL,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;iBAC3B;YACH,CAAC,CAAC,CAAA;YAEJ,2DAA2D;YAC3D,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;YAChC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/D,WAAW,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YAE3D,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;gBACvB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC3B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC9B,CAAA;QACH,CAAC,CAAA;QAED,UAAK,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAA;QAEpC,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAA;QAExC,aAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAA;QAE1C,SAAI,GAAG,GAAG,EAAE;YACV,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;YAE1B,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACzC,CAAC,CAAA;QAED,UAAK,GAAG,GAAG,EAAE;YACX,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC7C,CAAC,CAAA;QAED,YAAO,GAAG,GAAG,EAAE;YACb,MAAM,EAAC,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;YAEzC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,CAAC,CAAA;QAED,WAAM,GAAG,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC7C,CAAC,CAAA;QAED,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QAE1D,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAA;QAEnE,YAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;QAE7D,aAAQ,GAAG,GAAG,EAAE;YACd,MAAM,MAAM,GAA2B,EAAE,CAAA;YAEzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE;gBACvB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;aAC5B;YAED,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;QAED,UAAK,GAAG,CAAC,GAAW,EAAE,EAAE;;YACtB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE;gBAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;gBAElD,IAAI,CAAA,MAAA,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,KAAK,EAAE,MAAK,GAAG,EAAE;oBACpC,OAAO,IAAI,CAAA;iBACZ;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAA;QAED,kBAAkB;QAElB,WAAM,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAE3D,WAAM,GAAG,CAAC,CAAS,EAAE,GAAG,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;QAEnF,UAAU;QAEV,eAAU,GAAG,CAAC,SAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEzF,kBAAa,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;QAErD,eAAU,GAAG,CAAC,SAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEhF,SAAS;QAET,cAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9E,iBAAY,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAEhD,cAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAEnE,QAAQ;QAER,aAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhG,gBAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAE/C,aAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAClE,CAAC;;AAtKQ,SAAI,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,AAAhD,CAAgD;AAEpD,SAAI,GAAG,CAAC,CAAqB,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,AAAnE,CAAmE;AAEvE,cAAS,GAAG,CAAC,KAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,AAAtE,CAAsE;AAE/E,eAAU,GAAG,CAAC,MAAqC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,AAA1F,CAA0F;AAEpG,cAAS,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,AAAzE,CAAyE"}
|
package/build/index.cjs
CHANGED
|
@@ -20,7 +20,6 @@ __exportStar(require("./Filters.cjs"), exports);
|
|
|
20
20
|
__exportStar(require("./Kinds.cjs"), exports);
|
|
21
21
|
__exportStar(require("./Links.cjs"), exports);
|
|
22
22
|
__exportStar(require("./Relay.cjs"), exports);
|
|
23
|
-
__exportStar(require("./Relays.cjs"), exports);
|
|
24
23
|
__exportStar(require("./Repository.cjs"), exports);
|
|
25
24
|
__exportStar(require("./Router.cjs"), exports);
|
|
26
25
|
__exportStar(require("./Tags.cjs"), exports);
|
package/build/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,+CAAwB;AACxB,gDAAyB;AACzB,8CAAuB;AACvB,8CAAuB;AACvB,8CAAuB;AACvB
|
|
1
|
+
{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,+CAAwB;AACxB,gDAAyB;AACzB,8CAAuB;AACvB,8CAAuB;AACvB,8CAAuB;AACvB,mDAA4B;AAC5B,+CAAwB;AACxB,6CAAsB;AACtB,6CAAsB"}
|
package/build/index.d.ts
CHANGED
package/build/index.mjs
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/util",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.6",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "A collection of nostr-related utilities.",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"typescript": "~5.1.6"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@welshman/lib": "0.0.
|
|
34
|
+
"@welshman/lib": "0.0.5",
|
|
35
35
|
"nostr-tools": "^2.3.2"
|
|
36
36
|
}
|
|
37
37
|
}
|
package/build/Relays.cjs
DELETED
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeRelayUrl = exports.isShareableRelayUrl = exports.BOGUS_RELAY_URL = exports.LOCAL_RELAY_URL = void 0;
|
|
4
|
-
const lib_1 = require("@welshman/lib");
|
|
5
|
-
exports.LOCAL_RELAY_URL = "local://welshman.relay";
|
|
6
|
-
exports.BOGUS_RELAY_URL = "bogus://welshman.relay";
|
|
7
|
-
const isShareableRelayUrl = (url) => {
|
|
8
|
-
var _a;
|
|
9
|
-
return Boolean(typeof url === 'string' &&
|
|
10
|
-
// Is it actually a websocket url and has a dot
|
|
11
|
-
url.match(/^wss:\/\/.+\..+/) &&
|
|
12
|
-
// Sometimes bugs cause multiple relays to get concatenated
|
|
13
|
-
((_a = url.match(/:\/\//g)) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
|
|
14
|
-
// It shouldn't have any whitespace, url-encoded or otherwise
|
|
15
|
-
!url.match(/\s|%/) &&
|
|
16
|
-
// Don't match stuff with a port number
|
|
17
|
-
!url.slice(6).match(/:\d+/) &&
|
|
18
|
-
// Don't match raw ip addresses
|
|
19
|
-
!url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
|
|
20
|
-
// Skip nostr.wine's virtual relays
|
|
21
|
-
!url.slice(6).match(/\/npub/));
|
|
22
|
-
};
|
|
23
|
-
exports.isShareableRelayUrl = isShareableRelayUrl;
|
|
24
|
-
const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
|
|
25
|
-
var _a;
|
|
26
|
-
const prefix = allowInsecure ? ((_a = url.match(/^wss?:\/\//)) === null || _a === void 0 ? void 0 : _a[0]) || "wss://" : "wss://";
|
|
27
|
-
// Use our library to normalize
|
|
28
|
-
url = (0, lib_1.normalizeUrl)(url, { stripHash: true, stripAuthentication: false });
|
|
29
|
-
// Strip the protocol since only wss works, lowercase
|
|
30
|
-
url = (0, lib_1.stripProtocol)(url).toLowerCase();
|
|
31
|
-
// Urls without pathnames are supposed to have a trailing slash
|
|
32
|
-
if (!url.includes("/")) {
|
|
33
|
-
url += "/";
|
|
34
|
-
}
|
|
35
|
-
return prefix + url;
|
|
36
|
-
};
|
|
37
|
-
exports.normalizeRelayUrl = normalizeRelayUrl;
|
|
38
|
-
//# sourceMappingURL=Relays.cjs.map
|
package/build/Relays.cjs.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Relays.cjs","sourceRoot":"","sources":["../Relays.ts"],"names":[],"mappings":";;;AAAA,uCAAyD;AAE5C,QAAA,eAAe,GAAG,wBAAwB,CAAA;AAE1C,QAAA,eAAe,GAAG,wBAAwB,CAAA;AAEhD,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE;;IACjD,OAAA,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,+CAA+C;QAC/C,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC;QAC5B,2DAA2D;QAC3D,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,MAAM,MAAK,CAAC;QACjC,6DAA6D;QAC7D,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QAClB,uCAAuC;QACvC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3B,+BAA+B;QAC/B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC;QACzC,mCAAmC;QACnC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAC9B,CAAA;CAAA,CAAA;AAfU,QAAA,mBAAmB,uBAe7B;AAMI,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAC,aAAa,GAAG,KAAK,KAA2B,EAAE,EAAE,EAAE;;IACpG,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAG,CAAC,CAAC,KAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IAElF,+BAA+B;IAC/B,GAAG,GAAG,IAAA,kBAAY,EAAC,GAAG,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,CAAA;IAEtE,qDAAqD;IACrD,GAAG,GAAG,IAAA,mBAAa,EAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;IAEtC,+DAA+D;IAC/D,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,IAAI,GAAG,CAAA;KACX;IAED,OAAO,MAAM,GAAG,GAAG,CAAA;AACrB,CAAC,CAAA;AAfY,QAAA,iBAAiB,qBAe7B"}
|
package/build/Relays.d.ts
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export declare const LOCAL_RELAY_URL = "local://welshman.relay";
|
|
2
|
-
export declare const BOGUS_RELAY_URL = "bogus://welshman.relay";
|
|
3
|
-
export declare const isShareableRelayUrl: (url: string) => boolean;
|
|
4
|
-
type NormalizeRelayUrlOpts = {
|
|
5
|
-
allowInsecure?: boolean;
|
|
6
|
-
};
|
|
7
|
-
export declare const normalizeRelayUrl: (url: string, { allowInsecure }?: NormalizeRelayUrlOpts) => string;
|
|
8
|
-
export {};
|
package/build/Relays.mjs
DELETED
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { normalizeUrl, stripProtocol } from '@welshman/lib';
|
|
2
|
-
export const LOCAL_RELAY_URL = "local://welshman.relay";
|
|
3
|
-
export const BOGUS_RELAY_URL = "bogus://welshman.relay";
|
|
4
|
-
export const isShareableRelayUrl = (url) => {
|
|
5
|
-
var _a;
|
|
6
|
-
return Boolean(typeof url === 'string' &&
|
|
7
|
-
// Is it actually a websocket url and has a dot
|
|
8
|
-
url.match(/^wss:\/\/.+\..+/) &&
|
|
9
|
-
// Sometimes bugs cause multiple relays to get concatenated
|
|
10
|
-
((_a = url.match(/:\/\//g)) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
|
|
11
|
-
// It shouldn't have any whitespace, url-encoded or otherwise
|
|
12
|
-
!url.match(/\s|%/) &&
|
|
13
|
-
// Don't match stuff with a port number
|
|
14
|
-
!url.slice(6).match(/:\d+/) &&
|
|
15
|
-
// Don't match raw ip addresses
|
|
16
|
-
!url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
|
|
17
|
-
// Skip nostr.wine's virtual relays
|
|
18
|
-
!url.slice(6).match(/\/npub/));
|
|
19
|
-
};
|
|
20
|
-
export const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
|
|
21
|
-
var _a;
|
|
22
|
-
const prefix = allowInsecure ? ((_a = url.match(/^wss?:\/\//)) === null || _a === void 0 ? void 0 : _a[0]) || "wss://" : "wss://";
|
|
23
|
-
// Use our library to normalize
|
|
24
|
-
url = normalizeUrl(url, { stripHash: true, stripAuthentication: false });
|
|
25
|
-
// Strip the protocol since only wss works, lowercase
|
|
26
|
-
url = stripProtocol(url).toLowerCase();
|
|
27
|
-
// Urls without pathnames are supposed to have a trailing slash
|
|
28
|
-
if (!url.includes("/")) {
|
|
29
|
-
url += "/";
|
|
30
|
-
}
|
|
31
|
-
return prefix + url;
|
|
32
|
-
};
|
|
33
|
-
//# sourceMappingURL=Relays.mjs.map
|
package/build/Relays.mjs.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Relays.mjs","sourceRoot":"","sources":["../Relays.ts"],"names":[],"mappings":"OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe;AAEzD,MAAM,CAAC,MAAM,eAAe,GAAG,wBAAwB,CAAA;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,wBAAwB,CAAA;AAEvD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE;;IACjD,OAAA,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,+CAA+C;QAC/C,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC;QAC5B,2DAA2D;QAC3D,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,MAAM,MAAK,CAAC;QACjC,6DAA6D;QAC7D,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QAClB,uCAAuC;QACvC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3B,+BAA+B;QAC/B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC;QACzC,mCAAmC;QACnC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAC9B,CAAA;CAAA,CAAA;AAMH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAC,aAAa,GAAG,KAAK,KAA2B,EAAE,EAAE,EAAE;;IACpG,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA,MAAA,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAG,CAAC,CAAC,KAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;IAElF,+BAA+B;IAC/B,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,CAAA;IAEtE,qDAAqD;IACrD,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;IAEtC,+DAA+D;IAC/D,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,IAAI,GAAG,CAAA;KACX;IAED,OAAO,MAAM,GAAG,GAAG,CAAA;AACrB,CAAC,CAAA"}
|