From 354566bd2cd4ec88ae88db45cad0dda281179393 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 14 Dec 2023 10:59:10 -0500 Subject: [PATCH] build: rename bbb-graphql-actions-adapter-server to bbb-graphql-actions --- .github/dependabot.yml | 2 +- .github/workflows/automated-tests.yml | 2 +- bbb-graphql-actions-adapter-server/deploy.sh | 24 -------------- .../.gitignore | 0 bbb-graphql-actions/deploy.sh | 32 +++++++++++++++++++ .../package-lock.json | 4 +-- .../package.json | 6 ++-- .../run-dev.sh | 2 +- .../src/actions/allUsersClearEmoji.ts | 0 .../src/actions/allUsersClearReaction.ts | 0 .../src/actions/breakoutRoomCreate.ts | 0 .../src/actions/breakoutRoomEndAll.ts | 0 .../src/actions/breakoutRoomMoveUser.ts | 0 .../src/actions/breakoutRoomRequestJoinUrl.ts | 0 .../actions/breakoutRoomSendMessageToAll.ts | 0 .../src/actions/breakoutRoomSetTime.ts | 0 .../src/actions/cameraBroadcastStart.ts | 0 .../src/actions/cameraBroadcastStop.ts | 0 .../src/actions/captionSubmitText.ts | 0 .../src/actions/chatCreateWithUser.ts | 0 .../src/actions/chatPublicClearHistory.ts | 0 .../src/actions/chatRemove.ts | 0 .../src/actions/chatSendMessage.ts | 0 .../src/actions/chatSetTyping.ts | 0 .../dispatchPluginDataChannelMessageMsg.ts | 0 .../src/actions/externalVideoStart.ts | 0 .../src/actions/externalVideoStop.ts | 0 .../src/actions/externalVideoUpdate.ts | 0 .../src/actions/guestUsersSetLobbyMessage.ts | 0 .../guestUsersSetLobbyMessagePrivate.ts | 0 .../src/actions/guestUsersSetPolicy.ts | 0 .../actions/guestUsersSubmitApprovalStatus.ts | 0 .../src/actions/meetingEnd.ts | 0 .../src/actions/meetingLayoutSetProps.ts | 0 ...meetingLayoutSetSyncWithPresenterLayout.ts | 0 .../actions/meetingLockSettingsSetProps.ts | 0 .../src/actions/meetingRecordingSetStatus.ts | 0 .../src/actions/meetingSetMuted.ts | 0 .../meetingSetWebcamOnlyForModerator.ts | 0 .../src/actions/pollCancel.ts | 0 .../src/actions/pollCreate.ts | 0 .../src/actions/pollPublishResult.ts | 0 .../src/actions/pollSubmitUserTypedVote.ts | 0 .../src/actions/pollSubmitUserVote.ts | 0 .../src/actions/presAnnotationDelete.ts | 0 .../src/actions/presAnnotationDeleteAll.ts | 0 .../src/actions/presAnnotationSubmit.ts | 0 .../src/actions/presentationRemove.ts | 0 .../actions/presentationRequestUploadToken.ts | 0 .../src/actions/presentationSetCurrent.ts | 0 .../actions/presentationSetDownloadable.ts | 0 .../src/actions/presentationSetPage.ts | 0 .../actions/presentationSetRenderedInToast.ts | 0 .../src/actions/presentationSetWriters.ts | 0 .../src/actions/presentationSetZoom.ts | 0 .../src/actions/randomViewerPick.ts | 0 .../src/actions/sharedNotesCreateSession.ts | 0 .../src/actions/sharedNotesSetPinned.ts | 0 .../src/actions/timerActivate.ts | 0 .../src/actions/timerDeactivate.ts | 0 .../src/actions/timerReset.ts | 0 .../src/actions/timerSetSongTrack.ts | 0 .../src/actions/timerSetTime.ts | 0 .../src/actions/timerStart.ts | 0 .../src/actions/timerStop.ts | 0 .../src/actions/timerSwitchMode.ts | 0 .../src/actions/userEjectCameras.ts | 0 .../src/actions/userEjectFromMeeting.ts | 0 .../src/actions/userEjectFromVoice.ts | 0 .../src/actions/userJoinMeeting.ts | 0 .../src/actions/userLeaveMeeting.ts | 0 .../src/actions/userSetAway.ts | 0 .../src/actions/userSetCameraPinned.ts | 0 .../src/actions/userSetEmojiStatus.ts | 0 .../src/actions/userSetExitReason.ts | 0 .../src/actions/userSetLocked.ts | 0 .../src/actions/userSetMobileFlag.ts | 0 .../src/actions/userSetMuted.ts | 0 .../src/actions/userSetPresenter.ts | 0 .../src/actions/userSetRaiseHand.ts | 0 .../src/actions/userSetReactionEmoji.ts | 0 .../src/actions/userSetRole.ts | 0 .../src/actions/userSetSpeechLocale.ts | 0 .../src/actions/userThirdPartyInfoResquest.ts | 0 .../src/actions/userTransferVoiceToMeeting.ts | 0 .../src/config.ts | 0 .../src/imports/redis.ts | 2 +- .../src/imports/redisMessageFactory.ts | 0 .../src/imports/validation.ts | 0 .../src/index.ts | 0 .../src/types/ValidationError.ts | 0 .../src/types/index.ts | 0 .../tsconfig.json | 0 bigbluebutton-config/bin/bbb-conf | 4 +-- build/package-names.inc.sh | 2 +- .../before-remove.sh | 3 -- .../.build-files | 2 +- .../after-install.sh | 4 +-- ...bbb-graphql-actions-adapter-server.service | 6 ++-- .../bbb-graphql-actions/before-install.sh | 21 ++++++++++++ .../bbb-graphql-actions/before-remove.sh | 3 ++ .../build.sh | 25 ++++++++------- .../opts-jammy.sh | 0 .../packages-template/bbb-html5/opts-jammy.sh | 2 +- docs/docs/administration/install.md | 4 +-- 105 files changed, 90 insertions(+), 60 deletions(-) delete mode 100755 bbb-graphql-actions-adapter-server/deploy.sh rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/.gitignore (100%) create mode 100755 bbb-graphql-actions/deploy.sh rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/package-lock.json (99%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/package.json (86%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/run-dev.sh (81%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/allUsersClearEmoji.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/allUsersClearReaction.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomCreate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomEndAll.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomMoveUser.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomRequestJoinUrl.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomSendMessageToAll.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/breakoutRoomSetTime.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/cameraBroadcastStart.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/cameraBroadcastStop.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/captionSubmitText.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/chatCreateWithUser.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/chatPublicClearHistory.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/chatRemove.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/chatSendMessage.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/chatSetTyping.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/dispatchPluginDataChannelMessageMsg.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/externalVideoStart.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/externalVideoStop.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/externalVideoUpdate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/guestUsersSetLobbyMessage.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/guestUsersSetLobbyMessagePrivate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/guestUsersSetPolicy.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/guestUsersSubmitApprovalStatus.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingEnd.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingLayoutSetProps.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingLayoutSetSyncWithPresenterLayout.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingLockSettingsSetProps.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingRecordingSetStatus.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingSetMuted.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/meetingSetWebcamOnlyForModerator.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/pollCancel.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/pollCreate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/pollPublishResult.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/pollSubmitUserTypedVote.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/pollSubmitUserVote.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presAnnotationDelete.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presAnnotationDeleteAll.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presAnnotationSubmit.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationRemove.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationRequestUploadToken.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetCurrent.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetDownloadable.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetPage.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetRenderedInToast.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetWriters.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/presentationSetZoom.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/randomViewerPick.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/sharedNotesCreateSession.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/sharedNotesSetPinned.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerActivate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerDeactivate.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerReset.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerSetSongTrack.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerSetTime.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerStart.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerStop.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/timerSwitchMode.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userEjectCameras.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userEjectFromMeeting.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userEjectFromVoice.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userJoinMeeting.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userLeaveMeeting.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetAway.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetCameraPinned.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetEmojiStatus.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetExitReason.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetLocked.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetMobileFlag.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetMuted.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetPresenter.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetRaiseHand.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetReactionEmoji.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetRole.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userSetSpeechLocale.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userThirdPartyInfoResquest.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/actions/userTransferVoiceToMeeting.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/config.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/imports/redis.ts (89%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/imports/redisMessageFactory.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/imports/validation.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/index.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/types/ValidationError.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/src/types/index.ts (100%) rename {bbb-graphql-actions-adapter-server => bbb-graphql-actions}/tsconfig.json (100%) delete mode 100755 build/packages-template/bbb-graphql-actions-adapter-server/before-remove.sh rename build/packages-template/{bbb-graphql-actions-adapter-server => bbb-graphql-actions}/.build-files (57%) rename build/packages-template/{bbb-graphql-actions-adapter-server => bbb-graphql-actions}/after-install.sh (56%) rename build/packages-template/{bbb-graphql-actions-adapter-server => bbb-graphql-actions}/bbb-graphql-actions-adapter-server.service (68%) create mode 100644 build/packages-template/bbb-graphql-actions/before-install.sh create mode 100755 build/packages-template/bbb-graphql-actions/before-remove.sh rename build/packages-template/{bbb-graphql-actions-adapter-server => bbb-graphql-actions}/build.sh (51%) rename build/packages-template/{bbb-graphql-actions-adapter-server => bbb-graphql-actions}/opts-jammy.sh (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 26d53c496c..5eb53b5af2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -48,7 +48,7 @@ updates: # upcoming release branch ## excluding bigbluebutton-tests/playwright, bigbluebutton-tests/puppeteer, docs, bbb-graphql-client-test - package-ecosystem: npm - directory: "/bbb-graphql-actions-adapter-server" + directory: "/bbb-graphql-actions" target-branch: "v3.0.x-release" schedule: interval: daily diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index cd1567403f..6c0ee2e6d3 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -54,7 +54,7 @@ jobs: build-list: bbb-playback bbb-playback-notes bbb-playback-podcast bbb-playback-presentation bbb-playback-screenshare bbb-playback-video bbb-record-core - package: bbb-graphql-server build-name: bbb-graphql-server - build-list: bbb-graphql-server bbb-graphql-middleware bbb-graphql-actions-adapter-server + build-list: bbb-graphql-server bbb-graphql-middleware bbb-graphql-actions - package: bbb-etherpad cache-files-list: bbb-etherpad.placeholder.sh cache-urls-list: https://api.github.com/repos/mconf/ep_pad_ttl/commits https://api.github.com/repos/alangecker/bbb-etherpad-plugin/commits https://api.github.com/repos/mconf/ep_redis_publisher/commits https://api.github.com/repos/alangecker/bbb-etherpad-skin/commits diff --git a/bbb-graphql-actions-adapter-server/deploy.sh b/bbb-graphql-actions-adapter-server/deploy.sh deleted file mode 100755 index 61c7f269eb..0000000000 --- a/bbb-graphql-actions-adapter-server/deploy.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -cd "$(dirname "$0")" - -for var in "$@" -do - if [[ $var == --reset ]] ; then - echo "Performing a full reset..." - rm -rf node_modules - fi -done - -if [ ! -d ./node_modules ] ; then - npm ci --no-progress -fi - -npm run build - -mv -f dist/index.js dist/bbb-graphql-actions-adapter-server.js -sudo cp -rf dist/* /usr/local/bigbluebutton/bbb-graphql-actions-adapter-server/ -sudo systemctl restart bbb-graphql-actions-adapter-server -echo '' -echo '' -echo '----------------' -echo 'bbb-graphql-actions-adapter-server updated' diff --git a/bbb-graphql-actions-adapter-server/.gitignore b/bbb-graphql-actions/.gitignore similarity index 100% rename from bbb-graphql-actions-adapter-server/.gitignore rename to bbb-graphql-actions/.gitignore diff --git a/bbb-graphql-actions/deploy.sh b/bbb-graphql-actions/deploy.sh new file mode 100755 index 0000000000..c7cac8dafb --- /dev/null +++ b/bbb-graphql-actions/deploy.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +cd "$(dirname "$0")" + +for var in "$@" +do + if [[ $var == --reset ]] ; then + echo "Performing a full reset..." + rm -rf node_modules + fi +done + +if [ ! -d ./node_modules ] ; then + npm ci --no-progress +fi + +npm run build + +# handle renaming circa dec 2023 +if [[ -d /usr/local/bigbluebutton/bbb-graphql-actions-adapter-server ]] ; then + sudo systemctl stop bbb-graphql-actions-adapter-server + sudo rm -f /usr/lib/systemd/system/bbb-graphql-actions-adapter-server.service + sudo systemctl daemon-reload + sudo rm -rf /usr/local/bigbluebutton/bbb-graphql-actions-adapter-server +fi + +mv -f dist/index.js dist/bbb-graphql-actions.js +sudo cp -rf dist/* /usr/local/bigbluebutton/bbb-graphql-actions +sudo systemctl restart bbb-graphql-actions +echo '' +echo '' +echo '----------------' +echo 'bbb-graphql-actions updated' diff --git a/bbb-graphql-actions-adapter-server/package-lock.json b/bbb-graphql-actions/package-lock.json similarity index 99% rename from bbb-graphql-actions-adapter-server/package-lock.json rename to bbb-graphql-actions/package-lock.json index 541213d55a..91c044e661 100644 --- a/bbb-graphql-actions-adapter-server/package-lock.json +++ b/bbb-graphql-actions/package-lock.json @@ -1,11 +1,11 @@ { - "name": "bbb-graphql-actions-adapter-server", + "name": "bbb-graphql-actions", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "bbb-graphql-actions-adapter-server", + "name": "bbb-graphql-actions", "version": "0.0.1", "license": "LGPL-3.0", "dependencies": { diff --git a/bbb-graphql-actions-adapter-server/package.json b/bbb-graphql-actions/package.json similarity index 86% rename from bbb-graphql-actions-adapter-server/package.json rename to bbb-graphql-actions/package.json index 1372720734..2ee069636d 100644 --- a/bbb-graphql-actions-adapter-server/package.json +++ b/bbb-graphql-actions/package.json @@ -1,5 +1,5 @@ { - "name": "bbb-graphql-actions-adapter-server", + "name": "bbb-graphql-actions", "version": "0.0.1", "description": "A server component designed to interface between Hasura GraphQL actions and BigBlueButton ecosystem.", "main": "index.ts", @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/bigbluebutton/bigbluebutton/tree/develop/bbb-graphql-actions-adapter-server" + "url": "git+https://github.com/bigbluebutton/bigbluebutton/tree/develop/bbb-graphql-actions" }, "keywords": [ "bigbluebutton", @@ -22,7 +22,7 @@ "bugs": { "url": "https://github.com/bigbluebutton/bigbluebutton/issues" }, - "homepage": "https://github.com/bigbluebutton/bigbluebutton/tree/develop/bbb-graphql-actions-adapter-server#readme", + "homepage": "https://github.com/bigbluebutton/bigbluebutton/tree/develop/bbb-graphql-actions#readme", "dependencies": { "@types/express": "^4.17.18", "@types/node": "^20.7.0", diff --git a/bbb-graphql-actions-adapter-server/run-dev.sh b/bbb-graphql-actions/run-dev.sh similarity index 81% rename from bbb-graphql-actions-adapter-server/run-dev.sh rename to bbb-graphql-actions/run-dev.sh index c6b8bfbfc2..130e358e56 100755 --- a/bbb-graphql-actions-adapter-server/run-dev.sh +++ b/bbb-graphql-actions/run-dev.sh @@ -13,5 +13,5 @@ if [ ! -d ./node_modules ] ; then npm install fi -sudo systemctl stop bbb-graphql-actions-adapter-server +sudo systemctl stop bbb-graphql-actions npm start diff --git a/bbb-graphql-actions-adapter-server/src/actions/allUsersClearEmoji.ts b/bbb-graphql-actions/src/actions/allUsersClearEmoji.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/allUsersClearEmoji.ts rename to bbb-graphql-actions/src/actions/allUsersClearEmoji.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/allUsersClearReaction.ts b/bbb-graphql-actions/src/actions/allUsersClearReaction.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/allUsersClearReaction.ts rename to bbb-graphql-actions/src/actions/allUsersClearReaction.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomCreate.ts b/bbb-graphql-actions/src/actions/breakoutRoomCreate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomCreate.ts rename to bbb-graphql-actions/src/actions/breakoutRoomCreate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomEndAll.ts b/bbb-graphql-actions/src/actions/breakoutRoomEndAll.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomEndAll.ts rename to bbb-graphql-actions/src/actions/breakoutRoomEndAll.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomMoveUser.ts b/bbb-graphql-actions/src/actions/breakoutRoomMoveUser.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomMoveUser.ts rename to bbb-graphql-actions/src/actions/breakoutRoomMoveUser.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomRequestJoinUrl.ts b/bbb-graphql-actions/src/actions/breakoutRoomRequestJoinUrl.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomRequestJoinUrl.ts rename to bbb-graphql-actions/src/actions/breakoutRoomRequestJoinUrl.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomSendMessageToAll.ts b/bbb-graphql-actions/src/actions/breakoutRoomSendMessageToAll.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomSendMessageToAll.ts rename to bbb-graphql-actions/src/actions/breakoutRoomSendMessageToAll.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/breakoutRoomSetTime.ts b/bbb-graphql-actions/src/actions/breakoutRoomSetTime.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/breakoutRoomSetTime.ts rename to bbb-graphql-actions/src/actions/breakoutRoomSetTime.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/cameraBroadcastStart.ts b/bbb-graphql-actions/src/actions/cameraBroadcastStart.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/cameraBroadcastStart.ts rename to bbb-graphql-actions/src/actions/cameraBroadcastStart.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/cameraBroadcastStop.ts b/bbb-graphql-actions/src/actions/cameraBroadcastStop.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/cameraBroadcastStop.ts rename to bbb-graphql-actions/src/actions/cameraBroadcastStop.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/captionSubmitText.ts b/bbb-graphql-actions/src/actions/captionSubmitText.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/captionSubmitText.ts rename to bbb-graphql-actions/src/actions/captionSubmitText.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/chatCreateWithUser.ts b/bbb-graphql-actions/src/actions/chatCreateWithUser.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/chatCreateWithUser.ts rename to bbb-graphql-actions/src/actions/chatCreateWithUser.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/chatPublicClearHistory.ts b/bbb-graphql-actions/src/actions/chatPublicClearHistory.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/chatPublicClearHistory.ts rename to bbb-graphql-actions/src/actions/chatPublicClearHistory.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/chatRemove.ts b/bbb-graphql-actions/src/actions/chatRemove.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/chatRemove.ts rename to bbb-graphql-actions/src/actions/chatRemove.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/chatSendMessage.ts b/bbb-graphql-actions/src/actions/chatSendMessage.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/chatSendMessage.ts rename to bbb-graphql-actions/src/actions/chatSendMessage.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/chatSetTyping.ts b/bbb-graphql-actions/src/actions/chatSetTyping.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/chatSetTyping.ts rename to bbb-graphql-actions/src/actions/chatSetTyping.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/dispatchPluginDataChannelMessageMsg.ts b/bbb-graphql-actions/src/actions/dispatchPluginDataChannelMessageMsg.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/dispatchPluginDataChannelMessageMsg.ts rename to bbb-graphql-actions/src/actions/dispatchPluginDataChannelMessageMsg.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/externalVideoStart.ts b/bbb-graphql-actions/src/actions/externalVideoStart.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/externalVideoStart.ts rename to bbb-graphql-actions/src/actions/externalVideoStart.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/externalVideoStop.ts b/bbb-graphql-actions/src/actions/externalVideoStop.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/externalVideoStop.ts rename to bbb-graphql-actions/src/actions/externalVideoStop.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/externalVideoUpdate.ts b/bbb-graphql-actions/src/actions/externalVideoUpdate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/externalVideoUpdate.ts rename to bbb-graphql-actions/src/actions/externalVideoUpdate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/guestUsersSetLobbyMessage.ts b/bbb-graphql-actions/src/actions/guestUsersSetLobbyMessage.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/guestUsersSetLobbyMessage.ts rename to bbb-graphql-actions/src/actions/guestUsersSetLobbyMessage.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/guestUsersSetLobbyMessagePrivate.ts b/bbb-graphql-actions/src/actions/guestUsersSetLobbyMessagePrivate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/guestUsersSetLobbyMessagePrivate.ts rename to bbb-graphql-actions/src/actions/guestUsersSetLobbyMessagePrivate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/guestUsersSetPolicy.ts b/bbb-graphql-actions/src/actions/guestUsersSetPolicy.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/guestUsersSetPolicy.ts rename to bbb-graphql-actions/src/actions/guestUsersSetPolicy.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/guestUsersSubmitApprovalStatus.ts b/bbb-graphql-actions/src/actions/guestUsersSubmitApprovalStatus.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/guestUsersSubmitApprovalStatus.ts rename to bbb-graphql-actions/src/actions/guestUsersSubmitApprovalStatus.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingEnd.ts b/bbb-graphql-actions/src/actions/meetingEnd.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingEnd.ts rename to bbb-graphql-actions/src/actions/meetingEnd.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingLayoutSetProps.ts b/bbb-graphql-actions/src/actions/meetingLayoutSetProps.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingLayoutSetProps.ts rename to bbb-graphql-actions/src/actions/meetingLayoutSetProps.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingLayoutSetSyncWithPresenterLayout.ts b/bbb-graphql-actions/src/actions/meetingLayoutSetSyncWithPresenterLayout.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingLayoutSetSyncWithPresenterLayout.ts rename to bbb-graphql-actions/src/actions/meetingLayoutSetSyncWithPresenterLayout.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingLockSettingsSetProps.ts b/bbb-graphql-actions/src/actions/meetingLockSettingsSetProps.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingLockSettingsSetProps.ts rename to bbb-graphql-actions/src/actions/meetingLockSettingsSetProps.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingRecordingSetStatus.ts b/bbb-graphql-actions/src/actions/meetingRecordingSetStatus.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingRecordingSetStatus.ts rename to bbb-graphql-actions/src/actions/meetingRecordingSetStatus.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingSetMuted.ts b/bbb-graphql-actions/src/actions/meetingSetMuted.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingSetMuted.ts rename to bbb-graphql-actions/src/actions/meetingSetMuted.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/meetingSetWebcamOnlyForModerator.ts b/bbb-graphql-actions/src/actions/meetingSetWebcamOnlyForModerator.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/meetingSetWebcamOnlyForModerator.ts rename to bbb-graphql-actions/src/actions/meetingSetWebcamOnlyForModerator.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/pollCancel.ts b/bbb-graphql-actions/src/actions/pollCancel.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/pollCancel.ts rename to bbb-graphql-actions/src/actions/pollCancel.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/pollCreate.ts b/bbb-graphql-actions/src/actions/pollCreate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/pollCreate.ts rename to bbb-graphql-actions/src/actions/pollCreate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/pollPublishResult.ts b/bbb-graphql-actions/src/actions/pollPublishResult.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/pollPublishResult.ts rename to bbb-graphql-actions/src/actions/pollPublishResult.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/pollSubmitUserTypedVote.ts b/bbb-graphql-actions/src/actions/pollSubmitUserTypedVote.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/pollSubmitUserTypedVote.ts rename to bbb-graphql-actions/src/actions/pollSubmitUserTypedVote.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/pollSubmitUserVote.ts b/bbb-graphql-actions/src/actions/pollSubmitUserVote.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/pollSubmitUserVote.ts rename to bbb-graphql-actions/src/actions/pollSubmitUserVote.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presAnnotationDelete.ts b/bbb-graphql-actions/src/actions/presAnnotationDelete.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presAnnotationDelete.ts rename to bbb-graphql-actions/src/actions/presAnnotationDelete.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presAnnotationDeleteAll.ts b/bbb-graphql-actions/src/actions/presAnnotationDeleteAll.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presAnnotationDeleteAll.ts rename to bbb-graphql-actions/src/actions/presAnnotationDeleteAll.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presAnnotationSubmit.ts b/bbb-graphql-actions/src/actions/presAnnotationSubmit.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presAnnotationSubmit.ts rename to bbb-graphql-actions/src/actions/presAnnotationSubmit.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationRemove.ts b/bbb-graphql-actions/src/actions/presentationRemove.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationRemove.ts rename to bbb-graphql-actions/src/actions/presentationRemove.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationRequestUploadToken.ts b/bbb-graphql-actions/src/actions/presentationRequestUploadToken.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationRequestUploadToken.ts rename to bbb-graphql-actions/src/actions/presentationRequestUploadToken.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetCurrent.ts b/bbb-graphql-actions/src/actions/presentationSetCurrent.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetCurrent.ts rename to bbb-graphql-actions/src/actions/presentationSetCurrent.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetDownloadable.ts b/bbb-graphql-actions/src/actions/presentationSetDownloadable.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetDownloadable.ts rename to bbb-graphql-actions/src/actions/presentationSetDownloadable.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetPage.ts b/bbb-graphql-actions/src/actions/presentationSetPage.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetPage.ts rename to bbb-graphql-actions/src/actions/presentationSetPage.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetRenderedInToast.ts b/bbb-graphql-actions/src/actions/presentationSetRenderedInToast.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetRenderedInToast.ts rename to bbb-graphql-actions/src/actions/presentationSetRenderedInToast.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetWriters.ts b/bbb-graphql-actions/src/actions/presentationSetWriters.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetWriters.ts rename to bbb-graphql-actions/src/actions/presentationSetWriters.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/presentationSetZoom.ts b/bbb-graphql-actions/src/actions/presentationSetZoom.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/presentationSetZoom.ts rename to bbb-graphql-actions/src/actions/presentationSetZoom.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/randomViewerPick.ts b/bbb-graphql-actions/src/actions/randomViewerPick.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/randomViewerPick.ts rename to bbb-graphql-actions/src/actions/randomViewerPick.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/sharedNotesCreateSession.ts b/bbb-graphql-actions/src/actions/sharedNotesCreateSession.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/sharedNotesCreateSession.ts rename to bbb-graphql-actions/src/actions/sharedNotesCreateSession.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/sharedNotesSetPinned.ts b/bbb-graphql-actions/src/actions/sharedNotesSetPinned.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/sharedNotesSetPinned.ts rename to bbb-graphql-actions/src/actions/sharedNotesSetPinned.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerActivate.ts b/bbb-graphql-actions/src/actions/timerActivate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerActivate.ts rename to bbb-graphql-actions/src/actions/timerActivate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerDeactivate.ts b/bbb-graphql-actions/src/actions/timerDeactivate.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerDeactivate.ts rename to bbb-graphql-actions/src/actions/timerDeactivate.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerReset.ts b/bbb-graphql-actions/src/actions/timerReset.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerReset.ts rename to bbb-graphql-actions/src/actions/timerReset.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerSetSongTrack.ts b/bbb-graphql-actions/src/actions/timerSetSongTrack.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerSetSongTrack.ts rename to bbb-graphql-actions/src/actions/timerSetSongTrack.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerSetTime.ts b/bbb-graphql-actions/src/actions/timerSetTime.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerSetTime.ts rename to bbb-graphql-actions/src/actions/timerSetTime.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerStart.ts b/bbb-graphql-actions/src/actions/timerStart.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerStart.ts rename to bbb-graphql-actions/src/actions/timerStart.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerStop.ts b/bbb-graphql-actions/src/actions/timerStop.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerStop.ts rename to bbb-graphql-actions/src/actions/timerStop.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/timerSwitchMode.ts b/bbb-graphql-actions/src/actions/timerSwitchMode.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/timerSwitchMode.ts rename to bbb-graphql-actions/src/actions/timerSwitchMode.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userEjectCameras.ts b/bbb-graphql-actions/src/actions/userEjectCameras.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userEjectCameras.ts rename to bbb-graphql-actions/src/actions/userEjectCameras.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userEjectFromMeeting.ts b/bbb-graphql-actions/src/actions/userEjectFromMeeting.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userEjectFromMeeting.ts rename to bbb-graphql-actions/src/actions/userEjectFromMeeting.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userEjectFromVoice.ts b/bbb-graphql-actions/src/actions/userEjectFromVoice.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userEjectFromVoice.ts rename to bbb-graphql-actions/src/actions/userEjectFromVoice.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userJoinMeeting.ts b/bbb-graphql-actions/src/actions/userJoinMeeting.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userJoinMeeting.ts rename to bbb-graphql-actions/src/actions/userJoinMeeting.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userLeaveMeeting.ts b/bbb-graphql-actions/src/actions/userLeaveMeeting.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userLeaveMeeting.ts rename to bbb-graphql-actions/src/actions/userLeaveMeeting.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetAway.ts b/bbb-graphql-actions/src/actions/userSetAway.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetAway.ts rename to bbb-graphql-actions/src/actions/userSetAway.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetCameraPinned.ts b/bbb-graphql-actions/src/actions/userSetCameraPinned.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetCameraPinned.ts rename to bbb-graphql-actions/src/actions/userSetCameraPinned.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetEmojiStatus.ts b/bbb-graphql-actions/src/actions/userSetEmojiStatus.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetEmojiStatus.ts rename to bbb-graphql-actions/src/actions/userSetEmojiStatus.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetExitReason.ts b/bbb-graphql-actions/src/actions/userSetExitReason.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetExitReason.ts rename to bbb-graphql-actions/src/actions/userSetExitReason.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetLocked.ts b/bbb-graphql-actions/src/actions/userSetLocked.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetLocked.ts rename to bbb-graphql-actions/src/actions/userSetLocked.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetMobileFlag.ts b/bbb-graphql-actions/src/actions/userSetMobileFlag.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetMobileFlag.ts rename to bbb-graphql-actions/src/actions/userSetMobileFlag.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetMuted.ts b/bbb-graphql-actions/src/actions/userSetMuted.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetMuted.ts rename to bbb-graphql-actions/src/actions/userSetMuted.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetPresenter.ts b/bbb-graphql-actions/src/actions/userSetPresenter.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetPresenter.ts rename to bbb-graphql-actions/src/actions/userSetPresenter.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetRaiseHand.ts b/bbb-graphql-actions/src/actions/userSetRaiseHand.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetRaiseHand.ts rename to bbb-graphql-actions/src/actions/userSetRaiseHand.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetReactionEmoji.ts b/bbb-graphql-actions/src/actions/userSetReactionEmoji.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetReactionEmoji.ts rename to bbb-graphql-actions/src/actions/userSetReactionEmoji.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetRole.ts b/bbb-graphql-actions/src/actions/userSetRole.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetRole.ts rename to bbb-graphql-actions/src/actions/userSetRole.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userSetSpeechLocale.ts b/bbb-graphql-actions/src/actions/userSetSpeechLocale.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userSetSpeechLocale.ts rename to bbb-graphql-actions/src/actions/userSetSpeechLocale.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userThirdPartyInfoResquest.ts b/bbb-graphql-actions/src/actions/userThirdPartyInfoResquest.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userThirdPartyInfoResquest.ts rename to bbb-graphql-actions/src/actions/userThirdPartyInfoResquest.ts diff --git a/bbb-graphql-actions-adapter-server/src/actions/userTransferVoiceToMeeting.ts b/bbb-graphql-actions/src/actions/userTransferVoiceToMeeting.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/actions/userTransferVoiceToMeeting.ts rename to bbb-graphql-actions/src/actions/userTransferVoiceToMeeting.ts diff --git a/bbb-graphql-actions-adapter-server/src/config.ts b/bbb-graphql-actions/src/config.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/config.ts rename to bbb-graphql-actions/src/config.ts diff --git a/bbb-graphql-actions-adapter-server/src/imports/redis.ts b/bbb-graphql-actions/src/imports/redis.ts similarity index 89% rename from bbb-graphql-actions-adapter-server/src/imports/redis.ts rename to bbb-graphql-actions/src/imports/redis.ts index a182552890..6cb7ee5b58 100644 --- a/bbb-graphql-actions-adapter-server/src/imports/redis.ts +++ b/bbb-graphql-actions/src/imports/redis.ts @@ -6,7 +6,7 @@ export const createRedisClient = () => { const redisClient = redis.createClient({ url: `redis://${REDIS_HOST}:${REDIS_PORT}`, // Construct URL from host and port. disableOfflineQueue: true, // Disable offline queueing of commands. - name: 'bbb-graphql-actions-adapter-server', // Assign a name to this client. + name: 'bbb-graphql-actions', // Assign a name to this client. socket: { reconnectStrategy: (times) => 500 // Reconnect strategy with a fixed delay. } diff --git a/bbb-graphql-actions-adapter-server/src/imports/redisMessageFactory.ts b/bbb-graphql-actions/src/imports/redisMessageFactory.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/imports/redisMessageFactory.ts rename to bbb-graphql-actions/src/imports/redisMessageFactory.ts diff --git a/bbb-graphql-actions-adapter-server/src/imports/validation.ts b/bbb-graphql-actions/src/imports/validation.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/imports/validation.ts rename to bbb-graphql-actions/src/imports/validation.ts diff --git a/bbb-graphql-actions-adapter-server/src/index.ts b/bbb-graphql-actions/src/index.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/index.ts rename to bbb-graphql-actions/src/index.ts diff --git a/bbb-graphql-actions-adapter-server/src/types/ValidationError.ts b/bbb-graphql-actions/src/types/ValidationError.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/types/ValidationError.ts rename to bbb-graphql-actions/src/types/ValidationError.ts diff --git a/bbb-graphql-actions-adapter-server/src/types/index.ts b/bbb-graphql-actions/src/types/index.ts similarity index 100% rename from bbb-graphql-actions-adapter-server/src/types/index.ts rename to bbb-graphql-actions/src/types/index.ts diff --git a/bbb-graphql-actions-adapter-server/tsconfig.json b/bbb-graphql-actions/tsconfig.json similarity index 100% rename from bbb-graphql-actions-adapter-server/tsconfig.json rename to bbb-graphql-actions/tsconfig.json diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index 525f8a6119..56ec86e159 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -396,8 +396,8 @@ display_bigbluebutton_status () { done fi - if [ -f /usr/lib/systemd/system/bbb-graphql-actions-adapter-server.service ]; then - units="$units bbb-graphql-actions-adapter-server" + if [ -f /usr/lib/systemd/system/bbb-graphql-actions.service ]; then + units="$units bbb-graphql-actions" fi if [ -f /usr/lib/systemd/system/bbb-graphql-middleware.service ]; then diff --git a/build/package-names.inc.sh b/build/package-names.inc.sh index 0fc78bf30c..25c79347d4 100644 --- a/build/package-names.inc.sh +++ b/build/package-names.inc.sh @@ -7,7 +7,7 @@ DEBNAME_TO_SOURCEDIR[bbb-export-annotations]="bbb-export-annotations" DEBNAME_TO_SOURCEDIR[bbb-freeswitch-core]="freeswitch bbb-voice-conference" DEBNAME_TO_SOURCEDIR[bbb-freeswitch-sounds]="do_not_copy_anything" DEBNAME_TO_SOURCEDIR[bbb-fsesl-akka]="akka-bbb-fsesl bbb-common-message bbb-fsesl-client" -DEBNAME_TO_SOURCEDIR[bbb-graphql-actions-adapter-server]="bbb-graphql-actions-adapter-server" +DEBNAME_TO_SOURCEDIR[bbb-graphql-actions]="bbb-graphql-actions" DEBNAME_TO_SOURCEDIR[bbb-graphql-middleware]="bbb-graphql-middleware" DEBNAME_TO_SOURCEDIR[bbb-graphql-server]="bbb-graphql-server" DEBNAME_TO_SOURCEDIR[bbb-html5]="bigbluebutton-html5" diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/before-remove.sh b/build/packages-template/bbb-graphql-actions-adapter-server/before-remove.sh deleted file mode 100755 index 41a0ec1e13..0000000000 --- a/build/packages-template/bbb-graphql-actions-adapter-server/before-remove.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -stopService bbb-graphql-actions-adapter-server || echo "bbb-graphql-actions-adapter-server could not be unregistered or stopped" diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/.build-files b/build/packages-template/bbb-graphql-actions/.build-files similarity index 57% rename from build/packages-template/bbb-graphql-actions-adapter-server/.build-files rename to build/packages-template/bbb-graphql-actions/.build-files index 613f069145..6aeea5038e 100644 --- a/build/packages-template/bbb-graphql-actions-adapter-server/.build-files +++ b/build/packages-template/bbb-graphql-actions/.build-files @@ -1,5 +1,5 @@ after-install.sh -bbb-graphql-actions-adapter-server.service +bbb-graphql-actions.service before-remove.sh build.sh opts-jammy.sh diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/after-install.sh b/build/packages-template/bbb-graphql-actions/after-install.sh similarity index 56% rename from build/packages-template/bbb-graphql-actions-adapter-server/after-install.sh rename to build/packages-template/bbb-graphql-actions/after-install.sh index 2db659d356..3d11aaf739 100755 --- a/build/packages-template/bbb-graphql-actions-adapter-server/after-install.sh +++ b/build/packages-template/bbb-graphql-actions/after-install.sh @@ -5,9 +5,9 @@ case "$1" in fc-cache -f if [ ! -f /.dockerenv ]; then - systemctl enable bbb-graphql-actions-adapter-server.service + systemctl enable bbb-graphql-actions.service systemctl daemon-reload - startService bbb-graphql-actions-adapter-server.service || echo "bbb-graphql-actions-adapter-server service could not be registered or started" + startService bbb-graphql-actions.service || echo "bbb-graphql-actions service could not be registered or started" fi ;; diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/bbb-graphql-actions-adapter-server.service b/build/packages-template/bbb-graphql-actions/bbb-graphql-actions-adapter-server.service similarity index 68% rename from build/packages-template/bbb-graphql-actions-adapter-server/bbb-graphql-actions-adapter-server.service rename to build/packages-template/bbb-graphql-actions/bbb-graphql-actions-adapter-server.service index c54a815dc4..258c6cfcfe 100644 --- a/build/packages-template/bbb-graphql-actions-adapter-server/bbb-graphql-actions-adapter-server.service +++ b/build/packages-template/bbb-graphql-actions/bbb-graphql-actions-adapter-server.service @@ -6,10 +6,10 @@ PartOf=bigbluebutton.target StartLimitIntervalSec=0 [Service] -WorkingDirectory=/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server -ExecStart=/usr/bin/node bbb-graphql-actions-adapter-server.js +WorkingDirectory=/usr/local/bigbluebutton/bbb-graphql-actions +ExecStart=/usr/bin/node bbb-graphql-actions.js Restart=always -SyslogIdentifier=bbb-graphql-actions-adapter-server +SyslogIdentifier=bbb-graphql-actions User=bigbluebutton Group=bigbluebutton Environment=NODE_ENV=production diff --git a/build/packages-template/bbb-graphql-actions/before-install.sh b/build/packages-template/bbb-graphql-actions/before-install.sh new file mode 100644 index 0000000000..5ee81e04db --- /dev/null +++ b/build/packages-template/bbb-graphql-actions/before-install.sh @@ -0,0 +1,21 @@ +#!/bin/bash -e + +case "$1" in + install|upgrade|1|2) + + # handle renaming circa dec 2023 + if [[ -d /usr/local/bigbluebutton/bbb-graphql-actions-adapter-server ]] ; then + stopService bbb-graphql-actions-adapter-server || echo "bbb-graphql-actions-adapter-server could not be unregistered or stopped" + rm -f /usr/lib/systemd/system/bbb-graphql-actions-adapter-server.service + systemctl daemon-reload + rm -rf /usr/local/bigbluebutton/bbb-graphql-actions-adapter-server/ + fi + ;; + + abort-upgrade) + ;; + + *) + echo "## preinst called with unknown argument \`$1'" >&2 + ;; +esac diff --git a/build/packages-template/bbb-graphql-actions/before-remove.sh b/build/packages-template/bbb-graphql-actions/before-remove.sh new file mode 100755 index 0000000000..47cf9389be --- /dev/null +++ b/build/packages-template/bbb-graphql-actions/before-remove.sh @@ -0,0 +1,3 @@ +#!/bin/bash -e + +stopService bbb-graphql-actions || echo "bbb-graphql-actions could not be unregistered or stopped" diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/build.sh b/build/packages-template/bbb-graphql-actions/build.sh similarity index 51% rename from build/packages-template/bbb-graphql-actions-adapter-server/build.sh rename to build/packages-template/bbb-graphql-actions/build.sh index acf4595c86..44220f9df9 100755 --- a/build/packages-template/bbb-graphql-actions-adapter-server/build.sh +++ b/build/packages-template/bbb-graphql-actions/build.sh @@ -14,30 +14,30 @@ rm -rf staging # # package -mkdir -p staging/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server-temp +mkdir -p staging/usr/local/bigbluebutton/bbb-graphql-actions-temp -find -maxdepth 1 ! -path . ! -name staging $(printf "! -name %s " $(cat .build-files)) -exec cp -r {} staging/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server-temp/ \; +find -maxdepth 1 ! -path . ! -name staging $(printf "! -name %s " $(cat .build-files)) -exec cp -r {} staging/usr/local/bigbluebutton/bbb-graphql-actions-temp/ \; pushd . -cd staging/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server-temp/ +cd staging/usr/local/bigbluebutton/bbb-graphql-actions-temp/ npm -v npm ci --no-progress npm run build popd -mkdir -p staging/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server +mkdir -p staging/usr/local/bigbluebutton/bbb-graphql-actions pushd . -cd staging/usr/local/bigbluebutton/bbb-graphql-actions-adapter-server/ -mv ../bbb-graphql-actions-adapter-server-temp/dist/* . -mv index.js bbb-graphql-actions-adapter-server.js -cp ../bbb-graphql-actions-adapter-server-temp/package.json . -cp ../bbb-graphql-actions-adapter-server-temp/package-lock.json . +cd staging/usr/local/bigbluebutton/bbb-graphql-actions/ +mv ../bbb-graphql-actions-temp/dist/* . +mv index.js bbb-graphql-actions.js +cp ../bbb-graphql-actions-temp/package.json . +cp ../bbb-graphql-actions-temp/package-lock.json . npm ci --no-progress --omit=dev -rm -rf ../bbb-graphql-actions-adapter-server-temp/ +rm -rf ../bbb-graphql-actions-temp/ popd mkdir -p staging/usr/lib/systemd/system -cp bbb-graphql-actions-adapter-server.service staging/usr/lib/systemd/system +cp bbb-graphql-actions.service staging/usr/lib/systemd/system echo "List files" find staging/ @@ -51,8 +51,9 @@ find staging/ fpm -s dir -C ./staging -n $PACKAGE \ --version $VERSION --epoch $EPOCH \ --after-install after-install.sh \ + --before-install before-install.sh \ --before-remove before-remove.sh \ - --description "BigBlueButton GraphQL Actions Adapter Server" \ + --description "BigBlueButton GraphQL Actions" \ $DIRECTORIES \ $OPTS \ -d 'nodejs (>= 18)' -d 'nodejs (<< 20)' diff --git a/build/packages-template/bbb-graphql-actions-adapter-server/opts-jammy.sh b/build/packages-template/bbb-graphql-actions/opts-jammy.sh similarity index 100% rename from build/packages-template/bbb-graphql-actions-adapter-server/opts-jammy.sh rename to build/packages-template/bbb-graphql-actions/opts-jammy.sh diff --git a/build/packages-template/bbb-html5/opts-jammy.sh b/build/packages-template/bbb-html5/opts-jammy.sh index a9d8f6f461..77141447ab 100644 --- a/build/packages-template/bbb-html5/opts-jammy.sh +++ b/build/packages-template/bbb-html5/opts-jammy.sh @@ -1,3 +1,3 @@ . ./opts-global.sh -OPTS="$OPTS -d bc,bbb-pads,bbb-webrtc-sfu,bbb-export-annotations,bbb-web,bbb-html5-nodejs,bbb-graphql-middleware,bbb-graphql-actions-adapter-server,yq,mongodb-org -t deb" +OPTS="$OPTS -d bc,bbb-pads,bbb-webrtc-sfu,bbb-export-annotations,bbb-web,bbb-html5-nodejs,bbb-graphql-middleware,bbb-graphql-actions,yq,mongodb-org -t deb" diff --git a/docs/docs/administration/install.md b/docs/docs/administration/install.md index af0caf584c..97e5c58928 100644 --- a/docs/docs/administration/install.md +++ b/docs/docs/administration/install.md @@ -257,7 +257,7 @@ bbb-html5-backend@1 ——————————————————► [ bbb-html5-backend@2 ——————————————————► [✔ - active] bbb-html5-frontend@1 —————————————————► [✔ - active] bbb-html5-frontend@2 —————————————————► [✔ - active] -bbb-graphql-actions-adapter-server ———► [✔ - active] +bbb-graphql-actions ——————————————————► [✔ - active] bbb-graphql-middleware ———————————————► [✔ - active] bbb-graphql-server ———————————————————► [✔ - active] bbb-webrtc-sfu ———————————————————————► [✔ - active] @@ -284,7 +284,7 @@ ii bbb-export-annotations 1:3.0-2 amd64 BigBlueButto ii bbb-freeswitch-core 2:3.0-1 amd64 BigBlueButton build of FreeSWITCH ii bbb-freeswitch-sounds 1:3.0-1 amd64 FreeSWITCH Sounds ii bbb-fsesl-akka 1:3.0-5 all BigBlueButton FS-ESL (Akka) -ii bbb-graphql-actions-adapter-server 1:3.0-4 amd64 BigBlueButton GraphQL Actions Adapter Server +ii bbb-graphql-actions 1:3.0-5 amd64 BigBlueButton GraphQL Actions ii bbb-graphql-middleware 1:3.0-6 amd64 GraphQL middleware component for BigBlueButton ii bbb-graphql-server 1:3.0-5 amd64 GraphQL server component for BigBlueButton ii bbb-html5 1:3.0-10 amd64 The HTML5 components for BigBlueButton