@welshman/app 0.11.2 → 0.12.0

package/dist/app/src/command.d.ts

@@ -4,7 +4,7 @@ import type { IApp } from "./app.js";
  * An event paired with the relays it's meant for, without committing to how
  * it gets published. Plugin mutation methods (`create`/`update`/etc.) build
  * the event and return a `Command` instead of publishing it directly, so the
- * caller decides: `publish()` sends it through the normal `Thunks` pipeline,
+ * caller decides: `publish()` sends it through the normal `Publisher` pipeline,
  * and `publishToRelays(urls)` targets a specific set of relays.
  */
 export declare class Command {
@@ -12,9 +12,9 @@ export declare class Command {
     readonly event: EventTemplate;
     readonly relays: string[];
     constructor(app: IApp, event: EventTemplate, relays: string[]);
-    publish: () => import("./index.js").Thunk;
-    publishToRelays: (urls: string[]) => import("./index.js").Thunk;
+    publish: () => import("./index.js").Publication;
+    publishToRelays: (urls: string[]) => import("./index.js").Publication;
 }
-export declare const publish: (command: Command) => import("./index.js").Thunk;
-export declare const publishToRelays: (urls: string[]) => (command: Command) => import("./index.js").Thunk;
+export declare const publish: (command: Command) => import("./index.js").Publication;
+export declare const publishToRelays: (urls: string[]) => (command: Command) => import("./index.js").Publication;
 //# sourceMappingURL=command.d.ts.map

package/dist/app/src/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,UAAU,CAAA;AAGlC;;;;;;GAMG;AACH,qBAAa,OAAO;IAEhB,QAAQ,CAAC,GAAG,EAAE,IAAI;IAClB,QAAQ,CAAC,KAAK,EAAE,aAAa;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;gBAFhB,GAAG,EAAE,IAAI,EACT,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EAAE;IAG3B,OAAO,mCAA0C;IAEjD,eAAe,GAAI,MAAM,MAAM,EAAE,gCACgC;CAClE;AAED,eAAO,MAAM,OAAO,GAAI,SAAS,OAAO,+BAAsB,CAAA;AAE9D,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,MAAM,SAAS,OAAO,+BACrC,CAAA"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,UAAU,CAAA;AAGlC;;;;;;GAMG;AACH,qBAAa,OAAO;IAEhB,QAAQ,CAAC,GAAG,EAAE,IAAI;IAClB,QAAQ,CAAC,KAAK,EAAE,aAAa;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;gBAFhB,GAAG,EAAE,IAAI,EACT,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,EAAE;IAG3B,OAAO,yCAA0C;IAEjD,eAAe,GAAI,MAAM,MAAM,EAAE,sCACmC;CACrE;AAED,eAAO,MAAM,OAAO,GAAI,SAAS,OAAO,qCAAsB,CAAA;AAE9D,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,MAAM,SAAS,OAAO,qCACrC,CAAA"}

package/dist/app/src/command.js

@@ -1,9 +1,9 @@
-import { Thunks } from "./plugins/thunk.js";
+import { Publisher } from "./plugins/publisher.js";
 /**
  * An event paired with the relays it's meant for, without committing to how
  * it gets published. Plugin mutation methods (`create`/`update`/etc.) build
  * the event and return a `Command` instead of publishing it directly, so the
- * caller decides: `publish()` sends it through the normal `Thunks` pipeline,
+ * caller decides: `publish()` sends it through the normal `Publisher` pipeline,
  * and `publishToRelays(urls)` targets a specific set of relays.
  */
 export class Command {
@@ -16,7 +16,7 @@ export class Command {
         this.relays = relays;
     }
     publish = () => this.publishToRelays(this.relays);
-    publishToRelays = (urls) => this.app.use(Thunks).publish({ event: this.event, relays: urls });
+    publishToRelays = (urls) => this.app.use(Publisher).publish({ event: this.event, relays: urls });
 }
 export const publish = (command) => command.publish();
 export const publishToRelays = (urls) => (command) => command.publishToRelays(urls);

package/dist/app/src/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAEzC;;;;;;GAMG;AACH,MAAM,OAAO,OAAO;IAEP;IACA;IACA;IAHX,YACW,GAAS,EACT,KAAoB,EACpB,MAAgB;QAFhB,QAAG,GAAH,GAAG,CAAM;QACT,UAAK,GAAL,KAAK,CAAe;QACpB,WAAM,GAAN,MAAM,CAAU;IACxB,CAAC;IAEJ,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjD,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE,CACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;CAClE;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC,OAAgB,EAAE,EAAE,CACtE,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD;;;;;;GAMG;AACH,MAAM,OAAO,OAAO;IAEP;IACA;IACA;IAHX,YACW,GAAS,EACT,KAAoB,EACpB,MAAgB;QAFhB,QAAG,GAAH,GAAG,CAAM;QACT,UAAK,GAAL,KAAK,CAAe;QACpB,WAAM,GAAN,MAAM,CAAU;IACxB,CAAC;IAEJ,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjD,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE,CACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;CACrE;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC,OAAgB,EAAE,EAAE,CACtE,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA"}

