camstreamerlib 4.0.0-beta.84 → 4.0.0-beta.86

package/cjs/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';
@@ -369,7 +369,11 @@ 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/cjs/CamStreamerAPI.js

@@ -6,6 +6,7 @@ const ProxyClient_1 = require("./internal/ProxyClient");
 const CamStreamerAPI_1 = require("./types/CamStreamerAPI/CamStreamerAPI");
 const errors_1 = require("./errors/errors");
 const oldStreamSchema_1 = require("./types/CamStreamerAPI/oldStreamSchema");
+const utils_1 = require("./internal/utils");
 const BASE_PATH = '/local/camstreamer';
 class CamStreamerAPI {
     client;
@@ -98,15 +99,15 @@ 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);
         return CamStreamerAPI_1.storageListSchema.parse(res.data);
     }
+    async getFileFromCamera(path, options) {
+        return await this._getBlob(`${BASE_PATH}/audio.cgi`, { path }, options);
+    }
     async _getJson(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
@@ -117,6 +118,29 @@ class CamStreamerAPI {
             throw new errors_1.ErrorWithResponse(res);
         }
     }
+    async _getBlob(path, parameters, options) {
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.get({ path, parameters, timeout: options?.timeout });
+        if (res.ok) {
+            return await this.parseBlobResponse(res);
+        }
+        else {
+            throw new errors_1.ErrorWithResponse(res);
+        }
+    }
+    async parseBlobResponse(response) {
+        try {
+            return (await response.blob());
+        }
+        catch (err) {
+            throw new errors_1.ParsingBlobError(err);
+        }
+    }
+    async _postUrlEncoded(path, parameters, options, headers) {
+        const data = (0, utils_1.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/cjs/types/CamStreamerAPI/CamStreamerAPI.d.ts

@@ -2140,7 +2140,7 @@ export declare enum AudioType {
 }
 export declare const audioFileStorageTypeSchema: z.ZodUnion<[z.ZodLiteral<"flash">, z.ZodLiteral<"SD0">, z.ZodLiteral<"url">]>;
 export type TAudioFileStorageType = z.infer<typeof audioFileStorageTypeSchema>;
-export type TLocalStorageType = 'local' | 'url';
+export type TSourceType = 'local' | 'url';
 export declare const storageListSchema: z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"flash">;
     flash: z.ZodString;

package/esm/CamStreamerAPI.js

@@ -1,8 +1,9 @@
 import { z } from 'zod';
 import { ProxyClient } from './internal/ProxyClient';
 import { audioFileListSchema, storageListSchema, streamSchema, } from './types/CamStreamerAPI/CamStreamerAPI';
-import { ErrorWithResponse, UtcTimeFetchError, WsAuthorizationError, MigrationError } from './errors/errors';
+import { ErrorWithResponse, UtcTimeFetchError, WsAuthorizationError, MigrationError, ParsingBlobError, } 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,15 +96,15 @@ 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);
         return storageListSchema.parse(res.data);
     }
+    async getFileFromCamera(path, options) {
+        return await this._getBlob(`${BASE_PATH}/audio.cgi`, { path }, options);
+    }
     async _getJson(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
@@ -114,6 +115,29 @@ export class CamStreamerAPI {
             throw new ErrorWithResponse(res);
         }
     }
+    async _getBlob(path, parameters, options) {
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.get({ path, parameters, timeout: options?.timeout });
+        if (res.ok) {
+            return await this.parseBlobResponse(res);
+        }
+        else {
+            throw new ErrorWithResponse(res);
+        }
+    }
+    async parseBlobResponse(response) {
+        try {
+            return (await response.blob());
+        }
+        catch (err) {
+            throw new ParsingBlobError(err);
+        }
+    }
+    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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "camstreamerlib",
-    "version": "4.0.0-beta.84",
+    "version": "4.0.0-beta.86",
     "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';
@@ -369,7 +369,11 @@ 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/types/CamStreamerAPI/CamStreamerAPI.d.ts

@@ -2140,7 +2140,7 @@ export declare enum AudioType {
 }
 export declare const audioFileStorageTypeSchema: z.ZodUnion<[z.ZodLiteral<"flash">, z.ZodLiteral<"SD0">, z.ZodLiteral<"url">]>;
 export type TAudioFileStorageType = z.infer<typeof audioFileStorageTypeSchema>;
-export type TLocalStorageType = 'local' | 'url';
+export type TSourceType = 'local' | 'url';
 export declare const storageListSchema: z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"flash">;
     flash: z.ZodString;