remove HomeKit Stuff to prevent commit merge

iot.go

@@ -86,11 +86,6 @@ func IoTHubInit() {
 		//Home Dynamic v2
 		hdsv2Handler := hdsv2.NewProtocolHandler(MDNS)
 		iotManager.RegisterHandler(hdsv2Handler)
-
-		//Add more here if needed
-		//Apple(R) Homekit
-		//homekitHandler := homekit.NewProtocolHandler(MDNS)
-		//iotManager.RegisterHandler(homekitHandler)
 	}
 
 }

mod/iot/homekit/homekit.go_dis

@@ -1,222 +0,0 @@
-package homekit
-
-import (
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"imuslab.com/arozos/mod/iot"
-	"imuslab.com/arozos/mod/network/mdns"
-	"github.com/brutella/hc"
-    "github.com/brutella/hc/accessory"
-)
-
-/*
-	Home Dynamic 2 Controller
-
-	This is a module that handles HDSv2 protocol devices scannings
-
-
-*/
-
-type Handler struct {
-	scanner      *mdns.MDNSHost
-	lastScanTime int64
-}
-
-
-//Create a new HDSv2 Protocol Handler
-func NewProtocolHandler(scanner *mdns.MDNSHost) *Handler {
-			//Homekit
-    info := accessory.Info{Name: "ArOZ Bridge", ID: 1}
-    ac := accessory.NewBridge(info)
-    
-	outlet := accessory.NewOutlet(accessory.Info{Name: "ArOZ Speaker", ID: 2})
-
-    // configure the ip transport
-    config := hc.Config{Pin: "00102003"}
-    t, err := hc.NewIPTransport(config, ac.Accessory, outlet.Accessory)
-    if err != nil {
-        log.Panic(err)
-    }
-    
-    hc.OnTermination(func(){
-        <-t.Stop()
-    })
-    
-    t.Start()
-	//Create a new MDNS Host
-	return &Handler{
-		scanner,
-		0,
-	}
-}
-
-func (h *Handler) Start() error {
-	log.Println("*IoT* Homekit Loaded")
-
-	return nil
-}
-
-//Scan the devices within the LAN
-func (h *Handler) Scan() ([]*iot.Device, error) {
-	foundDevices := []*iot.Device{}
-	hosts := h.scanner.Scan(3, "hds.arozos.com")
-	for _, host := range hosts {
-		thisDevice := iot.Device{
-			Name:         host.HostName,
-			Port:         host.Port,
-			Model:        host.Model,
-			Version:      host.BuildVersion + "-" + host.MinorVersion,
-			Manufacturer: host.Vendor,
-			DeviceUUID:   host.UUID,
-
-			IPAddr:         host.IPv4[0].String(),
-			RequireAuth:    false,
-			RequireConnect: false,
-			Status:         map[string]interface{}{},
-			Handler:        h,
-		}
-		//Try to get the device status
-		status, err := getStatusForDevice(&thisDevice)
-		if err != nil {
-			//This might be not a valid HDSv2 device. Skip this
-			log.Println("*HDSv2* Get status failed for device: ", host.HostName, err.Error())
-			continue
-		}
-		thisDevice.Status = status
-
-		//Get the device content endpoints
-		eps, err := getEndpoints(&thisDevice)
-		if err != nil {
-			//This might be not a valid HDSv2 device. Skip this
-			log.Println("*HDSv2* Get endpoints failed for device: ", host.HostName, err.Error())
-			continue
-		}
-		thisDevice.ControlEndpoints = eps
-
-		//Push this host into found device list
-		foundDevices = append(foundDevices, &thisDevice)
-	}
-
-	return foundDevices, nil
-}
-
-//Home Dynamic system's devices no need to established conenction before executing anything
-func (h *Handler) Connect(device *iot.Device, authInfo *iot.AuthInfo) error {
-	return nil
-}
-
-//Same rules also apply to disconnect
-func (h *Handler) Disconnect(device *iot.Device) error {
-	return nil
-}
-
-//Get the status of the device
-func (h *Handler) Status(device *iot.Device) (map[string]interface{}, error) {
-	return getStatusForDevice(device)
-}
-
-//Get the status of the device
-func (h *Handler) Execute(device *iot.Device, endpoint *iot.Endpoint, payload interface{}) (interface{}, error) {
-	var result interface{}
-
-	targetURL := "http://" + device.IPAddr + ":" + strconv.Itoa(device.Port) + "/" + endpoint.RelPath
-
-	//Check if there are payload for this request
-	if payload == nil {
-		//No payload. Just call it
-
-	} else {
-		//Payload exists. Append it to the end with value=?
-		targetURL += "?value=" + payload.(string)
-	}
-
-	result, err := tryGet(targetURL)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (h *Handler) Stats() iot.Stats {
-	return iot.Stats{
-		Name:          "Home Dynamic v2",
-		Desc:          "A basic IoT communication protocol for ESP8266 made by Makers",
-		Version:       "2.0",
-		ProtocolVer:   "2.0",
-		Author:        "tobychui",
-		AuthorWebsite: "http://arozos.com",
-		AuthorEmail:   "[email protected]",
-		ReleaseDate:   1614524498,
-	}
-}
-
-//Get endpoint of the given device object
-func getEndpoints(device *iot.Device) ([]*iot.Endpoint, error) {
-	//Parse the URL of the endpoint apis location (eps)
-	requestURL := "http://" + device.IPAddr + ":" + strconv.Itoa(device.Port) + "/eps"
-	resp, err := http.Get(requestURL)
-	if err != nil {
-		return nil, err
-	}
-
-	//Get the body content
-	content, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	//Convert the results to Endpoints
-	endpoints := []iot.Endpoint{}
-	err = json.Unmarshal(content, &endpoints)
-	if err != nil {
-		return nil, err
-	}
-
-	//Convert the structure to array pointers
-	results := []*iot.Endpoint{}
-	for _, ep := range endpoints {
-		thisEp := ep
-		results = append(results, &thisEp)
-	}
-
-	return results, nil
-
-}
-
-//Get status given the device object.
-func getStatusForDevice(device *iot.Device) (map[string]interface{}, error) {
-	//Parse the URL for its status api endpoint
-	requestURL := "http://" + device.IPAddr + ":" + strconv.Itoa(device.Port) + "/status"
-	resp, err := http.Get(requestURL)
-	if err != nil {
-		return map[string]interface{}{}, err
-	}
-
-	//Get the body content
-	content, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return map[string]interface{}{}, err
-	}
-
-	//Check if the resp is json
-	if !isJSON(strings.TrimSpace(string(content))) {
-		return map[string]interface{}{}, errors.New("Invalid HDSv2 protocol")
-	}
-
-	//Ok. Parse it
-	status := map[string]interface{}{}
-	err = json.Unmarshal(content, &status)
-	if err != nil {
-		return map[string]interface{}{}, err
-	}
-
-	return status, nil
-
-}

mod/iot/homekit/utils.go_dis

@@ -1,37 +0,0 @@
-package homekit
-
-import (
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"net/http"
-	"strconv"
-	"time"
-)
-
-func isJSON(s string) bool {
-	var js map[string]interface{}
-	return json.Unmarshal([]byte(s), &js) == nil
-}
-
-func tryGet(url string) (string, error) {
-	client := http.Client{
-		Timeout: 10 * time.Second,
-	}
-
-	resp, err := client.Get(url)
-	if err != nil {
-		return "", err
-	}
-
-	if resp.StatusCode != 200 {
-		return "", errors.New("Server side return status code " + strconv.Itoa(resp.StatusCode))
-	}
-
-	content, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	return string(content), nil
-}