camstreamerlib 4.0.0-beta.32 → 4.0.0-beta.34

package/cjs/{events → node/events}/AxisCameraStationEvents.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AxisCameraStationEvents = void 0;
-const utils_1 = require("../internal/utils");
-const ProxyClient_1 = require("../internal/ProxyClient");
-const node_1 = require("../node");
+const utils_1 = require("../../internal/utils");
+const ProxyClient_1 = require("../../internal/ProxyClient");
+const DefaultClient_1 = require("../DefaultClient");
 class AxisCameraStationEvents {
     sourceKey;
     client;
     constructor(clientOptions, sourceKey) {
         this.sourceKey = sourceKey;
-        this.client = new node_1.DefaultClient(clientOptions);
+        this.client = new DefaultClient_1.DefaultClient(clientOptions);
     }
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;

package/cjs/{events → node/events}/GenetecAgent.js

@@ -1,31 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenetecAgent = exports.cameraDetailsResponseSchema = exports.cameraDetailSchema = void 0;
+exports.GenetecAgent = void 0;
 const zod_1 = require("zod");
-const utils_1 = require("../internal/utils");
-const ACTION = 'AddCameraBookmark';
-const GET_CAMERAS_URL = 'report/EntityConfiguration?q=EntityTypes@Camera';
-const GET_CAMERAS_DETAILS_URL = '/entity?q=';
-const cameraGuidsResponseSchema = zod_1.z.object({
+const utils_1 = require("../../internal/utils");
+const successResponseSchema = zod_1.z.object({
     Rsp: zod_1.z.object({
-        Status: zod_1.z.string(),
-        Result: zod_1.z.array(zod_1.z.object({ Guid: zod_1.z.string() })),
+        Status: zod_1.z.literal('Ok'),
     }),
 });
-const connectionResponseSchema = zod_1.z.object({
+const cameraGuidsResponseSchema = zod_1.z.object({
     Rsp: zod_1.z.object({
-        Status: zod_1.z.string(),
+        Status: zod_1.z.literal('Ok'),
+        Result: zod_1.z.array(zod_1.z.object({ Guid: zod_1.z.string() })),
     }),
 });
-exports.cameraDetailSchema = zod_1.z.object({
+const cameraDetailSchema = zod_1.z.object({
     Guid: zod_1.z.string().optional(),
     Name: zod_1.z.string().optional(),
     EntityType: zod_1.z.string().optional(),
 });
-exports.cameraDetailsResponseSchema = zod_1.z.object({
+const cameraDetailsResponseSchema = zod_1.z.object({
     Rsp: zod_1.z.object({
-        Status: zod_1.z.string(),
-        Result: zod_1.z.union([zod_1.z.array(exports.cameraDetailSchema), exports.cameraDetailSchema]),
+        Status: zod_1.z.literal('Ok'),
+        Result: zod_1.z.union([zod_1.z.array(cameraDetailSchema), cameraDetailSchema]),
     }),
 });
 class GenetecAgent {
@@ -48,56 +45,70 @@ class GenetecAgent {
     }
     async checkConnection() {
         const requestOptions = this.getRequestOptions('GET');
-        const res = await this.fetchWithTimeout(`${this.baseUrl}/`, requestOptions);
+        const res = await this.fetchWithTimeout(new URL(this.baseUrl), requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
-        return connectionResponseSchema.parse(await res.json());
+        const responseBody = await res.text();
+        const result = await successResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec connection test failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
     }
     async getAllCameraGuids() {
         const requestOptions = this.getRequestOptions('GET');
-        const res = await this.fetchWithTimeout(`${this.baseUrl}/${GET_CAMERAS_URL}`, requestOptions);
+        const url = new URL(`${this.baseUrl}/report/EntityConfiguration`);
+        url.searchParams.set('q', 'EntityTypes@Camera');
+        const res = await this.fetchWithTimeout(url, requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
-        return cameraGuidsResponseSchema.parse(await res.json());
+        const responseBody = await res.text();
+        const result = await cameraGuidsResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec get camera guids failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
+        return result.data;
     }
     async getCameraDetails(guids, parameters) {
         const params = parameters.join(',');
-        let camerasGuids = [];
         const requestOptions = this.getRequestOptions('GET');
         const allCameras = [];
         const chunkSize = 10;
         while (guids.length > 0) {
             const chunk = guids.slice(0, chunkSize);
             guids.splice(0, chunkSize);
-            camerasGuids = chunk.map((item) => item.Guid);
-            const camerasDetailsUrl = [];
-            for (const guid of camerasGuids) {
-                camerasDetailsUrl.push(`entity=${guid},${params}`);
-            }
-            const res = await this.fetchWithTimeout(`${this.baseUrl}/${GET_CAMERAS_DETAILS_URL}${camerasDetailsUrl.join(',')}`, requestOptions);
+            const url = new URL(`${this.baseUrl}/entity`);
+            url.searchParams.set('q', chunk.map((item) => `entity=${item.Guid},${params}`).join(','));
+            const res = await this.fetchWithTimeout(url, requestOptions);
             if (!res.ok) {
                 throw new Error(await (0, utils_1.responseStringify)(res));
             }
-            const data = exports.cameraDetailsResponseSchema.parse(await res.json());
+            const responseBody = await res.text();
+            const result = await cameraDetailsResponseSchema.safeParseAsync(JSON.parse(responseBody));
+            if (!result.success) {
+                throw new Error('Genetec get camera details failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+            }
+            const data = result.data;
             const resultArray = Array.isArray(data.Rsp.Result) ? data.Rsp.Result : [data.Rsp.Result];
             allCameras.push(...resultArray);
         }
         return allCameras;
     }
     async sendBookmark(guids, bookmarkText) {
-        const cameraEntitiesUrl = [];
         const timeStamp = this.getTimeStamp();
         const requestOptions = this.getRequestOptions('POST');
-        for (const guid of guids) {
-            cameraEntitiesUrl.push(`${ACTION}(${guid},${timeStamp},${bookmarkText})`);
-        }
-        const res = await this.fetchWithTimeout(`${this.baseUrl}/action?q=${cameraEntitiesUrl.join(',')}`, requestOptions);
+        const url = new URL(`${this.baseUrl}/action`);
+        url.searchParams.set('q', guids.map((guid) => `AddCameraBookmark(${guid},${timeStamp},${bookmarkText})`).join(','));
+        const res = await this.fetchWithTimeout(url, requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
-        return res;
+        const responseBody = await res.text();
+        const result = await successResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec send bookmark failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
     }
     getRequestOptions(method) {
         return {

package/cjs/node/index.js

@@ -14,11 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AxisCameraStationEvents = exports.WsClient = exports.DefaultClient = void 0;
-var DefaultClient_1 = require("./DefaultClient");
-Object.defineProperty(exports, "DefaultClient", { enumerable: true, get: function () { return DefaultClient_1.DefaultClient; } });
-var WsClient_1 = require("./WsClient");
-Object.defineProperty(exports, "WsClient", { enumerable: true, get: function () { return WsClient_1.WsClient; } });
-var AxisCameraStationEvents_1 = require("../events/AxisCameraStationEvents");
-Object.defineProperty(exports, "AxisCameraStationEvents", { enumerable: true, get: function () { return AxisCameraStationEvents_1.AxisCameraStationEvents; } });
-__exportStar(require("../events/GenetecAgent"), exports);
+__exportStar(require("./DefaultClient"), exports);
+__exportStar(require("./WsClient"), exports);
+__exportStar(require("./HttpServer"), exports);
+__exportStar(require("./events/AxisCameraStationEvents"), exports);
+__exportStar(require("./events/GenetecAgent"), exports);

package/cjs/types/CamOverlayAPI/CamOverlayAPI.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileDataSchema = exports.fileListSchema = exports.fileSchema = exports.storageResponseSchema = exports.storageDataListSchema = exports.storageSchema = exports.ImageType = exports.isWebCameraSharing = exports.isScreenSharing = exports.isPtz = exports.isPtzCompass = exports.isPip = exports.isInfoticker = exports.isImages = exports.isCustomGraphics = exports.isAccuweather = exports.widgetListSchema = exports.widgetsSchema = exports.WSResponseSchema = void 0;
+exports.fileDataSchema = exports.fileListSchema = exports.fileSchema = exports.storageResponseSchema = exports.storageDataListSchema = exports.storageSchema = exports.ImageType = exports.isScoreOverview = exports.isBaseballScoreBoardAutomatic = exports.isBaseballScoreBoard = exports.isScoreBoard = exports.isWebCameraSharing = exports.isScreenSharing = exports.isPtz = exports.isPtzCompass = exports.isPip = exports.isInfoticker = exports.isImages = exports.isCustomGraphics = exports.isAccuweather = exports.widgetListSchema = exports.widgetsSchema = exports.WSResponseSchema = void 0;
 const zod_1 = require("zod");
 const infotickerSchema_1 = require("./infotickerSchema");
 const accuweatherSchema_1 = require("./accuweatherSchema");
@@ -11,6 +11,7 @@ const pipSchema_1 = require("./pipSchema");
 const customGraphicsSchema_1 = require("./customGraphicsSchema");
 const screenSharingSchema_1 = require("./screenSharingSchema");
 const webCameraSharingSchema_1 = require("./webCameraSharingSchema");
+const scoreBoardSchema_1 = require("./scoreBoardSchema");
 exports.WSResponseSchema = zod_1.z.object({
     status: zod_1.z.number(),
     message: zod_1.z.string(),
@@ -26,6 +27,10 @@ exports.widgetsSchema = zod_1.z.discriminatedUnion('name', [
     customGraphicsSchema_1.customGraphicsSchema,
     screenSharingSchema_1.screenSharingSchema,
     webCameraSharingSchema_1.webCameraSharingSchema,
+    scoreBoardSchema_1.scoreBoardSchema,
+    scoreBoardSchema_1.baseballScoreBoardSchema,
+    scoreBoardSchema_1.baseballScoreBoardAutomaticSchema,
+    scoreBoardSchema_1.scoreOverviewSchema,
 ]);
 exports.widgetListSchema = zod_1.z.object({
     services: zod_1.z.array(exports.widgetsSchema),
@@ -48,6 +53,14 @@ const isScreenSharing = (widget) => widget.name === 'screenSharing';
 exports.isScreenSharing = isScreenSharing;
 const isWebCameraSharing = (widget) => widget.name === 'web_camera';
 exports.isWebCameraSharing = isWebCameraSharing;
+const isScoreBoard = (widget) => widget.name === 'scoreBoard';
+exports.isScoreBoard = isScoreBoard;
+const isBaseballScoreBoard = (widget) => widget.name === 'baseballScoreBoard';
+exports.isBaseballScoreBoard = isBaseballScoreBoard;
+const isBaseballScoreBoardAutomatic = (widget) => widget.name === 'myBallBaseballWidgets';
+exports.isBaseballScoreBoardAutomatic = isBaseballScoreBoardAutomatic;
+const isScoreOverview = (widget) => widget.name === 'scoreOverview';
+exports.isScoreOverview = isScoreOverview;
 var ImageType;
 (function (ImageType) {
     ImageType[ImageType["PNG"] = 0] = "PNG";

package/cjs/types/CamOverlayAPI/scoreBoardSchema.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scoreOverviewSchema = exports.baseballScoreBoardAutomaticSchema = exports.baseballScoreBoardSchema = exports.scoreBoardSchema = exports.sportFontSchema = void 0;
+const zod_1 = require("zod");
+const widgetCommonTypes_1 = require("./widgetCommonTypes");
+exports.sportFontSchema = zod_1.z.union([zod_1.z.literal('classic'), zod_1.z.intersection(zod_1.z.string(), zod_1.z.object({}))]);
+exports.scoreBoardSchema = zod_1.z.object({
+    id: zod_1.z.number().nonnegative(),
+    enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    schedule: zod_1.z.string().optional(),
+    cameraList: zod_1.z.array(zod_1.z.number()),
+    zIndex: zod_1.z.number().nonnegative(),
+    name: zod_1.z.literal('scoreBoard'),
+    pos_x: zod_1.z.number(),
+    pos_y: zod_1.z.number(),
+    coordSystem: widgetCommonTypes_1.coordinateSystemSchema,
+    width: zod_1.z.number(),
+    height: zod_1.z.number(),
+    scale: zod_1.z.number(),
+    teamHomeShortname: zod_1.z.string(),
+    teamGuestShortname: zod_1.z.string(),
+    teamHomeBackgroundColor: zod_1.z.string(),
+    teamGuestBackgroundColor: zod_1.z.string(),
+    teamHomeTextColor: zod_1.z.string(),
+    teamGuestTextColor: zod_1.z.string(),
+    teamHomeImgPath: zod_1.z.string(),
+    teamGuestImgPath: zod_1.z.string(),
+    teamHomeCurrentScore: zod_1.z.number(),
+    teamGuestCurrentScore: zod_1.z.number(),
+    baseTimeTimestamp: zod_1.z.number(),
+    baseTimePlaytime: zod_1.z.number(),
+    currentPeriodPlaytime: zod_1.z.number(),
+    timeIsRunning: zod_1.z.boolean(),
+    currentPeriodLength: zod_1.z.number(),
+    currentPeriod: zod_1.z.number(),
+    font: exports.sportFontSchema.default('classic'),
+});
+exports.baseballScoreBoardSchema = zod_1.z.object({
+    id: zod_1.z.number().nonnegative(),
+    enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    schedule: zod_1.z.string().optional(),
+    cameraList: zod_1.z.array(zod_1.z.number()),
+    zIndex: zod_1.z.number().nonnegative(),
+    name: zod_1.z.literal('baseballScoreBoard'),
+    pos_x: zod_1.z.number(),
+    pos_y: zod_1.z.number(),
+    coordSystem: widgetCommonTypes_1.coordinateSystemSchema,
+    width: zod_1.z.number(),
+    height: zod_1.z.number(),
+    scale: zod_1.z.number(),
+    matchFinished: zod_1.z.boolean(),
+    bases: zod_1.z.tuple([zod_1.z.boolean(), zod_1.z.boolean(), zod_1.z.boolean()]),
+    homeInning: zod_1.z.boolean(),
+    inning: zod_1.z.number().nonnegative(),
+    outs: zod_1.z.number().nonnegative(),
+    balls: zod_1.z.number().nonnegative(),
+    strikes: zod_1.z.number().nonnegative(),
+    baseTimeTimestamp: zod_1.z.number(),
+    baseTimePlaytime: zod_1.z.number(),
+    timeIsRunning: zod_1.z.boolean(),
+    teamHomeShortname: zod_1.z.string(),
+    teamGuestShortname: zod_1.z.string(),
+    teamHomeBackgroundColor: zod_1.z.string(),
+    teamGuestBackgroundColor: zod_1.z.string(),
+    teamHomeTextColor: zod_1.z.string(),
+    teamGuestTextColor: zod_1.z.string(),
+    teamHomeCurrentScore: zod_1.z.number(),
+    teamGuestCurrentScore: zod_1.z.number(),
+    footerImgPath: zod_1.z.string().optional(),
+    footerText: zod_1.z.string().optional(),
+    footerBackgroundColor: zod_1.z.string().optional(),
+    footerTextColor: zod_1.z.string().optional(),
+    font: exports.sportFontSchema.default('classic'),
+});
+exports.baseballScoreBoardAutomaticSchema = zod_1.z.object({
+    id: zod_1.z.number().nonnegative(),
+    enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    schedule: zod_1.z.string().optional(),
+    cameraList: zod_1.z.array(zod_1.z.number()),
+    zIndex: zod_1.z.number().nonnegative(),
+    name: zod_1.z.literal('myBallBaseballWidgets'),
+    width: zod_1.z.number(),
+    height: zod_1.z.number(),
+    scale: zod_1.z.number(),
+    matchDetailLink: zod_1.z.string(),
+    matchListLink: zod_1.z.string(),
+    mirrored: zod_1.z.boolean(),
+    pregameWidgetText: zod_1.z.string(),
+    teamHomeBackgroundColor: zod_1.z.string(),
+    teamGuestBackgroundColor: zod_1.z.string(),
+    teamHomeTextColor: zod_1.z.string(),
+    teamGuestTextColor: zod_1.z.string(),
+    homeLogoPath: zod_1.z.string(),
+    guestLogoPath: zod_1.z.string(),
+    footerImgPath: zod_1.z.string().optional(),
+    footerText: zod_1.z.string().optional(),
+    footerBackgroundColor: zod_1.z.string().optional(),
+    footerTextColor: zod_1.z.string().optional(),
+    font: exports.sportFontSchema.default('classic'),
+});
+exports.scoreOverviewSchema = zod_1.z.object({
+    id: zod_1.z.number().nonnegative(),
+    enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    cameraList: zod_1.z.array(zod_1.z.number()),
+    zIndex: zod_1.z.number().nonnegative(),
+    name: zod_1.z.literal('scoreOverview'),
+    pos_x: zod_1.z.number(),
+    pos_y: zod_1.z.number(),
+    coordSystem: widgetCommonTypes_1.coordinateSystemSchema,
+    width: zod_1.z.number(),
+    height: zod_1.z.number(),
+    scale: zod_1.z.number(),
+    teamHomeName: zod_1.z.string(),
+    teamGuestName: zod_1.z.string(),
+    teamHomeBackgroundColor: zod_1.z.string(),
+    teamGuestBackgroundColor: zod_1.z.string(),
+    teamHomeTextColor: zod_1.z.string(),
+    teamGuestTextColor: zod_1.z.string(),
+    teamHomeImgPath: zod_1.z.string(),
+    teamGuestImgPath: zod_1.z.string(),
+    teamHomeCurrentScore: zod_1.z.number(),
+    teamGuestCurrentScore: zod_1.z.number(),
+    scoreVisible: zod_1.z.boolean(),
+    description: zod_1.z.string(),
+    textFont: exports.sportFontSchema.default('classic'),
+    scoreFont: zod_1.z.literal('classic'),
+});

package/cjs/types/CamStreamerAPI.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.camstreamerServerResponseSchema = exports.streamListSchema = exports.streamAttributesSchema = void 0;
+exports.camstreamerServerResponseSchema = exports.cameraStreamResponseSchema = exports.streamSchema = exports.cameraStreamSchema = void 0;
 const zod_1 = require("zod");
-exports.streamAttributesSchema = zod_1.z.object({
+exports.cameraStreamSchema = zod_1.z.object({
     enabled: zod_1.z.string(),
     active: zod_1.z.string(),
     audioSource: zod_1.z.string(),
@@ -25,7 +25,34 @@ exports.streamAttributesSchema = zod_1.z.object({
     startTime: zod_1.z.string(),
     stopTime: zod_1.z.string(),
 });
-exports.streamListSchema = zod_1.z.record(zod_1.z.string(), exports.streamAttributesSchema);
+exports.streamSchema = zod_1.z.object({
+    enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    active: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    audioSource: zod_1.z.string(),
+    avSyncMsec: zod_1.z.number().int(),
+    internalVapixParameters: zod_1.z.string(),
+    userVapixParameters: zod_1.z.string(),
+    outputParameters: zod_1.z.string(),
+    outputType: zod_1.z.union([zod_1.z.literal('video'), zod_1.z.literal('images'), zod_1.z.literal('none')]),
+    mediaServerUrl: zod_1.z.string(),
+    inputType: zod_1.z.union([zod_1.z.literal('CSw'), zod_1.z.literal('CRS'), zod_1.z.literal('RTSP_URL')]),
+    inputUrl: zod_1.z.string(),
+    forceStereo: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    streamDelay: zod_1.z.number().nullable(),
+    statusLed: zod_1.z.number(),
+    statusPort: zod_1.z.string(),
+    callApi: zod_1.z.number().int(),
+    trigger: zod_1.z.string(),
+    schedule: zod_1.z.string(),
+    prepareAhead: zod_1.z.number().int(),
+    startTime: zod_1.z.number().nullable(),
+    stopTime: zod_1.z.number().nullable(),
+});
+exports.cameraStreamResponseSchema = zod_1.z.object({
+    data: exports.cameraStreamSchema,
+    code: zod_1.z.number(),
+    message: zod_1.z.string(),
+});
 exports.camstreamerServerResponseSchema = zod_1.z.object({
     code: zod_1.z.number(),
     message: zod_1.z.string(),

package/esm/CamOverlayAPI.js

@@ -198,7 +198,7 @@ export class CamOverlayAPI {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ ...params, timeout: options?.timeout });
         if (res.ok) {
-            return (await res.json());
+            return await res.json();
         }
         else {
             throw new Error(await responseStringify(res));
@@ -208,7 +208,7 @@ export class CamOverlayAPI {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({ ...params, timeout: options?.timeout });
         if (res.ok) {
-            return (await res.json());
+            return await res.json();
         }
         else {
             throw new Error(await responseStringify(res));

package/esm/CamStreamerAPI.js

@@ -1,6 +1,7 @@
+import z from 'zod';
 import { ProxyClient } from './internal/ProxyClient';
 import { responseStringify } from './internal/utils';
-import { streamAttributesSchema, streamListSchema } from './types/CamStreamerAPI';
+import { cameraStreamSchema } from './types/CamStreamerAPI';
 const BASE_PATH = '/local/camstreamer';
 export class CamStreamerAPI {
     client;
@@ -12,11 +13,18 @@ export class CamStreamerAPI {
     }
     async getStreamList(options) {
         const streamListRes = await this.get(`${BASE_PATH}/stream/list.cgi`, undefined, options);
-        return streamListSchema.parse(streamListRes.data);
+        const list = z.record(z.string(), cameraStreamSchema).parse(streamListRes.data);
+        const res = {};
+        for (const [key, data] of Object.entries(list)) {
+            const streamId = parseInt(key);
+            res[streamId] = parseCameraStreamResponse(data);
+        }
+        return res;
     }
     async getStream(streamId, options) {
         const stream = await this.get(`${BASE_PATH}/stream/get.cgi?stream_id=${streamId}`, undefined, options);
-        return streamAttributesSchema.parse(stream.data);
+        const cameraData = cameraStreamSchema.parse(stream.data);
+        return parseCameraStreamResponse(cameraData);
     }
     async getStreamParameter(streamId, paramName, options) {
         const stream = await this.get(`${BASE_PATH}/stream/get.cgi?stream_id=${streamId}`, undefined, options);
@@ -24,29 +32,38 @@ export class CamStreamerAPI {
     }
     async setStream(streamId, params, options) {
         const { streamDelay, startTime, stopTime, ...rest } = params;
-        await this.get(`${BASE_PATH}/stream/set.cgi`, {
+        return await this.get(`${BASE_PATH}/stream/set.cgi`, {
             stream_id: streamId,
             streamDelay: streamDelay ?? '',
-            startTime: startTime ?? 'null',
-            stopTime: stopTime ?? 'null',
+            startTime: startTime ?? null,
+            stopTime: stopTime ?? null,
             ...rest,
         }, options);
     }
     async setStreamParameter(streamId, paramName, value, options) {
-        await this.get(`${BASE_PATH}/stream/set.cgi?stream_id=${streamId}&${paramName}=${value}`, undefined, options);
+        return await this.get(`${BASE_PATH}/stream/set.cgi?stream_id=${streamId}&${paramName}=${value}`, undefined, options);
     }
     async isStreaming(streamId, options) {
         const response = await this.get(`${BASE_PATH}/get_streamstat.cgi?stream_id=${streamId}`, undefined, options);
         return response.data.is_streaming === 1;
     }
     async deleteStream(streamId, options) {
-        await this.get(`${BASE_PATH}/stream/remove.cgi`, { stream_id: streamId }, options);
+        const res = await this.get(`${BASE_PATH}/stream/remove.cgi`, { stream_id: streamId }, options);
+        return res.data.status === 200;
     }
-    wsAuthorization(options) {
-        return this.get(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
+    async getWsAuthorization(options) {
+        const res = await this.get(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
+        if (res.status !== 200) {
+            throw new Error(`Server error on ws authorization: ${res.message}`);
+        }
+        return res.data;
     }
     async getUtcTime(options) {
-        return await this.get(`${BASE_PATH}/get_utc_time.cgi`, undefined, options);
+        const res = await this.get(`${BASE_PATH}/get_utc_time.cgi`, undefined, options);
+        if (res.status !== 200) {
+            throw new Error(`Server error on get UTC time: ${res.message}`);
+        }
+        return res.data;
     }
     async get(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -59,3 +76,28 @@ export class CamStreamerAPI {
         }
     }
 }
+export const parseCameraStreamResponse = (cameraStreamData) => {
+    return {
+        enabled: parseInt(cameraStreamData.enabled),
+        active: parseInt(cameraStreamData.active),
+        audioSource: cameraStreamData.audioSource,
+        avSyncMsec: parseInt(cameraStreamData.avSyncMsec),
+        internalVapixParameters: cameraStreamData.internalVapixParameters,
+        userVapixParameters: cameraStreamData.userVapixParameters,
+        outputParameters: cameraStreamData.outputParameters,
+        outputType: cameraStreamData.outputType,
+        mediaServerUrl: cameraStreamData.mediaServerUrl,
+        inputType: cameraStreamData.inputType,
+        inputUrl: cameraStreamData.inputUrl,
+        forceStereo: parseInt(cameraStreamData.forceStereo),
+        streamDelay: isNaN(parseInt(cameraStreamData.streamDelay)) ? null : parseInt(cameraStreamData.streamDelay),
+        statusLed: parseInt(cameraStreamData.statusLed),
+        statusPort: cameraStreamData.statusPort,
+        callApi: parseInt(cameraStreamData.callApi),
+        trigger: cameraStreamData.trigger,
+        schedule: cameraStreamData.schedule,
+        prepareAhead: parseInt(cameraStreamData.prepareAhead),
+        startTime: isNaN(parseInt(cameraStreamData.startTime)) ? null : parseInt(cameraStreamData.startTime),
+        stopTime: isNaN(parseInt(cameraStreamData.stopTime)) ? null : parseInt(cameraStreamData.stopTime),
+    };
+};

package/esm/CamSwitcherAPI.js

@@ -108,10 +108,10 @@ export class CamSwitcherAPI {
     async playlistQueuePlayNext(options) {
         await this.get(`${BASE_PATH}/playlist_queue_play_next.cgi`, undefined, options);
     }
-    async addNewClip(file, clipType, storage, id, fileName, options) {
+    async addNewClip(file, clipType, storage, clipId, fileName, options) {
         const path = `${BASE_PATH}/clip_upload.cgi?storage=${storage}`;
         const formData = new this.CustomFormData();
-        formData.append('clip_name', id);
+        formData.append('clip_name', clipId);
         formData.append('clip_type', clipType);
         formData.append('file', file, fileName);
         const agent = this.getClient(options?.proxyParams);
@@ -121,8 +121,8 @@ export class CamSwitcherAPI {
             throw new AddNewClipError(output.message);
         }
     }
-    removeClip(id, storage, options) {
-        return this.get(`${BASE_PATH}/clip_remove.cgi`, { clip_name: id, storage }, options);
+    removeClip(clipId, storage, options) {
+        return this.get(`${BASE_PATH}/clip_remove.cgi`, { clip_name: clipId, storage }, options);
     }
     async getClipList(options) {
         const data = await this.get(`${BASE_PATH}/clip_list.cgi`, undefined, options);
@@ -177,8 +177,8 @@ export class CamSwitcherAPI {
         };
         return this.setParamFromCameraJSON(CSW_PARAM_NAMES.SECONDARY_AUDIO, data, options);
     }
-    setDefaultPlaylist(id, options) {
-        const value = JSON.stringify({ default_playlist_id: id });
+    setDefaultPlaylist(playlistId, options) {
+        const value = JSON.stringify({ default_playlist_id: playlistId });
         return this.vapixAgent.setParameter({
             [CSW_PARAM_NAMES.DEFAULT_PLAYLIST]: value,
         }, options);
@@ -250,7 +250,7 @@ export class CamSwitcherAPI {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {
-            const d = (await res.json());
+            const d = await res.json();
             return d.data;
         }
         else {

package/esm/CamSwitcherEvents.js

@@ -1,63 +1,7 @@
-import { cswEventsSchema, } from './types/CamSwitcherEvents';
-export class CamSwitcherEvents {
-    isDestroyed = false;
-    ws = null;
-    listeners = {};
-    setWebsocket(ws) {
-        if (this.ws) {
-            this.ws.destroy();
-        }
-        this.ws = ws;
-        this.ws.onmessage = (e) => this.onMessage(e);
-    }
-    resendInitData() {
-        const request = {
-            command: 'sendInitData',
-        };
-        this.ws?.send(JSON.stringify(request));
-    }
-    addListener(type, listener, id) {
-        const typeList = this.listeners[type];
-        if (typeList === undefined) {
-            this.listeners[type] = { [id]: listener };
-            return;
-        }
-        typeList[id] = listener;
-    }
-    removeListener(type, id) {
-        const typeList = this.listeners[type];
-        if (typeList) {
-            delete typeList[id];
-        }
-    }
-    onMessage(evt) {
-        if (this.isDestroyed) {
-            return;
-        }
-        try {
-            const eventData = JSON.parse(evt.data);
-            const data = cswEventsSchema.parse(eventData);
-            if (data.type === 'init') {
-                this.processMessage(data.data, true);
-                return;
-            }
-            this.processMessage(data, false);
-        }
-        catch (error) {
-            console.error('Error parsing event data:', evt.data, error);
-        }
-    }
-    processMessage(event, isInit) {
-        const listeners = this.listeners[event.type];
-        const list = Object.values(listeners ?? {});
-        list.forEach((listener) => listener(event, isInit));
-    }
-    destroy() {
-        this.isDestroyed = true;
-        if (this.ws) {
-            this.ws.destroy();
-            this.ws = null;
-        }
-        this.listeners = {};
+import { WsEvents } from './internal/WsEvents';
+import { cswEventsSchema } from './types/CamSwitcherEvents';
+export class CamSwitcherEvents extends WsEvents {
+    constructor(ws) {
+        super(cswEventsSchema, ws);
     }
 }