Merge branch 'MCSManager:master' into master

Author: SnowMoonSS

daemon/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mcsmanager-daemon",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "Provides remote control capability for MCSManager to manage processes, scheduled tasks, I/O streams, and more",
   "scripts": {
     "dev": "nodemon --watch src --ext ts,js --exec \"npm run build && node --enable-source-maps production/app.js\"",

daemon/package.json

@@ -150,23 +150,23 @@ routerApp.on("file/status", async (ctx, data) => {
 });
 
 // Create a new file
-routerApp.on("file/touch", (ctx, data) => {
+routerApp.on("file/touch", async (ctx, data) => {
   try {
     const target = data.target;
     const fileManager = getFileManager(data.instanceUuid);
-    fileManager.newFile(target);
+    await fileManager.newFile(target);
     protocol.response(ctx, true);
   } catch (error: any) {
     protocol.responseError(ctx, error);
   }
 });
 
 // Create a directory
-routerApp.on("file/mkdir", (ctx, data) => {
+routerApp.on("file/mkdir", async (ctx, data) => {
   try {
     const target = data.target;
     const fileManager = getFileManager(data.instanceUuid);
-    fileManager.mkdir(target);
+    await fileManager.mkdir(target);
     protocol.response(ctx, true);
   } catch (error: any) {
     protocol.responseError(ctx, error);

daemon/src/routers/file_router.ts

@@ -16,6 +16,7 @@ import { AsyncTask } from "./async_task_service";
 import logger from "./log";
 import { NetworkLimitService } from "./network_limit_service";
 import InstanceSubsystem from "./system_instance";
+import { getLinuxSystemId } from "../tools/system_user";
 
 type PublicPortArray = {
   [key: string]: {
@@ -396,6 +397,21 @@ export class SetupDockerContainer extends AsyncTask {
       }
     }
 
+    // Convert Linux host username to UID:GID format for Docker.
+    const runAs = instance.config.runAs?.trim();
+    let dockerUser: string | undefined = runAs || undefined;
+    const shouldResolveHostUser =
+      runAs && process.platform === "linux" && !runAs.includes(":") && !/^\d+$/.test(runAs);
+    if (shouldResolveHostUser) {
+      try {
+        const { uid, gid } = await getLinuxSystemId(runAs);
+        dockerUser = `${uid}:${gid}`;
+        logger.info(`Docker User: ${dockerUser} (converted from ${runAs})`);
+      } catch (error: any) {
+        logger.warn(`Failed to get UID/GID for user ${runAs}: ${error.message}`);
+      }
+    }
+
     this.container = await docker.createContainer({
       Entrypoint: entrypoint,
       Cmd: startCmd,
@@ -411,7 +427,7 @@ export class SetupDockerContainer extends AsyncTask {
       StdinOnce: false,
       ExposedPorts: exposedPorts,
       Env: dockerConfig?.env || [],
-      User: instance.config.runAs || undefined,
+      User: dockerUser,
       Labels: {
         ...dockerConfig.labels
           ?.map((label) => {