Split nbfs to upload and document, fix upload big file bug.

README.md

@@ -42,11 +42,6 @@ Go语言非官方开源telegram服务端，包括但不限于如下一些特色
         go get
         go build
     
-    编译session
-        cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/session
-        go get
-        go build
-    
     编译auth_key
         cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/auth_key
         go get
@@ -57,44 +52,49 @@ Go语言非官方开源telegram服务端，包括但不限于如下一些特色
         go get
         go build
     
-    编译nbfs
-        cd $GOPATH/src/github.com/nebulaim/telegramd/server/nbfs
+    编译upload
+        cd $GOPATH/src/github.com/nebulaim/telegramd/server/upload
         go get
         go build
     
+    编译document
+        cd $GOPATH/src/github.com/nebulaim/telegramd/service/document
+        go get
+        go build
+
     编译biz_server
         cd $GOPATH/src/github.com/nebulaim/telegramd/server/biz_server
         go get
         go build
+        
+    编译session
+        cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/session
+        go get
+        go build
     ```
 
 - 运行
     ```
-    cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/frontend
-    ./frontend
-
     cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/auth_key
     ./auth_key
 
     cd $GOPATH/src/github.com/nebulaim/telegramd/server/sync
     ./sync
     
-    cd $GOPATH/src/github.com/nebulaim/telegramd/server/nbfs
-    mkdir /opt/nbfs/0
-    mkdir /opt/nbfs/s
-    mkdir /opt/nbfs/m
-    mkdir /opt/nbfs/x
-    mkdir /opt/nbfs/y
-    mkdir /opt/nbfs/a
-    mkdir /opt/nbfs/b
-    mkdir /opt/nbfs/c
-    ./nbfs
+    cd $GOPATH/src/github.com/nebulaim/telegramd/server/upload
+    ./upload
+
+    cd $GOPATH/src/github.com/nebulaim/telegramd/service/document
+    ./document
 
     cd $GOPATH/src/github.com/nebulaim/telegramd/server/biz_server
     ./biz_server
 
     cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/session
     ./session
