camstreamerlib 4.0.0-beta.31 → 4.0.0-beta.33

package/cjs/CamOverlayAPI.d.ts

@@ -3,19 +3,7 @@
 import { IClient, TBlobResponse, TResponse } from './internal/types';
 import { THttpRequestOptions, TProxyParams, TNetworkCamera } from './types/common';
 import { ProxyClient } from './internal/ProxyClient';
-import { ImageType, TCoordinates, TFile, TFileList, TFileType, TStorage, TStorageDataList, TWidget } from './types/CamOverlayAPI/CamOverlayAPI';
-import { TField } from './types/CamOverlayAPI';
-export declare const allowedWidgetNames: {
-    readonly accuweather: "accuweather";
-    readonly infoticker: "infoticker";
-    readonly customGraphics: "customGraphics";
-    readonly ptzCompass: "ptzCompass";
-    readonly images: "images";
-    readonly ptz: "ptz";
-    readonly pip: "pip";
-    readonly screenSharing: "screenSharing";
-    readonly web_camera: "web_camera";
-};
+import { ImageType, TCoordinates, TField, TFile, TFileList, TFileType, TStorage, TStorageDataList, TWidget } from './types/CamOverlayAPI';
 export declare class CamOverlayAPI<Client extends IClient<TResponse> = IClient<TResponse>> {
     private client;
     constructor(client: Client);

package/cjs/CamOverlayAPI.js

@@ -1,23 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamOverlayAPI = exports.allowedWidgetNames = void 0;
+exports.CamOverlayAPI = void 0;
 const utils_1 = require("./internal/utils");
 const errors_1 = require("./errors/errors");
 const common_1 = require("./types/common");
 const zod_1 = require("zod");
 const ProxyClient_1 = require("./internal/ProxyClient");
-const CamOverlayAPI_1 = require("./types/CamOverlayAPI/CamOverlayAPI");
-exports.allowedWidgetNames = {
-    accuweather: 'accuweather',
-    infoticker: 'infoticker',
-    customGraphics: 'customGraphics',
-    ptzCompass: 'ptzCompass',
-    images: 'images',
-    ptz: 'ptz',
-    pip: 'pip',
-    screenSharing: 'screenSharing',
-    web_camera: 'web_camera',
-};
+const CamOverlayAPI_1 = require("./types/CamOverlayAPI");
 const BASE_PATH = '/local/camoverlay/api';
 class CamOverlayAPI {
     client;

package/cjs/events/GenetecAgent.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 declare const cameraGuidsResponseSchema: z.ZodObject<{
     Rsp: z.ZodObject<{
-        Status: z.ZodString;
+        Status: z.ZodLiteral<"Ok">;
         Result: z.ZodArray<z.ZodObject<{
             Guid: z.ZodString;
         }, "strip", z.ZodTypeAny, {
@@ -10,51 +10,33 @@ declare const cameraGuidsResponseSchema: z.ZodObject<{
             Guid: string;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        Status: string;
+        Status: "Ok";
         Result: {
             Guid: string;
         }[];
     }, {
-        Status: string;
+        Status: "Ok";
         Result: {
             Guid: string;
         }[];
     }>;
 }, "strip", z.ZodTypeAny, {
     Rsp: {
-        Status: string;
+        Status: "Ok";
         Result: {
             Guid: string;
         }[];
     };
 }, {
     Rsp: {
-        Status: string;
+        Status: "Ok";
         Result: {
             Guid: string;
         }[];
     };
 }>;
 export type TCameraGuidsResponse = z.infer<typeof cameraGuidsResponseSchema>;
-declare const connectionResponseSchema: z.ZodObject<{
-    Rsp: z.ZodObject<{
-        Status: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        Status: string;
-    }, {
-        Status: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    Rsp: {
-        Status: string;
-    };
-}, {
-    Rsp: {
-        Status: string;
-    };
-}>;
-export type TConnectionResponse = z.infer<typeof connectionResponseSchema>;
-export declare const cameraDetailSchema: z.ZodObject<{
+declare const cameraDetailSchema: z.ZodObject<{
     Guid: z.ZodOptional<z.ZodString>;
     Name: z.ZodOptional<z.ZodString>;
     EntityType: z.ZodOptional<z.ZodString>;
@@ -67,9 +49,9 @@ export declare const cameraDetailSchema: z.ZodObject<{
     Guid?: string | undefined;
     EntityType?: string | undefined;
 }>;
-export declare const cameraDetailsResponseSchema: z.ZodObject<{
+declare const cameraDetailsResponseSchema: z.ZodObject<{
     Rsp: z.ZodObject<{
-        Status: z.ZodString;
+        Status: z.ZodLiteral<"Ok">;
         Result: z.ZodUnion<[z.ZodArray<z.ZodObject<{
             Guid: z.ZodOptional<z.ZodString>;
             Name: z.ZodOptional<z.ZodString>;
@@ -96,7 +78,7 @@ export declare const cameraDetailsResponseSchema: z.ZodObject<{
             EntityType?: string | undefined;
         }>]>;
     }, "strip", z.ZodTypeAny, {
-        Status: string;
+        Status: "Ok";
         Result: {
             Name?: string | undefined;
             Guid?: string | undefined;
@@ -107,7 +89,7 @@ export declare const cameraDetailsResponseSchema: z.ZodObject<{
             EntityType?: string | undefined;
         }[];
     }, {
-        Status: string;
+        Status: "Ok";
         Result: {
             Name?: string | undefined;
             Guid?: string | undefined;
@@ -120,7 +102,7 @@ export declare const cameraDetailsResponseSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     Rsp: {
-        Status: string;
+        Status: "Ok";
         Result: {
             Name?: string | undefined;
             Guid?: string | undefined;
@@ -133,7 +115,7 @@ export declare const cameraDetailsResponseSchema: z.ZodObject<{
     };
 }, {
     Rsp: {
-        Status: string;
+        Status: "Ok";
         Result: {
             Name?: string | undefined;
             Guid?: string | undefined;
@@ -164,12 +146,12 @@ export declare class GenetecAgent {
     private baseUrl;
     private credentials;
     constructor(options?: GenetecAgentOptions);
-    checkConnection(): Promise<TConnectionResponse>;
+    checkConnection(): Promise<void>;
     getAllCameraGuids(): Promise<TCameraGuidsResponse>;
     getCameraDetails(guids: {
         Guid: string;
     }[], parameters: TParams): Promise<TCameraDetail[]>;
-    sendBookmark(guids: string[], bookmarkText: string): Promise<Response>;
+    sendBookmark(guids: string[], bookmarkText: string): Promise<void>;
     private getRequestOptions;
     private getTimeStamp;
     private fetchWithTimeout;

package/cjs/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 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/index.d.ts

@@ -14,7 +14,6 @@ export * from './types/CamSwitcherEvents';
 export * from './types/CamSwitcherAPI';
 export * from './types/VapixAPI';
 export * from './types/CamOverlayAPI';
-export * from './types/CamOverlayAPI/CamOverlayAPI';
 export * from './types/PlaneTrackerAPI';
 export { Frame } from './CamOverlayPainter/Frame';
 export { Painter } from './CamOverlayPainter/Painter';

package/cjs/index.js

@@ -38,7 +38,6 @@ __exportStar(require("./types/CamSwitcherEvents"), exports);
 __exportStar(require("./types/CamSwitcherAPI"), exports);
 __exportStar(require("./types/VapixAPI"), exports);
 __exportStar(require("./types/CamOverlayAPI"), exports);
-__exportStar(require("./types/CamOverlayAPI/CamOverlayAPI"), exports);
 __exportStar(require("./types/PlaneTrackerAPI"), exports);
 var Frame_1 = require("./CamOverlayPainter/Frame");
 Object.defineProperty(exports, "Frame", { enumerable: true, get: function () { return Frame_1.Frame; } });

package/cjs/node/index.d.ts

@@ -1,4 +1,5 @@
-export { DefaultClient } from './DefaultClient';
-export { WsClient } from './WsClient';
-export { AxisCameraStationEvents } from '../events/AxisCameraStationEvents';
+export * from './DefaultClient';
+export * from './WsClient';
+export * from './HttpServer';
+export * from '../events/AxisCameraStationEvents';
 export * from '../events/GenetecAgent';

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("./DefaultClient"), exports);
+__exportStar(require("./WsClient"), exports);
+__exportStar(require("./HttpServer"), exports);
+__exportStar(require("../events/AxisCameraStationEvents"), exports);
 __exportStar(require("../events/GenetecAgent"), exports);