@webiny/telemetry 5.40.0-beta.2 → 5.40.0-beta.3

package/cli.js

@@ -1,29 +1,44 @@
-const createSendEvent = require("./sendEvent");
 const { globalConfig } = require("@webiny/global-config");
+const isCI = require("is-ci");
+const { WTS } = require("wts/src/node");
+const baseSendEvent = require("./sendEvent");
 
-const sendEvent = ({ event, user, version, properties, extraPayload }) => {
+const sendEvent = async ({ event, user, version, properties }) => {
     const shouldSend = isEnabled();
+    if (!shouldSend) {
+        return;
+    }
+
+    const wts = new WTS();
+
+    const wcpProperties = {};
+    const [wcpOrgId, wcpProjectId] = getWcpOrgProjectId();
+    if (wcpOrgId && wcpProjectId) {
+        wcpProperties.wcpOrgId = wcpOrgId;
+        wcpProperties.wcpProjectId = wcpProjectId;
+    }
 
-    try {
-        const sendTelemetry = createSendEvent({
-            event,
-            user: user || globalConfig.get("id"),
+    return baseSendEvent({
+        event,
+        user: user || globalConfig.get("id"),
+        properties: {
+            ...properties,
+            ...wcpProperties,
             version: version || require("./package.json").version,
-            properties,
-            extraPayload
-        });
-
-        if (shouldSend) {
-            return sendTelemetry();
-        }
-    } catch (err) {
-        // Ignore errors if telemetry is disabled.
-        if (!shouldSend) {
-            return;
-        }
-
-        throw err;
+            ci: isCI,
+            newUser: Boolean(globalConfig.get("newUser"))
+        },
+        wts
+    });
+};
+
+const getWcpOrgProjectId = () => {
+    // In CLI, WCP project ID is stored in the `WCP_PROJECT_ID` environment variable.
+    const id = process.env.WCP_PROJECT_ID;
+    if (typeof id === "string") {
+        return id.split("/");
     }
+    return [];
 };
 
 const enable = () => {

package/package.json

@@ -1,15 +1,17 @@
 {
 	"name": "@webiny/telemetry",
-	"version": "5.40.0-beta.2",
+	"version": "5.40.0-beta.3",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/global-config": "5.40.0-beta.2",
-		"form-data": "3.0.0",
-		"node-fetch": "2.6.1"
+		"@webiny/global-config": "5.40.0-beta.3",
+		"is-ci": "3.0.0",
+		"jsesc": "3.0.2",
+		"strip-ansi": "6.0.1",
+		"wts": "https://github.com/webiny/wts#51fd5a89a8d12b27def57ff99a71e071e9085e6c"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "."
 	},
-	"gitHead": "15e414a228687140ce2f30bd2f55763368e99827"
+	"gitHead": "638d8b84063906cd1aa979ed6e0487ad26fbcf2f"
 }

package/react.d.ts

@@ -1,2 +1 @@
-export declare function setProperties(data: Record<string, any>): void;
-export declare function sendEvent(ev: string, data?: Record<string, any>): Promise<any>;
+export declare function sendEvent(ev: string, properties?: Record<string, any>): Promise<any>;

package/react.js

@@ -1,36 +1,42 @@
-const createSendEvent = require("./sendEvent");
+const baseSendEvent = require("./sendEvent");
+const { WTS } = require("wts/src/admin");
 
-const setProperties = data => {
-    return sendEvent("$identify", data);
-};
-/**
- *
- * @param event {String}
- * @param data {Record<string, string>}
- * @return {Promise<T>}
- */
-const sendEvent = (event, data = {}) => {
-    let properties = {};
-    let extraPayload = {};
-    if (event !== "$identify") {
-        properties = data;
-    } else {
-        extraPayload = {
-            $set: data
-        };
+const sendEvent = async (event, properties = {}) => {
+    const shouldSend = process.env.REACT_APP_WEBINY_TELEMETRY !== "false";
+    if (!shouldSend) {
+        return;
     }
 
-    const shouldSend = process.env.REACT_APP_WEBINY_TELEMETRY !== "false";
+    const wts = new WTS();
 
-    const sendTelemetry = createSendEvent({
+    const wcpProperties = {};
+    const [wcpOrgId, wcpProjectId] = getWcpOrgProjectId();
+    if (wcpOrgId && wcpProjectId) {
+        wcpProperties.wcpOrgId = wcpOrgId;
+        wcpProperties.wcpProjectId = wcpProjectId;
+    }
+
+    return baseSendEvent({
         event,
-        properties,
-        extraPayload,
-        user: process.env.REACT_APP_USER_ID,
-        version: process.env.REACT_APP_WEBINY_VERSION
+        user: process.env.REACT_APP_WEBINY_TELEMETRY_USER_ID,
+        properties: {
+            ...properties,
+            ...wcpProperties,
+            version: process.env.REACT_APP_WEBINY_VERSION,
+            ci: process.env.REACT_APP_IS_CI === "true",
+            newUser: process.env.REACT_APP_WEBINY_TELEMETRY_NEW_USER === "true"
+        },
+        wts
     });
+};
 
-    return shouldSend ? sendTelemetry() : Promise.resolve();
+const getWcpOrgProjectId = () => {
+    // In React applications, WCP project ID is stored in the `REACT_APP_WCP_PROJECT_ID` environment variable.
+    const id = process.env.REACT_APP_WCP_PROJECT_ID;
+    if (typeof id === "string") {
+        return id.split("/");
+    }
+    return [];
 };
 
-module.exports = { setProperties, sendEvent };
+module.exports = { sendEvent };

package/sendEvent.js

@@ -1,56 +1,60 @@
-const FormData = require("form-data");
-const fetch = require("node-fetch");
-
-const API_KEY = "ZdDZgkeOt4Z_m-UWmqFsE1d6-kcCK3BH0ypYTUIFty4";
-const API_URL = "https://t.webiny.com";
-
+const stripAnsi = require("strip-ansi");
+const jsesc = require("jsesc");
 /**
  * The main `sendEvent` function.
  * NOTE: don't use this in your app directly. Instead, use the one from `cli.js` or `react.js` files accordingly.
  */
-module.exports = ({ event, user, version, properties, extraPayload } = {}) => {
+module.exports = ({ event, user, properties, wts } = {}) => {
+    // 1. Check for existence of required base parameters.
     if (!event) {
         throw new Error(`Cannot send event - missing "event" name.`);
     }
 
     if (!user) {
-        throw new Error(`Cannot send event - missing "user" property.`);
+        throw new Error(`Cannot send event - missing "user" ID.`);
+    }
+
+    if (!properties) {
+        throw new Error(`Cannot send event - missing "properties" object.`);
+    }
+
+    if (!wts) {
+        throw new Error(`Cannot send event - missing "wts" instance.`);
     }
 
-    if (!version) {
+    // 2. Extract properties and check for existence of required properties.
+    if (!properties.version) {
         throw new Error(`Cannot send event - missing "version" property.`);
     }
 
-    if (!properties) {
-        properties = {};
+    const hasCiProp = "ci" in properties;
+    if (!hasCiProp) {
+        throw new Error(`Cannot send event - missing "ci" boolean property.`);
     }
 
-    if (!extraPayload) {
-        extraPayload = {};
+    const hasNewUserProp = "newUser" in properties;
+    if (!hasNewUserProp) {
+        throw new Error(`Cannot send event - missing "newUser" boolean property.`);
     }
 
-    const payload = {
-        ...extraPayload,
-        event,
-        properties: {
-            ...properties,
-            version
-        },
-        distinct_id: user,
-        api_key: API_KEY,
-        timestamp: new Date().toISOString()
+    // 2. Sanitize properties.
+    const sanitizedProperties = {
+        ...properties,
+        newUser: properties.newUser === true ? "yes" : "no",
+        ci: properties.ci === true ? "yes" : "no"
     };
 
-    const body = new FormData();
-    body.append("data", Buffer.from(JSON.stringify(payload)).toString("base64"));
-
-    // Return a function which will send the prepared body when invoked.
-    return () => {
-        return fetch(API_URL + "/capture/", {
-            body,
-            method: "POST"
-        }).catch(() => {
-            // Ignore errors
-        });
-    };
+    for (const key in sanitizedProperties) {
+        let sanitizedValue = sanitizedProperties[key];
+        if (typeof sanitizedValue === "string") {
+            sanitizedValue = sanitizedValue.trim();
+            sanitizedValue = stripAnsi(sanitizedValue);
+            sanitizedValue = jsesc(sanitizedValue);
+        }
+
+        sanitizedProperties[key] = sanitizedValue;
+    }
+
+    // 3. Send.
+    return wts.trackEvent(user, event, sanitizedProperties);
 };