PART 2: Implement full bi-directional communication over WebSocket/LP

resource/entry.go

@@ -143,7 +143,7 @@ func AddEntry(feedEntry Entry, FeedId string, ApplicationId string, OrgId string
 
 	// notify
 	data, _ := json.Marshal(entry)
-	room.Publish <- room.NewEvent(model.EVENT_MESSAGE, "system", string(data))
+	room.Publish <- room.NewEntryEvent(model.EVENT_MESSAGE, "system", string(data))
 
 	return feedEntry.Id, nil
 }

resource/feed.go

@@ -95,7 +95,7 @@ func AddFeed(feed Feed, applicationId string, orgId string) (id string, err erro
 
 	// notify
 	data, _ := json.Marshal(feed)
-	room.Publish <- room.NewEvent(model.EVENT_MESSAGE, "system", string(data))
+	room.Publish <- room.NewFeedEvent(model.EVENT_MESSAGE, "system", string(data))
 
 	return feed.Id, nil
 }

service/db/api.go

@@ -0,0 +1,7 @@
+package api
+
+import (
+	_ "github.com/feedlabs/elasticfeed/service/db/v1"
+)
+
+func init() {}

service/db/v1/api.go

@@ -0,0 +1,8 @@
+package v1
+
+import (
+	_ "github.com/feedlabs/elasticfeed/service/db/v1/router"
+	_ "github.com/feedlabs/elasticfeed/service/db/v1/controller"
+)
+
+func init() {}

service/api/v1/controller/admin.go → service/db/v1/controller/admin.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template/admin"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template/admin"
 )
 
 type AdminController struct {

service/api/v1/controller/application.go → service/db/v1/controller/application.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template/application"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template/application"
 )
 
 type ApplicationController struct {

service/api/v1/controller/default.go → service/db/v1/controller/default.go

@@ -7,7 +7,7 @@ import (
 	"github.com/feedlabs/feedify"
 	"github.com/feedlabs/elasticfeed/resource"
 	"github.com/feedlabs/elasticfeed/helper"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template"
 )
 
 type DefaultController struct {
@@ -70,5 +70,5 @@ func NoRoutes() {
 func init() {
 	SetAuthenticationFilter()
 	SetGlobalResponseHeader()
-//	NoRoutes()
+	//	NoRoutes()
 }

service/api/v1/controller/entry.go → service/db/v1/controller/entry.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template/entry"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template/entry"
 )
 
 type EntryController struct {

service/api/v1/controller/feed.go → service/db/v1/controller/feed.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template/feed"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template/feed"
 )
 
 type FeedController struct {

service/api/v1/controller/org.go → service/db/v1/controller/org.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	template "github.com/feedlabs/elasticfeed/service/api/v1/template/org"
+	template "github.com/feedlabs/elasticfeed/service/db/v1/template/org"
 )
 
 type OrgController struct {

service/api/v1/controller/token.go → service/db/v1/controller/token.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template/token"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template/token"
 )
 
 type TokenController struct {

service/api/v1/router/admin.go → service/db/v1/router/admin.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/application.go → service/db/v1/router/application.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/default.go → service/db/v1/router/default.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/entry.go → service/db/v1/router/entry.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/feed.go → service/db/v1/router/feed.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/org.go → service/db/v1/router/org.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/router/token.go → service/db/v1/router/token.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"github.com/feedlabs/feedify"
-	"github.com/feedlabs/elasticfeed/service/api/v1/controller"
+	"github.com/feedlabs/elasticfeed/service/db/v1/controller"
 )
 
 func init() {

service/api/v1/template/org/request.go → service/db/v1/template/org/request.go

@@ -3,7 +3,7 @@ package org
 import (
 	"errors"
 	"github.com/feedlabs/feedify/context"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template"
 )
 
 func CheckRequiredParams() {

service/api/v1/template/org/response.go → service/db/v1/template/org/response.go

@@ -3,7 +3,7 @@ package org
 import (
 	"strconv"
 	"github.com/feedlabs/elasticfeed/resource"
-	"github.com/feedlabs/elasticfeed/service/api/v1/template"
+	"github.com/feedlabs/elasticfeed/service/db/v1/template"
 	"errors"
 	"sort"
 )

service/service.go

@@ -1,8 +1,9 @@
 package service
 
 import (
-	_ "github.com/feedlabs/elasticfeed/service/api"
+	_ "github.com/feedlabs/elasticfeed/service/db"
 	_ "github.com/feedlabs/elasticfeed/service/stream"
+	_ "github.com/feedlabs/elasticfeed/service/system"
 )
 
 func init() {}

service/stream/controller/channel/long_pooling.go

@@ -12,22 +12,32 @@ type LongPollingController struct {
 }
 
 func (this *LongPollingController) Join() {
-	uname := this.GetString("uname")
-	if len(uname) == 0 {
+	chid := this.GetString("chid")
+	if len(chid) == 0 {
 		return
 	}
 
-	room.Join(uname, nil)
+	w := this.GetCtx().ResponseWriter
+	r := this.GetCtx().Input.Request
+	sess := room.GlobalSessions.SessionStart(w, r)
+	defer sess.SessionRelease(w)
+
+	room.Join(chid, nil)
 }
 
 func (this *LongPollingController) Post() {
-	uname := this.GetString("uname")
-	content := this.GetString("content")
-	if len(uname) == 0 || len(content) == 0 {
+	chid := this.GetString("chid")
+	data := this.GetString("data")
+	if len(chid) == 0 || len(data) == 0 {
 		return
 	}
 
-	room.Publish <- room.NewEvent(model.EVENT_MESSAGE, uname, content)
+	// Feature:
+	// or specific request for this client;
+	// should be executed and returned directly to user
+	// lastReceived time should not be changed in that case
+
+	room.Publish <- room.NewSystemEvent(model.EVENT_MESSAGE, chid, data)
 }
 
 func (this *LongPollingController) Fetch() {

service/stream/controller/channel/websocket.go

@@ -15,12 +15,17 @@ type WebSocketController struct {
 }
 
 func (this *WebSocketController) Join() {
-	uname := this.GetString("uname")
-	if len(uname) == 0 {
+	chid := this.GetString("chid")
+	if len(chid) == 0 {
 		return
 	}
 
-	ws, err := websocket.Upgrade(this.Ctx.ResponseWriter, this.Ctx.Request, nil, 1024, 1024)
+	w := this.GetCtx().ResponseWriter
+	r := this.GetCtx().Input.Request
+	sess := room.GlobalSessions.SessionStart(w, r)
+	defer sess.SessionRelease(w)
+
+	ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
 	if _, ok := err.(websocket.HandshakeError); ok {
 		http.Error(this.Ctx.ResponseWriter, "Not a websocket handshake", 400)
 		return
@@ -29,16 +34,16 @@ func (this *WebSocketController) Join() {
 		return
 	}
 
-	room.Join(uname, ws)
-	defer room.Leave(uname)
+	room.Join(chid, ws)
+	defer room.Leave(chid)
 
 	for {
 		_, p, err := ws.ReadMessage()
 		if err != nil {
 			return
 		}
-		room.Publish <- room.NewEvent(model.EVENT_MESSAGE, uname, string(p))
 
-		room.System_rpc <- ws
+		room.Publish <- room.NewSystemEvent(model.EVENT_MESSAGE, chid, string(p))
+		room.P2P <- ws
 	}
 }