Provide a Common MQTT Mapper

Signed-off-by: fuchendou <[email protected]>
kubeedge · Oct 17, 2024 · f66552e · f66552e
1 parent d9568d1
commit f66552e
Show file tree

Hide file tree

Showing 33 changed files with 1,948 additions and 2,417 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,12 @@ pkg/modbus/modbus
 pkg/bluetooth/bluetooth
 .idea
 vendor/
+.lightly
+.c_bin
+.classes
+logs
+*.log
+node_modules
+dist
+dist-ssr
+*.local
diff --git a/mappers/mqtt-mapper/Dockerfile_nostream → ...e-v1beta1/mqtt-mapper/Dockerfile_nostream b/mappers/mqtt-mapper/Dockerfile_nostream → ...e-v1beta1/mqtt-mapper/Dockerfile_nostream
@@ -1,20 +1,20 @@
-FROM golang:1.21.11-alpine3.19 AS builder
-
-WORKDIR /build
-
-ENV GO111MODULE=on \
-    GOPROXY=https://goproxy.cn,direct
-
-COPY . .
-
-RUN CGO_ENABLED=0 GOOS=linux go build -o main cmd/main.go
-
-
-FROM ubuntu:18.04
-
-RUN mkdir -p kubeedge
-
-COPY --from=builder /build/main kubeedge/
-COPY ./config.yaml kubeedge/
-
+FROM golang:1.21.11-alpine3.19 AS builder
+
+WORKDIR /build
+
+ENV GO111MODULE=on \
+    GOPROXY=https://goproxy.cn,direct
+
+COPY . .
+
+RUN CGO_ENABLED=0 GOOS=linux go build -o main cmd/main.go
+
+
+FROM ubuntu:18.04
+
+RUN mkdir -p kubeedge
+
+COPY --from=builder /build/main kubeedge/
+COPY ./config.yaml kubeedge/
+
 WORKDIR kubeedge
diff --git a/mappers/mqtt-mapper/Dockerfile_stream → ...ice-v1beta1/mqtt-mapper/Dockerfile_stream b/mappers/mqtt-mapper/Dockerfile_stream → ...ice-v1beta1/mqtt-mapper/Dockerfile_stream
@@ -1,35 +1,35 @@
-FROM golang:1.21.11-bullseye AS builder
-
-WORKDIR /build
-
-ENV GO111MODULE=on \
-    GOPROXY=https://goproxy.cn,direct
-
-COPY . .
-
-RUN apt-get update && \
-    apt-get install -y bzip2 curl upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross libva-dev libva-drm2 libx11-dev libvdpau-dev libxext-dev libsdl1.2-dev libxcb1-dev libxau-dev libxdmcp-dev yasm
-
-RUN curl -sLO https://ffmpeg.org/releases/ffmpeg-4.1.6.tar.bz2 && \
-    tar -jx --strip-components=1 -f ffmpeg-4.1.6.tar.bz2 &&  \
-    ./configure &&  make && \
-    make install
-
-RUN GOOS=linux go build -o main cmd/main.go
-
-FROM ubuntu:18.04
-
-RUN mkdir -p kubeedge
-
-RUN apt-get update && \
-    apt-get install -y bzip2 curl upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross libva-dev libva-drm2 libx11-dev libvdpau-dev libxext-dev libsdl1.2-dev libxcb1-dev libxau-dev libxdmcp-dev yasm
-
-RUN curl -sLO https://ffmpeg.org/releases/ffmpeg-4.1.6.tar.bz2 && \
-    tar -jx --strip-components=1 -f ffmpeg-4.1.6.tar.bz2 &&  \
-    ./configure &&  make && \
-    make install
-
-COPY --from=builder /build/main kubeedge/
-COPY ./config.yaml kubeedge/
-
+FROM golang:1.21.11-bullseye AS builder
+
+WORKDIR /build
+
+ENV GO111MODULE=on \
+    GOPROXY=https://goproxy.cn,direct
+
+COPY . .
+
+RUN apt-get update && \
+    apt-get install -y bzip2 curl upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross libva-dev libva-drm2 libx11-dev libvdpau-dev libxext-dev libsdl1.2-dev libxcb1-dev libxau-dev libxdmcp-dev yasm
+
+RUN curl -sLO https://ffmpeg.org/releases/ffmpeg-4.1.6.tar.bz2 && \
+    tar -jx --strip-components=1 -f ffmpeg-4.1.6.tar.bz2 &&  \
+    ./configure &&  make && \
+    make install
+
+RUN GOOS=linux go build -o main cmd/main.go
+
+FROM ubuntu:18.04
+
+RUN mkdir -p kubeedge
+
+RUN apt-get update && \
+    apt-get install -y bzip2 curl upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross libva-dev libva-drm2 libx11-dev libvdpau-dev libxext-dev libsdl1.2-dev libxcb1-dev libxau-dev libxdmcp-dev yasm
+
+RUN curl -sLO https://ffmpeg.org/releases/ffmpeg-4.1.6.tar.bz2 && \
+    tar -jx --strip-components=1 -f ffmpeg-4.1.6.tar.bz2 &&  \
+    ./configure &&  make && \
+    make install
+
+COPY --from=builder /build/main kubeedge/
+COPY ./config.yaml kubeedge/
+
 WORKDIR kubeedge
