语音助手参数添加在线状态字段

Signed-off-by: 阿恒 <2390904403@qq.com>

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -0,0 +1,28 @@
+# 奇点物联-RPC客户端
+
+奇点物理Go的RPC客户端
+
+## 使用示例
+~~~go
+
+package main
+
+import (
+	"log"
+
+	"gitee.com/LifetimeNine/singularity-rpc-client/pkg/rpc"
+)
+
+func main() {
+  // 初始化
+	rpc.Initiate("127.0.0.1", 9631, "/root/cert.pem")
+  // 获取设备详情
+	result, err := rpc.GetDevice().GetDetail(10001)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	log.Println(result)
+}
+
+~~~

go.mod

@@ -4,4 +4,8 @@ go 1.24.3
 
 require golang.org/x/net v0.43.0
 
-require golang.org/x/text v0.28.0 // indirect
+require (
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+)

go.sum

@@ -1,3 +1,7 @@
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
 golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=

pkg/rpc/device.go

@@ -1,16 +1,198 @@
 package rpc
 
 import (
+	"fmt"
 	"time"
 )
 
-// 设备详情
-type DeviceDetail struct {
-	Type        uint8  `json:"type"`
-	ConnectType uint8  `json:"connect_type"`
-	Secret      string `json:"secret"`
-	PId         uint32 `json:"p_id"`
-	DataId      uint32 `json:"data_id"`
+// 设备相关RPC
+type Device struct{}
+
+// 获取设备详情
+func (d *Device) GetDetail(deviceId uint32) (*DeviceDetail, error) {
+	body := map[string]any{
+		"device_id":  deviceId,
+		"field_list": []string{"type", "secret", "connect_type", "p_id", "data_id"},
+	}
+	result := &Result[DeviceDetail]{}
+	if err := GetRequest().Send("device.get_detail", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return &result.Data, nil
+}
+
+// 获取设备属性列表
+func (d *Device) GetAttributeOptionList() (*[]DeviceAttributeOption, error) {
+	result := &Result[[]DeviceAttributeOption]{}
+	if err := GetRequest().Send("device.get_attribute_option_list", map[string]any{}, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return &result.Data, nil
+}
+
+// 重置设备在线状态
+func (d *Device) ResetOnlineStatus() error {
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.reset_online_status", map[string]any{}, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 更新设备在线状态
+func (d *Device) UpdateOnlineStatus(deviceId uint32, online bool, updateTime time.Time) error {
+	body := map[string]any{
+		"device_id": deviceId,
+		"online":    online,
+		"time":      updateTime.Format(time.DateTime),
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.update_online_status", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 更新从设备在线状态
+func (d *Device) UpdateSlaveOnlineStatus(deviceId uint32, online bool, updateTime time.Time, parentId *uint32) error {
+	body := map[string]any{
+		"device_id": deviceId,
+		"online":    online,
+		"time":      updateTime.Format(time.DateTime),
+	}
+	if parentId != nil {
+		body["parent_id"] = *parentId
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.update_salve_online_status", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 更新设备属性上报时间
+func (d *Device) UpdateReportTime(deviceId uint32, reportTime *time.Time) error {
+	body := map[string]any{
+		"device_id": deviceId,
+	}
+	if reportTime != nil {
+		body["time"] = reportTime.Format(time.DateTime)
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.update_report_time", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 设置设备属性
+func (d *Device) SetAttribute(deviceId uint32, attributeSet map[string]any) error {
+	body := map[string]any{
+		"device_id": deviceId,
+		"attribute": attributeSet,
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.set_attribute", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 获取设备属性
+func (d *Device) GetAttribute(deviceId uint32) (*map[string]any, error) {
+	body := map[string]any{
+		"device_id": deviceId,
+	}
+	result := &Result[map[string]any]{}
+	if err := GetRequest().Send("device.get_attribute", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return &result.Data, nil
+}
+
+// 更新设备版本信息
+func (d *Device) UpdateVersion(deviceId uint32, versionNumber uint) error {
+	body := map[string]any{
+		"device_id":      deviceId,
+		"version_number": versionNumber,
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.update_version", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 保存升级结果
+func (d *Device) SaveUpgradeResult(upgradeTaskId uint32, status uint8, finishTime time.Time) error {
+	body := map[string]any{
+		"upgrade_task_id": upgradeTaskId,
+		"status":          status,
+		"finish_time":     finishTime.Format(time.DateTime),
+	}
+	result := &Result[any]{}
+	if err := GetRequest().Send("device.save_upgrade_result", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+// 获取语音助手参数列表
+func (d *Device) GetVoiceAssistantList() ([]VoiceAssistant, error) {
+	body := map[string]any{}
+	result := &Result[[]VoiceAssistant]{}
+	if err := GetRequest().Send("device.get_voice_assistant_list", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return result.Data, nil
+}
+
+// 获取设备语音助手参数
+func (d *Device) GetVoiceAssistant(deviceId uint32) (*VoiceAssistant, error) {
+	body := map[string]any{
+		"device_id": deviceId,
+	}
+	result := &Result[*VoiceAssistant]{}
+	if err := GetRequest().Send("device.get_voice_assistant", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return result.Data, nil
 }
 
 var device *Device
@@ -22,126 +204,3 @@ func GetDevice() *Device {
 	}
 	return device
 }
-
-// 设备相关RPC
-type Device struct{}
-
-// 获取设备详情
-func (d *Device) GetDetail(deviceId uint32) (*Result[DeviceDetail], error) {
-	body := map[string]any{
-		"device_id":  deviceId,
-		"field_list": []string{"type", "secret", "connect_type", "p_id", "data_id"},
-	}
-	result := &Result[DeviceDetail]{}
-	if err := GetRequest().Send("device.get_detail", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 重置设备在线状态
-func (d *Device) ResetOnlineStatus() (*Result[any], error) {
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.reset_online_status", map[string]any{}, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 更新设备在线状态
-func (d *Device) UpdateOnlineStatus(deviceId uint32, online bool, updateTime time.Time) (*Result[any], error) {
-	body := map[string]any{
-		"device_id": deviceId,
-		"online":    online,
-		"time":      updateTime.Format(time.DateTime),
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.update_online_status", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 更新从设备在线状态
-func (d *Device) UpdateSlaveOnlineStatus(deviceId uint32, online bool, updateTime time.Time, parentId *uint32) (*Result[any], error) {
-	body := map[string]any{
-		"device_id": deviceId,
-		"online":    online,
-		"time":      updateTime.Format(time.DateTime),
-	}
-	if parentId != nil {
-		body["parent_id"] = *parentId
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.update_salve_online_status", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 更新设备属性上报时间
-func (d *Device) UpdateReportTime(deviceId uint32, reportTime *time.Time) (*Result[any], error) {
-	body := map[string]any{
-		"device_id": deviceId,
-	}
-	if reportTime != nil {
-		body["time"] = reportTime.Format(time.DateTime)
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.update_report_time", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 设置设备属性
-func (d *Device) SetAttribute(deviceId uint32, attributeSet map[string]any) (*Result[any], error) {
-	body := map[string]any{
-		"device_id": deviceId,
-		"attribute": attributeSet,
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.set_attribute", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 获取设备属性
-func (d *Device) GetAttribute(deviceId uint32) (*Result[map[string]any], error) {
-	body := map[string]any{
-		"device_id": deviceId,
-	}
-	result := &Result[map[string]any]{}
-	if err := GetRequest().Send("device.get_attribute", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 更新设备版本信息
-func (d *Device) UpdateVersion(deviceId uint32, versionNumber uint) (*Result[any], error) {
-	body := map[string]any{
-		"device_id":      deviceId,
-		"version_number": versionNumber,
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.update_version", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// 保存升级结果
-func (d *Device) SaveUpgradeResult(upgradeTaskId uint32, status uint8, finishTime time.Time) (*Result[any], error) {
-	body := map[string]any{
-		"upgrade_task_id": upgradeTaskId,
-		"status":          status,
-		"finish_time":     finishTime.Format(time.DateTime),
-	}
-	result := &Result[any]{}
-	if err := GetRequest().Send("device.save_upgrade_result", body, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}

pkg/rpc/request.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"time"
 
+	"go.uber.org/zap"
 	"golang.org/x/net/http2"
 )
 
@@ -24,6 +25,7 @@ type Request struct {
 	port         uint16
 	rootCertPath string
 	client       *http.Client
+	logger       *zap.SugaredLogger
 }
 
 // 发送请求
@@ -58,11 +60,19 @@ func (r *Request) Send(methodName string, body any, responseBody any) error {
 		return fmt.Errorf("response body json unmarshal fail: %v", err)
 	}
 
+	if r.logger != nil {
+		r.logger.Debugf("method: %s, request: %s, response: %s",
+			methodName,
+			string(bodyByte),
+			string(responseBodyByte),
+		)
+	}
+
 	return nil
 }
 
-// 初始化请求类
-func InitiateRequest(host string, port uint16, rootCertPath string) error {
+// 初始化
+func Initiate(host string, port uint16, rootCertPath string, logger *zap.SugaredLogger) error {
 	rootCert, err := os.ReadFile(rootCertPath)
 	if err != nil {
 		return fmt.Errorf("cert file read fail")
@@ -70,6 +80,7 @@ func InitiateRequest(host string, port uint16, rootCertPath string) error {
 	defaultRequest.host = host
 	defaultRequest.port = port
 	defaultRequest.rootCertPath = rootCertPath
+	defaultRequest.logger = logger
 
 	certPool := x509.NewCertPool()
 	certPool.AppendCertsFromPEM(rootCert)

pkg/rpc/server.go

@@ -0,0 +1,46 @@
+package rpc
+
+import "fmt"
+
+// 服务相关RPC
+type Server struct{}
+
+// 获取Websocket签名信息
+func (s *Server) GetWebsocketSignData(sign string) (*WebsocketSignData, error) {
+	body := map[string]any{
+		"sign": sign,
+	}
+	result := &Result[WebsocketSignData]{}
+	if err := GetRequest().Send("server.get_websocket_sign", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return &result.Data, nil
+}
+
+// 删除Websocket签名
+func (s *Server) DeleteWebsocketSign(sign string) error {
+	body := map[string]any{
+		"sign": sign,
+	}
+	result := &Result[WebsocketSignData]{}
+	if err := GetRequest().Send("server.get_websocket_sign", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
+var server *Server
+
+// 获取服务相关RPC类
+func GetServer() *Server {
+	if server == nil {
+		server = &Server{}
+	}
+	return server
+}

pkg/rpc/type.go

@@ -41,3 +41,43 @@ type Result[D any] struct {
 	Message string     `json:"message"`
 	Data    D          `json:"data"`
 }
+
+// 设备详情
+type DeviceDetail struct {
+	Type        uint8  `json:"type"`
+	ConnectType uint8  `json:"connect_type"`
+	Secret      string `json:"secret"`
+	PId         uint32 `json:"p_id"`
+	DataId      uint32 `json:"data_id"`
+}
+
+// 设备属性参数
+type DeviceAttributeOption struct {
+	Type        uint8 `json:"type"`
+	ContentType uint8 `json:"content_type"`
+	Attribute   []struct {
+		Type      uint8    `json:"type"`
+		Name      string   `json:"name"`
+		Flag      uint8    `json:"flag"`
+		Field     string   `json:"field"`
+		Readonly  bool     `json:"readonly"`
+		AllowItem *[]uint8 `json:"allow_item,omitempty"`
+		Min       *uint32  `json:"min,omitempty"`
+		Max       *uint32  `json:"max,omitempty"`
+	} `json:"attribute"`
+}
+
+// Websocket签名数据
+type WebsocketSignData struct {
+	UserId   uint32 `json:"user_id"`
+	Platform string `json:"platform"`
+}
+
+// 语音助手数据
+type VoiceAssistant struct {
+	Id           uint32 `json:"id"`
+	Type         uint8  `json:"type"`
+	OnlineStatus uint8  `json:"online_status"`
+	BemFaEnable  uint8  `json:"bem_fa_enable"`
+	BemFaName    string `json:"bem_fa_name"`
+}