restructure runtime code

pkg/command/root.go

@@ -7,8 +7,8 @@ import (
 	"github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
-	"github.com/owncloud/ocis/pkg/micro/runtime"
 	"github.com/owncloud/ocis/pkg/register"
+	"github.com/owncloud/ocis/pkg/runtime"
 	"github.com/owncloud/ocis/pkg/version"
 )
 

pkg/command/server.go

@@ -8,8 +8,8 @@ import (
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
-	"github.com/owncloud/ocis/pkg/micro/runtime"
 	"github.com/owncloud/ocis/pkg/register"
+	"github.com/owncloud/ocis/pkg/runtime"
 	"github.com/owncloud/ocis/pkg/tracing"
 )
 

pkg/command/server_simple.go

@@ -6,11 +6,10 @@ import (
 	"strings"
 
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/v2/config/cmd"
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
-	"github.com/owncloud/ocis/pkg/micro/runtime"
 	"github.com/owncloud/ocis/pkg/register"
+	"github.com/owncloud/ocis/pkg/runtime"
 	"github.com/owncloud/ocis/pkg/tracing"
 )
 
@@ -39,19 +38,11 @@ func Simple(cfg *config.Config) *cli.Command {
 			return nil
 		},
 		Action: func(c *cli.Context) error {
-			logger := NewLogger(cfg)
-
 			if err := tracing.Start(cfg); err != nil {
 				return err
 			}
 
-			runtime := runtime.New(
-				runtime.Logger(logger),
-				runtime.Services(append(runtime.MicroServices, SimpleRuntimeServices...)),
-				runtime.MicroRuntime(cmd.DefaultCmd.Options().Runtime),
-				runtime.Context(c),
-			)
-
+			runtime := runtime.New()
 			runtime.Start()
 
 			return nil

pkg/runtime/runtime.go

@@ -0,0 +1,175 @@
+package runtime
+
+import (
+	"fmt"
+	golog "log"
+	"net/rpc"
+	"sync"
+	"time"
+
+	"github.com/micro/cli/v2"
+
+	"github.com/micro/micro/v2/client/api"
+	"github.com/micro/micro/v2/client/web"
+	"github.com/micro/micro/v2/service/registry"
+
+	"github.com/refs/pman/pkg/process"
+	"github.com/refs/pman/pkg/service"
+)
+
+var (
+	// OwncloudNamespace is the base path for micro' services to use
+	OwncloudNamespace = "com.owncloud."
+
+	// MicroServices to start as part of the fullstack option
+	MicroServices = []string{
+		"api",      // :8080
+		"web",      // :8082
+		"registry", // :8000
+	}
+
+	// Extensions are ocis extension services
+	Extensions = []string{
+		"proxy",
+		"settings",
+		"phoenix",
+		"graph",
+		"graph-explorer",
+		"ocs",
+		"webdav",
+		"reva-frontend",
+		"reva-gateway",
+		"reva-users",
+		"reva-auth-basic",
+		"reva-auth-bearer",
+		// "reva-storage-root",
+		"reva-storage-home",
+		"reva-storage-public-link",
+		"reva-storage-home-data",
+		"reva-storage-eos",
+		"reva-storage-eos-data",
+		"reva-storage-oc",
+		"reva-storage-oc-data",
+		"accounts",
+		"glauth",
+		"konnectd",
+		"thumbnails",
+	}
+
+	// There seem to be a race condition when reva-sharing needs to read the sharing.json file and the parent folder is not present.
+	dependants = []string{
+		"reva-sharing",
+	}
+
+	// Maximum number of retries until getting a connection to the rpc runtime service.
+	maxRetries int = 10
+)
+
+// Runtime represents an oCIS runtime environment.
+type Runtime struct {
+	extensions []string
+	dependants []string
+}
+
+// New creates a new ocis + micro runtime
+func New(extensions ...string) Runtime {
+	r := Runtime{
+		extensions: append(Extensions, MicroServices...),
+		dependants: dependants,
+	}
+
+	if extensions != nil {
+		r.extensions = extensions
+	}
+
+	return r
+}
+
+// Start rpc runtime
+func (r *Runtime) Start() error {
+	go r.Launch()
+	return service.Start()
+}
+
+// Launch ocis default ocis extensions.
+func (r *Runtime) Launch() {
+	var client *rpc.Client
+	var err error
+	var try int
+	wg := &sync.WaitGroup{}
+
+	for {
+		if try >= maxRetries {
+			golog.Fatal("could not get a connection to rpc runtime on localhost:10666")
+		}
+		client, err = rpc.DialHTTP("tcp", "localhost:10666")
+		if err != nil {
+			try++
+			fmt.Println("runtime not available, retrying in 1 second...")
+			time.Sleep(1 * time.Second)
+		} else {
+			goto OUT
+		}
+	}
+
+OUT:
+	for _, v := range r.extensions {
+		args := process.NewProcEntry(v, []string{v}...)
+		var reply int
+
+		if err := client.Call("Service.Start", args, &reply); err != nil {
+			golog.Fatal(err)
+		}
+	}
+
+	// ugly hack to avoid dependencies.
+	for _, v := range r.dependants {
+		args := process.NewProcEntry(v, []string{v}...)
+		wg.Add(len(r.dependants))
+		go delayedRun(client, &args, wg)
+	}
+
+	wg.Wait()
+}
+
+func delayedRun(c *rpc.Client, p *process.ProcEntry, wg *sync.WaitGroup) error {
+	var retries, reply int
+	for {
+		if retries >= maxRetries {
+			return fmt.Errorf("maximum number of retries on extension: `%v`", p.Extension)
+		}
+		time.Sleep(1 * time.Second)
+		if err := c.Call("Service.Start", p, &reply); err == nil {
+			goto OUT
+		}
+		fmt.Printf("try %v #%v", p.Extension, retries)
+		retries++
+	}
+OUT:
+	wg.Done()
+	return nil
+}
+
+// AddMicroPlatform adds the micro subcommands to the cli app
+func AddMicroPlatform(app *cli.App) {
+	setDefaults()
+
+	app.Commands = append(app.Commands, api.Commands()...)
+	app.Commands = append(app.Commands, web.Commands()...)
+	app.Commands = append(app.Commands, registry.Commands()...)
+}
+
+// provide a config.Config with default values?
+func setDefaults() {
+	// api
+	api.Name = OwncloudNamespace + "api"
+	api.Namespace = OwncloudNamespace + "api"
+	api.HeaderPrefix = "X-Micro-Owncloud-"
+
+	// web
+	web.Name = OwncloudNamespace + "web"
+	web.Namespace = OwncloudNamespace + "web"
+
+	// registry
+	registry.Name = OwncloudNamespace + "registry"
+}