@ddd-qc/lit-happ 0.34.6 → 0.34.8
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/HappMultiElement.d.ts +2 -3
- package/dist/HappMultiElement.d.ts.map +1 -1
- package/dist/HappMultiElement.js +1 -41
- package/dist/HappMultiElement.js.map +1 -1
- package/dist/NetworkCaller.d.ts +9 -1
- package/dist/NetworkCaller.d.ts.map +1 -1
- package/dist/NetworkCaller.js +24 -10
- package/dist/NetworkCaller.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { LitElement } from "lit";
|
|
2
|
-
import { AppProxy,
|
|
2
|
+
import { AppProxy, HcConnectionOptions } from "@ddd-qc/cell-proxy";
|
|
3
3
|
import { HappViewModel } from "./HappViewModel";
|
|
4
4
|
import { HvmDef } from "./definitions";
|
|
5
|
-
import { InstalledAppId
|
|
5
|
+
import { InstalledAppId } from "@holochain/client";
|
|
6
6
|
import { NetworkCaller } from "./NetworkCaller";
|
|
7
7
|
export declare class HappMultiElement extends LitElement {
|
|
8
8
|
readonly isMainView: boolean;
|
|
@@ -19,6 +19,5 @@ export declare class HappMultiElement extends LitElement {
|
|
|
19
19
|
hvmsConstructed(): Promise<void>;
|
|
20
20
|
perspectiveInitializedFromLocal(): Promise<void>;
|
|
21
21
|
perspectiveInitializedFromNetwork(): Promise<void>;
|
|
22
|
-
networkInfoAll(baseRoleName?: string): Promise<Record<CellIdStr, [Timestamp, NetworkMetrics]>>;
|
|
23
22
|
}
|
|
24
23
|
//# sourceMappingURL=HappMultiElement.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HappMultiElement.d.ts","sourceRoot":"","sources":["../src/HappMultiElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,KAAK,CAAC;AAE/B,OAAO,EACH,QAAQ,
|
|
1
|
+
{"version":3,"file":"HappMultiElement.d.ts","sourceRoot":"","sources":["../src/HappMultiElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,KAAK,CAAC;AAE/B,OAAO,EACH,QAAQ,EAER,mBAAmB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EACL,cAAc,EACb,MAAM,mBAAmB,CAAC;AAG7B,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAO9C,qBAAa,gBAAiB,SAAQ,UAAU;aAkB5B,UAAU,EAAE,OAAO;IAfrC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;IAGd,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAK;IAC/C,IAAI,KAAK,IAAI,MAAM,CAA0B;IAG7C,aAAa,CAAC,EAAE,aAAa,CAAC;IAGrB,YAAY,UAAS;IAG9B,SAAS,aACP,cAAc,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC,EAAE,EACvE,UAAU,EAAE,OAAO;cAcrB,aAAa,CAAC,cAAc,EAAE,CAAC,mBAAmB,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB3I,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/C,gCAAgC,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5C,YAAY;IAQf,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhC,+BAA+B,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhD,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC;CAE3D"}
|
package/dist/HappMultiElement.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { LitElement } from "lit";
|
|
3
3
|
import { state } from "lit/decorators.js";
|
|
4
|
-
import { ConductorAppProxy,
|
|
4
|
+
import { ConductorAppProxy, } from "@ddd-qc/cell-proxy";
|
|
5
5
|
import { HappViewModel } from "./HappViewModel";
|
|
6
6
|
import { NetworkCaller } from "./NetworkCaller";
|
|
7
7
|
export class HappMultiElement extends LitElement {
|
|
@@ -54,46 +54,6 @@ export class HappMultiElement extends LitElement {
|
|
|
54
54
|
async hvmsConstructed() { }
|
|
55
55
|
async perspectiveInitializedFromLocal() { }
|
|
56
56
|
async perspectiveInitializedFromNetwork() { }
|
|
57
|
-
async networkInfoAll(baseRoleName) {
|
|
58
|
-
const hvmDef = this.constructor.HVM_DEF;
|
|
59
|
-
const appProxy = this.hvms[0][0];
|
|
60
|
-
const cellMap = appProxy.getAppCells(hvmDef.id);
|
|
61
|
-
if (!cellMap) {
|
|
62
|
-
return Promise.reject("No cells found at given appId: " + hvmDef.id);
|
|
63
|
-
}
|
|
64
|
-
let cellAddrs = [];
|
|
65
|
-
if (baseRoleName) {
|
|
66
|
-
const cfr = cellMap[baseRoleName];
|
|
67
|
-
if (!cfr) {
|
|
68
|
-
return Promise.reject("No cells found at given baseRoleName: " + baseRoleName);
|
|
69
|
-
}
|
|
70
|
-
cellAddrs = flattenCells(cfr);
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
for (const cells of Object.values(cellMap)) {
|
|
74
|
-
cellAddrs = cellAddrs.concat(flattenCells(cells));
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
let dnaPerAgentMap = new AgentIdMap();
|
|
78
|
-
for (const cellAddr of cellAddrs) {
|
|
79
|
-
if (!dnaPerAgentMap.get(cellAddr.agentId)) {
|
|
80
|
-
dnaPerAgentMap.set(cellAddr.agentId, []);
|
|
81
|
-
}
|
|
82
|
-
dnaPerAgentMap.get(cellAddr.agentId).push(cellAddr.dnaId);
|
|
83
|
-
}
|
|
84
|
-
const allNetInfos = {};
|
|
85
|
-
for (const [agent, dnaIds] of dnaPerAgentMap.entries()) {
|
|
86
|
-
for (const dna of dnaIds) {
|
|
87
|
-
const response = await appProxy.dumpNetworkMetrics({ dna_hash: dna.hash, include_dht_summary: true });
|
|
88
|
-
if (!response || !response[dna.b64]) {
|
|
89
|
-
throw Promise.reject("No network metrics response for dna");
|
|
90
|
-
}
|
|
91
|
-
const idStr = new CellAddress(dna, agent).str;
|
|
92
|
-
allNetInfos[idStr] = [Date.now(), response[dna.b64]];
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
return allNetInfos;
|
|
96
|
-
}
|
|
97
57
|
}
|
|
98
58
|
__decorate([
|
|
99
59
|
state()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HappMultiElement.js","sourceRoot":"","sources":["../src/HappMultiElement.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAEH,iBAAiB,
|
|
1
|
+
{"version":3,"file":"HappMultiElement.js","sourceRoot":"","sources":["../src/HappMultiElement.ts"],"names":[],"mappings":"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","sourcesContent":["import {LitElement} from \"lit\";\nimport { state } from \"lit/decorators.js\";\nimport {\n AppProxy,\n ConductorAppProxy,\n HcConnectionOptions,\n} from \"@ddd-qc/cell-proxy\";\nimport {HappViewModel} from \"./HappViewModel\";\nimport {HvmDef} from \"./definitions\";\nimport {\n InstalledAppId,\n } from \"@holochain/client\";\n// @ts-ignore\nimport * as net from \"net\";\nimport {NetworkCaller} from \"./NetworkCaller\";\n\n\n/**\n * Base class for HappMultiElements, which are LitElements that wrap multiple HappViewModel,\n * i.e. the main WebComponent of a web-app using multiple Holochain apps.\n */\nexport class HappMultiElement extends LitElement {\n\n /** Must be defined by subclass */\n static HVM_DEF: HvmDef;\n\n /** Set during init triggered at ctor */\n @state() hvms: [AppProxy, HappViewModel][] = []\n get count(): number {return this.hvms.length}\n\n /** Continually calls networkInfo for a specific cell with appProxy */\n networkCaller?: NetworkCaller;\n\n\n @state() _constructed = false;\n\n /** Ctor */\n protected constructor(\n appConnections: [HcConnectionOptions, string | undefined, InstalledAppId | undefined][],\n public readonly isMainView: boolean,\n ) {\n super();\n this.constructHvms(appConnections)\n .then(() => {\n console.debug(\"[lit-happ] HappMultiElement: Local Perspective initialized.\");\n this._constructed = true;\n console.debug(\"[lit-happ] HappMultiElement: Initializing Perspective from Network\")\n this.initializePerspectiveFromNetwork()\n .then(() => console.debug(\"[lit-happ] HappMultiElement: Network Perspective initialized.\"))\n })\n }\n\n /** */\n protected async constructHvms(appConnections: [HcConnectionOptions, happSha256: string | undefined, InstalledAppId | undefined][]): Promise<void> {\n const hvmDef = (this.constructor as typeof HappMultiElement).HVM_DEF;\n if (!hvmDef) {\n throw Error(\"HVM_DEF static field undefined in HappMultiElement subclass \" + this.constructor.name);\n }\n for (const [options, happSha256, appId] of appConnections) {\n const appProxy = await ConductorAppProxy.new(hvmDef.id, options, happSha256);\n if (appId) {\n /** Override appId */\n hvmDef.id = appId;\n }\n const hvm = await HappViewModel.new(this, appProxy, hvmDef, this.isMainView);\n await hvm.authorizeAllZomeCalls(appProxy.adminWs);\n this.hvms.push([appProxy, hvm]);\n }\n this.networkCaller = new NetworkCaller(this.hvms[0]![0]); // use first appProxy\n await this.hvmsConstructed();\n console.debug(\"[lit-happ] HappMultiElement constructed. Initializing Local Perspective...\")\n await this.initializePerspectiveFromLocal();\n }\n\n /** */\n async initializePerspectiveFromLocal(): Promise<void> {\n for (const [_proxy, hvm] of this.hvms) {\n await hvm.initializePerspectiveFromLocal();\n }\n await this.perspectiveInitializedFromLocal();\n }\n\n async initializePerspectiveFromNetwork(): Promise<void> {\n // for (const [_proxy, hvm] of this.hvms) {\n // await hvm.initializePerspectiveFromNetwork(); // FIXME: Call Network once Holochain GetStrategy:Network issue is fixed.\n // }\n await this.perspectiveInitializedFromNetwork();\n }\n\n /** -- Lit lifecycle hooks -- */\n\n /** */\n override shouldUpdate() {\n return this._constructed && this.hvms.length > 0;\n }\n\n\n /** -- Hooks for subclasses to override -- */\n\n /** */\n async hvmsConstructed(): Promise<void> {}\n /** */\n async perspectiveInitializedFromLocal(): Promise<void> {}\n /** */\n async perspectiveInitializedFromNetwork(): Promise<void> {}\n\n}\n"]}
|
package/dist/NetworkCaller.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { AgentId, AppProxy, CellAddress } from "@ddd-qc/cell-proxy";
|
|
2
2
|
import { NetworkMetrics, Timestamp } from "@holochain/client";
|
|
3
3
|
import { TransportStats } from "@holochain/client/lib/api/admin/types";
|
|
4
|
+
export type NetworkInfoResponse = {
|
|
5
|
+
error: any;
|
|
6
|
+
metrics: NetworkMetrics | undefined;
|
|
7
|
+
stats: TransportStats | undefined;
|
|
8
|
+
};
|
|
9
|
+
export type NetworkInfoCb = (r: NetworkInfoResponse) => void;
|
|
4
10
|
export declare class NetworkCaller {
|
|
5
11
|
private appProxy;
|
|
6
12
|
private cellAddr?;
|
|
@@ -17,8 +23,10 @@ export declare class NetworkCaller {
|
|
|
17
23
|
get networkMetricsLogs(): [Timestamp, NetworkMetrics][];
|
|
18
24
|
get networkStatsLogs(): [Timestamp, TransportStats][];
|
|
19
25
|
isLooping(): boolean;
|
|
26
|
+
private _callTimeout;
|
|
20
27
|
startCallLoop(interval: number): void;
|
|
21
|
-
|
|
28
|
+
private callRegisteredCallbacks;
|
|
29
|
+
addCallback(callback: NetworkInfoCb): void;
|
|
22
30
|
clearAllCallbacks(): void;
|
|
23
31
|
stopCallLoop(): void;
|
|
24
32
|
clear(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkCaller.d.ts","sourceRoot":"","sources":["../src/NetworkCaller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAyB,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAKH,cAAc,EACd,SAAS,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"NetworkCaller.d.ts","sourceRoot":"","sources":["../src/NetworkCaller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAyB,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAKH,cAAc,EACd,SAAS,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAGrE,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,cAAc,GAAG,SAAS,CAAC;IACpC,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAM7D,qBAAa,aAAa;IAGZ,OAAO,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC;gBAArC,QAAQ,EAAE,QAAQ,EAAU,QAAQ,CAAC,EAAE,WAAW,YAAA;IAKtE,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,mBAAmB,CAA+D;IAC1F,OAAO,CAAC,iBAAiB,CAA+D;IAExF,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,cAAc,CAAkB;IAExC,OAAO,CAAC,UAAU,CAAuB;IAGzC,OAAO,CAAC,oBAAoB,CAAmC;IAK/D,WAAW,CAAC,QAAQ,EAAE,WAAW;IAEjC,WAAW,CAAC,CAAC,EAAE,MAAM;IAKrB,IAAI,kBAAkB,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAA6C;IAEpG,IAAI,gBAAgB,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAA2C;IAMhG,SAAS,IAAI,OAAO;IAKpB,OAAO,CAAC,YAAY,CAAqB;IACzC,aAAa,CAAC,QAAQ,EAAE,MAAM;IA8B9B,OAAO,CAAC,uBAAuB;IAY/B,WAAW,CAAC,QAAQ,EAAE,aAAa;IAKnC,iBAAiB;IAKjB,YAAY;IASZ,KAAK;IAMG,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAW1E,uBAAuB;IASjB,yBAAyB;IAwC3B,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC;IAuBnD,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM;IA6BzB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC;IAajD,oBAAoB,CAAC,CAAC,CAAC,EAAE,MAAM;CAYlC"}
|
package/dist/NetworkCaller.js
CHANGED
|
@@ -11,6 +11,7 @@ export class NetworkCaller {
|
|
|
11
11
|
this._isCallRunning = false;
|
|
12
12
|
this._callbacks = [];
|
|
13
13
|
this._transportToAgentMap = new Map();
|
|
14
|
+
this._callTimeout = 30 * 1000;
|
|
14
15
|
}
|
|
15
16
|
setCellAddr(cellAddr) { this.cellAddr = cellAddr; }
|
|
16
17
|
;
|
|
@@ -27,27 +28,39 @@ export class NetworkCaller {
|
|
|
27
28
|
if (this.isLooping()) {
|
|
28
29
|
this.stopCallLoop();
|
|
29
30
|
}
|
|
31
|
+
if (interval <= 1000) {
|
|
32
|
+
throw Error(`Loop interval is too short: ${interval}`);
|
|
33
|
+
}
|
|
34
|
+
this._callTimeout = interval - 100;
|
|
30
35
|
this._intervalId = setInterval(async () => {
|
|
31
36
|
if (this._isCallRunning) {
|
|
32
37
|
return;
|
|
33
38
|
}
|
|
34
39
|
this._isCallRunning = true;
|
|
35
40
|
try {
|
|
36
|
-
const
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
callback(res, res2);
|
|
40
|
-
}
|
|
41
|
+
const metrics = await this.callNetworkMetrics();
|
|
42
|
+
const stats = await this.callNetworkStats();
|
|
43
|
+
this.callRegisteredCallbacks({ metrics, stats, error: undefined });
|
|
41
44
|
}
|
|
42
45
|
catch (e) {
|
|
43
|
-
console.error("Error
|
|
44
|
-
this.
|
|
46
|
+
console.error("Error when calling Network Metrics & Stats.", e);
|
|
47
|
+
this.callRegisteredCallbacks({ error: e, metrics: undefined, stats: undefined });
|
|
45
48
|
}
|
|
46
49
|
finally {
|
|
47
50
|
this._isCallRunning = false;
|
|
48
51
|
}
|
|
49
52
|
}, interval);
|
|
50
53
|
}
|
|
54
|
+
callRegisteredCallbacks(resp) {
|
|
55
|
+
for (const cb of this._callbacks) {
|
|
56
|
+
try {
|
|
57
|
+
cb(resp);
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
console.error("Error in NetworkCaller callback", e);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
51
64
|
addCallback(callback) {
|
|
52
65
|
this._callbacks.push(callback);
|
|
53
66
|
}
|
|
@@ -55,6 +68,7 @@ export class NetworkCaller {
|
|
|
55
68
|
this._callbacks = [];
|
|
56
69
|
}
|
|
57
70
|
stopCallLoop() {
|
|
71
|
+
console.log("NetworkCaller.stopCallLoop()");
|
|
58
72
|
clearInterval(this._intervalId);
|
|
59
73
|
this._intervalId = undefined;
|
|
60
74
|
this._isCallRunning = false;
|
|
@@ -106,9 +120,9 @@ export class NetworkCaller {
|
|
|
106
120
|
}
|
|
107
121
|
const request = {
|
|
108
122
|
dna_hash: this.cellAddr.dnaId.hash,
|
|
109
|
-
include_dht_summary:
|
|
123
|
+
include_dht_summary: false,
|
|
110
124
|
};
|
|
111
|
-
const response = await this.appProxy.dumpNetworkMetrics(request);
|
|
125
|
+
const response = await this.appProxy.dumpNetworkMetrics(request, this._callTimeout);
|
|
112
126
|
if (!response || !response[this.cellAddr.dnaId.b64]) {
|
|
113
127
|
throw Promise.reject("No network metrics response for dna");
|
|
114
128
|
}
|
|
@@ -143,7 +157,7 @@ export class NetworkCaller {
|
|
|
143
157
|
console.table(logs);
|
|
144
158
|
}
|
|
145
159
|
async callNetworkStats() {
|
|
146
|
-
const response = await this.appProxy.dumpNetworkStats();
|
|
160
|
+
const response = await this.appProxy.dumpNetworkStats(this._callTimeout);
|
|
147
161
|
if (!response) {
|
|
148
162
|
throw Promise.reject("No network stats response for dna");
|
|
149
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkCaller.js","sourceRoot":"","sources":["../src/NetworkCaller.ts"],"names":[],"mappings":"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","sourcesContent":["import {AgentId, AppProxy, CellAddress, prettyDate, RingBuffer} from \"@ddd-qc/cell-proxy\";\r\nimport {\r\n DhtArc,\r\n DumpNetworkMetricsRequest,\r\n FetchStateSummary,\r\n hashFrom32AndType, HoloHashType,\r\n NetworkMetrics,\r\n Timestamp\r\n} from \"@holochain/client\";\r\nimport {TransportStats} from \"@holochain/client/lib/api/admin/types\";\r\n\r\ntype NetworkInfoCb = (info:NetworkMetrics, m: TransportStats) => void;\r\n\r\n\r\n/**\r\n * Class handling network info calling and result storing\r\n */\r\nexport class NetworkCaller {\r\n\r\n /** */\r\n constructor(private appProxy: AppProxy, private cellAddr?: CellAddress) {\r\n // N/A\r\n }\r\n\r\n\r\n private _lastTimeQueried: Timestamp = 0;\r\n private _networkMetricsLogs: RingBuffer<[Timestamp, NetworkMetrics]> = new RingBuffer(50);\r\n private _networkStatsLogs: RingBuffer<[Timestamp, TransportStats]> = new RingBuffer(50);\r\n\r\n private _intervalId: any | undefined = undefined;\r\n private _isCallRunning: boolean = false;\r\n\r\n private _callbacks: NetworkInfoCb[] = [];\r\n\r\n /** peer pub key to AgentId */\r\n private _transportToAgentMap: Map<string, AgentId> = new Map();\r\n\r\n\r\n /** -- Getters & Setters -- */\r\n\r\n setCellAddr(cellAddr: CellAddress) { this.cellAddr = cellAddr};\r\n\r\n setCapacity(n: number) {\r\n this._networkMetricsLogs.resize(n);\r\n this._networkStatsLogs.resize(n);\r\n }\r\n\r\n get networkMetricsLogs(): [Timestamp, NetworkMetrics][] {return this._networkMetricsLogs.toArray();}\r\n\r\n get networkStatsLogs(): [Timestamp, TransportStats][] {return this._networkStatsLogs.toArray();}\r\n\r\n\r\n /** -- Methods -- */\r\n\r\n /** */\r\n isLooping(): boolean {\r\n return this._intervalId !== undefined;\r\n }\r\n\r\n /** Calling twice will stop it */\r\n startCallLoop(interval: number) {\r\n //console.debug(`startCallLoop(${interval})`);\r\n if (this.isLooping()) {\r\n this.stopCallLoop();\r\n }\r\n this._intervalId = setInterval(async () => {\r\n // skip if previous call not done\r\n if (this._isCallRunning) {\r\n return;\r\n }\r\n this._isCallRunning = true;\r\n try {\r\n const res = await this.callNetworkMetrics();\r\n const res2 = await this.callNetworkStats();\r\n for (const callback of this._callbacks) {\r\n callback(res, res2);\r\n } } catch (e) {\r\n console.error(\"Error in NetworkCaller.startCallLoop() stopping the call loop.\", e);\r\n this.stopCallLoop();\r\n } finally {\r\n this._isCallRunning = false;\r\n }\r\n }, interval);\r\n }\r\n\r\n\r\n /** */\r\n addCallback(callback: (n: NetworkMetrics, m: TransportStats) => void) {\r\n this._callbacks.push(callback);\r\n }\r\n\r\n /** */\r\n clearAllCallbacks() {\r\n this._callbacks = [];\r\n }\r\n\r\n /** */\r\n stopCallLoop() {\r\n clearInterval(this._intervalId);\r\n this._intervalId = undefined;\r\n this._isCallRunning = false;\r\n }\r\n\r\n\r\n /** */\r\n clear() {\r\n this._networkMetricsLogs.clear();\r\n this._networkStatsLogs.clear();\r\n }\r\n\r\n\r\n async peerKeyToAgentId(transportKey: string): Promise<AgentId | undefined> {\r\n const maybe = this._transportToAgentMap.get(transportKey);\r\n if (maybe) {\r\n return maybe;\r\n }\r\n await this.updateTransportToAgentMap();\r\n return this._transportToAgentMap.get(transportKey);\r\n }\r\n\r\n\r\n /** debug */\r\n dumpTransportToAgentMap() {\r\n this.updateTransportToAgentMap().then(() => console.table(this._transportToAgentMap));\r\n }\r\n\r\n /**\r\n * Build a mapping from transport pub_key to AgentPubKey by fetching agentInfo.\r\n * AgentInfo returns both the kitsune agent ID and the peer URL, allowing us to\r\n * map the transport key (from URL) to the actual AgentPubKey.\r\n */\r\n async updateTransportToAgentMap() {\r\n if (!this.cellAddr) {\r\n throw Promise.reject(\"buildTransportToAgentMap() aborted. cellAddr not specified.\");\r\n }\r\n\r\n // Fetch agentInfo for these DNAs\r\n const agentInfoResponse = await this.appProxy.agentInfo({ dna_hashes: [this.cellAddr.dnaId.hash] });\r\n\r\n for (const agentInfoItem of agentInfoResponse) {\r\n try {\r\n // Parse the structure: { agentInfo: \"{...json...}\", signature: \"...\" }\r\n const parsed =\r\n typeof agentInfoItem === 'string' ? JSON.parse(agentInfoItem) : agentInfoItem;\r\n const agentInfoData =\r\n typeof parsed.agentInfo === 'string' ? JSON.parse(parsed.agentInfo) : parsed.agentInfo;\r\n const partialAgentId = agentInfoData.agent;\r\n const peerUrl = agentInfoData.url;\r\n if (!partialAgentId || !peerUrl) {\r\n continue;\r\n }\r\n // Extract transport key from the peer URL\r\n const transportKey = extractTransportKeyFromUrl(peerUrl);\r\n if (!transportKey) {\r\n continue;\r\n }\r\n // Convert partial agent ID to full AgentPubKey\r\n const bytes = decodeUrlSafeBase64(partialAgentId);\r\n // Convert the 32-byte core to a full agent pub key (adds type prefix and DHT location)\r\n const fullAgentKey = hashFrom32AndType(bytes, HoloHashType.Agent);\r\n // Update Map\r\n this._transportToAgentMap.set(transportKey, new AgentId(fullAgentKey));\r\n\r\n } catch (e) {\r\n // Skip invalid entries\r\n }\r\n }\r\n }\r\n \r\n\r\n /** */\r\n async callNetworkMetrics(): Promise<NetworkMetrics> {\r\n if (!this.cellAddr) {\r\n throw Promise.reject(\"callNetworkMetrics() aborted. cellAddr not specified.\");\r\n }\r\n /* Call networkInfo */\r\n const request: DumpNetworkMetricsRequest = {\r\n dna_hash: this.cellAddr.dnaId.hash,\r\n include_dht_summary: true, // ???\r\n };\r\n const response = await this.appProxy.dumpNetworkMetrics(request);\r\n if (!response || !response[this.cellAddr.dnaId.b64]) {\r\n throw Promise.reject(\"No network metrics response for dna\");\r\n }\r\n /* Store */\r\n const dnaResp = response[this.cellAddr.dnaId.b64]!;\r\n this._lastTimeQueried = Date.now();\r\n this._networkMetricsLogs.add([this._lastTimeQueried, dnaResp]);\r\n /** */\r\n return dnaResp;\r\n }\r\n\r\n\r\n /** */\r\n dumpNetworkMetricsLogs(n?: number) {\r\n console.log(`dumpNetworkMetricsLogs()`, this.cellAddr);\r\n if (!this.cellAddr) {\r\n throw Error(\"dumpNetworkMetricsLogs() aborted. cellAddr not specified.\");\r\n }\r\n const nn = n? n : this._networkMetricsLogs.getBufferLength();\r\n let logs = this._networkMetricsLogs.getLastN(nn).map(([ts, metrics]) => {\r\n if (metrics.local_agents.length == 0) {\r\n throw Error(\"No local agents found in NetworkMetrics\");\r\n }\r\n if (metrics.local_agents.length == 0) {\r\n console.warn(\"dumpNetworkMetricsLogs() More than one local_agent found\");\r\n }\r\n const local_agent = metrics.local_agents[0]!;\r\n return {\r\n //ts,\r\n ts: prettyDate(new Date(ts)),\r\n current_arc: arc_size(local_agent.storage_arc),\r\n target_arc: arc_size(local_agent.target_arc),\r\n peers: Object.keys(metrics.gossip_state_summary.peer_meta).length,\r\n //total_peers: Object.keys(metrics.gossip_state_summary.peer_meta).length,\r\n rounds: metrics.gossip_state_summary.accepted_rounds.length,\r\n pending_requests: count_pending_requests(metrics.fetch_state_summary),\r\n }\r\n })\r\n console.table(logs);\r\n }\r\n\r\n /** */\r\n async callNetworkStats(): Promise<TransportStats> {\r\n const response = await this.appProxy.dumpNetworkStats();\r\n if (!response) {\r\n throw Promise.reject(\"No network stats response for dna\");\r\n }\r\n /* Store */\r\n this._networkStatsLogs.add([this._lastTimeQueried, response]);\r\n /** */\r\n return response;\r\n }\r\n\r\n\r\n /** */\r\n dumpNetworkStatsLogs(n?: number) {\r\n console.log(`dumpNetworkStatsLogs()`);\r\n const nn = n ? n : this._networkStatsLogs.getBufferLength();\r\n this._networkStatsLogs.getLastN(nn).map(([ts, stats]) => {\r\n console.log(`[${prettyDate(new Date(ts))}] Backend: ${stats.backend} ; Peers: ${stats.peer_urls.length}`);\r\n const logs = stats.connections.map((connection) => {\r\n return connection;\r\n });\r\n console.table(logs);\r\n });\r\n }\r\n\r\n}\r\n\r\n\r\n/** */\r\nfunction count_pending_requests(fetchSummary: FetchStateSummary): number {\r\n let total = 0;\r\n for (const peerUrls of Object.values(fetchSummary.pending_requests)) {\r\n total += peerUrls.length;\r\n }\r\n return total;\r\n}\r\n\r\n\r\n/** */\r\nfunction arc_size(arc: DhtArc): number {\r\n if (arc == null) {\r\n return 0;\r\n }\r\n return arc[1] - arc[0];\r\n}\r\n\r\n\r\n/**\r\n * Extract the transport pub_key from a peer URL.\r\n * Peer URLs typically have format: wss://host/tx5-ws/sig/<transport_pub_key>\r\n * The transport pub_key is the last path segment.\r\n */\r\nfunction extractTransportKeyFromUrl(peerUrl: string): string | null {\r\n try {\r\n const urlObj = new URL(peerUrl);\r\n const pathParts = urlObj.pathname.split('/').filter((p) => p.length > 0);\r\n // The transport key is the last segment after /tx5-ws/sig/ or similar\r\n if (pathParts.length > 0) {\r\n const lastPart = pathParts[pathParts.length - 1]!;\r\n // Transport keys are typically 40+ characters in URL-safe base64\r\n if (lastPart.length >= 40) {\r\n return lastPart;\r\n }\r\n }\r\n } catch {\r\n // If URL parsing fails, try direct string splitting\r\n const parts = peerUrl.split('/');\r\n const lastPart = parts[parts.length - 1];\r\n if (lastPart && lastPart.length >= 40) {\r\n return lastPart;\r\n }\r\n }\r\n return null;\r\n}\r\n\r\n/**\r\n * Decode URL-safe base64 string to Uint8Array.\r\n * URL-safe base64 uses - and _ instead of + and /.\r\n */\r\nfunction decodeUrlSafeBase64(urlSafeBase64: string): Uint8Array {\r\n // Convert URL-safe base64 to standard base64\r\n let standardBase64 = urlSafeBase64.replace(/-/g, '+').replace(/_/g, '/');\r\n // Add padding if necessary\r\n while (standardBase64.length % 4 !== 0) {\r\n standardBase64 += '=';\r\n }\r\n // Decode base64 to bytes\r\n const binaryString = atob(standardBase64);\r\n const bytes = new Uint8Array(binaryString.length);\r\n for (let i = 0; i < binaryString.length; i++) {\r\n bytes[i] = binaryString.charCodeAt(i);\r\n }\r\n return bytes;\r\n}"]}
|
|
1
|
+
{"version":3,"file":"NetworkCaller.js","sourceRoot":"","sources":["../src/NetworkCaller.ts"],"names":[],"mappings":"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","sourcesContent":["import {AgentId, AppProxy, CellAddress, prettyDate, RingBuffer} from \"@ddd-qc/cell-proxy\";\r\nimport {\r\n DhtArc,\r\n DumpNetworkMetricsRequest,\r\n FetchStateSummary,\r\n hashFrom32AndType, HoloHashType,\r\n NetworkMetrics,\r\n Timestamp\r\n} from \"@holochain/client\";\r\nimport {TransportStats} from \"@holochain/client/lib/api/admin/types\";\r\n\r\n\r\nexport type NetworkInfoResponse = {\r\n error: any,\r\n metrics: NetworkMetrics | undefined,\r\n stats: TransportStats | undefined,\r\n};\r\n\r\nexport type NetworkInfoCb = (r: NetworkInfoResponse) => void;\r\n\r\n\r\n/**\r\n * Class handling network info calling and result storing\r\n */\r\nexport class NetworkCaller {\r\n\r\n /** */\r\n constructor(private appProxy: AppProxy, private cellAddr?: CellAddress) {\r\n // N/A\r\n }\r\n\r\n\r\n private _lastTimeQueried: Timestamp = 0;\r\n private _networkMetricsLogs: RingBuffer<[Timestamp, NetworkMetrics]> = new RingBuffer(50);\r\n private _networkStatsLogs: RingBuffer<[Timestamp, TransportStats]> = new RingBuffer(50);\r\n\r\n private _intervalId: any | undefined = undefined;\r\n private _isCallRunning: boolean = false;\r\n\r\n private _callbacks: NetworkInfoCb[] = [];\r\n\r\n /** peer pub key to AgentId */\r\n private _transportToAgentMap: Map<string, AgentId> = new Map();\r\n\r\n\r\n /** -- Getters & Setters -- */\r\n\r\n setCellAddr(cellAddr: CellAddress) { this.cellAddr = cellAddr};\r\n\r\n setCapacity(n: number) {\r\n this._networkMetricsLogs.resize(n);\r\n this._networkStatsLogs.resize(n);\r\n }\r\n\r\n get networkMetricsLogs(): [Timestamp, NetworkMetrics][] {return this._networkMetricsLogs.toArray();}\r\n\r\n get networkStatsLogs(): [Timestamp, TransportStats][] {return this._networkStatsLogs.toArray();}\r\n\r\n\r\n /** -- Methods -- */\r\n\r\n /** */\r\n isLooping(): boolean {\r\n return this._intervalId !== undefined;\r\n }\r\n\r\n /** Calling twice will stop it */\r\n private _callTimeout: number = 30 * 1000;\r\n startCallLoop(interval: number) {\r\n //console.debug(`startCallLoop(${interval})`);\r\n if (this.isLooping()) {\r\n this.stopCallLoop();\r\n }\r\n if (interval <= 1000) {\r\n throw Error(`Loop interval is too short: ${interval}`);\r\n }\r\n this._callTimeout = interval - 100;\r\n this._intervalId = setInterval(async () => {\r\n // skip if previous call not done\r\n if (this._isCallRunning) {\r\n return;\r\n }\r\n this._isCallRunning = true;\r\n try {\r\n const metrics = await this.callNetworkMetrics();\r\n const stats = await this.callNetworkStats();\r\n this.callRegisteredCallbacks({metrics, stats, error: undefined});\r\n } catch (e) {\r\n console.error(\"Error when calling Network Metrics & Stats.\", e);\r\n this.callRegisteredCallbacks({error: e, metrics: undefined, stats: undefined});\r\n } finally {\r\n this._isCallRunning = false;\r\n }\r\n }, interval);\r\n }\r\n\r\n\r\n /** */\r\n private callRegisteredCallbacks(resp: NetworkInfoResponse) {\r\n for (const cb of this._callbacks) {\r\n try {\r\n cb(resp);\r\n } catch (e) {\r\n console.error(\"Error in NetworkCaller callback\", e);\r\n }\r\n }\r\n }\r\n\r\n\r\n /** */\r\n addCallback(callback: NetworkInfoCb) {\r\n this._callbacks.push(callback);\r\n }\r\n\r\n /** */\r\n clearAllCallbacks() {\r\n this._callbacks = [];\r\n }\r\n\r\n /** */\r\n stopCallLoop() {\r\n console.log(\"NetworkCaller.stopCallLoop()\");\r\n clearInterval(this._intervalId);\r\n this._intervalId = undefined;\r\n this._isCallRunning = false;\r\n }\r\n\r\n\r\n /** */\r\n clear() {\r\n this._networkMetricsLogs.clear();\r\n this._networkStatsLogs.clear();\r\n }\r\n\r\n\r\n async peerKeyToAgentId(transportKey: string): Promise<AgentId | undefined> {\r\n const maybe = this._transportToAgentMap.get(transportKey);\r\n if (maybe) {\r\n return maybe;\r\n }\r\n await this.updateTransportToAgentMap();\r\n return this._transportToAgentMap.get(transportKey);\r\n }\r\n\r\n\r\n /** debug */\r\n dumpTransportToAgentMap() {\r\n this.updateTransportToAgentMap().then(() => console.table(this._transportToAgentMap));\r\n }\r\n\r\n /**\r\n * Build a mapping from transport pub_key to AgentPubKey by fetching agentInfo.\r\n * AgentInfo returns both the kitsune agent ID and the peer URL, allowing us to\r\n * map the transport key (from URL) to the actual AgentPubKey.\r\n */\r\n async updateTransportToAgentMap() {\r\n if (!this.cellAddr) {\r\n throw Promise.reject(\"buildTransportToAgentMap() aborted. cellAddr not specified.\");\r\n }\r\n\r\n // Fetch agentInfo for these DNAs\r\n const agentInfoResponse = await this.appProxy.agentInfo({ dna_hashes: [this.cellAddr.dnaId.hash] });\r\n\r\n for (const agentInfoItem of agentInfoResponse) {\r\n try {\r\n // Parse the structure: { agentInfo: \"{...json...}\", signature: \"...\" }\r\n const parsed =\r\n typeof agentInfoItem === 'string' ? JSON.parse(agentInfoItem) : agentInfoItem;\r\n const agentInfoData =\r\n typeof parsed.agentInfo === 'string' ? JSON.parse(parsed.agentInfo) : parsed.agentInfo;\r\n const partialAgentId = agentInfoData.agent;\r\n const peerUrl = agentInfoData.url;\r\n if (!partialAgentId || !peerUrl) {\r\n continue;\r\n }\r\n // Extract transport key from the peer URL\r\n const transportKey = extractTransportKeyFromUrl(peerUrl);\r\n if (!transportKey) {\r\n continue;\r\n }\r\n // Convert partial agent ID to full AgentPubKey\r\n const bytes = decodeUrlSafeBase64(partialAgentId);\r\n // Convert the 32-byte core to a full agent pub key (adds type prefix and DHT location)\r\n const fullAgentKey = hashFrom32AndType(bytes, HoloHashType.Agent);\r\n // Update Map\r\n this._transportToAgentMap.set(transportKey, new AgentId(fullAgentKey));\r\n\r\n } catch (e) {\r\n // Skip invalid entries\r\n }\r\n }\r\n }\r\n \r\n\r\n /** */\r\n async callNetworkMetrics(): Promise<NetworkMetrics> {\r\n if (!this.cellAddr) {\r\n throw Promise.reject(\"callNetworkMetrics() aborted. cellAddr not specified.\");\r\n }\r\n /* Call networkInfo */\r\n const request: DumpNetworkMetricsRequest = {\r\n dna_hash: this.cellAddr.dnaId.hash,\r\n include_dht_summary: false, // not needed and expensive\r\n };\r\n const response = await this.appProxy.dumpNetworkMetrics(request, this._callTimeout);\r\n if (!response || !response[this.cellAddr.dnaId.b64]) {\r\n throw Promise.reject(\"No network metrics response for dna\");\r\n }\r\n /* Store */\r\n const dnaResp = response[this.cellAddr.dnaId.b64]!;\r\n this._lastTimeQueried = Date.now();\r\n this._networkMetricsLogs.add([this._lastTimeQueried, dnaResp]);\r\n /** */\r\n return dnaResp;\r\n }\r\n\r\n\r\n /** */\r\n dumpNetworkMetricsLogs(n?: number) {\r\n console.log(`dumpNetworkMetricsLogs()`, this.cellAddr);\r\n if (!this.cellAddr) {\r\n throw Error(\"dumpNetworkMetricsLogs() aborted. cellAddr not specified.\");\r\n }\r\n const nn = n? n : this._networkMetricsLogs.getBufferLength();\r\n let logs = this._networkMetricsLogs.getLastN(nn).map(([ts, metrics]) => {\r\n if (metrics.local_agents.length == 0) {\r\n throw Error(\"No local agents found in NetworkMetrics\");\r\n }\r\n if (metrics.local_agents.length == 0) {\r\n console.warn(\"dumpNetworkMetricsLogs() More than one local_agent found\");\r\n }\r\n const local_agent = metrics.local_agents[0]!;\r\n return {\r\n //ts,\r\n ts: prettyDate(new Date(ts)),\r\n current_arc: arc_size(local_agent.storage_arc),\r\n target_arc: arc_size(local_agent.target_arc),\r\n peers: Object.keys(metrics.gossip_state_summary.peer_meta).length,\r\n //total_peers: Object.keys(metrics.gossip_state_summary.peer_meta).length,\r\n rounds: metrics.gossip_state_summary.accepted_rounds.length,\r\n pending_requests: count_pending_requests(metrics.fetch_state_summary),\r\n }\r\n })\r\n console.table(logs);\r\n }\r\n\r\n /** */\r\n async callNetworkStats(): Promise<TransportStats> {\r\n const response = await this.appProxy.dumpNetworkStats(this._callTimeout);\r\n if (!response) {\r\n throw Promise.reject(\"No network stats response for dna\");\r\n }\r\n /* Store */\r\n this._networkStatsLogs.add([this._lastTimeQueried, response]);\r\n /** */\r\n return response;\r\n }\r\n\r\n\r\n /** */\r\n dumpNetworkStatsLogs(n?: number) {\r\n console.log(`dumpNetworkStatsLogs()`);\r\n const nn = n ? n : this._networkStatsLogs.getBufferLength();\r\n this._networkStatsLogs.getLastN(nn).map(([ts, stats]) => {\r\n console.log(`[${prettyDate(new Date(ts))}] Backend: ${stats.backend} ; Peers: ${stats.peer_urls.length}`);\r\n const logs = stats.connections.map((connection) => {\r\n return connection;\r\n });\r\n console.table(logs);\r\n });\r\n }\r\n\r\n}\r\n\r\n\r\n/** */\r\nfunction count_pending_requests(fetchSummary: FetchStateSummary): number {\r\n let total = 0;\r\n for (const peerUrls of Object.values(fetchSummary.pending_requests)) {\r\n total += peerUrls.length;\r\n }\r\n return total;\r\n}\r\n\r\n\r\n/** */\r\nfunction arc_size(arc: DhtArc): number {\r\n if (arc == null) {\r\n return 0;\r\n }\r\n return arc[1] - arc[0];\r\n}\r\n\r\n\r\n/**\r\n * Extract the transport pub_key from a peer URL.\r\n * Peer URLs typically have format: wss://host/tx5-ws/sig/<transport_pub_key>\r\n * The transport pub_key is the last path segment.\r\n */\r\nfunction extractTransportKeyFromUrl(peerUrl: string): string | null {\r\n try {\r\n const urlObj = new URL(peerUrl);\r\n const pathParts = urlObj.pathname.split('/').filter((p) => p.length > 0);\r\n // The transport key is the last segment after /tx5-ws/sig/ or similar\r\n if (pathParts.length > 0) {\r\n const lastPart = pathParts[pathParts.length - 1]!;\r\n // Transport keys are typically 40+ characters in URL-safe base64\r\n if (lastPart.length >= 40) {\r\n return lastPart;\r\n }\r\n }\r\n } catch {\r\n // If URL parsing fails, try direct string splitting\r\n const parts = peerUrl.split('/');\r\n const lastPart = parts[parts.length - 1];\r\n if (lastPart && lastPart.length >= 40) {\r\n return lastPart;\r\n }\r\n }\r\n return null;\r\n}\r\n\r\n/**\r\n * Decode URL-safe base64 string to Uint8Array.\r\n * URL-safe base64 uses - and _ instead of + and /.\r\n */\r\nfunction decodeUrlSafeBase64(urlSafeBase64: string): Uint8Array {\r\n // Convert URL-safe base64 to standard base64\r\n let standardBase64 = urlSafeBase64.replace(/-/g, '+').replace(/_/g, '/');\r\n // Add padding if necessary\r\n while (standardBase64.length % 4 !== 0) {\r\n standardBase64 += '=';\r\n }\r\n // Decode base64 to bytes\r\n const binaryString = atob(standardBase64);\r\n const bytes = new Uint8Array(binaryString.length);\r\n for (let i = 0; i < binaryString.length; i++) {\r\n bytes[i] = binaryString.charCodeAt(i);\r\n }\r\n return bytes;\r\n}"]}
|