@naturalcycles/cloud-storage-lib 1.7.0 → 1.8.0

package/dist/cloudStorage.d.ts

@@ -50,6 +50,7 @@ export declare class CloudStorage implements CommonStorage {
     getFileReadStream(bucketName: string, filePath: string): Readable;
     saveFile(bucketName: string, filePath: string, content: Buffer): Promise<void>;
     getFileWriteStream(bucketName: string, filePath: string): Writable;
+    uploadFile(localFilePath: string, bucketName: string, bucketFilePath: string): Promise<void>;
     setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void>;
     getFileVisibility(bucketName: string, filePath: string): Promise<boolean>;
     copyFile(fromBucket: string, fromPath: string, toPath: string, toBucket?: string): Promise<void>;

package/dist/cloudStorage.js

@@ -111,6 +111,11 @@ class CloudStorage {
     getFileWriteStream(bucketName, filePath) {
         return this.storage.bucket(bucketName).file(filePath).createWriteStream();
     }
+    async uploadFile(localFilePath, bucketName, bucketFilePath) {
+        await this.storage.bucket(bucketName).upload(localFilePath, {
+            destination: bucketFilePath,
+        });
+    }
     async setFileVisibility(bucketName, filePath, isPublic) {
         await this.storage.bucket(bucketName).file(filePath)[isPublic ? 'makePublic' : 'makePrivate']();
     }

package/dist/commonStorage.d.ts

@@ -70,6 +70,10 @@ export interface CommonStorage {
     getFilesStream: (bucketName: string, opt?: CommonStorageGetOptions) => ReadableTyped<FileEntry>;
     getFileReadStream: (bucketName: string, filePath: string) => Readable;
     getFileWriteStream: (bucketName: string, filePath: string) => Writable;
+    /**
+     * Upload local file to the bucket (by streaming it).
+     */
+    uploadFile: (localFilePath: string, bucketName: string, bucketFilePath: string) => Promise<void>;
     setFileVisibility: (bucketName: string, filePath: string, isPublic: boolean) => Promise<void>;
     getFileVisibility: (bucketName: string, filePath: string) => Promise<boolean>;
     copyFile: (fromBucket: string, fromPath: string, toPath: string, toBucket?: string) => Promise<void>;

package/dist/inMemoryCommonStorage.d.ts

@@ -22,6 +22,7 @@ export declare class InMemoryCommonStorage implements CommonStorage {
     getFilesStream(bucketName: string, opt?: CommonStorageGetOptions): ReadableTyped<FileEntry>;
     getFileReadStream(bucketName: string, filePath: string): Readable;
     getFileWriteStream(_bucketName: string, _filePath: string): Writable;
+    uploadFile(localFilePath: string, bucketName: string, bucketFilePath: string): Promise<void>;
     setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void>;
     getFileVisibility(bucketName: string, filePath: string): Promise<boolean>;
     copyFile(fromBucket: string, fromPath: string, toPath: string, toBucket?: string): Promise<void>;

package/dist/inMemoryCommonStorage.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryCommonStorage = void 0;
 const node_stream_1 = require("node:stream");
 const js_lib_1 = require("@naturalcycles/js-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 class InMemoryCommonStorage {
     constructor() {
         /**
@@ -65,6 +66,10 @@ class InMemoryCommonStorage {
     getFileWriteStream(_bucketName, _filePath) {
         throw new Error('Method not implemented.');
     }
+    async uploadFile(localFilePath, bucketName, bucketFilePath) {
+        this.data[bucketName] ||= {};
+        this.data[bucketName][bucketFilePath] = await nodejs_lib_1.fs2.readBufferAsync(localFilePath);
+    }
     async setFileVisibility(bucketName, filePath, isPublic) {
         this.publicMap[bucketName] ||= {};
         this.publicMap[bucketName][filePath] = isPublic;

package/package.json

@@ -35,7 +35,7 @@
   "engines": {
     "node": ">=18.12.0"
   },
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "CommonStorage implementation based on Google Cloud Storage",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/cloudStorage.ts

@@ -163,6 +163,16 @@ export class CloudStorage implements CommonStorage {
     return this.storage.bucket(bucketName).file(filePath).createWriteStream()
   }
 
+  async uploadFile(
+    localFilePath: string,
+    bucketName: string,
+    bucketFilePath: string,
+  ): Promise<void> {
+    await this.storage.bucket(bucketName).upload(localFilePath, {
+      destination: bucketFilePath,
+    })
+  }
+
   async setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void> {
     await this.storage.bucket(bucketName).file(filePath)[isPublic ? 'makePublic' : 'makePrivate']()
   }

package/src/commonStorage.ts

@@ -87,6 +87,11 @@ export interface CommonStorage {
 
   getFileWriteStream: (bucketName: string, filePath: string) => Writable
 
+  /**
+   * Upload local file to the bucket (by streaming it).
+   */
+  uploadFile: (localFilePath: string, bucketName: string, bucketFilePath: string) => Promise<void>
+
   setFileVisibility: (bucketName: string, filePath: string, isPublic: boolean) => Promise<void>
 
   getFileVisibility: (bucketName: string, filePath: string) => Promise<boolean>

package/src/inMemoryCommonStorage.ts

@@ -1,6 +1,6 @@
 import { Readable, Writable } from 'node:stream'
 import { _stringMapEntries, _substringAfterLast, StringMap } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { fs2, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage'
 
 export class InMemoryCommonStorage implements CommonStorage {
@@ -83,6 +83,15 @@ export class InMemoryCommonStorage implements CommonStorage {
     throw new Error('Method not implemented.')
   }
 
+  async uploadFile(
+    localFilePath: string,
+    bucketName: string,
+    bucketFilePath: string,
+  ): Promise<void> {
+    this.data[bucketName] ||= {}
+    this.data[bucketName]![bucketFilePath] = await fs2.readBufferAsync(localFilePath)
+  }
+
   async setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void> {
     this.publicMap[bucketName] ||= {}
     this.publicMap[bucketName]![filePath] = isPublic