Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Change Log
 
+## v1.11.5 (963)
+
+* Alpine Linux Backend by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1401
+* fix: html escaping for console page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1411
+* Create plugin for native libs by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1413
+* feat: terminal frontend by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1415
+* Update hu-hu.json translation by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1423, https://github.com/Acode-Foundation/Acode/pull/1425, https://github.com/Acode-Foundation/Acode/pull/1440
+* chore: update id-id.json translation by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1424, https://github.com/Acode-Foundation/Acode/pull/1447
+* All file access permission for terminal by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1426
+* refactor: plugins page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1428
+	* Fixed infinite scrolling in case of filtering on both plugin page and sidebar
+    * Ui improvements on plugin page
+* Revamped few themes(fixes visibility issue) and Added few new ones  by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1430
+	* New theme: Neon, Sunset, Glass, Glass Dark
+	* Revamped themes: System (Dark & Light), Oled, Light
+	* System theme option is available on free too.
+* fix: scaling issue by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1431
+* fix: quicktools toggler responsiveness(scaling) and migrate biome by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1442
+* chore: update ace to v1.43.2 by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1443
+* feat: add uninstall option in terminal setting and tab subtitle fixes by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1445
+* feat: alpine document provider(exposes terminal public dir to saf picker) by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1444
+* feat: improved logging + fix terminal installation failure by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1446
+* some terminal related quality improvements by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1449
+	* fix: dont start selection in case of back gesture
+	* remove useless border-radius from terminal container
+	* fix: improve terminal cursor positioning for mobile keyboard events
+	* fix: update terminal container background when theme changes
+* exclude alpine/public while backup by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1450
+* Custom port support in Terminal manager by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1459
+* 🌐 i18n(locale): update vietnamese translations by @Nekitori17 in https://github.com/Acode-Foundation/Acode/pull/1461
+* fix: infinite loading when previewing by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1460
+* Feat/some improvements to terminal and its api by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1463
+* Fixes/sidebar extension state by clearing and active autocompletion box background  by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1466
+* feat: add terminal like search and replace history by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1467
+* fix: theme issue in terminal context menu
+* fix: prevent folder paste loops and improve SAF handling(termux) in cut operation by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1474
+	- Add validation to prevent pasting folders into themselves or subdirectories
+	- Implement special Termux SAF handling for cut operations with recursive file/folder moving
+	- Fix createFileStructure to handle nested paths (foo/bar) for file:// URIs
+
 ## v1.11.4 (962)
 
 * Fix renaming current Termux URI file whilst viewing/editing it by @peasneovoyager2banana2

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<widget id="com.foxdebug.acode" android-versionCode="962" version="1.11.4"
+<widget id="com.foxdebug.acode" android-versionCode="963" version="1.11.5"
     xmlns="http://www.w3.org/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:cdv="http://cordova.apache.org/ns/1.0">
@@ -37,7 +37,6 @@
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:networkSecurityConfig="@xml/network_security_config" />
             <application android:hardwareAccelerated="true" />
-            <application android:requestLegacyExternalStorage="true" />
             <application android:largeHeap="true" />
             <application android:requestLegacyExternalStorage="true"/>
         </edit-config>

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "com.foxdebug.acode",
   "displayName": "Acode",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "description": "Acode is a code editor for android",
   "scripts": {
     "lang": "node ./utils/lang.js",
@@ -36,7 +36,6 @@
       },
       "cordova-plugin-websocket": {},
       "cordova-plugin-buildinfo": {},
-      "com.foxdebug.acode.rk.exec.proot": {},
       "cordova-plugin-system": {},
       "com.foxdebug.acode.rk.exec.terminal": {}
     },
@@ -64,7 +63,6 @@
     "@types/url-parse": "^1.4.11",
     "autoprefixer": "^10.4.19",
     "babel-loader": "^9.1.3",
-    "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
     "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
     "cordova-android": "^13.0.0",
     "cordova-clipboard": "^1.3.0",

package.json

