camstreamerlib 4.0.0-beta.94 → 4.0.0-beta.96

package/cjs/types/CamStreamerAPI/streamCommonTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamCommonSchema = exports.internalVapixParametersSchema = exports.streamInputTypeSchema = exports.streamTriggerSchema = exports.streamTypeSchema = void 0;
+exports.streamCommonSchema = exports.streamAudioSchema = exports.streamTriggerSchema = exports.streamTypeSchema = void 0;
 const zod_1 = require("zod");
 exports.streamTypeSchema = zod_1.z.union([
     zod_1.z.literal('youtube'),
@@ -8,20 +8,8 @@ exports.streamTypeSchema = zod_1.z.union([
     zod_1.z.literal('sd_card'),
     zod_1.z.literal('windy'),
     zod_1.z.literal('mpeg_dvb'),
+    zod_1.z.literal('hls'),
     zod_1.z.literal('rtmp'),
-    zod_1.z.literal('dailymotion'),
-    zod_1.z.literal('ibm'),
-    zod_1.z.literal('hls_pull'),
-    zod_1.z.literal('hls_push'),
-    zod_1.z.literal('wowza'),
-    zod_1.z.literal('microsoft_stream'),
-    zod_1.z.literal('microsoft_azure'),
-    zod_1.z.literal('vimeo'),
-    zod_1.z.literal('twitch'),
-    zod_1.z.literal('church'),
-    zod_1.z.literal('srt'),
-    zod_1.z.literal('da_cast'),
-    zod_1.z.literal('game_changer'),
 ]);
 const scheduleSchema = zod_1.z.object({
     start: zod_1.z.object({
@@ -45,22 +33,28 @@ exports.streamTriggerSchema = zod_1.z.discriminatedUnion('type', [
         schedule: zod_1.z.array(scheduleSchema),
     }),
 ]);
-exports.streamInputTypeSchema = zod_1.z.union([zod_1.z.literal('CSw'), zod_1.z.literal('CRS'), zod_1.z.literal('RTSP_URL')]);
-exports.internalVapixParametersSchema = zod_1.z.object({
-    camera: zod_1.z.string(),
-    resolution: zod_1.z.string().optional(),
-    compression: zod_1.z.number().optional(),
-    fps: zod_1.z.number().int().optional(),
-    videobitrate: zod_1.z.number().int().optional(),
-    videomaxbitrate: zod_1.z.number().int().optional(),
-    audio: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]).optional(),
-});
+exports.streamAudioSchema = zod_1.z.discriminatedUnion('source', [
+    zod_1.z.object({
+        source: zod_1.z.literal('none'),
+    }),
+    zod_1.z.object({ source: zod_1.z.literal('microphone'), channel: zod_1.z.number().int().min(0) }),
+    zod_1.z.object({
+        source: zod_1.z.literal('file'),
+        fileName: zod_1.z.string(),
+        filePath: zod_1.z.string(),
+    }),
+    zod_1.z.object({
+        source: zod_1.z.literal('url'),
+        fileName: zod_1.z.string(),
+        fileUrl: zod_1.z.string(),
+        avSyncMsec: zod_1.z.number().int().nonnegative(),
+    }),
+]);
 exports.streamCommonSchema = zod_1.z.object({
     id: zod_1.z.number(),
     enabled: zod_1.z.boolean(),
     active: zod_1.z.boolean(),
     title: zod_1.z.string(),
     trigger: exports.streamTriggerSchema,
-    inputType: exports.streamInputTypeSchema,
-    internalVapixParameters: exports.internalVapixParametersSchema,
+    audio: exports.streamAudioSchema,
 });

package/cjs/types/CamStreamerAPI/windySchema.d.ts

@@ -97,36 +97,68 @@ export declare const windySchema: z.ZodObject<{
             isActive: boolean;
         }[];
     }>]>;
