@prosopo/env 2.0.3 → 2.1.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/dist/cjs/env.cjs +8 -15
- package/dist/env.d.ts +3 -3
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +5 -14
- package/dist/env.js.map +1 -1
- package/dist/mockenv.d.ts +0 -1
- package/dist/mockenv.d.ts.map +1 -1
- package/package.json +50 -46
package/dist/cjs/env.cjs
CHANGED
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
|
3
3
|
const keyring = require("@polkadot/keyring");
|
|
4
4
|
const common = require("@prosopo/common");
|
|
5
5
|
const database = require("@prosopo/database");
|
|
6
|
-
const util = require("@prosopo/util");
|
|
7
6
|
class Environment {
|
|
8
7
|
constructor(config, pair) {
|
|
9
8
|
this.config = config;
|
|
@@ -14,14 +13,6 @@ class Environment {
|
|
|
14
13
|
type: "sr25519"
|
|
15
14
|
});
|
|
16
15
|
if (this.pair) this.keyring.addPair(this.pair);
|
|
17
|
-
if (this.config.database) {
|
|
18
|
-
this.importDatabase().catch((err) => {
|
|
19
|
-
throw new common.ProsopoEnvError("DATABASE.DATABASE_IMPORT_FAILED", {
|
|
20
|
-
context: { error: err },
|
|
21
|
-
logger: this.logger
|
|
22
|
-
});
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
16
|
}
|
|
26
17
|
async getSigner() {
|
|
27
18
|
if (!this.pair) {
|
|
@@ -71,8 +62,10 @@ class Environment {
|
|
|
71
62
|
if (!this.db) {
|
|
72
63
|
await this.importDatabase();
|
|
73
64
|
}
|
|
74
|
-
if (this.db && this.db.
|
|
75
|
-
this.logger.warn(
|
|
65
|
+
if (this.db && !this.db.connected) {
|
|
66
|
+
this.logger.warn(
|
|
67
|
+
`Database connection is not ready (state: ${this.db.connection?.readyState}), reconnecting...`
|
|
68
|
+
);
|
|
76
69
|
await this.db.connect();
|
|
77
70
|
this.logger.info("Connected to db");
|
|
78
71
|
}
|
|
@@ -88,13 +81,13 @@ class Environment {
|
|
|
88
81
|
if (this.config.database) {
|
|
89
82
|
const dbConfig = this.config.database[this.defaultEnvironment];
|
|
90
83
|
if (dbConfig) {
|
|
91
|
-
|
|
92
|
-
this.db = await ProsopoDatabase.create(
|
|
84
|
+
this.db = new database.ProviderDatabase(
|
|
93
85
|
dbConfig.endpoint,
|
|
94
86
|
dbConfig.dbname,
|
|
95
|
-
|
|
96
|
-
|
|
87
|
+
dbConfig.authSource,
|
|
88
|
+
this.logger
|
|
97
89
|
);
|
|
90
|
+
await this.db.connect();
|
|
98
91
|
}
|
|
99
92
|
}
|
|
100
93
|
} catch (error) {
|
package/dist/env.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Keyring } from "@polkadot/keyring";
|
|
2
2
|
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
3
3
|
import { type Logger } from "@prosopo/common";
|
|
4
|
+
import { ProviderDatabase } from "@prosopo/database";
|
|
4
5
|
import type { AssetsResolver, EnvironmentTypes } from "@prosopo/types";
|
|
5
6
|
import type { ProsopoBasicConfigOutput } from "@prosopo/types";
|
|
6
|
-
import type { Database } from "@prosopo/types-database";
|
|
7
7
|
import type { ProsopoEnvironment } from "@prosopo/types-env";
|
|
8
8
|
export declare class Environment implements ProsopoEnvironment {
|
|
9
9
|
config: ProsopoBasicConfigOutput;
|
|
10
|
-
db:
|
|
10
|
+
db: ProviderDatabase | undefined;
|
|
11
11
|
defaultEnvironment: EnvironmentTypes;
|
|
12
12
|
logger: Logger;
|
|
13
13
|
assetsResolver: AssetsResolver | undefined;
|
|
@@ -15,7 +15,7 @@ export declare class Environment implements ProsopoEnvironment {
|
|
|
15
15
|
pair: KeyringPair | undefined;
|
|
16
16
|
constructor(config: ProsopoBasicConfigOutput, pair?: KeyringPair);
|
|
17
17
|
getSigner(): Promise<KeyringPair>;
|
|
18
|
-
getDb():
|
|
18
|
+
getDb(): ProviderDatabase;
|
|
19
19
|
getAssetsResolver(): AssetsResolver;
|
|
20
20
|
getPair(): KeyringPair;
|
|
21
21
|
isReady(): Promise<void>;
|
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,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAA8B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAa,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,WAAY,YAAW,kBAAkB;IACrD,MAAM,EAAE,wBAAwB,CAAC;IACjC,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;gBAElB,MAAM,EAAE,wBAAwB,EAAE,IAAI,CAAC,EAAE,WAAW;IAY1D,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBvC,KAAK,IAAI,gBAAgB;IASzB,iBAAiB,IAAI,cAAc;IASnC,OAAO,IAAI,WAAW;IAShB,OAAO;IAyBP,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BrC"}
|
package/dist/env.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Keyring } from "@polkadot/keyring";
|
|
2
2
|
import { ProsopoEnvError, getLogger } from "@prosopo/common";
|
|
3
|
-
import {
|
|
4
|
-
import { get } from "@prosopo/util";
|
|
3
|
+
import { ProviderDatabase } from "@prosopo/database";
|
|
5
4
|
export class Environment {
|
|
6
5
|
constructor(config, pair) {
|
|
7
6
|
this.config = config;
|
|
@@ -13,14 +12,6 @@ export class Environment {
|
|
|
13
12
|
});
|
|
14
13
|
if (this.pair)
|
|
15
14
|
this.keyring.addPair(this.pair);
|
|
16
|
-
if (this.config.database) {
|
|
17
|
-
this.importDatabase().catch((err) => {
|
|
18
|
-
throw new ProsopoEnvError("DATABASE.DATABASE_IMPORT_FAILED", {
|
|
19
|
-
context: { error: err },
|
|
20
|
-
logger: this.logger,
|
|
21
|
-
});
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
15
|
}
|
|
25
16
|
async getSigner() {
|
|
26
17
|
if (!this.pair) {
|
|
@@ -65,8 +56,8 @@ export class Environment {
|
|
|
65
56
|
if (!this.db) {
|
|
66
57
|
await this.importDatabase();
|
|
67
58
|
}
|
|
68
|
-
if (this.db && this.db.
|
|
69
|
-
this.logger.warn(
|
|
59
|
+
if (this.db && !this.db.connected) {
|
|
60
|
+
this.logger.warn(`Database connection is not ready (state: ${this.db.connection?.readyState}), reconnecting...`);
|
|
70
61
|
await this.db.connect();
|
|
71
62
|
this.logger.info("Connected to db");
|
|
72
63
|
}
|
|
@@ -83,8 +74,8 @@ export class Environment {
|
|
|
83
74
|
if (this.config.database) {
|
|
84
75
|
const dbConfig = this.config.database[this.defaultEnvironment];
|
|
85
76
|
if (dbConfig) {
|
|
86
|
-
|
|
87
|
-
this.db
|
|
77
|
+
this.db = new ProviderDatabase(dbConfig.endpoint, dbConfig.dbname, dbConfig.authSource, this.logger);
|
|
78
|
+
await this.db.connect();
|
|
88
79
|
}
|
|
89
80
|
}
|
|
90
81
|
}
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAe,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
|
package/dist/mockenv.d.ts
CHANGED
package/dist/mockenv.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockenv.d.ts","sourceRoot":"","sources":["../src/mockenv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockenv.d.ts","sourceRoot":"","sources":["../src/mockenv.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEpD,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACvD,aAAa,EAAE,QAAQ,CAAC;CACxB;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IAClD,aAAa,EAAE,IAAI,CAAC;CACpB;AAED,qBAAa,eAAgB,SAAQ,mBAAmB;IAChD,4BAA4B,IAAI,WAAW;CAMlD;AAED,MAAM,WAAW,eAAe;IAC/B,GAAG,EAAE,eAAe,CAAC;IACrB,sBAAsB,EAAE,EAAE,CAAC;IAC3B,kBAAkB,EAAE,EAAE,CAAC;CACvB"}
|
package/package.json
CHANGED
|
@@ -1,48 +1,52 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
2
|
+
"name": "@prosopo/env",
|
|
3
|
+
"version": "2.1.1",
|
|
4
|
+
"description": "Path env prosopo environment",
|
|
5
|
+
"main": "dist/index.js",
|
|
6
|
+
"type": "module",
|
|
7
|
+
"engines": {
|
|
8
|
+
"node": ">=20",
|
|
9
|
+
"npm": ">=9"
|
|
10
|
+
},
|
|
11
|
+
"exports": {
|
|
12
|
+
".": {
|
|
13
|
+
"import": "./dist/index.js",
|
|
14
|
+
"require": "./dist/cjs/index.cjs"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
"scripts": {
|
|
18
|
+
"test": "echo \"No test specified\"",
|
|
19
|
+
"clean": "tsc --build --clean",
|
|
20
|
+
"build": "tsc --build --verbose",
|
|
21
|
+
"build:cjs": "npx vite --config vite.cjs.config.ts build"
|
|
22
|
+
},
|
|
23
|
+
"dependencies": {
|
|
24
|
+
"@polkadot/keyring": "12.6.2",
|
|
25
|
+
"@polkadot/util": "12.6.2",
|
|
26
|
+
"@polkadot/util-crypto": "12.6.2",
|
|
27
|
+
"@prosopo/common": "2.1.1",
|
|
28
|
+
"@prosopo/database": "2.1.1",
|
|
29
|
+
"@prosopo/types": "2.1.1",
|
|
30
|
+
"@prosopo/types-database": "2.1.1",
|
|
31
|
+
"@prosopo/types-env": "2.1.1",
|
|
32
|
+
"@prosopo/util": "2.1.1"
|
|
33
|
+
},
|
|
34
|
+
"overrides": {
|
|
35
|
+
"@polkadot/keyring": "12.6.2"
|
|
36
|
+
},
|
|
37
|
+
"devDependencies": {
|
|
38
|
+
"@prosopo/config": "2.1.1",
|
|
39
|
+
"@vitest/coverage-v8": "2.1.1",
|
|
40
|
+
"concurrently": "9.0.1",
|
|
41
|
+
"npm-run-all": "4.1.5",
|
|
42
|
+
"rimraf": "6.0.1",
|
|
43
|
+
"tslib": "2.7.0",
|
|
44
|
+
"tsx": "4.19.1",
|
|
45
|
+
"typescript": "5.6.2",
|
|
46
|
+
"vite": "5.4.6",
|
|
47
|
+
"vitest": "2.1.1"
|
|
48
|
+
},
|
|
49
|
+
"author": "Prosopo",
|
|
50
|
+
"license": "Apache-2.0",
|
|
51
|
+
"sideEffects": false
|
|
48
52
|
}
|