增加启动登录广播

Author: lamborc

profile/.merkle

@@ -1,7 +1,8 @@
-#add Monica.mp3
-#Sat Jun 23 00:06:32 CST 2018
+#add \u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
+#Sun Jun 24 22:47:18 CST 2018
 QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
 QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
+QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
 Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
 QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
 QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png

src/main/java/UI/AppMainWindow.java

@@ -6,23 +6,33 @@
 import UI.panel.im.IMPanel;
 import UI.panel.setting.SettingPanel;
 import com.alibaba.fastjson.JSON;
+import com.nbs.entity.ContactsItem;
 import com.nbs.entity.PeerBoradcastInfo;
 import com.nbs.ipfs.IPFSHelper;
+import com.nbs.ipfs.entity.IpfsMessage;
 import com.nbs.tools.ConfigHelper;
 import com.nbs.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
+import io.ipfs.api.JSONParser;
 import io.ipfs.api.MerkleNode;
 import io.ipfs.api.NamedStreamable;
+import io.ipfs.multihash.Multihash;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Package : UI
@@ -43,6 +53,8 @@ public class AppMainWindow {
      */
     private static final Logger logger = LoggerFactory.getLogger(AppMainWindow.class);
 
+    private static boolean boradcastSuccess = false;
+
     public static JFrame frame;
     /**
      * 主窗口
@@ -73,16 +85,8 @@ public class AppMainWindow {
      */
     public static IPFS ipfs = IPFSHelper.getInstance().getIpfs();
 
-
     public static String PROFILE_NICKNAME = "";
 
-    /**
-     *
-     */
-    public static String NBS_FILES_ROOT_PATH ;
-
-    public static String NBS_FILES_IPFS_ROOT;
-
     /**
      *
      */
@@ -91,6 +95,10 @@ public class AppMainWindow {
      * 关于面板
      */
     public static AboutPanel aboutPanel;
+    /**
+     * 联系人缓存
+     */
+    public static Map<String,ContactsItem> peerItems = new HashMap<>();
 
     public static void main(String[] args){
 
@@ -123,6 +131,7 @@ public void run() {
     public AppMainWindow(){
         initialize();
         broadcastOnline();
+        subSelf(400);
     }
     /**
      * 初始化frame内容
@@ -195,9 +204,11 @@ private void loadEnv(){
             logger.info(k+"="+v);
         }
         logger.info("ENV ============================<<");
-        NBS_FILES_ROOT_PATH = ConfigHelper.CURRENT_DIR +File.separator+ ConfigHelper.getNbsFilesRoot()+File.separator;
-        NBS_FILES_IPFS_ROOT = NBS_FILES_ROOT_PATH  +"ipfs" + File.separator;
-        File ipfsDir = new File(NBS_FILES_IPFS_ROOT);
+        /**
+         *
+         */
+
+        File ipfsDir = new File(ConfigHelper.NBS_FILES_IPFS_ROOT);
         if(ipfsDir.isDirectory()&& !ipfsDir.exists()){
             ipfsDir.mkdirs();
         }
@@ -286,18 +297,131 @@ public void initAvatar(){
     }
 
     /**
-     *
+     * 上线广播
      */
     private void broadcastOnline(){
-        if(self==null)return;
-        String ctrlMsg = Base64CodecUtil.encodeCtrlMsg(self,Base64CodecUtil.CtrlTypes.online);
+        if(boradcastSuccess)return;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    if(self==null||self.getNick()==null){
+                        TimeUnit.SECONDS.sleep(30);
+                        broadcastOnline();
+                    }else {
+                        String ctrlMsg = Base64CodecUtil.encodeCtrlMsg(self,Base64CodecUtil.CtrlTypes.online);
+                        logger.info("Send CTRL MSG : "+ctrlMsg);
+                        ipfs.pubsub.pub(IPFSHelper.NBSWORLD_CTRL_TOPIC,ctrlMsg);
+                        logger.info(IPFSHelper.NBSWORLD_CTRL_TOPIC+"Send CTRL MSG : "+ctrlMsg);
+                        boradcastSuccess = true;
+                    }
+                } catch (InterruptedException e) {
+                    broadcastOnline();
+                } catch (Exception e) {
+                    logger.info(e.getMessage());
+                    broadcastOnline();
+                }
+            }
+        }).start();
+    }
 
