camstreamerlib 4.0.0-beta.10 → 4.0.0-beta.11

package/cjs/CamScripterAPI.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamOverlayAPI = void 0;
-const common_1 = require("./internal/common");
+const utils_1 = require("./internal/utils");
 const CamScripterAPI_1 = require("./types/CamScripterAPI");
-const common_2 = require("./types/common");
+const common_1 = require("./types/common");
 class CamOverlayAPI {
     client;
     constructor(client) {
@@ -18,7 +18,7 @@ class CamOverlayAPI {
     }
     async getNetworkCameraList() {
         const response = await this.get('/local/camscripter/network_camera_list.cgi');
-        return common_2.networkCameraListSchema.parse(response.camera_list);
+        return common_1.networkCameraListSchema.parse(response.camera_list);
     }
     async getPackageList() {
         const data = await this.get('/local/camscripter/package/list.cgi');
@@ -48,7 +48,7 @@ class CamOverlayAPI {
             return await res.json();
         }
         else {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
     async post(path, data, params) {
@@ -57,7 +57,7 @@ class CamOverlayAPI {
             return await res.json();
         }
         else {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
 }

package/cjs/CamScripterAPICameraEventsGenerator.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-import { WsOptions } from './internal/common';
+import { WsOptions } from './internal/types';
 export type CamScripterOptions = WsOptions;
 export type TDeclaration = {
     type?: '' | 'SOURCE' | 'DATA';

package/cjs/CamStreamerAPI.d.ts

@@ -1,8 +1,8 @@
-import { IClient } from './internal/common';
-import { CamStreamerAPIOptions, TStreamAttributes, TStreamList } from './types/CamStreamerAPI';
-export declare class CamStreamerAPI {
-    private client;
-    constructor(options?: CamStreamerAPIOptions | IClient);
+import { IClient, TResponse } from './internal/types';
+import { TStreamAttributes, TStreamList } from './types/CamStreamerAPI';
+export declare class CamStreamerAPI<Client extends IClient<TResponse>> {
+    client: Client;
+    constructor(client: Client);
     getStreamList(): Promise<TStreamList>;
     getStream(streamID: string): Promise<TStreamAttributes>;
     getStreamParameter(streamID: string, paramName: string): Promise<string>;

package/cjs/CamStreamerAPI.js

@@ -1,18 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamStreamerAPI = void 0;
-const common_1 = require("./internal/common");
-const DefaultClient_1 = require("./node/DefaultClient");
+const utils_1 = require("./internal/utils");
 const CamStreamerAPI_1 = require("./types/CamStreamerAPI");
 class CamStreamerAPI {
     client;
-    constructor(options = {}) {
-        if ((0, common_1.isClient)(options)) {
-            this.client = options;
-        }
-        else {
-            this.client = new DefaultClient_1.DefaultClient(options);
-        }
+    constructor(client) {
+        this.client = client;
     }
     async getStreamList() {
         const streamListRes = await this.get('/local/camstreamer/stream/list.cgi');
@@ -58,7 +52,7 @@ class CamStreamerAPI {
             return await res.json();
         }
         else {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
 }

package/cjs/CamSwitcherAPI.d.ts

@@ -1,7 +1,7 @@
-import { IClient } from './internal/common';
+import { IClient, TResponse } from './internal/types';
 import { TAudioPushInfo, TOutputInfo, TStorageInfo, TStreamSaveList, TClipList, TStreamSaveLoadList, TClipSaveLoadList, TPlaylistSaveLoadList, TTrackerSaveList, TrackerSaveLoadList, TClipSaveList, TPlaylistSaveList, TCameraOptions, TGlobalAudioSettings, TSecondaryAudioSettings } from './types/CamSwitcherAPI';
 import { TAudioChannel, TNetworkCamera, TStorageType } from './types/common';
-export declare class CamSwitcherAPI<Client extends IClient = IClient> {
+export declare class CamSwitcherAPI<Client extends IClient<TResponse> = IClient<TResponse>> {
     client: Client;
     private CustomFormData;
     private vapixAgent;

package/cjs/CamSwitcherAPI.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamSwitcherAPI = void 0;
 const zod_1 = require("zod");
 const errors_1 = require("./errors/errors");
-const common_1 = require("./internal/common");
+const utils_1 = require("./internal/utils");
 const CamSwitcherAPI_1 = require("./types/CamSwitcherAPI");
-const common_2 = require("./types/common");
+const common_1 = require("./types/common");
 const VapixAPI_1 = require("./VapixAPI");
 const versionCompare_1 = require("./internal/versionCompare");
-const utils_1 = require("./internal/utils");
 const constants_1 = require("./internal/constants");
 const baseUrl = '/local/camswitcher/api';
 class CamSwitcherAPI {
@@ -35,7 +34,7 @@ class CamSwitcherAPI {
     }
     async getIpListFromNetworkCheck() {
         const data = await this.get(`${baseUrl}/network_camera_list.cgi`);
-        return common_2.networkCameraListSchema.parse(data);
+        return common_1.networkCameraListSchema.parse(data);
     }
     async getMaxFps(source) {
         const data = await this.get(`${baseUrl}/get_max_framerate.cgi`, {
@@ -182,21 +181,21 @@ class CamSwitcherAPI {
     }
     async getCamSwitchOptions() {
         const saveData = await this.getParamFromCameraAndJSONParse(CSW_PARAM_NAMES.SETTINGS);
-        if ((0, common_1.isNullish)(saveData.video)) {
+        if ((0, utils_1.isNullish)(saveData.video)) {
             return saveData;
         }
-        if (!(0, common_1.isNullish)(saveData.video?.bitrateVapixParams)) {
+        if (!(0, utils_1.isNullish)(saveData.video?.bitrateVapixParams)) {
             const bitrateOptions = parseVapixParamsToBitrateOptions(saveData.video.bitrateVapixParams);
             saveData.video.bitrateMode = bitrateOptions.bitrateMode;
             saveData.video.maximumBitRate = bitrateOptions.maximumBitRate;
             saveData.video.retentionTime = bitrateOptions.retentionTime;
             saveData.video.bitRateLimit = bitrateOptions.bitRateLimit;
         }
-        if (!(0, common_1.isNullish)(saveData.video?.bitrateLimit)) {
+        if (!(0, utils_1.isNullish)(saveData.video?.bitrateLimit)) {
             saveData.video.maximumBitRate = saveData.video.bitrateLimit;
             saveData.video.bitrateMode = 'MBR';
         }
-        if (!(0, common_1.isNullish)(saveData.video?.videoClipQuality)) {
+        if (!(0, utils_1.isNullish)(saveData.video?.videoClipQuality)) {
             saveData.video.maximumBitRate = saveData.video.videoClipQuality;
         }
         return {
@@ -247,7 +246,7 @@ class CamSwitcherAPI {
             return d.data;
         }
         else {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
     async set(path, data, parameters = {}) {
@@ -257,7 +256,7 @@ class CamSwitcherAPI {
             return parsed.message === 'OK';
         }
         else {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
     setParamFromCameraJSON(paramName, data) {

package/cjs/CamSwitcherEvents.d.ts

@@ -1,4 +1,4 @@
-import { IWebsocket } from './internal/common';
+import { IWebsocket } from './internal/types';
 import { TCamSwitcherEventOfType, TCamSwitcherEventType } from './types/CamSwitcherEvents';
 type TListenerFunction<T extends TCamSwitcherEventType> = (data: TCamSwitcherEventOfType<T>, isInit: boolean) => void;
 export declare class CamSwitcherEvents<Event extends {

package/cjs/VapixAPI.d.ts

@@ -1,13 +1,13 @@
-import { IClient, TParameters } from './internal/common';
+import { IClient, TParameters, TResponse } from './internal/types';
 import { TAudioSampleRates, TSDCardInfo, TPtzOverview, TCameraPTZItem, TCameraPTZItemData, TAudioDevice } from './types/VapixAPI';
 import { ProxyClient } from './internal/ProxyClient';
 import { TCameraImageConfig, TProxyParam } from './types/common';
-export declare class VapixAPI<Client extends IClient = IClient> {
+export declare class VapixAPI<Client extends IClient<TResponse> = IClient<TResponse>> {
     client: ProxyClient<Client>;
     constructor(client: Client, getProxyUrl: () => string);
-    getUrlEncoded(proxy: TProxyParam, path: string, parameters?: TParameters, headers?: Record<string, string>): Promise<Response | import("undici").Response>;
-    postJson(proxy: TProxyParam, path: string, jsonData: Record<string, any>, headers?: Record<string, string>): Promise<Response | import("undici").Response>;
-    getCameraImage(params: TCameraImageConfig, proxy?: TProxyParam): Promise<Response | import("undici").Response>;
+    getUrlEncoded(proxy: TProxyParam, path: string, parameters?: TParameters, headers?: Record<string, string>): Promise<TResponse>;
+    postJson(proxy: TProxyParam, path: string, jsonData: Record<string, any>, headers?: Record<string, string>): Promise<TResponse>;
+    getCameraImage(params: TCameraImageConfig, proxy?: TProxyParam): Promise<TResponse>;
     getEventDeclarations(proxy?: TProxyParam): Promise<string>;
     getSupportedAudioSampleRate(proxy?: TProxyParam): Promise<TAudioSampleRates[]>;
     performAutofocus(proxy?: TProxyParam): Promise<void>;
@@ -16,8 +16,8 @@ export declare class VapixAPI<Client extends IClient = IClient> {
     unmountSDCard(proxy?: TProxyParam): Promise<number>;
     private _doSDCardMountAction;
     fetchSDCardJobProgress(jobId: number, proxy?: TProxyParam): Promise<number>;
-    downloadCameraReport(proxy?: TProxyParam): Promise<Response | import("undici").Response>;
-    getSystemLog(proxy?: TProxyParam): Promise<Response | import("undici").Response>;
+    downloadCameraReport(proxy?: TProxyParam): Promise<TResponse>;
+    getSystemLog(proxy?: TProxyParam): Promise<TResponse>;
     getMaxFps(channel: number, proxy?: TProxyParam): Promise<number>;
     getTimezone(proxy?: TProxyParam): Promise<string>;
     getDateTimeInfo(proxy?: TProxyParam): Promise<{
@@ -32,12 +32,12 @@ export declare class VapixAPI<Client extends IClient = IClient> {
     getDevicesSettings(proxy?: TProxyParam): Promise<TAudioDevice[]>;
     fetchRemoteDeviceInfo<T extends Record<string, any>>(payload: T, proxy?: TProxyParam): Promise<any>;
     getHeaders(proxy?: TProxyParam): Promise<Record<string, string>>;
-    setHeaders(headers: Record<string, string>, proxy?: TProxyParam): Promise<Response | import("undici").Response>;
+    setHeaders(headers: Record<string, string>, proxy?: TProxyParam): Promise<TResponse>;
     getParameter(paramNames: string | string[], proxy?: TProxyParam): Promise<Record<string, string>>;
     setParameter(params: Record<string, string | number | boolean>, proxy?: TProxyParam): Promise<boolean>;
     getGuardTourList(proxy?: TProxyParam): Promise<{
-        id: string;
         name: string;
+        id: string;
         running: string;
         tour: {
             moveSpeed?: unknown;
@@ -54,10 +54,10 @@ export declare class VapixAPI<Client extends IClient = IClient> {
     getPTZPresetList(channel: number, proxy?: TProxyParam): Promise<string[]>;
     listPTZ(camera: number, proxy?: TProxyParam): Promise<TCameraPTZItem[]>;
     listPtzVideoSourceOverview(proxy?: TProxyParam): Promise<TPtzOverview>;
-    goToPreset(channel: number, presetName: string, proxy?: TProxyParam): Promise<Response | import("undici").Response>;
+    goToPreset(channel: number, presetName: string, proxy?: TProxyParam): Promise<TResponse>;
     getPtzPosition(camera: number, proxy?: TProxyParam): Promise<TCameraPTZItemData>;
     getInputState(port: number, proxy?: TProxyParam): Promise<boolean>;
-    setOutputState(port: number, active: boolean, proxy?: TProxyParam): Promise<Response | import("undici").Response>;
+    setOutputState(port: number, active: boolean, proxy?: TProxyParam): Promise<TResponse>;
     getApplicationList(proxy?: TProxyParam): Promise<{
         appId: "CamStreamer" | "CamSwitcher" | "CamOverlay" | "CamScripter" | "PlaneTracker" | "Ndihxplugin" | "SportTracker" | null;
         Name: string;

package/cjs/VapixAPI.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VapixAPI = void 0;
 const prettifyXml = require("prettify-xml");
-const common_1 = require("./internal/common");
+const utils_1 = require("./internal/utils");
 const VapixAPI_1 = require("./types/VapixAPI");
 const errors_1 = require("./errors/errors");
 const ProxyClient_1 = require("./internal/ProxyClient");
-const utils_1 = require("./internal/utils");
 const zod_1 = require("zod");
 const fast_xml_parser_1 = require("fast-xml-parser");
 class VapixAPI {
@@ -19,7 +18,7 @@ class VapixAPI {
         const head = { ...headers, 'Content-Type': 'application/x-www-form-urlencoded' };
         const res = await this.client.post(proxy, path, data, {}, head);
         if (!res.ok) {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         return res;
     }
@@ -28,7 +27,7 @@ class VapixAPI {
         const head = { ...headers, 'Content-Type': 'application/json' };
         const res = await this.client.post(proxy, path, data, {}, head);
         if (!res.ok) {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         return res;
     }
@@ -44,7 +43,7 @@ class VapixAPI {
             '</s:Envelope>';
         const res = await this.client.post(proxy, '/vapix/services', data, { 'Content-Type': 'application/soap+xml' });
         if (!res.ok) {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         const declarations = await res.text();
         return prettifyXml(declarations);
@@ -122,7 +121,7 @@ class VapixAPI {
         const result = parser.parse(textXml);
         const job = result.root.job;
         if (job.result !== 'OK') {
-            throw new errors_1.SDCardActionError(action, await (0, common_1.responseStringify)(res));
+            throw new errors_1.SDCardActionError(action, await (0, utils_1.responseStringify)(res));
         }
         return Number(job.jobid);
     }
@@ -166,7 +165,7 @@ class VapixAPI {
         if (captureMode === undefined) {
             throw new errors_1.MaxFPSError('CAPTURE_MODE_NOT_FOUND');
         }
-        if ((0, common_1.isNullish)(captureMode.maxFPS)) {
+        if ((0, utils_1.isNullish)(captureMode.maxFPS)) {
             throw new errors_1.MaxFPSError('FPS_NOT_SPECIFIED');
         }
         return captureMode.maxFPS;
@@ -200,7 +199,7 @@ class VapixAPI {
             allowBooleanAttributes: true,
         });
         const result = parser.parse(textXml);
-        if ((0, common_1.isNullish)(result.body.data)) {
+        if ((0, utils_1.isNullish)(result.body.data)) {
             throw new errors_1.NoDeviceInfoError();
         }
         return result.data;
@@ -373,7 +372,7 @@ class VapixAPI {
         });
         const text = (await res.text()).trim().toLowerCase();
         if (text !== 'ok' && !(text.startsWith('error:') && text.substring(7) === '6')) {
-            throw new errors_1.ApplicationAPIError('START', await (0, common_1.responseStringify)(res));
+            throw new errors_1.ApplicationAPIError('START', await (0, utils_1.responseStringify)(res));
         }
     }
     async restartApplication(applicationID, proxy = null) {
@@ -383,7 +382,7 @@ class VapixAPI {
         });
         const text = (await res.text()).trim().toLowerCase();
         if (text !== 'ok') {
-            throw new errors_1.ApplicationAPIError('RESTART', await (0, common_1.responseStringify)(res));
+            throw new errors_1.ApplicationAPIError('RESTART', await (0, utils_1.responseStringify)(res));
         }
     }
     async stopApplication(applicationID, proxy = null) {
@@ -393,7 +392,7 @@ class VapixAPI {
         });
         const text = (await res.text()).trim().toLowerCase();
         if (text !== 'ok' && !(text.startsWith('error:') && text.substring(7) === '6')) {
-            throw new errors_1.ApplicationAPIError('STOP', await (0, common_1.responseStringify)(res));
+            throw new errors_1.ApplicationAPIError('STOP', await (0, utils_1.responseStringify)(res));
         }
     }
     async installApplication(data, fileName) {
@@ -403,7 +402,7 @@ class VapixAPI {
             contentType: 'application/octet-stream',
         });
         if (!res.ok) {
-            throw new Error(await (0, common_1.responseStringify)(res));
+            throw new Error(await (0, utils_1.responseStringify)(res));
         }
         const text = await res.text();
         if (text.length > 5) {

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/events/AxisCameraStationEvents.d.ts

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

package/cjs/events/AxisCameraStationEvents.js

@@ -2,13 +2,13 @@
 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");
 class AxisCameraStationEvents {
     sourceKey;
     client;
     constructor(sourceKey, opt = {}) {
         this.sourceKey = sourceKey;
-        if ((0, common_1.isClient)(opt)) {
+        if ((0, utils_1.isClient)(opt)) {
             this.client = opt;
         }
         else {
@@ -37,11 +37,11 @@ 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}`;
     }
 }

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=';
@@ -49,7 +49,7 @@ class GenetecAgent {
         const requestOptions = this.getRequestOptions('GET');
         const res = await fetch(`${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());
     }
@@ -57,7 +57,7 @@ class GenetecAgent {
         const requestOptions = this.getRequestOptions('GET');
         const res = await fetch(`${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());
     }
@@ -77,7 +77,7 @@ class GenetecAgent {
             }
             const res = await fetch(`${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];
@@ -94,7 +94,7 @@ class GenetecAgent {
         }
         const res = await fetch(`${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,12 +111,12 @@ 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`;
     }
 }

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';

package/cjs/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamOverlayAPI = exports.VapixAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = void 0;
-__exportStar(require("./internal/common"), exports);
+__exportStar(require("./internal/types"), exports);
 __exportStar(require("./internal/constants"), exports);
 __exportStar(require("./internal/utils"), exports);
 __exportStar(require("./internal/versionCompare"), exports);

package/cjs/internal/ProxyClient.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
-import { IClient } from './common';
+import { IClient, TResponse } from './types';
 import { TProxyParam } from '../types/common';
-export declare class ProxyClient<Client extends IClient = IClient> {
+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("./common").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<Response | import("undici").Response>;
-    post: (proxy: TProxyParam, url: string, data: string | Buffer | FormData, parameters?: import("./common").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<Response | import("undici").Response>;
+    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 getReal;
 }

package/cjs/internal/types.d.ts

@@ -0,0 +1,35 @@
+/// <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 = [url: string, parameters?: TParameters, headers?: Record<string, string>];
+export type TPostParams = [
+    url: string,
+    data: string | Buffer | FormData,
+    parameters?: TParameters,
+    headers?: Record<string, string>
+];
+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 { IClient, Options, 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,7 @@ 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,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.isClient = 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,27 @@ 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,
+        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;