green-screen-react 1.2.1 → 1.2.3

package/dist/index.d.mts

@@ -277,6 +277,7 @@ declare class WebSocketAdapter implements TerminalAdapter {
     private pendingScreenResolver;
     private pendingConnectResolver;
     private pendingMdtResolver;
+    private disconnectAckResolver;
     private connectingPromise;
     private screenListeners;
     private statusListeners;

package/dist/index.d.ts

@@ -277,6 +277,7 @@ declare class WebSocketAdapter implements TerminalAdapter {
     private pendingScreenResolver;
     private pendingConnectResolver;
     private pendingMdtResolver;
+    private disconnectAckResolver;
     private connectingPromise;
     private screenListeners;
     private statusListeners;

package/dist/index.js

@@ -131,6 +131,7 @@ var WebSocketAdapter = class _WebSocketAdapter {
     this.pendingScreenResolver = null;
     this.pendingConnectResolver = null;
     this.pendingMdtResolver = null;
+    this.disconnectAckResolver = null;
     this.connectingPromise = null;
     this.screenListeners = /* @__PURE__ */ new Set();
     this.statusListeners = /* @__PURE__ */ new Set();
@@ -265,7 +266,19 @@ var WebSocketAdapter = class _WebSocketAdapter {
     });
   }
   async disconnect() {
+    const acked = new Promise((resolve) => {
+      const timer = setTimeout(resolve, 3e3);
+      this.disconnectAckResolver = () => {
+        clearTimeout(timer);
+        resolve();
+      };
+    });
     this.wsSend({ type: "disconnect" });
+    try {
+      await acked;
+    } finally {
+      this.disconnectAckResolver = null;
+    }
     this.status = { connected: false, status: "disconnected" };
     this._sessionId = null;
     if (this.ws) {
@@ -321,6 +334,14 @@ var WebSocketAdapter = class _WebSocketAdapter {
         break;
       }
       case "cursor": {
+        if (this.screen) {
+          this.screen = {
+            ...this.screen,
+            cursor_row: msg.data.cursor_row,
+            cursor_col: msg.data.cursor_col
+          };
+          for (const listener of this.screenListeners) listener(this.screen);
+        }
         if (this.pendingScreenResolver) {
           const resolver = this.pendingScreenResolver;
           this.pendingScreenResolver = null;
@@ -361,6 +382,13 @@ var WebSocketAdapter = class _WebSocketAdapter {
           resolver({ success: true });
         }
         break;
+      case "disconnected":
+        if (this.disconnectAckResolver) {
+          const resolver = this.disconnectAckResolver;
+          this.disconnectAckResolver = null;
+          resolver();
+        }
+        break;
       case "error": {
         if (this.pendingConnectResolver) {
           const resolver = this.pendingConnectResolver;
@@ -1034,6 +1062,25 @@ var MinimizeIcon = () => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("svg", { w
 // src/components/InlineSignIn.tsx
 var import_react4 = require("react");
 var import_jsx_runtime3 = require("react/jsx-runtime");
+var STORAGE_KEY = "green-screen:inline-signin";
+function loadStored() {
+  if (typeof window === "undefined") return {};
+  try {
+    const raw = window.localStorage.getItem(STORAGE_KEY);
+    if (!raw) return {};
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function saveStored(value) {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(value));
+  } catch {
+  }
+}
 var PROTOCOL_OPTIONS = [
   { value: "tn5250", label: "TN5250 (IBM i)" },
   { value: "tn3270", label: "TN3270 (Mainframe)" },
@@ -1053,12 +1100,22 @@ var TERMINAL_TYPE_OPTIONS = {
   ]
 };
 function InlineSignIn({ defaultProtocol, loading: externalLoading, error, onConnect }) {
-  const [host, setHost] = (0, import_react4.useState)("");
-  const [port, setPort] = (0, import_react4.useState)("");
-  const [selectedProtocol, setSelectedProtocol] = (0, import_react4.useState)(defaultProtocol);
-  const [terminalType, setTerminalType] = (0, import_react4.useState)("");
-  const [username, setUsername] = (0, import_react4.useState)("");
+  const stored = loadStored();
+  const [host, setHost] = (0, import_react4.useState)(stored.host ?? "");
+  const [port, setPort] = (0, import_react4.useState)(stored.port ?? "");
+  const [selectedProtocol, setSelectedProtocol] = (0, import_react4.useState)(stored.protocol ?? defaultProtocol);
+  const [terminalType, setTerminalType] = (0, import_react4.useState)(stored.terminalType ?? "");
+  const [username, setUsername] = (0, import_react4.useState)(stored.username ?? "");
   const [password, setPassword] = (0, import_react4.useState)("");
+  (0, import_react4.useEffect)(() => {
+    saveStored({
+      host,
+      port,
+      protocol: selectedProtocol,
+      terminalType,
+      username
+    });
+  }, [host, port, selectedProtocol, terminalType, username]);
   const termTypeOptions = TERMINAL_TYPE_OPTIONS[selectedProtocol];
   const [submitted, setSubmitted] = (0, import_react4.useState)(false);
   const loading = externalLoading || submitted;
@@ -1336,6 +1393,22 @@ function validateMod11(value) {
 
 // src/components/GreenScreenTerminal.tsx
 var import_jsx_runtime4 = require("react/jsx-runtime");
+function isBlankContent(content) {
+  if (!content) return true;
+  for (let i = 0; i < content.length; i++) {
+    const ch = content.charCodeAt(i);
+    if (ch !== 32 && ch !== 9 && ch !== 10 && ch !== 13 && ch !== 0 && ch !== 160) {
+      return false;
+    }
+  }
+  return true;
+}
+function formatBusyClock(ms) {
+  const sec = Math.floor(ms / 1e3);
+  const m = Math.floor(sec / 60);
+  const s = sec % 60;
+  return `${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}`;
+}
 function aidByteToKeyName(aid) {
   if (aid === 241) return "ENTER";
   if (aid === 243) return "HELP";
@@ -1410,7 +1483,33 @@ function GreenScreenTerminal({
   const { data: polledScreenData, error: screenError } = useTerminalScreen(adapter, pollInterval, shouldPoll);
   const { sendText: _sendText, sendKey: _sendKey } = useTerminalInput(adapter);
   const { connect, reconnect, loading: reconnecting, error: connectError } = useTerminalConnection(adapter);
-  const rawScreenData = externalScreenData ?? polledScreenData;
+  const incomingScreenData = externalScreenData ?? polledScreenData;
+  const lastContentfulRef = (0, import_react5.useRef)(null);
+  (0, import_react5.useEffect)(() => {
+    if (incomingScreenData && !isBlankContent(incomingScreenData.content)) {
+      lastContentfulRef.current = incomingScreenData;
+    }
+  }, [incomingScreenData]);
+  const isBlankLocked = !!(incomingScreenData && incomingScreenData.keyboard_locked && isBlankContent(incomingScreenData.content));
+  const rawScreenData = (0, import_react5.useMemo)(() => {
+    if (isBlankLocked && lastContentfulRef.current) {
+      return { ...lastContentfulRef.current, keyboard_locked: true };
+    }
+    return incomingScreenData;
+  }, [incomingScreenData, isBlankLocked]);
+  const BUSY_OVERLAY_DELAY_MS = 600;
+  const [lockElapsedMs, setLockElapsedMs] = (0, import_react5.useState)(0);
+  (0, import_react5.useEffect)(() => {
+    if (!isBlankLocked) {
+      setLockElapsedMs(0);
+      return;
+    }
+    const start = Date.now();
+    setLockElapsedMs(0);
+    const id = setInterval(() => setLockElapsedMs(Date.now() - start), 250);
+    return () => clearInterval(id);
+  }, [isBlankLocked]);
+  const showBusyOverlay = isBlankLocked && lockElapsedMs >= BUSY_OVERLAY_DELAY_MS;
   const connStatus = externalStatus ?? (rawScreenData ? { connected: true, status: "authenticated" } : { connected: false, status: "disconnected" });
   const { displayedContent, animatedCursorPos } = useTypingAnimation(
     rawScreenData?.content,
@@ -1958,7 +2057,7 @@ function GreenScreenTerminal({
     const cursor = getCursorPos();
     const hasCursor = screenData.cursor_row !== void 0 && screenData.cursor_col !== void 0;
     const cursorInInputField = hasCursor && fields.some(
-      (f) => f.is_input && !f.is_non_display && f.row === cursor.row && cursor.col >= f.col && cursor.col < f.col + f.length
+      (f) => f.is_input && f.row === cursor.row && cursor.col >= f.col && cursor.col < f.col + f.length
     );
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { style: { fontFamily: "var(--gs-font)", fontSize: "13px", position: "relative", width: `${cols}ch` }, children: [
       rows.map((line, index) => {
@@ -2168,6 +2267,14 @@ function GreenScreenTerminal({
             /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { children: isAutoReconnecting || reconnecting ? "Reconnecting..." : connStatus?.status === "connecting" ? "Connecting..." : "Disconnected" }),
             connStatus.error && !isAutoReconnecting && !reconnecting && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { fontSize: "0.75em", opacity: 0.7, maxWidth: "80%", textAlign: "center", wordBreak: "break-word" }, children: connStatus.error })
           ] }),
+          showBusyOverlay && connStatus?.connected && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "gs-busy-overlay", role: "status", "aria-live": "polite", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(RefreshIcon, { size: 22, className: "gs-spin" }),
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { className: "gs-busy-clock", children: [
+              "X CLOCK\xA0\xA0",
+              formatBusyClock(lockElapsedMs)
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "gs-busy-hint", children: "Waiting for host\u2026" })
+          ] }),
           /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
             "input",
             {