@cripty2001/utils 0.0.229 → 0.0.231

package/dist/Appserver/client.js

@@ -51,7 +51,7 @@ class Client {
     constructor(url, rpcMount) {
         this.url = url;
         this.rpcMount = rpcMount;
-        const [token, setToken] = whispr_1.Whispr.create(null);
+        const [token, setToken] = whispr_1.Whispr.create(''); // This will make sure the loggedin only flips to false when there is really an auth rejected. Server will ignore invalid tokens on public apis anyway
         this.token = token;
         this.setToken = setToken;
         this.loggedIn = token.transform((t) => t !== null);

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Whispr } from "@cripty2001/whispr";
+import type { TSchema } from "@sinclair/typebox";
 export type JSONEncodable = number | string | boolean | JSONEncodable[] | null | {
     [key: string]: JSONEncodable;
 };
@@ -11,6 +12,13 @@ export type ExactlyOne<T> = {
     [K in keyof T]: Pick<T, K> & Partial<Record<Exclude<keyof T, K>, never>>;
 }[keyof T];
 export type AllRequired<T> = T extends ExactlyOne<infer U> ? ExactlyOne<Required<U>> : never;
+/**
+ * Generate a random number between 0 and `maxExclusive - 1`.
+ * @param maxExclusive The maximum exclusive value to generate
+ * @returns A random number between 0 and `maxExclusive - 1`
+ * @throws If `maxExclusive` is less than 1 or greater than 2^32
+ */
+export declare function randomBelow(maxExclusive: number): number;
 /**
  * Generate a random string from the given alphabeth.
  * @param _alphabeth The alphabeth to draw characters from
@@ -74,15 +82,36 @@ export declare function parseQuery(query: string | Record<string, any> | URLSear
  * @param min The minimum allowed number
  * @param max The maximum allowed number
  * @returns The generated random int
+ * @throws If `max - min + 1` is greater than 2^32
  */
 export declare function randBetween(min: number, max: number): number;
 /**
- * Get an environment variable, throwing if it is not defined and no default value is provided.
+ * Get an environment variable, convert it using the given converter function.
+ * If the environment variable is not defined, the default value is used.
+ * If the conversion throws an error, the conversion is aborted and an error is thrown. The default value is not used in this case.
+ *
  * @param key The environment variable key
  * @param defaultValue The default value to use if the environment variable is not defined
- * @returns The environment variable value, or the default value if provided
+ * @param converter The function to use to convert the environment variable value to the desired type
+ *
+ * @returns The converted environment variable value, or the default value if provided
+ *
+ * @throws If the environment variable is not defined and no default value is provided
+ * @throws If the conversion throws an error
+ */
+export declare function getEnv<R>(key: string, defaultValue?: R, converter?: (string: string) => R): R;
+/**
+ * @see getEnv, with the additional constraint that the environment variable must be a valid integer.
+ * Note: the default value is not used instead of an invalid integer. An invalid integer therefore throws an error.
+ */
+export declare function getEnvInt(key: string, defaultValue?: number): number;
+/**
+ * @see getEnv, with the additional constraint that the environment variable must be a valid JSON object.
+ * Note: the default value is not used instead of an invalid JSON object. An invalid JSON object therefore throws an error.
+ *
+ * @param schema The schema to use to validate the environment variable value
  */
-export declare function getEnv(key: string, defaultValue?: string): string;
+export declare function getEnvJson<T>(key: string, defaultValue?: T, schema?: TSchema): T;
 export declare const CURRENT_TS_MS: () => Whispr<number>;
 export declare function getClock(rate: number): Whispr<number>;
 export declare function timediff2HumanReadable(diffMs: number): string;

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CURRENT_TS_MS = void 0;
+exports.randomBelow = randomBelow;
 exports.getRandom = getRandom;
 exports.getRandomId = getRandomId;
 exports.getRandomOtp = getRandomOtp;
@@ -15,12 +16,38 @@ exports.stableLog = stableLog;
 exports.parseQuery = parseQuery;
 exports.randBetween = randBetween;
 exports.getEnv = getEnv;
+exports.getEnvInt = getEnvInt;
+exports.getEnvJson = getEnvJson;
 exports.getClock = getClock;
 exports.timediff2HumanReadable = timediff2HumanReadable;
 exports.fn2promise = fn2promise;
 exports.safeApply = safeApply;
 const whispr_1 = require("@cripty2001/whispr");
 const lodash_1 = require("lodash");
+const U32_LIMIT = 0x1_0000_0000;
+function randomU32() {
+    const buf = new Uint32Array(1);
+    globalThis.crypto.getRandomValues(buf);
+    return buf[0];
+}
+/**
+ * Generate a random number between 0 and `maxExclusive - 1`.
+ * @param maxExclusive The maximum exclusive value to generate
+ * @returns A random number between 0 and `maxExclusive - 1`
+ * @throws If `maxExclusive` is less than 1 or greater than 2^32
+ */
+function randomBelow(maxExclusive) {
+    const n = Math.floor(maxExclusive);
+    if (n < 1)
+        throw new RangeError(`randomBelow span must be at least 1: ${n}`);
+    if (n > U32_LIMIT)
+        throw new RangeError(`randomBelow span exceeds 2^32: ${n}`);
+    const threshold = U32_LIMIT - (U32_LIMIT % n);
+    let x = randomU32();
+    while (x >= threshold)
+        x = randomU32();
+    return x % n;
+}
 /**
  * Generate a random string from the given alphabeth.
  * @param _alphabeth The alphabeth to draw characters from
@@ -31,7 +58,7 @@ function getRandom(_alphabeth, length) {
     const alphabeth = _alphabeth.split("");
     const toReturn = [];
     while (toReturn.length < length) {
-        toReturn.push(alphabeth[Math.floor(Math.random() * alphabeth.length)]);
+        toReturn.push(alphabeth[randomBelow(alphabeth.length)]);
     }
     return toReturn.join("");
 }
@@ -189,21 +216,61 @@ function parseQuery(query, fields) {
  * @param min The minimum allowed number
  * @param max The maximum allowed number
  * @returns The generated random int
+ * @throws If `max - min + 1` is greater than 2^32
  */
 function randBetween(min, max) {
-    return Math.floor(Math.random() * (max - min + 1)) + min;
+    const span = max - min + 1;
+    if (span <= 1)
+        return min;
+    return min + randomBelow(span);
 }
 /**
- * Get an environment variable, throwing if it is not defined and no default value is provided.
+ * Get an environment variable, convert it using the given converter function.
+ * If the environment variable is not defined, the default value is used.
+ * If the conversion throws an error, the conversion is aborted and an error is thrown. The default value is not used in this case.
+ *
  * @param key The environment variable key
  * @param defaultValue The default value to use if the environment variable is not defined
- * @returns The environment variable value, or the default value if provided
+ * @param converter The function to use to convert the environment variable value to the desired type
+ *
+ * @returns The converted environment variable value, or the default value if provided
+ *
+ * @throws If the environment variable is not defined and no default value is provided
+ * @throws If the conversion throws an error
+ */
+function getEnv(key, defaultValue, converter = (s) => s) {
+    const value = process.env[key];
+    if (value === undefined) {
+        if (defaultValue === undefined)
+            throw new Error(`Environment variable ${key} is not defined and no default value was provided.`);
+        else
+            return defaultValue;
+    }
+    const converted = (() => {
+        try {
+            return converter(value);
+        }
+        catch (e) {
+            throw new Error(`Environment variable ${key} cannot be converted to the desired type.`);
+        }
+    })();
+    return converted;
+}
+/**
+ * @see getEnv, with the additional constraint that the environment variable must be a valid integer.
+ * Note: the default value is not used instead of an invalid integer. An invalid integer therefore throws an error.
+ */
+function getEnvInt(key, defaultValue) {
+    return getEnv(key, defaultValue, (s) => parseInt(s));
+}
+/**
+ * @see getEnv, with the additional constraint that the environment variable must be a valid JSON object.
+ * Note: the default value is not used instead of an invalid JSON object. An invalid JSON object therefore throws an error.
+ *
+ * @param schema The schema to use to validate the environment variable value
  */
-function getEnv(key, defaultValue) {
-    const value = process.env[key] ?? defaultValue;
-    if (value === undefined)
-        throw new Error(`Environment variable ${key} is not defined and no default value was provided.`);
-    return value;
+function getEnvJson(key, defaultValue, schema) {
+    return getEnv(key, defaultValue, (s) => JSON.parse(s));
 }
 const [currentTsMs, setCurrentTsMs] = whispr_1.Whispr.create(Date.now());
 let currentTsMsInterval = null;

package/dist/react/logger-display.d.ts

@@ -1,4 +1,4 @@
 export type LoggerReactDisplayProps = {
     zIndex?: number;
 };
-export declare function LoggerReactDisplay({ zIndex }: LoggerReactDisplayProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function LoggerReactDisplay({ zIndex }: LoggerReactDisplayProps): import("react").JSX.Element | null;

package/dist/react-ui/button.d.ts

@@ -4,4 +4,4 @@ export type ButtonProps = {
     className?: string;
     onError?: (error: unknown) => void;
 };
-export default function Button({ onClick, children, className, onError }: ButtonProps): import("react/jsx-runtime").JSX.Element;
+export default function Button({ onClick, children, className, onError }: ButtonProps): import("react").JSX.Element;

package/dist/react-ui/copiable.d.ts

@@ -2,4 +2,4 @@ export type CopiableProps = {
     value: string;
     className?: string;
 };
-export default function Copiable({ value, className }: CopiableProps): import("react/jsx-runtime").JSX.Element;
+export default function Copiable({ value, className }: CopiableProps): import("react").JSX.Element;

package/dist/react-ui/form.d.ts

@@ -24,4 +24,4 @@ export type FormComponentProps<T extends Record<string, string>> = {
         button: string;
     };
 };
-export default function FormComponent<T extends Record<string, string>>(props: FormComponentProps<T>): import("react/jsx-runtime").JSX.Element;
+export default function FormComponent<T extends Record<string, string>>(props: FormComponentProps<T>): import("react").JSX.Element;

package/dist/react-ui/input.d.ts

@@ -23,4 +23,4 @@ export type InputComponentProps<V extends InputComponentPropsVariants> = {
     validate?: (value: string) => void;
     variants: V;
 };
-export default function InputComponent<Variants extends InputComponentPropsVariants>(props: InputComponentProps<Variants>): import("react/jsx-runtime").JSX.Element;
+export default function InputComponent<Variants extends InputComponentPropsVariants>(props: InputComponentProps<Variants>): import("react").JSX.Element;

package/dist/react-ui/loader.d.ts

@@ -7,4 +7,4 @@ export type LoaderProps<T> = {
     }) => React.ReactNode;
     loader?: React.ReactNode;
 };