-    inputType: z.ZodUnion<[z.ZodLiteral<"CSw">, z.ZodLiteral<"CRS">, z.ZodLiteral<"RTSP_URL">]>;
-    internalVapixParameters: z.ZodObject<{
-        camera: z.ZodString;
-        resolution: z.ZodOptional<z.ZodString>;
-        compression: z.ZodOptional<z.ZodNumber>;
-        fps: z.ZodOptional<z.ZodNumber>;
-        videobitrate: z.ZodOptional<z.ZodNumber>;
-        videomaxbitrate: z.ZodOptional<z.ZodNumber>;
-        audio: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>>;
+    audio: z.ZodDiscriminatedUnion<"source", [z.ZodObject<{
+        source: z.ZodLiteral<"none">;
     }, "strip", z.ZodTypeAny, {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
+        source: "none";
     }, {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    }>;
+        source: "none";
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"microphone">;
+        channel: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        channel: number;
+        source: "microphone";
+    }, {
+        channel: number;
+        source: "microphone";
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"file">;
+        fileName: z.ZodString;
+        filePath: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    }, {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"url">;
+        fileName: z.ZodString;
+        fileUrl: z.ZodString;
+        avSyncMsec: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    }, {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    }>]>;
 } & {
     type: z.ZodLiteral<"windy">;
 }, "strip", z.ZodTypeAny, {
     type: "windy";
+    audio: {
+        source: "none";
+    } | {
+        channel: number;
+        source: "microphone";
+    } | {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    } | {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    };
     enabled: boolean;
     id: number;
     active: boolean;
@@ -152,18 +184,23 @@ export declare const windySchema: z.ZodObject<{
             isActive: boolean;
         }[];
     };
-    inputType: "RTSP_URL" | "CSw" | "CRS";
-    internalVapixParameters: {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    };
 }, {
     type: "windy";
+    audio: {
+        source: "none";
+    } | {
+        channel: number;
+        source: "microphone";
+    } | {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    } | {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    };
     enabled: boolean;
     id: number;
     active: boolean;
@@ -189,14 +226,4 @@ export declare const windySchema: z.ZodObject<{
             isActive: boolean;
         }[];
     };
-    inputType: "RTSP_URL" | "CSw" | "CRS";
-    internalVapixParameters: {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    };
 }>;

package/cjs/types/CamStreamerAPI/youtubeSchema.d.ts

@@ -97,36 +97,68 @@ export declare const youtubeSchema: z.ZodObject<{
             isActive: boolean;
         }[];
     }>]>;
-    inputType: z.ZodUnion<[z.ZodLiteral<"CSw">, z.ZodLiteral<"CRS">, z.ZodLiteral<"RTSP_URL">]>;
-    internalVapixParameters: z.ZodObject<{
-        camera: z.ZodString;
-        resolution: z.ZodOptional<z.ZodString>;
-        compression: z.ZodOptional<z.ZodNumber>;
-        fps: z.ZodOptional<z.ZodNumber>;
-        videobitrate: z.ZodOptional<z.ZodNumber>;
-        videomaxbitrate: z.ZodOptional<z.ZodNumber>;
-        audio: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>>;
+    audio: z.ZodDiscriminatedUnion<"source", [z.ZodObject<{
+        source: z.ZodLiteral<"none">;
     }, "strip", z.ZodTypeAny, {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
+        source: "none";
     }, {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    }>;
+        source: "none";
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"microphone">;
+        channel: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        channel: number;
+        source: "microphone";
+    }, {
+        channel: number;
+        source: "microphone";
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"file">;
+        fileName: z.ZodString;
+        filePath: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    }, {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    }>, z.ZodObject<{
+        source: z.ZodLiteral<"url">;
+        fileName: z.ZodString;
+        fileUrl: z.ZodString;
+        avSyncMsec: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    }, {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    }>]>;
 } & {
     type: z.ZodLiteral<"youtube">;
 }, "strip", z.ZodTypeAny, {
     type: "youtube";
+    audio: {
+        source: "none";
+    } | {
+        channel: number;
+        source: "microphone";
+    } | {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    } | {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    };
     enabled: boolean;
     id: number;
     active: boolean;
@@ -152,18 +184,23 @@ export declare const youtubeSchema: z.ZodObject<{
             isActive: boolean;
         }[];
     };
-    inputType: "RTSP_URL" | "CSw" | "CRS";
-    internalVapixParameters: {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    };
 }, {
     type: "youtube";
+    audio: {
+        source: "none";
+    } | {
+        channel: number;
+        source: "microphone";
+    } | {
+        source: "file";
+        fileName: string;
+        filePath: string;
+    } | {
+        source: "url";
+        fileName: string;
+        fileUrl: string;
+        avSyncMsec: number;
+    };
     enabled: boolean;
     id: number;
     active: boolean;
@@ -189,14 +226,4 @@ export declare const youtubeSchema: z.ZodObject<{
             isActive: boolean;
         }[];
     };
