@sigmaott/base-next 1.4.52 → 1.4.54

package/locales/en.yaml

@@ -121,6 +121,7 @@ ReportSchedule:
   this_report_will_be_generated_and_sent_daily_at: This report will be generated and sent daily at
   you_must_select_at_least_one_day_of_the_week_for_weekly_report: You must select at least one day of the week for weekly report
 SSConfig:
+  please_choose_input_pid_in_same_program: Please choose input PID in same program
   add_ouput: Add ouput
   adobe_protocol_for_adaptive_bitrate_streaming_via_http: Adobe protocol for adaptive bitrate streaming via HTTP.
   adobe_protocol_for_low-latency_video_and_audio_streaming: Adobe protocol for low-latency video and audio streaming.

package/locales/vi.yaml

@@ -122,6 +122,7 @@ ReportSchedule:
   this_report_will_be_generated_and_sent_daily_at: Báo cáo này sẽ được tạo và gửi hàng ngày tại
   you_must_select_at_least_one_day_of_the_week_for_weekly_report: Bạn phải chọn ít nhất một ngày trong tuần để báo cáo hàng tuần
 SSConfig:
+  please_choose_input_pid_in_same_program: Vui lòng chọn Input PID cùng 1 Program
   add_ouput: Thêm đầu ra
   adobe_protocol_for_adaptive_bitrate_streaming_via_http: Adobe protocol for adaptive bitrate streaming via HTTP.
   adobe_protocol_for_low-latency_video_and_audio_streaming: Giao thức Adobe để truyền phát video và âm thanh có độ trễ thấp.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sigmaott/base-next",
   "type": "module",
-  "version": "1.4.52",
+  "version": "1.4.54",
   "publishConfig": {
     "access": "public"
   },
@@ -128,4 +128,4 @@
     "nuxt": "3.15.4",
     "vue-tsc": "^1.8.1"
   }
-}
+}

