@hashtree/worker 0.1.12 → 0.1.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rootResolver.d.ts","sourceRoot":"","sources":["../../src/capabilities/rootResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAIpD,eAAO,MAAM,+BAA+B,QAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"rootResolver.d.ts","sourceRoot":"","sources":["../../src/capabilities/rootResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAIpD,eAAO,MAAM,+BAA+B,QAAS,CAAC;AAoJtD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,IAAI,EAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,SAAS,GAAE,MAAwC,GAClD,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CA0BrB"}
|
|
@@ -51,46 +51,82 @@ async function queryLatestTreeRoot(relays, npub, treeName, timeoutMs) {
|
|
|
51
51
|
return null;
|
|
52
52
|
}
|
|
53
53
|
const pool = new SimplePool();
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
new Promise((resolve) => {
|
|
65
|
-
setTimeout(() => resolve(null), timeoutMs + 500);
|
|
66
|
-
}),
|
|
67
|
-
]);
|
|
68
|
-
if (!events) {
|
|
69
|
-
return null;
|
|
70
|
-
}
|
|
71
|
-
for (const event of Array.from(events).sort(compareReplaceableEvents)) {
|
|
72
|
-
const parsed = parseHashtreeRootEvent(event);
|
|
73
|
-
if (!parsed || parsed.treeName !== treeName) {
|
|
74
|
-
continue;
|
|
54
|
+
return await new Promise((resolve) => {
|
|
55
|
+
let closed = false;
|
|
56
|
+
let latestEvent = null;
|
|
57
|
+
let latestCid = null;
|
|
58
|
+
let settleTimer = null;
|
|
59
|
+
let timeoutId = null;
|
|
60
|
+
let subscription = null;
|
|
61
|
+
const finish = (cid) => {
|
|
62
|
+
if (closed) {
|
|
63
|
+
return;
|
|
75
64
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
65
|
+
closed = true;
|
|
66
|
+
if (settleTimer) {
|
|
67
|
+
clearTimeout(settleTimer);
|
|
68
|
+
}
|
|
69
|
+
if (timeoutId) {
|
|
70
|
+
clearTimeout(timeoutId);
|
|
71
|
+
}
|
|
72
|
+
Promise.resolve(subscription?.close('resolved'))
|
|
73
|
+
.catch(() => undefined)
|
|
74
|
+
.finally(() => {
|
|
75
|
+
try {
|
|
76
|
+
pool.close(relays);
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
// Ignore close errors.
|
|
80
|
+
}
|
|
81
|
+
try {
|
|
82
|
+
pool.destroy();
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// Ignore destroy errors.
|
|
86
|
+
}
|
|
87
|
+
resolve(cid);
|
|
88
|
+
});
|
|
89
|
+
};
|
|
90
|
+
const scheduleFinish = () => {
|
|
91
|
+
if (!latestCid) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (settleTimer) {
|
|
95
|
+
clearTimeout(settleTimer);
|
|
96
|
+
}
|
|
97
|
+
settleTimer = setTimeout(() => {
|
|
98
|
+
finish(latestCid);
|
|
99
|
+
}, 150);
|
|
100
|
+
};
|
|
101
|
+
timeoutId = setTimeout(() => {
|
|
102
|
+
finish(latestCid);
|
|
103
|
+
}, timeoutMs);
|
|
104
|
+
subscription = pool.subscribeMany(relays, {
|
|
105
|
+
kinds: [30078],
|
|
106
|
+
authors: [decoded.data],
|
|
107
|
+
'#d': [treeName],
|
|
108
|
+
limit: MAX_TREE_ROOT_EVENTS,
|
|
109
|
+
}, {
|
|
110
|
+
maxWait: timeoutMs,
|
|
111
|
+
onevent(event) {
|
|
112
|
+
const parsed = parseHashtreeRootEvent(event);
|
|
113
|
+
if (!parsed || parsed.treeName !== treeName) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
if (!latestEvent || compareReplaceableEvents(event, latestEvent) < 0) {
|
|
117
|
+
latestEvent = event;
|
|
118
|
+
latestCid = parsed.rootCid;
|
|
119
|
+
scheduleFinish();
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
oneose() {
|
|
123
|
+
finish(latestCid);
|
|
124
|
+
},
|
|
125
|
+
onclose() {
|
|
126
|
+
finish(latestCid);
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
});
|
|
94
130
|
}
|
|
95
131
|
export async function resolveRootPathFromRelays(tree, relays, npub, path, timeoutMs = DEFAULT_ROOT_RESOLVE_TIMEOUT_MS) {
|
|
96
132
|
const relayList = withUniqueRelays(relays);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rootResolver.js","sourceRoot":"","sources":["../../src/capabilities/rootResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAmB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAEtD,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,2BAA2B,GAAG;IAClC,sBAAsB;IACtB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,oBAAoB;IACpB,oBAAoB;CACrB,CAAC;AAEF,SAAS,gBAAgB,CAAC,MAAiB;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,2BAA2B,CAAC,EAAE,CAAC;QACxE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS;QAClD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAa;IACtC,OAAO,IAAI;QACT,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAgB,EAAE,KAAiB;IACnE,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;IACvE,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IAC/B,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,MAAgB,EAChB,IAAY,EACZ,QAAgB,EAChB,SAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;IAE9B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"rootResolver.js","sourceRoot":"","sources":["../../src/capabilities/rootResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAmB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAEtD,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,2BAA2B,GAAG;IAClC,sBAAsB;IACtB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,oBAAoB;IACpB,oBAAoB;CACrB,CAAC;AAEF,SAAS,gBAAgB,CAAC,MAAiB;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,2BAA2B,CAAC,EAAE,CAAC;QACxE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS;QAClD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAa;IACtC,OAAO,IAAI;QACT,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAgB,EAAE,KAAiB;IACnE,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;IACvE,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IAC/B,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,MAAgB,EAChB,IAAY,EACZ,QAAgB,EAChB,SAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;IAE9B,OAAO,MAAM,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;QAC/C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,WAAW,GAAsB,IAAI,CAAC;QAC1C,IAAI,SAAS,GAAe,IAAI,CAAC;QACjC,IAAI,WAAW,GAAyC,IAAI,CAAC;QAC7D,IAAI,SAAS,GAAyC,IAAI,CAAC;QAC3D,IAAI,YAAY,GAA4D,IAAI,CAAC;QAEjF,MAAM,MAAM,GAAG,CAAC,GAAe,EAAQ,EAAE;YACvC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;YACD,MAAM,GAAG,IAAI,CAAC;YAEd,IAAI,WAAW,EAAE,CAAC;gBAChB,YAAY,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;iBAC7C,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;iBACtB,OAAO,CAAC,GAAG,EAAE;gBACZ,IAAI,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACrB,CAAC;gBAAC,MAAM,CAAC;oBACP,uBAAuB;gBACzB,CAAC;gBACD,IAAI,CAAC;oBACH,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,CAAC;gBAAC,MAAM,CAAC;oBACP,yBAAyB;gBAC3B,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,GAAS,EAAE;YAChC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,YAAY,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC;YACD,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,MAAM,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC;QAEF,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YACxC,KAAK,EAAE,CAAC,KAAK,CAAC;YACd,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,CAAC,QAAQ,CAAC;YAChB,KAAK,EAAE,oBAAoB;SAC5B,EAAE;YACD,OAAO,EAAE,SAAS;YAClB,OAAO,CAAC,KAAK;gBACX,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAqD,CAAC,CAAC;gBAC7F,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC5C,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,WAAW,IAAI,wBAAwB,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrE,WAAW,GAAG,KAAK,CAAC;oBACpB,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;oBAC3B,cAAc,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,MAAM;gBACJ,MAAM,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC;YACD,OAAO;gBACL,MAAM,CAAC,SAAS,CAAC,CAAC;YACpB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAA0C,EAC1C,MAA4B,EAC5B,IAAY,EACZ,IAAa,EACb,YAAoB,+BAA+B;IAEnD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC;IAEzD,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACvF,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7E,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC;AAC9D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hashtree/worker",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.13",
|
|
4
4
|
"description": "Modular browser worker for hashtree blob caching and Blossom connectivity",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -82,8 +82,8 @@
|
|
|
82
82
|
"typescript": "^5.3.0",
|
|
83
83
|
"vitest": "^2.1.9",
|
|
84
84
|
"ndk": "0.1.1",
|
|
85
|
-
"
|
|
86
|
-
"
|
|
85
|
+
"ndk-cache": "0.1.1",
|
|
86
|
+
"nostr-social-graph": "1.0.36"
|
|
87
87
|
},
|
|
88
88
|
"scripts": {
|
|
89
89
|
"build": "tsc",
|