-export default function Loader<T>(props: LoaderProps<T>): import("react/jsx-runtime").JSX.Element;
+export default function Loader<T>(props: LoaderProps<T>): React.JSX.Element;

package/dist/react-ui/modal.d.ts

@@ -10,4 +10,4 @@ export type ModalComponentProps = {
     animate?: boolean;
     panelClassName?: string;
 };
-export default function ModalComponent({ children, open, setOpen, animate, panelClassName, }: ModalComponentProps): import("react/jsx-runtime").JSX.Element | null;
+export default function ModalComponent({ children, open, setOpen, animate, panelClassName, }: ModalComponentProps): import("react").JSX.Element | null;

package/dist/react-ui/table.d.ts

@@ -2,4 +2,4 @@ export type TableProps = {
     value: (string | React.ReactNode)[][];
     headers: string[];
 };
-export default function Table({ value, headers }: TableProps): import("react/jsx-runtime").JSX.Element;
+export default function Table({ value, headers }: TableProps): import("react").JSX.Element;

package/dist/react-ui/textButton.d.ts

@@ -4,4 +4,4 @@ export type TextButtonProps = Omit<ButtonProps, 'children'> & {
     title: string;
     icon?: React.ReactElement<LucideIcon>;
 };
-export default function TextButton({ title, onClick, className, icon }: TextButtonProps): import("react/jsx-runtime").JSX.Element;
+export default function TextButton({ title, onClick, className, icon }: TextButtonProps): import("react").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cripty2001/utils",
-  "version": "0.0.229",
+  "version": "0.0.231",
   "description": "Internal Set of utils. If you need them use them, otherwise go to the next package ;)",
   "homepage": "https://github.com/cripty2001/utils#readme",
   "bugs": {
@@ -12,6 +12,9 @@
   },
   "license": "MIT",
   "author": "Fabio Mauri <cripty2001@outlook.com>",
