camstreamerlib 4.0.31-e0ed433 → 4.0.32

package/README.md

@@ -83,7 +83,7 @@ const coApi = new CamOverlayAPI(
     new DefaultClient({
         tls: false,
         tlsInsecure: false,
-        ip: '127.0.0.1',
+        host: '127.0.0.1',
         port: 80,
         user: '',
         pass: '',

package/cjs/CamSwitcherAPI.d.ts

@@ -161,7 +161,7 @@ export declare class CamSwitcherAPI<Client extends IClient<TResponse, any>> exte
         bitrateVapixParams?: string | null | undefined;
         audioSampleRate?: number | undefined;
         audioChannelCount?: 1 | 2 | undefined;
-    }>;
+    } | undefined>;
     getGlobalAudioSettings(options?: THttpRequestOptions): Promise<{
         type: "source" | "fromSource";
         source: string;

package/cjs/CamSwitcherAPI.js

@@ -34,15 +34,13 @@ class CamSwitcherAPI extends BasicAPI_1.BasicAPI {
         return common_1.networkCameraListSchema.parse(res.data);
     }
     async generateSilence(sampleRate, channels, options) {
-        const agent = this.getClient(options?.proxyParams);
-        await agent.get({
-            path: `${BASE_PATH}/generate_silence.cgi`,
-            parameters: {
-                sample_rate: sampleRate.toString(),
-                channels,
-            },
-            timeout: options?.timeout,
-        });
+        const res = await this._getJson(`${BASE_PATH}/generate_silence.cgi`, {
+            sample_rate: sampleRate.toString(),
+            channels,
+        }, options);
+        if (res.status !== 200) {
+            throw new errors_1.GenerateSilenceError(res.message);
+        }
     }
     async getMaxFps(source, options) {
         const res = await this._getJson(`${BASE_PATH}/get_max_framerate.cgi`, {
@@ -204,11 +202,7 @@ class CamSwitcherAPI extends BasicAPI_1.BasicAPI {
     async getCamSwitchOptions(options) {
         const saveData = await this.getParamFromCameraAndJSONParse(CSW_PARAM_NAMES.SETTINGS, options);
         if ((0, utils_1.isNullish)(saveData.video)) {
-            return CamSwitcherAPI_1.cameraOptionsSchema.parse({
-                audioSampleRate: saveData.audio?.sampleRate,
-                audioChannelCount: saveData.audio?.channelCount,
-                keyboard: saveData.keyboard,
-            });
+            return;
         }
         const settings = {
             audioSampleRate: saveData.audio?.sampleRate,

package/cjs/PlaneTrackerAPI.d.ts

@@ -268,6 +268,7 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
             maxAltitudeAmsl?: number | undefined;
             minSpeedKmph?: number | undefined;
             maxSpeedKmph?: number | undefined;
+            runwayDirectionDeg?: number | undefined;
         }[];
     }>;
     setZones(zones: TZones, options?: THttpRequestOptions): Promise<void>;

package/cjs/errors/errors.d.ts

@@ -49,6 +49,9 @@ export declare class FetchDeviceInfoError extends Error {
 export declare class AddNewClipError extends Error {
     constructor(message: string);
 }
+export declare class GenerateSilenceError extends Error {
+    constructor(message: string);
+}
 export declare class PtzNotSupportedError extends Error {
     constructor();
 }

package/cjs/errors/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationError = exports.BadRequestError = exports.ServerError = exports.InvalidAltitudeError = exports.InvalidLatLngError = exports.CannotSetCoordsInAutoModeError = exports.ImportSettingsError = exports.ResetCalibrationError = exports.TimezoneFetchError = exports.TimezoneNotSetupError = exports.UtcTimeFetchError = exports.WsAuthorizationError = exports.StorageDataFetchError = exports.PtzNotSupportedError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.SettingParameterError = exports.ParameterNotFoundError = exports.JsonParseError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = exports.ErrorWithResponse = void 0;
+exports.MigrationError = exports.BadRequestError = exports.ServerError = exports.InvalidAltitudeError = exports.InvalidLatLngError = exports.CannotSetCoordsInAutoModeError = exports.ImportSettingsError = exports.ResetCalibrationError = exports.TimezoneFetchError = exports.TimezoneNotSetupError = exports.UtcTimeFetchError = exports.WsAuthorizationError = exports.StorageDataFetchError = exports.PtzNotSupportedError = exports.GenerateSilenceError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.SettingParameterError = exports.ParameterNotFoundError = exports.JsonParseError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = exports.ErrorWithResponse = void 0;
 class ErrorWithResponse extends Error {
     res;
     constructor(res) {
@@ -111,6 +111,13 @@ class AddNewClipError extends Error {
     }
 }
 exports.AddNewClipError = AddNewClipError;
+class GenerateSilenceError extends Error {
+    constructor(message) {
+        super('Error generating silence clip: ' + message);
+        this.name = 'GenerateSilenceError';
+    }
+}
+exports.GenerateSilenceError = GenerateSilenceError;
 class PtzNotSupportedError extends Error {
     constructor() {
         super('Ptz not supported.');

package/cjs/internal/types.d.ts

@@ -1,10 +1,12 @@
 export type Options = {
     ip?: string;
+    host?: string;
     port?: number;
     user?: string;
     pass?: string;
     tls?: boolean;
     tlsInsecure?: boolean;
+    headers?: Record<string, string>;
 };
 export type HttpOptions = Options & {
     keepAlive?: boolean;

package/cjs/node/CamOverlayDrawingAPI.d.ts

@@ -6,10 +6,11 @@ import { CamOverlayDrawingOptions, TCairoCreateResponse, TCairoResponse, TUpload
 export declare class CamOverlayDrawingAPI extends EventEmitter {
     private tls;
     private tlsInsecure;
-    private ip;
+    private host;
     private port;
     private user;
     private pass;
+    private headers?;
     private cameraList;
     private zIndex;
     private callId;

package/cjs/node/CamOverlayDrawingAPI.js

@@ -6,10 +6,11 @@ const WsClient_1 = require("./WsClient");
 class CamOverlayDrawingAPI extends events_1.EventEmitter {
     tls;
     tlsInsecure;
-    ip;
+    host;
     port;
     user;
     pass;
+    headers;
     cameraList;
     zIndex;
     callId;
@@ -21,10 +22,11 @@ class CamOverlayDrawingAPI extends events_1.EventEmitter {
         super();
         this.tls = options?.tls ?? false;
         this.tlsInsecure = options?.tlsInsecure ?? false;
-        this.ip = options?.ip ?? '127.0.0.1';
+        this.host = options?.host ?? options?.ip ?? '127.0.0.1';
         this.port = options?.port ?? (this.tls ? 443 : 80);
         this.user = options?.user ?? '';
         this.pass = options?.pass ?? '';
+        this.headers = options?.headers;
         this.zIndex = options?.zIndex ?? 0;
         this.cameraList = [0];
         if (options && Array.isArray(options.camera)) {
@@ -91,7 +93,7 @@ class CamOverlayDrawingAPI extends events_1.EventEmitter {
     }
     createWsClient() {
         const options = {
-            ip: this.ip,
+            host: this.host,
             port: this.port,
             address: '/local/camoverlay/ws',
             protocol: 'cairo-api',
@@ -99,6 +101,7 @@ class CamOverlayDrawingAPI extends events_1.EventEmitter {
             pass: this.pass,
             tls: this.tls,
             tlsInsecure: this.tlsInsecure,
+            headers: this.headers,
         };
         this.ws = new WsClient_1.WsClient(options);
         this.ws.onOpen = () => {

package/cjs/node/CamScripterAPICameraEventsGenerator.d.ts

@@ -5,10 +5,11 @@ import { TCamScripterEvent, TEventDeclaration, TEventUndeclaration, TCamScripter
 export declare class CamScripterAPICameraEventsGenerator extends EventEmitter {
     private tls;
     private tlsInsecure;
-    private ip;
+    private host;
     private port;
     private user;
     private pass;
+    private headers?;
     private callId;
     private sendMessages;
     private timeoutCheckTimer;

package/cjs/node/CamScripterAPICameraEventsGenerator.js

@@ -6,10 +6,11 @@ const WsClient_1 = require("./WsClient");
 class CamScripterAPICameraEventsGenerator extends events_1.EventEmitter {
     tls;
     tlsInsecure;
-    ip;
+    host;
     port;
     user;
     pass;
+    headers;
     callId;
     sendMessages;
     timeoutCheckTimer;
@@ -19,10 +20,11 @@ class CamScripterAPICameraEventsGenerator extends events_1.EventEmitter {
         super();
         this.tls = options?.tls ?? false;
         this.tlsInsecure = options?.tlsInsecure ?? false;
-        this.ip = options?.ip ?? '127.0.0.1';
+        this.host = options?.host ?? options?.ip ?? '127.0.0.1';
         this.port = options?.port ?? (this.tls ? 443 : 80);
         this.user = options?.user ?? '';
         this.pass = options?.pass ?? '';
+        this.headers = options?.headers;
         this.callId = 0;
         this.sendMessages = {};
         this.wsConnected = false;
@@ -64,10 +66,11 @@ class CamScripterAPICameraEventsGenerator extends events_1.EventEmitter {
             pass: this.pass,
             tlsInsecure: this.tlsInsecure,
             tls: this.tls,
-            ip: this.ip,
+            host: this.host,
             port: this.port,
             address: `/local/camscripter/ws`,
             protocol: 'camera-events',
+            headers: this.headers,
         };
         this.ws = new WsClient_1.WsClient(options);
         this.ws.onOpen = () => {

package/cjs/node/DefaultClient.d.ts

@@ -4,10 +4,11 @@ import { IClient, HttpOptions, TGetParams, TPostParams } from '../internal/types
 import { FormData as UndiciFormData, Response as UndiciResponse } from 'undici';
 export declare class DefaultClient implements IClient<UndiciResponse, UndiciFormData | Buffer> {
     private tls;
-    private ip;
+    private host;
     private port;
-    private user;
-    private pass;
+    private user?;
+    private pass?;
+    private headers;
     private httpRequestSender;
     constructor(opt?: HttpOptions);
     get(params: TGetParams): Promise<UndiciResponse>;

package/cjs/node/DefaultClient.js

@@ -5,17 +5,19 @@ const utils_1 = require("../internal/utils");
 const HttpRequestSender_1 = require("./HttpRequestSender");
 class DefaultClient {
     tls;
-    ip;
+    host;
     port;
     user;
     pass;
+    headers;
     httpRequestSender;
     constructor(opt = {}) {
         this.tls = opt.tls ?? false;
-        this.ip = opt.ip ?? '127.0.0.1';
+        this.host = opt.host ?? opt.ip ?? '127.0.0.1';
         this.port = opt.port ?? (this.tls ? 443 : 80);
-        this.user = opt.user ?? '';
-        this.pass = opt.pass ?? '';
+        this.user = opt.user;
+        this.pass = opt.pass;
+        this.headers = opt.headers ?? {};
         let agentOptions;
         if (opt.tlsInsecure !== undefined || opt.keepAlive !== undefined) {
             agentOptions = {
@@ -39,12 +41,12 @@ class DefaultClient {
         return {
             method: method,
             protocol: this.tls ? 'https:' : 'http:',
-            host: this.ip,
+            host: this.host,
             port: this.port,
             path: (0, utils_1.addParametersToPath)(path, params),
             user: this.user,
             pass: this.pass,
-            headers,
+            headers: { ...this.headers, ...headers },
             timeout,
         };
     }

package/cjs/node/DeviceConnectClient.d.ts

@@ -0,0 +1,9 @@
+import { DefaultClient } from './DefaultClient';
+type THttpOptions = {
+    tlsInsecure?: boolean;
+    keepAlive?: boolean;
+};
+export declare class DeviceConnectClient extends DefaultClient {
+    constructor(deviceAccessToken: string, host: string, opt?: THttpOptions);
+}
+export {};

package/cjs/node/DeviceConnectClient.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceConnectClient = void 0;
+const DefaultClient_1 = require("./DefaultClient");
+class DeviceConnectClient extends DefaultClient_1.DefaultClient {
+    constructor(deviceAccessToken, host, opt = {}) {
+        super({
+            ...opt,
+            tls: true,
+            host: host,
+            headers: { authorization: `Bearer ${deviceAccessToken}` },
+        });
+    }
+}
+exports.DeviceConnectClient = DeviceConnectClient;

package/cjs/node/DeviceConnectWsClient.d.ts

@@ -0,0 +1,12 @@
+import { WsClient } from './WsClient';
+type TWsClientOptions = {
+    path: string;
+    headers?: Record<string, string>;
+    tlsInsecure?: boolean;
+    pingInterval?: number;
+    protocol?: string;
+};
+export declare class DeviceConnectWsClient extends WsClient {
+    constructor(deviceAccessToken: string, host: string, opt: TWsClientOptions);
+}
+export {};

package/cjs/node/DeviceConnectWsClient.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceConnectWsClient = void 0;
+const WsClient_1 = require("./WsClient");
+class DeviceConnectWsClient extends WsClient_1.WsClient {
+    constructor(deviceAccessToken, host, opt) {
+        const andChar = opt.path.includes('?') ? '&' : '?';
+        super({
+            ...opt,
+            tls: true,
+            host: host,
+            address: `${opt.path}${andChar}DEVICE_ACCESS_TOKEN=${deviceAccessToken}`,
+        });
+        this.wsOptions = {
+            auth: undefined,
+            rejectUnauthorized: !opt.tlsInsecure,
+            headers: { ...opt.headers },
+        };
+    }
+}
+exports.DeviceConnectWsClient = DeviceConnectWsClient;

package/cjs/node/VapixEvents.d.ts

@@ -3,10 +3,11 @@ import { Options } from '../internal/types';
 export declare class VapixEvents extends EventEmitter {
     private tls;
     private tlsInsecure;
-    private ip;
+    private host;
     private port;
     private user;
     private pass;
+    private headers?;
     private ws;
     constructor(options?: Options);
     connect(): void;

package/cjs/node/VapixEvents.js

@@ -6,19 +6,21 @@ const WsClient_1 = require("./WsClient");
 class VapixEvents extends eventemitter2_1.EventEmitter2 {
     tls;
     tlsInsecure;
-    ip;
+    host;
     port;
     user;
     pass;
+    headers;
     ws;
     constructor(options = {}) {
         super();
         this.tls = options.tls ?? false;
         this.tlsInsecure = options.tlsInsecure ?? false;
-        this.ip = options.ip ?? '127.0.0.1';
+        this.host = options.host ?? options.ip ?? '127.0.0.1';
         this.port = options.port ?? (this.tls ? 443 : 80);
         this.user = options.user ?? 'root';
         this.pass = options.pass ?? '';
+        this.headers = options.headers;
         this.createWsClient();
         eventemitter2_1.EventEmitter2.call(this);
     }
@@ -34,9 +36,10 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
             tlsInsecure: this.tlsInsecure,
             user: this.user,
             pass: this.pass,
-            ip: this.ip,
+            host: this.host,
             port: this.port,
             address: '/vapix/ws-data-stream?sources=events',
+            headers: this.headers,
         };
         this.ws = new WsClient_1.WsClient(options);
         this.ws.onOpen = () => {

package/cjs/node/WsClient.d.ts

@@ -1,17 +1,21 @@
 import { IWsClient, Options } from '../internal/types';
 export type WsClientOptions = Options & {
     address: string;
-    headers?: Record<string, string>;
     pingInterval?: number;
     protocol?: string;
 };
+type TWsoptions = {
+    auth?: string;
+    rejectUnauthorized: boolean;
+    headers: Record<string, string>;
+};
 export declare class WsClient implements IWsClient {
     private user;
     private pass;
     private address;
     private protocol?;
     private pingInterval;
-    private wsOptions;
+    protected wsOptions: TWsoptions;
     private digestAddress;
     private isAlive;
     private pingTimer?;
@@ -28,3 +32,4 @@ export declare class WsClient implements IWsClient {
     reconnect(): void;
     private closeWsConnection;
 }
+export {};

package/cjs/node/WsClient.js

@@ -18,12 +18,12 @@ class WsClient {
     constructor(options) {
         const tls = options.tls ?? false;
         const tlsInsecure = options.tlsInsecure ?? false;
-        const ip = options.ip ?? '127.0.0.1';
+        const host = options.host ?? options.ip ?? '127.0.0.1';
         const port = options.port ?? (tls ? 443 : 80);
         this.user = options.user ?? '';
         this.pass = options.pass ?? '';
         const protocol = tls ? 'wss' : 'ws';
-        this.address = `${protocol}://${ip}:${port}${options.address}`;
+        this.address = `${protocol}://${host}:${port}${options.address}`;
         this.digestAddress = options.address;
         this.pingInterval = options.pingInterval ?? 30000;
         this.protocol = options.protocol;
@@ -61,7 +61,7 @@ class WsClient {
                 this.isAlive = true;
             });
             if (wwwAuthenticateHeader !== undefined) {
-                this.wsOptions.headers['Authorization'] = new Digest_1.Digest().getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
+                this.wsOptions.headers['authorization'] = new Digest_1.Digest().getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
             }
             this.ws.on('unexpected-response', (req, res) => {
                 if (res.statusCode === 401 && res.headers['www-authenticate'] !== undefined) {

package/cjs/node/index.d.ts

@@ -1,4 +1,6 @@
 export * from './DefaultClient';
+export * from './DeviceConnectClient';
+export { DeviceConnectWsClient } from './DeviceConnectWsClient';
 export * from './WsClient';
 export * from './HttpServer';
 export * from './HttpRequestSender';

package/cjs/node/index.js

@@ -14,8 +14,11 @@ 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.VapixEvents = exports.CamScripterAPICameraEventsGenerator = exports.CamOverlayDrawingAPI = exports.Frame = exports.Painter = exports.ResourceManager = void 0;
+exports.VapixEvents = exports.CamScripterAPICameraEventsGenerator = exports.CamOverlayDrawingAPI = exports.Frame = exports.Painter = exports.ResourceManager = exports.DeviceConnectWsClient = void 0;
 __exportStar(require("./DefaultClient"), exports);
+__exportStar(require("./DeviceConnectClient"), exports);
+var DeviceConnectWsClient_1 = require("./DeviceConnectWsClient");
+Object.defineProperty(exports, "DeviceConnectWsClient", { enumerable: true, get: function () { return DeviceConnectWsClient_1.DeviceConnectWsClient; } });
 __exportStar(require("./WsClient"), exports);
 __exportStar(require("./HttpServer"), exports);
 __exportStar(require("./HttpRequestSender"), exports);

package/cjs/types/PlaneTrackerAPI.d.ts

@@ -1113,6 +1113,7 @@ export declare const zonesSchema: z.ZodObject<{
         minSpeedKmph: z.ZodOptional<z.ZodNumber>;
         maxSpeedKmph: z.ZodOptional<z.ZodNumber>;
         flightDirection: z.ZodDefault<z.ZodEnum<["all", "arrival", "departure"]>>;
+        runwayDirectionDeg: z.ZodOptional<z.ZodNumber>;
         weight: z.ZodNumber;
         perimeter: z.ZodDefault<z.ZodEnum<["none", "outer", "inner"]>>;
         trackingDomains: z.ZodDefault<z.ZodArray<z.ZodEnum<["adsb", "remoteId"]>, "many">>;
@@ -1134,6 +1135,7 @@ export declare const zonesSchema: z.ZodObject<{
         maxAltitudeAmsl?: number | undefined;
         minSpeedKmph?: number | undefined;
         maxSpeedKmph?: number | undefined;
+        runwayDirectionDeg?: number | undefined;
     }, {
         area: [{
             lat: number;
@@ -1150,6 +1152,7 @@ export declare const zonesSchema: z.ZodObject<{
         minSpeedKmph?: number | undefined;
         maxSpeedKmph?: number | undefined;
         flightDirection?: "all" | "arrival" | "departure" | undefined;
+        runwayDirectionDeg?: number | undefined;
         perimeter?: "none" | "outer" | "inner" | undefined;
         trackingDomains?: ("adsb" | "remoteId")[] | undefined;
     }>, "many">>;
@@ -1172,6 +1175,7 @@ export declare const zonesSchema: z.ZodObject<{
         maxAltitudeAmsl?: number | undefined;
         minSpeedKmph?: number | undefined;
         maxSpeedKmph?: number | undefined;
+        runwayDirectionDeg?: number | undefined;
     }[];
 }, {
     zones?: {
@@ -1190,6 +1194,7 @@ export declare const zonesSchema: z.ZodObject<{
         minSpeedKmph?: number | undefined;
         maxSpeedKmph?: number | undefined;
         flightDirection?: "all" | "arrival" | "departure" | undefined;
+        runwayDirectionDeg?: number | undefined;
         perimeter?: "none" | "outer" | "inner" | undefined;
         trackingDomains?: ("adsb" | "remoteId")[] | undefined;
     }[] | undefined;

package/cjs/types/PlaneTrackerAPI.js

@@ -372,6 +372,7 @@ exports.zonesSchema = zod_1.z.object({
         minSpeedKmph: zod_1.z.number().optional(),
         maxSpeedKmph: zod_1.z.number().optional(),
         flightDirection: zod_1.z.enum(['all', 'arrival', 'departure']).default('all'),
+        runwayDirectionDeg: zod_1.z.number().min(0).max(360).optional(),
         weight: zod_1.z.number(),
         perimeter: exports.zonePerimeterSchema.default('none'),
         trackingDomains: zod_1.z.array(exports.domainIdSchema).default(['adsb', 'remoteId']),