make-mp-data 1.4.5 → 1.5.1

package/.vscode/launch.json

@@ -23,18 +23,30 @@
 			"type": "node-terminal"
 		},
 		{
-			"type": "node",
-			"request": "launch",
-			"name": "go",
-			"runtimeExecutable": "nodemon",
-			"program": "${file}",
-			"restart": true,
-			"console": "integratedTerminal",
-			"internalConsoleOptions": "neverOpen",
-			"args": [
-				"--ignore",
-				"./data/"
-			]
-		}
+            "type": "node",
+            "request": "launch",
+            "name": "go",
+            "runtimeExecutable": "nodemon",
+            "runtimeArgs": ["--inspect"],
+            "program": "${workspaceFolder}/index.js",
+			"args": ["--ignore", "./data/*", "${file}"],
+            "restart": true,
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "skipFiles": ["<node_internals>/**"],
+        },
+		{
+            "type": "node",
+            "request": "launch",
+            "name": "sanity",
+            "runtimeExecutable": "nodemon",
+            "runtimeArgs": ["--inspect"],
+            "program": "${workspaceFolder}/index.js",
+			"args": ["--ignore", "./data/*", "./schemas/sanity.js"],
+            "restart": true,
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "skipFiles": ["<node_internals>/**"],
+        }
 	]
 }

package/{core → components}/cli.js

