kirby-ocpp 0.1.0 → 0.1.2

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" },
@@ -10,7 +11,7 @@ const TABS = [
     { id: "scenarios", label: "Scenarios" }
 ];
 const LEVEL_STYLE = {
-    info: "{blue-fg}info{/blue-fg}",
+    info: "{white-fg}info{/white-fg}",
     success: "{green-fg}ok{/green-fg}",
     warn: "{yellow-fg}warn{/yellow-fg}",
     error: "{red-fg}err{/red-fg}",
@@ -19,14 +20,27 @@ const LEVEL_STYLE = {
 };
 const DEFAULT_MEASURANDS = "Energy.Active.Import.Register,Power.Active.Import,Current.Import,Voltage,Temperature,SoC";
 const THEME = {
+    background: "black",
+    foreground: "white",
     panelBorder: "cyan",
     headerBg: "black",
     headerFg: "white",
     footerBg: "black",
     footerFg: "white",
+    mutedFg: "cyan",
     selectedBg: "white",
-    selectedFg: "black"
+    selectedFg: "black",
+    focusBorder: "yellow"
 };
+function fgTag(color, content) {
+    return `{${color}-fg}${content}{/${color}-fg}`;
+}
+function muted(content) {
+    return fgTag(THEME.mutedFg, content);
+}
+function disabledLine(content) {
+    return muted(`${content} (disabled)`);
+}
 export class Tui {
     station;
     screen;
@@ -71,6 +85,8 @@ export class Tui {
             border: "line",
             padding: { left: 1, right: 1 },
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 selected: { bg: THEME.selectedBg, fg: THEME.selectedFg },
                 border: { fg: THEME.panelBorder }
             }
@@ -85,6 +101,8 @@ export class Tui {
             border: "line",
             padding: { left: 1, right: 1 },
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         });
@@ -100,6 +118,8 @@ export class Tui {
             border: "line",
             padding: { left: 1, right: 1 },
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 selected: { bg: THEME.selectedBg, fg: THEME.selectedFg },
                 border: { fg: THEME.panelBorder }
             }
@@ -123,6 +143,8 @@ export class Tui {
                 style: { bg: THEME.panelBorder }
             },
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         });
@@ -281,7 +303,7 @@ export class Tui {
         const compact = this.screenColumns() < 110;
         const tabLine = TABS.map((tab, index) => {
             const label = compact ? `${index + 1}:${tab.label.slice(0, 4)}` : `${index + 1}:${tab.label}`;
-            return tab.id === this.activeTab ? `{black-fg}{white-bg}${label}{/white-bg}{/black-fg}` : `{gray-fg}${label}{/gray-fg}`;
+            return tab.id === this.activeTab ? `{black-fg}{white-bg}${label}{/white-bg}{/black-fg}` : muted(label);
         }).join("  ");
         this.header.setContent([
             ` {bold}kirby-ocpp{/bold}  ${this.station.config.chargePointId} -> ${this.station.config.centralSystemUrl}`,
@@ -357,9 +379,11 @@ export class Tui {
         this.actions = this.actionsForTab();
         const width = this.centerContentWidth();
         const items = this.actions.map((action) => {
-            const prefix = action.disabled?.() ? "{gray-fg}" : "";
-            const suffix = action.disabled?.() ? "{/gray-fg}" : "";
-            return `${prefix}${action.key.padEnd(2)} ${truncateText(action.label, Math.max(12, width - 6))}${suffix}`;
+            const disabled = action.disabled?.() ?? false;
+            const suffix = disabled ? " (disabled)" : "";
+            const labelWidth = Math.max(12, width - 6 - suffix.length);
+            const line = `${action.key.padEnd(2)} ${truncateText(action.label, labelWidth)}`;
+            return disabled ? disabledLine(line) : line;
         });
         this.actionList.setLabel(` ${this.tabLabel(this.activeTab)} actions `);
         this.actionList.setItems(items);
@@ -394,6 +418,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 +485,8 @@ export class Tui {
             "d",
             "D",
             "S-d",
+            "S",
+            "S-s",
             "e",
             "f",
             "h",
@@ -542,6 +569,8 @@ export class Tui {
             tags: true,
             keys: true,
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         });
@@ -555,6 +584,8 @@ export class Tui {
             keys: true,
             tags: true,
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         });
@@ -570,6 +601,8 @@ export class Tui {
             vi: false,
             items: [],
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 selected: { bg: THEME.selectedBg, fg: THEME.selectedFg },
                 border: { fg: THEME.panelBorder }
             }
@@ -581,7 +614,8 @@ export class Tui {
             right: 2,
             height: 1,
             tags: true,
-            content: "{gray-fg}Type to filter  Up/Down select  Enter run  Esc cancel{/gray-fg}"
+            style: { fg: THEME.foreground, bg: THEME.background },
+            content: muted("Type to filter  Up/Down select  Enter run  Esc cancel")
         });
         let entries = [];
         let selectedIndex = 0;
@@ -608,7 +642,7 @@ export class Tui {
             selectedIndex = clamp(selectedIndex, 0, Math.max(0, entries.length - 1));
             box.setLabel(` Commands${trimmedQuery ? `: ${truncateText(trimmedQuery, 28)}` : ""} `);
             if (entries.length === 0) {
-                list.setItems(["{gray-fg}No matching commands{/gray-fg}"]);
+                list.setItems([muted("No matching commands")]);
                 list.select(0);
                 this.screen.render();
                 return;
@@ -697,6 +731,8 @@ export class Tui {
             alwaysScroll: false,
             padding: { left: 2, right: 2 },
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             },
             scrollbar: {
@@ -720,7 +756,7 @@ export class Tui {
             `  id=${this.station.config.chargePointId}`,
             `  url=${this.station.config.centralSystemUrl}`,
             "",
-            "{gray-fg}Esc or q closes this help.{/gray-fg}"
+            muted("Esc or q closes this help.")
         ].join("\n"));
         const close = () => {
             box.destroy();
@@ -738,9 +774,8 @@ export class Tui {
     paletteEntryLine(entry) {
         const tab = this.tabLabel(entry.tab).padEnd(11);
         const key = entry.action.key.padEnd(2);
-        const state = entry.action.disabled?.() ? "{gray-fg}" : "";
-        const endState = entry.action.disabled?.() ? "{/gray-fg}" : "";
-        return `${state}${tab} ${key} ${entry.action.label}${endState}`;
+        const line = `${tab} ${key} ${entry.action.label}`;
+        return entry.action.disabled?.() ? disabledLine(line) : line;
     }
     paletteEntries(query) {
         const terms = query.toLowerCase().split(/\s+/).filter(Boolean);
@@ -798,6 +833,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) },
@@ -956,6 +994,8 @@ export class Tui {
             tags: true,
             keys: true,
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         });
@@ -972,6 +1012,8 @@ export class Tui {
             keys: true,
             tags: true,
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 border: { fg: THEME.panelBorder }
             }
         }));
@@ -982,7 +1024,8 @@ export class Tui {
             right: 2,
             height: 1,
             tags: true,
-            content: "{gray-fg}Tab/Up/Down field  Left/Right cursor  C-u clear  Enter submit  Esc cancel{/gray-fg}"
+            style: { fg: THEME.foreground, bg: THEME.background },
+            content: muted("Tab/Up/Down field  Left/Right cursor  C-u clear  Enter submit  Esc cancel")
         });
         let focusedIndex = 0;
         let closed = false;
