@prosopo/env 3.0.7 → 3.1.0
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/CHANGELOG.md +18 -0
- package/dist/cjs/env.cjs +16 -0
- package/dist/env.d.ts +2 -0
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +16 -0
- package/dist/env.js.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @prosopo/env
|
|
2
2
|
|
|
3
|
+
## 3.1.0
|
|
4
|
+
### Minor Changes
|
|
5
|
+
|
|
6
|
+
- b7c3258: Add tests for UAPs
|
|
7
|
+
|
|
8
|
+
### Patch Changes
|
|
9
|
+
|
|
10
|
+
- @prosopo/database@3.0.9
|
|
11
|
+
- @prosopo/types-database@3.0.9
|
|
12
|
+
- @prosopo/types-env@2.7.13
|
|
13
|
+
|
|
14
|
+
## 3.0.8
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- @prosopo/database@3.0.8
|
|
18
|
+
- @prosopo/types-database@3.0.8
|
|
19
|
+
- @prosopo/types-env@2.7.12
|
|
20
|
+
|
|
3
21
|
## 3.0.7
|
|
4
22
|
### Patch Changes
|
|
5
23
|
|
package/dist/cjs/env.cjs
CHANGED
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
|
3
3
|
const common = require("@prosopo/common");
|
|
4
4
|
const database = require("@prosopo/database");
|
|
5
5
|
const keyring = require("@prosopo/keyring");
|
|
6
|
+
const utilCrypto = require("@prosopo/util-crypto");
|
|
6
7
|
class Environment {
|
|
7
8
|
constructor(config, pair, authAccount) {
|
|
9
|
+
this.ready = false;
|
|
8
10
|
this.config = config;
|
|
9
11
|
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
10
12
|
this.pair = pair;
|
|
@@ -17,6 +19,15 @@ class Environment {
|
|
|
17
19
|
type: "sr25519"
|
|
18
20
|
});
|
|
19
21
|
if (this.pair) this.keyring.addPair(this.pair);
|
|
22
|
+
this.envId = utilCrypto.randomAsHex(32).slice(0, 32);
|
|
23
|
+
this.logger.info(() => ({
|
|
24
|
+
msg: "Environment initialized",
|
|
25
|
+
data: {
|
|
26
|
+
envId: this.envId,
|
|
27
|
+
defaultEnvironment: this.defaultEnvironment,
|
|
28
|
+
logLevel: this.config.logLevel
|
|
29
|
+
}
|
|
30
|
+
}));
|
|
20
31
|
}
|
|
21
32
|
async getSigner() {
|
|
22
33
|
if (!this.pair) {
|
|
@@ -58,6 +69,10 @@ class Environment {
|
|
|
58
69
|
return this.pair;
|
|
59
70
|
}
|
|
60
71
|
async isReady() {
|
|
72
|
+
if (this.ready) {
|
|
73
|
+
this.logger.debug(() => ({ msg: "Environment is already ready" }));
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
61
76
|
try {
|
|
62
77
|
if (this.pair && this.config.account.password && this.pair.isLocked) {
|
|
63
78
|
this.pair.unlock(this.config.account.password);
|
|
@@ -73,6 +88,7 @@ class Environment {
|
|
|
73
88
|
await this.db.connect();
|
|
74
89
|
this.logger.info(() => ({ msg: "Connected to db" }));
|
|
75
90
|
}
|
|
91
|
+
this.ready = true;
|
|
76
92
|
} catch (err) {
|
|
77
93
|
throw new common.ProsopoEnvError("GENERAL.ENVIRONMENT_NOT_READY", {
|
|
78
94
|
context: { error: err },
|
package/dist/env.d.ts
CHANGED
|
@@ -14,6 +14,8 @@ export declare class Environment implements ProsopoEnvironment {
|
|
|
14
14
|
keyring: Keyring;
|
|
15
15
|
pair: KeyringPair | undefined;
|
|
16
16
|
authAccount: KeyringPair | undefined;
|
|
17
|
+
envId: string | undefined;
|
|
18
|
+
ready: boolean;
|
|
17
19
|
constructor(config: ProsopoConfigOutput, pair?: KeyringPair, authAccount?: KeyringPair);
|
|
18
20
|
getSigner(): Promise<KeyringPair>;
|
|
19
21
|
getDb(): ProviderDatabase;
|
package/dist/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,MAAM,EAIX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,MAAM,EAIX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,WAAY,YAAW,kBAAkB;IACrD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,EAAE,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACjC,kBAAkB,EAAE,gBAAgB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAC9B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,KAAK,UAAS;gBAGb,MAAM,EAAE,mBAAmB,EAC3B,IAAI,CAAC,EAAE,WAAW,EAClB,WAAW,CAAC,EAAE,WAAW;IA0BpB,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBvC,KAAK,IAAI,gBAAgB;IASzB,iBAAiB,IAAI,cAAc;IASnC,OAAO,IAAI,WAAW;IAShB,OAAO;IA6BP,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAiCrC"}
|
package/dist/env.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { ProsopoEnvError, getLogger, parseLogLevel, } from "@prosopo/common";
|
|
2
2
|
import { ProviderDatabase } from "@prosopo/database";
|
|
3
3
|
import { Keyring } from "@prosopo/keyring";
|
|
4
|
+
import { randomAsHex } from "@prosopo/util-crypto";
|
|
4
5
|
export class Environment {
|
|
5
6
|
constructor(config, pair, authAccount) {
|
|
7
|
+
this.ready = false;
|
|
6
8
|
this.config = config;
|
|
7
9
|
this.defaultEnvironment = this.config.defaultEnvironment;
|
|
8
10
|
this.pair = pair;
|
|
@@ -13,6 +15,15 @@ export class Environment {
|
|
|
13
15
|
});
|
|
14
16
|
if (this.pair)
|
|
15
17
|
this.keyring.addPair(this.pair);
|
|
18
|
+
this.envId = randomAsHex(32).slice(0, 32);
|
|
19
|
+
this.logger.info(() => ({
|
|
20
|
+
msg: "Environment initialized",
|
|
21
|
+
data: {
|
|
22
|
+
envId: this.envId,
|
|
23
|
+
defaultEnvironment: this.defaultEnvironment,
|
|
24
|
+
logLevel: this.config.logLevel,
|
|
25
|
+
},
|
|
26
|
+
}));
|
|
16
27
|
}
|
|
17
28
|
async getSigner() {
|
|
18
29
|
if (!this.pair) {
|
|
@@ -49,6 +60,10 @@ export class Environment {
|
|
|
49
60
|
return this.pair;
|
|
50
61
|
}
|
|
51
62
|
async isReady() {
|
|
63
|
+
if (this.ready) {
|
|
64
|
+
this.logger.debug(() => ({ msg: "Environment is already ready" }));
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
52
67
|
try {
|
|
53
68
|
if (this.pair && this.config.account.password && this.pair.isLocked) {
|
|
54
69
|
this.pair.unlock(this.config.account.password);
|
|
@@ -64,6 +79,7 @@ export class Environment {
|
|
|
64
79
|
await this.db.connect();
|
|
65
80
|
this.logger.info(() => ({ msg: "Connected to db" }));
|
|
66
81
|
}
|
|
82
|
+
this.ready = true;
|
|
67
83
|
}
|
|
68
84
|
catch (err) {
|
|
69
85
|
throw new ProsopoEnvError("GENERAL.ENVIRONMENT_NOT_READY", {
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EAEN,eAAe,EACf,SAAS,EACT,aAAa,GACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/env",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"description": "Path env prosopo environment",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@polkadot/util": "12.6.2",
|
|
25
25
|
"@prosopo/common": "3.0.2",
|
|
26
|
-
"@prosopo/database": "3.0.
|
|
26
|
+
"@prosopo/database": "3.0.9",
|
|
27
27
|
"@prosopo/types": "3.0.3",
|
|
28
|
-
"@prosopo/types-database": "3.0.
|
|
29
|
-
"@prosopo/types-env": "2.7.
|
|
28
|
+
"@prosopo/types-database": "3.0.9",
|
|
29
|
+
"@prosopo/types-env": "2.7.13",
|
|
30
30
|
"@prosopo/util": "3.0.2",
|
|
31
31
|
"@typegoose/auto-increment": "4.13.0",
|
|
32
32
|
"axios": "1.10.0",
|