@tstdl/base 0.71.89 → 0.71.91
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/core.js +2 -1
- package/core.js.map +1 -1
- package/image-service/image-service.d.ts +5 -5
- package/package.json +8 -8
- package/queue/mongo/mongo-job.repository.js +1 -1
- package/queue/mongo/mongo-job.repository.js.map +1 -1
- package/schema/schemas/union.js +8 -2
- package/schema/schemas/union.js.map +1 -1
- package/search-index/elastic/model/index-mapping.d.ts +2 -1
- package/search-index/elastic/model/index-mapping.js.map +1 -1
- package/search-index/elastic/module.js +15 -1
- package/search-index/elastic/module.js.map +1 -1
- package/search-index/elastic/search-index.js +5 -4
- package/search-index/elastic/search-index.js.map +1 -1
package/core.js
CHANGED
|
@@ -22,7 +22,8 @@ async function connect(name, connectFunction, logger, maxTries = 5) {
|
|
|
22
22
|
logger.info(`connected to ${name}`);
|
|
23
23
|
}
|
|
24
24
|
catch (error) {
|
|
25
|
-
logger.verbose(`error connecting to ${name}
|
|
25
|
+
logger.verbose(`error connecting to ${name}${triesLeft > 0 ? ', trying again...' : ''}`);
|
|
26
|
+
logger.error(error);
|
|
26
27
|
if (triesLeft == 0) {
|
|
27
28
|
throw new Error(`failed to connect to ${name} - no tries left`);
|
|
28
29
|
}
|
package/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../source/core.ts"],"names":[],"mappings":";;;AACA,2CAAwD;AACxD,6CAA6C;AAE7C,qCAA4C;AAC5C,8CAAiD;AACjD,2CAAyC;AAEzC,IAAI,aAAa,GAAG,MAAM,CAAC;AAC3B,IAAI,QAAQ,GAAG,iBAAQ,CAAC,KAAK,CAAC;AAC9B,IAAI,WAAW,GAA2C,uBAAa,CAAC;AAE3D,QAAA,WAAW,GAAG,IAAA,0BAAc,EAAS,aAAa,CAAC,CAAC;AAEpD,QAAA,QAAQ,GAAkB,IAAI,0BAAa,EAAE,CAAC;AAEpD,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,eAAqC,EAAE,MAAc,EAAE,WAAmB,CAAC;IACrH,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,OAAO,CAAC,OAAO,IAAI,CAAC,gBAAQ,CAAC,SAAS,IAAI,SAAS,EAAE,GAAG,CAAC,EAAE;QACzD,IAAI;YACF,MAAM,CAAC,OAAO,CAAC,iBAAiB,IAAI,KAAK,CAAC,CAAC;YAE3C,MAAM,eAAe,EAAE,CAAC;YACxB,OAAO,GAAG,IAAI,CAAC;YAEf,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;SACrC;QACD,OAAO,KAAc,EAAE;YACrB,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../source/core.ts"],"names":[],"mappings":";;;AACA,2CAAwD;AACxD,6CAA6C;AAE7C,qCAA4C;AAC5C,8CAAiD;AACjD,2CAAyC;AAEzC,IAAI,aAAa,GAAG,MAAM,CAAC;AAC3B,IAAI,QAAQ,GAAG,iBAAQ,CAAC,KAAK,CAAC;AAC9B,IAAI,WAAW,GAA2C,uBAAa,CAAC;AAE3D,QAAA,WAAW,GAAG,IAAA,0BAAc,EAAS,aAAa,CAAC,CAAC;AAEpD,QAAA,QAAQ,GAAkB,IAAI,0BAAa,EAAE,CAAC;AAEpD,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,eAAqC,EAAE,MAAc,EAAE,WAAmB,CAAC;IACrH,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,OAAO,CAAC,OAAO,IAAI,CAAC,gBAAQ,CAAC,SAAS,IAAI,SAAS,EAAE,GAAG,CAAC,EAAE;QACzD,IAAI;YACF,MAAM,CAAC,OAAO,CAAC,iBAAiB,IAAI,KAAK,CAAC,CAAC;YAE3C,MAAM,eAAe,EAAE,CAAC;YACxB,OAAO,GAAG,IAAI,CAAC;YAEf,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;SACrC;QACD,OAAO,KAAc,EAAE;YACrB,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACzF,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;YAE7B,IAAI,SAAS,IAAI,CAAC,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,kBAAkB,CAAC,CAAC;aACjE;YAED,MAAM,IAAA,gBAAO,EAAC,IAAI,CAAC,CAAC;SACrB;KACF;AACH,CAAC;AAxBD,0BAwBC;AAEM,KAAK,UAAU,gBAAgB;IACpC,MAAM,gBAAQ,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAFD,4CAEC;AAQD,SAAgB,cAAc,CAAC,MAA0B;IACvD,aAAa,GAAG,MAAM,EAAE,aAAa,IAAI,aAAa,CAAC;IACvD,QAAQ,GAAG,MAAM,EAAE,QAAQ,IAAI,QAAQ,CAAC;IACxC,WAAW,GAAG,MAAM,EAAE,WAAW,IAAI,WAAW,CAAC;AACnD,CAAC;AAJD,wCAIC;AAED,qBAAS,CAAC,QAAQ,CAAC,mBAAW,EAAE,EAAE,QAAQ,EAAE,eAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;AAE7F,qBAAS,CAAC,iBAAiB,CACzB,iBAAQ,EACR,EAAE,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,iBAAQ,CAAC,KAAK,EAAE,EAClD,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAC5C,CAAC;AAEF,qBAAS,CAAC,QAAQ,CAAC,eAAM,EAAE,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Infer } from 'superstruct';
|
|
2
|
-
export declare const imageResizeModeSchema: import("superstruct").Struct<"
|
|
3
|
-
fill: "fill";
|
|
2
|
+
export declare const imageResizeModeSchema: import("superstruct").Struct<"fit" | "fill", {
|
|
4
3
|
fit: "fit";
|
|
4
|
+
fill: "fill";
|
|
5
5
|
}>;
|
|
6
6
|
export declare type ImageResizeMode = Infer<typeof imageResizeModeSchema>;
|
|
7
7
|
export declare const imageOriginSchema: import("superstruct").Struct<"center" | "smart" | "top" | "left" | "right" | "bottom" | "topleft" | "topright" | "bottomleft" | "bottomright", {
|
|
@@ -30,13 +30,13 @@ export declare const imageOptionsSchema: import("superstruct").Struct<{
|
|
|
30
30
|
height?: number | undefined;
|
|
31
31
|
width?: number | undefined;
|
|
32
32
|
format?: "png" | "jpg" | "jpeg" | "webp" | "avif" | undefined;
|
|
33
|
-
resizeMode?: "
|
|
33
|
+
resizeMode?: "fit" | "fill" | undefined;
|
|
34
34
|
quality?: number | undefined;
|
|
35
35
|
cacheBuster?: string | undefined;
|
|
36
36
|
}, {
|
|
37
|
-
resizeMode: import("superstruct").Struct<"
|
|
38
|
-
fill: "fill";
|
|
37
|
+
resizeMode: import("superstruct").Struct<"fit" | "fill" | undefined, {
|
|
39
38
|
fit: "fit";
|
|
39
|
+
fill: "fill";
|
|
40
40
|
}>;
|
|
41
41
|
width: import("superstruct").Struct<number | undefined, null>;
|
|
42
42
|
height: import("superstruct").Struct<number | undefined, null>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.91",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -18,11 +18,11 @@
|
|
|
18
18
|
"luxon": "^3.0",
|
|
19
19
|
"reflect-metadata": "^0.1",
|
|
20
20
|
"rxjs": "^7.5",
|
|
21
|
-
"type-fest": "^2.
|
|
21
|
+
"type-fest": "^2.19"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/chroma-js": "2.1",
|
|
25
|
-
"@types/koa__router": "
|
|
25
|
+
"@types/koa__router": "12.0",
|
|
26
26
|
"@types/luxon": "3.0",
|
|
27
27
|
"@types/minio": "7.0",
|
|
28
28
|
"@types/mjml": "4.7",
|
|
@@ -38,20 +38,20 @@
|
|
|
38
38
|
"typescript-transform-paths": "3.3"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@elastic/elasticsearch": "^8.
|
|
41
|
+
"@elastic/elasticsearch": "^8.4",
|
|
42
42
|
"@koa/router": "^12.0",
|
|
43
43
|
"@tstdl/angular": "^0.10",
|
|
44
44
|
"chroma-js": "^2.4",
|
|
45
|
-
"got": "^12.
|
|
45
|
+
"got": "^12.5",
|
|
46
46
|
"handlebars": "^4.7",
|
|
47
47
|
"koa": "^2.13",
|
|
48
48
|
"minio": "^7.0",
|
|
49
49
|
"mjml": "^4.13",
|
|
50
|
-
"mongodb": "4.
|
|
50
|
+
"mongodb": "4.10",
|
|
51
51
|
"nodemailer": "^6.7",
|
|
52
|
-
"puppeteer": "^
|
|
52
|
+
"puppeteer": "^18.0",
|
|
53
53
|
"superstruct": "^0.16",
|
|
54
|
-
"undici": "^5.
|
|
54
|
+
"undici": "^5.10",
|
|
55
55
|
"urlpattern-polyfill": "^4.0"
|
|
56
56
|
},
|
|
57
57
|
"peerDependenciesMeta": {
|
|
@@ -28,7 +28,7 @@ const indexes = [
|
|
|
28
28
|
];
|
|
29
29
|
let MongoJobRepository = MongoJobRepository_1 = class MongoJobRepository extends mongo_1.MongoEntityRepository {
|
|
30
30
|
constructor(collection, logger) {
|
|
31
|
-
super(collection, mongo_1.noopTransformer, { indexes, logger });
|
|
31
|
+
super(collection, mongo_1.noopTransformer, { indexes: indexes, logger });
|
|
32
32
|
}
|
|
33
33
|
async insertWithUniqueTagStrategy(newJob, uniqueTagStrategy) {
|
|
34
34
|
const { queue, tag, ...rest } = newJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongo-job.repository.js","sourceRoot":"","sources":["../../../source/queue/mongo/mongo-job.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+CAAqF;AACrF,6CAAsC;AAEtC,gDAAsF;AACtF,yCAAkC;AAClC,8BAA4C;AAG5C,MAAM,OAAO,GAA2C;IACtD,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IAC7C,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1F,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;IAC7B,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/B,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;CAChC,CAAC;AAGF,IAAa,kBAAkB,0BAA/B,MAAa,kBAAsB,SAAQ,6BAAkC;IAG3E,YAA0B,UAAmC,EAAuC,MAAc;QAChH,KAAK,CAAC,UAAU,EAAE,uBAAe,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mongo-job.repository.js","sourceRoot":"","sources":["../../../source/queue/mongo/mongo-job.repository.ts"],"names":[],"mappings":"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"}
|
package/schema/schemas/union.js
CHANGED
|
@@ -11,22 +11,28 @@ class UnionSchemaValidator extends schema_validator_1.SchemaValidator {
|
|
|
11
11
|
this.innerSchemaTypesString = this.innerSchemas.map((innerSchema) => innerSchema.schema.type).join(', ');
|
|
12
12
|
}
|
|
13
13
|
[schema_validator_1.test](value, options, path) {
|
|
14
|
+
const errors = [];
|
|
14
15
|
for (const schema of this.innerSchemas) {
|
|
15
16
|
const result = schema.test(value, options);
|
|
16
17
|
if (result.valid) {
|
|
17
18
|
return result;
|
|
18
19
|
}
|
|
20
|
+
errors.push(result.error);
|
|
19
21
|
}
|
|
20
|
-
|
|
22
|
+
const childErrors = errors.map((error) => `${' '.repeat(path.nodes.length * 2)}${error.message}`).join('\n');
|
|
23
|
+
return { valid: false, error: new schema_error_1.SchemaError(`Value did not match any of the allowed schemas (${this.innerSchemaTypesString}):\n${childErrors}`, { path }) };
|
|
21
24
|
}
|
|
22
25
|
async [schema_validator_1.testAsync](value, options, path) {
|
|
26
|
+
const errors = [];
|
|
23
27
|
for (const schema of this.innerSchemas) {
|
|
24
28
|
const result = await schema.testAsync(value, options);
|
|
25
29
|
if (result.valid) {
|
|
26
30
|
return result;
|
|
27
31
|
}
|
|
32
|
+
errors.push(result.error);
|
|
28
33
|
}
|
|
29
|
-
|
|
34
|
+
const childErrors = errors.map((error) => `${' '.repeat(path.nodes.length * 2)}${error.message}`).join('\n');
|
|
35
|
+
return { valid: false, error: new schema_error_1.SchemaError(`Value did not match any of the allowed schemas (${this.innerSchemaTypesString}):\n${childErrors}`, { path }) };
|
|
30
36
|
}
|
|
31
37
|
}
|
|
32
38
|
exports.UnionSchemaValidator = UnionSchemaValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,oBAA+E,SAAQ,kCAA4C;IAK9I,YAAY,YAAmE,EAAE,MAAmC;QAClH,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3G,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAEhE,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;
|
|
1
|
+
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../source/schema/schemas/union.ts"],"names":[],"mappings":";;;AACA,kDAA8C;AAE9C,0DAAuE;AAEvE,oCAAwC;AASxC,MAAa,oBAA+E,SAAQ,kCAA4C;IAK9I,YAAY,YAAmE,EAAE,MAAmC;QAClH,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3G,CAAC;IAED,CAAC,uBAAI,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QACtE,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAEhE,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;YAED,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3B;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7G,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,OAAO,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChK,CAAC;IAES,KAAK,CAAC,CAAC,4BAAS,CAAC,CAAC,KAAc,EAAE,OAAiC,EAAE,IAAc;QAC3F,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE;YACtC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,KAA0B,EAAE,OAAO,CAAC,CAAC;YAE3E,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC;aACf;YAED,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3B;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7G,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,0BAAW,CAAC,mDAAmD,IAAI,CAAC,sBAAsB,OAAO,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAChK,CAAC;CACF;AA/CD,oDA+CC;AAED,SAAgB,KAAK,CAAyD,OAAkB,EAAE,OAA6F;IAC7L,MAAM,MAAM,GAAG,IAAA,oBAAY,EAA4D;QACrF,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAuC;QAC/F,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AARD,sBAQC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Entity } from "../../../database";
|
|
2
2
|
import type { DeepFlatten, StringMap, TypedOmit } from "../../../types";
|
|
3
|
-
import type { MappingBooleanProperty, MappingDateProperty, MappingGeoPointProperty, MappingKeywordProperty,
|
|
3
|
+
import type { MappingBooleanProperty, MappingByteNumberProperty, MappingDateProperty, MappingDoubleNumberProperty, MappingFloatNumberProperty, MappingGeoPointProperty, MappingHalfFloatNumberProperty, MappingIntegerNumberProperty, MappingKeywordProperty, MappingLongNumberProperty, MappingNestedProperty, MappingObjectProperty, MappingPropertyBase, MappingScaledFloatNumberProperty, MappingShortNumberProperty, MappingTextProperty, MappingTypeMapping, MappingUnsignedLongNumberProperty } from '@elastic/elasticsearch/lib/api/types';
|
|
4
4
|
export declare type ElasticIndexMapping<T extends Entity = Entity> = TypedOmit<MappingTypeMapping, 'properties'> & ElasticNestedIndexMapping<TypedOmit<T, 'id'>>;
|
|
5
5
|
export declare type ElasticNestedIndexMapping<T> = {
|
|
6
6
|
properties: {
|
|
@@ -12,6 +12,7 @@ declare type ElasticIndexMappingItemBase = {
|
|
|
12
12
|
index?: boolean;
|
|
13
13
|
fields?: StringMap<ElasticIndexMappingItem>;
|
|
14
14
|
};
|
|
15
|
+
export declare type MappingNumberProperty = MappingByteNumberProperty | MappingDoubleNumberProperty | MappingFloatNumberProperty | MappingHalfFloatNumberProperty | MappingIntegerNumberProperty | MappingLongNumberProperty | MappingShortNumberProperty | MappingScaledFloatNumberProperty | MappingUnsignedLongNumberProperty;
|
|
15
16
|
export declare type ElasticKeywordIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingKeywordProperty>;
|
|
16
17
|
export declare type ElasticTextIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingTextProperty>;
|
|
17
18
|
export declare type ElasticNumberIndexMappingItem = ElasticIndexMappingItemBase & StrippedBaseType<MappingNumberProperty>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-mapping.js","sourceRoot":"","sources":["../../../../source/search-index/elastic/model/index-mapping.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,uDAAoD;
|
|
1
|
+
{"version":3,"file":"index-mapping.js","sourceRoot":"","sources":["../../../../source/search-index/elastic/model/index-mapping.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,uDAAoD;AAqDpD,SAAgB,0BAA0B,CAAmB,QAAkC;IAC7F,OAAO,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAFD,gEAEC"}
|
|
@@ -23,7 +23,8 @@ container_1.container.registerSingleton(elasticsearch_1.Client, {
|
|
|
23
23
|
const logger = await container_1.container.resolveAsync(logger_1.Logger, exports.elasticsearchModuleConfig.logPrefix);
|
|
24
24
|
const client = new elasticsearch_1.Client(options);
|
|
25
25
|
core_1.disposer.add(async () => client.close().then(() => logger.info('closed connection')), 10000);
|
|
26
|
-
|
|
26
|
+
const url = getUrl(options.node ?? options.nodes);
|
|
27
|
+
await (0, core_1.connect)(`elasticsearch (${url})`, async () => client.ping().then((alive) => (0, type_guards_1.assert)(alive, 'failed to connect')), logger);
|
|
27
28
|
return client;
|
|
28
29
|
}
|
|
29
30
|
}, { defaultArgumentProvider: () => exports.elasticsearchModuleConfig.defaultOptions });
|
|
@@ -34,4 +35,17 @@ function getElasticSearchIndexConfig(indexName) {
|
|
|
34
35
|
return container_1.container.resolve(config_1.ElasticSearchIndexConfig, indexName);
|
|
35
36
|
}
|
|
36
37
|
exports.getElasticSearchIndexConfig = getElasticSearchIndexConfig;
|
|
38
|
+
function getUrl(node) {
|
|
39
|
+
if ((0, type_guards_1.isString)(node)) {
|
|
40
|
+
return node;
|
|
41
|
+
}
|
|
42
|
+
if ((0, type_guards_1.isArray)(node)) {
|
|
43
|
+
const urls = node.map(getUrl);
|
|
44
|
+
return `[${urls.join(', ')}]`;
|
|
45
|
+
}
|
|
46
|
+
if ((0, type_guards_1.isObject)(node)) {
|
|
47
|
+
return node.url.toString();
|
|
48
|
+
}
|
|
49
|
+
return 'undefined url';
|
|
50
|
+
}
|
|
37
51
|
//# sourceMappingURL=module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/search-index/elastic/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AACxD,qCAA2C;AAE3C,yCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../source/search-index/elastic/module.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AACxD,qCAA2C;AAE3C,yCAAkC;AAClC,yDAAyF;AAEzF,0DAAgD;AAEhD,qCAAoD;AAOvC,QAAA,yBAAyB,GAA8B;IAClE,cAAc,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE;IACjD,SAAS,EAAE,SAAS;CACrB,CAAC;AAEW,QAAA,2BAA2B,GAAG,IAAA,0BAAc,EAA6D,6BAA6B,CAAC,CAAC;AAErJ,SAAgB,sBAAsB,CAAC,SAA6C,EAAE;IACpF,iCAAyB,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,iCAAyB,CAAC,cAAc,CAAC;IAC7G,iCAAyB,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,iCAAyB,CAAC,SAAS,CAAC;AAChG,CAAC;AAHD,wDAGC;AAED,qBAAS,CAAC,iBAAiB,CAAwB,sBAAM,EAAE;IACzD,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC5B,IAAA,2BAAa,EAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,eAAM,EAAE,iCAAyB,CAAC,SAAS,CAAC,CAAC;QACzF,MAAM,MAAM,GAAW,IAAI,sBAAM,CAAC,OAAO,CAAC,CAAC;QAE3C,eAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7F,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,IAAA,cAAO,EAAC,kBAAkB,GAAG,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,oBAAM,EAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE/H,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,EAAE,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,iCAAyB,CAAC,cAAc,EAAE,CAAC,CAAC;AAEhF,qBAAS,CAAC,iBAAiB,CAAC,mCAA2B,EAAE;IACvD,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,iCAAwB,EAAE,QAAQ,CAAC;CACvF,CAAC,CAAC;AAEH,SAAgB,2BAA2B,CAAmB,SAAiB;IAC7E,OAAO,qBAAS,CAAC,OAAO,CAAC,iCAAwB,EAAE,SAAS,CAAC,CAAC;AAChE,CAAC;AAFD,kEAEC;AAED,SAAS,MAAM,CAAC,IAA2B;IACzC,IAAI,IAAA,sBAAQ,EAAC,IAAI,CAAC,EAAE;QAClB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAA,qBAAO,EAAC,IAAI,CAAC,EAAE;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9B,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;KAC/B;IAED,IAAI,IAAA,sBAAQ,EAAC,IAAI,CAAC,EAAE;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;KAC5B;IAED,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ElasticSearchIndex = void 0;
|
|
4
4
|
const container_1 = require("../../container");
|
|
5
|
-
const
|
|
5
|
+
const bad_request_error_1 = require("../../error/bad-request.error");
|
|
6
|
+
const multi_error_1 = require("../../error/multi.error");
|
|
6
7
|
const search_index_1 = require("..");
|
|
7
8
|
const base64_1 = require("../../utils/base64");
|
|
8
9
|
const encoding_1 = require("../../utils/encoding");
|
|
@@ -69,7 +70,7 @@ class ElasticSearchIndex extends search_index_1.SearchIndex {
|
|
|
69
70
|
if (errors.length == 1) {
|
|
70
71
|
throw errors[0];
|
|
71
72
|
}
|
|
72
|
-
const multiError = new
|
|
73
|
+
const multiError = new multi_error_1.MultiError(errors);
|
|
73
74
|
throw new search_index_1.SearchIndexError('index error', 'multiple errors', { cause: multiError });
|
|
74
75
|
}
|
|
75
76
|
}
|
|
@@ -87,7 +88,7 @@ class ElasticSearchIndex extends search_index_1.SearchIndex {
|
|
|
87
88
|
const search = { index: this.indexName, query: queryBody };
|
|
88
89
|
const windowLimit = this.indexSettings.max_result_window ?? 10000;
|
|
89
90
|
if ((options?.skip ?? 0) + (options?.limit ?? 0) > windowLimit) {
|
|
90
|
-
throw new
|
|
91
|
+
throw new bad_request_error_1.BadRequestError(`Result window is too large, skip + limit must be less than or equal to ${windowLimit}. Use cursor for more results`);
|
|
91
92
|
}
|
|
92
93
|
if ((0, type_guards_1.isDefined)(cursorData) && (0, type_guards_1.isDefined)(options?.skip)) {
|
|
93
94
|
throw new Error('cursor and skip cannot be used at the same time');
|
|
@@ -138,6 +139,6 @@ function deserializeCursor(cursor) {
|
|
|
138
139
|
}
|
|
139
140
|
function convertError(error, raw) {
|
|
140
141
|
const cause = ((0, type_guards_1.isDefined)(error.caused_by)) ? convertError(error.caused_by) : undefined;
|
|
141
|
-
return new search_index_1.SearchIndexError(error.type, error.reason, { raw, cause });
|
|
142
|
+
return new search_index_1.SearchIndexError(error.type, error.reason ?? 'No error message provided.', { raw, cause });
|
|
142
143
|
}
|
|
143
144
|
//# sourceMappingURL=search-index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/search-index.ts"],"names":[],"mappings":";;;AAEA,+CAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../../source/search-index/elastic/search-index.ts"],"names":[],"mappings":"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"}
|