+  "engines": {
+    "node": ">=22"
+  },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
@@ -27,6 +30,7 @@
   ],
   "dependencies": {
     "@cripty2001/whispr": "^0.4.1",
+    "@sinclair/typebox": "^0.34.41",
     "cors": "^2.8.6",
     "lodash": "^4.17.21"
   },
@@ -34,20 +38,16 @@
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.5",
     "@types/lodash": "^4.17.21",
-    "@types/mjml": "^4.7.4",
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.13.3",
     "@types/react": "^19",
     "react": "^19",
-    "typescript": "^5.9.3"
+    "typescript": "^7.0.2"
   },
   "peerDependencies": {
     "@msgpack/msgpack": "^3.1.2",
-    "@sinclair/typebox": "^0.34.41",
     "dotenv": "^17.2.3",
     "express": "^5.2.1",
-    "handlebars": "^4.7.8",
     "lucide-react": ">=0.552.0",
-    "mjml": "^4.17.1",
     "react": "^19"
   },
   "peerDependenciesMeta": {
@@ -101,11 +101,6 @@
       "types": "./dist/Appserver/client.d.ts",
       "require": "./dist/Appserver/client.js"
     },
-    "./mail-template": {
-      "import": "./dist/MailTemplate/index.js",
-      "types": "./dist/MailTemplate/index.d.ts",
-      "require": "./dist/MailTemplate/index.js"
-    },
     "./react": {
       "import": "./dist/react/index.js",
       "types": "./dist/react/index.d.ts",