camstreamerlib 4.0.0-beta.84 → 4.0.0-beta.85

package/cjs/types/CamStreamerAPI/streamCommonTypes.d.ts

@@ -1,166 +1,20 @@
 import { z } from 'zod';
 export declare const streamTypeSchema: z.ZodUnion<[z.ZodLiteral<"youtube">, z.ZodLiteral<"facebook">, z.ZodLiteral<"sd_card">, z.ZodLiteral<"windy">, z.ZodLiteral<"mpeg_dvb">, z.ZodLiteral<"hls">, z.ZodLiteral<"rtmp">]>;
 export type TStreamType = z.infer<typeof streamTypeSchema>;
-export declare const streamTriggerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-    type: z.ZodLiteral<"manual">;
-    ioPort: z.ZodNullable<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    type: "manual";
-    ioPort: string | null;
-}, {
-    type: "manual";
-    ioPort: string | null;
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"onetime">;
-    startTime: z.ZodNumber;
-    stopTime: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    type: "onetime";
-    startTime: number;
-    stopTime: number;
-}, {
-    type: "onetime";
-    startTime: number;
-    stopTime: number;
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"recurrent">;
-    schedule: z.ZodArray<z.ZodObject<{
-        day: z.ZodNumber;
-        startTimeS: z.ZodNumber;
-        stopTimeS: z.ZodNumber;
-        isActive: z.ZodBoolean;
-    }, "strip", z.ZodTypeAny, {
-        day: number;
-        startTimeS: number;
-        stopTimeS: number;
-        isActive: boolean;
-    }, {
-        day: number;
-        startTimeS: number;
-        stopTimeS: number;
-        isActive: boolean;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    type: "recurrent";
-    schedule: {
-        day: number;
-        startTimeS: number;
-        stopTimeS: number;
-        isActive: boolean;
-    }[];
-}, {
-    type: "recurrent";
-    schedule: {
-        day: number;
-        startTimeS: number;
-        stopTimeS: number;
-        isActive: boolean;
-    }[];
-}>]>;
-export type TStreamTrigger = z.infer<typeof streamTriggerSchema>;
-export type TStreamTriggerType = TStreamTrigger['type'];
 export declare const streamCommonSchema: z.ZodObject<{
     id: z.ZodNumber;
     enabled: z.ZodBoolean;
     active: z.ZodBoolean;
     title: z.ZodString;
-    trigger: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-        type: z.ZodLiteral<"manual">;
-        ioPort: z.ZodNullable<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "manual";
-        ioPort: string | null;
-    }, {
-        type: "manual";
-        ioPort: string | null;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"onetime">;
-        startTime: z.ZodNumber;
-        stopTime: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"recurrent">;
-        schedule: z.ZodArray<z.ZodObject<{
-            day: z.ZodNumber;
-            startTimeS: z.ZodNumber;
-            stopTimeS: z.ZodNumber;
-            isActive: z.ZodBoolean;
-        }, "strip", z.ZodTypeAny, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }>]>;
 }, "strip", z.ZodTypeAny, {
     enabled: boolean;
     id: number;
     active: boolean;
     title: string;
-    trigger: {
-        type: "manual";
-        ioPort: string | null;
-    } | {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    } | {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    };
 }, {
     enabled: boolean;
     id: number;
     active: boolean;
     title: string;
-    trigger: {
-        type: "manual";
-        ioPort: string | null;
-    } | {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    } | {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    };
 }>;
 export type TCommonStream = z.infer<typeof streamCommonSchema>;

