camstreamerlib 4.0.0-beta.29 → 4.0.0-beta.30

package/esm/types/CamStreamerAPI.d.ts

@@ -25,8 +25,8 @@ export declare const streamAttributesSchema: z.ZodObject<{
     stopTime: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     enabled: string;
-    schedule: string;
     active: string;
+    schedule: string;
     audioSource: string;
     avSyncMsec: string;
     internalVapixParameters: string;
@@ -47,8 +47,8 @@ export declare const streamAttributesSchema: z.ZodObject<{
     stopTime: string;
 }, {
     enabled: string;
-    schedule: string;
     active: string;
+    schedule: string;
     audioSource: string;
     avSyncMsec: string;
     internalVapixParameters: string;
@@ -93,8 +93,8 @@ export declare const streamListSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
     stopTime: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     enabled: string;
-    schedule: string;
     active: string;
+    schedule: string;
     audioSource: string;
     avSyncMsec: string;
     internalVapixParameters: string;
@@ -115,8 +115,8 @@ export declare const streamListSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
     stopTime: string;
 }, {
     enabled: string;
-    schedule: string;
     active: string;
+    schedule: string;
     audioSource: string;
     avSyncMsec: string;
     internalVapixParameters: string;

package/esm/types/PlaneTrackerAPI.d.ts

@@ -1,2 +1,8 @@
 export type TImportDataType = 'MAP_DATA' | 'SERVER_DATA' | 'ALL';
 export type TExportDataType = 'NIGHT_SKY_CALIBRATION_DATA' | 'ALL';
+export type TApiUser = {
+    userId: string;
+    userName: string;
+    userPriority: number;
+};
+export type ICAO = string;

package/esm/types/common.d.ts

@@ -22,16 +22,25 @@ export declare const keyboardShortcutSchema: z.ZodNullable<z.ZodString>;
 export declare const keyboardShortcutsSchema: z.ZodRecord<z.ZodString, z.ZodNullable<z.ZodString>>;
 export type TKeyboardShortcut = z.infer<typeof keyboardShortcutSchema>;
 export type TKeyboardShortcuts = z.infer<typeof keyboardShortcutsSchema>;
-export type TProxyParam = {
+export type TProxyTarget = {
     ip: string;
     mdnsName: string;
     port: number;
     user: string;
     pass: string;
-} | null;
+};
+export type TProxyParams = {
+    path: string;
+    target: TProxyTarget;
+};
+export type THttpRequestOptions = {
+    timeout?: number;
+    proxyParams?: TProxyParams;
+};
 export type TCameraImageConfig = {
     camera?: string;
     resolution?: string;
     compression?: number;
-    overlays?: 'off';
+    overlays?: string;
+    [key: string]: string | number | undefined;
 };

package/esm/web/DefaultClient.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="node" />
-import { IClient } from '../internal/types';
+import { IClient, TGetParams, TPostParams } from '../internal/types';
 export declare class DefaultClient implements IClient<Response> {
-    get: (url: string, parameters?: import("../internal/types").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<Response>;
-    post: (url: string, data: string | Buffer | FormData, parameters?: import("../internal/types").TParameters | undefined, headers?: Record<string, string> | undefined) => Promise<Response>;
+    get: (params: TGetParams) => Promise<Response>;
+    post: (params: TPostParams) => Promise<Response>;
+    private fetchWithTimeout;
 }

package/esm/web/DefaultClient.js

@@ -1,18 +1,28 @@
 import { addParametersToPath } from '../internal/utils';
 export class DefaultClient {
-    get = (...params) => {
-        const [url, parameters, headers] = params;
-        return fetch(addParametersToPath(url, parameters), {
+    get = (params) => {
+        return this.fetchWithTimeout(addParametersToPath(params.path, params.parameters), {
             method: 'GET',
-            headers: headers,
-        });
+            headers: params.headers,
+        }, params.timeout);
     };
-    post = (...params) => {
-        const [url, data, parameters, headers] = params;
-        return fetch(addParametersToPath(url, parameters), {
+    post = (params) => {
+        return this.fetchWithTimeout(addParametersToPath(params.path, params.parameters), {
             method: 'POST',
-            body: data,
-            headers: headers,
-        });
+            body: params.data,
+            headers: params.headers,
+        }, params.timeout);
     };
+    async fetchWithTimeout(url, options, timeout) {
+        const controller = new AbortController();
+        const timeoutId = timeout !== undefined ? setTimeout(() => controller.abort(), timeout) : null;
+        try {
+            return await fetch(url, { ...options, signal: controller.signal });
+        }
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "camstreamerlib",
-    "version": "4.0.0-beta.29",
+    "version": "4.0.0-beta.30",
     "description": "Helper library for CamStreamer ACAP applications.",
     "prettier": "@camstreamer/prettier-config",
     "engine": {
@@ -23,7 +23,7 @@
         "@types/adm-zip": "^0.5.5",
         "@types/jest": "^28.0.0",
         "@types/lodash": "^4.17.18",
-        "@types/node": "^18.19.39",
+        "@types/node": "^18.19.127",
         "@types/ws": "^8.5.10",
         "@typescript-eslint/eslint-plugin": "^6.8.0",
         "@typescript-eslint/parser": "^6.8.0",

package/cjs/models/CamOverlayAPI/constants.d.ts

@@ -1,11 +0,0 @@
-export declare const allowedWidgetNames: {
-    readonly accuweather: "accuweather";
-    readonly infoticker: "infoticker";
-    readonly customGraphics: "customGraphics";
-    readonly ptzCompass: "ptzCompass";
-    readonly images: "images";
-    readonly ptz: "ptz";
-    readonly pip: "pip";
-    readonly screenSharing: "screenSharing";
-    readonly web_camera: "web_camera";
-};

package/cjs/models/CamOverlayAPI/constants.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowedWidgetNames = void 0;
-exports.allowedWidgetNames = {
-    accuweather: 'accuweather',
-    infoticker: 'infoticker',
-    customGraphics: 'customGraphics',
-    ptzCompass: 'ptzCompass',
-    images: 'images',
-    ptz: 'ptz',
-    pip: 'pip',
-    screenSharing: 'screenSharing',
-    web_camera: 'web_camera',
-};

package/cjs/models/CamOverlayAPI/fileSchema.d.ts

@@ -1,28 +0,0 @@
-import { z } from 'zod';
-export declare const storageSchema: z.ZodUnion<[z.ZodLiteral<"flash">, z.ZodLiteral<"SD0">, z.ZodLiteral<"ftp">, z.ZodLiteral<"samba">, z.ZodLiteral<"url">]>;
-export declare const fileSchema: z.ZodObject<{
-    name: z.ZodString;
-    path: z.ZodString;
-    storage: z.ZodUnion<[z.ZodLiteral<"flash">, z.ZodLiteral<"SD0">, z.ZodLiteral<"ftp">, z.ZodLiteral<"samba">, z.ZodLiteral<"url">]>;
-}, "strip", z.ZodTypeAny, {
-    path: string;
-    name: string;
-    storage: "url" | "flash" | "SD0" | "ftp" | "samba";
-}, {
-    path: string;
-    name: string;
-    storage: "url" | "flash" | "SD0" | "ftp" | "samba";
-}>;
-export declare const fileListSchema: z.ZodArray<z.ZodObject<{
-    name: z.ZodString;
-    path: z.ZodString;
-    storage: z.ZodUnion<[z.ZodLiteral<"flash">, z.ZodLiteral<"SD0">, z.ZodLiteral<"ftp">, z.ZodLiteral<"samba">, z.ZodLiteral<"url">]>;
-}, "strip", z.ZodTypeAny, {
-    path: string;
-    name: string;
-    storage: "url" | "flash" | "SD0" | "ftp" | "samba";
-}, {
-    path: string;
-    name: string;
-    storage: "url" | "flash" | "SD0" | "ftp" | "samba";
-}>, "many">;

package/cjs/models/CamOverlayAPI/fileSchema.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileListSchema = exports.fileSchema = exports.storageSchema = void 0;
-const zod_1 = require("zod");
-exports.storageSchema = zod_1.z.union([
-    zod_1.z.literal('flash'),
-    zod_1.z.literal('SD0'),
-    zod_1.z.literal('ftp'),
-    zod_1.z.literal('samba'),
-    zod_1.z.literal('url'),
-]);
-exports.fileSchema = zod_1.z.object({
-    name: zod_1.z.string(),
-    path: zod_1.z.string().url(),
-    storage: exports.storageSchema,
-});
-exports.fileListSchema = zod_1.z.array(exports.fileSchema);

package/cjs/models/CamOverlayAPI/imagesSchema.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.imagesSchema = void 0;
-const constants_1 = require("./constants");
-const widgetCommonSchema_1 = require("./widgetCommonSchema");
-const zod_1 = require("zod");
-exports.imagesSchema = widgetCommonSchema_1.widgetCommonSchema.extend({
-    name: zod_1.z.literal(constants_1.allowedWidgetNames.images),
-    overlayList: zod_1.z.array(widgetCommonSchema_1.overlaySchema),
-});

package/cjs/models/CamOverlayAPI/ptzSchema.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptzSchema = void 0;
-const constants_1 = require("./constants");
-const widgetCommonSchema_1 = require("./widgetCommonSchema");
-const zod_1 = require("zod");
-exports.ptzSchema = widgetCommonSchema_1.widgetCommonSchema.extend({
-    name: zod_1.z.literal(constants_1.allowedWidgetNames.ptz),
-    ptz_positions: zod_1.z.record(zod_1.z.string(), zod_1.z.object({
-        overlayList: zod_1.z.array(widgetCommonSchema_1.overlaySchema.omit({ active: true, fps: true })),
-        loop: zod_1.z.boolean(),
-    })),
-});

package/cjs/models/CamOverlayAPI/screenSharingSchema.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.screenSharingSchema = void 0;
-const constants_1 = require("./constants");
-const widgetCommonSchema_1 = require("./widgetCommonSchema");
-const zod_1 = require("zod");
-exports.screenSharingSchema = widgetCommonSchema_1.sharingSchema.extend({
-    name: zod_1.z.literal(constants_1.allowedWidgetNames.screenSharing),
-});

package/cjs/models/CamOverlayAPI/webCameraSharingSchema.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.webCameraSharingSchema = void 0;
-const constants_1 = require("./constants");
-const widgetCommonSchema_1 = require("./widgetCommonSchema");
-const zod_1 = require("zod");
-exports.webCameraSharingSchema = widgetCommonSchema_1.sharingSchema.extend({
-    name: zod_1.z.literal(constants_1.allowedWidgetNames.web_camera),
-});

package/cjs/models/CamOverlayAPI/widgetCommonSchema.d.ts

@@ -1,126 +0,0 @@
-import { z } from 'zod';
-export declare const coordinateSystemSchema: z.ZodUnion<[z.ZodLiteral<"top_left">, z.ZodLiteral<"top">, z.ZodLiteral<"top_right">, z.ZodLiteral<"left">, z.ZodLiteral<"center">, z.ZodLiteral<"right">, z.ZodLiteral<"bottom_left">, z.ZodLiteral<"bottom">, z.ZodLiteral<"bottom_right">]>;
-export declare const languageSchema: z.ZodUnion<[z.ZodLiteral<"en-us">, z.ZodLiteral<"fr-fr">, z.ZodLiteral<"ja-jp">, z.ZodLiteral<"pt-pt">, z.ZodLiteral<"es-es">, z.ZodLiteral<"de-de">, z.ZodLiteral<"ko-kr">, z.ZodLiteral<"zh-hk">, z.ZodLiteral<"zh-cn">, z.ZodLiteral<"nl-nl">, z.ZodLiteral<"cs-cz">, z.ZodLiteral<"ru-ru">, z.ZodLiteral<"sv-se">]>;
-export declare const widgetCommonSchema: z.ZodObject<{
-    id: z.ZodNumber;
-    enabled: z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>;
-    automationType: z.ZodUnion<[z.ZodLiteral<"time">, z.ZodLiteral<"manual">, z.ZodLiteral<"schedule">, z.ZodType<`input${number}`, z.ZodTypeDef, `input${number}`>]>;
-    invertInput: z.ZodOptional<z.ZodBoolean>;
-    cameraList: z.ZodArray<z.ZodNumber, "many">;
-    camera: z.ZodOptional<z.ZodNumber>;
-    schedule: z.ZodOptional<z.ZodString>;
-    customName: z.ZodString;
-    zIndex: z.ZodOptional<z.ZodNumber>;
-    width: z.ZodNumber;
-    height: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    enabled: 0 | 1;
-    id: number;
-    width: number;
-    height: number;
-    automationType: "time" | "manual" | "schedule" | `input${number}`;
-    cameraList: number[];
-    customName: string;
-    schedule?: string | undefined;
-    invertInput?: boolean | undefined;
-    camera?: number | undefined;
-    zIndex?: number | undefined;
-}, {
-    enabled: 0 | 1;
-    id: number;
-    width: number;
-    height: number;
-    automationType: "time" | "manual" | "schedule" | `input${number}`;
-    cameraList: number[];
-    customName: string;
-    schedule?: string | undefined;
-    invertInput?: boolean | undefined;
-    camera?: number | undefined;
-    zIndex?: number | undefined;
-}>;
-export declare const fontSchema: z.ZodUnion<[z.ZodLiteral<"classic">, z.ZodLiteral<"digital">, z.ZodType<string, z.ZodTypeDef, string>]>;
-export declare const weatherUnitSchema: z.ZodUnion<[z.ZodLiteral<"Metric">, z.ZodLiteral<"Imperial">]>;
-export declare const overlaySchema: z.ZodObject<{
-    active: z.ZodBoolean;
-    coordSystem: z.ZodUnion<[z.ZodLiteral<"top_left">, z.ZodLiteral<"top">, z.ZodLiteral<"top_right">, z.ZodLiteral<"left">, z.ZodLiteral<"center">, z.ZodLiteral<"right">, z.ZodLiteral<"bottom_left">, z.ZodLiteral<"bottom">, z.ZodLiteral<"bottom_right">]>;
-    pos_x: z.ZodNumber;
-    pos_y: z.ZodNumber;
-    imgPath: z.ZodString;
-    imgName: z.ZodString;
-    duration: z.ZodNumber;
-    scale: z.ZodNumber;
-    fps: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    duration: number;
-    active: boolean;
-    coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    pos_x: number;
-    pos_y: number;
-    imgPath: string;
-    imgName: string;
-    scale: number;
-    fps?: number | undefined;
-}, {
-    duration: number;
-    active: boolean;
-    coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    pos_x: number;
-    pos_y: number;
-    imgPath: string;
-    imgName: string;
-    scale: number;
-    fps?: number | undefined;
-}>;
-export declare const sharingSchema: z.ZodObject<{
-    id: z.ZodNumber;
-    enabled: z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>;
-    automationType: z.ZodUnion<[z.ZodLiteral<"time">, z.ZodLiteral<"manual">, z.ZodLiteral<"schedule">, z.ZodType<`input${number}`, z.ZodTypeDef, `input${number}`>]>;
-    invertInput: z.ZodOptional<z.ZodBoolean>;
-    cameraList: z.ZodArray<z.ZodNumber, "many">;
-    camera: z.ZodOptional<z.ZodNumber>;
-    schedule: z.ZodOptional<z.ZodString>;
-    customName: z.ZodString;
-    zIndex: z.ZodOptional<z.ZodNumber>;
-    width: z.ZodNumber;
-    height: z.ZodNumber;
-} & {
-    pos_x: z.ZodNumber;
-    pos_y: z.ZodNumber;
-    coordSystem: z.ZodUnion<[z.ZodLiteral<"top_left">, z.ZodLiteral<"top">, z.ZodLiteral<"top_right">, z.ZodLiteral<"left">, z.ZodLiteral<"center">, z.ZodLiteral<"right">, z.ZodLiteral<"bottom_left">, z.ZodLiteral<"bottom">, z.ZodLiteral<"bottom_right">]>;
-    screenSize: z.ZodNumber;
-    fps: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    enabled: 0 | 1;
-    id: number;
-    width: number;
-    height: number;
-    fps: number;
-    automationType: "time" | "manual" | "schedule" | `input${number}`;
-    cameraList: number[];
-    customName: string;
-    coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    pos_x: number;
-    pos_y: number;
-    screenSize: number;
-    schedule?: string | undefined;
-    invertInput?: boolean | undefined;
-    camera?: number | undefined;
-    zIndex?: number | undefined;
-}, {
-    enabled: 0 | 1;
-    id: number;
-    width: number;
-    height: number;
-    fps: number;
-    automationType: "time" | "manual" | "schedule" | `input${number}`;
-    cameraList: number[];
-    customName: string;
-    coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    pos_x: number;
-    pos_y: number;
-    screenSize: number;
-    schedule?: string | undefined;
-    invertInput?: boolean | undefined;
-    camera?: number | undefined;
-    zIndex?: number | undefined;
-}>;

package/cjs/models/CamOverlayAPI/widgetsSchema.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.widgetListSchema = exports.widgetsSchema = void 0;
-const customGraphicsSchema_1 = require("./customGraphicsSchema");
-const imagesSchema_1 = require("./imagesSchema");
-const accuweatherSchema_1 = require("./accuweatherSchema");
-const infotickerSchema_1 = require("./infotickerSchema");
-const pipSchema_1 = require("./pipSchema");
-const ptzCompassSchema_1 = require("./ptzCompassSchema");
-const ptzSchema_1 = require("./ptzSchema");
-const screenSharingSchema_1 = require("./screenSharingSchema");
-const webCameraSharingSchema_1 = require("./webCameraSharingSchema");
-const zod_1 = require("zod");
-exports.widgetsSchema = zod_1.z.discriminatedUnion('name', [
-    infotickerSchema_1.infoTickerSchema,
-    accuweatherSchema_1.accuweatherSchema,
-    ptzCompassSchema_1.ptzCompassSchema,
-    imagesSchema_1.imagesSchema,
-    ptzSchema_1.ptzSchema,
-    pipSchema_1.pipSchema,
-    customGraphicsSchema_1.customGraphicsSchema,
-    screenSharingSchema_1.screenSharingSchema,
-    webCameraSharingSchema_1.webCameraSharingSchema,
-]);
-exports.widgetListSchema = zod_1.z.object({
-    services: zod_1.z.array(exports.widgetsSchema),
-});