refactor(entity): refactor model types

src/components/MessageList.vue

@@ -5,7 +5,7 @@
     :style="{ height: `${height}px`, marginTop: `${marginTop}px` }"
   >
     <span v-show="showLoadingIcon" class="loading-icon"><i class="el-icon-loading"></i></span>
-    <div v-for="message in showMessages" :key="message.mid" :id="message.mid">
+    <div v-for="message in showMessages" :key="message.id" :id="message.id">
       <MsgLeftItem
         v-if="!message.out"
         :subsList="subscriptions"
@@ -78,12 +78,14 @@ export default class MessageList extends Vue {
           this.showMessages = addMessages.concat(this.showMessages)
           this.$nextTick(() => {
             if (addMessages.length > 0) {
-              const id = addMessages[addMessages.length - 1].mid
-              const idBox = document.getElementById(id.toString() as string)
-              if (idBox) {
-                idBox.scrollIntoView(true)
+              const id = addMessages[addMessages.length - 1].id
+              if (id) {
+                const idBox = document.getElementById(id.toString() as string)
+                if (idBox) {
+                  idBox.scrollIntoView(true)
+                }
+                this.showLoadingIcon = false
               }
-              this.showLoadingIcon = false
             }
           })
           window.clearTimeout(timer)
@@ -93,7 +95,7 @@ export default class MessageList extends Vue {
   }
 
   private getNewMessages(newMessageList: MessageModel[], oldMessageList: MessageModel[]) {
-    const newMessages = newMessageList.filter((item) => oldMessageList.every((one) => one.mid !== item.mid))
+    const newMessages = newMessageList.filter((item) => oldMessageList.every((one) => one.id !== item.id))
     return newMessages
   }
 

src/components/MsgPublish.vue

@@ -119,7 +119,6 @@ export default class MsgPublish extends Vue {
   private payloadsHistory: HistoryMessagePayloadModel[] | [] = []
   private historyIndex: number = -1
   private defaultMsgRecord: MessageModel = {
-    mid: 0,
     createAt: '',
     out: true,
     qos: 0,
@@ -216,7 +215,7 @@ export default class MsgPublish extends Vue {
   }
 
   private async send() {
-    this.msgRecord.mid = uuidv4()
+    this.msgRecord.id = uuidv4()
     this.$emit('handleSend', this.msgRecord, this.payloadType, this.loadHistoryData)
   }
 

src/database/models/CollectionEntity.ts

@@ -3,8 +3,8 @@ import ConnectionEntity from './ConnectionEntity'
 
 @Entity('CollectionEntity')
 export default class CollectionEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   name!: string
@@ -17,7 +17,7 @@ export default class CollectionEntity {
 
   // current collection parent
   @ManyToOne(() => CollectionEntity, (collection) => collection.collection, { onDelete: 'CASCADE' })
-  collection!: CollectionEntity[]
+  collection!: CollectionEntity
 
   // collections children
   @OneToMany(() => CollectionEntity, (collection) => collection.collection)

src/database/models/ConnectionEntity.ts

@@ -6,8 +6,8 @@ import CollectionEntity from './CollectionEntity'
 import WillEntity from './WillEntity'
 @Entity('ConnectionEntity')
 export default class ConnectionEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   clientId!: string
@@ -18,8 +18,8 @@ export default class ConnectionEntity {
   @Column({ type: 'boolean', default: true })
   clean!: boolean
 
-  @Column({ type: 'varchar' })
-  protocol!: string
+  @Column({ type: 'simple-enum', enum: ['ws', 'wss', 'mqtt', 'mqtts'], default: 'mqtt' })
+  protocol!: Protocol
 
   @Column({ type: 'varchar' })
   host!: string
@@ -45,8 +45,8 @@ export default class ConnectionEntity {
   @Column({ type: 'varchar', nullable: true })
   path!: string
 
-  @Column({ type: 'varchar', nullable: true })
-  certType!: string
+  @Column({ type: 'varchar', enum: ['', 'server', 'self'], default: '', nullable: true })
+  certType!: CertType
 
   @Column({ type: 'boolean' })
   ssl!: boolean

src/database/models/HistoryMessageHeaderEntity.ts

@@ -2,15 +2,15 @@ import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 
 @Entity('historyMessageHeaderEntity')
 export default class historyMessageHeaderEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'boolean' })
   retain!: boolean
 
   @Column({ type: 'varchar' })
   topic!: string
 
-  @Column({ type: 'integer' })
-  qos!: number
+  @Column({ type: 'simple-enum', enum: [0, 1, 2], default: 0 })
+  qos!: QoS
 }

src/database/models/HistoryMessagePayloadEntity.ts

@@ -2,8 +2,8 @@ import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 
 @Entity('historyMessagePayloadEntity')
 export default class historyMessagePayloadEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   payload!: string

src/database/models/MessageEntity.ts

@@ -3,8 +3,8 @@ import ConnectionEntity from './ConnectionEntity'
 
 @Entity('MessageEntity')
 export default class MessageEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  mid!: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   createAt!: string
@@ -15,8 +15,8 @@ export default class MessageEntity {
   @Column({ type: 'varchar' })
   payload!: string
 
-  @Column({ type: 'integer' })
-  qos!: number
+  @Column({ type: 'simple-enum', enum: [0, 1, 2], default: 0 })
+  qos!: QoS
 
   @Column({ type: 'boolean' })
   retain!: boolean

src/database/models/ScriptEntity.ts

@@ -2,8 +2,8 @@ import { Entity, Column, PrimaryGeneratedColumn } from 'typeorm'
 
 @Entity('ScriptEntity')
 export default class ScriptEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   name!: string

src/database/models/SubscriptionEntity.ts

@@ -3,14 +3,14 @@ import ConnectionEntity from './ConnectionEntity'
 
 @Entity('SubscriptionEntity')
 export default class SubscriptionEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   topic!: string
 
-  @Column({ type: 'integer' })
-  qos!: number
+  @Column({ type: 'simple-enum', enum: [0, 1, 2], default: 0 })
+  qos!: QoS
 
   @Column({ type: 'varchar' })
   alias!: string

src/database/models/WillEntity.ts

@@ -3,17 +3,17 @@ import ConnectionEntity from './ConnectionEntity'
 
 @Entity('WillEntity')
 export default class WillEntity {
-  @PrimaryGeneratedColumn({ type: 'integer' })
-  id?: number
+  @PrimaryGeneratedColumn('uuid')
+  id!: string
 
   @Column({ type: 'varchar' })
   lastWillTopic!: string
 
   @Column({ type: 'varchar' })
   lastWillPayload!: string
 
-  @Column({ type: 'integer' })
-  lastWillQos!: number
+  @Column({ type: 'simple-enum', enum: [0, 1, 2], default: 0 })
+  lastWillQos!: QoS
 
   @Column({ type: 'boolean' })
   lastWillRetain!: boolean

src/database/services/ConnectionService.ts

@@ -13,7 +13,7 @@ export default class ConnectionService {
 
   public async updateConnectionCollectionId(
     id: number,
-    updatedCollectionId: number,
+    updatedCollectionId: string,
   ): Promise<ConnectionModel | undefined> {
     const query: ConnectionEntity | undefined = await this.connectionRepository.findOne({
       where: {
@@ -36,7 +36,7 @@ export default class ConnectionService {
     }
     deepMerge(res, data)
     const query: ConnectionEntity | undefined = await this.connectionRepository.save(res)
-    return query
+    return query as ConnectionModel
   }
 
   public async importConnections(data: ConnectionModel[]): Promise<string> {
@@ -102,17 +102,17 @@ export default class ConnectionService {
     return removed as ConnectionEntity
   }
 
-  public async loadAllConnectionsIds(): Promise<number[] | undefined> {
-    const res: number[] = []
+  public async loadAllConnectionsIds(): Promise<string[] | undefined> {
+    const res: string[] = []
     const query: ConnectionEntity[] | undefined = await this.connectionRepository.find({
       select: ['id'],
     })
     if (!query) {
       return
     }
     query.forEach((entity) => {
-      if (entity && entity.id) res?.push(entity.id)
+      if (entity && entity.id) res.push(entity.id)
     })
-    return res as number[]
+    return res as string[]
   }
 }

src/database/services/MessageService.ts

@@ -0,0 +1,12 @@
+import { Service } from 'typedi'
+import { InjectRepository } from 'typeorm-typedi-extensions'
+import MessageEntity from '../models/MessageEntity'
+import { Repository } from 'typeorm'
+
+@Service()
+export default class MessageService {
+  constructor(
+    @InjectRepository(MessageEntity)
+    private messageRepository: Repository<MessageEntity>,
+  ) {}
+}

src/types/global.d.ts

@@ -147,18 +147,18 @@ declare global {
 
   interface SubscriptionModel {
     topic: string
-    qos: number
+    qos: QoS
     alias?: string
     retain?: boolean
     color?: string
   }
 
   interface MessageModel {
-    mid: number
+    id?: string
     createAt: string
     out: boolean
     payload: string
-    qos: number
+    qos: QoS
     retain: boolean
     topic: string
   }
@@ -168,7 +168,7 @@ declare global {
     id?: string
     retain: boolean
     topic: string
-    qos: number
+    qos: QoS
   }
 
   interface HistoryMessagePayloadModel {
@@ -195,17 +195,17 @@ declare global {
   interface WillModel {
     lastWillTopic: string
     lastWillPayload: string
-    lastWillQos: number
+    lastWillQos: QoS
     lastWillRetain: boolean
     properties?: WillPropertiesModel
   }
 
   interface ConnectionModel extends SSLPath {
-    readonly id?: number
+    readonly id?: string
     clientId: string
     name: string
     clean: boolean
-    protocol?: string
+    protocol?: Protocol
     host: string
     port: number
     keepalive: number
@@ -214,7 +214,7 @@ declare global {
     username: string
     password: string
     path: string
-    certType?: string
+    certType?: CertType
     ssl: boolean
     mqttVersion: string
     unreadMessageCount: number

src/views/connections/ConnectionsDetail.vue

@@ -635,12 +635,12 @@ export default class ConnectionsDetail extends Vue {
   // Delete message
   private async handleDeleteMessage() {
     const connectID = this.record.id
-    let mid = ''
-    if (this.selectedMessage) {
-      mid = this.selectedMessage.mid.toString()
+    let id = ''
+    if (this.selectedMessage && this.selectedMessage.id) {
+      id = this.selectedMessage.id.toString()
     }
     if (connectID) {
-      const res: ConnectionModel | null = await deleteMessage(connectID.toString() as string, mid as string)
+      const res: ConnectionModel | null = await deleteMessage(connectID.toString() as string, id as string)
       if (res) {
         this.showContextmenu = false
         this.$message.success(this.$t('common.deleteSuccess') as string)
@@ -1026,7 +1026,7 @@ export default class ConnectionsDetail extends Vue {
       const convertPayload = this.convertPayloadByType(payload, this.receivedMsgType, 'receive') as string
       const receviedPayload = this.convertPayloadByScript(convertPayload, 'publish')
       const receivedMessage: MessageModel = {
-        mid: uuidv4(),
+        id: uuidv4(),
         out: false,
         createAt: time.getNowDate(),
         topic,
@@ -1076,7 +1076,7 @@ export default class ConnectionsDetail extends Vue {
           this.messagesAddedNewItem = true
           this.$log.info(
             `Message arrived: message added #${JSON.stringify(
-              receivedMessage.mid,
+              receivedMessage.id,
             )} added to topic ${topic}, MQTT.js onMessageArrived trigger`,
           )
         }
@@ -1113,9 +1113,9 @@ export default class ConnectionsDetail extends Vue {
     this.stopTimedSend()
     this.sendTimeId = window.setInterval(() => {
       const { ...oneMessage } = message
-      let { mid } = oneMessage
-      mid = uuidv4()
-      this.sendOneMessage(Object.assign(oneMessage, { mid }), type)
+      let { id } = oneMessage
+      id = uuidv4()
+      this.sendOneMessage(Object.assign(oneMessage, { id }), type)
     }, time * 1000)
   }
 
@@ -1144,7 +1144,7 @@ export default class ConnectionsDetail extends Vue {
       this.stopTimedSend()
       return false
     }
-    const { mid, topic, qos, payload, retain } = message
+    const { id, topic, qos, payload, retain } = message
     if (!topic) {
       this.$message.warning(this.$t('connections.topicReuired') as string)
       this.stopTimedSend()
@@ -1168,7 +1168,7 @@ export default class ConnectionsDetail extends Vue {
         return false
       }
       const publishMessage: MessageModel = {
-        mid,
+        id,
         out: true,
         createAt: time.getNowDate(),
         topic,