package/dist/app/src/index.d.ts

@@ -40,5 +40,5 @@ export * from "./plugins/rooms.js";
 export * from "./plugins/relayRoles.js";
 export * from "./plugins/relayMembers.js";
 export * from "./plugins/relayManagement.js";
-export * from "./plugins/thunk.js";
+export * from "./plugins/publisher.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/app/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,wBAAwB,CAAA"}

package/dist/app/src/index.js

@@ -40,5 +40,5 @@ export * from "./plugins/rooms.js";
 export * from "./plugins/relayRoles.js";
 export * from "./plugins/relayMembers.js";
 export * from "./plugins/relayManagement.js";
-export * from "./plugins/thunk.js";
+export * from "./plugins/publisher.js";
 //# sourceMappingURL=index.js.map

package/dist/app/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,wBAAwB,CAAA"}

package/dist/app/src/plugins/publisher.d.ts

@@ -0,0 +1,122 @@
+import type { Subscriber } from "svelte/store";
+import { TaskQueue } from "@welshman/lib";
+import { HashedEvent, EventTemplate } from "@welshman/util";
+import { PublishStatus, PublishResultsByRelay } from "@welshman/net";
+import { ISigner } from "@welshman/signer";
+import type { IApp } from "../app.js";
+/** What the caller asked for. A retry rebuilds from it and the publication's current event. */
+export type PublishRequest = {
+    event: EventTemplate;
+    relays: string[];
+    recipient?: string;
+    delay?: number;
+    pow?: number;
+    priority?: number;
+    timeout?: number;
+};
+/** A publication's place in the pipeline. Every terminal state has a result for each relay. */
+export type PublicationState = {
+    stage: "queued";
+} | {
+    stage: "delayed";
+    until: number;
+} | {
+    stage: "wrapping";
+} | {
+    stage: "pow";
+    difficulty: number;
+} | {
+    stage: "signing";
+} | {
+    stage: "sending";
+    results: PublishResultsByRelay;
+} | {
+    stage: "sent";
+    results: PublishResultsByRelay;
+} | {
+    stage: "failed";
+    error: string;
+    results: PublishResultsByRelay;
+} | {
+    stage: "aborted";
+    results: PublishResultsByRelay;
+};
+export type PublicationStage = PublicationState["stage"];
+export declare const TERMINAL_STAGES: PublicationStage[];
+/** Status queries over per-relay results. A relay with no result is still in progress. */
+export declare abstract class PublishStatusView {
+    abstract readonly relays: string[];
+    abstract readonly results: PublishResultsByRelay;
+    abstract isComplete(): boolean;
+    abstract abort(): void;
+    getUrlsWithStatus(statuses: PublishStatus | PublishStatus[]): string[];
+    getCompleteUrls(): string[];
+    getIncompleteUrls(): string[];
+    getFailedUrls(): string[];
+    hasStatus(statuses: PublishStatus | PublishStatus[]): boolean;
+    canAbort(): boolean;
+    getError(): string | undefined;
+}
+/** One event on its way to a set of relays. The `Publisher` moves it with `advance`. */
+export declare class Publication extends PublishStatusView {
+    readonly request: PublishRequest;
+    state: PublicationState;
+    event: HashedEvent;
+    wrap?: HashedEvent;
+    readonly controller: AbortController;
+    private _subs;
+    private _settled;
+    constructor(request: PublishRequest, event: HashedEvent);
+    get relays(): string[];
+    get results(): PublishResultsByRelay;
+    get signal(): AbortSignal;
+    isComplete(): boolean;
+    advance(state: PublicationState, draft?: {
+        event: HashedEvent;
+        wrap?: HashedEvent;
+    }): void;
+    abort(): void;
+    subscribe(subscriber: Subscriber<this>): () => void;
+    settled(): import("@welshman/lib").Deferred<this, this>;
+}
+export declare const mergeResults: (publications: Publication[]) => PublishResultsByRelay;
+/** Several publications watched as one, e.g. a rumor gift-wrapped for each recipient. */
+export declare class PublicationGroup extends PublishStatusView {
+    readonly publications: Publication[];
+    private _subs;
+    constructor(publications: Publication[]);
+    get relays(): string[];
+    get results(): PublishResultsByRelay;
+    isComplete(): boolean;
+    abort(): void;
+    subscribe(subscriber: Subscriber<this>): () => void;
+    settled(): Promise<this>;
+}
+export type Publishable = Publication | PublicationGroup;
+type Draft = {
+    event: HashedEvent;
+    wrap?: HashedEvent;
+    wrapper?: ISigner;
+};
+type StageContext = {
+    app: IApp;
+    publication: Publication;
+    enter: (state: PublicationState) => void;
+};
+type Stage = (draft: Draft, ctx: StageContext) => Promise<Draft>;
+export declare const STAGES: Stage[];
+/** Per-app publish pipeline, reached via `app.use(Publisher)`. */
+export declare class Publisher {
+    readonly app: IApp;
+    history: import("svelte/store").Writable<Publication[]>;
+    queue: TaskQueue<Publication>;
+    constructor(app: IApp);
+    publish: (request: PublishRequest) => Publication;
+    retry(target: Publication, relays?: string[]): Publication;
+    retry(target: PublicationGroup, relays?: string[]): PublicationGroup;
+    merge(items: Publishable[]): PublicationGroup;
+    private run;
+    private observe;
+}
+export {};
+//# sourceMappingURL=publisher.d.ts.map