+    
+    cd $GOPATH/src/github.com/nebulaim/telegramd/server/access/frontend
+    ./frontend
     ```
 
 #### 更多文档

server/nbfs/biz/core/file/file_location.go → baselib/crypto/md5_file.go

@@ -15,11 +15,33 @@
  * limitations under the License.
  */
 
-package file
+package crypto
 
-// inputFileLocation#14637196 volume_id:long local_id:int secret:long = InputFileLocation;
-// inputEncryptedFileLocation#f5235d55 id:long access_hash:long = InputFileLocation;
-// inputDocumentFileLocation#430f0724 id:long access_hash:long version:int = InputFileLocation;
+import (
+	"github.com/golang/glog"
+	"crypto/md5"
+	"fmt"
+	"os"
+	"io"
+)
 
-// fileLocationUnavailable#7c596b46 volume_id:long local_id:int secret:long = FileLocation;
-// fileLocation#53d69076 dc_id:int volume_id:long local_id:int secret:long = FileLocation;
+// TODO(@benqi): remove to baselib
+func CalcMd5File(filename string) (string, error) {
+	// fileName := core.NBFS_DATA_PATH + m.data.FilePath
+	f, err := os.Open(filename)
+	if err != nil {
+		glog.Error(err)
+		return "", err
+	}
+
+	defer f.Close()
+
+	md5Hash := md5.New()
+	if _, err := io.Copy(md5Hash, f); err != nil {
+		// fmt.Println("Copy", err)
+		glog.Error("Copy - ", err)
+		return "", err
+	}
+
+	return fmt.Sprintf("%x", md5Hash.Sum(nil)), nil
+}

baselib/grpc_util/rpc_client.go

@@ -110,7 +110,7 @@ func (c *RPCClient) Invoke(rpcMetaData *RpcMetadata, object mtproto.TLObject) (m
 		// return nil, err
 	}
 
-	glog.Infof("Invoke - method: {%s}, req: {%v}", t.Method, object)
+	glog.Infof("Invoke - method: {%s}", t.Method)
 	r := t.NewReplyFunc()
 	glog.Infof("Invoke - NewReplyFunc: {%v}, t: {%v}", r, reflect.TypeOf(r))
 
@@ -140,7 +140,7 @@ func (c *RPCClient) Invoke(rpcMetaData *RpcMetadata, object mtproto.TLObject) (m
 		}
 		return nil, mtproto.NewRpcError(int32(mtproto.TLRpcErrorCodes_INTERNAL), "INTERNAL_SERVER_ERROR")
 	} else {
-		glog.Infof("Invoke - Invoke reply: {%v}\n", r)
+		// glog.Infof("Invoke - Invoke reply: {%v}\n", r)
 		reply, ok := r.(mtproto.TLObject)
 
 		glog.Infof("Invoke %s time: %d", t.Method, (time.Now().Unix() - rpcMetaData.ReceiveTime))

baselib/net2/tcp_client_group_manager.go

@@ -148,7 +148,7 @@ func (cgm *TcpClientGroupManager) SendDataToAddress(name, address string, msg in
 
 	cgm.clientMapLock.RUnlock()
 
-	glog.Info("tcp_client_group_manager sendDataToAddress: {name: %s, conn: %s, msg: {%v}}", name, c, msg)
+	glog.Infof("tcp_client_group_manager sendDataToAddress: {name: %s, conn: %s, msg: {%v}}", name, c, msg)
 	return c.Send(msg)
 }
 

biz/core/photo/model.go

@@ -20,7 +20,7 @@ package photo
 import (
 	"github.com/nebulaim/telegramd/biz/core"
 	"github.com/nebulaim/telegramd/proto/mtproto"
-	"github.com/nebulaim/telegramd/server/nbfs/nbfs_client"
+	"github.com/nebulaim/telegramd/service/document/client"
 	"time"
 )
 
@@ -39,7 +39,7 @@ func (m *PhotoModel) GetUserProfilePhoto(photoId int64) (photo *mtproto.UserProf
 	if photoId == 0 {
 		photo = mtproto.NewTLUserProfilePhotoEmpty().To_UserProfilePhoto()
 	} else {
-		sizes, _ := nbfs_client.GetPhotoSizeList(photoId)
+		sizes, _ := document_client.GetPhotoSizeList(photoId)
 		photo = MakeUserProfilePhoto(photoId, sizes)
 	}
 
@@ -50,7 +50,7 @@ func (m *PhotoModel) GetChatPhoto(photoId int64) (photo *mtproto.ChatPhoto) {
 	if photoId == 0 {
 		photo = mtproto.NewTLChatPhotoEmpty().To_ChatPhoto()
 	} else {
-		sizes, _ := nbfs_client.GetPhotoSizeList(photoId)
+		sizes, _ := document_client.GetPhotoSizeList(photoId)
 		photo = MakeChatPhoto(sizes)
 	}
 
@@ -61,7 +61,7 @@ func (m *PhotoModel) GetPhoto(photoId int64) (photo *mtproto.Photo) {
 	if photoId == 0 {
 		photo = mtproto.NewTLPhotoEmpty().To_Photo()
 	} else {
-		sizes, _ := nbfs_client.GetPhotoSizeList(photoId)
+		sizes, _ := document_client.GetPhotoSizeList(photoId)
 		if len(sizes) == 0 {
 			photo = mtproto.NewTLPhotoEmpty().To_Photo()
 		} else {

doc/build.md

@@ -88,7 +88,8 @@ if password is empty ignore this section otherwise add password to the following
 ```
 $ $GOPATH/src/github.com/nebulaim/telegramd/server/access/auth_key/auth_key.toml
 $ $GOPATH/src/github.com/nebulaim/telegramd/server/sync/sync.toml
-$ $GOPATH/src/github.com/nebulaim/telegramd/server/nbfs/nbfs.toml
+$ $GOPATH/src/github.com/nebulaim/telegramd/server/upload/upload.toml
+$ $GOPATH/src/github.com/nebulaim/telegramd/service/ocument/document.toml
 $ $GOPATH/src/github.com/nebulaim/telegramd/server/biz_server/biz_server.toml
 ```
 set ***my-secret-pw*** in mysql dsn as follow:
@@ -134,9 +135,16 @@ $ go get
 $ go build
 ```
 
-### build nbfs
+### build upload
 ```
-$ cd $GOPATH/src/github.com/nebulaim/telegramd/server/nbfs
+$ cd $GOPATH/src/github.com/nebulaim/telegramd/server/upload
+$ go get
+$ go build
+```
+
+### build document
+```
+$ cd $GOPATH/src/github.com/nebulaim/telegramd/service/document
 $ go get
 $ go build
 ```
@@ -178,16 +186,11 @@ $ ./auth_key
 $ cd $GOPATH/src/github.com/nebulaim/telegramd/server/sync
 $ ./sync
 
