ColdBreeze/ColdBreeze-chat-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: lots of updates

Browse Source
This commit is contained in:
zerosoul
2022-02-10 23:35:25 +08:00
parent e8b6c2b0f1
commit d05c5ff8f2
33 changed files with 1072 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/config.js
+6 -1
View File
@@ -1,5 +1,10 @@
// const BASE_URL = `${location.origin}/api`;
const BASE_URL = `http://rustchat.com:3000/api`;
export const ContentTypes = {
text: "text/plain",
image: "image/png",
json: "application/json",
};
export const tokenHeader = "X-API-Key";
export default BASE_URL;
src/app/services/auth.js
+1 -1
View File
@@ -8,7 +8,7 @@ export const authApi = createApi({
query: (credentials) => ({
url: "token/login",
method: "POST",
body: credentials,
body: { credential: credentials, device: "web", device_token: "test" },
}),
// transformResponse: (resp) => {
// console.log("resp", resp);
src/app/services/base.query.js
+38 -11
View File
@@ -1,4 +1,5 @@
import { fetchBaseQuery } from "@reduxjs/toolkit/query";
import toast from "react-hot-toast";
import BASE_URL, { tokenHeader } from "../config";
const whiteList = ["login"];
const baseQuery = fetchBaseQuery({
@@ -9,22 +10,48 @@ const baseQuery = fetchBaseQuery({
if (token && !whiteList.includes(endpoint)) {
headers.set(tokenHeader, token);
}
// 发送channel msg (临时举措)
// if (endpoint == "sendChannelMsg") {
// headers.set("Content-Type", "text/plain");
// }
return headers;
},
});
const baseQueryWithReauth = async (args, api, extraOptions) => {
let result = await baseQuery(args, api, extraOptions);
if (result.error && result.error.status === 401) {
// try to get a new token with refreshToken
// const refreshResult = await baseQuery('/refreshToken', api, extraOptions);
// if (refreshResult.data) {
// // store the new token
// api.dispatch(tokenReceived(refreshResult.data));
// // retry the initial query
// result = await baseQuery(args, api, extraOptions);
// } else {
// api.dispatch(loggedOut());
// }
if (result.error) {
console.log("api error", result.error);
switch (result.error.originalStatus) {
case 404:
{
toast.error("Request Not Found");
}
break;
case 500:
{
toast.error(result.error.data || "server error");
}
break;
case 401:
{
toast.error("token expired, please login again");
// try to get a new token with refreshToken
// const refreshResult = await baseQuery('/refreshToken', api, extraOptions);
// if (refreshResult.data) {
// // store the new token
// api.dispatch(tokenReceived(refreshResult.data));
// // retry the initial query
// result = await baseQuery(args, api, extraOptions);
// } else {
// api.dispatch(loggedOut());
// }
}
break;
default:
break;
}
}
return result;
};
src/app/services/channel.js
+8 -3
View File
@@ -1,6 +1,8 @@
import { createApi } from "@reduxjs/toolkit/query/react";
import baseQuery from "./base.query";
import { REHYDRATE } from "redux-persist";
import { ContentTypes } from "../config";
export const channelApi = createApi({
reducerPath: "channel",
baseQuery,
@@ -22,10 +24,13 @@ export const channelApi = createApi({
}),
}),
sendChannelMsg: builder.mutation({
query: ({ gid, message }) => ({
url: `group/${gid}/send`,
query: ({ id, content, type = "text" }) => ({
headers: {
"content-type": ContentTypes[type],
},
url: `group/${id}/send`,
method: "POST",
body: message,
body: content,
}),
}),
}),
src/app/services/contact.js
+8 -4
View File
@@ -1,7 +1,8 @@
import { createApi } from "@reduxjs/toolkit/query/react";
import baseQuery from "./base.query";
import BASE_URL from "../config";
import BASE_URL, { ContentTypes } from "../config";
import { REHYDRATE } from "redux-persist";
export const contactApi = createApi({
reducerPath: "contact",
baseQuery,
@@ -22,10 +23,13 @@ export const contactApi = createApi({
},
}),
sendMsg: builder.mutation({
query: ({ uid, message }) => ({
url: `user/${uid}/send`,
query: ({ id, content, type = "text" }) => ({
headers: {
"content-type": ContentTypes[type],
},
url: `user/${id}/send`,
method: "POST",
body: message,
body: content,
}),
}),
}),
src/app/slices/auth.data.js
+11 -1
View File
@@ -2,7 +2,8 @@ import { createSlice } from "@reduxjs/toolkit";
const initialState = {
user: null,
usersVersion: 0,
usersVersion: null,
afterMid: null,
token: null,
refreshToken: null,
};
@@ -21,16 +22,25 @@ const authDataSlice = createSlice({
state.user = null;
state.token = null;
state.refreshToken = null;
// 清掉本地缓存auth data
// localStorage.removeItem("AUTH_DATA");
// state.afterMid = null;
// state.usersVersion = null;
},
setUsersVersion(state, action) {
const { version } = action.payload;
state.usersVersion = version;
},
setAfterMid(state, action) {
const { mid } = action.payload;
state.afterMid = mid;
},
},
});
export const {
setAuthData,
clearAuthData,
setUsersVersion,
setAfterMid,
} = authDataSlice.actions;
export default authDataSlice.reducer;
src/app/slices/channels.js
+9 -9
View File
@@ -1,18 +1,18 @@
import { createSlice } from "@reduxjs/toolkit";
const initialState = {};
const channelsSlice = createSlice({
name: "channels",
name: `channels`,
initialState,
reducers: {
setChannels(state, action) {
// console.log("set channels store", action);
const chs = action.payload;
chs.forEach((c) => {
const { gid, ...rest } = c;
console.log("wtf", gid, rest);
state[gid] = rest;
});
console.log("set channels store", state);
const chs = action.payload || [];
return Object.fromEntries(
chs.map((c) => {
const { gid, ...rest } = c;
return [gid, rest];
})
);
},
addChannel(state, action) {
// console.log("set channels store", action);
src/app/slices/message.channel.js
+3 -1
View File
@@ -5,6 +5,7 @@ const initialState = {
// accessLogs: {},
pendingMsgs: [],
};
const channelMsgSlice = createSlice({
name: "channelMessage",
initialState,
@@ -16,9 +17,10 @@ const channelMsgSlice = createSlice({
created_at,
mid,
from_uid,
content_type,
unread = true,
} = action.payload;
const newMsg = { content, created_at, from_uid, unread };
const newMsg = { content, content_type, created_at, from_uid, unread };
if (state[id]) {
let replaceMsg = state[id][mid];
// 如果存在，并且新消息和缓存消息不一样，则替换掉，并且改为已读（可能有问题）
src/app/slices/message.user.js
+2 -1
View File
@@ -10,12 +10,13 @@ const userMsgSlice = createSlice({
const {
id,
content,
content_type,
created_at,
mid,
from_uid,
unread = true,
} = action.payload;
const newMsg = { content, created_at, from_uid, unread };
const newMsg = { content, content_type, created_at, from_uid, unread };
if (state[id]) {
let replaceMsg = state[id][mid];
// 如果存在，并且新消息和缓存消息不一样，则替换掉
src/app/store.js
+18 -36
View File
@@ -1,15 +1,5 @@
import { configureStore, combineReducers } from "@reduxjs/toolkit";
import { setupListeners } from "@reduxjs/toolkit/query";
import storage from "redux-persist/lib/storage";
import {
persistReducer,
FLUSH,
REHYDRATE,
PAUSE,
PERSIST,
PURGE,
REGISTER,
} from "redux-persist";
import authDataReducer from "./slices/auth.data";
import uiReducer from "./slices/ui";
import channelsReducer from "./slices/channels";
@@ -19,14 +9,9 @@ import { authApi } from "./services/auth";
import { contactApi } from "./services/contact";
import { channelApi } from "./services/channel";
import { serverApi } from "./services/server";
const persistConfig = {
key: "root",
version: 1,
storage,
};
const persistedReducer = persistReducer(
persistConfig,
combineReducers({
const getStore = () => {
const reducer = combineReducers({
ui: uiReducer,
channels: channelsReducer,
userMsg: userMsgReducer,
@@ -36,21 +21,18 @@ const persistedReducer = persistReducer(
[contactApi.reducerPath]: contactApi.reducer,
[channelApi.reducerPath]: channelApi.reducer,
[serverApi.reducerPath]: serverApi.reducer,
})
);
const store = configureStore({
reducer: persistedReducer,
middleware: (getDefaultMiddleware) =>
getDefaultMiddleware({
serializableCheck: {
ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER],
},
}).concat(
authApi.middleware,
contactApi.middleware,
channelApi.middleware,
serverApi.middleware
),
});
setupListeners(store.dispatch);
export default store;
});
const store = configureStore({
reducer,
middleware: (getDefaultMiddleware) =>
getDefaultMiddleware().concat(
authApi.middleware,
contactApi.middleware,
channelApi.middleware,
serverApi.middleware
),
});
setupListeners(store.dispatch);
return store;
};
export default getStore;
src/app/store.with.persist.js
+56
View File
@@ -0,0 +1,56 @@
import { configureStore, combineReducers } from "@reduxjs/toolkit";
import { setupListeners } from "@reduxjs/toolkit/query";
import storage from "redux-persist/lib/storage";
import {
persistReducer,
FLUSH,
REHYDRATE,
PAUSE,
PERSIST,
PURGE,
REGISTER,
} from "redux-persist";
import authDataReducer from "./slices/auth.data";
import uiReducer from "./slices/ui";
import channelsReducer from "./slices/channels";
import channelMsgReducer from "./slices/message.channel";
import userMsgReducer from "./slices/message.user";
import { authApi } from "./services/auth";
import { contactApi } from "./services/contact";
import { channelApi } from "./services/channel";
import { serverApi } from "./services/server";
const persistConfig = {
key: "root",
version: 1,
storage,
};
const persistedReducer = persistReducer(
persistConfig,
combineReducers({
ui: uiReducer,
channels: channelsReducer,
userMsg: userMsgReducer,
channelMsg: channelMsgReducer,
authData: authDataReducer,
[authApi.reducerPath]: authApi.reducer,
[contactApi.reducerPath]: contactApi.reducer,
[channelApi.reducerPath]: channelApi.reducer,
[serverApi.reducerPath]: serverApi.reducer,
})
);
const store = configureStore({
reducer: persistedReducer,
middleware: (getDefaultMiddleware) =>
getDefaultMiddleware({
serializableCheck: {
ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER],
},
}).concat(
authApi.middleware,
contactApi.middleware,
channelApi.middleware,
serverApi.middleware
),
});
setupListeners(store.dispatch);
export default store;