@upsnap/strapi 1.0.11 → 1.0.14

package/dist/admin/index.js

@@ -1,65 +1,4 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const React = require("react");
-const jsxRuntime = require("react/jsx-runtime");
-const icons = require("@strapi/icons");
-const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
-  const v = glob[path];
-  if (v) {
-    return typeof v === "function" ? v() : Promise.resolve(v);
-  }
-  return new Promise((_, reject) => {
-    (typeof queueMicrotask === "function" ? queueMicrotask : setTimeout)(
-      reject.bind(
-        null,
-        new Error(
-          "Unknown variable dynamic import: " + path + (path.split("/").length !== segs ? ". Note that variables only represent file names one level deep." : "")
-        )
-      )
-    );
-  });
-};
-const PLUGIN_ID = "upsnap";
-const Initializer = ({ setPlugin }) => {
-  const ref = React.useRef(setPlugin);
-  React.useEffect(() => {
-    ref.current(PLUGIN_ID);
-  }, []);
-  return null;
-};
-const PluginIcon = () => /* @__PURE__ */ jsxRuntime.jsx(icons.ChartCircle, {});
-const index = {
-  register(app) {
-    app.addMenuLink({
-      to: `plugins/${PLUGIN_ID}`,
-      icon: PluginIcon,
-      intlLabel: {
-        id: `${PLUGIN_ID}.plugin.name`,
-        defaultMessage: PLUGIN_ID.slice(0, 1).toUpperCase() + PLUGIN_ID.slice(1)
-      },
-      Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-CH5fBeNI.js"));
-        return App;
-      }
-    });
-    app.registerPlugin({
-      id: PLUGIN_ID,
-      initializer: Initializer,
-      isReady: false,
-      name: PLUGIN_ID
-    });
-  },
-  async registerTrads({ locales }) {
-    return Promise.all(
-      locales.map(async (locale) => {
-        try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-B4KWt_jN.js")) }), `./translations/${locale}.json`, 3);
-          return { data, locale };
-        } catch {
-          return { data: {}, locale };
-        }
-      })
-    );
-  }
-};
-exports.default = index;
+const index = require("./index-BWyzuEFm.js");
+exports.default = index.index;

package/dist/admin/index.mjs

@@ -1,65 +1,4 @@
-import { useRef, useEffect } from "react";
-import { jsx } from "react/jsx-runtime";
-import { ChartCircle } from "@strapi/icons";
-const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
-  const v = glob[path];
-  if (v) {
-    return typeof v === "function" ? v() : Promise.resolve(v);
-  }
-  return new Promise((_, reject) => {
-    (typeof queueMicrotask === "function" ? queueMicrotask : setTimeout)(
-      reject.bind(
-        null,
-        new Error(
-          "Unknown variable dynamic import: " + path + (path.split("/").length !== segs ? ". Note that variables only represent file names one level deep." : "")
-        )
-      )
-    );
-  });
-};
-const PLUGIN_ID = "upsnap";
-const Initializer = ({ setPlugin }) => {
-  const ref = useRef(setPlugin);
-  useEffect(() => {
-    ref.current(PLUGIN_ID);
-  }, []);
-  return null;
-};
-const PluginIcon = () => /* @__PURE__ */ jsx(ChartCircle, {});
-const index = {
-  register(app) {
-    app.addMenuLink({
-      to: `plugins/${PLUGIN_ID}`,
-      icon: PluginIcon,
-      intlLabel: {
-        id: `${PLUGIN_ID}.plugin.name`,
-        defaultMessage: PLUGIN_ID.slice(0, 1).toUpperCase() + PLUGIN_ID.slice(1)
-      },
-      Component: async () => {
-        const { App } = await import("./App-BIxhBt5_.mjs");
-        return App;
-      }
-    });
-    app.registerPlugin({
-      id: PLUGIN_ID,
-      initializer: Initializer,
-      isReady: false,
-      name: PLUGIN_ID
-    });
-  },
-  async registerTrads({ locales }) {
-    return Promise.all(
-      locales.map(async (locale) => {
-        try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-Byx4XI2L.mjs") }), `./translations/${locale}.json`, 3);
-          return { data, locale };
-        } catch {
-          return { data: {}, locale };
-        }
-      })
-    );
-  }
-};
+import { p } from "./index-Ct7siGlB.mjs";
 export {
-  index as default
+  p as default
 };

package/dist/server/index.js

