ocpp-ws-io 1.0.0-alpha → 1.0.0

package/dist/index.js

@@ -38056,21 +38056,25 @@ var OCPPClient = class extends import_node_events.EventEmitter {
       }
     });
   }
-  // ─── Handle ──────────────────────────────────────────────────
-  handle(methodOrHandler, handler) {
-    if (typeof methodOrHandler === "function") {
-      this._wildcardHandler = methodOrHandler;
-    } else if (typeof methodOrHandler === "string" && handler) {
-      this._handlers.set(methodOrHandler, handler);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  handle(...args) {
+    if (args.length === 1 && typeof args[0] === "function") {
+      this._wildcardHandler = args[0];
+    } else if (args.length === 2 && typeof args[0] === "string" && typeof args[1] === "function") {
+      this._handlers.set(args[0], args[1]);
+    } else if (args.length === 3 && typeof args[0] === "string" && typeof args[1] === "string" && typeof args[2] === "function") {
+      this._handlers.set(`${args[0]}:${args[1]}`, args[2]);
     } else {
       throw new Error(
-        "Invalid arguments: provide (method, handler) or (wildcardHandler)"
+        "Invalid arguments: provide (version, method, handler), (method, handler), or (wildcardHandler)"
       );
     }
   }
-  removeHandler(method) {
-    if (method) {
-      this._handlers.delete(method);
+  removeHandler(versionOrMethod, method) {
+    if (versionOrMethod && method) {
+      this._handlers.delete(`${versionOrMethod}:${method}`);
+    } else if (versionOrMethod) {
+      this._handlers.delete(versionOrMethod);
     } else {
       this._wildcardHandler = null;
     }
@@ -38079,14 +38083,23 @@ var OCPPClient = class extends import_node_events.EventEmitter {
     this._handlers.clear();
     this._wildcardHandler = null;
   }
-  // ─── Call ────────────────────────────────────────────────────
-  async call(method, params = {}, options = {}) {
+  async call(...args) {
+    let method;
+    let params;
+    let options;
+    if (args.length >= 3 && typeof args[0] === "string" && typeof args[1] === "string") {
+      method = args[1];
+      params = args[2] ?? {};
+      options = args[3] ?? {};
+    } else {
+      method = args[0];
+      params = args[1] ?? {};
+      options = args[2] ?? {};
+    }
     if (this._state !== OPEN) {
       throw new Error(`Cannot call: client is in state ${this._state}`);
     }
-    return this._callQueue.push(
-      () => this._sendCall(method, params, options)
-    );
+    return this._callQueue.push(() => this._sendCall(method, params, options));
   }
   async _sendCall(method, params, options) {
     const msgId = (0, import_node_crypto.randomUUID)();
@@ -38216,7 +38229,7 @@ var OCPPClient = class extends import_node_events.EventEmitter {
           `Already processing call with ID: ${msgId}`
         );
       }
-      let handler = this._handlers.get(method);
+      let handler = this._protocol ? this._handlers.get(`${this._protocol}:${method}`) ?? this._handlers.get(method) : this._handlers.get(method);
       let isWildcard = false;
       if (!handler) {
         if (this._wildcardHandler) {
@@ -38236,6 +38249,7 @@ var OCPPClient = class extends import_node_events.EventEmitter {
       const context = {
         messageId: msgId,
         method,
+        protocol: this._protocol,
         params,
         signal: ac.signal
       };
@@ -38293,6 +38307,18 @@ var OCPPClient = class extends import_node_events.EventEmitter {
   _onBadMessage(rawMessage, error) {
     this._badMessageCount++;
     this.emit("badMessage", { message: rawMessage, error });
+    const match = rawMessage.match(/^\s*\[\s*2\s*,\s*"([^"]+)"/);
+    if (match?.[1] && this._ws) {
+      const errorResponse = [
+        MessageType.CALLERROR,
+        match[1],
+        "FormatViolation",
+        error.message || "Invalid message format",
+        {}
+      ];
+      this._ws.send(JSON.stringify(errorResponse));
+      this.emit("callError", errorResponse);
+    }
     if (this._badMessageCount >= this._options.maxBadMessages) {
       this.close({ code: 1002, reason: "Too many bad messages" }).catch(
         () => {
@@ -38482,7 +38508,7 @@ var OCPPServerClient = class extends OCPPClient {
     this._state = ConnectionState.OPEN;
     this._identity = this._options.identity;
     this._ws = context.ws;
-    this._protocol = context.ws.protocol;
+    this._protocol = context.protocol ?? context.ws.protocol;
     this._attachWebsocket(context.ws);
   }
   /**
@@ -38731,7 +38757,11 @@ var OCPPServer = class extends import_node_events2.EventEmitter {
     }
     const serverProtocols = this._options.protocols ?? [];
     let selectedProtocol;
-    if (serverProtocols.length > 0 && protocols.size > 0) {
+    if (serverProtocols.length > 0) {
+      if (protocols.size === 0) {
+        abortHandshake(socket, 400, "Missing subprotocol");
+        return;
+      }
       selectedProtocol = serverProtocols.find((p) => protocols.has(p));
       if (!selectedProtocol) {
         abortHandshake(socket, 400, "No matching subprotocol");
@@ -38806,7 +38836,8 @@ var OCPPServer = class extends import_node_events2.EventEmitter {
       const client = new OCPPServerClient(clientOptions, {
         ws,
         handshake,
-        session: {}
+        session: {},
+        protocol: selectedProtocol
       });
       this._clients.add(client);
       client.on("close", () => {