Fix nodepty process resize bug for powershell

Shellishack · Shellishack · commit 590257d3b7c1 · 2025-10-17T13:51:11.000+08:00
diff --git a/.changeset/crisp-impalas-search.md b/.changeset/crisp-impalas-search.md
@@ -0,0 +1,6 @@
+---
+"@pulse-editor/shared-utils": patch
+"@pulse-editor/react-api": patch
+---
+
+Revert debug information
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -22,6 +22,7 @@
     "clean-mangos-swim",
     "cold-shrimps-give",
     "crazy-cities-stand",
+    "crisp-impalas-search",
     "cruel-waves-double",
     "cruel-zoos-play",
     "curvy-places-wash",
diff --git a/desktop/lib/node-pty-server.js b/desktop/lib/node-pty-server.js
@@ -1,7 +1,7 @@
 import http from "http";
-import { WebSocketServer } from "ws";
-import os from "os";
 import pty from "node-pty";
+import os from "os";
+import { WebSocketServer } from "ws";
 
 let sharedPtyProcess = null;
 let sharedTerminalMode = false;
@@ -25,14 +25,20 @@ const setSharedTerminalMode = (useSharedTerminal) => {
 const handleTerminalConnection = (ws) => {
   let ptyProcess = sharedTerminalMode ? sharedPtyProcess : spawnShell();
 
-  ws.on("message", (command) => {
-    const processedCommand = commandProcessor(command);
-    ptyProcess.write(processedCommand);
+  ws.on("message", (data) => {
+    const dataObj = JSON.parse(data);
+
+    if (dataObj.type === "input") {
+      const command = dataObj.payload;
+      ptyProcess.write(command);
+    } else if (dataObj.type === "resize") {
+      const { cols, rows } = dataObj.payload;
+      ptyProcess.resize(cols, rows);
+    }
   });
 
   ptyProcess.on("data", (rawOutput) => {
-    const processedOutput = outputProcessor(rawOutput);
-    ws.send(processedOutput);
+    ws.send(JSON.stringify({ type: "output", payload: rawOutput }));
   });
 
   ws.on("close", () => {
@@ -42,16 +48,6 @@ const handleTerminalConnection = (ws) => {
   });
 };
 
-// Utility function to process commands
-const commandProcessor = (command) => {
-  return command;
-};
-
-// Utility function to process output
-const outputProcessor = (output) => {
-  return output;
-};
-
 /* Host ws node-pty server */
 setSharedTerminalMode(false); // Set this to false to allow a shared session
 const port = 6060;
diff --git a/npm-packages/react-api/CHANGELOG.md b/npm-packages/react-api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pulse-editor/react-api
 
+## 0.1.1-alpha.50
+
+### Patch Changes
+
+- Revert debug information
+- Updated dependencies
+  - @pulse-editor/shared-utils@0.1.1-alpha.50
+
 ## 0.1.1-alpha.49
 
 ### Patch Changes
diff --git a/npm-packages/react-api/package.json b/npm-packages/react-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pulse-editor/react-api",
-  "version": "0.1.1-alpha.49",
+  "version": "0.1.1-alpha.50",
   "main": "dist/main.js",
   "files": [
     "dist"
@@ -38,7 +38,7 @@
     "typescript-eslint": "^8.30.1"
   },
   "peerDependencies": {
-    "@pulse-editor/shared-utils": "0.1.1-alpha.49",
+    "@pulse-editor/shared-utils": "0.1.1-alpha.50",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   }
diff --git a/npm-packages/shared-utils/CHANGELOG.md b/npm-packages/shared-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @pulse-editor/shared-utils
 
+## 0.1.1-alpha.50
+
+### Patch Changes
+
+- Revert debug information
+
 ## 0.1.1-alpha.49
 
 ### Patch Changes
diff --git a/npm-packages/shared-utils/package.json b/npm-packages/shared-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pulse-editor/shared-utils",
-    "version": "0.1.1-alpha.49",
+    "version": "0.1.1-alpha.50",
     "main": "dist/main.js",
     "files": [
         "dist"
diff --git a/npm-packages/shared-utils/src/imc/inter-module-communication.ts b/npm-packages/shared-utils/src/imc/inter-module-communication.ts
@@ -76,7 +76,9 @@ export class InterModuleCommunication {
       const message = event.data;
       if (message.from !== undefined) {
         console.log(
-          `Module ${this.thisWindowId} received message from module ${message.from}:\n ${message}`
+          `Module ${this.thisWindowId} received message from module ${
+            message.from
+          }:\n ${JSON.stringify(message)}`
         );
       }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/remote-instance/src/servers/node-pty/index.ts b/remote-instance/src/servers/node-pty/index.ts
@@ -1,8 +1,8 @@
 import http from "http";
 import https from "https";
-import { WebSocket, WebSocketServer } from "ws";
-import os from "os";
 import { IPty, spawn } from "node-pty";
+import os from "os";
+import { WebSocket, WebSocketServer } from "ws";
 
 let sharedPtyProcess: IPty | null = null;
 let sharedTerminalMode = false;
diff --git a/web/components/app-loaders/sandbox-app-loader.tsx b/web/components/app-loaders/sandbox-app-loader.tsx
@@ -8,7 +8,6 @@ import { getPlatform } from "@/lib/platform-api/platform-checker";
 import { ExtensionApp, FileDragData } from "@/lib/types";
 import { addToast } from "@heroui/react";
 import {
-  AppTypeEnum,
   ConnectionListener,
   IMCMessage,
   IMCMessageTypeEnum,
@@ -138,6 +137,13 @@ export default function SandboxAppLoader({
     };
   }, []);
 
+  useEffect(() => {
+    console.log(
+      "Is dragging over canvas: ",
+      editorContext?.editorStates.isDraggingOverCanvas,
+    );
+  }, [editorContext?.editorStates.isDraggingOverCanvas]);
+
   // Set is loading extension to true when current extension changes
   useEffect(() => {
     if (currentExtension) {
@@ -209,88 +215,85 @@ export default function SandboxAppLoader({
     );
 
     // The following message handlers require OS-like environment.
-    // This can be either local environment or remote instance.
-    if (model.appConfig?.appType === AppTypeEnum.FileView) {
-      newMap.set(
-        IMCMessageTypeEnum.PlatformWriteFile,
-        async (
-          senderWindow: Window,
-          message: IMCMessage,
-          abortSignal?: AbortSignal,
-        ) => {
-          if (message.payload) {
-            const { uri, file }: { uri: string; file: File | undefined } =
-              message.payload;
-
-            if (!file) {
-              throw new Error("File is undefined.");
-            }
-
-            const projectPath =
-              editorContext?.persistSettings?.projectHomePath +
-              "/" +
-              editorContext?.editorStates.project;
-
-            // Prevent writing to path outside the project path
-            if (!uri.startsWith(projectPath)) {
-              throw new Error(
-                "Cannot write to path outside the project directory.",
-              );
-            }
-            await platformApi?.writeFile(file, uri);
+    // This can be either local environment or remote workspace.
+    newMap.set(
+      IMCMessageTypeEnum.PlatformWriteFile,
+      async (
+        senderWindow: Window,
+        message: IMCMessage,
+        abortSignal?: AbortSignal,
+      ) => {
+        if (message.payload) {
+          const { uri, file }: { uri: string; file: File | undefined } =
+            message.payload;
+
+          if (!file) {
+            throw new Error("File is undefined.");
           }
-        },
-      );
-      newMap.set(
-        IMCMessageTypeEnum.PlatformReadFile,
-        async (
-          senderWindow: Window,
-          message: IMCMessage,
-          abortSignal?: AbortSignal,
-        ) => {
-          const { uri }: { uri: string } = message.payload;
 
           const projectPath =
             editorContext?.persistSettings?.projectHomePath +
             "/" +
             editorContext?.editorStates.project;
 
-          // Prevent reading path outside the project path
+          // Prevent writing to path outside the project path
           if (!uri.startsWith(projectPath)) {
             throw new Error(
-              `Cannot read file outside the project directory: ${uri}, project path: ${projectPath}`,
+              "Cannot write to path outside the project directory.",
             );
           }
+          await platformApi?.writeFile(file, uri);
+        }
+      },
+    );
+    newMap.set(
+      IMCMessageTypeEnum.PlatformReadFile,
+      async (
+        senderWindow: Window,
+        message: IMCMessage,
+        abortSignal?: AbortSignal,
+      ) => {
+        const { uri }: { uri: string } = message.payload;
 
-          const file = await platformApi?.readFile(uri);
-          return file;
-        },
-      );
-    } else if (model.appConfig?.appType === AppTypeEnum.ConsoleView) {
-      newMap.set(
-        IMCMessageTypeEnum.PlatformCreateTerminal,
-        async (
-          senderWindow: Window,
-          message: IMCMessage,
-          abortSignal?: AbortSignal,
-        ) => {
-          const platform = getPlatform();
-          // Get a shell terminal from native platform APIs
-          if (platform === PlatformEnum.Capacitor) {
-            return {
-              websocketUrl: editorContext?.persistSettings?.mobileHost,
-              projectHomePath: `~/storage/shared/${editorContext?.persistSettings?.projectHomePath}`,
-            };
-          } else {
-            const wsUrl = await platformApi?.createTerminal();
-            return {
-              websocketUrl: wsUrl,
-              projectHomePath: editorContext?.persistSettings?.projectHomePath,
-            };
-          }
-        },
-      );
-    }
+        const projectPath =
+          editorContext?.persistSettings?.projectHomePath +
+          "/" +
+          editorContext?.editorStates.project;
+
+        // Prevent reading path outside the project path
+        if (!uri.startsWith(projectPath)) {
+          throw new Error(
+            `Cannot read file outside the project directory: ${uri}, project path: ${projectPath}`,
+          );
+        }
+
+        const file = await platformApi?.readFile(uri);
+        return file;
+      },
+    );
+    newMap.set(
+      IMCMessageTypeEnum.PlatformCreateTerminal,
+      async (
+        senderWindow: Window,
+        message: IMCMessage,
+        abortSignal?: AbortSignal,
+      ) => {
+        const platform = getPlatform();
+        // Get a shell terminal from native platform APIs
+        if (platform === PlatformEnum.Capacitor) {
+          return {
+            websocketUrl: editorContext?.persistSettings?.mobileHost,
+            projectHomePath: `~/storage/shared/${editorContext?.persistSettings?.projectHomePath}`,
+          };
+        } else {
+          const wsUrl = await platformApi?.createTerminal();
+          return {
+            websocketUrl: wsUrl,
+            projectHomePath: editorContext?.persistSettings?.projectHomePath,
+          };
+        }
+      },
+    );
 
     return newMap;
   }
@@ -353,11 +356,6 @@ export default function SandboxAppLoader({
             description: "The dropped file data is invalid.",
             color: "danger",
           });
-        } finally {
-          editorContext?.setEditorStates((prev) => ({
-            ...prev,
-            isDraggingOverCanvas: false,
-          }));
         }
       }}
     >
@@ -375,8 +373,8 @@ export default function SandboxAppLoader({
         </div>
       ) : (
         <div
-          className="relative h-full w-full data-[is-dragging-file=true]:pointer-events-none"
-          data-is-dragging-file={
+          className="relative h-full w-full data-[is-dragging-over-canvas=true]:pointer-events-none"
+          data-is-dragging-over-canvas={
             editorContext?.editorStates.isDraggingOverCanvas ? "true" : "false"
           }
         >
diff --git a/web/components/explorer/app/app-explorer.tsx b/web/components/explorer/app/app-explorer.tsx
@@ -33,6 +33,12 @@ export default function AppExplorer() {
           } as AppDragData),
         );
       }}
+      onDragEnd={() => {
+        editorContext?.setEditorStates((prev) => ({
+          ...prev,
+          isDraggingOverCanvas: false,
+        }));
+      }}
     >
       <AppPreviewCard
         extension={ext}
diff --git a/web/components/explorer/file-system/tree-view.tsx b/web/components/explorer/file-system/tree-view.tsx
diff --git a/web/components/views/canvas/canvas-view.tsx b/web/components/views/canvas/canvas-view.tsx
diff --git a/web/package.json b/web/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pulse-editor/shared-utils",`
`3`		`- "version": "0.1.1-alpha.49",`
	`3`	`+ "version": "0.1.1-alpha.50",`
`4`	`4`	`"main": "dist/main.js",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist"`