@osaas/client-db 0.3.1 → 0.4.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/lib/valkey.d.ts +0 -2
- package/lib/valkey.d.ts.map +1 -1
- package/lib/valkey.js +7 -18
- package/lib/valkey.js.map +1 -1
- package/package.json +4 -3
package/lib/valkey.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Context } from '@osaas/client-core';
|
|
3
|
-
export declare const delay: (ms: number) => Promise<unknown>;
|
|
4
3
|
export declare class ValkeyDb {
|
|
5
4
|
private context;
|
|
6
5
|
private name;
|
|
7
|
-
private token?;
|
|
8
6
|
private url?;
|
|
9
7
|
constructor({ context, name }: {
|
|
10
8
|
context: Context;
|
package/lib/valkey.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valkey.d.ts","sourceRoot":"","sources":["../src/valkey.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"valkey.d.ts","sourceRoot":"","sources":["../src/valkey.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,OAAO,EAIR,MAAM,oBAAoB,CAAC;AAS5B,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,GAAG,CAAC,CAAM;gBAEN,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;WAK7C,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;YAQ7C,YAAY;IAYb,IAAI;IAaJ,OAAO;IAQP,WAAW,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAO7C,OAAO,IAAI,MAAM;CAGzB"}
|
package/lib/valkey.js
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ValkeyDb =
|
|
3
|
+
exports.ValkeyDb = void 0;
|
|
4
4
|
const client_core_1 = require("@osaas/client-core");
|
|
5
|
-
const
|
|
6
|
-
exports.delay = delay;
|
|
5
|
+
const client_services_1 = require("@osaas/client-services");
|
|
7
6
|
const SERVICE_ID = 'valkey-io-valkey';
|
|
8
7
|
class ValkeyDb {
|
|
9
8
|
context;
|
|
10
9
|
name;
|
|
11
|
-
token;
|
|
12
10
|
url;
|
|
13
11
|
constructor({ context, name }) {
|
|
14
12
|
this.context = context;
|
|
@@ -22,23 +20,15 @@ class ValkeyDb {
|
|
|
22
20
|
});
|
|
23
21
|
}
|
|
24
22
|
async getRedisPort() {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
const ports = await (0, client_core_1.getPortsForInstance)(this.context, SERVICE_ID, this.name, this.token);
|
|
23
|
+
const token = await this.context.getServiceAccessToken(SERVICE_ID);
|
|
24
|
+
const ports = await (0, client_core_1.getPortsForInstance)(this.context, SERVICE_ID, this.name, token);
|
|
29
25
|
const redisPort = ports.find((port) => port.internalPort == 6379);
|
|
30
26
|
return redisPort;
|
|
31
27
|
}
|
|
32
28
|
async init() {
|
|
33
|
-
|
|
34
|
-
const instance = await (0, client_core_1.getInstance)(this.context, SERVICE_ID, this.name, this.token);
|
|
29
|
+
const instance = await (0, client_services_1.getValkeyIoValkeyInstance)(this.context, this.name);
|
|
35
30
|
if (!instance) {
|
|
36
|
-
|
|
37
|
-
name: this.name
|
|
38
|
-
}))) {
|
|
39
|
-
throw new Error('Failed to create Valkey instance');
|
|
40
|
-
}
|
|
41
|
-
await (0, exports.delay)(5000);
|
|
31
|
+
await (0, client_services_1.createValkeyIoValkeyInstance)(this.context, { name: this.name });
|
|
42
32
|
}
|
|
43
33
|
const redisPort = await this.getRedisPort();
|
|
44
34
|
if (redisPort) {
|
|
@@ -47,8 +37,7 @@ class ValkeyDb {
|
|
|
47
37
|
}
|
|
48
38
|
async destroy() {
|
|
49
39
|
try {
|
|
50
|
-
|
|
51
|
-
await (0, client_core_1.removeInstance)(this.context, SERVICE_ID, this.name, this.token);
|
|
40
|
+
await (0, client_services_1.removeValkeyIoValkeyInstance)(this.context, this.name);
|
|
52
41
|
}
|
|
53
42
|
catch (err) {
|
|
54
43
|
(0, client_core_1.Log)().error(err.message);
|
package/lib/valkey.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valkey.js","sourceRoot":"","sources":["../src/valkey.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"valkey.js","sourceRoot":"","sources":["../src/valkey.ts"],"names":[],"mappings":";;;AAAA,oDAK4B;AAC5B,4DAIgC;AAEhC,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAEtC,MAAa,QAAQ;IACX,OAAO,CAAU;IACjB,IAAI,CAAS;IACb,GAAG,CAAO;IAElB,YAAY,EAAE,OAAO,EAAE,IAAI,EAAsC;QAC/D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAY;QACnC,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAa,EAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAA0B,EAAE,EAAE;YAClD,OAAO,IAAI,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAmB,EACrC,IAAI,CAAC,OAAO,EACZ,UAAU,EACV,IAAI,CAAC,IAAI,EACT,KAAK,CACN,CAAC;QACF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;QAClE,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,QAAQ,GAAG,MAAM,IAAA,2CAAyB,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAA,8CAA4B,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACvE;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAChB,WAAW,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,YAAY,EAAE,CAC5D,CAAC;SACH;IACH,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI;YACF,MAAM,IAAA,8CAA4B,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7D;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,iBAAG,GAAE,CAAC,KAAK,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;SACnB;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF;AA7DD,4BA6DC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/client-db",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Open Source Cloud Client SDK database library",
|
|
5
5
|
"author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -25,11 +25,12 @@
|
|
|
25
25
|
"test": "jest --passWithNoTests"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@osaas/client-core": "^0.
|
|
28
|
+
"@osaas/client-core": "^0.15.0",
|
|
29
|
+
"@osaas/client-services": "^0.4.0",
|
|
29
30
|
"chalk": "4.1.2"
|
|
30
31
|
},
|
|
31
32
|
"publishConfig": {
|
|
32
33
|
"access": "public"
|
|
33
34
|
},
|
|
34
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "0907e1a5bf0eb7c7c59a57e119d624e5bb3bd8eb"
|
|
35
36
|
}
|