.drone.yml

@@ -1,45 +1,35 @@
-global-variables:
-  env: &env
-  image: golang
-    commands:
-      - go build -ldflags "-X main.version=${DRONE_TAG##v}" -o release/$GOOS/$GOARCH/ubnt-freifunk-map-api .
-      - tar -cvzf release/ubnt-freifunk-map-api_$GOOS_$GOARCH.tar.gz -C release/$GOOS/$GOARCH ubnt-freifunk-map-api
-
 kind: pipeline
 type: docker
 name: build go
 
 steps:
   - name: build linux/amd64
-  <<: *env
+    image: golang
+    commands:
+      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/linux/amd64/ubnt-freifunk-map-api .
+      - tar -cvzf release/ubnt-freifunk-map-api_linux_amd64.tar.gz -C release/linux/amd64 ubnt-freifunk-map-api
     environment:
       GOARCH: amd64
       GOOS: linux
 
   - name: build linux/arm64
-  <<: *env
+    image: golang
+    commands:
+      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/linux/arm64/ubnt-freifunk-map-api .
+      - tar -cvzf release/ubnt-freifunk-map-api_linux_arm64.tar.gz -C release/linux/arm64 ubnt-freifunk-map-api
     environment:
       GOARCH: arm64
       GOOS: linux
 
   - name: build windows
-  <<: *env
+    image: golang
+    commands:
+      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/windows/amd64/ubnt-freifunk-map-api .
+      - tar -cvzf release/ubnt-freifunk-map-api_windows_amd64.tar.gz -C release/windows/amd64 ubnt-freifunk-map-api
     environment:
       GOARCH: amd64
       GOOS: windows
 
-  - name: build macos/x64
-  <<: *env
-    environment:
-      GOARCH: amd64
-      GOOS: darwin
-
-  - name: build macos/arm64
-  <<: *env
-    environment:
-      GOARCH: arm64
-      GOOS: darwin
-
   - name: docker  
     image: plugins/docker
     settings:

main.go

