camstreamerlib 4.0.0-beta.3 → 4.0.0-beta.30

package/cjs/VapixEvents.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter2 as EventEmitter } from 'eventemitter2';
-import { WsOptions } from './internal/common';
+import { WsOptions } from './internal/types';
 export type VapixEventsOptions = WsOptions;
 type TEventMessage = {
     apiVersion: string;

package/cjs/VapixEvents.js

@@ -42,10 +42,10 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
         this.ws.on('open', () => {
             const topics = [];
             const eventNames = this.eventNames();
-            for (let i = 0; i < eventNames.length; i++) {
-                if (!this.isReservedEventName(eventNames[i])) {
+            for (const eventName of eventNames) {
+                if (!this.isReservedEventName(eventName)) {
                     const topic = {
-                        topicFilter: eventNames[i],
+                        topicFilter: eventName,
                     };
                     topics.push(topic);
                 }

package/cjs/errors/errors.d.ts

@@ -31,4 +31,7 @@ export declare class FetchDeviceInfoError extends Error {
 export declare class AddNewClipError extends Error {
     constructor(message: string);
 }
+export declare class PtzNotSupportedError extends Error {
+    constructor();
+}
 export {};

package/cjs/errors/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
+exports.PtzNotSupportedError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
 class ServiceUnavailableError extends Error {
     constructor() {
         super('Service is unavailable.');
@@ -77,3 +77,10 @@ class AddNewClipError extends Error {
     }
 }
 exports.AddNewClipError = AddNewClipError;
+class PtzNotSupportedError extends Error {
+    constructor() {
+        super('Ptz not supported.');
+        this.name = 'PtzNotSupportedError';
+    }
+}
+exports.PtzNotSupportedError = PtzNotSupportedError;

package/cjs/events/AxisCameraStationEvents.d.ts

@@ -1,9 +1,10 @@
-import { IClient, HttpOptions } from '../internal/common';
-export type AcsEventsOptions = HttpOptions;
+import { HttpOptions } from '../internal/types';
+import { THttpRequestOptions } from '../types/common';
 export declare class AxisCameraStationEvents {
     private sourceKey;
     private client;
-    constructor(sourceKey: string, opt?: AcsEventsOptions | IClient);
-    sendEvent(data: Record<string, string>, eventType: string): Promise<void>;
+    constructor(clientOptions: HttpOptions, sourceKey: string);
+    sendEvent(data: Record<string, string>, eventType: string, options?: THttpRequestOptions): Promise<void>;
     private getDate;
+    private getAgent;
 }

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 common_1 = require("../internal/common");
+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, common_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}`);
@@ -37,12 +39,15 @@ class AxisCameraStationEvents {
     getDate() {
         const date = new Date();
         const year = date.getUTCFullYear();
-        const month = (0, common_1.pad)(date.getUTCMonth() + 1, 2);
-        const day = (0, common_1.pad)(date.getUTCDate(), 2);
-        const hours = (0, common_1.pad)(date.getUTCHours(), 2);
-        const minutes = (0, common_1.pad)(date.getUTCMinutes(), 2);
-        const seconds = (0, common_1.pad)(date.getUTCSeconds(), 2);
+        const month = (0, utils_1.pad)(date.getUTCMonth() + 1, 2);
+        const day = (0, utils_1.pad)(date.getUTCDate(), 2);
+        const hours = (0, utils_1.pad)(date.getUTCHours(), 2);
+        const minutes = (0, utils_1.pad)(date.getUTCMinutes(), 2);
+        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

@@ -148,14 +148,16 @@ export declare const cameraDetailsResponseSchema: z.ZodObject<{
 export type TCameraDetailsResponse = z.infer<typeof cameraDetailsResponseSchema>;
 export type TCameraDetail = z.infer<typeof cameraDetailSchema>;
 export type TParams = Array<'Guid' | 'Name' | 'EntityType'>;
+export type TProtocol = 'http' | 'https' | 'https_insecure';
 export type GenetecAgentOptions = {
-    protocol?: 'http' | 'https' | 'https_insecure';
+    protocol?: TProtocol;
     ip?: string;
     port?: number;
-    base_uri?: string;
+    baseUri?: string;
     user?: string;
     pass?: string;
-    app_id?: string;
+    appId?: string;
+    timeout?: number;
 };
 export declare class GenetecAgent {
     private settings;
@@ -170,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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenetecAgent = exports.cameraDetailsResponseSchema = exports.cameraDetailSchema = void 0;
 const zod_1 = require("zod");
-const common_1 = require("../internal/common");
+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=';
@@ -37,27 +37,28 @@ class GenetecAgent {
             protocol: options.protocol ?? 'http',
             ip: options.ip ?? '127.0.0.1',
             port: options.port ?? 80,
-            base_uri: options.base_uri ?? 'WebSdk',
+            baseUri: options.baseUri ?? 'WebSdk',
             user: options.user ?? 'root',
             pass: options.pass ?? '',
-            app_id: options.app_id ?? '',
+            appId: options.appId ?? '',
+            timeout: options.timeout ?? 10000,
         };
-        this.baseUrl = `${this.settings.protocol}://${this.settings.ip}:${this.settings.port}/${this.settings.base_uri}`;
-        this.credentials = btoa(`${this.settings.user};${this.settings.app_id}:${this.settings.pass}`);
+        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, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         return connectionResponseSchema.parse(await res.json());
     }
     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, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         return cameraGuidsResponseSchema.parse(await res.json());
     }
@@ -75,9 +76,9 @@ 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, common_1.responseStringify)(res));
+                throw new Error(await (0, utils_1.responseStringify)(res));
             }
             const data = exports.cameraDetailsResponseSchema.parse(await res.json());
             const resultArray = Array.isArray(data.Rsp.Result) ? data.Rsp.Result : [data.Rsp.Result];
@@ -92,9 +93,9 @@ 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, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         return res;
     }
@@ -111,13 +112,23 @@ class GenetecAgent {
     getTimeStamp() {
         const date = new Date();
         const year = date.getUTCFullYear();
-        const month = (0, common_1.pad)(date.getUTCMonth() + 1, 2);
-        const day = (0, common_1.pad)(date.getUTCDate(), 2);
-        const hours = (0, common_1.pad)(date.getUTCHours(), 2);
-        const minutes = (0, common_1.pad)(date.getUTCMinutes(), 2);
-        const seconds = (0, common_1.pad)(date.getUTCSeconds(), 2);
-        const miliSeconds = (0, common_1.pad)(date.getUTCMilliseconds(), 2);
+        const month = (0, utils_1.pad)(date.getUTCMonth() + 1, 2);
+        const day = (0, utils_1.pad)(date.getUTCDate(), 2);
+        const hours = (0, utils_1.pad)(date.getUTCHours(), 2);
+        const minutes = (0, utils_1.pad)(date.getUTCMinutes(), 2);
+        const seconds = (0, utils_1.pad)(date.getUTCSeconds(), 2);
+        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

@@ -1,4 +1,4 @@
-export * from './internal/common';
+export * from './internal/types';
 export * from './internal/constants';
 export * from './internal/utils';
 export * from './internal/versionCompare';
@@ -6,6 +6,19 @@ export * from './types/common';
 export { CamSwitcherAPI } from './CamSwitcherAPI';
 export { CamSwitcherEvents } from './CamSwitcherEvents';
 export { VapixAPI } from './VapixAPI';
+export { CamOverlayAPI } from './CamOverlayAPI';
+export { CamScripterAPI } from './CamScripterAPI';
+export { CamStreamerAPI } from './CamStreamerAPI';
+export { PlaneTrackerAPI } from './PlaneTrackerAPI';
 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';
+export { ResourceManager } from './CamOverlayPainter/ResourceManager';
+export * from './types/CamOverlayPainter';
+export { CamOverlayDrawingAPI } from './CamOverlayDrawingAPI';
+export * from './types/CamOverlayDrawingAPI';

package/cjs/index.js

@@ -14,8 +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.VapixAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = void 0;
-__exportStar(require("./internal/common"), exports);
+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);
 __exportStar(require("./internal/versionCompare"), exports);
@@ -26,6 +26,27 @@ var CamSwitcherEvents_1 = require("./CamSwitcherEvents");
 Object.defineProperty(exports, "CamSwitcherEvents", { enumerable: true, get: function () { return CamSwitcherEvents_1.CamSwitcherEvents; } });
 var VapixAPI_1 = require("./VapixAPI");
 Object.defineProperty(exports, "VapixAPI", { enumerable: true, get: function () { return VapixAPI_1.VapixAPI; } });
+var CamOverlayAPI_1 = require("./CamOverlayAPI");
+Object.defineProperty(exports, "CamOverlayAPI", { enumerable: true, get: function () { return CamOverlayAPI_1.CamOverlayAPI; } });
+var CamScripterAPI_1 = require("./CamScripterAPI");
+Object.defineProperty(exports, "CamScripterAPI", { enumerable: true, get: function () { return CamScripterAPI_1.CamScripterAPI; } });
+var CamStreamerAPI_1 = require("./CamStreamerAPI");
+Object.defineProperty(exports, "CamStreamerAPI", { enumerable: true, get: function () { return CamStreamerAPI_1.CamStreamerAPI; } });
+var PlaneTrackerAPI_1 = require("./PlaneTrackerAPI");
+Object.defineProperty(exports, "PlaneTrackerAPI", { enumerable: true, get: function () { return PlaneTrackerAPI_1.PlaneTrackerAPI; } });
 __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; } });
