camstreamerlib 4.0.0-beta.29 → 4.0.0-beta.30

package/cjs/events/AxisCameraStationEvents.js

@@ -1,21 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AxisCameraStationEvents = void 0;
-const DefaultClient_1 = require("../node/DefaultClient");
 const utils_1 = require("../internal/utils");
+const ProxyClient_1 = require("../internal/ProxyClient");
+const node_1 = require("../node");
 class AxisCameraStationEvents {
     sourceKey;
     client;
-    constructor(sourceKey, opt = {}) {
+    constructor(clientOptions, sourceKey) {
         this.sourceKey = sourceKey;
-        if ((0, utils_1.isClient)(opt)) {
-            this.client = opt;
-        }
-        else {
-            this.client = new DefaultClient_1.DefaultClient(opt);
-        }
+        this.client = new node_1.DefaultClient(clientOptions);
     }
-    async sendEvent(data, eventType) {
+    async sendEvent(data, eventType, options) {
         const dateString = this.getDate();
         const event = {
             addExternalDataRequest: {
@@ -26,9 +22,15 @@ class AxisCameraStationEvents {
             },
         };
         const eventData = JSON.stringify(event);
-        const res = await this.client.post('/Acs/Api/ExternalDataFacade/AddExternalData', eventData, undefined, {
-            'Content-Type': 'application/json',
-            'Content-Length': eventData.length.toString(),
+        const agent = this.getAgent(options?.proxyParams);
+        const res = await agent.post({
+            path: '/Acs/Api/ExternalDataFacade/AddExternalData',
+            data: eventData,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': eventData.length.toString(),
+            },
+            timeout: options?.timeout,
         });
         if (!res.ok) {
             throw new Error(`ACS status code: ${res.status}`);
@@ -44,5 +46,8 @@ class AxisCameraStationEvents {
         const seconds = (0, utils_1.pad)(date.getUTCSeconds(), 2);
         return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     }
+    getAgent(proxyParams) {
+        return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
+    }
 }
 exports.AxisCameraStationEvents = AxisCameraStationEvents;

package/cjs/events/GenetecAgent.d.ts

@@ -157,6 +157,7 @@ export type GenetecAgentOptions = {
     user?: string;
     pass?: string;
     appId?: string;
+    timeout?: number;
 };
 export declare class GenetecAgent {
     private settings;
@@ -171,5 +172,6 @@ export declare class GenetecAgent {
     sendBookmark(guids: string[], bookmarkText: string): Promise<Response>;
     private getRequestOptions;
     private getTimeStamp;
+    private fetchWithTimeout;
 }
 export {};

package/cjs/events/GenetecAgent.js

@@ -41,13 +41,14 @@ class GenetecAgent {
             user: options.user ?? 'root',
             pass: options.pass ?? '',
             appId: options.appId ?? '',
+            timeout: options.timeout ?? 10000,
         };
         this.baseUrl = `${this.settings.protocol}://${this.settings.ip}:${this.settings.port}/${this.settings.baseUri}`;
         this.credentials = btoa(`${this.settings.user};${this.settings.appId}:${this.settings.pass}`);
     }
     async checkConnection() {
         const requestOptions = this.getRequestOptions('GET');
-        const res = await fetch(`${this.baseUrl}/`, requestOptions);
+        const res = await this.fetchWithTimeout(`${this.baseUrl}/`, requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
@@ -55,7 +56,7 @@ class GenetecAgent {
     }
     async getAllCameraGuids() {
         const requestOptions = this.getRequestOptions('GET');
-        const res = await fetch(`${this.baseUrl}/${GET_CAMERAS_URL}`, requestOptions);
+        const res = await this.fetchWithTimeout(`${this.baseUrl}/${GET_CAMERAS_URL}`, requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
@@ -75,7 +76,7 @@ class GenetecAgent {
             for (const guid of camerasGuids) {
                 camerasDetailsUrl.push(`entity=${guid},${params}`);
             }
-            const res = await fetch(`${this.baseUrl}/${GET_CAMERAS_DETAILS_URL}${camerasDetailsUrl.join(',')}`, requestOptions);
+            const res = await this.fetchWithTimeout(`${this.baseUrl}/${GET_CAMERAS_DETAILS_URL}${camerasDetailsUrl.join(',')}`, requestOptions);
             if (!res.ok) {
                 throw new Error(await (0, utils_1.responseStringify)(res));
             }
@@ -92,7 +93,7 @@ class GenetecAgent {
         for (const guid of guids) {
             cameraEntitiesUrl.push(`${ACTION}(${guid},${timeStamp},${bookmarkText})`);
         }
-        const res = await fetch(`${this.baseUrl}/action?q=${cameraEntitiesUrl.join(',')}`, requestOptions);
+        const res = await this.fetchWithTimeout(`${this.baseUrl}/action?q=${cameraEntitiesUrl.join(',')}`, requestOptions);
         if (!res.ok) {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
@@ -119,5 +120,15 @@ class GenetecAgent {
         const miliSeconds = (0, utils_1.pad)(date.getUTCMilliseconds(), 2);
         return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${miliSeconds}Z`;
     }
+    async fetchWithTimeout(url, options) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.settings.timeout);
+        try {
+            return await fetch(url, { ...options, signal: controller.signal });
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    }
 }
 exports.GenetecAgent = GenetecAgent;

package/cjs/index.d.ts

@@ -14,5 +14,11 @@ export * from './types/CamSwitcherEvents';
 export * from './types/CamSwitcherAPI';
 export * from './types/VapixAPI';
 export * from './types/CamOverlayAPI';
-export * from './models/CamOverlayAPI';
+export * from './types/CamOverlayAPI/CamOverlayAPI';
 export * from './types/PlaneTrackerAPI';
+export { Frame } from './CamOverlayPainter/Frame';
+export { Painter } from './CamOverlayPainter/Painter';
+export { ResourceManager } from './CamOverlayPainter/ResourceManager';
+export * from './types/CamOverlayPainter';
+export { CamOverlayDrawingAPI } from './CamOverlayDrawingAPI';
+export * from './types/CamOverlayDrawingAPI';

package/cjs/index.js

@@ -14,7 +14,7 @@ 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.PlaneTrackerAPI = exports.CamStreamerAPI = exports.CamScripterAPI = exports.CamOverlayAPI = exports.VapixAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = void 0;
+exports.CamOverlayDrawingAPI = exports.ResourceManager = exports.Painter = exports.Frame = exports.PlaneTrackerAPI = exports.CamStreamerAPI = exports.CamScripterAPI = exports.CamOverlayAPI = exports.VapixAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = void 0;
 __exportStar(require("./internal/types"), exports);
 __exportStar(require("./internal/constants"), exports);
 __exportStar(require("./internal/utils"), exports);
@@ -38,5 +38,15 @@ __exportStar(require("./types/CamSwitcherEvents"), exports);
 __exportStar(require("./types/CamSwitcherAPI"), exports);
 __exportStar(require("./types/VapixAPI"), exports);
 __exportStar(require("./types/CamOverlayAPI"), exports);
-__exportStar(require("./models/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; } });
+var Painter_1 = require("./CamOverlayPainter/Painter");
+Object.defineProperty(exports, "Painter", { enumerable: true, get: function () { return Painter_1.Painter; } });
+var ResourceManager_1 = require("./CamOverlayPainter/ResourceManager");
+Object.defineProperty(exports, "ResourceManager", { enumerable: true, get: function () { return ResourceManager_1.ResourceManager; } });
+__exportStar(require("./types/CamOverlayPainter"), exports);
+var CamOverlayDrawingAPI_1 = require("./CamOverlayDrawingAPI");
+Object.defineProperty(exports, "CamOverlayDrawingAPI", { enumerable: true, get: function () { return CamOverlayDrawingAPI_1.CamOverlayDrawingAPI; } });
+__exportStar(require("./types/CamOverlayDrawingAPI"), exports);

package/cjs/internal/ProxyClient.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" />
-import { IClient, TResponse } from './types';
-import { TProxyParam } from '../types/common';
+import { IClient, TGetParams, TPostParams, TResponse } from './types';
+import { TProxyParams } from '../types/common';
 export declare class ProxyClient<Client extends IClient<TResponse> = IClient<TResponse>> {
-    client: Client;
-    getProxyUrl: () => string;
-    constructor(client: Client, getProxyUrl: () => string);
-    get: (proxy: TProxyParam, url: string, parameters?: import("./types").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<TResponse>;
-    post: (proxy: TProxyParam, url: string, data: string | Buffer | FormData, parameters?: import("./types").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<TResponse>;
+    private client;
+    private proxyParams;
+    constructor(client: Client, proxyParams: TProxyParams);
+    get: (params: TGetParams) => Promise<TResponse>;
+    post: (params: TPostParams) => Promise<TResponse>;
     private getReal;
 }

package/cjs/internal/ProxyClient.js

@@ -4,42 +4,36 @@ exports.ProxyClient = void 0;
 const utils_1 = require("./utils");
 class ProxyClient {
     client;
-    getProxyUrl;
-    constructor(client, getProxyUrl) {
+    proxyParams;
+    constructor(client, proxyParams) {
         this.client = client;
-        this.getProxyUrl = getProxyUrl;
+        this.proxyParams = proxyParams;
     }
-    get = (proxy, ...args) => {
-        const [path, parameters, headers] = args;
-        const url = (0, utils_1.addParametersToPath)(path, parameters);
-        const { realUrl, realHeaders } = this.getReal(proxy, url, headers);
-        return this.client.get(realUrl, {}, realHeaders);
+    get = (params) => {
+        const { path, parameters, headers, timeout } = params;
+        const targetPath = (0, utils_1.addParametersToPath)(path, parameters);
+        const { realPath, realHeaders } = this.getReal(targetPath, headers);
+        return this.client.get({ path: realPath, headers: realHeaders, timeout });
     };
-    post = (proxy, ...args) => {
-        const [path, data, parameters, headers] = args;
-        const url = (0, utils_1.addParametersToPath)(path, parameters);
-        const { realUrl, realHeaders } = this.getReal(proxy, url, headers);
-        return this.client.post(realUrl, data, {}, realHeaders);
+    post = (params) => {
+        const { path, data, parameters, headers, timeout } = params;
+        const targetPath = (0, utils_1.addParametersToPath)(path, parameters);
+        const { realPath, realHeaders } = this.getReal(targetPath, headers);
+        return this.client.post({ path: realPath, data, headers: realHeaders, timeout });
     };
-    getReal = (proxy, url, headers) => {
-        if (proxy !== null) {
-            return {
-                realUrl: this.getProxyUrl(),
-                realHeaders: {
-                    ...(headers ?? {}),
-                    'x-target-camera-protocol': proxy.port === 443 ? 'https' : 'http',
-                    'x-target-camera-path': url,
-                    'x-target-camera-ip': proxy.ip,
-                    'x-target-camera-mdns': proxy.mdnsName,
-                    'x-target-camera-port': String(proxy.port),
-                    'x-target-camera-pass': proxy.pass,
-                    'x-target-camera-user': proxy.user,
-                },
-            };
-        }
+    getReal = (targetPath, headers) => {
         return {
-            realUrl: url,
-            realHeaders: headers,
+            realPath: this.proxyParams.path,
+            realHeaders: {
+                ...(headers ?? {}),
+                'x-target-camera-protocol': this.proxyParams.target.port === 443 ? 'https' : 'http',
+                'x-target-camera-path': targetPath,
+                'x-target-camera-ip': this.proxyParams.target.ip,
+                'x-target-camera-mdns': this.proxyParams.target.mdnsName,
+                'x-target-camera-port': String(this.proxyParams.target.port),
+                'x-target-camera-pass': this.proxyParams.target.pass,
+                'x-target-camera-user': this.proxyParams.target.user,
+            },
         };
     };
 }

package/cjs/internal/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Response as UndiciResponse } from 'undici';
 export type Options = {
     ip?: string;
@@ -14,16 +15,22 @@ export type HttpOptions = Options & {
 export type WsOptions = Options;
 export type TParameters = Record<string, string | number | boolean | null | undefined>;
 export type TResponse = Response | UndiciResponse;
-export type TGetParams = [url: string, parameters?: TParameters, headers?: Record<string, string>];
-export type TPostParams = [
-    url: string,
-    data: string | Buffer | FormData,
-    parameters?: TParameters,
-    headers?: Record<string, string>
-];
+export type TGetParams = {
+    path: string;
+    parameters?: TParameters;
+    headers?: Record<string, string>;
+    timeout?: number;
+};
+export type TPostParams = {
+    path: string;
+    data: string | Buffer | FormData;
+    parameters?: TParameters;
+    headers?: Record<string, string>;
+    timeout?: number;
+};
 export interface IClient<TRes extends TResponse> {
-    get: (...params: TGetParams) => Promise<TRes>;
-    post: (...params: TPostParams) => Promise<TRes>;
+    get: (params: TGetParams) => Promise<TRes>;
+    post: (params: TPostParams) => Promise<TRes>;
 }
 export type TBlobResponse<Client extends IClient<TResponse>> = Awaited<ReturnType<Awaited<ReturnType<Client['get']>>['blob']>>;
 export interface IWebsocket<Event extends {

package/cjs/internal/utils.d.ts

@@ -1,5 +1,5 @@
 import { TPlaylistPlayType } from '../types/CamSwitcherAPI';
-import { IClient, Options, TParameters, TResponse } from './types';
+import { TParameters, TResponse } from './types';
 export declare const addParametersToPath: (path: string, params?: TParameters) => string;
 export declare const paramToUrl: (params?: TParameters) => string;
 export declare const arrayToUrl: (arr: string | string[]) => string;
@@ -9,7 +9,6 @@ export declare const isClip: (id?: string) => boolean;
 export declare const isTracker: (id?: string) => boolean;
 export declare const isPlaylist: (id?: string) => boolean;
 export declare const isLoopPlayType: (playType: TPlaylistPlayType) => boolean;
-export declare function isClient(arg?: Options | IClient<TResponse>): arg is IClient<TResponse>;
 export declare function responseStringify(res: TResponse): Promise<string>;
 export declare function pad(num: number, size: number): string;
 export declare function isNullish<T>(value: T | undefined | null): value is undefined | null;

package/cjs/internal/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNullish = exports.pad = exports.responseStringify = exports.isClient = exports.isLoopPlayType = exports.isPlaylist = exports.isTracker = exports.isClip = exports.isStream = exports.isCamera = exports.arrayToUrl = exports.paramToUrl = exports.addParametersToPath = void 0;
+exports.isNullish = exports.pad = exports.responseStringify = exports.isLoopPlayType = exports.isPlaylist = exports.isTracker = exports.isClip = exports.isStream = exports.isCamera = exports.arrayToUrl = exports.paramToUrl = exports.addParametersToPath = void 0;
 const addParametersToPath = (path, params) => {
     if (params === undefined || Object.keys(params).length === 0) {
         return path;
@@ -43,10 +43,6 @@ const isPlaylist = (id) => id?.charAt(0) === 'p';
 exports.isPlaylist = isPlaylist;
 const isLoopPlayType = (playType) => playType.includes('LOOP');
 exports.isLoopPlayType = isLoopPlayType;
-function isClient(arg = {}) {
-    return 'get' in arg && 'post' in arg;
-}
-exports.isClient = isClient;
 async function responseStringify(res) {
     return JSON.stringify({
         status: res.status,

package/cjs/node/DefaultClient.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { IClient, HttpOptions, TParameters } from '../internal/types';
+import { IClient, HttpOptions, TGetParams, TPostParams } from '../internal/types';
 import { Response as UndiciResponse } from 'undici';
 export declare class DefaultClient implements IClient<UndiciResponse> {
     private tls;
@@ -9,8 +8,7 @@ export declare class DefaultClient implements IClient<UndiciResponse> {
     private pass;
     private httpRequestSender;
     constructor(opt?: HttpOptions);
-    get url(): string;
-    get: (url: string, parameters?: TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<UndiciResponse>;
-    post: (url: string, data: string | Buffer | FormData, parameters?: TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<UndiciResponse>;
+    get: (params: TGetParams) => Promise<UndiciResponse>;
+    post: (params: TPostParams) => Promise<UndiciResponse>;
     private getBaseConnectionParams;
 }

package/cjs/node/DefaultClient.js

@@ -25,31 +25,27 @@ class DefaultClient {
         }
         this.httpRequestSender = new HttpRequestSender_1.HttpRequestSender(agentOptions);
     }
-    get url() {
-        return `${this.tls ? 'https' : 'http'}://${this.user}:${this.pass}@${this.ip}:${this.port}`;
-    }
-    get = (...params) => {
-        const [path, parameters, headers] = params;
-        const options = this.getBaseConnectionParams('GET', path, parameters ?? {});
-        options.headers = headers;
+    get = (params) => {
+        const { path, parameters, headers, timeout } = params;
+        const options = this.getBaseConnectionParams('GET', path, parameters, headers, timeout);
         return this.httpRequestSender.sendRequest(options);
     };
-    post = (...params) => {
-        const [path, data, parameters, headers] = params;
-        const options = this.getBaseConnectionParams('POST', path, parameters ?? {});
-        options.headers = headers;
+    post = (params) => {
+        const { path, data, parameters, headers, timeout } = params;
+        const options = this.getBaseConnectionParams('POST', path, parameters, headers, timeout);
         return this.httpRequestSender.sendRequest(options, data);
     };
-    getBaseConnectionParams(method, path, params) {
-        const pathName = (0, utils_1.addParametersToPath)(path, params);
+    getBaseConnectionParams(method, path, params, headers, timeout) {
         return {
             method: method,
             protocol: this.tls ? 'https:' : 'http:',
             host: this.ip,
             port: this.port,
-            path: pathName,
+            path: (0, utils_1.addParametersToPath)(path, params),
             user: this.user,
             pass: this.pass,
+            headers,
+            timeout,
         };
     }
 }

package/cjs/node/HttpRequestSender.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { FormData as UndiciFormData, Response as UndiciResponse } from 'undici';
 export type HttpRequestOptions = {
     method?: string;

package/cjs/node/HttpRequestSender.js

@@ -11,8 +11,18 @@ class HttpRequestSender {
             connect: { rejectUnauthorized: agentOptions?.rejectUnaurhorized, keepAlive: agentOptions?.keepAlive },
         });
     }
-    sendRequest(options, postData) {
-        return this.sendRequestWithAuth(options, postData);
+    async sendRequest(options, postData) {
+        const stackHolder = { stack: '' };
+        Error.captureStackTrace(stackHolder, this.sendRequest);
+        try {
+            return await this.sendRequestWithAuth(options, postData);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                err.stack = `${err.stack}\nCaptured at:\n${stackHolder.stack}`;
+            }
+            throw err;
+        }
     }
     async sendRequestWithAuth(options, postData, wwwAuthenticateHeader) {
         options.timeout ??= 10000;
@@ -82,7 +92,7 @@ class HttpRequestSender {
             return authData.digest.getAuthHeader(options.user, options.pass, options.method ?? 'GET', options.path, authData.wwwAuthenticateHeader);
         }
         else {
-            return `Basic ${btoa(options.user + ':' + options.pass)}`;
+            return `Basic ${Buffer.from(`${options.user}:${options.pass}`).toString('base64')}`;
         }
     }
 }

package/cjs/node/WsClient.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import * as EventEmitter from 'events';
 import { WsOptions } from '../internal/types';
 export type WsClientOptions = WsOptions & {

package/cjs/node/index.d.ts

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

package/cjs/node/index.js

@@ -1,7 +1,24 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.WsClient = exports.DefaultClient = void 0;
+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);