@welshman/signer 0.0.11 → 0.0.13
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.
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing,
|
|
13
|
+
var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing, _Nip46Broker_connectResponse, _Nip46Broker_queue, _Nip46Broker_sub, _Nip46Broker_subscribe, _Nip46Broker_processQueue, _Nip46Broker_getResult, _Nip46Signer_pubkey;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.Nip46Signer = exports.Nip46Broker = void 0;
|
|
16
16
|
const lib_1 = require("@welshman/lib");
|
|
@@ -20,6 +20,35 @@ const util_2 = require("../util.cjs");
|
|
|
20
20
|
const nip01_1 = require("./nip01.cjs");
|
|
21
21
|
let singleton;
|
|
22
22
|
class Nip46Broker extends lib_1.Emitter {
|
|
23
|
+
static initiate({ url, name, image, perms, relays, abortController }) {
|
|
24
|
+
const secret = Math.random().toString(36).substring(7);
|
|
25
|
+
const clientSecret = (0, util_2.makeSecret)();
|
|
26
|
+
const clientPubkey = (0, util_2.getPubkey)(clientSecret);
|
|
27
|
+
const clientSigner = new nip01_1.Nip01Signer(clientSecret);
|
|
28
|
+
const params = new URLSearchParams({ secret, url, name, image, perms });
|
|
29
|
+
for (const relay of relays) {
|
|
30
|
+
params.append('relay', relay);
|
|
31
|
+
}
|
|
32
|
+
const nostrconnect = `nostrconnect://${clientPubkey}?${params.toString()}`;
|
|
33
|
+
const result = new Promise(resolve => {
|
|
34
|
+
const complete = (pubkey) => {
|
|
35
|
+
sub.close();
|
|
36
|
+
resolve(pubkey);
|
|
37
|
+
};
|
|
38
|
+
const sub = (0, net_1.subscribe)({
|
|
39
|
+
relays,
|
|
40
|
+
filters: [{ kinds: [util_1.NOSTR_CONNECT], "#p": [clientPubkey] }],
|
|
41
|
+
onEvent: async ({ pubkey, content }) => {
|
|
42
|
+
const response = await (0, lib_1.tryCatch)(async () => JSON.parse(await (0, util_2.decrypt)(clientSigner, pubkey, content)));
|
|
43
|
+
if ((response === null || response === void 0 ? void 0 : response.result) === secret) {
|
|
44
|
+
complete(pubkey);
|
|
45
|
+
}
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
abortController === null || abortController === void 0 ? void 0 : abortController.signal.addEventListener('abort', () => complete());
|
|
49
|
+
});
|
|
50
|
+
return { result, params, nostrconnect, clientSecret, clientPubkey };
|
|
51
|
+
}
|
|
23
52
|
static parseBunkerLink(link) {
|
|
24
53
|
let token = "";
|
|
25
54
|
let pubkey = "";
|
|
@@ -50,7 +79,7 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
50
79
|
_Nip46Broker_algorithm.set(this, void 0);
|
|
51
80
|
_Nip46Broker_closed.set(this, false);
|
|
52
81
|
_Nip46Broker_processing.set(this, false);
|
|
53
|
-
|
|
82
|
+
_Nip46Broker_connectResponse.set(this, void 0);
|
|
54
83
|
_Nip46Broker_queue.set(this, []);
|
|
55
84
|
_Nip46Broker_sub.set(this, void 0);
|
|
56
85
|
_Nip46Broker_subscribe.set(this, async () => {
|
|
@@ -61,21 +90,21 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
61
90
|
}
|
|
62
91
|
__classPrivateFieldSet(this, _Nip46Broker_sub, (0, net_1.subscribe)({
|
|
63
92
|
relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
|
|
64
|
-
filters: [{
|
|
93
|
+
filters: [{ kinds: [util_1.NOSTR_CONNECT], "#p": [pubkey] }],
|
|
65
94
|
}), "f");
|
|
66
|
-
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(
|
|
67
|
-
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(
|
|
68
|
-
const json = await (0, util_2.decrypt)(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"),
|
|
69
|
-
const
|
|
70
|
-
if (!
|
|
95
|
+
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(net_1.SubscriptionEvent.Send, resolve);
|
|
96
|
+
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(net_1.SubscriptionEvent.Event, async (url, event) => {
|
|
97
|
+
const json = await (0, util_2.decrypt)(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), event.pubkey, event.content);
|
|
98
|
+
const response = (0, lib_1.tryCatch)(() => JSON.parse(json));
|
|
99
|
+
if (!response.id) {
|
|
71
100
|
console.error(`Invalid nostr-connect response: ${json}`);
|
|
72
101
|
}
|
|
73
|
-
console.log('nip46 response:',
|
|
74
|
-
if (
|
|
75
|
-
this.emit(`auth-${
|
|
102
|
+
console.log('nip46 response:', response);
|
|
103
|
+
if (response.result === "auth_url") {
|
|
104
|
+
this.emit(`auth-${response.id}`, { ...response, url, event });
|
|
76
105
|
}
|
|
77
106
|
else {
|
|
78
|
-
this.emit(`res-${
|
|
107
|
+
this.emit(`res-${response.id}`, { ...response, url, event });
|
|
79
108
|
}
|
|
80
109
|
});
|
|
81
110
|
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on("complete", () => {
|
|
@@ -91,20 +120,19 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
91
120
|
try {
|
|
92
121
|
while (__classPrivateFieldGet(this, _Nip46Broker_queue, "f").length > 0) {
|
|
93
122
|
const [{ method, params, resolve }] = __classPrivateFieldGet(this, _Nip46Broker_queue, "f").splice(0, 1);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
// important user actions
|
|
98
|
-
await Promise.race([
|
|
99
|
-
this.request(method, params).then(resolve),
|
|
100
|
-
(0, lib_1.sleep)(15),
|
|
101
|
-
]);
|
|
123
|
+
this.request(method, params).then(resolve, error => {
|
|
124
|
+
console.error(`Failed to send nip46 request`, { method, params, error });
|
|
125
|
+
});
|
|
102
126
|
}
|
|
103
127
|
}
|
|
104
128
|
finally {
|
|
105
129
|
__classPrivateFieldSet(this, _Nip46Broker_processing, false, "f");
|
|
106
130
|
}
|
|
107
131
|
});
|
|
132
|
+
_Nip46Broker_getResult.set(this, async (promise) => {
|
|
133
|
+
const { result } = await promise;
|
|
134
|
+
return result;
|
|
135
|
+
});
|
|
108
136
|
this.request = async (method, params) => {
|
|
109
137
|
if (__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
|
|
110
138
|
throw new Error("Attempted to make a nip46 request with a closed broker");
|
|
@@ -122,16 +150,16 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
122
150
|
relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
|
|
123
151
|
event: await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").sign(template),
|
|
124
152
|
});
|
|
125
|
-
this.once(`auth-${id}`,
|
|
126
|
-
window.open(
|
|
153
|
+
this.once(`auth-${id}`, response => {
|
|
154
|
+
window.open(response.error, "", "width=600,height=800,popup=yes");
|
|
127
155
|
});
|
|
128
156
|
return new Promise((resolve, reject) => {
|
|
129
|
-
this.once(`res-${id}`, (
|
|
130
|
-
if (error) {
|
|
131
|
-
reject(
|
|
157
|
+
this.once(`res-${id}`, (response) => {
|
|
158
|
+
if (response.error) {
|
|
159
|
+
reject(response);
|
|
132
160
|
}
|
|
133
161
|
else {
|
|
134
|
-
resolve(
|
|
162
|
+
resolve(response);
|
|
135
163
|
}
|
|
136
164
|
});
|
|
137
165
|
});
|
|
@@ -144,31 +172,21 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
144
172
|
if (!__classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain) {
|
|
145
173
|
throw new Error("Unable to create an account without a handler domain");
|
|
146
174
|
}
|
|
147
|
-
return this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]);
|
|
175
|
+
return __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]));
|
|
148
176
|
};
|
|
149
|
-
this.connect = async (token = "", perms = "") => {
|
|
150
|
-
if (!__classPrivateFieldGet(this,
|
|
177
|
+
this.connect = async (token = "", perms = "", secret = "") => {
|
|
178
|
+
if (!__classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f")) {
|
|
151
179
|
const params = ["", token, perms];
|
|
152
|
-
__classPrivateFieldSet(this,
|
|
180
|
+
__classPrivateFieldSet(this, _Nip46Broker_connectResponse, await this.enqueue("connect", params), "f");
|
|
153
181
|
}
|
|
154
|
-
return __classPrivateFieldGet(this,
|
|
155
|
-
};
|
|
156
|
-
this.getPublicKey = () => this.enqueue("get_public_key", []);
|
|
157
|
-
this.signEvent = async (event) => {
|
|
158
|
-
return JSON.parse(await this.enqueue("sign_event", [JSON.stringify(event)]));
|
|
159
|
-
};
|
|
160
|
-
this.nip04Encrypt = (pk, message) => {
|
|
161
|
-
return this.enqueue("nip04_encrypt", [pk, message]);
|
|
162
|
-
};
|
|
163
|
-
this.nip04Decrypt = (pk, message) => {
|
|
164
|
-
return this.enqueue("nip04_decrypt", [pk, message]);
|
|
165
|
-
};
|
|
166
|
-
this.nip44Encrypt = (pk, message) => {
|
|
167
|
-
return this.enqueue("nip44_encrypt", [pk, message]);
|
|
168
|
-
};
|
|
169
|
-
this.nip44Decrypt = (pk, message) => {
|
|
170
|
-
return this.enqueue("nip44_decrypt", [pk, message]);
|
|
182
|
+
return __classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f").result === 'ack';
|
|
171
183
|
};
|
|
184
|
+
this.getPublicKey = () => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("get_public_key", []));
|
|
185
|
+
this.signEvent = async (event) => JSON.parse(await __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("sign_event", [JSON.stringify(event)])));
|
|
186
|
+
this.nip04Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_encrypt", [pk, message]));
|
|
187
|
+
this.nip04Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_decrypt", [pk, message]));
|
|
188
|
+
this.nip44Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_encrypt", [pk, message]));
|
|
189
|
+
this.nip44Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_decrypt", [pk, message]));
|
|
172
190
|
this.teardown = () => {
|
|
173
191
|
var _a;
|
|
174
192
|
__classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
|
|
@@ -183,7 +201,7 @@ class Nip46Broker extends lib_1.Emitter {
|
|
|
183
201
|
}
|
|
184
202
|
}
|
|
185
203
|
exports.Nip46Broker = Nip46Broker;
|
|
186
|
-
_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(),
|
|
204
|
+
_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(), _Nip46Broker_connectResponse = new WeakMap(), _Nip46Broker_queue = new WeakMap(), _Nip46Broker_sub = new WeakMap(), _Nip46Broker_subscribe = new WeakMap(), _Nip46Broker_processQueue = new WeakMap(), _Nip46Broker_getResult = new WeakMap();
|
|
187
205
|
class Nip46Signer {
|
|
188
206
|
constructor(broker) {
|
|
189
207
|
this.broker = broker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nip46.cjs","sourceRoot":"","sources":["../../../src/signers/nip46.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"nip46.cjs","sourceRoot":"","sources":["../../../src/signers/nip46.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Emitter } from "@welshman/lib";
|
|
2
|
-
import { StampedEvent } from "@welshman/util";
|
|
2
|
+
import { TrustedEvent, StampedEvent } from "@welshman/util";
|
|
3
3
|
import { ISigner } from '../util';
|
|
4
4
|
export type Nip46Algorithm = "nip04" | "nip44";
|
|
5
5
|
export type Nip46Handler = {
|
|
@@ -7,19 +7,53 @@ export type Nip46Handler = {
|
|
|
7
7
|
pubkey: string;
|
|
8
8
|
domain?: string;
|
|
9
9
|
};
|
|
10
|
+
export type Nip46InitiateParams = {
|
|
11
|
+
url: string;
|
|
12
|
+
name: string;
|
|
13
|
+
image: string;
|
|
14
|
+
perms: string;
|
|
15
|
+
relays: string[];
|
|
16
|
+
abortController?: AbortController;
|
|
17
|
+
};
|
|
10
18
|
export type Nip46BrokerParams = {
|
|
11
19
|
secret: string;
|
|
12
20
|
handler: Nip46Handler;
|
|
13
21
|
algorithm?: Nip46Algorithm;
|
|
14
22
|
};
|
|
23
|
+
export type Nip46Request = {
|
|
24
|
+
method: string;
|
|
25
|
+
params: string[];
|
|
26
|
+
resolve: (result: Nip46ResponseWithResult) => void;
|
|
27
|
+
};
|
|
15
28
|
export type Nip46Response = {
|
|
16
29
|
id: string;
|
|
30
|
+
url: string;
|
|
31
|
+
event: TrustedEvent;
|
|
17
32
|
error?: string;
|
|
18
33
|
result?: string;
|
|
19
34
|
};
|
|
35
|
+
export type Nip46ResponseWithResult = {
|
|
36
|
+
id: string;
|
|
37
|
+
url: string;
|
|
38
|
+
event: TrustedEvent;
|
|
39
|
+
result: string;
|
|
40
|
+
};
|
|
41
|
+
export type Nip46ResponseWithError = {
|
|
42
|
+
id: string;
|
|
43
|
+
url: string;
|
|
44
|
+
event: TrustedEvent;
|
|
45
|
+
error: string;
|
|
46
|
+
};
|
|
20
47
|
export declare class Nip46Broker extends Emitter {
|
|
21
48
|
#private;
|
|
22
49
|
private params;
|
|
50
|
+
static initiate({ url, name, image, perms, relays, abortController }: Nip46InitiateParams): {
|
|
51
|
+
result: Promise<string | undefined>;
|
|
52
|
+
params: URLSearchParams;
|
|
53
|
+
nostrconnect: string;
|
|
54
|
+
clientSecret: string;
|
|
55
|
+
clientPubkey: string;
|
|
56
|
+
};
|
|
23
57
|
static parseBunkerLink(link: string): {
|
|
24
58
|
token: string;
|
|
25
59
|
pubkey: string;
|
|
@@ -28,10 +62,10 @@ export declare class Nip46Broker extends Emitter {
|
|
|
28
62
|
static get(params: Nip46BrokerParams): Nip46Broker;
|
|
29
63
|
constructor(params: Nip46BrokerParams);
|
|
30
64
|
hasParams(params: Nip46BrokerParams): boolean;
|
|
31
|
-
request: (method: string, params: string[]) => Promise<
|
|
32
|
-
enqueue: (method: string, params: string[]) => Promise<
|
|
65
|
+
request: (method: string, params: string[]) => Promise<Nip46ResponseWithResult>;
|
|
66
|
+
enqueue: (method: string, params: string[]) => Promise<Nip46ResponseWithResult>;
|
|
33
67
|
createAccount: (username: string, perms?: string) => Promise<string>;
|
|
34
|
-
connect: (token?: string, perms?: string) => Promise<boolean>;
|
|
68
|
+
connect: (token?: string, perms?: string, secret?: string) => Promise<boolean>;
|
|
35
69
|
getPublicKey: () => Promise<string>;
|
|
36
70
|
signEvent: (event: StampedEvent) => Promise<any>;
|
|
37
71
|
nip04Encrypt: (pk: string, message: string) => Promise<string>;
|
|
@@ -9,14 +9,43 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
9
9
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
10
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
11
|
};
|
|
12
|
-
var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing,
|
|
13
|
-
import { Emitter,
|
|
12
|
+
var _Nip46Broker_signer, _Nip46Broker_handler, _Nip46Broker_algorithm, _Nip46Broker_closed, _Nip46Broker_processing, _Nip46Broker_connectResponse, _Nip46Broker_queue, _Nip46Broker_sub, _Nip46Broker_subscribe, _Nip46Broker_processQueue, _Nip46Broker_getResult, _Nip46Signer_pubkey;
|
|
13
|
+
import { Emitter, tryCatch, randomId, equals } from "@welshman/lib";
|
|
14
14
|
import { createEvent, NOSTR_CONNECT } from "@welshman/util";
|
|
15
|
-
import { subscribe, publish } from "@welshman/net";
|
|
16
|
-
import { decrypt, hash, own } from "../util.mjs";
|
|
15
|
+
import { subscribe, publish, SubscriptionEvent } from "@welshman/net";
|
|
16
|
+
import { decrypt, hash, own, makeSecret, getPubkey } from "../util.mjs";
|
|
17
17
|
import { Nip01Signer } from "./nip01.mjs";
|
|
18
18
|
let singleton;
|
|
19
19
|
export class Nip46Broker extends Emitter {
|
|
20
|
+
static initiate({ url, name, image, perms, relays, abortController }) {
|
|
21
|
+
const secret = Math.random().toString(36).substring(7);
|
|
22
|
+
const clientSecret = makeSecret();
|
|
23
|
+
const clientPubkey = getPubkey(clientSecret);
|
|
24
|
+
const clientSigner = new Nip01Signer(clientSecret);
|
|
25
|
+
const params = new URLSearchParams({ secret, url, name, image, perms });
|
|
26
|
+
for (const relay of relays) {
|
|
27
|
+
params.append('relay', relay);
|
|
28
|
+
}
|
|
29
|
+
const nostrconnect = `nostrconnect://${clientPubkey}?${params.toString()}`;
|
|
30
|
+
const result = new Promise(resolve => {
|
|
31
|
+
const complete = (pubkey) => {
|
|
32
|
+
sub.close();
|
|
33
|
+
resolve(pubkey);
|
|
34
|
+
};
|
|
35
|
+
const sub = subscribe({
|
|
36
|
+
relays,
|
|
37
|
+
filters: [{ kinds: [NOSTR_CONNECT], "#p": [clientPubkey] }],
|
|
38
|
+
onEvent: async ({ pubkey, content }) => {
|
|
39
|
+
const response = await tryCatch(async () => JSON.parse(await decrypt(clientSigner, pubkey, content)));
|
|
40
|
+
if ((response === null || response === void 0 ? void 0 : response.result) === secret) {
|
|
41
|
+
complete(pubkey);
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
abortController === null || abortController === void 0 ? void 0 : abortController.signal.addEventListener('abort', () => complete());
|
|
46
|
+
});
|
|
47
|
+
return { result, params, nostrconnect, clientSecret, clientPubkey };
|
|
48
|
+
}
|
|
20
49
|
static parseBunkerLink(link) {
|
|
21
50
|
let token = "";
|
|
22
51
|
let pubkey = "";
|
|
@@ -47,7 +76,7 @@ export class Nip46Broker extends Emitter {
|
|
|
47
76
|
_Nip46Broker_algorithm.set(this, void 0);
|
|
48
77
|
_Nip46Broker_closed.set(this, false);
|
|
49
78
|
_Nip46Broker_processing.set(this, false);
|
|
50
|
-
|
|
79
|
+
_Nip46Broker_connectResponse.set(this, void 0);
|
|
51
80
|
_Nip46Broker_queue.set(this, []);
|
|
52
81
|
_Nip46Broker_sub.set(this, void 0);
|
|
53
82
|
_Nip46Broker_subscribe.set(this, async () => {
|
|
@@ -58,21 +87,21 @@ export class Nip46Broker extends Emitter {
|
|
|
58
87
|
}
|
|
59
88
|
__classPrivateFieldSet(this, _Nip46Broker_sub, subscribe({
|
|
60
89
|
relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
|
|
61
|
-
filters: [{
|
|
90
|
+
filters: [{ kinds: [NOSTR_CONNECT], "#p": [pubkey] }],
|
|
62
91
|
}), "f");
|
|
63
|
-
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(
|
|
64
|
-
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(
|
|
65
|
-
const json = await decrypt(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"),
|
|
66
|
-
const
|
|
67
|
-
if (!
|
|
92
|
+
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(SubscriptionEvent.Send, resolve);
|
|
93
|
+
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on(SubscriptionEvent.Event, async (url, event) => {
|
|
94
|
+
const json = await decrypt(__classPrivateFieldGet(this, _Nip46Broker_signer, "f"), event.pubkey, event.content);
|
|
95
|
+
const response = tryCatch(() => JSON.parse(json));
|
|
96
|
+
if (!response.id) {
|
|
68
97
|
console.error(`Invalid nostr-connect response: ${json}`);
|
|
69
98
|
}
|
|
70
|
-
console.log('nip46 response:',
|
|
71
|
-
if (
|
|
72
|
-
this.emit(`auth-${
|
|
99
|
+
console.log('nip46 response:', response);
|
|
100
|
+
if (response.result === "auth_url") {
|
|
101
|
+
this.emit(`auth-${response.id}`, { ...response, url, event });
|
|
73
102
|
}
|
|
74
103
|
else {
|
|
75
|
-
this.emit(`res-${
|
|
104
|
+
this.emit(`res-${response.id}`, { ...response, url, event });
|
|
76
105
|
}
|
|
77
106
|
});
|
|
78
107
|
__classPrivateFieldGet(this, _Nip46Broker_sub, "f").emitter.on("complete", () => {
|
|
@@ -88,20 +117,19 @@ export class Nip46Broker extends Emitter {
|
|
|
88
117
|
try {
|
|
89
118
|
while (__classPrivateFieldGet(this, _Nip46Broker_queue, "f").length > 0) {
|
|
90
119
|
const [{ method, params, resolve }] = __classPrivateFieldGet(this, _Nip46Broker_queue, "f").splice(0, 1);
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
// important user actions
|
|
95
|
-
await Promise.race([
|
|
96
|
-
this.request(method, params).then(resolve),
|
|
97
|
-
sleep(15),
|
|
98
|
-
]);
|
|
120
|
+
this.request(method, params).then(resolve, error => {
|
|
121
|
+
console.error(`Failed to send nip46 request`, { method, params, error });
|
|
122
|
+
});
|
|
99
123
|
}
|
|
100
124
|
}
|
|
101
125
|
finally {
|
|
102
126
|
__classPrivateFieldSet(this, _Nip46Broker_processing, false, "f");
|
|
103
127
|
}
|
|
104
128
|
});
|
|
129
|
+
_Nip46Broker_getResult.set(this, async (promise) => {
|
|
130
|
+
const { result } = await promise;
|
|
131
|
+
return result;
|
|
132
|
+
});
|
|
105
133
|
this.request = async (method, params) => {
|
|
106
134
|
if (__classPrivateFieldGet(this, _Nip46Broker_closed, "f")) {
|
|
107
135
|
throw new Error("Attempted to make a nip46 request with a closed broker");
|
|
@@ -119,16 +147,16 @@ export class Nip46Broker extends Emitter {
|
|
|
119
147
|
relays: __classPrivateFieldGet(this, _Nip46Broker_handler, "f").relays,
|
|
120
148
|
event: await __classPrivateFieldGet(this, _Nip46Broker_signer, "f").sign(template),
|
|
121
149
|
});
|
|
122
|
-
this.once(`auth-${id}`,
|
|
123
|
-
window.open(
|
|
150
|
+
this.once(`auth-${id}`, response => {
|
|
151
|
+
window.open(response.error, "", "width=600,height=800,popup=yes");
|
|
124
152
|
});
|
|
125
153
|
return new Promise((resolve, reject) => {
|
|
126
|
-
this.once(`res-${id}`, (
|
|
127
|
-
if (error) {
|
|
128
|
-
reject(
|
|
154
|
+
this.once(`res-${id}`, (response) => {
|
|
155
|
+
if (response.error) {
|
|
156
|
+
reject(response);
|
|
129
157
|
}
|
|
130
158
|
else {
|
|
131
|
-
resolve(
|
|
159
|
+
resolve(response);
|
|
132
160
|
}
|
|
133
161
|
});
|
|
134
162
|
});
|
|
@@ -141,31 +169,21 @@ export class Nip46Broker extends Emitter {
|
|
|
141
169
|
if (!__classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain) {
|
|
142
170
|
throw new Error("Unable to create an account without a handler domain");
|
|
143
171
|
}
|
|
144
|
-
return this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]);
|
|
172
|
+
return __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("create_account", [username, __classPrivateFieldGet(this, _Nip46Broker_handler, "f").domain, "", perms]));
|
|
145
173
|
};
|
|
146
|
-
this.connect = async (token = "", perms = "") => {
|
|
147
|
-
if (!__classPrivateFieldGet(this,
|
|
174
|
+
this.connect = async (token = "", perms = "", secret = "") => {
|
|
175
|
+
if (!__classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f")) {
|
|
148
176
|
const params = ["", token, perms];
|
|
149
|
-
__classPrivateFieldSet(this,
|
|
177
|
+
__classPrivateFieldSet(this, _Nip46Broker_connectResponse, await this.enqueue("connect", params), "f");
|
|
150
178
|
}
|
|
151
|
-
return __classPrivateFieldGet(this,
|
|
152
|
-
};
|
|
153
|
-
this.getPublicKey = () => this.enqueue("get_public_key", []);
|
|
154
|
-
this.signEvent = async (event) => {
|
|
155
|
-
return JSON.parse(await this.enqueue("sign_event", [JSON.stringify(event)]));
|
|
156
|
-
};
|
|
157
|
-
this.nip04Encrypt = (pk, message) => {
|
|
158
|
-
return this.enqueue("nip04_encrypt", [pk, message]);
|
|
159
|
-
};
|
|
160
|
-
this.nip04Decrypt = (pk, message) => {
|
|
161
|
-
return this.enqueue("nip04_decrypt", [pk, message]);
|
|
162
|
-
};
|
|
163
|
-
this.nip44Encrypt = (pk, message) => {
|
|
164
|
-
return this.enqueue("nip44_encrypt", [pk, message]);
|
|
165
|
-
};
|
|
166
|
-
this.nip44Decrypt = (pk, message) => {
|
|
167
|
-
return this.enqueue("nip44_decrypt", [pk, message]);
|
|
179
|
+
return __classPrivateFieldGet(this, _Nip46Broker_connectResponse, "f").result === 'ack';
|
|
168
180
|
};
|
|
181
|
+
this.getPublicKey = () => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("get_public_key", []));
|
|
182
|
+
this.signEvent = async (event) => JSON.parse(await __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("sign_event", [JSON.stringify(event)])));
|
|
183
|
+
this.nip04Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_encrypt", [pk, message]));
|
|
184
|
+
this.nip04Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip04_decrypt", [pk, message]));
|
|
185
|
+
this.nip44Encrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_encrypt", [pk, message]));
|
|
186
|
+
this.nip44Decrypt = (pk, message) => __classPrivateFieldGet(this, _Nip46Broker_getResult, "f").call(this, this.enqueue("nip44_decrypt", [pk, message]));
|
|
169
187
|
this.teardown = () => {
|
|
170
188
|
var _a;
|
|
171
189
|
__classPrivateFieldSet(this, _Nip46Broker_closed, true, "f");
|
|
@@ -179,7 +197,7 @@ export class Nip46Broker extends Emitter {
|
|
|
179
197
|
return equals(this.params, params);
|
|
180
198
|
}
|
|
181
199
|
}
|
|
182
|
-
_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(),
|
|
200
|
+
_Nip46Broker_signer = new WeakMap(), _Nip46Broker_handler = new WeakMap(), _Nip46Broker_algorithm = new WeakMap(), _Nip46Broker_closed = new WeakMap(), _Nip46Broker_processing = new WeakMap(), _Nip46Broker_connectResponse = new WeakMap(), _Nip46Broker_queue = new WeakMap(), _Nip46Broker_sub = new WeakMap(), _Nip46Broker_subscribe = new WeakMap(), _Nip46Broker_processQueue = new WeakMap(), _Nip46Broker_getResult = new WeakMap();
|
|
183
201
|
export class Nip46Signer {
|
|
184
202
|
constructor(broker) {
|
|
185
203
|
this.broker = broker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nip46.mjs","sourceRoot":"","sources":["../../../src/signers/nip46.ts"],"names":[],"mappings":";;;;;;;;;;;;OAAO,EAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"nip46.mjs","sourceRoot":"","sources":["../../../src/signers/nip46.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/signer",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.13",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "A nostr signer implemenation supporting several login methods.",
|
|
@@ -31,9 +31,9 @@
|
|
|
31
31
|
"typescript": "~5.1.6"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@welshman/lib": "~0.0.
|
|
35
|
-
"@welshman/net": "~0.0.
|
|
36
|
-
"@welshman/util": "~0.0.
|
|
34
|
+
"@welshman/lib": "~0.0.24",
|
|
35
|
+
"@welshman/net": "~0.0.34",
|
|
36
|
+
"@welshman/util": "~0.0.45",
|
|
37
37
|
"nostr-tools": "^2.7.2"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|