Merge pull request #47 from kaleido-io/publish

Add publishData and publishDataBlob

Author: David Echelberger

lib/firefly.ts

@@ -65,6 +65,8 @@ import {
   FireFlyGroupResponse,
   FireFlyBlockchainEventFilter,
   FireFlyBlockchainEventResponse,
+  FireFlyDataBlobRequest,
+  FireFlyDataBlobRequestDefaults,
 } from './interfaces';
 import { FireFlyWebSocket, FireFlyWebSocketCallback } from './websocket';
 import HttpBase, { mapConfig } from './http';
@@ -190,27 +192,24 @@ export default class FireFly extends HttpBase {
     return this.createOne<FireFlyDataResponse>('/data', data, options);
   }
 
+  publishData(id: string, options?: FireFlyCreateOptions): Promise<FireFlyDataResponse> {
+    return this.createOne<FireFlyDataResponse>(`/data/${id}/value/publish`, {}, options);
+  }
+
   async uploadDataBlob(
     blob: string | Buffer | Readable,
-    filename: string,
+    blobOptions?: FormData.AppendOptions,
+    dataOptions?: FireFlyDataBlobRequest,
   ): Promise<FireFlyDataResponse> {
+    dataOptions = { ...FireFlyDataBlobRequestDefaults, ...dataOptions };
     const formData = new FormData();
-    formData.append('autometa', 'true');
-    formData.append('file', blob, { filename });
-    const response = await this.wrapError(
-      this.http.post<FireFlyDataResponse>('/data', formData, {
-        headers: {
-          ...formData.getHeaders(),
-          'Content-Length': formData.getLengthSync(),
-        },
-      }),
-    );
-    return response.data;
-  }
-
-  async uploadDataBlobWithFormData(
-    formData: FormData
-  ): Promise<FireFlyDataResponse> {
+    for (const key in dataOptions) {
+      const val = dataOptions[key as keyof FireFlyDataBlobRequest];
+      if (val !== undefined) {
+        formData.append(key, val);
+      }
+    }
+    formData.append('file', blob, blobOptions);
     const response = await this.wrapError(
       this.http.post<FireFlyDataResponse>('/data', formData, {
         headers: {
@@ -222,13 +221,8 @@ export default class FireFly extends HttpBase {
     return response.data;
   }
 
-  async publishDataBlobToSharedStorage(
-    dataid: string
-  ): Promise<FireFlyDataResponse> {
-    const response = await this.wrapError(
-      this.http.post<FireFlyDataResponse>(`/data/${dataid}/blob/publish`, {dataid}),
-    );
-    return response.data;
+  publishDataBlob(id: string, options?: FireFlyCreateOptions): Promise<FireFlyDataResponse> {
+    return this.createOne<FireFlyDataResponse>(`/data/${id}/blob/publish`, {}, options);
   }
 
   getBatches(

lib/interfaces.ts

@@ -159,11 +159,17 @@ export type FireFlyDataFilter = operations['getData']['parameters']['query'];
 
 export type FireFlyDataRequest =
   operations['postData']['requestBody']['content']['application/json'];
+export type FireFlyDataBlobRequest =
+  operations['postData']['requestBody']['content']['multipart/form-data'];
 
 export type FireFlyDataResponse = Required<
   operations['getDataByID']['responses']['200']['content']['application/json']
 >;
 
+export const FireFlyDataBlobRequestDefaults: FireFlyDataBlobRequest = {
+  autometa: 'true',
+};
+
 // Messages
 
 export type FireFlyMessageFilter = operations['getMsgs']['parameters']['query'];