package/dist/app/src/plugins/publisher.d.ts.map

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

package/dist/app/src/plugins/publisher.js

@@ -0,0 +1,368 @@
+import { get, writable } from "svelte/store";
+import { append, TaskQueue, ensurePlural, remove, defer, sleep, now, uniq } from "@welshman/lib";
+import { isSignedEvent, WRAPPED_KINDS, prep, makePow, } from "@welshman/util";
+import { PublishStatus } from "@welshman/net";
+import { Nip01Signer, Nip59 } from "@welshman/signer";
+import { Network } from "./network.js";
+import { User } from "../user.js";
+export const TERMINAL_STAGES = ["sent", "failed", "aborted"];
+const { Pending, Success, Failure, Timeout, Aborted } = PublishStatus;
+const resultsFor = (relays, status, detail) => {
+    const results = {};
+    for (const relay of relays) {
+        results[relay] = { relay, status, detail };
+    }
+    return results;
+};
+/** Status queries over per-relay results. A relay with no result is still in progress. */
+export class PublishStatusView {
+    getUrlsWithStatus(statuses) {
+        const matches = ensurePlural(statuses);
+        return this.relays.filter(relay => {
+            const result = this.results[relay];
+            return result !== undefined && matches.includes(result.status);
+        });
+    }
+    getCompleteUrls() {
+        return this.getUrlsWithStatus([Success, Failure, Timeout, Aborted]);
+    }
+    getIncompleteUrls() {
+        return this.relays.filter(relay => [undefined, Pending].includes(this.results[relay]?.status));
+    }
+    getFailedUrls() {
+        return this.getUrlsWithStatus([Failure, Timeout]);
+    }
+    hasStatus(statuses) {
+        return this.getUrlsWithStatus(statuses).length > 0;
+    }
+    // Nothing has reached a relay yet, so aborting still undoes the publish entirely.
+    canAbort() {
+        return this.relays.some(relay => this.results[relay] === undefined);
+    }
+    getError() {
+        return this.relays.map(relay => this.results[relay]).find(result => result?.status === Failure)
+            ?.detail;
+    }
+}
+/** One event on its way to a set of relays. The `Publisher` moves it with `advance`. */
+export class Publication extends PublishStatusView {
+    request;
+    state = { stage: "queued" };
+    // Mined and signed as the pipeline runs. For a gift wrap, this is the rumor inside `wrap`.
+    event;
+    wrap;
+    controller = new AbortController();
+    _subs = [];
+    _settled = defer();
+    constructor(request, event) {
+        super();
+        this.request = request;
+        this.event = event;
+    }
+    get relays() {
+        return this.request.relays;
+    }
+    get results() {
+        return "results" in this.state ? this.state.results : {};
+    }
+    get signal() {
+        return this.controller.signal;
+    }
+    isComplete() {
+        return TERMINAL_STAGES.includes(this.state.stage);
+    }
+    advance(state, draft) {
+        if (!this.isComplete()) {
+            this.state = state;
+            if (draft) {
+                this.event = draft.event;
+                this.wrap = draft.wrap;
+            }
+            for (const subscriber of this._subs) {
+                subscriber(this);
+            }
+            if (this.isComplete()) {
+                this._subs = [];
+                this._settled.resolve(this);
+            }
+        }
+    }
+    // Relays that already answered keep their result.
+    abort() {
+        const results = { ...resultsFor(this.relays, Aborted, "aborted"), ...this.results };
+        for (const [relay, result] of Object.entries(results)) {
+            if (result.status === Pending) {
+                results[relay] = { relay, status: Aborted, detail: "aborted" };
+            }
+        }
+        this.advance({ stage: "aborted", results });
+        this.controller.abort();
+    }
+    // A settled publication never changes again, so its subscribers aren't kept.
+    subscribe(subscriber) {
+        subscriber(this);
+        if (!this.isComplete()) {
+            this._subs.push(subscriber);
+        }
+        return () => {
+            this._subs = remove(subscriber, this._subs);
+        };
+    }
+    settled() {
+        return this._settled;
+    }
+}
+// Pending first, then the worst outcome, so a relay succeeds only when every publication did.
+const MERGE_PRECEDENCE = [Pending, Failure, Timeout, Aborted, Success];
+export const mergeResults = (publications) => {
+    const results = {};
+    const rank = (result) => MERGE_PRECEDENCE.indexOf(result.status);
+    for (const relay of uniq(publications.flatMap(p => p.relays))) {
+        const sending = publications.filter(p => p.relays.includes(relay));
+        const answered = sending
+            .map(p => p.results[relay])
+            .filter((result) => result !== undefined);
+        if (answered.length === sending.length) {
+            results[relay] = answered.reduce((a, b) => (rank(b) < rank(a) ? b : a));
+        }
+    }
+    return results;
+};
+/** Several publications watched as one, e.g. a rumor gift-wrapped for each recipient. */
+export class PublicationGroup extends PublishStatusView {
+    publications;
+    _subs = [];
+    constructor(publications) {
+        super();
+        this.publications = publications;
+        for (const publication of publications) {
+            publication.subscribe(() => {
+                for (const subscriber of this._subs) {
+                    subscriber(this);
+                }
+                if (this.isComplete()) {
+                    this._subs = [];
+                }
+            });
+        }
+    }
+    get relays() {
+        return uniq(this.publications.flatMap(p => p.relays));
+    }
+    get results() {
+        return mergeResults(this.publications);
+    }
+    isComplete() {
+        return this.publications.every(p => p.isComplete());
+    }
+    abort() {
+        this.publications.forEach(p => p.abort());
+    }
+    // As with a publication, a settled group never changes again, so its subscribers aren't kept.
+    subscribe(subscriber) {
+        subscriber(this);
+        if (!this.isComplete()) {
+            this._subs.push(subscriber);
+        }
+        return () => {
+            this._subs = remove(subscriber, this._subs);
+        };
+    }
+    async settled() {
+        await Promise.all(this.publications.map(p => p.settled()));
+        return this;
+    }
+}
+// A remote signer can otherwise hang the publication indefinitely.
+const SIGN_TIMEOUT = 30_000;
+// The soft-undo window comes before anything is signed.
+const delayStage = async (draft, { publication, enter }) => {
+    const { delay } = publication.request;
+    if (delay) {
+        enter({ stage: "delayed", until: now() + delay / 1000 });
+        await Promise.race([
+            sleep(delay),
+            new Promise(resolve => publication.signal.addEventListener("abort", resolve, { once: true })),
+        ]);
+    }
+    return draft;
+};
+// The user signs the seal, and a throwaway key signs the wrap.
+const wrapStage = async (draft, { app, publication, enter }) => {
+    const { recipient } = publication.request;
+    let result = draft;
+    if (recipient) {
+        enter({ stage: "wrapping" });
+        const wrapper = Nip01Signer.ephemeral();
+        const nip59 = new Nip59(User.require(app).signer, wrapper);
+        result = { ...draft, wrapper, wrap: await nip59.wrap(recipient, draft.event) };
+    }
+    return result;
+};
+// Relays receive the wrap rather than the rumor, so the wrap is what gets mined.
+const powStage = async (draft, { publication, enter }) => {
+    const { pow } = publication.request;
+    const target = draft.wrap ?? draft.event;
+    let result = draft;
+    if (pow && (draft.wrap || !isSignedEvent(target))) {
+        enter({ stage: "pow", difficulty: pow });
+        // Mining re-hashes, so it starts from the owned fields and leaves any id or signature behind.
+        const { kind, tags, content, created_at, pubkey } = target;
+        const mined = await makePow({ kind, tags, content, created_at, pubkey }, pow).result;
+        result = draft.wrap ? { ...draft, wrap: mined } : { ...draft, event: mined };
+    }
+    return result;
+};
+const signStage = async (draft, { app, enter }) => {
+    const options = { signal: AbortSignal.timeout(SIGN_TIMEOUT) };
+    let result = draft;
+    if (draft.wrap && draft.wrapper && !isSignedEvent(draft.wrap)) {
+        result = { ...draft, wrap: await draft.wrapper.sign(draft.wrap, options) };
+    }
+    if (!draft.wrap && !isSignedEvent(draft.event)) {
+        enter({ stage: "signing" });
+        result = { ...draft, event: await User.require(app).sign(draft.event, options) };
+    }
+    return result;
+};
+const sendStage = async (draft, { app, publication, enter }) => {
+    const { relays, priority, timeout } = publication.request;
+    let results = resultsFor(relays, Pending, "");
+    const update = (result) => {
+        results = { ...results, [result.relay]: result };
+        enter({ stage: "sending", results });
+    };
+    const event = draft.wrap ?? draft.event;
+    if (!isSignedEvent(event)) {
+        throw new Error("Attempted to send an unsigned event");
+    }
+    enter({ stage: "sending", results });
+    await app.use(Network).publish({
+        event,
+        relays,
+        priority,
+        timeout,
+        signal: publication.signal,
+        onPending: update,
+        onSuccess: update,
+        onFailure: update,
+        onTimeout: update,
+        onAborted: update,
+    });
+    enter({ stage: "sent", results });
+    return draft;
+};
+export const STAGES = [delayStage, wrapStage, powStage, signStage, sendStage];
+/** Per-app publish pipeline, reached via `app.use(Publisher)`. */
+export class Publisher {
+    app;
+    history = writable([]);
+    // Paces how fast publications enter the pipeline.
+    queue = new TaskQueue({
+        batchSize: 10,
+        batchDelay: 100,
+        processItem: (publication) => {
+            this.run(publication);
+        },
+    });
+    constructor(app) {
+        this.app = app;
+        app.onCleanup(() => {
+            this.queue.clear();
+            // Stops in-flight publishes and unwinds their optimistic writes.
+            for (const publication of get(this.history)) {
+                publication.abort();
+            }
+        });
+    }
+    publish = (request) => {
+        if (!request.recipient && WRAPPED_KINDS.includes(request.event.kind)) {
+            throw new Error(`Attempted to publish a kind ${request.event.kind} without wrapping it`);
+        }
+        const event = prep(request.event, User.require(this.app).pubkey);
+        const publication = new Publication(request, event);
+        this.observe(publication);
+        this.history.update($history => append(publication, $history));
+        this.queue.push(publication);
+        return publication;
+    };
+    retry(target, relays) {
+        const targets = (p) => relays ? p.relays.filter(r => relays.includes(r)) : p.relays;
+        const replaced = target instanceof PublicationGroup
+            ? target.publications.filter(p => targets(p).length > 0)
+            : [target];
+        this.history.update($history => $history.filter(p => !replaced.includes(p)));
+        const retried = replaced.map(p => this.publish({ ...p.request, event: p.event, relays: targets(p) }));
+        return target instanceof PublicationGroup ? new PublicationGroup(retried) : retried[0];
+    }
+    merge(items) {
+        return new PublicationGroup(items.flatMap(p => (p instanceof PublicationGroup ? p.publications : [p])));
+    }
+    async run(publication) {
+        const ctx = { app: this.app, publication };
+        let draft = { event: publication.event };
+        try {
+            for (const stage of STAGES) {
+                if (!publication.isComplete()) {
+                    draft = await stage(draft, { ...ctx, enter: state => publication.advance(state, draft) });
+                }
+            }
+        }
+        catch (e) {
+            const error = String(e || "Failed to publish event");
+            console.error("Failed to publish event", e);
+            publication.advance({
+                stage: "failed",
+                error,
+                results: resultsFor(publication.relays, Failure, error),
+            });
+        }
+    }
+    observe(publication) {
+        const { repository, tracker, wrapManager } = this.app;
+        const { recipient } = publication.request;
+        let current = publication.event;
+        let registeredWrap;
+        for (const url of publication.relays) {
+            tracker.track(current.id, url);
+        }
+        repository.publish(current);
+        publication.subscribe(({ state, event, wrap }) => {
+            // Only pow changes the id. A signature on the same id is taken in place.
+            if (event.id !== current.id) {
+                for (const url of publication.relays) {
+                    tracker.removeRelay(current.id, url);
+                    tracker.track(event.id, url);
+                }
+                repository.removeEvent(current.id);
+            }
+            if (event !== current) {
+                repository.publish(event);
+                current = event;
+            }
+            if (recipient &&
+                wrap &&
+                isSignedEvent(wrap) &&
+                state.stage === "sending" &&
+                !registeredWrap) {
+                registeredWrap = wrap;
+                wrapManager.add({ recipient, wrap, rumor: event });
+            }
+            if ("results" in state) {
+                for (const { relay, status } of Object.values(state.results)) {
+                    if (![Pending, Success].includes(status)) {
+                        tracker.removeRelay(current.id, relay);
+                    }
+                }
+            }
+            if (state.stage === "aborted") {
+                if (registeredWrap) {
+                    wrapManager.remove(registeredWrap.id);
+                }
+                repository.removeEvent(current.id);
+                this.history.update($history => remove(publication, $history));
+            }
+        });
+    }
+}
+//# sourceMappingURL=publisher.js.map

