Merge branch 'main' into cli_chore

.github/CODE_OF_CONDUCT.md

@@ -10,4 +10,4 @@
 
 5. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+This Code of Conduct is adapted from the [Contributor Covenant](https://contributor-covenant.org), version 1.0.0, available at [https://contributor-covenant.org/version/1/0/0/](https://contributor-covenant.org/version/1/0/0/)

.github/CODE_OF_CONDUCT_CN.md

@@ -10,4 +10,4 @@
 
 5. 可以通过提出问题或联系一个或多个项目维护者来举报虐待，骚扰或其他不可接受的行为。
 
-本行为准则改编自 [Contributor Covenant](http://contributor-covenant.org)版本1.0.0，可在 [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/ )查看
+本行为准则改编自 [Contributor Covenant](https://contributor-covenant.org)版本1.0.0，可在 [https://contributor-covenant.org/version/1/0/0/](https://contributor-covenant.org/version/1/0/0/ )查看

.github/CONTRIBUTING.md

@@ -84,11 +84,11 @@ If you find a problem 🐛 or have a better idea 💡 during use, you can modify
      - ci: Continuous integration
      - build || chore: Changes in build tools or dependent packages
 
-6. Submit a pull request to the `master` branch of the upstream repository, and we will review it.
+6. Submit a pull request to the `main` branch of the upstream repository, and we will review it.
 
-   > Note: The master branch is an unstable code branch, new code will be merged to master, if you need to use stable code, you can switch to the tag. git checkout ${tag_name}
+   > Note: The main branch is an unstable code branch, new code will be merged to main, if you need to use stable code, you can switch to the tag. git checkout ${tag_name}
 
-7. Release process, pull down the latest master branch `maste`, using this command line to generate a new commit, and finally use rebase merge to merge into The master branch `master`.
+7. Release process, pull down the latest `main` branch, using this command line to generate a new commit, and finally use rebase merge to merge into the `main` branch.
 
    ```shell
    npm version [patch | minor | major] -m '${Commit message}'

.github/CONTRIBUTING_CN.md

@@ -83,11 +83,11 @@
       - ci: 持续集成
       - build || chore: 构建过程或辅助工具的变动
 
-6. 最后，向上游仓库中的 `master` 分支发起一个 pull request 请求，我们将对其进行认真的审查。
+6. 最后，向上游仓库中的 `main` 分支发起一个 pull request 请求，我们将对其进行认真的审查。
 
-    > 注意：master 分支为不稳定代码分支，新的代码都会 merge 到 master，如果您需要使用稳定代码，可以切换到对应的 tag。git checkout ${tag_name}
+    > 注意：main 分支为不稳定代码分支，新的代码都会 merge 到 main，如果您需要使用稳定代码，可以切换到对应的 tag。git checkout ${tag_name}
 
-7. 发版流程，拉下最新的主分支 `maste`，使用下面这个命令行产生一个新的 commit，最后使用 rebase merge 合并到主分支 `master`。
+7. 发版流程，拉下最新的主分支 `main`，使用下面这个命令行产生一个新的 commit，最后使用 rebase merge 合并到主分支 `main`。
 
     ```shell
     npm version [patch | minor | major] -m '${Commit message}'

.github/workflows/build_cli.yaml

@@ -10,12 +10,12 @@ on:
 
 jobs:
   build_packages:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: 16.14
+          node-version-file: '.nvmrc'
 
       - name: build
         run: |
@@ -44,9 +44,9 @@ jobs:
 
   publish_docker:
     if: github.event_name == 'release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -79,12 +79,12 @@ jobs:
 
   publish_npm:
     if: github.event_name == 'release' && !github.event.release.prerelease
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.14
+          node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
       - name: build
         run: |

.github/workflows/build_packages.yaml

@@ -8,9 +8,9 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build
         run: |
           docker run --rm -i \

.github/workflows/deploy_web.yaml

@@ -11,14 +11,14 @@ on:
 
 jobs:
   deploy_website:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
+      - uses: actions/checkout@v4
       - name: use node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.14
+          node-version-file: '.nvmrc'
 
-      - uses: actions/checkout@v3
       - name: set env
         run: |
           cd web
@@ -41,14 +41,14 @@ jobs:
 
   publish_docker:
     if: github.event_name != 'pull_request'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
+      - uses: actions/checkout@v4
       - name: use node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.14
+          node-version-file: '.nvmrc'
 
-      - uses: actions/checkout@v3
       - name: set env
         run: |
           cd web

.nvmrc

@@ -0,0 +1 @@
+16

README-CN.md

@@ -15,7 +15,7 @@
 
 [MQTTX](https://mqttx.app/zh) 的用户界面借助聊天软件的形式简化了页面的操作逻辑，用户可以快速创建连接保存并同时建立多个连接客户端，方便用户快速测试 MQTT/TCP、MQTT/TLS、MQTT/WebSocket 的 **连接/发布/订阅** 功能及其他特性。
 
-> [MQTT](http://mqtt.org/faq) 全称为 Message Queuing Telemetry Transport（消息队列遥测传输）是一种基于 发布/订阅 范式的“轻量级”消息协议，旨在用于受限设备和低带宽，高延迟或不可靠的网络，由 IBM 发布。
+> [MQTT](https://mqtt.org/faq) 全称为 Message Queuing Telemetry Transport（消息队列遥测传输）是一种基于 发布/订阅 范式的“轻量级”消息协议，旨在用于受限设备和低带宽，高延迟或不可靠的网络，由 IBM 发布。
 
 ## 功能预览
 

README-JP.md

@@ -15,7 +15,7 @@
 
 [MQTTX](https://mqttx.app/)のユーザーインターフェイスは、チャットソフトウェアのような形でページの操作ロジックを簡素化します。ユーザーは、接続をすばやく作成し、複数の接続クライアントを同時に保存および確立できます。 MQTT/TCP、MQTT/TLS、MQTT/WebSocketの**接続/パブリッシュ/サブスクライブ**機能およびその他の機能をすばやくテストすることが便利です。
 
-> [MQTT](http://mqtt.org/faq)（Message Queuing Telemetry Transport）は、パブリッシュ/サブスクライブパラダイムに基づいた「軽量」メッセージングプロトコルです。制約のあるデバイスや、低帯域幅、高遅延、または信頼性の低いネットワークで使用するように設計されています。IBMによって公開されています。
+> [MQTT](https://mqtt.org/faq)（Message Queuing Telemetry Transport）は、パブリッシュ/サブスクライブパラダイムに基づいた「軽量」メッセージングプロトコルです。制約のあるデバイスや、低帯域幅、高遅延、または信頼性の低いネットワークで使用するように設計されています。IBMによって公開されています。
 
 ## 機能プレビュー
 

README.md

@@ -1,21 +1,26 @@
 <img src="./assets/mqttx-logo.png" width="480" alt="MQTTX Logo" />
 
 [![GitHub Release](https://img.shields.io/github/release/emqx/mqttx?color=brightgreen)](https://github.com/emqx/mqttx/releases)
-![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)
+![platforms](https://img.shields.io/badge/platforms-Windows%20%7C%20Linux%20%7C%20macOS-lightgrey)
 ![build packages](https://github.com/emqx/MQTTX/workflows/build%20packages/badge.svg)
-[![Total Downloads](https://img.shields.io/github/downloads/emqx/mqttx/total.svg)](https://github.com/emqx/mqttx/releases)
-[![Slack](https://img.shields.io/badge/Slack-EMQX-39AE85?logo=slack)](https://slack-invite.emqx.io/) [![Discord](https://img.shields.io/discord/931086341838622751?label=Discord&logo=discord)](https://discord.gg/xYGf3fQnES)
+
+[![GitHub Downloads](https://img.shields.io/github/downloads/emqx/MQTTX/total?label=GitHub%20Downloads)](https://mqttx.app/downloads)
+[![Docker Web Pulls](https://img.shields.io/docker/pulls/emqx/mqttx-web?label=Docker%20Web%20Pulls)](https://hub.docker.com/r/emqx/mqttx-web)
+[![Docker CLI Pulls](https://img.shields.io/docker/pulls/emqx/mqttx-cli?label=Docker%20CLI%20Pulls)](https://hub.docker.com/r/emqx/mqttx-cli)  
+
 [![Community](https://img.shields.io/badge/Community-MQTTX-yellow?logo=github)](https://github.com/emqx/MQTTX/discussions)
+[![Slack](https://img.shields.io/badge/Slack-EMQX-39AE85?logo=slack)](https://slack-invite.emqx.io/)
+[![Discord](https://img.shields.io/discord/931086341838622751?label=Discord&logo=discord)](https://discord.gg/xYGf3fQnES)
 [![YouTube](https://img.shields.io/badge/Subscribe-EMQ-FF0000?logo=youtube)](https://www.youtube.com/channel/UC5FjR77ErAxvZENEWzQaO5Q)
-[![Twitter](https://img.shields.io/badge/Follow-EMQ-1DA1F2?logo=twitter)](https://twitter.com/EMQTech)
+[![Twitter Follows](https://img.shields.io/twitter/follow/EMQTech?label=Twitter%20Follows)](https://twitter.com/EMQTech)
 
 ---
 
 [MQTTX](https://mqttx.app) is a cross-platform MQTT 5.0 client tool open sourced by [EMQ](https://www.emqx.com/en), which can run on macOS, Linux and Windows, and supports formatting MQTT payload.
 
 [MQTTX](https://mqttx.app) simplifies test operation with the help of a familiar, chat-like interface. It’s easy and quick to create multiple, simultaneous online MQTT client connections, and can test the connection, publishing, and subscription functions of MQTT/TCP, MQTT/TLS, MQTT/WebSocket as well as other MQTT protocol features.
 
-> [MQTT](http://mqtt.org/faq) stands for MQ Telemetry Transport. It is a publish/subscribe, extremely simple and lightweight messaging protocol, designed for constrained devices and low-bandwidth, high-latency or unreliable networks.
+> [MQTT](https://mqtt.org/faq) stands for MQ Telemetry Transport. It is a publish/subscribe, extremely simple and lightweight messaging protocol, designed for constrained devices and low-bandwidth, high-latency or unreliable networks.
 
 ## Preview
 
@@ -138,7 +143,7 @@ Please make sure to read the [Contributing Guide](https://github.com/emqx/MQTTX/
 
 ## Resources
 
-- [MQTT client programming](https://www.emqx.com/en/blog/tag/mqtt-client-programming)
+- [MQTT Programming](https://www.emqx.com/en/blog/category/mqtt-programming)
 
   A series of blogs to help developers get started quickly with MQTT in PHP, Node.js, Python, Golang, and other programming languages.
 

babel.config.js

@@ -9,7 +9,28 @@ const plugins = [
   [
     'prismjs',
     {
-      languages: ['javascript'],
+      languages: [
+        'javascript',
+        'json',
+        'python',
+        'java',
+        'bash',
+        'sql',
+        'c',
+        'csharp',
+        'cpp',
+        'go',
+        'kotlin',
+        'php',
+        'ruby',
+        'rust',
+        'scala',
+        'swift',
+        'typescript',
+        'yaml',
+        'erlang',
+        'dart',
+      ],
       // plugins: ['line-numbers'],
       // theme: 'funky',
       css: true,

cli/README-CN.md

@@ -18,7 +18,7 @@
 
 [MQTTX CLI](https://mqttx.app/zh/cli) 是一款开源的 MQTT 5.0 命令行客户端工具，也是命令行上的 MQTTX，旨在帮助开发者在不需要使用图形化界面的基础上，也能更快的开发和调试 MQTT 服务与应用。
 
-> [MQTT](http://mqtt.org/faq) 全称为 Message Queuing Telemetry Transport（消息队列遥测传输）是一种基于 发布/订阅 范式的“轻量级”消息协议，旨在用于受限设备和低带宽，高延迟或不可靠的网络，由 IBM 发布。
+> [MQTT](https://mqtt.org/faq) 全称为 Message Queuing Telemetry Transport（消息队列遥测传输）是一种基于 发布/订阅 范式的“轻量级”消息协议，旨在用于受限设备和低带宽，高延迟或不可靠的网络，由 IBM 发布。
 
 ## 功能预览