camstreamerlib 4.0.3 → 4.0.5

package/cjs/CamStreamerAPI.js

@@ -116,7 +116,12 @@ class CamStreamerAPI extends BasicAPI_1.BasicAPI {
         await this._postUrlEncoded(`${BASE_PATH}/set_stream_active.cgi`, { stream_id: streamId, active: active ? 1 : 0 }, options);
     }
     async deleteStream(streamId, options) {
-        await this._postUrlEncoded(`${BASE_PATH}/remove.cgi`, { stream_id: streamId }, options);
+        const streamList = await this.getStreamList(options);
+        const filteredList = streamList.filter((stream) => !('streamId' in stream) || stream.streamId !== streamId);
+        if (filteredList.length === streamList.length) {
+            return;
+        }
+        await this.setStreamList(filteredList, options);
     }
     async listFiles(options) {
         const res = await this._getJson(`${BASE_PATH}/upload_audio.cgi`, { action: 'list' }, options);

package/cjs/PlaneTrackerAPI.d.ts

@@ -1,4 +1,4 @@
-import { IClient, TParameters, TResponse } from './internal/types';
+import { IClient, TResponse } from './internal/types';
 import { ICAO, TApiUser, TBlackList, TCameraSettings, TExportDataType, TGetIcaoByOption, TImportDataType, TPriorityList, TTrackingMode, TTypePriorityList, TWhiteList, TZones } from './types/PlaneTrackerAPI';
 import { THttpRequestOptions } from './types/common';
 import { BasicAPI } from './internal/BasicAPI';
@@ -106,17 +106,6 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
             protocol: "https" | "http" | "https_insecure";
             sourceKey: string;
         };
-        genetec: {
-            ip: string;
-            enabled: boolean;
-            port: number;
-            cameraList: string[];
-            pass: string;
-            appId: string;
-            user: string;
-            protocol: "https" | "http" | "https_insecure";
-            baseUri: string;
-        };
         camstreamerIntegration: {
             adPlacementEnabled: boolean;
             adMinIntervalSec: number;
@@ -232,10 +221,4 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
     setZones(zones: TZones, options?: THttpRequestOptions): Promise<void>;
     goToCoordinates(lat: number, lon: number, alt?: number, options?: THttpRequestOptions): Promise<void>;
     downloadReport(options?: THttpRequestOptions): Promise<string>;
-    checkGenetecConnection(params: TParameters, options?: THttpRequestOptions): Promise<boolean>;
-    getGenetecCameraList(params: TParameters, options?: THttpRequestOptions): Promise<{
-        value: string;
-        label: string;
-        index: number;
-    }[]>;
 }

package/cjs/PlaneTrackerAPI.js

@@ -4,7 +4,6 @@ exports.PlaneTrackerAPI = void 0;
 const zod_1 = require("zod");
 const PlaneTrackerAPI_1 = require("./types/PlaneTrackerAPI");
 const errors_1 = require("./errors/errors");
-const GenetecAgent_1 = require("./types/GenetecAgent");
 const BasicAPI_1 = require("./internal/BasicAPI");
 const BASE_PATH = '/local/planetracker';
 class PlaneTrackerAPI extends BasicAPI_1.BasicAPI {
@@ -187,13 +186,5 @@ class PlaneTrackerAPI extends BasicAPI_1.BasicAPI {
     downloadReport(options) {
         return this._getText(`${BASE_PATH}/report.cgi`, undefined, options);
     }
-    async checkGenetecConnection(params, options) {
-        const res = await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);
-        return res.status === 200;
-    }
-    async getGenetecCameraList(params, options) {
-        const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, params, options);
-        return GenetecAgent_1.cameraListSchema.parse(await res.json());
-    }
 }
 exports.PlaneTrackerAPI = PlaneTrackerAPI;

package/cjs/internal/transformers.js

