Revert "feat(ocpp): 添加对WebSocket子协议的支持和缺失参数检查"

This reverts commit 216a8e118d.

apps/csms/src/index.ts

@@ -85,12 +85,8 @@ app.get(
   '/ocpp/:chargePointId',
   upgradeWebSocket((c) => {
     const chargePointId = c.req.param('chargePointId')
-    if (!chargePointId) {
-      throw new Error('Missing chargePointId route param')
-    }
     const connInfo = getConnInfo(c)
-    const requestedProtocol = c.req.header('sec-websocket-protocol')
+    return createOcppHandler(chargePointId, connInfo.remote.address)
-    return createOcppHandler(chargePointId, connInfo.remote.address, requestedProtocol)
   }),
 )
 

apps/csms/src/lib/db.ts

@@ -9,8 +9,6 @@ export const useDrizzle = () => {
   if (!pgPoolInstance || !drizzleInstance) {
     pgPoolInstance = new Pool({
       connectionString: process.env.DATABASE_CONNECTION_STRING,
-      connectionTimeoutMillis: 3000,
-      idleTimeoutMillis: 10000,
     })
     drizzleInstance = drizzle({ client: pgPoolInstance, schema })
   }

apps/csms/src/ocpp/actions/boot-notification.ts

@@ -8,86 +8,58 @@ import type {
 } from '../types.ts'
 
 const DEFAULT_HEARTBEAT_INTERVAL = 60
-const BOOT_NOTIFICATION_DB_TIMEOUT_MS = 3000
-
-function withTimeout<T>(promise: Promise<T>, timeoutMs: number, label: string) {
-  return Promise.race<T>([
-    promise,
-    new Promise<T>((_, reject) => {
-      setTimeout(() => reject(new Error(`${label} timed out after ${timeoutMs}ms`)), timeoutMs)
-    }),
-  ])
-}
 
 export async function handleBootNotification(
   payload: BootNotificationRequest,
   ctx: OcppConnectionContext,
 ): Promise<BootNotificationResponse> {
   const db = useDrizzle()
-  const currentTime = dayjs().toISOString()
 
-  console.log(`[OCPP] BootNotification ${ctx.chargePointIdentifier} received`)
+  const [cp] = await db
+    .insert(chargePoint)
+    .values({
+      id: crypto.randomUUID(),
+      chargePointIdentifier: ctx.chargePointIdentifier,
+      chargePointVendor: payload.chargePointVendor,
+      chargePointModel: payload.chargePointModel,
+      chargePointSerialNumber: payload.chargePointSerialNumber ?? null,
+      firmwareVersion: payload.firmwareVersion ?? null,
+      iccid: payload.iccid ?? null,
+      imsi: payload.imsi ?? null,
+      meterType: payload.meterType ?? null,
+      meterSerialNumber: payload.meterSerialNumber ?? null,
+      // New, unknown devices start as Pending — admin must manually accept them
+      registrationStatus: 'Pending',
+      heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL,
+      lastBootNotificationAt: dayjs().toDate(),
+    })
+    .onConflictDoUpdate({
+      target: chargePoint.chargePointIdentifier,
+      set: {
+        chargePointVendor: payload.chargePointVendor,
+        chargePointModel: payload.chargePointModel,
+        chargePointSerialNumber: payload.chargePointSerialNumber ?? null,
+        firmwareVersion: payload.firmwareVersion ?? null,
+        iccid: payload.iccid ?? null,
+        imsi: payload.imsi ?? null,
+        meterType: payload.meterType ?? null,
+        meterSerialNumber: payload.meterSerialNumber ?? null,
+        // Do NOT override registrationStatus — preserve whatever the admin set
+        heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL,
+        lastBootNotificationAt: dayjs().toDate(),
+        updatedAt: dayjs().toDate(),
+      },
+    })
+    .returning()
 
-  try {
+  const status = cp.registrationStatus
-    const [cp] = await withTimeout(
+  ctx.isRegistered = status === 'Accepted'
-      db
-        .insert(chargePoint)
-        .values({
-          id: crypto.randomUUID(),
-          chargePointIdentifier: ctx.chargePointIdentifier,
-          chargePointVendor: payload.chargePointVendor,
-          chargePointModel: payload.chargePointModel,
-          chargePointSerialNumber: payload.chargePointSerialNumber ?? null,
-          firmwareVersion: payload.firmwareVersion ?? null,
-          iccid: payload.iccid ?? null,
-          imsi: payload.imsi ?? null,
-          meterType: payload.meterType ?? null,
-          meterSerialNumber: payload.meterSerialNumber ?? null,
-          // New, unknown devices start as Pending — admin must manually accept them
-          registrationStatus: 'Pending',
-          heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL,
-          lastBootNotificationAt: dayjs().toDate(),
-        })
-        .onConflictDoUpdate({
-          target: chargePoint.chargePointIdentifier,
-          set: {
-            chargePointVendor: payload.chargePointVendor,
-            chargePointModel: payload.chargePointModel,
-            chargePointSerialNumber: payload.chargePointSerialNumber ?? null,
-            firmwareVersion: payload.firmwareVersion ?? null,
-            iccid: payload.iccid ?? null,
-            imsi: payload.imsi ?? null,
-            meterType: payload.meterType ?? null,
-            meterSerialNumber: payload.meterSerialNumber ?? null,
-            // Do NOT override registrationStatus — preserve whatever the admin set
-            heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL,
-            lastBootNotificationAt: dayjs().toDate(),
-            updatedAt: dayjs().toDate(),
-          },
-        })
-        .returning(),
-      BOOT_NOTIFICATION_DB_TIMEOUT_MS,
-      `BootNotification persistence for ${ctx.chargePointIdentifier}`,
-    )
 
-    const status = cp.registrationStatus
+  console.log(`[OCPP] BootNotification ${ctx.chargePointIdentifier} status=${status}`)
-    ctx.isRegistered = status === 'Accepted'
 
-    console.log(`[OCPP] BootNotification ${ctx.chargePointIdentifier} status=${status}`)
+  return {
-
+    currentTime: dayjs().toISOString(),
-    return {
+    interval: DEFAULT_HEARTBEAT_INTERVAL,
-      currentTime,
+    status,
-      interval: DEFAULT_HEARTBEAT_INTERVAL,
-      status,
-    }
-  } catch (error) {
-    ctx.isRegistered = false
-    console.error(`[OCPP] BootNotification ${ctx.chargePointIdentifier} persistence failed:`, error)
-
-    return {
-      currentTime,
-      interval: DEFAULT_HEARTBEAT_INTERVAL,
-      status: 'Pending',
-    }
   }
 }

apps/csms/src/ocpp/handler.ts

@@ -92,26 +92,6 @@ function sendCallError(
   )
 }
 
-function pickOcppSubprotocol(
-  negotiatedProtocol?: string | null,
-  requestedHeader?: string | null,
-) {
-  if (negotiatedProtocol && isSupportedOCPP(negotiatedProtocol)) {
-    return negotiatedProtocol
-  }
-
-  if (!requestedHeader) {
-    return null
-  }
-
-  const requestedProtocols = requestedHeader
-    .split(',')
-    .map((value) => value.trim())
-    .filter(Boolean)
-
-  return requestedProtocols.find((protocol) => isSupportedOCPP(protocol)) ?? null
-}
-
 /**
  * Factory that produces a hono-ws event handler object for a single
  * OCPP WebSocket connection.
@@ -119,11 +99,7 @@ function pickOcppSubprotocol(
  * Usage in route:
  *   upgradeWebSocket((c) => createOcppHandler(c.req.param('chargePointId'), remoteAddr))
  */
-export function createOcppHandler(
+export function createOcppHandler(chargePointIdentifier: string, remoteAddr?: string) {
-  chargePointIdentifier: string,
-  remoteAddr?: string,
-  requestedProtocolHeader?: string,
-) {
   const ctx: OcppConnectionContext = {
     chargePointIdentifier,
     isRegistered: false,
@@ -131,14 +107,14 @@ export function createOcppHandler(
 
   return {
     onOpen(_evt: Event, ws: WSContext) {
-      const subProtocol = pickOcppSubprotocol(ws.protocol, requestedProtocolHeader)
+      const subProtocol = ws.protocol ?? 'unknown'
-      if (!subProtocol) {
+      if (!isSupportedOCPP(subProtocol)) {
         ws.close(1002, 'Unsupported subprotocol')
         return
       }
       ocppConnections.set(chargePointIdentifier, ws)
       console.log(
-        `[OCPP] ${chargePointIdentifier} connected (${subProtocol})` +
+        `[OCPP] ${chargePointIdentifier} connected` +
           (remoteAddr ? ` from ${remoteAddr}` : ''),
       )
     },

hardware/firmware/lib/mongoose/mongoose_config.h

@@ -1,2 +1 @@
 #define MG_ARCH MG_ARCH_ESP32
-#define MG_TLS MG_TLS_MBED // Use ESP-IDF built-in mbedTLS for WSS support