@noxfly/noxus 1.2.0 → 2.1.0

package/dist/renderer.d.mts

@@ -1 +1 @@
-export { o as IBatchRequestItem, p as IBatchRequestPayload, q as IBatchResponsePayload, s as IRendererEventMessage, n as IRequest, I as IResponse, r as RENDERER_EVENT_TYPE, v as RendererEventHandler, x as RendererEventRegistry, w as RendererEventSubscription, R as Request, t as createRendererEventMessage, u as isRendererEventMessage } from './index-5OkVPHfI.mjs';
+export { p as IBatchRequestItem, q as IBatchRequestPayload, r as IBatchResponsePayload, b as IPortRequester, t as IRendererEventMessage, o as IRequest, I as IResponse, N as NoxRendererClient, s as RENDERER_EVENT_TYPE, z as RendererClientOptions, w as RendererEventHandler, y as RendererEventRegistry, x as RendererEventSubscription, R as Request, u as createRendererEventMessage, v as isRendererEventMessage } from './index-CI3OMzNR.mjs';

package/dist/renderer.d.ts

@@ -1 +1 @@
-export { o as IBatchRequestItem, p as IBatchRequestPayload, q as IBatchResponsePayload, s as IRendererEventMessage, n as IRequest, I as IResponse, r as RENDERER_EVENT_TYPE, v as RendererEventHandler, x as RendererEventRegistry, w as RendererEventSubscription, R as Request, t as createRendererEventMessage, u as isRendererEventMessage } from './index-5OkVPHfI.js';
+export { p as IBatchRequestItem, q as IBatchRequestPayload, r as IBatchResponsePayload, b as IPortRequester, t as IRendererEventMessage, o as IRequest, I as IResponse, N as NoxRendererClient, s as RENDERER_EVENT_TYPE, z as RendererClientOptions, w as RendererEventHandler, y as RendererEventRegistry, x as RendererEventSubscription, R as Request, u as createRendererEventMessage, v as isRendererEventMessage } from './index-CI3OMzNR.js';

package/dist/renderer.js

@@ -28,6 +28,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  NoxRendererClient: () => NoxRendererClient,
   RENDERER_EVENT_TYPE: () => RENDERER_EVENT_TYPE,
   RendererEventRegistry: () => RendererEventRegistry,
   Request: () => Request,
