From 660af756e6beba8f856a489f6d3d9c71a320e74e Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Tue, 30 Jul 2024 23:03:09 +0100
Subject: [PATCH] Minor Corrections

---
 packages/controller/package.json              | 4 ++--
 packages/controller/src/Controller.ts         | 2 +-
 packages/create/templates/common/package.json | 2 +-
 packages/lib/src/link/link.ts                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/controller/package.json b/packages/controller/package.json
index d83a87b8..2256e2a9 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -29,7 +29,6 @@
 		"jsonwebtoken": "^9.0.1",
 		"jszip": "^3.10.1",
 		"set-blocking": "^2.0.0",
-		"webpack-cli": "^5.1.4",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1",
 		"ws": "^8.13.0",
@@ -54,7 +53,8 @@
 		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-dev-middleware": "^6.1.1",
-		"webpack-merge": "^5.9.0"
+		"webpack-merge": "^5.9.0",
+		"webpack-cli": "^5.1.4"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/controller/src/Controller.ts b/packages/controller/src/Controller.ts
index f256da32..8ae227bc 100644
--- a/packages/controller/src/Controller.ts
+++ b/packages/controller/src/Controller.ts
@@ -95,7 +95,7 @@ export default class Controller {
 	public shouldRestart: boolean = false;
 	_fallbackedRequests: Map<lib.RequestClass<unknown, unknown>, lib.RequestHandler<unknown, unknown>> = new Map();
 	_registeredRequests: Map<lib.RequestClass<unknown, unknown>, lib.RequestHandler<unknown, unknown>> = new Map();
-	_registeredEvents = new Map();
+	_registeredEvents = new Map<lib.EventClass<unknown>, lib.EventHandler<unknown>>();
 	_snoopedEvents = new Map();
 
 	devMiddleware: any | null = null;
diff --git a/packages/create/templates/common/package.json b/packages/create/templates/common/package.json
index 346cce77..b05122b3 100644
--- a/packages/create/templates/common/package.json
+++ b/packages/create/templates/common/package.json
@@ -20,7 +20,7 @@
 	"devDependencies": {
 //%// Typescript and type declarations
 //%if typescript
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"@types/node": "^20.4.5",
 //%endif
 //%if typescript & web
diff --git a/packages/lib/src/link/link.ts b/packages/lib/src/link/link.ts
index ae91a4c8..236b5340 100644
--- a/packages/lib/src/link/link.ts
+++ b/packages/lib/src/link/link.ts
@@ -538,7 +538,7 @@ export class Link {
 		if (!entry) {
 			throw new Error(`Attempt to send unregistered Request ${request.constructor.name}`);
 		}
-		if (this.connector.src.equals(dst)) {
+		if (this.connector.src.addressedTo(dst)) {
 			throw new Error(`Message would return back to sender ${dst}.`);
 		}
 		if (this.validateSent) {
@@ -575,7 +575,7 @@ export class Link {
 		if (!entry) {
 			throw new Error(`Attempt to send unregistered Event ${event.constructor.name}`);
 		}
-		if (this.connector.src.equals(dst)) {
+		if (this.connector.src.addressedTo(dst)) {
 			throw new Error(`Message would return back to sender ${dst}.`);
 		}
 		if (this.validateSent) {