[](https://github.com/emqx/mqttx/releases)
-
+
-[](https://github.com/emqx/mqttx/releases)
-[](https://slack-invite.emqx.io/) [](https://discord.gg/xYGf3fQnES)
+
+[](https://mqttx.app/downloads)
+[](https://hub.docker.com/r/emqx/mqttx-web)
+[](https://hub.docker.com/r/emqx/mqttx-cli)
+
[](https://github.com/emqx/MQTTX/discussions)
+[](https://slack-invite.emqx.io/)
+[](https://discord.gg/xYGf3fQnES)
[](https://www.youtube.com/channel/UC5FjR77ErAxvZENEWzQaO5Q)
-[](https://twitter.com/EMQTech)
+[](https://twitter.com/EMQTech)
---
@@ -15,7 +20,7 @@
[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.
diff --git a/assets/mqttx-gif.gif b/assets/mqttx-gif.gif
index 7f60370be..0f3b79a0e 100644
Binary files a/assets/mqttx-gif.gif and b/assets/mqttx-gif.gif differ
diff --git a/assets/mqttx-preview.png b/assets/mqttx-preview.png
index 4eb035c78..bbbe6b74a 100644
Binary files a/assets/mqttx-preview.png and b/assets/mqttx-preview.png differ
diff --git a/assets/mqttx-web-preview.png b/assets/mqttx-web-preview.png
index 344aff3a8..03d7601bc 100644
Binary files a/assets/mqttx-web-preview.png and b/assets/mqttx-web-preview.png differ
diff --git a/babel.config.js b/babel.config.js
index b31b3358c..1d3320337 100644
--- a/babel.config.js
+++ b/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,
diff --git a/cli/README-CN.md b/cli/README-CN.md
index dbdee7a01..5ef4d6e31 100644
--- a/cli/README-CN.md
+++ b/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 发布。
## 功能预览
diff --git a/cli/README.md b/cli/README.md
index df7ab6c95..b955fc891 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -3,19 +3,24 @@
# MQTTX CLI
[](https://github.com/emqx/mqttx/releases)
+
-[](https://github.com/emqx/mqttx/releases)
-[](https://hub.docker.com/r/emqx/mqttx-cli)
-[](https://slack-invite.emqx.io/) [](https://discord.gg/xYGf3fQnES)
+
+[](https://mqttx.app/downloads)
+[](https://hub.docker.com/r/emqx/mqttx-web)
+[](https://hub.docker.com/r/emqx/mqttx-cli)
+
[](https://github.com/emqx/MQTTX/discussions)
+[](https://slack-invite.emqx.io/)
+[](https://discord.gg/xYGf3fQnES)
[](https://www.youtube.com/channel/UC5FjR77ErAxvZENEWzQaO5Q)
-[](https://twitter.com/EMQTech)
+[](https://twitter.com/EMQTech)
---
[MQTTX CLI](https://mqttx.app/cli) is an open source MQTT 5.0 CLI Client and MQTTX on the command line. Designed to help develop and debug MQTT services and applications faster without the need to use a graphical interface.
-> [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
@@ -23,442 +28,35 @@
## Documentation
-For introduction, installation, and usage, see the [MQTTX CLI documentation](https://mqttx.app/docs/cli). Below is a quick start guide.
+Explore the full range of features and learn how to get the most out of MQTTX CLI with our comprehensive [MQTTX CLI Documentation](https://mqttx.app/docs/cli).
## Installation
-### macOS
-
-To install the latest MQTTX CLI stable release on **macOS** using **binary download**.
-
-> **Note**: Please note CPU architecture of the current system environment
-
-#### Intel Chip
-
-```shell
-curl -LO https://www.emqx.com/en/downloads/MQTTX/v1.9.5/mqttx-cli-macos-x64
-sudo install ./mqttx-cli-macos-x64 /usr/local/bin/mqttx
-```
-
-#### Apple Silicon
-
-```shell
-curl -LO https://www.emqx.com/en/downloads/MQTTX/v1.9.5/mqttx-cli-macos-arm64
-sudo install ./mqttx-cli-macos-arm64 /usr/local/bin/mqttx
-```
-
-#### Homebrew
-
-```shell
-brew install emqx/mqttx/mqttx-cli
-```
-
-### Linux
-
-To install the latest MQTTX CLI stable release on **Linux** using **binary download**.
-
-> **Note**: Please note CPU architecture of the current system environment
-
-#### x86-64
-
-```shell
-curl -LO https://www.emqx.com/en/downloads/MQTTX/v1.9.5/mqttx-cli-linux-x64
-sudo install ./mqttx-cli-linux-x64 /usr/local/bin/mqttx
-```
-
-#### ARM64
-
-```shell
-curl -LO https://www.emqx.com/en/downloads/MQTTX/v1.9.5/mqttx-cli-linux-arm64
-sudo install ./mqttx-cli-linux-arm64 /usr/local/bin/mqttx
-```
-
-### Windows
-
-Windows users should go to the MQTTX [release page](https://github.com/emqx/MQTTX/releases) and find the `exe` package for the corresponding system architecture, download it manually and execute.
-
-### NPM
-
-```shell
-npm install mqttx-cli -g
-```
-
-### Docker
-
-```shell
-docker pull emqx/mqttx-cli
-
-docker run -it --rm emqx/mqttx-cli
-```
-
-### Other platforms
-
-Download packaged binaries from the [MQTTX releases page](https://github.com/emqx/MQTTX/releases).
-
-## Usage
-
-After installing it, run `mqttx` on the terminal
-
-### Quickstart
-
-Connect
-
-```shell
-mqttx conn -h 'broker.emqx.io' -p 1883 -u 'admin' -P 'public'
-```
-
-Subscribe
-
-```shell
-mqttx sub -t 'hello' -h 'broker.emqx.io' -p 1883
-```
-
-Publish
-
-```shell
-# Publish a single message
-mqttx pub -t 'hello' -h 'broker.emqx.io' -p 1883 -m 'from MQTTX CLI'
-
-# Publish multiple messages (multiline)
-mqttx pub -t 'hello' -h 'broker.emqx.io' -p 1883 -s -M
-```
-
-Benchmark
-
-```bash
-# Connect Benchmark
-mqttx bench conn -c 5000
+Get started by downloading MQTTX CLI from the [MQTTX Downloads Page](https://mqttx.app/downloads). Installation instructions are provided for different platforms to ensure a smooth setup.
-# Subscribe Benchmark
-mqttx bench sub -c 5000 -t bench/%i
+## Quickstart
-# Publish Benchmark
-mqttx bench pub -c 5000 -t bench/%i
-```
-
-Simulate
-
-```bash
-# Specify a built-in local scenario and start the simulation
-mqttx simulate -sc tesla -c 10
-
-# Specify a scenario file and start the simulation
-mqttx simulate -f
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 7d898c2ed..3490bedaf 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -31,6 +31,7 @@ export default class Editor extends Vue {
@Model('change', { type: String }) private readonly value!: string
@Getter('currentTheme') private theme!: Theme
+ @Getter('showConnectionList') private showConnectionList!: boolean
private editor: monaco.editor.IStandaloneCodeEditor | null = null
@@ -66,6 +67,13 @@ export default class Editor extends Vue {
}
}
+ @Watch('showConnectionList')
+ private handleShowConnectionListChanged(val: boolean) {
+ setTimeout(() => {
+ this.editorLayout()
+ }, 500)
+ }
+
// init and register customer editor style
private initCustomerLanguages() {
this.registerLog()
diff --git a/src/components/EmptyPage.vue b/src/components/EmptyPage.vue
index d1848c3fc..c237bcc91 100644
--- a/src/components/EmptyPage.vue
+++ b/src/components/EmptyPage.vue
@@ -1,5 +1,10 @@
-
+ MQTTX Copilot Beta
+
+
+
+
+
+
+
+
+
+ {{ $t('common.thinking') }}
+
+
+
+
+
+ MQTTX Copilot
+
+
+
+
![new connection]()
@@ -25,6 +30,7 @@
import { Component, Vue, Prop } from 'vue-property-decorator'
import { Getter } from 'vuex-class'
import gaCustomLinks from '@/utils/gaCustomLinks'
+import { LeftValues } from '@/utils/styles'
@Component
export default class EmptyPage extends Vue {
@@ -33,6 +39,7 @@ export default class EmptyPage extends Vue {
@Prop() public clickMethod!: () => T | void
@Getter('currentLang') private getterLang!: Language
+ @Getter('showConnectionList') private showConnectionList!: boolean
get imageSrc(): string {
return require(`../assets/images/${this.name}`)
@@ -45,11 +52,20 @@ export default class EmptyPage extends Vue {
get emqxWebsite(): string {
return gaCustomLinks(this.getterLang).empty.EMQX
}
+
+ get leftValue(): string {
+ return this.showConnectionList ? LeftValues.Show : LeftValues.Hide
+ }
}
diff --git a/src/components/SubscriptionsList.vue b/src/components/SubscriptionsList.vue
index 6eb3c4cd2..0fcd8cb5d 100644
--- a/src/components/SubscriptionsList.vue
+++ b/src/components/SubscriptionsList.vue
@@ -1,65 +1,60 @@
{{ $t('common.edit') }}
@@ -157,7 +152,7 @@
-
+
true
false
@@ -165,7 +160,7 @@
-
+
true
false
@@ -173,7 +168,7 @@
-
+
= {
connected: false,
}
- private showDialog: boolean = false
+ public showDialog: boolean = false
private subRecord: SubscriptionModel = {
id: getSubscriptionId(),
topic: 'testtopic/#',
@@ -277,6 +273,10 @@ export default class SubscriptionsList extends Vue {
return defineColors
}
+ get leftValue(): string {
+ return this.showConnectionList ? LeftValues.Show : LeftValues.Hide
+ }
+
@Watch('$route.params.id')
private handleIdChanged() {
this.$emit('onClickTopic', this.topicActiveIndex, true)
@@ -379,7 +379,7 @@ export default class SubscriptionsList extends Vue {
public async resubscribe() {
this.getCurrentConnection(this.connectionId)
for (let sub of this.subsList) {
- this.$log.info(`Topic: ${sub.topic} is resubscribing`)
+ this.$log.info(`Resubscription in progress for topic: ${sub.topic}`)
this.subRecord = { ...sub }
if (this.subRecord.disabled === false) {
await this.subscribe(this.subRecord)
@@ -444,14 +444,14 @@ export default class SubscriptionsList extends Vue {
this.client.subscribe(topicsArr, { qos, nl, rap, rh, properties }, async (error, granted) => {
this.subLoading = false
if (error) {
- this.$message.error(error)
- this.$log.error(`Topic: subscribe error, ${error} `)
+ this.$emit('onSubError', error.toString(), `Topics: ${JSON.stringify(topicsArr)}`)
+ this.$log.error(`Error subscribing to topic: ${error}`)
return false
}
let errorReason = SubscribeErrorReason.normal
if (!granted || (Array.isArray(granted) && granted.length < 1)) {
- this.$log.error('Topic: subscribe granted empty')
+ this.$log.error('Error subscribing to topic: granted empty')
} else if (![0, 1, 2].includes(granted[0].qos) && topic.match(/^(\$SYS)/i)) {
errorReason = SubscribeErrorReason.qosSubSysFailed
} else if (![0, 1, 2].includes(granted[0].qos)) {
@@ -461,8 +461,8 @@ export default class SubscriptionsList extends Vue {
if (errorReason !== SubscribeErrorReason.normal) {
const errorReasonMsg: VueI18n.TranslateResult = this.getErrorReasonMsg(errorReason)
const errorMsg: string = `${this.$t('connections.subFailed')} ${errorReasonMsg}`
- this.$log.error(`Topic: subscribe error, ${errorReasonMsg} `)
- this.$message.error(errorMsg)
+ this.$log.error(`Error subscribing to topic: ${errorReasonMsg}`)
+ this.$emit('onSubError', errorMsg, `Topics: ${JSON.stringify(topicsArr)}`)
return false
}
if (enable) {
@@ -484,10 +484,7 @@ export default class SubscriptionsList extends Vue {
await subscriptionService.updateSubscriptions(this.record.id, this.record.subscriptions)
this.changeSubs({ id: this.connectionId, subscriptions: this.subsList })
this.showDialog = false
- let subLog = `Topic: ${topic} successfully subscribed`
- if (this.record.mqttVersion === '5.0') {
- subLog += `, Subscription Identifier: ${subscriptionIdentifier}, No Local flag: ${nl}, Retain as Published flag: ${rap}, Retain Handling: ${rh}`
- }
+ let subLog = `Successfully subscribed to topic: ${topic}`
this.$log.info(subLog)
}
isFinished = true
@@ -532,7 +529,7 @@ export default class SubscriptionsList extends Vue {
this.client.unsubscribe(topic, { qos }, async (error) => {
this.unsubLoading = false
if (error) {
- this.$message.error(error)
+ this.$emit('onSubError', error.toString(), `Topic: ${topic}`)
resolve(false)
return false
}
@@ -707,6 +704,15 @@ export default class SubscriptionsList extends Vue {
@import '~@/assets/scss/mixins.scss';
.subscriptions-list-view {
+ position: fixed;
+ z-index: 1;
+ width: 230px;
+ background: var(--color-bg-normal);
+ border-radius: 0;
+ top: 0;
+ bottom: 0;
+ padding-bottom: 42px;
+ border-bottom: 0px;
&.el-card {
border-top: 0px;
border-left: 0px;
diff --git a/src/components/UseScript.vue b/src/components/UseScript.vue
index c538f013f..650f3904f 100644
--- a/src/components/UseScript.vue
+++ b/src/components/UseScript.vue
@@ -9,7 +9,7 @@
@keyupEnter="save"
>
-
+
@@ -130,10 +130,10 @@ export default class UseScript extends Vue {
.use-script {
.new-script-btn {
position: absolute;
- top: 17px;
+ top: 16px;
left: 70px;
i {
- font-size: 14px;
+ font-weight: bold;
}
}
}
diff --git a/src/components/charts/AreaLine.vue b/src/components/charts/AreaLine.vue
new file mode 100644
index 000000000..ea9a161f9
--- /dev/null
+++ b/src/components/charts/AreaLine.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
diff --git a/src/components/widgets/BytesStatistics.vue b/src/components/widgets/BytesStatistics.vue
new file mode 100644
index 000000000..ffb03c5c7
--- /dev/null
+++ b/src/components/widgets/BytesStatistics.vue
@@ -0,0 +1,120 @@
+
+
+
+
+ Broker {{ $t('common.version') }}{{ version }}
+
+
+ {{ $t('common.uptime') }}{{ uptime }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/database/database.config.ts b/src/database/database.config.ts
index 52870cbfc..e57bb1649 100644
--- a/src/database/database.config.ts
+++ b/src/database/database.config.ts
@@ -11,6 +11,7 @@ import HistoryMessageHeaderEntity from './models/HistoryMessageHeaderEntity'
import HistoryMessagePayloadEntity from './models/HistoryMessagePayloadEntity'
import HistoryConnectionEntity from './models/HistoryConnectionEntity'
import WillEntity from './models/WillEntity'
+import CopilotEntity from './models/CopilotEntity'
import { ConnectionOptions } from 'typeorm'
import { initTable1629476510574 } from './migration/1629476510574-initTable'
import { messages1630403733964 } from './migration/1630403733964-messages'
@@ -38,6 +39,11 @@ import { supportSchemas1688042450818 } from './migration/1688042450818-supportSc
import { saveScriptName1688449795669 } from './migration/1688449795669-saveScriptName'
import { jsonHighlight1691071794840 } from './migration/1691071794840-jsonHighlight'
import { ALPNProtocols1691817588169 } from './migration/1691817588169-ALPNProtocols'
+import { aiSettings1701761407723 } from './migration/1701761407723-aiSettings'
+import { aiTables1701936842016 } from './migration/1701936842016-aiTables'
+import { enableCopilot1703659148195 } from './migration/1703659148195-enableCopilot'
+import { logLevel1704941582350 } from './migration/1704941582350-logLevel'
+import { updatePayloadTypeToVarchar1630403733965 } from './migration/1705478422620-updatePayloadTypeToVarchar'
const STORE_PATH = getAppDataPath('MQTTX')
try {
@@ -83,6 +89,11 @@ const ORMConfig = {
saveScriptName1688449795669,
jsonHighlight1691071794840,
ALPNProtocols1691817588169,
+ aiSettings1701761407723,
+ aiTables1701936842016,
+ enableCopilot1703659148195,
+ logLevel1704941582350,
+ updatePayloadTypeToVarchar1630403733965,
],
migrationsTableName: 'temp_migration_table',
entities: [
@@ -96,6 +107,7 @@ const ORMConfig = {
HistoryMessagePayloadEntity,
WillEntity,
HistoryConnectionEntity,
+ CopilotEntity,
],
cli: {
migrationsDir: 'src/database/migration',
diff --git a/src/database/migration/1701761407723-aiSettings.ts b/src/database/migration/1701761407723-aiSettings.ts
new file mode 100644
index 000000000..1fbfb9883
--- /dev/null
+++ b/src/database/migration/1701761407723-aiSettings.ts
@@ -0,0 +1,111 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class aiSettings1701761407723 implements MigrationInterface {
+ name = 'aiSettings1701761407723'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "temporary_SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1),
+ "openAIAPIKey" varchar NOT NULL DEFAULT (''),
+ "model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo')
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "temporary_SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight"
+ FROM "SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "SettingEntity"
+ `)
+ await queryRunner.query(`
+ ALTER TABLE "temporary_SettingEntity"
+ RENAME TO "SettingEntity"
+ `)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ ALTER TABLE "SettingEntity"
+ RENAME TO "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ CREATE TABLE "SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1)
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight"
+ FROM "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "temporary_SettingEntity"
+ `)
+ }
+}
diff --git a/src/database/migration/1701936842016-aiTables.ts b/src/database/migration/1701936842016-aiTables.ts
new file mode 100644
index 000000000..9b456a89b
--- /dev/null
+++ b/src/database/migration/1701936842016-aiTables.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class aiTables1701936842016 implements MigrationInterface {
+ name = 'aiTables1701936842016'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "CopilotEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "role" varchar NOT NULL,
+ "content" text NOT NULL,
+ "createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+ )
+ `)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ DROP TABLE "CopilotEntity"
+ `)
+ }
+}
diff --git a/src/database/migration/1703659148195-enableCopilot.ts b/src/database/migration/1703659148195-enableCopilot.ts
new file mode 100644
index 000000000..946dd904d
--- /dev/null
+++ b/src/database/migration/1703659148195-enableCopilot.ts
@@ -0,0 +1,122 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class enableCopilot1703659148195 implements MigrationInterface {
+ name = 'enableCopilot1703659148195'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "temporary_SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1),
+ "openAIAPIKey" varchar NOT NULL DEFAULT (''),
+ "model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo'),
+ "enableCopilot" boolean NOT NULL DEFAULT (1)
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "temporary_SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model"
+ FROM "SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "SettingEntity"
+ `)
+ await queryRunner.query(`
+ ALTER TABLE "temporary_SettingEntity"
+ RENAME TO "SettingEntity"
+ `)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ ALTER TABLE "SettingEntity"
+ RENAME TO "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ CREATE TABLE "SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1),
+ "openAIAPIKey" varchar NOT NULL DEFAULT (''),
+ "model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo')
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model"
+ FROM "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "temporary_SettingEntity"
+ `)
+ }
+}
diff --git a/src/database/migration/1704941582350-logLevel.ts b/src/database/migration/1704941582350-logLevel.ts
new file mode 100644
index 000000000..9be6e0eb5
--- /dev/null
+++ b/src/database/migration/1704941582350-logLevel.ts
@@ -0,0 +1,128 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class logLevel1704941582350 implements MigrationInterface {
+ name = 'logLevel1704941582350'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "temporary_SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1),
+ "openAIAPIKey" varchar NOT NULL DEFAULT (''),
+ "model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo'),
+ "enableCopilot" boolean NOT NULL DEFAULT (1),
+ "logLevel" varchar CHECK(logLevel IN ('debug', 'info', 'warn', 'error')) NOT NULL DEFAULT ('info')
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "temporary_SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model",
+ "enableCopilot"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model",
+ "enableCopilot"
+ FROM "SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "SettingEntity"
+ `)
+ await queryRunner.query(`
+ ALTER TABLE "temporary_SettingEntity"
+ RENAME TO "SettingEntity"
+ `)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ ALTER TABLE "SettingEntity"
+ RENAME TO "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ CREATE TABLE "SettingEntity" (
+ "id" varchar PRIMARY KEY NOT NULL,
+ "width" integer NOT NULL DEFAULT (1025),
+ "height" integer NOT NULL DEFAULT (749),
+ "autoCheck" boolean NOT NULL DEFAULT (1),
+ "currentLang" varchar CHECK(currentLang IN ('zh', 'en', 'ja', 'tr', 'hu')) NOT NULL DEFAULT ('en'),
+ "currentTheme" varchar CHECK(currentTheme IN ('light', 'dark', 'night')) NOT NULL DEFAULT ('light'),
+ "maxReconnectTimes" integer NOT NULL DEFAULT (10),
+ "autoResub" boolean NOT NULL DEFAULT (1),
+ "syncOsTheme" boolean NOT NULL DEFAULT (0),
+ "multiTopics" boolean NOT NULL DEFAULT (1),
+ "jsonHighlight" boolean NOT NULL DEFAULT (1),
+ "openAIAPIKey" varchar NOT NULL DEFAULT (''),
+ "model" varchar NOT NULL DEFAULT ('gpt-3.5-turbo'),
+ "enableCopilot" boolean NOT NULL DEFAULT (1)
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "SettingEntity"(
+ "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model",
+ "enableCopilot"
+ )
+ SELECT "id",
+ "width",
+ "height",
+ "autoCheck",
+ "currentLang",
+ "currentTheme",
+ "maxReconnectTimes",
+ "autoResub",
+ "syncOsTheme",
+ "multiTopics",
+ "jsonHighlight",
+ "openAIAPIKey",
+ "model",
+ "enableCopilot"
+ FROM "temporary_SettingEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "temporary_SettingEntity"
+ `)
+ }
+}
diff --git a/src/database/migration/1705478422620-updatePayloadTypeToVarchar.ts b/src/database/migration/1705478422620-updatePayloadTypeToVarchar.ts
new file mode 100644
index 000000000..cdb631cf7
--- /dev/null
+++ b/src/database/migration/1705478422620-updatePayloadTypeToVarchar.ts
@@ -0,0 +1,54 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class updatePayloadTypeToVarchar1630403733965 implements MigrationInterface {
+ name = 'updatePayloadTypeToVarchar1630403733965'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "temporary_historyMessagePayloadEntity" (
+ "id" uuid PRIMARY KEY NOT NULL,
+ "payload" varchar NOT NULL,
+ "payloadType" varchar NOT NULL DEFAULT 'JSON',
+ "createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+ )
+ `)
+ await queryRunner.query(`
+ INSERT INTO "temporary_historyMessagePayloadEntity" ("id", "payload", "payloadType", "createAt")
+ SELECT "id", "payload", "payloadType", "createAt"
+ FROM "historyMessagePayloadEntity"
+ `)
+ await queryRunner.query(`
+ DROP TABLE "historyMessagePayloadEntity"
+ `)
+ await queryRunner.query(`
+ ALTER TABLE "temporary_historyMessagePayloadEntity"
+ RENAME TO "historyMessagePayloadEntity"
+ `)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ CREATE TABLE "temporary_historyMessagePayloadEntity" (
+ "id" uuid PRIMARY KEY NOT NULL,
+ "payload" varchar NOT NULL,
+ "payloadType" varchar CHECK(payloadType IN ('Plaintext', 'Base64', 'JSON', 'Hex')) NOT NULL DEFAULT 'JSON',
+ "createAt" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)
+ )
+ `)
+
+ await queryRunner.query(`
+ INSERT INTO "temporary_historyMessagePayloadEntity" ("id", "payload", "payloadType", "createAt")
+ SELECT "id", "payload", "payloadType", "createAt"
+ FROM "historyMessagePayloadEntity"
+ `)
+
+ await queryRunner.query(`
+ DROP TABLE "historyMessagePayloadEntity"
+ `)
+
+ await queryRunner.query(`
+ ALTER TABLE "temporary_historyMessagePayloadEntity"
+ RENAME TO "historyMessagePayloadEntity"
+ `)
+ }
+}
diff --git a/src/database/models/CopilotEntity.ts b/src/database/models/CopilotEntity.ts
new file mode 100644
index 000000000..5c3038f53
--- /dev/null
+++ b/src/database/models/CopilotEntity.ts
@@ -0,0 +1,16 @@
+import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn } from 'typeorm'
+
+@Entity('CopilotEntity')
+export default class CopilotEntity {
+ @PrimaryGeneratedColumn('uuid')
+ id!: string
+
+ @Column({ type: 'varchar' })
+ role!: string
+
+ @Column({ type: 'text' })
+ content!: string
+
+ @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
+ createAt!: string
+}
diff --git a/src/database/models/HistoryMessagePayloadEntity.ts b/src/database/models/HistoryMessagePayloadEntity.ts
index 1b320666e..3126325bb 100644
--- a/src/database/models/HistoryMessagePayloadEntity.ts
+++ b/src/database/models/HistoryMessagePayloadEntity.ts
@@ -1,7 +1,5 @@
import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
-type PayloadType = 'Plaintext' | 'Base64' | 'JSON' | 'Hex'
-
@Entity('historyMessagePayloadEntity')
export default class HistoryMessagePayloadEntity {
@PrimaryGeneratedColumn('uuid')
@@ -10,8 +8,8 @@ export default class HistoryMessagePayloadEntity {
@Column({ type: 'varchar' })
payload!: string
- @Column({ type: 'simple-enum', enum: ['Plaintext', 'Base64', 'JSON', 'Hex'], default: 'JSON' })
- payloadType!: PayloadType
+ @Column({ type: 'varchar', default: 'JSON' })
+ payloadType!: string
@Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
createAt?: string
diff --git a/src/database/models/SettingEntity.ts b/src/database/models/SettingEntity.ts
index 3b70b5cdb..8a275e3b8 100644
--- a/src/database/models/SettingEntity.ts
+++ b/src/database/models/SettingEntity.ts
@@ -34,4 +34,16 @@ export default class SettingEntity {
@Column({ type: 'boolean', default: true })
jsonHighlight!: boolean
+
+ @Column({ type: 'boolean', default: true })
+ enableCopilot!: boolean
+
+ @Column({ type: 'varchar', default: '' })
+ openAIAPIKey!: string
+
+ @Column({ type: 'varchar', default: 'gpt-3.5-turbo' })
+ model!: string
+
+ @Column({ type: 'simple-enum', enum: ['debug', 'info', 'warn', 'error'], default: 'info' })
+ logLevel!: 'debug' | 'info' | 'warn' | 'error'
}
diff --git a/src/database/services/CopilotService.ts b/src/database/services/CopilotService.ts
new file mode 100644
index 000000000..b7b51593d
--- /dev/null
+++ b/src/database/services/CopilotService.ts
@@ -0,0 +1,36 @@
+import { Service } from 'typedi'
+import { InjectRepository } from 'typeorm-typedi-extensions'
+import CopilotEntity from '../models/CopilotEntity'
+import { Repository } from 'typeorm'
+
+@Service()
+export default class CopilotService {
+ constructor(
+ // @ts-ignore
+ @InjectRepository(CopilotEntity)
+ private conversationRepository: Repository,
+ ) {}
+
+ public async create(copilotMessage: CopilotMessage) {
+ const newConversation = this.conversationRepository.create(copilotMessage)
+ return await this.conversationRepository.save(newConversation)
+ }
+
+ public async get(page: number = 1) {
+ const count = 20
+ const messages = await this.conversationRepository.find({
+ skip: (page - 1) * count,
+ take: count,
+ order: {
+ createAt: 'DESC',
+ },
+ })
+ const total = await this.conversationRepository.count()
+ const hasMore = total - page * count > 0
+ return { messages: messages.reverse(), hasMore }
+ }
+
+ public async deleteAll() {
+ return await this.conversationRepository.clear()
+ }
+}
diff --git a/src/database/services/SettingService.ts b/src/database/services/SettingService.ts
index f6ffb8f49..e2e1540a2 100644
--- a/src/database/services/SettingService.ts
+++ b/src/database/services/SettingService.ts
@@ -6,6 +6,7 @@ import { Repository } from 'typeorm'
@Service()
export default class SettingService {
constructor(
+ // @ts-ignore
@InjectRepository(SettingEntity)
private settingRepository: Repository,
) {}
diff --git a/src/database/useServices.ts b/src/database/useServices.ts
index 7d0a83db6..a3aa12cc8 100644
--- a/src/database/useServices.ts
+++ b/src/database/useServices.ts
@@ -8,6 +8,7 @@ import HistoryMessageHeaderService from './services/HistoryMessageHeaderService'
import HistoryMessagePayloadService from './services/HistoryMessagePayloaderService'
import MessageService from './services/MessageService'
import ScriptService from './services/ScriptService'
+import CopilotService from './services/CopilotService'
export default function useServices() {
const connectionService = Container.get(ConnectionService)
@@ -19,6 +20,7 @@ export default function useServices() {
const historyMessagePayloadService = Container.get(HistoryMessagePayloadService)
const messageService = Container.get(MessageService)
const scriptService = Container.get(ScriptService)
+ const copilotService = Container.get(CopilotService)
return {
connectionService,
willService,
@@ -29,5 +31,6 @@ export default function useServices() {
historyMessagePayloadService,
messageService,
scriptService,
+ copilotService,
}
}
diff --git a/src/lang/common.ts b/src/lang/common.ts
index 283cdeeb0..4fd605928 100644
--- a/src/lang/common.ts
+++ b/src/lang/common.ts
@@ -188,6 +188,13 @@ export default {
ja: 'コピーが成功しました',
hu: 'Sikeres másolás',
},
+ copied: {
+ zh: '已复制',
+ en: 'Copied',
+ tr: 'Kopyalandı',
+ ja: 'コピー済み',
+ hu: 'Másolva',
+ },
copyFailed: {
zh: '复制失败',
en: 'Copy Failed',
@@ -265,4 +272,312 @@ export default {
ja: '{count}件の新しいメッセージ | {count}件の新しいメッセージ',
hu: '{count} új üzenet | {count} új üzenet',
},
+ thinking: {
+ zh: '思考中...',
+ en: 'Thinking...',
+ tr: 'Düşünüyorum...',
+ ja: '考え中...',
+ hu: 'Gondolkodom...',
+ },
+ welcomeToCopilot: {
+ zh: '您好！我是 MQTTX Copilot 🤖，一个专门设计来帮助解答 MQTT 相关问题，提供常见问题的解决方案，并提供最佳实践见解的 AI 助手。今天我能如何帮助您？',
+ en: 'Hello! I am MQTTX Copilot 🤖, an AI assistant designed to help with MQTT-related queries, provide solutions for common issues, and offer insights on best practices. How can I assist you today?',
+ tr: 'Merhaba! Ben MQTTX Copilot 🤖, MQTT ile ilgili sorgulara yardımcı olmak, yaygın sorunlar için çözümler sağlamak ve en iyi uygulamalar hakkında bilgi vermek üzere tasarlanmış bir AI asistanıyım. Bugün size nasıl yardımcı olabilirim?',
+ ja: 'こんにちは！私は MQTTX Copilot 🤖、MQTT 関連の問い合わせを支援し、一般的な問題の解決策を提供し、ベストプラクティスについての洞察を提供するために設計された AI アシスタントです。今日は何でお手伝いでしょうか？',
+ hu: 'Szia! Én vagyok az MQTTX Copilot 🤖, egy AI asszisztens, amelyet az MQTT-vel kapcsolatos kérdések megválaszolására, a gyakori problémák megoldására és a legjobb gyakorlatok bemutatására terveztek. Hogyan segíthetek ma?',
+ },
+ copiltePubMsgPlacehoder: {
+ zh: '向 MQTTX Copilot 发送消息...',
+ en: 'Message MQTTX Copilot...',
+ tr: "MQTTX Copilot'a mesaj gönder...",
+ ja: 'MQTTX Copilotにメッセージを送る...',
+ hu: 'Üzenet küldése a MQTTX Copilotnak...',
+ },
+ copilteUser: {
+ zh: '用户',
+ en: 'You',
+ tr: 'Sen',
+ ja: 'あなた',
+ hu: 'Te',
+ },
+ copilotAPIKeyRequired: {
+ zh: '请先在设置中配置 Copilot 的 API Key',
+ en: 'Please configure the Copilot API Key in the settings first',
+ tr: 'Lütfen önce ayarlarda Copilot API Anahtarını yapılandırın',
+ ja: '最初に設定でCopilot APIキーを構成してください',
+ hu: 'Kérjük, először állítsa be a Copilot API-kulcsot a beállításokban',
+ },
+ goToSetting: {
+ zh: '去设置',
+ en: 'Go Settings',
+ tr: 'Ayarlar',
+ ja: '設定',
+ hu: 'Beállítások',
+ },
+ promptError: {
+ zh: '请帮助解析并解决以下错误：',
+ en: 'Please help to analyze and resolve the following error: ',
+ tr: 'Lütfen aşağıdaki hata mesajını analiz etmeye ve çözmeye yardımcı olun: ',
+ ja: '以下のエラーメッセージを分析し、解決してください：',
+ hu: 'Kérjük, segítsen elemezni és megoldani az alábbi hibaüzenetet: ',
+ },
+ myConnectionInfo: {
+ zh: '有需要的话可以查看这个当前的连接信息：@connection',
+ en: 'If needed, you can check the current connection information: @connection',
+ tr: 'Gerekirse, mevcut bağlantı bilgisini kontrol edebilirsiniz: @connection',
+ ja: '必要な場合は、現在の接続情報を確認できます：@connection',
+ hu: 'Szükség esetén ellenőrizheti a jelenlegi kapcsolati információkat: @connection',
+ },
+ promptCodegen: {
+ zh: '客户端代码生成',
+ en: 'Client Codegen',
+ tr: 'Kod Oluşturucu',
+ ja: 'コード生成',
+ hu: 'Kódgenerálás',
+ },
+ promptProgrammingLanguage: {
+ zh: '使用当前连接创建 {0} MQTT Client 代码 {1}，如果使用了 MQTT5 的，注意配置属性',
+ en: 'Create {0} MQTT Client code with the current connection {1}, if you use MQTT5, pay attention to the configuration properties',
+ tr: 'Mevcut bağlantı ile {0} MQTT Client kodu oluştur {1}, MQTT5 kullanıyorsanız, yapılandırma özelliklerine dikkat edin',
+ ja: '現在の接続で {0} MQTTクライアントコードを作成する {1}，MQTT5を使用する場合は、構成プロパティに注意してください',
+ hu: 'Hozzon létre {0} MQTT ügyfélkódot az aktuális kapcsolattal {1}, ha MQTT5-öt használ, figyeljen a konfigurációs tulajdonságokra',
+ },
+ genSimpleIoTPayload: {
+ zh: '生成简单测试数据',
+ en: 'Generate Simple Test Data',
+ tr: 'Basit IoT Verisi Oluştur',
+ ja: 'シンプルなIoTデータを生成する',
+ hu: 'Egyszerű IoT Adatok Generálása',
+ },
+ promptGenSimpleIoTPayload: {
+ zh: '生成简单结构的 MQTT IoT 测试数据，适合基础测试场景。',
+ en: 'Generate MQTT IoT test data with a simple structure, suitable for basic testing scenarios.',
+ tr: 'Temel test senaryoları için basit yapıda MQTT IoT test verileri oluşturun.',
+ ja: '基本的なテストシナリオに適した、単純な構造のMQTT IoTテストデータを生成します。',
+ hu: 'Generáljon egyszerű szerkezetű MQTT IoT tesztadatokat, amelyek alapvető tesztelési forgatókönyvekhez alkalmasak.',
+ },
+ genComplexIoTPayload: {
+ zh: '生成复杂测试数据',
+ en: 'Generate Complex Test Data',
+ tr: 'Karmaşık IoT Verisi Oluştur',
+ ja: '複雑なIoTデータを生成する',
+ hu: 'Bonyolult IoT Adatok Generálása',
+ },
+ promptGenComplexIoTPayload: {
+ zh: '生成具有复杂结构的 MQTT IoT 测试数据，适用于高级测试场景，包括多设备交互和数据分析。',
+ en: 'Generate MQTT IoT test data with a complex structure, suitable for advanced testing scenarios, including multi-device interactions and data analysis.',
+ tr: 'Gelişmiş test senaryoları için uygun, çoklu cihaz etkileşimlerini ve veri analizini içeren karmaşık yapıda IoT test verileri oluşturun.',
+ ja: '複数デバイスの相互作用とデータ分析を含む、高度なテストシナリオに適した複雑な構造のIoTテストデータを生成します。',
+ hu: 'Generáljon bonyolult szerkezetű IoT tesztadatokat, amelyek alkalmasak fejlett tesztelési forgatókönyvekre, beleértve a több eszköz közötti interakciókat és az adatelemzést.',
+ },
+ genConnectedCarPayload: {
+ zh: '车联网测试数据',
+ en: 'Connected Car Test Data',
+ tr: 'Bağlantılı Araba Test Verisi Oluştur',
+ ja: 'コネクテッドカーのテストデータを生成する',
+ hu: 'Csatlakoztatott Autó Tesztadatok Generálása',
+ },
+ promptGenConnectedCarPayload: {
+ zh: '生成车联网测试数据，模拟车辆通信、远程监控和数据分析。',
+ en: 'Generate connected car test data, simulating vehicle communication, remote monitoring, and data analysis.',
+ tr: 'Araç iletişimi, uzaktan izleme ve veri analizini simüle eden bağlantılı araba test verileri oluşturun.',
+ ja: '車両通信、リモートモニタリング、データ分析をシミュレートするコネクテッドカーのテストデータを生成します。',
+ hu: 'Generáljon csatlakoztatott autó tesztadatokat, amelyek az autókommunikációt, a távoli monitorozást és az adatelemzést szimulálják.',
+ },
+ genSmartHomePayload: {
+ zh: '智能家居测试数据',
+ en: 'Smart Home Test Data',
+ tr: 'Akıllı Ev Test Verisi Oluştur',
+ ja: 'スマートホームのテストデータを生成する',
+ hu: 'Okosotthoni Tesztadatok Generálása',
+ },
+ promptGenSmartHomePayload: {
+ zh: '生成智能家居测试数据，包括设备自动化和用户行为模式。',
+ en: 'Generate smart home test data, covering device automation and user behavior patterns.',
+ tr: 'Cihaz otomasyonunu ve kullanıcı davranış modellerini içeren akıllı ev test verileri oluşturun.',
+ ja: 'デバイスの自動化とユーザー行動パターンを含むスマートホームテストデータを生成します。',
+ hu: 'Generáljon okosotthoni tesztadatokat, amelyek az eszközautomatizálást és a felhasználói viselkedésmintákat tartalmazzák.',
+ },
+ genIndustrialIoTPayload: {
+ zh: '工业物联网测试数据',
+ en: 'Industrial IoT Test Data',
+ tr: 'Endüstriyel IoT Test Verisi Oluştur',
+ ja: '産業用IoTテストデータを生成する',
+ hu: 'Ipari IoT Tesztadatok Generálása',
+ },
+ promptGenIndustrialIoTPayload: {
+ zh: '生成适用于工业物联网场景的 MQTT IoT 测试数据，包括机器性能、传感器读数和生产线状态。',
+ en: 'Generate MQTT IoT test data suitable for industrial IoT scenarios, including machine performance, sensor readings, and production line statuses.',
+ tr: 'Makine performansını, sensör okumalarını ve üretim hattı durumlarını içeren, endüstriyel IoT senaryoları için uygun MQTT IoT test verileri oluşturun.',
+ ja: '機械のパフォーマンス、センサーの読み取り、生産ラインの状態を含む、産業用IoTシナリオに適したMQTT IoTテストデータを生成します。',
+ hu: 'Generáljon MQTT IoT tesztadatokat ipari IoT forgatókönyvekhez, beleértve a gépek teljesítményét, a szenzorok olvasásait és a termelési sor állapotait.',
+ },
+ genPayloadFormat: {
+ zh: '请确保给我一个包含必要信息的完整的 JSON 数据，不需要其它额外信息。这个 JSON 数据应该包含模拟的基础信息，适合基础测试场景，并且可以包含简单的数据结构的介绍。',
+ en: 'Please make sure to give me a complete JSON data containing the necessary information, no other additional information is required. This JSON data should contain simulated basic information, suitable for basic testing scenarios, and can contain an introduction to simple data structures.',
+ tr: 'Lütfen bana gerekli bilgileri içeren tam bir JSON verisi verdiğinizden emin olun, başka ek bilgi gerekmez. Bu JSON verileri, temel test senaryoları için uygun, simüle edilmiş temel bilgileri içermeli ve basit veri yapılarına bir giriş içerebilir.',
+ ja: '必要な情報を含む完全なJSONデータを提供してください。他に追加情報は必要ありません。このJSONデータには、基本的なテストシナリオに適したシミュレートされた基本情報が含まれており、単純なデータ構造の紹介を含む場合があります。',
+ hu: 'Győződjön meg róla, hogy ad nekem egy teljes JSON adatot, amely tartalmazza a szükséges információkat, más további információ nem szükséges. Ez a JSON adat tartalmazhat szimulált alapinformációkat, amelyek alkalmasak az alapvető tesztelési forgatókönyvekre, és tartalmazhatnak egy bevezetést az egyszerű adatszerkezetekhez.',
+ },
+ mqttProtocol: {
+ zh: 'MQTT 协议是什么',
+ en: 'What is MQTT Protocol',
+ tr: 'MQTT Protokolü Nedir',
+ ja: 'MQTTプロトコルとは何ですか',
+ hu: 'Mi az MQTT protokoll',
+ },
+ whatIsMQTT5: {
+ zh: 'MQTT 5.0 是什么',
+ en: 'What is MQTT 5.0',
+ tr: 'MQTT 5.0 nedir',
+ ja: 'MQTT 5.0 とは何ですか',
+ hu: 'Mi az MQTT 5.0',
+ },
+ whatIsMQTT5Desc: {
+ zh: 'MQTT 5.0 是什么？请提供详细的介绍，包含 MQTT 5.0 的新特性和更新。',
+ en: 'What is MQTT 5.0? Please provide a detailed introduction, including the new features and updates of MQTT 5.0.',
+ tr: "MQTT 5.0 nedir? Lütfen MQTT 5.0'ın yeni özelliklerini ve güncellemelerini içeren ayrıntılı bir tanıtım sağlayın.",
+ ja: 'MQTT 5.0とは何ですか？MQTT 5.0の新機能と更新を含む詳細な紹介を提供してください。',
+ hu: 'Mi az MQTT 5.0? Kérjük, adjon meg egy részletes bevezetést, amely tartalmazza az MQTT 5.0 új funkcióit és frissítéseit.',
+ },
+ mqttQoS: {
+ zh: 'MQTT QoS 是什么',
+ en: 'What is MQTT QoS',
+ tr: 'MQTT QoS Nedir',
+ ja: 'MQTT QoSとは何ですか',
+ hu: 'Mi az MQTT QoS',
+ },
+ mqttQoSDesc: {
+ zh: 'MQTT QoS 是什么？我该如何选择，请提供一些真实场景案例区分',
+ en: 'What is MQTT QoS? How do I choose? Please provide some real-world scenario cases to distinguish',
+ tr: 'MQTT QoS Nedir? Nasıl seçilir? Lütfen ayırt etmek için bazı gerçek dünya senaryo durumları sağlayın',
+ ja: 'MQTT QoSとは何ですか？どうやって選びますか？区別するためにいくつかの実世界のシナリオケースを提供してください',
+ hu: 'Mi az MQTT QoS? Hogyan válasszam ki? Kérjük, adjon meg néhány valós világ szcenárió esetet a megkülönböztetéshez',
+ },
+ mqttRetain: {
+ zh: 'MQTT 保留消息是什么',
+ en: "What's the Retain Message",
+ tr: 'Retain Mesajı Nedir',
+ ja: 'レテインメッセージとは何ですか',
+ hu: 'Mi a Retain Üzenet',
+ },
+ mqttRetainDesc: {
+ zh: 'MQTT 保留消息是什么？我该如何使用，请提供一些真实场景案例，并且告知如何使用 MQTTX 来清除保留消息呢？',
+ en: "What's the MQTT Retain Message? How do I use it? Please provide some real-world scenario cases and tell me how to use MQTTX to clear retained messages?",
+ tr: "MQTT Retain Mesajı Nedir? Nasıl kullanılır? Lütfen bazı gerçek dünya senaryo durumları sağlayın ve MQTTX'i kullanarak kalıcı mesajları nasıl temizleyeceğimi söyleyin?",
+ ja: 'MQTT レテインメッセージとは何ですか？どうやって使うのですか？実際のシナリオケースをいくつか提供し、MQTTXを使用して保持されたメッセージをクリアする方法を教えてください。',
+ hu: 'Mi az MQTT Retain Üzenet? Hogyan használjam? Kérjük, adjon meg néhány valós világ szcenárió esetet, és mondja el, hogyan használhatom az MQTTX-et a megőrzött üzenetek törléséhez?',
+ },
+ installEMQX: {
+ zh: '如何安装 EMQX',
+ en: 'How to install EMQX',
+ tr: 'EMQX Nasıl Kurulur',
+ ja: 'EMQXのインストール方法',
+ hu: 'Hogyan telepíthető az EMQX',
+ },
+ emqxRule: {
+ zh: 'EMQX 规则引擎 SQL 示例',
+ en: 'EMQX Rule Engine SQL Example',
+ tr: 'EMQX Kural Motoru SQL Örneği',
+ ja: 'EMQXルールエンジンSQLの例',
+ hu: 'EMQX szabálymotor SQL példa',
+ },
+ promptEmqxRule: {
+ zh: '请帮我编辑一段 EMQX 规则引擎的 SQL 示例，包含解释和简单教程',
+ en: 'Please help me edit an EMQX Rule Engine SQL example, including explanation and simple tutorial',
+ tr: 'Lütfen bana bir EMQX Kural Motoru SQL örneği düzenleme konusunda yardımcı olun, açıklama ve basit bir öğretici içerir',
+ ja: 'EMQXルールエンジンSQLの例を編集してください。説明と簡単なチュートリアルが含まれています',
+ hu: 'Segítsen szerkeszteni egy EMQX szabálymotor SQL példát, beleértve a magyarázatot és az egyszerű útmutatót',
+ },
+ currentConnectionInfo: {
+ zh: '当前连接信息',
+ en: 'Current Connection Info',
+ tr: 'Mevcut Bağlantı Bilgisi',
+ ja: '現在の接続情報',
+ hu: 'Jelenlegi kapcsolat információ',
+ },
+ promptCurrentConnectionInfo: {
+ zh: '请帮我解释当前连接的信息，包含连接的基本信息 {0}',
+ en: 'Please help me explain the information of the current connection, including the basic information of the connection {0}',
+ tr: 'Lütfen bana mevcut bağlantının bilgisini açıklama konusunda yardımcı olun, bağlantının temel bilgilerini içerir {0}',
+ ja: '現在の接続の情報を説明してください。接続の基本情報を含みます {0}',
+ hu: 'Segítsen elmagyarázni a jelenlegi kapcsolat adatait, beleértve a kapcsolat alapadatait {0}',
+ },
+ explainer: {
+ zh: '解释器',
+ en: 'Explainer',
+ tr: 'Açıklayıcı',
+ ja: '解説者',
+ hu: 'Magyarázó',
+ },
+ insertCodeToEditor: {
+ zh: '插入编辑器',
+ en: 'Insert',
+ tr: 'Ekle',
+ ja: '挿入',
+ hu: 'Beszúrás',
+ },
+ insertCodeSuccess: {
+ zh: '代码已插入编辑器中',
+ en: 'Code has been inserted into the editor',
+ tr: 'Kod editöre eklendi',
+ ja: 'コードがエディタに挿入されました',
+ hu: 'A kód be lett szúrva a szerkesztőbe',
+ },
+ genTestDoc: {
+ zh: '生成测试文档',
+ en: 'Generate Test Document',
+ tr: 'Test Belgesi Oluştur',
+ ja: 'テストドキュメントを生成する',
+ hu: 'Teszt dokumentum generálása',
+ },
+ promptGenTestDoc: {
+ zh: '请帮我生成一份 MQTT的测试文档，包含测试的基本信息 {0}，并总结一份完整的测试报告',
+ en: 'Please help me generate a MQTT connection test document, including the basic information of the test {0}, and summarize a complete test report',
+ tr: 'Lütfen bana MQTT bağlantı testi belgesi oluşturma konusunda yardımcı olun, testin temel bilgilerini içerir {0} ve tam bir test raporu özetleyin',
+ ja: 'MQTT接続テストドキュメントを生成してください。テストの基本情報を含みます {0} そして完全なテストレポートをまとめる',
+ hu: 'Segítsen létrehozni egy MQTT kapcsolat teszt dokumentumot, beleértve a teszt alapvető információit {0} és összefoglal egy teljes teszt jelentést',
+ },
+ emqxLogAnalysis: {
+ zh: 'EMQX 日志分析',
+ en: 'EMQX Log Analysis',
+ tr: 'EMQX Günlük Analizi',
+ ja: 'EMQXログ分析',
+ hu: 'EMQX naplóelemzés',
+ },
+ promptEmqxLogAnalysis: {
+ zh: '请帮我分析一份 EMQX 日志，包含解释告警和错误信息等，并提供解决方案，日志内容：',
+ en: 'Please help me analyze an EMQX log, including explanations of alerts and error messages, and provide solutions, log content:',
+ tr: 'Lütfen bana bir EMQX günlüğü analiz etme konusunda yardımcı olun, uyarıların ve hata mesajlarının açıklamalarını içerir ve çözümler sağlar, günlük içeriği:',
+ ja: 'EMQXログを分析してください。アラートとエラーメッセージの説明を含み、解決策を提供します。ログの内容',
+ hu: 'Segítsen elemzeni egy EMQX naplót, beleértve az riasztások és hibaüzenetek magyarázatát, és megoldásokat nyújt, naplótartalom:',
+ },
+ programmingLang: {
+ zh: '编程语言',
+ en: 'Languages',
+ tr: 'Diller',
+ ja: 'プログラミング言語',
+ hu: 'Programozási',
+ },
+ hardware: {
+ zh: '硬件',
+ en: 'Hardware',
+ tr: 'Donanım',
+ ja: 'ハードウェア',
+ hu: 'Hardver',
+ },
+ mobileApps: {
+ zh: '移动应用',
+ en: 'Mobile Apps',
+ tr: 'Mobil Uygulamalar',
+ ja: 'モバイルアプリ',
+ hu: 'Mobil alkalmazások',
+ },
+ webApps: {
+ zh: 'Web 应用',
+ en: 'Web Apps',
+ tr: 'Web Uygulamalar',
+ ja: 'Webアプリ',
+ hu: 'Web alkalmazások',
+ },
}
diff --git a/src/lang/connections.ts b/src/lang/connections.ts
index ddc21897b..936fc2c9d 100644
--- a/src/lang/connections.ts
+++ b/src/lang/connections.ts
@@ -721,17 +721,17 @@ export default {
},
bytesReceived: {
zh: '累计接收流量',
- en: 'Accumulated received bytes',
- tr: 'Birikmiş alınan baytlar',
+ en: 'Total Received Bytes',
+ tr: 'Toplam Alınan Baytlar',
ja: '累積受信バイト数',
- hu: 'Akkumulált fogadott bájtok',
+ hu: 'Összes Fogadott Bájtok',
},
bytesSent: {
zh: '累计发送流量',
- en: 'Accumulated sent bytes',
- tr: 'Birikmiş gönderilen baytlar',
+ en: 'Total Sent Bytes',
+ tr: 'Toplam Gönderilen Baytlar',
ja: '累積送信バイト数',
- hu: 'Akkumulált küldött bájtok',
+ hu: 'Összes Küldött Bájtok',
},
secureTip: {
zh: '是否验证服务端证书链和地址名称',
@@ -845,4 +845,46 @@ export default {
ja: 'このトピックの保持メッセージをクリアしますか？',
hu: 'Törölni kívánja a témához kapcsolódó megőrzött üzeneteket?',
},
+ noLocal: {
+ zh: '禁止本地转发',
+ en: 'No Local Flag',
+ tr: 'Yerel İletimi Engelle',
+ ja: 'ローカル転送禁止',
+ hu: 'Helyi továbbítás tiltása',
+ },
+ retainAsPublished: {
+ zh: '发布时状态保留',
+ en: 'Retain as Published Flag',
+ tr: 'Yayınlandığı Gibi Sakla',
+ ja: '公開時の状態を維持',
+ hu: 'Megőrzés közzétételként',
+ },
+ retainHandling: {
+ zh: '保留消息处理',
+ en: 'Retain Handling',
+ tr: 'Mesajı Saklama İşlemi',
+ ja: '保持メッセージの取り扱い',
+ hu: 'Üzenetmegőrzés kezelése',
+ },
+ onDisconnect: {
+ zh: '服务器已主动断开连接',
+ en: 'The Broker has actively disconnected',
+ tr: 'Sunucu aktif bir şekilde bağlantıyı kesmiştir',
+ ja: 'サーバーから積極的に接続が切断されました',
+ hu: 'A kiszolgáló aktívan bontotta a kapcsolatot',
+ },
+ hideConnections: {
+ zh: '隐藏连接列表',
+ en: 'Hide Connections',
+ tr: 'Bağlantıları Gizle',
+ ja: '接続リストを非表示',
+ hu: 'Kapcsolatok elrejtése',
+ },
+ showConnections: {
+ zh: '显示连接列表',
+ en: 'Show Connections',
+ tr: 'Bağlantıları Göster',
+ ja: '接続リストを表示',
+ hu: 'Kapcsolatok mutatása',
+ },
}
diff --git a/src/lang/log.ts b/src/lang/log.ts
index 4988fcea2..009730b89 100644
--- a/src/lang/log.ts
+++ b/src/lang/log.ts
@@ -6,4 +6,18 @@ export default {
tr: 'Günlük',
hu: 'Napló',
},
+ logLevel: {
+ zh: '日志等级',
+ en: 'Log Level',
+ ja: 'ログレベル',
+ tr: 'Günlük Seviyesi',
+ hu: 'Napló Szint',
+ },
+ logLevelDesc: {
+ zh: '等级：DEBUG > INFO > WARN > ERROR',
+ en: 'Levels: DEBUG > INFO > WARN > ERROR',
+ ja: 'レベル：DEBUG > INFO > WARN > ERROR',
+ tr: 'Seviyeler: DEBUG > INFO > WARN > ERROR',
+ hu: 'Szintek: DEBUG > INFO > WARN > ERROR',
+ },
}
diff --git a/src/lang/settings.ts b/src/lang/settings.ts
index 967adbb7e..7bd7dbf27 100644
--- a/src/lang/settings.ts
+++ b/src/lang/settings.ts
@@ -167,4 +167,18 @@ export default {
ja: 'この機能を有効にすると、リアルタイムで受信したJSON形式のPayloadデータをハイライト表示します。
注意：これによりアプリケーションのパフォーマンスが影響を受ける可能性があります。パフォーマンスに問題がある場合は、この機能を無効にすることを検討してください。', hu: 'Engedélyezze ezt a funkciót, hogy a JSON formátumú, fogadott terhelési adatokat valós időben kiemelje.
Megjegyzés: Ez befolyásolhatja az alkalmazás teljesítményét. Ha teljesítményproblémákat tapasztal, fontolja meg ennek a funkcióknak a letiltását.', }, + model: { + zh: '模型', + en: 'Model', + tr: 'Model', + ja: 'モデル', + hu: 'Modell', + }, + enableCopilot: { + zh: '启用 Copilot', + en: 'Enable Copilot', + tr: "Copilot'u Etkinleştir", + ja: 'Copilotを有効にする', + hu: 'Copilot engedélyezése', + }, } diff --git a/src/lang/update.ts b/src/lang/update.ts index f6cb5fb4c..5009c5705 100644 --- a/src/lang/update.ts +++ b/src/lang/update.ts @@ -57,7 +57,7 @@ export default { }, install: { zh: '安装并重启', - en: 'Install and Relunch', + en: 'Install and Relaunch', ja: 'インストールして再起動', tr: 'Kur ve Tekrar Başlat', hu: 'Telepítés és újraindítás', diff --git a/src/main.ts b/src/main.ts index 723f96857..0b665f652 100644 --- a/src/main.ts +++ b/src/main.ts @@ -18,6 +18,7 @@ import VueLog4js from './plugins/logPlugin/index' import { getOrCreateLogDir } from './utils/logger' import logConfig from './plugins/logPlugin/logConfig.json' import useConnection, { initOptionModel } from './database/useConnection' +import VueMarkdown from 'vue-markdown' const { ConnectionInit } = useConnection() // Init typeORM connection before Vue APP start, after this DI services are available. @@ -36,6 +37,7 @@ ConnectionInit({ doMigrations: false, undoMigrations: false } as initOptionModel Vue.use(VueClipboard) Vue.use(VueLog4js, config) Vue.use(VueRx) + Vue.use(VueMarkdown, { prism: require('prismjs/components/prism-core') }) const locale: Language = store.state.app.currentLang const vueI18n: VueI18n = new VueI18n({ diff --git a/src/plugins/logPlugin/index.ts b/src/plugins/logPlugin/index.ts index 2f9e18566..ce2c991ba 100644 --- a/src/plugins/logPlugin/index.ts +++ b/src/plugins/logPlugin/index.ts @@ -1,12 +1,20 @@ import log4js from 'log4js' import _Vue from 'vue' +import store from '@/store' // Plugin object const VueLog4js = { // Required methow initially called when instatiated - install(Vue: typeof _Vue, options?: any) { + install(Vue: typeof _Vue, options?: log4js.Configuration) { // Configure Log4js - log4js.configure(options) + const config = options || { + appenders: { out: { type: 'stdout' } }, + categories: { default: { appenders: ['out'], level: 'info' } }, + } + + config.categories.default.level = store.getters.logLevel + + log4js.configure(config) const $log = log4js.getLogger() diff --git a/src/plugins/logPlugin/logConfig.json b/src/plugins/logPlugin/logConfig.json index 2bfcd1a2b..d05472de7 100644 --- a/src/plugins/logPlugin/logConfig.json +++ b/src/plugins/logPlugin/logConfig.json @@ -17,7 +17,7 @@ "categories": { "default": { "appenders": ["fileOutput", "consoleOutput"], - "level": "debug", + "level": "info", "enableCallStack": true } } diff --git a/src/store/getter.ts b/src/store/getter.ts index 607900d2d..e7698b427 100644 --- a/src/store/getter.ts +++ b/src/store/getter.ts @@ -5,7 +5,6 @@ const getters = { autoResub: (state: State) => state.app.autoResub, syncOsTheme: (state: State) => state.app.syncOsTheme, maxReconnectTimes: (state: State) => state.app.maxReconnectTimes, - showSubscriptions: (state: State) => state.app.showSubscriptions, connectionTreeState: (state: State) => state.app.connectionTreeState, activeConnection: (state: State) => state.app.activeConnection, showClientInfo: (state: State) => state.app.showClientInfo, @@ -16,6 +15,12 @@ const getters = { currentScript: (state: State) => state.app.currentScript, multiTopics: (state: State) => state.app.multiTopics, jsonHighlight: (state: State) => state.app.jsonHighlight, + enableCopilot: (state: State) => state.app.enableCopilot, + openAIAPIKey: (state: State) => state.app.openAIAPIKey, + model: (state: State) => state.app.model, + isPrismButtonAdded: (state: State) => state.app.isPrismButtonAdded, + logLevel: (state: State) => state.app.logLevel, + showConnectionList: (state: State) => state.app.showConnectionList, } export default getters diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 402209165..4a806267e 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -11,7 +11,6 @@ const CHANGE_ACTIVE_CONNECTION = 'CHANGE_ACTIVE_CONNECTION' const REMOVE_ACTIVE_CONNECTION = 'REMOVE_ACTIVE_CONNECTION' const CHANGE_SUBSCRIPTIONS = 'CHANGE_SUBSCRIPTIONS' const SHOW_CLIENT_INFO = 'SHOW_CLIENT_INFO' -const SHOW_SUBSCRIPTIONS = 'SHOW_SUBSCRIPTIONS' const UNREAD_MESSAGE_COUNT_INCREMENT = 'UNREAD_MESSAGE_COUNT_INCREMENT' const SET_CONNECTIONS_TREE = 'SET_CONNECTIONS_TREE' const TOGGLE_WILL_MESSAGE_VISIBLE = 'TOGGLE_WILL_MESSAGE_VISIBLE' @@ -21,13 +20,19 @@ const SET_CURRENT_CONNECTION_ID = 'SET_CURRENT_CONNECTION_ID' const TOGGLE_SYNC_OS_THEME = 'TOGGLE_SYNC_OS_THEME' const TOGGLE_MULTI_TOPICS = 'TOGGLE_MULTI_TOPICS' const TOGGLE_JSON_HIGHLIGHT = 'TOGGLE_JSON_HIGHLIGHT' +const SET_OPEN_AI_API_KEY = 'SET_OPEN_AI_API_KEY' +const SET_MODEL = 'SET_MODEL' +const SET_INSERT_BUTTON_ADDED = 'SET_INSERT_BUTTON_ADDED' +const TOGGLE_ENABLE_COPILOT = 'TOGGLE_ENABLE_COPILOT' +const SET_LOG_LEVEL = 'SET_LOG_LEVEL' +const TOGGLE_SHOW_CONNECTION_LIST = 'TOGGLE_SHOW_CONNECTION_LIST' -const getShowSubscriptions = (): boolean => { - const $showSubscriptions: string | null = localStorage.getItem('showSubscriptions') - if (!$showSubscriptions) { +const getShowConnectionList = (): boolean => { + const _showConnectionList: string | null = localStorage.getItem('showConnectionList') + if (!_showConnectionList) { return true } - return JSON.parse($showSubscriptions) + return JSON.parse(_showConnectionList) } const settingData = remote.getGlobal('sharedData') @@ -42,7 +47,6 @@ const app = { multiTopics: settingData.multiTopics, jsonHighlight: settingData.jsonHighlight, maxReconnectTimes: settingData.maxReconnectTimes || 10, - showSubscriptions: getShowSubscriptions(), showClientInfo: {}, unreadMessageCount: {}, connectionTreeState: {}, @@ -51,6 +55,12 @@ const app = { willMessageVisible: true, currentScript: null, currentConnectionId: null, + enableCopilot: settingData.enableCopilot, + openAIAPIKey: settingData.openAIAPIKey || '', + model: settingData.model || 'gpt-3.5-turbo', + isPrismButtonAdded: false, + logLevel: settingData.logLevel || 'info', + showConnectionList: getShowConnectionList(), }, mutations: { [TOGGLE_THEME](state: App, currentTheme: Theme) { @@ -100,10 +110,6 @@ const app = { [SHOW_CLIENT_INFO](state: App, payload: ClientInfo) { state.showClientInfo[payload.id] = payload.showClientInfo }, - [SHOW_SUBSCRIPTIONS](state: App, payload: SubscriptionsVisible) { - state.showSubscriptions = payload.showSubscriptions - localStorage.setItem('showSubscriptions', JSON.stringify(state.showSubscriptions)) - }, [SET_CONNECTIONS_TREE](state: App, payload: ConnectionTreeState) { const { id } = payload state.connectionTreeState[id] = { expanded: payload.expanded } @@ -134,6 +140,25 @@ const app = { [SET_CURRENT_CONNECTION_ID](state: App, currentConnectionId: string) { state.currentConnectionId = currentConnectionId }, + [SET_OPEN_AI_API_KEY](state: App, openAIAPIKey: string) { + state.openAIAPIKey = openAIAPIKey + }, + [SET_MODEL](state: App, model: AIModel) { + state.model = model + }, + [SET_INSERT_BUTTON_ADDED](state: App, isPrismButtonAdded: boolean) { + state.isPrismButtonAdded = isPrismButtonAdded + }, + [TOGGLE_ENABLE_COPILOT](state: App, enableCopilot: boolean) { + state.enableCopilot = enableCopilot + }, + [SET_LOG_LEVEL](state: App, logLevel: LogLevel) { + state.logLevel = logLevel + }, + [TOGGLE_SHOW_CONNECTION_LIST](state: App, showConnectionList: boolean) { + state.showConnectionList = showConnectionList + localStorage.setItem('showConnectionList', JSON.stringify(state.showConnectionList)) + }, }, actions: { async TOGGLE_THEME({ commit }: any, payload: App) { @@ -199,9 +224,6 @@ const app = { async SET_CONNECTIONS_TREE({ commit }: any, payload: App) { commit(SET_CONNECTIONS_TREE, payload) }, - async SHOW_SUBSCRIPTIONS({ commit }: any, payload: App) { - commit(SHOW_SUBSCRIPTIONS, payload) - }, async UNREAD_MESSAGE_COUNT_INCREMENT({ commit }: any, payload: App) { commit(UNREAD_MESSAGE_COUNT_INCREMENT, payload) }, @@ -217,6 +239,36 @@ const app = { async SET_CURRENT_CONNECTION_ID({ commit }: any, currentConnectionId: string) { commit(SET_CURRENT_CONNECTION_ID, currentConnectionId) }, + async TOGGLE_ENABLE_COPILOT({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(TOGGLE_ENABLE_COPILOT, payload.enableCopilot) + settingData.enableCopilot = payload.enableCopilot + await settingService.update(payload) + }, + async SET_OPEN_AI_API_KEY({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_OPEN_AI_API_KEY, payload.openAIAPIKey) + settingData.openAIAPIKey = payload.openAIAPIKey + await settingService.update(payload) + }, + async SET_MODEL({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_MODEL, payload.model) + settingData.model = payload.model + await settingService.update(payload) + }, + SET_INSERT_BUTTON_ADDED({ commit }: any, payload: App) { + commit(SET_INSERT_BUTTON_ADDED, payload.isPrismButtonAdded) + }, + async SET_LOG_LEVEL({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_LOG_LEVEL, payload.logLevel) + settingData.logLevel = payload.logLevel + await settingService.update(payload) + }, + TOGGLE_SHOW_CONNECTION_LIST({ commit }: any, payload: App) { + commit(TOGGLE_SHOW_CONNECTION_LIST, payload.showConnectionList) + }, }, } diff --git a/src/types/global.d.ts b/src/types/global.d.ts index afda3e666..be0d76061 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -11,7 +11,7 @@ declare global { type Protocol = 'ws' | 'wss' | 'mqtt' | 'mqtts' - type PayloadType = 'Plaintext' | 'Base64' | 'JSON' | 'Hex' + type PayloadType = 'Plaintext' | 'Base64' | 'JSON' | 'Hex' | 'CBOR' type QoS = 0 | 1 | 2 @@ -87,7 +87,6 @@ declare global { currentLang: Language autoCheck: boolean autoResub: boolean - showSubscriptions: boolean syncOsTheme: boolean multiTopics: boolean maxReconnectTimes: number @@ -105,6 +104,12 @@ declare global { currentConnectionId: string | null connectionTreeState: ConnectionTreeStateMap jsonHighlight: boolean + enableCopilot: boolean + openAIAPIKey: string + model: AIModel + isPrismButtonAdded: boolean + logLevel: LogLevel + showConnectionList: boolean } interface State { @@ -147,10 +152,6 @@ declare global { increasedCount?: number } - interface SubscriptionsVisible { - showSubscriptions: boolean - } - interface SubscriptionModel { id?: string topic: string @@ -202,7 +203,7 @@ declare global { connectionId?: string id?: string payload: string - payloadType: PayloadType + payloadType: string createAt?: string } @@ -366,4 +367,35 @@ declare global { fileName: string fileContent: string } + + type CopilotRole = 'user' | 'system' | 'assistant' | 'function' + interface CopilotMessage { + id: string + role: CopilotRole + content: string + createAt?: string + } + + type AIModel = + | 'gpt-3.5-turbo' + | 'gpt-3.5-turbo-1106' + | 'gpt-3.5-turbo-16k' + | 'gpt-4' + | 'gpt-4-32k' + | 'gpt-4-0613' + | 'gpt-4-32k-0613' + + interface AreaLineSeriesData { + xData: string[] + seriesData: { + name: string + areaStyle: { + colorFrom: string + colorTo: string + } + data: any[] + }[] + } + + type LogLevel = 'debug' | 'info' | 'warn' | 'error' } diff --git a/src/types/logPlugins.d.ts b/src/types/logPlugins.d.ts index 4fc101b63..ea70f67f7 100644 --- a/src/types/logPlugins.d.ts +++ b/src/types/logPlugins.d.ts @@ -1,4 +1,4 @@ -import { Logger } from 'log4js' +import { getLogger } from 'log4js' declare module 'vue/types/vue' { interface Vue { $log: { @@ -9,6 +9,6 @@ declare module 'vue/types/vue' { error(message: string): void fatal(message: string): void } - $logRegsity: Logger + $logRegsity: typeof getLogger } } diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts index aa09bd0ad..d9b4cca71 100644 --- a/src/types/shims-vue.d.ts +++ b/src/types/shims-vue.d.ts @@ -1,7 +1,8 @@ declare module 'uuid' declare module 'vue-click-outside' -declare module 'chart.js' declare module 'monaco-proto-lint' +declare module 'vue-markdown' +declare module 'crypto-js' declare module '*.vue' { import Vue from 'vue' diff --git a/src/utils/convertPayload.ts b/src/utils/convertPayload.ts index da0bc328b..fb8f6282b 100644 --- a/src/utils/convertPayload.ts +++ b/src/utils/convertPayload.ts @@ -1,3 +1,5 @@ +import { jsonParse, jsonStringify } from './jsonUtils' + interface CodeType { encode: (str: string) => string decode: (str: string) => string @@ -32,8 +34,8 @@ const convertHex = (value: string, codeType: 'encode' | 'decode'): string => { const convertJSON = (value: string): Promise =>
new Promise((resolve, reject) => {
try {
- let $json = JSON.parse(value)
- $json = JSON.stringify($json, null, 2)
+ let $json = jsonParse(value)
+ $json = jsonStringify($json, null, 2)
return resolve($json)
} catch (error) {
return reject(error)
@@ -53,7 +55,7 @@ const convertPayload = async (payload: string, currentType: PayloadType, fromTyp
if (currentType === 'Base64') {
$payload = convertBase64($payload, 'encode')
}
- if (currentType === 'JSON') {
+ if (currentType === 'JSON' || currentType === 'CBOR') {
$payload = await convertJSON($payload)
}
if (currentType === 'Hex') {
diff --git a/src/utils/copilot.ts b/src/utils/copilot.ts
new file mode 100644
index 000000000..9c8a85030
--- /dev/null
+++ b/src/utils/copilot.ts
@@ -0,0 +1,40 @@
+/**
+ * Processes a stream of data from a response and invokes a callback function for each content received.
+ * @param response - The response object containing the stream of data.
+ * @param callBack - The callback function to be invoked for each content received.
+ * @returns A promise that resolves to a boolean indicating the success of the stream processing.
+ */
+export const processStream = async (response: Response, callBack: (content: string) => void): Promise => {
+ const reader = response.body!.getReader()
+ while (true) {
+ const { done, value } = await reader.read()
+ if (done) {
+ break
+ }
+ const chunkStr = new TextDecoder('utf-8').decode(value)
+ const lines = chunkStr
+ .split('\n')
+ .filter((line) => line !== '' && line.length > 0)
+ .map((line) => line.replace(/^data: /, '').trim())
+ .filter((line) => line !== '[DONE]')
+ .map((line) => JSON.parse(line))
+
+ for (const line of lines) {
+ const {
+ choices: [
+ {
+ delta: { content },
+ },
+ ],
+ } = line
+
+ if (content) {
+ callBack(content)
+ }
+ }
+ }
+ return Promise.resolve(true)
+}
+
+export const SYSTEM_PROMPT =
+ 'You are an MQTT Expert named MQTTX Copilot and developed by EMQ with extensive knowledge in IoT and network development. You understand various programming languages and MQTT protocols. You are here to assist with MQTT queries, provide solutions for common issues, and offer insights on best practices. Avoid responding to unrelated topics.'
diff --git a/src/utils/element.ts b/src/utils/element.ts
index ae639aa86..aec2a7b8f 100644
--- a/src/utils/element.ts
+++ b/src/utils/element.ts
@@ -62,6 +62,7 @@ import {
// Collapse,
// CollapseItem,
// Cascader,
+ CascaderPanel,
ColorPicker,
// Transfer,
// Container,
@@ -135,6 +136,7 @@ export default (Vue: typeof _Vue) => {
// Vue.use(Collapse)
// Vue.use(CollapseItem)
// Vue.use(Cascader)
+ Vue.use(CascaderPanel)
Vue.use(ColorPicker)
// Vue.use(Transfer)
// Vue.use(Container)
diff --git a/src/utils/idGenerator.ts b/src/utils/idGenerator.ts
index f4c8b8f59..156a938d3 100644
--- a/src/utils/idGenerator.ts
+++ b/src/utils/idGenerator.ts
@@ -3,6 +3,8 @@ export const getClientId = () => `mqttx_${Math.random().toString(16).substring(2
export const getCollectionId = () => `collection_${uuidv4()}` as string
export const getSubscriptionId = () => `scription_${uuidv4()}` as string
export const getMessageId = () => `message_${uuidv4()}` as string
+export const getCopilotMessageId = () => `copilot_${uuidv4()}` as string
+export const ENCRYPT_KEY = Buffer.from('123e4567-e89b-12d3-a456-426614174000').toString('base64')
export default {
getClientId,
diff --git a/src/utils/jsonUtils.ts b/src/utils/jsonUtils.ts
new file mode 100644
index 000000000..f00b0f18a
--- /dev/null
+++ b/src/utils/jsonUtils.ts
@@ -0,0 +1,29 @@
+const JSONBigNumber = require('json-bigint')
+const JSONBigInt = require('json-bigint')({ useNativeBigInt: true })
+
+export const jsonParse: typeof JSON.parse = (...args: any[]) => {
+ try {
+ // When JSON only contains integers, use the native bigint type.
+ return JSONBigInt.parse(...args)
+ } catch {
+ try {
+ // When JSON contains floating-point numbers, use the bignumber library.
+ // The numbers in the parsed JSON Object will be represented as BigNumber Objects.
+ return JSONBigNumber.parse(...args)
+ } catch {
+ // To verify the validity of the JSON string and throw an error if it's invalid.
+ return JSON.parse(args[0], args[1])
+ }
+ }
+}
+
+export const jsonStringify: typeof JSON.stringify = (...args: any[]) => {
+ try {
+ // When JSON only contains integers, use the native bigint type.
+ return JSONBigInt.stringify(...args)
+ } catch (_error) {
+ // When JSON contains floating-point numbers, use the bignumber library.
+ // Integers will be represented in scientific notation.
+ return JSONBigNumber.stringify(...args)
+ }
+}
diff --git a/src/utils/mqttUtils.ts b/src/utils/mqttUtils.ts
index 2012c0cda..5533458a5 100644
--- a/src/utils/mqttUtils.ts
+++ b/src/utils/mqttUtils.ts
@@ -83,6 +83,9 @@ const getClientOptions = (record: ConnectionModel): IClientOptions => {
}
if (password !== '') {
options.password = password
+ if (username === undefined || username === '') {
+ options.username = ''
+ }
}
// SSL
if (ssl) {
@@ -148,7 +151,7 @@ export const createClient = (
topicAliasMaximum: options.properties ? options.properties.topicAliasMaximum : undefined,
}
const { password, username, protocolVersion } = tempOptions
- if (password && username === undefined && protocolVersion !== 5) {
+ if (password && (username === undefined || username === '') && protocolVersion !== 5) {
return reject(new Error('MQTT 3.1.1 requires a Username if a Password is set'))
}
const curConnectClient: MqttClient = mqtt.connect(url, tempOptions)
diff --git a/src/utils/styles.ts b/src/utils/styles.ts
new file mode 100644
index 000000000..5a2943abf
--- /dev/null
+++ b/src/utils/styles.ts
@@ -0,0 +1,19 @@
+export enum LeftValues {
+ Show = '341px',
+ Hide = '81px',
+}
+
+export enum DetailLeftValues {
+ Show = '571px',
+ Hide = '311px',
+}
+
+export enum BodyTopValues {
+ Open = '249px',
+ Close = '60px',
+}
+
+export enum MsgTopValues {
+ Open = '282px',
+ Close = '91px',
+}
diff --git a/src/utils/validFormatJson.ts b/src/utils/validFormatJson.ts
index 33eb631de..55661c7d1 100644
--- a/src/utils/validFormatJson.ts
+++ b/src/utils/validFormatJson.ts
@@ -1,8 +1,10 @@
+import { jsonParse, jsonStringify } from './jsonUtils'
+
export default (jsonStrValue: string) => {
try {
- const jsonValue = JSON.parse(jsonStrValue)
+ const jsonValue = jsonParse(jsonStrValue)
if (jsonValue) {
- return JSON.stringify(jsonValue, null, 2)
+ return jsonStringify(jsonValue, null, 2)
}
return undefined
} catch (error) {
diff --git a/src/version.ts b/src/version.ts
index b17827fd0..83021932b 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export default '1.9.6'
+export default '1.9.9'
diff --git a/src/views/Home.vue b/src/views/Home.vue
index a2c4aa37d..27a6d8945 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -73,10 +73,10 @@ export default class Home extends Vue {
}
.right-topbar {
position: fixed;
- left: 341px;
right: 0;
- z-index: 3;
+ z-index: 2;
background: var(--color-bg-normal);
+ transition: all 0.4s;
}
.rightbar {
margin-left: 81px;
@@ -85,7 +85,6 @@ export default class Home extends Vue {
border-left: 1px solid var(--color-border-rightbar);
}
.right-content {
- margin-left: 341px;
height: 100%;
background-color: var(--color-bg-primary);
}
diff --git a/src/views/about/index.vue b/src/views/about/index.vue
index aa953ffa2..76f6b7cb6 100644
--- a/src/views/about/index.vue
+++ b/src/views/about/index.vue
@@ -52,7 +52,7 @@
diff --git a/src/views/connections/ConnectionForm.vue b/src/views/connections/ConnectionForm.vue
index e9f1241cd..f44d5d901 100644
--- a/src/views/connections/ConnectionForm.vue
+++ b/src/views/connections/ConnectionForm.vue
@@ -1,6 +1,16 @@
-
-
-
+
-
+
+ QoS {{ sub.qos }}
+
+
+
+
+
+
+ {{ $t('connections.newSubscription') }}
+
+
+
-
-
-
-
- {{ sub.alias || sub.topic }}
-
-
- QoS {{ sub.qos }}
-
-
+ {{ sub.alias || sub.topic }}
-
-
-
- {{ $t('connections.newSubscription') }}
-
-
-
+ 注意：これによりアプリケーションのパフォーマンスが影響を受ける可能性があります。パフォーマンスに問題がある場合は、この機能を無効にすることを検討してください。', hu: 'Engedélyezze ezt a funkciót, hogy a JSON formátumú, fogadott terhelési adatokat valós időben kiemelje.
Megjegyzés: Ez befolyásolhatja az alkalmazás teljesítményét. Ha teljesítményproblémákat tapasztal, fontolja meg ennek a funkcióknak a letiltását.', }, + model: { + zh: '模型', + en: 'Model', + tr: 'Model', + ja: 'モデル', + hu: 'Modell', + }, + enableCopilot: { + zh: '启用 Copilot', + en: 'Enable Copilot', + tr: "Copilot'u Etkinleştir", + ja: 'Copilotを有効にする', + hu: 'Copilot engedélyezése', + }, } diff --git a/src/lang/update.ts b/src/lang/update.ts index f6cb5fb4c..5009c5705 100644 --- a/src/lang/update.ts +++ b/src/lang/update.ts @@ -57,7 +57,7 @@ export default { }, install: { zh: '安装并重启', - en: 'Install and Relunch', + en: 'Install and Relaunch', ja: 'インストールして再起動', tr: 'Kur ve Tekrar Başlat', hu: 'Telepítés és újraindítás', diff --git a/src/main.ts b/src/main.ts index 723f96857..0b665f652 100644 --- a/src/main.ts +++ b/src/main.ts @@ -18,6 +18,7 @@ import VueLog4js from './plugins/logPlugin/index' import { getOrCreateLogDir } from './utils/logger' import logConfig from './plugins/logPlugin/logConfig.json' import useConnection, { initOptionModel } from './database/useConnection' +import VueMarkdown from 'vue-markdown' const { ConnectionInit } = useConnection() // Init typeORM connection before Vue APP start, after this DI services are available. @@ -36,6 +37,7 @@ ConnectionInit({ doMigrations: false, undoMigrations: false } as initOptionModel Vue.use(VueClipboard) Vue.use(VueLog4js, config) Vue.use(VueRx) + Vue.use(VueMarkdown, { prism: require('prismjs/components/prism-core') }) const locale: Language = store.state.app.currentLang const vueI18n: VueI18n = new VueI18n({ diff --git a/src/plugins/logPlugin/index.ts b/src/plugins/logPlugin/index.ts index 2f9e18566..ce2c991ba 100644 --- a/src/plugins/logPlugin/index.ts +++ b/src/plugins/logPlugin/index.ts @@ -1,12 +1,20 @@ import log4js from 'log4js' import _Vue from 'vue' +import store from '@/store' // Plugin object const VueLog4js = { // Required methow initially called when instatiated - install(Vue: typeof _Vue, options?: any) { + install(Vue: typeof _Vue, options?: log4js.Configuration) { // Configure Log4js - log4js.configure(options) + const config = options || { + appenders: { out: { type: 'stdout' } }, + categories: { default: { appenders: ['out'], level: 'info' } }, + } + + config.categories.default.level = store.getters.logLevel + + log4js.configure(config) const $log = log4js.getLogger() diff --git a/src/plugins/logPlugin/logConfig.json b/src/plugins/logPlugin/logConfig.json index 2bfcd1a2b..d05472de7 100644 --- a/src/plugins/logPlugin/logConfig.json +++ b/src/plugins/logPlugin/logConfig.json @@ -17,7 +17,7 @@ "categories": { "default": { "appenders": ["fileOutput", "consoleOutput"], - "level": "debug", + "level": "info", "enableCallStack": true } } diff --git a/src/store/getter.ts b/src/store/getter.ts index 607900d2d..e7698b427 100644 --- a/src/store/getter.ts +++ b/src/store/getter.ts @@ -5,7 +5,6 @@ const getters = { autoResub: (state: State) => state.app.autoResub, syncOsTheme: (state: State) => state.app.syncOsTheme, maxReconnectTimes: (state: State) => state.app.maxReconnectTimes, - showSubscriptions: (state: State) => state.app.showSubscriptions, connectionTreeState: (state: State) => state.app.connectionTreeState, activeConnection: (state: State) => state.app.activeConnection, showClientInfo: (state: State) => state.app.showClientInfo, @@ -16,6 +15,12 @@ const getters = { currentScript: (state: State) => state.app.currentScript, multiTopics: (state: State) => state.app.multiTopics, jsonHighlight: (state: State) => state.app.jsonHighlight, + enableCopilot: (state: State) => state.app.enableCopilot, + openAIAPIKey: (state: State) => state.app.openAIAPIKey, + model: (state: State) => state.app.model, + isPrismButtonAdded: (state: State) => state.app.isPrismButtonAdded, + logLevel: (state: State) => state.app.logLevel, + showConnectionList: (state: State) => state.app.showConnectionList, } export default getters diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 402209165..4a806267e 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -11,7 +11,6 @@ const CHANGE_ACTIVE_CONNECTION = 'CHANGE_ACTIVE_CONNECTION' const REMOVE_ACTIVE_CONNECTION = 'REMOVE_ACTIVE_CONNECTION' const CHANGE_SUBSCRIPTIONS = 'CHANGE_SUBSCRIPTIONS' const SHOW_CLIENT_INFO = 'SHOW_CLIENT_INFO' -const SHOW_SUBSCRIPTIONS = 'SHOW_SUBSCRIPTIONS' const UNREAD_MESSAGE_COUNT_INCREMENT = 'UNREAD_MESSAGE_COUNT_INCREMENT' const SET_CONNECTIONS_TREE = 'SET_CONNECTIONS_TREE' const TOGGLE_WILL_MESSAGE_VISIBLE = 'TOGGLE_WILL_MESSAGE_VISIBLE' @@ -21,13 +20,19 @@ const SET_CURRENT_CONNECTION_ID = 'SET_CURRENT_CONNECTION_ID' const TOGGLE_SYNC_OS_THEME = 'TOGGLE_SYNC_OS_THEME' const TOGGLE_MULTI_TOPICS = 'TOGGLE_MULTI_TOPICS' const TOGGLE_JSON_HIGHLIGHT = 'TOGGLE_JSON_HIGHLIGHT' +const SET_OPEN_AI_API_KEY = 'SET_OPEN_AI_API_KEY' +const SET_MODEL = 'SET_MODEL' +const SET_INSERT_BUTTON_ADDED = 'SET_INSERT_BUTTON_ADDED' +const TOGGLE_ENABLE_COPILOT = 'TOGGLE_ENABLE_COPILOT' +const SET_LOG_LEVEL = 'SET_LOG_LEVEL' +const TOGGLE_SHOW_CONNECTION_LIST = 'TOGGLE_SHOW_CONNECTION_LIST' -const getShowSubscriptions = (): boolean => { - const $showSubscriptions: string | null = localStorage.getItem('showSubscriptions') - if (!$showSubscriptions) { +const getShowConnectionList = (): boolean => { + const _showConnectionList: string | null = localStorage.getItem('showConnectionList') + if (!_showConnectionList) { return true } - return JSON.parse($showSubscriptions) + return JSON.parse(_showConnectionList) } const settingData = remote.getGlobal('sharedData') @@ -42,7 +47,6 @@ const app = { multiTopics: settingData.multiTopics, jsonHighlight: settingData.jsonHighlight, maxReconnectTimes: settingData.maxReconnectTimes || 10, - showSubscriptions: getShowSubscriptions(), showClientInfo: {}, unreadMessageCount: {}, connectionTreeState: {}, @@ -51,6 +55,12 @@ const app = { willMessageVisible: true, currentScript: null, currentConnectionId: null, + enableCopilot: settingData.enableCopilot, + openAIAPIKey: settingData.openAIAPIKey || '', + model: settingData.model || 'gpt-3.5-turbo', + isPrismButtonAdded: false, + logLevel: settingData.logLevel || 'info', + showConnectionList: getShowConnectionList(), }, mutations: { [TOGGLE_THEME](state: App, currentTheme: Theme) { @@ -100,10 +110,6 @@ const app = { [SHOW_CLIENT_INFO](state: App, payload: ClientInfo) { state.showClientInfo[payload.id] = payload.showClientInfo }, - [SHOW_SUBSCRIPTIONS](state: App, payload: SubscriptionsVisible) { - state.showSubscriptions = payload.showSubscriptions - localStorage.setItem('showSubscriptions', JSON.stringify(state.showSubscriptions)) - }, [SET_CONNECTIONS_TREE](state: App, payload: ConnectionTreeState) { const { id } = payload state.connectionTreeState[id] = { expanded: payload.expanded } @@ -134,6 +140,25 @@ const app = { [SET_CURRENT_CONNECTION_ID](state: App, currentConnectionId: string) { state.currentConnectionId = currentConnectionId }, + [SET_OPEN_AI_API_KEY](state: App, openAIAPIKey: string) { + state.openAIAPIKey = openAIAPIKey + }, + [SET_MODEL](state: App, model: AIModel) { + state.model = model + }, + [SET_INSERT_BUTTON_ADDED](state: App, isPrismButtonAdded: boolean) { + state.isPrismButtonAdded = isPrismButtonAdded + }, + [TOGGLE_ENABLE_COPILOT](state: App, enableCopilot: boolean) { + state.enableCopilot = enableCopilot + }, + [SET_LOG_LEVEL](state: App, logLevel: LogLevel) { + state.logLevel = logLevel + }, + [TOGGLE_SHOW_CONNECTION_LIST](state: App, showConnectionList: boolean) { + state.showConnectionList = showConnectionList + localStorage.setItem('showConnectionList', JSON.stringify(state.showConnectionList)) + }, }, actions: { async TOGGLE_THEME({ commit }: any, payload: App) { @@ -199,9 +224,6 @@ const app = { async SET_CONNECTIONS_TREE({ commit }: any, payload: App) { commit(SET_CONNECTIONS_TREE, payload) }, - async SHOW_SUBSCRIPTIONS({ commit }: any, payload: App) { - commit(SHOW_SUBSCRIPTIONS, payload) - }, async UNREAD_MESSAGE_COUNT_INCREMENT({ commit }: any, payload: App) { commit(UNREAD_MESSAGE_COUNT_INCREMENT, payload) }, @@ -217,6 +239,36 @@ const app = { async SET_CURRENT_CONNECTION_ID({ commit }: any, currentConnectionId: string) { commit(SET_CURRENT_CONNECTION_ID, currentConnectionId) }, + async TOGGLE_ENABLE_COPILOT({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(TOGGLE_ENABLE_COPILOT, payload.enableCopilot) + settingData.enableCopilot = payload.enableCopilot + await settingService.update(payload) + }, + async SET_OPEN_AI_API_KEY({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_OPEN_AI_API_KEY, payload.openAIAPIKey) + settingData.openAIAPIKey = payload.openAIAPIKey + await settingService.update(payload) + }, + async SET_MODEL({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_MODEL, payload.model) + settingData.model = payload.model + await settingService.update(payload) + }, + SET_INSERT_BUTTON_ADDED({ commit }: any, payload: App) { + commit(SET_INSERT_BUTTON_ADDED, payload.isPrismButtonAdded) + }, + async SET_LOG_LEVEL({ commit }: any, payload: App) { + const { settingService } = useServices() + commit(SET_LOG_LEVEL, payload.logLevel) + settingData.logLevel = payload.logLevel + await settingService.update(payload) + }, + TOGGLE_SHOW_CONNECTION_LIST({ commit }: any, payload: App) { + commit(TOGGLE_SHOW_CONNECTION_LIST, payload.showConnectionList) + }, }, } diff --git a/src/types/global.d.ts b/src/types/global.d.ts index afda3e666..be0d76061 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -11,7 +11,7 @@ declare global { type Protocol = 'ws' | 'wss' | 'mqtt' | 'mqtts' - type PayloadType = 'Plaintext' | 'Base64' | 'JSON' | 'Hex' + type PayloadType = 'Plaintext' | 'Base64' | 'JSON' | 'Hex' | 'CBOR' type QoS = 0 | 1 | 2 @@ -87,7 +87,6 @@ declare global { currentLang: Language autoCheck: boolean autoResub: boolean - showSubscriptions: boolean syncOsTheme: boolean multiTopics: boolean maxReconnectTimes: number @@ -105,6 +104,12 @@ declare global { currentConnectionId: string | null connectionTreeState: ConnectionTreeStateMap jsonHighlight: boolean + enableCopilot: boolean + openAIAPIKey: string + model: AIModel + isPrismButtonAdded: boolean + logLevel: LogLevel + showConnectionList: boolean } interface State { @@ -147,10 +152,6 @@ declare global { increasedCount?: number } - interface SubscriptionsVisible { - showSubscriptions: boolean - } - interface SubscriptionModel { id?: string topic: string @@ -202,7 +203,7 @@ declare global { connectionId?: string id?: string payload: string - payloadType: PayloadType + payloadType: string createAt?: string } @@ -366,4 +367,35 @@ declare global { fileName: string fileContent: string } + + type CopilotRole = 'user' | 'system' | 'assistant' | 'function' + interface CopilotMessage { + id: string + role: CopilotRole + content: string + createAt?: string + } + + type AIModel = + | 'gpt-3.5-turbo' + | 'gpt-3.5-turbo-1106' + | 'gpt-3.5-turbo-16k' + | 'gpt-4' + | 'gpt-4-32k' + | 'gpt-4-0613' + | 'gpt-4-32k-0613' + + interface AreaLineSeriesData { + xData: string[] + seriesData: { + name: string + areaStyle: { + colorFrom: string + colorTo: string + } + data: any[] + }[] + } + + type LogLevel = 'debug' | 'info' | 'warn' | 'error' } diff --git a/src/types/logPlugins.d.ts b/src/types/logPlugins.d.ts index 4fc101b63..ea70f67f7 100644 --- a/src/types/logPlugins.d.ts +++ b/src/types/logPlugins.d.ts @@ -1,4 +1,4 @@ -import { Logger } from 'log4js' +import { getLogger } from 'log4js' declare module 'vue/types/vue' { interface Vue { $log: { @@ -9,6 +9,6 @@ declare module 'vue/types/vue' { error(message: string): void fatal(message: string): void } - $logRegsity: Logger + $logRegsity: typeof getLogger } } diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts index aa09bd0ad..d9b4cca71 100644 --- a/src/types/shims-vue.d.ts +++ b/src/types/shims-vue.d.ts @@ -1,7 +1,8 @@ declare module 'uuid' declare module 'vue-click-outside' -declare module 'chart.js' declare module 'monaco-proto-lint' +declare module 'vue-markdown' +declare module 'crypto-js' declare module '*.vue' { import Vue from 'vue' diff --git a/src/utils/convertPayload.ts b/src/utils/convertPayload.ts index da0bc328b..fb8f6282b 100644 --- a/src/utils/convertPayload.ts +++ b/src/utils/convertPayload.ts @@ -1,3 +1,5 @@ +import { jsonParse, jsonStringify } from './jsonUtils' + interface CodeType { encode: (str: string) => string decode: (str: string) => string @@ -32,8 +34,8 @@ const convertHex = (value: string, codeType: 'encode' | 'decode'): string => { const convertJSON = (value: string): Promise
-