Publish v0.3.0

- RateLimiter is no longer the default export, breaks normal JavaScript.
- Code is now somewhat properly tested, to ensure that at least basic functionality is there.

README.md

@@ -8,7 +8,7 @@ Simple but effective way to rate limit Tasks in JavaScript. Anything can be rate
 
 ## Usage
 ```js
-var RateLimiter = require("@xaymar/ratelimiter");
+var { RateLimiter } = require("@xaymar/ratelimiter");
 
 let limitMany = new RateLimiter(4);
 let limitOne = new RateLimiter(1);
@@ -40,7 +40,7 @@ No, but it is relatively easy to do without official support. See the example be
 
 ```js
 // main.js
-var RateLimiter = require("@xaymar/ratelimiter");
+var { RateLimiter } = require("@xaymar/ratelimiter");
 
 let worker = new Worker("worker.js");
 let workerRL = new RateLimiter(1);

package.json

@@ -4,7 +4,7 @@
   "description": "A simple but effective way to rate limit Tasks in JavaScript.",
   "license": "GPLv3",
   "repository": "https://github.com/Xaymar/js-ratelimiter",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "funding": {
 	"type": "patreon",
 	"url": "https://www.patreon.com/xaymar"
@@ -16,7 +16,7 @@
     "compile": "npx tsc",
     "build": "npm run fix && npm run compile",
 	"prepublish": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node ./tests/test.js"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",

source/ratelimiter.ts

@@ -31,7 +31,7 @@ type RateLimiterExecutor = RateLimiterSyncExecutor | RateLimiterAsyncExecutor;
 /** A simple but effective way to rate limit Tasks.
  *
  */
-export default class RateLimiter {
+export class RateLimiter {
 	private _maximum: number = 0;
 	private _available: number = 0;
 	private _instances: any[];

tests/test.js

@@ -0,0 +1,119 @@
+// May require `npm link`.
+const { RateLimiter } = require("../generated/ratelimiter");
+
+async function asyncRunTest(fn, ...args) {
+	try {
+		let msg = await fn(...args);
+		if (msg) {
+			console.log(`✅ ${fn.name}(${args}): ${msg}`);
+		} else {
+			console.log(`✅ ${fn.name}(${args})`);
+		}
+	} catch (ex) {
+		console.log(`❌ ${fn.name}(${args})`)
+		console.error(ex);
+		process.exitCode++;
+	}
+}
+function runTest(fn, ...args) {
+	try {
+		let msg = fn(...args);
+		if (msg) {
+			console.log(`✅ ${fn.name}(${args}): ${msg}`);
+		} else {
+			console.log(`✅ ${fn.name}(${args})`);
+		}
+	} catch (ex) {
+		console.log(`❌ ${fn.name}(${args})`);
+		console.error(ex);
+		process.exitCode++;
+	}
+}
+async function delay(time) {
+	await new Promise((resolve, reject) => {
+		setTimeout(() => {
+			resolve();
+		}, time);
+	});
+}
+
+function test_Construct(limit) {
+	let rl = new RateLimiter(limit);
+}
+
+async function test_TaskLimit(tasks, limit) {
+	let rl = new RateLimiter(limit);
+	let p = new Array();
+	for (let idx = 0; idx < tasks; idx++) {
+		p.push(rl.queue(() => {
+			return true;
+		}));
+	}
+
+	let r = await Promise.all(p);
+	for (res of r) {
+		if (res !== true) {
+			throw new Error("Result is unexpected.");
+		}
+	}
+}
+
+async function test_LimitEnforcement(tasks, limit) {
+	let rl = new RateLimiter(limit);
+	let value = 0;
+	let time = 50;
+
+	let records = [];
+	let t = setInterval(() => {
+		records.push([
+			value, Date.now()
+		]);
+	}, 25);
+
+	let p = new Array();
+	for (let idx = 0; idx < tasks; idx++) {
+		p.push(rl.queue(async () => {
+			await delay(time);
+			value++;
+		}));
+	}
+	await Promise.all(p);
+
+	clearInterval(t);
+
+	let totalTime = 0;
+	let totalValue = 0;
+	for (let n = 1; n < records.length; n++) {
+		let pRecord = records[n - 1];
+		let cRecord = records[n];
+
+		let deltaTime = cRecord[1] - pRecord[1];
+		let deltaValue = cRecord[0] - pRecord[0];
+
+		totalTime += deltaTime;
+		totalValue += deltaValue;
+	}
+	let averageChange = totalValue / totalTime;
+	let normalizedChange = averageChange * time;
+	// setTimeout loses accuracy over time, not sure what the solution is. Accepting +-1 for now.
+	if ((normalizedChange < (limit - 1.)) || (normalizedChange > (limit + 1.))) {
+		throw new Error(`Outside acceptable range (${normalizedChange} is not equal to ${limit}).`);
+	} else {
+		return `Within acceptable range (${normalizedChange} is roughly equal to ${limit}).`
+	}
+}
+
+(async function() {
+	process.exitCode = 0;
+	for (let limit = 1; limit <= 64; limit *= 2) {
+		runTest(test_Construct, limit);
+	}
+	for (let limit = 1; limit <= 10; limit++) {
+		for (let tasks = 1; tasks <= 64; tasks *= 2) {
+			await asyncRunTest(test_TaskLimit, tasks, limit);
+		}
+	}
+	for (let limit = 1; limit <= 10; limit++) {
+		await asyncRunTest(test_LimitEnforcement, 100, limit);
+	}
+})();