-$ cd $GOPATH/src/github.com/nebulaim/telegramd/server/nbfs
-$ mkdir /opt/nbfs/0
-$ mkdir /opt/nbfs/s
-$ mkdir /opt/nbfs/m
-$ mkdir /opt/nbfs/x
-$ mkdir /opt/nbfs/y
-$ mkdir /opt/nbfs/a
-$ mkdir /opt/nbfs/b
-$ mkdir /opt/nbfs/c
-$ ./nbfs
+$ cd $GOPATH/src/github.com/nebulaim/telegramd/server/upload
+$ ./upload
+
+$ cd $GOPATH/src/github.com/nebulaim/telegramd/service/document
+$ ./document
 
 $ cd $GOPATH/src/github.com/nebulaim/telegramd/server/biz_server
 $ ./biz_server

proto/mtproto/mtproto_http_proxy_codec.go

@@ -99,14 +99,14 @@ func (c *MTProtoHttpProxyCodec) Send(msg interface{}) error {
 			"Access-Control-Allow-Origin":  {"*"},
 			"Access-Control-Max-Age":       {"1728000"},
 			"Cache-control":                {"no-store"},
-			"Connection":                   {"close"},
+			"Connection":                   {"keep-alive"},
 			"Content-type":                 {"application/octet-stream"},
 			"Pragma":                       {"no-cache"},
 			"Strict-Transport-Security":    {"max-age=15768000"},
 		},
 		ContentLength: int64(len(b)),
 		Body:          ioutil.NopCloser(bytes.NewReader(b)),
-		Close:         true,
+		Close:         false,
 	}
 
 	err := rsp.Write(c.conn)

scripts/build.sh

@@ -26,11 +26,17 @@ go get
 go build
 ./sync &
 
-echo "build nbfs ..."
-cd ${telegramd}/server/nbfs
+echo "build upload ..."
+cd ${telegramd}/server/upload
 go get
 go build
-./nbfs &
+./upload &
+
+echo "build document ..."
+cd ${telegramd}/server/document
+go get
+go build
+./document &
 
 echo "build biz_server ..."
 cd ${telegramd}/server/biz_server

server/access/auth_key/server/handshake.go