@@ -995,7 +1038,7 @@ export class Tui {
             const value = values[index] ?? "";
             const cursor = clamp(cursors[index] ?? value.length, 0, value.length);
             input.setContent(renderFieldValue(value, cursor, width, focusedIndex === index));
-            input.style.border = { fg: focusedIndex === index ? "yellow" : THEME.panelBorder };
+            input.style.border = { fg: focusedIndex === index ? THEME.focusBorder : THEME.panelBorder };
         };
         const renderInputs = () => {
             inputBoxes.forEach((_input, index) => renderInput(index));
@@ -1128,6 +1171,8 @@ export class Tui {
             vi: true,
             items: choices.map((choice) => ` ${choice}`),
             style: {
+                fg: THEME.foreground,
+                bg: THEME.background,
                 selected: { bg: THEME.selectedBg, fg: THEME.selectedFg },
                 border: { fg: THEME.panelBorder }
             }
@@ -1205,12 +1250,12 @@ export class Tui {
             alwaysScroll: false,
             content: this.plainLogContent(),
             style: {
-                fg: "white",
-                bg: "black"
+                fg: THEME.foreground,
+                bg: THEME.background
             },
             scrollbar: {
                 ch: " ",
-                style: { bg: "cyan" }
+                style: { bg: THEME.panelBorder }
             }
         });
         this.bindLogNavigationKeys(this.plainLogView);
@@ -1275,7 +1320,7 @@ export class Tui {
     appendLogEntry(entry) {
         this.logBox.log(this.formatLogEntryForTui(entry));
         if (entry.details) {
-            this.logBox.log(`  {gray-fg}${entry.details}{/gray-fg}`);
+            this.logBox.log(`  ${muted(entry.details)}`);
         }
     }
     filteredLogs() {
@@ -1432,6 +1477,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 +1552,9 @@ function normalizeActionKey(keyName) {
     if (keyName === "S-d") {
         return "D";
     }
+    if (keyName === "S-s") {
+        return "S";
+    }
     if (keyName === "S-u") {
         return "U";
     }
@@ -1515,7 +1567,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 +1606,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.2",
   "description": "A terminal OCPP charge point emulator.",
   "type": "module",
   "author": "archhaze24",