Update Websocket und weiteres.
This commit is contained in:
@@ -8,13 +8,14 @@ class OCPPFrameRouter
|
||||
if (!is_array($route)) {
|
||||
continue;
|
||||
}
|
||||
if ((string)($route['ChargePointId'] ?? '') !== $chargePointId) {
|
||||
$routeChargePointId = (string)($route['ChargePointId'] ?? ($route['chargePointId'] ?? ''));
|
||||
if ($routeChargePointId !== $chargePointId) {
|
||||
continue;
|
||||
}
|
||||
$routeEvse = (int)($route['EVSEId'] ?? 1);
|
||||
$routeConnector = (int)($route['ConnectorId'] ?? 1);
|
||||
$routeEvse = (int)($route['EVSEId'] ?? ($route['evseId'] ?? 1));
|
||||
$routeConnector = (int)($route['ConnectorId'] ?? ($route['connectorId'] ?? 1));
|
||||
if ($routeEvse === $evseId && $routeConnector === $connectorId) {
|
||||
return (int)($route['TargetInstance'] ?? 0);
|
||||
return (int)($route['TargetInstance'] ?? ($route['instanceId'] ?? 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,12 +2,22 @@
|
||||
|
||||
class WebSocketEndpoint
|
||||
{
|
||||
public static function supportSummary(bool $registerHookAvailable, string $hookPath): array
|
||||
public static function supportSummary(bool $registerHookAvailable, string $hookPath, string $transportMode = 'webhook_spike'): array
|
||||
{
|
||||
if ($transportMode !== 'webhook_spike') {
|
||||
return [
|
||||
'status' => 'Externer WebSocket-Transport',
|
||||
'detail' => 'OCPP_Server erwartet einen echten WebSocket-Server/Parent oder lokalen Adapter und uebernimmt nur Routing und Protokollzustand.',
|
||||
'warning' => 'WebHook Control wird in diesem Modus nicht als OCPP-CSMS-Endpunkt verwendet.',
|
||||
'hookPath' => $hookPath
|
||||
];
|
||||
}
|
||||
|
||||
if ($registerHookAvailable) {
|
||||
return [
|
||||
'status' => 'Hook vorbereitet',
|
||||
'detail' => 'Symcon RegisterHook ist verfuegbar. WebSocket-Dauerbetrieb muss mit echter OCPP-Station verifiziert werden.',
|
||||
'status' => 'WebHook-Spike',
|
||||
'detail' => 'RegisterHook ist verfuegbar, aber der WebHook-Pfad ist kein vollwertiger OCPP-CSMS-WebSocket-Server mit garantiertem Async-Push.',
|
||||
'warning' => 'Nur fuer Spike/Diagnose verwenden. Produktiv ist ein echter WebSocket-Server/Parent erforderlich.',
|
||||
'hookPath' => $hookPath
|
||||
];
|
||||
}
|
||||
@@ -15,6 +25,7 @@ class WebSocketEndpoint
|
||||
return [
|
||||
'status' => 'Hook manuell/spaeter',
|
||||
'detail' => 'RegisterHook ist in dieser Symcon-Umgebung nicht als Modul-Methode verfuegbar. WebHook Control muss manuell oder nach Upgrade verbunden werden.',
|
||||
'warning' => 'Kein produktiver OCPP-WebSocket-Transport aktiv.',
|
||||
'hookPath' => $hookPath
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user