feat: [Feature] Added release version api for clients and RTS (#8324)

Added a new event in RTS when new version is deployed. After receiving this event, client will show a prompt to refresh.
This commit is contained in:
Nayan 2021-10-29 15:52:21 +06:00 committed by GitHub
parent b951d8db21
commit 09eff23479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 10 deletions

View File

@ -168,6 +168,7 @@ jobs:
- name: Build
run: |
echo 'export const VERSION = "${{ needs.prelude.outputs.tag }}"' > src/version.js
./build.sh
ls -l dist

View File

@ -254,6 +254,7 @@ jobs:
- name: Build
run: |
echo 'export const VERSION = "${{ steps.vars.outputs.version }}"' > src/version.js
./build.sh
ls -l dist

View File

@ -128,6 +128,7 @@ const StyledDebugButton = styled(DebugButton)`
const StyledActionText = styled(Text)`
color: ${(props) => props.theme.colors.toast.undoRedoColor} !important;
cursor: pointer;
`;
export function ToastComponent(

View File

@ -804,6 +804,8 @@ export const RESTART_BANNER_HEADER = () => "Restarting Server";
export const RESTART_ERROR_BODY = () =>
"Something went wrong. Please contact your administrator.";
export const RESTART_ERROR_HEADER = () => "Restart failed";
export const INFO_VERSION_MISMATCH_FOUND_RELOAD_REQUEST = () =>
"Hey! There is a new version of Appsmith available. Please consider refreshing your window.";
export const WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN = () =>
"Tell us more about what you do at work?";

View File

@ -12,6 +12,14 @@ import {
import { collabSetAppEditors } from "actions/appCollabActions";
import { newNotificationEvent } from "actions/notificationActions";
import { getCurrentUser } from "selectors/usersSelectors";
import { Toaster } from "components/ads/Toast";
import {
createMessage,
INFO_VERSION_MISMATCH_FOUND_RELOAD_REQUEST,
} from "constants/messages";
import { Variant } from "components/ads/common";
import React from "react";
import { getAppsmithConfigs } from "../../configs";
export default function* handleAppLevelSocketEvents(event: any) {
const currentUser = yield select(getCurrentUser);
@ -75,5 +83,20 @@ export default function* handleAppLevelSocketEvents(event: any) {
yield put(collabSetAppEditors(event.payload[0]));
return;
}
// notification on release version
case APP_LEVEL_SOCKET_EVENTS.RELEASE_VERSION_NOTIFICATION: {
const { appVersion } = getAppsmithConfigs();
if (appVersion.id != event.payload[0]) {
Toaster.show({
text: createMessage(INFO_VERSION_MISMATCH_FOUND_RELOAD_REQUEST),
variant: Variant.info,
actionElement: (
<span onClick={() => location.reload(true)}>REFRESH</span>
),
autoClose: false,
});
}
return;
}
}
}

View File

@ -18,6 +18,8 @@ export const APP_LEVEL_SOCKET_EVENTS = {
INSERT_NOTIFICATION: "insert:notification",
LIST_ONLINE_APP_EDITORS: "collab:online_editors", // user presence
RELEASE_VERSION_NOTIFICATION: "info:release_version", // release version
};
export const PAGE_LEVEL_SOCKET_EVENTS = {

View File

@ -7,7 +7,9 @@ import type mongodb from "mongodb"
import axios from "axios"
import { LogLevelDesc } from "loglevel";
import log from "loglevel";
import { AppUser, CurrentEditorsEvent, Policy, Comment, CommentThread, MousePointerEvent } from "./models"
import { VERSION as buildVersion } from "./version" // release version of the api
const RTS_BASE_PATH = "/rts"
@ -20,6 +22,7 @@ const EDITORS_EVENT_NAME : string = "collab:online_editors"
const START_EDIT_EVENT_NAME : string = "collab:start_edit"
const LEAVE_EDIT_EVENT_NAME : string = "collab:leave_edit"
const MOUSE_POINTER_EVENT_NAME : string = "collab:mouse_pointer"
const RELEASE_VERSION_EVENT_NAME : string = "info:release_version"
// Setting the logLevel for all log messages
const logLevel : LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL || "debug") as LogLevelDesc
@ -59,6 +62,7 @@ function main() {
})
io.on("connection", (socket: Socket) => {
socket.emit(RELEASE_VERSION_EVENT_NAME, buildVersion)
subscribeToEditEvents(socket, APP_ROOM_PREFIX)
onAppSocketConnected(socket)
.catch((error) => log.error("Error in socket connected handler", error))
@ -71,39 +75,46 @@ function main() {
});
io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => {
log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`)
if(room.startsWith(APP_ROOM_PREFIX)) {
log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`)
}
sendCurrentUsers(io, room, APP_ROOM_PREFIX);
});
io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => {
log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`)
if(room.startsWith(APP_ROOM_PREFIX)) {
log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`)
}
sendCurrentUsers(io, room, APP_ROOM_PREFIX);
});
io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => {
log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} left the room ${room}`)
if(room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others
log.debug(`ns:${PAGE_EDIT_NAMESPACE} # socket ${id} left the room ${room}`)
io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id);
}
sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX);
});
io.of(PAGE_EDIT_NAMESPACE).adapter.on("join-room", (room, id) => {
log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} joined the room ${room}`)
if(room.startsWith(PAGE_ROOM_PREFIX)) {
log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} joined the room ${room}`)
}
sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX);
});
watchMongoDB(io)
.catch((error) => log.error("Error watching MongoDB", error))
app.use(express.static(path.join(__dirname, "static")))
watchMongoDB(io).catch((error) => log.error("Error watching MongoDB", error))
// run the server
server.listen(port, () => {
log.info(`RTS running at http://localhost:${port}`)
log.info(`RTS version ${buildVersion} running at http://localhost:${port}`)
})
}
function joinEditRoom(socket:Socket, roomId:string, roomPrefix:string) {
// remove this socket from any other app rooms
// remove this socket from any other rooms with roomPrefix
if(socket.rooms) {
socket.rooms.forEach(roomName => {
if(roomName.startsWith(roomPrefix)) {

1
app/rts/src/version.js Normal file
View File

@ -0,0 +1 @@
export const VERSION = 'SNAPSHOT'

View File

@ -5,7 +5,8 @@
"esModuleInterop": true,
"moduleResolution": "node",
"sourceMap": true,
"outDir": "dist"
"outDir": "dist",
"allowJs": true
},
"lib": ["es2015"]
}