prepare-package 1.1.3 → 1.1.5

package/dist/index.js

@@ -40,21 +40,23 @@ module.exports = async function (options) {
   console.log(chalk.blue(`[prepare-package]: output=${theirPackageJSON.preparePackage.output}`));
   console.log(chalk.blue(`[prepare-package]: main=${theirPackageJSON.main}`));
 
-  // Remove the output folder
-  jetpack.remove(
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.output),
-  )
+  // Set the paths relative to the cwd
+  const mainPath = path.resolve(options.cwd, theirPackageJSON.main);
+  const outputPath = path.resolve(options.cwd, theirPackageJSON.preparePackage.output);
+  const inputPath = path.resolve(options.cwd, theirPackageJSON.preparePackage.input);
+
+  // Remove the output folder if it exists
+  if (jetpack.exists(outputPath)) {
+    jetpack.remove(outputPath);
+  }
 
-  // Copy the input folder to the output folder
-  jetpack.copy(
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.input),
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.output),
-  )
+  // Copy the input folder to the output folder if it exists
+  if (jetpack.exists(inputPath)) {
+    jetpack.copy(inputPath, outputPath);
+  }
 
   // Only do this part on the actual package that is using THIS package because we dont't want to replace THIS {version}
   if (isLivePreparation) {
-    const mainPath = path.resolve(options.cwd, theirPackageJSON.main);
-
     // Replace the main file
     jetpack.write(
       mainPath,
@@ -72,13 +74,7 @@ module.exports = async function (options) {
   // Handle post install
   if (options.isPostInstall) {
     // Send analytics
-    await sendAnalytics(thisPackageJSON, theirPackageJSON)
-    .then((r) => {
-      console.log(chalk.green(`[prepare-package]: Sent analytics code=${r.status}`));
-    })
-    .catch(e => {
-      console.log(chalk.red(`[prepare-package]: Failed to send analytics`, e));
-    });
+    // ... moveed to another package
   }
 
   // If purge is disabled, then return
@@ -99,157 +95,3 @@ module.exports = async function (options) {
   })
 }
 
-// Send analytics
-function sendAnalytics(thisPackageJSON, theirPackageJSON) {
-  return new Promise(async function(resolve, reject) {
-    const uuidv5 = require('uuid').v5;
-    const os = require('os');
-    const userInfo = os.userInfo();
-
-    // Build url and body
-    const analyticsId = 'G-9YP4NNBLY3';
-    const analyticsSecret = 'w3Z2tfucR9KFPB8it5WkyQ';
-    const url = `https://www.google-analytics.com/mp/collect?measurement_id=${analyticsId}&api_secret=${analyticsSecret}`;
-    const mac = getDeviceUniqueId();
-    const uuid = uuidv5(mac, '4caf995a-3d43-451b-b34d-e535d2663bc1');
-    const simpleOS = getSimpleOS(os.platform());
-    const name = (theirPackageJSON.name || 'unknown')
-      // Replace anything not a letter, number, or underscore with an underscore
-      .replace(/[^a-zA-Z0-9_]/g, '_')
-      // Remove leading and trailing underscores
-      .replace(/^_+|_+$/g, '')
-      // Remove multiple underscores
-      .replace(/_+/g, '_');
-
-    // Build body
-    const body = {
-      client_id: uuid,
-      user_id: uuid,
-      // timestamp_micros: new Date().getTime() * 1000,
-      user_properties: {
-        // operating_system: simpleOS, // CAUSES EVENT TO NOT BE SENT
-      },
-      user_data: {
-      },
-      // consent: {},
-      // non_personalized_ads: false,
-      events: [{
-        name: name,
-        params: {
-          packageName: theirPackageJSON.name,
-          packageVersion: theirPackageJSON.version,
-          preparePackageVersion: thisPackageJSON.version,
-          os: simpleOS,
-          platform: os.platform(),
-          arch: os.arch(),
-          release: os.release(),
-          hostname: os.hostname(),
-          cpus: os.cpus().length,
-          memory: os.totalmem(),
-          uptime: os.uptime(),
-          username: userInfo.username,
-          homedir: userInfo.homedir,
-          shell: userInfo.shell,
-          uid: userInfo.uid,
-          gid: userInfo.gid,
-        },
-      }],
-    }
-
-    // Get the user's location
-    const savePath = path.resolve(os.tmpdir(), 'prepare-package-geolocation-cache.json');
-    const geolocation = await fetch('https://ipapi.co/json/', {
-      response: 'json',
-      tries: 2,
-      timeout: 30000,
-    })
-    .then((r) => {
-      // Save to tmpdir
-      jetpack.write(savePath, JSON.stringify(r, null, 2));
-
-      return r;
-    })
-    .catch((e) => {
-      console.log(chalk.red(`[prepare-package]: Failed to get geolocation`, e));
-
-      // Try to get from cache
-      if (jetpack.exists(savePath)) {
-        console.log(chalk.blue(`[prepare-package]: Used cached geolocation`));
-
-        return JSON.parse(jetpack.read(savePath));
-      }
-    });
-
-    // Add the geolocation to the body
-    if (geolocation) {
-      body.user_data.city = geolocation.city || 'Unknown';
-      body.user_data.region = geolocation.region || 'Unknown';
-      body.user_data.country = geolocation.country || 'Unknown';
-
-      body.user_properties.language = (geolocation.languages || 'Unknown').split(',')[0];
-    }
-
-    // Log the options
-    // console.log(chalk.blue(`[prepare-package]: Sending analytics mac=${mac}, uuid=${uuid}...`), body, body.events[0].params);
-    console.log(chalk.blue(`[prepare-package]: Sending analytics mac=${mac}, uuid=${uuid}...`));
-
-    // Send event
-    fetch(url, {
-      method: 'post',
-      response: 'raw',
-      tries: 2,
-      timeout: 30000,
-      body: body,
-    })
-    .then((r) => {
-      resolve(r);
-    })
-    .catch((e) => {
-      reject(e);
-    });
-  });
-}
-
-const getDeviceUniqueId = () => {
-  const os = require('os');
-  const interfaces = os.networkInterfaces();
-
-  // Find the first valid MAC address
-  for (const name in interfaces) {
-    for (const net of interfaces[name]) {
-      if (!net.internal && net.mac && net.mac !== '00:00:00:00:00:00') {
-        return net.mac;
-      }
-    }
-  }
-
-  // Log
-  console.warn('No valid MAC address found. Generating a random MAC address.');
-
-  // Generate a random MAC address
-  const hexDigits = '0123456789ABCDEF';
-  let mac = '';
-  for (let i = 0; i < 6; i++) {
-    let byte = '';
-    for (let j = 0; j < 2; j++) {
-      byte += hexDigits.charAt(Math.floor(Math.random() * 16));
-    }
-    mac += byte;
-    if (i !== 5) mac += ':';
-  }
-  return mac;
-};
-
-const getSimpleOS = (platform) => {
-  switch (platform) {
-    case 'darwin':
-      return 'mac';
-    case 'win32':
-      return 'windows';
-    case 'linux':
-      return 'linux';
-    default:
-      return platform;
-  }
-};
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prepare-package",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Prepare a Node.js package before being published",
   "main": "dist/index.js",
   "scripts": {
@@ -37,7 +37,6 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "fs-jetpack": "^4.3.1",
-    "uuid": "^9.0.1",
     "wonderful-fetch": "^1.1.9"
   },
   "devDependencies": {

package/src/index.js

@@ -40,21 +40,23 @@ module.exports = async function (options) {
   console.log(chalk.blue(`[prepare-package]: output=${theirPackageJSON.preparePackage.output}`));
   console.log(chalk.blue(`[prepare-package]: main=${theirPackageJSON.main}`));
 
-  // Remove the output folder
-  jetpack.remove(
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.output),
-  )
+  // Set the paths relative to the cwd
+  const mainPath = path.resolve(options.cwd, theirPackageJSON.main);
+  const outputPath = path.resolve(options.cwd, theirPackageJSON.preparePackage.output);
+  const inputPath = path.resolve(options.cwd, theirPackageJSON.preparePackage.input);
+
+  // Remove the output folder if it exists
+  if (jetpack.exists(outputPath)) {
+    jetpack.remove(outputPath);
+  }
 
-  // Copy the input folder to the output folder
-  jetpack.copy(
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.input),
-    path.resolve(options.cwd, theirPackageJSON.preparePackage.output),
-  )
+  // Copy the input folder to the output folder if it exists
+  if (jetpack.exists(inputPath)) {
+    jetpack.copy(inputPath, outputPath);
+  }
 
   // Only do this part on the actual package that is using THIS package because we dont't want to replace THIS {version}
   if (isLivePreparation) {
-    const mainPath = path.resolve(options.cwd, theirPackageJSON.main);
-
     // Replace the main file
     jetpack.write(
       mainPath,
@@ -72,13 +74,7 @@ module.exports = async function (options) {
   // Handle post install
   if (options.isPostInstall) {
     // Send analytics
-    await sendAnalytics(thisPackageJSON, theirPackageJSON)
-    .then((r) => {
-      console.log(chalk.green(`[prepare-package]: Sent analytics code=${r.status}`));
-    })
-    .catch(e => {
-      console.log(chalk.red(`[prepare-package]: Failed to send analytics`, e));
-    });
+    // ... moveed to another package
   }
 
   // If purge is disabled, then return
@@ -99,157 +95,3 @@ module.exports = async function (options) {
   })
 }
 
-// Send analytics
-function sendAnalytics(thisPackageJSON, theirPackageJSON) {
-  return new Promise(async function(resolve, reject) {
-    const uuidv5 = require('uuid').v5;
-    const os = require('os');
-    const userInfo = os.userInfo();
-
-    // Build url and body
-    const analyticsId = 'G-9YP4NNBLY3';
-    const analyticsSecret = 'w3Z2tfucR9KFPB8it5WkyQ';
-    const url = `https://www.google-analytics.com/mp/collect?measurement_id=${analyticsId}&api_secret=${analyticsSecret}`;
-    const mac = getDeviceUniqueId();
-    const uuid = uuidv5(mac, '4caf995a-3d43-451b-b34d-e535d2663bc1');
-    const simpleOS = getSimpleOS(os.platform());
-    const name = (theirPackageJSON.name || 'unknown')
-      // Replace anything not a letter, number, or underscore with an underscore
-      .replace(/[^a-zA-Z0-9_]/g, '_')
-      // Remove leading and trailing underscores
-      .replace(/^_+|_+$/g, '')
-      // Remove multiple underscores
-      .replace(/_+/g, '_');
-
-    // Build body
-    const body = {
-      client_id: uuid,
-      user_id: uuid,
-      // timestamp_micros: new Date().getTime() * 1000,
-      user_properties: {
-        // operating_system: simpleOS, // CAUSES EVENT TO NOT BE SENT
-      },
-      user_data: {
-      },
-      // consent: {},
-      // non_personalized_ads: false,
-      events: [{
-        name: name,
-        params: {
-          packageName: theirPackageJSON.name,
-          packageVersion: theirPackageJSON.version,
-          preparePackageVersion: thisPackageJSON.version,
-          os: simpleOS,
-          platform: os.platform(),
-          arch: os.arch(),
-          release: os.release(),
-          hostname: os.hostname(),
-          cpus: os.cpus().length,
-          memory: os.totalmem(),
-          uptime: os.uptime(),
-          username: userInfo.username,
-          homedir: userInfo.homedir,
-          shell: userInfo.shell,
-          uid: userInfo.uid,
-          gid: userInfo.gid,
-        },
-      }],
-    }
-
-    // Get the user's location
-    const savePath = path.resolve(os.tmpdir(), 'prepare-package-geolocation-cache.json');
-    const geolocation = await fetch('https://ipapi.co/json/', {
-      response: 'json',
-      tries: 2,
-      timeout: 30000,
-    })
-    .then((r) => {
-      // Save to tmpdir
-      jetpack.write(savePath, JSON.stringify(r, null, 2));
-
-      return r;
-    })
-    .catch((e) => {
-      console.log(chalk.red(`[prepare-package]: Failed to get geolocation`, e));
-
-      // Try to get from cache
-      if (jetpack.exists(savePath)) {
-        console.log(chalk.blue(`[prepare-package]: Used cached geolocation`));
-
-        return JSON.parse(jetpack.read(savePath));
-      }
-    });
-
-    // Add the geolocation to the body
-    if (geolocation) {
-      body.user_data.city = geolocation.city || 'Unknown';
-      body.user_data.region = geolocation.region || 'Unknown';
-      body.user_data.country = geolocation.country || 'Unknown';
-
-      body.user_properties.language = (geolocation.languages || 'Unknown').split(',')[0];
-    }
-
-    // Log the options
-    // console.log(chalk.blue(`[prepare-package]: Sending analytics mac=${mac}, uuid=${uuid}...`), body, body.events[0].params);
-    console.log(chalk.blue(`[prepare-package]: Sending analytics mac=${mac}, uuid=${uuid}...`));
-
-    // Send event
-    fetch(url, {
-      method: 'post',
-      response: 'raw',
-      tries: 2,
-      timeout: 30000,
-      body: body,
-    })
-    .then((r) => {
-      resolve(r);
-    })
-    .catch((e) => {
-      reject(e);
-    });
-  });
-}
-
-const getDeviceUniqueId = () => {
-  const os = require('os');
-  const interfaces = os.networkInterfaces();
-
-  // Find the first valid MAC address
-  for (const name in interfaces) {
-    for (const net of interfaces[name]) {
-      if (!net.internal && net.mac && net.mac !== '00:00:00:00:00:00') {
-        return net.mac;
-      }
-    }
-  }
-
-  // Log
-  console.warn('No valid MAC address found. Generating a random MAC address.');
-
-  // Generate a random MAC address
-  const hexDigits = '0123456789ABCDEF';
-  let mac = '';
-  for (let i = 0; i < 6; i++) {
-    let byte = '';
-    for (let j = 0; j < 2; j++) {
-      byte += hexDigits.charAt(Math.floor(Math.random() * 16));
-    }
-    mac += byte;
-    if (i !== 5) mac += ':';
-  }
-  return mac;
-};
-
-const getSimpleOS = (platform) => {
-  switch (platform) {
-    case 'darwin':
-      return 'mac';
-    case 'win32':
-      return 'windows';
-    case 'linux':
-      return 'linux';
-    default:
-      return platform;
-  }
-};
-