diff --git a/mappers/mqtt-mapper/cmd/main.go → ...rs/device-v1beta1/mqtt-mapper/cmd/main.go b/mappers/mqtt-mapper/cmd/main.go → ...rs/device-v1beta1/mqtt-mapper/cmd/main.go
@@ -1,60 +1,60 @@
-package main
-
-import (
-	"errors"
-
-	"k8s.io/klog/v2"
-
-	"github.com/kubeedge/kubeedge-v1.17.0/device"
-	"github.com/kubeedge/mapper-framework/pkg/common"
-	"github.com/kubeedge/mapper-framework/pkg/config"
-	"github.com/kubeedge/mapper-framework/pkg/grpcclient"
-	"github.com/kubeedge/mapper-framework/pkg/grpcserver"
-	"github.com/kubeedge/mapper-framework/pkg/httpserver"
-)
-
-func main() {
-	var err error
-	var c *config.Config
-
-	klog.InitFlags(nil)
-	defer klog.Flush()
-
-	if c, err = config.Parse(); err != nil {
-		klog.Fatal(err)
-	}
-	klog.Infof("config: %+v", c)
-
-	klog.Infoln("Mapper will register to edgecore")
-	deviceList, deviceModelList, err := grpcclient.RegisterMapper(true)
-	if err != nil {
-		klog.Fatal(err)
-	}
-	klog.Infoln("Mapper register finished")
-
-	panel := device.NewDevPanel()
-	err = panel.DevInit(deviceList, deviceModelList)
-	if err != nil && !errors.Is(err, device.ErrEmptyData) {
-		klog.Fatal(err)
-	}
-	klog.Infoln("devInit finished")
-	go panel.DevStart()
-
-	// start http server
-	httpServer := httpserver.NewRestServer(panel, c.Common.HTTPPort)
-	go httpServer.StartServer()
-
-	// start grpc server
-	grpcServer := grpcserver.NewServer(
-		grpcserver.Config{
-			SockPath: c.GrpcServer.SocketPath,
-			Protocol: common.ProtocolCustomized,
-		},
-		panel,
-	)
-	defer grpcServer.Stop()
-	if err = grpcServer.Start(); err != nil {
-		klog.Fatal(err)
-	}
-
-}
+package main
+
+import (
+	"errors"
+
+	"k8s.io/klog/v2"
+
+	"github.com/kubeedge/mqtt/device"
+	"github.com/kubeedge/mapper-framework/pkg/common"
+	"github.com/kubeedge/mapper-framework/pkg/config"
+	"github.com/kubeedge/mapper-framework/pkg/grpcclient"
+	"github.com/kubeedge/mapper-framework/pkg/grpcserver"
+	"github.com/kubeedge/mapper-framework/pkg/httpserver"
+)
+
+func main() {
+	var err error
+	var c *config.Config
+
+	klog.InitFlags(nil)
+	defer klog.Flush()
+
+	if c, err = config.Parse(); err != nil {
+		klog.Fatal(err)
+	}
+	klog.Infof("config: %+v", c)
+
+	klog.Infoln("Mapper will register to edgecore")
+	deviceList, deviceModelList, err := grpcclient.RegisterMapper(true)
+	if err != nil {
+		klog.Fatal(err)
+	}
+	klog.Infoln("Mapper register finished")
+
+	panel := device.NewDevPanel()
+	err = panel.DevInit(deviceList, deviceModelList)
+	if err != nil && !errors.Is(err, device.ErrEmptyData) {
+		klog.Fatal(err)
+	}
+	klog.Infoln("devInit finished")
+	go panel.DevStart()
+
+	// start http server
+	httpServer := httpserver.NewRestServer(panel, c.Common.HTTPPort)
+	go httpServer.StartServer()
+
+	// start grpc server
+	grpcServer := grpcserver.NewServer(
+		grpcserver.Config{
+			SockPath: c.GrpcServer.SocketPath,
+			Protocol: common.ProtocolCustomized,
+		},
+		panel,
+	)
+	defer grpcServer.Stop()
+	if err = grpcServer.Start(); err != nil {
+		klog.Fatal(err)
+	}
+
+}
diff --git a/mappers/mqtt-mapper/config.yaml → ...rs/device-v1beta1/mqtt-mapper/config.yaml b/mappers/mqtt-mapper/config.yaml → ...rs/device-v1beta1/mqtt-mapper/config.yaml
@@ -1,9 +1,9 @@
-grpc_server:
-  socket_path: /etc/kubeedge/kubeedge-v1.17.0.sock
-common:
-  name: github.com/kubeedge/mqtt-mapper
-  version: v1.13.0
-  api_version: v1.0.0
-  protocol: mqtt
-  address: 127.0.0.1
-  edgecore_sock: /etc/kubeedge/dmi.sock
+grpc_server:
+  socket_path: /etc/kubeedge/mqtt.sock
+common:
+  name: Mqtt-mapper
+  version: v1.13.0
+  api_version: v1.0.0
+  protocol: # TODO add your protocol name
+  address: 127.0.0.1
+  edgecore_sock: /etc/kubeedge/dmi.sock