switch services client

services/address/address.go

@@ -1,7 +1,7 @@
 package address
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Address interface {

services/answer/answer.go

@@ -1,7 +1,7 @@
 package answer
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Answer interface {

services/app/app.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type App interface {

services/avatar/avatar.go

@@ -1,7 +1,7 @@
 package avatar
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Avatar interface {

services/cache/cache.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Cache interface {

services/client/client.go

@@ -0,0 +1,220 @@
+package client
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/gorilla/websocket"
+)
+
+const (
+	// local address for api
+	localAddress = "http://localhost:8080"
+	// public address for api
+	liveAddress = "https://api.m3o.com"
+)
+
+// Options of the Client
+type Options struct {
+	// Token for authentication
+	Token string
+	// Address of the micro platform.
+	// By default it connects to live. Change it or use the local flag
+	// to connect to your local installation.
+	Address string
+	// Helper flag to help users connect to the default local address
+	Local bool
+	// set a timeout
+	Timeout time.Duration
+}
+
+// Request is the request of the generic `api-client` call
+type Request struct {
+	// eg. "go.micro.srv.greeter"
+	Service string `json:"service"`
+	// eg. "Say.Hello"
+	Endpoint string `json:"endpoint"`
+	// json and then base64 encoded body
+	Body string `json:"body"`
+}
+
+// Response is the response of the generic `api-client` call.
+type Response struct {
+	// json and base64 encoded response body
+	Body string `json:"body"`
+	// error fields. Error json example
+	// {"id":"go.micro.client","code":500,"detail":"malformed method name: \"\"","status":"Internal Server Error"}
+	Code   int    `json:"code"`
+	ID     string `json:"id"`
+	Detail string `json:"detail"`
+	Status string `json:"status"`
+}
+
+// Client enables generic calls to micro
+type Client struct {
+	options Options
+}
+
+type Stream struct {
+	conn              *websocket.Conn
+	service, endpoint string
+}
+
+// NewClient returns a generic micro client that connects to live by default
+func NewClient(options *Options) *Client {
+	ret := new(Client)
+	ret.options = Options{
+		Address: liveAddress,
+	}
+
+	// no options provided
+	if options == nil {
+		return ret
+	}
+
+	if options.Token != "" {
+		ret.options.Token = options.Token
+	}
+
+	if options.Local {
+		ret.options.Address = localAddress
+		ret.options.Local = true
+	}
+
+	if options.Timeout > 0 {
+		ret.options.Timeout = options.Timeout
+	}
+
+	return ret
+}
+
+// SetToken sets the api auth token
+func (client *Client) SetToken(t string) {
+	client.options.Token = t
+}
+
+// SetTimeout sets the http client's timeout
+func (client *Client) SetTimeout(d time.Duration) {
+	client.options.Timeout = d
+}
+
+// Call enables you to access any endpoint of any service on Micro
+func (client *Client) Call(service, endpoint string, request, response interface{}) error {
+	// example curl: curl -XPOST -d '{"service": "go.micro.srv.greeter", "endpoint": "Say.Hello"}'
+	//  -H 'Content-Type: application/json' http://localhost:8080/client {"body":"eyJtc2ciOiJIZWxsbyAifQ=="}
+	uri, err := url.Parse(client.options.Address)
+	if err != nil {
+		return err
+	}
+
+	// set the url to go through the v1 api
+	uri.Path = "/v1/" + service + "/" + endpoint
+
+	b, err := marshalRequest(service, endpoint, request)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest("POST", uri.String(), bytes.NewBuffer(b))
+	if err != nil {
+		return err
+	}
+
+	// set the token if it exists
+	if len(client.options.Token) > 0 {
+		req.Header.Set("Authorization", "Bearer "+client.options.Token)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+
+	// if user didn't specify Timeout the default is 0 i.e no timeout
+	httpClient := &http.Client{
+		Timeout: client.options.Timeout,
+	}
+
+	resp, err := httpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	if !(resp.StatusCode >= 200 && resp.StatusCode < 300) {
+		return errors.New(string(body))
+	}
+	return unmarshalResponse(body, response)
+}
+
+// Stream enables the ability to stream via websockets
+func (client *Client) Stream(service, endpoint string, request interface{}) (*Stream, error) {
+	b, err := marshalRequest(service, endpoint, request)
+	if err != nil {
+		return nil, err
+	}
+
+	uri, err := url.Parse(client.options.Address)
+	if err != nil {
+		return nil, err
+	}
+
+	// set the url to go through the v1 api
+	uri.Path = "/v1/" + service + "/" + endpoint
+
+	// replace http with websocket
+	uri.Scheme = strings.Replace(uri.Scheme, "http", "ws", 1)
+
+	// create the headers
+	header := make(http.Header)
+	// set the token if it exists
+	if len(client.options.Token) > 0 {
+		header.Set("Authorization", "Bearer "+client.options.Token)
+	}
+	header.Set("Content-Type", "application/json")
+
+	// dial the connection
+	conn, _, err := websocket.DefaultDialer.Dial(uri.String(), header)
+	if err != nil {
+		return nil, err
+	}
+
+	// send the first request
+	if err := conn.WriteMessage(websocket.TextMessage, b); err != nil {
+		return nil, err
+	}
+
+	return &Stream{conn, service, endpoint}, nil
+}
+
+func (s *Stream) Recv(v interface{}) error {
+	// read response
+	_, message, err := s.conn.ReadMessage()
+	if err != nil {
+		return err
+	}
+	return unmarshalResponse(message, v)
+}
+
+func (s *Stream) Send(v interface{}) error {
+	b, err := marshalRequest(s.service, s.endpoint, v)
+	if err != nil {
+		return err
+	}
+	return s.conn.WriteMessage(websocket.TextMessage, b)
+}
+
+func marshalRequest(service, endpoint string, v interface{}) ([]byte, error) {
+	return json.Marshal(v)
+}
+
+func unmarshalResponse(body []byte, v interface{}) error {
+	return json.Unmarshal(body, &v)
+}

services/client/client_test.go

@@ -0,0 +1,24 @@
+package client
+
+import (
+	"os"
+	"testing"
+)
+
+func TestBasicCall(t *testing.T) {
+	if v := os.Getenv("IN_TRAVIS"); v == "yes" {
+		return
+	}
+
+	response := map[string]interface{}{}
+	if err := NewClient(&Options{
+		Token: os.Getenv("TOKEN"),
+	}).Call("groups", "list", map[string]interface{}{
+		"memberId": "random",
+	}, &response); err != nil {
+		t.Fatal(err)
+	}
+	if len(response) > 0 {
+		t.Fatal(len(response))
+	}
+}

services/contact/contact.go

@@ -1,7 +1,7 @@
 package contact
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Contact interface {

services/crypto/crypto.go

@@ -1,7 +1,7 @@
 package crypto
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Crypto interface {

services/currency/currency.go

@@ -1,7 +1,7 @@
 package currency
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Currency interface {

services/db/db.go

@@ -1,7 +1,7 @@
 package db
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Db interface {

services/email/email.go

@@ -1,7 +1,7 @@
 package email
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Email interface {

services/emoji/emoji.go

@@ -1,7 +1,7 @@
 package emoji
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Emoji interface {

services/evchargers/evchargers.go

@@ -1,7 +1,7 @@
 package evchargers
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Evchargers interface {

services/event/event.go

@@ -1,7 +1,7 @@
 package event
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Event interface {

services/file/file.go

@@ -1,7 +1,7 @@
 package file
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type File interface {

services/forex/forex.go

@@ -1,7 +1,7 @@
 package forex
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Forex interface {

services/function/function.go

@@ -1,7 +1,7 @@
 package function
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Function interface {

services/geocoding/geocoding.go

@@ -1,7 +1,7 @@
 package geocoding
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Geocoding interface {

services/gifs/gifs.go

@@ -1,7 +1,7 @@
 package gifs
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Gifs interface {

services/google/google.go

@@ -1,7 +1,7 @@
 package google
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Google interface {

services/helloworld/helloworld.go

@@ -1,7 +1,7 @@
 package helloworld
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Helloworld interface {

services/holidays/holidays.go

@@ -1,7 +1,7 @@
 package holidays
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Holidays interface {

services/id/id.go

@@ -1,7 +1,7 @@
 package id
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Id interface {

services/image/image.go

@@ -1,7 +1,7 @@
 package image
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Image interface {

services/ip/ip.go

@@ -1,7 +1,7 @@
 package ip
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Ip interface {

services/joke/joke.go

@@ -1,7 +1,7 @@
 package joke
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Joke interface {

services/location/location.go

@@ -1,7 +1,7 @@
 package location
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Location interface {

services/movie/movie.go

@@ -1,7 +1,7 @@
 package movie
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Movie interface {

services/mq/mq.go

@@ -1,7 +1,7 @@
 package mq
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Mq interface {

services/news/news.go

@@ -1,7 +1,7 @@
 package news
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type News interface {

services/nft/nft.go

@@ -1,7 +1,7 @@
 package nft
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Nft interface {

services/notes/notes.go

@@ -1,7 +1,7 @@
 package notes
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Notes interface {

services/otp/otp.go

@@ -1,7 +1,7 @@
 package otp
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Otp interface {

services/postcode/postcode.go

@@ -1,7 +1,7 @@
 package postcode
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Postcode interface {

services/prayer/prayer.go

@@ -1,7 +1,7 @@
 package prayer
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Prayer interface {

services/qr/qr.go

@@ -1,7 +1,7 @@
 package qr
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Qr interface {

services/quran/quran.go

@@ -1,7 +1,7 @@
 package quran
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Quran interface {

services/routing/routing.go

@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Routing interface {

services/rss/rss.go

@@ -1,7 +1,7 @@
 package rss
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Rss interface {

services/search/search.go

@@ -1,7 +1,7 @@
 package search
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Search interface {

services/sentiment/sentiment.go

@@ -1,7 +1,7 @@
 package sentiment
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Sentiment interface {

services/sms/sms.go

@@ -1,7 +1,7 @@
 package sms
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Sms interface {

services/space/space.go

@@ -1,7 +1,7 @@
 package space
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Space interface {

services/spam/spam.go

@@ -1,7 +1,7 @@
 package spam
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Spam interface {

services/stock/stock.go

@@ -1,7 +1,7 @@
 package stock
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Stock interface {

services/stream/stream.go

@@ -1,7 +1,7 @@
 package stream
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Stream interface {

services/sunnah/sunnah.go

@@ -1,7 +1,7 @@
 package sunnah
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Sunnah interface {

services/thumbnail/thumbnail.go

@@ -1,7 +1,7 @@
 package thumbnail
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Thumbnail interface {

services/time/time.go

@@ -1,7 +1,7 @@
 package time
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Time interface {

services/translate/translate.go

@@ -1,7 +1,7 @@
 package translate
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Translate interface {

services/twitter/twitter.go

@@ -1,7 +1,7 @@
 package twitter
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Twitter interface {

services/url/url.go

@@ -1,7 +1,7 @@
 package url
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Url interface {

services/user/user.go

@@ -1,7 +1,7 @@
 package user
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type User interface {

services/vehicle/vehicle.go

@@ -1,7 +1,7 @@
 package vehicle
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Vehicle interface {

services/weather/weather.go

@@ -1,7 +1,7 @@
 package weather
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Weather interface {

services/youtube/youtube.go

@@ -1,7 +1,7 @@
 package youtube
 
 import (
-	"go.m3o.com/client"
+	"go-micro.dev/v4/services/client"
 )
 
 type Youtube interface {