melperjs 5.0.0 → 6.0.0

package/src/index.js

@@ -1,8 +1,8 @@
 import xss from "xss";
+import setCookieParser from "set-cookie-parser";
 import camelCase from "lodash/camelCase.js";
 import capitalize from "lodash/capitalize.js";
 import isEmpty from "lodash/isEmpty.js";
-import setCookieParser from "set-cookie-parser";
 
 
 export const CONSTANTS = {
@@ -17,8 +17,8 @@ export function Exception(message, response = {}, name = null) {
     return {
         name: pascalCase(name),
         message,
-        response,
-    }
+        response
+    };
 }
 
 export function time() {
@@ -91,7 +91,7 @@ export function lowerCaseFirst(str) {
     return str[0].toLowerCase() + str.slice(1);
 }
 
-export function titleString(str) {
+export function titleCase(str) {
     str = str || "";
     return str
         .split(' ')
@@ -142,6 +142,36 @@ export function randomHex(length) {
     return result;
 }
 
+export function randomInteger(min, max, callback) {
+    const minNotSpecified = typeof max === 'undefined' || typeof max === 'function';
+
+    if (minNotSpecified) {
+        callback = max;
+        max = min;
+        min = 0;
+    }
+
+    const isSync = typeof callback === 'undefined';
+
+    if (typeof min !== 'number' || typeof max !== 'number') {
+        throw new Error('min and max must be numerical values');
+    }
+    if (max <= min) {
+        throw new Error('max must be greater than min');
+    }
+
+    const randomNumber = Math.floor(Math.random() * (max - min)) + min;
+
+    if (isSync) {
+        return randomNumber;
+    } else {
+        if (typeof callback !== 'function') {
+            throw new Error('callback must be a function');
+        }
+        callback(randomNumber);
+    }
+}
+
 export function randomUuid(useDashes = true) {
     let d = Date.now();
     const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -189,9 +219,10 @@ export function isIntlHttpCode(httpCode) {
         httpCode === undefined ||
         httpCode === null ||
         httpCode === 0 ||
+        httpCode === 100 ||
         httpCode === 402 ||
         httpCode === 407 ||
-        httpCode === 466 ||
+        (460 <= httpCode && httpCode < 470) ||
         500 <= httpCode
     );
 }

package/src/node.js

@@ -5,10 +5,8 @@ import {networkInterfaces} from "os";
 import {execSync} from "child_process";
 
 import bcrypt from "bcrypt";
-import axios from "axios";
-import {HttpsProxyAgent} from "hpagent";
 
-import {CONSTANTS, randomWeighted, sleep} from "./index.js";
+import {CONSTANTS, randomWeighted, splitLines} from "./index.js";
 
 
 export function tokenString(length, useNumbers = true, useUppercase = false) {
@@ -144,50 +142,14 @@ export function proxyObject(...args) {
     return proxy;
 }
 
-export async function proxify(proxyConfig, callback = formatProxy) {
-    proxyConfig = proxyConfig || {};
-    const timeout = 7000;
-    if (proxyConfig.mode === 1) {
-        return callback(proxyConfig.proxy);
-    } else if (proxyConfig.mode === 2) {
-        const proxy = callback(proxyConfig.proxy);
-        try {
-            await axios.get(proxyConfig.resetApi, {timeout});
-        } catch {
-            return false;
-        }
-        await sleep(5);
-        for (let i = 0; i < 5; i++) {
-            try {
-                const res = await axios.get("https://api64.ipify.org", {
-                    timeout,
-                    httpsAgent: new HttpsProxyAgent({proxy, timeout: 7000})
-                });
-                if (res.status === 200)
-                    return proxy;
-            } catch {
-                await sleep(3);
-            }
-        }
-    } else if (proxyConfig.mode === 3) {
-        try {
-            const res = await axios.get(proxyConfig.resetApi, {timeout});
-            if (res.status === 200)
-                return callback(proxyConfig.proxy);
-        } catch {
-            return false;
-        }
-    } else if (proxyConfig.mode === 4) {
-        return callback(proxyConfig.proxy).replace("{SESSION}", tokenHex(8));
-    } else if (proxyConfig.mode === 5) {
-        try {
-            const lines = proxyConfig.proxy.split("\n");
-            const line = lines[crypto.randomInt(0, lines.length)];
-            return callback(line);
-        } catch {
-            return false;
-        }
-    }
-
-    return null;
+export function proxyValue(proxies) {
+    let proxy;
+    proxies = proxies || "";
+    proxies = splitLines(proxies);
+    if (proxies.length < 1)
+        return null;
+    proxy = proxies[crypto.randomInt(0, proxies.length)];
+    proxy = formatProxy(proxy);
+    proxy = proxy.replace("{SESSION}", tokenHex(8));
+    return proxy || null;
 }

package/test/script.js

@@ -40,11 +40,12 @@ import * as nodeHelper from "../src/node.js";
     console.log(helper.pascalCase("pascal case"));
     console.log(helper.upperCaseFirst("first letter upper"));
     console.log(helper.lowerCaseFirst("First Letter Lower"));
-    console.log(helper.titleString("THIS mUsT be Title"));
+    console.log(helper.titleCase("THIS mUsT be Title"));
     console.log(helper.limitString("LONG TEXT", 7));
     console.log(helper.safeString("<strong>SAFE TEXT</strong>"));
     console.log(helper.randomString(32, true, true));
     console.log(helper.randomHex(8));
+    console.log(helper.randomInteger(100, 1000));
     console.log(helper.randomUuid(true));
     console.log(helper.randomWeighted({strongProbability: 1000, lowProbability: 1}));
     console.log(nodeHelper.tokenString(32, true, true));
@@ -61,7 +62,7 @@ import * as nodeHelper from "../src/node.js";
     const proxy = nodeHelper.formatProxy("127.0.0.1:8080:id:pw-{SESSION}");
     console.log(proxy);
     console.log(nodeHelper.proxyObject(proxy));
-    console.log(await nodeHelper.proxify({mode: 4, proxy}));
+    console.log(nodeHelper.proxyValue(proxy));
     console.log(nodeHelper.serverIp());
     console.log("HTTP CODE: 400 (Bad Request) ?", helper.isIntlHttpCode(401));
     console.log("HTTP CODE: 407 (Failed Proxy Auth) ?", helper.isIntlHttpCode(407));