-    inputType: "RTSP_URL" | "CSw" | "CRS";
-    internalVapixParameters: {
-        camera: string;
-        resolution?: string | undefined;
-        compression?: number | undefined;
-        audio?: 0 | 1 | undefined;
-        fps?: number | undefined;
-        videobitrate?: number | undefined;
-        videomaxbitrate?: number | undefined;
-    };
 }>;

package/esm/types/CamStreamerAPI/CamStreamerAPI.js

@@ -1,48 +1,27 @@
 import { z } from 'zod';
 import { facebookSchema } from './facebookSchema';
+import { hlsSchema } from './hlsSchema';
 import { mpegDvbSchema } from './mpegDvbSchema';
 import { rtmpSchema } from './rtmpSchema';
 import { sdCardSchema } from './sdCardSchema';
 import { windySchema } from './windySchema';
 import { youtubeSchema } from './youtubeSchema';
-import { vimeoSchema } from './vimeoSchema';
-import { twitchSchema } from './twitchSchema';
-import { churchSchema } from './churchSchema';
-import { srtSchema } from './srtSchema';
-import { daCastSchema } from './daCastSchema';
-import { hlsPullSchema } from './hlsPullSchema';
-import { hlsPushSchema } from './hlsPushSchema';
-import { wowzaSchema } from './wowzaSchema';
-import { dailymotionSchema } from './dailymotionSchema';
-import { ibmSchema } from './ibmSchema';
-import { microsoftAzureSchema } from './microsoftAzureSchema';
-import { microsoftStreamSchema } from './microsoftStreamSchema';
-import { gameChangerSchema } from './gameChangerSchema';
 export const streamSchema = z.discriminatedUnion('type', [
     facebookSchema,
+    hlsSchema,
     mpegDvbSchema,
     rtmpSchema,
     sdCardSchema,
     windySchema,
     youtubeSchema,
-    vimeoSchema,
-    twitchSchema,
-    churchSchema,
-    srtSchema,
-    daCastSchema,
-    hlsPullSchema,
-    hlsPushSchema,
-    wowzaSchema,
-    dailymotionSchema,
-    ibmSchema,
-    microsoftAzureSchema,
-    microsoftStreamSchema,
-    gameChangerSchema,
 ]);
 export const streamListSchema = z.object({ streamList: z.array(streamSchema) });
 export const isFacebookStream = (stream) => {
     return stream.type === 'facebook';
 };
+export const isHlsStream = (stream) => {
+    return stream.type === 'hls';
+};
 export const isMpegDvbStream = (stream) => {
     return stream.type === 'mpeg_dvb';
 };
