@golemio/core 1.22.1-dev.2040129457 → 1.22.1-dev.2044688374
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/helpers/data-access/storage/AbstractStorageService.d.ts +1 -1
- package/dist/helpers/data-access/storage/AbstractStorageService.js.map +1 -1
- package/dist/helpers/data-access/storage/AzureBlobStorageService.d.ts +9 -3
- package/dist/helpers/data-access/storage/AzureBlobStorageService.js +16 -7
- package/dist/helpers/data-access/storage/AzureBlobStorageService.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { Readable } from "stream";
|
|
6
6
|
export declare abstract class AbstractStorageService {
|
|
7
7
|
abstract uploadStream(stream: Readable, pathPrefix: string, ext?: string, fileName?: string): Promise<void>;
|
|
8
|
-
abstract uploadFile(data: Buffer | string, pathPrefix: string, ext?: string, fileName?: string): Promise<void>;
|
|
8
|
+
abstract uploadFile(data: Buffer | string, pathPrefix: string, ext?: string, fileName?: string): Promise<void | string>;
|
|
9
9
|
abstract deleteFile(key: string): Promise<void>;
|
|
10
10
|
abstract getFileStream(fileKey: string): Promise<NodeJS.ReadableStream | undefined>;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractStorageService.js","sourceRoot":"","sources":["../../../../src/helpers/data-access/storage/AbstractStorageService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AbstractStorageService.js","sourceRoot":"","sources":["../../../../src/helpers/data-access/storage/AbstractStorageService.ts"],"names":[],"mappings":";;;AACA,MAAsB,sBAAsB;CAK3C;AALD,wDAKC"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
/// <reference types="node" />
|
|
5
5
|
import { ILogger } from "../../logger";
|
|
6
|
+
import { ContainerClient } from "@azure/storage-blob";
|
|
6
7
|
import { Readable } from "node:stream";
|
|
7
8
|
import { AbstractStorageService } from "./AbstractStorageService";
|
|
8
9
|
export interface IAzureBlobStorageConfig {
|
|
@@ -13,15 +14,20 @@ export interface IAzureBlobStorageConfig {
|
|
|
13
14
|
containerName: string;
|
|
14
15
|
uploadTimeoutInSeconds: number;
|
|
15
16
|
}
|
|
17
|
+
export interface IUploadFileOptions {
|
|
18
|
+
strict?: boolean;
|
|
19
|
+
returnPath?: boolean;
|
|
20
|
+
}
|
|
16
21
|
export declare class AzureBlobStorageService extends AbstractStorageService {
|
|
17
22
|
private config;
|
|
18
23
|
private readonly log;
|
|
19
24
|
private readonly uploadTimeoutInMs;
|
|
20
|
-
|
|
25
|
+
private readonly uploadFileOptions?;
|
|
26
|
+
constructor(config: IAzureBlobStorageConfig, log: ILogger, uploadFileOptions?: IUploadFileOptions);
|
|
21
27
|
uploadStream(stream: Readable, pathPrefix: string, ext?: string, fileName?: string): Promise<void>;
|
|
22
|
-
uploadFile(data: Buffer | string, pathPrefix: string, ext?: string, fileName?: string): Promise<void>;
|
|
28
|
+
uploadFile(data: Buffer | string, pathPrefix: string, ext?: string, fileName?: string): Promise<void | string>;
|
|
23
29
|
deleteFile(fileKey: string): Promise<void>;
|
|
24
30
|
getFileStream(fileKey: string): Promise<NodeJS.ReadableStream | undefined>;
|
|
25
|
-
|
|
31
|
+
protected instantiateContainerClient(): ContainerClient;
|
|
26
32
|
private handleUploadProgress;
|
|
27
33
|
}
|
|
@@ -5,13 +5,15 @@ const _helpers_1 = require("../..");
|
|
|
5
5
|
const identity_1 = require("@azure/identity");
|
|
6
6
|
const storage_blob_1 = require("@azure/storage-blob");
|
|
7
7
|
const AbstractStorageService_1 = require("./AbstractStorageService");
|
|
8
|
+
const errors_1 = require("@golemio/errors");
|
|
8
9
|
const UPLOAD_STREAM_BUFFER_SIZE = 4 * 1024 * 1024; // 4 MB
|
|
9
10
|
class AzureBlobStorageService extends AbstractStorageService_1.AbstractStorageService {
|
|
10
|
-
constructor(config, log) {
|
|
11
|
+
constructor(config, log, uploadFileOptions) {
|
|
11
12
|
super();
|
|
12
13
|
this.config = config;
|
|
13
14
|
this.log = log;
|
|
14
15
|
this.uploadTimeoutInMs = config.uploadTimeoutInSeconds * 1000;
|
|
16
|
+
this.uploadFileOptions = uploadFileOptions;
|
|
15
17
|
}
|
|
16
18
|
async uploadStream(stream, pathPrefix, ext = "", fileName) {
|
|
17
19
|
const now = (0, _helpers_1.dateTime)(new Date(), { timeZone: "Europe/Prague" });
|
|
@@ -38,22 +40,29 @@ class AzureBlobStorageService extends AbstractStorageService_1.AbstractStorageSe
|
|
|
38
40
|
const fileNamePrefix = fileName ?? `${now.format("yyyy-MM-dd")}/${now.format("HH_mm_ss.SSS")}`;
|
|
39
41
|
const fileNameKey = `${pathPrefix}/${fileNamePrefix}`;
|
|
40
42
|
const fileNameExt = ext ? `.${ext}` : "";
|
|
43
|
+
const fullPath = `${fileNameKey}${fileNameExt}`;
|
|
41
44
|
try {
|
|
42
|
-
const
|
|
45
|
+
const uploadOptions = {
|
|
43
46
|
blobHTTPHeaders: { blobContentType: "application/octet-stream" },
|
|
44
|
-
onProgress: this.handleUploadProgress(
|
|
47
|
+
onProgress: this.handleUploadProgress(fullPath, Buffer.byteLength(data)),
|
|
45
48
|
abortSignal: AbortSignal.timeout(this.uploadTimeoutInMs),
|
|
46
49
|
};
|
|
47
50
|
if (!Buffer.isBuffer(data)) {
|
|
48
51
|
data = Buffer.from(data);
|
|
49
52
|
}
|
|
50
53
|
const containerClient = this.instantiateContainerClient();
|
|
51
|
-
const blobClient = containerClient.getBlockBlobClient(`${
|
|
52
|
-
await blobClient.uploadData(data,
|
|
53
|
-
this.log.verbose(`[${this.constructor.name}] Data uploaded (${
|
|
54
|
+
const blobClient = containerClient.getBlockBlobClient(`${fullPath}`);
|
|
55
|
+
await blobClient.uploadData(data, uploadOptions);
|
|
56
|
+
this.log.verbose(`[${this.constructor.name}] Data uploaded (${fullPath})`);
|
|
57
|
+
return this.uploadFileOptions?.returnPath ? fullPath : undefined;
|
|
54
58
|
}
|
|
55
59
|
catch (err) {
|
|
56
|
-
|
|
60
|
+
if (this.uploadFileOptions?.strict) {
|
|
61
|
+
throw new errors_1.GeneralError(`Upload failed for ${fullPath}`, this.constructor.name, err);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
this.log.error(err, `[${this.constructor.name}] Saving of data failed (${fullPath})`);
|
|
65
|
+
}
|
|
57
66
|
}
|
|
58
67
|
}
|
|
59
68
|
async deleteFile(fileKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureBlobStorageService.js","sourceRoot":"","sources":["../../../../src/helpers/data-access/storage/AzureBlobStorageService.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AAGpC,8CAAyD;AACzD,sDAA4H;AAE5H,qEAAkE;
|
|
1
|
+
{"version":3,"file":"AzureBlobStorageService.js","sourceRoot":"","sources":["../../../../src/helpers/data-access/storage/AzureBlobStorageService.ts"],"names":[],"mappings":"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"}
|