@strapi/strapi 4.6.0-beta.2 → 4.6.1

package/lib/commands/transfer/transfer.js

@@ -15,6 +15,7 @@ const {
   buildTransferTable,
   createStrapiInstance,
   DEFAULT_IGNORED_CONTENT_TYPES,
+  formatDiagnostic,
 } = require('./utils');
 
 const logger = console;
@@ -109,6 +110,8 @@ module.exports = async (opts) => {
     },
   });
 
+  engine.diagnostics.onDiagnostic(formatDiagnostic('transfer'));
+
   try {
     logger.log(`Starting transfer...`);
 
@@ -120,8 +123,7 @@ module.exports = async (opts) => {
     logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
     process.exit(0);
   } catch (e) {
-    logger.error('Transfer process failed unexpectedly');
-    logger.error(e);
+    logger.error('Transfer process failed.');
     process.exit(1);
   }
 };

package/lib/commands/transfer/utils.js

@@ -4,6 +4,11 @@ const chalk = require('chalk');
 const Table = require('cli-table3');
 const { Option } = require('commander');
 const { TransferGroupPresets } = require('@strapi/data-transfer/lib/engine');
+
+const {
+  configs: { createOutputFileConfiguration },
+  createLogger,
+} = require('@strapi/logger');
 const { readableBytes, exitWith } = require('../utils/helpers');
 const strapi = require('../../index');
 const { getParseListWithChoices } = require('../utils/commander');
@@ -77,29 +82,34 @@ const DEFAULT_IGNORED_CONTENT_TYPES = [
   'admin::role',
   'admin::api-token',
   'admin::api-token-permission',
+  'admin::audit-log',
 ];
 
 const createStrapiInstance = async (logLevel = 'error') => {
-  const appContext = await strapi.compile();
-  const app = strapi(appContext);
-
-  app.log.level = logLevel;
-
-  return app.load();
+  try {
+    const appContext = await strapi.compile();
+    const app = strapi(appContext);
+
+    app.log.level = logLevel;
+    return await app.load();
+  } catch (err) {
+    if (err.code === 'ECONNREFUSED') {
+      throw new Error('Process failed. Check the database connection with your Strapi project.');
+    }
+    throw err;
+  }
 };
 
 const transferDataTypes = Object.keys(TransferGroupPresets);
 
 const excludeOption = new Option(
   '--exclude <comma-separated data types>',
-  `Exclude this data. Options used here override --only. Available types: ${transferDataTypes.join(
-    ','
-  )}`
+  `Exclude data using comma-separated types. Available types: ${transferDataTypes.join(',')}`
 ).argParser(getParseListWithChoices(transferDataTypes, 'Invalid options for "exclude"'));
 
 const onlyOption = new Option(
   '--only <command-separated data types>',
-  `Include only this data (plus schemas). Available types: ${transferDataTypes.join(',')}`
+  `Include only these types of data (plus schemas). Available types: ${transferDataTypes.join(',')}`
 ).argParser(getParseListWithChoices(transferDataTypes, 'Invalid options for "only"'));
 
 const validateExcludeOnly = (command) => {
@@ -121,6 +131,44 @@ const validateExcludeOnly = (command) => {
   }
 };
 
