@dcl/content-validator 1.0.1-20220128144241.commit-9e37746 → 1.0.2-20220207171651.commit-57ffa8d

package/dist/content-validator.api.json

@@ -172,18 +172,22 @@
         {
           "kind": "Variable",
           "canonicalReference": "@dcl/content-validator!ADR_45_TIMESTAMP:var",
-          "docComment": "/**\n * @public\n */\n",
+          "docComment": "/**\n * 1648771200000 = April 1st 2022 UTC\n *\n * @public\n */\n",
           "excerptTokens": [
             {
               "kind": "Content",
-              "text": "ADR_45_TIMESTAMP = 1648954800000"
+              "text": "ADR_45_TIMESTAMP: "
+            },
+            {
+              "kind": "Content",
+              "text": "number"
             }
           ],
           "releaseTag": "Public",
           "name": "ADR_45_TIMESTAMP",
           "variableTypeTokenRange": {
-            "startIndex": 0,
-            "endIndex": 0
+            "startIndex": 1,
+            "endIndex": 2
           }
         },
         {
@@ -815,6 +819,15 @@
               "text": "Validation",
               "canonicalReference": "@dcl/content-validator!Validation:type"
             },
+            {
+              "kind": "Content",
+              "text": ", "
+            },
+            {
+              "kind": "Reference",
+              "text": "Validation",
+              "canonicalReference": "@dcl/content-validator!Validation:type"
+            },
             {
               "kind": "Content",
               "text": "]"
@@ -824,7 +837,7 @@
           "name": "statefulValidations",
           "variableTypeTokenRange": {
             "startIndex": 1,
-            "endIndex": 12
+            "endIndex": 14
           }
         },
         {
@@ -1186,6 +1199,15 @@
               "text": "Validation",
               "canonicalReference": "@dcl/content-validator!Validation:type"
             },