@@ -1,8 +1,29 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const crypto = require("crypto");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const crypto__default = /* @__PURE__ */ _interopDefault(crypto);
+const bootstrap = async ({ strapi: strapi2 }) => {
+};
+const destroy = ({ strapi: strapi2 }) => {
+};
+const register = ({ strapi: strapi2 }) => {
+};
+const config = {
+  default: {},
+  validator() {
+  }
+};
+const contentTypes = {};
+const controller = ({ strapi: strapi2 }) => ({
+  index(ctx) {
+    ctx.body = strapi2.plugin("upsnap").service("service").getWelcomeMessage();
+  }
+});
 const BACKEND_URL = "https://api.upsnap.ai/v1";
+const IP_API_BASE_URL = "https://ipapi.co";
 const LIGHTHOUSE_CHECKS = ["performance", "accessibility", "bestPractices", "seo", "pwa"];
-const version = "1.0.11";
+const version = "1.0.14";
 const repository = { "type": "git", "url": "https://github.com/Appfoster/upsnap-strapi" };
 const keywords = [];
 const type = "commonjs";
@@ -77,7 +98,7 @@ const service = ({ strapi: strapi2 }) => ({
       headers: response.headers
     };
   },
-  async trackInstallation() {
+  async trackInstallation(userPayload) {
     try {
       const settings2 = await this.settingsStore.get();
       if (settings2?.installationTracked) {
@@ -86,25 +107,67 @@ const service = ({ strapi: strapi2 }) => ({
       const pluginVersion = packageJson.version;
       const strapiVersion = strapi2.config.get("info.strapi");
       const siteUrl = strapi2.config.get("server.url") || `http://${strapi2.config.get("server.host") || "localhost"}:${strapi2.config.get("server.port") || 1337}`;
+      const users = await strapi2.db.query("admin::user").findMany({
+        orderBy: { createdAt: "ASC" },
+        limit: 1
+      });
+      const firstUser = users?.[0];
+      const email = firstUser?.email || "";
+      const name2 = `${firstUser?.firstname || ""} ${firstUser?.lastname || ""}`.trim();
+      const phoneNumber = firstUser?.phoneNumber || firstUser?.phone || "";
+      const company = firstUser?.company || "";
+      const installId = settings2?.installId || crypto__default.default.randomUUID();
+      let finalDetails = {
+        version: pluginVersion,
+        site_url: siteUrl,
+        strapi_version: strapiVersion,
+        install_id: installId,
+        email,
+        name: name2,
+        phone_number: phoneNumber,
+        company
+      };
+      if (userPayload) {
+        finalDetails = { ...finalDetails, ...userPayload };
+      } else {
+        let ipAddress = "";
+        let country = "";
+        let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || "";
+        let browserOs = `Node.js ${process.version} / ${process.platform}`;
+        try {
+          const ipRes = await fetch(`${IP_API_BASE_URL}/json/`);
+          if (ipRes.ok) {
+            const ipData = await ipRes.json();
+            ipAddress = ipData.ip || "";
+            country = ipData.country_name || ipData.country || "";
+            if (ipData.timezone) timezone = ipData.timezone;
+          }
+        } catch (e) {
+        }
+        finalDetails = {
+          ...finalDetails,
+          ip_address: ipAddress,
+          country,
+          browser_os: browserOs,
+          timezone
+        };
+      }
       const response = await this.makeBackendRequest(
         "/installation-data",
         {
           method: "POST",
           body: JSON.stringify({
             platform: "strapi",
-            details: {
-              version: pluginVersion,
-              site_url: siteUrl,
-              strapi_version: strapiVersion
-            }
+            details: finalDetails
           })
         },
         true
       );
-      if (response?.status === "success") {
+      if (response?.status === "success" && !settings2?.installationTracked) {
         await this.settingsStore.set({
           value: {
-            ...settings2,
+            ...settings2 || {},
+            installId,
             installationTracked: true
           }
         });
@@ -114,24 +177,6 @@ const service = ({ strapi: strapi2 }) => ({
     }
   }
 });
-const bootstrap = async ({ strapi: strapi2 }) => {
-  await service({ strapi: strapi2 }).trackInstallation();
-};
-const destroy = ({ strapi: strapi2 }) => {
-};
-const register = ({ strapi: strapi2 }) => {
-};
-const config = {
-  default: {},
-  validator() {
-  }
-};
-const contentTypes = {};
-const controller = ({ strapi: strapi2 }) => ({
-  index(ctx) {
-    ctx.body = strapi2.plugin("upsnap").service("service").getWelcomeMessage();
-  }
-});
 const settings = ({ strapi: strapi2 }) => ({
   async get(ctx) {
     const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
@@ -177,6 +222,37 @@ const settings = ({ strapi: strapi2 }) => ({
   async getPrimaryMonitorId(ctx) {
     const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
     ctx.body = { primaryMonitorId: settings2?.primaryMonitorId };
+  },
+  async trackUserData(ctx) {
+    const { browser, os, language, screen, client_timezone } = ctx.request.body || {};
+    const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
+    if (settings2?.installationTracked) {
+      ctx.body = { ok: false, error: "Installation already tracked" };
+      return;
+    }
+    const ip = ctx.ip;
+    let country = "";
+    let ipAddress = ip;
+    try {
+      if (ip && ip !== "127.0.0.1" && ip !== "::1") {
+        const ipRes = await fetch(`${IP_API_BASE_URL}/${ip}/json/`);
+        if (ipRes.ok) {
+          const ipData = await ipRes.json();
+          country = ipData.country_name || ipData.country || "";
+        }
+      }
+    } catch (e) {
+    }
+    const userPayload = {
+      ip_address: ipAddress,
+      country,
+      browser_os: `${browser || ""} / ${os || ""}`,
+      timezone: client_timezone || "",
+      language: language || "",
+      screen: screen || ""
+    };
+    await service({ strapi: strapi2 }).trackInstallation(userPayload);
+    ctx.body = { ok: true };
   }
 });
 function getMixedContentMessage(meta) {
@@ -1178,6 +1254,15 @@ const routes = {
           auth: false
         }
       },
+      {
+        method: "POST",
+        path: "/track-user-data",
+        handler: "settings.trackUserData",
+        config: {
+          policies: [],
+          auth: false
+        }
+      },
       {
         method: "GET",
         path: "/monitor/:id",

package/dist/server/index.mjs

@@ -1,6 +1,25 @@
+import crypto from "crypto";
+const bootstrap = async ({ strapi: strapi2 }) => {
+};
+const destroy = ({ strapi: strapi2 }) => {
+};
+const register = ({ strapi: strapi2 }) => {
+};
+const config = {
+  default: {},
+  validator() {
+  }
+};
+const contentTypes = {};
+const controller = ({ strapi: strapi2 }) => ({
+  index(ctx) {
+    ctx.body = strapi2.plugin("upsnap").service("service").getWelcomeMessage();
+  }
+});
 const BACKEND_URL = "https://api.upsnap.ai/v1";
+const IP_API_BASE_URL = "https://ipapi.co";
 const LIGHTHOUSE_CHECKS = ["performance", "accessibility", "bestPractices", "seo", "pwa"];
-const version = "1.0.11";
+const version = "1.0.14";
 const repository = { "type": "git", "url": "https://github.com/Appfoster/upsnap-strapi" };
 const keywords = [];
 const type = "commonjs";
@@ -75,7 +94,7 @@ const service = ({ strapi: strapi2 }) => ({
       headers: response.headers
     };
   },
-  async trackInstallation() {
+  async trackInstallation(userPayload) {
     try {
       const settings2 = await this.settingsStore.get();
       if (settings2?.installationTracked) {
@@ -84,25 +103,67 @@ const service = ({ strapi: strapi2 }) => ({
       const pluginVersion = packageJson.version;
       const strapiVersion = strapi2.config.get("info.strapi");
       const siteUrl = strapi2.config.get("server.url") || `http://${strapi2.config.get("server.host") || "localhost"}:${strapi2.config.get("server.port") || 1337}`;
+      const users = await strapi2.db.query("admin::user").findMany({
+        orderBy: { createdAt: "ASC" },
+        limit: 1
+      });
+      const firstUser = users?.[0];
+      const email = firstUser?.email || "";
+      const name2 = `${firstUser?.firstname || ""} ${firstUser?.lastname || ""}`.trim();
+      const phoneNumber = firstUser?.phoneNumber || firstUser?.phone || "";
+      const company = firstUser?.company || "";
+      const installId = settings2?.installId || crypto.randomUUID();
+      let finalDetails = {
+        version: pluginVersion,
+        site_url: siteUrl,
+        strapi_version: strapiVersion,
+        install_id: installId,
+        email,
+        name: name2,
+        phone_number: phoneNumber,
+        company
+      };
+      if (userPayload) {
+        finalDetails = { ...finalDetails, ...userPayload };
+      } else {
+        let ipAddress = "";
+        let country = "";
+        let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || "";
+        let browserOs = `Node.js ${process.version} / ${process.platform}`;
+        try {
+          const ipRes = await fetch(`${IP_API_BASE_URL}/json/`);
+          if (ipRes.ok) {
+            const ipData = await ipRes.json();
+            ipAddress = ipData.ip || "";
+            country = ipData.country_name || ipData.country || "";
+            if (ipData.timezone) timezone = ipData.timezone;
+          }
+        } catch (e) {
+        }
+        finalDetails = {
+          ...finalDetails,
+          ip_address: ipAddress,
+          country,
+          browser_os: browserOs,
+          timezone
+        };
+      }
       const response = await this.makeBackendRequest(
         "/installation-data",
         {
           method: "POST",
           body: JSON.stringify({
             platform: "strapi",
-            details: {
-              version: pluginVersion,
-              site_url: siteUrl,
-              strapi_version: strapiVersion
-            }
+            details: finalDetails
           })
         },
         true
       );
-      if (response?.status === "success") {
+      if (response?.status === "success" && !settings2?.installationTracked) {
         await this.settingsStore.set({
           value: {
-            ...settings2,
+            ...settings2 || {},
+            installId,
             installationTracked: true
           }
         });
@@ -112,24 +173,6 @@ const service = ({ strapi: strapi2 }) => ({
     }
   }
 });
-const bootstrap = async ({ strapi: strapi2 }) => {
-  await service({ strapi: strapi2 }).trackInstallation();
-};
-const destroy = ({ strapi: strapi2 }) => {
-};
-const register = ({ strapi: strapi2 }) => {
-};
-const config = {
-  default: {},
-  validator() {
-  }
-};
-const contentTypes = {};
-const controller = ({ strapi: strapi2 }) => ({
-  index(ctx) {
-    ctx.body = strapi2.plugin("upsnap").service("service").getWelcomeMessage();
-  }
-});
 const settings = ({ strapi: strapi2 }) => ({
   async get(ctx) {
     const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
@@ -175,6 +218,37 @@ const settings = ({ strapi: strapi2 }) => ({
   async getPrimaryMonitorId(ctx) {
     const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
     ctx.body = { primaryMonitorId: settings2?.primaryMonitorId };
+  },
+  async trackUserData(ctx) {
+    const { browser, os, language, screen, client_timezone } = ctx.request.body || {};
+    const settings2 = await service({ strapi: strapi2 }).settingsStore.get();
+    if (settings2?.installationTracked) {
+      ctx.body = { ok: false, error: "Installation already tracked" };
+      return;
+    }
+    const ip = ctx.ip;
+    let country = "";
+    let ipAddress = ip;
+    try {
+      if (ip && ip !== "127.0.0.1" && ip !== "::1") {
+        const ipRes = await fetch(`${IP_API_BASE_URL}/${ip}/json/`);
+        if (ipRes.ok) {
+          const ipData = await ipRes.json();
+          country = ipData.country_name || ipData.country || "";
+        }
+      }
+    } catch (e) {
+    }
+    const userPayload = {
+      ip_address: ipAddress,
+      country,
+      browser_os: `${browser || ""} / ${os || ""}`,
+      timezone: client_timezone || "",
+      language: language || "",
+      screen: screen || ""
+    };
+    await service({ strapi: strapi2 }).trackInstallation(userPayload);
+    ctx.body = { ok: true };
   }
 });
 function getMixedContentMessage(meta) {
@@ -1176,6 +1250,15 @@ const routes = {
           auth: false
         }
       },
+      {
+        method: "POST",
+        path: "/track-user-data",
+        handler: "settings.trackUserData",
+        config: {
+          policies: [],
+          auth: false
+        }
+      },
       {
         method: "GET",
         path: "/monitor/:id",

package/dist/server/src/index.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
             set(ctx: any): Promise<void>;
             setPrimaryMonitorId(ctx: any): Promise<void>;
             getPrimaryMonitorId(ctx: any): Promise<void>;
+            trackUserData(ctx: any): Promise<void>;
         };
         monitor: ({ strapi }: {
             strapi: import('@strapi/types/dist/core').Strapi;
@@ -146,7 +147,7 @@ declare const _default: {
             };
             getToken(): Promise<string>;
             makeBackendRequest(endpoint: string, options: RequestInit, forValidation?: boolean, sessionToken?: string): Promise<unknown>;
-            trackInstallation(): Promise<void>;
+            trackInstallation(userPayload?: any): Promise<void>;
         };
         userDetailsService: ({ strapi }: {
             strapi: import('@strapi/types/dist/core').Strapi;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.11",
+  "version": "1.0.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/Appfoster/upsnap-strapi"