ocpp-ws-io 2.1.6 → 2.1.7

package/dist/{index-1QBeqAuc.d.mts → index-BRblF1XV.d.mts}

@@ -5117,13 +5117,11 @@ interface CORSOptions {
     /** Allowed WebSocket protocol schemes */
     allowedSchemes?: ("ws" | "wss")[];
 }
-interface ServerOptions {
+interface ServerOptionsBase {
     /** OCPP Security Profile (default: NONE) */
     securityProfile?: SecurityProfile;
     /** TLS options for HTTPS server (Profile 2 & 3) */
     tls?: TLSOptions;
-    /** Accepted OCPP subprotocols */
-    protocols?: AnyOCPPProtocol[];
     /** Call timeout in ms — inherited by server clients (default: 30000) */
     callTimeoutMs?: number;
     /** Ping interval in ms — inherited by server clients (default: 30000) */
@@ -5132,8 +5130,6 @@ interface ServerOptions {
     deferPingsOnActivity?: boolean;
     /** Max concurrent outbound calls — inherited (default: 1) */
     callConcurrency?: number;
-    /** Enable strict mode — inherited (default: false) */
-    strictMode?: boolean | OCPPProtocol[];
     /** If defined, restricts strict mode validation ONLY to these methods */
     strictModeMethods?: Array<AllMethodNames<OCPPProtocol>>;
     /** Custom validators — inherited */
@@ -5187,13 +5183,24 @@ interface ServerOptions {
      */
     healthEndpoint?: boolean;
     /**
-     * I1: Maximum WebSocket payload size in bytes. Messages exceeding this limit
+     * Maximum WebSocket payload size in bytes. Messages exceeding this limit
      * are rejected at the transport layer before JSON parsing, preventing OOM
      * from oversized or malicious payloads.
      * (default: 65536 / 64KB — sufficient for any standard OCPP message)
      */
     maxPayloadBytes?: number;
 }
+/** When strictMode is enabled, protocols MUST be specified */
+interface StrictServerOptions extends ServerOptionsBase {
+    strictMode: true | OCPPProtocol[];
+    protocols: AnyOCPPProtocol[];
+}
+/** When strictMode is disabled or omitted, protocols are optional */
+interface RelaxedServerOptions extends ServerOptionsBase {
+    strictMode?: false;
+    protocols?: AnyOCPPProtocol[];
+}
+type ServerOptions = StrictServerOptions | RelaxedServerOptions;
 interface OCPPServerStats {
     /** Number of currently connected WebSockets */
     connectedClients: number;

package/dist/{index-1QBeqAuc.d.ts → index-BRblF1XV.d.ts}

@@ -5117,13 +5117,11 @@ interface CORSOptions {
     /** Allowed WebSocket protocol schemes */
     allowedSchemes?: ("ws" | "wss")[];
 }
-interface ServerOptions {
+interface ServerOptionsBase {
     /** OCPP Security Profile (default: NONE) */
     securityProfile?: SecurityProfile;
     /** TLS options for HTTPS server (Profile 2 & 3) */
     tls?: TLSOptions;
-    /** Accepted OCPP subprotocols */
-    protocols?: AnyOCPPProtocol[];
     /** Call timeout in ms — inherited by server clients (default: 30000) */
     callTimeoutMs?: number;
     /** Ping interval in ms — inherited by server clients (default: 30000) */
@@ -5132,8 +5130,6 @@ interface ServerOptions {
     deferPingsOnActivity?: boolean;
     /** Max concurrent outbound calls — inherited (default: 1) */
     callConcurrency?: number;
-    /** Enable strict mode — inherited (default: false) */
-    strictMode?: boolean | OCPPProtocol[];
     /** If defined, restricts strict mode validation ONLY to these methods */
     strictModeMethods?: Array<AllMethodNames<OCPPProtocol>>;
     /** Custom validators — inherited */
@@ -5187,13 +5183,24 @@ interface ServerOptions {
      */
     healthEndpoint?: boolean;
     /**
-     * I1: Maximum WebSocket payload size in bytes. Messages exceeding this limit
+     * Maximum WebSocket payload size in bytes. Messages exceeding this limit
      * are rejected at the transport layer before JSON parsing, preventing OOM
      * from oversized or malicious payloads.
      * (default: 65536 / 64KB — sufficient for any standard OCPP message)
      */
     maxPayloadBytes?: number;
 }
+/** When strictMode is enabled, protocols MUST be specified */
+interface StrictServerOptions extends ServerOptionsBase {
+    strictMode: true | OCPPProtocol[];
+    protocols: AnyOCPPProtocol[];
+}
+/** When strictMode is disabled or omitted, protocols are optional */
+interface RelaxedServerOptions extends ServerOptionsBase {
+    strictMode?: false;
+    protocols?: AnyOCPPProtocol[];
+}
+type ServerOptions = StrictServerOptions | RelaxedServerOptions;
 interface OCPPServerStats {
     /** Number of currently connected WebSockets */
     connectedClients: number;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { E as EventAdapterInterface, A as AuthCallback, L as LoggerLike, a as LoggingConfig, M as MiddlewareFunction, b as MiddlewareContext, C as ConnectionMiddleware, T as TypedEventEmitter, S as ServerEvents, c as CORSOptions, R as RouterConfig, O as OCPPProtocol, d as AllMethodNames, e as RouterHandlerContext, f as OCPPRequestType, g as OCPPResponseType, h as RouterWildcardHandler, i as ServerOptions, j as LoggerLikeNotOptional, k as OCPPServerClient, l as OCPPServerStats, m as ListenOptions, n as TLSOptions, o as CloseOptions, p as CallOptions, V as Validator } from './index-1QBeqAuc.mjs';
-export { q as AnyOCPPProtocol, r as AuthAccept, s as CallHandler, t as ClientEvents, u as ClientOptions, v as ConnectionContext, w as ConnectionState, H as HandlerContext, x as HandshakeInfo, y as MessageType, z as MiddlewareNext, B as MiddlewareStack, N as NOREPLY, D as OCPP16Methods, F as OCPP201Methods, G as OCPP21Methods, I as OCPPCall, J as OCPPCallError, K as OCPPCallResult, P as OCPPClient, Q as OCPPMessage, U as OCPPMethodMap, W as OCPPProtocolKey, X as RedisAdapter, Y as SecurityProfile, Z as SessionData, _ as WildcardHandler, $ as createValidator } from './index-1QBeqAuc.mjs';
+import { E as EventAdapterInterface, A as AuthCallback, L as LoggerLike, a as LoggingConfig, M as MiddlewareFunction, b as MiddlewareContext, C as ConnectionMiddleware, T as TypedEventEmitter, S as ServerEvents, c as CORSOptions, R as RouterConfig, O as OCPPProtocol, d as AllMethodNames, e as RouterHandlerContext, f as OCPPRequestType, g as OCPPResponseType, h as RouterWildcardHandler, i as ServerOptions, j as LoggerLikeNotOptional, k as OCPPServerClient, l as OCPPServerStats, m as ListenOptions, n as TLSOptions, o as CloseOptions, p as CallOptions, V as Validator } from './index-BRblF1XV.mjs';
+export { q as AnyOCPPProtocol, r as AuthAccept, s as CallHandler, t as ClientEvents, u as ClientOptions, v as ConnectionContext, w as ConnectionState, H as HandlerContext, x as HandshakeInfo, y as MessageType, z as MiddlewareNext, B as MiddlewareStack, N as NOREPLY, D as OCPP16Methods, F as OCPP201Methods, G as OCPP21Methods, I as OCPPCall, J as OCPPCallError, K as OCPPCallResult, P as OCPPClient, Q as OCPPMessage, U as OCPPMethodMap, W as OCPPProtocolKey, X as RedisAdapter, Y as SecurityProfile, Z as SessionData, _ as WildcardHandler, $ as createValidator } from './index-BRblF1XV.mjs';
 import { Server, IncomingMessage } from 'node:http';
 import { Duplex } from 'node:stream';
 import 'ws';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EventAdapterInterface, A as AuthCallback, L as LoggerLike, a as LoggingConfig, M as MiddlewareFunction, b as MiddlewareContext, C as ConnectionMiddleware, T as TypedEventEmitter, S as ServerEvents, c as CORSOptions, R as RouterConfig, O as OCPPProtocol, d as AllMethodNames, e as RouterHandlerContext, f as OCPPRequestType, g as OCPPResponseType, h as RouterWildcardHandler, i as ServerOptions, j as LoggerLikeNotOptional, k as OCPPServerClient, l as OCPPServerStats, m as ListenOptions, n as TLSOptions, o as CloseOptions, p as CallOptions, V as Validator } from './index-1QBeqAuc.js';
-export { q as AnyOCPPProtocol, r as AuthAccept, s as CallHandler, t as ClientEvents, u as ClientOptions, v as ConnectionContext, w as ConnectionState, H as HandlerContext, x as HandshakeInfo, y as MessageType, z as MiddlewareNext, B as MiddlewareStack, N as NOREPLY, D as OCPP16Methods, F as OCPP201Methods, G as OCPP21Methods, I as OCPPCall, J as OCPPCallError, K as OCPPCallResult, P as OCPPClient, Q as OCPPMessage, U as OCPPMethodMap, W as OCPPProtocolKey, X as RedisAdapter, Y as SecurityProfile, Z as SessionData, _ as WildcardHandler, $ as createValidator } from './index-1QBeqAuc.js';
+import { E as EventAdapterInterface, A as AuthCallback, L as LoggerLike, a as LoggingConfig, M as MiddlewareFunction, b as MiddlewareContext, C as ConnectionMiddleware, T as TypedEventEmitter, S as ServerEvents, c as CORSOptions, R as RouterConfig, O as OCPPProtocol, d as AllMethodNames, e as RouterHandlerContext, f as OCPPRequestType, g as OCPPResponseType, h as RouterWildcardHandler, i as ServerOptions, j as LoggerLikeNotOptional, k as OCPPServerClient, l as OCPPServerStats, m as ListenOptions, n as TLSOptions, o as CloseOptions, p as CallOptions, V as Validator } from './index-BRblF1XV.js';
+export { q as AnyOCPPProtocol, r as AuthAccept, s as CallHandler, t as ClientEvents, u as ClientOptions, v as ConnectionContext, w as ConnectionState, H as HandlerContext, x as HandshakeInfo, y as MessageType, z as MiddlewareNext, B as MiddlewareStack, N as NOREPLY, D as OCPP16Methods, F as OCPP201Methods, G as OCPP21Methods, I as OCPPCall, J as OCPPCallError, K as OCPPCallResult, P as OCPPClient, Q as OCPPMessage, U as OCPPMethodMap, W as OCPPProtocolKey, X as RedisAdapter, Y as SecurityProfile, Z as SessionData, _ as WildcardHandler, $ as createValidator } from './index-BRblF1XV.js';
 import { Server, IncomingMessage } from 'node:http';
 import { Duplex } from 'node:stream';
 import 'ws';

package/dist/index.js

@@ -37739,6 +37739,36 @@ var OCPPClient = class _OCPPClient extends import_node_events.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);
@@ -38708,7 +38738,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");
@@ -38816,9 +38857,9 @@ var OCPPServer = class extends import_node_events3.EventEmitter {
     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'])"
         );
       }
     }