@@ -134,8 +135,9 @@ var RootInjector = new AppInjector("root");
 
 // src/request.ts
 var _Request = class _Request {
-  constructor(event, id, method, path, body) {
+  constructor(event, senderId, id, method, path, body) {
     __publicField(this, "event");
+    __publicField(this, "senderId");
     __publicField(this, "id");
     __publicField(this, "method");
     __publicField(this, "path");
@@ -143,6 +145,7 @@ var _Request = class _Request {
     __publicField(this, "context", RootInjector.createScope());
     __publicField(this, "params", {});
     this.event = event;
+    this.senderId = senderId;
     this.id = id;
     this.method = method;
     this.path = path;
@@ -249,8 +252,255 @@ var _RendererEventRegistry = class _RendererEventRegistry {
 };
 __name(_RendererEventRegistry, "RendererEventRegistry");
 var RendererEventRegistry = _RendererEventRegistry;
+
+// src/renderer-client.ts
+var DEFAULT_INIT_EVENT = "init-port";
+var DEFAULT_BRIDGE_NAMES = [
+  "noxus",
+  "ipcRenderer"
+];
+function defaultRequestId() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  return `${Date.now().toString(16)}-${Math.floor(Math.random() * 1e8).toString(16)}`;
+}
+__name(defaultRequestId, "defaultRequestId");
+function normalizeBridgeNames(preferred) {
+  const names = [];
+  const add = /* @__PURE__ */ __name((name) => {
+    if (!name) return;
+    if (!names.includes(name)) {
+      names.push(name);
+    }
+  }, "add");
+  if (Array.isArray(preferred)) {
+    for (const name of preferred) {
+      add(name);
+    }
+  } else {
+    add(preferred);
+  }
+  for (const fallback of DEFAULT_BRIDGE_NAMES) {
+    add(fallback);
+  }
+  return names;
+}
+__name(normalizeBridgeNames, "normalizeBridgeNames");
+function resolveBridgeFromWindow(windowRef, preferred) {
+  const names = normalizeBridgeNames(preferred);
+  const globalRef = windowRef;
+  if (!globalRef) {
+    return null;
+  }
+  for (const name of names) {
+    const candidate = globalRef[name];
+    if (candidate && typeof candidate.requestPort === "function") {
+      return candidate;
+    }
+  }
+  return null;
+}
+__name(resolveBridgeFromWindow, "resolveBridgeFromWindow");
+var _NoxRendererClient = class _NoxRendererClient {
+  constructor(options = {}) {
+    __publicField(this, "events", new RendererEventRegistry());
+    __publicField(this, "pendingRequests", /* @__PURE__ */ new Map());
+    __publicField(this, "requestPort");
+    __publicField(this, "socketPort");
+    __publicField(this, "senderId");
+    __publicField(this, "bridge");
+    __publicField(this, "initMessageType");
+    __publicField(this, "windowRef");
+    __publicField(this, "generateRequestId");
+    __publicField(this, "isReady", false);
+    __publicField(this, "setupPromise");
+    __publicField(this, "setupResolve");
+    __publicField(this, "setupReject");
+    __publicField(this, "onWindowMessage", /* @__PURE__ */ __name((event) => {
+      if (event.data?.type !== this.initMessageType) {
+        return;
+      }
+      if (!Array.isArray(event.ports) || event.ports.length < 2) {
+        const error = new Error("[Noxus] Renderer expected two MessagePorts (request + socket).");
+        console.error(error);
+        this.setupReject?.(error);
+        this.resetSetupState();
+        return;
+      }
+      this.windowRef.removeEventListener("message", this.onWindowMessage);
+      this.requestPort = event.ports[0];
+      this.socketPort = event.ports[1];
+      this.senderId = event.data.senderId;
+      if (this.requestPort === void 0 || this.socketPort === void 0) {
+        const error = new Error("[Noxus] Renderer failed to receive valid MessagePorts.");
+        console.error(error);
+        this.setupReject?.(error);
+        this.resetSetupState();
+        return;
+      }
+      this.attachRequestPort(this.requestPort);
+      this.attachSocketPort(this.socketPort);
+      this.isReady = true;
+      this.setupResolve?.();
+      this.resetSetupState(true);
+    }, "onWindowMessage"));
+    __publicField(this, "onSocketMessage", /* @__PURE__ */ __name((event) => {
+      if (this.events.tryDispatchFromMessageEvent(event)) {
+        return;
+      }
+      console.warn("[Noxus] Received a socket message that is not a renderer event payload.", event.data);
+    }, "onSocketMessage"));
+    __publicField(this, "onRequestMessage", /* @__PURE__ */ __name((event) => {
+      if (this.events.tryDispatchFromMessageEvent(event)) {
+        return;
+      }
+      const response = event.data;
+      if (!response || typeof response.requestId !== "string") {
+        console.error("[Noxus] Renderer received an invalid response payload.", response);
+        return;
+      }
+      const pending = this.pendingRequests.get(response.requestId);
+      if (!pending) {
+        console.error(`[Noxus] No pending handler found for request ${response.requestId}.`);
+        return;
+      }
+      this.pendingRequests.delete(response.requestId);
+      this.onRequestCompleted(pending, response);
+      if (response.status >= 400) {
+        pending.reject(response);
+        return;
+      }
+      pending.resolve(response.body);
+    }, "onRequestMessage"));
+    this.windowRef = options.windowRef ?? window;
+    const resolvedBridge = options.bridge ?? resolveBridgeFromWindow(this.windowRef, options.bridgeName);
+    this.bridge = resolvedBridge ?? null;
+    this.initMessageType = options.initMessageType ?? DEFAULT_INIT_EVENT;
+    this.generateRequestId = options.generateRequestId ?? defaultRequestId;
+  }
+  async setup() {
+    if (this.isReady) {
+      return Promise.resolve();
+    }
+    if (this.setupPromise) {
+      return this.setupPromise;
+    }
+    if (!this.bridge || typeof this.bridge.requestPort !== "function") {
+      throw new Error("[Noxus] Renderer bridge is missing requestPort().");
+    }
+    this.setupPromise = new Promise((resolve, reject) => {
+      this.setupResolve = resolve;
+      this.setupReject = reject;
+    });
+    this.windowRef.addEventListener("message", this.onWindowMessage);
+    this.bridge.requestPort();
+    return this.setupPromise;
+  }
+  dispose() {
+    this.windowRef.removeEventListener("message", this.onWindowMessage);
+    this.requestPort?.close();
+    this.socketPort?.close();
+    this.requestPort = void 0;
+    this.socketPort = void 0;
+    this.senderId = void 0;
+    this.isReady = false;
+    this.pendingRequests.clear();
+  }
+  async request(request) {
+    const senderId = this.senderId;
+    const requestId = this.generateRequestId();
+    if (senderId === void 0) {
+      return Promise.reject(this.createErrorResponse(requestId, "MessagePort is not available"));
+    }
+    const readinessError = this.validateReady(requestId);
+    if (readinessError) {
+      return Promise.reject(readinessError);
+    }
+    const message = {
+      requestId,
+      senderId,
+      ...request
+    };
+    return new Promise((resolve, reject) => {
+      const pending = {
+        resolve,
+        reject: /* @__PURE__ */ __name((response) => reject(response), "reject"),
+        request: message,
+        submittedAt: Date.now()
+      };
+      this.pendingRequests.set(message.requestId, pending);
+      this.requestPort.postMessage(message);
+    });
+  }
+  async batch(requests) {
+    return this.request({
+      method: "BATCH",
+      path: "",
+      body: {
+        requests
+      }
+    });
+  }
+  getSenderId() {
+    return this.senderId;
+  }
+  onRequestCompleted(pending, response) {
+    if (typeof console.groupCollapsed === "function") {
+      console.groupCollapsed(`${response.status} ${pending.request.method} /${pending.request.path}`);
+    }
+    if (response.error) {
+      console.error("error message:", response.error);
+    }
+    if (response.body !== void 0) {
+      console.info("response:", response.body);
+    }
+    console.info("request:", pending.request);
+    console.info(`Request duration: ${Date.now() - pending.submittedAt} ms`);
+    if (typeof console.groupCollapsed === "function") {
+      console.groupEnd();
+    }
+  }
+  attachRequestPort(port) {
+    port.onmessage = this.onRequestMessage;
+    port.start();
+  }
+  attachSocketPort(port) {
+    port.onmessage = this.onSocketMessage;
+    port.start();
+  }
+  validateReady(requestId) {
+    if (!this.isElectronEnvironment()) {
+      return this.createErrorResponse(requestId, "Not running in Electron environment");
+    }
+    if (!this.requestPort) {
+      return this.createErrorResponse(requestId, "MessagePort is not available");
+    }
+    return void 0;
+  }
+  createErrorResponse(requestId, message) {
+    return {
+      status: 500,
+      requestId,
+      error: message
+    };
+  }
+  resetSetupState(success = false) {
+    if (!success) {
+      this.setupPromise = void 0;
+    }
+    this.setupResolve = void 0;
+    this.setupReject = void 0;
+  }
+  isElectronEnvironment() {
+    return typeof window !== "undefined" && /Electron/.test(window.navigator.userAgent);
+  }
+};
+__name(_NoxRendererClient, "NoxRendererClient");
+var NoxRendererClient = _NoxRendererClient;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  NoxRendererClient,
   RENDERER_EVENT_TYPE,
   RendererEventRegistry,
   Request,

package/dist/renderer.mjs

@@ -106,8 +106,9 @@ var RootInjector = new AppInjector("root");
 
 // src/request.ts
 var _Request = class _Request {
-  constructor(event, id, method, path, body) {
+  constructor(event, senderId, id, method, path, body) {
     __publicField(this, "event");
+    __publicField(this, "senderId");
     __publicField(this, "id");
     __publicField(this, "method");
     __publicField(this, "path");
@@ -115,6 +116,7 @@ var _Request = class _Request {
     __publicField(this, "context", RootInjector.createScope());
     __publicField(this, "params", {});
     this.event = event;
+    this.senderId = senderId;
     this.id = id;
     this.method = method;
     this.path = path;
@@ -221,7 +223,254 @@ var _RendererEventRegistry = class _RendererEventRegistry {
 };
 __name(_RendererEventRegistry, "RendererEventRegistry");
 var RendererEventRegistry = _RendererEventRegistry;
+
+// src/renderer-client.ts
+var DEFAULT_INIT_EVENT = "init-port";
+var DEFAULT_BRIDGE_NAMES = [
+  "noxus",
+  "ipcRenderer"
+];
+function defaultRequestId() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  return `${Date.now().toString(16)}-${Math.floor(Math.random() * 1e8).toString(16)}`;
+}
+__name(defaultRequestId, "defaultRequestId");
+function normalizeBridgeNames(preferred) {
+  const names = [];
+  const add = /* @__PURE__ */ __name((name) => {
+    if (!name) return;
+    if (!names.includes(name)) {
+      names.push(name);
+    }
+  }, "add");
+  if (Array.isArray(preferred)) {
+    for (const name of preferred) {
+      add(name);
+    }
+  } else {
+    add(preferred);
+  }
+  for (const fallback of DEFAULT_BRIDGE_NAMES) {
+    add(fallback);
+  }
+  return names;
+}
+__name(normalizeBridgeNames, "normalizeBridgeNames");
+function resolveBridgeFromWindow(windowRef, preferred) {
+  const names = normalizeBridgeNames(preferred);
+  const globalRef = windowRef;
+  if (!globalRef) {
+    return null;
+  }
+  for (const name of names) {
+    const candidate = globalRef[name];
+    if (candidate && typeof candidate.requestPort === "function") {
+      return candidate;
+    }
+  }
+  return null;
+}
+__name(resolveBridgeFromWindow, "resolveBridgeFromWindow");
+var _NoxRendererClient = class _NoxRendererClient {
+  constructor(options = {}) {
+    __publicField(this, "events", new RendererEventRegistry());
+    __publicField(this, "pendingRequests", /* @__PURE__ */ new Map());
+    __publicField(this, "requestPort");
+    __publicField(this, "socketPort");
+    __publicField(this, "senderId");
+    __publicField(this, "bridge");
+    __publicField(this, "initMessageType");
+    __publicField(this, "windowRef");
+    __publicField(this, "generateRequestId");
+    __publicField(this, "isReady", false);
+    __publicField(this, "setupPromise");
+    __publicField(this, "setupResolve");
+    __publicField(this, "setupReject");
+    __publicField(this, "onWindowMessage", /* @__PURE__ */ __name((event) => {
+      if (event.data?.type !== this.initMessageType) {
+        return;
+      }
+      if (!Array.isArray(event.ports) || event.ports.length < 2) {
+        const error = new Error("[Noxus] Renderer expected two MessagePorts (request + socket).");
+        console.error(error);
+        this.setupReject?.(error);
+        this.resetSetupState();
+        return;
+      }
+      this.windowRef.removeEventListener("message", this.onWindowMessage);
+      this.requestPort = event.ports[0];
+      this.socketPort = event.ports[1];
+      this.senderId = event.data.senderId;
+      if (this.requestPort === void 0 || this.socketPort === void 0) {
+        const error = new Error("[Noxus] Renderer failed to receive valid MessagePorts.");
+        console.error(error);
+        this.setupReject?.(error);
+        this.resetSetupState();
+        return;
+      }
+      this.attachRequestPort(this.requestPort);
+      this.attachSocketPort(this.socketPort);
+      this.isReady = true;
+      this.setupResolve?.();
+      this.resetSetupState(true);
+    }, "onWindowMessage"));
+    __publicField(this, "onSocketMessage", /* @__PURE__ */ __name((event) => {
+      if (this.events.tryDispatchFromMessageEvent(event)) {
+        return;
+      }
+      console.warn("[Noxus] Received a socket message that is not a renderer event payload.", event.data);
+    }, "onSocketMessage"));
+    __publicField(this, "onRequestMessage", /* @__PURE__ */ __name((event) => {
+      if (this.events.tryDispatchFromMessageEvent(event)) {
+        return;
+      }
+      const response = event.data;
+      if (!response || typeof response.requestId !== "string") {
+        console.error("[Noxus] Renderer received an invalid response payload.", response);
+        return;
+      }
+      const pending = this.pendingRequests.get(response.requestId);
+      if (!pending) {
+        console.error(`[Noxus] No pending handler found for request ${response.requestId}.`);
+        return;
+      }
+      this.pendingRequests.delete(response.requestId);
+      this.onRequestCompleted(pending, response);
+      if (response.status >= 400) {
+        pending.reject(response);
+        return;
+      }
+      pending.resolve(response.body);
+    }, "onRequestMessage"));
+    this.windowRef = options.windowRef ?? window;
+    const resolvedBridge = options.bridge ?? resolveBridgeFromWindow(this.windowRef, options.bridgeName);
+    this.bridge = resolvedBridge ?? null;
+    this.initMessageType = options.initMessageType ?? DEFAULT_INIT_EVENT;
+    this.generateRequestId = options.generateRequestId ?? defaultRequestId;
+  }
+  async setup() {
+    if (this.isReady) {
+      return Promise.resolve();
+    }
+    if (this.setupPromise) {
+      return this.setupPromise;
+    }
+    if (!this.bridge || typeof this.bridge.requestPort !== "function") {
+      throw new Error("[Noxus] Renderer bridge is missing requestPort().");
+    }
+    this.setupPromise = new Promise((resolve, reject) => {
+      this.setupResolve = resolve;
+      this.setupReject = reject;
+    });
+    this.windowRef.addEventListener("message", this.onWindowMessage);
+    this.bridge.requestPort();
+    return this.setupPromise;
+  }
+  dispose() {
+    this.windowRef.removeEventListener("message", this.onWindowMessage);
+    this.requestPort?.close();
+    this.socketPort?.close();
+    this.requestPort = void 0;
+    this.socketPort = void 0;
+    this.senderId = void 0;
+    this.isReady = false;
+    this.pendingRequests.clear();
+  }
+  async request(request) {
+    const senderId = this.senderId;
+    const requestId = this.generateRequestId();
+    if (senderId === void 0) {
+      return Promise.reject(this.createErrorResponse(requestId, "MessagePort is not available"));
+    }
+    const readinessError = this.validateReady(requestId);
+    if (readinessError) {
+      return Promise.reject(readinessError);
+    }
+    const message = {
+      requestId,
+      senderId,
+      ...request
+    };
+    return new Promise((resolve, reject) => {
+      const pending = {
+        resolve,
+        reject: /* @__PURE__ */ __name((response) => reject(response), "reject"),
+        request: message,
+        submittedAt: Date.now()
+      };
+      this.pendingRequests.set(message.requestId, pending);
+      this.requestPort.postMessage(message);
+    });
+  }
+  async batch(requests) {
+    return this.request({
+      method: "BATCH",
+      path: "",
+      body: {
+        requests
+      }
+    });
+  }
+  getSenderId() {
+    return this.senderId;
+  }
+  onRequestCompleted(pending, response) {
+    if (typeof console.groupCollapsed === "function") {
+      console.groupCollapsed(`${response.status} ${pending.request.method} /${pending.request.path}`);
+    }
+    if (response.error) {
+      console.error("error message:", response.error);
+    }
+    if (response.body !== void 0) {
+      console.info("response:", response.body);
+    }
+    console.info("request:", pending.request);
+    console.info(`Request duration: ${Date.now() - pending.submittedAt} ms`);
+    if (typeof console.groupCollapsed === "function") {
+      console.groupEnd();
+    }
+  }
+  attachRequestPort(port) {
+    port.onmessage = this.onRequestMessage;
+    port.start();
+  }
+  attachSocketPort(port) {
+    port.onmessage = this.onSocketMessage;
+    port.start();
+  }
+  validateReady(requestId) {
+    if (!this.isElectronEnvironment()) {
+      return this.createErrorResponse(requestId, "Not running in Electron environment");
+    }
+    if (!this.requestPort) {
+      return this.createErrorResponse(requestId, "MessagePort is not available");
+    }
+    return void 0;
+  }
+  createErrorResponse(requestId, message) {
+    return {
+      status: 500,
+      requestId,
+      error: message
+    };
+  }
+  resetSetupState(success = false) {
+    if (!success) {
+      this.setupPromise = void 0;
+    }
+    this.setupResolve = void 0;
+    this.setupReject = void 0;
+  }
+  isElectronEnvironment() {
+    return typeof window !== "undefined" && /Electron/.test(window.navigator.userAgent);
+  }
+};
+__name(_NoxRendererClient, "NoxRendererClient");
+var NoxRendererClient = _NoxRendererClient;
 export {
+  NoxRendererClient,
   RENDERER_EVENT_TYPE,
   RendererEventRegistry,
   Request,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noxfly/noxus",
-    "version": "1.2.0",
+    "version": "2.1.0",
     "main": "dist/main.js",
     "module": "dist/main.mjs",
     "types": "dist/main.d.ts",
@@ -49,7 +49,7 @@
     "homepage": "https://github.com/NoxFly/noxus",
     "repository": {
         "type": "git",
-        "url": "https://github.com/NoxFly/noxus.git"
+        "url": "git+https://github.com/NoxFly/noxus.git"
     },
     "engines": {
         "node": ">= 20"

package/src/DI/injector-explorer.ts

@@ -5,7 +5,7 @@
  */
 
 import { getControllerMetadata } from "src/decorators/controller.decorator";
-import { getInjectableMetadata } from "src/decorators/injectable.decorator";
+import { getInjectableMetadata } from "src/decorators/injectable.metadata";
 import { getRouteMetadata } from "src/decorators/method.decorator";
 import { getModuleMetadata } from "src/decorators/module.decorator";
 import { Lifetime, RootInjector } from "src/DI/app-injector";

package/src/app.ts

@@ -32,20 +32,24 @@ export interface IApp {
 @Injectable('singleton')
 export class NoxApp {
     private app: IApp | undefined;
+
+    /**
+     *
+     */
     private readonly onRendererMessage = async (event: Electron.MessageEvent): Promise<void> => {
         const { senderId, requestId, path, method, body }: IRequest = event.data;
 
-        const channel = this.socket.get(senderId);
+        const channels = this.socket.get(senderId);
 
-        if(!channel) {
+        if(!channels) {
             Logger.error(`No message channel found for sender ID: ${senderId}`);
             return;
         }
 
         try {
-            const request = new Request(event, requestId, method, path, body);
+            const request = new Request(event, senderId, requestId, method, path, body);
             const response = await this.router.handle(request);
-            channel.port1.postMessage(response);
+            channels.request.port1.postMessage(response);
         }
         catch(err: any) {
             const response: IResponse = {
@@ -55,7 +59,7 @@ export class NoxApp {
                 error: err.message || 'Internal Server Error',
             };
 
-            channel.port1.postMessage(response);
+            channels.request.port1.postMessage(response);
         }
     };
 
@@ -93,14 +97,16 @@ export class NoxApp {
             this.shutdownChannel(senderId);
         }
 
-        const channel = new MessageChannelMain();
+        const requestChannel = new MessageChannelMain();
+        const socketChannel = new MessageChannelMain();
 
-        channel.port1.on('message', this.onRendererMessage);
-        channel.port1.start();
+        requestChannel.port1.on('message', this.onRendererMessage);
+        requestChannel.port1.start();
+        socketChannel.port1.start();
 
-        this.socket.register(senderId, channel);
+        this.socket.register(senderId, requestChannel, socketChannel);
 
-        event.sender.postMessage('port', { senderId }, [channel.port2]);
+        event.sender.postMessage('port', { senderId }, [requestChannel.port2, socketChannel.port2]);
     }
 
     /**
@@ -120,16 +126,19 @@ export class NoxApp {
      * @param remove - Whether to remove the channel from the messagePorts map.
      */
     private shutdownChannel(channelSenderId: number): void {
-        const channel = this.socket.get(channelSenderId);
+        const channels = this.socket.get(channelSenderId);
 
-        if(!channel) {
+        if(!channels) {
             Logger.warn(`No message channel found for sender ID: ${channelSenderId}`);
             return;
         }
 
-        channel.port1.off('message', this.onRendererMessage);
-        channel.port1.close();
-        channel.port2.close();
+        channels.request.port1.off('message', this.onRendererMessage);
+        channels.request.port1.close();
+        channels.request.port2.close();
+
+        channels.socket.port1.close();
+        channels.socket.port2.close();
 
         this.socket.unregister(channelSenderId);
     }