@welshman/app 0.0.6 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/collection.cjs +1 -1
- package/build/src/collection.cjs.map +1 -1
- package/build/src/collection.mjs +2 -2
- package/build/src/collection.mjs.map +1 -1
- package/build/src/context.cjs +1 -0
- package/build/src/context.cjs.map +1 -1
- package/build/src/context.mjs +1 -0
- package/build/src/context.mjs.map +1 -1
- package/build/src/core.cjs +0 -3
- package/build/src/core.cjs.map +1 -1
- package/build/src/core.mjs +0 -3
- package/build/src/core.mjs.map +1 -1
- package/build/src/follows.cjs +3 -1
- package/build/src/follows.cjs.map +1 -1
- package/build/src/follows.d.ts +1 -0
- package/build/src/follows.mjs +2 -1
- package/build/src/follows.mjs.map +1 -1
- package/build/src/freshness.cjs +7 -8
- package/build/src/freshness.cjs.map +1 -1
- package/build/src/freshness.d.ts +7 -2
- package/build/src/freshness.mjs +6 -6
- package/build/src/freshness.mjs.map +1 -1
- package/build/src/index.cjs +3 -0
- package/build/src/index.cjs.map +1 -1
- package/build/src/index.d.ts +3 -0
- package/build/src/index.mjs +3 -0
- package/build/src/mutes.cjs +3 -1
- package/build/src/mutes.cjs.map +1 -1
- package/build/src/mutes.d.ts +1 -0
- package/build/src/mutes.mjs +2 -1
- package/build/src/mutes.mjs.map +1 -1
- package/build/src/plaintext.cjs +4 -1
- package/build/src/plaintext.cjs.map +1 -1
- package/build/src/plaintext.mjs +4 -1
- package/build/src/plaintext.mjs.map +1 -1
- package/build/src/profiles.cjs +13 -1
- package/build/src/profiles.cjs.map +1 -1
- package/build/src/profiles.d.ts +2 -0
- package/build/src/profiles.mjs +12 -0
- package/build/src/profiles.mjs.map +1 -1
- package/build/src/session.cjs +2 -0
- package/build/src/session.cjs.map +1 -1
- package/build/src/session.d.ts +4 -3
- package/build/src/session.mjs +3 -1
- package/build/src/session.mjs.map +1 -1
- package/build/src/storage.cjs +13 -16
- package/build/src/storage.cjs.map +1 -1
- package/build/src/storage.d.ts +2 -5
- package/build/src/storage.mjs +14 -17
- package/build/src/storage.mjs.map +1 -1
- package/build/src/sync.cjs +39 -0
- package/build/src/sync.cjs.map +1 -0
- package/build/src/sync.d.ts +9 -0
- package/build/src/sync.mjs +32 -0
- package/build/src/sync.mjs.map +1 -0
- package/build/src/tags.cjs +94 -0
- package/build/src/tags.cjs.map +1 -0
- package/build/src/tags.d.ts +6 -0
- package/build/src/tags.mjs +86 -0
- package/build/src/tags.mjs.map +1 -0
- package/build/src/util.cjs +2 -0
- package/build/src/util.cjs.map +1 -1
- package/build/src/util.d.ts +1 -0
- package/build/src/util.mjs +2 -0
- package/build/src/util.mjs.map +1 -1
- package/build/src/wot.cjs +64 -0
- package/build/src/wot.cjs.map +1 -0
- package/build/src/wot.d.ts +9 -0
- package/build/src/wot.mjs +55 -0
- package/build/src/wot.mjs.map +1 -0
- package/package.json +6 -6
package/build/src/session.mjs
CHANGED
|
@@ -2,7 +2,7 @@ import { derived } from "svelte/store";
|
|
|
2
2
|
import { ctx, memoize, omit, equals, assoc } from "@welshman/lib";
|
|
3
3
|
import { createEvent } from "@welshman/util";
|
|
4
4
|
import { withGetter, synced } from "@welshman/store";
|
|
5
|
-
import { Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer } from "@welshman/signer";
|
|
5
|
+
import { Nip46Broker, Nip46Signer, Nip07Signer, Nip01Signer, Nip55Signer } from "@welshman/signer";
|
|
6
6
|
export const pubkey = withGetter(synced("pubkey", null));
|
|
7
7
|
export const sessions = withGetter(synced("sessions", {}));
|
|
8
8
|
export const session = withGetter(derived([pubkey, sessions], ([$pubkey, $sessions]) => ($pubkey ? $sessions[$pubkey] : null)));
|
|
@@ -27,6 +27,8 @@ export const getSigner = memoize((session) => {
|
|
|
27
27
|
return new Nip01Signer(session.secret);
|
|
28
28
|
case "nip46":
|
|
29
29
|
return new Nip46Signer(Nip46Broker.get(session.pubkey, session.secret, session.handler));
|
|
30
|
+
case "nip55":
|
|
31
|
+
return new Nip55Signer(session.signer);
|
|
30
32
|
default:
|
|
31
33
|
return null;
|
|
32
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.mjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAC,MAAM,cAAc;OAC7B,EAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,eAAe;OACxD,EAAC,WAAW,EAAC,MAAM,gBAAgB;OACnC,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,iBAAiB;OAE3C,EAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,kBAAkB;
|
|
1
|
+
{"version":3,"file":"session.mjs","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"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"}
|
package/build/src/storage.cjs
CHANGED
|
@@ -31,11 +31,7 @@ const bulkDelete = async (name, ids) => {
|
|
|
31
31
|
};
|
|
32
32
|
exports.bulkDelete = bulkDelete;
|
|
33
33
|
const initIndexedDbAdapter = async (name, adapter) => {
|
|
34
|
-
var _a;
|
|
35
34
|
let prevRecords = await (0, exports.getAll)(name);
|
|
36
|
-
if ((_a = adapter.options) === null || _a === void 0 ? void 0 : _a.migrate) {
|
|
37
|
-
prevRecords = adapter.options.migrate(prevRecords);
|
|
38
|
-
}
|
|
39
35
|
adapter.store.set(prevRecords);
|
|
40
36
|
adapter.store.subscribe(async (currentRecords) => {
|
|
41
37
|
if (exports.dead.get()) {
|
|
@@ -44,7 +40,7 @@ const initIndexedDbAdapter = async (name, adapter) => {
|
|
|
44
40
|
const currentIds = new Set(currentRecords.map(item => item[adapter.keyPath]));
|
|
45
41
|
const removedRecords = prevRecords.filter(r => !currentIds.has(r[adapter.keyPath]));
|
|
46
42
|
const prevRecordsById = (0, lib_1.indexBy)(item => item[adapter.keyPath], prevRecords);
|
|
47
|
-
const updatedRecords = currentRecords.filter(r => r
|
|
43
|
+
const updatedRecords = currentRecords.filter(r => !(0, lib_1.equals)(r, prevRecordsById.get(r[adapter.keyPath])));
|
|
48
44
|
prevRecords = currentRecords;
|
|
49
45
|
if (updatedRecords.length > 0) {
|
|
50
46
|
await (0, exports.bulkPut)(name, updatedRecords);
|
|
@@ -94,31 +90,32 @@ const clearStorage = async () => {
|
|
|
94
90
|
await (0, idb_1.deleteDB)(exports.db.name);
|
|
95
91
|
};
|
|
96
92
|
exports.clearStorage = clearStorage;
|
|
93
|
+
const migrate = (data, options) => options.migrate ? options.migrate(data) : data;
|
|
97
94
|
exports.storageAdapters = {
|
|
98
95
|
fromObjectStore: (store, options = {}) => ({
|
|
99
96
|
options,
|
|
100
97
|
keyPath: "key",
|
|
101
|
-
store: (0, store_2.
|
|
102
|
-
store: store,
|
|
103
|
-
forward: ($data) => Object.entries($data).map(([key, value]) => ({ key, value })),
|
|
98
|
+
store: (0, store_2.adapter)({
|
|
99
|
+
store: (0, store_2.throttled)(options.throttle || 0, store),
|
|
100
|
+
forward: ($data) => migrate(Object.entries($data).map(([key, value]) => ({ key, value })), options),
|
|
104
101
|
backward: (data) => (0, lib_1.fromPairs)(data.map(({ key, value }) => [key, value])),
|
|
105
|
-
})
|
|
102
|
+
}),
|
|
106
103
|
}),
|
|
107
104
|
fromMapStore: (store, options = {}) => ({
|
|
108
105
|
options,
|
|
109
106
|
keyPath: "key",
|
|
110
|
-
store: (0, store_2.
|
|
111
|
-
store: store,
|
|
112
|
-
forward: ($data) => Array.from($data.entries()).map(([key, value]) => ({ key, value })),
|
|
107
|
+
store: (0, store_2.adapter)({
|
|
108
|
+
store: (0, store_2.throttled)(options.throttle || 0, store),
|
|
109
|
+
forward: ($data) => migrate(Array.from($data.entries()).map(([key, value]) => ({ key, value })), options),
|
|
113
110
|
backward: (data) => new Map(data.map(({ key, value }) => [key, value])),
|
|
114
|
-
})
|
|
111
|
+
}),
|
|
115
112
|
}),
|
|
116
113
|
fromTracker: (tracker, options = {}) => ({
|
|
117
114
|
options,
|
|
118
115
|
keyPath: 'key',
|
|
119
116
|
store: (0, store_2.custom)(setter => {
|
|
120
|
-
let onUpdate = () => setter(Array.from(tracker.data.entries())
|
|
121
|
-
.map(([key, urls]) => ({ key, value: Array.from(urls) })));
|
|
117
|
+
let onUpdate = () => setter(migrate(Array.from(tracker.data.entries())
|
|
118
|
+
.map(([key, urls]) => ({ key, value: Array.from(urls) })), options));
|
|
122
119
|
if (options.throttle) {
|
|
123
120
|
onUpdate = (0, throttle_debounce_1.throttle)(options.throttle, onUpdate);
|
|
124
121
|
}
|
|
@@ -133,7 +130,7 @@ exports.storageAdapters = {
|
|
|
133
130
|
options,
|
|
134
131
|
keyPath: 'id',
|
|
135
132
|
store: (0, store_2.custom)(setter => {
|
|
136
|
-
let onUpdate = () => setter(repository.dump());
|
|
133
|
+
let onUpdate = () => setter(migrate(repository.dump(), options));
|
|
137
134
|
if (options.throttle) {
|
|
138
135
|
onUpdate = (0, throttle_debounce_1.throttle)(options.throttle, onUpdate);
|
|
139
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.cjs","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":";;;AAAA,6BAAoC;AAEpC,yDAA0C;AAC1C,wCAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"storage.cjs","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
|
package/build/src/storage.d.ts
CHANGED
|
@@ -3,13 +3,9 @@ import type { IDBPDatabase } from "idb";
|
|
|
3
3
|
import type { Unsubscriber, Writable } from "svelte/store";
|
|
4
4
|
import type { TrustedEvent, Repository } from "@welshman/util";
|
|
5
5
|
import type { Tracker } from "@welshman/net";
|
|
6
|
-
export type IndexedDbAdapterOptions = {
|
|
7
|
-
migrate?: (items: any[]) => any[];
|
|
8
|
-
};
|
|
9
6
|
export type IndexedDbAdapter = {
|
|
10
7
|
keyPath: string;
|
|
11
8
|
store: Writable<any[]>;
|
|
12
|
-
options?: IndexedDbAdapterOptions;
|
|
13
9
|
};
|
|
14
10
|
export declare let db: IDBPDatabase;
|
|
15
11
|
export declare const dead: import("@welshman/store").WritableWithGetter<boolean>;
|
|
@@ -21,8 +17,9 @@ export declare const initIndexedDbAdapter: (name: string, adapter: IndexedDbAdap
|
|
|
21
17
|
export declare const initStorage: (name: string, version: number, adapters: Record<string, IndexedDbAdapter>) => Promise<void>;
|
|
22
18
|
export declare const closeStorage: () => Promise<void>;
|
|
23
19
|
export declare const clearStorage: () => Promise<void>;
|
|
24
|
-
export type StorageAdapterOptions =
|
|
20
|
+
export type StorageAdapterOptions = {
|
|
25
21
|
throttle?: number;
|
|
22
|
+
migrate?: (items: any[]) => any[];
|
|
26
23
|
};
|
|
27
24
|
export declare const storageAdapters: {
|
|
28
25
|
fromObjectStore: <T>(store: Writable<Record<string, T>>, options?: StorageAdapterOptions) => {
|
package/build/src/storage.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { openDB, deleteDB } from "idb";
|
|
2
2
|
import { throttle } from "throttle-debounce";
|
|
3
3
|
import { writable } from "svelte/store";
|
|
4
|
-
import { indexBy, fromPairs } from "@welshman/lib";
|
|
4
|
+
import { indexBy, equals, fromPairs } from "@welshman/lib";
|
|
5
5
|
import { withGetter, adapter, throttled, custom } from "@welshman/store";
|
|
6
6
|
export let db;
|
|
7
7
|
export const dead = withGetter(writable(false));
|
|
@@ -26,11 +26,7 @@ export const bulkDelete = async (name, ids) => {
|
|
|
26
26
|
await tx.done;
|
|
27
27
|
};
|
|
28
28
|
export const initIndexedDbAdapter = async (name, adapter) => {
|
|
29
|
-
var _a;
|
|
30
29
|
let prevRecords = await getAll(name);
|
|
31
|
-
if ((_a = adapter.options) === null || _a === void 0 ? void 0 : _a.migrate) {
|
|
32
|
-
prevRecords = adapter.options.migrate(prevRecords);
|
|
33
|
-
}
|
|
34
30
|
adapter.store.set(prevRecords);
|
|
35
31
|
adapter.store.subscribe(async (currentRecords) => {
|
|
36
32
|
if (dead.get()) {
|
|
@@ -39,7 +35,7 @@ export const initIndexedDbAdapter = async (name, adapter) => {
|
|
|
39
35
|
const currentIds = new Set(currentRecords.map(item => item[adapter.keyPath]));
|
|
40
36
|
const removedRecords = prevRecords.filter(r => !currentIds.has(r[adapter.keyPath]));
|
|
41
37
|
const prevRecordsById = indexBy(item => item[adapter.keyPath], prevRecords);
|
|
42
|
-
const updatedRecords = currentRecords.filter(r => r
|
|
38
|
+
const updatedRecords = currentRecords.filter(r => !equals(r, prevRecordsById.get(r[adapter.keyPath])));
|
|
43
39
|
prevRecords = currentRecords;
|
|
44
40
|
if (updatedRecords.length > 0) {
|
|
45
41
|
await bulkPut(name, updatedRecords);
|
|
@@ -85,31 +81,32 @@ export const clearStorage = async () => {
|
|
|
85
81
|
await closeStorage();
|
|
86
82
|
await deleteDB(db.name);
|
|
87
83
|
};
|
|
84
|
+
const migrate = (data, options) => options.migrate ? options.migrate(data) : data;
|
|
88
85
|
export const storageAdapters = {
|
|
89
86
|
fromObjectStore: (store, options = {}) => ({
|
|
90
87
|
options,
|
|
91
88
|
keyPath: "key",
|
|
92
|
-
store:
|
|
93
|
-
store: store,
|
|
94
|
-
forward: ($data) => Object.entries($data).map(([key, value]) => ({ key, value })),
|
|
89
|
+
store: adapter({
|
|
90
|
+
store: throttled(options.throttle || 0, store),
|
|
91
|
+
forward: ($data) => migrate(Object.entries($data).map(([key, value]) => ({ key, value })), options),
|
|
95
92
|
backward: (data) => fromPairs(data.map(({ key, value }) => [key, value])),
|
|
96
|
-
})
|
|
93
|
+
}),
|
|
97
94
|
}),
|
|
98
95
|
fromMapStore: (store, options = {}) => ({
|
|
99
96
|
options,
|
|
100
97
|
keyPath: "key",
|
|
101
|
-
store:
|
|
102
|
-
store: store,
|
|
103
|
-
forward: ($data) => Array.from($data.entries()).map(([key, value]) => ({ key, value })),
|
|
98
|
+
store: adapter({
|
|
99
|
+
store: throttled(options.throttle || 0, store),
|
|
100
|
+
forward: ($data) => migrate(Array.from($data.entries()).map(([key, value]) => ({ key, value })), options),
|
|
104
101
|
backward: (data) => new Map(data.map(({ key, value }) => [key, value])),
|
|
105
|
-
})
|
|
102
|
+
}),
|
|
106
103
|
}),
|
|
107
104
|
fromTracker: (tracker, options = {}) => ({
|
|
108
105
|
options,
|
|
109
106
|
keyPath: 'key',
|
|
110
107
|
store: custom(setter => {
|
|
111
|
-
let onUpdate = () => setter(Array.from(tracker.data.entries())
|
|
112
|
-
.map(([key, urls]) => ({ key, value: Array.from(urls) })));
|
|
108
|
+
let onUpdate = () => setter(migrate(Array.from(tracker.data.entries())
|
|
109
|
+
.map(([key, urls]) => ({ key, value: Array.from(urls) })), options));
|
|
113
110
|
if (options.throttle) {
|
|
114
111
|
onUpdate = throttle(options.throttle, onUpdate);
|
|
115
112
|
}
|
|
@@ -124,7 +121,7 @@ export const storageAdapters = {
|
|
|
124
121
|
options,
|
|
125
122
|
keyPath: 'id',
|
|
126
123
|
store: custom(setter => {
|
|
127
|
-
let onUpdate = () => setter(repository.dump());
|
|
124
|
+
let onUpdate = () => setter(migrate(repository.dump(), options));
|
|
128
125
|
if (options.throttle) {
|
|
129
126
|
onUpdate = throttle(options.throttle, onUpdate);
|
|
130
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.mjs","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,KAAK;OAE7B,EAAC,QAAQ,EAAC,MAAM,mBAAmB;OACnC,EAAC,QAAQ,EAAC,MAAM,cAAc;OAE9B,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"storage.mjs","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sync = exports.push = exports.pull = exports.hasNegentropy = void 0;
|
|
4
|
+
const util_1 = require("@welshman/util");
|
|
5
|
+
const net_1 = require("@welshman/net");
|
|
6
|
+
const core_1 = require("./core.cjs");
|
|
7
|
+
const relays_1 = require("./relays.cjs");
|
|
8
|
+
const hasNegentropy = (url) => {
|
|
9
|
+
var _a, _b, _c, _d;
|
|
10
|
+
const p = (_a = relays_1.relaysByUrl.get().get(url)) === null || _a === void 0 ? void 0 : _a.profile;
|
|
11
|
+
if ((_b = p === null || p === void 0 ? void 0 : p.supported_nips) === null || _b === void 0 ? void 0 : _b.includes(77))
|
|
12
|
+
return true;
|
|
13
|
+
if (((_c = p === null || p === void 0 ? void 0 : p.software) === null || _c === void 0 ? void 0 : _c.includes('strfry')) && !((_d = p === null || p === void 0 ? void 0 : p.version) === null || _d === void 0 ? void 0 : _d.match(/^0\./)))
|
|
14
|
+
return true;
|
|
15
|
+
return false;
|
|
16
|
+
};
|
|
17
|
+
exports.hasNegentropy = hasNegentropy;
|
|
18
|
+
const pull = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
19
|
+
const events = core_1.repository.query(filters);
|
|
20
|
+
await (0, exports.hasNegentropy)(relay)
|
|
21
|
+
? (0, net_1.pull)({ filters, events, relays: [relay] })
|
|
22
|
+
: (0, net_1.pullWithoutNegentropy)({ filters, relays: [relay] });
|
|
23
|
+
}));
|
|
24
|
+
exports.pull = pull;
|
|
25
|
+
const push = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
26
|
+
const events = core_1.repository.query(filters).filter(util_1.isSignedEvent);
|
|
27
|
+
await (0, exports.hasNegentropy)(relay)
|
|
28
|
+
? (0, net_1.push)({ filters, events, relays: [relay] })
|
|
29
|
+
: (0, net_1.pushWithoutNegentropy)({ events, relays: [relay] });
|
|
30
|
+
}));
|
|
31
|
+
exports.push = push;
|
|
32
|
+
const sync = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
33
|
+
const events = core_1.repository.query(filters).filter(util_1.isSignedEvent);
|
|
34
|
+
await (0, exports.hasNegentropy)(relay)
|
|
35
|
+
? (0, net_1.sync)({ filters, events, relays: [relay] })
|
|
36
|
+
: (0, net_1.syncWithoutNegentropy)({ filters, events, relays: [relay] });
|
|
37
|
+
}));
|
|
38
|
+
exports.sync = sync;
|
|
39
|
+
//# sourceMappingURL=sync.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.cjs","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":";;;AACA,yCAA4C;AAC5C,uCAAuJ;AACvJ,qCAAiC;AACjC,yCAAoC;AAE7B,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;;IAC3C,MAAM,CAAC,GAAG,MAAA,oBAAW,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,OAAO,CAAA;IAE7C,IAAI,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ,CAAC,EAAE,CAAC;QAAE,OAAO,IAAI,CAAA;IAChD,IAAI,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,0CAAE,QAAQ,CAAC,QAAQ,CAAC,KAAI,CAAC,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,0CAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAAE,OAAO,IAAI,CAAA;IAE9E,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAOM,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE,CAC3D,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;IACvB,MAAM,MAAM,GAAG,iBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAExC,MAAM,IAAA,qBAAa,EAAC,KAAK,CAAC;QACxB,CAAC,CAAC,IAAA,UAAQ,EAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;QAC9C,CAAC,CAAC,IAAA,2BAAqB,EAAC,EAAC,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAA;AACvD,CAAC,CAAC,CACH,CAAA;AATU,QAAA,IAAI,QASd;AAEI,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE,CAC3D,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;IACvB,MAAM,MAAM,GAAG,iBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,oBAAa,CAAC,CAAA;IAE9D,MAAM,IAAA,qBAAa,EAAC,KAAK,CAAC;QACxB,CAAC,CAAC,IAAA,UAAQ,EAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;QAC9C,CAAC,CAAC,IAAA,2BAAqB,EAAC,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAA;AACtD,CAAC,CAAC,CACH,CAAA;AATU,QAAA,IAAI,QASd;AAEI,MAAM,IAAI,GAAG,KAAK,EAAE,EAAC,MAAM,EAAE,OAAO,EAAc,EAAE,EAAE,CAC3D,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;IACvB,MAAM,MAAM,GAAG,iBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,oBAAa,CAAC,CAAA;IAE9D,MAAM,IAAA,qBAAa,EAAC,KAAK,CAAC;QACxB,CAAC,CAAC,IAAA,UAAQ,EAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC;QAC9C,CAAC,CAAC,IAAA,2BAAqB,EAAC,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAC,CAAC,CAAA;AAC/D,CAAC,CAAC,CACH,CAAA;AATU,QAAA,IAAI,QASd"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Filter } from '@welshman/util';
|
|
2
|
+
export declare const hasNegentropy: (url: string) => boolean;
|
|
3
|
+
export type AppSyncOpts = {
|
|
4
|
+
relays: string[];
|
|
5
|
+
filters: Filter[];
|
|
6
|
+
};
|
|
7
|
+
export declare const pull: ({ relays, filters }: AppSyncOpts) => Promise<void[]>;
|
|
8
|
+
export declare const push: ({ relays, filters }: AppSyncOpts) => Promise<void[]>;
|
|
9
|
+
export declare const sync: ({ relays, filters }: AppSyncOpts) => Promise<void[]>;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { isSignedEvent } from '@welshman/util';
|
|
2
|
+
import { push as basePush, pull as basePull, sync as baseSync, pushWithoutNegentropy, pullWithoutNegentropy, syncWithoutNegentropy } from "@welshman/net";
|
|
3
|
+
import { repository } from "./core.mjs";
|
|
4
|
+
import { relaysByUrl } from "./relays.mjs";
|
|
5
|
+
export const hasNegentropy = (url) => {
|
|
6
|
+
var _a, _b, _c, _d;
|
|
7
|
+
const p = (_a = relaysByUrl.get().get(url)) === null || _a === void 0 ? void 0 : _a.profile;
|
|
8
|
+
if ((_b = p === null || p === void 0 ? void 0 : p.supported_nips) === null || _b === void 0 ? void 0 : _b.includes(77))
|
|
9
|
+
return true;
|
|
10
|
+
if (((_c = p === null || p === void 0 ? void 0 : p.software) === null || _c === void 0 ? void 0 : _c.includes('strfry')) && !((_d = p === null || p === void 0 ? void 0 : p.version) === null || _d === void 0 ? void 0 : _d.match(/^0\./)))
|
|
11
|
+
return true;
|
|
12
|
+
return false;
|
|
13
|
+
};
|
|
14
|
+
export const pull = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
15
|
+
const events = repository.query(filters);
|
|
16
|
+
await hasNegentropy(relay)
|
|
17
|
+
? basePull({ filters, events, relays: [relay] })
|
|
18
|
+
: pullWithoutNegentropy({ filters, relays: [relay] });
|
|
19
|
+
}));
|
|
20
|
+
export const push = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
21
|
+
const events = repository.query(filters).filter(isSignedEvent);
|
|
22
|
+
await hasNegentropy(relay)
|
|
23
|
+
? basePush({ filters, events, relays: [relay] })
|
|
24
|
+
: pushWithoutNegentropy({ events, relays: [relay] });
|
|
25
|
+
}));
|
|
26
|
+
export const sync = async ({ relays, filters }) => await Promise.all(relays.map(async (relay) => {
|
|
27
|
+
const events = repository.query(filters).filter(isSignedEvent);
|
|
28
|
+
await hasNegentropy(relay)
|
|
29
|
+
? baseSync({ filters, events, relays: [relay] })
|
|
30
|
+
: syncWithoutNegentropy({ filters, events, relays: [relay] });
|
|
31
|
+
}));
|
|
32
|
+
//# sourceMappingURL=sync.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync.mjs","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tagReactionTo = exports.tagReplyTo = exports.tagEvent = exports.tagPubkey = exports.tagZapSplit = void 0;
|
|
4
|
+
const lib_1 = require("@welshman/lib");
|
|
5
|
+
const util_1 = require("@welshman/util");
|
|
6
|
+
const profiles_1 = require("./profiles.cjs");
|
|
7
|
+
const session_1 = require("./session.cjs");
|
|
8
|
+
const tagZapSplit = (pubkey, split = 1) => [
|
|
9
|
+
"zap",
|
|
10
|
+
pubkey,
|
|
11
|
+
lib_1.ctx.app.router.FromPubkeys([pubkey]).getUrl(),
|
|
12
|
+
String(split),
|
|
13
|
+
];
|
|
14
|
+
exports.tagZapSplit = tagZapSplit;
|
|
15
|
+
const tagPubkey = (pubkey, ...args) => [
|
|
16
|
+
"p",
|
|
17
|
+
pubkey,
|
|
18
|
+
lib_1.ctx.app.router.FromPubkeys([pubkey]).getUrl(),
|
|
19
|
+
(0, profiles_1.displayProfileByPubkey)(pubkey),
|
|
20
|
+
];
|
|
21
|
+
exports.tagPubkey = tagPubkey;
|
|
22
|
+
const tagEvent = (event, mark = "") => {
|
|
23
|
+
const url = lib_1.ctx.app.router.Event(event).getUrl();
|
|
24
|
+
const tags = [["e", event.id, url, mark, event.pubkey]];
|
|
25
|
+
if ((0, util_1.isReplaceable)(event)) {
|
|
26
|
+
tags.push(["a", (0, util_1.getAddress)(event), url, mark, event.pubkey]);
|
|
27
|
+
}
|
|
28
|
+
return tags;
|
|
29
|
+
};
|
|
30
|
+
exports.tagEvent = tagEvent;
|
|
31
|
+
const tagReplyTo = (event) => {
|
|
32
|
+
const $pubkey = session_1.pubkey.get();
|
|
33
|
+
const tagValues = (0, util_1.getIdAndAddress)(event);
|
|
34
|
+
const tags = [];
|
|
35
|
+
// Mention the event's author
|
|
36
|
+
if (event.pubkey !== $pubkey) {
|
|
37
|
+
tags.push((0, exports.tagPubkey)(event.pubkey));
|
|
38
|
+
}
|
|
39
|
+
// Inherit p-tag mentions
|
|
40
|
+
for (const pubkey of (0, util_1.getPubkeyTagValues)(tags)) {
|
|
41
|
+
if (pubkey !== $pubkey) {
|
|
42
|
+
tags.push((0, exports.tagPubkey)(pubkey));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// Based on NIP 10 legacy tags, order is root, mentions, reply
|
|
46
|
+
const { roots, replies, mentions } = (0, util_1.getAncestorTags)(tags);
|
|
47
|
+
// Root comes first
|
|
48
|
+
if (roots.length > 0) {
|
|
49
|
+
for (const t of roots) {
|
|
50
|
+
tags.push([...t.slice(0, 2), lib_1.ctx.app.router.EventRoots(event).getUrl(), "root"]);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
for (const t of replies) {
|
|
55
|
+
tags.push([...t.slice(0, 2), lib_1.ctx.app.router.EventParents(event).getUrl(), "root"]);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
// Make sure we don't repeat any tag values
|
|
59
|
+
const isRepeated = (v) => tagValues.includes(v) || tags.find(t => t[1] === v);
|
|
60
|
+
// Inherit mentions
|
|
61
|
+
for (const t of mentions) {
|
|
62
|
+
if (!isRepeated(t[1])) {
|
|
63
|
+
tags.push([...t.slice(0, 3), "mention"]);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
// Inherit replies if they weren't already included
|
|
67
|
+
if (roots.length > 0) {
|
|
68
|
+
for (const t of replies) {
|
|
69
|
+
if (!isRepeated(t[1])) {
|
|
70
|
+
tags.push([...t.slice(0, 3), "mention"]);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
// Add a/e-tags for the event event
|
|
75
|
+
for (const t of (0, exports.tagEvent)(event, replies.length > 0 ? "reply" : "root")) {
|
|
76
|
+
tags.push(t);
|
|
77
|
+
}
|
|
78
|
+
return tags;
|
|
79
|
+
};
|
|
80
|
+
exports.tagReplyTo = tagReplyTo;
|
|
81
|
+
const tagReactionTo = (event) => {
|
|
82
|
+
const tags = [];
|
|
83
|
+
// Mention the event's author
|
|
84
|
+
if (event.pubkey !== session_1.pubkey.get()) {
|
|
85
|
+
tags.push((0, exports.tagPubkey)(event.pubkey));
|
|
86
|
+
}
|
|
87
|
+
// Add a/e-tags for the event
|
|
88
|
+
for (const t of (0, exports.tagEvent)(event, "root")) {
|
|
89
|
+
tags.push(t);
|
|
90
|
+
}
|
|
91
|
+
return tags;
|
|
92
|
+
};
|
|
93
|
+
exports.tagReactionTo = tagReactionTo;
|
|
94
|
+
//# sourceMappingURL=tags.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tags.cjs","sourceRoot":"","sources":["../../src/tags.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { TrustedEvent } from '@welshman/util';
|
|
2
|
+
export declare const tagZapSplit: (pubkey: string, split?: number) => string[];
|
|
3
|
+
export declare const tagPubkey: (pubkey: string, ...args: unknown[]) => string[];
|
|
4
|
+
export declare const tagEvent: (event: TrustedEvent, mark?: string) => string[][];
|
|
5
|
+
export declare const tagReplyTo: (event: TrustedEvent) => string[][];
|
|
6
|
+
export declare const tagReactionTo: (event: TrustedEvent) => string[][];
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { ctx } from '@welshman/lib';
|
|
2
|
+
import { getAddress, isReplaceable, getAncestorTags, getPubkeyTagValues, getIdAndAddress } from '@welshman/util';
|
|
3
|
+
import { displayProfileByPubkey } from "./profiles.mjs";
|
|
4
|
+
import { pubkey } from "./session.mjs";
|
|
5
|
+
export const tagZapSplit = (pubkey, split = 1) => [
|
|
6
|
+
"zap",
|
|
7
|
+
pubkey,
|
|
8
|
+
ctx.app.router.FromPubkeys([pubkey]).getUrl(),
|
|
9
|
+
String(split),
|
|
10
|
+
];
|
|
11
|
+
export const tagPubkey = (pubkey, ...args) => [
|
|
12
|
+
"p",
|
|
13
|
+
pubkey,
|
|
14
|
+
ctx.app.router.FromPubkeys([pubkey]).getUrl(),
|
|
15
|
+
displayProfileByPubkey(pubkey),
|
|
16
|
+
];
|
|
17
|
+
export const tagEvent = (event, mark = "") => {
|
|
18
|
+
const url = ctx.app.router.Event(event).getUrl();
|
|
19
|
+
const tags = [["e", event.id, url, mark, event.pubkey]];
|
|
20
|
+
if (isReplaceable(event)) {
|
|
21
|
+
tags.push(["a", getAddress(event), url, mark, event.pubkey]);
|
|
22
|
+
}
|
|
23
|
+
return tags;
|
|
24
|
+
};
|
|
25
|
+
export const tagReplyTo = (event) => {
|
|
26
|
+
const $pubkey = pubkey.get();
|
|
27
|
+
const tagValues = getIdAndAddress(event);
|
|
28
|
+
const tags = [];
|
|
29
|
+
// Mention the event's author
|
|
30
|
+
if (event.pubkey !== $pubkey) {
|
|
31
|
+
tags.push(tagPubkey(event.pubkey));
|
|
32
|
+
}
|
|
33
|
+
// Inherit p-tag mentions
|
|
34
|
+
for (const pubkey of getPubkeyTagValues(tags)) {
|
|
35
|
+
if (pubkey !== $pubkey) {
|
|
36
|
+
tags.push(tagPubkey(pubkey));
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// Based on NIP 10 legacy tags, order is root, mentions, reply
|
|
40
|
+
const { roots, replies, mentions } = getAncestorTags(tags);
|
|
41
|
+
// Root comes first
|
|
42
|
+
if (roots.length > 0) {
|
|
43
|
+
for (const t of roots) {
|
|
44
|
+
tags.push([...t.slice(0, 2), ctx.app.router.EventRoots(event).getUrl(), "root"]);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
for (const t of replies) {
|
|
49
|
+
tags.push([...t.slice(0, 2), ctx.app.router.EventParents(event).getUrl(), "root"]);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
// Make sure we don't repeat any tag values
|
|
53
|
+
const isRepeated = (v) => tagValues.includes(v) || tags.find(t => t[1] === v);
|
|
54
|
+
// Inherit mentions
|
|
55
|
+
for (const t of mentions) {
|
|
56
|
+
if (!isRepeated(t[1])) {
|
|
57
|
+
tags.push([...t.slice(0, 3), "mention"]);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
// Inherit replies if they weren't already included
|
|
61
|
+
if (roots.length > 0) {
|
|
62
|
+
for (const t of replies) {
|
|
63
|
+
if (!isRepeated(t[1])) {
|
|
64
|
+
tags.push([...t.slice(0, 3), "mention"]);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
// Add a/e-tags for the event event
|
|
69
|
+
for (const t of tagEvent(event, replies.length > 0 ? "reply" : "root")) {
|
|
70
|
+
tags.push(t);
|
|
71
|
+
}
|
|
72
|
+
return tags;
|
|
73
|
+
};
|
|
74
|
+
export const tagReactionTo = (event) => {
|
|
75
|
+
const tags = [];
|
|
76
|
+
// Mention the event's author
|
|
77
|
+
if (event.pubkey !== pubkey.get()) {
|
|
78
|
+
tags.push(tagPubkey(event.pubkey));
|
|
79
|
+
}
|
|
80
|
+
// Add a/e-tags for the event
|
|
81
|
+
for (const t of tagEvent(event, "root")) {
|
|
82
|
+
tags.push(t);
|
|
83
|
+
}
|
|
84
|
+
return tags;
|
|
85
|
+
};
|
|
86
|
+
//# sourceMappingURL=tags.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tags.mjs","sourceRoot":"","sources":["../../src/tags.ts"],"names":[],"mappings":"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"}
|
package/build/src/util.cjs
CHANGED
|
@@ -10,6 +10,8 @@ const createSearch = (options, opts) => {
|
|
|
10
10
|
const fuse = new fuse_js_1.default(options, { ...opts.fuseOptions, includeScore: true });
|
|
11
11
|
const map = new Map(options.map(item => [opts.getValue(item), item]));
|
|
12
12
|
const search = (term) => {
|
|
13
|
+
var _a;
|
|
14
|
+
(_a = opts.onSearch) === null || _a === void 0 ? void 0 : _a.call(opts, term);
|
|
13
15
|
let results = term ? fuse.search(term) : options.map(item => ({ item, score: 1 }));
|
|
14
16
|
if (opts.sortFn) {
|
|
15
17
|
results = (0, lib_1.sortBy)(opts.sortFn, results);
|
package/build/src/util.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.cjs","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA0B;AAE1B,uCAAoC;
|
|
1
|
+
{"version":3,"file":"util.cjs","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|
package/build/src/util.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { IFuseOptions, FuseResult } from "fuse.js";
|
|
|
2
2
|
export type SearchOptions<V, T> = {
|
|
3
3
|
getValue: (item: T) => V;
|
|
4
4
|
fuseOptions?: IFuseOptions<T>;
|
|
5
|
+
onSearch?: (term: string) => void;
|
|
5
6
|
sortFn?: (items: FuseResult<T>) => any;
|
|
6
7
|
};
|
|
7
8
|
export type Search<V, T> = {
|
package/build/src/util.mjs
CHANGED
|
@@ -4,6 +4,8 @@ export const createSearch = (options, opts) => {
|
|
|
4
4
|
const fuse = new Fuse(options, { ...opts.fuseOptions, includeScore: true });
|
|
5
5
|
const map = new Map(options.map(item => [opts.getValue(item), item]));
|
|
6
6
|
const search = (term) => {
|
|
7
|
+
var _a;
|
|
8
|
+
(_a = opts.onSearch) === null || _a === void 0 ? void 0 : _a.call(opts, term);
|
|
7
9
|
let results = term ? fuse.search(term) : options.map(item => ({ item, score: 1 }));
|
|
8
10
|
if (opts.sortFn) {
|
|
9
11
|
results = sortBy(opts.sortFn, results);
|