@nostrify/nostrify 0.46.4 → 0.46.6
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +16 -0
- package/NCache.ts +1 -1
- package/NConnectSigner.ts +1 -1
- package/NIP05.ts +2 -2
- package/NIP98.ts +1 -1
- package/NPool.ts +3 -3
- package/NRelay1.ts +3 -3
- package/NSecSigner.ts +1 -0
- package/dist/BunkerURI.js +1 -5
- package/dist/BunkerURI.js.map +1 -1
- package/dist/NBrowserSigner.js +1 -5
- package/dist/NBrowserSigner.js.map +1 -1
- package/dist/NCache.d.ts +1 -1
- package/dist/NCache.d.ts.map +1 -1
- package/dist/NCache.js +8 -11
- package/dist/NCache.js.map +1 -1
- package/dist/NConnectSigner.js +7 -11
- package/dist/NConnectSigner.js.map +1 -1
- package/dist/NIP05.js +6 -10
- package/dist/NIP05.js.map +1 -1
- package/dist/NIP50.js +1 -5
- package/dist/NIP50.js.map +1 -1
- package/dist/NIP98.js +8 -12
- package/dist/NIP98.js.map +1 -1
- package/dist/NKinds.js +1 -5
- package/dist/NKinds.js.map +1 -1
- package/dist/NPool.js +9 -13
- package/dist/NPool.js.map +1 -1
- package/dist/NRelay1.js +16 -20
- package/dist/NRelay1.js.map +1 -1
- package/dist/NSchema.js +57 -61
- package/dist/NSchema.js.map +1 -1
- package/dist/NSecSigner.d.ts.map +1 -1
- package/dist/NSecSigner.js +10 -13
- package/dist/NSecSigner.js.map +1 -1
- package/dist/NSet.js +1 -4
- package/dist/NSet.js.map +1 -1
- package/dist/RelayError.js +1 -5
- package/dist/RelayError.js.map +1 -1
- package/dist/ln/LNURL.d.ts +3 -3
- package/dist/ln/LNURL.d.ts.map +1 -1
- package/dist/ln/LNURL.js +22 -26
- package/dist/ln/LNURL.js.map +1 -1
- package/dist/ln/mod.d.ts +3 -3
- package/dist/ln/mod.d.ts.map +1 -1
- package/dist/ln/mod.js +1 -5
- package/dist/ln/mod.js.map +1 -1
- package/dist/ln/types/LNURLCallback.js +1 -2
- package/dist/ln/types/LNURLDetails.js +1 -2
- package/dist/mod.d.ts +14 -14
- package/dist/mod.d.ts.map +1 -1
- package/dist/mod.js +14 -31
- package/dist/mod.js.map +1 -1
- package/dist/test/ErrorRelay.js +1 -5
- package/dist/test/ErrorRelay.js.map +1 -1
- package/dist/test/MockRelay.d.ts +2 -2
- package/dist/test/MockRelay.d.ts.map +1 -1
- package/dist/test/MockRelay.js +8 -12
- package/dist/test/MockRelay.js.map +1 -1
- package/dist/test/TestRelayServer.js +13 -17
- package/dist/test/TestRelayServer.js.map +1 -1
- package/dist/test/mod.d.ts +2 -2
- package/dist/test/mod.d.ts.map +1 -1
- package/dist/test/mod.js +8 -15
- package/dist/test/mod.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/uploaders/BlossomUploader.js +11 -15
- package/dist/uploaders/BlossomUploader.js.map +1 -1
- package/dist/uploaders/NostrBuildUploader.js +17 -21
- package/dist/uploaders/NostrBuildUploader.js.map +1 -1
- package/dist/uploaders/mod.d.ts +2 -2
- package/dist/uploaders/mod.d.ts.map +1 -1
- package/dist/uploaders/mod.js +2 -7
- package/dist/uploaders/mod.js.map +1 -1
- package/dist/utils/CircularSet.js +1 -5
- package/dist/utils/CircularSet.js.map +1 -1
- package/dist/utils/Machina.js +1 -5
- package/dist/utils/Machina.js.map +1 -1
- package/dist/utils/N64.js +7 -11
- package/dist/utils/N64.js.map +1 -1
- package/dist/utils/mod.d.ts +2 -2
- package/dist/utils/mod.d.ts.map +1 -1
- package/dist/utils/mod.js +2 -7
- package/dist/utils/mod.js.map +1 -1
- package/ln/LNURL.ts +3 -3
- package/ln/mod.ts +3 -3
- package/mod.ts +14 -14
- package/package.json +10 -9
- package/test/MockRelay.ts +2 -2
- package/test/TestRelayServer.ts +2 -2
- package/test/mod.ts +2 -2
- package/uploaders/BlossomUploader.ts +1 -1
- package/uploaders/NostrBuildUploader.ts +2 -2
- package/uploaders/mod.ts +2 -2
- package/utils/N64.ts +1 -1
- package/utils/mod.ts +2 -2
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.46.6
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Fix typescript config so it outputs ESM not CJS built files
|
|
8
|
+
- Updated dependencies
|
|
9
|
+
- @nostrify/types@0.36.2
|
|
10
|
+
|
|
11
|
+
## 0.46.5
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- fix package.json setup
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
- @nostrify/types@0.36.1
|
|
18
|
+
|
|
3
19
|
All notable changes to this project will be documented in this file.
|
|
4
20
|
|
|
5
21
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
package/NCache.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { NostrEvent, NostrFilter, NostrRelayCOUNT, NStore } from '@nostrify/type
|
|
|
4
4
|
import { LRUCache } from 'lru-cache';
|
|
5
5
|
import { matchFilters } from 'nostr-tools';
|
|
6
6
|
|
|
7
|
-
import { NSet } from './NSet';
|
|
7
|
+
import { NSet } from './NSet.js';
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* Nostr LRU cache based on [`npm:lru-cache`](https://www.npmjs.com/package/lru-cache).
|
package/NConnectSigner.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { z } from 'zod';
|
|
|
4
4
|
|
|
5
5
|
import { NostrConnectRequest, NostrConnectResponse, NostrEvent, NostrSigner, NRelay } from '@nostrify/types';
|
|
6
6
|
|
|
7
|
-
import { NSchema as n } from './NSchema';
|
|
7
|
+
import { NSchema as n } from './NSchema.js';
|
|
8
8
|
|
|
9
9
|
/** Options for `NConnectSigner`. */
|
|
10
10
|
export interface NConnectSignerOpts {
|
package/NIP05.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { NProfilePointer } from '@nostrify/types';
|
|
2
2
|
|
|
3
|
-
import { NSchema as n, z } from './NSchema';
|
|
3
|
+
import { NSchema as n, z } from './NSchema.js';
|
|
4
4
|
|
|
5
5
|
interface LookupOpts {
|
|
6
6
|
fetch?: typeof fetch;
|
|
@@ -15,7 +15,7 @@ export class NIP05 {
|
|
|
15
15
|
|
|
16
16
|
/** Nostr pubkey with relays object. */
|
|
17
17
|
private static profilePointerSchema(): z.ZodType<NProfilePointer> {
|
|
18
|
-
// @ts-expect-error
|
|
18
|
+
// @ts-expect-error this is fine
|
|
19
19
|
return z.object({
|
|
20
20
|
pubkey: n.id(),
|
|
21
21
|
relays: n.relayUrl().array().optional(),
|
package/NIP98.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { NostrEvent } from '@nostrify/types';
|
|
|
2
2
|
import { encodeHex } from '@std/encoding/hex';
|
|
3
3
|
import { verifyEvent as _verifyEvent } from 'nostr-tools';
|
|
4
4
|
|
|
5
|
-
import { N64 } from './utils/N64';
|
|
5
|
+
import { N64 } from './utils/N64.js';
|
|
6
6
|
|
|
7
7
|
/** [NIP-98](https://github.com/nostr-protocol/nips/blob/master/98.md) HTTP auth. */
|
|
8
8
|
export class NIP98 {
|
package/NPool.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { NostrEvent, NostrFilter, NostrRelayCLOSED, NostrRelayEOSE, NostrRelayEVENT, NRelay } from '@nostrify/types';
|
|
2
2
|
import { getFilterLimit } from 'nostr-tools';
|
|
3
3
|
|
|
4
|
-
import { CircularSet } from './utils/CircularSet';
|
|
5
|
-
import { Machina } from './utils/Machina';
|
|
6
|
-
import { NSet } from './NSet';
|
|
4
|
+
import { CircularSet } from './utils/CircularSet.js';
|
|
5
|
+
import { Machina } from './utils/Machina.js';
|
|
6
|
+
import { NSet } from './NSet.js';
|
|
7
7
|
|
|
8
8
|
export interface NPoolOpts<T extends NRelay> {
|
|
9
9
|
/** Creates an `NRelay` instance for the given URL. */
|
package/NRelay1.ts
CHANGED
|
@@ -15,9 +15,9 @@ import {
|
|
|
15
15
|
import { getFilterLimit, matchFilters, verifyEvent as _verifyEvent } from 'nostr-tools';
|
|
16
16
|
import { ArrayQueue, Backoff, ExponentialBackoff, Websocket, WebsocketBuilder, WebsocketEvent } from 'websocket-ts';
|
|
17
17
|
|
|
18
|
-
import { Machina } from './utils/Machina';
|
|
19
|
-
import { NSchema as n } from './NSchema';
|
|
20
|
-
import { NSet } from './NSet';
|
|
18
|
+
import { Machina } from './utils/Machina.js';
|
|
19
|
+
import { NSchema as n } from './NSchema.js';
|
|
20
|
+
import { NSet } from './NSet.js';
|
|
21
21
|
|
|
22
22
|
/** Map of EventEmitter events. */
|
|
23
23
|
type EventMap = {
|
package/NSecSigner.ts
CHANGED
package/dist/BunkerURI.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BunkerURI = void 0;
|
|
4
1
|
/** Construct a [NIP-46](https://github.com/nostr-protocol/nips/blob/master/46.md) bunker URI. */
|
|
5
|
-
class BunkerURI {
|
|
2
|
+
export class BunkerURI {
|
|
6
3
|
/** Remote signer pubkey. */
|
|
7
4
|
pubkey;
|
|
8
5
|
/** Relay URLs on which the client is listening for responses from the remote-signer. */
|
|
@@ -48,5 +45,4 @@ class BunkerURI {
|
|
|
48
45
|
return `bunker://${data.pubkey}?${search.toString()}`;
|
|
49
46
|
}
|
|
50
47
|
}
|
|
51
|
-
exports.BunkerURI = BunkerURI;
|
|
52
48
|
//# sourceMappingURL=BunkerURI.js.map
|
package/dist/BunkerURI.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BunkerURI.js","sourceRoot":"","sources":["../BunkerURI.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BunkerURI.js","sourceRoot":"","sources":["../BunkerURI.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,MAAM,OAAO,SAAS;IACpB,4BAA4B;IAC5B,MAAM,CAAS;IACf,wFAAwF;IACxF,MAAM,CAAW;IACjB,wGAAwG;IACxG,MAAM,CAAU;IAEhB,YAAY,GAAW;QACrB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE/C,gDAAgD;QAChD,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,6CAA6C;IAC7C,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAED,6CAA6C;IAC7C,QAAQ;QACN,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,gEAAgE;IAChE,MAAM,CAAC,QAAQ,CAAC,IAA2D;QACzE,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,6DAA6D;IACrD,MAAM,CAAC,QAAQ,CAAC,IAA2D;QACjF,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAErC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,YAAY,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IACxD,CAAC;CACF"}
|
package/dist/NBrowserSigner.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NBrowserSigner = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* NIP-07-compatible signer that proxies to browser extension, normalizing behavior across different implementations.
|
|
6
3
|
*
|
|
@@ -15,7 +12,7 @@ exports.NBrowserSigner = void 0;
|
|
|
15
12
|
* const event = await signer.signEvent({ kind: 1, content: 'Hello, world!', tags: [], created_at: 0 });
|
|
16
13
|
* ```
|
|
17
14
|
*/
|
|
18
|
-
class NBrowserSigner {
|
|
15
|
+
export class NBrowserSigner {
|
|
19
16
|
get nostr() {
|
|
20
17
|
const nostr = globalThis.nostr;
|
|
21
18
|
if (!nostr) {
|
|
@@ -92,5 +89,4 @@ class NBrowserSigner {
|
|
|
92
89
|
};
|
|
93
90
|
}
|
|
94
91
|
}
|
|
95
|
-
exports.NBrowserSigner = NBrowserSigner;
|
|
96
92
|
//# sourceMappingURL=NBrowserSigner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NBrowserSigner.js","sourceRoot":"","sources":["../NBrowserSigner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NBrowserSigner.js","sourceRoot":"","sources":["../NBrowserSigner.ts"],"names":[],"mappings":"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"}
|
package/dist/NCache.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { NostrEvent, NostrFilter, NostrRelayCOUNT, NStore } from '@nostrify/types';
|
|
2
2
|
import { LRUCache } from 'lru-cache';
|
|
3
|
-
import { NSet } from './NSet';
|
|
3
|
+
import { NSet } from './NSet.js';
|
|
4
4
|
/**
|
|
5
5
|
* Nostr LRU cache based on [`npm:lru-cache`](https://www.npmjs.com/package/lru-cache).
|
|
6
6
|
* It implements both `NStore` and `NSet` interfaces.
|
package/dist/NCache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NCache.d.ts","sourceRoot":"","sources":["../NCache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"NCache.d.ts","sourceRoot":"","sources":["../NCache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,cAAM,MAAO,SAAQ,IAAK,YAAW,MAAM;gBAEvC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAK/D,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAapD,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAQvD,CAAC,MAAM,CAAC,WAAW,CAAC,SAAY;CAC1C;AAED,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/NCache.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// deno-lint-ignore-file require-await
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const nostr_tools_1 = require("nostr-tools");
|
|
7
|
-
const NSet_1 = require("./NSet");
|
|
2
|
+
import { LRUCache } from 'lru-cache';
|
|
3
|
+
import { matchFilters } from 'nostr-tools';
|
|
4
|
+
import { NSet } from './NSet.js';
|
|
8
5
|
/**
|
|
9
6
|
* Nostr LRU cache based on [`npm:lru-cache`](https://www.npmjs.com/package/lru-cache).
|
|
10
7
|
* It implements both `NStore` and `NSet` interfaces.
|
|
@@ -26,9 +23,9 @@ const NSet_1 = require("./NSet");
|
|
|
26
23
|
* }
|
|
27
24
|
* ```
|
|
28
25
|
*/
|
|
29
|
-
class NCache extends
|
|
26
|
+
class NCache extends NSet {
|
|
30
27
|
constructor(...args) {
|
|
31
|
-
super(new
|
|
28
|
+
super(new LRUCache(...args));
|
|
32
29
|
}
|
|
33
30
|
async event(event) {
|
|
34
31
|
this.add(event);
|
|
@@ -36,7 +33,7 @@ class NCache extends NSet_1.NSet {
|
|
|
36
33
|
async query(filters) {
|
|
37
34
|
const events = [];
|
|
38
35
|
for (const event of this) {
|
|
39
|
-
if (
|
|
36
|
+
if (matchFilters(filters, event)) {
|
|
40
37
|
this.cache.get(event.id);
|
|
41
38
|
events.push(event);
|
|
42
39
|
}
|
|
@@ -45,7 +42,7 @@ class NCache extends NSet_1.NSet {
|
|
|
45
42
|
}
|
|
46
43
|
async remove(filters) {
|
|
47
44
|
for (const event of this) {
|
|
48
|
-
if (
|
|
45
|
+
if (matchFilters(filters, event)) {
|
|
49
46
|
this.delete(event);
|
|
50
47
|
}
|
|
51
48
|
}
|
|
@@ -59,5 +56,5 @@ class NCache extends NSet_1.NSet {
|
|
|
59
56
|
}
|
|
60
57
|
[Symbol.toStringTag] = 'NCache';
|
|
61
58
|
}
|
|
62
|
-
|
|
59
|
+
export { NCache };
|
|
63
60
|
//# sourceMappingURL=NCache.js.map
|
package/dist/NCache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NCache.js","sourceRoot":"","sources":["../NCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NCache.js","sourceRoot":"","sources":["../NCache.ts"],"names":[],"mappings":"AAAA,sCAAsC;AAGtC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,MAAO,SAAQ,IAAI;IACvB,YACE,GAAG,IAAgE;QAEnE,KAAK,CAAC,IAAI,QAAQ,CAAqB,GAAG,IAAI,CAA4B,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAiB;QAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAsB;QAChC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAsB;QACjC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,IAAI,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAsB;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,WAAW,EAAE,KAAK;SACnB,CAAC;IACJ,CAAC;IAEQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;CAC1C;AAED,OAAO,EAAE,MAAM,EAAE,CAAC"}
|
package/dist/NConnectSigner.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// deno-lint-ignore-file require-await
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const zod_1 = require("zod");
|
|
6
|
-
const NSchema_1 = require("./NSchema");
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { NSchema as n } from './NSchema.js';
|
|
7
4
|
/** [NIP-46](https://github.com/nostr-protocol/nips/blob/master/46.md) remote signer through a relay. */
|
|
8
|
-
class NConnectSigner {
|
|
5
|
+
export class NConnectSigner {
|
|
9
6
|
relay;
|
|
10
7
|
pubkey;
|
|
11
8
|
signer;
|
|
@@ -23,14 +20,14 @@ class NConnectSigner {
|
|
|
23
20
|
}
|
|
24
21
|
async signEvent(event) {
|
|
25
22
|
const result = await this.cmd('sign_event', [JSON.stringify(event)]);
|
|
26
|
-
return
|
|
23
|
+
return n.json().pipe(n.event()).parse(result);
|
|
27
24
|
}
|
|
28
25
|
async getRelays() {
|
|
29
26
|
const result = await this.cmd('get_relays', []);
|
|
30
27
|
// @ts-expect-error This should be fine.
|
|
31
|
-
return
|
|
28
|
+
return n
|
|
32
29
|
.json()
|
|
33
|
-
.pipe(
|
|
30
|
+
.pipe(z.record(z.string(), z.object({ read: z.boolean(), write: z.boolean() })))
|
|
34
31
|
.parse(result);
|
|
35
32
|
}
|
|
36
33
|
nip04 = {
|
|
@@ -91,7 +88,7 @@ class NConnectSigner {
|
|
|
91
88
|
if (msg[0] === 'EVENT') {
|
|
92
89
|
const event = msg[2];
|
|
93
90
|
const decrypted = await this.decrypt(this.pubkey, event.content);
|
|
94
|
-
const response =
|
|
91
|
+
const response = n.json().pipe(n.connectResponse()).parse(decrypted);
|
|
95
92
|
if (response.id === request.id) {
|
|
96
93
|
resolve(response);
|
|
97
94
|
return;
|
|
@@ -126,5 +123,4 @@ class NConnectSigner {
|
|
|
126
123
|
}
|
|
127
124
|
}
|
|
128
125
|
}
|
|
129
|
-
exports.NConnectSigner = NConnectSigner;
|
|
130
126
|
//# sourceMappingURL=NConnectSigner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NConnectSigner.js","sourceRoot":"","sources":["../NConnectSigner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NConnectSigner.js","sourceRoot":"","sources":["../NConnectSigner.ts"],"names":[],"mappings":"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"}
|
package/dist/NIP05.js
CHANGED
|
@@ -1,18 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.NIP05 = void 0;
|
|
4
|
-
const NSchema_1 = require("./NSchema");
|
|
5
|
-
class NIP05 {
|
|
1
|
+
import { NSchema as n, z } from './NSchema.js';
|
|
2
|
+
export class NIP05 {
|
|
6
3
|
/** NIP-05 value regex. */
|
|
7
4
|
static regex() {
|
|
8
5
|
return /^(?:([\w.+-]+)@)?([\w.-]+)$/;
|
|
9
6
|
}
|
|
10
7
|
/** Nostr pubkey with relays object. */
|
|
11
8
|
static profilePointerSchema() {
|
|
12
|
-
// @ts-expect-error
|
|
13
|
-
return
|
|
14
|
-
pubkey:
|
|
15
|
-
relays:
|
|
9
|
+
// @ts-expect-error this is fine
|
|
10
|
+
return z.object({
|
|
11
|
+
pubkey: n.id(),
|
|
12
|
+
relays: n.relayUrl().array().optional(),
|
|
16
13
|
});
|
|
17
14
|
}
|
|
18
15
|
/** Resolve NIP-05 name to a profile pointer. */
|
|
@@ -36,5 +33,4 @@ class NIP05 {
|
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
35
|
}
|
|
39
|
-
exports.NIP05 = NIP05;
|
|
40
36
|
//# sourceMappingURL=NIP05.js.map
|
package/dist/NIP05.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NIP05.js","sourceRoot":"","sources":["../NIP05.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NIP05.js","sourceRoot":"","sources":["../NIP05.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,cAAc,CAAC;AAO/C,MAAM,OAAO,KAAK;IAChB,0BAA0B;IAC1B,MAAM,CAAC,KAAK;QACV,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,uCAAuC;IAC/B,MAAM,CAAC,oBAAoB;QACjC,gCAAgC;QAChC,OAAO,CAAC,CAAC,MAAM,CAAC;YACd,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;SACxC,CAAC,CAAC;IACL,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,KAAa,EACb,IAAiB;QAEjB,MAAM,EAAE,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QAEzE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;QAEtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,yBAAyB,EAAE,WAAW,MAAM,GAAG,CAAC,CAAC;QACrE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;YAErC,OAAO,KAAK,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;CACF"}
|
package/dist/NIP50.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NIP50 = void 0;
|
|
4
1
|
/** [NIP-50](https://github.com/nostr-protocol/nips/blob/master/50.md) search functionality. */
|
|
5
|
-
class NIP50 {
|
|
2
|
+
export class NIP50 {
|
|
6
3
|
static parseInput(input) {
|
|
7
4
|
const regex = /(\B-\w+:[^\s"]+)|(\b\w+:[^\s"]+)|(".*?")|(\S+)/g;
|
|
8
5
|
const tokens = [];
|
|
@@ -22,5 +19,4 @@ class NIP50 {
|
|
|
22
19
|
return tokens;
|
|
23
20
|
}
|
|
24
21
|
}
|
|
25
|
-
exports.NIP50 = NIP50;
|
|
26
22
|
//# sourceMappingURL=NIP50.js.map
|
package/dist/NIP50.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NIP50.js","sourceRoot":"","sources":["../NIP50.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NIP50.js","sourceRoot":"","sources":["../NIP50.ts"],"names":[],"mappings":"AAEA,+FAA+F;AAC/F,MAAM,OAAO,KAAK;IAChB,MAAM,CAAC,UAAU,CAAC,KAAa;QAC7B,MAAM,KAAK,GAAG,iDAAiD,CAAC;QAEhE,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,IAAI,KAA6B,CAAC;QAElC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5C,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3D,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,CAAC;iBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC1C,CAAC;iBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
package/dist/NIP98.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const hex_1 = require("@std/encoding/hex");
|
|
5
|
-
const nostr_tools_1 = require("nostr-tools");
|
|
6
|
-
const N64_1 = require("./utils/N64");
|
|
1
|
+
import { encodeHex } from '@std/encoding/hex';
|
|
2
|
+
import { verifyEvent as _verifyEvent } from 'nostr-tools';
|
|
3
|
+
import { N64 } from './utils/N64.js';
|
|
7
4
|
/** [NIP-98](https://github.com/nostr-protocol/nips/blob/master/98.md) HTTP auth. */
|
|
8
|
-
class NIP98 {
|
|
5
|
+
export class NIP98 {
|
|
9
6
|
/** Generate an auth event template from a Request. */
|
|
10
7
|
static async template(request, opts) {
|
|
11
8
|
const { validatePayload = ['POST', 'PUT', 'PATCH'].includes(request.method), } = opts ?? {};
|
|
@@ -17,7 +14,7 @@ class NIP98 {
|
|
|
17
14
|
if (validatePayload) {
|
|
18
15
|
const buffer = await request.clone().arrayBuffer();
|
|
19
16
|
const digest = await crypto.subtle.digest('SHA-256', buffer);
|
|
20
|
-
tags.push(['payload',
|
|
17
|
+
tags.push(['payload', encodeHex(digest)]);
|
|
21
18
|
}
|
|
22
19
|
return {
|
|
23
20
|
kind: 27235,
|
|
@@ -28,7 +25,7 @@ class NIP98 {
|
|
|
28
25
|
}
|
|
29
26
|
/** Compare the auth event with the request, throwing a human-readable error if validation fails. */
|
|
30
27
|
static async verify(request, opts) {
|
|
31
|
-
const { maxAge = 60_000, validatePayload = ['POST', 'PUT', 'PATCH'].includes(request.method), verifyEvent =
|
|
28
|
+
const { maxAge = 60_000, validatePayload = ['POST', 'PUT', 'PATCH'].includes(request.method), verifyEvent = _verifyEvent, } = opts ?? {};
|
|
32
29
|
const header = request.headers.get('authorization');
|
|
33
30
|
if (!header) {
|
|
34
31
|
throw new Error('Missing Nostr authorization header');
|
|
@@ -37,7 +34,7 @@ class NIP98 {
|
|
|
37
34
|
if (!token) {
|
|
38
35
|
throw new Error('Missing Nostr authorization token');
|
|
39
36
|
}
|
|
40
|
-
const event =
|
|
37
|
+
const event = N64.decodeEvent(token);
|
|
41
38
|
if (!verifyEvent(event)) {
|
|
42
39
|
throw new Error('Event signature is invalid');
|
|
43
40
|
}
|
|
@@ -60,12 +57,11 @@ class NIP98 {
|
|
|
60
57
|
if (validatePayload && payload !== undefined) {
|
|
61
58
|
const buffer = await request.clone().arrayBuffer();
|
|
62
59
|
const digest = await crypto.subtle.digest('SHA-256', buffer);
|
|
63
|
-
if (
|
|
60
|
+
if (encodeHex(digest) !== payload) {
|
|
64
61
|
throw new Error('Event payload does not match request body');
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
return event;
|
|
68
65
|
}
|
|
69
66
|
}
|
|
70
|
-
exports.NIP98 = NIP98;
|
|
71
67
|
//# sourceMappingURL=NIP98.js.map
|
package/dist/NIP98.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NIP98.js","sourceRoot":"","sources":["../NIP98.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NIP98.js","sourceRoot":"","sources":["../NIP98.ts"],"names":[],"mappings":"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"}
|
package/dist/NKinds.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NKinds = void 0;
|
|
4
|
-
class NKinds {
|
|
1
|
+
export class NKinds {
|
|
5
2
|
/** Events are **regular**, which means they're all expected to be stored by relays. */
|
|
6
3
|
static regular(kind) {
|
|
7
4
|
return (1000 <= kind && kind < 10000) || [1, 2, 4, 5, 6, 7, 8, 16, 40, 41, 42, 43, 44].includes(kind);
|
|
@@ -23,5 +20,4 @@ class NKinds {
|
|
|
23
20
|
return NKinds.addressable(kind);
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
exports.NKinds = NKinds;
|
|
27
23
|
//# sourceMappingURL=NKinds.js.map
|
package/dist/NKinds.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NKinds.js","sourceRoot":"","sources":["../NKinds.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NKinds.js","sourceRoot":"","sources":["../NKinds.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;IACjB,uFAAuF;IACvF,MAAM,CAAC,OAAO,CAAC,IAAY;QACzB,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxG,CAAC;IAED,iNAAiN;IACjN,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAED,0FAA0F;IAC1F,MAAM,CAAC,SAAS,CAAC,IAAY;QAC3B,OAAO,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC;IACvC,CAAC;IAED,qNAAqN;IACrN,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,KAAK,IAAI,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC;IACvC,CAAC;IAED,sDAAsD;IACtD,MAAM,CAAC,wBAAwB,CAAC,IAAY;QAC1C,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACF"}
|
package/dist/NPool.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const CircularSet_1 = require("./utils/CircularSet");
|
|
6
|
-
const Machina_1 = require("./utils/Machina");
|
|
7
|
-
const NSet_1 = require("./NSet");
|
|
1
|
+
import { getFilterLimit } from 'nostr-tools';
|
|
2
|
+
import { CircularSet } from './utils/CircularSet.js';
|
|
3
|
+
import { Machina } from './utils/Machina.js';
|
|
4
|
+
import { NSet } from './NSet.js';
|
|
8
5
|
/**
|
|
9
6
|
* The `NPool` class is a `NRelay` implementation for connecting to multiple relays.
|
|
10
7
|
*
|
|
@@ -34,7 +31,7 @@ const NSet_1 = require("./NSet");
|
|
|
34
31
|
*
|
|
35
32
|
* `pool.req` will only emit an `EOSE` when all relays in its set have emitted an `EOSE`, and likewise for `CLOSED`.
|
|
36
33
|
*/
|
|
37
|
-
class NPool {
|
|
34
|
+
export class NPool {
|
|
38
35
|
opts;
|
|
39
36
|
_relays = new Map();
|
|
40
37
|
constructor(opts) {
|
|
@@ -82,10 +79,10 @@ class NPool {
|
|
|
82
79
|
if (routes.size < 1) {
|
|
83
80
|
return;
|
|
84
81
|
}
|
|
85
|
-
const machina = new
|
|
82
|
+
const machina = new Machina(signal);
|
|
86
83
|
const eoses = new Set();
|
|
87
84
|
const closes = new Set();
|
|
88
|
-
const events = new
|
|
85
|
+
const events = new CircularSet(1000);
|
|
89
86
|
for (const [url, filters] of routes.entries()) {
|
|
90
87
|
const relay = this.relay(url);
|
|
91
88
|
(async () => {
|
|
@@ -148,8 +145,8 @@ class NPool {
|
|
|
148
145
|
*/
|
|
149
146
|
async query(filters, opts) {
|
|
150
147
|
const map = new Map();
|
|
151
|
-
const events = new
|
|
152
|
-
const limit = filters.reduce((result, filter) => result +
|
|
148
|
+
const events = new NSet(map);
|
|
149
|
+
const limit = filters.reduce((result, filter) => result + getFilterLimit(filter), 0);
|
|
153
150
|
if (limit === 0)
|
|
154
151
|
return [];
|
|
155
152
|
try {
|
|
@@ -181,5 +178,4 @@ class NPool {
|
|
|
181
178
|
await this.close();
|
|
182
179
|
}
|
|
183
180
|
}
|
|
184
|
-
exports.NPool = NPool;
|
|
185
181
|
//# sourceMappingURL=NPool.js.map
|
package/dist/NPool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NPool.js","sourceRoot":"","sources":["../NPool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NPool.js","sourceRoot":"","sources":["../NPool.ts"],"names":[],"mappings":"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"}
|