ocpp-ws-io 2.1.6 → 2.1.7

package/dist/index.mjs

@@ -37667,6 +37667,36 @@ var OCPPClient = class _OCPPClient extends EventEmitter {
       return;
     }
     const messageType = message[0];
+    const messageId = message[1];
+    if (typeof messageId !== "string") {
+      this._onBadMessage(
+        typeof rawData === "string" ? rawData : rawData.toString(),
+        new RPCMessageTypeNotSupportedError(
+          `Invalid MessageId type: ${typeof messageId} (expected string)`
+        )
+      );
+      return;
+    }
+    if (messageType === MessageType.CALL && message.length < 4 || messageType === MessageType.CALLRESULT && message.length < 3 || messageType === MessageType.CALLERROR && message.length < 5) {
+      this._onBadMessage(
+        JSON.stringify(message),
+        new RPCMessageTypeNotSupportedError(
+          `Missing payload elements for message type ${messageType}`
+        )
+      );
+      return;
+    }
+    const payloadIndex = messageType === MessageType.CALLERROR ? 4 : messageType === MessageType.CALL ? 3 : 2;
+    const payload = message[payloadIndex];
+    if (typeof payload !== "object" || payload === null || Array.isArray(payload)) {
+      this._onBadMessage(
+        JSON.stringify(message),
+        new RPCMessageTypeNotSupportedError(
+          `Payload must be a JSON object, got ${payload === null ? "null" : Array.isArray(payload) ? "array" : typeof payload}`
+        )
+      );
+      return;
+    }
     switch (messageType) {
       case MessageType.CALL:
         this._handleIncomingCall(message);
@@ -38638,7 +38668,18 @@ var OCPPServerClient = class extends OCPPClient {
         this._onClose(code, reason)
       )
     );
-    ws.on("error", (err) => this.emit("error", err));
+    ws.on("error", (err) => {
+      if (this.listenerCount("error") > 0) {
+        this.emit("error", err);
+      } else {
+        this._logger?.debug?.(
+          "WebSocket error (unhandled by client listener)",
+          {
+            error: err.message
+          }
+        );
+      }
+    });
     ws.on("ping", () => {
       this._recordActivity();
       this.emit("ping");
@@ -38746,9 +38787,9 @@ var OCPPServer = class extends EventEmitter3 {
     super();
     this.setMaxListeners(0);
     if (options.strictMode) {
-      if (!options.strictModeValidators && !options.protocols?.length) {
+      if (!options.protocols?.length) {
         throw new Error(
-          "strictMode requires either strictModeValidators or protocols to be specified"
+          "strictMode requires protocols to be specified (e.g. protocols: ['ocpp1.6'])"
         );
       }
     }