+const errorColors = {
+  fatal: chalk.red,
+  error: chalk.red,
+  silly: chalk.yellow,
+};
+
+const formatDiagnostic =
+  (operation) =>
+  ({ details, kind }) => {
+    const logger = createLogger(
+      createOutputFileConfiguration(`${operation}_error_log_${Date.now()}.log`)
+    );
+    try {
+      if (kind === 'error') {
+        const { message, severity = 'fatal' } = details;
+
+        const colorizeError = errorColors[severity];
+        const errorMessage = colorizeError(`[${severity.toUpperCase()}] ${message}`);
+
+        logger.error(errorMessage);
+      }
+      if (kind === 'info') {
+        const { message, params } = details;
+
+        const msg = `${message}\n${params ? JSON.stringify(params, null, 2) : ''}`;
+
+        logger.info(msg);
+      }
+      if (kind === 'warning') {
+        const { origin, message } = details;
+
+        logger.warn(`(${origin ?? 'transfer'}) ${message}`);
+      }
+    } catch (err) {
+      logger.error(err);
+    }
+  };
+
 module.exports = {
   buildTransferTable,
   getDefaultExportName,
@@ -129,4 +177,5 @@ module.exports = {
   excludeOption,
   onlyOption,
   validateExcludeOnly,
+  formatDiagnostic,
 };

package/lib/commands/utils/commander.js

@@ -122,7 +122,7 @@ const confirmMessage = (message) => {
 };
 
 const forceOption = new Option(
-  '-f, --force',
+  '--force',
   `Automatically answer "yes" to all prompts, including potentially destructive requests, and run non-interactively.`
 );
 

package/lib/core/loaders/plugins/index.js

@@ -85,7 +85,15 @@ const loadPlugins = async (strapi) => {
   for (const pluginName of Object.keys(enabledPlugins)) {
     const enabledPlugin = enabledPlugins[pluginName];
 
-    const serverEntrypointPath = join(enabledPlugin.pathToPlugin, 'strapi-server.js');
+    let serverEntrypointPath;
+
+    try {
+      serverEntrypointPath = join(enabledPlugin.pathToPlugin, 'strapi-server.js');
+    } catch (e) {
+      throw new Error(
+        `Error loading the plugin ${pluginName} because ${pluginName} is not installed. Please either install the plugin or remove it's configuration.`
+      );
+    }
 
     // only load plugins with a server entrypoint
     if (!(await fse.pathExists(serverEntrypointPath))) {

package/lib/services/entity-service/components.js

@@ -3,10 +3,12 @@
 const _ = require('lodash');
 const { has, prop, omit, toString, pipe, assign } = require('lodash/fp');
 
-const { contentTypes: contentTypesUtils } = require('@strapi/utils');
+const { contentTypes: contentTypesUtils, mapAsync } = require('@strapi/utils');
 const { ApplicationError } = require('@strapi/utils').errors;
 const { getComponentAttributes } = require('@strapi/utils').contentTypes;
 
+const isDialectMySQL = () => strapi.db.dialect.client === 'mysql';
+
 const omitComponentData = (contentType, data) => {
   const { attributes } = contentType;
   const componentAttributes = Object.keys(attributes).filter((attributeName) =>
@@ -43,8 +45,11 @@ const createComponents = async (uid, data) => {
           throw new Error('Expected an array to create repeatable component');
         }
 
-        const components = await Promise.all(
-          componentValue.map((value) => createComponent(componentUID, value))
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        const components = await mapAsync(
+          componentValue,
+          (value) => createComponent(componentUID, value),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
         );
 
         componentBody[attributeName] = components.map(({ id }) => {
@@ -77,17 +82,22 @@ const createComponents = async (uid, data) => {
         throw new Error('Expected an array to create repeatable component');
       }
 
-      componentBody[attributeName] = await Promise.all(
-        dynamiczoneValues.map(async (value) => {
-          const { id } = await createComponent(value.__component, value);
-          return {
-            id,
-            __component: value.__component,
-            __pivot: {
-              field: attributeName,
-            },
-          };
-        })
+      const createDynamicZoneComponents = async (value) => {
+        const { id } = await createComponent(value.__component, value);
+        return {
+          id,
+          __component: value.__component,
+          __pivot: {
+            field: attributeName,
+          },
+        };
+      };
+
+      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+      componentBody[attributeName] = await mapAsync(
+        dynamiczoneValues,
+        createDynamicZoneComponents,
+        { concurrency: isDialectMySQL() ? 1 : Infinity }
       );
 
       continue;
@@ -137,8 +147,11 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           throw new Error('Expected an array to create repeatable component');
         }
 
-        const components = await Promise.all(
-          componentValue.map((value) => updateOrCreateComponent(componentUID, value))
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        const components = await mapAsync(
+          componentValue,
+          (value) => updateOrCreateComponent(componentUID, value),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
         );
 
         componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
@@ -173,8 +186,10 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         throw new Error('Expected an array to create repeatable component');
       }
 
-      componentBody[attributeName] = await Promise.all(
-        dynamiczoneValues.map(async (value) => {
+      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+      componentBody[attributeName] = await mapAsync(
+        dynamiczoneValues,
+        async (value) => {
           const { id } = await updateOrCreateComponent(value.__component, value);
 
           return {
@@ -184,7 +199,8 @@ const updateComponents = async (uid, entityToUpdate, data) => {
               field: attributeName,
             },
           };
-        })
+        },
+        { concurrency: isDialectMySQL() ? 1 : Infinity }
       );
 
       continue;
@@ -287,13 +303,17 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
 
       if (attribute.type === 'component') {
         const { component: componentUID } = attribute;
-        await Promise.all(
-          _.castArray(value).map((subValue) => deleteComponent(componentUID, subValue))
-        );
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        await mapAsync(_.castArray(value), (subValue) => deleteComponent(componentUID, subValue), {
+          concurrency: isDialectMySQL() ? 1 : Infinity,
+        });
       } else {
         // delete dynamic zone components
-        await Promise.all(
-          _.castArray(value).map((subValue) => deleteComponent(subValue.__component, subValue))
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        await mapAsync(
+          _.castArray(value),
+          (subValue) => deleteComponent(subValue.__component, subValue),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
         );
       }
 

package/lib/services/entity-service/index.js

@@ -70,6 +70,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     eventHub.emit(event, {
       model: model.modelName,
+      uid: model.uid,
       entry: sanitizedEntity,
     });
   },

package/lib/services/metrics/index.js

@@ -5,12 +5,8 @@
  * You can learn more at https://docs.strapi.io/developer-docs/latest/getting-started/usage-information.html
  */
 
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
 const { scheduleJob } = require('node-schedule');
 
-const ee = require('../../utils/ee');
 const wrapWithRateLimit = require('./rate-limiter');
 const createSender = require('./sender');
 const createMiddleware = require('./middleware');
@@ -46,41 +42,14 @@ const createTelemetryInstance = (strapi) => {
         strapi.server.use(createMiddleware({ sendEvent }));
       }
     },
-    bootstrap() {
-      if (strapi.EE === true && ee.isEE === true) {
-        const pingDisabled =
-          isTruthy(process.env.STRAPI_LICENSE_PING_DISABLED) && ee.licenseInfo.type === 'gold';
 
-        const sendLicenseCheck = () => {
-          return sendEvent(
-            'didCheckLicense',
-            {
-              groupProperties: {
-                licenseInfo: {
-                  ...ee.licenseInfo,
-                  projectHash: hashProject(strapi),
-                  dependencyHash: hashDep(strapi),
-                },
-              },
-            },
-            {
-              headers: { 'x-strapi-project': 'enterprise' },
-            }
-          );
-        };
+    bootstrap() {},
 
-        if (!pingDisabled) {
-          const licenseCron = scheduleJob('0 0 0 * * 7', () => sendLicenseCheck());
-          crons.push(licenseCron);
-
-          sendLicenseCheck();
-        }
-      }
-    },
     destroy() {
-      // clear open handles
+      // Clear open handles
       crons.forEach((cron) => cron.cancel());
     },
+
     async send(event, payload) {
       if (isDisabled) return true;
       return sendEvent(event, payload);
@@ -88,24 +57,4 @@ const createTelemetryInstance = (strapi) => {
   };
 };
 
-const hash = (str) => crypto.createHash('sha256').update(str).digest('hex');
-
-const hashProject = (strapi) =>
-  hash(`${strapi.config.get('info.name')}${strapi.config.get('info.description')}`);
-
-const hashDep = (strapi) => {
-  const depStr = JSON.stringify(strapi.config.info.dependencies);
-  const readmePath = path.join(strapi.dirs.app.root, 'README.md');
-
-  try {
-    if (fs.existsSync(readmePath)) {
-      return hash(`${depStr}${fs.readFileSync(readmePath)}`);
-    }
-  } catch (err) {
-    return hash(`${depStr}`);
-  }
-
-  return hash(`${depStr}`);
-};
-
 module.exports = createTelemetryInstance;

package/lib/services/metrics/sender.js

@@ -3,12 +3,12 @@
 const os = require('os');
 const path = require('path');
 const _ = require('lodash');
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
 const isDocker = require('is-docker');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
 const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const { env } = require('@strapi/utils');
-const ee = require('../../utils/ee');
 const machineID = require('../../utils/machine-id');
 const { generateAdminUserHash } = require('./admin-user-hash');
 
@@ -37,11 +37,18 @@ const addPackageJsonStrapiMetadata = (metadata, strapi) => {
 module.exports = (strapi) => {
   const { uuid } = strapi.config;
   const deviceId = machineID();
-  const isEE = strapi.EE === true && ee.isEE === true;
 
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
+  const getNumberOfDynamicZones = () => {
+    return pipe(
+      map('attributes'),
+      flatMap(values),
+      sumBy(propEq('type', 'dynamiczone'))
+    )(strapi.contentTypes);
+  };
+
   const anonymousUserProperties = {
     environment: strapi.config.environment,
     os: os.type(),
@@ -55,11 +62,13 @@ module.exports = (strapi) => {
     docker: process.env.DOCKER || isDocker(),
     isCI: ciEnv.isCI,
     version: strapi.config.get('info.strapi'),
-    projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
     projectId: uuid,
     isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
+    numberOfAllContentTypes: _.size(strapi.contentTypes), // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
+    numberOfComponents: _.size(strapi.components),
+    numberOfDynamicZones: getNumberOfDynamicZones(),
   };
 
   addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
@@ -77,6 +86,7 @@ module.exports = (strapi) => {
         userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},
         groupProperties: {
           ...anonymousGroupProperties,
+          projectType: strapi.EE ? 'Enterprise' : 'Community',
           ...payload.groupProperties,
         },
       }),

package/lib/types/core/attributes/common.d.ts

@@ -30,7 +30,10 @@ export type ConfigurableAttribute = { configurable: true };
 export type NonConfigurableAttribute = { configurable: false };
 
 // custom field
-export type CustomField<T extends string, P extends object = undefined> = { customField: T, options?: P };
+export type CustomField<T extends string, P extends object = undefined> = {
+  customField: T;
+  options?: P;
+};
 
 // min/max
 export type SetMinMax<T extends MinMaxOption<U>, U = number> = T;

package/lib/utils/cron.js

@@ -0,0 +1,56 @@
+'use strict';
+
+const { isEmpty, negate } = require('lodash/fp');
+
+const INTEGER_REGEX = /^\d+$/;
+const STEP_REGEX = /^\*\/\d+$/;
+const COMPONENTS = [
+  { limit: 60, zeroBasedIndices: true, functionName: 'getSeconds' },
+  { limit: 60, zeroBasedIndices: true, functionName: 'getMinutes' },
+  { limit: 24, zeroBasedIndices: true, functionName: 'getHours' },
+  { limit: 31, zeroBasedIndices: false, functionName: 'getDate' },
+  { limit: 12, zeroBasedIndices: false, functionName: 'getMonth' },
+  { limit: 7, zeroBasedIndices: true, functionName: 'getDay' },
+];
+
+const shift = (component, index, date) => {
+  if (component === '*') {
+    return '*';
+  }
+
+  const { limit, zeroBasedIndices, functionName } = COMPONENTS[index];
+  const offset = +!zeroBasedIndices;
+  const currentValue = date[functionName]();
+
+  if (INTEGER_REGEX.test(component)) {
+    return ((Number.parseInt(component, 10) + currentValue) % limit) + offset;
+  }
+
+  if (STEP_REGEX.test(component)) {
+    const [, step] = component.split('/');
+    const frequency = Math.floor(limit / step);
+    const list = Array.from({ length: frequency }, (_, index) => index * step);
+    return list.map((value) => ((value + currentValue) % limit) + offset).sort((a, b) => a - b);
+  }
+
+  // Unsupported syntax
+  return component;
+};
+
+/**
+ * Simulate an interval by shifting a cron expression using the specified date.
+ * @param {string} rule A cron expression you want to shift.
+ * @param {Date} date The date that's gonna be used as the start of the "interval", it defaults to now.
+ * @returns The shifted cron expression.
+ */
+const shiftCronExpression = (rule, date = new Date()) => {
+  const components = rule.trim().split(' ').filter(negate(isEmpty));
+  const secondsIncluded = components.length === 6;
+  return components
+    .map((component, index) => shift(component, secondsIncluded ? index : index + 1, date))
+    .join(' ');
+};
+
+module.exports = {
+  shiftCronExpression,
+};

package/lib/utils/ee.js

@@ -1,123 +1,3 @@
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
-const _ = require('lodash');
-
-const publicKey = fs.readFileSync(path.join(__dirname, '../utils/resources/key.pub'));
-
-const noop = () => {};
-
-const noLog = {
-  warn: noop,
-  info: noop,
-};
-
-const internals = {};
-const features = {
-  bronze: [],
-  silver: [],
-  gold: ['sso', 'audit-logs'],
-};
-
-module.exports = ({ dir, logger = noLog }) => {
-  if (_.has(internals, 'isEE')) return internals.isEE;
-
-  const warnAndReturn = (msg = 'Invalid license. Starting in CE.') => {
-    logger.warn(msg);
-    internals.isEE = false;
-    return false;
-  };
-
-  if (process.env.STRAPI_DISABLE_EE === 'true') {
-    internals.isEE = false;
-    return false;
-  }
-
-  const licensePath = path.join(dir, 'license.txt');
-
-  let license;
-  if (_.has(process.env, 'STRAPI_LICENSE')) {
-    license = process.env.STRAPI_LICENSE;
-  } else if (fs.existsSync(licensePath)) {
-    license = fs.readFileSync(licensePath).toString();
-  }
-
-  if (_.isNil(license)) {
-    internals.isEE = false;
-    return false;
-  }
-
-  try {
-    const plainLicense = Buffer.from(license, 'base64').toString();
-    const [signatureb64, contentb64] = plainLicense.split('\n');
-
-    const signature = Buffer.from(signatureb64, 'base64');
-    const content = Buffer.from(contentb64, 'base64').toString();
-
-    const verifier = crypto.createVerify('RSA-SHA256');
-    verifier.update(content);
-    verifier.end();
-
-    const isValid = verifier.verify(publicKey, signature);
-    if (!isValid) return warnAndReturn();
-
-    internals.licenseInfo = JSON.parse(content);
-
-    const expirationTime = new Date(internals.licenseInfo.expireAt).getTime();
-    if (expirationTime < new Date().getTime()) {
-      return warnAndReturn('License expired. Starting in CE');
-    }
-  } catch (err) {
-    return warnAndReturn();
-  }
-
-  internals.isEE = true;
-  return true;
-};
-
-Object.defineProperty(module.exports, 'licenseInfo', {
-  get() {
-    mustHaveKey('licenseInfo');
-    return internals.licenseInfo;
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-Object.defineProperty(module.exports, 'isEE', {
-  get() {
-    mustHaveKey('isEE');
-    return internals.isEE;
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-Object.defineProperty(module.exports, 'features', {
-  get() {
-    mustHaveKey('licenseInfo');
-
-    const { type: licenseType } = module.exports.licenseInfo;
-
-    return {
-      isEnabled(feature) {
-        return features[licenseType].includes(feature);
-      },
-      getEnabled() {
-        return features[licenseType];
-      },
-    };
-  },
-  configurable: false,
-  enumerable: false,
-});
-
-const mustHaveKey = (key) => {
-  if (!_.has(internals, key)) {
-    const err = new Error('Tampering with license');
-    // err.stack = null;
-    throw err;
-  }
-};
+module.exports = require('../../ee');

package/lib/utils/startup-logger.js

@@ -4,7 +4,6 @@ const chalk = require('chalk');
 const CLITable = require('cli-table3');
 const _ = require('lodash/fp');
 const { getAbsoluteAdminUrl, getAbsoluteServerUrl } = require('@strapi/utils');
-const ee = require('./ee');
 
 module.exports = (app) => {
   return {
@@ -19,15 +18,14 @@ module.exports = (app) => {
         chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
       });
 
-      const isEE = app.EE === true && ee.isEE === true;
-
       infoTable.push(
         [chalk.blue('Time'), `${new Date()}`],
         [chalk.blue('Launched in'), `${Date.now() - app.config.launchedAt} ms`],
         [chalk.blue('Environment'), app.config.environment],
         [chalk.blue('Process PID'), process.pid],
         [chalk.blue('Version'), `${app.config.info.strapi} (node ${process.version})`],
-        [chalk.blue('Edition'), isEE ? 'Enterprise' : 'Community']
+        [chalk.blue('Edition'), app.EE ? 'Enterprise' : 'Community'],
+        [chalk.blue('Database'), app.db.dialect.client]
       );
 
       console.log(infoTable.toString());