package/dist/app/src/plugins/publisher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/plugins/publisher.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC9F,OAAO,EAIL,aAAa,EACb,aAAa,EACb,IAAI,EACJ,OAAO,GACR,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAuC,MAAM,eAAe,CAAA;AACjF,OAAO,EAAU,WAAW,EAAE,KAAK,EAAC,MAAM,kBAAkB,CAAA;AAE5D,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AA2B/B,MAAM,CAAC,MAAM,eAAe,GAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;AAEhF,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,aAAa,CAAA;AAEnE,MAAM,UAAU,GAAG,CAAC,MAAgB,EAAE,MAAqB,EAAE,MAAc,EAAE,EAAE;IAC7E,MAAM,OAAO,GAA0B,EAAE,CAAA;IAEzC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,CAAA;IAC1C,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,0FAA0F;AAC1F,MAAM,OAAgB,iBAAiB;IAQrC,iBAAiB,CAAC,QAAyC;QACzD,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;QAEtC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YAElC,OAAO,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IACrE,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IAChG,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,SAAS,CAAC,QAAyC;QACjD,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IACpD,CAAC;IAED,kFAAkF;IAClF,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAA;IACrE,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;YAC7F,EAAE,MAAM,CAAA;IACZ,CAAC;CACF;AAED,wFAAwF;AACxF,MAAM,OAAO,WAAY,SAAQ,iBAAiB;IAcrC;IAbX,KAAK,GAAqB,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAA;IAE3C,2FAA2F;IAC3F,KAAK,CAAa;IAElB,IAAI,CAAc;IAET,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAEnC,KAAK,GAAuB,EAAE,CAAA;IAC9B,QAAQ,GAAG,KAAK,EAAQ,CAAA;IAEhC,YACW,OAAuB,EAChC,KAAkB;QAElB,KAAK,EAAE,CAAA;QAHE,YAAO,GAAP,OAAO,CAAgB;QAKhC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAA;IAC5B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1D,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;IAC/B,CAAC;IAED,UAAU;QACR,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACnD,CAAC;IAED,OAAO,CAAC,KAAuB,EAAE,KAAgD;QAC/E,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAElB,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;gBACxB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;YACxB,CAAC;YAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpC,UAAU,CAAC,IAAI,CAAC,CAAA;YAClB,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;gBACtB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;gBACf,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,KAAK;QACH,MAAM,OAAO,GAAG,EAAC,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAC,CAAA;QAEjF,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,OAAO,CAAC,KAAK,CAAC,GAAG,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAC,CAAA;YAC9D,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,CAAA;QACzC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,6EAA6E;IAC7E,SAAS,CAAC,UAA4B;QACpC,UAAU,CAAC,IAAI,CAAC,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC;QAED,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC,CAAA;IACH,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AAED,8FAA8F;AAC9F,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;AAEtE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA2B,EAAE,EAAE;IAC1D,MAAM,OAAO,GAA0B,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,CAAC,MAAqB,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAE/E,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QAClE,MAAM,QAAQ,GAAG,OAAO;aACrB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aAC1B,MAAM,CAAC,CAAC,MAAM,EAA2B,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAEpE,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzE,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,yFAAyF;AACzF,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAGhC;IAFb,KAAK,GAAuB,EAAE,CAAA;IAEtC,YAAqB,YAA2B;QAC9C,KAAK,EAAE,CAAA;QADY,iBAAY,GAAZ,YAAY,CAAe;QAG9C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE;gBACzB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACpC,UAAU,CAAC,IAAI,CAAC,CAAA;gBAClB,CAAC;gBAED,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;oBACtB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;gBACjB,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,KAAK;QACH,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAC3C,CAAC;IAED,8FAA8F;IAC9F,SAAS,CAAC,UAA4B;QACpC,UAAU,CAAC,IAAI,CAAC,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC;QAED,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;QAE1D,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAmBD,mEAAmE;AACnE,MAAM,YAAY,GAAG,MAAM,CAAA;AAE3B,wDAAwD;AACxD,MAAM,UAAU,GAAU,KAAK,EAAE,KAAK,EAAE,EAAC,WAAW,EAAE,KAAK,EAAC,EAAE,EAAE;IAC9D,MAAM,EAAC,KAAK,EAAC,GAAG,WAAW,CAAC,OAAO,CAAA;IAEnC,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,EAAC,CAAC,CAAA;QAEtD,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,KAAK,CAAC,KAAK,CAAC;YACZ,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;SAC5F,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,+DAA+D;AAC/D,MAAM,SAAS,GAAU,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAC,EAAE,EAAE;IAClE,MAAM,EAAC,SAAS,EAAC,GAAG,WAAW,CAAC,OAAO,CAAA;IACvC,IAAI,MAAM,GAAG,KAAK,CAAA;IAElB,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAA;QAE1B,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,EAAE,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAE1D,MAAM,GAAG,EAAC,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,EAAC,CAAA;IAC9E,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,iFAAiF;AACjF,MAAM,QAAQ,GAAU,KAAK,EAAE,KAAK,EAAE,EAAC,WAAW,EAAE,KAAK,EAAC,EAAE,EAAE;IAC5D,MAAM,EAAC,GAAG,EAAC,GAAG,WAAW,CAAC,OAAO,CAAA;IACjC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAA;IACxC,IAAI,MAAM,GAAG,KAAK,CAAA;IAElB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAClD,KAAK,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAC,CAAC,CAAA;QAEtC,8FAA8F;QAC9F,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAC,GAAG,MAAM,CAAA;QACxD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAA;QAElF,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC,CAAC,CAAC,EAAC,GAAG,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,CAAA;IAC1E,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,SAAS,GAAU,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAAE,KAAK,EAAC,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,EAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAC,CAAA;IAC3D,IAAI,MAAM,GAAG,KAAK,CAAA;IAElB,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9D,MAAM,GAAG,EAAC,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EAAC,CAAA;IAC1E,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,KAAK,CAAC,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;QAEzB,MAAM,GAAG,EAAC,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,EAAC,CAAA;IAChF,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,SAAS,GAAU,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAC,EAAE,EAAE;IAClE,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAC,GAAG,WAAW,CAAC,OAAO,CAAA;IACvD,IAAI,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAE7C,MAAM,MAAM,GAAG,CAAC,MAAqB,EAAE,EAAE;QACvC,OAAO,GAAG,EAAC,GAAG,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAC,CAAA;QAC9C,KAAK,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAA;IAEvC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,CAAC,CAAA;IAElC,MAAM,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QAC7B,KAAK;QACL,MAAM;QACN,QAAQ;QACR,OAAO;QACP,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,MAAM;KAClB,CAAC,CAAA;IAEF,KAAK,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,CAAC,CAAA;IAE/B,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAY,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AAEtF,kEAAkE;AAClE,MAAM,OAAO,SAAS;IAYC;IAXrB,OAAO,GAAG,QAAQ,CAAgB,EAAE,CAAC,CAAA;IAErC,kDAAkD;IAClD,KAAK,GAAG,IAAI,SAAS,CAAc;QACjC,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,CAAC,WAAwB,EAAE,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QACvB,CAAC;KACF,CAAC,CAAA;IAEF,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;QAC5B,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YAElB,iEAAiE;YACjE,KAAK,MAAM,WAAW,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5C,WAAW,CAAC,KAAK,EAAE,CAAA;YACrB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,GAAG,CAAC,OAAuB,EAAE,EAAE;QACpC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,CAAA;QAC1F,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;QAChE,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE5B,OAAO,WAAW,CAAA;IACpB,CAAC,CAAA;IAMD,KAAK,CAAC,MAAmB,EAAE,MAAiB;QAC1C,MAAM,OAAO,GAAG,CAAC,CAAc,EAAE,EAAE,CACjC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QAC9D,MAAM,QAAQ,GACZ,MAAM,YAAY,gBAAgB;YAChC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAEd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE5E,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAC/B,IAAI,CAAC,OAAO,CAAC,EAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAC,CAAC,CACjE,CAAA;QAED,OAAO,MAAM,YAAY,gBAAgB,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACxF,CAAC;IAED,KAAK,CAAC,KAAoB;QACxB,OAAO,IAAI,gBAAgB,CACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3E,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,GAAG,CAAC,WAAwB;QACxC,MAAM,GAAG,GAAG,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,WAAW,EAAC,CAAA;QACxC,IAAI,KAAK,GAAU,EAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAC,CAAA;QAE7C,IAAI,CAAC;YACH,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC;oBAC9B,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,EAAC,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,EAAC,CAAC,CAAA;gBACzF,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,IAAI,yBAAyB,CAAC,CAAA;YAEpD,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAA;YAC3C,WAAW,CAAC,OAAO,CAAC;gBAClB,KAAK,EAAE,QAAQ;gBACf,KAAK;gBACL,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;aACxD,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,WAAwB;QACtC,MAAM,EAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,GAAG,CAAA;QACnD,MAAM,EAAC,SAAS,EAAC,GAAG,WAAW,CAAC,OAAO,CAAA;QACvC,IAAI,OAAO,GAAG,WAAW,CAAC,KAAK,CAAA;QAC/B,IAAI,cAAuC,CAAA;QAE3C,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAChC,CAAC;QAED,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAE3B,WAAW,CAAC,SAAS,CAAC,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE;YAC7C,yEAAyE;YACzE,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC;gBAC5B,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;oBACrC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;oBACpC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;gBAC9B,CAAC;gBAED,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACpC,CAAC;YAED,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACtB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBACzB,OAAO,GAAG,KAAK,CAAA;YACjB,CAAC;YAED,IACE,SAAS;gBACT,IAAI;gBACJ,aAAa,CAAC,IAAI,CAAC;gBACnB,KAAK,CAAC,KAAK,KAAK,SAAS;gBACzB,CAAC,cAAc,EACf,CAAC;gBACD,cAAc,GAAG,IAAI,CAAA;gBACrB,WAAW,CAAC,GAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAA;YAClD,CAAC;YAED,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBACvB,KAAK,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC3D,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBACzC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;oBACxC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC9B,IAAI,cAAc,EAAE,CAAC;oBACnB,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;gBACvC,CAAC;gBAED,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;gBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF"}

