equipped 5.0.0 → 5.0.2
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 +9 -0
- package/lib/cache/base.js +1 -5
- package/lib/cache/base.js.map +1 -1
- package/lib/cache/index.js +3 -19
- package/lib/cache/index.js.map +1 -1
- package/lib/cache/pipes.d.ts +2 -2
- package/lib/cache/pipes.js +9 -14
- package/lib/cache/pipes.js.map +1 -1
- package/lib/cache/types/redis.js +17 -20
- package/lib/cache/types/redis.js.map +1 -1
- package/lib/dbs/base/_instance.js +18 -37
- package/lib/dbs/base/_instance.js.map +1 -1
- package/lib/dbs/base/core.js +1 -2
- package/lib/dbs/base/types.js +1 -2
- package/lib/dbs/index.js +6 -22
- package/lib/dbs/index.js.map +1 -1
- package/lib/dbs/mongo/api.js +10 -13
- package/lib/dbs/mongo/api.js.map +1 -1
- package/lib/dbs/mongo/changes.js +17 -34
- package/lib/dbs/mongo/changes.js.map +1 -1
- package/lib/dbs/mongo/index.js +23 -39
- package/lib/dbs/mongo/index.js.map +1 -1
- package/lib/dbs/mongo/query.js +4 -8
- package/lib/dbs/mongo/query.js.map +1 -1
- package/lib/dbs/pipes.js +45 -54
- package/lib/dbs/pipes.js.map +1 -1
- package/lib/errors/equippedError.js +4 -5
- package/lib/errors/equippedError.js.map +1 -1
- package/lib/errors/index.js +9 -25
- package/lib/errors/index.js.map +1 -1
- package/lib/errors/requestError.js +4 -6
- package/lib/errors/requestError.js.map +1 -1
- package/lib/errors/types/authorizationExpired.js +4 -8
- package/lib/errors/types/authorizationExpired.js.map +1 -1
- package/lib/errors/types/badRequestError.js +4 -8
- package/lib/errors/types/badRequestError.js.map +1 -1
- package/lib/errors/types/notAuthenticatedError.js +4 -8
- package/lib/errors/types/notAuthenticatedError.js.map +1 -1
- package/lib/errors/types/notAuthorizedError.js +4 -8
- package/lib/errors/types/notAuthorizedError.js.map +1 -1
- package/lib/errors/types/notFoundError.js +4 -8
- package/lib/errors/types/notFoundError.js.map +1 -1
- package/lib/errors/types/refreshTokenMisusedError.js +4 -8
- package/lib/errors/types/refreshTokenMisusedError.js.map +1 -1
- package/lib/errors/types/validationError.js +4 -8
- package/lib/errors/types/validationError.js.map +1 -1
- package/lib/events/base.js +2 -6
- package/lib/events/base.js.map +1 -1
- package/lib/events/index.js +4 -20
- package/lib/events/index.js.map +1 -1
- package/lib/events/pipes.d.ts +3 -3
- package/lib/events/pipes.js +15 -20
- package/lib/events/pipes.js.map +1 -1
- package/lib/events/types/kafka.js +41 -59
- package/lib/events/types/kafka.js.map +1 -1
- package/lib/events/types/rabbitmq.js +21 -38
- package/lib/events/types/rabbitmq.js.map +1 -1
- package/lib/index.js +1 -17
- package/lib/index.js.map +1 -1
- package/lib/instance/hooks.js +1 -4
- package/lib/instance/hooks.js.map +1 -1
- package/lib/instance/index.js +41 -55
- package/lib/instance/index.js.map +1 -1
- package/lib/instance/settings.d.ts +2 -2
- package/lib/instance/settings.js +66 -74
- package/lib/instance/settings.js.map +1 -1
- package/lib/jobs/index.js +2 -18
- package/lib/jobs/index.js.map +1 -1
- package/lib/jobs/pipes.d.ts +2 -2
- package/lib/jobs/pipes.js +6 -11
- package/lib/jobs/pipes.js.map +1 -1
- package/lib/jobs/types/redis.js +43 -61
- package/lib/jobs/types/redis.js.map +1 -1
- package/lib/server/impls/base.js +138 -153
- package/lib/server/impls/base.js.map +1 -1
- package/lib/server/impls/express.js +35 -55
- package/lib/server/impls/express.js.map +1 -1
- package/lib/server/impls/fastify.js +29 -36
- package/lib/server/impls/fastify.js.map +1 -1
- package/lib/server/index.js +9 -25
- package/lib/server/index.js.map +1 -1
- package/lib/server/middlewares/index.js +1 -17
- package/lib/server/middlewares/index.js.map +1 -1
- package/lib/server/middlewares/parseAuthUser.d.ts +2 -2
- package/lib/server/middlewares/parseAuthUser.js +6 -9
- package/lib/server/middlewares/parseAuthUser.js.map +1 -1
- package/lib/server/middlewares/requireAuthUser.d.ts +8 -8
- package/lib/server/middlewares/requireAuthUser.js +13 -16
- package/lib/server/middlewares/requireAuthUser.js.map +1 -1
- package/lib/server/openapi.js +118 -130
- package/lib/server/openapi.js.map +1 -1
- package/lib/server/pipes.d.ts +2 -2
- package/lib/server/pipes.js +27 -30
- package/lib/server/pipes.js.map +1 -1
- package/lib/server/requests-auth/apiKeys.js +1 -5
- package/lib/server/requests-auth/apiKeys.js.map +1 -1
- package/lib/server/requests-auth/index.js +2 -18
- package/lib/server/requests-auth/index.js.map +1 -1
- package/lib/server/requests-auth/tokens.js +31 -51
- package/lib/server/requests-auth/tokens.js.map +1 -1
- package/lib/server/requests.js +25 -15
- package/lib/server/requests.js.map +1 -1
- package/lib/server/routes.js +24 -41
- package/lib/server/routes.js.map +1 -1
- package/lib/server/sockets.js +96 -111
- package/lib/server/sockets.js.map +1 -1
- package/lib/server/types.js +4 -9
- package/lib/server/types.js.map +1 -1
- package/lib/types/index.js +2 -18
- package/lib/types/index.js.map +1 -1
- package/lib/types/overrides.js +1 -2
- package/lib/utilities/authProviders.js +19 -28
- package/lib/utilities/authProviders.js.map +1 -1
- package/lib/utilities/hash.js +5 -43
- package/lib/utilities/hash.js.map +1 -1
- package/lib/utilities/index.js +6 -45
- package/lib/utilities/index.js.map +1 -1
- package/lib/utilities/json.js +3 -8
- package/lib/utilities/json.js.map +1 -1
- package/lib/utilities/media.js +3 -7
- package/lib/utilities/media.js.map +1 -1
- package/lib/utilities/random.js +5 -12
- package/lib/utilities/random.js.map +1 -1
- package/lib/utilities/retry.js +6 -11
- package/lib/utilities/retry.js.map +1 -1
- package/lib/validations/index.js +8 -48
- package/lib/validations/index.js.map +1 -1
- package/lib/validations/valleyed.js +23 -43
- package/lib/validations/valleyed.js.map +1 -1
- package/package.json +6 -7
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [5.0.2](https://github.com/kevinand11/equipped/compare/v5.0.1...v5.0.2) (2025-06-24)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* valleyed 4.5.6 ([e61c65f](https://github.com/kevinand11/equipped/commit/e61c65f9c21d121e114f142bbe37f6f99ff39c2d))
|
|
11
|
+
|
|
12
|
+
### [5.0.1](https://github.com/kevinand11/equipped/compare/v5.0.0...v5.0.1) (2025-06-24)
|
|
13
|
+
|
|
5
14
|
## [5.0.0](https://github.com/kevinand11/equipped/compare/v5.0.0-rc.40...v5.0.0) (2025-06-24)
|
|
6
15
|
|
|
7
16
|
|
package/lib/cache/base.js
CHANGED
package/lib/cache/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/cache/base.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/cache/base.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,KAAK;CAQ1B"}
|
package/lib/cache/index.js
CHANGED
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./base"), exports);
|
|
18
|
-
__exportStar(require("./pipes"), exports);
|
|
19
|
-
__exportStar(require("./types/redis"), exports);
|
|
1
|
+
export * from './base';
|
|
2
|
+
export * from './pipes';
|
|
3
|
+
export * from './types/redis';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
package/lib/cache/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cache/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA"}
|
package/lib/cache/pipes.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PipeOutput } from 'valleyed';
|
|
2
|
-
export declare const redisConfigPipe:
|
|
1
|
+
import { v, PipeOutput } from 'valleyed';
|
|
2
|
+
export declare const redisConfigPipe: v.Pipe<{
|
|
3
3
|
host: string;
|
|
4
4
|
port: number | undefined;
|
|
5
5
|
password: string | undefined;
|
package/lib/cache/pipes.js
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
.
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
username: valleyed_1.v.optional(valleyed_1.v.string()),
|
|
11
|
-
tls: valleyed_1.v.optional(valleyed_1.v.boolean()),
|
|
12
|
-
cluster: valleyed_1.v.optional(valleyed_1.v.boolean()),
|
|
13
|
-
})
|
|
14
|
-
.meta({ title: 'Redis Config', $refId: 'RedisConfig' });
|
|
1
|
+
import { v } from 'valleyed';
|
|
2
|
+
export const redisConfigPipe = v.meta(v.object({
|
|
3
|
+
host: v.string(),
|
|
4
|
+
port: v.optional(v.number()),
|
|
5
|
+
password: v.optional(v.string()),
|
|
6
|
+
username: v.optional(v.string()),
|
|
7
|
+
tls: v.optional(v.boolean()),
|
|
8
|
+
cluster: v.optional(v.boolean()),
|
|
9
|
+
}), { title: 'Redis Config', $refId: 'RedisConfig' });
|
|
15
10
|
//# sourceMappingURL=pipes.js.map
|
package/lib/cache/pipes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/cache/pipes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pipes.js","sourceRoot":"","sources":["../../src/cache/pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAc,MAAM,UAAU,CAAA;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CACpC,CAAC,CAAC,MAAM,CAAC;IACR,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;CAChC,CAAC,EACF,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,CAChD,CAAA"}
|
package/lib/cache/types/redis.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const base_1 = require("../base");
|
|
8
|
-
class RedisCache extends base_1.Cache {
|
|
1
|
+
import { Cluster, Redis } from 'ioredis';
|
|
2
|
+
import { EquippedError } from '../../errors';
|
|
3
|
+
import { Instance } from '../../instance';
|
|
4
|
+
import { Cache } from '../base';
|
|
5
|
+
export class RedisCache extends Cache {
|
|
6
|
+
client;
|
|
9
7
|
constructor(settings, extraConfig) {
|
|
10
8
|
super();
|
|
11
9
|
const node = {
|
|
@@ -20,38 +18,37 @@ class RedisCache extends base_1.Cache {
|
|
|
20
18
|
lazyConnect: true,
|
|
21
19
|
};
|
|
22
20
|
this.client = settings.cluster
|
|
23
|
-
? new
|
|
21
|
+
? new Cluster([node], {
|
|
24
22
|
...extraConfig,
|
|
25
23
|
redisOptions: common,
|
|
26
24
|
lazyConnect: true,
|
|
27
25
|
})
|
|
28
|
-
: new
|
|
26
|
+
: new Redis({ ...common, ...node });
|
|
29
27
|
this.client.on('error', async (error) => {
|
|
30
|
-
|
|
28
|
+
Instance.crash(new EquippedError(`Redis failed with error`, {}, error));
|
|
31
29
|
});
|
|
32
30
|
if (!extraConfig)
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
Instance.on('start', async () => this.client.connect(), 1);
|
|
32
|
+
Instance.on('close', async () => this.client.quit(), 1);
|
|
35
33
|
}
|
|
36
34
|
async delete(key) {
|
|
37
|
-
await this.client.del(
|
|
35
|
+
await this.client.del(Instance.get().getScopedName(key, ':'));
|
|
38
36
|
}
|
|
39
37
|
async get(key) {
|
|
40
|
-
return await this.client.get(
|
|
38
|
+
return await this.client.get(Instance.get().getScopedName(key, ':'));
|
|
41
39
|
}
|
|
42
40
|
async set(key, data, ttlInSecs) {
|
|
43
41
|
if (ttlInSecs > 0)
|
|
44
|
-
await this.client.setex(
|
|
42
|
+
await this.client.setex(Instance.get().getScopedName(key, ':'), ttlInSecs, data);
|
|
45
43
|
else
|
|
46
|
-
this.client.set(
|
|
44
|
+
this.client.set(Instance.get().getScopedName(key), data);
|
|
47
45
|
}
|
|
48
46
|
async getOrSet(key, fn, ttlInSecs) {
|
|
49
|
-
const cached = await this.get(
|
|
47
|
+
const cached = await this.get(Instance.get().getScopedName(key, ':'));
|
|
50
48
|
if (cached)
|
|
51
49
|
return JSON.parse(cached);
|
|
52
50
|
const result = await fn();
|
|
53
|
-
await this.set(
|
|
51
|
+
await this.set(Instance.get().getScopedName(key, ':'), JSON.stringify(result), ttlInSecs);
|
|
54
52
|
}
|
|
55
53
|
}
|
|
56
|
-
exports.RedisCache = RedisCache;
|
|
57
54
|
//# sourceMappingURL=redis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/cache/types/redis.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/cache/types/redis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,53 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
};
|
|
8
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
-
};
|
|
13
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
-
};
|
|
16
|
-
var _DbChange_callbacks, _DbChange_mapper;
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.DbChange = exports.Db = exports.TopicPrefix = void 0;
|
|
19
|
-
const axios_1 = __importDefault(require("axios"));
|
|
20
|
-
const errors_1 = require("../../errors");
|
|
21
|
-
const instance_1 = require("../../instance");
|
|
22
|
-
exports.TopicPrefix = 'db-changes';
|
|
23
|
-
class Db {
|
|
1
|
+
import axios from 'axios';
|
|
2
|
+
import { EquippedError } from '../../errors';
|
|
3
|
+
import { Instance } from '../../instance';
|
|
4
|
+
export const TopicPrefix = 'db-changes';
|
|
5
|
+
export class Db {
|
|
6
|
+
config;
|
|
24
7
|
constructor(config) {
|
|
25
8
|
this.config = config;
|
|
26
9
|
}
|
|
27
10
|
getScopedDb(db) {
|
|
28
|
-
return
|
|
11
|
+
return Instance.get().getScopedName(db).replaceAll('.', '-');
|
|
29
12
|
}
|
|
30
13
|
}
|
|
31
|
-
|
|
32
|
-
|
|
14
|
+
export class DbChange {
|
|
15
|
+
config;
|
|
16
|
+
#callbacks = {};
|
|
17
|
+
#mapper;
|
|
33
18
|
constructor(config, callbacks, mapper) {
|
|
34
19
|
this.config = config;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
__classPrivateFieldSet(this, _DbChange_callbacks, callbacks, "f");
|
|
38
|
-
__classPrivateFieldSet(this, _DbChange_mapper, mapper, "f");
|
|
20
|
+
this.#callbacks = callbacks;
|
|
21
|
+
this.#mapper = mapper;
|
|
39
22
|
}
|
|
40
23
|
get callbacks() {
|
|
41
|
-
return Object.freeze(
|
|
24
|
+
return Object.freeze(this.#callbacks);
|
|
42
25
|
}
|
|
43
26
|
get mapper() {
|
|
44
|
-
return
|
|
27
|
+
return this.#mapper;
|
|
45
28
|
}
|
|
46
29
|
async configureConnector(key, data) {
|
|
47
|
-
const instance =
|
|
30
|
+
const instance = axios.create({ baseURL: this.config.debeziumUrl });
|
|
48
31
|
return await instance
|
|
49
32
|
.put(`/connectors/${key}/config`, {
|
|
50
|
-
'topic.prefix':
|
|
33
|
+
'topic.prefix': TopicPrefix,
|
|
51
34
|
'topic.creation.enable': 'false',
|
|
52
35
|
'topic.creation.default.replication.factor': `-1`,
|
|
53
36
|
'topic.creation.default.partitions': '-1',
|
|
@@ -62,10 +45,8 @@ class DbChange {
|
|
|
62
45
|
return topics.data[key]?.topics?.includes?.(key) ?? false;
|
|
63
46
|
})
|
|
64
47
|
.catch((err) => {
|
|
65
|
-
throw new
|
|
48
|
+
throw new EquippedError(`Failed to configure watcher`, { key }, err);
|
|
66
49
|
});
|
|
67
50
|
}
|
|
68
51
|
}
|
|
69
|
-
exports.DbChange = DbChange;
|
|
70
|
-
_DbChange_callbacks = new WeakMap(), _DbChange_mapper = new WeakMap();
|
|
71
52
|
//# sourceMappingURL=_instance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_instance.js","sourceRoot":"","sources":["../../../src/dbs/base/_instance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"_instance.js","sourceRoot":"","sources":["../../../src/dbs/base/_instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGzC,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAA;AAYvC,MAAM,OAAgB,EAAE;IACD;IAAtB,YAAsB,MAAgB;QAAhB,WAAM,GAAN,MAAM,CAAU;IAAG,CAAC;IAEhC,WAAW,CAAC,EAAU;QAC/B,OAAO,QAAQ,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC7D,CAAC;CAKD;AAED,MAAM,OAAgB,QAAQ;IAKpB;IAJT,UAAU,GAAqC,EAAE,CAAA;IACjD,OAAO,CAA0B;IAEjC,YACS,MAAsB,EAC9B,SAA2C,EAC3C,MAAgC;QAFxB,WAAM,GAAN,MAAM,CAAgB;QAI9B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAA;IACpB,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,IAA4B;QAC3E,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QACnE,OAAO,MAAM,QAAQ;aACnB,GAAG,CAAC,eAAe,GAAG,SAAS,EAAE;YACjC,cAAc,EAAE,WAAW;YAC3B,uBAAuB,EAAE,OAAO;YAChC,2CAA2C,EAAE,IAAI;YACjD,mCAAmC,EAAE,IAAI;YACzC,eAAe,EAAE,6CAA6C;YAC9D,8BAA8B,EAAE,OAAO;YACvC,iBAAiB,EAAE,6CAA6C;YAChE,gCAAgC,EAAE,OAAO;YACzC,GAAG,IAAI;SACP,CAAC;aACD,IAAI,CAAC,KAAK,IAAI,EAAE;YAChB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC,CAAA;YAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;QAC1D,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,MAAM,IAAI,aAAa,CAAC,6BAA6B,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;IACJ,CAAC;CACD"}
|
package/lib/dbs/base/core.js
CHANGED
package/lib/dbs/base/types.js
CHANGED
package/lib/dbs/index.js
CHANGED
|
@@ -1,23 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./base/_instance"), exports);
|
|
18
|
-
__exportStar(require("./base/core"), exports);
|
|
19
|
-
__exportStar(require("./base/types"), exports);
|
|
20
|
-
__exportStar(require("./mongo/changes"), exports);
|
|
21
|
-
__exportStar(require("./mongo/index"), exports);
|
|
22
|
-
__exportStar(require("./pipes"), exports);
|
|
1
|
+
export * from './base/_instance';
|
|
2
|
+
export * from './base/core';
|
|
3
|
+
export * from './base/types';
|
|
4
|
+
export * from './mongo/changes';
|
|
5
|
+
export * from './mongo/index';
|
|
6
|
+
export * from './pipes';
|
|
23
7
|
//# sourceMappingURL=index.js.map
|
package/lib/dbs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dbs/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dbs/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA"}
|
package/lib/dbs/mongo/api.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const mongodb_1 = require("mongodb");
|
|
5
|
-
const query_1 = require("./query");
|
|
6
|
-
const errors_1 = require("../../errors");
|
|
1
|
+
import { ObjectId } from 'mongodb';
|
|
2
|
+
import { parseMongodbQueryParams } from './query';
|
|
3
|
+
import { EquippedError } from '../../errors';
|
|
7
4
|
const idKey = '_id';
|
|
8
|
-
function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
5
|
+
export function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
9
6
|
async function transform(doc) {
|
|
10
7
|
const docs = Array.isArray(doc) ? doc : [doc];
|
|
11
8
|
const mapped = docs.map((d) => mapper(d));
|
|
@@ -42,7 +39,7 @@ function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
42
39
|
const table = {
|
|
43
40
|
extras: { collection },
|
|
44
41
|
query: async (params) => {
|
|
45
|
-
const results = await
|
|
42
|
+
const results = await parseMongodbQueryParams(collection, params);
|
|
46
43
|
return {
|
|
47
44
|
...results,
|
|
48
45
|
results: (await transform(results.results)),
|
|
@@ -70,7 +67,7 @@ function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
70
67
|
},
|
|
71
68
|
insertMany: async (values, options = {}) => {
|
|
72
69
|
const now = options.getTime?.() ?? new Date();
|
|
73
|
-
const payload = values.map((value, i) => prepInsertValue(value, options.makeId?.(i) ?? new
|
|
70
|
+
const payload = values.map((value, i) => prepInsertValue(value, options.makeId?.(i) ?? new ObjectId().toString(), now));
|
|
74
71
|
await collection.insertMany(payload, { session: options.session });
|
|
75
72
|
const insertedData = await Promise.all(payload.map(async (data) => await table.findById(data[idKey], options)));
|
|
76
73
|
return insertedData.filter((value) => !!value);
|
|
@@ -100,7 +97,7 @@ function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
100
97
|
const now = options.getTime?.() ?? new Date();
|
|
101
98
|
const doc = await collection.findOneAndUpdate(filter, {
|
|
102
99
|
...prepUpdateValue('update' in values ? values.update : {}, now),
|
|
103
|
-
$setOnInsert: prepInsertValue(values.insert, options.makeId?.() ?? new
|
|
100
|
+
$setOnInsert: prepInsertValue(values.insert, options.makeId?.() ?? new ObjectId().toString(), now, true),
|
|
104
101
|
}, { returnDocument: 'after', session: options.session, upsert: true });
|
|
105
102
|
return transform(doc);
|
|
106
103
|
},
|
|
@@ -123,7 +120,7 @@ function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
123
120
|
operations.forEach((operation, i) => {
|
|
124
121
|
switch (operation.op) {
|
|
125
122
|
case 'insert':
|
|
126
|
-
bulk.insert(prepInsertValue(operation.value, operation.makeId?.(i) ?? new
|
|
123
|
+
bulk.insert(prepInsertValue(operation.value, operation.makeId?.(i) ?? new ObjectId().toString(), now));
|
|
127
124
|
break;
|
|
128
125
|
case 'delete':
|
|
129
126
|
bulk.find(operation.filter).delete();
|
|
@@ -136,11 +133,11 @@ function getTable(collection, { mapper, options: tableOptions = {} }) {
|
|
|
136
133
|
.upsert()
|
|
137
134
|
.update({
|
|
138
135
|
...prepUpdateValue('update' in operation ? operation.update : {}, now),
|
|
139
|
-
$setOnInsert: prepInsertValue(operation.insert, operation.makeId?.(i) ?? new
|
|
136
|
+
$setOnInsert: prepInsertValue(operation.insert, operation.makeId?.(i) ?? new ObjectId().toString(), now, true),
|
|
140
137
|
});
|
|
141
138
|
break;
|
|
142
139
|
default:
|
|
143
|
-
throw new
|
|
140
|
+
throw new EquippedError(`Unknown bulkWrite operation`, { operation });
|
|
144
141
|
}
|
|
145
142
|
});
|
|
146
143
|
await bulk.execute({ session: options.session });
|
package/lib/dbs/mongo/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dbs/mongo/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/dbs/mongo/api.ts"],"names":[],"mappings":"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"}
|
package/lib/dbs/mongo/changes.js
CHANGED
|
@@ -1,28 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
10
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
11
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
12
|
-
};
|
|
13
|
-
var _MongoDbChange_started;
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.MongoDbChange = void 0;
|
|
16
|
-
const mongodb_1 = require("mongodb");
|
|
17
|
-
const errors_1 = require("../../errors");
|
|
18
|
-
const instance_1 = require("../../instance");
|
|
19
|
-
const utilities_1 = require("../../utilities");
|
|
20
|
-
const validations_1 = require("../../validations");
|
|
21
|
-
const _instance_1 = require("../base/_instance");
|
|
22
|
-
class MongoDbChange extends _instance_1.DbChange {
|
|
1
|
+
import { ObjectId } from 'mongodb';
|
|
2
|
+
import { EquippedError } from '../../errors';
|
|
3
|
+
import { Instance } from '../../instance';
|
|
4
|
+
import { retry } from '../../utilities';
|
|
5
|
+
import { differ } from '../../validations';
|
|
6
|
+
import { DbChange, TopicPrefix } from '../base/_instance';
|
|
7
|
+
export class MongoDbChange extends DbChange {
|
|
8
|
+
#started = false;
|
|
23
9
|
constructor(config, change, client, dbName, colName, callbacks, mapper) {
|
|
24
10
|
super(change, callbacks, mapper);
|
|
25
|
-
_MongoDbChange_started.set(this, false);
|
|
26
11
|
const hydrate = (data) => data._id
|
|
27
12
|
? {
|
|
28
13
|
...data,
|
|
@@ -30,7 +15,7 @@ class MongoDbChange extends _instance_1.DbChange {
|
|
|
30
15
|
}
|
|
31
16
|
: undefined;
|
|
32
17
|
const dbColName = `${dbName}.${colName}`;
|
|
33
|
-
const topic = `${
|
|
18
|
+
const topic = `${TopicPrefix}.${dbColName}`;
|
|
34
19
|
const hexId = '5f5f65717569707065645f5f';
|
|
35
20
|
const TestId = makeId(hexId);
|
|
36
21
|
const condition = { _id: TestId };
|
|
@@ -53,7 +38,7 @@ class MongoDbChange extends _instance_1.DbChange {
|
|
|
53
38
|
await this.callbacks.updated({
|
|
54
39
|
before: this.mapper(before),
|
|
55
40
|
after: this.mapper(after),
|
|
56
|
-
changes:
|
|
41
|
+
changes: differ.from(differ.diff(before, after)),
|
|
57
42
|
});
|
|
58
43
|
else if (op === 'd' && this.callbacks.deleted && before)
|
|
59
44
|
await this.callbacks.deleted({
|
|
@@ -61,12 +46,12 @@ class MongoDbChange extends _instance_1.DbChange {
|
|
|
61
46
|
after: null,
|
|
62
47
|
});
|
|
63
48
|
}, { skipScope: true });
|
|
64
|
-
|
|
65
|
-
if (
|
|
49
|
+
Instance.on('start', async () => {
|
|
50
|
+
if (this.#started)
|
|
66
51
|
return;
|
|
67
|
-
|
|
52
|
+
this.#started = true;
|
|
68
53
|
const collection = client.db(dbName).collection(colName);
|
|
69
|
-
await
|
|
54
|
+
await retry(async () => {
|
|
70
55
|
const started = await this.configureConnector(topic, {
|
|
71
56
|
'connector.class': 'io.debezium.connector.mongodb.MongoDbConnector',
|
|
72
57
|
'capture.mode': 'change_streams_update_full_with_pre_image',
|
|
@@ -78,17 +63,15 @@ class MongoDbChange extends _instance_1.DbChange {
|
|
|
78
63
|
return { done: true, value: true };
|
|
79
64
|
await collection.findOneAndUpdate(condition, { $set: { colName } }, { upsert: true });
|
|
80
65
|
await collection.findOneAndDelete(condition);
|
|
81
|
-
|
|
66
|
+
Instance.get().log.warn(`Waiting for db changes for ${dbColName} to start...`);
|
|
82
67
|
return { done: false };
|
|
83
|
-
}, 6, 10_000).catch((err) =>
|
|
68
|
+
}, 6, 10_000).catch((err) => Instance.crash(new EquippedError(`Failed to start db changes`, { dbColName }, err)));
|
|
84
69
|
}, 10);
|
|
85
70
|
}
|
|
86
71
|
}
|
|
87
|
-
exports.MongoDbChange = MongoDbChange;
|
|
88
|
-
_MongoDbChange_started = new WeakMap();
|
|
89
72
|
const makeId = (id) => {
|
|
90
73
|
try {
|
|
91
|
-
return new
|
|
74
|
+
return new ObjectId(id);
|
|
92
75
|
}
|
|
93
76
|
catch {
|
|
94
77
|
return id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../src/dbs/mongo/changes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../../src/dbs/mongo/changes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAqB,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK5E,MAAM,OAAO,aAAqF,SAAQ,QAAuB;IAChI,QAAQ,GAAG,KAAK,CAAA;IAEhB,YACC,MAAqB,EACrB,MAAsB,EACtB,MAAmB,EACnB,MAAc,EACd,OAAe,EACf,SAA2C,EAC3C,MAAgC;QAEhC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAEhC,MAAM,OAAO,GAAG,CAAC,IAAS,EAAE,EAAE,CAC7B,IAAI,CAAC,GAAG;YACP,CAAC,CAAC;gBACA,GAAG,IAAI;gBACP,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC;aACzC;YACF,CAAC,CAAC,SAAS,CAAA;QAEb,MAAM,SAAS,GAAG,GAAG,MAAM,IAAI,OAAO,EAAE,CAAA;QACxC,MAAM,KAAK,GAAG,GAAG,WAAW,IAAI,SAAS,EAAE,CAAA;QAE3C,MAAM,KAAK,GAAG,0BAA0B,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5B,MAAM,SAAS,GAAG,EAAE,GAAG,EAAE,MAAM,EAAmB,CAAA;QAElD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAC/B,KAAc,EACd,KAAK,EAAE,IAAsB,EAAE,EAAE;YAChC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;YAElB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,CAAA;YAC9C,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,CAAA;YAE5C,IAAI,MAAM;gBAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;YACpC,IAAI,KAAK;gBAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;YACjC,IAAI,MAAM,EAAE,IAAI,KAAK,MAAM,IAAI,KAAK,EAAE,IAAI,KAAK,MAAM;gBAAE,OAAM;YAE7D,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,KAAK;gBAChD,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC5B,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE;iBAC1B,CAAC,CAAA;iBACE,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,MAAM,IAAI,KAAK;gBAC/D,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC5B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE;oBAC5B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE;oBAC1B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;iBAChD,CAAC,CAAA;iBACE,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,MAAM;gBACtD,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC5B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAE;oBAC5B,KAAK,EAAE,IAAI;iBACX,CAAC,CAAA;QACJ,CAAC,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACnB,CAAA;QAED,QAAQ,CAAC,EAAE,CACV,OAAO,EACP,KAAK,IAAI,EAAE;YACV,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAM;YACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YAEpB,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,UAAU,CAAQ,OAAO,CAAC,CAAA;YAE/D,MAAM,KAAK,CACV,KAAK,IAAI,EAAE;gBACV,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE;oBACpD,iBAAiB,EAAE,gDAAgD;oBACnE,cAAc,EAAE,2CAA2C;oBAC3D,2BAA2B,EAAE,MAAM,CAAC,GAAG;oBACvC,yBAAyB,EAAE,SAAS;oBACpC,eAAe,EAAE,aAAa;iBAC9B,CAAC,CAAA;gBAEF,IAAI,OAAO;oBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;gBAC/C,MAAM,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAS,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;gBAC5F,MAAM,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;gBAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,SAAS,cAAc,CAAC,CAAA;gBAC9E,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;YACvB,CAAC,EACD,CAAC,EACD,MAAM,CACN,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,4BAA4B,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;QACtG,CAAC,EACD,EAAE,CACF,CAAA;IACF,CAAC;CACD;AAQD,MAAM,MAAM,GAAG,CAAC,EAAU,EAAE,EAAE;IAC7B,IAAI,CAAC;QACJ,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAA;IACV,CAAC;AACF,CAAC,CAAA"}
|