update

Dockerfile

@@ -2,7 +2,8 @@ FROM nikolaik/python-nodejs:python3.10-nodejs20
 
 ENV USER=pn \
     HOMEDIR=/home/pn \
-    PORT=7860
+    PORT=7860 \
+    REMIX_NAME=remix-app
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     apt-utils \
@@ -22,8 +23,8 @@ RUN chmod +x ${HOMEDIR}/*.sh
 
 # 运行 setup.sh、sshx.sh 和 remix.sh
 RUN ${HOMEDIR}/setup.sh \
-    && ${HOMEDIR}/sshx.sh \
-    && ${HOMEDIR}/remix.sh
+    && ${HOMEDIR}/remix.sh \
+    && ${HOMEDIR}/sshx.sh
 
 # 暴露 Remix 端口
 EXPOSE ${PORT}

src/remix.sh

@@ -4,20 +4,86 @@ set -e
 echo "开始安装 Remix..."
 
 # 使用 npx 来运行 create-remix
-npx create-remix@latest remix-app --yes --no-install --no-git-init
+npx create-remix@latest ${REMIX_NAME} --yes --no-install --no-git-init
 
 # 进入 Remix 项目目录
-cd ${HOMEDIR}/remix-app
+cd ${HOMEDIR}/${REMIX_NAME}
 
 # 安装依赖并构建
 pnpm install
 
-# 修改 package.json 中的 start 脚本，使用环境变量 PORT
-# sed -i 's/"start": "remix-serve build"/"start": "remix-serve build --port $PORT"/' package.json
+# 创建 sshx 路由文件
+cat << EOF > app/routes/sshx.tsx
+import { useState, useEffect } from 'react';
+import { json, ActionFunction } from '@remix-run/node';
+import { useLoaderData, Form, useSubmit } from '@remix-run/react';
+import { spawn } from 'child_process';
+
+let sshxProcess: any = null;
+let sshxOutput = '';
+
+export const loader = async () => {
+  return json({ status: sshxProcess ? 'running' : 'stopped', output: sshxOutput });
+};
+
+export const action: ActionFunction = async ({ request }) => {
+  const formData = await request.formData();
+  const action = formData.get('action');
+
+  if (action === 'start' && !sshxProcess) {
+    sshxProcess = spawn('${HOMEDIR}/sshx/sshx', []);
+    sshxProcess.stdout.on('data', (data: Buffer) => {
+      sshxOutput += data.toString();
+    });
+    sshxProcess.stderr.on('data', (data: Buffer) => {
+      sshxOutput += data.toString();
+    });
+    return json({ status: 'started' });
+  } else if (action === 'stop' && sshxProcess) {
+    sshxProcess.kill();
+    sshxProcess = null;
+    return json({ status: 'stopped' });
+  }
+
+  return json({ error: 'Invalid action' }, { status: 400 });
+};
+
+export default function Sshx() {
+  const { status, output } = useLoaderData();
+  const submit = useSubmit();
+  const [localOutput, setLocalOutput] = useState(output);
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      submit(null, { method: 'get', replace: true });
+    }, 1000);
+    return () => clearInterval(interval);
+  }, [submit]);
+
+  useEffect(() => {
+    setLocalOutput(output);
+  }, [output]);
+
+  return (
+    <div>
+      <h1>SSHX Control</h1>
+      <p>Status: {status}</p>
+      <Form method="post">
+        <button type="submit" name="action" value="start">Start SSHX</button>
+      </Form>
+      <Form method="post">
+        <button type="submit" name="action" value="stop">Stop SSHX</button>
+      </Form>
+      <h2>Output:</h2>
+      <pre>{localOutput}</pre>
+    </div>
+  );
+}
+EOF
 
 pnpm run build
 
 # 返回 HOMEDIR
 cd ${HOMEDIR}
 
-echo "Remix 安装完成"
+echo "Remix 安装完成，并添加了 SSHX 控制页面"

src/startup.sh

@@ -3,13 +3,8 @@
 echo "$HOMEDIR"
 
 # 使用 PM2 启动 Remix 应用，并传递 PORT 环境变量
-cd ${HOMEDIR}/remix-app
+cd ${HOMEDIR}/${REMIX_NAME}
 PORT=$PORT pm2 start npm --name "remix" -- start
+pm2 save
 
-# 运行sshx
-$HOMEDIR/sshx/sshx --help
-
-$HOMEDIR/sshx/sshx
-
-
-
+# PM2 会保持前台运行，无需额外的命令来保持容器运行