@@ -35,6 +35,7 @@ import (
 	"github.com/nebulaim/telegramd/server/access/auth_key/dal/dataobject"
 	"math/big"
 	"time"
+	"github.com/nebulaim/telegramd/baselib/bytes2"
 )
 
 const (
@@ -251,14 +252,18 @@ func (s *handshake) onReq_DHParams(state *zproto.HandshakeState, request *mtprot
 	// 客户端传输数据解析
 	// check Nonce
 	if !bytes.Equal(request.Nonce, authKeyMD.Nonce) {
-		err = fmt.Errorf("onReq_DHParams - Invalid Nonce")
+		err = fmt.Errorf("onReq_DHParams - Invalid Nonce, req: %s, back: %s",
+			bytes2.HexDump(request.Nonce),
+			bytes2.HexDump(authKeyMD.Nonce))
 		glog.Error(err)
 		return nil, err
 	}
 
 	// check ServerNonce
 	if !bytes.Equal(request.ServerNonce, authKeyMD.ServerNonce) {
-		err = fmt.Errorf("onReq_DHParams - Wrong ServerNonce")
+		err = fmt.Errorf("onReq_DHParams - Wrong ServerNonce, req: %s, back: %s",
+			bytes2.HexDump(request.ServerNonce),
+			bytes2.HexDump(authKeyMD.ServerNonce))
 		glog.Error(err)
 		return nil, err
 	}

server/access/session/server/client_session_handler.go

@@ -26,6 +26,7 @@ import (
 	"github.com/nebulaim/telegramd/proto/zproto"
 	"math/rand"
 	"time"
+	"reflect"
 )
 
 const (
@@ -457,7 +458,7 @@ func (c *clientSessionHandler) onMessageData(connID ClientConnID, md *zproto.ZPr
 	)
 
 	for _, message := range messages {
-		glog.Info("onMessageData - ", message)
+		// glog.Info("onMessageData - ", message)
 
 		if message.Object == nil {
 			continue
@@ -1055,25 +1056,25 @@ func (c *clientSessionHandler) onInvokeAfterMsgsExt(connID ClientConnID, md *zpr
 }
 
 func (c *clientSessionHandler) onInvokeWithoutUpdatesExt(connID ClientConnID, md *zproto.ZProtoMetadata, msgId int64, seqNo int32, request *TLInvokeWithoutUpdatesExt) bool {
-	glog.Infof("onInvokeWithoutUpdatesExt - request data: {sess: %s, conn_id: %s, md: %s, msg_id: %d, seq_no: %d, request: {%v}}",
+	glog.Infof("onInvokeWithoutUpdatesExt - request data: {sess: %s, conn_id: %s, md: %s, msg_id: %d, seq_no: %d, request: {%s}}",
 		c,
 		connID,
 		md,
 		msgId,
 		seqNo,
-		request)
+		reflect.TypeOf(request))
 
 	return c.onRpcRequest(connID, md, msgId, seqNo, request.Query)
 }
 
 func (c *clientSessionHandler) onRpcRequest(connID ClientConnID, md *zproto.ZProtoMetadata, msgId int64, seqNo int32, object mtproto.TLObject) bool {
-	glog.Infof("onInvokeWithoutUpdatesExt - request data: {sess: %s, conn_id: %s, md: %s, msg_id: %d, seq_no: %d, request: {%v}}",
+	glog.Infof("onRpcRequest - request data: {sess: %s, conn_id: %s, md: %s, msg_id: %d, seq_no: %d, request: {%s}}",
 		c,
 		connID,
 		md,
 		msgId,
 		seqNo,
-		object)
+		reflect.TypeOf(object))
 
 	// TODO(@benqi): sync AuthUserId??
 	requestMessage := &mtproto.TLMessage2{

server/access/session/server/client_session_manager.go

@@ -467,7 +467,7 @@ func (s *clientSessionManager) onRpcRequest(requests *rpcApiMessages) {
 			// err.(*mtproto.TLRpcError)
 
 		} else {
-			glog.Infof("OnMessage - rpc_result: {%v}\n", rpcResult)
+			// glog.Infof("OnMessage - rpc_result: {%v}\n", rpcResult)
 			reply.Result = rpcResult
 		}
 
@@ -546,7 +546,7 @@ func extractClientMessage(msgId int64, seqNo int32, object mtproto.TLObject, mes
 		//
 
 		for _, m := range msgContainer.Messages {
-			glog.Info("processMsgContainer - request data: ", m)
+			// glog.Info("processMsgContainer - request data: ", m)
 			if m.Object == nil {
 				continue
 			}
@@ -639,7 +639,7 @@ func extractClientMessage(msgId int64, seqNo int32, object mtproto.TLObject, mes
 		messages.messages = append(messages.messages, &mtproto.TLMessage2{MsgId: msgId, Seqno: seqNo, Object: invokeWithoutUpdatesExt})
 
 	default:
-		glog.Info("processOthers - request data: ", object)
+		// glog.Info("processOthers - request data: ", object)
 		messages.messages = append(messages.messages, &mtproto.TLMessage2{MsgId: msgId, Seqno: seqNo, Object: object})
 	}
 }

server/access/session/session.toml

@@ -28,7 +28,7 @@ etcdAddrs = ["http://127.0.0.1:2379"]
 balancer = "round_robin"
 
 [nbfsRpcClient]
-serviceName = "nbfs"
+serviceName = "upload"
 etcdAddrs = ["http://127.0.0.1:2379"]
 balancer = "round_robin"
 

server/biz_server/account/rpc/account.getWallPapers_handler.go

@@ -22,7 +22,7 @@ import (
 	"github.com/nebulaim/telegramd/baselib/grpc_util"
 	"github.com/nebulaim/telegramd/baselib/logger"
 	"github.com/nebulaim/telegramd/proto/mtproto"
-	"github.com/nebulaim/telegramd/server/nbfs/nbfs_client"
+	"github.com/nebulaim/telegramd/service/document/client"
 	"golang.org/x/net/context"
 )
 
@@ -44,7 +44,7 @@ func (s *AccountServiceImpl) AccountGetWallPapers(ctx context.Context, request *
 
 	for _, wallData := range wallDataList {
 		if wallData.Type == 0 {
-			szList, _ := nbfs_client.GetPhotoSizeList(wallData.PhotoId)
+			szList, _ := document_client.GetPhotoSizeList(wallData.PhotoId)
 			wall := &mtproto.TLWallPaper{Data2: &mtproto.WallPaper_Data{
 				Id:    wallData.Id,
 				Title: wallData.Title,