Merge pull request #12 from TRPGEngine/master

v0.1.3

Author: moonrailgun

.circleci/config.yml

@@ -0,0 +1,40 @@
+version: 2.1
+# orbs:
+#   node: circleci/[email protected]
+jobs:
+  "Build Electron App":
+    docker:
+      - image: circleci/node
+    steps:
+      - checkout
+      - run:
+          name: update-npm
+          command: 'sudo npm install -g npm@latest'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run:
+          name: install-npm-wee
+          command: npm install
+      - save_cache: # special step to save the dependency cache
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - ./node_modules
+            - ~/.cache/electron
+      - run:
+          name: prepare-env
+          command: chmod +x ./.circleci/prepare_env.sh && ./.circleci/prepare_env.sh
+      - run:
+          name: build
+          command: npm run package-all
+      - store_artifacts:
+          path: ./dist
+workflows:
+  version: 2
+  build:
+    jobs:
+      # - Build Electron App
+      - Build Electron App:
+          filters:
+            branches:
+              only:
+                - release

.circleci/prepare_env.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -xe
+# -*- coding: utf-8 -*-
+# for circle ci
+
+case "$OSTYPE" in
+  "linux-gnu")
+    # Not using Trusty containers because it can't install wine1.6(-i386),
+    # see: https://github.com/travis-ci/travis-ci/issues/6460
+    sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
+    echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+    sudo dpkg --add-architecture i386
+    sudo apt-get update
+    sudo apt-get install -y wine yarn
+    ;;
+esac

.gitignore

@@ -3,6 +3,7 @@ dist/
 package-lock.json
 yarn.lock
 config/local.js
+.sentryclirc
 
 
 # Logs

build/ci/before_install.sh

@@ -36,8 +36,8 @@ case "$TRAVIS_OS_NAME" in
     ;;
 esac
 
-# Force [email protected] if Node 8 (NPM ~5.0.0, ~5.3.0 have issues)
-if test "$TRAVIS_NODE_VERSION" = "8"; then
-  npm install -g [email protected]
-fi
-npm install -g cnpm
+# # Force [email protected] if Node 8 (NPM ~5.0.0, ~5.3.0 have issues)
+# if test "$TRAVIS_NODE_VERSION" = "8"; then
+#   npm install -g [email protected]
+# fi
+# npm install -g cnpm

config/project.config.js

@@ -36,6 +36,12 @@ let out = {
     host: currentHost,
     port: apiPort,
   },