@@ -58,45 +37,6 @@ export const isWindyStream = (stream) => {
 export const isYouTubeStream = (stream) => {
     return stream.type === 'youtube';
 };
-export const isVimeoStream = (stream) => {
-    return stream.type === 'vimeo';
-};
-export const isTwitchStream = (stream) => {
-    return stream.type === 'twitch';
-};
-export const isChurchStream = (stream) => {
-    return stream.type === 'church';
-};
-export const isSrtStream = (stream) => {
-    return stream.type === 'srt';
-};
-export const isDaCastStream = (stream) => {
-    return stream.type === 'da_cast';
-};
-export const isHlsPullStream = (stream) => {
-    return stream.type === 'hls_pull';
-};
-export const isHlsPushStream = (stream) => {
-    return stream.type === 'hls_push';
-};
-export const isWowzaStream = (stream) => {
-    return stream.type === 'wowza';
-};
-export const isDailymotionStream = (stream) => {
-    return stream.type === 'dailymotion';
-};
-export const isIbmStream = (stream) => {
-    return stream.type === 'ibm';
-};
-export const isMicrosoftAzureStream = (stream) => {
-    return stream.type === 'microsoft_azure';
-};
-export const isMicrosoftStream = (stream) => {
-    return stream.type === 'microsoft_stream';
-};
-export const isGameChangerStream = (stream) => {
-    return stream.type === 'game_changer';
-};
 export var AudioType;
 (function (AudioType) {
     AudioType[AudioType["MP3"] = 0] = "MP3";
@@ -119,7 +59,13 @@ export const audioFileSchema = z.object({
     storage: audioFileStorageTypeSchema,
 });
 export const audioFileListSchema = z.array(audioFileSchema);
-export const audioFileDataSchema = z.object({
-    code: z.number(),
-    list: audioFileListSchema,
+export const audioUrlSchema = z.object({
+    fileUrl: z.string(),
+    name: z.string(),
+    storage: z.literal('url'),
+});
+export const audioLocalSchema = z.object({
+    file: z.instanceof(File),
+    name: z.string(),
+    storage: z.enum(['flash', 'SD0']),
 });

package/esm/types/CamStreamerAPI/{ibmSchema.js → hlsSchema.js}

@@ -1,5 +1,5 @@
 import z from 'zod';
 import { streamCommonSchema } from './streamCommonTypes';
-export const ibmSchema = streamCommonSchema.extend({
-    type: z.literal('ibm'),
+export const hlsSchema = streamCommonSchema.extend({
+    type: z.literal('hls'),
 });

package/esm/types/CamStreamerAPI/index.js

@@ -1,6 +1,7 @@
 export * from './CamStreamerAPI';
 export * from './streamCommonTypes';
 export * from './facebookSchema';
+export * from './hlsSchema';
 export * from './mpegDvbSchema';
 export * from './rtmpSchema';
 export * from './sdCardSchema';

package/esm/types/CamStreamerAPI/rtmpSchema.js

@@ -2,4 +2,7 @@ import z from 'zod';
 import { streamCommonSchema } from './streamCommonTypes';
 export const rtmpSchema = streamCommonSchema.extend({
     type: z.literal('rtmp'),
+    rtmpUrl: z.string().url(),
+    streamKey: z.string(),
+    streamIdentifier: z.string().optional(),
 });

package/esm/types/CamStreamerAPI/streamCommonTypes.js

@@ -5,20 +5,8 @@ export const streamTypeSchema = z.union([
     z.literal('sd_card'),
     z.literal('windy'),
     z.literal('mpeg_dvb'),
+    z.literal('hls'),
     z.literal('rtmp'),
-    z.literal('dailymotion'),
-    z.literal('ibm'),
-    z.literal('hls_pull'),
-    z.literal('hls_push'),
-    z.literal('wowza'),
-    z.literal('microsoft_stream'),
-    z.literal('microsoft_azure'),
-    z.literal('vimeo'),
-    z.literal('twitch'),
-    z.literal('church'),
-    z.literal('srt'),
-    z.literal('da_cast'),
-    z.literal('game_changer'),
 ]);
 const scheduleSchema = z.object({
     start: z.object({
@@ -42,22 +30,28 @@ export const streamTriggerSchema = z.discriminatedUnion('type', [
         schedule: z.array(scheduleSchema),
     }),
 ]);
-export const streamInputTypeSchema = z.union([z.literal('CSw'), z.literal('CRS'), z.literal('RTSP_URL')]);
-export const internalVapixParametersSchema = z.object({
-    camera: z.string(),
-    resolution: z.string().optional(),
-    compression: z.number().optional(),
-    fps: z.number().int().optional(),
-    videobitrate: z.number().int().optional(),
-    videomaxbitrate: z.number().int().optional(),
-    audio: z.union([z.literal(0), z.literal(1)]).optional(),
-});
+export const streamAudioSchema = z.discriminatedUnion('source', [
+    z.object({
+        source: z.literal('none'),
+    }),
+    z.object({ source: z.literal('microphone'), channel: z.number().int().min(0) }),
+    z.object({
+        source: z.literal('file'),
+        fileName: z.string(),
+        filePath: z.string(),
+    }),
+    z.object({
+        source: z.literal('url'),
+        fileName: z.string(),
+        fileUrl: z.string(),
+        avSyncMsec: z.number().int().nonnegative(),
+    }),
+]);
 export const streamCommonSchema = z.object({
     id: z.number(),
     enabled: z.boolean(),
     active: z.boolean(),
     title: z.string(),
     trigger: streamTriggerSchema,
-    inputType: streamInputTypeSchema,
-    internalVapixParameters: internalVapixParametersSchema,
+    audio: streamAudioSchema,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "camstreamerlib",
-    "version": "4.0.0-beta.94",
+    "version": "4.0.0-beta.96",
     "description": "Helper library for CamStreamer ACAP applications.",
     "prettier": "@camstreamer/prettier-config",
     "engine": {