@activeledger/activenetwork 2.15.7 → 4.3.3
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/es/network/cpus.d.ts +1 -0
- package/es/network/cpus.d.ts.map +1 -1
- package/es/network/cpus.js +26 -15
- package/es/network/cpus.js.map +1 -1
- package/es/network/endpoints.d.ts +7 -3
- package/es/network/endpoints.d.ts.map +1 -1
- package/es/network/endpoints.js +685 -172
- package/es/network/endpoints.js.map +1 -1
- package/es/network/home.d.ts.map +1 -1
- package/es/network/home.js +41 -19
- package/es/network/home.js.map +1 -1
- package/es/network/host.d.ts +15 -7
- package/es/network/host.d.ts.map +1 -1
- package/es/network/host.js +631 -240
- package/es/network/host.js.map +1 -1
- package/es/network/locker.d.ts +10 -5
- package/es/network/locker.d.ts.map +1 -1
- package/es/network/locker.js +50 -17
- package/es/network/locker.js.map +1 -1
- package/es/network/maintain.d.ts.map +1 -1
- package/es/network/maintain.js +42 -42
- package/es/network/maintain.js.map +1 -1
- package/es/network/neighbour.d.ts +8 -4
- package/es/network/neighbour.d.ts.map +1 -1
- package/es/network/neighbour.js +82 -18
- package/es/network/neighbour.js.map +1 -1
- package/es/network/neighbourhood.d.ts +1 -1
- package/es/network/neighbourhood.d.ts.map +1 -1
- package/es/network/neighbourhood.js +39 -42
- package/es/network/neighbourhood.js.map +1 -1
- package/es/network/p2pClient.d.ts +20 -0
- package/es/network/p2pClient.d.ts.map +1 -0
- package/es/network/p2pClient.js +84 -0
- package/es/network/p2pClient.js.map +1 -0
- package/es/network/process.js +99 -65
- package/es/network/process.js.map +1 -1
- package/es/network/utils.d.ts.map +1 -1
- package/es/network/utils.js +17 -21
- package/es/network/utils.js.map +1 -1
- package/lib/network/cpus.d.ts +1 -0
- package/lib/network/cpus.d.ts.map +1 -1
- package/lib/network/cpus.js +26 -15
- package/lib/network/cpus.js.map +1 -1
- package/lib/network/endpoints.d.ts +7 -3
- package/lib/network/endpoints.d.ts.map +1 -1
- package/lib/network/endpoints.js +684 -171
- package/lib/network/endpoints.js.map +1 -1
- package/lib/network/home.d.ts.map +1 -1
- package/lib/network/home.js +41 -19
- package/lib/network/home.js.map +1 -1
- package/lib/network/host.d.ts +15 -7
- package/lib/network/host.d.ts.map +1 -1
- package/lib/network/host.js +630 -239
- package/lib/network/host.js.map +1 -1
- package/lib/network/locker.d.ts +10 -5
- package/lib/network/locker.d.ts.map +1 -1
- package/lib/network/locker.js +50 -17
- package/lib/network/locker.js.map +1 -1
- package/lib/network/maintain.d.ts.map +1 -1
- package/lib/network/maintain.js +42 -42
- package/lib/network/maintain.js.map +1 -1
- package/lib/network/neighbour.d.ts +8 -4
- package/lib/network/neighbour.d.ts.map +1 -1
- package/lib/network/neighbour.js +82 -18
- package/lib/network/neighbour.js.map +1 -1
- package/lib/network/neighbourhood.d.ts +1 -1
- package/lib/network/neighbourhood.d.ts.map +1 -1
- package/lib/network/neighbourhood.js +39 -42
- package/lib/network/neighbourhood.js.map +1 -1
- package/lib/network/p2pClient.d.ts +20 -0
- package/lib/network/p2pClient.d.ts.map +1 -0
- package/lib/network/p2pClient.js +88 -0
- package/lib/network/p2pClient.js.map +1 -0
- package/lib/network/process.js +98 -64
- package/lib/network/process.js.map +1 -1
- package/lib/network/utils.d.ts.map +1 -1
- package/lib/network/utils.js +17 -21
- package/lib/network/utils.js.map +1 -1
- package/package.json +10 -8
package/es/network/process.js
CHANGED
|
@@ -1,17 +1,22 @@
|
|
|
1
|
-
import { ActiveDSConnect, ActiveOptions
|
|
1
|
+
import { ActiveDSConnect, ActiveOptions } from "@activeledger/activeoptions";
|
|
2
2
|
import { ActiveCrypto } from "@activeledger/activecrypto";
|
|
3
3
|
import { ActiveLogger } from "@activeledger/activelogger";
|
|
4
4
|
import { Home } from "./home";
|
|
5
5
|
import { Neighbour } from "./neighbour";
|
|
6
6
|
import { ActiveProtocol } from "@activeledger/activeprotocol";
|
|
7
|
-
import { EventEngine } from "@activeledger/activequery";
|
|
8
7
|
const MAX_MEMORY_MB = ActiveOptions.get("max_memory", 1500) * 1024 * 1024;
|
|
9
8
|
class Processor {
|
|
9
|
+
db;
|
|
10
|
+
dbe;
|
|
11
|
+
dbev;
|
|
12
|
+
secured;
|
|
13
|
+
neighbourhood;
|
|
14
|
+
unhandledRejection = {};
|
|
15
|
+
protocols = {};
|
|
16
|
+
maxMemoryReached = false;
|
|
17
|
+
latestContractVersion = {};
|
|
18
|
+
latestContractData = {};
|
|
10
19
|
constructor() {
|
|
11
|
-
this.unhandledRejection = {};
|
|
12
|
-
this.protocols = {};
|
|
13
|
-
this.maxMemoryReached = false;
|
|
14
|
-
this.latestContractVersion = {};
|
|
15
20
|
ActiveOptions.init();
|
|
16
21
|
ActiveOptions.parseConfig();
|
|
17
22
|
ActiveLogger.enableDebug = ActiveOptions.get("debug", false);
|
|
@@ -29,13 +34,20 @@ class Processor {
|
|
|
29
34
|
});
|
|
30
35
|
break;
|
|
31
36
|
case "hk":
|
|
32
|
-
this.housekeeping(m.data.right, m.data.neighbourhood);
|
|
37
|
+
this.housekeeping(m.data.right ?? Home.right, m.data.neighbourhood);
|
|
33
38
|
break;
|
|
34
39
|
case "tx":
|
|
35
40
|
this.protocols[m.entry.$umid] = new ActiveProtocol.Process(m.entry, Home.host, Home.reference, Home.right, this.db, this.dbe, this.dbev, this.secured);
|
|
36
41
|
this.unhandledRejection[m.entry.$umid] = (reason) => {
|
|
37
|
-
if (this.protocols[m.entry.$umid]
|
|
42
|
+
if (this.protocols[m.entry.$umid] &&
|
|
43
|
+
!this.protocols[m.entry.$umid].unhandled) {
|
|
44
|
+
ActiveLogger.warn({
|
|
45
|
+
name: reason?.name ?? "Unknown",
|
|
46
|
+
message: reason?.message ?? "Unknown",
|
|
47
|
+
stack: reason?.stack ?? "Unknown",
|
|
48
|
+
}, "UnhandledRejection - " + m.entry.$umid);
|
|
38
49
|
this.unhandled(m.entry, reason);
|
|
50
|
+
this.protocols[m.entry.$umid].unhandled = true;
|
|
39
51
|
}
|
|
40
52
|
};
|
|
41
53
|
process.on("unhandledRejection", this.unhandledRejection[m.entry.$umid]);
|
|
@@ -43,6 +55,13 @@ class Processor {
|
|
|
43
55
|
this.committed(m.entry, response);
|
|
44
56
|
});
|
|
45
57
|
this.protocols[m.entry.$umid].on("failed", (error) => {
|
|
58
|
+
const contract = m.entry.$tx.$contract.substring(0, 64);
|
|
59
|
+
if (this.latestContractData[contract]) {
|
|
60
|
+
this.send("contractData", {
|
|
61
|
+
contract: contract,
|
|
62
|
+
data: null,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
46
65
|
this.failed(m.entry, error.error);
|
|
47
66
|
});
|
|
48
67
|
this.protocols[m.entry.$umid].on("broadcast", (early) => {
|
|
@@ -51,16 +70,19 @@ class Processor {
|
|
|
51
70
|
this.protocols[m.entry.$umid].on("reload", () => {
|
|
52
71
|
this.reloadUp(m.entry.$umid);
|
|
53
72
|
});
|
|
54
|
-
this.protocols[m.entry.$umid].on("throw", (response) => {
|
|
55
|
-
this.throw(m.entry, response);
|
|
56
|
-
});
|
|
57
73
|
this.protocols[m.entry.$umid].on("contractLatestVersion", (response) => {
|
|
58
74
|
if (response) {
|
|
59
75
|
this.latestContractVersion[response.contract] = response.file;
|
|
60
76
|
this.send("contractLatestVersion", response);
|
|
61
77
|
}
|
|
62
78
|
});
|
|
63
|
-
this.protocols[m.entry.$umid].
|
|
79
|
+
this.protocols[m.entry.$umid].on("contractData", (response) => {
|
|
80
|
+
if (response) {
|
|
81
|
+
this.latestContractData[response.contract] = response.data;
|
|
82
|
+
this.send("contractData", response);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
this.protocols[m.entry.$umid].start(this.latestContractVersion[m.entry.$tx.$contract], this.latestContractData[m.entry.$tx.$contract.substring(0, 64)]);
|
|
64
86
|
break;
|
|
65
87
|
case "broadcast":
|
|
66
88
|
if (this.protocols[m.data.umid]) {
|
|
@@ -68,16 +90,33 @@ class Processor {
|
|
|
68
90
|
}
|
|
69
91
|
break;
|
|
70
92
|
case "destory":
|
|
71
|
-
this.clear(m.data.umid);
|
|
93
|
+
this.clear(m.data.umid, m.data.skipTimeout);
|
|
72
94
|
break;
|
|
73
95
|
case "reload":
|
|
74
96
|
this.reloadDown(m.data);
|
|
75
97
|
break;
|
|
76
98
|
case "contractLatestVersion":
|
|
77
|
-
if (
|
|
99
|
+
if (m.data.refresh) {
|
|
100
|
+
if (m.data.contract) {
|
|
101
|
+
for (const key of Object.keys(this.latestContractVersion)) {
|
|
102
|
+
if (key === m.data.contract || this.latestContractVersion[key].includes(m.data.contract)) {
|
|
103
|
+
delete this.latestContractVersion[key];
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
ActiveProtocol.Process.clearContractPathCache(m.data.contract);
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
this.latestContractVersion = {};
|
|
110
|
+
ActiveProtocol.Process.clearContractPathCache();
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
if (m.data.contract) {
|
|
78
114
|
this.latestContractVersion[m.data.contract] = m.data.file;
|
|
79
115
|
}
|
|
80
116
|
break;
|
|
117
|
+
case "contractData":
|
|
118
|
+
this.latestContractData[m.data.contract] = m.data.data;
|
|
119
|
+
break;
|
|
81
120
|
default:
|
|
82
121
|
ActiveLogger.fatal(m, "Unknown Processor Call");
|
|
83
122
|
}
|
|
@@ -94,6 +133,7 @@ class Processor {
|
|
|
94
133
|
this.send("contractLatestVersion", {
|
|
95
134
|
contract: output,
|
|
96
135
|
file: `${output}@${input.version}`,
|
|
136
|
+
refresh: true,
|
|
97
137
|
});
|
|
98
138
|
}
|
|
99
139
|
this.send("commited", {
|
|
@@ -105,13 +145,22 @@ class Processor {
|
|
|
105
145
|
response: entry.response,
|
|
106
146
|
},
|
|
107
147
|
});
|
|
108
|
-
|
|
109
|
-
this.clear(entry.$umid);
|
|
110
|
-
}
|
|
148
|
+
this.clear(entry.$umid);
|
|
111
149
|
}
|
|
112
150
|
failed(entry, error) {
|
|
113
151
|
ActiveLogger.debug(error, "TX Failed");
|
|
114
|
-
|
|
152
|
+
if (Home.reference) {
|
|
153
|
+
if (entry.$nodes[Home.reference]?.error) {
|
|
154
|
+
entry.$nodes[Home.reference].error = error?.toString();
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
entry.$nodes[Home.reference] = {
|
|
158
|
+
vote: false,
|
|
159
|
+
commit: false,
|
|
160
|
+
error: error?.toString(),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
}
|
|
115
164
|
this.send("commited", {
|
|
116
165
|
umid: entry.$umid,
|
|
117
166
|
nodes: entry.$nodes,
|
|
@@ -134,6 +183,13 @@ class Processor {
|
|
|
134
183
|
});
|
|
135
184
|
}
|
|
136
185
|
reloadDown(data) {
|
|
186
|
+
try {
|
|
187
|
+
ActiveOptions.parseConfig();
|
|
188
|
+
ActiveLogger.enableDebug = ActiveOptions.get("debug", false);
|
|
189
|
+
}
|
|
190
|
+
catch (e) {
|
|
191
|
+
ActiveLogger.error(e, "Child process failed to re-parse config.json");
|
|
192
|
+
}
|
|
137
193
|
ActiveOptions.extendConfig()
|
|
138
194
|
.then((config) => {
|
|
139
195
|
if (config.neighbourhood) {
|
|
@@ -146,47 +202,13 @@ class Processor {
|
|
|
146
202
|
ActiveLogger.info(e, "Failed to reload Neighbourhood");
|
|
147
203
|
});
|
|
148
204
|
}
|
|
149
|
-
throw(entry, response) {
|
|
150
|
-
ActiveLogger.info(response, "Throwing Transaction");
|
|
151
|
-
const eventEngine = new EventEngine(this.dbev, entry.$tx.$contract);
|
|
152
|
-
eventEngine.setPhase("throw");
|
|
153
|
-
if (response.locations && response.locations.length) {
|
|
154
|
-
let i = response.locations.length;
|
|
155
|
-
while (i--) {
|
|
156
|
-
let location = response.locations[i];
|
|
157
|
-
ActiveRequest.send(location, "POST", [], {
|
|
158
|
-
$tx: entry.$tx,
|
|
159
|
-
$selfsign: entry.$selfsign,
|
|
160
|
-
$sigs: entry.$sigs,
|
|
161
|
-
})
|
|
162
|
-
.then((resp) => {
|
|
163
|
-
eventEngine.emit("throw", {
|
|
164
|
-
success: true,
|
|
165
|
-
sentFrom: Home.host,
|
|
166
|
-
sentTo: location,
|
|
167
|
-
$umid: entry.$umid,
|
|
168
|
-
response: resp.data,
|
|
169
|
-
});
|
|
170
|
-
})
|
|
171
|
-
.catch((error) => {
|
|
172
|
-
eventEngine.emit("throw", {
|
|
173
|
-
success: false,
|
|
174
|
-
sentFrom: Home.host,
|
|
175
|
-
sentTo: location,
|
|
176
|
-
$umid: entry.$umid,
|
|
177
|
-
response: error === null || error === void 0 ? void 0 : error.toString(),
|
|
178
|
-
});
|
|
179
|
-
});
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
205
|
unhandled(entry, error) {
|
|
184
|
-
|
|
185
|
-
ActiveLogger.warn(error, "UnhandledRejection");
|
|
206
|
+
let recoverable = false;
|
|
186
207
|
if (entry.$nodes) {
|
|
187
208
|
const errMsg = "(Unhandled Contract Error) " + JSON.stringify(error || "unknown");
|
|
188
209
|
if (Home.reference) {
|
|
189
|
-
|
|
210
|
+
recoverable = true;
|
|
211
|
+
if (entry.$nodes[Home.reference]?.error) {
|
|
190
212
|
entry.$nodes[Home.reference].error = errMsg;
|
|
191
213
|
}
|
|
192
214
|
else {
|
|
@@ -208,27 +230,39 @@ class Processor {
|
|
|
208
230
|
this.send("unhandledrejection", {
|
|
209
231
|
umid: entry.$umid,
|
|
210
232
|
nodes: entry.$nodes,
|
|
233
|
+
recoverable,
|
|
211
234
|
});
|
|
212
235
|
if (!entry.$broadcast) {
|
|
213
236
|
this.clear(entry.$umid);
|
|
214
237
|
}
|
|
215
238
|
}
|
|
216
239
|
send(type, data) {
|
|
217
|
-
process
|
|
240
|
+
process?.send({
|
|
218
241
|
type,
|
|
219
242
|
data,
|
|
243
|
+
}, (e) => {
|
|
220
244
|
});
|
|
221
245
|
}
|
|
222
|
-
clear(umid) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
this.protocols[umid]
|
|
226
|
-
|
|
227
|
-
|
|
246
|
+
clear(umid, skipTimeout = false) {
|
|
247
|
+
const clear = () => {
|
|
248
|
+
ActiveLogger.debug("Removing from memory : " + umid);
|
|
249
|
+
if (this.protocols[umid]) {
|
|
250
|
+
this.protocols[umid].destroy(umid);
|
|
251
|
+
this.protocols[umid].removeAllListeners();
|
|
252
|
+
delete this.protocols[umid];
|
|
253
|
+
}
|
|
254
|
+
if (this.unhandledRejection[umid]) {
|
|
255
|
+
process.off("unhandledRejection", this.unhandledRejection[umid]);
|
|
256
|
+
delete this.unhandledRejection[umid];
|
|
257
|
+
}
|
|
258
|
+
};
|
|
259
|
+
if (skipTimeout) {
|
|
260
|
+
clear();
|
|
228
261
|
}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
262
|
+
else {
|
|
263
|
+
setTimeout(() => {
|
|
264
|
+
clear();
|
|
265
|
+
}, 5000);
|
|
232
266
|
}
|
|
233
267
|
}
|
|
234
268
|
setup(setup) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/network/process.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/network/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/network/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/network/utils.ts"],"names":[],"mappings":"AA8BA,qBAAa,gBAAgB;IAQ3B,OAAO,CAAC,MAAM,CAAC,WAAW,CAAS;IASnC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAS;WASrB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WACvC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM;IAkBnE,OAAO,CAAC,MAAM,CAAC,WAAW;CAoC3B"}
|
package/es/network/utils.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ActiveOptions } from "@activeledger/activeoptions";
|
|
2
2
|
export class ActiveInterfaces {
|
|
3
|
+
static bindingHost;
|
|
4
|
+
static bindingPort;
|
|
3
5
|
static getBindingDetails(type) {
|
|
4
6
|
ActiveInterfaces.findBinding();
|
|
5
7
|
if (type == "host") {
|
|
@@ -14,32 +16,26 @@ export class ActiveInterfaces {
|
|
|
14
16
|
return;
|
|
15
17
|
let argv = ActiveOptions.fetch(true);
|
|
16
18
|
let config = ActiveOptions.fetch(false);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
const hostString = config.host || argv.host;
|
|
20
|
+
if (hostString) {
|
|
21
|
+
const [host, portStr] = hostString.split(":");
|
|
19
22
|
this.bindingHost = host;
|
|
20
|
-
|
|
23
|
+
let port = parseInt(portStr, 10);
|
|
24
|
+
if (isNaN(port)) {
|
|
25
|
+
port = argv.port;
|
|
26
|
+
}
|
|
27
|
+
if (isNaN(port)) {
|
|
28
|
+
port = 5260;
|
|
29
|
+
}
|
|
30
|
+
this.bindingPort = port;
|
|
21
31
|
}
|
|
22
32
|
else {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
this.bindingHost = host;
|
|
27
|
-
this.bindingPort = parseInt(port);
|
|
28
|
-
return;
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
if (argv.port) {
|
|
32
|
-
this.bindingHost = host;
|
|
33
|
-
this.bindingPort = argv.port;
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
this.bindingHost = host;
|
|
37
|
-
this.bindingPort = 5260;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
33
|
+
const port = parseInt(argv.port, 10);
|
|
34
|
+
if (argv.host === undefined && !isNaN(port)) {
|
|
35
|
+
this.bindingPort = port;
|
|
40
36
|
}
|
|
41
37
|
else {
|
|
42
|
-
throw new Error("IP:Port Binding not found");
|
|
38
|
+
throw new Error("IP:Port Binding not found in configuration or arguments.");
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
41
|
}
|
package/es/network/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/network/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/network/utils.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAQ5D,MAAM,OAAO,gBAAgB;IAQnB,MAAM,CAAC,WAAW,CAAS;IAS3B,MAAM,CAAC,WAAW,CAAS;IAW5B,MAAM,CAAC,iBAAiB,CAAC,IAAY;QAE1C,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,IAAI,IAAI,MAAM,EAAE;YAClB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;aAAM;YACL,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;IACH,CAAC;IASO,MAAM,CAAC,WAAW;QAExB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAGjD,IAAI,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAGxC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;QAE5C,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAGxB,IAAI,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;gBACf,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;aAClB;YACD,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;gBACf,IAAI,GAAG,IAAI,CAAC;aACb;YACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;SACzB;aAAM;YAEL,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACrC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAG3C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;aACzB;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;aAC7E;SACF;IACH,CAAC;CACF"}
|
package/lib/network/cpus.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpus.d.ts","sourceRoot":"","sources":["../../src/network/cpus.ts"],"names":[],"mappings":"AAiCA,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"cpus.d.ts","sourceRoot":"","sources":["../../src/network/cpus.ts"],"names":[],"mappings":"AAiCA,qBAAa,aAAa;IAQxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAuB;WAQjC,KAAK,IAAI,MAAM;CAmD9B"}
|
package/lib/network/cpus.js
CHANGED
|
@@ -4,7 +4,11 @@ exports.PhysicalCores = void 0;
|
|
|
4
4
|
const child = require("child_process");
|
|
5
5
|
const os = require("os");
|
|
6
6
|
class PhysicalCores {
|
|
7
|
+
static coreCount = null;
|
|
7
8
|
static count() {
|
|
9
|
+
if (this.coreCount !== null) {
|
|
10
|
+
return this.coreCount;
|
|
11
|
+
}
|
|
8
12
|
switch (os.platform()) {
|
|
9
13
|
case "linux":
|
|
10
14
|
return parseInt(child.execSync('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l', { encoding: "utf8" }));
|
|
@@ -14,23 +18,30 @@ class PhysicalCores {
|
|
|
14
18
|
const output = child.execSync("WMIC CPU Get NumberOfCores", {
|
|
15
19
|
encoding: "utf8"
|
|
16
20
|
});
|
|
17
|
-
|
|
21
|
+
this.coreCount = output
|
|
18
22
|
.split(os.EOL)
|
|
19
|
-
.map(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
return !isNaN(value);
|
|
24
|
-
})
|
|
25
|
-
.reduce(function add(sum, number) {
|
|
26
|
-
return sum + number;
|
|
27
|
-
}, 0);
|
|
23
|
+
.map(line => parseInt(line, 10))
|
|
24
|
+
.filter(value => !isNaN(value))
|
|
25
|
+
.reduce((sum, number) => sum + number, 0);
|
|
26
|
+
return this.coreCount;
|
|
28
27
|
default:
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
const cpus = os.cpus();
|
|
29
|
+
if (cpus && cpus.length > 0 && cpus[0].core_id !== undefined) {
|
|
30
|
+
const coreIds = new Set();
|
|
31
|
+
for (const cpu of cpus) {
|
|
32
|
+
coreIds.add(cpu.core_id);
|
|
33
|
+
}
|
|
34
|
+
this.coreCount = coreIds.size;
|
|
35
|
+
return this.coreCount;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
this.coreCount = cpus.filter(function (cpu, index) {
|
|
39
|
+
const hasHyperthreading = cpu.model.includes("Intel");
|
|
40
|
+
const isOdd = index % 2 === 1;
|
|
41
|
+
return !hasHyperthreading || isOdd;
|
|
42
|
+
}).length;
|
|
43
|
+
return this.coreCount;
|
|
44
|
+
}
|
|
34
45
|
}
|
|
35
46
|
}
|
|
36
47
|
}
|
package/lib/network/cpus.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpus.js","sourceRoot":"","sources":["../../src/network/cpus.ts"],"names":[],"mappings":";;;AAsBA,uCAAuC;AACvC,yBAAyB;AAUzB,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"cpus.js","sourceRoot":"","sources":["../../src/network/cpus.ts"],"names":[],"mappings":";;;AAsBA,uCAAuC;AACvC,yBAAyB;AAUzB,MAAa,aAAa;IAQhB,MAAM,CAAC,SAAS,GAAkB,IAAI,CAAC;IAQxC,MAAM,CAAC,KAAK;QAEjB,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE;YAC3B,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QAED,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,KAAK,OAAO;gBACV,OAAO,QAAQ,CACb,KAAK,CAAC,QAAQ,CACZ,uDAAuD,EACvD,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CACF,CAAC;YACJ,KAAK,QAAQ;gBACX,OAAO,QAAQ,CACb,KAAK,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CACrE,CAAC;YACJ,KAAK,OAAO;gBACV,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,4BAA4B,EAAE;oBAC1D,QAAQ,EAAE,MAAM;iBACjB,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,GAAG,MAAM;qBACpB,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC;qBACb,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;qBAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;qBAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC,SAAS,CAAC;YACxB;gBACE,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;gBAGvB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAK,IAAI,CAAC,CAAC,CAAS,CAAC,OAAO,KAAK,SAAS,EAAE;oBACrE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;oBAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACtB,OAAO,CAAC,GAAG,CAAE,GAAW,CAAC,OAAO,CAAC,CAAC;qBACnC;oBACD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC9B,OAAO,IAAI,CAAC,SAAS,CAAC;iBACvB;qBAAM;oBAGL,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,UAAS,GAAG,EAAE,KAAK;wBAC9C,MAAM,iBAAiB,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;wBACtD,MAAM,KAAK,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;wBAC9B,OAAO,CAAC,iBAAiB,IAAI,KAAK,CAAC;oBACrC,CAAC,CAAC,CAAC,MAAM,CAAC;oBACV,OAAO,IAAI,CAAC,SAAS,CAAC;iBACvB;SACJ;IACH,CAAC;;AAlEH,sCAmEC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { ActiveDSConnect } from "@activeledger/activeoptions";
|
|
2
3
|
import { Host } from "./host";
|
|
3
4
|
export declare class Endpoints {
|
|
4
5
|
static rebaseThrottle: number;
|
|
5
|
-
static ExternalInitalise(host: Host, body: any, ip: string): Promise<any>;
|
|
6
|
+
static ExternalInitalise(host: Host, body: any, ip: string, db: ActiveDSConnect): Promise<any>;
|
|
7
|
+
static shouldTriggerSpiLookup(errors: string[] | undefined, selfError?: string): boolean;
|
|
8
|
+
static labelOrKey(txIO: any): string[];
|
|
9
|
+
static filterPrefix(streamId: string): string;
|
|
6
10
|
static ExternalEncrypt(host: Host, body: any, encHeader: boolean, db: ActiveDSConnect): Promise<any>;
|
|
7
|
-
static InternalInitalise(host: Host, body: any): Promise<any>;
|
|
11
|
+
static InternalInitalise(host: Host, body: any, remoteAddr: string, retried?: boolean, isP2P?: boolean): Promise<any>;
|
|
8
12
|
private static DirectInternalInitalise;
|
|
9
13
|
static status(host: Host, requester: string): Promise<any>;
|
|
10
14
|
static streams(db: ActiveDSConnect, body: any): Promise<any>;
|
|
@@ -12,7 +16,7 @@ export declare class Endpoints {
|
|
|
12
16
|
static umid(db: ActiveDSConnect, umid: string): Promise<any>;
|
|
13
17
|
private static allMap;
|
|
14
18
|
private static allFilter;
|
|
15
|
-
static postConvertor(host: Host, body: string, encryptHeader: boolean): Promise<any>;
|
|
19
|
+
static postConvertor(host: Host, body: string | Buffer, encryptHeader: boolean): Promise<any>;
|
|
16
20
|
private static makeSureNotBuffer;
|
|
17
21
|
private static successfulFailure;
|
|
18
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../src/network/endpoints.ts"],"names":[],"mappings":"AAuBA,OAAO,
|
|
1
|
+
{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../src/network/endpoints.ts"],"names":[],"mappings":";AAuBA,OAAO,EAEL,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAe9B,qBAAa,SAAS;IAOpB,OAAc,cAAc,EAAE,MAAM,CAAK;WAY3B,iBAAiB,CAC7B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,GAAG,EACT,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,eAAe,GAClB,OAAO,CAAC,GAAG,CAAC;WAknBD,sBAAsB,CAClC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO;WAeI,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE;WAgB/B,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;WAoBtC,eAAe,CAC3B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,OAAO,EAClB,EAAE,EAAE,eAAe,GAClB,OAAO,CAAC,GAAG,CAAC;WA6CD,iBAAiB,CAC7B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAClB,OAAO,UAAQ,EACf,KAAK,UAAQ,GACZ,OAAO,CAAC,GAAG,CAAC;IA8Zf,OAAO,CAAC,MAAM,CAAC,uBAAuB;WAyExB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;WAyEnD,OAAO,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;WAyIrD,GAAG,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;WAiCnD,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAyBnE,OAAO,CAAC,MAAM,CAAC,MAAM;IAWrB,OAAO,CAAC,MAAM,CAAC,SAAS;WAaV,aAAa,CACzB,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,GAAG,CAAC;mBAyFM,iBAAiB;IA+BtC,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAmBjC"}
|