@@ -23,131 +23,118 @@ const (
 // flags
 var token = flag.String("token", "", "Defines the x-auth-token")
 var version = "development"
-var delay time.Duration = 60 * time.Second
 
 func main() {
-	log.Printf("starting version %s...\n", version)
+
+	log.Println("starting version", version, "...")
 	// parse all flags
 	flag.Parse()
+
 	// check if token is set
 	if *token == "" {
 		log.Fatalln("Please specify an API token via the flag '-token'")
 	}
 
-	// start API processing (runs in a loop)
-	go processAPIs()
+	// Variables for runtime
+	var links []link
+	var nodes []node
 
-	// start webserver
-	serveJSON()
-}
-
-func processAPIs() {
-	tick := time.Tick(delay)
-	for range tick {
-		// Variables for runtime
-		var links []link
-		var nodes []node
-
-		d, err := getDevices()
-		if err != nil {
-			log.Fatalln(err)
-		}
-
-		// API CALL 1
-		log.Println("calling API 1")
-		var u []unifiAPIResponse
-		err = callUnifiAPI("/devices", &u)
-		if err != nil {
-			log.Fatalln(err)
-		}
-
-		for i := range d.Devices {
-			var dev unifiAPIResponse
-			var currentDevice device
-			for j := range u {
-				if strings.ToUpper(u[j].Identification.MAC) == strings.ToUpper(d.Devices[i].MAC) {
-					dev = u[j]
-					currentDevice = d.Devices[i]
-				}
-			}
-
-			var isOnline bool = false
-			if dev.Overview.Status == "active" {
-				isOnline = true
-			}
-			// END OF API CALL 1
-
-			// API CALL 2
-			log.Println("calling API 2 for device", d.Devices[i].Name)
-			var details unifiAPIDetails
-			callUnifiAPI("/devices/erouters/"+dev.Identification.ID, &details)
-			// END OF API CALL 2
-
-			// API CALL 3
-			log.Println("calling API 3 for device", d.Devices[i].Name)
-			var airmaxes []unifiAPIAirmax
-			callUnifiAPI("/devices/airmaxes/"+dev.Identification.ID+"/stations", &airmaxes)
-			// check if remote mac address is part of our published network
-			for i := range airmaxes {
-				if isRemoteMACpublished(airmaxes[i].DeviceIdentification.MAC, d.Devices) == true {
-					links = addLink(dev, airmaxes[i], links)
-				}
-			}
-			// END OF API CALL 3
-
-			// Get info from json file (static)
-			nodes = append(nodes, node{
-				Firstseen:      dev.Overview.CreatedAt.Format(iso8601),
-				Lastseen:       dev.Overview.LastSeen.Format(iso8601),
-				IsOnline:       isOnline,
-				IsGateway:      false,
-				Clients:        0,
-				ClientsWifi24:  0,
-				ClientsWifi5:   0,
-				ClientsOther:   0,
-				RootFSUsage:    0,
-				LoadAVG:        details.Overview.CPU / 100,
-				MemoryUsage:    details.Overview.RAM / 100,
-				Uptime:         dev.Identification.Started.Format(iso8601),
-				GatewayNexthop: currentDevice.GatewayNexthop,
-				Gateway:        currentDevice.Gateway,
-				Location:       currentDevice.Location,
-				NodeID:         strings.ReplaceAll(dev.Identification.MAC, ":", ""),
-				MAC:            dev.Identification.MAC,
-				Adresses:       getAddresses(details.IPAddress),
-				Domain:         currentDevice.Domain,
-				Hostname:       "[RiFu] " + details.Identification.Name,
-				Owner:          "Freifunk Rhein-Sieg",
-				Firmware: firmware{
-					Base:    "Ubiquiti - Stock",
-					Release: details.Firmware.Current,
-				},
-				Autoupdater: autoupdater{
-					Enabled: false,
-					Branch:  "stable",
-				},
-				NProc: 1,
-				Model: details.Identification.Model,
-			})
-		}
-
-		// assemble final struct
-		o := output{
-			Timestamp: time.Now().Format(iso8601),
-			Nodes:     nodes,
-			Links:     links,
-		}
-
-		// create file output
-		log.Println("writing json file")
-
-		if err := o.writeToFile(); err != nil {
-			log.Fatalln(err)
-		}
-
-		// we're done here
-		log.Println("...done")
+	d, err := getDevices()
+	if err != nil {
+		log.Fatalln(err)
 	}
+
+	// API CALL 1
+	log.Println("calling API 1")
+	var u []unifiAPIResponse
+	err = callUnifiAPI("/devices", &u)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	for i := range d.Devices {
+		var dev unifiAPIResponse
+		var currentDevice device
+		for j := range u {
+			if strings.ToUpper(u[j].Identification.MAC) == strings.ToUpper(d.Devices[i].MAC) {
+				dev = u[j]
+				currentDevice = d.Devices[i]
+			}
+		}
+
+		var isOnline bool = false
+		if dev.Overview.Status == "active" {
+			isOnline = true
+		}
+		// END OF API CALL 1
+
+		// API CALL 2
+		log.Println("calling API 2 for device", d.Devices[i].Name)
+		var details unifiAPIDetails
+		callUnifiAPI("/devices/erouters/"+dev.Identification.ID, &details)
+		// END OF API CALL 2
+
+		// API CALL 3
+		log.Println("calling API 3 for device", d.Devices[i].Name)
+		var airmaxes []unifiAPIAirmax
+		callUnifiAPI("/devices/airmaxes/"+dev.Identification.ID+"/stations", &airmaxes)
+		// check if remote mac address is part of our published network
+		for i := range airmaxes {
+			if isRemoteMACpublished(airmaxes[i].DeviceIdentification.MAC, d.Devices) == true {
+				links = addLink(dev, airmaxes[i], links)
+			}
+		}
+		// END OF API CALL 3
+
+		// Get info from json file (static)
+		nodes = append(nodes, node{
+			Firstseen:      dev.Overview.CreatedAt.Format(iso8601),
+			Lastseen:       dev.Overview.LastSeen.Format(iso8601),
+			IsOnline:       isOnline,
+			IsGateway:      false,
+			Clients:        0,
+			ClientsWifi24:  0,
+			ClientsWifi5:   0,
+			ClientsOther:   0,
+			RootFSUsage:    0,
+			LoadAVG:        details.Overview.CPU / 100,
+			MemoryUsage:    details.Overview.RAM / 100,
+			Uptime:         dev.Identification.Started.Format(iso8601),
+			GatewayNexthop: currentDevice.GatewayNexthop,
+			Gateway:        currentDevice.Gateway,
+			Location:       currentDevice.Location,
+			NodeID:         strings.ReplaceAll(dev.Identification.MAC, ":", ""),
+			MAC:            dev.Identification.MAC,
+			Adresses:       getAddresses(details.IPAddress),
+			Domain:         currentDevice.Domain,
+			Hostname:       "[RiFu] " + details.Identification.Name,
+			Owner:          "Freifunk Rhein-Sieg",
+			Firmware: firmware{
+				Base:    "Ubiquiti - Stock",
+				Release: details.Firmware.Current,
+			},
+			Autoupdater: autoupdater{
+				Enabled: false,
+				Branch:  "stable",
+			},
+			NProc: 1,
+			Model: details.Identification.Model,
+		})
+	}
+
+	// assemble final struct
+	o := output{
+		Timestamp: time.Now().Format(iso8601),
+		Nodes:     nodes,
+		Links:     links,
+	}
+
+	// create file output
+	log.Println("writing json file")
+	writeJSONtoFile(o)
+
+	// we're done here
+	log.Println("...done")
 }
 
 func getDevices() (devices, error) {
@@ -226,19 +213,22 @@ func addLink(dev unifiAPIResponse, airmaxes unifiAPIAirmax, links []link) []link
 	return links
 }
 
+func writeJSONtoFile(o output) error {
+	file, err := json.MarshalIndent(o, "", "  ")
+	if err != nil {
+		return fmt.Errorf("can't marshal to json: %+v", o)
+	}
+
+	// write to file
+	err = ioutil.WriteFile("example.json", file, 0644)
+	if err != nil {
+		return fmt.Errorf("can't write to json file example.json")
+	}
+	return nil
+}
+
 func getAddresses(ip string) []string {
 	var adresses []string
 	adresses = append(adresses, strings.Split(ip, "/")[0])
 	return adresses
 }
-
-func serveJSON() {
-	fs := http.FileServer(http.Dir("./output"))
-	http.Handle("/", fs)
-
-	log.Println("Listening on :3000...")
-	err := http.ListenAndServe(":3000", nil)
-	if err != nil {
-		log.Fatalln(err)
-	}
-}

types.go

@@ -1,12 +1,6 @@
 package main
 
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"time"
-)
+import "time"
 
 type device struct {
 	Name           string `json:"name"`
@@ -117,26 +111,6 @@ type output struct {
 	Links     []link `json:"links"`
 }
 
-func (o *output) writeToFile() error {
-	file, err := json.MarshalIndent(o, "", "  ")
-	if err != nil {
-		return fmt.Errorf("can't marshal to json: %+v", o)
-	}
-
-	// write to file
-	if _, err := os.Stat("output"); os.IsNotExist(err) {
-		err = os.Mkdir("output", 0755)
-		if err != nil {
-			return fmt.Errorf("can't create output folder")
-		}
-	}
-	err = ioutil.WriteFile("output/meshviewer.json", file, 0644)
-	if err != nil {
-		return fmt.Errorf("can't write to json file meshviewer.json")
-	}
-	return nil
-}
-
 type apiResponse struct {
 	StatusCode int    `json:"statusCode"`
 	Error      string `json:"error"`