@dcl/content-validator 6.0.2 → 6.0.3-18285018140.commit-e8baa26
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/validations/ADR51.d.ts +1 -0
- package/dist/validations/ADR51.d.ts.map +1 -1
- package/dist/validations/ADR51.js +2 -1
- package/dist/validations/ADR51.js.map +1 -1
- package/dist/validations/items/items.d.ts.map +1 -1
- package/dist/validations/items/items.js +6 -2
- package/dist/validations/items/items.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ADR51.d.ts","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5G,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE,gBAAgB,CAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,CAAA;IAChF,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"ADR51.d.ts","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5G,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE,gBAAgB,CAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,CAAA;IAChF,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,IAAI,CAAA;AAChC,eAAO,MAAM,oBAAoB,IAAI,CAAA;AAErC,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAyBvD,CAAA"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.entityParameters = exports.skinMaxSizeInMb = void 0;
|
|
3
|
+
exports.entityParameters = exports.thumbnailMaxSizeInMb = exports.skinMaxSizeInMb = void 0;
|
|
4
4
|
const schemas_1 = require("@dcl/schemas");
|
|
5
5
|
exports.skinMaxSizeInMb = 9;
|
|
6
|
+
exports.thumbnailMaxSizeInMb = 1;
|
|
6
7
|
exports.entityParameters = {
|
|
7
8
|
scene: {
|
|
8
9
|
validate: schemas_1.Scene.validate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ADR51.js","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":";;;AAAA,0CAA4G;AAO/F,QAAA,eAAe,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ADR51.js","sourceRoot":"","sources":["../../src/validations/ADR51.ts"],"names":[],"mappings":";;;AAAA,0CAA4G;AAO/F,QAAA,eAAe,GAAG,CAAC,CAAA;AACnB,QAAA,oBAAoB,GAAG,CAAC,CAAA;AAExB,QAAA,gBAAgB,GAA+B;IAC1D,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,EAAE;KAChB;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,iBAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,CAAC;KACf;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,kBAAQ,CAAC,QAAQ;QAC3B,WAAW,EAAE,CAAC;KACf;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,CAAC;KACf;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,eAAK,CAAC,QAAQ;QACxB,WAAW,EAAE,CAAC;KACf;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,iBAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,CAAC;KACf;CACF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.d.ts","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,0BAA0B,EAG1B,UAAU,EAGX,MAAM,aAAa,CAAA;AAIpB,2EAA2E;AAC3E,wBAAgB,gEAAgE,CAC9E,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,
|
|
1
|
+
{"version":3,"file":"items.d.ts","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,0BAA0B,EAG1B,UAAU,EAGX,MAAM,aAAa,CAAA;AAIpB,2EAA2E;AAC3E,wBAAgB,gEAAgE,CAC9E,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,CAiDZ;AAKD,wBAAgB,6CAA6C,CAC3D,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,GAAG,MAAM,CAAC,GACrE,UAAU,CA2CZ;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,0BAA0B,GAAG,UAAU,CAQxF"}
|
|
@@ -24,7 +24,7 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
24
24
|
maxSizeInMB = ADR51_1.skinMaxSizeInMb;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
const modelSizeInMB = maxSizeInMB -
|
|
27
|
+
const modelSizeInMB = maxSizeInMB - ADR51_1.thumbnailMaxSizeInMb;
|
|
28
28
|
const metadata = entity.metadata;
|
|
29
29
|
const thumbnailHash = entity.content?.find(({ file }) => file === metadata.thumbnail)?.hash;
|
|
30
30
|
if (!thumbnailHash) {
|
|
@@ -34,6 +34,10 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
34
34
|
if (typeof totalDeploymentSizeInB === 'string')
|
|
35
35
|
return (0, types_1.validationFailed)(totalDeploymentSizeInB);
|
|
36
36
|
const thumbnailSize = deployment.files.get(thumbnailHash)?.byteLength ?? 0;
|
|
37
|
+
// Check if thumbnail size exceeds the allowed maximum
|
|
38
|
+
if (thumbnailSize > ADR51_1.thumbnailMaxSizeInMb * 1024 * 1024) {
|
|
39
|
+
return (0, types_1.validationFailed)(`The thumbnail is too big. The maximum allowed size for thumbnail model files is ${ADR51_1.thumbnailMaxSizeInMb} MB. You can upload up to ${ADR51_1.thumbnailMaxSizeInMb * 1024 * 1024} bytes but you tried to upload ${thumbnailSize}.`);
|
|
40
|
+
}
|
|
37
41
|
const modelSize = totalDeploymentSizeInB - thumbnailSize;
|
|
38
42
|
if (modelSize > modelSizeInMB * 1024 * 1024)
|
|
39
43
|
return (0, types_1.validationFailed)(`The deployment is too big. The maximum allowed size for ${entity.type} model files is ${modelSizeInMB} MB. You can upload up to ${modelSizeInMB * 1024 * 1024} bytes but you tried to upload ${modelSize}.`);
|
|
@@ -43,7 +47,7 @@ function createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn(compon
|
|
|
43
47
|
}
|
|
44
48
|
exports.createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn = createDeploymentMaxSizeExcludingThumbnailIsNotExceededValidateFn;
|
|
45
49
|
/** Validate that given item deployment includes a thumbnail with valid format and size */
|
|
46
|
-
const maxThumbnailSizeInB = 1024;
|
|
50
|
+
const maxThumbnailSizeInB = ADR51_1.thumbnailMaxSizeInMb * 1024;
|
|
47
51
|
function createThumbnailMaxSizeIsNotExceededValidateFn(components) {
|
|
48
52
|
const { externalCalls, logs } = components;
|
|
49
53
|
const logger = logs.getLogger('thumbnail size validator');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAqE;AAErE,kDAAyB;AACzB,0BAA4C;AAC5C,uCAOoB;AACpB,
|
|
1
|
+
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../../src/validations/items/items.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/content-validator",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.3-18285018140.commit-e8baa26",
|
|
4
4
|
"description": "Catalyst content validations",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"files": [
|
|
54
54
|
"dist"
|
|
55
55
|
],
|
|
56
|
-
"commit": "
|
|
56
|
+
"commit": "e8baa26857fd90f7382a82fcfd2de223806be946"
|
|
57
57
|
}
|