@welshman/app 0.9.0-pre2 → 0.9.0-pre4
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/app.d.ts +6 -2
- package/dist/app/src/app.d.ts.map +1 -1
- package/dist/app/src/app.js +6 -5
- package/dist/app/src/app.js.map +1 -1
- package/dist/app/src/index.d.ts +2 -0
- package/dist/app/src/index.d.ts.map +1 -1
- package/dist/app/src/index.js +2 -0
- package/dist/app/src/index.js.map +1 -1
- package/dist/app/src/plugins/base.d.ts +6 -5
- package/dist/app/src/plugins/base.d.ts.map +1 -1
- package/dist/app/src/plugins/base.js +9 -2
- package/dist/app/src/plugins/base.js.map +1 -1
- package/dist/app/src/plugins/domain.d.ts +5 -4
- package/dist/app/src/plugins/domain.d.ts.map +1 -1
- package/dist/app/src/plugins/domain.js +5 -1
- package/dist/app/src/plugins/domain.js.map +1 -1
- package/dist/app/src/plugins/events.d.ts +31 -0
- package/dist/app/src/plugins/events.d.ts.map +1 -0
- package/dist/app/src/plugins/events.js +64 -0
- package/dist/app/src/plugins/events.js.map +1 -0
- package/dist/app/src/plugins/feeds.d.ts.map +1 -1
- package/dist/app/src/plugins/feeds.js +8 -4
- package/dist/app/src/plugins/feeds.js.map +1 -1
- package/dist/app/src/plugins/logger.d.ts +1 -4
- package/dist/app/src/plugins/logger.d.ts.map +1 -1
- package/dist/app/src/plugins/network.d.ts +2 -0
- package/dist/app/src/plugins/network.d.ts.map +1 -1
- package/dist/app/src/plugins/network.js +14 -3
- package/dist/app/src/plugins/network.js.map +1 -1
- package/dist/app/src/plugins/profiles.d.ts.map +1 -1
- package/dist/app/src/plugins/profiles.js +7 -7
- package/dist/app/src/plugins/profiles.js.map +1 -1
- package/dist/app/src/plugins/reactions.js +4 -4
- package/dist/app/src/plugins/reactions.js.map +1 -1
- package/dist/app/src/plugins/relayRoles.js +1 -1
- package/dist/app/src/plugins/relayRoles.js.map +1 -1
- package/dist/app/src/plugins/relays.d.ts +1 -1
- package/dist/app/src/plugins/relays.js +1 -1
- package/dist/app/src/plugins/roomLists.d.ts +11 -7
- package/dist/app/src/plugins/roomLists.d.ts.map +1 -1
- package/dist/app/src/plugins/roomLists.js +17 -4
- package/dist/app/src/plugins/roomLists.js.map +1 -1
- package/dist/app/src/plugins/roomPins.d.ts +18 -0
- package/dist/app/src/plugins/roomPins.d.ts.map +1 -0
- package/dist/app/src/plugins/roomPins.js +34 -0
- package/dist/app/src/plugins/roomPins.js.map +1 -0
- package/dist/app/src/plugins/rooms.d.ts +24 -10
- package/dist/app/src/plugins/rooms.d.ts.map +1 -1
- package/dist/app/src/plugins/rooms.js +113 -46
- package/dist/app/src/plugins/rooms.js.map +1 -1
- package/dist/app/src/plugins/thunk.d.ts.map +1 -1
- package/dist/app/src/plugins/thunk.js +18 -2
- package/dist/app/src/plugins/thunk.js.map +1 -1
- package/dist/app/src/plugins/wot.d.ts +45 -19
- package/dist/app/src/plugins/wot.d.ts.map +1 -1
- package/dist/app/src/plugins/wot.js +155 -94
- package/dist/app/src/plugins/wot.js.map +1 -1
- package/dist/app/src/plugins/wraps.d.ts.map +1 -1
- package/dist/app/src/plugins/wraps.js +13 -7
- package/dist/app/src/plugins/wraps.js.map +1 -1
- package/dist/app/src/plugins/zappers.d.ts.map +1 -1
- package/dist/app/src/plugins/zappers.js +5 -9
- package/dist/app/src/plugins/zappers.js.map +1 -1
- package/dist/app/src/policy.d.ts.map +1 -1
- package/dist/app/src/policy.js +6 -5
- package/dist/app/src/policy.js.map +1 -1
- package/dist/app/src/user.d.ts +2 -2
- package/dist/app/src/user.d.ts.map +1 -1
- package/dist/app/src/user.js +1 -1
- package/dist/app/src/user.js.map +1 -1
- package/dist/domain/src/core/EventReader.d.ts +30 -3
- package/dist/domain/src/core/EventReader.d.ts.map +1 -1
- package/dist/domain/src/core/EventReader.js +24 -3
- package/dist/domain/src/core/EventReader.js.map +1 -1
- package/dist/domain/src/core/EventWriter.d.ts +6 -6
- package/dist/domain/src/core/EventWriter.d.ts.map +1 -1
- package/dist/domain/src/core/EventWriter.js +12 -12
- package/dist/domain/src/core/EventWriter.js.map +1 -1
- package/dist/domain/src/core/Kind.d.ts +5 -5
- package/dist/domain/src/core/Kind.d.ts.map +1 -1
- package/dist/domain/src/core/Kind.js +4 -6
- package/dist/domain/src/core/Kind.js.map +1 -1
- package/dist/domain/src/core/ListReader.d.ts +3 -3
- package/dist/domain/src/core/ListReader.d.ts.map +1 -1
- package/dist/domain/src/core/ListReader.js +3 -2
- package/dist/domain/src/core/ListReader.js.map +1 -1
- package/dist/domain/src/index.d.ts +3 -1
- package/dist/domain/src/index.d.ts.map +1 -1
- package/dist/domain/src/index.js +3 -1
- package/dist/domain/src/index.js.map +1 -1
- package/dist/domain/src/kinds/AppData.d.ts +3 -3
- package/dist/domain/src/kinds/AppData.d.ts.map +1 -1
- package/dist/domain/src/kinds/AppData.js +5 -4
- package/dist/domain/src/kinds/AppData.js.map +1 -1
- package/dist/domain/src/kinds/CommunityList.d.ts +12 -0
- package/dist/domain/src/kinds/CommunityList.d.ts.map +1 -0
- package/dist/domain/src/kinds/{GroupList.js → CommunityList.js} +10 -9
- package/dist/domain/src/kinds/CommunityList.js.map +1 -0
- package/dist/domain/src/kinds/Delete.d.ts +1 -1
- package/dist/domain/src/kinds/Delete.d.ts.map +1 -1
- package/dist/domain/src/kinds/Delete.js +7 -7
- package/dist/domain/src/kinds/Delete.js.map +1 -1
- package/dist/domain/src/kinds/Handler.d.ts +1 -1
- package/dist/domain/src/kinds/Handler.d.ts.map +1 -1
- package/dist/domain/src/kinds/Handler.js +2 -1
- package/dist/domain/src/kinds/Handler.js.map +1 -1
- package/dist/domain/src/kinds/Profile.d.ts +1 -1
- package/dist/domain/src/kinds/Profile.d.ts.map +1 -1
- package/dist/domain/src/kinds/Profile.js +2 -1
- package/dist/domain/src/kinds/Profile.js.map +1 -1
- package/dist/domain/src/kinds/RoomCreate.js +2 -2
- package/dist/domain/src/kinds/RoomCreate.js.map +1 -1
- package/dist/domain/src/kinds/RoomDelete.js +3 -3
- package/dist/domain/src/kinds/RoomDelete.js.map +1 -1
- package/dist/domain/src/kinds/RoomEdit.js +3 -3
- package/dist/domain/src/kinds/RoomEdit.js.map +1 -1
- package/dist/domain/src/kinds/RoomJoin.js +2 -2
- package/dist/domain/src/kinds/RoomJoin.js.map +1 -1
- package/dist/domain/src/kinds/RoomLeave.js +3 -3
- package/dist/domain/src/kinds/RoomLeave.js.map +1 -1
- package/dist/domain/src/kinds/RoomList.d.ts +7 -5
- package/dist/domain/src/kinds/RoomList.d.ts.map +1 -1
- package/dist/domain/src/kinds/RoomList.js +44 -16
- package/dist/domain/src/kinds/RoomList.js.map +1 -1
- package/dist/domain/src/kinds/RoomPins.d.ts +15 -0
- package/dist/domain/src/kinds/RoomPins.d.ts.map +1 -0
- package/dist/domain/src/kinds/RoomPins.js +34 -0
- package/dist/domain/src/kinds/RoomPins.js.map +1 -0
- package/dist/domain/src/kinds/RoomUpdatePins.d.ts +15 -0
- package/dist/domain/src/kinds/RoomUpdatePins.d.ts.map +1 -0
- package/dist/domain/src/kinds/RoomUpdatePins.js +38 -0
- package/dist/domain/src/kinds/RoomUpdatePins.js.map +1 -0
- package/dist/domain/src/kinds/ZapGoal.d.ts +5 -0
- package/dist/domain/src/kinds/ZapGoal.d.ts.map +1 -1
- package/dist/domain/src/kinds/ZapGoal.js +29 -4
- package/dist/domain/src/kinds/ZapGoal.js.map +1 -1
- package/dist/domain/src/kinds/ZapReceipt.d.ts +1 -1
- package/dist/domain/src/kinds/ZapReceipt.d.ts.map +1 -1
- package/dist/domain/src/kinds/ZapReceipt.js +2 -1
- package/dist/domain/src/kinds/ZapReceipt.js.map +1 -1
- package/dist/lib/src/LRUCache.d.ts +0 -1
- package/dist/lib/src/LRUCache.d.ts.map +1 -1
- package/dist/lib/src/LRUCache.js +9 -10
- package/dist/lib/src/LRUCache.js.map +1 -1
- package/dist/lib/src/Tools.js +1 -1
- package/dist/lib/src/Tools.js.map +1 -1
- package/dist/net/src/auth.d.ts.map +1 -1
- package/dist/net/src/auth.js +2 -2
- package/dist/net/src/auth.js.map +1 -1
- package/dist/net/src/publish.d.ts.map +1 -1
- package/dist/net/src/publish.js +13 -0
- package/dist/net/src/publish.js.map +1 -1
- package/dist/net/src/request.d.ts +1 -2
- package/dist/net/src/request.d.ts.map +1 -1
- package/dist/net/src/request.js +16 -2
- package/dist/net/src/request.js.map +1 -1
- package/dist/signer/src/nip59.d.ts +1 -1
- package/dist/signer/src/nip59.d.ts.map +1 -1
- package/dist/signer/src/nip59.js +26 -30
- package/dist/signer/src/nip59.js.map +1 -1
- package/dist/signer/src/signers/nip07.d.ts.map +1 -1
- package/dist/signer/src/signers/nip07.js +19 -5
- package/dist/signer/src/signers/nip07.js.map +1 -1
- package/dist/signer/src/signers/nip55.d.ts +46 -6
- package/dist/signer/src/signers/nip55.d.ts.map +1 -1
- package/dist/signer/src/signers/nip55.js +53 -54
- package/dist/signer/src/signers/nip55.js.map +1 -1
- package/dist/signer/src/util.d.ts +2 -2
- package/dist/signer/src/util.d.ts.map +1 -1
- package/dist/signer/src/util.js +2 -6
- package/dist/signer/src/util.js.map +1 -1
- package/dist/store/src/misc.d.ts +4 -2
- package/dist/store/src/misc.d.ts.map +1 -1
- package/dist/store/src/misc.js +2 -4
- package/dist/store/src/misc.js.map +1 -1
- package/dist/store/src/repository.d.ts.map +1 -1
- package/dist/store/src/repository.js +44 -19
- package/dist/store/src/repository.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/util/src/Kinds.d.ts +2 -0
- package/dist/util/src/Kinds.d.ts.map +1 -1
- package/dist/util/src/Kinds.js +2 -0
- package/dist/util/src/Kinds.js.map +1 -1
- package/package.json +18 -18
- package/dist/domain/src/kinds/GroupList.d.ts +0 -12
- package/dist/domain/src/kinds/GroupList.d.ts.map +0 -1
- package/dist/domain/src/kinds/GroupList.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../../src/plugins/profiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAC,GAAG,EAAE,GAAG,EAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../../src/plugins/profiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,12 @@ export class Reactions {
|
|
|
13
13
|
}
|
|
14
14
|
react = async (event, content, fn) => {
|
|
15
15
|
const writer = this.app.use(Domain).writer(Reaction).setContent(content).setEvent(event);
|
|
16
|
-
// A reaction to a NIP-29
|
|
16
|
+
// A reaction to a NIP-29 room message goes to the room's relay — where the
|
|
17
17
|
// target event lives (per the tracker).
|
|
18
|
-
const
|
|
18
|
+
const room = tagValue(tagSpec("h"), event.tags);
|
|
19
19
|
const [url] = this.app.tracker.getRelays(event.id);
|
|
20
|
-
if (
|
|
21
|
-
writer.
|
|
20
|
+
if (room && url)
|
|
21
|
+
writer.setRoom(url, room);
|
|
22
22
|
fn?.(writer);
|
|
23
23
|
return this.app.use(Domain).command(writer);
|
|
24
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reactions.js","sourceRoot":"","sources":["../../../../src/plugins/reactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAC,QAAQ,EAAiB,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAIlC;;;;GAIG;AACH,MAAM,OAAO,SAAS;IACC;IAArB,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;IAAG,CAAC;IAElC,KAAK,GAAG,KAAK,EACX,KAAmB,EACnB,OAAe,EACf,EAAqC,EACnB,EAAE;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAExF,
|
|
1
|
+
{"version":3,"file":"reactions.js","sourceRoot":"","sources":["../../../../src/plugins/reactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAC,QAAQ,EAAiB,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAIlC;;;;GAIG;AACH,MAAM,OAAO,SAAS;IACC;IAArB,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;IAAG,CAAC;IAElC,KAAK,GAAG,KAAK,EACX,KAAmB,EACnB,OAAe,EACf,EAAqC,EACnB,EAAE;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAExF,2EAA2E;QAC3E,wCAAwC;QACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAElD,IAAI,IAAI,IAAI,GAAG;YAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAE1C,EAAE,EAAE,CAAC,MAAM,CAAC,CAAA;QAEZ,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,CAAC,CAAA;CACF"}
|
|
@@ -6,7 +6,7 @@ import { RelaySignedDerivedPlugin } from "./relays.js";
|
|
|
6
6
|
import { Network } from "./network.js";
|
|
7
7
|
// Flotilla kind-33534 relay roles are addressable (d = role id) and published
|
|
8
8
|
// by a relay's self key, so key them by `${url}|${d}` — the `|` separator keeps
|
|
9
|
-
// them distinct from the `'`-separated
|
|
9
|
+
// them distinct from the `'`-separated room keys and never appears in a url.
|
|
10
10
|
export const makeRelayRoleKey = (url, d) => `${url}|${d}`;
|
|
11
11
|
export const splitRelayRoleKey = (key) => {
|
|
12
12
|
const i = key.indexOf("|");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRoles.js","sourceRoot":"","sources":["../../../../src/plugins/relayRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAC,SAAS,EAAkB,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAErC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AAGpC,8EAA8E;AAC9E,gFAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"relayRoles.js","sourceRoot":"","sources":["../../../../src/plugins/relayRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAC,SAAS,EAAkB,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAErC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AAGpC,8EAA8E;AAC9E,gFAAgF;AAChF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAA;AAEzE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAoB,EAAE;IACjE,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAE1B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC5C,CAAC,CAAA;AAED,oEAAoE;AACpE,MAAM,OAAO,UAAW,SAAQ,wBAAyC;IACvE,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,UAAU,CAAC,EAAC,CAAC;YAChC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;SACtE,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAW;QACf,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAEvC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAA;IACjG,CAAC;IAED,MAAM,GAAG,CAAC,GAAW,EAAiC,EAAE,CACtD,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAC9B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;SAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAC3B,CAAA;IAEH,OAAO,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;CACzE"}
|
|
@@ -22,7 +22,7 @@ export type RelaySignedItem = {
|
|
|
22
22
|
* A `RelayScopedDerivedPlugin` that additionally validates provenance: an item
|
|
23
23
|
* is only keyed on a relay when the relay ITSELF signed it — i.e. the event's
|
|
24
24
|
* author matches the relay's NIP-11 `self` pubkey. This is the trust model for
|
|
25
|
-
* relay-hosted, relay-signed content (NIP-29
|
|
25
|
+
* relay-hosted, relay-signed content (NIP-29 room state, relay membership and
|
|
26
26
|
* roles), and rejects events of these kinds forged by other pubkeys.
|
|
27
27
|
*
|
|
28
28
|
* Relay self pubkeys load from NIP-11 and can arrive after the events, so the
|
|
@@ -50,7 +50,7 @@ export class Relays extends LoadableMapPlugin {
|
|
|
50
50
|
* A `RelayScopedDerivedPlugin` that additionally validates provenance: an item
|
|
51
51
|
* is only keyed on a relay when the relay ITSELF signed it — i.e. the event's
|
|
52
52
|
* author matches the relay's NIP-11 `self` pubkey. This is the trust model for
|
|
53
|
-
* relay-hosted, relay-signed content (NIP-29
|
|
53
|
+
* relay-hosted, relay-signed content (NIP-29 room state, relay membership and
|
|
54
54
|
* roles), and rejects events of these kinds forged by other pubkeys.
|
|
55
55
|
*
|
|
56
56
|
* Relay self pubkeys load from NIP-11 and can arrive after the events, so the
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import type { Maybe } from "@welshman/lib";
|
|
1
2
|
import { RoomListReader, RoomListWriter } from "@welshman/domain";
|
|
3
|
+
import type { Command } from "../command.js";
|
|
2
4
|
import { DerivedPlugin } from "./base.js";
|
|
3
5
|
import type { Projection } from "./base.js";
|
|
4
6
|
import type { IApp } from "../app.js";
|
|
5
7
|
/**
|
|
6
|
-
* NIP-51 kind-10009 room lists (relays the user belongs to, and
|
|
8
|
+
* NIP-51 kind-10009 room lists (relays the user belongs to, and the rooms on
|
|
7
9
|
* them), keyed by pubkey. Loaded via the outbox model (the author's write
|
|
8
10
|
* relays), so it depends on the relay-list collection.
|
|
9
11
|
*/
|
|
@@ -11,12 +13,14 @@ export declare class RoomLists extends DerivedPlugin<RoomListReader> {
|
|
|
11
13
|
constructor(app: IApp);
|
|
12
14
|
fetch(pubkey: string, relayHints?: string[]): Promise<import("@welshman/util").TrustedEvent | undefined>;
|
|
13
15
|
urls: (pubkey: string) => Projection<string[]>;
|
|
14
|
-
|
|
16
|
+
roomsForUrl: (pubkey: string, url: string) => Projection<string[]>;
|
|
15
17
|
pubkeysForUrl: (url: string) => Projection<string[]>;
|
|
16
|
-
update: (fn: (writer: RoomListWriter) => void) => Promise<
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
addRelay: (url: string) => Promise<
|
|
20
|
-
removeRelay: (url: string) => Promise<
|
|
18
|
+
update: (fn: (writer: RoomListWriter) => void) => Promise<Command>;
|
|
19
|
+
addRoom: (roomId: string, url: string) => Promise<Command>;
|
|
20
|
+
removeRoom: (roomId: string, url?: string) => Promise<Command>;
|
|
21
|
+
addRelay: (url: string) => Promise<Command>;
|
|
22
|
+
removeRelay: (url: string) => Promise<Command>;
|
|
23
|
+
setRelays: (urls: string[]) => Promise<Command>;
|
|
24
|
+
migrateRelay: (oldUrl: string, newUrl: string) => Promise<Maybe<Command>>;
|
|
21
25
|
}
|
|
22
26
|
//# sourceMappingURL=roomLists.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roomLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/roomLists.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"roomLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/roomLists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,EAAW,cAAc,EAAE,cAAc,EAAC,MAAM,kBAAkB,CAAA;AACzE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAc,MAAM,WAAW,CAAA;AACpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,aAAa,CAAC,cAAc,CAAC;gBAC9C,GAAG,EAAE,IAAI;IAQrB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,GAAE,MAAM,EAAO;IAI/C,IAAI,GAAI,QAAQ,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAoD;IAEjG,WAAW,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CACL;IAE5D,aAAa,GAAI,KAAK,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAGhD;IAEH,MAAM,GAAU,IAAI,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,sBAOnD;IAED,OAAO,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,sBAAuD;IAE7F,UAAU,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,sBACa;IAEvD,QAAQ,GAAI,KAAK,MAAM,sBAAgD;IAEvE,WAAW,GAAI,KAAK,MAAM,sBAAmD;IAE7E,SAAS,GAAI,MAAM,MAAM,EAAE,sBAAkD;IAI7E,YAAY,GAAU,QAAQ,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAW7E;CACF"}
|
|
@@ -5,7 +5,7 @@ import { Network } from "./network.js";
|
|
|
5
5
|
import { Domain } from "./domain.js";
|
|
6
6
|
import { User } from "../user.js";
|
|
7
7
|
/**
|
|
8
|
-
* NIP-51 kind-10009 room lists (relays the user belongs to, and
|
|
8
|
+
* NIP-51 kind-10009 room lists (relays the user belongs to, and the rooms on
|
|
9
9
|
* them), keyed by pubkey. Loaded via the outbox model (the author's write
|
|
10
10
|
* relays), so it depends on the relay-list collection.
|
|
11
11
|
*/
|
|
@@ -21,7 +21,7 @@ export class RoomLists extends DerivedPlugin {
|
|
|
21
21
|
return this.app.use(Network).loadUsingOutbox(pubkey, { kinds: [ROOMS] }, relayHints);
|
|
22
22
|
}
|
|
23
23
|
urls = (pubkey) => this.project(pubkey, list => list?.urls() ?? []);
|
|
24
|
-
|
|
24
|
+
roomsForUrl = (pubkey, url) => this.project(pubkey, list => list?.roomsForUrl(url) ?? []);
|
|
25
25
|
pubkeysForUrl = (url) => projectFrom(this.all, lists => lists.filter(list => list.urls().includes(normalizeRelayUrl(url))).map(list => list.author()));
|
|
26
26
|
update = async (fn) => {
|
|
27
27
|
const user = User.require(this.app);
|
|
@@ -29,9 +29,22 @@ export class RoomLists extends DerivedPlugin {
|
|
|
29
29
|
fn(writer);
|
|
30
30
|
return this.app.use(Domain).command(writer);
|
|
31
31
|
};
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
addRoom = (roomId, url) => this.update(writer => writer.addRoom(roomId, url));
|
|
33
|
+
removeRoom = (roomId, url) => this.update(writer => writer.removeRoom(roomId, url));
|
|
34
34
|
addRelay = (url) => this.update(writer => writer.addRelay(url));
|
|
35
35
|
removeRelay = (url) => this.update(writer => writer.removeRelay(url));
|
|
36
|
+
setRelays = (urls) => this.update(writer => writer.setRelays(urls));
|
|
37
|
+
// Point every reference to a relay at its new url. Resolves to undefined when there's
|
|
38
|
+
// nothing to do, so a no-op migration doesn't publish.
|
|
39
|
+
migrateRelay = async (oldUrl, newUrl) => {
|
|
40
|
+
const from = normalizeRelayUrl(oldUrl);
|
|
41
|
+
const to = normalizeRelayUrl(newUrl);
|
|
42
|
+
if (from === to)
|
|
43
|
+
return undefined;
|
|
44
|
+
const user = User.require(this.app);
|
|
45
|
+
if (!this.get(user.pubkey)?.urls().includes(from))
|
|
46
|
+
return undefined;
|
|
47
|
+
return this.update(writer => writer.migrateRelay(from, to));
|
|
48
|
+
};
|
|
36
49
|
}
|
|
37
50
|
//# sourceMappingURL=roomLists.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roomLists.js","sourceRoot":"","sources":["../../../../src/plugins/roomLists.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"roomLists.js","sourceRoot":"","sources":["../../../../src/plugins/roomLists.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { RoomPinsReader } from "@welshman/domain";
|
|
2
|
+
import type { Projection } from "./base.js";
|
|
3
|
+
import { RelaySignedDerivedPlugin } from "./relays.js";
|
|
4
|
+
import type { IApp } from "../app.js";
|
|
5
|
+
/**
|
|
6
|
+
* NIP-29 kind-39005 room pin lists, keyed by `${url}'${h}` like the rest of a room's state.
|
|
7
|
+
* The relay authors the list, so only its own signature counts; clients ask for a change with
|
|
8
|
+
* a kind-9010 op and the relay republishes the list.
|
|
9
|
+
*/
|
|
10
|
+
export declare class RoomPinLists extends RelaySignedDerivedPlugin<RoomPinsReader> {
|
|
11
|
+
constructor(app: IApp);
|
|
12
|
+
fetch(key: string, signal?: AbortSignal): Promise<import("@welshman/util").TrustedEvent[]>;
|
|
13
|
+
forRoom: (url: string, h: string) => import("svelte/store").Readable<import("@welshman/lib").Maybe<RoomPinsReader>>;
|
|
14
|
+
loadForRoom: (url: string, h: string, signal?: AbortSignal) => Promise<import("@welshman/lib").Maybe<RoomPinsReader>>;
|
|
15
|
+
pins: (url: string, h: string) => Projection<string[]>;
|
|
16
|
+
setPins: (url: string, h: string, idsOrAddresses: string[]) => Promise<import("../command.js").Command>;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=roomPins.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"roomPins.d.ts","sourceRoot":"","sources":["../../../../src/plugins/roomPins.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAEzE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAGzC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AAEpD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,wBAAwB,CAAC,cAAc,CAAC;gBAC5D,GAAG,EAAE,IAAI;IAQrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAQvC,OAAO,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,oFAAkC;IAEnE,WAAW,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,EAAE,SAAS,WAAW,4DACd;IAE7C,IAAI,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAC2B;IAEhF,OAAO,GAAI,KAAK,MAAM,EAAE,GAAG,MAAM,EAAE,gBAAgB,MAAM,EAAE,8CAGsC;CAClG"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ROOM_PINS } from "@welshman/util";
|
|
2
|
+
import { RoomPins, RoomUpdatePins } from "@welshman/domain";
|
|
3
|
+
import { projectFrom } from "./base.js";
|
|
4
|
+
import { Domain } from "./domain.js";
|
|
5
|
+
import { Network } from "./network.js";
|
|
6
|
+
import { RelaySignedDerivedPlugin } from "./relays.js";
|
|
7
|
+
import { makeRoomKey, splitRoomKey } from "./rooms.js";
|
|
8
|
+
/**
|
|
9
|
+
* NIP-29 kind-39005 room pin lists, keyed by `${url}'${h}` like the rest of a room's state.
|
|
10
|
+
* The relay authors the list, so only its own signature counts; clients ask for a change with
|
|
11
|
+
* a kind-9010 op and the relay republishes the list.
|
|
12
|
+
*/
|
|
13
|
+
export class RoomPinLists extends RelaySignedDerivedPlugin {
|
|
14
|
+
constructor(app) {
|
|
15
|
+
super(app, {
|
|
16
|
+
filters: [{ kinds: [ROOM_PINS] }],
|
|
17
|
+
eventToItem: app.use(Domain).reader(RoomPins),
|
|
18
|
+
getKey: (pins, url) => makeRoomKey(url, pins.identifier() ?? ""),
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
fetch(key, signal) {
|
|
22
|
+
const [url, h] = splitRoomKey(key);
|
|
23
|
+
return this.app
|
|
24
|
+
.use(Network)
|
|
25
|
+
.load({ relays: [url], signal, filters: [{ kinds: [ROOM_PINS], "#d": [h] }] });
|
|
26
|
+
}
|
|
27
|
+
forRoom = (url, h) => this.one(makeRoomKey(url, h));
|
|
28
|
+
loadForRoom = (url, h, signal) => this.forceLoad(makeRoomKey(url, h), signal);
|
|
29
|
+
pins = (url, h) => projectFrom(this.index, byKey => byKey.get(makeRoomKey(url, h))?.pins() ?? []);
|
|
30
|
+
setPins = (url, h, idsOrAddresses) => this.app
|
|
31
|
+
.use(Domain)
|
|
32
|
+
.command(this.app.use(Domain).writer(RoomUpdatePins).setRoom(url, h).setPins(idsOrAddresses));
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=roomPins.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"roomPins.js","sourceRoot":"","sources":["../../../../src/plugins/roomPins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAC,QAAQ,EAAkB,cAAc,EAAC,MAAM,kBAAkB,CAAA;AACzE,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAErC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AACpC,OAAO,EAAC,wBAAwB,EAAC,MAAM,aAAa,CAAA;AACpD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,YAAY,CAAA;AAGpD;;;;GAIG;AACH,MAAM,OAAO,YAAa,SAAQ,wBAAwC;IACxE,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC;YAC/B,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;SACjE,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAoB;QACrC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QAElC,OAAO,IAAI,CAAC,GAAG;aACZ,GAAG,CAAC,OAAO,CAAC;aACZ,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAA;IAC9E,CAAC;IAED,OAAO,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IAEnE,WAAW,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,MAAoB,EAAE,EAAE,CAC7D,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAE7C,IAAI,GAAG,CAAC,GAAW,EAAE,CAAS,EAAwB,EAAE,CACtD,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAEhF,OAAO,GAAG,CAAC,GAAW,EAAE,CAAS,EAAE,cAAwB,EAAE,EAAE,CAC7D,IAAI,CAAC,GAAG;SACL,GAAG,CAAC,MAAM,CAAC;SACX,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAA;CAClG"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import type { Readable } from "svelte/store";
|
|
2
|
+
import type { Maybe } from "@welshman/lib";
|
|
3
|
+
import type { ItemsByKey } from "@welshman/store";
|
|
1
4
|
import { RoomMetaReader, RoomMembersReader, RoomAdminsReader } from "@welshman/domain";
|
|
2
|
-
import { LoadableMapPlugin } from "./base.js";
|
|
3
5
|
import type { Projection } from "./base.js";
|
|
4
|
-
|
|
5
|
-
export declare const
|
|
6
|
+
import type { IApp } from "../app.js";
|
|
7
|
+
export declare const makeRoomKey: (url: string, room: string) => string;
|
|
8
|
+
export declare const splitRoomKey: (key: string) => [string, string];
|
|
6
9
|
export type Room = {
|
|
7
10
|
h: string;
|
|
8
11
|
id: string;
|
|
@@ -24,15 +27,26 @@ export type RoomMeta = {
|
|
|
24
27
|
livekit?: boolean;
|
|
25
28
|
};
|
|
26
29
|
/**
|
|
27
|
-
* NIP-29 relay-based
|
|
28
|
-
*
|
|
30
|
+
* NIP-29 relay-based rooms. A `${url}'${h}`-keyed collection whose values bundle
|
|
31
|
+
* a room's metadata, members, and admins, derived from the repository so a space
|
|
32
|
+
* can be enumerated without loading each room by id. Also owns room management.
|
|
29
33
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
34
|
+
* Rooms a kind-9008 delete supersedes are dropped, so a tombstoned room stops
|
|
35
|
+
* appearing without the caller having to filter.
|
|
32
36
|
*/
|
|
33
|
-
export declare class Rooms
|
|
34
|
-
|
|
35
|
-
|
|
37
|
+
export declare class Rooms {
|
|
38
|
+
protected readonly app: IApp;
|
|
39
|
+
index: Projection<ItemsByKey<Room>>;
|
|
40
|
+
all: Projection<Room[]>;
|
|
41
|
+
byUrl: Projection<Map<string, Room[]>>;
|
|
42
|
+
one: (key?: string, ...args: any[]) => Readable<Maybe<Room>>;
|
|
43
|
+
load: (key: string, ...args: any[]) => Promise<Maybe<Room>>;
|
|
44
|
+
forceLoad: (key: string, ...args: any[]) => Promise<Maybe<Room>>;
|
|
45
|
+
constructor(app: IApp);
|
|
46
|
+
fetch: (id: string) => Promise<import("@welshman/util").TrustedEvent[]>;
|
|
47
|
+
get: (key: string) => Room | undefined;
|
|
48
|
+
project: <U>(key: string, read: (item: Maybe<Room>) => U) => Projection<U>;
|
|
49
|
+
forRoom: (url: string, h: string) => Readable<Maybe<Room>>;
|
|
36
50
|
forUrl: (url: string) => Projection<Room[]>;
|
|
37
51
|
createRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
|
|
38
52
|
deleteRoom: (url: string, room: RoomMeta) => Promise<import("../command.js").Command>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rooms.d.ts","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,61 +1,128 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { derived } from "svelte/store";
|
|
2
|
+
import { gte, max, pushToMapKey } from "@welshman/lib";
|
|
3
|
+
import { ROOM_META, ROOM_MEMBERS, ROOM_ADMINS, ROOM_DELETE, tagSpec, tagValues } from "@welshman/util";
|
|
4
|
+
import { deriveEventsByIdByUrl, deriveItems, deriveItemsByKeyByUrl, makeDeriveItem, makeForceLoadItem, makeLoadItem, } from "@welshman/store";
|
|
3
5
|
import { RoomCreate, RoomDelete, RoomEdit, RoomJoin, RoomLeave, RoomAddMember, RoomRemoveMember, RoomMeta as RoomMetaKind, RoomMembers, RoomAdmins, } from "@welshman/domain";
|
|
4
|
-
import {
|
|
6
|
+
import { projection, projectFrom } from "./base.js";
|
|
5
7
|
import { Domain } from "./domain.js";
|
|
6
8
|
import { Network } from "./network.js";
|
|
7
9
|
import { Relays } from "./relays.js";
|
|
8
|
-
// NIP-29
|
|
9
|
-
// on a specific relay, so the same
|
|
10
|
-
// relays. Key it by `${url}'${
|
|
10
|
+
// NIP-29 room metadata (kinds 39000–39002) is addressable per room but hosted
|
|
11
|
+
// on a specific relay, so the same room id can exist independently on many
|
|
12
|
+
// relays. Key it by `${url}'${room}` (the `'` separator matches flotilla's
|
|
11
13
|
// room-id convention; relay urls never contain it).
|
|
12
|
-
export const
|
|
13
|
-
export const
|
|
14
|
+
export const makeRoomKey = (url, room) => `${url}'${room}`;
|
|
15
|
+
export const splitRoomKey = (key) => {
|
|
14
16
|
const i = key.indexOf("'");
|
|
15
17
|
return [key.slice(0, i), key.slice(i + 1)];
|
|
16
18
|
};
|
|
19
|
+
// One room-state kind, keyed per relay. The three kinds are authored by the
|
|
20
|
+
// relay itself, so an event only counts when its author matches the relay's
|
|
21
|
+
// NIP-11 `self` pubkey — that rejects room state forged by other pubkeys.
|
|
22
|
+
// Self pubkeys load from NIP-11 and can arrive after the events, so this
|
|
23
|
+
// re-evaluates whenever the relay-profile collection changes.
|
|
24
|
+
const deriveRoomState = (app, kind, eventToItem) => deriveItemsByKeyByUrl({
|
|
25
|
+
filters: [{ kinds: [kind] }],
|
|
26
|
+
eventToItem,
|
|
27
|
+
getKey: (item, url) => item.author() === app.use(Relays).get(url)?.self
|
|
28
|
+
? makeRoomKey(url, item.identifier() ?? "")
|
|
29
|
+
: undefined,
|
|
30
|
+
revalidateOn: app.use(Relays).index.$,
|
|
31
|
+
tracker: app.tracker,
|
|
32
|
+
repository: app.repository,
|
|
33
|
+
});
|
|
17
34
|
/**
|
|
18
|
-
* NIP-29 relay-based
|
|
19
|
-
*
|
|
35
|
+
* NIP-29 relay-based rooms. A `${url}'${h}`-keyed collection whose values bundle
|
|
36
|
+
* a room's metadata, members, and admins, derived from the repository so a space
|
|
37
|
+
* can be enumerated without loading each room by id. Also owns room management.
|
|
20
38
|
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
39
|
+
* Rooms a kind-9008 delete supersedes are dropped, so a tombstoned room stops
|
|
40
|
+
* appearing without the caller having to filter.
|
|
23
41
|
*/
|
|
24
|
-
export class Rooms
|
|
42
|
+
export class Rooms {
|
|
43
|
+
app;
|
|
44
|
+
index;
|
|
45
|
+
all;
|
|
46
|
+
byUrl;
|
|
47
|
+
one;
|
|
48
|
+
load;
|
|
49
|
+
forceLoad;
|
|
50
|
+
constructor(app) {
|
|
51
|
+
this.app = app;
|
|
52
|
+
// Deletes are moderation ops rather than relay-signed room state, so they
|
|
53
|
+
// aren't self-checked, and one event can tombstone several rooms at once.
|
|
54
|
+
// Keep the newest per room, since a room can be re-created after a delete.
|
|
55
|
+
const deletedAt = derived(deriveEventsByIdByUrl({
|
|
56
|
+
filters: [{ kinds: [ROOM_DELETE] }],
|
|
57
|
+
tracker: app.tracker,
|
|
58
|
+
repository: app.repository,
|
|
59
|
+
}), $eventsByIdByUrl => {
|
|
60
|
+
const result = new Map();
|
|
61
|
+
for (const [url, eventsById] of $eventsByIdByUrl) {
|
|
62
|
+
for (const event of eventsById.values()) {
|
|
63
|
+
for (const h of tagValues(tagSpec("h"), event.tags)) {
|
|
64
|
+
const key = makeRoomKey(url, h);
|
|
65
|
+
result.set(key, max([result.get(key), event.created_at]));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return result;
|
|
70
|
+
});
|
|
71
|
+
const index = derived([
|
|
72
|
+
deriveRoomState(app, ROOM_META, app.use(Domain).reader(RoomMetaKind)),
|
|
73
|
+
deriveRoomState(app, ROOM_MEMBERS, app.use(Domain).reader(RoomMembers)),
|
|
74
|
+
deriveRoomState(app, ROOM_ADMINS, app.use(Domain).reader(RoomAdmins)),
|
|
75
|
+
deletedAt,
|
|
76
|
+
], ([$metas, $members, $admins, $deletedAt]) => {
|
|
77
|
+
const result = new Map();
|
|
78
|
+
for (const id of new Set([...$metas.keys(), ...$members.keys(), ...$admins.keys()])) {
|
|
79
|
+
const meta = $metas.get(id);
|
|
80
|
+
const members = $members.get(id);
|
|
81
|
+
const admins = $admins.get(id);
|
|
82
|
+
const createdAt = max([meta?.createdAt(), members?.createdAt(), admins?.createdAt()]);
|
|
83
|
+
if (gte($deletedAt.get(id), createdAt))
|
|
84
|
+
continue;
|
|
85
|
+
const [url, h] = splitRoomKey(id);
|
|
86
|
+
result.set(id, { id, url, h, meta, members, admins });
|
|
87
|
+
}
|
|
88
|
+
return result;
|
|
89
|
+
});
|
|
90
|
+
this.index = projection(index);
|
|
91
|
+
this.all = projection(deriveItems(index));
|
|
92
|
+
this.byUrl = projectFrom(this.index, byKey => {
|
|
93
|
+
const result = new Map();
|
|
94
|
+
for (const room of byKey.values()) {
|
|
95
|
+
pushToMapKey(result, room.url, room);
|
|
96
|
+
}
|
|
97
|
+
return result;
|
|
98
|
+
});
|
|
99
|
+
const fetch = (key) => this.fetch(key);
|
|
100
|
+
const read = (key) => this.index.get().get(key);
|
|
101
|
+
this.load = makeLoadItem(fetch, read);
|
|
102
|
+
this.forceLoad = makeForceLoadItem(fetch, read);
|
|
103
|
+
this.one = makeDeriveItem(index, this.load);
|
|
104
|
+
}
|
|
105
|
+
// The relay's `self` pubkey gates every room-state event, so load the relay
|
|
106
|
+
// profile before the events that depend on it.
|
|
25
107
|
fetch = async (id) => {
|
|
26
|
-
const [url, h] =
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
await this.app.use(Network).load({
|
|
108
|
+
const [url, h] = splitRoomKey(id);
|
|
109
|
+
await this.app.use(Relays).load(url);
|
|
110
|
+
return this.app.use(Network).load({
|
|
30
111
|
relays: [url],
|
|
31
|
-
filters: [
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (event.kind === ROOM_META && gt(event.created_at, room.meta?.createdAt())) {
|
|
36
|
-
room.meta = await this.app.use(Domain).reader(RoomMetaKind)(event);
|
|
37
|
-
this.set(id, room);
|
|
38
|
-
}
|
|
39
|
-
else if (event.kind === ROOM_MEMBERS && gt(event.created_at, room.members?.createdAt())) {
|
|
40
|
-
room.members = await this.app.use(Domain).reader(RoomMembers)(event);
|
|
41
|
-
this.set(id, room);
|
|
42
|
-
}
|
|
43
|
-
else if (event.kind === ROOM_ADMINS && gt(event.created_at, room.admins?.createdAt())) {
|
|
44
|
-
room.admins = await this.app.use(Domain).reader(RoomAdmins)(event);
|
|
45
|
-
this.set(id, room);
|
|
46
|
-
}
|
|
47
|
-
},
|
|
112
|
+
filters: [
|
|
113
|
+
{ kinds: [ROOM_META, ROOM_MEMBERS, ROOM_ADMINS], "#d": [h] },
|
|
114
|
+
{ kinds: [ROOM_DELETE], "#h": [h] },
|
|
115
|
+
],
|
|
48
116
|
});
|
|
49
|
-
return room;
|
|
50
117
|
};
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
createRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomCreate).
|
|
56
|
-
deleteRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomDelete).
|
|
118
|
+
get = (key) => this.index.get().get(key);
|
|
119
|
+
project = (key, read) => projection(derived(this.one(key), read), () => read(this.get(key)));
|
|
120
|
+
forRoom = (url, h) => this.one(makeRoomKey(url, h));
|
|
121
|
+
forUrl = (url) => projectFrom(this.byUrl, byUrl => byUrl.get(url) ?? []);
|
|
122
|
+
createRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomCreate).setRoom(url, room.h));
|
|
123
|
+
deleteRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomDelete).setRoom(url, room.h));
|
|
57
124
|
editRoom = (url, room) => {
|
|
58
|
-
const writer = this.app.use(Domain).writer(RoomEdit).
|
|
125
|
+
const writer = this.app.use(Domain).writer(RoomEdit).setRoom(url, room.h);
|
|
59
126
|
if (room.name)
|
|
60
127
|
writer.setName(room.name);
|
|
61
128
|
if (room.about)
|
|
@@ -70,13 +137,13 @@ export class Rooms extends LoadableMapPlugin {
|
|
|
70
137
|
.setLivekit(Boolean(room.livekit));
|
|
71
138
|
return this.app.use(Domain).command(writer);
|
|
72
139
|
};
|
|
73
|
-
joinRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomJoin).
|
|
74
|
-
leaveRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomLeave).
|
|
140
|
+
joinRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomJoin).setRoom(url, room.h));
|
|
141
|
+
leaveRoom = (url, room) => this.app.use(Domain).command(this.app.use(Domain).writer(RoomLeave).setRoom(url, room.h));
|
|
75
142
|
addMember = (url, room, pubkey) => this.app
|
|
76
143
|
.use(Domain)
|
|
77
|
-
.command(this.app.use(Domain).writer(RoomAddMember).
|
|
144
|
+
.command(this.app.use(Domain).writer(RoomAddMember).setRoom(url, room.h).addPubkey(pubkey));
|
|
78
145
|
removeMember = (url, room, pubkey) => this.app
|
|
79
146
|
.use(Domain)
|
|
80
|
-
.command(this.app.use(Domain).writer(RoomRemoveMember).
|
|
147
|
+
.command(this.app.use(Domain).writer(RoomRemoveMember).setRoom(url, room.h).addPubkey(pubkey));
|
|
81
148
|
}
|
|
82
149
|
//# sourceMappingURL=rooms.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rooms.js","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,EAAE,EAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"rooms.js","sourceRoot":"","sources":["../../../../src/plugins/rooms.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAS,SAAS,EAAmD,MAAM,eAAe,CAAA;AACjG,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,EAKZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAA;AAEjG,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,cAAc,EACd;IACE,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED;;;GAGG;AACH,8BAAsB,SAAS;IAC7B,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAK;IAC7B,OAAO,EAAE,qBAAqB,CAAK;IAEnC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAEtB,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;IAUtC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE,GAKvC,MAAM,EAAE;IAG5B,eAAe;IAMf,iBAAiB;IAIjB,aAAa;IAIb,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE;IAInD,UAAU;IAIV,QAAQ;IAYR,YAAY;IAYZ,iBAAiB;CASlB;AAED,qBAAa,KAAM,SAAQ,SAAS;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,IAAI,IAAI,SAEP;IAED,KAAK,CAAC,MAAM,EAAE,MAAM;IAYpB,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAEK,QAAQ,CAAC,KAAK,EAAE,WAAW;IA0C3B,OAAO;
|
|
1
|
+
{"version":3,"file":"thunk.d.ts","sourceRoot":"","sources":["../../../../src/plugins/thunk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAS,SAAS,EAAmD,MAAM,eAAe,CAAA;AACjG,OAAO,EACL,WAAW,EACX,aAAa,EACb,WAAW,EAKZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAA;AAEjG,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAE/B,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,cAAc,EACd;IACE,GAAG,EAAE,IAAI,CAAA;IACT,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED;;;GAGG;AACH,8BAAsB,SAAS;IAC7B,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAK;IAC7B,OAAO,EAAE,qBAAqB,CAAK;IAEnC,QAAQ,CAAC,KAAK,IAAI,IAAI;IAEtB,OAAO;IAMP,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC;IAUtC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE,GAKvC,MAAM,EAAE;IAG5B,eAAe;IAMf,iBAAiB;IAIjB,aAAa;IAIb,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,EAAE;IAInD,UAAU;IAIV,QAAQ;IAYR,YAAY;IAYZ,iBAAiB;CASlB;AAED,qBAAa,KAAM,SAAQ,SAAS;IAMtB,QAAQ,CAAC,OAAO,EAAE,YAAY;IAL1C,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,+CAAgB;IACxB,UAAU,kBAAwB;IAClC,IAAI,CAAC,EAAE,WAAW,CAAA;gBAEG,OAAO,EAAE,YAAY;IA4B1C,IAAI,IAAI,SAEP;IAED,KAAK,CAAC,MAAM,EAAE,MAAM;IAYpB,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAED,WAAW,GAAI,QAAQ,aAAa,UAInC;IAEK,QAAQ,CAAC,KAAK,EAAE,WAAW;IA0C3B,OAAO;IAuEb,KAAK;CAGN;AAED,qBAAa,WAAY,SAAQ,SAAS;IAC5B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;gBAAf,MAAM,EAAE,KAAK,EAAE;IA6BpC,KAAK;CAGN;AAED;;;;;;GAMG;AACH,qBAAa,MAAM;IAWL,QAAQ,CAAC,GAAG,EAAE,IAAI;IAV9B,OAAO,2CAAwB;IAE/B,KAAK,mBAMH;gBAEmB,GAAG,EAAE,IAAI;IAe9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAsBpB,OAAO,GAAI,SAAS,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAM5C;IAED,KAAK,GAAI,OAAO,SAAS,yBAGmB;IAE5C,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;IAIxB,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;CAS/C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { writable } from "svelte/store";
|
|
1
|
+
import { get, writable } from "svelte/store";
|
|
2
2
|
import { append, TaskQueue, ensurePlural, remove, defer, sleep, nth, without } from "@welshman/lib";
|
|
3
3
|
import { isSignedEvent, WRAPPED_KINDS, prep, makePow, } from "@welshman/util";
|
|
4
4
|
import { PublishStatus } from "@welshman/net";
|
|
@@ -203,9 +203,14 @@ export class Thunk extends BaseThunk {
|
|
|
203
203
|
if (this.options.pow) {
|
|
204
204
|
this.event = await makePow(this.event, this.options.pow).result;
|
|
205
205
|
}
|
|
206
|
-
const signedEvent = await this.user.
|
|
206
|
+
const signedEvent = await this.user.sign(this.event, {
|
|
207
207
|
signal: AbortSignal.timeout(30_000),
|
|
208
208
|
});
|
|
209
|
+
// Signing is slow enough to be aborted mid-flight; bail before writing the
|
|
210
|
+
// signed event, since the abort handler has already unwound the unsigned one
|
|
211
|
+
if (this.controller.signal.aborted) {
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
209
214
|
// Update tracker and repository with the signed event since the id will have changed
|
|
210
215
|
if (this.options.pow) {
|
|
211
216
|
for (const url of this.options.relays) {
|
|
@@ -274,6 +279,17 @@ export class Thunks {
|
|
|
274
279
|
});
|
|
275
280
|
constructor(app) {
|
|
276
281
|
this.app = app;
|
|
282
|
+
app.onCleanup(() => {
|
|
283
|
+
this.queue.clear();
|
|
284
|
+
// Anything still in flight would go on publishing after teardown, opening
|
|
285
|
+
// sockets in the cleared pool and writing its event back into the cleared
|
|
286
|
+
// repository. Aborting also unwinds each thunk's optimistic write.
|
|
287
|
+
for (const thunk of get(this.history)) {
|
|
288
|
+
if (!thunk.isComplete()) {
|
|
289
|
+
thunk.abort();
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
});
|
|
277
293
|
}
|
|
278
294
|
enqueue(thunk) {
|
|
279
295
|
this.queue.push(thunk);
|