makiwara 2.1.3 → 2.1.5

package/README.md

@@ -3,8 +3,8 @@
 [![node version](https://img.shields.io/node/v/makiwara.svg)](https://www.npmjs.com/package/makiwara)
 [![npm version](https://badge.fury.io/js/makiwara.svg)](https://badge.fury.io/js/makiwara)
 [![downloads count](https://img.shields.io/npm/dt/makiwara.svg)](https://www.npmjs.com/package/makiwara)
-[![license](https://img.shields.io/npm/l/makiwara.svg)](https://www.npmjs.com/package/makiwara)
-[![travis-ci](https://api.travis-ci.com/piecioshka/makiwara.svg?branch=master)](https://app.travis-ci.com/github/piecioshka/makiwara)
+[![license](https://img.shields.io/npm/l/makiwara.svg)](https://piecioshka.mit-license.org)
+[![github-ci](https://github.com/piecioshka/makiwara/actions/workflows/testing.yml/badge.svg)](https://github.com/piecioshka/makiwara/actions/workflows/testing.yml)
 
 :hammer: Benchmark URL to gain HTTP requests limits
 
@@ -19,7 +19,7 @@ npm install -g makiwara
 ```javascript
 const { attack } = require('makiwara');
 
-attack('http://example.org', [1, 5, 10], 'sequence')
+attack('https://example.org', [1, 5, 10], 'sequence')
     .then((result) => {
         console.log(result);
     })
@@ -36,11 +36,11 @@ makiwara --help
 Usage: cli [options]
 
 Example:
-    makiwara -u http://localhost:3000 -t 10 -s sequence
+    makiwara -u https://localhost:3000 -t 10 -s sequence
 
 Options:
   -V, --version                         output the version number
-  -u, --url <url>                       Define URL to attack. Ex. http://example.org/
+  -u, --url <url>                       Define URL to attack. Ex. https://example.org/
   -t, --timelimit [numbers]             Define list of time thresholds (in seconds). Ex. 10,100,1000
   -s, --strategy <concurrent|sequence>  Define strategy for making requests
   -h, --help                            output usage information
@@ -101,4 +101,4 @@ npm run coverage
 
 ## License
 
-[The MIT License](http://piecioshka.mit-license.org) @ 2017-2019
+[The MIT License](https://piecioshka.mit-license.org) @ 2017-2019

package/bin/cli.js

@@ -26,10 +26,10 @@ const STRATEGY_REGEXP = /^(concurrent|sequence)$/;
 
 program
     .version(pkg.version)
-    .option('-u, --url <url>', 'Define URL to attack. Ex. http://example.org/')
+    .option('-u, --url <url>', 'Define URL to attack. Ex. https://example.org/')
     .option('-t, --timelimit [numbers]', 'Define list of time thresholds (in seconds). Ex. 10,100,1000')
     .option('-s, --strategy <concurrent|sequence>', 'Define strategy for making requests')
-    .description('Example:\n\tmakiwara -u http://localhost:3000 -t 10 -s sequence')
+    .description('Example:\n\tmakiwara -u https://localhost:3000 -t 10 -s sequence')
     .parse(process.argv);
 
 if (typeof program.url !== 'string') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "makiwara",
   "description": "Benchmark URL to gain HTTP requests limits",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "license": "MIT",
   "author": {
     "name": "Piotr Kowalski",
@@ -18,32 +18,32 @@
     "prepare": "npm run snyk-protect"
   },
   "dependencies": {
-    "@types/node": "^17.0.8",
+    "@types/node": "^22.7.5",
     "ansi-bold": "^0.1.1",
     "ansi-cyan": "^0.1.1",
     "ansi-gray": "^0.1.1",
     "ansi-red": "^0.1.1",
     "ansi-yellow": "^0.1.1",
-    "axios": "^0.24.0",
-    "commander": "^8.3.0",
-    "http-status-codes": "^2.2.0",
+    "axios": "^1.7.7",
+    "commander": "^12.1.0",
+    "http-status-codes": "^2.3.0",
     "is-url": "^1.2.4",
-    "node-fetch": "^3.1.0",
-    "ora": "^6.0.1",
-    "snyk": "^1.826.0",
-    "table": "^6.8.0"
+    "node-fetch": "^3.3.2",
+    "ora": "^8.1.0",
+    "snyk": "^1.1293.1",
+    "table": "^6.8.2"
   },
   "devDependencies": {
-    "@types/jasmine": "^3.10.3",
+    "@types/jasmine": "^5.1.4",
     "eslint": "^8.6.0",
-    "eslint-config-piecioshka": "^2.0.4",
-    "jasmine": "^4.0.2",
-    "nock": "^13.2.2",
+    "eslint-config-piecioshka": "^2.3.1",
+    "jasmine": "^5.4.0",
+    "nock": "^13.5.5",
     "nyc": "^15.1.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/piecioshka/makiwara.git"
+    "url": "git+https://github.com/piecioshka/makiwara.git"
   },
   "bugs": {
     "url": "https://github.com/piecioshka/makiwara/issues"
@@ -71,6 +71,8 @@
     "commonjs"
   ],
   "main": "./index.js",
-  "bin": "./bin/cli.js",
+  "bin": {
+    "makiwara": "bin/cli.js"
+  },
   "snyk": true
 }

package/src/color-logs.js

@@ -3,10 +3,10 @@ function setupColorLogFunction(name) {
     console[name] = (...args) => console.log(...args.map(fn));
 }
 
-setupColorLogFunction('red');
-setupColorLogFunction('yellow');
-setupColorLogFunction('gray');
-setupColorLogFunction('cyan');
+setupColorLogFunction("red");
+setupColorLogFunction("yellow");
+setupColorLogFunction("gray");
+setupColorLogFunction("cyan");
 
 /**
  * @type console

package/src/display.js

@@ -1,27 +1,27 @@
-const { table } = require('table');
-const HTTPStatusCodes = require('http-status-codes');
-const bold = require('ansi-bold');
+const { table } = require("table");
+const HTTPStatusCodes = require("http-status-codes");
+const bold = require("ansi-bold");
 
-const { collapseArray } = require('./object-util');
+const { collapseArray } = require("./object-util");
 
 const SECOND_IN_MILLISECONDS = 1000;
 
 const tableOptions = {
     columns: {
         0: { width: 22 },
-        1: { width: 30 }
-    }
+        1: { width: 30 },
+    },
 };
 
 function appendHttpStatusCodeLabel(statusCodeEntries) {
-    statusCodeEntries.forEach(entry => {
+    statusCodeEntries.forEach((entry) => {
         let label = null;
         try {
             label = HTTPStatusCodes.getStatusText(entry[0]);
         } catch (err) {
             console.red(err);
         }
-        if (typeof label === 'string') {
+        if (typeof label === "string") {
             entry[0] = `${entry[0]} ${label}`;
         }
     });
@@ -29,28 +29,31 @@ function appendHttpStatusCodeLabel(statusCodeEntries) {
 
 function displayRequestsSummary(attackResults) {
     const statusCodes = collapseArray(
-        attackResults.requests.map(r => r.status)
+        attackResults.requests.map((r) => r.status)
     );
-    const isEmptyResults = (statusCodes.length === 0);
+    const isEmptyResults = statusCodes.length === 0;
 
     if (isEmptyResults) {
-        statusCodes['-'] = -1;
+        statusCodes["-"] = -1;
     } else {
         appendHttpStatusCodeLabel(statusCodes);
     }
 
-    const data = [['HTTP Status Code', 'Requests quantity']
-        .map(bold)]
-        .concat(statusCodes);
+    const data = [["HTTP Status Code", "Requests quantity"].map(bold)].concat(
+        statusCodes
+    );
     console.log(table(data, tableOptions));
 }
 
 function displayAttackSummary(results) {
     const meta = [];
-    meta.push(['Type', results.type]);
-    const durationInSeconds = (results.duration / SECOND_IN_MILLISECONDS);
-    meta.push(['Effective Duration', `${durationInSeconds.toLocaleString()} seconds`]);
-    meta.push(['Times', `${results.times}`]);
+    meta.push(["Type", results.type]);
+    const durationInSeconds = results.duration / SECOND_IN_MILLISECONDS;
+    meta.push([
+        "Effective Duration",
+        `${durationInSeconds.toLocaleString()} seconds`,
+    ]);
+    meta.push(["Times", `${results.times}`]);
     console.log(table(meta, tableOptions));
 }
 
@@ -65,5 +68,5 @@ function displayError(err) {
 
 module.exports = {
     displaySummary,
-    displayError
+    displayError,
 };

package/src/local-fetch.js

@@ -1,7 +1,7 @@
-const http = require('http');
-const https = require('https');
+const http = require("http");
+const https = require("https");
 
-const IS_HTTP = (/^https/);
+const IS_HTTP = /^https/;
 
 function getProtocol(url) {
     if (IS_HTTP.test(url)) {
@@ -12,20 +12,20 @@ function getProtocol(url) {
 
 async function makeRequest(url, options = {}) {
     const response = {
-        status: null,
-        text: '',
+        status: 0,
+        text: "",
     };
     const protocol = getProtocol(url);
     return new Promise((resolve, reject) => {
-        protocol.get(url, options, res => {
-            res.addListener('data', data => {
+        protocol.get(url, options, (res) => {
+            res.addListener("data", (data) => {
                 response.text += data.toString();
             });
-            res.addListener('error', err => {
+            res.addListener("error", (err) => {
                 reject(err);
             });
-            res.addListener('end', () => {
-                response.status = res.statusCode;
+            res.addListener("end", () => {
+                response.status = Number(res.statusCode);
                 resolve(response);
             });
         });

package/src/make-requests.js

@@ -1,12 +1,12 @@
-const http = require('http');
+const http = require("http");
 
 // const makeRequest = require('node-fetch');
-const makeRequest = require('./local-fetch');
+const makeRequest = require("./local-fetch");
 
 const SECOND_IN_MILLISECONDS = 1000;
 
 function pause(timeoutInSeconds) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         setTimeout(resolve, timeoutInSeconds * SECOND_IN_MILLISECONDS);
     });
 }
@@ -20,7 +20,7 @@ function status(i) {
 
 async function makeRequestsInConcurrentMode(url, durationInSeconds) {
     if (isNaN(durationInSeconds)) {
-        throw new TypeError('duration should be a number (ex. 1,3,5)');
+        throw new TypeError("duration should be a number (ex. 1,3,5)");
     }
 
     const requests = [];
@@ -44,10 +44,9 @@ async function makeRequestsInConcurrentMode(url, durationInSeconds) {
 
         status(i);
 
-        await makeRequest(url, { agent: false })
-            .then(response => {
-                requests.push(response);
-            });
+        await makeRequest(url, { agent: false }).then((response) => {
+            requests.push(response);
+        });
     }
 
     const endTime = Date.now();
@@ -56,18 +55,18 @@ async function makeRequestsInConcurrentMode(url, durationInSeconds) {
     await pause(durationInSeconds);
 
     return {
-        type: 'Concurrent',
+        type: "Concurrent",
         startTime,
         endTime,
         duration: wholeProcessDuration,
         times: i,
-        requests
+        requests,
     };
 }
 
 async function makeRequestsInSequenceMode(url, durationInSeconds) {
     if (isNaN(durationInSeconds)) {
-        throw new TypeError('duration should be a number (ex. 1,3,5)');
+        throw new TypeError("duration should be a number (ex. 1,3,5)");
     }
 
     const requests = [];
@@ -95,17 +94,17 @@ async function makeRequestsInSequenceMode(url, durationInSeconds) {
     const wholeProcessDuration = endTime - startTime;
 
     return {
-        type: 'Sequence',
+        type: "Sequence",
         startTime,
         endTime,
         duration: wholeProcessDuration,
         times: i,
-        requests
+        requests,
     };
 }
 
 module.exports = {
     makeRequest,
     makeRequestsInSequenceMode,
-    makeRequestsInConcurrentMode
+    makeRequestsInConcurrentMode,
 };

package/src/object-util.js

@@ -9,13 +9,9 @@ function collapseArray(array) {
 
     const entries = Object.entries(hashMap);
 
-    entries.forEach(entry => {
-        entry[0] = Number(entry[0]);
-    });
-
-    return entries;
+    return entries.map((entry) => Number(entry[0]));
 }
 
 module.exports = {
-    collapseArray
+    collapseArray,
 };