camstreamerlib 4.0.0-beta.85 → 4.0.0-beta.87

package/esm/types/ws/PlaneTrackerEvents.js

@@ -12,6 +12,7 @@ const apiFlightDataSchema = z.object({
     whiteListed: z.boolean(),
     blackListed: z.boolean(),
     priorityListed: z.boolean(),
+    typePriorityListed: z.boolean().default(false),
     autoSelectionIgnored: z.boolean(),
     signalQuality: z.number(),
     emitterCategorySet: z.number().default(4),
@@ -45,6 +46,7 @@ export var PlaneTrackerUserActions;
     PlaneTrackerUserActions["TRACK_ICAO"] = "trackIcao.cgi";
     PlaneTrackerUserActions["RESET_ICAO"] = "resetIcao.cgi";
     PlaneTrackerUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
+    PlaneTrackerUserActions["SET_TYPE_PRIORITY_LIST"] = "setTypePriorityList.cgi";
     PlaneTrackerUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
     PlaneTrackerUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
     PlaneTrackerUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
@@ -75,6 +77,14 @@ export const planeTrackerUserActionData = z.discriminatedUnion('cgi', [
             priorityList: z.array(z.string()),
         }),
     }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: z.object({
+            typePriorityList: z.array(z.string()),
+        }),
+    }),
     z.object({
         cgi: z.literal(PlaneTrackerUserActions.SET_BLACK_LIST),
         ip: z.string(),
@@ -161,6 +171,7 @@ const ptrEventsDataSchema = z.discriminatedUnion('type', [
             PlaneTrackerUserActions.TRACK_ICAO,
             PlaneTrackerUserActions.RESET_ICAO,
             PlaneTrackerUserActions.SET_PRIORITY_LIST,
+            PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST,
             PlaneTrackerUserActions.SET_BLACK_LIST,
             PlaneTrackerUserActions.SET_WHITE_LIST,
             PlaneTrackerUserActions.GO_TO_COORDINATES,

package/package.json

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

package/types/CamStreamerAPI.d.ts

@@ -1,5 +1,5 @@
 import { ProxyClient } from './internal/ProxyClient';
-import { IClient, TResponse } from './internal/types';
+import { IClient, TBlobResponse, TResponse } from './internal/types';
 import { TAudioFile, TAudioFileStorageType, TStream, TStreamList } from './types/CamStreamerAPI/CamStreamerAPI';
 import { THttpRequestOptions, TProxyParams } from './types/common';
 import { TOldStream, TOldStringStream } from './types/CamStreamerAPI/oldStreamSchema';
@@ -16,12 +16,54 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "hls";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "mpeg_dvb";
         port: number;
@@ -29,6 +71,27 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
         ipAddress: string;
         standard: "DVB" | "ATSC";
         nullPacketsPaddingEnabled: boolean;
@@ -41,7 +104,6 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         pcrPeriodMs: number;
         providerName: string;
         serviceName: string;
-        triggerType: "manual" | "onetime" | "recurrent" | "io" | "nonstop";
         statusCameraLed: boolean;
         statusCameraOutput: string;
         saveToSdCard: boolean;
@@ -51,24 +113,108 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "sd_card";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "windy";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "youtube";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     })[]>;
     setStreamList(streamList: TStreamList['streamList'], options?: THttpRequestOptions): Promise<void>;
     getStream(streamId: number, options?: THttpRequestOptions): Promise<{
@@ -77,12 +223,54 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "hls";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "mpeg_dvb";
         port: number;
@@ -90,6 +278,27 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
         ipAddress: string;
         standard: "DVB" | "ATSC";
         nullPacketsPaddingEnabled: boolean;
@@ -102,7 +311,6 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         pcrPeriodMs: number;
         providerName: string;
         serviceName: string;
-        triggerType: "manual" | "onetime" | "recurrent" | "io" | "nonstop";
         statusCameraLed: boolean;
         statusCameraOutput: string;
         saveToSdCard: boolean;
@@ -112,24 +320,108 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "sd_card";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "windy";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     } | {
         type: "youtube";
         enabled: boolean;
         id: number;
         active: boolean;
         title: string;
+        trigger: {
+            type: "manual";
+            ioPort: string | null;
+        } | {
+            type: "onetime";
+            startTime: number;
+            stopTime: number;
+        } | {
+            type: "recurrent";
+            schedule: {
+                start: {
+                    day: number;
+                    timeS: number;
+                };
+                stop: {
+                    day: number;
+                    timeS: number;
+                };
+                isActive: boolean;
+            }[];
+        };
     }>;
     setStream(streamId: number, streamData: Partial<TStream>, options?: THttpRequestOptions): Promise<void>;
     isStreaming(streamId: number, options?: THttpRequestOptions): Promise<boolean>;
@@ -147,7 +439,10 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> {
         type: "SD0";
         SD0: string;
     })[]>;
+    getFileFromCamera(path: string, options?: THttpRequestOptions): Promise<TBlobResponse<Client>>;
     private _getJson;
+    private _getBlob;
+    private parseBlobResponse;
     private _postUrlEncoded;
     private _postJsonEncoded;
     private _post;

package/types/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, TWhiteList, TZones } from './types/PlaneTrackerAPI';
+import { ICAO, TApiUser, TBlackList, TCameraSettings, TExportDataType, TGetIcaoByOption, TImportDataType, TPriorityList, TTrackingMode, TTypePriorityList, 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,6 +194,8 @@ 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[]>;