fix

Co-authored-by: 孟宁 <mengning@mengning.com.cn>
Reviewed-on: #4
Co-authored-by: hwy <1093970372@qq.com>
Co-committed-by: hwy <1093970372@qq.com>

.github/workflows/backend.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, s390x, win32]
     steps:
-      - uses: actions/checkout@v4
+      - uses: https://devstar.cn/actions/checkout@v4
       - name: Install packages
         run: |
           sudo apt-get update
@@ -32,8 +32,3 @@ jobs:
         env:
           BUILD_TARGET: ${{ matrix.target }}
         run: ./scripts/cross-build.sh
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ttyd.${{ matrix.target }}
-          path: build/ttyd*
-

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ jobs:
       packages: write
       contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: https://devstar.cn/actions/checkout@v4
       - name: Install packages
         run: |
           sudo apt-get update
@@ -25,32 +25,37 @@ jobs:
             [ "$arch" = "armv7" ] && arch="arm" 
             mkdir -p dist/$arch && cp build/ttyd dist/$arch/ttyd
           done
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/login-action@v3
+      - uses: https://devstar.cn/alexios/setup-qemu-action@v3
+      - uses: https://devstar.cn/alexios/setup-buildx-action@v3
+      - uses: https://devstar.cn/alexios/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - uses: docker/login-action@v3
+      - uses: alexios/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Determine docker tags
         id: docker_tag
+        env:
+          DOCKER_USER: ${{ vars.DOCKER_HUB_USERNAME }}
+          PROJECT: ${{ vars.PROJECT_NAME }}
         run: |
+          FULL_IMAGE_NAME="${DOCKER_USER}/${PROJECT}"
+          
           case $GITHUB_REF in
             refs/tags/*)
               TAG_NAME=${GITHUB_REF#refs/tags/}
-              echo "DOCKER_TAG=tsl0922/ttyd:${TAG_NAME}" >> $GITHUB_ENV
-              echo "ALPINE_TAG=tsl0922/ttyd:${TAG_NAME}-alpine" >> $GITHUB_ENV
+              echo "DOCKER_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}" >> $GITHUB_ENV
+              echo "ALPINE_TAG=${FULL_IMAGE_NAME}:${TAG_NAME}-alpine" >> $GITHUB_ENV
               ;;
             *)
-              echo "DOCKER_TAG=tsl0922/ttyd:latest" >> $GITHUB_ENV
-              echo "ALPINE_TAG=tsl0922/ttyd:alpine" >> $GITHUB_ENV
+              echo "DOCKER_TAG=${FULL_IMAGE_NAME}:latest" >> $GITHUB_ENV
+              echo "ALPINE_TAG=${FULL_IMAGE_NAME}:alpine" >> $GITHUB_ENV
           esac
       - name: build/push docker image
-        uses: docker/build-push-action@v6
+        uses: https://devstar.cn/alexios/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -60,7 +65,7 @@ jobs:
             ${{ env.DOCKER_TAG }}
             ghcr.io/${{ env.DOCKER_TAG }}
       - name: build/push docker image (alpine)
-        uses: docker/build-push-action@v6
+        uses: https://devstar.cn/alexios/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile.alpine

.github/workflows/frontend.yml

@@ -14,15 +14,16 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: https://devstar.cn/actions/checkout@v4
+      - uses: https://devstar.cn/actions/setup-node@v4
         with:
           node-version: 18
       - name: Run yarn install, check and build
         run: |
           corepack enable
           corepack prepare yarn@stable --activate
-          yarn install
+          yarn install --no-immutable
+          yarn add -D eslint-plugin-n
           yarn run check
           yarn run build
         working-directory: html

html/src/components/terminal/xterm/index.ts

@@ -112,7 +112,6 @@ export class Xterm {
     private containerStatus = "";
     private attachCommandSent = false;
     private attachCommandSentAt?: number;
-    private ptyOutputReceived = false;
     constructor(
         private options: XtermOptions,
         private sendCb: () => void
@@ -277,7 +276,6 @@ export class Xterm {
     @bind
     public connect() {
         this.socket = new WebSocket(this.options.wsUrl, ['tty']);
-        this.ptyOutputReceived = false;
         const { socket, register } = this;
 
         socket.binaryType = 'arraybuffer';
@@ -312,7 +310,6 @@ export class Xterm {
         this.doReconnect = this.reconnect;
         this.initListeners();
         terminal.focus();
-        this.tryExecuteAttachCommand();
     }
 
     @bind
@@ -343,43 +340,6 @@ export class Xterm {
         }
     }
 
-    @bind
-    private tryExecuteAttachCommand() {
-        console.log('[Xterm] tryExecuteAttachCommand called:', {
-            attachCommandSent: this.attachCommandSent,
-            connectStatus: this.connectStatus,
-            hasCommand: !!(this.postAttachCommand && this.postAttachCommand.length > 0),
-            socketReady: this.socket?.readyState === WebSocket.OPEN,
-            ptyOutputReceived: this.ptyOutputReceived
-        });
-        
-        if (this.attachCommandSent || this.connectStatus) {
-            console.log('[Xterm] Skipping: command already sent or connected');
-            return;
-        }
-        if (!this.postAttachCommand || this.postAttachCommand.length === 0) {
-            console.log('[Xterm] Skipping: no command available');
-            return;
-        }
-        if (this.socket?.readyState !== WebSocket.OPEN) {
-            console.log('[Xterm] Skipping: WebSocket not ready, state:', this.socket?.readyState);
-            return;
-        }
-        if (!this.ptyOutputReceived) {
-            console.log('[Xterm] Skipping: ttyd not ready yet (waiting for first output)');
-            return; // Wait for TTY readiness confirm via output
-        }
-
-        const cmd = this.postAttachCommand[0];
-        if (cmd) {
-            console.log('[Xterm] ✅ All conditions met, executing attach command...');
-            this.sendData(cmd + "\n");
-            this.attachCommandSent = true;
-            this.attachCommandSentAt = Date.now();
-            console.log('[Xterm] Command sent at:', new Date(this.attachCommandSentAt).toISOString());
-        }
-    }
-
     /**
      * 获取 URL 查询参数
      */
