@welshman/app 0.14.4 → 0.14.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/src/plugins/relayLists.d.ts.map +1 -1
- package/dist/app/src/plugins/relayLists.js +9 -7
- package/dist/app/src/plugins/relayLists.js.map +1 -1
- package/dist/lib/src/TaskQueue.d.ts +0 -1
- package/dist/lib/src/TaskQueue.d.ts.map +1 -1
- package/dist/lib/src/TaskQueue.js +2 -6
- package/dist/lib/src/TaskQueue.js.map +1 -1
- package/dist/net/src/socket.d.ts.map +1 -1
- package/dist/net/src/socket.js +7 -12
- package/dist/net/src/socket.js.map +1 -1
- package/package.json +15 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/relayLists.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relayLists.d.ts","sourceRoot":"","sources":["../../../../src/plugins/relayLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,eAAe,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAA;AAC5E,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAI/C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC;;;GAGG;AACH,qBAAa,UAAW,SAAQ,aAAa,CAAC,eAAe,CAAC;gBAChD,GAAG,EAAE,IAAI;IAQf,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO;IAehD,IAAI,GAAI,QAAQ,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAoD;IAEjG,QAAQ,GAAI,QAAQ,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CACK;IAEtD,SAAS,GAAI,QAAQ,MAAM,KAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CACK;IAEvD,MAAM,GAAI,IAAI,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,8CACa;IAE5D,UAAU,GAAI,KAAK,MAAM,8CAAkD;IAE3E,WAAW,GAAI,KAAK,MAAM,8CAAmD;IAE7E,aAAa,GAAI,KAAK,MAAM,8CAAqD;IAEjF,cAAc,GAAI,KAAK,MAAM,8CAAsD;IAEnF,WAAW,GAAI,MAAM,MAAM,EAAE,8CAAoD;IAEjF,YAAY,GAAI,MAAM,MAAM,EAAE,8CAAqD;CACpF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { uniq } from "@welshman/lib";
|
|
2
1
|
import { RELAYS, relays, indexers } from "@welshman/util";
|
|
3
2
|
import { RelayList } from "@welshman/domain";
|
|
4
3
|
import { DerivedPlugin } from "./base.js";
|
|
@@ -19,12 +18,15 @@ export class RelayLists extends DerivedPlugin {
|
|
|
19
18
|
}
|
|
20
19
|
async fetch(pubkey, hints = []) {
|
|
21
20
|
const filters = [{ kinds: [RELAYS], authors: [pubkey] }];
|
|
22
|
-
|
|
23
|
-
//
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
21
|
+
// Resolving `outbox(pubkey)` here would recurse back into this loader, so the pubkey's
|
|
22
|
+
// already-known write relays stand in for it. They're scored and limited like the rest, since
|
|
23
|
+
// refreshing a few hundred follows otherwise dials the union of their relays, most of them dead.
|
|
24
|
+
const scenario = await this.app
|
|
25
|
+
.use(Router)
|
|
26
|
+
.resolve([...relays(hints), indexers(), ...relays(this.writeUrls(pubkey).get(), 0.5)]);
|
|
27
|
+
return this.app
|
|
28
|
+
.use(Network)
|
|
29
|
+
.load({ filters, relays: scenario.getUrls(), timeouts: REPLACEABLE_TIMEOUTS });
|
|
28
30
|
}
|
|
29
31
|
urls = (pubkey) => this.project(pubkey, list => list?.urls() ?? []);
|
|
30
32
|
readUrls = (pubkey) => this.project(pubkey, list => list?.readUrls() ?? []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayLists.js","sourceRoot":"","sources":["../../../../src/plugins/relayLists.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"relayLists.js","sourceRoot":"","sources":["../../../../src/plugins/relayLists.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskQueue.d.ts","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,CAAC,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAA;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAA;CACrC,CAAA;AAED,qBAAa,SAAS,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"TaskQueue.d.ts","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,CAAC,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAA;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAA;CACrC,CAAA;AAED,qBAAa,SAAS,CAAC,IAAI;IAMb,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IALpD,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,EAAE,CAAK;IACpC,KAAK,EAAE,IAAI,EAAE,CAAK;IAClB,QAAQ,UAAQ;IAChB,YAAY,UAAQ;gBAEC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,IAAI;IA+Bf,MAAM,CAAC,IAAI,EAAE,IAAI;IAIjB,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAQ1C,OAAO;IAyCP,IAAI;IAIJ,KAAK;IAKL,KAAK;CAGN"}
|
|
@@ -5,7 +5,6 @@ export class TaskQueue {
|
|
|
5
5
|
items = [];
|
|
6
6
|
isPaused = false;
|
|
7
7
|
isProcessing = false;
|
|
8
|
-
lastDrainAt = 0;
|
|
9
8
|
constructor(options) {
|
|
10
9
|
this.options = options;
|
|
11
10
|
}
|
|
@@ -54,7 +53,6 @@ export class TaskQueue {
|
|
|
54
53
|
this.isProcessing = false;
|
|
55
54
|
}
|
|
56
55
|
else {
|
|
57
|
-
this.lastDrainAt = Date.now();
|
|
58
56
|
// Taken one at a time, so an item stays removable until its turn
|
|
59
57
|
for (let i = 0; i < this.options.batchSize && this.items.length > 0; i++) {
|
|
60
58
|
const item = this.items.shift();
|
|
@@ -74,10 +72,8 @@ export class TaskQueue {
|
|
|
74
72
|
}
|
|
75
73
|
}
|
|
76
74
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (wait > 0) {
|
|
80
|
-
setTimeout(drain, wait);
|
|
75
|
+
if (this.options.batchDelay > 0) {
|
|
76
|
+
setTimeout(drain, this.options.batchDelay);
|
|
81
77
|
}
|
|
82
78
|
else {
|
|
83
79
|
queueMicrotask(drain);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskQueue.js","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAA;AASjC,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"TaskQueue.js","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../../net/src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../../net/src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAC,SAAS,EAAiB,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,YAAY,EAAE,aAAa,EAA4B,MAAM,cAAc,CAAA;AACnF,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AACnC,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAA;AAEtC,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,oBAAY,WAAW;IACrB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACzD,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACnE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CACtE,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAA;AAE3D,qBAAa,MAAO,SAAQ,YAAY;IAgBpC,QAAQ,CAAC,GAAG,EAAE,MAAM;IACpB,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE;IAhBnC,MAAM,CAAC,aAAa,SAAI;IACxB,MAAM,CAAC,cAAc,SAAM;IAC3B,MAAM,CAAC,aAAa,SAAK;IAEzB,MAAM,CAAC,cAAc,SAAK;IAE1B,IAAI,EAAE,SAAS,CAAA;IACf,MAAM,eAAsB;IAC5B,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,GAAG,CAAC,EAAE,SAAS,CAAA;IACf,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,CAAA;IACpC,UAAU,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAGxB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,YAAY,EAAO;IAmCxC,IAAI,aA0CH;IAED,aAAa,aAIZ;IAED,KAAK,aAGJ;IAED,OAAO,aAON;IAED,IAAI,GAAI,SAAS,aAAa,UAG7B;IAED,OAAO,GAAI,SAAS,YAAY,UAG/B;CACF"}
|
package/dist/net/src/socket.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import WebSocket from "isomorphic-ws";
|
|
2
2
|
import EventEmitter from "events";
|
|
3
|
-
import { TaskQueue, call } from "@welshman/lib";
|
|
3
|
+
import { TaskQueue, call, tryCatch } from "@welshman/lib";
|
|
4
4
|
import { getPriority, isClientAuth } from "./message.js";
|
|
5
5
|
import { AuthState } from "./auth.js";
|
|
6
6
|
export var SocketStatus;
|
|
@@ -26,7 +26,7 @@ export class Socket extends EventEmitter {
|
|
|
26
26
|
static sendBatchSize = 5;
|
|
27
27
|
static sendBatchDelay = 100;
|
|
28
28
|
static recvBatchSize = 20;
|
|
29
|
-
//
|
|
29
|
+
// Short, since every received message waits it out before it is handled
|
|
30
30
|
static recvBatchDelay = 16;
|
|
31
31
|
auth;
|
|
32
32
|
status = SocketStatus.Closed;
|
|
@@ -86,18 +86,13 @@ export class Socket extends EventEmitter {
|
|
|
86
86
|
this.emit(SocketEvent.Status, SocketStatus.Closed, this.url);
|
|
87
87
|
}
|
|
88
88
|
};
|
|
89
|
+
// Only the parse is guarded, so a listener that throws surfaces as itself rather than as this
|
|
89
90
|
this._ws.onmessage = (event) => {
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if (Array.isArray(message)) {
|
|
94
|
-
this.receive(message);
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
this.emit(SocketEvent.Error, "Invalid message received", this.url);
|
|
98
|
-
}
|
|
91
|
+
const message = tryCatch(() => JSON.parse(event.data));
|
|
92
|
+
if (Array.isArray(message)) {
|
|
93
|
+
this.receive(message);
|
|
99
94
|
}
|
|
100
|
-
|
|
95
|
+
else {
|
|
101
96
|
this.emit(SocketEvent.Error, "Invalid message received", this.url);
|
|
102
97
|
}
|
|
103
98
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../net/src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAC,SAAS,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../net/src/socket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@welshman/app",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.5",
|
|
4
4
|
"author": "hodlbod",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"description": "An instance-based, composable client for building nostr applications",
|
|
@@ -20,26 +20,26 @@
|
|
|
20
20
|
},
|
|
21
21
|
"peerDependencies": {
|
|
22
22
|
"@pomade/core": "^0.3.3",
|
|
23
|
-
"@welshman/domain": "0.14.
|
|
24
|
-
"@welshman/feeds": "0.14.
|
|
25
|
-
"@welshman/lib": "0.14.
|
|
26
|
-
"@welshman/net": "0.14.
|
|
27
|
-
"@welshman/signer": "0.14.
|
|
28
|
-
"@welshman/store": "0.14.
|
|
29
|
-
"@welshman/util": "0.14.
|
|
23
|
+
"@welshman/domain": "0.14.5",
|
|
24
|
+
"@welshman/feeds": "0.14.5",
|
|
25
|
+
"@welshman/lib": "0.14.5",
|
|
26
|
+
"@welshman/net": "0.14.5",
|
|
27
|
+
"@welshman/signer": "0.14.5",
|
|
28
|
+
"@welshman/store": "0.14.5",
|
|
29
|
+
"@welshman/util": "0.14.5"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"rimraf": "~6.0.0",
|
|
33
33
|
"typescript": "~5.8.0",
|
|
34
34
|
"@pomade/core": "^0.3.3",
|
|
35
35
|
"@types/throttle-debounce": "^5.0.2",
|
|
36
|
-
"@welshman/domain": "0.14.
|
|
37
|
-
"@welshman/feeds": "0.14.
|
|
38
|
-
"@welshman/lib": "0.14.
|
|
39
|
-
"@welshman/net": "0.14.
|
|
40
|
-
"@welshman/signer": "0.14.
|
|
41
|
-
"@welshman/store": "0.14.
|
|
42
|
-
"@welshman/util": "0.14.
|
|
36
|
+
"@welshman/domain": "0.14.5",
|
|
37
|
+
"@welshman/feeds": "0.14.5",
|
|
38
|
+
"@welshman/lib": "0.14.5",
|
|
39
|
+
"@welshman/net": "0.14.5",
|
|
40
|
+
"@welshman/signer": "0.14.5",
|
|
41
|
+
"@welshman/store": "0.14.5",
|
|
42
|
+
"@welshman/util": "0.14.5"
|
|
43
43
|
},
|
|
44
44
|
"scripts": {
|
|
45
45
|
"build": "pnpm run clean && pnpm run compile --force",
|