improve(cli): helper function for extracting schema options

emqx · Aug 23, 2024 · 1665514 · 1665514
1 parent d28945b
commit 1665514
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/cli/src/lib/sub.ts b/cli/src/lib/sub.ts
@@ -1,6 +1,6 @@
 import * as mqtt from 'mqtt'
 import logWrapper, { Signale, msgLog, basicLog, benchLog, singaleConfig, signale } from '../utils/logWrapper'
-import { parseConnectOptions, parseSubscribeOptions, checkTopicExists } from '../utils/parse'
+import { parseConnectOptions, parseSubscribeOptions, parseSchemaOptions, checkTopicExists } from '../utils/parse'
 import delay from '../utils/delay'
 import convertPayload from '../utils/convertPayload'
 import { handleSaveOptions, handleLoadOptions } from '../utils/options'
@@ -159,19 +159,7 @@ const sub = (options: SubscribeOptions) => {
   client.on('message', (topic, payload, packet) => {
     const { format, protobufPath, protobufMessageName, avscPath, fileSave, fileWrite, delimiter } = options
 
-    let schemaOptions: SchemaOptions | undefined
-    if (protobufPath && protobufMessageName) {
-      schemaOptions = {
-        type: 'protobuf',
-        protobufPath,
-        protobufMessageName,
-      }
-    } else if (avscPath) {
-      schemaOptions = {
-        type: 'avro',
-        avscPath,
-      }
-    }
+    const schemaOptions: SchemaOptions | undefined = parseSchemaOptions(protobufPath, protobufMessageName, avscPath)
 
     const msgData: MsgItem[] = []
 

diff --git a/cli/src/utils/parse.ts b/cli/src/utils/parse.ts
@@ -141,6 +141,27 @@ const parseFormat = (value: string) => {
   return value
 }
 
+const parseSchemaOptions = (
+  protobufPath?: string,
+  protobufMessageName?: string,
+  avscPath?: string,
+): SchemaOptions | undefined => {
+  if (protobufPath && protobufMessageName) {
+    return {
+      type: 'protobuf',
+      protobufPath,
+      protobufMessageName,
+    }
+  } else if (avscPath) {
+    return {
+      type: 'avro',
+      avscPath,
+    }
+  } else {
+    return undefined
+  }
+}
+
 const parseOutputMode = (value: string) => {
   if (!['clean', 'default'].includes(value)) {
     logWrapper.fail('Not a valid output mode.')
@@ -359,19 +380,7 @@ const parsePublishOptions = (options: PublishOptions) => {
     dup,
   }
 
-  let schemaOptions: SchemaOptions | undefined
-  if (protobufPath && protobufMessageName) {
-    schemaOptions = {
-      type: 'protobuf',
-      protobufPath,
-      protobufMessageName,
-    }
-  } else if (avscPath) {
-    schemaOptions = {
-      type: 'avro',
-      avscPath,
-    }
-  }
+  const schemaOptions: SchemaOptions | undefined = parseSchemaOptions(protobufPath, protobufMessageName, avscPath)
 
   if (options.mqttVersion === 5) {
     const properties = {
@@ -446,6 +455,7 @@ export {
   parseFileSave,
   parseFileWrite,
   parseFormat,
+  parseSchemaOptions,
   parseOutputMode,
   parseConnectOptions,
   parsePublishOptions,