package/dist/app/src/plugins/wraps.d.ts

@@ -1,9 +1,9 @@
 import { TaskQueue } from "@welshman/lib";
 import type { TrustedEvent, EventTemplate } from "@welshman/util";
-import { MergedThunk } from "./thunk.js";
-import type { ThunkOptions } from "./thunk.js";
+import { PublicationGroup } from "./publisher.js";
+import type { PublishRequest } from "./publisher.js";
 import type { IApp } from "../app.js";
-export type SendWrappedOptions = Omit<ThunkOptions, "event" | "relays" | "recipient" | "app" | "user"> & {
+export type SendWrappedOptions = Omit<PublishRequest, "event" | "relays" | "recipient"> & {
     event: EventTemplate;
     recipients: string[];
 };
@@ -29,6 +29,6 @@ export declare class Wraps {
     constructor(app: IApp);
     retry: (wrap: TrustedEvent, delay: number) => void;
     enqueue: (wrap: TrustedEvent) => void;
-    publish: ({ event, recipients, ...options }: SendWrappedOptions) => Promise<MergedThunk>;
+    publish: ({ event, recipients, ...options }: SendWrappedOptions) => Promise<PublicationGroup>;
 }
 //# sourceMappingURL=wraps.d.ts.map

package/dist/app/src/plugins/wraps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wraps.d.ts","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAY,MAAM,eAAe,CAAA;AAElD,OAAO,KAAK,EAAC,YAAY,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAC,WAAW,EAAS,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,YAAY,EACZ,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,GAAG,MAAM,CAClD,GAAG;IACF,KAAK,EAAE,aAAa,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAGpC,eAAO,MAAM,cAAc,QAAS,CAAA;AAGpC,eAAO,MAAM,kBAAkB,OAAQ,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,qBAAa,KAAK;IAKJ,QAAQ,CAAC,GAAG,EAAE,IAAI;IAJ9B,cAAc,sBAA4B;IAC1C,WAAW,sBAA2C;IACtD,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAET,GAAG,EAAE,IAAI;IA+C9B,KAAK,GAAI,MAAM,YAAY,EAAE,OAAO,MAAM,UAOzC;IAED,OAAO,GAAI,MAAM,YAAY,UAM5B;IAID,OAAO,GAAU,mCAAiC,kBAAkB,0BAenE;CACF"}
+{"version":3,"file":"wraps.d.ts","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAY,MAAM,eAAe,CAAA;AAElD,OAAO,KAAK,EAAC,YAAY,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAC,gBAAgB,EAAY,MAAM,gBAAgB,CAAA;AAC1D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAGlD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC,GAAG;IACxF,KAAK,EAAE,aAAa,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAGpC,eAAO,MAAM,cAAc,QAAS,CAAA;AAGpC,eAAO,MAAM,kBAAkB,OAAQ,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,qBAAa,KAAK;IAKJ,QAAQ,CAAC,GAAG,EAAE,IAAI;IAJ9B,cAAc,sBAA4B;IAC1C,WAAW,sBAA2C;IACtD,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAET,GAAG,EAAE,IAAI;IA+C9B,KAAK,GAAI,MAAM,YAAY,EAAE,OAAO,MAAM,UAOzC;IAED,OAAO,GAAI,MAAM,YAAY,UAM5B;IAID,OAAO,GAAU,mCAAiC,kBAAkB,+BAiBnE;CACF"}