@dcl/content-validator 2.1.0 → 2.1.1-20220622185224.commit-163289a

package/dist/validations/validations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../src/validations/validations.ts"],"names":[],"mappings":";;;AACA,oCAA+G;AAC/G,6CAAmF;AAEnF,SAAgB,eAAe,CAAC,GAAG,WAAyB;IAC1D,OAAO;QACL,KAAK,CAAC,QAAQ,CACZ,UAAsC,EACtC,UAAgC;YAEhC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;gBAClE,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAAE,OAAO,QAAQ,CAAA;aAClC;YACD,OAAO,UAAE,CAAA;QACX,CAAC;KACF,CAAA;AACH,CAAC;AAbD,0CAaC;AAED,SAAgB,qBAAqB,CACnC,SAA2E,EAC3E,UAAsB;IAEtB,OAAO;QACL,KAAK,CAAC,QAAQ,CAAC,UAAsC,EAAE,UAAgC;YACrF,MAAM,cAAc,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;YAClD,IAAI,cAAc,EAAE;gBAClB,OAAO,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;aACnD;YACD,OAAO,UAAE,CAAA;QACX,CAAC;KACF,CAAA;AACH,CAAC;AAbD,sDAaC;AAED,SAAgB,oBAAoB,CAAC,UAAsB;IACzD,OAAO,qBAAqB,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,6BAAgB,EAAE,UAAU,CAAC,CAAA;AAC3G,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB,CAAC,UAAsB;IACzD,OAAO,qBAAqB,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,6BAAgB,EAAE,UAAU,CAAC,CAAA;AAC3G,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB,CAAC,UAAsB;IACzD,OAAO,qBAAqB,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,6BAAgB,EAAE,UAAU,CAAC,CAAA;AAC3G,CAAC;AAFD,oDAEC;AAED,SAAgB,iBAAiB,CAAC,UAAsB,EAAE,UAAsB;IAC9E,OAAO,qBAAqB,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,UAAU,CAAC,CAAA;AACjG,CAAC;AAFD,8CAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/content-validator",
-  "version": "2.1.0",
+  "version": "2.1.1-20220622185224.commit-163289a",
   "description": "Catalyst content validations",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/decentraland/content-validator#readme",
   "devDependencies": {
-    "@dcl/eslint-config": "1.0.3",
+    "@dcl/eslint-config": "1.0.5",
     "@microsoft/api-extractor": "^7.24.2",
     "@types/jest": "^28.1.1",
     "@types/ms": "0.7.31",
@@ -50,7 +50,7 @@
   "dependencies": {
     "@dcl/content-hash-tree": "^1.1.3",
     "@dcl/hashing": "1.1.0",
-    "@dcl/schemas": "^4.14.0",
+    "@dcl/schemas": "^5.0.3",
     "@dcl/urn-resolver": "1.3.1",
     "@well-known-components/interfaces": "1.1.1",
     "ms": "2.1.3",
@@ -59,5 +59,5 @@
   "files": [
     "dist"
   ],
-  "commit": "ef47fea4635fe429aae20445e4adb1c351a9df36"
+  "commit": "163289a97efcd6c09681971b25b55a992ead3b77"
 }

package/dist/validations/wearable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wearable.d.ts","sourceRoot":"","sources":["../../src/validations/wearable.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,UAAU,EAEX,MAAM,UAAU,CAAA;AAIjB,sEAAsE;AACtE,eAAO,MAAM,6BAA6B,EAAE,UAwB3C,CAAA;AAED,+EAA+E;AAC/E,eAAO,MAAM,YAAY,EAAE,UAgC1B,CAAA;AAID,eAAO,MAAM,iBAAiB,EAAE,UAqD/B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,UAWtB,CAAA"}

package/dist/validations/wearable.js

@@ -1,110 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wearable = exports.wearableThumbnail = exports.wearableSize = exports.wearableRepresentationContent = void 0;
-const schemas_1 = require("@dcl/schemas");
-const ADR51_1 = require("./ADR51");
-const sharp_1 = __importDefault(require("sharp"));
-const _1 = require(".");
-const types_1 = require("../types");
-const wearableSizeLimitInMB = 2;
-/** Validate wearable representations are referencing valid content */
-exports.wearableRepresentationContent = {
-    validate: async (components, deployment) => {
-        const { entity } = deployment;
-        const wearableMetadata = entity.metadata;
-        const representations = wearableMetadata?.data?.representations;
-        if (!representations)
-            return (0, types_1.validationFailed)('No wearable representations found');
-        if (!entity.content)
-            return (0, types_1.validationFailed)('No content found');
-        for (const representation of representations) {
-            for (const representationContent of representation.contents) {
-                if (!entity.content.find((content) => content.file === representationContent)) {
-                    return (0, types_1.validationFailed)(`Representation content: '${representationContent}' is not one of the content files`);
-                }
-            }
-        }
-        return types_1.OK;
-    }
-};
-/** Validate wearable files size, excluding thumbnail, is less than expected */
-exports.wearableSize = {
-    validate: async ({ externalCalls }, deployment) => {
-        const entity = deployment.entity;
-        if (entity.timestamp < _1.ADR_45_TIMESTAMP)
-            return types_1.OK;
-        const maxSizeInMB = ADR51_1.entityParameters[schemas_1.EntityType.WEARABLE]?.maxSizeInMB;
-        if (!maxSizeInMB)
-            return (0, types_1.validationFailed)(`Type ${schemas_1.EntityType.WEARABLE} is not supported yet`);
-        const modelSizeInMB = wearableSizeLimitInMB;
-        const metadata = entity.metadata;
-        const thumbnailHash = entity.content?.find(({ file }) => file === metadata.thumbnail)?.hash;
-        if (!thumbnailHash)
-            return (0, types_1.validationFailed)("Couldn't find the thumbnail hash");
-        const result = await (0, _1.calculateDeploymentSize)(deployment, externalCalls);
-        if (typeof result === 'string')
-            return (0, types_1.validationFailed)(result);
-        const totalDeploymentSize = result;
-        const thumbnailSize = deployment.files.get(thumbnailHash)?.byteLength ?? 0;
-        const modelSize = totalDeploymentSize - thumbnailSize;
-        if (modelSize > modelSizeInMB * 1024 * 1024)
-            return (0, types_1.validationFailed)(`The deployment is too big. The maximum allowed size for wearable model files is ${modelSizeInMB} MB. You can upload up to ${modelSizeInMB * 1024 * 1024} bytes but you tried to upload ${modelSize}.`);
-        return types_1.OK;
-    }
-};
-/** Validate that given wearable deployment includes a thumbnail with valid format and size */
-const maxThumbnailSize = 1024;
-exports.wearableThumbnail = {
-    validate: async ({ externalCalls, logs }, deployment) => {
-        const logger = logs.getLogger('wearable validator');
-        if (deployment.entity.timestamp < _1.ADR_45_TIMESTAMP)
-            return types_1.OK;
-        // read thumbnail field from metadata
-        const metadata = deployment.entity.metadata;
-        const hash = deployment.entity.content?.find(({ file }) => file === metadata.thumbnail)?.hash;
-        if (!hash)
-            return (0, types_1.validationFailed)(`Couldn't find hash for thumbnail file with name: ${metadata.thumbnail}`);
-        const errors = [];
-        // check size
-        const thumbnailBuffer = deployment.files.get(hash);
-        if (!thumbnailBuffer) {
-            const isHashStored = (await externalCalls.isContentStoredAlready([hash])).get(hash) ?? false;
-            if (!isHashStored) {
-                return (0, types_1.validationFailed)(`Couldn't find thumbnail file with hash: ${hash}`);
-            }
-            // otherwise, thumbnail was already uploaded and won't be validated again
-            logger.debug(`Thumbnail file with hash: ${hash} is not in the deployment, but it is already stored`);
-            return types_1.OK;
-        }
-        try {
-            const { width, height, format } = await (0, sharp_1.default)(thumbnailBuffer).metadata();
-            if (!format || format !== 'png')
-                errors.push(`Invalid or unknown image format. Only 'PNG' format is accepted.`);
-            if (!width || !height) {
-                errors.push(`Couldn't validate thumbnail size for file ${metadata.thumbnail}`);
-            }
-            else if (width > maxThumbnailSize || height > maxThumbnailSize) {
-                errors.push(`Invalid thumbnail image size (width = ${width} / height = ${height})`);
-            }
-        }
-        catch (e) {
-            errors.push(`Couldn't parse thumbnail, please check image format.`);
-        }
-        return errors.length > 0 ? (0, types_1.validationFailed)(...errors) : types_1.OK;
-    }
-};
-/**
- * Validate that given wearable deployment includes the thumbnail and doesn't exceed file sizes
- * * @public
- */
-exports.wearable = {
-    validate: async (components, deployment) => {
-        if (deployment.entity.type !== schemas_1.EntityType.WEARABLE)
-            return types_1.OK;
-        return (0, _1.validateInRow)(components, deployment, exports.wearableRepresentationContent, exports.wearableThumbnail, exports.wearableSize);
-    }
-};
-//# sourceMappingURL=wearable.js.map

package/dist/validations/wearable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wearable.js","sourceRoot":"","sources":["../../src/validations/wearable.ts"],"names":[],"mappings":"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"}