@@ -31,6 +31,7 @@ export default class TerminalComponent {
 			scrollOnUserInput: true,
 			rows: options.rows || 24,
 			cols: options.cols || 80,
+			port: options.port || 8767,
 			fontSize: terminalSettings.fontSize,
 			fontFamily: terminalSettings.fontFamily,
 			fontWeight: terminalSettings.fontWeight,
@@ -128,7 +129,7 @@ export default class TerminalComponent {
 		let lastKnownScrollPosition = 0;
 		let isResizing = false;
 		let resizeCount = 0;
-		const RESIZE_DEBOUNCE = 150;
+		const RESIZE_DEBOUNCE = 100;
 		const MAX_RAPID_RESIZES = 3;
 
 		// Store original dimensions for comparison
@@ -170,8 +171,37 @@ export default class TerminalComponent {
 						await this.resizeTerminal(size.cols, size.rows);
 					}
 
-					// Preserve scroll position for content-heavy terminals
-					this.preserveViewportPosition(lastKnownScrollPosition);
+					// Handle keyboard resize cursor positioning
+					const heightRatio = size.rows / originalRows;
+					if (
+						heightRatio < 0.75 &&
+						this.terminal.buffer &&
+						this.terminal.buffer.active
+					) {
+						// Keyboard resize detected - ensure cursor is visible
+						const buffer = this.terminal.buffer.active;
+						const cursorY = buffer.cursorY;
+						const cursorViewportPos = buffer.baseY + cursorY;
+						const viewportTop = buffer.viewportY;
+						const viewportBottom = viewportTop + this.terminal.rows - 1;
+
+						if (
+							cursorViewportPos <= viewportTop + 1 ||
+							cursorViewportPos >= viewportBottom - 1
+						) {
+							const targetScroll = Math.max(
+								0,
+								Math.min(
+									buffer.length - this.terminal.rows,
+									cursorViewportPos - Math.floor(this.terminal.rows * 0.25),
+								),
+							);
+							this.terminal.scrollToLine(targetScroll);
+						}
+					} else {
+						// Regular resize - preserve scroll position
+						this.preserveViewportPosition(lastKnownScrollPosition);
+					}
 
 					// Update stored dimensions
 					originalRows = size.rows;
@@ -437,8 +467,9 @@ export default class TerminalComponent {
       height: 100%;
       position: relative;
       background: ${this.options.theme.background};
-      border-radius: 4px;
       overflow: hidden;
+      padding: 0.25rem;
+      box-sizing: border-box;
     `;
 
 		return this.container;
@@ -455,6 +486,9 @@ export default class TerminalComponent {
 
 		this.container = container;
 
+		// Apply terminal background color to container to match theme
+		this.container.style.background = this.options.theme.background;
+
 		try {
 			try {
 				this.terminal.loadAddon(this.webglAddon);
@@ -535,13 +569,16 @@ export default class TerminalComponent {
 				rows: this.terminal.rows,
 			};
 
-			const response = await fetch("http://localhost:8767/terminals", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			const response = await fetch(
+				`http://localhost:${this.options.port}/terminals`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify(requestBody),
 				},
-				body: JSON.stringify(requestBody),
-			});
+			);
 
 			if (!response.ok) {
 				throw new Error(`HTTP error! status: ${response.status}`);
@@ -573,7 +610,7 @@ export default class TerminalComponent {
 
 		this.pid = pid;
 
-		const wsUrl = `ws://localhost:8767/terminals/${pid}`;
+		const wsUrl = `ws://localhost:${this.options.port}/terminals/${pid}`;
 
 		this.websocket = new WebSocket(wsUrl);
 
@@ -627,13 +664,16 @@ export default class TerminalComponent {
 		if (!this.pid || !this.serverMode) return;
 
 		try {
-			await fetch(`http://localhost:8767/terminals/${this.pid}/resize`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			await fetch(
+				`http://localhost:${this.options.port}/terminals/${this.pid}/resize`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify({ cols, rows }),
 				},
-				body: JSON.stringify({ cols, rows }),
-			});
+			);
 		} catch (error) {
 			console.error("Failed to resize terminal:", error);
 		}
@@ -653,7 +693,18 @@ export default class TerminalComponent {
 	 * @param {string} data - Data to write
 	 */
 	write(data) {
-		this.terminal.write(data);
+		if (
+			this.serverMode &&
+			this.isConnected &&
+			this.websocket &&
+			this.websocket.readyState === WebSocket.OPEN
+		) {
+			// Send data through WebSocket instead of direct write
+			this.websocket.send(data);
+		} else {
+			// For local mode or disconnected terminals, write directly
+			this.terminal.write(data);
+		}
 	}
 
 	/**
@@ -675,6 +726,32 @@ export default class TerminalComponent {
 	 * Focus terminal
 	 */
 	focus() {
+		// Ensure cursor is visible before focusing to prevent half-visibility
+		if (this.terminal.buffer && this.terminal.buffer.active) {
+			const buffer = this.terminal.buffer.active;
+			const cursorY = buffer.cursorY;
+			const cursorViewportPos = buffer.baseY + cursorY;
+			const viewportTop = buffer.viewportY;
+			const viewportBottom = viewportTop + this.terminal.rows - 1;
+
+			// Check if cursor is fully visible (with margin to prevent half-visibility)
+			const isCursorFullyVisible =
+				cursorViewportPos >= viewportTop + 1 &&
+				cursorViewportPos <= viewportBottom - 2;
+
+			// If cursor is not fully visible, scroll to make it properly visible
+			if (!isCursorFullyVisible && buffer.length > this.terminal.rows) {
+				const targetScroll = Math.max(
+					0,
+					Math.min(
+						buffer.length - this.terminal.rows,
+						cursorViewportPos - Math.floor(this.terminal.rows * 0.25),
+					),
+				);
+				this.terminal.scrollToLine(targetScroll);
+			}
+		}
+
 		this.terminal.focus();
 	}
 
@@ -896,9 +973,12 @@ export default class TerminalComponent {
 
 		if (this.pid && this.serverMode) {
 			try {
-				await fetch(`http://localhost:8767/terminals/${this.pid}/terminate`, {
-					method: "POST",
-				});
+				await fetch(
+					`http://localhost:${this.options.port}/terminals/${this.pid}/terminate`,
+					{
+						method: "POST",
+					},
+				);
 			} catch (error) {
 				console.error("Failed to terminate terminal:", error);
 			}

src/components/terminal/terminal.js

@@ -472,6 +472,7 @@ class TerminalManager {
 				background: #1e1e1e;
 				overflow: hidden;
 				position: relative;
+				padding: 0.25rem;
 			}
 		`;
 	}

src/components/terminal/terminalManager.js

@@ -71,7 +71,7 @@
 	padding: 12px 16px;
 	border: none;
 	background: transparent;
-	color: #fff;
+	color: var(--primary-text-color);
 	font-size: 14px;
 	font-weight: 500;
 	text-align: center;
@@ -85,12 +85,12 @@
 
 .terminal-context-menu button:hover,
 .terminal-context-menu button:focus {
-	background: #616161;
+	background: var(--popup-border-color);
 	outline: none;
 }
 
 .terminal-context-menu button:active {
-	background: #757575;
+	background: rgba(var(--secondary-color), 0.5);
 }
 
 @media (min-width: 768px) {