added support for file content in Readable, Blob and ArrayBuffer

Author: boyko-ant

Diff for: README.md

@@ -38,13 +38,13 @@ await app.initializeAsync();
 ### Training
 ```typescript
 await app.train.addPersonAsync(person: PersonModel): Promise<PersonModel>
-await app.train.addPersonFaceAsync(personId: string, photo: Blob, rectangle: RectangleModel): Promise<void>
+await app.train.addPersonFaceAsync(personId: string, photo: Readable | Blob | ArrayBuffer, rectangle: RectangleModel): Promise<void>
 ```
 
 ### Predicting
 ```typescript
-await app.predict.detectFacesAsync(photo: Blob): Promise<DetectFaceModel[]>
-await app.predict.identifyFacesAsync(photo: Blob): Promise<IdentifyModel[]>
+await app.predict.detectFacesAsync(photo: Readable | Blob | ArrayBuffer): Promise<DetectFaceModel[]>
+await app.predict.identifyFacesAsync(photo: Readable | Blob | ArrayBuffer): Promise<IdentifyModel[]>
 ```
 
 ## Known issues

Diff for: src/application/PredictApplication.ts

@@ -6,20 +6,22 @@ import FaceService from "../service/FaceService";
 import {IdentifyModel} from "./model/Identify/IdentifyModel";
 import ConfigService from "../service/config/ConfigService";
 
+import {Readable} from "stream";
+
 export default class PredictApplication extends ApplicationBase {
     constructor(log: ILogService) {
         super(log);
     }
 
-    public async detectFacesAsync(photo: Blob): Promise<DetectFaceModel[]> {
+    public async detectFacesAsync(photo: Readable | Blob | ArrayBuffer): Promise<DetectFaceModel[]> {
         this.log.info("Uploading photo.");
         const url = await BlobService.uploadBlobAsync(photo);
 
         this.log.info("Detecting faces.");
         return await FaceService.detectFacesAsync(url);
     }
 
-    public async identifyFacesAsync(photo: Blob): Promise<IdentifyModel[]> {
+    public async identifyFacesAsync(photo: Readable | Blob | ArrayBuffer): Promise<IdentifyModel[]> {
         this.log.info("Uploading photo.");
         const url = await BlobService.uploadBlobAsync(photo);
 

Diff for: src/application/TrainApplication.ts

@@ -12,6 +12,8 @@ import {PersonModel} from "./model/Person/PersonModel";
 import BlobService from "../service/BlobService";
 import {RectangleModel} from "./model/Face/Base/RectangleModel";
 
+import {Readable} from "stream";
+
 export default class TrainApplication extends ApplicationBase {
     constructor(log: ILogService) {
         super(log);
@@ -22,7 +24,7 @@ export default class TrainApplication extends ApplicationBase {
         return await FaceService.createPersonAsync(ConfigService.Face.Group.Id, person);
     }
 
-    public async addPersonFaceAsync(personId: string, photo: Blob, rectangle: RectangleModel): Promise<void> {
+    public async addPersonFaceAsync(personId: string, photo: Readable | Blob | ArrayBuffer, rectangle: RectangleModel): Promise<void> {
         this.log.info("Uploading photo.");
         const url = await BlobService.uploadBlobAsync(photo);
 

Diff for: src/service/BlobService.ts

@@ -2,6 +2,7 @@ import ConfigService from "./config/ConfigService";
 import GeneratorService from "./helper/GeneratorService";
 
 import {BlobServiceClient, ContainerClient, StorageSharedKeyCredential} from "@azure/storage-blob";
+import {Readable} from "stream";
 
 export default class BlobService {
     public static async createContainerIfNotExistsAsync(): Promise<void> {
@@ -23,7 +24,7 @@ export default class BlobService {
     /**
      * @param   content     Blob.
      */
-    public static async uploadBlobAsync(content: Blob): Promise<string> {
+    public static async uploadBlobAsync(content: Readable | Blob | ArrayBuffer): Promise<string> {
         // TODO: refactoring needed
         const size = 10;
         let uniqueId = GeneratorService.getUniqieNumber(size).toString();
@@ -34,7 +35,15 @@ export default class BlobService {
         const clientContainer = this.getClientContainer();
         const clientBlob = clientContainer.getBlockBlobClient(uniqueId);
 
-        await clientBlob.upload(content, content.size);
+        if (content instanceof ArrayBuffer) {
+            await clientBlob.upload(content, content.byteLength);
+        } else if (content instanceof Readable) {
+            await clientBlob.uploadStream(content);
+        } else if (content instanceof Blob) {
+            await clientBlob.upload(content, content.size);
+        } else {
+            throw new Error("Content should be either Readable or Blob");
+        }
 
         return clientBlob.url;
     }

Diff for: test/integration/service/BlobService.test.ts

@@ -0,0 +1,30 @@
+import SecretService from "../../../src/service/config/SecretService";
+import ConfigService from "../../../src/service/config/ConfigService";
+import BlobService from "../../../src/service/BlobService";
+
+import * as fs from "fs";
+import * as path from "path";
+
+before(async () => {
+    SecretService.Blob.Name = "";
+    SecretService.Blob.Key = "";
+    ConfigService.initializeBlob();
+    await BlobService.createContainerIfNotExistsAsync();
+});
+
+describe("DIY IoT lock Application - blob service", () => {
+    const filePath = path.join(__dirname, "test.jpg");
+
+    it("upload file by content", async () => {
+        const content = fs.readFileSync(filePath);
+        const blob = new Uint8Array(content).buffer;
+        await BlobService.uploadBlobAsync(blob);
+        //TODO: check manually
+    });
+
+    it("upload file by stream", async () => {
+        const stream = fs.createReadStream(filePath);
+        await BlobService.uploadBlobAsync(stream);
+        //TODO: check manually
+    });
+});