@welshman/net 0.5.0 → 0.5.1
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.
|
@@ -11,6 +11,7 @@ export declare enum PublishStatus {
|
|
|
11
11
|
export type PublishResult = {
|
|
12
12
|
status: PublishStatus;
|
|
13
13
|
detail: string;
|
|
14
|
+
relay: string;
|
|
14
15
|
};
|
|
15
16
|
export type PublishOneOptions = {
|
|
16
17
|
event: SignedEvent;
|
|
@@ -18,27 +19,27 @@ export type PublishOneOptions = {
|
|
|
18
19
|
signal?: AbortSignal;
|
|
19
20
|
timeout?: number;
|
|
20
21
|
context?: AdapterContext;
|
|
21
|
-
onSuccess?: (
|
|
22
|
-
onFailure?: (
|
|
23
|
-
onPending?: () => void;
|
|
24
|
-
onTimeout?: () => void;
|
|
25
|
-
onAborted?: () => void;
|
|
26
|
-
onComplete?: () => void;
|
|
22
|
+
onSuccess?: (result: PublishResult) => void;
|
|
23
|
+
onFailure?: (result: PublishResult) => void;
|
|
24
|
+
onPending?: (result: PublishResult) => void;
|
|
25
|
+
onTimeout?: (result: PublishResult) => void;
|
|
26
|
+
onAborted?: (result: PublishResult) => void;
|
|
27
|
+
onComplete?: (result: PublishResult) => void;
|
|
27
28
|
};
|
|
28
|
-
export declare const publishOne: (options: PublishOneOptions) => Promise<
|
|
29
|
-
export type
|
|
29
|
+
export declare const publishOne: (options: PublishOneOptions) => Promise<PublishResult>;
|
|
30
|
+
export type PublishResultsByRelay = Record<string, PublishResult>;
|
|
30
31
|
export type PublishOptions = {
|
|
31
32
|
event: SignedEvent;
|
|
32
33
|
relays: string[];
|
|
33
34
|
signal?: AbortSignal;
|
|
34
35
|
timeout?: number;
|
|
35
36
|
context?: AdapterContext;
|
|
36
|
-
onSuccess?: (
|
|
37
|
-
onFailure?: (
|
|
38
|
-
onPending?: (
|
|
39
|
-
onTimeout?: (
|
|
40
|
-
onAborted?: (
|
|
41
|
-
onComplete?: () => void;
|
|
37
|
+
onSuccess?: (result: PublishResult) => void;
|
|
38
|
+
onFailure?: (result: PublishResult) => void;
|
|
39
|
+
onPending?: (result: PublishResult) => void;
|
|
40
|
+
onTimeout?: (result: PublishResult) => void;
|
|
41
|
+
onAborted?: (result: PublishResult) => void;
|
|
42
|
+
onComplete?: (result: PublishResult) => void;
|
|
42
43
|
};
|
|
43
|
-
export declare const publish: (options: PublishOptions) => Promise<
|
|
44
|
+
export declare const publish: (options: PublishOptions) => Promise<PublishResultsByRelay>;
|
|
44
45
|
//# sourceMappingURL=publish.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAe,cAAc,EAAa,MAAM,cAAc,CAAA;AAErE,oBAAY,aAAa;IACvB,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;CACnC;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,2BA+DjD,CAAA;AAEJ,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,qBAAqB,CAoCpF,CAAA"}
|
package/dist/net/src/publish.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { fromPairs } from "@welshman/lib";
|
|
1
2
|
import { ClientMessageType, isRelayOk } from "./message.js";
|
|
2
3
|
import { AdapterEvent, getAdapter } from "./adapter.js";
|
|
3
4
|
export var PublishStatus;
|
|
@@ -11,12 +12,16 @@ export var PublishStatus;
|
|
|
11
12
|
})(PublishStatus || (PublishStatus = {}));
|
|
12
13
|
export const publishOne = (options) => new Promise(resolve => {
|
|
13
14
|
const adapter = getAdapter(options.relay, options.context);
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
const result = {
|
|
16
|
+
relay: options.relay,
|
|
17
|
+
status: PublishStatus.Pending,
|
|
18
|
+
detail: "",
|
|
19
|
+
};
|
|
20
|
+
options.onPending?.(result);
|
|
16
21
|
const cleanup = () => {
|
|
17
|
-
options.onComplete?.();
|
|
22
|
+
options.onComplete?.(result);
|
|
18
23
|
adapter.cleanup();
|
|
19
|
-
resolve(
|
|
24
|
+
resolve(result);
|
|
20
25
|
};
|
|
21
26
|
adapter.on(AdapterEvent.Receive, (message, url) => {
|
|
22
27
|
if (isRelayOk(message)) {
|
|
@@ -24,27 +29,31 @@ export const publishOne = (options) => new Promise(resolve => {
|
|
|
24
29
|
if (id !== options.event.id)
|
|
25
30
|
return;
|
|
26
31
|
if (ok) {
|
|
27
|
-
status = PublishStatus.Success;
|
|
28
|
-
|
|
32
|
+
result.status = PublishStatus.Success;
|
|
33
|
+
result.detail = detail;
|
|
34
|
+
options.onSuccess?.(result);
|
|
29
35
|
}
|
|
30
36
|
else {
|
|
31
|
-
status = PublishStatus.Failure;
|
|
32
|
-
|
|
37
|
+
result.status = PublishStatus.Failure;
|
|
38
|
+
result.detail = detail;
|
|
39
|
+
options.onFailure?.(result);
|
|
33
40
|
}
|
|
34
41
|
cleanup();
|
|
35
42
|
}
|
|
36
43
|
});
|
|
37
44
|
options.signal?.addEventListener("abort", () => {
|
|
38
|
-
if (status === PublishStatus.Pending) {
|
|
39
|
-
status = PublishStatus.Aborted;
|
|
40
|
-
|
|
45
|
+
if (result.status === PublishStatus.Pending) {
|
|
46
|
+
result.status = PublishStatus.Aborted;
|
|
47
|
+
result.detail = "aborted";
|
|
48
|
+
options.onAborted?.(result);
|
|
41
49
|
}
|
|
42
50
|
cleanup();
|
|
43
51
|
});
|
|
44
52
|
setTimeout(() => {
|
|
45
|
-
if (status === PublishStatus.Pending) {
|
|
46
|
-
status = PublishStatus.Timeout;
|
|
47
|
-
|
|
53
|
+
if (result.status === PublishStatus.Pending) {
|
|
54
|
+
result.status = PublishStatus.Timeout;
|
|
55
|
+
result.detail = "timed out";
|
|
56
|
+
options.onTimeout?.(result);
|
|
48
57
|
}
|
|
49
58
|
cleanup();
|
|
50
59
|
}, options.timeout || 10_000);
|
|
@@ -52,45 +61,31 @@ export const publishOne = (options) => new Promise(resolve => {
|
|
|
52
61
|
});
|
|
53
62
|
export const publish = async (options) => {
|
|
54
63
|
const { event, timeout, signal, context } = options;
|
|
55
|
-
const status = {};
|
|
56
64
|
const completed = new Set();
|
|
57
65
|
const relays = new Set(options.relays);
|
|
58
66
|
if (relays.size !== options.relays.length) {
|
|
59
67
|
console.warn("Non-unique relays passed to publish");
|
|
60
68
|
}
|
|
61
|
-
await Promise.all(options.relays.map(relay =>
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
options.
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
options.onTimeout?.(relay);
|
|
82
|
-
},
|
|
83
|
-
onAborted: () => {
|
|
84
|
-
status[relay] = PublishStatus.Aborted;
|
|
85
|
-
options.onAborted?.(relay);
|
|
86
|
-
},
|
|
87
|
-
onComplete: () => {
|
|
88
|
-
completed.add(relay);
|
|
89
|
-
if (completed.size === relays.size) {
|
|
90
|
-
options.onComplete?.();
|
|
91
|
-
}
|
|
92
|
-
},
|
|
69
|
+
return fromPairs(await Promise.all(options.relays.map(async (relay) => {
|
|
70
|
+
const result = await publishOne({
|
|
71
|
+
event,
|
|
72
|
+
relay,
|
|
73
|
+
signal,
|
|
74
|
+
timeout,
|
|
75
|
+
context,
|
|
76
|
+
onSuccess: options.onSuccess,
|
|
77
|
+
onFailure: options.onFailure,
|
|
78
|
+
onPending: options.onPending,
|
|
79
|
+
onTimeout: options.onTimeout,
|
|
80
|
+
onAborted: options.onAborted,
|
|
81
|
+
onComplete: (result) => {
|
|
82
|
+
completed.add(relay);
|
|
83
|
+
if (completed.size === relays.size) {
|
|
84
|
+
options.onComplete?.(result);
|
|
85
|
+
}
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
return [relay, result];
|
|
93
89
|
})));
|
|
94
|
-
return status;
|
|
95
90
|
};
|
|
96
91
|
//# sourceMappingURL=publish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/net",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "Utilities for connecting with nostr relays.",
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"events": "^3.3.0",
|
|
18
18
|
"isomorphic-ws": "^5.0.0",
|
|
19
|
-
"@welshman/lib": "0.5.
|
|
20
|
-
"@welshman/relay": "0.5.
|
|
21
|
-
"@welshman/util": "0.5.
|
|
19
|
+
"@welshman/lib": "0.5.1",
|
|
20
|
+
"@welshman/relay": "0.5.1",
|
|
21
|
+
"@welshman/util": "0.5.1"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"rimraf": "~6.0.0",
|