@@ -14,8 +14,9 @@ const toSnakeCaseDeep = (o) => {
 };
 exports.toSnakeCaseDeep = toSnakeCaseDeep;
 const splitWords = (input) => {
-    if (!input)
+    if (!input) {
         return [];
+    }
     return (input
         .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
         .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
@@ -27,15 +28,17 @@ const splitWords = (input) => {
 };
 const camelCase = (key) => {
     const words = splitWords(key);
-    if (words.length === 0)
+    if (words.length === 0) {
         return '';
+    }
     const [first, ...rest] = words;
     return first + rest.map((w) => w[0].toUpperCase() + w.slice(1)).join('');
 };
 const snakeCase = (key) => splitWords(key).join('_');
 const isPlainObject = (value) => {
-    if (value === null || typeof value !== 'object')
+    if (value === null || typeof value !== 'object') {
         return false;
+    }
     const proto = Object.getPrototypeOf(value);
     return proto === null || proto === Object.prototype;
 };

package/cjs/types/PlaneTrackerAPI.d.ts

@@ -360,38 +360,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     }>>;
-    genetec: z.ZodDefault<z.ZodObject<{
-        protocol: z.ZodUnion<[z.ZodLiteral<"http">, z.ZodLiteral<"https">, z.ZodLiteral<"https_insecure">]>;
-        ip: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
-        port: z.ZodNumber;
-        user: z.ZodString;
-        pass: z.ZodString;
-    } & {
-        enabled: z.ZodBoolean;
-        baseUri: z.ZodDefault<z.ZodString>;
-        appId: z.ZodDefault<z.ZodString>;
-        cameraList: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        cameraList: string[];
-        pass: string;
-        appId: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        baseUri: string;
-    }, {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        pass: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        cameraList?: string[] | undefined;
-        appId?: string | undefined;
-        baseUri?: string | undefined;
-    }>>;
     camstreamerIntegration: z.ZodDefault<z.ZodObject<{
         adPlacementEnabled: z.ZodBoolean;
         adMinIntervalSec: z.ZodNumber;
@@ -497,17 +465,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     };
-    genetec: {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        cameraList: string[];
-        pass: string;
-        appId: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        baseUri: string;
-    };
     camstreamerIntegration: {
         adPlacementEnabled: boolean;
         adMinIntervalSec: number;
@@ -649,17 +606,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     } | undefined;
-    genetec?: {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        pass: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        cameraList?: string[] | undefined;
-        appId?: string | undefined;
-        baseUri?: string | undefined;
-    } | undefined;
     camstreamerIntegration?: {
         adPlacementEnabled: boolean;
         adMinIntervalSec: number;

package/cjs/types/PlaneTrackerAPI.js

@@ -201,24 +201,6 @@ exports.cameraSettingsSchema = zod_1.z.object({
         pass: '',
         sourceKey: '',
     }),
-    genetec: exports.connectionSchema
-        .extend({
-        enabled: zod_1.z.boolean(),
-        baseUri: zod_1.z.string().default(''),
-        appId: zod_1.z.string().default(''),
-        cameraList: zod_1.z.string().array().default([]),
-    })
-        .default({
-        enabled: false,
-        protocol: 'http',
-        ip: '',
-        port: 4590,
-        user: '',
-        pass: '',
-        baseUri: 'WebSdk',
-        appId: '',
-        cameraList: [],
-    }),
     camstreamerIntegration: zod_1.z
         .object({
         adPlacementEnabled: zod_1.z.boolean(),

package/esm/CamStreamerAPI.js

@@ -113,7 +113,12 @@ export class CamStreamerAPI extends BasicAPI {
         await this._postUrlEncoded(`${BASE_PATH}/set_stream_active.cgi`, { stream_id: streamId, active: active ? 1 : 0 }, options);
     }
     async deleteStream(streamId, options) {
-        await this._postUrlEncoded(`${BASE_PATH}/remove.cgi`, { stream_id: streamId }, options);
+        const streamList = await this.getStreamList(options);
+        const filteredList = streamList.filter((stream) => !('streamId' in stream) || stream.streamId !== streamId);
+        if (filteredList.length === streamList.length) {
+            return;
+        }
+        await this.setStreamList(filteredList, options);
     }
     async listFiles(options) {
         const res = await this._getJson(`${BASE_PATH}/upload_audio.cgi`, { action: 'list' }, options);

package/esm/PlaneTrackerAPI.js

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import { blackListSchema, cameraSettingsSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, typePriorityListSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
 import { CannotSetCoordsInAutoModeError, ImportSettingsError, InvalidAltitudeError, InvalidLatLngError, ResetCalibrationError, ServerError, BadRequestError, } from './errors/errors';
-import { cameraListSchema } from './types/GenetecAgent';
 import { BasicAPI } from './internal/BasicAPI';
 const BASE_PATH = '/local/planetracker';
 export class PlaneTrackerAPI extends BasicAPI {
@@ -184,12 +183,4 @@ export class PlaneTrackerAPI extends BasicAPI {
     downloadReport(options) {
         return this._getText(`${BASE_PATH}/report.cgi`, undefined, options);
     }
-    async checkGenetecConnection(params, options) {
-        const res = await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);
-        return res.status === 200;
-    }
-    async getGenetecCameraList(params, options) {
-        const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, params, options);
-        return cameraListSchema.parse(await res.json());
-    }
 }

package/esm/internal/transformers.js

@@ -7,8 +7,9 @@ export const toSnakeCaseDeep = (o) => {
     return mapKeysDeep(o, snakeCase);
 };
 const splitWords = (input) => {
-    if (!input)
+    if (!input) {
         return [];
+    }
     return (input
         .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
         .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
@@ -20,15 +21,17 @@ const splitWords = (input) => {
 };
 const camelCase = (key) => {
     const words = splitWords(key);
-    if (words.length === 0)
+    if (words.length === 0) {
         return '';
+    }
     const [first, ...rest] = words;
     return first + rest.map((w) => w[0].toUpperCase() + w.slice(1)).join('');
 };
 const snakeCase = (key) => splitWords(key).join('_');
 const isPlainObject = (value) => {
-    if (value === null || typeof value !== 'object')
+    if (value === null || typeof value !== 'object') {
         return false;
+    }
     const proto = Object.getPrototypeOf(value);
     return proto === null || proto === Object.prototype;
 };

package/esm/types/PlaneTrackerAPI.js

@@ -198,24 +198,6 @@ export const cameraSettingsSchema = z.object({
         pass: '',
         sourceKey: '',
     }),
-    genetec: connectionSchema
-        .extend({
-        enabled: z.boolean(),
-        baseUri: z.string().default(''),
-        appId: z.string().default(''),
-        cameraList: z.string().array().default([]),
-    })
-        .default({
-        enabled: false,
-        protocol: 'http',
-        ip: '',
-        port: 4590,
-        user: '',
-        pass: '',
-        baseUri: 'WebSdk',
-        appId: '',
-        cameraList: [],
-    }),
     camstreamerIntegration: z
         .object({
         adPlacementEnabled: z.boolean(),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "camstreamerlib",
-    "version": "4.0.3",
+    "version": "4.0.5",
     "description": "Helper library for CamStreamer ACAP applications.",
     "prettier": "@camstreamer/prettier-config",
     "engine": {

package/types/PlaneTrackerAPI.d.ts

@@ -1,4 +1,4 @@
-import { IClient, TParameters, TResponse } from './internal/types';
+import { IClient, TResponse } from './internal/types';
 import { ICAO, TApiUser, TBlackList, TCameraSettings, TExportDataType, TGetIcaoByOption, TImportDataType, TPriorityList, TTrackingMode, TTypePriorityList, TWhiteList, TZones } from './types/PlaneTrackerAPI';
 import { THttpRequestOptions } from './types/common';
 import { BasicAPI } from './internal/BasicAPI';
@@ -106,17 +106,6 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
             protocol: "https" | "http" | "https_insecure";
             sourceKey: string;
         };
-        genetec: {
-            ip: string;
-            enabled: boolean;
-            port: number;
-            cameraList: string[];
-            pass: string;
-            appId: string;
-            user: string;
-            protocol: "https" | "http" | "https_insecure";
-            baseUri: string;
-        };
         camstreamerIntegration: {
             adPlacementEnabled: boolean;
             adMinIntervalSec: number;
@@ -232,10 +221,4 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
     setZones(zones: TZones, options?: THttpRequestOptions): Promise<void>;
     goToCoordinates(lat: number, lon: number, alt?: number, options?: THttpRequestOptions): Promise<void>;
     downloadReport(options?: THttpRequestOptions): Promise<string>;
-    checkGenetecConnection(params: TParameters, options?: THttpRequestOptions): Promise<boolean>;
-    getGenetecCameraList(params: TParameters, options?: THttpRequestOptions): Promise<{
-        value: string;
-        label: string;
-        index: number;
-    }[]>;
 }

package/types/types/PlaneTrackerAPI.d.ts

@@ -360,38 +360,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     }>>;
-    genetec: z.ZodDefault<z.ZodObject<{
-        protocol: z.ZodUnion<[z.ZodLiteral<"http">, z.ZodLiteral<"https">, z.ZodLiteral<"https_insecure">]>;
-        ip: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
-        port: z.ZodNumber;
-        user: z.ZodString;
-        pass: z.ZodString;
-    } & {
-        enabled: z.ZodBoolean;
-        baseUri: z.ZodDefault<z.ZodString>;
-        appId: z.ZodDefault<z.ZodString>;
-        cameraList: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        cameraList: string[];
-        pass: string;
-        appId: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        baseUri: string;
-    }, {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        pass: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        cameraList?: string[] | undefined;
-        appId?: string | undefined;
-        baseUri?: string | undefined;
-    }>>;
     camstreamerIntegration: z.ZodDefault<z.ZodObject<{
         adPlacementEnabled: z.ZodBoolean;
         adMinIntervalSec: z.ZodNumber;
@@ -497,17 +465,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     };
-    genetec: {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        cameraList: string[];
-        pass: string;
-        appId: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        baseUri: string;
-    };
     camstreamerIntegration: {
         adPlacementEnabled: boolean;
         adMinIntervalSec: number;
@@ -649,17 +606,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
         protocol: "https" | "http" | "https_insecure";
         sourceKey: string;
     } | undefined;
-    genetec?: {
-        ip: string;
-        enabled: boolean;
-        port: number;
-        pass: string;
-        user: string;
-        protocol: "https" | "http" | "https_insecure";
-        cameraList?: string[] | undefined;
-        appId?: string | undefined;
-        baseUri?: string | undefined;
-    } | undefined;
     camstreamerIntegration?: {
         adPlacementEnabled: boolean;
         adMinIntervalSec: number;