@welshman/net 0.9.0-pre1 → 0.9.0-pre2

package/dist/util/src/Nip86.js

@@ -1,33 +1,124 @@
-import { makeHttpAuthHeader } from "./Nip98.js";
-export var ManagementMethod;
-(function (ManagementMethod) {
-    ManagementMethod["SupportedMethods"] = "supportedmethods";
-    ManagementMethod["BanPubkey"] = "banpubkey";
-    ManagementMethod["UnbanPubkey"] = "unbanpubkey";
-    ManagementMethod["AllowPubkey"] = "allowpubkey";
-    ManagementMethod["UnallowPubkey"] = "unallowpubkey";
-    ManagementMethod["ListBannedPubkeys"] = "listbannedpubkeys";
-    ManagementMethod["ListAllowedPubkeys"] = "listallowedpubkeys";
-    ManagementMethod["CreateRole"] = "createrole";
-    ManagementMethod["EditRole"] = "editrole";
-    ManagementMethod["DeleteRole"] = "deleterole";
-    ManagementMethod["AssignRole"] = "assignrole";
-    ManagementMethod["UnassignRole"] = "unassignrole";
-    ManagementMethod["ListEventsNeedingModeration"] = "listeventsneedingmoderation";
-    ManagementMethod["AllowEvent"] = "allowevent";
-    ManagementMethod["BanEvent"] = "banevent";
-    ManagementMethod["ListBannedEvents"] = "listbannedevents";
-    ManagementMethod["ChangeRelayName"] = "changerelayname";
-    ManagementMethod["ChangeRelayDescription"] = "changerelaydescription";
-    ManagementMethod["ChangeRelayIcon"] = "changerelayicon";
-    ManagementMethod["AllowKind"] = "allowkind";
-    ManagementMethod["DisallowKind"] = "disallowkind";
-    ManagementMethod["ListAllowedKinds"] = "listallowedkinds";
-    ManagementMethod["BlockIp"] = "blockip";
-    ManagementMethod["UnblockIp"] = "unblockip";
-    ManagementMethod["ListBlockedIps"] = "listblockedips";
-    ManagementMethod["SignEvent"] = "signevent";
-})(ManagementMethod || (ManagementMethod = {}));
+import { makeHttpAuth, makeHttpAuthHeader } from "./Nip98.js";
+// Append an optional reason to a single-value param list, per the NIP-86
+// `["<value>", "<optional-reason>"]` shape.
+const withReason = (value, reason) => reason === undefined ? [value] : [value, reason];
+// ── Request builders, one per NIP-86 method ──
+export const makeSupportedMethods = () => ({
+    method: "supportedmethods",
+    params: [],
+});
+export const makeBanPubkey = (pubkey, reason) => ({
+    method: "banpubkey",
+    params: withReason(pubkey, reason),
+});
+export const makeUnbanPubkey = (pubkey, reason) => ({
+    method: "unbanpubkey",
+    params: withReason(pubkey, reason),
+});
+export const makeListBannedPubkeys = () => ({
+    method: "listbannedpubkeys",
+    params: [],
+});
+export const makeAllowPubkey = (pubkey, reason) => ({
+    method: "allowpubkey",
+    params: withReason(pubkey, reason),
+});
+export const makeUnallowPubkey = (pubkey, reason) => ({
+    method: "unallowpubkey",
+    params: withReason(pubkey, reason),
+});
+export const makeListAllowedPubkeys = () => ({
+    method: "listallowedpubkeys",
+    params: [],
+});
+export const makeCreateRole = (id, label, description, color, order) => ({
+    method: "createrole",
+    params: [id, label, description, color, order],
+});
+export const makeEditRole = (id, label, description, color, order) => ({
+    method: "editrole",
+    params: [id, label, description, color, order],
+});
+export const makeDeleteRole = (id) => ({
+    method: "deleterole",
+    params: [id],
+});
+export const makeAssignRole = (pubkey, roleId) => ({
+    method: "assignrole",
+    params: [pubkey, roleId],
+});
+export const makeUnassignRole = (pubkey, roleId) => ({
+    method: "unassignrole",
+    params: [pubkey, roleId],
+});
+export const makeListClaims = () => ({
+    method: "listclaims",
+    params: [],
+});
+export const makeCreateClaim = (claim) => ({
+    method: "createclaim",
+    params: [claim],
+});
+export const makeDeleteClaim = (claim) => ({
+    method: "deleteclaim",
+    params: [claim],
+});
+export const makeListEventsNeedingModeration = () => ({
+    method: "listeventsneedingmoderation",
+    params: [],
+});
+export const makeAllowEvent = (id, reason) => ({
+    method: "allowevent",
+    params: withReason(id, reason),
+});
+export const makeBanEvent = (id, reason) => ({
+    method: "banevent",
+    params: withReason(id, reason),
+});
+export const makeListBannedEvents = () => ({
+    method: "listbannedevents",
+    params: [],
+});
+export const makeChangeRelayName = (name) => ({
+    method: "changerelayname",
+    params: [name],
+});
+export const makeChangeRelayDescription = (description) => ({
+    method: "changerelaydescription",
+    params: [description],
+});
+export const makeChangeRelayIcon = (iconUrl) => ({
+    method: "changerelayicon",
+    params: [iconUrl],
+});
+export const makeAllowKind = (kind) => ({
+    method: "allowkind",
+    params: [kind],
+});
+export const makeDisallowKind = (kind) => ({
+    method: "disallowkind",
+    params: [kind],
+});
+export const makeListAllowedKinds = () => ({
+    method: "listallowedkinds",
+    params: [],
+});
+export const makeBlockIp = (ip, reason) => ({
+    method: "blockip",
+    params: withReason(ip, reason),
+});
+export const makeUnblockIp = (ip) => ({
+    method: "unblockip",
+    params: [ip],
+});
+export const makeListBlockedIps = () => ({
+    method: "listblockedips",
+    params: [],
+});
+export const makeSignEvent = (event) => ({
+    method: "signevent",
+    params: [event],
+});
 export const sendManagementRequest = async (url, request, authEvent) => {
     try {
         const res = await fetch(url, {
@@ -46,4 +137,52 @@ export const sendManagementRequest = async (url, request, authEvent) => {
         return { error: "failed to send management request" };
     }
 };
+/**
+ * A NIP-86 relay management client bound to one relay and one signer. Each
+ * method builds the request, signs a fresh NIP-98 auth event, and POSTs it —
+ * e.g. `new ManagementApi(url, sign).deleteRole(roleId)`. Management shares the
+ * relay's websocket URI but is served over HTTP, so `ws(s)://` is normalized to
+ * `http(s)://`.
+ */
+export class ManagementApi {
+    sign;
+    url;
+    constructor(url, sign) {
+        this.sign = sign;
+        this.url = url.replace(/^ws/, "http");
+    }
+    send = async (request) => {
+        const authEvent = await this.sign(await makeHttpAuth(this.url, "POST", JSON.stringify(request)));
+        return sendManagementRequest(this.url, request, authEvent);
+    };
+    supportedMethods = () => this.send(makeSupportedMethods());
+    banPubkey = (pubkey, reason) => this.send(makeBanPubkey(pubkey, reason));
+    unbanPubkey = (pubkey, reason) => this.send(makeUnbanPubkey(pubkey, reason));
+    listBannedPubkeys = () => this.send(makeListBannedPubkeys());
+    allowPubkey = (pubkey, reason) => this.send(makeAllowPubkey(pubkey, reason));
+    unallowPubkey = (pubkey, reason) => this.send(makeUnallowPubkey(pubkey, reason));
+    listAllowedPubkeys = () => this.send(makeListAllowedPubkeys());
+    createRole = (id, label, description, color, order) => this.send(makeCreateRole(id, label, description, color, order));
+    editRole = (id, label, description, color, order) => this.send(makeEditRole(id, label, description, color, order));
+    deleteRole = (id) => this.send(makeDeleteRole(id));
+    assignRole = (pubkey, roleId) => this.send(makeAssignRole(pubkey, roleId));
+    unassignRole = (pubkey, roleId) => this.send(makeUnassignRole(pubkey, roleId));
+    listClaims = () => this.send(makeListClaims());
+    createClaim = (claim) => this.send(makeCreateClaim(claim));
+    deleteClaim = (claim) => this.send(makeDeleteClaim(claim));
+    listEventsNeedingModeration = () => this.send(makeListEventsNeedingModeration());
+    allowEvent = (id, reason) => this.send(makeAllowEvent(id, reason));
+    banEvent = (id, reason) => this.send(makeBanEvent(id, reason));
+    listBannedEvents = () => this.send(makeListBannedEvents());
+    changeRelayName = (name) => this.send(makeChangeRelayName(name));
+    changeRelayDescription = (description) => this.send(makeChangeRelayDescription(description));
+    changeRelayIcon = (iconUrl) => this.send(makeChangeRelayIcon(iconUrl));
+    allowKind = (kind) => this.send(makeAllowKind(kind));
+    disallowKind = (kind) => this.send(makeDisallowKind(kind));
+    listAllowedKinds = () => this.send(makeListAllowedKinds());
+    blockIp = (ip, reason) => this.send(makeBlockIp(ip, reason));
+    unblockIp = (ip) => this.send(makeUnblockIp(ip));
+    listBlockedIps = () => this.send(makeListBlockedIps());
+    signEvent = (event) => this.send(makeSignEvent(event));
+}
 //# sourceMappingURL=Nip86.js.map

package/dist/util/src/Nip86.js.map

@@ -1 +1 @@
-{"version":3,"file":"Nip86.js","sourceRoot":"","sources":["../../../../util/src/Nip86.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAA;AAE7C,MAAM,CAAN,IAAY,gBA2BX;AA3BD,WAAY,gBAAgB;IAC1B,yDAAqC,CAAA;IACrC,2CAAuB,CAAA;IACvB,+CAA2B,CAAA;IAC3B,+CAA2B,CAAA;IAC3B,mDAA+B,CAAA;IAC/B,2DAAuC,CAAA;IACvC,6DAAyC,CAAA;IACzC,6CAAyB,CAAA;IACzB,yCAAqB,CAAA;IACrB,6CAAyB,CAAA;IACzB,6CAAyB,CAAA;IACzB,iDAA6B,CAAA;IAC7B,+EAA2D,CAAA;IAC3D,6CAAyB,CAAA;IACzB,yCAAqB,CAAA;IACrB,yDAAqC,CAAA;IACrC,uDAAmC,CAAA;IACnC,qEAAiD,CAAA;IACjD,uDAAmC,CAAA;IACnC,2CAAuB,CAAA;IACvB,iDAA6B,CAAA;IAC7B,yDAAqC,CAAA;IACrC,uCAAmB,CAAA;IACnB,2CAAuB,CAAA;IACvB,qDAAiC,CAAA;IACjC,2CAAuB,CAAA;AACzB,CAAC,EA3BW,gBAAgB,KAAhB,gBAAgB,QA2B3B;AAYD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,GAAW,EACX,OAA0B,EAC1B,SAAsB,EACO,EAAE;IAC/B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAC3B,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7B,OAAO,EAAE;gBACP,cAAc,EAAE,4BAA4B;gBAC5C,aAAa,EAAE,kBAAkB,CAAC,SAAS,CAAC;aAC7C;SACF,CAAC,CAAA;QAEF,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;IACzB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,mCAAmC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QACxB,OAAO,EAAC,KAAK,EAAE,mCAAmC,EAAC,CAAA;IACrD,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"Nip86.js","sourceRoot":"","sources":["../../../../util/src/Nip86.ts"],"names":[],"mappings":"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"}

package/dist/util/src/Pow.js

@@ -1,5 +1,5 @@
 import { call } from "@welshman/lib";
-import { getTag } from "./Tags.js";
+import { matchTag, tagSpec } from "./Tags.js";
 import { makeSecret, own, getPubkey } from "./Keys.js";
 import { makeEvent } from "./Events.js";
 export let benchmark = 0;
@@ -92,7 +92,7 @@ export const makePow = (event, difficulty) => {
     return { worker, result };
 };
 export const getPow = (event) => {
-    const difficulty = parseInt(getTag("nonce", event.tags)?.[2] || "");
+    const difficulty = parseInt(matchTag(tagSpec("nonce"), event.tags)?.[2] || "");
     if (isNaN(difficulty))
         return 0;
     let count = 0;

package/dist/util/src/Pow.js.map

@@ -1 +1 @@
-{"version":3,"file":"Pow.js","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Pow.js","sourceRoot":"","sources":["../../../../util/src/Pow.ts"],"names":[],"mappings":"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"}

package/dist/util/src/Pubkey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pubkey.d.ts","sourceRoot":"","sources":["../../../../util/src/Pubkey.ts"],"names":[],"mappings":"AAEA,qBAAa,MAAM;IAEf,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;gBADhB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,EAAO;IAGhC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,EAAO;IAmBjD,QAAQ,eAAoB;IAE5B,MAAM,yBAAgC;IAEtC,UAAU,6BAA6B;CACxC"}
+{"version":3,"file":"Pubkey.d.ts","sourceRoot":"","sources":["../../../../util/src/Pubkey.ts"],"names":[],"mappings":"AAGA,qBAAa,MAAM;IAEf,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;gBADhB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,EAAO;IAGhC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,EAAO;IAmBjD,QAAQ,eAAoB;IAE5B,MAAM,yBAAgC;IAEtC,UAAU,6BAA6B;CACxC"}

package/dist/util/src/Pubkey.js

@@ -1,4 +1,5 @@
 import { decode, npubEncode, nprofileEncode } from "nostr-tools/nip19";
+import { isHex32 } from "@welshman/lib";
 export class Pubkey {
     pubkey;
     relays;
@@ -8,7 +9,7 @@ export class Pubkey {
     }
     static from(entity, relays = []) {
         let pubkey;
-        if (entity.match(/^[0-9a-f]{64}$/)) {
+        if (isHex32(entity)) {
             pubkey = entity;
         }
         else {

package/dist/util/src/Pubkey.js.map

@@ -1 +1 @@
-{"version":3,"file":"Pubkey.js","sourceRoot":"","sources":["../../../../util/src/Pubkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAEpE,MAAM,OAAO,MAAM;IAEN;IACA;IAFX,YACW,MAAc,EACd,SAAmB,EAAE;QADrB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAe;IAC7B,CAAC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAc,EAAE,SAAmB,EAAE;QAC/C,IAAI,MAAc,CAAA;QAClB,IAAI,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,MAAM,GAAG,MAAM,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,MAAM,CAAC,MAAM,CAAQ,CAAA;YAE1C,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,MAAM,GAAG,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAA;IAE5B,MAAM,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEtC,UAAU,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;CACxC"}
+{"version":3,"file":"Pubkey.js","sourceRoot":"","sources":["../../../../util/src/Pubkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAErC,MAAM,OAAO,MAAM;IAEN;IACA;IAFX,YACW,MAAc,EACd,SAAmB,EAAE;QADrB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAe;IAC7B,CAAC;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAc,EAAE,SAAmB,EAAE;QAC/C,IAAI,MAAc,CAAA;QAClB,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpB,MAAM,GAAG,MAAM,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,MAAM,CAAC,MAAM,CAAQ,CAAA;YAE1C,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,MAAM,GAAG,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAA;IAE5B,MAAM,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEtC,UAAU,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;CACxC"}

package/dist/util/src/Relay.d.ts

@@ -1,31 +1,3 @@
-export declare enum RelayMode {
-    Read = "read",
-    Write = "write",
-    Search = "search",
-    Blocked = "blocked",
-    Messaging = "messaging"
-}
-export type RelayProfile = {
-    url: string;
-    icon?: string;
-    banner?: string;
-    name?: string;
-    self?: string;
-    pubkey?: string;
-    contact?: string;
-    software?: string;
-    version?: string;
-    negentropy?: number;
-    description?: string;
-    supported_nips?: string[];
-    privacy_policy?: string;
-    terms_of_service?: string;
-    limitation?: {
-        min_pow_difficulty?: number;
-        payment_required?: boolean;
-        auth_required?: boolean;
-    };
-};
 export declare const LOCAL_RELAY_URL = "local://welshman.relay/";
 export declare const isRelayUrl: (url: string) => boolean;
 export declare const isOnionUrl: (url: string) => boolean;
@@ -34,5 +6,4 @@ export declare const isIPAddress: (url: string) => boolean;
 export declare const isShareableRelayUrl: (url: string) => boolean;
 export declare const normalizeRelayUrl: (url: string) => string;
 export declare const displayRelayUrl: (url: string) => string;
-export declare const displayRelayProfile: (profile?: RelayProfile, fallback?: string) => string;
 //# sourceMappingURL=Relay.d.ts.map

package/dist/util/src/Relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../../../util/src/Relay.ts"],"names":[],"mappings":"AAIA,oBAAY,SAAS;IACnB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE;QACX,kBAAkB,CAAC,EAAE,MAAM,CAAA;QAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;KACxB,CAAA;CACF,CAAA;AAID,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAExD,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAsBrC,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAA6D,CAAA;AAEnG,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YACiD,CAAA;AAEvF,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,YAA6C,CAAA;AAEpF,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,YAAiD,CAAA;AAEhG,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,WAiB5C,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAA8C,CAAA;AAEzF,eAAO,MAAM,mBAAmB,GAAI,UAAU,YAAY,EAAE,iBAAa,WAC9C,CAAA"}
+{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../../../util/src/Relay.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAExD,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAsBrC,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAA6D,CAAA;AAEnG,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YACiD,CAAA;AAEvF,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,YAA6C,CAAA;AAEpF,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,YAAiD,CAAA;AAEhG,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,WAiB5C,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAA8C,CAAA"}

package/dist/util/src/Relay.js

@@ -1,13 +1,4 @@
 import { last, normalizeUrl, stripProtocol } from "@welshman/lib";
-// Constants and types
-export var RelayMode;
-(function (RelayMode) {
-    RelayMode["Read"] = "read";
-    RelayMode["Write"] = "write";
-    RelayMode["Search"] = "search";
-    RelayMode["Blocked"] = "blocked";
-    RelayMode["Messaging"] = "messaging";
-})(RelayMode || (RelayMode = {}));
 // Utils related to bare urls
 export const LOCAL_RELAY_URL = "local://welshman.relay/";
 export const isRelayUrl = (url) => {
@@ -51,5 +42,4 @@ export const normalizeRelayUrl = (url) => {
     return prefix + url;
 };
 export const displayRelayUrl = (url) => last(url.split("://")).replace(/\/$/, "");
-export const displayRelayProfile = (profile, fallback = "") => profile?.name || fallback;
 //# sourceMappingURL=Relay.js.map

package/dist/util/src/Relay.js.map

@@ -1 +1 @@
-{"version":3,"file":"Relay.js","sourceRoot":"","sources":["../../../../util/src/Relay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Relay.js","sourceRoot":"","sources":["../../../../util/src/Relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe,CAAA;AAE/D,6BAA6B;AAE7B,MAAM,CAAC,MAAM,eAAe,GAAG,yBAAyB,CAAA;AAExD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;IACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,GAAG,GAAG,QAAQ,GAAG,GAAG,CAAA;IACtB,CAAC;IAED,IAAI,MAAW,CAAA;IACf,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAA;IACd,CAAC;IAED,mBAAmB;IACnB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAA;IAEnD,qEAAqE;IACrE,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAA;IAElC,iEAAiE;IACjE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW;QAAE,OAAO,KAAK,CAAA;IAEnF,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEnG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAA;AAEvF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAEpF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;AAEhG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC/C,IAAI,GAAG,KAAK,eAAe;QAAE,OAAO,GAAG,CAAA;IAEvC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IAErF,+BAA+B;IAC/B,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAC,CAAC,CAAA;IAEtE,gCAAgC;IAChC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;IAEtC,+DAA+D;IAC/D,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,GAAG,IAAI,GAAG,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,GAAG,GAAG,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA"}

package/dist/util/src/RelaySelection.d.ts

@@ -0,0 +1,101 @@
+import type { MaybeAsync } from "@welshman/lib";
+export type EventRef = {
+    id?: string;
+    pubkey?: string;
+    kind?: number;
+    identifier?: string;
+    relays?: string[];
+};
+export type RelayRoute = {
+    type: "userInbox";
+} | {
+    type: "userOutbox";
+} | {
+    type: "userMessaging";
+} | {
+    type: "pubkeyInbox";
+    pubkey: string;
+} | {
+    type: "pubkeyOutbox";
+    pubkey: string;
+} | {
+    type: "pubkeyMessaging";
+    pubkey: string;
+} | {
+    type: "eventInbox";
+    ref: EventRef;
+} | {
+    type: "eventOutbox";
+    ref: EventRef;
+} | {
+    type: "seen";
+    ref: EventRef;
+} | {
+    type: "relay";
+    url: string;
+} | {
+    type: "index";
+} | {
+    type: "search";
+};
+export type RelaySelection = {
+    route: RelayRoute;
+    weight: number;
+};
+export declare const inbox: (pubkey: string, weight?: number) => RelaySelection;
+export declare const outbox: (pubkey: string, weight?: number) => RelaySelection;
+export declare const messaging: (pubkey: string, weight?: number) => RelaySelection;
+export declare const userInbox: (weight?: number) => RelaySelection;
+export declare const userOutbox: (weight?: number) => RelaySelection;
+export declare const userMessaging: (weight?: number) => RelaySelection;
+export declare const eventInbox: (ref: EventRef, weight?: number) => RelaySelection;
+export declare const eventOutbox: (ref: EventRef, weight?: number) => RelaySelection;
+export declare const seen: (ref: EventRef, weight?: number) => RelaySelection;
+export declare const relay: (url: string, weight?: number) => RelaySelection;
+export declare const relays: (urls: string[], weight?: number) => RelaySelection[];
+export declare const inboxes: (pubkeys: string[], weight?: number) => RelaySelection[];
+export declare const indexers: (weight?: number) => RelaySelection;
+export declare const searchRelays: (weight?: number) => RelaySelection;
+export type Selection = {
+    weight: number;
+    relays: string[];
+};
+export declare const makeSelection: (relays: string[], weight?: number) => Selection;
+export type FallbackPolicy = (count: number, limit: number) => number;
+export declare const addNoFallbacks: (count: number, limit: number) => number;
+export declare const addMinimalFallbacks: (count: number, limit: number) => 1 | 0;
+export declare const addMaximalFallbacks: (count: number, limit: number) => number;
+export type RelayScenarioOptions = {
+    policy?: FallbackPolicy;
+    limit?: number;
+    allowLocal?: boolean;
+    allowOnion?: boolean;
+    allowInsecure?: boolean;
+    getRelayQuality?: (url: string) => number;
+    getDefaultRelays?: () => string[];
+};
+export declare class RelayScenario {
+    readonly selections: Selection[];
+    readonly options: RelayScenarioOptions;
+    constructor(selections: Selection[], options?: RelayScenarioOptions);
+    clone: (options: RelayScenarioOptions) => RelayScenario;
+    limit: (limit: number) => RelayScenario;
+    policy: (policy: FallbackPolicy) => RelayScenario;
+    allowLocal: (allowLocal: boolean) => RelayScenario;
+    allowOnion: (allowOnion: boolean) => RelayScenario;
+    allowInsecure: (allowInsecure: boolean) => RelayScenario;
+    getLimit: () => number;
+    getPolicy: () => (count: number, limit: number) => number;
+    getUrls: () => string[];
+    getUrl: () => string | undefined;
+}
+export type ResolveRoute = (route: RelayRoute) => MaybeAsync<string[]>;
+export declare class Resolver {
+    readonly routeResolver: ResolveRoute;
+    readonly options: RelayScenarioOptions;
+    constructor(routeResolver: ResolveRoute, options?: RelayScenarioOptions);
+    scenario(selections: RelaySelection[]): Promise<RelayScenario>;
+    relays(selections: RelaySelection[]): Promise<string[]>;
+    relay(selections: RelaySelection[]): Promise<string | undefined>;
+}
+//# sourceMappingURL=RelaySelection.d.ts.map

package/dist/util/src/RelaySelection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RelaySelection.d.ts","sourceRoot":"","sources":["../../../../util/src/RelaySelection.ts"],"names":[],"mappings":"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"}

package/dist/util/src/RelaySelection.js

@@ -0,0 +1,98 @@
+import { add, inc, take, sortBy, shuffle, first, uniq } from "@welshman/lib";
+import { isRelayUrl, isOnionUrl, isLocalUrl, normalizeRelayUrl } from "./Relay.js";
+// DSL constructors ----------------------------------------------------------
+const sel = (route, weight = 1) => ({ route, weight });
+export const inbox = (pubkey, weight = 1) => sel({ type: "pubkeyInbox", pubkey }, weight);
+export const outbox = (pubkey, weight = 1) => sel({ type: "pubkeyOutbox", pubkey }, weight);
+export const messaging = (pubkey, weight = 1) => sel({ type: "pubkeyMessaging", pubkey }, weight);
+export const userInbox = (weight = 1) => sel({ type: "userInbox" }, weight);
+export const userOutbox = (weight = 1) => sel({ type: "userOutbox" }, weight);
+export const userMessaging = (weight = 1) => sel({ type: "userMessaging" }, weight);
+export const eventInbox = (ref, weight = 1) => sel({ type: "eventInbox", ref }, weight);
+export const eventOutbox = (ref, weight = 1) => sel({ type: "eventOutbox", ref }, weight);
+// Relays the given event was found on (its tracker relays plus any ref hints).
+export const seen = (ref, weight = 1) => sel({ type: "seen", ref }, weight);
+export const relay = (url, weight = 1) => sel({ type: "relay", url }, weight);
+export const relays = (urls, weight = 1) => urls.map(url => relay(url, weight));
+// Inbox selections for a set of pubkeys (mentions/recipients).
+export const inboxes = (pubkeys, weight = 1) => uniq(pubkeys).map(pubkey => inbox(pubkey, weight));
+export const indexers = (weight = 1) => sel({ type: "index" }, weight);
+export const searchRelays = (weight = 1) => sel({ type: "search" }, weight);
+export const makeSelection = (relays, weight = 1) => ({
+    relays: relays.filter(isRelayUrl).map(normalizeRelayUrl),
+    weight,
+});
+export const addNoFallbacks = (count, limit) => 0;
+export const addMinimalFallbacks = (count, limit) => (count > 0 ? 0 : 1);
+export const addMaximalFallbacks = (count, limit) => limit - count;
+export class RelayScenario {
+    selections;
+    options;
+    constructor(selections, options = {}) {
+        this.selections = selections;
+        this.options = options;
+    }
+    clone = (options) => new RelayScenario(this.selections, { ...this.options, ...options });
+    limit = (limit) => this.clone({ limit });
+    policy = (policy) => this.clone({ policy });
+    allowLocal = (allowLocal) => this.clone({ allowLocal });
+    allowOnion = (allowOnion) => this.clone({ allowOnion });
+    allowInsecure = (allowInsecure) => this.clone({ allowInsecure });
+    getLimit = () => this.options.limit || 3;
+    getPolicy = () => this.options.policy || addNoFallbacks;
+    getUrls = () => {
+        const limit = this.getLimit();
+        const fallbackPolicy = this.getPolicy();
+        const relayWeights = new Map();
+        const { getRelayQuality, getDefaultRelays, allowOnion, allowLocal, allowInsecure } = this.options;
+        for (const { weight, relays } of this.selections) {
+            for (const relay of relays) {
+                if (!isRelayUrl(relay))
+                    continue;
+                if (!allowOnion && isOnionUrl(relay))
+                    continue;
+                if (!allowLocal && isLocalUrl(relay))
+                    continue;
+                if (!allowInsecure && relay.startsWith("ws://") && !isOnionUrl(relay))
+                    continue;
+                relayWeights.set(relay, add(weight, relayWeights.get(relay)));
+            }
+        }
+        const scoreRelay = (relay) => {
+            const weight = relayWeights.get(relay);
+            const quality = getRelayQuality ? getRelayQuality(relay) : 1;
+            // Log the weight, since it's a straight count which ends up over-weighting
+            // hubs. Also add some random noise so that we'll occasionally pick lower
+            // quality/less popular relays.
+            return -(quality * inc(Math.log(weight)) * Math.random());
+        };
+        const relays = take(limit, sortBy(scoreRelay, Array.from(relayWeights.keys()).filter(scoreRelay)));
+        const fallbacksNeeded = fallbackPolicy(relays.length, limit);
+        const allFallbackRelays = getDefaultRelays?.() || [];
+        const fallbackRelays = shuffle(allFallbackRelays).slice(0, fallbacksNeeded);
+        for (const fallbackRelay of fallbackRelays) {
+            relays.push(fallbackRelay);
+        }
+        return relays;
+    };
+    getUrl = () => first(this.getUrls());
+}
+export class Resolver {
+    routeResolver;
+    options;
+    constructor(routeResolver, options = {}) {
+        this.routeResolver = routeResolver;
+        this.options = options;
+    }
+    async scenario(selections) {
+        const resolved = await Promise.all(selections.map(async ({ route, weight }) => makeSelection(await this.routeResolver(route), weight)));
+        return new RelayScenario(resolved, this.options);
+    }
+    async relays(selections) {
+        return (await this.scenario(selections)).getUrls();
+    }
+    async relay(selections) {
+        return (await this.scenario(selections)).getUrl();
+    }
+}
+//# sourceMappingURL=RelaySelection.js.map

package/dist/util/src/RelaySelection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RelaySelection.js","sourceRoot":"","sources":["../../../../util/src/RelaySelection.ts"],"names":[],"mappings":"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"}