+            {
+              "kind": "Content",
+              "text": ", "
+            },
+            {
+              "kind": "Reference",
+              "text": "Validation",
+              "canonicalReference": "@dcl/content-validator!Validation:type"
+            },
             {
               "kind": "Content",
               "text": "]"
@@ -1195,7 +1217,7 @@
           "name": "validations",
           "variableTypeTokenRange": {
             "startIndex": 1,
-            "endIndex": 18
+            "endIndex": 20
           }
         },
         {

package/dist/validations/index.d.ts

@@ -4,9 +4,10 @@ import { DeploymentToValidate, ExternalCalls, Validation, ValidationArgs, Valida
  */
 export declare const validateInRow: (validationArgs: ValidationArgs, ...validations: Validation[]) => Promise<ValidationResponse>;
 /**
+ * 1648771200000 = April 1st 2022 UTC
  * @public
  */
-export declare const ADR_45_TIMESTAMP = 1648954800000;
+export declare const ADR_45_TIMESTAMP: number;
 /**
  * DCL Launch Day
  * @public
@@ -20,7 +21,7 @@ export declare const calculateDeploymentSize: (deployment: DeploymentToValidate,
  * Stateful validations that are run on a deployment.
  * @public
  */
-export declare const statefulValidations: readonly [Validation, Validation, Validation, Validation, Validation];
+export declare const statefulValidations: readonly [Validation, Validation, Validation, Validation, Validation, Validation];
 /**
  * Stateless validations that are run on a deployment.
  * @public
@@ -30,5 +31,5 @@ export declare const statelessValidations: readonly [Validation, Validation, Val
  * All validations that are run on a deployment.
  * @public
  */
-export declare const validations: readonly [Validation, Validation, Validation, Validation, Validation, Validation, Validation, Validation];
+export declare const validations: readonly [Validation, Validation, Validation, Validation, Validation, Validation, Validation, Validation, Validation];
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAM,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAUlH;;GAEG;AACH,eAAO,MAAM,aAAa,mBACR,cAAc,kBACd,UAAU,EAAE,KAC3B,QAAQ,kBAAkB,CAM5B,CAAA;AAGD;;GAEG;AACH,eAAO,MAAM,gBAAgB,gBAAgB,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,kCAAkC,gBAAgB,CAAA;AAE/D;;GAEG;AACH,eAAO,MAAM,uBAAuB,eACtB,oBAAoB,iBACjB,aAAa,KAC3B,QAAQ,MAAM,GAAG,MAAM,CAazB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,uEAAwD,CAAA;AAExF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,+CAAoD,CAAA;AAErF;;;GAGG;AACH,eAAO,MAAM,WAAW,2GAA6D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAM,UAAU,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAWlH;;GAEG;AACH,eAAO,MAAM,aAAa,mBACR,cAAc,kBACd,UAAU,EAAE,KAC3B,QAAQ,kBAAkB,CAM5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,QAAwF,CAAA;AAErH;;;GAGG;AACH,eAAO,MAAM,kCAAkC,gBAAgB,CAAA;AAE/D;;GAEG;AACH,eAAO,MAAM,uBAAuB,eACtB,oBAAoB,iBACjB,aAAa,KAC3B,QAAQ,MAAM,GAAG,MAAM,CAazB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,mFAAiE,CAAA;AAEjG;;;GAGG;AACH,eAAO,MAAM,oBAAoB,+CAAoD,CAAA;AAErF;;;GAGG;AACH,eAAO,MAAM,WAAW,uHAA6D,CAAA"}

package/dist/validations/index.js

@@ -10,6 +10,7 @@ const metadata_schema_1 = require("./metadata-schema");
 const signature_1 = require("./signature");
 const size_1 = require("./size");
 const wearable_1 = require("./wearable");
+const profile_1 = require("./profile");
 /**
  * @public
  */
@@ -22,11 +23,11 @@ const validateInRow = async (validationArgs, ...validations) => {
     return types_1.OK;
 };
 exports.validateInRow = validateInRow;
-// todo: review/define date for entities v4 (for the time being, it is set for test purposes)
 /**
+ * 1648771200000 = April 1st 2022 UTC
  * @public
  */
-exports.ADR_45_TIMESTAMP = 1648954800000;
+exports.ADR_45_TIMESTAMP = process.env.ADR_45_TIMESTAMP ? parseInt(process.env.ADR_45_TIMESTAMP) : 1648771200000;
 /**
  * DCL Launch Day
  * @public
@@ -56,7 +57,7 @@ exports.calculateDeploymentSize = calculateDeploymentSize;
  * Stateful validations that are run on a deployment.
  * @public
  */
-exports.statefulValidations = [signature_1.signature, access_1.access, size_1.size, wearable_1.wearable, content_1.content];
+exports.statefulValidations = [signature_1.signature, access_1.access, size_1.size, wearable_1.wearable, profile_1.profile, content_1.content];
 /**
  * Stateless validations that are run on a deployment.
  * @public

package/dist/validations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":";;;AAAA,oCAAkH;AAClH,oDAAgD;AAChD,uCAAmC;AACnC,yDAAoD;AACpD,iDAA4C;AAC5C,uDAA4C;AAC5C,2CAAuC;AACvC,iCAA6B;AAC7B,yCAAqC;AAErC;;GAEG;AACI,MAAM,aAAa,GAAG,KAAK,EAChC,cAA8B,EAC9B,GAAG,WAAyB,EACC,EAAE;IAC/B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;QAC1D,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAA;KAClC;IACD,OAAO,UAAE,CAAA;AACX,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB;AAED,6FAA6F;AAC7F;;GAEG;AACU,QAAA,gBAAgB,GAAG,aAAa,CAAA;AAE7C;;;GAGG;AACU,QAAA,kCAAkC,GAAG,aAAa,CAAA;AAE/D;;GAEG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAgC,EAChC,aAA4B,EACF,EAAE;IAC5B,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,KAAK,MAAM,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE;QACrF,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,YAAY,EAAE;YAChB,SAAS,IAAI,YAAY,CAAC,UAAU,CAAA;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAClE,IAAI,CAAC,WAAW;gBAAE,OAAO,0CAA0C,IAAI,EAAE,CAAA;YACzE,SAAS,IAAI,WAAW,CAAA;SACzB;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAhBY,QAAA,uBAAuB,2BAgBnC;AAED;;;GAGG;AACU,QAAA,mBAAmB,GAAG,CAAC,qBAAS,EAAE,eAAM,EAAE,WAAI,EAAE,mBAAQ,EAAE,iBAAO,CAAU,CAAA;AAExF;;;GAGG;AACU,QAAA,oBAAoB,GAAG,CAAC,kCAAe,EAAE,0BAAW,EAAE,0BAAQ,CAAU,CAAA;AAErF;;;GAGG;AACU,QAAA,WAAW,GAAG,CAAC,GAAG,4BAAoB,EAAE,GAAG,2BAAmB,CAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":";;;AAAA,oCAAkH;AAClH,oDAAgD;AAChD,uCAAmC;AACnC,yDAAoD;AACpD,iDAA4C;AAC5C,uDAA4C;AAC5C,2CAAuC;AACvC,iCAA6B;AAC7B,yCAAqC;AACrC,uCAAmC;AAEnC;;GAEG;AACI,MAAM,aAAa,GAAG,KAAK,EAChC,cAA8B,EAC9B,GAAG,WAAyB,EACC,EAAE;IAC/B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;QAC1D,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAA;KAClC;IACD,OAAO,UAAE,CAAA;AACX,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB;AAED;;;GAGG;AACU,QAAA,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;AAErH;;;GAGG;AACU,QAAA,kCAAkC,GAAG,aAAa,CAAA;AAE/D;;GAEG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAgC,EAChC,aAA4B,EACF,EAAE;IAC5B,IAAI,SAAS,GAAG,CAAC,CAAA;IACjB,KAAK,MAAM,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE;QACrF,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,YAAY,EAAE;YAChB,SAAS,IAAI,YAAY,CAAC,UAAU,CAAA;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAClE,IAAI,CAAC,WAAW;gBAAE,OAAO,0CAA0C,IAAI,EAAE,CAAA;YACzE,SAAS,IAAI,WAAW,CAAA;SACzB;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAhBY,QAAA,uBAAuB,2BAgBnC;AAED;;;GAGG;AACU,QAAA,mBAAmB,GAAG,CAAC,qBAAS,EAAE,eAAM,EAAE,WAAI,EAAE,mBAAQ,EAAE,iBAAO,EAAE,iBAAO,CAAU,CAAA;AAEjG;;;GAGG;AACU,QAAA,oBAAoB,GAAG,CAAC,kCAAe,EAAE,0BAAW,EAAE,0BAAQ,CAAU,CAAA;AAErF;;;GAGG;AACU,QAAA,WAAW,GAAG,CAAC,GAAG,4BAAoB,EAAE,GAAG,2BAAmB,CAAU,CAAA"}

package/dist/validations/profile.d.ts

@@ -0,0 +1,8 @@
+import { Validation } from '../types';
+export declare const faceThumbnail: Validation;
+/**
+ * Validate that given profile deployment includes the face256 file with the correct size
+ * * @public
+ */
+export declare const profile: Validation;
+//# sourceMappingURL=profile.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAM,UAAU,EAAwC,MAAM,UAAU,CAAA;AAM/E,eAAO,MAAM,aAAa,EAAE,UAwB3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,UAQrB,CAAA"}

package/dist/validations/profile.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.profile = exports.faceThumbnail = void 0;
+const dcl_catalyst_commons_1 = require("dcl-catalyst-commons");
+const sharp_1 = __importDefault(require("sharp"));
+const _1 = require(".");
+const types_1 = require("../types");
+/** Validate that given profile deployment includes a face256 thumbnail with valid size */
+const defaultThumbnailSize = 256;
+const faceThumbnailFileName = 'face256.png';
+exports.faceThumbnail = {
+    validate: async ({ deployment }) => {
+        if (deployment.entity.timestamp < _1.ADR_45_TIMESTAMP)
+            return types_1.OK;
+        const hash = deployment.entity.content?.find(({ file }) => file === faceThumbnailFileName)?.hash;
+        if (!hash)
+            return (0, types_1.validationFailed)(`Couldn't find hash for face256 thumbnail file with name: ${faceThumbnailFileName}`);
+        const errors = [];
+        // check size
+        const thumbnailBuffer = deployment.files.get(hash);
+        if (!thumbnailBuffer)
+            return (0, types_1.validationFailed)(`Couldn't find thumbnail file with hash: ${hash}`);
+        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 ${faceThumbnailFileName}`);
+            }
+            else if (width !== defaultThumbnailSize || height !== defaultThumbnailSize) {
+                errors.push(`Invalid face256 thumbnail image size (width = ${width} / height = ${height})`);
+            }
+        }
+        catch (e) {
+            errors.push(`Couldn't parse face256 thumbnail, please check image format.`);
+        }
+        return errors.length > 0 ? (0, types_1.validationFailed)(...errors) : types_1.OK;
+    },
+};
+/**
+ * Validate that given profile deployment includes the face256 file with the correct size
+ * * @public
+ */
+exports.profile = {
+    validate: async (args) => {
+        if (args.deployment.entity.type !== dcl_catalyst_commons_1.EntityType.PROFILE)
+            return types_1.OK;
+        const response = await exports.faceThumbnail.validate(args);
+        if (!response.ok)
+            return response;
+        return types_1.OK;
+    },
+};
+//# sourceMappingURL=profile.js.map

package/dist/validations/profile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiD;AACjD,kDAAyB;AACzB,wBAAoC;AACpC,oCAA+E;AAG/E,0FAA0F;AAC1F,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAChC,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAC9B,QAAA,aAAa,GAAe;IACvC,QAAQ,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;QACjC,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,GAAG,mBAAgB;YAAE,OAAO,UAAE,CAAA;QAE7D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,qBAAqB,CAAC,EAAE,IAAI,CAAA;QAChG,IAAI,CAAC,IAAI;YAAE,OAAO,IAAA,wBAAgB,EAAC,4DAA4D,qBAAqB,EAAE,CAAC,CAAA;QAEvH,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,aAAa;QACb,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAClD,IAAI,CAAC,eAAe;YAAE,OAAO,IAAA,wBAAgB,EAAC,2CAA2C,IAAI,EAAE,CAAC,CAAA;QAChG,IAAI;YACF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;YACzE,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,KAAK;gBAAE,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAA;YAC/G,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,6CAA6C,qBAAqB,EAAE,CAAC,CAAA;aAClF;iBAAM,IAAI,KAAK,KAAK,oBAAoB,IAAI,MAAM,KAAK,oBAAoB,EAAE;gBAC5E,MAAM,CAAC,IAAI,CAAC,iDAAiD,KAAK,eAAe,MAAM,GAAG,CAAC,CAAA;aAC5F;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAA;SAC5E;QACD,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAgB,EAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,UAAE,CAAA;IAC7D,CAAC;CACF,CAAA;AAED;;;GAGG;AACU,QAAA,OAAO,GAAe;IACjC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,iCAAU,CAAC,OAAO;YAAE,OAAO,UAAE,CAAA;QACjE,MAAM,QAAQ,GAAuB,MAAM,qBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEvE,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAA;QACjC,OAAO,UAAE,CAAA;IACX,CAAC;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/content-validator",
-  "version": "1.0.1-20220128144241.commit-9e37746",
+  "version": "1.0.2-20220207171651.commit-57ffa8d",
   "description": "Catalyst content validations",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,12 +37,12 @@
     "@dcl/urn-resolver": "^1.3.0",
     "@ethersproject/address": "^5.5.0",
     "@well-known-components/interfaces": "1.1.1",
-    "dcl-catalyst-commons": "7.2.2",
+    "dcl-catalyst-commons": "7.3.0",
     "ms": "^2.1.3",
     "sharp": "^0.29.3"
   },
   "files": [
     "dist"
   ],
-  "commit": "9e37746ed16e2839e8f714a2d5b8291afdc36d8c"
+  "commit": "57ffa8dbc0e4b6e6aef409c0cb429633cc4608f2"
 }