kirby-ocpp 0.1.0 → 0.1.1

package/README.md

@@ -88,6 +88,7 @@ Global shortcuts:
 - `q`: quit.
 
 Forms prompt for values such as `idTag`, connector id, measurands, and `DataTransfer` payloads. There is no built-in default RFID/idTag.
+On the Connector tab, `s` cycles the selected connector status and `S` opens a list of all OCPP connector statuses.
 
 ## Persistence
 

package/dist/ocpp/client.js

@@ -54,9 +54,14 @@ export class OcppClient extends EventEmitter {
         }
         this.rejectPending(new Error("Connection closed"));
         this.stopPingTimer();
-        this.socket.removeAllListeners();
-        if (this.socket.readyState === WebSocket.OPEN || this.socket.readyState === WebSocket.CONNECTING) {
-            this.socket.close();
+        const socket = this.socket;
+        socket.removeAllListeners();
+        socket.on("error", () => { });
+        if (socket.readyState === WebSocket.OPEN) {
+            socket.close();
+        }
+        else if (socket.readyState === WebSocket.CONNECTING) {
+            socket.terminate();
         }
         this.socket = undefined;
     }

package/dist/station.d.ts

@@ -57,6 +57,7 @@ export declare class Station extends EventEmitter {
     setDiagnosticsOutcome(outcome: DiagnosticsOutcome): void;
     setFirmwareOutcome(outcome: FirmwareOutcome): void;
     cycleStatus(connectorId?: number): Promise<void>;
+    setStatus(connectorId: number | undefined, status: ConnectorStatus): Promise<void>;
     addConnector(): number;
     private bindClientEvents;
     private handleCentralSystemCall;

package/dist/station.js

@@ -495,14 +495,17 @@ export class Station extends EventEmitter {
     async cycleStatus(connectorId = this.config.connectorId) {
         const connector = this.connectors.get(connectorId);
         const next = nextConnectorStatus(connector.status);
+        await this.setStatus(connectorId, next);
+    }
+    async setStatus(connectorId = this.config.connectorId, status) {
         this.connectors.patch(connectorId, {
-            status: next,
-            errorCode: next === "Faulted" ? "OtherError" : "NoError",
-            info: next === "Faulted" ? "Manual fault" : undefined,
-            vendorId: next === "Faulted" ? this.config.vendor : undefined,
+            status,
+            errorCode: status === "Faulted" ? "OtherError" : "NoError",
+            info: status === "Faulted" ? "Manual fault" : undefined,
+            vendorId: status === "Faulted" ? this.config.vendor : undefined,
             vendorErrorCode: undefined
         });
-        await this.statusNotification(connectorId, next);
+        await this.statusNotification(connectorId, status);
     }
     addConnector() {
         const { id: nextId } = this.connectors.add();

package/dist/tui.d.ts

@@ -49,6 +49,7 @@ export declare class Tui {
     private tabLabel;
     private togglePlug;
     private stopTransactionFlow;
+    private setStatusFlow;
     private startTransactionFlow;
     private customMeterValuesFlow;
     private dataTransferFlow;

package/dist/tui.js

@@ -1,5 +1,6 @@
 import { spawnSync } from "node:child_process";
 import blessed from "blessed";
+import { CONNECTOR_STATUS_SEQUENCE } from "./station/connector-status.js";
 const TABS = [
     { id: "station", label: "Station" },
     { id: "connector", label: "Connector" },
@@ -394,6 +395,7 @@ export class Tui {
                 return [
                     action("p", "Plug / unplug EV", "Toggle EV plug state on the selected connector.", () => this.togglePlug()),
                     action("s", "Cycle status", "Cycle StatusNotification status on the selected connector.", () => this.runStationTask(() => this.station.cycleStatus(this.selectedConnectorId))),
+                    action("S", "Set status", "Choose any StatusNotification status for the selected connector.", () => this.setStatusFlow()),
                     action("n", "Send StatusNotification", "Send current selected connector status now.", () => this.runStationTask(() => this.station.statusNotification(this.selectedConnectorId, this.selectedConnector()?.status, true))),
                     action("f", "Fault / clear fault", "Inject or clear a fault on the selected connector.", () => this.faultFlow()),
                     action("]", "Next connector", "Select next connector.", () => this.selectNextConnector()),
@@ -460,6 +462,8 @@ export class Tui {
             "d",
             "D",
             "S-d",
+            "S",
+            "S-s",
             "e",
             "f",
             "h",
@@ -798,6 +802,9 @@ export class Tui {
     stopTransactionFlow() {
         this.promptChoice("StopTransaction reason", STOP_REASONS, (reason) => this.runStationTask(() => this.station.stopTransaction(this.selectedConnectorId, readStopReason(reason), this.selectedConnector()?.lastIdTag)));
     }
+    setStatusFlow() {
+        this.promptChoice("Connector status", CONNECTOR_STATUS_SEQUENCE, (status) => this.runStationTask(() => this.station.setStatus(this.selectedConnectorId, readConnectorStatus(status))));
+    }
     startTransactionFlow() {
         this.promptForm("StartTransaction", [
             { name: "connectorId", label: "connectorId", initialValue: String(this.selectedConnectorId) },
@@ -1432,6 +1439,10 @@ function readStopReason(value) {
     const normalized = value.trim();
     return isStopReason(normalized) ? normalized : "Local";
 }
+function readConnectorStatus(value) {
+    const normalized = value.trim();
+    return isConnectorStatus(normalized) ? normalized : "Available";
+}
 function parseObjectJson(value) {
     try {
         const parsed = JSON.parse(value);
@@ -1503,6 +1514,9 @@ function normalizeActionKey(keyName) {
     if (keyName === "S-d") {
         return "D";
     }
+    if (keyName === "S-s") {
+        return "S";
+    }
     if (keyName === "S-u") {
         return "U";
     }
@@ -1515,7 +1529,7 @@ function legacyActionTab(key) {
     if (["b", "h", "x"].includes(key)) {
         return "station";
     }
-    if (["p", "s", "n", "f"].includes(key)) {
+    if (["p", "s", "S", "n", "f"].includes(key)) {
         return "connector";
     }
     if (["a", "t", "e", "m", "M"].includes(key)) {
@@ -1554,6 +1568,9 @@ const STOP_REASONS = [
 function isStopReason(value) {
     return STOP_REASONS.includes(value);
 }
+function isConnectorStatus(value) {
+    return CONNECTOR_STATUS_SEQUENCE.includes(value);
+}
 const CHARGE_POINT_ERROR_CODES = [
     "ConnectorLockFailure",
     "EVCommunicationError",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-ocpp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A terminal OCPP charge point emulator.",
   "type": "module",
   "author": "archhaze24",