@norskvideo/norsk-studio 1.27.0-2025-03-11-6b63bfb6 → 1.27.0-2025-03-13-5c343278

package/lib/extension/base-nodes.d.ts

@@ -1,5 +1,5 @@
 import { type AutoProcessorMediaNode, type AutoSinkMediaNode, type MediaNodeState, type SourceMediaNode, Context } from "@norskvideo/norsk-sdk";
-import { CreatedMediaNode, RelatedMediaNodes, RuntimeUpdates, StudioNodeSubscriptionSource } from "./runtime-types";
+import { CreatedMediaNode, RelatedMediaNodes, RuntimeUpdates, StudioComponentInputStream } from "./runtime-types";
 export type BaseAutoDuplexNodeSetup<State extends object = object, Event extends object = object> = {
     input: AutoSinkMediaNode<string>;
     output: SourceMediaNode[];
@@ -14,7 +14,7 @@ export declare class CustomAutoDuplexNode implements CreatedMediaNode {
     constructor(id: string);
     setup<State extends object = object, Event extends object = object>(setup: BaseAutoDuplexNodeSetup<State, Event>, opts?: SubscriptionOpts): void;
     close(): Promise<void>;
-    subscribe(sources: StudioNodeSubscriptionSource[], opts?: SubscriptionOpts): void;
+    subscribe(streams: StudioComponentInputStream[], opts?: SubscriptionOpts): Promise<void>;
 }
 export type BaseSourceNodeSetup<State extends object = object, Event extends object = object> = {
     output: SourceMediaNode[];
@@ -39,7 +39,7 @@ export declare class CustomSinkNode implements CreatedMediaNode {
     relatedMediaNodes: RelatedMediaNodes;
     constructor(id: string);
     setup<State extends object = object, Command extends object = object, Event extends object = object>(setup: BaseSinkNodeSetup<State, Command, Event>, opts?: SubscriptionOpts): void;
-    subscribe(sources: StudioNodeSubscriptionSource[], opts?: SubscriptionOpts): void;
+    subscribe(streams: StudioComponentInputStream[], opts?: SubscriptionOpts): Promise<void>;
     registerInput(input: MediaNodeState): void;
     close(): Promise<void>;
 }
@@ -58,5 +58,5 @@ export declare class SimpleProcessorWrapper extends CustomAutoDuplexNode {
     initialised: Promise<void>;
     constructor(id: string, create: () => Promise<AutoProcessorMediaNode<string>>, updates?: RuntimeUpdates);
 }
-export declare function defaultSubscription(innerInput: AutoSinkMediaNode<string>, sources: StudioNodeSubscriptionSource[], updates?: RuntimeUpdates, opts?: SubscriptionOpts): void;
-export declare function defaultValidation(sources: StudioNodeSubscriptionSource[], updates?: RuntimeUpdates, opts?: SubscriptionOpts): ((ctx: Context) => "accept" | "deny") | undefined;
+export declare function defaultSubscription(innerInput: AutoSinkMediaNode<string>, sources: StudioComponentInputStream[], updates?: RuntimeUpdates, opts?: SubscriptionOpts): void;
+export declare function defaultValidation(sources: StudioComponentInputStream[], updates?: RuntimeUpdates, opts?: SubscriptionOpts): ((ctx: Context) => "accept" | "deny") | undefined;

package/lib/extension/base-nodes.js

@@ -19,7 +19,7 @@ class CustomAutoDuplexNode {
         this._updates = setup.updates;
         this.opts = opts;
         this.relatedMediaNodes.addInput(setup.input);
-        setup.output.forEach((o) => this.relatedMediaNodes.addOutput(o));
+        this.relatedMediaNodes.addOutputs(setup.output);
     }
     async close() {
         await this.innerInput?.close();
@@ -28,9 +28,9 @@ class CustomAutoDuplexNode {
         if (this.innerInput)
             this.relatedMediaNodes.removeInput(this.innerInput);
     }
-    subscribe(sources, opts) {
+    async subscribe(streams, opts) {
         if (this.innerInput)
-            defaultSubscription(this.innerInput, sources, this._updates, opts || this.opts);
+            defaultSubscription(this.innerInput, streams, this._updates, opts || this.opts);
     }
 }
 exports.CustomAutoDuplexNode = CustomAutoDuplexNode;
@@ -66,9 +66,9 @@ class CustomSinkNode {
         this._updates = setup.updates;
         this.relatedMediaNodes.addInput(setup.sink);
     }
-    subscribe(sources, opts) {
+    async subscribe(streams, opts) {
         if (this.inner)
-            defaultSubscription(this.inner, sources, this._updates, opts || this.opts);
+            defaultSubscription(this.inner, streams, this._updates, opts || this.opts);
     }
     registerInput(input) {
         this.relatedMediaNodes.addInput(input);
@@ -106,10 +106,7 @@ class SimpleProcessorWrapper extends CustomAutoDuplexNode {
 }
 exports.SimpleProcessorWrapper = SimpleProcessorWrapper;
 function defaultSubscription(innerInput, sources, updates, opts) {
-    let subs = [];
-    sources.forEach((s) => {
-        subs = subs.concat(s.selectStreams());
-    });
+    const subs = sources.map((s) => s.select());
     if (subs.length > 0) {
         updates?.clearAlert('no-inputs-available');
         innerInput.subscribe(subs, defaultValidation(sources, updates, opts));
@@ -121,17 +118,14 @@ function defaultSubscription(innerInput, sources, updates, opts) {
     }
 }
 function defaultValidation(sources, updates, opts) {
-    const totalStreamsExpected = sources.reduce((acc, s) => {
-        return acc + s.streams.select.length;
-    }, 0);
     const requireAll = opts?.requireOneOfEverything == undefined ? false : opts.requireOneOfEverything;
     return requireAll ? (ctx) => {
-        if (ctx.streams.length == totalStreamsExpected) {
+        if (ctx.streams.length == sources.length) {
             updates?.clearAlert('not-all-streams-present');
             return "accept";
         }
         else {
-            updates?.setAlert('not-all-streams-present', { level: 'error', message: `This component requires all configured streams to be present. Expected: ${totalStreamsExpected}, Current: ${ctx.streams.length}` });
+            updates?.setAlert('not-all-streams-present', { level: 'error', message: `This component requires all configured streams to be present. Expected: ${sources.length}, Current: ${ctx.streams.length}` });
             return "deny";
         }
     } : undefined;

package/lib/extension/base-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-nodes.js","sourceRoot":"","sources":["../../src/extension/base-nodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-nodes.js","sourceRoot":"","sources":["../../src/extension/base-nodes.ts"],"names":[],"mappings":"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"}

package/lib/extension/client-types.d.ts

@@ -1,6 +1,6 @@
 import type { DocumentDescription, NodeDescription, NodeSubscriptionDescription, NodeValidationContext } from "../shared/document";
 import type * as Z from 'zod';
-import type { StreamKey, StreamMetadata, StreamMetadataMessage } from "@norskvideo/norsk-sdk";
+import type { StreamMetadataMessage } from "@norskvideo/norsk-sdk";
 export type Media = Exclude<StreamMetadataMessage["case"], undefined>;
 export declare const All: Media[];
 export declare const Av: Media[];
@@ -8,36 +8,49 @@ export declare const Audio: Media[];
 export declare const Video: Media[];
 export declare const Playlist: Media[];
 export declare const Subtitle: Media[];
-export declare function subscriptionMedia(s: NodeSubscriptionDescription<BaseConfig>): Media[];
-export declare function outputMedia(s: SubscriptionProduceInfo<BaseConfig> | undefined): Media[];
-export declare function inputMedia(s: SubscriptionAcceptInfo | undefined): Media[];
+export declare function subscriptionMedia<T extends BaseConfig>(s?: NodeSubscriptionDescription<T>): Media[];
+export declare function outputMedia(s: SubscriptionProduceInfo<BaseConfig> | undefined, cfg: BaseConfig, inputs: InputStreamDefinition[]): Media[];
+export declare function simpleToMedia(stream: SimpleStream): Media[];
+export declare function outputStreamComponents(s: SubscriptionProduceInfo<BaseConfig> | undefined, cfg: BaseConfig, inputs: InputStreamDefinition[]): OutputStreamDefinition[];
+export declare function inputMedia<Config extends BaseConfig>(s: SubscriptionAcceptInfo<Config> | undefined, cfg: Config): Media[];
+export type SimpleStream = {
+    type: 'simple-stream';
+    video?: true;
+    audio?: true;
+    ancillary?: true;
+    subtitle?: true;
+    sourceName?: string;
+    programNumber?: number;
+};
 export type ComponentCategory = 'input' | 'output' | 'processor';
-export type SubscriptionAcceptInfo = {
-    type: 'single-stream';
-    media: Media[];
-} | {
-    type: 'multi-stream';
-    media: Media[];
+export type SubscriptionProduceInfo<Config> = SimpleStream | {
+    type: 'dynamic-streams';
+    groupBy?: GroupingKey;
+    streams: (cfg: Config, inputStreams: OutputStreamDefinition[]) => OutputStreamDefinition[];
 };
-export type SubscriptionProduceInfo<Config> = {
-    type: 'single-stream';
-    media: Media[];
-} | {
-    type: 'fixed-list';
-    possibleMedia: Media[];
-    keys: (cfg: Config, subscriptions: NodeSubscriptionDescription<BaseConfig>[]) => FixedSubscriptionSelection[];
-    selector: (selectionKeys: string[], outputMetadata: StreamMetadata[], cfg: Config, subscriptions: NodeSubscriptionDescription<BaseConfig>[]) => StreamKey[];
-} | {
-    type: 'multi-stream';
-    media: Media[];
+export type OutputStreamDefinition = {
+    media: Media;
+    sourceName?: string;
+    programNumber?: number;
+    streamId?: number;
+    renditionName?: string;
 };
-export type FixedSubscriptionSelection = {
-    key: string;
-    media: Media[];
-    display: string;
+export type InputStreamDefinition = {
+    media: Media;
+    name?: string;
+    optional?: true;
+};
+export type GroupingKey = keyof Pick<OutputStreamDefinition, "streamId" | "sourceName" | "programNumber" | "renditionName">;
+export type SubscriptionAcceptInfo<Config> = SimpleStream | {
+    type: 'dynamic-streams';
+    mode?: {
+        type: 'multiple';
+        groupBy: GroupingKey;
+    } | 'any';
+    streams: (cfg: Config) => InputStreamDefinition[];
 };
 export type SubscriptionInfo<Config extends BaseConfig> = {
-    accepts?: SubscriptionAcceptInfo;
+    accepts?: SubscriptionAcceptInfo<Config>;
     produces?: SubscriptionProduceInfo<Config>;
 };
 export type InstanceUrls = {

package/lib/extension/client-types.js

@@ -29,41 +29,53 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistrationConsts = exports.Subtitle = exports.Playlist = exports.Video = exports.Audio = exports.Av = exports.All = void 0;
 exports.subscriptionMedia = subscriptionMedia;
 exports.outputMedia = outputMedia;
+exports.simpleToMedia = simpleToMedia;
+exports.outputStreamComponents = outputStreamComponents;
 exports.inputMedia = inputMedia;
 exports.discriminatedForm = discriminatedForm;
-exports.All = ["video", "audio", "subtitle"];
+exports.All = ["video", "audio", "subtitle", "ancillary"];
 exports.Av = ["video", "audio"];
 exports.Audio = ["audio"];
 exports.Video = ["video"];
 exports.Playlist = ["playlist"];
 exports.Subtitle = ["subtitle"];
 function subscriptionMedia(s) {
-    return s.streams.select;
+    if (!s)
+        return [];
+    return s.streams.filter.map((f) => f.media);
+}
+function outputMedia(s, cfg, inputs) {
+    const components = outputStreamComponents(s, cfg, inputs);
+    return [...new Set(components.map((s) => s.media)).values()];
+}
+function simpleToMedia(stream) {
+    const keys = Object.keys(stream);
+    return exports.All.filter((media) => {
+        return keys.includes(media);
+    });
 }
-function outputMedia(s) {
+function outputStreamComponents(s, cfg, inputs) {
     if (!s)
         return [];
     const t = s.type;
     switch (t) {
-        case 'single-stream':
-            return s.media;
-        case 'multi-stream':
-            return s.media;
-        case 'fixed-list':
-            return s.possibleMedia;
+        case 'simple-stream':
+            return simpleToMedia(s).map((media) => ({ media }));
+        case 'dynamic-streams':
+            return s.streams(cfg, inputs);
         default:
             (0, util_1.assertUnreachable)(t);
     }
 }
-function inputMedia(s) {
+function inputMedia(s, cfg) {
     if (!s)
         return [];
     const t = s.type;
     switch (t) {
-        case "multi-stream":
-            return s.media;
-        case "single-stream":
-            return s.media;
+        case "dynamic-streams":
+            return s.streams(cfg).map((s) => s.media);
+        case "simple-stream":
+            return simpleToMedia(s);
         default:
             (0, util_1.assertUnreachable)(t);
     }

package/lib/extension/client-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-types.js","sourceRoot":"","sources":["../../src/extension/client-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-types.js","sourceRoot":"","sources":["../../src/extension/client-types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,8CAGC;AAED,kCAGC;AAED,sCAKC;AAED,wDAgBC;AAED,gCAWC;AAmVD,8CAuBC;AA/ZY,QAAA,GAAG,GAAY,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;AAC3D,QAAA,EAAE,GAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACjC,QAAA,KAAK,GAAY,CAAC,OAAO,CAAC,CAAC;AAC3B,QAAA,KAAK,GAAY,CAAC,OAAO,CAAC,CAAC;AAC3B,QAAA,QAAQ,GAAY,CAAC,UAAU,CAAC,CAAC;AACjC,QAAA,QAAQ,GAAY,CAAC,UAAU,CAAC,CAAC;AAE9C,SAAgB,iBAAiB,CAAuB,CAAkC;IACxF,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AAC7C,CAAC;AAED,SAAgB,WAAW,CAAC,CAAkD,EAAE,GAAe,EAAE,MAA+B;IAC9H,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAI,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAChE,CAAC;AAED,SAAgB,aAAa,CAAC,MAAoB;IAChD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,WAAG,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,sBAAsB,CAAC,CAAkD,EAAE,GAAe,EAAE,MAA+B;IACzI,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAClB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC;QAGV,KAAK,eAAe;YAClB,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAItD,KAAK,iBAAiB;YACpB,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAC/B;YACE,IAAA,wBAAiB,EAAC,CAAC,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAgB,UAAU,CAA4B,CAA6C,EAAE,GAAW;IAC9G,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IAClB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,iBAAiB;YACpB,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,KAAK,eAAe;YAClB,OAAO,aAAa,CAAC,CAAC,CAAC,CAAA;QACzB;YACE,IAAA,wBAAiB,EAAC,CAAC,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAmVD,SAAgB,iBAAiB,CAAyD,KAEzF;IAEC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3C,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,KAAK,CAAC,CAAU,CAAC,CAAC,OAAO;KACnC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,OAAO;QACP,KAAK,EAAE,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;QACzC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;YACV,MAAM,CAAC,GAAgC;gBACrC,IAAI,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG;gBACnB,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU;oBAChB,YAAY,EAAE,CAAU;iBACzB;aACF,CAAC;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,CAAU,CAAC,CAAC,IAAI,EAA0B,CAAA;QAC3E,CAAC;KACF,CAAA;AACH,CAAC;AAOD,iBAAiB,CAAC,IAAI,GAAG,UAAkE,KAE1F;IAEC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3C,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,KAAK,CAAC,CAAU,CAAC,CAAC,OAAO;KACnC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,OAAO;QACP,KAAK,EAAE,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;QACzC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;YACV,MAAM,CAAC,GAAgC;gBACrC,IAAI,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG;gBACnB,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU;oBAChB,YAAY,EAAE,CAAU;iBACzB;aACF,CAAC;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC,CAAU,CAAC,CAAC,IAAI,EAA0B,CAAA;QAC3E,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAmED,yDAA2C;AAC3C,iDAAmC;AACnC,kDAAmD;AACnD,yCAAmD;AAItC,QAAA,kBAAkB,GAAG;IAEhC,eAAe,EAAE,CAGyB,IAAkE,EAAgE,EAAE,CAAC,IAAI;IACnL,aAAa,EAAE,CAAC,OAAoB,EAAe,EAAE,CAAC,OAAO;IAC7D,iBAAiB,EAAjB,wBAAiB;IACjB,GAAG,EAAH,WAAG;IACH,KAAK,EAAL,aAAK;IACL,KAAK,EAAL,aAAK;IACL,EAAE,EAAF,UAAE;IACF,QAAQ,EAAR,gBAAQ;IACR,QAAQ,EAAR,gBAAQ;IACR,UAAU;IACV,MAAM;IACN,KAAK,EAAL,eAAK;CACN,CAAA"}

package/lib/extension/runtime-types.d.ts

@@ -1,8 +1,7 @@
-import { AmdMA35DLoad, CurrentLoad, MediaNodeId, MediaNodeState, Norsk, ReceiveFromAddress, ReceiveFromAddressAuto, SourceMediaNode, StreamKey, StreamMetadata, SubscribeDestination } from '@norskvideo/norsk-sdk';
+import { AmdMA35DLoad, CurrentLoad, MediaNodeId, MediaNodeState, Norsk, ReceiveFromAddress, ReceiveFromAddressAuto, SourceMediaNode, StreamMetadata } from '@norskvideo/norsk-sdk';
 import { ReportBuilder } from '../runtime/execution';
-import { BaseConfig, Media, NodeInfo } from './client-types';
+import { BaseConfig, Media, NodeInfo, OutputStreamDefinition } from './client-types';
 import { IRouter, RequestHandler } from 'express';
-import { NodeDescription, SubscriptionConfiguration } from '../shared/document';
 import { HardwareAccelerationType } from '../shared/config';
 import EventHandler from 'eventhandler';
 import { ComponentAlert } from '../shared/server-msg';
@@ -15,6 +14,7 @@ export declare class RelatedMediaNodes {
     evs: EventHandler;
     constructor();
     onChange(handler: () => void): void;
+    removeOnChange(handler: () => void): void;
     addInput(node: MediaNodeState): void;
     addInputs(nodes: MediaNodeState[]): void;
     addOutputs(nodes: SourceMediaNode[]): void;
@@ -22,47 +22,18 @@ export declare class RelatedMediaNodes {
     removeInput(node: MediaNodeState): void;
     removeOutput(node: SourceMediaNode): void;
 }
-export type ActiveStream = {
-    mediaNode: SourceMediaNode;
-    metadata: StreamMetadata;
-};
-export declare class StudioNodeSubscriptionSource {
+export interface StudioComponentInputStream {
     source: CreatedMediaNode;
-    sourceDescription: NodeDescription<BaseConfig>;
-    streams: SubscriptionConfiguration;
-    sourceConfig: BaseConfig;
-    contextChangeHandlers: SubscribeDestination[];
-    info?: NodeInfo<BaseConfig>;
-    accepted: Map<Media, ActiveStream>;
-    constructor(source: CreatedMediaNode, description: NodeDescription<BaseConfig>, streams: SubscriptionConfiguration, info?: NodeInfo<BaseConfig>);
-    selectStreams(additional?: (metadata: StreamMetadata[]) => StreamKey[]): ReceiveFromAddressAuto[];
-    selectKeys(keys: string[], additional?: (metadata: StreamMetadata[]) => StreamKey[]): ReceiveFromAddressAuto[];
-    selectVideo(): ReceiveFromAddressAuto[];
-    selectAudio(): ReceiveFromAddressAuto[];
-    selectAV(): ReceiveFromAddressAuto[];
-    selectVideoForKey(key: string): ReceiveFromAddressAuto[];
-    selectAudioForKey(key: string): ReceiveFromAddressAuto[];
-    selectAVForKey(key: string): ReceiveFromAddressAuto[];
-    selectStreamsToPin<Pins extends string>(p: Pins, additional?: (metadata: StreamMetadata[]) => StreamKey[], keys?: string[]): ReceiveFromAddress<Pins>[];
-    selectVideoToPin<Pins extends string>(p: Pins): ReceiveFromAddress<Pins>[];
-    selectVideoToPinForKey<Pins extends string>(p: Pins, key: string): ReceiveFromAddress<Pins>[];
-    selectAudioToPin<Pins extends string>(p: Pins): ReceiveFromAddress<Pins>[];
-    selectAudioToPinForKey<Pins extends string>(p: Pins, key: string): ReceiveFromAddress<Pins>[];
-    selectAvToPin<Pins extends string>(p: Pins): ReceiveFromAddress<Pins>[];
-    selectAvToPinForKey<Pins extends string>(p: Pins, key: string): ReceiveFromAddress<Pins>[];
-    latestStreams(filterOverride?: string[]): ActiveStream[];
-    filterStreams(streams: ActiveStream[], filterOverride?: string[]): ActiveStream[];
-    onSourceNodesChange(): void;
-    registerForContextChange(handler: SubscribeDestination): void;
-    unregisterForContextChange(handler: SubscribeDestination): void;
-    _availableSourceKeys(): string[];
-    activeSourceKeys(): string[];
+    definition: OutputStreamDefinition;
+    metadata?: StreamMetadata;
+    select(): ReceiveFromAddressAuto;
+    selectToPin<Pin extends string>(p: Pin): ReceiveFromAddress<Pin>;
+    isMedia(media: Media): boolean;
 }
 export interface CreatedMediaNode {
     id: MediaNodeId;
     relatedMediaNodes: RelatedMediaNodes;
-    subscribe?: (sources: StudioNodeSubscriptionSource[]) => void;
-    selectOutputs?: (selectionKeys: string[]) => StreamKey[];
+    subscribe?: (streams: StudioComponentInputStream[]) => Promise<void>;
 }
 export interface Storage {
     identifier: string;

package/lib/extension/runtime-types.js

@@ -26,15 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StudioNodeSubscriptionSource = exports.RelatedMediaNodes = void 0;
+exports.RelatedMediaNodes = void 0;
 exports.hydratePathsObject = hydratePathsObject;
 exports.routeInfoFromSchemas = routeInfoFromSchemas;
 exports.makeRelativeToNode = makeRelativeToNode;
 exports.streamsOfMediaType = streamsOfMediaType;
-const norsk_sdk_1 = require("@norskvideo/norsk-sdk");
 const path = __importStar(require("path"));
 const util_1 = require("../shared/util");
-const logging_1 = require("../server/logging");
 const eventhandler_1 = __importDefault(require("eventhandler"));
 class RelatedMediaNodes {
     _input = [];
@@ -51,6 +49,9 @@ class RelatedMediaNodes {
     onChange(handler) {
         this.evs.on('change', handler);
     }
+    removeOnChange(handler) {
+        this.evs.removeEventListener('change', handler);
+    }
     addInput(node) {
         this._input.push(node);
         this.evs.emit('change', {});
@@ -77,236 +78,6 @@ class RelatedMediaNodes {
     }
 }
 exports.RelatedMediaNodes = RelatedMediaNodes;
-class StudioNodeSubscriptionSource {
-    source;
-    sourceDescription;
-    streams;
-    sourceConfig;
-    contextChangeHandlers = [];
-    info;
-    accepted = new Map();
-    constructor(source, description, streams, info) {
-        this.sourceConfig = description.config;
-        this.sourceDescription = description;
-        this.source = source;
-        this.streams = streams;
-        this.info = info;
-        this.source.relatedMediaNodes.onChange(this.onSourceNodesChange.bind(this));
-    }
-    selectStreams(additional) {
-        return this.source.relatedMediaNodes.output.map((output) => {
-            return {
-                source: output,
-                sourceSelector: (streams) => {
-                    const matching = this.filterStreams(streams.map((m) => ({ mediaNode: output, metadata: m })))
-                        .map((m) => m.metadata);
-                    if (additional) {
-                        return additional(matching);
-                    }
-                    else {
-                        return matching.map((m) => m.streamKey);
-                    }
-                }
-            };
-        });
-    }
-    selectKeys(keys, additional) {
-        return this.source.relatedMediaNodes.output.map((output) => {
-            return {
-                source: output,
-                sourceSelector: (streams) => {
-                    const matching = this.filterStreams(streams.map((m) => ({ mediaNode: output, metadata: m })), keys)
-                        .map((m) => m.metadata);
-                    if (additional) {
-                        return additional(matching);
-                    }
-                    else {
-                        return matching.map((m) => m.streamKey);
-                    }
-                }
-            };
-        });
-    }
-    selectVideo() {
-        return this.selectStreams(norsk_sdk_1.selectVideo);
-    }
-    selectAudio() {
-        return this.selectStreams(norsk_sdk_1.selectAudio);
-    }
-    selectAV() {
-        return this.selectStreams(norsk_sdk_1.selectAV);
-    }
-    selectVideoForKey(key) {
-        return this.selectKeys([key], norsk_sdk_1.selectVideo);
-    }
-    selectAudioForKey(key) {
-        return this.selectKeys([key], norsk_sdk_1.selectAudio);
-    }
-    selectAVForKey(key) {
-        return this.selectKeys([key], norsk_sdk_1.selectAV);
-    }
-    selectStreamsToPin(p, additional, keys) {
-        return this.source.relatedMediaNodes.output.map((output) => {
-            return {
-                source: output,
-                sourceSelector: (streams) => {
-                    const matching = this.filterStreams(streams.map((m) => ({ mediaNode: output, metadata: m })), keys)
-                        .map((m) => m.metadata);
-                    if (additional) {
-                        return { [p]: additional(matching) };
-                    }
-                    else {
-                        return {
-                            [p]: matching.map((m) => m.streamKey)
-                        };
-                    }
-                }
-            };
-        });
-    }
-    selectVideoToPin(p) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectVideo);
-    }
-    selectVideoToPinForKey(p, key) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectVideo, [key]);
-    }
-    selectAudioToPin(p) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectAudio);
-    }
-    selectAudioToPinForKey(p, key) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectAudio, [key]);
-    }
-    selectAvToPin(p) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectAV);
-    }
-    selectAvToPinForKey(p, key) {
-        return this.selectStreamsToPin(p, norsk_sdk_1.selectAV, [key]);
-    }
-    latestStreams(filterOverride) {
-        return this.filterStreams(this.source.relatedMediaNodes.output.flatMap((n => n.outputStreams.map((s) => ({ mediaNode: n, metadata: s })))), filterOverride);
-    }
-    filterStreams(streams, filterOverride) {
-        const output = this.source.relatedMediaNodes.output;
-        if (!output) {
-            (0, logging_1.debuglog)("No output on subscription source", this.source.id);
-            return [];
-        }
-        const sType = this.streams.type;
-        switch (sType) {
-            case "take-all-streams": {
-                const media = this.streams.select;
-                const producer = this.info?.subscription.produces;
-                if (filterOverride && producer?.type == 'fixed-list') {
-                    const needle = filterOverride ? filterOverride : this.activeSourceKeys();
-                    (0, logging_1.sillylog)("Searching for filter keys in streams", { needle, streams: streams.map((m) => m.metadata.streamKey) });
-                    const keys = this.source.selectOutputs
-                        ? this.source.selectOutputs(needle)
-                        : producer.selector(needle, streams.map((s) => s.metadata), this.sourceConfig, this.sourceDescription.subscriptions);
-                    return streams.filter((s) => s.metadata.streamKey && keys.find((k) => (0, norsk_sdk_1.streamKeysAreEqual)(k, s.metadata.streamKey)) && streamsOfMediaType(this.streams.select)(s.metadata));
-                }
-                else if (filterOverride) {
-                    (0, logging_1.warninglog)("Component attempting to use filterovverride in filterStreams, but source is not a fixed-list", { source: this.source.id, component: this.info?.identifier });
-                }
-                return streams.filter((s) => streamsOfMediaType(media)(s.metadata));
-            }
-            case "take-first-stream": {
-                const media = this.streams.select;
-                for (const m of media) {
-                    if (!this.accepted.get(m)) {
-                        const matching = streams.find((s) => streamsOfMediaType([m])(s.metadata));
-                        if (matching) {
-                            (0, logging_1.sillylog)("TFS: Subscription accepting stream key from source", {
-                                streamKey: matching.metadata.streamKey,
-                                source: this.source.id,
-                                media: m
-                            });
-                            this.accepted.set(m, matching);
-                        }
-                        continue;
-                    }
-                    if (this.accepted.get(m) && streams.find((s) => _streamKeysAreEqual(s.metadata.streamKey, this.accepted.get(m)?.metadata.streamKey))) {
-                        continue;
-                    }
-                    const existing = this.accepted.get(m);
-                    if (existing) {
-                        (0, logging_1.sillylog)("TFS: Subscription removing stream key from source", {
-                            streamKey: existing.metadata.streamKey,
-                            source: this.source.id,
-                            media: m
-                        });
-                        this.accepted.delete(m);
-                    }
-                }
-                return [...this.accepted.values()];
-            }
-            case "take-specific-stream":
-            case "take-specific-streams": {
-                const producer = this.info?.subscription.produces;
-                if (producer?.type != 'fixed-list') {
-                    (0, logging_1.errorlog)("Badly constructed subscription, fixed list not available", { producer, id: this.source.id });
-                    return [];
-                }
-                const needle = filterOverride ? filterOverride : this.activeSourceKeys();
-                (0, logging_1.sillylog)("Searching for filter keys in streams", { needle, streams: streams.map((m) => m.metadata.streamKey) });
-                const keys = this.source.selectOutputs
-                    ? this.source.selectOutputs(needle)
-                    : producer.selector(needle, streams.map((s) => s.metadata), this.sourceConfig, this.sourceDescription.subscriptions);
-                const selected = streams.filter((s) => s.metadata.streamKey && keys.find((k) => (0, norsk_sdk_1.streamKeysAreEqual)(k, s.metadata.streamKey)) && streamsOfMediaType(this.streams.select)(s.metadata));
-                (0, logging_1.sillylog)("Searched", { needle, selected: selected.map(s => s.metadata), streams });
-                return selected;
-            }
-            default:
-                (0, util_1.assertUnreachable)(sType);
-        }
-    }
-    onSourceNodesChange() {
-        this.contextChangeHandlers.forEach((h) => {
-            this.source.relatedMediaNodes.output.forEach((s) => s.registerForContextChange(h));
-        });
-    }
-    registerForContextChange(handler) {
-        this.source.relatedMediaNodes.output.forEach((s) => s.registerForContextChange(handler));
-        this.contextChangeHandlers.push(handler);
-    }
-    unregisterForContextChange(handler) {
-        this.source.relatedMediaNodes.output.forEach((s) => s.unregisterForContextChange(handler));
-        this.contextChangeHandlers = this.contextChangeHandlers.filter((h) => h !== handler);
-    }
-    _availableSourceKeys() {
-        const producer = this.info?.subscription.produces;
-        if (producer?.type != 'fixed-list') {
-            (0, logging_1.errorlog)("Badly constructed subscription, fixed list not available", { producer, id: this.source.id });
-            return [];
-        }
-        return producer.keys(this.sourceConfig, this.sourceDescription.subscriptions).map((s) => s.key);
-    }
-    activeSourceKeys() {
-        const producer = this.info?.subscription.produces;
-        if (producer?.type != 'fixed-list') {
-            (0, logging_1.errorlog)("Badly constructed subscription, fixed list not available", { producer, id: this.source.id });
-            return [];
-        }
-        const sType = this.streams.type;
-        switch (sType) {
-            case 'take-all-streams':
-                return this._availableSourceKeys();
-            case 'take-first-stream':
-                return this._availableSourceKeys().slice(0, 1);
-            case 'take-specific-stream':
-                return [this.streams.filter];
-            case 'take-specific-streams':
-                return this.streams.filter;
-            default:
-                (0, util_1.assertUnreachable)(sType);
-        }
-    }
-}
-exports.StudioNodeSubscriptionSource = StudioNodeSubscriptionSource;
-function _streamKeysAreEqual(l, r) {
-    if (!l || !r)
-        return false;
-    return (0, norsk_sdk_1.streamKeysAreEqual)(l, r);
-}
 function hydratePathsObject(target, source, tags) {
     if (source.type)
         return;