package/src/components/Channel/PresetConfigItemPId.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-const { prop, mediaType, isTranscode } = definePropsRefs<{
+const { prop, mediaType, isTranscode = false, idx } = definePropsRefs<{
   prop?: string
   mediaType?: string
-  isTranscode?: string
+  isTranscode?: boolean
+  idx?: number
 }>()
 
 function getProp(key: string) {
@@ -12,7 +13,35 @@ const { t } = useI18n()
 const { formValue } = useElFormContext()
 const isEvent = ref(inject('isEvent'))
 const isPackage = ref(inject('isPackage'))
-const { transcodeInput, packageInput } = useGetInputDetail({ formValue, isTranscode, isPackage, isEvent })
+const { transcodeInput, packageInput } = useGetInputDetail({
+  formValue,
+  isTranscode: computed(() => !!unref(isTranscode)),
+  isPackage,
+  isEvent,
+})
+
+function getProgramIdByPid(pid: string) {
+  if (!pid)
+    return null
+  let programs: any[] = []
+  let programMaps: any[] = []
+
+  if (isTranscode.value || isEvent.value) {
+    programs = Array.isArray(transcodeInput.value?.programs?.[0])
+      ? transcodeInput.value.programs[0]
+      : transcodeInput.value?.programs ?? []
+    programMaps = transcodeInput.value?.programMaps ?? []
+  }
+  else if (isPackage.value) {
+    programs = Array.isArray(packageInput.value?.programs?.[0])
+      ? packageInput.value.programs[0]
+      : packageInput.value?.programs ?? []
+    programMaps = packageInput.value?.programMaps ?? []
+  }
+  const programMap = programMaps.find((pm: any) => pm.pids?.split(',').includes(pid))
+  return programMap?.id
+}
+
 const [inputPIdValue, inputPIdAttrs] = useElField<string>(getProp('streamId'), [
   {
     message: t('SSConfig.please_enter_pid'),
@@ -40,6 +69,42 @@ const [inputPIdValue, inputPIdAttrs] = useElField<string>(getProp('streamId'), [
           return
         }
       }
+
+      const currentProgramId = getProgramIdByPid(value)
+      if (currentProgramId) {
+        const profiles = formValue.value?.profiles || []
+        if (isTranscode.value || isEvent.value) {
+          for (const profile of profiles) {
+            const hasConflict = profile.presets?.some((p: any) => {
+              if (p.streamId && p.streamId !== value) {
+                const otherId = getProgramIdByPid(p.streamId)
+                return otherId && otherId !== currentProgramId
+              }
+              return false
+            })
+            if (hasConflict) {
+              callback(new Error(t('SSConfig.please_choose_input_pid_in_same_program')))
+              return
+            }
+          }
+        }
+        else if (isPackage.value) {
+          const profileIdx = idx.value
+          const currentProfile = (profileIdx !== undefined && profileIdx !== null) ? profiles[profileIdx] : null
+          const hasConflict = currentProfile?.presets?.some((p: any) => {
+            if (p.streamId && p.streamId !== value) {
+              const otherId = getProgramIdByPid(p.streamId)
+              return otherId && otherId !== currentProgramId
+            }
+            return false
+          })
+          if (hasConflict) {
+            callback(new Error(t('SSConfig.please_choose_input_pid_in_same_program')))
+            return
+          }
+        }
+      }
+
       callback()
     },
     trigger: ['blur', 'change'],
@@ -78,7 +143,7 @@ const [outputPIdValue, outputPIdAttrs] = useElField<string>(getProp('pid'), [
   },
 ])
 
-function filterProgramsById(_programs) {
+function filterProgramsById(_programs: any[]) {
   return _programs?.filter((program) => {
     const id = program.id
 
@@ -93,21 +158,29 @@ function filterProgramsById(_programs) {
   })
 }
 function getStream(type: string) {
+  let programs: any[] = []
+
   if (isTranscode.value || isEvent.value) {
-    const programs = Array.isArray(transcodeInput.value?.programs?.[0])
+    programs = Array.isArray(transcodeInput.value?.programs?.[0])
       ? transcodeInput.value.programs[0]
       : transcodeInput.value?.programs ?? []
-
-    const newOptions = programs.filter(program => program.type === type)
-
-    return filterProgramsById(newOptions)
   }
   else if (isPackage.value) {
-    const newOptions = packageInput.value?.programs?.[0]?.filter(program => program.type === type)?.length > 0 ? packageInput.value?.programs?.[0]?.filter(program => program.type === type) : packageInput.value?.programs?.filter(program => program.type === type)
-    return filterProgramsById(newOptions)
+    programs = Array.isArray(packageInput.value?.programs?.[0])
+      ? packageInput.value.programs[0]
+      : packageInput.value?.programs ?? []
   }
 
-  return []
+  const filtered = programs.filter(program => program.type === type)
+
+  const newOptions = filtered.map((program) => {
+    return {
+      ...program,
+      programId: getProgramIdByPid(program.id),
+    }
+  })
+
+  return filterProgramsById(newOptions)
 }
 
 function handleChangeInputPID(value: string) {
@@ -126,7 +199,7 @@ function handleChangeOutputPID(value: string) {
 
 <template>
   <DevOnly>
-    <VueJsonPretty :data="packageInput" />
+    <VueJsonPretty :data="getStream(mediaType)" />
   </DevOnly>
   <div class="flex flex-wrap gap-2">
     <el-form-item label="Input PID" v-bind="inputPIdAttrs" class="w-586px">
@@ -134,7 +207,7 @@ function handleChangeOutputPID(value: string) {
         allow-create @change="handleChangeInputPID">
         <el-option v-for="(preset, index) in getStream(mediaType)" :key="`${preset.id} + ${index}`"
           class="w-700px !h-auto" :value="preset.id" :label="preset.id">
-          <SharedMediaInfoViewer :media="preset" />
+          <MediaInfoViewer :isShowPId="true" :media="preset" />
         </el-option>
       </el-select>
     </el-form-item>