@ido_kawaz/storage-client 7.0.2 → 7.1.1

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/README.md CHANGED
@@ -41,6 +41,7 @@ Builds a validated `StorageConfig` from environment variables using Zod.
41
41
  Supported environment variables:
42
42
 
43
43
  - `AWS_ENDPOINT` (optional) - S3 endpoint URL
44
+ - `AWS_PUBLIC_ENDPOINT` (optional) - public-facing endpoint used for presigned URLs (e.g. a CDN or browser-accessible host); falls back to `AWS_ENDPOINT`
44
45
  - `AWS_REGION` (optional, default `us-east-1`)
45
46
  - `AWS_ACCESS_KEY_ID` (required)
46
47
  - `AWS_SECRET_ACCESS_KEY` (required)
@@ -57,27 +58,27 @@ Creates a new client.
57
58
  - `partSize: number` - multipart upload part size in bytes
58
59
  - `maxConcurrency: number` - number of parts uploaded in parallel
59
60
  - `batchSize: number` - number of objects processed in parallel per batch
61
+ - `publicEndpoint?: string` - public-facing endpoint for presigned URL signing (e.g. a CDN URL)
60
62
 
61
63
  ### `ensureBucket(bucketName: string): Promise<void>`
62
64
 
63
65
  Checks whether a bucket exists and creates it when it is missing.
64
66
 
65
- ### `deleteBucket(bucketName: string): Promise<void>`
67
+ ### `deleteBucket(bucketName: string, onProgress?: OnProgressCallback): Promise<void>`
66
68
 
67
- Deletes a bucket. If the bucket does not exist, the operation is treated as successful.
69
+ Deletes a bucket. If the bucket does not exist, the operation is treated as successful. When the bucket is non-empty, clears all objects first — `onProgress` receives `(completedBatches, totalBatches)` during that clearing phase.
68
70
 
69
- ### `uploadObject(bucketName: string, object: StorageObject, options?: UploadObjectOptions): Promise<void>`
71
+ ### `uploadObject(bucketName: string, object: StorageObject, options?: UploadObjectOptions, onProgress?: OnProgressCallback): Promise<void>`
70
72
 
71
73
  Uploads a single object to storage. `StorageObject` is `{ key: string; data: Readable }`.
72
74
 
73
75
  - By default, uses a regular `PutObject` request.
74
- - When multipart upload is enabled, upload progress is logged to the console.
75
76
  - If `options?.ensureBucket` is `true`, the bucket is created automatically when missing.
76
- - If `options?.multipartUpload` is `true`, upload is performed using multipart upload.
77
+ - If `options?.multipartUpload` is `true`, upload is performed using multipart upload. `onProgress` receives `(bytesLoaded, totalBytes)` as each part is sent.
77
78
 
78
- ### `uploadObjects(bucketName: string, objects: StorageObject[], options?: UploadObjectOptions): Promise<void>`
79
+ ### `uploadObjects(bucketName: string, objects: StorageObject[], options?: UploadObjectOptions, onOperationProgress?: OnProgressCallback, onObjectProgress?: OnProgressCallback): Promise<void>`
79
80
 
80
- Uploads multiple objects in parallel batches (controlled by `batchSize`).
81
+ Uploads multiple objects in parallel batches (controlled by `batchSize`). `onOperationProgress` receives `(completedBatches, totalBatches)`; `onObjectProgress` is forwarded to each individual `uploadObject` call.
81
82
 
82
83
  `UploadObjectOptions`:
83
84
 
@@ -104,9 +105,9 @@ Deletes a single object from a bucket.
104
105
 
105
106
  - Throws `StorageError` on failure.
106
107
 
107
- ### `clearPrefix(bucketName: string, prefix: string): Promise<void>`
108
+ ### `clearPrefix(bucketName: string, prefix: string, onProgress?: OnProgressCallback): Promise<void>`
108
109
 
109
- Deletes all objects whose key starts with the given prefix.
110
+ Deletes all objects whose key starts with the given prefix. `onProgress` receives `(completedBatches, totalBatches)`.
110
111
 
111
112
  - No-ops when the prefix matches no objects.
112
113
  - Throws `StorageError` if listing objects fails.
