fix: move UIDeviceTriggerPreview to remove cross-boundary access

Author: Julusian

meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx

@@ -5,7 +5,7 @@ import React, { useMemo } from 'react'
 import { MeteorPubSub } from '../../../../../../lib/api/pubsub'
 import { Studios } from '../../../../../collections'
 import { getCurrentTime } from '../../../../../../lib/lib'
-import { UIDeviceTriggerPreview } from '../../../../../../server/publications/deviceTriggersPreview'
+import { UIDeviceTriggerPreview } from '../../../../../../lib/api/triggers/MountedTriggers'
 import { useSubscription, useTracker } from '../../../../../lib/ReactMeteorData/ReactMeteorData'
 import { DeviceTriggersPreviews } from '../../../../Collections'
 import { DeviceTrigger } from './DeviceTrigger'

meteor/lib/api/pubsub.ts

@@ -23,7 +23,7 @@ import { DBUser } from '../collections/Users'
 import { UIBucketContentStatus, UIPieceContentStatus, UISegmentPartNote } from './rundownNotifications'
 import { UIShowStyleBase } from './showStyles'
 import { UIStudio } from './studios'
-import { UIDeviceTriggerPreview } from '../../server/publications/deviceTriggersPreview'
+import { UIDeviceTriggerPreview } from './triggers/MountedTriggers'
 import { logger } from '../logging'
 import { UIBlueprintUpgradeStatus } from './upgradeStatus'
 import {

meteor/lib/api/triggers/MountedTriggers.ts

@@ -1,6 +1,7 @@
 import { ISourceLayer, ITranslatableMessage } from '@sofie-automation/blueprints-integration'
 import {
 	AdLibActionId,
+	PeripheralDeviceId,
 	PieceId,
 	RundownBaselineAdLibActionId,
 	TriggeredActionId,
@@ -70,3 +71,14 @@ export interface MountedAdLibTrigger extends MountedTriggerCommon {
 }
 
 export type MountedAdLibTriggerId = ProtectedString<'mountedAdLibTriggerId'>
+
+export type DeviceTriggerPreviewId = ProtectedString<'deviceTriggerPreviewId'>
+
+export interface UIDeviceTriggerPreview {
+	_id: DeviceTriggerPreviewId
+	peripheralDeviceId: PeripheralDeviceId
+	triggerDeviceId: string
+	triggerId: string
+	timestamp: number
+	values?: DeviceTriggerArguments
+}

meteor/server/publications/deviceTriggersPreview.ts

@@ -1,32 +1,21 @@
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { getRandomId } from '@sofie-automation/corelib/dist/lib'
-import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
+import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { check } from 'meteor/check'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
 import { CustomCollectionName, MeteorPubSub } from '../../lib/api/pubsub'
-import { DeviceTriggerArguments } from '../../lib/api/triggers/MountedTriggers'
+import { DeviceTriggerArguments, UIDeviceTriggerPreview } from '../../lib/api/triggers/MountedTriggers'
 import { getCurrentTime } from '../../lib/lib'
 import { setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
 import { CustomPublish, meteorCustomPublish } from '../lib/customPublication/publish'
 import { StudioReadAccess } from '../security/studio'
 import { PeripheralDevices } from '../collections'
 
-type DeviceTriggerPreviewId = ProtectedString<'deviceTriggerPreviewId'>
-
 /** IDEA: This could potentially be a Capped Collection, thus enabling scaling Core horizontally:
  *  https://www.mongodb.com/docs/manual/core/capped-collections/ */
 const lastTriggers: Record<string, { triggers: UIDeviceTriggerPreview[]; updated?: (() => void) | undefined }> = {}
 
-export interface UIDeviceTriggerPreview {
-	_id: DeviceTriggerPreviewId
-	peripheralDeviceId: PeripheralDeviceId
-	triggerDeviceId: string
-	triggerId: string
-	timestamp: number
-	values?: DeviceTriggerArguments
-}
-
 meteorCustomPublish(
 	MeteorPubSub.deviceTriggersPreview,
 	CustomCollectionName.UIDeviceTriggerPreviews,