@welshman/app 0.5.4 → 0.6.0
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/dist/app/src/commands.d.ts +3 -3
- package/dist/app/src/commands.d.ts.map +1 -1
- package/dist/app/src/commands.js +4 -9
- package/dist/app/src/commands.js.map +1 -1
- package/dist/app/src/core.d.ts +3 -5
- package/dist/app/src/core.d.ts.map +1 -1
- package/dist/app/src/core.js +2 -4
- package/dist/app/src/core.js.map +1 -1
- package/dist/app/src/index.d.ts.map +1 -1
- package/dist/app/src/index.js +10 -5
- package/dist/app/src/index.js.map +1 -1
- package/dist/app/src/session.d.ts +7 -1
- package/dist/app/src/session.d.ts.map +1 -1
- package/dist/app/src/session.js +49 -1
- package/dist/app/src/session.js.map +1 -1
- package/dist/app/src/thunk.d.ts +14 -8
- package/dist/app/src/thunk.d.ts.map +1 -1
- package/dist/app/src/thunk.js +74 -57
- package/dist/app/src/thunk.js.map +1 -1
- package/dist/feeds/src/request.d.ts.map +1 -1
- package/dist/feeds/src/request.js +1 -2
- package/dist/feeds/src/request.js.map +1 -1
- package/dist/lib/src/Tools.d.ts +15 -0
- package/dist/lib/src/Tools.d.ts.map +1 -1
- package/dist/lib/src/Tools.js +22 -0
- package/dist/lib/src/Tools.js.map +1 -1
- package/dist/net/src/adapter.d.ts +7 -4
- package/dist/net/src/adapter.d.ts.map +1 -1
- package/dist/net/src/adapter.js +47 -12
- package/dist/net/src/adapter.js.map +1 -1
- package/dist/net/src/auth.d.ts +7 -7
- package/dist/net/src/auth.d.ts.map +1 -1
- package/dist/net/src/auth.js +7 -7
- package/dist/net/src/auth.js.map +1 -1
- package/dist/net/src/context.d.ts +1 -1
- package/dist/net/src/context.d.ts.map +1 -1
- package/dist/net/src/context.js +1 -1
- package/dist/net/src/context.js.map +1 -1
- package/dist/net/src/diff.d.ts +3 -3
- package/dist/net/src/diff.d.ts.map +1 -1
- package/dist/net/src/diff.js +3 -3
- package/dist/net/src/diff.js.map +1 -1
- package/dist/net/src/index.d.ts +2 -0
- package/dist/net/src/index.d.ts.map +1 -1
- package/dist/net/src/index.js +2 -0
- package/dist/net/src/index.js.map +1 -1
- package/dist/net/src/publish.d.ts +6 -6
- package/dist/net/src/publish.d.ts.map +1 -1
- package/dist/net/src/publish.js +6 -6
- package/dist/net/src/publish.js.map +1 -1
- package/dist/{relay → net}/src/repository.d.ts +23 -24
- package/dist/net/src/repository.d.ts.map +1 -0
- package/dist/{relay → net}/src/repository.js +8 -19
- package/dist/net/src/repository.js.map +1 -0
- package/dist/net/src/socket.d.ts +11 -11
- package/dist/net/src/socket.d.ts.map +1 -1
- package/dist/net/src/socket.js +11 -11
- package/dist/net/src/socket.js.map +1 -1
- package/dist/net/src/wrapManager.d.ts +36 -0
- package/dist/net/src/wrapManager.d.ts.map +1 -0
- package/dist/net/src/wrapManager.js +90 -0
- package/dist/net/src/wrapManager.js.map +1 -0
- package/dist/signer/src/nip59.d.ts +6 -14
- package/dist/signer/src/nip59.d.ts.map +1 -1
- package/dist/signer/src/nip59.js +8 -6
- package/dist/signer/src/nip59.js.map +1 -1
- package/dist/signer/src/util.d.ts +1 -0
- package/dist/signer/src/util.d.ts.map +1 -1
- package/dist/signer/src/util.js +13 -0
- package/dist/signer/src/util.js.map +1 -1
- package/dist/store/src/repository.d.ts +1 -1
- package/dist/store/src/repository.d.ts.map +1 -1
- package/dist/store/src/repository.js.map +1 -1
- package/dist/util/src/Events.d.ts +0 -8
- package/dist/util/src/Events.d.ts.map +1 -1
- package/dist/util/src/Events.js +0 -4
- package/dist/util/src/Events.js.map +1 -1
- package/dist/util/src/Filters.d.ts.map +1 -1
- package/dist/util/src/Filters.js +0 -3
- package/dist/util/src/Filters.js.map +1 -1
- package/dist/util/src/Kinds.d.ts +5 -0
- package/dist/util/src/Kinds.d.ts.map +1 -1
- package/dist/util/src/Kinds.js +5 -0
- package/dist/util/src/Kinds.js.map +1 -1
- package/package.json +8 -9
- package/dist/relay/src/index.d.ts +0 -3
- package/dist/relay/src/index.d.ts.map +0 -1
- package/dist/relay/src/index.js +0 -3
- package/dist/relay/src/index.js.map +0 -1
- package/dist/relay/src/relay.d.ts +0 -13
- package/dist/relay/src/relay.d.ts.map +0 -1
- package/dist/relay/src/relay.js +0 -48
- package/dist/relay/src/relay.js.map +0 -1
- package/dist/relay/src/repository.d.ts.map +0 -1
- package/dist/relay/src/repository.js.map +0 -1
|
@@ -18,10 +18,10 @@ export declare const setMutes: ({ publicTags, privateTags, }: {
|
|
|
18
18
|
export declare const unpin: (value: string) => Promise<import("./thunk.js").Thunk>;
|
|
19
19
|
export declare const pin: (tag: string[]) => Promise<import("./thunk.js").Thunk>;
|
|
20
20
|
export type SendWrappedOptions = Omit<ThunkOptions, "event" | "relays"> & {
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
event: EventTemplate;
|
|
22
|
+
recipients: string[];
|
|
23
23
|
};
|
|
24
|
-
export declare const sendWrapped: ({
|
|
24
|
+
export declare const sendWrapped: ({ event, recipients, ...options }: SendWrappedOptions) => MergedThunk;
|
|
25
25
|
export declare const manageRelay: (url: string, request: ManagementRequest) => Promise<import("@welshman/util").ManagementResponse>;
|
|
26
26
|
export declare const createRoom: (url: string, room: RoomMeta) => import("./thunk.js").Thunk;
|
|
27
27
|
export declare const deleteRoom: (url: string, room: RoomMeta) => import("./thunk.js").Thunk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,iBAAiB,EAIjB,aAAa,EAcb,SAAS,EAMV,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,iBAAiB,EAIjB,aAAa,EAcb,SAAS,EAMV,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAA;AAerD,OAAO,EAAC,YAAY,EAAE,WAAW,EAAe,MAAM,YAAY,CAAA;AAIlE,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,MAAM,SAAS,wCAoB7D,CAAA;AAED,eAAO,MAAM,QAAQ,GAAU,KAAK,MAAM,EAAE,MAAM,SAAS,wCAW1D,CAAA;AAID,eAAO,MAAM,gBAAgB,GAAU,KAAK,MAAM,wCAQjD,CAAA;AAED,eAAO,MAAM,aAAa,GAAU,KAAK,MAAM,wCAQ9C,CAAA;AAID,eAAO,MAAM,UAAU,GAAI,SAAS,OAAO,+BAM1C,CAAA;AAID,eAAO,MAAM,QAAQ,GAAU,OAAO,MAAM,wCAQ3C,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,KAAK,MAAM,EAAE,wCAQzC,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,OAAO,MAAM,wCAQzC,CAAA;AAED,eAAO,MAAM,YAAY,GAAU,KAAK,MAAM,EAAE,wCAQ/C,CAAA;AAED,eAAO,MAAM,aAAa,GAAU,KAAK,MAAM,EAAE,wCAQhD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAU,8BAG5B;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA;CACzB,wCAQA,CAAA;AAED,eAAO,MAAM,KAAK,GAAU,OAAO,MAAM,wCAQxC,CAAA;AAED,eAAO,MAAM,GAAG,GAAU,KAAK,MAAM,EAAE,wCAQtC,CAAA;AAID,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG;IACxE,KAAK,EAAE,aAAa,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,mCAAiC,kBAAkB,gBAO5E,CAAA;AAIH,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,SAAS,iBAAiB,yDAOxE,CAAA;AAID,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,EAAE,MAAM,QAAQ,+BACW,CAAA;AAEjE,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,EAAE,MAAM,QAAQ,+BACW,CAAA;AAEjE,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,MAAM,QAAQ,+BACW,CAAA;AAE/D,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,MAAM,QAAQ,+BACW,CAAA;AAE/D,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,EAAE,MAAM,QAAQ,+BACW,CAAA"}
|
package/dist/app/src/commands.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { get } from "svelte/store";
|
|
2
2
|
import { uniq, nthNe, removeNil, nthEq } from "@welshman/lib";
|
|
3
3
|
import { sendManagementRequest, addToListPublicly, addToListPrivately, updateList, removeFromList, makeHttpAuth, getListTags, getRelayTags, makeList, makeRoomCreateEvent, makeRoomDeleteEvent, makeRoomEditEvent, makeRoomJoinEvent, makeRoomLeaveEvent, isPublishedProfile, createProfile, editProfile, RelayMode, INBOX_RELAYS, FOLLOWS, RELAYS, MUTES, PINS, } from "@welshman/util";
|
|
4
|
-
import { Nip59, stamp } from "@welshman/signer";
|
|
5
4
|
import { Router, addMaximalFallbacks } from "@welshman/router";
|
|
6
5
|
import { userRelaySelections, loadUserRelaySelections, userInboxRelaySelections, loadUserInboxRelaySelections, userFollows, loadUserFollows, userMutes, loadUserMutes, userPins, loadUserPins, } from "./user.js";
|
|
7
6
|
import { nip44EncryptToSelf, signer } from "./session.js";
|
|
@@ -112,14 +111,10 @@ export const pin = async (tag) => {
|
|
|
112
111
|
const relays = Router.get().FromUser().policy(addMaximalFallbacks).getUrls();
|
|
113
112
|
return publishThunk({ event, relays });
|
|
114
113
|
};
|
|
115
|
-
export const sendWrapped =
|
|
116
|
-
const
|
|
117
|
-
return
|
|
118
|
-
|
|
119
|
-
relays: Router.get().PubkeyInbox(recipient).getUrls(),
|
|
120
|
-
...options,
|
|
121
|
-
}))));
|
|
122
|
-
};
|
|
114
|
+
export const sendWrapped = ({ event, recipients, ...options }) => new MergedThunk(uniq(recipients).map(recipient => {
|
|
115
|
+
const relays = Router.get().PubkeyInbox(recipient).getUrls();
|
|
116
|
+
return publishThunk({ event, relays, recipient, ...options });
|
|
117
|
+
}));
|
|
123
118
|
// NIP 86
|
|
124
119
|
export const manageRelay = async (url, request) => {
|
|
125
120
|
url = url.replace(/^ws/, "http");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAA;AAChC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3D,OAAO,EACL,qBAAqB,EAErB,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EAEV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,SAAS,EACT,YAAY,EACZ,OAAO,EACP,MAAM,EACN,KAAK,EACL,IAAI,GACL,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAA;AAChC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3D,OAAO,EACL,qBAAqB,EAErB,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EAEV,cAAc,EACd,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,SAAS,EACT,YAAY,EACZ,OAAO,EACP,MAAM,EACN,KAAK,EACL,IAAI,GACL,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,MAAM,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,wBAAwB,EACxB,4BAA4B,EAC5B,WAAW,EACX,eAAe,EACf,SAAS,EACT,aAAa,EACb,QAAQ,EACR,YAAY,GACb,MAAM,WAAW,CAAA;AAClB,OAAO,EAAC,kBAAkB,EAAE,MAAM,EAAC,MAAM,cAAc,CAAA;AACvD,OAAO,EAAe,WAAW,EAAE,YAAY,EAAC,MAAM,YAAY,CAAA;AAElE,SAAS;AAET,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,GAAW,EAAE,IAAe,EAAE,EAAE;IAChE,MAAM,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAEvC,MAAM,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;IAC/D,MAAM,GAAG,GAAG,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAA;IACtE,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;IAElD,oEAAoE;IACpE,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IAC5B,CAAC;IAED,MAAM,KAAK,GAAG,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,EAAE,IAAI,EAAC,CAAA;IACzE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,wCAAwC;IACxC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAEhB,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAE,IAAe,EAAE,EAAE;IAC7D,MAAM,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAEvC,MAAM,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;IAC/D,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5E,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC5D,MAAM,KAAK,GAAG,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,EAAE,IAAI,EAAC,CAAA;IACzE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,SAAS;AAET,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IACpD,MAAM,4BAA4B,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAC,wBAAwB,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,YAAY,EAAC,CAAC,CAAA;IAC5E,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC3E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IACjD,MAAM,4BAA4B,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAC,wBAAwB,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,YAAY,EAAC,CAAC,CAAA;IAC5E,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IACzF,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,SAAS;AAET,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;IAC1E,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAEzF,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,SAAS;AAET,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IAC9C,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE/B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,CAAA;IAC1D,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;IAC5C,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE/B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,CAAA;IAC1D,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IAC5C,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;IAClD,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;IACnD,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC/E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,EAC7B,UAAU,EACV,WAAW,GAIZ,EAAE,EAAE;IACH,MAAM,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;IACtD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,EAAC,UAAU,EAAE,WAAW,EAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC7F,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IAC3C,MAAM,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE5B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;IACzC,MAAM,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAE5B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5E,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;AACtC,CAAC,CAAA;AASD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,EAAqB,EAAE,EAAE,CACjF,IAAI,WAAW,CACb,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAA;IAE5D,OAAO,YAAY,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,EAAC,CAAC,CAAA;AAC7D,CAAC,CAAC,CACH,CAAA;AAEH,SAAS;AAET,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,GAAW,EAAE,OAA0B,EAAE,EAAE;IAC3E,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAEhC,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7E,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,GAAG,EAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAExD,OAAO,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC,CAAA;AAED,SAAS;AAET,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,EAAE,CACxD,YAAY,CAAC,EAAC,KAAK,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,EAAE,CACxD,YAAY,CAAC,EAAC,KAAK,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,EAAE,CACtD,YAAY,CAAC,EAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,CAAC,CAAA;AAE/D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,EAAE,CACtD,YAAY,CAAC,EAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,CAAC,CAAA;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,EAAE,CACvD,YAAY,CAAC,EAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,CAAC,CAAA"}
|
package/dist/app/src/core.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { Repository,
|
|
2
|
-
import { Tracker } from "@welshman/net";
|
|
3
|
-
export declare const repository: Repository<import("@welshman/util").TrustedEvent>;
|
|
4
|
-
export declare const relay: LocalRelay<import("@welshman/util").TrustedEvent>;
|
|
1
|
+
import { Repository, Tracker } from "@welshman/net";
|
|
5
2
|
export declare const tracker: Tracker;
|
|
3
|
+
export declare const repository: Repository;
|
|
6
4
|
export declare const makeRepositoryStore: ({ throttle: t }?: {
|
|
7
5
|
throttle?: number;
|
|
8
|
-
}) => import("@welshman/store").WritableWithGetter<Repository
|
|
6
|
+
}) => import("@welshman/store").WritableWithGetter<Repository>;
|
|
9
7
|
export declare const makeTrackerStore: ({ throttle: t }?: {
|
|
10
8
|
throttle?: number;
|
|
11
9
|
}) => import("@welshman/store").WritableWithGetter<Tracker>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,eAAe,CAAA;AAGjD,eAAO,MAAM,OAAO,SAAgB,CAAA;AAEpC,eAAO,MAAM,UAAU,YAAmB,CAAA;AAI1C,eAAO,MAAM,mBAAmB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,6DAiB9E,CAAA;AAEH,eAAO,MAAM,gBAAgB,GAAI,kBAAqB;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAM,0DAyB3E,CAAA"}
|
package/dist/app/src/core.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { throttle } from "@welshman/lib";
|
|
2
|
-
import { Repository,
|
|
2
|
+
import { Repository, Tracker } from "@welshman/net";
|
|
3
3
|
import { custom } from "@welshman/store";
|
|
4
|
-
import { Tracker } from "@welshman/net";
|
|
5
|
-
export const repository = Repository.get();
|
|
6
|
-
export const relay = new LocalRelay(repository);
|
|
7
4
|
export const tracker = new Tracker();
|
|
5
|
+
export const repository = Repository.get();
|
|
8
6
|
// Adapt objects to stores
|
|
9
7
|
export const makeRepositoryStore = ({ throttle: t = 300 } = {}) => custom(setter => {
|
|
10
8
|
let onUpdate = () => setter(repository);
|
package/dist/app/src/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,eAAe,CAAA;AACjD,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAA;AAEtC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAA;AAEpC,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAA;AAE1C,0BAA0B;AAE1B,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,KAAyB,EAAE,EAAE,EAAE,CACnF,MAAM,CACJ,MAAM,CAAC,EAAE;IACP,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAEvC,IAAI,CAAC,EAAE,CAAC;QACN,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,QAAQ,EAAE,CAAA;IACV,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAEjC,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACjD,CAAC,EACD;IACE,QAAQ,EAAE,CAAC,KAAiB,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;CAC/D,CACF,CAAA;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,KAAyB,EAAE,EAAE,EAAE,CAChF,MAAM,CACJ,MAAM,CAAC,EAAE;IACP,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAEpC,IAAI,CAAC,EAAE,CAAC;QACN,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,QAAQ,EAAE,CAAA;IACV,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC5B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAE7B,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC7B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAChC,CAAC,CAAA;AACH,CAAC,EACD;IACE,QAAQ,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;CAC7D,CACF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAI5B,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAI5B,OAAO,EAAmC,SAAS,EAAoB,MAAM,gBAAgB,CAAA;AAmD7F,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,aAGQ,CAAA;AAExE,eAAO,MAAM,kBAAkB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,8CAGkB,CAAA"}
|
package/dist/app/src/index.js
CHANGED
|
@@ -23,10 +23,10 @@ export * from "./wot.js";
|
|
|
23
23
|
export * from "./zappers.js";
|
|
24
24
|
import { derived } from "svelte/store";
|
|
25
25
|
import { sortBy, throttleWithValue, tryCatch } from "@welshman/lib";
|
|
26
|
-
import { isEphemeralKind, isDVMKind, RelayMode, getRelaysFromList } from "@welshman/util";
|
|
26
|
+
import { isEphemeralKind, isDVMKind, WRAP, RelayMode, getRelaysFromList } from "@welshman/util";
|
|
27
27
|
import { routerContext } from "@welshman/router";
|
|
28
28
|
import { Pool, SocketEvent, isRelayEvent, netContext } from "@welshman/net";
|
|
29
|
-
import { pubkey } from "./session.js";
|
|
29
|
+
import { pubkey, unwrapAndStore } from "./session.js";
|
|
30
30
|
import { repository, tracker } from "./core.js";
|
|
31
31
|
import { relays, loadRelay, trackRelayStats, getRelayQuality } from "./relays.js";
|
|
32
32
|
import { relaySelectionsByPubkey } from "./relaySelections.js";
|
|
@@ -38,11 +38,16 @@ Pool.get().subscribe(socket => {
|
|
|
38
38
|
socket.on(SocketEvent.Receive, message => {
|
|
39
39
|
if (isRelayEvent(message)) {
|
|
40
40
|
const event = message[2];
|
|
41
|
-
if (!
|
|
42
|
-
!
|
|
41
|
+
if (!isDVMKind(event.kind) &&
|
|
42
|
+
!isEphemeralKind(event.kind) &&
|
|
43
43
|
netContext.isEventValid(event, socket.url)) {
|
|
44
44
|
tracker.track(event.id, socket.url);
|
|
45
|
-
|
|
45
|
+
if (event.kind === WRAP) {
|
|
46
|
+
unwrapAndStore(event);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
repository.publish(event);
|
|
50
|
+
}
|
|
46
51
|
}
|
|
47
52
|
}
|
|
48
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAA;AACjE,OAAO,EAAC,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { Wallet } from "@welshman/util";
|
|
1
|
+
import { Wallet, HashedEvent, SignedEvent } from "@welshman/util";
|
|
2
2
|
import { WrappedSigner, ISigner } from "@welshman/signer";
|
|
3
|
+
import { WrapManager } from "@welshman/net";
|
|
3
4
|
export declare enum SessionMethod {
|
|
4
5
|
Nip01 = "nip01",
|
|
5
6
|
Nip07 = "nip07",
|
|
@@ -87,6 +88,11 @@ export declare const getSigner: {
|
|
|
87
88
|
getValue: (args: [Session | undefined]) => WrappedSigner | undefined;
|
|
88
89
|
pop: (args_0: Session | undefined) => WrappedSigner | undefined;
|
|
89
90
|
};
|
|
91
|
+
export declare const getSignerFromPubkey: (pubkey: string) => WrappedSigner | undefined;
|
|
90
92
|
export declare const signer: import("@welshman/store").ReadableWithGetter<WrappedSigner>;
|
|
91
93
|
export declare const nip44EncryptToSelf: (payload: string) => Promise<string>;
|
|
94
|
+
export declare const wrapManager: WrapManager;
|
|
95
|
+
export declare const shouldUnwrap: import("@welshman/store").WritableWithGetter<boolean>;
|
|
96
|
+
export declare const failedUnwraps: Set<string>;
|
|
97
|
+
export declare const unwrapAndStore: (wrap: SignedEvent) => Promise<HashedEvent | undefined>;
|
|
92
98
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/session.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { derived, writable } from "svelte/store";
|
|
2
2
|
import { cached, randomId, append, omit, equals, assoc } from "@welshman/lib";
|
|
3
3
|
import { withGetter } from "@welshman/store";
|
|
4
|
-
import {
|
|
4
|
+
import { WRAP, getPubkeyTagValues } from "@welshman/util";
|
|
5
|
+
import { Nip59, WrappedSigner, Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer, getPubkey, } from "@welshman/signer";
|
|
6
|
+
import { WrapManager } from "@welshman/net";
|
|
7
|
+
import { tracker, repository } from "./core.js";
|
|
5
8
|
export var SessionMethod;
|
|
6
9
|
(function (SessionMethod) {
|
|
7
10
|
SessionMethod["Nip01"] = "nip01";
|
|
@@ -120,6 +123,12 @@ export const getSigner = cached({
|
|
|
120
123
|
}
|
|
121
124
|
},
|
|
122
125
|
});
|
|
126
|
+
export const getSignerFromPubkey = (pubkey) => {
|
|
127
|
+
const session = getSession(pubkey);
|
|
128
|
+
if (session) {
|
|
129
|
+
return getSigner(session);
|
|
130
|
+
}
|
|
131
|
+
};
|
|
123
132
|
export const signer = withGetter(derived(session, getSigner));
|
|
124
133
|
export const nip44EncryptToSelf = (payload) => {
|
|
125
134
|
const $pubkey = pubkey.get();
|
|
@@ -129,4 +138,43 @@ export const nip44EncryptToSelf = (payload) => {
|
|
|
129
138
|
}
|
|
130
139
|
return $signer.nip44.encrypt($pubkey, payload);
|
|
131
140
|
};
|
|
141
|
+
// Gift wrap utilities
|
|
142
|
+
export const wrapManager = new WrapManager({ repository, tracker });
|
|
143
|
+
export const shouldUnwrap = withGetter(writable(false));
|
|
144
|
+
export const failedUnwraps = new Set();
|
|
145
|
+
export const unwrapAndStore = async (wrap) => {
|
|
146
|
+
if (wrap.kind !== WRAP) {
|
|
147
|
+
throw new Error("Tried to unwrap an invalid event");
|
|
148
|
+
}
|
|
149
|
+
if (!shouldUnwrap.get()) {
|
|
150
|
+
throw new Error("Discarding wrapped event because `shouldUnwrap` is not enabled");
|
|
151
|
+
}
|
|
152
|
+
// Check to see if we already tried to unwrap but failed
|
|
153
|
+
if (failedUnwraps.has(wrap.id)) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
// Check index and repository
|
|
157
|
+
const cached = wrapManager.getRumor(wrap.id);
|
|
158
|
+
if (cached) {
|
|
159
|
+
return cached;
|
|
160
|
+
}
|
|
161
|
+
let result;
|
|
162
|
+
// Next, try to decrypt as the recipient
|
|
163
|
+
for (const recipient of getPubkeyTagValues(wrap.tags)) {
|
|
164
|
+
const signer = getSignerFromPubkey(recipient);
|
|
165
|
+
if (signer) {
|
|
166
|
+
try {
|
|
167
|
+
const rumor = await Nip59.fromSigner(signer).unwrap(wrap);
|
|
168
|
+
result = { rumor, recipient };
|
|
169
|
+
}
|
|
170
|
+
catch (e) {
|
|
171
|
+
failedUnwraps.add(wrap.id);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
if (result) {
|
|
176
|
+
wrapManager.add({ wrap, ...result });
|
|
177
|
+
return result.rumor;
|
|
178
|
+
}
|
|
179
|
+
};
|
|
132
180
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAS,IAAI,EAAE,kBAAkB,EAA2B,MAAM,gBAAgB,CAAA;AACzF,OAAO,EACL,KAAK,EACL,aAAa,EACb,WAAW,EACX,WAAW,EACX,WAAW,EACX,WAAW,EACX,WAAW,EACX,SAAS,GAEV,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,WAAW,CAAA;AAE7C,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;AACzB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAgDD,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAqB,SAAS,CAAC,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAA0B,EAAE,CAAC,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAC/B,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAClG,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAA;AAEpE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC7C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAC/C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;QACjD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,CAAgC,EAAE,EAAE,CAChF,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAElD,IAAI,OAAO,YAAY,WAAW,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACrE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;AAC1D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QACjD,WAAW,CAAC,MAAM,CAAC,CAAA;IACrB,CAAC;AACH,CAAC,CAAA;AAED,oBAAoB;AAEpB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAgB,EAAE,CAAC,CAAC;IACjE,MAAM,EAAE,aAAa,CAAC,KAAK;IAC3B,MAAM;IACN,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC;CAC1B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAgB,EAAE,CAAC,CAAC;IACjE,MAAM,EAAE,aAAa,CAAC,KAAK;IAC3B,MAAM;CACP,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAc,EACd,YAAoB,EACpB,YAAoB,EACpB,MAAgB,EACF,EAAE,CAAC,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC,KAAK;IAC3B,MAAM;IACN,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,EAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAC;CACxC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,MAAc,EAAgB,EAAE,CAAC,CAAC;IACjF,MAAM,EAAE,aAAa,CAAC,KAAK;IAC3B,MAAM;IACN,MAAM;CACP,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAiB,EAAE,CAAC,CAAC;IACnE,MAAM,EAAE,aAAa,CAAC,MAAM;IAC5B,MAAM;CACP,CAAC,CAAA;AAEF,cAAc;AAEd,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAA2B,EAAE,CAC3E,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,KAAK,CAAA;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAA2B,EAAE,CAC3E,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,KAAK,CAAA;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAA2B,EAAE,CAC3E,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,KAAK,CAAA;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAA2B,EAAE,CAC3E,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,KAAK,CAAA;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAiB,EAA4B,EAAE,CAC7E,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,MAAM,CAAA;AAE1C,kBAAkB;AAElB,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;AAEtF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;AAEtF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAAc,EACd,YAAoB,EACpB,YAAoB,EACpB,MAAgB,EAChB,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,MAAc,EAAE,EAAE,CAC/D,UAAU,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAE9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;AAExF,cAAc;AAEd,MAAM,CAAC,MAAM,UAAU,GAAG,0EAA0E,CAAA;AAEpG,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,2CAAmB,CAAA;IACnB,2CAAmB,CAAA;IACnB,2CAAmB,CAAA;AACrB,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AASD,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAmB,EAAE,CAAC,CAAC,CAAA;AAEnE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAe,EAAE,EAAE,CAC5C,IAAI,aAAa,CAAC,MAAM,EAAE,KAAK,EAAK,MAAc,EAAE,KAAuB,EAAE,EAAE;IAC7E,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAA;IACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAEtB,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrB,MAAM,CAAC,EAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAC,EAAE,GAAG,CAAC,CAC7E,CAAA;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,KAAK,EAAE,CAAA;QAE5B,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACV,CAAC,CAAC,EAAE,KAAK,EAAE;YACT,CAAC,CAAC,EAAC,GAAG,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,EAAC;YAC1E,CAAC,CAAC,CAAC,CACN,CACF,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACV,CAAC,CAAC,EAAE,KAAK,EAAE;YACT,CAAC,CAAC,EAAC,GAAG,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,EAAC;YAC1E,CAAC,CAAC,CAAC,CACN,CACF,CAAA;QAED,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC;IAC9B,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,CAAC,CAAC,OAAO,CAAwB,EAAE,EAAE,CAAC,GAAG,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,EAAE;IACrF,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAwB,EAAE,EAAE;QAC7C,IAAI,cAAc,CAAC,OAAO,CAAC;YAAE,OAAO,UAAU,CAAC,IAAI,WAAW,EAAE,CAAC,CAAA;QACjE,IAAI,cAAc,CAAC,OAAO,CAAC;YAAE,OAAO,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/E,IAAI,cAAc,CAAC,OAAO,CAAC;YAAE,OAAO,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/F,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,EAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAC,GACxC,GAAG,OAAO,CAAA;YACX,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,EAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAC,CAAC,CAAA;YACpE,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;YAEtC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,EAAE;IACpD,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IAElC,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;AAE7D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAE,EAAE;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;IACnE,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAQ,EAAE,OAAO,CAAC,CAAA;AACjD,CAAC,CAAA;AAED,sBAAsB;AAEtB,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,EAAC,UAAU,EAAE,OAAO,EAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAA;AAE9C,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,IAAiB,EAAE,EAAE;IACxD,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrD,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAA;IACnF,CAAC;IAED,wDAAwD;IACxD,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,OAAM;IACR,CAAC;IAED,6BAA6B;IAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAE5C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAA;IACf,CAAC;IAED,IAAI,MAA2D,CAAA;IAE/D,wCAAwC;IACxC,KAAK,MAAM,SAAS,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;QAE7C,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBAEzD,MAAM,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,CAAA;YAC7B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,GAAG,MAAM,EAAC,CAAC,CAAA;QAElC,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;AACH,CAAC,CAAA"}
|
package/dist/app/src/thunk.d.ts
CHANGED
|
@@ -1,27 +1,33 @@
|
|
|
1
1
|
import type { Subscriber } from "svelte/store";
|
|
2
|
+
import type { Override } from "@welshman/lib";
|
|
2
3
|
import { TaskQueue } from "@welshman/lib";
|
|
3
|
-
import {
|
|
4
|
+
import { HashedEvent, EventTemplate, SignedEvent } from "@welshman/util";
|
|
4
5
|
import { PublishStatus, PublishResult, PublishOptions, PublishResultsByRelay } from "@welshman/net";
|
|
5
|
-
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
import { ISigner } from "@welshman/signer";
|
|
7
|
+
export type ThunkOptions = Override<PublishOptions, {
|
|
8
|
+
event: EventTemplate;
|
|
9
|
+
recipient?: string;
|
|
9
10
|
delay?: number;
|
|
10
|
-
}
|
|
11
|
+
}>;
|
|
11
12
|
export declare class Thunk {
|
|
12
13
|
readonly options: ThunkOptions;
|
|
13
14
|
_subs: Subscriber<Thunk>[];
|
|
14
|
-
|
|
15
|
+
pubkey: string;
|
|
16
|
+
signer: ISigner;
|
|
17
|
+
event: HashedEvent;
|
|
15
18
|
results: PublishResultsByRelay;
|
|
16
19
|
complete: import("@welshman/lib").Deferred<void, void>;
|
|
17
20
|
controller: AbortController;
|
|
21
|
+
wrap?: SignedEvent;
|
|
18
22
|
constructor(options: ThunkOptions);
|
|
19
23
|
_notify(): void;
|
|
20
24
|
_fail(detail: string): void;
|
|
21
25
|
_setPending: (result: PublishResult) => void;
|
|
22
26
|
_setTimeout: (result: PublishResult) => void;
|
|
23
27
|
_setAborted: (result: PublishResult) => void;
|
|
28
|
+
_publish(event: SignedEvent): Promise<void>;
|
|
24
29
|
publish(): Promise<void>;
|
|
30
|
+
enqueue(): void;
|
|
25
31
|
subscribe(subscriber: Subscriber<Thunk>): () => void;
|
|
26
32
|
}
|
|
27
33
|
export declare class MergedThunk {
|
|
@@ -44,7 +50,7 @@ export declare const thunkIsComplete: (thunk: AbstractThunk) => boolean;
|
|
|
44
50
|
export declare const getThunkError: (thunk: Thunk) => string | undefined;
|
|
45
51
|
export declare const waitForThunkError: (thunk: Thunk) => Promise<string>;
|
|
46
52
|
export declare const waitForThunkCompletion: (thunk: Thunk) => Promise<void>;
|
|
47
|
-
export declare const thunks: import("svelte/store").Writable<
|
|
53
|
+
export declare const thunks: import("svelte/store").Writable<Thunk[]>;
|
|
48
54
|
export declare const thunkQueue: TaskQueue<Thunk>;
|
|
49
55
|
export declare const mergeThunks: (thunks: AbstractThunk[]) => MergedThunk;
|
|
50
56
|
export declare function flattenThunks(thunks: AbstractThunk[]): Iterable<Thunk>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,
|
|
1
|
+
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../src/thunk.ts"],"names":[],"mappings":"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"}
|
package/dist/app/src/thunk.js
CHANGED
|
@@ -1,32 +1,36 @@
|
|
|
1
|
-
import { writable
|
|
2
|
-
import { TaskQueue, ifLet, ensurePlural,
|
|
3
|
-
import {
|
|
4
|
-
import { isStampedEvent, isOwnedEvent, isHashedEvent, isUnwrappedEvent, isSignedEvent, } from "@welshman/util";
|
|
1
|
+
import { writable } from "svelte/store";
|
|
2
|
+
import { append, TaskQueue, ifLet, ensurePlural, remove, defer, sleep, nth, without, } from "@welshman/lib";
|
|
3
|
+
import { isSignedEvent, WRAPPED_KINDS } from "@welshman/util";
|
|
5
4
|
import { publish, PublishStatus, } from "@welshman/net";
|
|
5
|
+
import { Nip59, prep } from "@welshman/signer";
|
|
6
6
|
import { repository, tracker } from "./core.js";
|
|
7
|
-
import { pubkey,
|
|
8
|
-
export const prepEvent = (event) => {
|
|
9
|
-
if (!isStampedEvent(event)) {
|
|
10
|
-
event = stamp(event);
|
|
11
|
-
}
|
|
12
|
-
if (!isOwnedEvent(event)) {
|
|
13
|
-
event = own(event, get(pubkey));
|
|
14
|
-
}
|
|
15
|
-
if (!isHashedEvent(event)) {
|
|
16
|
-
event = hash(event);
|
|
17
|
-
}
|
|
18
|
-
return event;
|
|
19
|
-
};
|
|
7
|
+
import { pubkey, signer, wrapManager } from "./session.js";
|
|
20
8
|
export class Thunk {
|
|
21
9
|
options;
|
|
22
10
|
_subs = [];
|
|
11
|
+
pubkey;
|
|
12
|
+
signer;
|
|
23
13
|
event;
|
|
24
14
|
results = {};
|
|
25
15
|
complete = defer();
|
|
26
16
|
controller = new AbortController();
|
|
17
|
+
wrap;
|
|
27
18
|
constructor(options) {
|
|
28
19
|
this.options = options;
|
|
29
|
-
|
|
20
|
+
if (!options.recipient && WRAPPED_KINDS.includes(options.event.kind)) {
|
|
21
|
+
throw new Error(`Attempted to publish a kind ${options.event.kind} without wrapping it`);
|
|
22
|
+
}
|
|
23
|
+
const $pubkey = pubkey.get();
|
|
24
|
+
if (!$pubkey) {
|
|
25
|
+
throw new Error(`Attempted to publish an event without an active pubkey`);
|
|
26
|
+
}
|
|
27
|
+
const $signer = signer.get();
|
|
28
|
+
if (!$signer) {
|
|
29
|
+
throw new Error(`Attempted to publish an event without an active signer`);
|
|
30
|
+
}
|
|
31
|
+
this.pubkey = $pubkey;
|
|
32
|
+
this.signer = $signer;
|
|
33
|
+
this.event = prep(options.event, this.pubkey);
|
|
30
34
|
for (const relay of options.relays) {
|
|
31
35
|
this.results[relay] = {
|
|
32
36
|
relay,
|
|
@@ -74,37 +78,7 @@ export class Thunk {
|
|
|
74
78
|
this.results[result.relay] = result;
|
|
75
79
|
this._notify();
|
|
76
80
|
};
|
|
77
|
-
async
|
|
78
|
-
let event = this.event;
|
|
79
|
-
// Handle abort immediately if possible
|
|
80
|
-
if (this.controller.signal.aborted)
|
|
81
|
-
return;
|
|
82
|
-
// If we were given a wrapped event, make sure to publish the wrapper, not the rumor
|
|
83
|
-
if (isUnwrappedEvent(event)) {
|
|
84
|
-
event = event.wrap;
|
|
85
|
-
}
|
|
86
|
-
// If the event was already signed, leave it alone. Otherwise, sign it now. This is to
|
|
87
|
-
// decrease apparent latency in the UI that results from waiting for remote signers
|
|
88
|
-
if (!isSignedEvent(event)) {
|
|
89
|
-
const signer = getSigner(getSession(event.pubkey));
|
|
90
|
-
if (!signer) {
|
|
91
|
-
return this._fail(`No signer found for ${event.pubkey}`);
|
|
92
|
-
}
|
|
93
|
-
try {
|
|
94
|
-
event = await signer.sign(event, {
|
|
95
|
-
signal: AbortSignal.timeout(15_000),
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
catch (e) {
|
|
99
|
-
return this._fail(String(e || "Failed to sign event"));
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
// We're guaranteed to have a signed event at this point
|
|
103
|
-
const signedEvent = event;
|
|
104
|
-
// Copy the signature over since we had deferred signing
|
|
105
|
-
ifLet(repository.getEvent(signedEvent.id), savedEvent => {
|
|
106
|
-
savedEvent.sig = signedEvent.sig;
|
|
107
|
-
});
|
|
81
|
+
async _publish(event) {
|
|
108
82
|
// Wait if the thunk is to be delayed
|
|
109
83
|
if (this.options.delay) {
|
|
110
84
|
await sleep(this.options.delay);
|
|
@@ -116,9 +90,9 @@ export class Thunk {
|
|
|
116
90
|
// Send it off
|
|
117
91
|
await publish({
|
|
118
92
|
...this.options,
|
|
119
|
-
event
|
|
93
|
+
event,
|
|
120
94
|
onSuccess: (result) => {
|
|
121
|
-
tracker.track(
|
|
95
|
+
tracker.track(event.id, result.relay);
|
|
122
96
|
this.options.onSuccess?.(result);
|
|
123
97
|
this.results[result.relay] = result;
|
|
124
98
|
this._notify();
|
|
@@ -136,8 +110,55 @@ export class Thunk {
|
|
|
136
110
|
this._subs = [];
|
|
137
111
|
},
|
|
138
112
|
});
|
|
113
|
+
// Notify the caller that we're done
|
|
139
114
|
this.complete.resolve();
|
|
140
115
|
}
|
|
116
|
+
async publish() {
|
|
117
|
+
// Handle abort immediately if possible
|
|
118
|
+
if (this.controller.signal.aborted)
|
|
119
|
+
return;
|
|
120
|
+
const { recipient } = this.options;
|
|
121
|
+
// If we're sending it privately, wrap the event using nip 59
|
|
122
|
+
if (recipient) {
|
|
123
|
+
const nip59 = Nip59.fromSigner(this.signer);
|
|
124
|
+
this.wrap = await nip59.wrap(recipient, this.event);
|
|
125
|
+
wrapManager.add({ recipient, wrap: this.wrap, rumor: this.event });
|
|
126
|
+
return this._publish(this.wrap);
|
|
127
|
+
}
|
|
128
|
+
// If the event has been signed, we're good to go
|
|
129
|
+
if (isSignedEvent(this.event)) {
|
|
130
|
+
return this._publish(this.event);
|
|
131
|
+
}
|
|
132
|
+
// Allow for lazily signing events in order to decrease apparent latency in the UI
|
|
133
|
+
// that results from waiting for remote signers
|
|
134
|
+
try {
|
|
135
|
+
const signedEvent = await this.signer.sign(this.event, {
|
|
136
|
+
signal: AbortSignal.timeout(15_000),
|
|
137
|
+
});
|
|
138
|
+
// Copy the signature over since we deferred signing
|
|
139
|
+
ifLet(repository.getEvent(signedEvent.id), savedEvent => {
|
|
140
|
+
savedEvent.sig = signedEvent.sig;
|
|
141
|
+
});
|
|
142
|
+
return this._publish(signedEvent);
|
|
143
|
+
}
|
|
144
|
+
catch (e) {
|
|
145
|
+
return this._fail(String(e || "Failed to sign event"));
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
enqueue() {
|
|
149
|
+
thunkQueue.push(this);
|
|
150
|
+
repository.publish(this.event);
|
|
151
|
+
thunks.update($thunks => append(this, $thunks));
|
|
152
|
+
this.controller.signal.addEventListener("abort", () => {
|
|
153
|
+
if (this.wrap) {
|
|
154
|
+
wrapManager.remove(this.wrap.id);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
repository.removeEvent(this.event.id);
|
|
158
|
+
}
|
|
159
|
+
thunks.update($thunks => remove(this, $thunks));
|
|
160
|
+
});
|
|
161
|
+
}
|
|
141
162
|
subscribe(subscriber) {
|
|
142
163
|
this._subs.push(subscriber);
|
|
143
164
|
subscriber(this);
|
|
@@ -228,7 +249,7 @@ export const waitForThunkCompletion = (thunk) => new Promise(resolve => {
|
|
|
228
249
|
});
|
|
229
250
|
});
|
|
230
251
|
// Thunk state
|
|
231
|
-
export const thunks = writable(
|
|
252
|
+
export const thunks = writable([]);
|
|
232
253
|
export const thunkQueue = new TaskQueue({
|
|
233
254
|
batchSize: 50,
|
|
234
255
|
processItem: (thunk) => {
|
|
@@ -249,16 +270,12 @@ export function* flattenThunks(thunks) {
|
|
|
249
270
|
}
|
|
250
271
|
export const publishThunk = (options) => {
|
|
251
272
|
const thunk = new Thunk(options);
|
|
252
|
-
|
|
253
|
-
repository.publish(thunk.event);
|
|
254
|
-
thunks.update(assoc(thunk.event.id, thunk));
|
|
273
|
+
thunk.enqueue();
|
|
255
274
|
return thunk;
|
|
256
275
|
};
|
|
257
276
|
export const abortThunk = (thunk) => {
|
|
258
277
|
for (const child of flattenThunks([thunk])) {
|
|
259
278
|
child.controller.abort();
|
|
260
|
-
thunks.update(dissoc(child.event.id));
|
|
261
|
-
repository.removeEvent(child.event.id);
|
|
262
279
|
}
|
|
263
280
|
};
|
|
264
281
|
export const retryThunk = (thunk) => isMergedThunk(thunk)
|