@@ -135,6 +136,7 @@ try {
135
136
  - `StorageError`
136
137
  - `StorageObject`
137
138
  - `UploadObjectOptions`
139
+ - `OnProgressCallback`
138
140
 
139
141
  ## Development
140
142
 
@@ -225,5 +225,46 @@ describe('StorageClient', () => {
225
225
  const client = new storageClient_1.StorageClient(config);
226
226
  await expect(client.clearPrefix('bucket-n', 'prefix/')).rejects.toBeInstanceOf(types_1.StorageError);
227
227
  });
228
+ it('clearPrefix calls onProgress callback when deleting objects', async () => {
229
+ sendMock
230
+ .mockResolvedValueOnce({ Contents: [{ Key: 'prefix/a.txt' }, { Key: 'prefix/b.txt' }] })
231
+ .mockResolvedValue({});
232
+ const client = new storageClient_1.StorageClient(config);
233
+ const onProgress = jest.fn();
234
+ await client.clearPrefix('bucket-o', 'prefix/', onProgress);
235
+ expect(onProgress).toHaveBeenCalled();
236
+ expect(onProgress).toHaveBeenCalledWith(expect.any(Number), expect.any(Number));
237
+ });
238
+ it('uploadObject calls onProgress during multipart upload', async () => {
239
+ const onProgress = jest.fn();
240
+ uploadOnMock.mockImplementation((_event, handler) => {
241
+ handler({ loaded: 512, total: 1024 });
242
+ });
243
+ uploadDoneMock.mockResolvedValueOnce();
244
+ const client = new storageClient_1.StorageClient(config);
245
+ await client.uploadObject('bucket-p', { key: 'file.txt', data: stream_1.Readable.from(['x']) }, { multipartUpload: true }, onProgress);
246
+ expect(onProgress).toHaveBeenCalledWith(512, 1024);
247
+ });
248
+ it('uploadObjects calls onOperationProgress callback', async () => {
249
+ sendMock.mockResolvedValue({});
250
+ const client = new storageClient_1.StorageClient(config);
251
+ const onOperationProgress = jest.fn();
252
+ const objects = [{ key: 'a.txt', data: stream_1.Readable.from(['a']) }];
253
+ await client.uploadObjects('bucket-q', objects, undefined, onOperationProgress);
254
+ expect(onOperationProgress).toHaveBeenCalled();
255
+ });
256
+ it('constructs a separate signingClient when publicEndpoint is set', () => {
257
+ const S3ClientMock = jest.requireMock('@aws-sdk/client-s3').S3Client;
258
+ S3ClientMock.mockClear();
259
+ new storageClient_1.StorageClient({ ...config, publicEndpoint: 'https://cdn.example.com' });
260
+ expect(S3ClientMock).toHaveBeenCalledTimes(2);
261
+ expect(S3ClientMock.mock.calls[1][0]).toMatchObject({ endpoint: 'https://cdn.example.com' });
262
+ });
263
+ it('reuses client as signingClient when publicEndpoint is not set', () => {
264
+ const S3ClientMock = jest.requireMock('@aws-sdk/client-s3').S3Client;
265
+ S3ClientMock.mockClear();
266
+ new storageClient_1.StorageClient(config);
267
+ expect(S3ClientMock).toHaveBeenCalledTimes(1);
268
+ });
228
269
  });
229
270
  //# sourceMappingURL=storageClient.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"storageClient.test.js","sourceRoot":"","sources":["../../src/__tests__/storageClient.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storageClient.test.js","sourceRoot":"","sources":["../../src/__tests__/storageClient.test.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  export { StorageClient } from './storageClient';
2
2
  export { createStorageConfig, type StorageConfig } from './config';
3
- export { StorageError, type StorageObject, type UploadObjectOptions } from './types';
3
+ export { StorageError, type StorageObject, type UploadObjectOptions, type OnProgressCallback } from './types';
4
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC"}
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,mCAAmE;AAA1D,6GAAA,mBAAmB,OAAA;AAC5B,iCAAqF;AAA5E,qGAAA,YAAY,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,mCAAmE;AAA1D,6GAAA,mBAAmB,OAAA;AAC5B,iCAA8G;AAArG,qGAAA,YAAY,OAAA"}
@@ -1,6 +1,6 @@
1
1
  import { Readable } from "stream";
2
2
  import { StorageConfig } from "./config";
