-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
434 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule protocol
updated
23 files
| +36 −0 | factory/mysqlDb.go | |
| +57 −0 | factory/redis.go | |
| +3 −3 | generate.sh | |
| +26 −17 | go.mod | |
| +68 −480 | go.sum | |
| +2 −2 | plugnmeet/plugnmeet_auth_recording.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_auth_room.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_breakout_room.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_common.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_common_api.pb.go | |
| +279 −167 | plugnmeet/plugnmeet_create_room.pb.go | |
| +155 −0 | plugnmeet/plugnmeet_create_room.pb.validate.go | |
| +2 −2 | plugnmeet/plugnmeet_datamessage.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_gen_token.pb.go | |
| +308 −0 | plugnmeet/plugnmeet_ingress.pb.go | |
| +250 −0 | plugnmeet/plugnmeet_ingress.pb.validate.go | |
| +2 −2 | plugnmeet/plugnmeet_lti_v1.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_polls.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_recorder.pb.go | |
| +2 −2 | plugnmeet/plugnmeet_recording.pb.go | |
| +9 −0 | proto_files/plugnmeet_create_room.proto | |
| +24 −0 | proto_files/plugnmeet_ingress.proto | |
| +31 −0 | utils/create_room.go |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| import React, { useState } from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { toast } from 'react-toastify'; | ||
| import { isEmpty } from 'lodash'; | ||
|
|
||
| import { IIngressFeatures } from '../../../store/slices/interfaces/session'; | ||
| import { | ||
| CreateIngressReq, | ||
| CreateIngressRes, | ||
| IngressInput, | ||
| } from '../../../helpers/proto/plugnmeet_ingress_pb'; | ||
| import { RootState, store, useAppSelector } from '../../../store'; | ||
| import sendAPIRequest from '../../../helpers/api/plugNmeetAPI'; | ||
| import { createSelector } from '@reduxjs/toolkit'; | ||
|
|
||
| interface IngressProps { | ||
| features: IIngressFeatures; | ||
| } | ||
|
|
||
| const ingressFeaturesSelector = createSelector( | ||
| (state: RootState) => | ||
| state.session.currentRoom?.metadata?.room_features.ingress_features, | ||
| (ingress_features) => ingress_features, | ||
| ); | ||
|
|
||
| const Ingress = () => { | ||
| const { t } = useTranslation(); | ||
| const [name, setName] = useState<string>('broadcaster'); | ||
| const [errorMsg, setErrorMsg] = useState<string | null>(null); | ||
| const session = store.getState().session; | ||
| const ingressFeatures = useAppSelector(ingressFeaturesSelector); | ||
|
|
||
| const onSubmit = async (e) => { | ||
| e.preventDefault(); | ||
| setErrorMsg(null); | ||
|
|
||
| if (!ingressFeatures?.is_allow) { | ||
| setErrorMsg(t('ingress-features.feature-not-allow')); | ||
| return; | ||
| } | ||
| let participantName = name; | ||
|
|
||
| if (isEmpty(participantName)) { | ||
| participantName = 'broadcaster'; | ||
| } | ||
|
|
||
| const body = new CreateIngressReq({ | ||
| inputType: IngressInput.RTMP_INPUT, | ||
| participantName: participantName, | ||
| roomId: session.currentRoom.room_id, | ||
| }); | ||
|
|
||
| const r = await sendAPIRequest( | ||
| 'ingress/create', | ||
| body.toBinary(), | ||
| false, | ||
| 'application/protobuf', | ||
| 'arraybuffer', | ||
| ); | ||
| const res = CreateIngressRes.fromBinary(new Uint8Array(r)); | ||
| if (!res.status) { | ||
| toast(t(res.msg), { | ||
| type: 'error', | ||
| isLoading: false, | ||
| autoClose: 1000, | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| const renderFrom = () => { | ||
| return ( | ||
| <> | ||
| <form method="POST" onSubmit={(e) => onSubmit(e)}> | ||
| <div className=""> | ||
| <label | ||
| htmlFor="stream-key" | ||
| className="block text-sm font-medium text-gray-700 dark:text-darkText" | ||
| > | ||
| {t('ingress-features.join-as-name')} | ||
| </label> | ||
| <input | ||
| type="text" | ||
| name="name" | ||
| id="name" | ||
| value={name} | ||
| onChange={(e) => setName(e.currentTarget.value)} | ||
| className="mt-1 px-4 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm rounded-md h-10 border border-solid border-black/50 dark:border-darkText bg-transparent dark:text-darkText" | ||
| /> | ||
| {errorMsg ? ( | ||
| <div className="error-msg text-xs text-red-600 py-2"> | ||
| {errorMsg} | ||
| </div> | ||
| ) : null} | ||
| </div> | ||
| <div className="pb-3 pt-4 bg-gray-50 dark:bg-transparent text-right mt-4"> | ||
| <button | ||
| type="submit" | ||
| className="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-primaryColor hover:bg-secondaryColor focus:outline-none focus:ring-2 focus:ring-offset-2 focus:bg-secondaryColor" | ||
| > | ||
| {t('ingress-features.gen-link')} | ||
| </button> | ||
| </div> | ||
| </form> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| const render = () => { | ||
| return ( | ||
| <> | ||
| <div className="grid"> | ||
| <div className="flex items-center justify-start"> | ||
| <label | ||
| htmlFor="language" | ||
| className="pr-4 w-full dark:text-darkText" | ||
| > | ||
| {t('ingress-features.rtmp-url')} | ||
| </label> | ||
| <input | ||
| type="text" | ||
| readOnly={true} | ||
| name="url" | ||
| id="url" | ||
| value={ingressFeatures?.url} | ||
| className="mt-1 px-4 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm rounded-md h-10 border border-solid border-black/50 dark:border-darkText bg-transparent dark:text-darkText" | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div className="grid"> | ||
| <div className="flex items-center justify-start"> | ||
| <label | ||
| htmlFor="language" | ||
| className="pr-4 w-full dark:text-darkText" | ||
| > | ||
| {t('ingress-features.rtmp-key')} | ||
| </label> | ||
| <input | ||
| type="text" | ||
| readOnly={true} | ||
| name="stream_key" | ||
| id="stream_key" | ||
| value={ingressFeatures?.stream_key} | ||
| className="mt-1 px-4 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm rounded-md h-10 border border-solid border-black/50 dark:border-darkText bg-transparent dark:text-darkText" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="mt-2"> | ||
| {isEmpty(ingressFeatures?.url) && isEmpty(ingressFeatures?.stream_key) | ||
| ? renderFrom() | ||
| : render()} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Ingress; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.