+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/Digest.js

@@ -7,17 +7,17 @@ class Digest {
     getAuthHeader(user, pass, method, uri, wwwAuthenticateHeader) {
         const digestItems = {};
         const digestArr = wwwAuthenticateHeader.substring(wwwAuthenticateHeader.indexOf('Digest') + 6).split(',');
-        for (let i = 0; i < digestArr.length; i++) {
-            const pos = digestArr[i].indexOf('=');
-            const key = digestArr[i].substring(0, pos).trim();
-            const value = digestArr[i].substring(pos + 1).trim();
+        for (const arg of digestArr) {
+            const pos = arg.indexOf('=');
+            const key = arg.substring(0, pos).trim();
+            const value = arg.substring(pos + 1).trim();
             digestItems[key] = value.replace(/"/g, '');
         }
         const HA1 = crypto.createHash('md5').update(`${user}:${digestItems['realm']}:${pass}`).digest('hex');
         const HA2 = crypto.createHash('md5').update(`${method}:${uri}`).digest('hex');
         const ncValue = ('00000000' + this.nonceCount.toString(16)).slice(-8);
         let response;
-        if (digestItems['qop']) {
+        if (digestItems['qop'] !== undefined) {
             response = crypto
                 .createHash('md5')
                 .update(`${HA1}:${digestItems['nonce']}:${ncValue}:162d50aa594e9648:auth:${HA2}`)
@@ -32,7 +32,7 @@ class Digest {
             `nonce="${digestItems['nonce']}",` +
             `uri="${uri}",` +
             `response="${response}"`;
-        if (digestItems['qop']) {
+        if (digestItems['qop'] !== undefined) {
             header += `,qop=auth,nc=${ncValue},cnonce="162d50aa594e9648"`;
         }
         this.nonceCount++;

package/cjs/internal/ProxyClient.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" />
-import { IClient, TParameters } from './common';
-import { TProxyParam } from '../types/common';
-export declare class ProxyClient<Client extends IClient = IClient> {
-    client: Client;
-    getProxyUrl: () => string;
-    constructor(client: Client, getProxyUrl: () => string);
-    get: (proxy: TProxyParam, path: string, parameters?: TParameters, headers?: Record<string, string>) => Promise<import("./common").TResponse>;
-    post: (proxy: TProxyParam, path: string, data: string | Buffer | FormData, parameters?: TParameters, headers?: Record<string, string>) => Promise<import("./common").TResponse>;
+import { IClient, TGetParams, TPostParams, TResponse } from './types';
+import { TProxyParams } from '../types/common';
+export declare class ProxyClient<Client extends IClient<TResponse> = IClient<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,40 +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, path, parameters, headers = {}) => {
-        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, path, data, parameters, headers) => {
-        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': encodeURIComponent(proxy.pass),
-                    'x-target-camera-user': encodeURIComponent(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

@@ -0,0 +1,42 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Response as UndiciResponse } from 'undici';
+export type Options = {
+    ip?: string;
+    port?: number;
+    user?: string;
+    pass?: string;
+    tls?: boolean;
+    tlsInsecure?: boolean;
+};
+export type HttpOptions = Options & {
+    keepAlive?: boolean;
+};
+export type WsOptions = Options;
+export type TParameters = Record<string, string | number | boolean | null | undefined>;
+export type TResponse = Response | UndiciResponse;
+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>;
+}
+export type TBlobResponse<Client extends IClient<TResponse>> = Awaited<ReturnType<Awaited<ReturnType<Client['get']>>['blob']>>;
+export interface IWebsocket<Event extends {
+    readonly data: string;
+}> {
+    destroy: () => void;
+    onmessage: null | ((event: Event) => void);
+    send: (data: string) => void;
+}

package/cjs/internal/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/internal/utils.d.ts

@@ -1,5 +1,5 @@
 import { TPlaylistPlayType } from '../types/CamSwitcherAPI';
-import { TParameters } from './common';
+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,3 +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 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,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLoopPlayType = exports.isPlaylist = exports.isTracker = exports.isClip = exports.isStream = exports.isCamera = exports.arrayToUrl = exports.paramToUrl = exports.addParametersToPath = void 0;
-const common_1 = require("./common");
+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;
@@ -17,7 +16,7 @@ const paramToUrl = (params) => {
     let output = '';
     for (const key in params) {
         const value = params[key];
-        if ((0, common_1.isNullish)(value)) {
+        if (isNullish(value)) {
             continue;
         }
         output += `${encodeURIComponent(key)}=${encodeURIComponent(value)}&`;
@@ -44,3 +43,23 @@ const isPlaylist = (id) => id?.charAt(0) === 'p';
 exports.isPlaylist = isPlaylist;
 const isLoopPlayType = (playType) => playType.includes('LOOP');
 exports.isLoopPlayType = isLoopPlayType;
+async function responseStringify(res) {
+    return JSON.stringify({
+        status: res.status,
+        body: await res.text(),
+    });
+}
+exports.responseStringify = responseStringify;
+function pad(num, size) {
+    const sign = Math.sign(num) === -1 ? '-' : '';
+    return (sign +
+        new Array(size)
+            .concat([Math.abs(num)])
+            .join('0')
+            .slice(-size));
+}
+exports.pad = pad;
+function isNullish(value) {
+    return value === null || value === undefined;
+}
+exports.isNullish = isNullish;

package/cjs/internal/versionCompare.d.ts

@@ -1,6 +1,6 @@
 export declare const assertVersionString: (s: string, msg?: string) => void;
 export declare const isFirmwareVersionAtLeast: (version: string, compareVersion: string) => boolean;
 export declare const isVersionAtLeast: (version: string, compareVersion: string) => boolean;
-export declare const firmwareVersionCompare: (a: string, b: string) => 1 | -1 | 0;
-export declare const versionCompare: (a: string, b: string) => 1 | -1 | 0;
+export declare const firmwareVersionCompare: (a: string, b: string) => 0 | 1 | -1;
+export declare const versionCompare: (a: string, b: string) => 0 | 1 | -1;
 export declare const fixVersionToDots: (version: string) => string;

package/cjs/node/DefaultClient.d.ts

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

package/cjs/node/DefaultClient.js

@@ -25,29 +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}`;
-    }
-    async get(path, parameters = {}, headers) {
-        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);
-    }
-    async post(path, data, parameters = {}, headers) {
-        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) {
-        let 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;