package/cjs/types/CamStreamerAPI/streamCommonTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamCommonSchema = exports.streamTriggerSchema = exports.streamTypeSchema = void 0;
+exports.streamCommonSchema = exports.streamTypeSchema = void 0;
 const zod_1 = require("zod");
 exports.streamTypeSchema = zod_1.z.union([
     zod_1.z.literal('youtube'),
@@ -11,26 +11,9 @@ exports.streamTypeSchema = zod_1.z.union([
     zod_1.z.literal('hls'),
     zod_1.z.literal('rtmp'),
 ]);
-exports.streamTriggerSchema = zod_1.z.discriminatedUnion('type', [
-    zod_1.z.object({
-        type: zod_1.z.literal('manual'),
-        ioPort: zod_1.z.string().nullable(),
-    }),
-    zod_1.z.object({ type: zod_1.z.literal('onetime'), startTime: zod_1.z.number(), stopTime: zod_1.z.number() }),
-    zod_1.z.object({
-        type: zod_1.z.literal('recurrent'),
-        schedule: zod_1.z.array(zod_1.z.object({
-            day: zod_1.z.number().int().min(0).max(6),
-            startTimeS: zod_1.z.number().int().min(0).max(86400),
-            stopTimeS: zod_1.z.number().int().min(0).max(86400),
-            isActive: zod_1.z.boolean(),
-        })),
-    }),
-]);
 exports.streamCommonSchema = zod_1.z.object({
     id: zod_1.z.number(),
     enabled: zod_1.z.boolean(),
     active: zod_1.z.boolean(),
     title: zod_1.z.string(),
-    trigger: exports.streamTriggerSchema,
 });

package/cjs/types/CamStreamerAPI/windySchema.d.ts

@@ -4,62 +4,6 @@ export declare const windySchema: z.ZodObject<{
     enabled: z.ZodBoolean;
     active: z.ZodBoolean;
     title: z.ZodString;
-    trigger: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-        type: z.ZodLiteral<"manual">;
-        ioPort: z.ZodNullable<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "manual";
-        ioPort: string | null;
-    }, {
-        type: "manual";
-        ioPort: string | null;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"onetime">;
-        startTime: z.ZodNumber;
-        stopTime: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"recurrent">;
-        schedule: z.ZodArray<z.ZodObject<{
-            day: z.ZodNumber;
-            startTimeS: z.ZodNumber;
-            stopTimeS: z.ZodNumber;
-            isActive: z.ZodBoolean;
-        }, "strip", z.ZodTypeAny, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }>]>;
 } & {
     type: z.ZodLiteral<"windy">;
 }, "strip", z.ZodTypeAny, {
@@ -68,42 +12,10 @@ export declare const windySchema: z.ZodObject<{
     id: number;
     active: boolean;
     title: string;
-    trigger: {
-        type: "manual";
-        ioPort: string | null;
-    } | {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    } | {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: 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: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    };
 }>;

package/cjs/types/CamStreamerAPI/youtubeSchema.d.ts

@@ -4,62 +4,6 @@ export declare const youtubeSchema: z.ZodObject<{
     enabled: z.ZodBoolean;
     active: z.ZodBoolean;
     title: z.ZodString;
-    trigger: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-        type: z.ZodLiteral<"manual">;
-        ioPort: z.ZodNullable<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "manual";
-        ioPort: string | null;
-    }, {
-        type: "manual";
-        ioPort: string | null;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"onetime">;
-        startTime: z.ZodNumber;
-        stopTime: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }, {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"recurrent">;
-        schedule: z.ZodArray<z.ZodObject<{
-            day: z.ZodNumber;
-            startTimeS: z.ZodNumber;
-            stopTimeS: z.ZodNumber;
-            isActive: z.ZodBoolean;
-        }, "strip", z.ZodTypeAny, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }, {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }, {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    }>]>;
 } & {
     type: z.ZodLiteral<"youtube">;
 }, "strip", z.ZodTypeAny, {
@@ -68,42 +12,10 @@ export declare const youtubeSchema: z.ZodObject<{
     id: number;
     active: boolean;
     title: string;
-    trigger: {
-        type: "manual";
-        ioPort: string | null;
-    } | {
-        type: "onetime";
-        startTime: number;
-        stopTime: number;
-    } | {
-        type: "recurrent";
-        schedule: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: 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: {
-            day: number;
-            startTimeS: number;
-            stopTimeS: number;
-            isActive: boolean;
-        }[];
-    };
 }>;

package/esm/CamStreamerAPI.js

@@ -3,6 +3,7 @@ import { ProxyClient } from './internal/ProxyClient';
 import { audioFileListSchema, storageListSchema, streamSchema, } from './types/CamStreamerAPI/CamStreamerAPI';
 import { ErrorWithResponse, UtcTimeFetchError, WsAuthorizationError, MigrationError } from './errors/errors';
 import { oldStringStreamSchema, oldStringStreamSchemaWithId, } from './types/CamStreamerAPI/oldStreamSchema';
+import { paramToUrl } from './internal/utils';
 const BASE_PATH = '/local/camstreamer';
 export class CamStreamerAPI {
     client;
@@ -95,10 +96,7 @@ export class CamStreamerAPI {
         }, options);
     }
     async removeFile(fileParams, options) {
-        await this._getJson(`${BASE_PATH}/upload_audio.cgi`, {
-            action: 'remove',
-            ...fileParams,
-        }, options);
+        await this._postUrlEncoded(`${BASE_PATH}/upload_audio.cgi`, { action: 'remove', ...fileParams }, options, undefined);
     }
     async getFileStorage(options) {
         const res = await this._getJson(`${BASE_PATH}/upload_audio.cgi`, { action: 'get_storage' }, options);
@@ -114,6 +112,11 @@ export class CamStreamerAPI {
             throw new ErrorWithResponse(res);
         }
     }
+    async _postUrlEncoded(path, parameters, options, headers) {
+        const data = paramToUrl(parameters);
+        const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
+        return this._post(path, data, undefined, options, { ...baseHeaders, ...headers });
+    }
     async _postJsonEncoded(path, data, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
         const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };

package/esm/types/CamStreamerAPI/mpegDvbSchema.js

@@ -15,6 +15,7 @@ export const mpegDvbSchema = streamCommonSchema.extend({
     pcrPeriodMs: z.number(),
     providerName: z.string(),
     serviceName: z.string(),
+    triggerType: z.enum(['manual', 'onetime', 'recurrent', 'io', 'nonstop']),
     statusCameraLed: z.boolean(),
     statusCameraOutput: z.string(),
     saveToSdCard: z.boolean(),

package/esm/types/CamStreamerAPI/streamCommonTypes.js

@@ -8,26 +8,9 @@ export const streamTypeSchema = z.union([
     z.literal('hls'),
     z.literal('rtmp'),
 ]);
-export const streamTriggerSchema = z.discriminatedUnion('type', [
-    z.object({
-        type: z.literal('manual'),
-        ioPort: z.string().nullable(),
-    }),
-    z.object({ type: z.literal('onetime'), startTime: z.number(), stopTime: z.number() }),
-    z.object({
-        type: z.literal('recurrent'),
-        schedule: z.array(z.object({
-            day: z.number().int().min(0).max(6),
-            startTimeS: z.number().int().min(0).max(86400),
-            stopTimeS: z.number().int().min(0).max(86400),
-            isActive: z.boolean(),
-        })),
-    }),
-]);
 export const streamCommonSchema = z.object({
     id: z.number(),
     enabled: z.boolean(),
     active: z.boolean(),
     title: z.string(),
-    trigger: streamTriggerSchema,
 });

package/package.json

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