camstreamerlib 4.0.0-beta.76 → 4.0.0-beta.78

package/cjs/CamOverlayAPI.d.ts

@@ -38,7 +38,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         source: string;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_y: number;
@@ -68,7 +68,8 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        title: string;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -79,7 +80,6 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         font: string;
         location: string;
         locationName: string;
-        title: string;
         bgStartColor: "237,143,73,0.93" | "0,0,0,0.75" | "31,32,73,0.9" | "76,94,127,0.95";
         bgEndColor: "0,0,0,0.75" | "234,181,89,0.93" | "73,96,213,0.9" | "140,150,168,0.95";
         lang: "en-us" | "fr-fr" | "ja-jp" | "pt-pt" | "es-es" | "de-de" | "ko-kr" | "zh-hk" | "zh-cn" | "nl-nl" | "cs-cz" | "ru-ru" | "sv-se";
@@ -96,7 +96,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -126,15 +126,15 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         overlayList: {
             duration: number;
+            active: boolean;
             pos_x: number;
             pos_y: number;
             coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-            active: boolean;
             imgPath: string;
             imgName: string;
             scale: number;
@@ -150,7 +150,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         ptz_positions: Record<string, {
@@ -177,7 +177,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -213,7 +213,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -294,7 +294,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -312,7 +312,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -448,7 +448,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         source: string;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_y: number;
@@ -478,7 +478,8 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        title: string;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -489,7 +490,6 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         font: string;
         location: string;
         locationName: string;
-        title: string;
         bgStartColor: "237,143,73,0.93" | "0,0,0,0.75" | "31,32,73,0.9" | "76,94,127,0.95";
         bgEndColor: "0,0,0,0.75" | "234,181,89,0.93" | "73,96,213,0.9" | "140,150,168,0.95";
         lang: "en-us" | "fr-fr" | "ja-jp" | "pt-pt" | "es-es" | "de-de" | "ko-kr" | "zh-hk" | "zh-cn" | "nl-nl" | "cs-cz" | "ru-ru" | "sv-se";
@@ -506,7 +506,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -536,15 +536,15 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         overlayList: {
             duration: number;
+            active: boolean;
             pos_x: number;
             pos_y: number;
             coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-            active: boolean;
             imgPath: string;
             imgName: string;
             scale: number;
@@ -560,7 +560,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         ptz_positions: Record<string, {
@@ -587,7 +587,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -623,7 +623,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         id: number;
         width: number;
         height: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -704,7 +704,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
@@ -722,7 +722,7 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> {
         width: number;
         height: number;
         fps: number;
-        automationType: "time" | "manual" | "schedule" | `input${number}`;
+        automationType: "schedule" | "time" | "manual" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;

package/cjs/CamStreamerAPI.d.ts

@@ -1,64 +1,62 @@
 import { ProxyClient } from './internal/ProxyClient';
 import { IClient, TResponse } from './internal/types';
-import { TCameraStream, TStream } from './types/CamStreamerAPI';
+import { TStream } from './types/CamStreamerAPI/CamStreamerAPI';
 import { THttpRequestOptions, TProxyParams } from './types/common';
+import { TOldStream, TOldStringStream } from './types/CamStreamerAPI/oldStreamSchema';
 export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
     private client;
     constructor(client: Client);
+    static getProxyPath: () => string;
     getClient(proxyParams?: TProxyParams): Client | ProxyClient<Client>;
     wsAuthorization(options?: THttpRequestOptions): Promise<string>;
     getUtcTime(options?: THttpRequestOptions): Promise<number>;
-    getStreamList(options?: THttpRequestOptions): Promise<Record<number, {
-        enabled: 0 | 1;
-        schedule: string;
-        active: 0 | 1;
-        audioSource: string;
-        avSyncMsec: number;
-        internalVapixParameters: string;
-        userVapixParameters: string;
-        outputParameters: string;
-        outputType: "video" | "none" | "images";
-        mediaServerUrl: string;
-        inputType: "RTSP_URL" | "CSw" | "CRS";
-        inputUrl: string;
-        forceStereo: 0 | 1;
-        streamDelay: number | null;
-        statusLed: number;
-        statusPort: string;
-        callApi: number;
-        trigger: string;
-        prepareAhead: number;
-        startTime: number | null;
-        stopTime: number | null;
-    }>>;
+    getStreamList(options?: THttpRequestOptions): Promise<Record<number, TStream>>;
     getStream(streamId: number, options?: THttpRequestOptions): Promise<{
-        enabled: 0 | 1;
-        schedule: string;
-        active: 0 | 1;
-        audioSource: string;
-        avSyncMsec: number;
-        internalVapixParameters: string;
-        userVapixParameters: string;
-        outputParameters: string;
-        outputType: "video" | "none" | "images";
-        mediaServerUrl: string;
-        inputType: "RTSP_URL" | "CSw" | "CRS";
-        inputUrl: string;
-        forceStereo: 0 | 1;
-        streamDelay: number | null;
-        statusLed: number;
-        statusPort: string;
-        callApi: number;
-        trigger: string;
-        prepareAhead: number;
-        startTime: number | null;
-        stopTime: number | null;
+        type: "facebook";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "hls";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "mpeg_dvb";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "rtmp";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "sd_card";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "windy";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
+    } | {
+        type: "youtube";
+        enabled: boolean;
+        active: boolean;
+        title: string;
+        order: number;
     }>;
-    getStreamParameter(streamId: number, paramName: string, options?: THttpRequestOptions): Promise<string>;
-    setStream(streamId: number, params: Partial<TStream>, options?: THttpRequestOptions): Promise<void>;
-    setStreamParameter(streamId: number, paramName: string, value: string, options?: THttpRequestOptions): Promise<void>;
+    setStream(streamId: number, streamData: Partial<TStream>, options?: THttpRequestOptions): Promise<void>;
     isStreaming(streamId: number, options?: THttpRequestOptions): Promise<boolean>;
     deleteStream(streamId: number, options?: THttpRequestOptions): Promise<boolean>;
     private _getJson;
 }
-export declare const parseCameraStreamResponse: (cameraStreamData: TCameraStream) => TStream;
+export declare const parseCameraStreamResponse: (cameraStreamData: TOldStringStream) => TOldStream;

package/cjs/CamStreamerAPI.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCameraStreamResponse = exports.CamStreamerAPI = void 0;
 const zod_1 = require("zod");
 const ProxyClient_1 = require("./internal/ProxyClient");
-const CamStreamerAPI_1 = require("./types/CamStreamerAPI");
+const CamStreamerAPI_1 = require("./types/CamStreamerAPI/CamStreamerAPI");
 const errors_1 = require("./errors/errors");
+const oldStreamSchema_1 = require("./types/CamStreamerAPI/oldStreamSchema");
 const BASE_PATH = '/local/camstreamer';
 class CamStreamerAPI {
     client;
     constructor(client) {
         this.client = client;
     }
+    static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
@@ -30,35 +32,46 @@ class CamStreamerAPI {
     }
     async getStreamList(options) {
         const res = await this._getJson(`${BASE_PATH}/stream/list.cgi`, undefined, options);
-        const list = zod_1.z.record(zod_1.z.string(), CamStreamerAPI_1.cameraStreamSchema).parse(res.data);
         const streamList = {};
-        for (const [key, data] of Object.entries(list)) {
-            const streamId = parseInt(key);
-            streamList[streamId] = (0, exports.parseCameraStreamResponse)(data);
+        const invalidList = {};
+        for (const [key, value] of Object.entries(res.data)) {
+            const id = parseInt(key);
+            try {
+                const parsed = CamStreamerAPI_1.streamSchema.parse(value);
+                streamList[id] = parsed;
+            }
+            catch (err) {
+                const oldStream = oldStreamSchema_1.oldStringStreamSchema.parse(value);
+                const parsedOldStream = (0, exports.parseCameraStreamResponse)(oldStream);
+                invalidList[id] = parsedOldStream;
+            }
+        }
+        if (Object.keys(invalidList).length > 0) {
+            throw new errors_1.MigrationError(streamList, invalidList);
         }
         return streamList;
     }
     async getStream(streamId, options) {
         const res = await this._getJson(`${BASE_PATH}/stream/get.cgi`, { stream_id: streamId }, options);
-        const cameraData = CamStreamerAPI_1.cameraStreamSchema.parse(res.data);
-        return (0, exports.parseCameraStreamResponse)(cameraData);
-    }
-    async getStreamParameter(streamId, paramName, options) {
-        const res = await this._getJson(`${BASE_PATH}/stream/get.cgi`, { stream_id: streamId }, options);
-        return zod_1.z.string().parse(res.data[paramName]);
-    }
-    async setStream(streamId, params, options) {
-        const { streamDelay, startTime, stopTime, ...rest } = params;
-        await this._getJson(`${BASE_PATH}/stream/set.cgi`, {
-            stream_id: streamId,
-            streamDelay: streamDelay ?? '',
-            startTime: startTime ?? null,
-            stopTime: stopTime ?? null,
-            ...rest,
-        }, options);
+        try {
+            return CamStreamerAPI_1.streamSchema.parse(res.data);
+        }
+        catch (err) {
+            const oldStream = oldStreamSchema_1.oldStringStreamSchema.parse(res.data);
+            const parsedOldStream = (0, exports.parseCameraStreamResponse)(oldStream);
+            throw new errors_1.MigrationError({}, { [streamId]: parsedOldStream });
+        }
     }
-    async setStreamParameter(streamId, paramName, value, options) {
-        await this._getJson(`${BASE_PATH}/stream/set.cgi`, { stream_id: streamId, [paramName]: value }, options);
+    async setStream(streamId, streamData, options) {
+        const agent = this.getClient(options?.proxyParams);
+        await agent.post({
+            path: `${BASE_PATH}/stream/set.cgi`,
+            data: streamData,
+            parameters: {
+                stream_id: streamId,
+            },
+            timeout: options?.timeout,
+        });
     }
     async isStreaming(streamId, options) {
         const res = await this._getJson(`${BASE_PATH}/get_streamstat.cgi`, { stream_id: streamId }, options);

package/cjs/PlaneTrackerAPI.d.ts

@@ -1,5 +1,5 @@
 import { IClient, TBlobResponse, TParameters, TResponse } from './internal/types';
-import { ICAO, TApiUser, TBlackList, TCameraSettings, TExportDataType, TGetIcaoByOption, TImportDataType, TPriorityList, TTrackingMode, TTypePriorityList, TWhiteList, TZones } from './types/PlaneTrackerAPI';
+import { ICAO, TApiUser, TBlackList, TCameraSettings, TExportDataType, TGetIcaoByOption, TImportDataType, TPriorityList, TTrackingMode, TWhiteList, TZones } from './types/PlaneTrackerAPI';
 import { THttpRequestOptions, TProxyParams } from './types/common';
 import { ProxyClient } from './internal/ProxyClient';
 export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
@@ -194,8 +194,6 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
     getIcao(by: TGetIcaoByOption, value: string, options?: THttpRequestOptions): Promise<string>;
     getPriorityList(options?: THttpRequestOptions): Promise<string[]>;
     setPriorityList(priorityList: TPriorityList['priorityList'], options?: THttpRequestOptions): Promise<TResponse>;
-    getTypePriorityList(options?: THttpRequestOptions): Promise<string[]>;
-    setTypePriorityList(typePriorityList: TTypePriorityList['typePriorityList'], options?: THttpRequestOptions): Promise<TResponse>;
     getWhiteList(options?: THttpRequestOptions): Promise<string[]>;
     setWhiteList(whiteList: TWhiteList['whiteList'], options?: THttpRequestOptions): Promise<TResponse>;
     getBlackList(options?: THttpRequestOptions): Promise<string[]>;

package/cjs/PlaneTrackerAPI.js

@@ -125,13 +125,6 @@ class PlaneTrackerAPI {
     async setPriorityList(priorityList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
-    async getTypePriorityList(options) {
-        const res = await this._getJson(`${BASE_PATH}/package/getTypePriorityList.cgi`, undefined, options);
-        return PlaneTrackerAPI_1.typePriorityListSchema.parse(res).typePriorityList;
-    }
-    async setTypePriorityList(typePriorityList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setTypePriorityList.cgi`, { typePriorityList }, this.apiUser, options);
-    }
     async getWhiteList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
         return PlaneTrackerAPI_1.whiteListSchema.parse(res).whiteList;

package/cjs/errors/errors.d.ts

@@ -1,4 +1,6 @@
 import { TResponse } from '../internal/types';
+import { TStream } from '../types/CamStreamerAPI';
+import { TOldStream } from '../types/CamStreamerAPI/oldStreamSchema';
 export declare class ErrorWithResponse<T extends TResponse> extends Error {
     res: T;
     constructor(res: T);
@@ -88,4 +90,9 @@ export declare class ServerError extends Error {
 export declare class BadRequestError<T extends TResponse> extends ErrorWithResponse<T> {
     constructor(res: T);
 }
+export declare class MigrationError extends Error {
+    readonly valid: Record<number, TStream>;
+    readonly invalid: Record<number, TOldStream>;
+    constructor(valid: Record<number, TStream>, invalid: Record<number, TOldStream>);
+}
 export {};

package/cjs/errors/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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) {
@@ -204,3 +204,14 @@ class BadRequestError extends ErrorWithResponse {
     }
 }
 exports.BadRequestError = BadRequestError;
+class MigrationError extends Error {
+    valid;
+    invalid;
+    constructor(valid, invalid) {
+        super('Migration to newer version is needed: some stream entries failed to parse.');
+        this.name = 'MigrationError';
+        this.valid = valid;
+        this.invalid = invalid;
+    }
+}
+exports.MigrationError = MigrationError;