@@ -433,8 +393,14 @@ export class Xterm {
                 }
                 
                 // 执行连接容器的命令（只执行一次）
-                this.postAttachCommand = data.command.split('\n');
-                this.tryExecuteAttachCommand();
+                const parts = data.command.split('\n');
+                if (parts[0] && !this.connectStatus) {
+                    console.log('[Xterm] Successfully loaded connection command, executing...');
+                    this.sendData(parts[0]+"\n");
+                    this.attachCommandSent = true;
+                    this.attachCommandSentAt = Date.now();
+                }
+                this.postAttachCommand = parts;
             })
             .catch(error => {
                 console.error(`[Xterm] Error loading command (attempt ${retryCount + 1}/${maxRetries}):`, error);
@@ -499,66 +465,48 @@ export class Xterm {
         const data = rawData.slice(1);
         switch (cmd) {
             case Command.OUTPUT:
-                if (!this.ptyOutputReceived) {
-                    this.ptyOutputReceived = true;
-                    console.log('[Xterm] ✅ ttyd is now ready (received first output), attempting to execute attach command');
-                    this.tryExecuteAttachCommand();
-                }
-
                 const decodedData = textDecoder.decode(data);
                 console.log('[ttyd] output:', decodedData);
                 const compactOutput = decodedData.replace(/\s/g, '');
                 const { options } = this.getUrlParams();
                 if (options.get('type') === 'docker') {
                     // 保存host的标题
-                    const pureContent = decodedData.replace(/\u001B\[[0-9;?]*[ -\/]*[@-~]/g, '').replace(/\u0007/g, '').trim();
-                    if (this.hostTitle === '' && pureContent.length > 0){
+                    if (this.hostTitle === ''){
                         this.hostTitle = compactOutput;
-                        console.log('[Xterm] Host title captured:', this.hostTitle);
                     }
-                    
                     // 检测是否退出devcontainer，标题等于host的标题
-                    if (this.connectStatus && this.hostTitle && compactOutput.includes(this.hostTitle)){
-                        console.log('[Xterm] Detected exit to host shell');
+                    if (this.connectStatus && compactOutput.includes(this.hostTitle)){
                         this.connectStatus = false;
                         this.connectionMessageBuffer = '';
                         this.attachCommandSent = false;
                         this.attachCommandSentAt = undefined;
                         this.postAttachCommandStatus = false;
-                        this.ptyOutputReceived = false; // 重置 PTY 状态
                     }
-
-                    if (this.connectStatus) {
-                        try {
-                            this.writeFunc(data);
-                        } catch (e) {
-                             console.error('[Xterm] writeFunc error:', e);
-                        }
-                    } else {
-                        // 未连接状态：缓冲所有输出
-                        this.connectionMessageBuffer += decodedData;
-                        
-                        const successMarker = 'Successfully connected to the devcontainer';
-                        // 尝试在 buffer 中查找成功标记
-                        const markerIndex = this.connectionMessageBuffer.indexOf(successMarker);
-
-                        if (markerIndex !== -1) {
-                            console.log('[Xterm] Connection established, flushing buffer.');
+                    // 检测连接完成：监听 "Successfully connected to the devcontainer" 消息
+                    // 这条消息是由连接命令中的 echo "$WEB_TERMINAL_HELLO" 输出的
+                    if (!this.connectStatus) {
+                        const sanitizedOutput = this.stripAnsi(decodedData).replace(/\r/g, '\n');
+                        const combinedOutput = this.connectionMessageBuffer + sanitizedOutput;
+                        const segments = combinedOutput.split(/\n/);
+                        this.connectionMessageBuffer = segments.pop() ?? '';
+                        const hasSuccessLine = segments.some(line => line.trim() === 'Successfully connected to the devcontainer');
+                        if (hasSuccessLine) {
                             this.connectStatus = true;
-                            this.terminal.options.disableStdin = false;
-                            
-                            const validOutput = this.connectionMessageBuffer.substring(markerIndex);
-                            this.writeData(validOutput);
                             this.connectionMessageBuffer = '';
-                        } 
-                        
-                        if (this.connectionMessageBuffer.length > 20000) {
-                             console.warn('[Xterm] Buffer overflow protection. Flushing all.');
-                             this.writeData(this.connectionMessageBuffer);
-                             this.connectionMessageBuffer = '';
+                            this.attachCommandSentAt = undefined;
+                            console.log('[Xterm] Connection established, enabling terminal input');
+                            // 确保终端输入已启用
+                            this.terminal.options.disableStdin = false;
                         }
                     }
-
+                    // 连接完成之前，过滤掉 docker exec 命令的标题输出（ANSI 码和 docker-H 开头的输出）
+                    if ( 
+                        !(this.connectStatus === false && 
+                            (textDecoder.decode(data).includes('\x1b') || 
+                            textDecoder.decode(data).replace(/\s/g, '').includes('docker-H')))
+                    ){
+                        this.writeFunc(data);
+                    }
                     // 连接完成且出现容器的标题，且没有执行过postAttach命令
                     if (this.connectStatus && compactOutput.includes(this.workdir) && !this.postAttachCommandStatus){
                         console.log('[Xterm] Detected workdir in output, executing postAttachCommand');

scripts/cross-build.sh

@@ -16,9 +16,17 @@ MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.28.5}"
 LIBUV_VERSION="${LIBUV_VERSION:-1.44.2}"
 LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.3}"
 
+BASE_URL="https://devstar.cn/alexios/zip-repo/releases/download"
+URL_TOOLCHAIN="${BASE_URL}/v1.0/aarch64-linux-musl-cross.tgz"
+URL_ZLIB="${BASE_URL}/v1.0/zlib-1.3.1.tar.gz"
+URL_JSONC="${BASE_URL}/v1.0/json-c-0.17.tar.gz"
+URL_MBEDTLS="${BASE_URL}/v1.0/mbedtls-2.28.5.tar.gz"
+URL_LIBUV="${BASE_URL}/v1.0/libuv-v1.44.2.tar.gz"
+URL_LWS="${BASE_URL}/v1.0/libwebsockets-4.3.3.tar.gz"
+
 build_zlib() {
     echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+    curl -kfSsLo- "$URL_ZLIB" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}"/zlib-"${ZLIB_VERSION}"
         env CHOST="${TARGET}" ./configure --static --archs="-fPIC" --prefix="${STAGE_DIR}"
         make -j"$(nproc)" install
@@ -27,7 +35,7 @@ build_zlib() {
 
 build_json-c() {
     echo "=== Building json-c-${JSON_C_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://s3.amazonaws.com/json-c_releases/releases/json-c-${JSON_C_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+    curl -kfSsLo- "$URL_JSONC" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}/json-c-${JSON_C_VERSION}"
         rm -rf build && mkdir -p build && cd build
         cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \
@@ -43,7 +51,7 @@ build_json-c() {
 
 build_mbedtls() {
     echo "=== Building mbedtls-${MBEDTLS_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://github.com/ARMmbed/mbedtls/archive/v${MBEDTLS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+    curl -kfSsLo- "$URL_MBEDTLS" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}/mbedtls-${MBEDTLS_VERSION}"
         rm -rf build && mkdir -p build && cd build
         cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \
@@ -57,7 +65,7 @@ build_mbedtls() {
 
 build_libuv() {
     echo "=== Building libuv-${LIBUV_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://dist.libuv.org/dist/v${LIBUV_VERSION}/libuv-v${LIBUV_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+   curl -kfSsLo- "$URL_LIBUV" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}/libuv-v${LIBUV_VERSION}"
         ./autogen.sh
         env CFLAGS=-fPIC ./configure --disable-shared --enable-static --prefix="${STAGE_DIR}" --host="${TARGET}"
@@ -83,7 +91,7 @@ EOF
 
 build_libwebsockets() {
     echo "=== Building libwebsockets-${LIBWEBSOCKETS_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+    curl -kfSsLo- "$URL_LWS" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}"
         sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in
         sed -i 's/ OR PC_OPENSSL_FOUND//g' lib/tls/CMakeLists.txt
@@ -134,7 +142,6 @@ build() {
     ALIAS="$2"
     STAGE_DIR="${STAGE_ROOT}/${TARGET}"
     BUILD_DIR="${BUILD_ROOT}/${TARGET}"
-    MUSL_CC_URL="https://github.com/tsl0922/musl-toolchains/releases/download/2021-11-23"
     COMPONENTS="1"
     SYSTEM="Linux"
 
@@ -144,12 +151,12 @@ build() {
     fi
 
     echo "=== Installing toolchain ${ALIAS} (${TARGET})..."
-
     mkdir -p "${CROSS_ROOT}" && export PATH="${PATH}:${CROSS_ROOT}/bin"
-    curl -fSsLo- "${MUSL_CC_URL}/${TARGET}-cross.tgz" | tar xz -C "${CROSS_ROOT}" --strip-components=${COMPONENTS}
-
-    echo "=== Building target ${ALIAS} (${TARGET})..."
-
+    TOOLCHAIN_FILE="${TARGET}-cross.tgz"
+    DOWNLOAD_URL="${BASE_URL}/v1.0/${TOOLCHAIN_FILE}"
+    
+    echo "Downloading toolchain: $DOWNLOAD_URL"
+    curl -kfSsLo- "$DOWNLOAD_URL" | tar xz -C "${CROSS_ROOT}" --strip-components=${COMPONENTS}
     rm -rf "${STAGE_DIR}" "${BUILD_DIR}"
     mkdir -p "${STAGE_DIR}" "${BUILD_DIR}"
     export PKG_CONFIG_PATH="${STAGE_DIR}/lib/pkgconfig"