+  chat: {
+    isWriting: {
+      throttle: 1500, // 节流时间，即至少多少毫秒才会发出一个正在写的信息
+      timeout: 3000, // 超时时间，即多少毫秒后仍未接收到正在写操作则自动视为已经停止写
+    },
+  },
   file: {
     protocol: isSSL ? 'https' : 'http',
     host: currentHost,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "trpg-game-client",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "main": "./dist/entry.js",
   "scripts": {
@@ -60,7 +60,7 @@
     "react-native-image-picker": "^0.28.0",
     "react-native-photo-browser": "^0.4.0",
     "react-native-root-toast": "^3.0.1",
-    "react-native-storage": "^1.0.0",
+    "react-native-storage": "^1.0.1",
     "react-native-style-block": "0.0.4",
     "react-navigation": "^3.5.1",
     "react-navigation-redux-helpers": "^3.0.0",

src/api/event.js

@@ -0,0 +1,10 @@
+import * as trpgApi from './trpg.api.js';
+const api = trpgApi.getInstance();
+
+export const sendStartWriting = (type = 'user', uuid) => {
+  return api.emit('chat::startWriting', { type, uuid });
+};
+
+export const sendStopWriting = (type = 'user', uuid) => {
+  return api.emit('chat::stopWriting', { type, uuid });
+};

src/api/rnStorage.api.js

@@ -1,4 +1,4 @@
-import Storage from 'react-native-storage/src/storage';
+import Storage from 'react-native-storage';
 import config from '../../config/project.config';
 
 let storage = new Storage({

src/api/trpg.api.js

@@ -2,7 +2,12 @@ import io from 'socket.io-client';
 import config from '../../config/project.config.js';
 import { RESET, ADD_FRIEND_SUCCESS } from '../redux/constants';
 
-import { addMsg, updateMsg } from '../redux/actions/chat';
+import {
+  addMsg,
+  updateMsg,
+  startWriting,
+  stopWriting,
+} from '../redux/actions/chat';
 import { addFriendInvite, loginWithToken } from '../redux/actions/user';
 import { updateGroupStatus, addGroup } from '../redux/actions/group';
 
@@ -24,7 +29,7 @@ function API() {
       this.socket.connect();
     }
     return this.socket.emit(event, data, (res) => {
-      cb(res);
+      cb && cb(res);
       if (res.result === false) {
         // 如果检测到错误则汇报错误信息
         const info = `${res.msg}\n事件: ${event}\n发送信息: ${JSON.stringify(
@@ -71,6 +76,18 @@ export function bindEventFunc(store, { onReceiveMessage } = {}) {
     store.dispatch(updateMsg(converseUUID, payload));
   });
 
+  api.on('chat::startWriting', function(data) {
+    const { type = 'user', from } = data;
+    const uuid = from;
+    store.dispatch(startWriting(type, uuid));
+  });
+
+  api.on('chat::stopWriting', function(data) {
+    const { type = 'user', from } = data;
+    const uuid = from;
+    store.dispatch(stopWriting(type, uuid));
+  });
+
   api.on('player::addFriend', function(data) {
     let uuid = data.uuid;
     getUserInfoCache(uuid);

src/redux/actions/chat.js

@@ -11,19 +11,28 @@ const {
   CREATE_CONVERSES_SUCCESS,
   CREATE_CONVERSES_FAILED,
   REMOVE_CONVERSES_SUCCESS,
+  REMOVE_USER_CONVERSE,
   UPDATE_CONVERSES_INFO_SUCCESS,
   UPDATE_CONVERSES_MSGLIST_SUCCESS,
   SWITCH_CONVERSES,
   SEND_MSG,
   SEND_MSG_COMPLETED,
   UPDATE_SYSTEM_CARD_CHAT_DATA,
+  UPDATE_WRITING_STATUS,
 } = constants;
 import * as trpgApi from '../../api/trpg.api.js';
 const api = trpgApi.getInstance();
 import rnStorage from '../../api/rnStorage.api.js';
 import { checkUser } from '../../shared/utils/cacheHelper';
 import { hideProfileCard, switchMenuPannel } from './ui';
 import uploadHelper from '../../shared/utils/uploadHelper';
+import { renewableDelayTimer } from '../../shared/utils/timer';
+import config from '../../../config/project.config';
+import _without from 'lodash/without';
+
+const getUserConversesHash = (userUUID) => {
+  return `userConverses#${userUUID}`;
+};
 
 let localIndex = 0;
 let getLocalUUID = function getLocalUUID() {
@@ -157,6 +166,8 @@ export let createConverse = function createConverse(
     });
   };
 };
+
+// 移除多人会话
 export let removeConverse = function removeConverse(converseUUID) {
   return function(dispatch, getState) {
     return api.emit('chat::removeConverse', { converseUUID }, function(data) {
@@ -169,6 +180,24 @@ export let removeConverse = function removeConverse(converseUUID) {
   };
 };
 
+export const removeUserConverse = (userConverseUUID) => {
+  return (dispatch, getState) => {
+    // 在当前删除
+    dispatch({ type: REMOVE_USER_CONVERSE, converseUUID: userConverseUUID });
+
+    // 在localStorage删除
+    const userUUID = getState().getIn(['user', 'info', 'uuid']);
+    const converses = getState().getIn(['chat', 'converses']);
+    const uuids = Object.keys(
+      converses.filter((c) => c.get('type') === 'user').toJS()
+    );
+    rnStorage.set(
+      getUserConversesHash(userUUID),
+      _without(uuids, userConverseUUID)
+    );
+  };
+};
+
 export let addUserConverse = function addUserConverse(senders) {
   return function(dispatch, getState) {
     if (typeof senders === 'string') {
@@ -183,10 +212,10 @@ export let addUserConverse = function addUserConverse(senders) {
 
     // 用户会话缓存
     let userUUID = getState().getIn(['user', 'info', 'uuid']);
-    rnStorage.get('userConverses#' + userUUID).then(function(converse) {
+    rnStorage.get(getUserConversesHash(userUUID)).then(function(converse) {
       converse = Array.from(new Set([...converse, ...senders]));
       rnStorage
-        .set('userConverses#' + userUUID, converse)
+        .set(getUserConversesHash(userUUID), converse)
         .then((data) => console.log('用户会话缓存完毕:', data));
     });
 
@@ -266,13 +295,15 @@ export let reloadConverseList = function reloadConverseList(cb) {
     let userInfo = getState().getIn(['user', 'info']);
     let userUUID = userInfo.get('uuid');
 
-    dispatch(getConverses(cb));
-    rnStorage.get('userConverses#' + userUUID).then(function(converse) {
+    dispatch(getConverses(cb)); // 从服务端获取多人会话列表
+    rnStorage.get(getUserConversesHash(userUUID)).then(function(converse) {
       console.log('缓存中的用户会话列表:', converse);
       if (converse && converse.length > 0) {
+        // 如果本地缓存有存在用户会话，则根据上次登录时间获取这段时间内新建的用户会话
         dispatch(addUserConverse(converse));
         dispatch(getOfflineUserConverse(userInfo.get('last_login')));
       } else {
+        // 如果本地没有存在用户会话，则获取所有的用户会话
         dispatch(getAllUserConverse());
       }
     });
@@ -481,3 +512,37 @@ export let updateCardChatData = function(chatUUID, newData) {
     });
   };
 };
+
+const getWriteHash = (type = 'user', uuid) => {
+  return `${type}#${uuid}`;
+};
+export let startWriting = function(type = 'user', uuid) {
+  return function(dispatch, getState) {
+    dispatch({
+      type: UPDATE_WRITING_STATUS,
+      payload: {
+        type,
+        uuid,
+        isWriting: true,
+      },
+    });
+
+    renewableDelayTimer(
+      getWriteHash(type, uuid),
+      function() {
+        dispatch(stopWriting()); // 如果10秒后没有再次收到正在输入的信号，则视为已经停止输入了
+      },
+      config.chat.isWriting.timeout
+    );
+  };
+};
+export let stopWriting = function(type = 'user', uuid) {
+  return {
+    type: UPDATE_WRITING_STATUS,
+    payload: {
+      type,
+      uuid,
+      isWriting: false,
+    },
+  };
+};