@activeledger/activestorage 2.10.1 → 2.11.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.
- package/es/datastore.d.ts +2 -0
- package/es/datastore.d.ts.map +1 -1
- package/es/datastore.js +13 -1
- package/es/datastore.js.map +1 -1
- package/lib/datastore.d.ts +2 -0
- package/lib/datastore.d.ts.map +1 -1
- package/lib/datastore.js +13 -1
- package/lib/datastore.js.map +1 -1
- package/package.json +2 -2
package/es/datastore.d.ts
CHANGED
package/es/datastore.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datastore.d.ts","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datastore.d.ts","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"AAyCA,qBAAa,eAAe;IAQ1B,OAAO,CAAC,UAAU,CAAS;IAS3B,OAAO,CAAC,OAAO,CAAqB;IASpC,OAAO,CAAC,cAAc,CAAK;IAW3B,OAAO,CAAC,WAAW,CAAsB;;IA6BlC,MAAM,IAAI,MAAM;YAuDT,QAAQ;CAqBvB"}
|
package/es/datastore.js
CHANGED
|
@@ -3,8 +3,12 @@ import { promises as fsPromises } from "fs";
|
|
|
3
3
|
import * as child from "child_process";
|
|
4
4
|
import { ActiveOptions } from "@activeledger/activeoptions";
|
|
5
5
|
import { ActiveLogger } from "@activeledger/activelogger";
|
|
6
|
+
const MAX_RESTARTS = 5;
|
|
7
|
+
const MAX_RESTART_RESET_HOURS = 24;
|
|
6
8
|
export class ActiveDataStore {
|
|
7
9
|
constructor() {
|
|
10
|
+
this.restartCounter = 0;
|
|
11
|
+
this.lastRestart = Date.now();
|
|
8
12
|
this.dsLocation = ActiveOptions.get("db", {}).selfhost.dir || "./.ds";
|
|
9
13
|
if (!fs.existsSync(this.dsLocation)) {
|
|
10
14
|
fs.mkdirSync(this.dsLocation);
|
|
@@ -26,8 +30,16 @@ export class ActiveDataStore {
|
|
|
26
30
|
this.storePid(this.process.pid || 0);
|
|
27
31
|
this.process.on("exit", (code, signal) => {
|
|
28
32
|
ActiveLogger.error(`Self-hosted data engine has shutdown (${code} : ${signal || "No Signal"})`);
|
|
29
|
-
if (signal !== "SIGTERM") {
|
|
33
|
+
if (signal !== "SIGTERM" && MAX_RESTARTS >= this.restartCounter) {
|
|
34
|
+
this.restartCounter++;
|
|
30
35
|
this.launch();
|
|
36
|
+
if (Date.now() >
|
|
37
|
+
this.lastRestart + MAX_RESTART_RESET_HOURS * 60 * 60 * 1000) {
|
|
38
|
+
this.restartCounter = 0;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
ActiveLogger.error("Not attempting to restart either due to signal or counters reached");
|
|
31
43
|
}
|
|
32
44
|
});
|
|
33
45
|
return "http://127.0.0.1:" + ActiveOptions.get("db", {}).selfhost.port;
|
package/es/datastore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datastore.js","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"datastore.js","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"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"}
|
package/lib/datastore.d.ts
CHANGED
package/lib/datastore.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datastore.d.ts","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datastore.d.ts","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":"AAyCA,qBAAa,eAAe;IAQ1B,OAAO,CAAC,UAAU,CAAS;IAS3B,OAAO,CAAC,OAAO,CAAqB;IASpC,OAAO,CAAC,cAAc,CAAK;IAW3B,OAAO,CAAC,WAAW,CAAsB;;IA6BlC,MAAM,IAAI,MAAM;YAuDT,QAAQ;CAqBvB"}
|
package/lib/datastore.js
CHANGED
|
@@ -29,8 +29,12 @@ const fs_1 = require("fs");
|
|
|
29
29
|
const child = __importStar(require("child_process"));
|
|
30
30
|
const activeoptions_1 = require("@activeledger/activeoptions");
|
|
31
31
|
const activelogger_1 = require("@activeledger/activelogger");
|
|
32
|
+
const MAX_RESTARTS = 5;
|
|
33
|
+
const MAX_RESTART_RESET_HOURS = 24;
|
|
32
34
|
class ActiveDataStore {
|
|
33
35
|
constructor() {
|
|
36
|
+
this.restartCounter = 0;
|
|
37
|
+
this.lastRestart = Date.now();
|
|
34
38
|
this.dsLocation = activeoptions_1.ActiveOptions.get("db", {}).selfhost.dir || "./.ds";
|
|
35
39
|
if (!fs.existsSync(this.dsLocation)) {
|
|
36
40
|
fs.mkdirSync(this.dsLocation);
|
|
@@ -52,8 +56,16 @@ class ActiveDataStore {
|
|
|
52
56
|
this.storePid(this.process.pid || 0);
|
|
53
57
|
this.process.on("exit", (code, signal) => {
|
|
54
58
|
activelogger_1.ActiveLogger.error(`Self-hosted data engine has shutdown (${code} : ${signal || "No Signal"})`);
|
|
55
|
-
if (signal !== "SIGTERM") {
|
|
59
|
+
if (signal !== "SIGTERM" && MAX_RESTARTS >= this.restartCounter) {
|
|
60
|
+
this.restartCounter++;
|
|
56
61
|
this.launch();
|
|
62
|
+
if (Date.now() >
|
|
63
|
+
this.lastRestart + MAX_RESTART_RESET_HOURS * 60 * 60 * 1000) {
|
|
64
|
+
this.restartCounter = 0;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
activelogger_1.ActiveLogger.error("Not attempting to restart either due to signal or counters reached");
|
|
57
69
|
}
|
|
58
70
|
});
|
|
59
71
|
return "http://127.0.0.1:" + activeoptions_1.ActiveOptions.get("db", {}).selfhost.port;
|
package/lib/datastore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datastore.js","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,uCAAyB;AACzB,2BAA4C;AAC5C,qDAAuC;AACvC,+DAA4D;AAC5D,6DAA0D;
|
|
1
|
+
{"version":3,"file":"datastore.js","sourceRoot":"","sources":["../src/datastore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,uCAAyB;AACzB,2BAA4C;AAC5C,qDAAuC;AACvC,+DAA4D;AAC5D,6DAA0D;AAG1D,MAAM,YAAY,GAAG,CAAC,CAAC;AAGvB,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAQnC,MAAa,eAAe;IA2C1B;QAjBQ,mBAAc,GAAG,CAAC,CAAC;QAWnB,gBAAW,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QAQvC,IAAI,CAAC,UAAU,GAAG,6BAAa,CAAC,GAAG,CAAM,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC;QAG3E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACnC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/B;QAGD,2BAAY,CAAC,IAAI,CACf,6CAA6C;YAC3C,6BAAa,CAAC,GAAG,CAAM,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CACjD,CAAC;IACJ,CAAC;IASM,MAAM;QACX,MAAM,MAAM,GAAG,6BAAa,CAAC,GAAG,CAAM,IAAI,EAAE,EAAE,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CACxB,MAAM,EACN;YACE,SAAS,GAAG,cAAc;YAC1B,IAAI,CAAC,UAAU;YACf,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;YACzB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,EAAE;SACvC,EACD;YACE,KAAK,EAAE,SAAS;SACjB,CACF,CAAC;QAEF,2BAAY,CAAC,IAAI,CACf,4BACE,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,OAC5B,qBAAqB,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,CACzC,CAAC;QAGF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAGrC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;YAEvD,2BAAY,CAAC,KAAK,CAChB,yCAAyC,IAAI,MAC3C,MAAM,IAAI,WACZ,GAAG,CACJ,CAAC;YAGF,IAAI,MAAM,KAAK,SAAS,IAAI,YAAY,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,EAAE,CAAC;gBAGd,IACE,IAAI,CAAC,GAAG,EAAE;oBACV,IAAI,CAAC,WAAW,GAAG,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAC3D;oBACA,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;iBACzB;aACF;iBAAI;gBACH,2BAAY,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;aAC1F;QACH,CAAC,CAAC,CAAC;QAGH,OAAO,mBAAmB,GAAG,6BAAa,CAAC,GAAG,CAAM,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9E,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,GAAW;QAChC,MAAM,OAAO,GAAG,MAAM,CAAC;QACvB,IAAI,OAKH,CAAC;QAEF,IAAI;YACF,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,aAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtE,OAAO,CAAC,aAAa,GAAG,GAAG,CAAC;YAE5B,MAAM,aAAU,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;SAC9D;QAAC,OAAO,KAAK,EAAE;YACd,2BAAY,CAAC,IAAI,CACf,+DAA+D,CAChE,CAAC;YACF,2BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAClC;IACH,CAAC;CACF;AA9ID,0CA8IC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@activeledger/activestorage",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.11.1",
|
|
4
4
|
"description": "This package is Activeledger's built-in data storage engine",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"levelup": "5.1.1",
|
|
59
59
|
"rocksdb": "5.2.1"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "1c534de3d1df2baec96a3f0e2347202b67abcfb8"
|
|
62
62
|
}
|