@@ -15,7 +15,6 @@ by ak@mixpanel.com
 
 function cliParams() {
 	console.log(hero);
-	// @ts-ignore
 	const args = yargs(process.argv.splice(2))
 		.scriptName("make-mp-data")
 		.usage(`\nusage:\nnpx $0 [dataModel.js] [options]
@@ -85,6 +84,13 @@ DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js
 			describe: 'either US or EU',
 			type: 'string'
 		})
+		.option('concurrency', {
+			alias: 'conn',
+			default: 500,
+			demandOption: false,
+			describe: 'concurrency level for data generation',
+			type: 'number'
+		})
 		.options("complex", {
 			demandOption: false,
 			default: false,
@@ -101,7 +107,7 @@ DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js
 			type: 'boolean',
 			coerce: boolCoerce
 		})
-		.option("sessionIds", {
+		.option("hasSessionIds", {
 			demandOption: false,
 			default: false,
 			describe: 'create session ids in the data',
@@ -109,7 +115,7 @@ DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js
 			type: 'boolean',
 			coerce: boolCoerce
 		})
-		.option("anonIds", {
+		.option("hasAnonIds", {
 			demandOption: false,
 			default: false,
 			describe: 'create anonymous ids in the data',
@@ -187,6 +193,7 @@ DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js
 			type: 'boolean',
 			coerce: boolCoerce
 		})
+		
 		.help()
 		.wrap(null)
 		.argv;

package/components/project.js

@@ -0,0 +1,155 @@
+require('dotenv').config();
+const akTools = require('ak-tools');
+const { rand, makeName } = akTools;
+let { OAUTH_TOKEN = "" } = process.env;
+
+/**
+ * Main function to create a project and add group keys to it.
+ *
+ * @param {Object} params - Parameters for the function.
+ * @param {string} [params.oauth=""] - OAuth token for authentication.
+ * @param {string} [params.orgId=""] - Organization ID.
+ * @param {Array<Object>} [params.groups=[]] - List of groups to add to the project.
+ * @param {string} [params.name=""] - Name of the user.
+ * @param {string} [params.email=""] - Email of the user.
+ * @param {string} [params.projectName=""] - Name of the project.
+ * @returns {Promise<Object>} The created project with additional group keys.
+ * @throws Will throw an error if OAUTH_TOKEN is not set.
+ * @throws Will throw an error if orgId is not found.
+ */
+async function main(params = {}) {
+	let { oauth = "", orgId = "", groups = [], name = "", email = "", projectName } = params;
+	if (oauth) OAUTH_TOKEN = oauth;
+	if (!OAUTH_TOKEN) throw new Error('No OAUTH_TOKEN in .env');
+	if (!orgId) {
+		({ orgId, name, email } = await getUser());
+	}
+	if (!orgId) throw new Error('No orgId found');
+	if (!projectName) projectName = makeName();
+	const project = await makeProject(orgId);
+	project.user = name;
+	project.email = email;
+	project.groups = groups;
+	project.orgId = orgId;
+	const groupKeys = [
+		// { display_name: 'Account', property_name: 'account_id' },
+	];
+	groupKeys.push(...groups);
+	const addedGroupKeys = await addGroupKeys(groupKeys, project.id);
+	project.groupsAdded = addedGroupKeys;
+
+	return project;
+}
+
+
+async function makeProject(orgId, oauthToken = OAUTH_TOKEN) {
+	const excludedOrgs = [
+		1, // Mixpanel
+		328203, // Mixpanel Demo
+		1673847, // SE Demo
+		1866253 // Demo Projects
+	];
+	if (!orgId || !oauthToken) throw new Error('Missing orgId or oauthToken');
+	const url = `https://mixpanel.com/api/app/organizations/${orgId}/create-project`;
+	const projectPayload = {
+		"cluster_id": 1,
+		"project_name": `GTM Metrics: Test Env ${rand(1000, 9999)}`,
+		"timezone_id": 404
+	};
+
+	const payload = {
+		method: 'POST',
+
+		headers: {
+			Authorization: `Bearer ${oauthToken}`,
+		},
+		body: JSON.stringify(projectPayload)
+
+	};
+
+	const projectsReq = await fetch(url, payload);
+	const projectsRes = await projectsReq.json();
+	const { api_secret, id, name, token } = projectsRes.results;
+
+	const data = {
+		api_secret,
+		id,
+		name,
+		token,
+		url: `https://mixpanel.com/project/${id}/app/settings#project/${id}`
+
+	};
+
+	return data;
+}
+
+async function getUser(oauthToken = OAUTH_TOKEN) {
+	const user = {};
+	try {
+		if (oauthToken) {
+			const info = await fetch(`https://mixpanel.com/api/app/me/?include_workspace_users=false`, { headers: { Authorization: `Bearer ${oauthToken}` } });
+			const data = await info.json();
+			if (data?.results) {
+				const { user_name = "", user_email = "" } = data.results;
+				if (user_name) user.name = user_name;
+				if (user_email) user.email = user_email;
+				const foundOrg = Object.values(data.results.organizations).filter(o => o.name.includes(user_name))?.pop();
+				if (foundOrg) {
+					user.orgId = foundOrg.id?.toString();
+					user.orgName = foundOrg.name;
+				}
+				if (!foundOrg) {
+					// the name is not in the orgs, so we need to find the org in which the user is the owner
+					const ignoreProjects = [1673847, 1866253, 328203];
+					const possibleOrg = Object.values(data.results.organizations)
+						.filter(o => o.role === 'owner')
+						.filter(o => !ignoreProjects.includes(o.id))?.pop();
+					if (possibleOrg) {
+						user.orgId = possibleOrg?.id?.toString();
+						user.orgName = possibleOrg.name;
+					}
+				}
+			}
+		}
+	}
+	catch (err) {
+		console.error('get user err', err);
+	}
+
+	return user;
+}
+
+
+async function addGroupKeys(groupKeyDfns = [], projectId, oauthToken = OAUTH_TOKEN) {
+	const url = `https://mixpanel.com/api/app/projects/${projectId}/data-groups/`;
+	const results = [];
+	loopKeys: for (const { display_name, property_name } of groupKeyDfns) {
+		const body = {
+			display_name,
+			property_name
+		};
+		const payload = {
+			method: 'POST',
+			headers: {
+				Authorization: `Bearer ${oauthToken}`,
+				'Content-Type': 'application/json'
+			},
+			body: JSON.stringify(body)
+		};
+
+		try {
+			const res = await fetch(url, payload);
+			const data = await res.json();
+			results.push(data?.results);
+		}
+		catch (err) {
+			console.error('add group keys err', err);
+			continue loopKeys;
+		}
+
+	}
+	return results;
+}
+
+
+module.exports = main;

package/{core → components}/utils.js

@@ -15,7 +15,7 @@ const { domainSuffix, domainPrefix } = require('./defaults');
 /** @typedef {import('../types').Config} Config */
 /** @typedef {import('../types').EventConfig} EventConfig */
 /** @typedef {import('../types').ValueValid} ValueValid */
-/** @typedef {import('../types').EnrichedArray} hookArray */
+/** @typedef {import('../types').HookedArray} hookArray */
 /** @typedef {import('../types').hookArrayOptions} hookArrayOptions */
 /** @typedef {import('../types').Person} Person */
 /** @typedef {import('../types').Funnel} Funnel */
@@ -23,6 +23,7 @@ const { domainSuffix, domainPrefix } = require('./defaults');
 let globalChance;
 let chanceInitialized = false;
 
+const ACTUAL_NOW = dayjs.utc();
 
 
 /*
@@ -40,7 +41,6 @@ function initChance(seed) {
 	if (process.env.SEED) seed = process.env.SEED;  // Override seed with environment variable if available
 	if (!chanceInitialized) {
 		globalChance = new Chance(seed);
-		if (global.MP_SIMULATION_CONFIG) global.MP_SIMULATION_CONFIG.chance = globalChance;
 		chanceInitialized = true;
 	}
 	return globalChance;
@@ -52,11 +52,11 @@ function initChance(seed) {
  */
 function getChance() {
 	if (!chanceInitialized) {
-		const seed = process.env.SEED || global.MP_SIMULATION_CONFIG?.seed;
+		const seed = process.env.SEED || "";
 		if (!seed) {
-			return new Chance();
+			return new Chance(); // this is a new RNG and therefore not deterministic
 		}
-		return initChance(seed);		
+		return initChance(seed);
 	}
 	return globalChance;
 }
@@ -97,7 +97,8 @@ function pick(items) {
  */
 function date(inTheLast = 30, isPast = true, format = 'YYYY-MM-DD') {
 	const chance = getChance();
-	const now = global.NOW ? dayjs.unix(global.NOW) : dayjs();
+	// const now = global.FIXED_NOW ? dayjs.unix(global.FIXED_NOW) : dayjs();
+	const now = ACTUAL_NOW;
 	if (Math.abs(inTheLast) > 365 * 10) inTheLast = chance.integer({ min: 1, max: 180 });
 	return function () {
 		const when = chance.integer({ min: 0, max: Math.abs(inTheLast) });
@@ -150,14 +151,17 @@ function datesBetween(start, end) {
 /**
  * returns a random date
  * @param  {any} start
- * @param  {any} end=global.NOW
+ * @param  {any} end
  */
-function day(start, end = global.NOW) {
+function day(start, end) {
+	// if (!end) end = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
+	if (!start) start = ACTUAL_NOW.subtract(30, 'd').toISOString();
+	if (!end) end = ACTUAL_NOW.toISOString();
 	const chance = getChance();
 	const format = 'YYYY-MM-DD';
 	return function (min, max) {
 		start = dayjs(start);
-		end = dayjs.unix(global.NOW);
+		end = dayjs(end);
 		const diff = end.diff(start, 'day');
 		const delta = chance.integer({ min: min, max: diff });
 		const day = start.add(delta, 'day');
@@ -312,52 +316,6 @@ function range(a, b, step = 1) {
 };
 
 
-/**
- * create funnels out of random events
- * @param {EventConfig[]} events
- */
-function inferFunnels(events) {
-	const createdFunnels = [];
-	const firstEvents = events.filter((e) => e.isFirstEvent).map((e) => e.event);
-	const usageEvents = events.filter((e) => !e.isFirstEvent).map((e) => e.event);
-	const numFunnelsToCreate = Math.ceil(usageEvents.length);
-	/** @type {Funnel} */
-	const funnelTemplate = {
-		sequence: [],
-		conversionRate: 50,
-		order: 'sequential',
-		requireRepeats: false,
-		props: {},
-		timeToConvert: 1,
-		isFirstFunnel: false,
-		weight: 1
-	};
-	if (firstEvents.length) {
-		for (const event of firstEvents) {
-			createdFunnels.push({ ...clone(funnelTemplate), sequence: [event], isFirstFunnel: true, conversionRate: 100 });
-		}
-	}
-
-	//at least one funnel with all usage events
-	createdFunnels.push({ ...clone(funnelTemplate), sequence: usageEvents });
-
-	//for the rest, make random funnels
-	followUpFunnels: for (let i = 1; i < numFunnelsToCreate; i++) {
-		/** @type {Funnel} */
-		const funnel = { ...clone(funnelTemplate) };
-		funnel.conversionRate = integer(25, 75);
-		funnel.timeToConvert = integer(1, 10);
-		funnel.weight = integer(1, 10);
-		const sequence = shuffleArray(usageEvents).slice(0, integer(2, usageEvents.length));
-		funnel.sequence = sequence;
-		funnel.order = 'random';
-		createdFunnels.push(funnel);
-	}
-
-	return createdFunnels;
-
-}
-
 
 /*
 ----
@@ -674,14 +632,14 @@ function validateEventConfig(events) {
 	return cleanEventConfig;
 }
 
-function validateTime(chosenTime, earliestTime, latestTime) {
-	if (!earliestTime) earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-	if (!latestTime) latestTime = global.NOW;
+function validTime(chosenTime, earliestTime, latestTime) {
+	if (!earliestTime) earliestTime = global.FIXED_BEGIN ? global.FIXED_BEGIN : dayjs().subtract(30, 'd').unix(); // 30 days ago
+	if (!latestTime) latestTime = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
 
 	if (typeof chosenTime === 'number') {
 		if (chosenTime > 0) {
 			if (chosenTime > earliestTime) {
-				if (chosenTime < latestTime) {
+				if (chosenTime < (latestTime)) {
 					return true;
 				}
 
@@ -691,6 +649,17 @@ function validateTime(chosenTime, earliestTime, latestTime) {
 	return false;
 }
 
+function validEvent(row) {
+	if (!row) return false;
+	if (!row.event) return false;
+	if (!row.time) return false;
+	if (!row.device_id && !row.user_id) return false;
+	if (!row.insert_id) return false;
+	if (!row.source) return false;
+	if (typeof row.time !== 'string') return false;
+	return true;
+}
+
 
 /*
 ----
@@ -698,68 +667,7 @@ META
 ----
 */
 
-/** 
- * our meta programming function which lets you mutate items as they are pushed into an array
- * @param  {any[]} arr
- * @param  {hookArrayOptions} opts
- * @returns {hookArray}}
- */
-function hookArray(arr = [], opts = {}) {
-	const { hook = a => a, type = "", ...rest } = opts;
-
-	function transformThenPush(item) {
-		if (item === null) return false;
-		if (item === undefined) return false;
-		if (typeof item === 'object') {
-			if (Object.keys(item).length === 0) return false;
-		}
-
-		//hook is passed an array 
-		if (Array.isArray(item)) {
-			for (const i of item) {
-				try {
-					const enriched = hook(i, type, rest);
-					if (Array.isArray(enriched)) enriched.forEach(e => arr.push(e));
-					else arr.push(enriched);
-
-				}
-				catch (e) {
-					console.error(`\n\nyour hook had an error\n\n`, e);
-					arr.push(i);
-					return false;
-				}
-
-			}
-			return true;
-		}
-
-		//hook is passed a single item
-		else {
-			try {
-				const enriched = hook(item, type, rest);
-				if (Array.isArray(enriched)) enriched.forEach(e => arr.push(e));
-				else arr.push(enriched);
-				return true;
-			}
-			catch (e) {
-				console.error(`\n\nyour hook had an error\n\n`, e);
-				arr.push(item);
-				return false;
-			}
-		}
-
-	}
 
-	/** @type {hookArray} */
-	// @ts-ignore
-	const enrichedArray = arr;
-
-
-	enrichedArray.hookPush = transformThenPush;
-
-
-	return enrichedArray;
-};
 
 /**
  * @param  {Config} config
@@ -770,7 +678,7 @@ function buildFileNames(config) {
 	extension = format === "csv" ? "csv" : "json";
 	// const current = dayjs.utc().format("MM-DD-HH");
 	let simName = config.simulationName;
-	let writeDir = "./";
+	let writeDir = typeof config.writeToDisk === 'string' ? config.writeToDisk : "./";
 	if (config.writeToDisk) {
 		const dataFolder = path.resolve("./data");
 		if (existsSync(dataFolder)) writeDir = dataFolder;
@@ -835,7 +743,6 @@ function buildFileNames(config) {
  * @param  {[string, number][]} arrayOfArrays
  */
 function progress(arrayOfArrays) {
-	// @ts-ignore
 	readline.cursorTo(process.stdout, 0);
 	let message = "";
 	for (const status of arrayOfArrays) {
@@ -873,8 +780,9 @@ CORE
 */
 
 //the function which generates $distinct_id + $anonymous_ids, $session_ids, and created, skewing towards the present
-function generateUser(user_id, numDays, amplitude = 1, frequency = 1, skew = 1) {
+function generateUser(user_id, opts, amplitude = 1, frequency = 1, skew = 1) {
 	const chance = getChance();
+	const { numDays, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds } = opts;
 	// Uniformly distributed `u`, then skew applied
 	let u = Math.pow(chance.random(), skew);
 
@@ -886,16 +794,18 @@ function generateUser(user_id, numDays, amplitude = 1, frequency = 1, skew = 1)
 
 	// Clamp values to ensure they are within the desired range
 	daysAgoBorn = Math.min(daysAgoBorn, numDays);
+	const props = person(user_id, daysAgoBorn, isAnonymous, hasAvatar, hasAnonIds, hasSessionIds);
 
 	const user = {
 		distinct_id: user_id,
-		...person(numDays),
+		...props,
 	};
 
 
 	return user;
 }
 
+let soupHits = 0;
 /**
  * build sign waves basically
  * @param  {number} [earliestTime]
@@ -903,8 +813,8 @@ function generateUser(user_id, numDays, amplitude = 1, frequency = 1, skew = 1)
  * @param  {number} [peaks=5]
  */
 function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0) {
-	if (!earliestTime) earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-	if (!latestTime) latestTime = global.NOW;
+	if (!earliestTime) earliestTime = global.FIXED_BEGIN ? global.FIXED_BEGIN : dayjs().subtract(30, 'd').unix(); // 30 days ago
+	if (!latestTime) latestTime = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
 	const chance = getChance();
 	const totalRange = latestTime - earliestTime;
 	const chunkSize = totalRange / peaks;
@@ -921,8 +831,9 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0)
 	let isValidTime = false;
 	do {
 		iterations++;
+		soupHits++;
 		offset = chance.normal({ mean: mean, dev: chunkSize / deviation });
-		isValidTime = validateTime(chunkMid + offset, earliestTime, latestTime);
+		isValidTime = validTime(chunkMid + offset, earliestTime, latestTime);
 		if (iterations > 25000) {
 			throw `${iterations} iterations... exceeded`;
 		}
@@ -946,15 +857,17 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0)
  * @param {string} userId
  * @param  {number} bornDaysAgo=30
  * @param {boolean} isAnonymous
+ * @param {boolean} hasAvatar
+ * @param {boolean} hasAnonIds
+ * @param {boolean} hasSessionIds
  * @return {Person}
  */
-function person(userId, bornDaysAgo = 30, isAnonymous = false) {
+function person(userId, bornDaysAgo = 30, isAnonymous = false, hasAvatar = false, hasAnonIds = false, hasSessionIds = false) {
 	const chance = getChance();
 	//names and photos
 	const l = chance.letter.bind(chance);
 	let gender = chance.pickone(['male', 'female']);
 	if (!gender) gender = "female";
-	// @ts-ignore
 	let first = chance.first({ gender });
 	let last = chance.last();
 	let name = `${first} ${last}`;
@@ -963,7 +876,7 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false) {
 	let randomAvatarNumber = integer(1, 99);
 	let avPath = gender === 'male' ? `/men/${randomAvatarNumber}.jpg` : `/women/${randomAvatarNumber}.jpg`;
 	let avatar = avatarPrefix + avPath;
-	let created = dayjs.unix(global.NOW).subtract(bornDaysAgo, 'day').format('YYYY-MM-DD');
+	let created = dayjs().subtract(bornDaysAgo, 'day').format('YYYY-MM-DD');
 	// const created = date(bornDaysAgo, true)();
 
 
@@ -982,21 +895,23 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false) {
 		user.name = "Anonymous User";
 		user.email = l() + l() + `*`.repeat(integer(3, 6)) + l() + `@` + l() + `*`.repeat(integer(3, 6)) + l() + `.` + choose(domainSuffix);
 		delete user.avatar;
-
 	}
 
+	if (!hasAvatar) delete user.avatar;
+
 	//anon Ids
-	if (global.MP_SIMULATION_CONFIG?.anonIds) {
+	if (hasAnonIds) {
 		const clusterSize = integer(2, 10);
 		for (let i = 0; i < clusterSize; i++) {
 			const anonId = uid(42);
 			user.anonymousIds.push(anonId);
 		}
-
 	}
 
+	if (!hasAnonIds) delete user.anonymousIds;
+
 	//session Ids
-	if (global.MP_SIMULATION_CONFIG?.sessionIds) {
+	if (hasSessionIds) {
 		const sessionSize = integer(5, 30);
 		for (let i = 0; i < sessionSize; i++) {
 			const sessionId = [uid(5), uid(5), uid(5), uid(5)].join("-");
@@ -1004,6 +919,8 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false) {
 		}
 	}
 
+	if (!hasSessionIds) delete user.sessionIds;
+
 	return user;
 };
 
@@ -1012,32 +929,32 @@ function person(userId, bornDaysAgo = 30, isAnonymous = false) {
 
 //UNUSED
 
-function fixFunkyTime(earliestTime, latestTime) {
-	if (!earliestTime) earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-	// if (typeof earliestTime !== "number") {
-	// 	if (parseInt(earliestTime) > 0) earliestTime = parseInt(earliestTime);
-	// 	if (dayjs(earliestTime).isValid()) earliestTime = dayjs(earliestTime).unix();
-	// }
-	if (typeof earliestTime !== "number") earliestTime = dayjs.unix(earliestTime).unix();
-	if (typeof latestTime !== "number") latestTime = global.NOW;
-	if (typeof latestTime === "number" && latestTime > global.NOW) latestTime = global.NOW;
-	if (earliestTime > latestTime) {
-		const tempEarlyTime = earliestTime;
-		const tempLateTime = latestTime;
-		earliestTime = tempLateTime;
-		latestTime = tempEarlyTime;
-	}
-	if (earliestTime === latestTime) {
-		earliestTime = dayjs.unix(earliestTime)
-			.subtract(integer(1, 14), "day")
-			.subtract(integer(1, 23), "hour")
-			.subtract(integer(1, 59), "minute")
-			.subtract(integer(1, 59), "second")
-			.unix();
-	}
-	return [earliestTime, latestTime];
-
-}
+// function fixFunkyTime(earliestTime, latestTime) {
+// 	if (!earliestTime) earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
+// 	// if (typeof earliestTime !== "number") {
+// 	// 	if (parseInt(earliestTime) > 0) earliestTime = parseInt(earliestTime);
+// 	// 	if (dayjs(earliestTime).isValid()) earliestTime = dayjs(earliestTime).unix();
+// 	// }
+// 	if (typeof earliestTime !== "number") earliestTime = dayjs.unix(earliestTime).unix();
+// 	if (typeof latestTime !== "number") latestTime = global.NOW;
+// 	if (typeof latestTime === "number" && latestTime > global.NOW) latestTime = global.NOW;
+// 	if (earliestTime > latestTime) {
+// 		const tempEarlyTime = earliestTime;
+// 		const tempLateTime = latestTime;
+// 		earliestTime = tempLateTime;
+// 		latestTime = tempEarlyTime;
+// 	}
+// 	if (earliestTime === latestTime) {
+// 		earliestTime = dayjs.unix(earliestTime)
+// 			.subtract(integer(1, 14), "day")
+// 			.subtract(integer(1, 23), "hour")
+// 			.subtract(integer(1, 59), "minute")
+// 			.subtract(integer(1, 59), "second")
+// 			.unix();
+// 	}
+// 	return [earliestTime, latestTime];
+
+// }
 
 
 
@@ -1078,7 +995,10 @@ module.exports = {
 
 	initChance,
 	getChance,
-	validateTime,
+
+	validTime,
+	validEvent,
+
 	boxMullerRandom,
 	applySkew,
 	mapToRange,
@@ -1100,12 +1020,10 @@ module.exports = {
 	shuffleOutside,
 	interruptArray,
 	generateUser,
-	hookArray,
 	optimizedBoxMuller,
 	buildFileNames,
 	streamJSON,
 	streamCSV,
-	inferFunnels,
 	datesBetween,
 	weighChoices
 };