@strapi/strapi 4.5.4 → 4.6.0-alpha.1

package/lib/Strapi.js

@@ -225,7 +225,7 @@ class Strapi {
 
     await this.runLifecyclesFunctions(LIFECYCLES.DESTROY);
 
-    this.eventHub.removeAllListeners();
+    this.eventHub.destroy();
 
     if (_.has(this, 'db')) {
       await this.db.destroy();
@@ -242,14 +242,11 @@ class Strapi {
   sendStartupTelemetry() {
     // Emit started event.
     // do not await to avoid slower startup
-    // This event is anonymous
     this.telemetry.send('didStartServer', {
-      groupProperties: {
-        database: strapi.config.get('database.connection.client'),
-        plugins: Object.keys(strapi.plugins),
-        // TODO: to add back
-        // providers: this.config.installedProviders,
-      },
+      database: strapi.config.get('database.connection.client'),
+      plugins: Object.keys(strapi.plugins),
+      // TODO: to add back
+      // providers: this.config.installedProviders,
     });
   }
 

package/lib/commands/opt-in-telemetry.js

@@ -53,12 +53,12 @@ const generateNewPackageJSON = (packageObj) => {
 
 const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/api/v2/track', {
+    await fetch('https://analytics.strapi.io/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptInTelemetry',
+        uuid,
         deviceId: machineID(),
-        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });

package/lib/commands/opt-out-telemetry.js

@@ -28,12 +28,12 @@ const writePackageJSON = async (path, file, spacing) => {
 
 const sendEvent = async (uuid) => {
   try {
-    await fetch('https://analytics.strapi.io/api/v2/track', {
+    await fetch('https://analytics.strapi.io/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didOptOutTelemetry',
+        uuid,
         deviceId: machineID(),
-        groupProperties: { projectId: uuid },
       }),
       headers: { 'Content-Type': 'application/json' },
     });

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

@@ -293,48 +293,40 @@ const buildRelationsStore = ({ uid, data }) => {
         break;
       }
       case 'component': {
-        return castArray(value).reduce((relationsStore, componentValue) => {
-          if (!attribute.component) {
-            throw new ValidationError(
-              `Cannot build relations store from component, component identifier is undefined`
-            );
-          }
-
-          return mergeWith(
-            relationsStore,
-            buildRelationsStore({
-              uid: attribute.component,
-              data: componentValue,
-            }),
-            (objValue, srcValue) => {
-              if (isArray(objValue)) {
-                return objValue.concat(srcValue);
+        return castArray(value).reduce(
+          (relationsStore, componentValue) =>
+            mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: attribute.component,
+                data: componentValue,
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
               }
-            }
-          );
-        }, result);
+            ),
+          result
+        );
       }
       case 'dynamiczone': {
-        return value.reduce((relationsStore, dzValue) => {
-          if (!dzValue.__component) {
-            throw new ValidationError(
-              `Cannot build relations store from dynamiczone, component identifier is undefined`
-            );
-          }
-
-          return mergeWith(
-            relationsStore,
-            buildRelationsStore({
-              uid: dzValue.__component,
-              data: dzValue,
-            }),
-            (objValue, srcValue) => {
-              if (isArray(objValue)) {
-                return objValue.concat(srcValue);
+        return value.reduce(
+          (relationsStore, dzValue) =>
+            mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: dzValue.__component,
+                data: dzValue,
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
               }
-            }
-          );
-        }, result);
+            ),
+          result
+        );
       }
       default:
         break;

package/lib/services/event-hub.js

@@ -1,16 +1,78 @@
+'use strict';
+
 /**
  * The event hub is Strapi's event control center.
  */
+module.exports = function createEventHub() {
+  const listeners = new Map();
 
-'use strict';
+  // Default subscriber to easily add listeners with the on() method
+  const defaultSubscriber = async (eventName, ...args) => {
+    if (listeners.has(eventName)) {
+      for (const listener of listeners.get(eventName)) {
+        await listener(...args);
+      }
+    }
+  };
 
-const EventEmitter = require('events');
+  // Store of subscribers that will be called when an event is emitted
+  const subscribers = [defaultSubscriber];
 
-class EventHub extends EventEmitter {}
+  const eventHub = {
+    async emit(eventName, ...args) {
+      for (const subscriber of subscribers) {
+        await subscriber(eventName, ...args);
+      }
+    },
 
-/**
- * Expose a factory function instead of the class
- */
-module.exports = function createEventHub(opts) {
-  return new EventHub(opts);
+    subscribe(subscriber) {
+      subscribers.push(subscriber);
+
+      // Return a function to remove the subscriber
+      return () => {
+        eventHub.unsubscribe(subscriber);
+      };
+    },
+
+    unsubscribe(subscriber) {
+      subscribers.splice(subscribers.indexOf(subscriber), 1);
+    },
+
+    on(eventName, listener) {
+      if (!listeners.has(eventName)) {
+        listeners.set(eventName, []);
+      }
+
+      listeners.get(eventName).push(listener);
+
+      // Return a function to remove the listener
+      return () => {
+        eventHub.off(eventName, listener);
+      };
+    },
+
+    off(eventName, listener) {
+      listeners.get(eventName).splice(listeners.get(eventName).indexOf(listener), 1);
+    },
+
+    once(eventName, listener) {
+      return eventHub.on(eventName, async (...args) => {
+        eventHub.off(eventName, listener);
+        return listener(...args);
+      });
+    },
+
+    destroy() {
+      listeners.clear();
+      subscribers.length = 0;
+      return this;
+    },
+  };
+
+  return {
+    ...eventHub,
+    removeListener: eventHub.off,
+    removeAllListeners: eventHub.destroy,
+    addListener: eventHub.on,
+  };
 };

package/lib/services/metrics/index.js

@@ -55,12 +55,10 @@ const createTelemetryInstance = (strapi) => {
           return sendEvent(
             'didCheckLicense',
             {
-              groupProperties: {
-                licenseInfo: {
-                  ...ee.licenseInfo,
-                  projectHash: hashProject(strapi),
-                  dependencyHash: hashDep(strapi),
-                },
+              licenseInfo: {
+                ...ee.licenseInfo,
+                projectHash: hashProject(strapi),
+                dependencyHash: hashDep(strapi),
               },
             },
             {

package/lib/services/metrics/middleware.js

@@ -19,7 +19,7 @@ const createMiddleware = ({ sendEvent }) => {
 
       // Send max. 1000 events per day.
       if (_state.counter < 1000) {
-        sendEvent('didReceiveRequest', { eventProperties: { url: ctx.request.url } });
+        sendEvent('didReceiveRequest', { url: ctx.request.url });
 
         // Increase counter.
         _state.counter += 1;

package/lib/services/metrics/sender.js

@@ -10,7 +10,7 @@ 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');
+const stringifyDeep = require('./stringify-deep');
 
 const defaultQueryOpts = {
   timeout: 1000,
@@ -42,49 +42,41 @@ module.exports = (strapi) => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const anonymousUserProperties = {
+  const anonymousMetadata = {
     environment: strapi.config.environment,
     os: os.type(),
     osPlatform: os.platform(),
     osArch: os.arch(),
     osRelease: os.release(),
     nodeVersion: process.versions.node,
-  };
-
-  const anonymousGroupProperties = {
     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',
   };
 
-  addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
+  addPackageJsonStrapiMetadata(anonymousMetadata, strapi);
 
   return async (event, payload = {}, opts = {}) => {
-    const userId = generateAdminUserHash();
-
     const reqParams = {
       method: 'POST',
       body: JSON.stringify({
         event,
-        userId,
+        uuid,
         deviceId,
-        eventProperties: payload.eventProperties,
-        userProperties: userId ? { ...anonymousUserProperties, ...payload.userProperties } : {},
-        groupProperties: {
-          ...anonymousGroupProperties,
-          ...payload.groupProperties,
-        },
+        properties: stringifyDeep({
+          ...payload,
+          ...anonymousMetadata,
+        }),
       }),
       ..._.merge({}, defaultQueryOpts, opts),
     };
 
     try {
-      const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
+      const res = await fetch(`${ANALYTICS_URI}/track`, reqParams);
       return res.ok;
     } catch (err) {
       return false;

package/lib/utils/success.js

@@ -17,7 +17,7 @@ try {
     process.env.npm_config_global === 'true' ||
     JSON.parse(process.env.npm_config_argv).original.includes('global')
   ) {
-    fetch('https://analytics.strapi.io/api/v2/track', {
+    fetch('https://analytics.strapi.io/track', {
       method: 'POST',
       body: JSON.stringify({
         event: 'didInstallStrapi',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.5.4",
+  "version": "4.6.0-alpha.1",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,18 +80,18 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.5.4",
-    "@strapi/database": "4.5.4",
-    "@strapi/generate-new": "4.5.4",
-    "@strapi/generators": "4.5.4",
-    "@strapi/logger": "4.5.4",
-    "@strapi/permissions": "4.5.4",
-    "@strapi/plugin-content-manager": "4.5.4",
-    "@strapi/plugin-content-type-builder": "4.5.4",
-    "@strapi/plugin-email": "4.5.4",
-    "@strapi/plugin-upload": "4.5.4",
-    "@strapi/typescript-utils": "4.5.4",
-    "@strapi/utils": "4.5.4",
+    "@strapi/admin": "4.6.0-alpha.1",
+    "@strapi/database": "4.6.0-alpha.1",
+    "@strapi/generate-new": "4.6.0-alpha.1",
+    "@strapi/generators": "4.6.0-alpha.1",
+    "@strapi/logger": "4.6.0-alpha.1",
+    "@strapi/permissions": "4.6.0-alpha.1",
+    "@strapi/plugin-content-manager": "4.6.0-alpha.1",
+    "@strapi/plugin-content-type-builder": "4.6.0-alpha.1",
+    "@strapi/plugin-email": "4.6.0-alpha.1",
+    "@strapi/plugin-upload": "4.6.0-alpha.1",
+    "@strapi/typescript-utils": "4.6.0-alpha.1",
+    "@strapi/utils": "4.6.0-alpha.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -100,7 +100,7 @@
     "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
-    "debug": "4.3.4",
+    "debug": "4.3.2",
     "delegates": "1.0.0",
     "dotenv": "10.0.0",
     "execa": "5.1.1",
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "8716ecc920130db5341b0904cf868c6e6b581a5d"
+  "gitHead": "9171c48104548f5f6da21abf2a8098009f1a40e9"
 }

package/lib/services/metrics/admin-user-hash.js

@@ -1,15 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-
-const generateAdminUserHash = () => {
-  const ctx = strapi?.requestContext?.get();
-  if (!ctx?.state?.user) {
-    return '';
-  }
-  return crypto.createHash('sha256').update(ctx.state.user.email).digest('hex');
-};
-
-module.exports = {
-  generateAdminUserHash,
-};