3
- import { StorageObject, UploadObjectOptions } from "./types";
3
+ import { OnProgressCallback, StorageObject, UploadObjectOptions } from "./types";
4
4
  export declare class StorageClient {
5
5
  private readonly config;
6
6
  private client;
@@ -8,10 +8,10 @@ export declare class StorageClient {
8
8
  constructor(config: StorageConfig);
9
9
  private clearObjects;
10
10
  ensureBucket: (bucketName: string) => Promise<void | import("@aws-sdk/client-s3").HeadBucketCommandOutput>;
11
- deleteBucket: (bucketName: string) => Promise<void | import("@aws-sdk/client-s3").DeleteBucketCommandOutput>;
12
- clearPrefix: (Bucket: string, Prefix: string) => Promise<void>;
13
- uploadObjects: (Bucket: string, objects: StorageObject[], options?: UploadObjectOptions) => Promise<void[]>;
14
- uploadObject: (Bucket: string, object: StorageObject, options?: UploadObjectOptions) => Promise<void>;
11
+ deleteBucket: (bucketName: string, onProgress?: OnProgressCallback) => Promise<void | import("@aws-sdk/client-s3").DeleteBucketCommandOutput>;
12
+ clearPrefix: (Bucket: string, Prefix: string, onProgress?: OnProgressCallback) => Promise<void>;
13
+ uploadObjects: (Bucket: string, objects: StorageObject[], options?: UploadObjectOptions, onOperationProgress?: OnProgressCallback, onObjectProgress?: OnProgressCallback) => Promise<void[]>;
14
+ uploadObject: (Bucket: string, object: StorageObject, options?: UploadObjectOptions, onProgress?: OnProgressCallback) => Promise<void>;
15
15
  downloadObject: (Bucket: string, Key: string) => Promise<Readable>;
16
16
  getPresignedUrl: (Bucket: string, Key: string, expiresInSeconds: number) => Promise<string>;
17
17
  deleteObject: (Bucket: string, Key: string) => Promise<void | import("@aws-sdk/client-s3").DeleteObjectCommandOutput>;
@@ -1 +1 @@
1
- {"version":3,"file":"storageClient.d.ts","sourceRoot":"","sources":["../src/storageClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAgB,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG3E,qBAAa,aAAa;IAIV,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,aAAa,CAAW;gBAEH,MAAM,EAAE,aAAa;IAOlD,OAAO,CAAC,YAAY,CAInB;IAED,YAAY,GAAI,YAAY,MAAM,0EASvB;IAEX,YAAY,GAAU,YAAY,MAAM,4EAY7B;IAEX,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,mBAalC;IAEX,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAS,aAAa,EAAE,EAAE,UAAU,mBAAmB,qBAMxF;IAEN,YAAY,GAAU,QAAQ,MAAM,EAAE,QAAQ,aAAa,EAAE,UAAU,mBAAmB,mBAuBzF;IAED,cAAc,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,KAAG,OAAO,CAAC,QAAQ,CAAC,CAUtD;IAEX,eAAe,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,EAAE,kBAAkB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAI/E;IAGX,YAAY,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,4EAOhC;CACd"}
1
+ {"version":3,"file":"storageClient.d.ts","sourceRoot":"","sources":["../src/storageClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAgB,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG/F,qBAAa,aAAa;IAIV,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,aAAa,CAAW;gBAEH,MAAM,EAAE,aAAa;IAOlD,OAAO,CAAC,YAAY,CAInB;IAED,YAAY,GAAI,YAAY,MAAM,0EASvB;IAEX,YAAY,GAAU,YAAY,MAAM,EAAE,aAAa,kBAAkB,4EAY9D;IAEX,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,EAAE,aAAa,kBAAkB,mBAanE;IAEX,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAS,aAAa,EAAE,EAAE,UAAU,mBAAmB,EAAE,sBAAsB,kBAAkB,EAAE,mBAAmB,kBAAkB,qBAMzK;IAEN,YAAY,GAAU,QAAQ,MAAM,EAAE,QAAQ,aAAa,EAAE,UAAU,mBAAmB,EAAE,aAAa,kBAAkB,mBA6B1H;IAED,cAAc,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,KAAG,OAAO,CAAC,QAAQ,CAAC,CAUtD;IAEX,eAAe,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,EAAE,kBAAkB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAI/E;IAGX,YAAY,GAAI,QAAQ,MAAM,EAAE,KAAK,MAAM,4EAOhC;CACd"}
@@ -10,10 +10,10 @@ const batches_1 = require("./utils/batches");
10
10
  class StorageClient {
11
11
  constructor(config) {
12
12
  this.config = config;
13
- this.clearObjects = async (bucketName, objectKeys) => {
13
+ this.clearObjects = async (bucketName, objectKeys, onProgress) => {
14
14
  const clearObjectOperation = (key) => this.deleteObject(bucketName, key);
15
- const clearProgressLog = (index, total) => `cleared ${index / total * 100}% of prefix files (${index}/${total} batches)`;
16
- await (0, batches_1.runInBatches)(objectKeys, this.config.batchSize, clearObjectOperation, clearProgressLog);
15
+ const clearProgressLog = (index, total) => console.log(`cleared ${index / total * 100}% of prefix files (${index}/${total} batches)`);
16
+ await (0, batches_1.runInBatches)(objectKeys, this.config.batchSize, clearObjectOperation, onProgress ?? clearProgressLog);
17
17
  };
18
18
  this.ensureBucket = (bucketName) => this.client
19
19
  .send(new client_s3_1.HeadBucketCommand({ Bucket: bucketName }))
@@ -25,21 +25,21 @@ class StorageClient {
25
25
  throw new types_1.StorageError("ensureBucket", error, { bucketName });
26
26
  }
27
27
  });
28
- this.deleteBucket = async (bucketName) => this.client
28
+ this.deleteBucket = async (bucketName, onProgress) => this.client
29
29
  .send(new client_s3_1.DeleteBucketCommand({ Bucket: bucketName }))
30
30
  .catch(async (error) => {
31
31
  if (error.name === 'NoSuchBucket') {
32
32
  return;
33
33
  }
34
34
  else if (error.name === 'BucketNotEmpty') {
35
- await this.clearPrefix(bucketName, "");
35
+ await this.clearPrefix(bucketName, "", onProgress);
36
36
  await this.client.send(new client_s3_1.DeleteBucketCommand({ Bucket: bucketName }));
37
37
  }
38
38
  else {
39
39
  throw new types_1.StorageError("deleteBucket", error, { bucketName });
40
40
  }
41
41
  });
42
- this.clearPrefix = (Bucket, Prefix) => this.client
42
+ this.clearPrefix = (Bucket, Prefix, onProgress) => this.client
43
43
  .send(new client_s3_1.ListObjectsCommand({ Bucket, Prefix: Prefix }))
44
44
  .then(async ({ Contents: listedObjects }) => {
45
45
  if ((0, ramda_1.isNil)(listedObjects) || (0, ramda_1.isEmpty)(listedObjects)) {
@@ -47,14 +47,14 @@ class StorageClient {
47
47
  }
48
48
  else {
49
49
  const objectKeys = (0, ramda_1.pluck)('Key', listedObjects).filter(ramda_1.isNotNil);
50
- await this.clearObjects(Bucket, objectKeys);
50
+ await this.clearObjects(Bucket, objectKeys, onProgress);
51
51
  }
52
52
  })
53
53
  .catch((error) => {
54
54
  throw new types_1.StorageError("clearPrefix", error, { Bucket, prefix: Prefix });
55
55
  });
56
- this.uploadObjects = async (Bucket, objects, options) => (0, batches_1.runInBatches)(objects, this.config.batchSize, (object) => this.uploadObject(Bucket, object, options), (index, total) => `Uploaded ${index / total * 100}% of files (${index}/${total} batches)`);
57
- this.uploadObject = async (Bucket, object, options) => {
56
+ this.uploadObjects = async (Bucket, objects, options, onOperationProgress, onObjectProgress) => (0, batches_1.runInBatches)(objects, this.config.batchSize, (object) => this.uploadObject(Bucket, object, options, onObjectProgress), onOperationProgress ?? ((index, total) => console.log(`Uploaded ${index / total * 100}% of files (${index}/${total} batches)`)));
57
+ this.uploadObject = async (Bucket, object, options, onProgress) => {
58
58
  const { key: Key, data: Body } = object;
59
59
  if (options?.ensureBucket) {
60
60
  await this.ensureBucket(Bucket);
@@ -68,7 +68,14 @@ class StorageClient {
68
68
  partSize: this.config.partSize
69
69
  });
70
70
  upload.on("httpUploadProgress", (progress) => {
71
- console.log(`Upload progress for ${Key}: ${progress.loaded / progress.total * 100}%`);
71
+ if ((0, ramda_1.isNotNil)(progress.loaded) && (0, ramda_1.isNotNil)(progress.total)) {
72
+ if ((0, ramda_1.isNotNil)(onProgress)) {
73
+ onProgress(progress.loaded, progress.total);
74
+ }
75
+ else {
76
+ console.log(`Upload progress for ${Key}: ${progress.loaded / progress.total * 100}%`);
77
+ }
78
+ }
72
79
  });
73
80
  await upload.done();
74
81
  }
@@ -1 +1 @@
1
- {"version":3,"file":"storageClient.js","sourceRoot":"","sources":["../src/storageClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storageClient.js","sourceRoot":"","sources":["../src/storageClient.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -10,4 +10,5 @@ export interface UploadObjectOptions {
10
10
  ensureBucket?: boolean;
11
11
  multipartUpload?: boolean;
12
12
  }
13
+ export type OnProgressCallback = (index: number, total: number) => void | Promise<void>;
13
14
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,qBAAa,YAAa,SAAQ,KAAK;gBACvB,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;CAI3D;AAED,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,qBAAa,YAAa,SAAQ,KAAK;gBACvB,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;CAI3D;AAED,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC"}
@@ -1,2 +1,3 @@
1
- export declare const runInBatches: <T, R>(items: T[], batchSize: number, handler: (item: T) => Promise<R>, generateProgressMessage: (index: number, totalBatches: number) => string) => Promise<R[]>;
1
+ import { OnProgressCallback } from "../types";
2
+ export declare const runInBatches: <T, R>(items: T[], batchSize: number, handler: (item: T) => Promise<R>, onProgress: OnProgressCallback) => Promise<R[]>;
2
3
  //# sourceMappingURL=batches.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"batches.d.ts","sourceRoot":"","sources":["../../src/utils/batches.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY,GAAU,CAAC,EAAE,CAAC,EACnC,OAAO,CAAC,EAAE,EACV,WAAW,MAAM,EACjB,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAChC,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,MAAM,KACzE,OAAO,CAAC,CAAC,EAAE,CAYb,CAAA"}
1
+ {"version":3,"file":"batches.d.ts","sourceRoot":"","sources":["../../src/utils/batches.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO9C,eAAO,MAAM,YAAY,GAAU,CAAC,EAAE,CAAC,EACnC,OAAO,CAAC,EAAE,EACV,WAAW,MAAM,EACjB,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAChC,YAAY,kBAAkB,KAC/B,OAAO,CAAC,CAAC,EAAE,CAYb,CAAA"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.runInBatches = void 0;
4
4
  const batchify = (items, size) => Array.from({ length: Math.ceil(items.length / size) }, (_, i) => items.slice(i * size, Math.min(i * size + size, items.length)));
5
- const runInBatches = async (items, batchSize, handler, generateProgressMessage) => {
5
+ const runInBatches = async (items, batchSize, handler, onProgress) => {
6
6
  const batches = batchify(items, batchSize);
7
7
  const count = batches.length;
8
8
  const progressInterval = Math.max(1, Math.floor(count / 10));
@@ -10,7 +10,7 @@ const runInBatches = async (items, batchSize, handler, generateProgressMessage)
10
10
  for (let i = 0; i < count; i++) {
11
11
  results = results.concat(await Promise.all(batches[i].map(handler)));
12
12
  if (i % progressInterval === 0 || i === count - 1) {
13
- console.log(generateProgressMessage(i + 1, count));
13
+ await onProgress(i + 1, count);
14
14
  }
15
15
  }
16
16
  return results;
@@ -1 +1 @@
1
- {"version":3,"file":"batches.js","sourceRoot":"","sources":["../../src/utils/batches.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAAG,CAAI,KAAU,EAAE,IAAY,EAAS,EAAE,CACpD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CACjE,CAAC;AAEC,MAAM,YAAY,GAAG,KAAK,EAC7B,KAAU,EACV,SAAiB,EACjB,OAAgC,EAChC,uBAAwE,EAC5D,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7D,IAAI,OAAO,GAAQ,EAAE,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,gBAAgB,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAA;AAjBY,QAAA,YAAY,gBAiBxB"}
1
+ {"version":3,"file":"batches.js","sourceRoot":"","sources":["../../src/utils/batches.ts"],"names":[],"mappings":";;;AAEA,MAAM,QAAQ,GAAG,CAAI,KAAU,EAAE,IAAY,EAAS,EAAE,CACpD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CACjE,CAAC;AAEC,MAAM,YAAY,GAAG,KAAK,EAC7B,KAAU,EACV,SAAiB,EACjB,OAAgC,EAChC,UAA8B,EAClB,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7D,IAAI,OAAO,GAAQ,EAAE,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,gBAAgB,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,EAAE,CAAC;YAChD,MAAM,UAAU,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAA;AAjBY,QAAA,YAAY,gBAiBxB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ido_kawaz/storage-client",
3
- "version": "7.0.2",
3
+ "version": "7.1.1",
4
4
  "description": "Storage client library for Kawaz Plus services",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",