-        try {
-            logger.info("Send CTRL MSG : "+ctrlMsg);
-            ipfs.pubsub.pub(IPFSHelper.NBSWORLD_CTRL_TOPIC,ctrlMsg);
-            logger.info(IPFSHelper.NBSWORLD_CTRL_TOPIC+"Send CTRL MSG : "+ctrlMsg);
-        } catch (Exception e) {
-            e.printStackTrace();
+    /**
+     * See yourself
+     */
+    private void subSelf(long sleepTimes){
+       new Thread(new Runnable() {
+           @Override
+           public void run() {
+               try {
+                   if(StringUtils.isBlank(PEER_ID)){
+                       TimeUnit.SECONDS.sleep(30);
+                   }
+                   if(sleepTimes>0l){ TimeUnit.MILLISECONDS.sleep(sleepTimes); }
+                   logger.info("SUB SEFL :"+self.getId());
+                   Stream<Map<String,Object>> sub = ipfs.pubsub.sub(self.getId());
+                   List<Map> lst = sub.limit(1).collect(Collectors.toList());
+                   String json = JSONParser.toString(lst.get(0));
+                   logger.info(System.currentTimeMillis()+"-revc : "+json);
+                   IpfsMessage message = JSON.parseObject(json,IpfsMessage.class);
+                   //TODO 处理
+                   updateContactsCache(message);
+                   subSelf(sleepTimes);
+               } catch (Exception e) {
+                   e.printStackTrace();
+                   logger.info(e.getMessage());
+                   subSelf(sleepTimes);
+               }
+           }
+       }).start();
+    }
+
+    public void updateContactsCache(IpfsMessage m){
+        if(m==null)return;
+        m = Base64CodecUtil.parseIpmsMessageCtrlType(m);
+        switch (m.getTypes()){
+            case online:
+
+                //更新缓存
+                updatePeerItem(m);
+                break;
+             default:
+                break;
+        }
+    }
+
+    public void updatePeerItem (IpfsMessage m){
+        logger.info(m.getContents());
+        PeerBoradcastInfo info = JSON.parseObject(m.getContents(),PeerBoradcastInfo.class);
+        ContactsItem item = null;
+        if(info.getId().equals(self.getId())){
+            //自己不处理
+            return;
+        }
+        if(peerItems.containsKey(info.getId())){
+            item = peerItems.get(info.getId());
+            item.setFormid(m.getFrom());
+            if(info.getAvatarHash()!=null)item.setAvatar(info.getAvatarHash());
+            if(info.getAvatarSuffix()!=null)item.setAvatarSuffix(info.getAvatarSuffix());
+            item.setName(info.getNick());
+        }else {
+            item = new ContactsItem(info.getId(),info.getNick(),m.getFrom());
+            item.setAvatar(info.getAvatarHash());
+            item.setAvatarSuffix(info.getAvatarSuffix());
+            peerItems.put(info.getId(),item);
         }
+        safeAndFreshIM(item);
+    }
+
+    /**
+     * 启用新线程下载头像，并存储
+     * @param item
+     */
+    private void safeAndFreshIM(ContactsItem item){
+        //TODO 通知
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                //TODO save sqlite
+                String headRootPath = ConfigHelper.NBS_CACHE_AVATAR_ROOT_PATH;
+                try {
+                    if(StringUtils.isNotBlank(item.getAvatar())){
+                        FileOutputStream fos ;
+                        File headImage = new File(headRootPath,item.getAvatar()+item.getAvatarSuffix());
+                        if(headImage.exists()){
+                            headImage.delete();
+                        }
+                        headImage.createNewFile();
+                        Multihash multihash = Multihash.fromBase58(item.getAvatar());
+                        byte[] bytes = ipfs.get(multihash);
+                        fos = new FileOutputStream(headImage);
+                        fos.write(bytes);
+                        fos.flush();
+                        fos.close();
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
     }
 }

src/main/java/UI/panel/im/IMPanel.java

@@ -154,7 +154,7 @@ private JPanel buildMessMainPanel(){
         messPanel = new WihteBackJPanel();
         messPanel.setLayout(new BorderLayout());
         int downHeight = 116;
-        int upHeight = ConstantsUI.MAIN_WINDOW_HEIGHT -downHeight-4;
+        int upHeight = ConstantsUI.MAIN_WINDOW_HEIGHT -downHeight-24;
 
         /**
          * 上部
@@ -287,4 +287,5 @@ public void contactsItemChanged(ContactsItem item){
     public static IMPanel getContext() {
         return context;
     }
+
 }

src/main/java/com/nbs/entity/ContactsItem.java

@@ -1,5 +1,6 @@
 package com.nbs.entity;
 
+import com.nbs.utils.Base64CodecUtil;
 import com.nbs.utils.CharacterParser;
 
 /**
@@ -20,17 +21,52 @@ public class ContactsItem implements Comparable<ContactsItem> {
 
     private String type;
 
+    private String formid;
+    /**
+     *
+     */
+    private String avatar;
+
+    private String avatarSuffix;
+
     public ContactsItem() { }
 
+    /**
+     *
+     * @param id
+     * @param name
+     */
     public ContactsItem(String id, String name) {
         this.id = id;
         this.name = name;
+        this.type = TYPE.P.toString();
+    }
+
+    /**
+     *
+     * @param id
+     * @param name
+     * @param formid
+     */
+    public ContactsItem(String id, String name, String formid) {
+        this.id = id;
+        this.name = name;
+        this.formid = formid;
+        this.type = TYPE.P.toString();
     }
 
-    public ContactsItem(String id, String name, String type) {
+    /**
+     *
+     * @param id
+     * @param name
+     * @param formid
+     * @param type
+     */
+    public ContactsItem(String id, String name,String formid, String type ) {
         this.id = id;
         this.name = name;
         this.type = type;
+        this.formid = formid;
     }
 
     public String getId() {
@@ -77,6 +113,30 @@ public int compareTo(ContactsItem o) {
         return 0==r ? this.id.compareTo(o.getId()) : r;
     }
 
+    public String getFormid() {
+        return formid;
+    }
+
+    public void setFormid(String formid) {
+        this.formid = formid;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getAvatarSuffix() {
+        return avatarSuffix;
+    }
+
+    public void setAvatarSuffix(String avatarSuffix) {
+        this.avatarSuffix = avatarSuffix;
+    }
+
     /**
      *
      */

src/main/java/com/nbs/entity/PeerBoradcastInfo.java

@@ -15,13 +15,25 @@ public class PeerBoradcastInfo {
     private String avatarHash;
     private String avatarSuffix;
 
+    /**
+     *
+     * @param id
+     * @param nick
+     * @param avatarHash
+     * @param avatarSuffix
+     */
     public PeerBoradcastInfo(String id, String nick, String avatarHash, String avatarSuffix) {
         this.id = id;
         this.nick = nick;
         this.avatarHash = avatarHash;
         this.avatarSuffix = avatarSuffix;
     }
 
+    /**
+     *
+     * @param id
+     * @param nick
+     */
     public PeerBoradcastInfo(String id, String nick) {
         this.id = id;
         this.nick = nick;

src/main/java/com/nbs/ipfs/NBSPmessageHelper.java

@@ -0,0 +1,14 @@
+package com.nbs.ipfs;
+
+/**
+ * @Package : com.nbs.ipfs
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/24-22:36
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class NBSPmessageHelper {
+
+
+}