@oneblink/storage 1.0.0-beta.9 → 2.0.0-beta.1

package/dist/OneBlinkRequestHandler.d.ts

@@ -0,0 +1,18 @@
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
+import { RequestHandler } from '@smithy/types';
+import { RequestBodyHeader, IOneBlinkHttpHandler, OneBlinkResponse, FailResponse } from './http-handlers/types';
+/**
+ * Our own custom request handler to allow the response header which includes
+ * dynamic data from the lambda at edge to be retrieved and held for later when
+ * the upload has completed.
+ */
+export declare class OneBlinkRequestHandler<T> implements RequestHandler<HttpRequest, HttpResponse> {
+    requestBodyHeader?: RequestBodyHeader;
+    oneBlinkHttpHandler: IOneBlinkHttpHandler;
+    oneblinkResponse?: OneBlinkResponse<T>;
+    failResponse?: FailResponse;
+    constructor(oneBlinkHttpHandler: IOneBlinkHttpHandler, requestBodyHeader?: RequestBodyHeader);
+    handle(request: HttpRequest): Promise<{
+        response: HttpResponse;
+    }>;
+}

package/dist/OneBlinkRequestHandler.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneBlinkRequestHandler = void 0;
+/**
+ * Our own custom request handler to allow the response header which includes
+ * dynamic data from the lambda at edge to be retrieved and held for later when
+ * the upload has completed.
+ */
+class OneBlinkRequestHandler {
+    constructor(oneBlinkHttpHandler, requestBodyHeader) {
+        this.oneBlinkHttpHandler = oneBlinkHttpHandler;
+        this.requestBodyHeader = requestBodyHeader;
+    }
+    async handle(request) {
+        if (this.requestBodyHeader) {
+            request.headers['x-oneblink-request-body'] = JSON.stringify(this.requestBodyHeader);
+        }
+        if (this.oneblinkResponse) {
+            request.query['key'] = this.oneblinkResponse.s3.key;
+        }
+        const requestUrl = `${request.method} ${request.protocol}//${request.hostname}${request.path}?${new URLSearchParams(request.query).toString()}`;
+        console.log('Starting S3 upload request', requestUrl);
+        const response = await this.oneBlinkHttpHandler.handleRequest(request);
+        console.log('Finished S3 upload request', requestUrl);
+        const oneblinkResponse = response.headers['x-oneblink-response'];
+        if (typeof oneblinkResponse === 'string') {
+            this.oneblinkResponse = JSON.parse(oneblinkResponse);
+        }
+        if (response.statusCode >= 400) {
+            this.failResponse =
+                await this.oneBlinkHttpHandler.handleFailResponse(response);
+        }
+        return {
+            response,
+        };
+    }
+}
+exports.OneBlinkRequestHandler = OneBlinkRequestHandler;
+//# sourceMappingURL=OneBlinkRequestHandler.js.map

package/dist/OneBlinkRequestHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OneBlinkRequestHandler.js","sourceRoot":"","sources":["../src/OneBlinkRequestHandler.ts"],"names":[],"mappings":";;;AASA;;;;GAIG;AACH,MAAa,sBAAsB;IAQjC,YACE,mBAAyC,EACzC,iBAAqC;QAErC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAoB;QAC/B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC,SAAS,CACzD,IAAI,CAAC,iBAAiB,CACvB,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,CAAA;QACrD,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,KAA+B,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAA;QACzK,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAA;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QACtE,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAA;QAErD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAChE,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACzC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;YAC/B,IAAI,CAAC,YAAY;gBACf,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;QAC/D,CAAC;QAED,OAAO;YACL,QAAQ;SACT,CAAA;IACH,CAAC;CACF;AA9CD,wDA8CC","sourcesContent":["import { HttpRequest, HttpResponse } from '@smithy/protocol-http'\nimport { RequestHandler } from '@smithy/types'\nimport {\n  RequestBodyHeader,\n  IOneBlinkHttpHandler,\n  OneBlinkResponse,\n  FailResponse,\n} from './http-handlers/types'\n\n/**\n * Our own custom request handler to allow the response header which includes\n * dynamic data from the lambda at edge to be retrieved and held for later when\n * the upload has completed.\n */\nexport class OneBlinkRequestHandler<T>\n  implements RequestHandler<HttpRequest, HttpResponse>\n{\n  requestBodyHeader?: RequestBodyHeader\n  oneBlinkHttpHandler: IOneBlinkHttpHandler\n  oneblinkResponse?: OneBlinkResponse<T>\n  failResponse?: FailResponse\n\n  constructor(\n    oneBlinkHttpHandler: IOneBlinkHttpHandler,\n    requestBodyHeader?: RequestBodyHeader,\n  ) {\n    this.oneBlinkHttpHandler = oneBlinkHttpHandler\n    this.requestBodyHeader = requestBodyHeader\n  }\n\n  async handle(request: HttpRequest) {\n    if (this.requestBodyHeader) {\n      request.headers['x-oneblink-request-body'] = JSON.stringify(\n        this.requestBodyHeader,\n      )\n    }\n\n    if (this.oneblinkResponse) {\n      request.query['key'] = this.oneblinkResponse.s3.key\n    }\n\n    const requestUrl = `${request.method} ${request.protocol}//${request.hostname}${request.path}?${new URLSearchParams(request.query as Record<string, string>).toString()}`\n    console.log('Starting S3 upload request', requestUrl)\n    const response = await this.oneBlinkHttpHandler.handleRequest(request)\n    console.log('Finished S3 upload request', requestUrl)\n\n    const oneblinkResponse = response.headers['x-oneblink-response']\n    if (typeof oneblinkResponse === 'string') {\n      this.oneblinkResponse = JSON.parse(oneblinkResponse)\n    }\n\n    if (response.statusCode >= 400) {\n      this.failResponse =\n        await this.oneBlinkHttpHandler.handleFailResponse(response)\n    }\n\n    return {\n      response,\n    }\n  }\n}\n"]}

package/dist/OneBlinkStorageError.js

@@ -11,8 +11,8 @@ class OneBlinkStorageError extends Error {
     constructor(message, options) {
         super(message);
         this.name = 'OneBlinkStorageError';
-        this.originalError = options.originalError;
         this.httpStatusCode = options.httpStatusCode;
+        this.originalError = options.originalError;
     }
 }
 exports.default = OneBlinkStorageError;

package/dist/OneBlinkStorageError.js.map

@@ -1 +1 @@
-{"version":3,"file":"OneBlinkStorageError.js","sourceRoot":"","sources":["../src/OneBlinkStorageError.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAC1C,MAAqB,oBAAqB,SAAQ,KAAK;IAMrD;;;;;OAKG;IACH,YACE,OAAe,EACf,OAKC;QAED,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;QAElC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;QAC1C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;IAC9C,CAAC;CACF;AA3BD,uCA2BC","sourcesContent":["/** An error class that extends `Error` */\nexport default class OneBlinkStorageError extends Error {\n  /** The http status code associated with the error */\n  httpStatusCode: number\n  /** The original error that was thrown */\n  originalError?: Error\n\n  /**\n   * Used to create an instance of the `OneBlinkStorageError` class.\n   *\n   * @param message The message associated with the error\n   * @param options The options associated with the error\n   */\n  constructor(\n    message: string,\n    options: {\n      /** The http status code associated with the error */\n      httpStatusCode: number\n      /** The original error that was thrown */\n      originalError?: Error\n    },\n  ) {\n    super(message)\n    this.name = 'OneBlinkStorageError'\n\n    this.originalError = options.originalError\n    this.httpStatusCode = options.httpStatusCode\n  }\n}\n"]}
+{"version":3,"file":"OneBlinkStorageError.js","sourceRoot":"","sources":["../src/OneBlinkStorageError.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAC1C,MAAqB,oBAAqB,SAAQ,KAAK;IAMrD;;;;;OAKG;IACH,YACE,OAAe,EACf,OAKC;QAED,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;QAElC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC5C,CAAC;CACF;AA3BD,uCA2BC","sourcesContent":["/** An error class that extends `Error` */\nexport default class OneBlinkStorageError extends Error {\n  /** The http status code associated with the error */\n  httpStatusCode: number\n  /** The original error that was thrown */\n  originalError?: Error\n\n  /**\n   * Used to create an instance of the `OneBlinkStorageError` class.\n   *\n   * @param message The message associated with the error\n   * @param options The options associated with the error\n   */\n  constructor(\n    message: string,\n    options: {\n      /** The http status code associated with the error */\n      httpStatusCode: number\n      /** The original error that was thrown */\n      originalError?: Error\n    },\n  ) {\n    super(message)\n    this.name = 'OneBlinkStorageError'\n\n    this.httpStatusCode = options.httpStatusCode\n    this.originalError = options.originalError\n  }\n}\n"]}

package/dist/OneBlinkUploader.d.ts

@@ -7,7 +7,7 @@ import { SubmissionTypes } from '@oneblink/types';
 export default class OneBlinkUploader {
     apiOrigin: StorageConstructorOptions['apiOrigin'];
     region: StorageConstructorOptions['region'];
-    getIdToken: StorageConstructorOptions['getIdToken'];
+    getBearerToken: StorageConstructorOptions['getBearerToken'];
     /**
      * #### Example
      *
@@ -17,7 +17,7 @@ export default class OneBlinkUploader {
      * const uploader = new OneBlinkUploader({
      *   apiOrigin: 'https://auth-api.blinkm.io',
      *   region: 'ap-southeast-2',
-     *   getIdToken: () => getAccessToken(),
+     *   getBearerToken: () => getAccessToken(),
      * })
      * ```
      */
@@ -45,21 +45,14 @@ export default class OneBlinkUploader {
      * @param data The submission upload data and options
      * @returns The upload result
      */
-    uploadSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, recaptchas, onProgress, abortSignal, }: UploadFormSubmissionOptions & {
-        /** The identifier of the task that will be marked as completed */
-        taskId?: string;
-        /** The identifier of the task action that was used to complete the task */
-        taskActionId?: string;
-        /**
-         * The identifier of the task group instance that the completed task is
-         * associated with
-         */
-        taskGroupInstanceId?: string;
+    uploadSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, formSubmissionDraftId, recaptchas, onProgress, abortSignal, }: UploadFormSubmissionOptions & {
         /** The reCAPTCHA tokens to validate the submission */
         recaptchas?: {
             /** A reCAPTCHA token */
             token: string;
         }[];
+        /** The identifier of the draft to mark as submitted. */
+        formSubmissionDraftId?: string;
     }): Promise<import("./http-handlers/types").OneBlinkResponse<{
         submissionTimestamp: string;
         submissionId: string;
@@ -120,6 +113,9 @@ export default class OneBlinkUploader {
      *     // ...
      *   },
      *   formsAppId: 1,
+     *   formSubmissionDraftId: '',
+     *   createdAt: new Date().toISOString(),
+     *   title: '',
      *   onProgress: (progress) => {
      *     // ...
      *   },
@@ -129,13 +125,19 @@ export default class OneBlinkUploader {
      * @param data The submission upload data and options
      * @returns The upload result
      */
-    uploadDraftSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, lastElementUpdated, onProgress, abortSignal, }: UploadFormSubmissionOptions & {
+    uploadFormSubmissionDraft({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, formSubmissionDraftId, createdAt, title, lastElementUpdated, onProgress, abortSignal, }: UploadFormSubmissionOptions & {
+        /** The identifier of the draft that a new version should be created for. */
+        formSubmissionDraftId: string;
+        /**
+         * The date and time (in ISO format) when the draft data was saved by a
+         * user.
+         */
+        createdAt: string;
+        /** The title input by a user to identify the draft. */
+        title: string;
         /** The identifier for the last element that was used before saving draft */
         lastElementUpdated?: SubmissionTypes.NewS3SubmissionData['lastElementUpdated'];
-    }): Promise<import("./http-handlers/types").OneBlinkResponse<{
-        submissionTimestamp: string;
-        draftDataId: string;
-    }>>;
+    }): Promise<import("./http-handlers/types").OneBlinkResponse<SubmissionTypes.FormSubmissionDraftVersion>>;
     /**
      * Upload an asset file. Asset files are always public.
      *

package/dist/OneBlinkUploader.js

@@ -19,14 +19,14 @@ class OneBlinkUploader {
      * const uploader = new OneBlinkUploader({
      *   apiOrigin: 'https://auth-api.blinkm.io',
      *   region: 'ap-southeast-2',
-     *   getIdToken: () => getAccessToken(),
+     *   getBearerToken: () => getAccessToken(),
      * })
      * ```
      */
     constructor(props) {
         this.apiOrigin = props.apiOrigin;
         this.region = props.region;
-        this.getIdToken = props.getIdToken;
+        this.getBearerToken = props.getBearerToken;
     }
     /**
      * Upload a submission.
@@ -51,7 +51,7 @@ class OneBlinkUploader {
      * @param data The submission upload data and options
      * @returns The upload result
      */
-    async uploadSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, recaptchas, onProgress, abortSignal, }) {
+    async uploadSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, formSubmissionDraftId, recaptchas = [], onProgress, abortSignal, }) {
         const newS3SubmissionData = {
             submission,
             definition,
@@ -76,9 +76,10 @@ class OneBlinkUploader {
                 taskId,
                 taskActionId,
                 taskGroupInstanceId,
-                recaptchas: recaptchas || [],
                 jobId,
                 previousFormSubmissionApprovalId,
+                recaptchas,
+                formSubmissionDraftId,
             },
         });
     }
@@ -134,6 +135,9 @@ class OneBlinkUploader {
      *     // ...
      *   },
      *   formsAppId: 1,
+     *   formSubmissionDraftId: '',
+     *   createdAt: new Date().toISOString(),
+     *   title: '',
      *   onProgress: (progress) => {
      *     // ...
      *   },
@@ -143,26 +147,40 @@ class OneBlinkUploader {
      * @param data The submission upload data and options
      * @returns The upload result
      */
-    async uploadDraftSubmission({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, lastElementUpdated, onProgress, abortSignal, }) {
+    async uploadFormSubmissionDraft({ submission, definition, device, userToken, previousFormSubmissionApprovalId, jobId, formsAppId, externalId, taskId, taskActionId, taskGroupInstanceId, formSubmissionDraftId, createdAt, title, lastElementUpdated, onProgress, abortSignal, }) {
+        const newS3SubmissionData = {
+            submission,
+            definition,
+            device,
+            lastElementUpdated,
+        };
+        const tags = (0, generateFormSubmissionTags_1.default)({
+            userToken,
+            previousFormSubmissionApprovalId,
+            jobId,
+        });
+        tags.append('formSubmissionDraftId', formSubmissionDraftId);
         return await (0, uploadToS3_1.default)({
             ...this,
             contentType: 'application/json',
-            body: JSON.stringify({
-                definition,
-                submission,
+            body: JSON.stringify(newS3SubmissionData),
+            key: 'form-submission-draft-versions',
+            tags,
+            abortSignal,
+            onProgress,
+            requestBodyHeader: {
                 formsAppId,
-                lastElementUpdated,
+                formId: definition.id,
                 externalId,
-                device,
-            }),
-            key: `forms/${definition.id}/drafts`,
-            tags: (0, generateFormSubmissionTags_1.default)({
-                userToken,
+                taskId,
+                taskActionId,
+                taskGroupInstanceId,
                 jobId,
                 previousFormSubmissionApprovalId,
-            }),
-            abortSignal,
-            onProgress,
+                createdAt,
+                title,
+                formSubmissionDraftId,
+            },
         });
     }
     /**
@@ -306,7 +324,7 @@ class OneBlinkUploader {
             abortSignal,
             onProgress,
             requestBodyHeader: {
-                fileName,
+                filename: fileName,
             },
             isPublic: false,
         });

package/dist/OneBlinkUploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"OneBlinkUploader.js","sourceRoot":"","sources":["../src/OneBlinkUploader.ts"],"names":[],"mappings":"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","sourcesContent":["import uploadToS3 from './uploadToS3'\nimport {\n  AttachmentUploadData,\n  StorageConstructorOptions,\n  UploadAssetOptions,\n  UploadFormSubmissionOptions,\n  UploadOptions,\n  UploadEmailAttachmentOptions,\n  UploadPDFConversionOptions,\n} from './types'\nimport { SubmissionTypes } from '@oneblink/types'\nimport generateFormSubmissionTags from './generateFormSubmissionTags'\n/**\n * Used to create an instance of the OneBlinkUploader, exposing methods to\n * upload submissions and other types of files\n */\nexport default class OneBlinkUploader {\n  apiOrigin: StorageConstructorOptions['apiOrigin']\n  region: StorageConstructorOptions['region']\n  getIdToken: StorageConstructorOptions['getIdToken']\n\n  /**\n   * #### Example\n   *\n   * ```typescript\n   * import { OneBlinkUploader } from '@oneblink/uploads'\n   *\n   * const uploader = new OneBlinkUploader({\n   *   apiOrigin: 'https://auth-api.blinkm.io',\n   *   region: 'ap-southeast-2',\n   *   getIdToken: () => getAccessToken(),\n   * })\n   * ```\n   */\n  constructor(props: StorageConstructorOptions) {\n    this.apiOrigin = props.apiOrigin\n    this.region = props.region\n    this.getIdToken = props.getIdToken\n  }\n\n  /**\n   * Upload a submission.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const result = await uploader.uploadSubmission({\n   *   submission: {\n   *     // ...\n   *   },\n   *   definition: {\n   *     // ...\n   *   },\n   *   formsAppId: 1,\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   * })\n   * ```\n   *\n   * @param data The submission upload data and options\n   * @returns The upload result\n   */\n  async uploadSubmission({\n    submission,\n    definition,\n    device,\n    userToken,\n    previousFormSubmissionApprovalId,\n    jobId,\n    formsAppId,\n    externalId,\n    taskId,\n    taskActionId,\n    taskGroupInstanceId,\n    recaptchas,\n    onProgress,\n    abortSignal,\n  }: UploadFormSubmissionOptions & {\n    /** The identifier of the task that will be marked as completed */\n    taskId?: string\n    /** The identifier of the task action that was used to complete the task */\n    taskActionId?: string\n    /**\n     * The identifier of the task group instance that the completed task is\n     * associated with\n     */\n    taskGroupInstanceId?: string\n    /** The reCAPTCHA tokens to validate the submission */\n    recaptchas?: {\n      /** A reCAPTCHA token */\n      token: string\n    }[]\n  }) {\n    const newS3SubmissionData: SubmissionTypes.NewS3SubmissionData = {\n      submission,\n      definition,\n      device,\n    }\n    const tags = generateFormSubmissionTags({\n      userToken,\n      previousFormSubmissionApprovalId,\n      jobId,\n    })\n\n    return await uploadToS3<{\n      submissionTimestamp: string\n      submissionId: string\n      pdfAccessToken?: string\n      preventPayment: boolean\n    }>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify(newS3SubmissionData),\n      key: `forms/${definition.id}/submissions`,\n      tags,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        formsAppId,\n        externalId,\n        taskId,\n        taskActionId,\n        taskGroupInstanceId,\n        recaptchas: recaptchas || [],\n        jobId,\n        previousFormSubmissionApprovalId,\n      },\n    })\n  }\n\n  /**\n   * Upload an form submission attachment.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   formId: 1,\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   isPrivate: true,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The attachment upload data and options\n   * @returns The upload result\n   */\n  async uploadAttachment({\n    formId,\n    fileName,\n    contentType,\n    isPrivate,\n    data,\n    username,\n    onProgress,\n    abortSignal,\n  }: UploadOptions & {\n    /** The identifier for the form that is being completed */\n    formId: number\n    /** The name of the file being uploaded */\n    fileName: string\n    /** A standard MIME type describing the format of the contents */\n    contentType: string\n    /** Set to `true` to prevent the file from being downloaded publicly */\n    isPrivate: boolean\n    /** The file data to upload */\n    data: AttachmentUploadData\n    /** A username to allow a single user to download the attachment file */\n    username?: string\n  }) {\n    return await uploadToS3<{\n      url: string\n      attachmentDataId: string\n      uploadedAt: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `forms/${formId}/attachments`,\n      abortSignal,\n      onProgress,\n      isPublic: !isPrivate,\n      contentDisposition: `attachment; filename*=UTF-8''${encodeURIComponent(fileName)}`,\n      requestBodyHeader: {\n        username,\n        fileName,\n      },\n    })\n  }\n\n  /**\n   * Upload a draft submission.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const result = await uploader.uploadDraftSubmission({\n   *   submission: {\n   *     // ...\n   *   },\n   *   definition: {\n   *     // ...\n   *   },\n   *   formsAppId: 1,\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   * })\n   * ```\n   *\n   * @param data The submission upload data and options\n   * @returns The upload result\n   */\n  async uploadDraftSubmission({\n    submission,\n    definition,\n    device,\n    userToken,\n    previousFormSubmissionApprovalId,\n    jobId,\n    formsAppId,\n    externalId,\n    lastElementUpdated,\n    onProgress,\n    abortSignal,\n  }: UploadFormSubmissionOptions & {\n    /** The identifier for the last element that was used before saving draft */\n    lastElementUpdated?: SubmissionTypes.NewS3SubmissionData['lastElementUpdated']\n  }) {\n    return await uploadToS3<{\n      submissionTimestamp: string\n      draftDataId: string\n    }>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify({\n        definition,\n        submission,\n        formsAppId,\n        lastElementUpdated,\n        externalId,\n        device,\n      }),\n      key: `forms/${definition.id}/drafts`,\n      tags: generateFormSubmissionTags({\n        userToken,\n        jobId,\n        previousFormSubmissionApprovalId,\n      }),\n      abortSignal,\n      onProgress,\n    })\n  }\n\n  /**\n   * Upload an asset file. Asset files are always public.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   *   organisatsionId: 'abc123',\n   * })\n   * ```\n   *\n   * @param data The asset upload data and options\n   * @returns The upload result\n   */\n  async uploadAsset({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n    organisationId,\n  }: UploadOptions &\n    UploadAssetOptions & {\n      /** The identifier for the organisation that owns the asset */\n      organisationId: string\n    }) {\n    return await uploadToS3<{\n      url: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `organisations/${organisationId}/assets`,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        fileName,\n      },\n      isPublic: true,\n    })\n  }\n\n  /**\n   * Upload an asset file for a product service such as Product Notifications.\n   * Asset files are always public.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The asset upload data and options\n   * @returns The upload result\n   */\n  async uploadProductAsset({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n  }: UploadOptions & UploadAssetOptions) {\n    return await uploadToS3<{\n      url: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `administration/assets`,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        fileName,\n      },\n      isPublic: true,\n    })\n  }\n\n  /**\n   * Upload form prefill data.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadPrefillData({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: {\n   *     field1: 'abc',\n   *     field2: 123,\n   *   },\n   *   formId: 12,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The prefill upload data and options\n   * @returns The upload result\n   */\n  async uploadPrefillData({\n    formId,\n    prefillData,\n    onProgress,\n    abortSignal,\n  }: UploadOptions & {\n    /** The identifier for the form that the prefill data is associated with */\n    formId: number\n    /** The prefill data to upload */\n    prefillData: SubmissionTypes.NewS3SubmissionData['submission']\n  }) {\n    return await uploadToS3<{\n      preFillFormDataId: string\n    }>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify(prefillData),\n      key: `forms/${formId}/pre-fill`,\n      abortSignal,\n      onProgress,\n    })\n  }\n\n  /**\n   * Upload an email attachment. Email attachments are always private.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadEmailAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The email attachment data and options\n   * @returns The upload result\n   */\n  async uploadEmailAttachment({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n  }: UploadOptions & UploadEmailAttachmentOptions) {\n    return await uploadToS3({\n      ...this,\n      contentType,\n      body: data,\n      key: 'email-attachments',\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        fileName,\n      },\n      isPublic: false,\n    })\n  }\n\n  /**\n   * Upload a PDF for conversion. PDF Conversions are always private.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadPDFConversion({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: pdfData,\n   *   formId: 1,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The PDF data and options\n   * @returns The upload result\n   */\n  async uploadPDFConversion({\n    onProgress,\n    abortSignal,\n    data,\n    formId,\n  }: UploadPDFConversionOptions) {\n    return await uploadToS3({\n      ...this,\n      contentType: 'application/pdf',\n      body: data,\n      key: `forms/${formId}/pdf-conversion`,\n      abortSignal,\n      onProgress,\n    })\n  }\n}\n"]}
+{"version":3,"file":"OneBlinkUploader.js","sourceRoot":"","sources":["../src/OneBlinkUploader.ts"],"names":[],"mappings":"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","sourcesContent":["import uploadToS3 from './uploadToS3'\nimport {\n  AttachmentUploadData,\n  StorageConstructorOptions,\n  UploadAssetOptions,\n  UploadFormSubmissionOptions,\n  UploadOptions,\n  UploadEmailAttachmentOptions,\n  UploadPDFConversionOptions,\n} from './types'\nimport { SubmissionTypes } from '@oneblink/types'\nimport generateFormSubmissionTags from './generateFormSubmissionTags'\n/**\n * Used to create an instance of the OneBlinkUploader, exposing methods to\n * upload submissions and other types of files\n */\nexport default class OneBlinkUploader {\n  apiOrigin: StorageConstructorOptions['apiOrigin']\n  region: StorageConstructorOptions['region']\n  getBearerToken: StorageConstructorOptions['getBearerToken']\n\n  /**\n   * #### Example\n   *\n   * ```typescript\n   * import { OneBlinkUploader } from '@oneblink/uploads'\n   *\n   * const uploader = new OneBlinkUploader({\n   *   apiOrigin: 'https://auth-api.blinkm.io',\n   *   region: 'ap-southeast-2',\n   *   getBearerToken: () => getAccessToken(),\n   * })\n   * ```\n   */\n  constructor(props: StorageConstructorOptions) {\n    this.apiOrigin = props.apiOrigin\n    this.region = props.region\n    this.getBearerToken = props.getBearerToken\n  }\n\n  /**\n   * Upload a submission.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const result = await uploader.uploadSubmission({\n   *   submission: {\n   *     // ...\n   *   },\n   *   definition: {\n   *     // ...\n   *   },\n   *   formsAppId: 1,\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   * })\n   * ```\n   *\n   * @param data The submission upload data and options\n   * @returns The upload result\n   */\n  async uploadSubmission({\n    submission,\n    definition,\n    device,\n    userToken,\n    previousFormSubmissionApprovalId,\n    jobId,\n    formsAppId,\n    externalId,\n    taskId,\n    taskActionId,\n    taskGroupInstanceId,\n    formSubmissionDraftId,\n    recaptchas = [],\n    onProgress,\n    abortSignal,\n  }: UploadFormSubmissionOptions & {\n    /** The reCAPTCHA tokens to validate the submission */\n    recaptchas?: {\n      /** A reCAPTCHA token */\n      token: string\n    }[]\n    /** The identifier of the draft to mark as submitted. */\n    formSubmissionDraftId?: string\n  }) {\n    const newS3SubmissionData: SubmissionTypes.NewS3SubmissionData = {\n      submission,\n      definition,\n      device,\n    }\n    const tags = generateFormSubmissionTags({\n      userToken,\n      previousFormSubmissionApprovalId,\n      jobId,\n    })\n\n    return await uploadToS3<{\n      submissionTimestamp: string\n      submissionId: string\n      pdfAccessToken?: string\n      preventPayment: boolean\n    }>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify(newS3SubmissionData),\n      key: `forms/${definition.id}/submissions`,\n      tags,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        formsAppId,\n        externalId,\n        taskId,\n        taskActionId,\n        taskGroupInstanceId,\n        jobId,\n        previousFormSubmissionApprovalId,\n        recaptchas,\n        formSubmissionDraftId,\n      },\n    })\n  }\n\n  /**\n   * Upload an form submission attachment.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   formId: 1,\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   isPrivate: true,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The attachment upload data and options\n   * @returns The upload result\n   */\n  async uploadAttachment({\n    formId,\n    fileName,\n    contentType,\n    isPrivate,\n    data,\n    username,\n    onProgress,\n    abortSignal,\n  }: UploadOptions & {\n    /** The identifier for the form that is being completed */\n    formId: number\n    /** The name of the file being uploaded */\n    fileName: string\n    /** A standard MIME type describing the format of the contents */\n    contentType: string\n    /** Set to `true` to prevent the file from being downloaded publicly */\n    isPrivate: boolean\n    /** The file data to upload */\n    data: AttachmentUploadData\n    /** A username to allow a single user to download the attachment file */\n    username?: string\n  }) {\n    return await uploadToS3<{\n      url: string\n      attachmentDataId: string\n      uploadedAt: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `forms/${formId}/attachments`,\n      abortSignal,\n      onProgress,\n      isPublic: !isPrivate,\n      contentDisposition: `attachment; filename*=UTF-8''${encodeURIComponent(fileName)}`,\n      requestBodyHeader: {\n        username,\n        fileName,\n      },\n    })\n  }\n\n  /**\n   * Upload a draft submission.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const result = await uploader.uploadDraftSubmission({\n   *   submission: {\n   *     // ...\n   *   },\n   *   definition: {\n   *     // ...\n   *   },\n   *   formsAppId: 1,\n   *   formSubmissionDraftId: '',\n   *   createdAt: new Date().toISOString(),\n   *   title: '',\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   * })\n   * ```\n   *\n   * @param data The submission upload data and options\n   * @returns The upload result\n   */\n  async uploadFormSubmissionDraft({\n    submission,\n    definition,\n    device,\n    userToken,\n    previousFormSubmissionApprovalId,\n    jobId,\n    formsAppId,\n    externalId,\n    taskId,\n    taskActionId,\n    taskGroupInstanceId,\n    formSubmissionDraftId,\n    createdAt,\n    title,\n    lastElementUpdated,\n    onProgress,\n    abortSignal,\n  }: UploadFormSubmissionOptions & {\n    /** The identifier of the draft that a new version should be created for. */\n    formSubmissionDraftId: string\n    /**\n     * The date and time (in ISO format) when the draft data was saved by a\n     * user.\n     */\n    createdAt: string\n    /** The title input by a user to identify the draft. */\n    title: string\n    /** The identifier for the last element that was used before saving draft */\n    lastElementUpdated?: SubmissionTypes.NewS3SubmissionData['lastElementUpdated']\n  }) {\n    const newS3SubmissionData: SubmissionTypes.NewS3SubmissionData = {\n      submission,\n      definition,\n      device,\n      lastElementUpdated,\n    }\n    const tags = generateFormSubmissionTags({\n      userToken,\n      previousFormSubmissionApprovalId,\n      jobId,\n    })\n\n    tags.append('formSubmissionDraftId', formSubmissionDraftId)\n\n    return await uploadToS3<SubmissionTypes.FormSubmissionDraftVersion>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify(newS3SubmissionData),\n      key: 'form-submission-draft-versions',\n      tags,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        formsAppId,\n        formId: definition.id,\n        externalId,\n        taskId,\n        taskActionId,\n        taskGroupInstanceId,\n        jobId,\n        previousFormSubmissionApprovalId,\n        createdAt,\n        title,\n        formSubmissionDraftId,\n      },\n    })\n  }\n\n  /**\n   * Upload an asset file. Asset files are always public.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   *   organisatsionId: 'abc123',\n   * })\n   * ```\n   *\n   * @param data The asset upload data and options\n   * @returns The upload result\n   */\n  async uploadAsset({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n    organisationId,\n  }: UploadOptions &\n    UploadAssetOptions & {\n      /** The identifier for the organisation that owns the asset */\n      organisationId: string\n    }) {\n    return await uploadToS3<{\n      url: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `organisations/${organisationId}/assets`,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        fileName,\n      },\n      isPublic: true,\n    })\n  }\n\n  /**\n   * Upload an asset file for a product service such as Product Notifications.\n   * Asset files are always public.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The asset upload data and options\n   * @returns The upload result\n   */\n  async uploadProductAsset({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n  }: UploadOptions & UploadAssetOptions) {\n    return await uploadToS3<{\n      url: string\n    }>({\n      ...this,\n      contentType,\n      body: data,\n      key: `administration/assets`,\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        fileName,\n      },\n      isPublic: true,\n    })\n  }\n\n  /**\n   * Upload form prefill data.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadPrefillData({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: {\n   *     field1: 'abc',\n   *     field2: 123,\n   *   },\n   *   formId: 12,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The prefill upload data and options\n   * @returns The upload result\n   */\n  async uploadPrefillData({\n    formId,\n    prefillData,\n    onProgress,\n    abortSignal,\n  }: UploadOptions & {\n    /** The identifier for the form that the prefill data is associated with */\n    formId: number\n    /** The prefill data to upload */\n    prefillData: SubmissionTypes.NewS3SubmissionData['submission']\n  }) {\n    return await uploadToS3<{\n      preFillFormDataId: string\n    }>({\n      ...this,\n      contentType: 'application/json',\n      body: JSON.stringify(prefillData),\n      key: `forms/${formId}/pre-fill`,\n      abortSignal,\n      onProgress,\n    })\n  }\n\n  /**\n   * Upload an email attachment. Email attachments are always private.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadEmailAttachment({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: new Blob(['a string of data'], {\n   *     type: 'text/plain',\n   *   }),\n   *   fileName: 'file.txt',\n   *   contentType: 'text/plain',\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The email attachment data and options\n   * @returns The upload result\n   */\n  async uploadEmailAttachment({\n    onProgress,\n    abortSignal,\n    data,\n    contentType,\n    fileName,\n  }: UploadOptions & UploadEmailAttachmentOptions) {\n    return await uploadToS3({\n      ...this,\n      contentType,\n      body: data,\n      key: 'email-attachments',\n      abortSignal,\n      onProgress,\n      requestBodyHeader: {\n        filename: fileName,\n      },\n      isPublic: false,\n    })\n  }\n\n  /**\n   * Upload a PDF for conversion. PDF Conversions are always private.\n   *\n   * #### Example\n   *\n   * ```ts\n   * const abortController = new AbortController()\n   * const result = await uploader.uploadPDFConversion({\n   *   onProgress: (progress) => {\n   *     // ...\n   *   },\n   *   data: pdfData,\n   *   formId: 1,\n   *   abortSignal: abortController.signal,\n   * })\n   * ```\n   *\n   * @param data The PDF data and options\n   * @returns The upload result\n   */\n  async uploadPDFConversion({\n    onProgress,\n    abortSignal,\n    data,\n    formId,\n  }: UploadPDFConversionOptions) {\n    return await uploadToS3({\n      ...this,\n      contentType: 'application/pdf',\n      body: data,\n      key: `forms/${formId}/pdf-conversion`,\n      abortSignal,\n      onProgress,\n    })\n  }\n}\n"]}

package/dist/http-handlers/FetchHandler.d.ts

@@ -1,19 +1,11 @@
-import { FetchHttpHandler } from '@smithy/fetch-http-handler';
-import { HttpRequest } from '@smithy/protocol-http';
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { HttpHandlerOptions } from '@smithy/types';
-import { StorageConstructorOptions } from '../types';
-import { RequestBodyHeader, IOneBlinkRequestHandler, OneBlinkResponse, FailResponse } from './types';
-export declare class OneBlinkFetchHandler<T> extends FetchHttpHandler implements IOneBlinkRequestHandler<T> {
-    constructor({ getIdToken, requestBodyHeader, }: {
-        getIdToken: StorageConstructorOptions['getIdToken'];
-        requestBodyHeader?: RequestBodyHeader;
-    });
-    getIdToken: StorageConstructorOptions['getIdToken'];
-    requestBodyHeader?: RequestBodyHeader;
-    oneblinkResponse?: OneBlinkResponse<T>;
-    failResponse?: FailResponse;
-    handle(request: HttpRequest, options?: HttpHandlerOptions): Promise<{
-        response: import("@smithy/protocol-http").HttpResponse;
+import { IOneBlinkHttpHandler } from './types';
+export declare class OneBlinkFetchHandler implements IOneBlinkHttpHandler {
+    handleRequest(request: HttpRequest, options?: HttpHandlerOptions): Promise<HttpResponse>;
+    handleFailResponse(response: HttpResponse): Promise<{
+        statusCode: number;
+        message: any;
     }>;
     determineQueueSize(): 1 | 2 | 10;
 }

package/dist/http-handlers/FetchHandler.js

@@ -1,44 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OneBlinkFetchHandler = void 0;
-const fetch_http_handler_1 = require("@smithy/fetch-http-handler");
-const handleRequest_1 = require("./handleRequest");
-// Our own custom request handler to allow setting customer headers for
-// authentication. Also allow the response header which includes dynamic
-// data from the lambda at edge to be retrieved and held for later when
-// the upload has completed.
-class OneBlinkFetchHandler extends fetch_http_handler_1.FetchHttpHandler {
-    constructor({ getIdToken, requestBodyHeader, }) {
-        super();
-        this.getIdToken = getIdToken;
-        this.requestBodyHeader = requestBodyHeader;
+class OneBlinkFetchHandler {
+    async handleRequest(request, options) {
+        const { FetchHttpHandler } = await import('@smithy/fetch-http-handler');
+        const fetchHttpHandler = new FetchHttpHandler();
+        const { response } = await fetchHttpHandler.handle(request, options);
+        return response;
     }
-    async handle(request, options) {
-        await (0, handleRequest_1.prepareRequest)(this, request);
-        const result = await super.handle(request, options);
-        await (0, handleRequest_1.handleResponse)(this, request, result.response);
-        if (result.response.statusCode < 400) {
-            return result;
-        }
-        const fetchResponse = new Response(result.response.body);
-        switch (result.response.headers['content-type']) {
+    async handleFailResponse(response) {
+        const fetchResponse = new Response(response.body);
+        switch (response.headers['content-type']) {
             case 'application/json; charset=utf-8':
             case 'application/json': {
-                this.failResponse = {
-                    statusCode: result.response.statusCode,
+                return {
+                    statusCode: response.statusCode,
                     message: (await fetchResponse.json()).message,
                 };
-                break;
             }
             default: {
-                this.failResponse = {
-                    statusCode: result.response.statusCode,
+                return {
+                    statusCode: response.statusCode,
                     message: await fetchResponse.text(),
                 };
-                break;
             }
         }
-        return result;
     }
     determineQueueSize() {
         const effectiveType = window.navigator &&

package/dist/http-handlers/FetchHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchHandler.js","sourceRoot":"","sources":["../../src/http-handlers/FetchHandler.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAU7D,mDAAgE;AAEhE,uEAAuE;AACvE,wEAAwE;AACxE,uEAAuE;AACvE,4BAA4B;AAC5B,MAAa,oBACX,SAAQ,qCAAgB;IAGxB,YAAY,EACV,UAAU,EACV,iBAAiB,GAIlB;QACC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,OAAoB,EAAE,OAA4B;QAC7D,MAAM,IAAA,8BAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAEnD,MAAM,IAAA,8BAAc,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;QAEpD,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;YACrC,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAExD,QAAQ,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAChD,KAAK,iCAAiC,CAAC;YACvC,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,IAAI,CAAC,YAAY,GAAG;oBAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;oBACtC,OAAO,EAAE,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO;iBAC9C,CAAA;gBACD,MAAK;YACP,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,IAAI,CAAC,YAAY,GAAG;oBAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;oBACtC,OAAO,EAAE,MAAM,aAAa,CAAC,IAAI,EAAE;iBACpC,CAAA;gBACD,MAAK;YACP,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,kBAAkB;QAChB,MAAM,aAAa,GACjB,MAAM,CAAC,SAAS;YAChB,YAAY,IAAI,MAAM,CAAC,SAAS;YAChC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU;YAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,UAAU,KAAK,QAAQ;YAC/C,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU;YAC5C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa;YAC3C,CAAC,CAAC,SAAS,CAAA;QACf,QAAQ,aAAa,EAAE,CAAC;YACtB,KAAK,IAAI;gBACP,OAAO,EAAE,CAAA;YACX,KAAK,IAAI;gBACP,OAAO,CAAC,CAAA;YACV,KAAK,SAAS,CAAC;YACf,KAAK,IAAI,CAAC;YACV,OAAO,CAAC,CAAC,CAAC;gBACR,OAAO,CAAC,CAAA;YACV,CAAC;QACH,CAAC;IACH,CAAC;CACF;AA5ED,oDA4EC","sourcesContent":["import { FetchHttpHandler } from '@smithy/fetch-http-handler'\nimport { HttpRequest } from '@smithy/protocol-http'\nimport { HttpHandlerOptions } from '@smithy/types'\nimport { StorageConstructorOptions } from '../types'\nimport {\n  RequestBodyHeader,\n  IOneBlinkRequestHandler,\n  OneBlinkResponse,\n  FailResponse,\n} from './types'\nimport { handleResponse, prepareRequest } from './handleRequest'\n\n// Our own custom request handler to allow setting customer headers for\n// authentication. Also allow the response header which includes dynamic\n// data from the lambda at edge to be retrieved and held for later when\n// the upload has completed.\nexport class OneBlinkFetchHandler<T>\n  extends FetchHttpHandler\n  implements IOneBlinkRequestHandler<T>\n{\n  constructor({\n    getIdToken,\n    requestBodyHeader,\n  }: {\n    getIdToken: StorageConstructorOptions['getIdToken']\n    requestBodyHeader?: RequestBodyHeader\n  }) {\n    super()\n    this.getIdToken = getIdToken\n    this.requestBodyHeader = requestBodyHeader\n  }\n\n  getIdToken: StorageConstructorOptions['getIdToken']\n  requestBodyHeader?: RequestBodyHeader\n  oneblinkResponse?: OneBlinkResponse<T>\n  failResponse?: FailResponse\n\n  async handle(request: HttpRequest, options?: HttpHandlerOptions) {\n    await prepareRequest(this, request)\n\n    const result = await super.handle(request, options)\n\n    await handleResponse(this, request, result.response)\n\n    if (result.response.statusCode < 400) {\n      return result\n    }\n\n    const fetchResponse = new Response(result.response.body)\n\n    switch (result.response.headers['content-type']) {\n      case 'application/json; charset=utf-8':\n      case 'application/json': {\n        this.failResponse = {\n          statusCode: result.response.statusCode,\n          message: (await fetchResponse.json()).message,\n        }\n        break\n      }\n      default: {\n        this.failResponse = {\n          statusCode: result.response.statusCode,\n          message: await fetchResponse.text(),\n        }\n        break\n      }\n    }\n\n    return result\n  }\n\n  determineQueueSize() {\n    const effectiveType =\n      window.navigator &&\n      'connection' in window.navigator &&\n      !!window.navigator.connection &&\n      typeof window.navigator.connection === 'object' &&\n      'effectiveType' in window.navigator.connection\n        ? window.navigator.connection.effectiveType\n        : undefined\n    switch (effectiveType) {\n      case '4g':\n        return 10\n      case '3g':\n        return 2\n      case 'slow-2g':\n      case '2g':\n      default: {\n        return 1\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"FetchHandler.js","sourceRoot":"","sources":["../../src/http-handlers/FetchHandler.ts"],"names":[],"mappings":";;;AAIA,MAAa,oBAAoB;IAC/B,KAAK,CAAC,aAAa,CAAC,OAAoB,EAAE,OAA4B;QACpE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAA;QACvE,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACpE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAsB;QAC7C,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEjD,QAAQ,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,KAAK,iCAAiC,CAAC;YACvC,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,OAAO;oBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,OAAO,EAAE,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO;iBAC9C,CAAA;YACH,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,OAAO;oBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,OAAO,EAAE,MAAM,aAAa,CAAC,IAAI,EAAE;iBACpC,CAAA;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,kBAAkB;QAChB,MAAM,aAAa,GACjB,MAAM,CAAC,SAAS;YAChB,YAAY,IAAI,MAAM,CAAC,SAAS;YAChC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU;YAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,UAAU,KAAK,QAAQ;YAC/C,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU;YAC5C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa;YAC3C,CAAC,CAAC,SAAS,CAAA;QACf,QAAQ,aAAa,EAAE,CAAC;YACtB,KAAK,IAAI;gBACP,OAAO,EAAE,CAAA;YACX,KAAK,IAAI;gBACP,OAAO,CAAC,CAAA;YACV,KAAK,SAAS,CAAC;YACf,KAAK,IAAI,CAAC;YACV,OAAO,CAAC,CAAC,CAAC;gBACR,OAAO,CAAC,CAAA;YACV,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAjDD,oDAiDC","sourcesContent":["import { HttpRequest, HttpResponse } from '@smithy/protocol-http'\nimport { HttpHandlerOptions } from '@smithy/types'\nimport { IOneBlinkHttpHandler } from './types'\n\nexport class OneBlinkFetchHandler implements IOneBlinkHttpHandler {\n  async handleRequest(request: HttpRequest, options?: HttpHandlerOptions) {\n    const { FetchHttpHandler } = await import('@smithy/fetch-http-handler')\n    const fetchHttpHandler = new FetchHttpHandler()\n    const { response } = await fetchHttpHandler.handle(request, options)\n    return response\n  }\n\n  async handleFailResponse(response: HttpResponse) {\n    const fetchResponse = new Response(response.body)\n\n    switch (response.headers['content-type']) {\n      case 'application/json; charset=utf-8':\n      case 'application/json': {\n        return {\n          statusCode: response.statusCode,\n          message: (await fetchResponse.json()).message,\n        }\n      }\n      default: {\n        return {\n          statusCode: response.statusCode,\n          message: await fetchResponse.text(),\n        }\n      }\n    }\n  }\n\n  determineQueueSize() {\n    const effectiveType =\n      window.navigator &&\n      'connection' in window.navigator &&\n      !!window.navigator.connection &&\n      typeof window.navigator.connection === 'object' &&\n      'effectiveType' in window.navigator.connection\n        ? window.navigator.connection.effectiveType\n        : undefined\n    switch (effectiveType) {\n      case '4g':\n        return 10\n      case '3g':\n        return 2\n      case 'slow-2g':\n      case '2g':\n      default: {\n        return 1\n      }\n    }\n  }\n}\n"]}

package/dist/http-handlers/NodeJsHandler.d.ts

@@ -1,19 +1,11 @@
-import { NodeHttpHandler } from '@smithy/node-http-handler';
-import { HttpRequest } from '@smithy/protocol-http';
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
 import { HttpHandlerOptions } from '@smithy/types';
-import { StorageConstructorOptions } from '../types';
-import { RequestBodyHeader, IOneBlinkRequestHandler, OneBlinkResponse, FailResponse } from './types';
-export declare class OneBlinkNodeJsHandler<T> extends NodeHttpHandler implements IOneBlinkRequestHandler<T> {
-    constructor({ getIdToken, requestBodyHeader, }: {
-        getIdToken: StorageConstructorOptions['getIdToken'];
-        requestBodyHeader?: RequestBodyHeader;
-    });
-    getIdToken: StorageConstructorOptions['getIdToken'];
-    requestBodyHeader?: RequestBodyHeader;
-    oneblinkResponse?: OneBlinkResponse<T>;
-    failResponse?: FailResponse;
-    handle(request: HttpRequest, options?: HttpHandlerOptions): Promise<{
-        response: import("@smithy/protocol-http").HttpResponse;
-    }>;
+import { IOneBlinkHttpHandler } from './types';
+export declare class OneBlinkNodeJsHandler implements IOneBlinkHttpHandler {
+    handleRequest(request: HttpRequest, options?: HttpHandlerOptions | undefined): Promise<HttpResponse>;
+    handleFailResponse(response: HttpResponse): Promise<{
+        statusCode: number;
+        message: any;
+    } | undefined>;
     determineQueueSize(): number;
 }

package/dist/http-handlers/NodeJsHandler.js

@@ -1,58 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OneBlinkNodeJsHandler = void 0;
-const node_http_handler_1 = require("@smithy/node-http-handler");
-const handleRequest_1 = require("./handleRequest");
-// Our own custom request handler to allow setting customer headers for
-// authentication. Also allow the response header which includes dynamic
-// data from the lambda at edge to be retrieved and held for later when
-// the upload has completed.
-class OneBlinkNodeJsHandler extends node_http_handler_1.NodeHttpHandler {
-    constructor({ getIdToken, requestBodyHeader, }) {
-        super();
-        this.getIdToken = getIdToken;
-        this.requestBodyHeader = requestBodyHeader;
+class OneBlinkNodeJsHandler {
+    async handleRequest(request, options) {
+        const { NodeHttpHandler } = await import('@smithy/node-http-handler');
+        const nodeHttpHandler = new NodeHttpHandler();
+        const { response } = await nodeHttpHandler.handle(request, options);
+        return response;
     }
-    async handle(request, options) {
-        await (0, handleRequest_1.prepareRequest)(this, request);
-        const result = await super.handle(request, options);
-        await (0, handleRequest_1.handleResponse)(this, request, result.response);
-        if (result.response.statusCode < 400) {
-            return result;
-        }
-        switch (result.response.headers['content-type']) {
+    async handleFailResponse(response) {
+        switch (response.headers['content-type']) {
             case 'application/json; charset=utf-8':
             case 'application/json': {
-                const { Readable, consumers } = await import('stream');
-                if (result.response.body instanceof Readable) {
-                    this.failResponse = {
-                        statusCode: result.response.statusCode,
-                        message: (await consumers.json(result.response.body)).message,
+                const { Readable } = await import('stream');
+                if (response.body instanceof Readable) {
+                    const consumers = await import('stream/consumers');
+                    return {
+                        statusCode: response.statusCode,
+                        message: (await consumers.json(response.body))
+                            .message,
                     };
                 }
-                if (typeof result.response.body === 'string') {
-                    this.failResponse = {
-                        statusCode: result.response.statusCode,
-                        message: JSON.parse(result.response.body).message,
+                if (typeof response.body === 'string') {
+                    return {
+                        statusCode: response.statusCode,
+                        message: JSON.parse(response.body).message,
                     };
                 }
                 break;
             }
             case 'text/html': {
                 const { Readable, consumers } = await import('stream');
-                if (result.response.body instanceof Readable) {
-                    this.failResponse = {
-                        statusCode: result.response.statusCode,
-                        message: await consumers.text(result.response.body),
+                if (response.body instanceof Readable) {
+                    return {
+                        statusCode: response.statusCode,
+                        message: await consumers.text(response.body),
                     };
                 }
-                if (typeof result.response.body === 'string') {
-                    console.log('response', result.response.body);
+                if (typeof response.body === 'string') {
+                    return {
+                        statusCode: response.statusCode,
+                        message: response.body,
+                    };
                 }
                 break;
             }
         }
-        return result;
     }
     determineQueueSize() {
         return 10;

package/dist/http-handlers/NodeJsHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeJsHandler.js","sourceRoot":"","sources":["../../src/http-handlers/NodeJsHandler.ts"],"names":[],"mappings":";;;AAAA,iEAA2D;AAU3D,mDAAgE;AAEhE,uEAAuE;AACvE,wEAAwE;AACxE,uEAAuE;AACvE,4BAA4B;AAC5B,MAAa,qBACX,SAAQ,mCAAe;IAGvB,YAAY,EACV,UAAU,EACV,iBAAiB,GAIlB;QACC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,OAAoB,EAAE,OAA4B;QAC7D,MAAM,IAAA,8BAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAEnD,MAAM,IAAA,8BAAc,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;QAEpD,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;YACrC,OAAO,MAAM,CAAA;QACf,CAAC;QAED,QAAQ,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YAChD,KAAK,iCAAiC,CAAC;YACvC,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACtD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,YAAY,QAAQ,EAAE,CAAC;oBAC7C,IAAI,CAAC,YAAY,GAAG;wBAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;wBACtC,OAAO,EACL,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC5C,CAAC,OAAO;qBACV,CAAA;gBACH,CAAC;gBAED,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7C,IAAI,CAAC,YAAY,GAAG;wBAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;wBACtC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO;qBAClD,CAAA;gBACH,CAAC;gBACD,MAAK;YACP,CAAC;YACD,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACtD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,YAAY,QAAQ,EAAE,CAAC;oBAC7C,IAAI,CAAC,YAAY,GAAG;wBAClB,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;wBACtC,OAAO,EAAE,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;qBACpD,CAAA;gBACH,CAAC;gBAED,IAAI,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC/C,CAAC;gBACD,MAAK;YACP,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,kBAAkB;QAChB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AA3ED,sDA2EC","sourcesContent":["import { NodeHttpHandler } from '@smithy/node-http-handler'\nimport { HttpRequest } from '@smithy/protocol-http'\nimport { HttpHandlerOptions } from '@smithy/types'\nimport { StorageConstructorOptions } from '../types'\nimport {\n  RequestBodyHeader,\n  IOneBlinkRequestHandler,\n  OneBlinkResponse,\n  FailResponse,\n} from './types'\nimport { handleResponse, prepareRequest } from './handleRequest'\n\n// Our own custom request handler to allow setting customer headers for\n// authentication. Also allow the response header which includes dynamic\n// data from the lambda at edge to be retrieved and held for later when\n// the upload has completed.\nexport class OneBlinkNodeJsHandler<T>\n  extends NodeHttpHandler\n  implements IOneBlinkRequestHandler<T>\n{\n  constructor({\n    getIdToken,\n    requestBodyHeader,\n  }: {\n    getIdToken: StorageConstructorOptions['getIdToken']\n    requestBodyHeader?: RequestBodyHeader\n  }) {\n    super()\n    this.getIdToken = getIdToken\n    this.requestBodyHeader = requestBodyHeader\n  }\n\n  getIdToken: StorageConstructorOptions['getIdToken']\n  requestBodyHeader?: RequestBodyHeader\n  oneblinkResponse?: OneBlinkResponse<T>\n  failResponse?: FailResponse\n\n  async handle(request: HttpRequest, options?: HttpHandlerOptions) {\n    await prepareRequest(this, request)\n\n    const result = await super.handle(request, options)\n\n    await handleResponse(this, request, result.response)\n\n    if (result.response.statusCode < 400) {\n      return result\n    }\n\n    switch (result.response.headers['content-type']) {\n      case 'application/json; charset=utf-8':\n      case 'application/json': {\n        const { Readable, consumers } = await import('stream')\n        if (result.response.body instanceof Readable) {\n          this.failResponse = {\n            statusCode: result.response.statusCode,\n            message: (\n              (await consumers.json(result.response.body)) as FailResponse\n            ).message,\n          }\n        }\n\n        if (typeof result.response.body === 'string') {\n          this.failResponse = {\n            statusCode: result.response.statusCode,\n            message: JSON.parse(result.response.body).message,\n          }\n        }\n        break\n      }\n      case 'text/html': {\n        const { Readable, consumers } = await import('stream')\n        if (result.response.body instanceof Readable) {\n          this.failResponse = {\n            statusCode: result.response.statusCode,\n            message: await consumers.text(result.response.body),\n          }\n        }\n\n        if (typeof result.response.body === 'string') {\n          console.log('response', result.response.body)\n        }\n        break\n      }\n    }\n\n    return result\n  }\n\n  determineQueueSize() {\n    return 10\n  }\n}\n"]}
+{"version":3,"file":"NodeJsHandler.js","sourceRoot":"","sources":["../../src/http-handlers/NodeJsHandler.ts"],"names":[],"mappings":";;;AAIA,MAAa,qBAAqB;IAChC,KAAK,CAAC,aAAa,CACjB,OAAoB,EACpB,OAAwC;QAExC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAA;QACrE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACnE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAsB;QAC7C,QAAQ,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,KAAK,iCAAiC,CAAC;YACvC,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBAC3C,IAAI,QAAQ,CAAC,IAAI,YAAY,QAAQ,EAAE,CAAC;oBACtC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAA;oBAClD,OAAO;wBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAkB;6BAC7D,OAAO;qBACX,CAAA;gBACH,CAAC;gBAED,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACtC,OAAO;wBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO;qBAC3C,CAAA;gBACH,CAAC;gBACD,MAAK;YACP,CAAC;YACD,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACtD,IAAI,QAAQ,CAAC,IAAI,YAAY,QAAQ,EAAE,CAAC;oBACtC,OAAO;wBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;qBAC7C,CAAA;gBACH,CAAC;gBAED,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACtC,OAAO;wBACL,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,QAAQ,CAAC,IAAI;qBACvB,CAAA;gBACH,CAAC;gBACD,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;IAED,kBAAkB;QAChB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAxDD,sDAwDC","sourcesContent":["import { HttpRequest, HttpResponse } from '@smithy/protocol-http'\nimport { HttpHandlerOptions } from '@smithy/types'\nimport { IOneBlinkHttpHandler, FailResponse } from './types'\n\nexport class OneBlinkNodeJsHandler implements IOneBlinkHttpHandler {\n  async handleRequest(\n    request: HttpRequest,\n    options?: HttpHandlerOptions | undefined,\n  ) {\n    const { NodeHttpHandler } = await import('@smithy/node-http-handler')\n    const nodeHttpHandler = new NodeHttpHandler()\n    const { response } = await nodeHttpHandler.handle(request, options)\n    return response\n  }\n\n  async handleFailResponse(response: HttpResponse) {\n    switch (response.headers['content-type']) {\n      case 'application/json; charset=utf-8':\n      case 'application/json': {\n        const { Readable } = await import('stream')\n        if (response.body instanceof Readable) {\n          const consumers = await import('stream/consumers')\n          return {\n            statusCode: response.statusCode,\n            message: ((await consumers.json(response.body)) as FailResponse)\n              .message,\n          }\n        }\n\n        if (typeof response.body === 'string') {\n          return {\n            statusCode: response.statusCode,\n            message: JSON.parse(response.body).message,\n          }\n        }\n        break\n      }\n      case 'text/html': {\n        const { Readable, consumers } = await import('stream')\n        if (response.body instanceof Readable) {\n          return {\n            statusCode: response.statusCode,\n            message: await consumers.text(response.body),\n          }\n        }\n\n        if (typeof response.body === 'string') {\n          return {\n            statusCode: response.statusCode,\n            message: response.body,\n          }\n        }\n        break\n      }\n    }\n  }\n\n  determineQueueSize() {\n    return 10\n  }\n}\n"]}

package/dist/http-handlers/index.d.ts

@@ -1,3 +1,3 @@
 import { OneBlinkNodeJsHandler } from './NodeJsHandler';
 import { OneBlinkFetchHandler } from './FetchHandler';
-export declare function getRequestHandler(): typeof OneBlinkNodeJsHandler | typeof OneBlinkFetchHandler;
+export declare function getOneBlinkHttpHandler(): OneBlinkNodeJsHandler | OneBlinkFetchHandler;

package/dist/http-handlers/index.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequestHandler = void 0;
+exports.getOneBlinkHttpHandler = void 0;
 const browser_or_node_1 = require("browser-or-node");
 const NodeJsHandler_1 = require("./NodeJsHandler");
 const FetchHandler_1 = require("./FetchHandler");
-function getRequestHandler() {
+function getOneBlinkHttpHandler() {
     if (browser_or_node_1.isBrowser) {
-        return FetchHandler_1.OneBlinkFetchHandler;
+        return new FetchHandler_1.OneBlinkFetchHandler();
     }
     if (browser_or_node_1.isNode) {
-        return NodeJsHandler_1.OneBlinkNodeJsHandler;
+        return new NodeJsHandler_1.OneBlinkNodeJsHandler();
     }
-    throw new Error('Could not find request handle matching current environment');
+    throw new Error('Could not find http handler matching current environment');
 }
-exports.getRequestHandler = getRequestHandler;
+exports.getOneBlinkHttpHandler = getOneBlinkHttpHandler;
 //# sourceMappingURL=index.js.map

package/dist/http-handlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http-handlers/index.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AACnD,mDAAuD;AACvD,iDAAqD;AAErD,SAAgB,iBAAiB;IAC/B,IAAI,2BAAS,EAAE,CAAC;QACd,OAAO,mCAAoB,CAAA;IAC7B,CAAC;IACD,IAAI,wBAAM,EAAE,CAAC;QACX,OAAO,qCAAqB,CAAA;IAC9B,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;AAC/E,CAAC;AATD,8CASC","sourcesContent":["import { isBrowser, isNode } from 'browser-or-node'\nimport { OneBlinkNodeJsHandler } from './NodeJsHandler'\nimport { OneBlinkFetchHandler } from './FetchHandler'\n\nexport function getRequestHandler() {\n  if (isBrowser) {\n    return OneBlinkFetchHandler\n  }\n  if (isNode) {\n    return OneBlinkNodeJsHandler\n  }\n\n  throw new Error('Could not find request handle matching current environment')\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http-handlers/index.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AACnD,mDAAuD;AACvD,iDAAqD;AAErD,SAAgB,sBAAsB;IACpC,IAAI,2BAAS,EAAE,CAAC;QACd,OAAO,IAAI,mCAAoB,EAAE,CAAA;IACnC,CAAC;IACD,IAAI,wBAAM,EAAE,CAAC;QACX,OAAO,IAAI,qCAAqB,EAAE,CAAA;IACpC,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;AAC7E,CAAC;AATD,wDASC","sourcesContent":["import { isBrowser, isNode } from 'browser-or-node'\nimport { OneBlinkNodeJsHandler } from './NodeJsHandler'\nimport { OneBlinkFetchHandler } from './FetchHandler'\n\nexport function getOneBlinkHttpHandler() {\n  if (isBrowser) {\n    return new OneBlinkFetchHandler()\n  }\n  if (isNode) {\n    return new OneBlinkNodeJsHandler()\n  }\n\n  throw new Error('Could not find http handler matching current environment')\n}\n"]}

package/dist/http-handlers/types.d.ts

@@ -1,5 +1,6 @@
-import { StorageConstructorOptions } from '../types';
 import { AWSTypes } from '@oneblink/types';
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
+import { HttpHandlerOptions } from '@smithy/types';
 export type RequestBodyHeader = Record<string, unknown>;
 export type OneBlinkResponse<T> = T & {
     s3: AWSTypes.S3Configuration;
@@ -8,13 +9,8 @@ export type FailResponse = {
     statusCode: number;
     message: string;
 };
-export interface IOneBlinkRequestHandler<T> {
-    getIdToken: StorageConstructorOptions['getIdToken'];
-    requestBodyHeader?: RequestBodyHeader;
-    oneblinkResponse?: OneBlinkResponse<T>;
-    failResponse?: {
-        statusCode: number;
-        message: string;
-    };
+export interface IOneBlinkHttpHandler {
+    handleRequest: (request: HttpRequest, options?: HttpHandlerOptions) => Promise<HttpResponse>;
+    handleFailResponse: (response: HttpResponse) => Promise<FailResponse | undefined>;
     determineQueueSize: () => number;
 }

package/dist/http-handlers/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/http-handlers/types.ts"],"names":[],"mappings":"","sourcesContent":["import { StorageConstructorOptions } from '../types'\nimport { AWSTypes } from '@oneblink/types'\n\nexport type RequestBodyHeader = Record<string, unknown>\n\nexport type OneBlinkResponse<T> = T & {\n  s3: AWSTypes.S3Configuration\n}\nexport type FailResponse = {\n  statusCode: number\n  message: string\n}\n\nexport interface IOneBlinkRequestHandler<T> {\n  getIdToken: StorageConstructorOptions['getIdToken']\n  requestBodyHeader?: RequestBodyHeader\n  oneblinkResponse?: OneBlinkResponse<T>\n  failResponse?: {\n    statusCode: number\n    message: string\n  }\n  determineQueueSize: () => number\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/http-handlers/types.ts"],"names":[],"mappings":"","sourcesContent":["import { AWSTypes } from '@oneblink/types'\nimport { HttpRequest, HttpResponse } from '@smithy/protocol-http'\nimport { HttpHandlerOptions } from '@smithy/types'\n\nexport type RequestBodyHeader = Record<string, unknown>\n\nexport type OneBlinkResponse<T> = T & {\n  s3: AWSTypes.S3Configuration\n}\nexport type FailResponse = {\n  statusCode: number\n  message: string\n}\n\nexport interface IOneBlinkHttpHandler {\n  handleRequest: (\n    request: HttpRequest,\n    options?: HttpHandlerOptions,\n  ) => Promise<HttpResponse>\n  handleFailResponse: (\n    response: HttpResponse,\n  ) => Promise<FailResponse | undefined>\n  determineQueueSize: () => number\n}\n"]}

package/dist/types.d.ts

@@ -12,11 +12,11 @@ export type StorageConstructorOptions = {
     /** The AWS region to upload the submission to */
     region: string;
     /**
-     * A function that returns a promise resolving to an access token. If the
-     * promise resolves to a truthy value, the `x-oneblink-authorization` header
-     * will be set with the value.
+     * A function that returns a promise resolving to a Bearer token. If the
+     * promise resolves to a truthy value, the `authorization` header will be set
+     * with the value.
      */
-    getIdToken: () => Promise<string | undefined>;
+    getBearerToken: () => Promise<string | undefined>;
 };
 export type UploadOptions = {
     /** An optional progress listener for tracking the progress of the upload */
@@ -34,7 +34,7 @@ export type UploadFormSubmissionOptions = UploadOptions & {
     device?: SubmissionTypes.NewS3SubmissionData['device'];
     /** The identifier for the forms app that is being submitted from */
     formsAppId: number;
-    /** An encrypted token that repraesents the user */
+    /** An encrypted token that represents the user */
     userToken?: string;
     /** The external identifier that represents the submission */
     externalId?: string;
@@ -45,6 +45,15 @@ export type UploadFormSubmissionOptions = UploadOptions & {
     previousFormSubmissionApprovalId?: string;
     /** The identifier of the job that will be marked as submitted */
     jobId?: string;
+    /** The identifier of the task that will be marked as completed */
+    taskId?: string;
+    /** The identifier of the task action that was used to complete the task */
+    taskActionId?: string;
+    /**
+     * The identifier of the task group instance that the completed task is
+     * associated with
+     */
+    taskGroupInstanceId?: string;
 };
 export type UploadAssetOptions = UploadOptions & {
     /** The file data to upload */

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import { PutObjectCommandInput } from '@aws-sdk/client-s3'\nimport { SubmissionTypes } from '@oneblink/types'\n\nexport type ProgressListenerEvent = { progress: number; total: number }\nexport type ProgressListener = (progress: ProgressListenerEvent) => void\n\n/** The properties to be passed to the Storage class constructors */\nexport type StorageConstructorOptions = {\n  /** The API origin URL used to communicate with the OneBlink API */\n  apiOrigin: string\n  /** The AWS region to upload the submission to */\n  region: string\n  /**\n   * A function that returns a promise resolving to an access token. If the\n   * promise resolves to a truthy value, the `x-oneblink-authorization` header\n   * will be set with the value.\n   */\n  getIdToken: () => Promise<string | undefined>\n}\n\nexport type UploadOptions = {\n  /** An optional progress listener for tracking the progress of the upload */\n  onProgress?: ProgressListener\n  /** An optional AbortSignal that can be used to abort the upload */\n  abortSignal?: AbortSignal\n}\n\nexport type AttachmentUploadData = NonNullable<PutObjectCommandInput['Body']>\n\nexport type UploadFormSubmissionOptions = UploadOptions & {\n  /** The submission data */\n  submission: SubmissionTypes.NewS3SubmissionData['submission']\n  /** The form that is being submitted */\n  definition: SubmissionTypes.NewS3SubmissionData['definition']\n  /** The device the form is being submitted */\n  device?: SubmissionTypes.NewS3SubmissionData['device']\n  /** The identifier for the forms app that is being submitted from */\n  formsAppId: number\n  /** An encrypted token that repraesents the user */\n  userToken?: string\n  /** The external identifier that represents the submission */\n  externalId?: string\n  /**\n   * The identifier for the previous FormSubmissionApproval that lead to a\n   * clarification request\n   */\n  previousFormSubmissionApprovalId?: string\n  /** The identifier of the job that will be marked as submitted */\n  jobId?: string\n}\n\nexport type UploadAssetOptions = UploadOptions & {\n  /** The file data to upload */\n  data: AttachmentUploadData\n  /** A standard MIME type describing the format of the contents */\n  contentType: string\n  /** The name of the file being uploaded */\n  fileName: string\n}\n\nexport type UploadPDFConversionOptions = UploadOptions & {\n  /** The PDF File to upload */\n  data: AttachmentUploadData\n  /** The id of the Form that the PDF Conversion is occurring on */\n  formId: number\n}\n\nexport type UploadEmailAttachmentOptions = UploadAssetOptions\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import { PutObjectCommandInput } from '@aws-sdk/client-s3'\nimport { SubmissionTypes } from '@oneblink/types'\n\nexport type ProgressListenerEvent = { progress: number; total: number }\nexport type ProgressListener = (progress: ProgressListenerEvent) => void\n\n/** The properties to be passed to the Storage class constructors */\nexport type StorageConstructorOptions = {\n  /** The API origin URL used to communicate with the OneBlink API */\n  apiOrigin: string\n  /** The AWS region to upload the submission to */\n  region: string\n  /**\n   * A function that returns a promise resolving to a Bearer token. If the\n   * promise resolves to a truthy value, the `authorization` header will be set\n   * with the value.\n   */\n  getBearerToken: () => Promise<string | undefined>\n}\n\nexport type UploadOptions = {\n  /** An optional progress listener for tracking the progress of the upload */\n  onProgress?: ProgressListener\n  /** An optional AbortSignal that can be used to abort the upload */\n  abortSignal?: AbortSignal\n}\n\nexport type AttachmentUploadData = NonNullable<PutObjectCommandInput['Body']>\n\nexport type UploadFormSubmissionOptions = UploadOptions & {\n  /** The submission data */\n  submission: SubmissionTypes.NewS3SubmissionData['submission']\n  /** The form that is being submitted */\n  definition: SubmissionTypes.NewS3SubmissionData['definition']\n  /** The device the form is being submitted */\n  device?: SubmissionTypes.NewS3SubmissionData['device']\n  /** The identifier for the forms app that is being submitted from */\n  formsAppId: number\n  /** An encrypted token that represents the user */\n  userToken?: string\n  /** The external identifier that represents the submission */\n  externalId?: string\n  /**\n   * The identifier for the previous FormSubmissionApproval that lead to a\n   * clarification request\n   */\n  previousFormSubmissionApprovalId?: string\n  /** The identifier of the job that will be marked as submitted */\n  jobId?: string\n  /** The identifier of the task that will be marked as completed */\n  taskId?: string\n  /** The identifier of the task action that was used to complete the task */\n  taskActionId?: string\n  /**\n   * The identifier of the task group instance that the completed task is\n   * associated with\n   */\n  taskGroupInstanceId?: string\n}\n\nexport type UploadAssetOptions = UploadOptions & {\n  /** The file data to upload */\n  data: AttachmentUploadData\n  /** A standard MIME type describing the format of the contents */\n  contentType: string\n  /** The name of the file being uploaded */\n  fileName: string\n}\n\nexport type UploadPDFConversionOptions = UploadOptions & {\n  /** The PDF File to upload */\n  data: AttachmentUploadData\n  /** The id of the Form that the PDF Conversion is occurring on */\n  formId: number\n}\n\nexport type UploadEmailAttachmentOptions = UploadAssetOptions\n"]}

package/dist/uploadToS3.d.ts

@@ -20,6 +20,6 @@ interface UploadToS3Props extends UploadOptions, StorageConstructorOptions {
     /** Set to `true` to make the upload available to download publicly */
     isPublic?: boolean;
 }
-declare function uploadToS3<T>({ region, apiOrigin, key, body, requestBodyHeader, tags, getIdToken, onProgress, abortSignal, contentType, isPublic, }: UploadToS3Props): Promise<import("./http-handlers/types").OneBlinkResponse<T>>;
+declare function uploadToS3<T>({ region, apiOrigin, key, body, requestBodyHeader, tags, getBearerToken, onProgress, abortSignal, contentType, isPublic, }: UploadToS3Props): Promise<import("./http-handlers/types").OneBlinkResponse<T>>;
 export default uploadToS3;
 export declare const determineUploadProgressAsPercentage: (progress: Required<Pick<Progress, 'total'>> & Omit<Progress, 'total'>) => number;

package/dist/uploadToS3.js

@@ -8,62 +8,60 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
 const OneBlinkStorageError_1 = __importDefault(require("./OneBlinkStorageError"));
 const http_handlers_1 = require("./http-handlers");
+const OneBlinkRequestHandler_1 = require("./OneBlinkRequestHandler");
 const RETRY_ATTEMPTS = 3;
 const endpointSuffix = '/storage';
-async function uploadToS3({ region, apiOrigin, key, body, requestBodyHeader, tags, getIdToken, onProgress, abortSignal, contentType, isPublic, }) {
-    const RequestHandler = (0, http_handlers_1.getRequestHandler)();
-    const requestHandler = new RequestHandler({
-        getIdToken,
-        requestBodyHeader,
-    });
+async function uploadToS3({ region, apiOrigin, key, body, requestBodyHeader, tags = new URLSearchParams(), getBearerToken, onProgress, abortSignal, contentType, isPublic, }) {
+    const oneBlinkHttpHandler = (0, http_handlers_1.getOneBlinkHttpHandler)();
+    const oneBlinkRequestHandler = new OneBlinkRequestHandler_1.OneBlinkRequestHandler(oneBlinkHttpHandler, requestBodyHeader);
+    // The endpoint we use instead of the the AWS S3 endpoint is
+    // formatted internally by the AWS S3 SDK. It will add the Bucket
+    // parameter below as the subdomain to the URL (as long as the
+    // bucket does not contain a `.`). The logic below allows the final
+    // URL used to upload the object to be the origin that is passed in.
+    // The suffix on the end is important as it will allow us to route
+    // traffic to S3 via lambda at edge instead of going to our API.
+    const url = new URL(endpointSuffix, apiOrigin);
+    const [bucket, ...domainParts] = url.hostname.split('.');
+    url.hostname = domainParts.join('.');
     const s3Client = new client_s3_1.S3Client({
-        // The suffix on the end is important as it will allow us to route
-        // traffic to S3 via lambda at edge instead of going to our API
-        endpoint: `${apiOrigin}${endpointSuffix}`,
+        endpoint: url.href,
         region: region,
-        requestHandler,
-        // Have to put something here otherwise the SDK throws errors.
-        // Might be able to remove the validation from the middleware somehow?
-        credentials: {
-            accessKeyId: 'AWS_ACCESS_KEY_ID',
-            secretAccessKey: 'AWS_SECRET_ACCESS_KEY',
-        },
         maxAttempts: RETRY_ATTEMPTS,
+        requestHandler: oneBlinkRequestHandler,
+        // Sign requests with our own Authorization header instead
+        // of letting AWS SDK attempt to generate credentials
+        signer: {
+            sign: async (request) => {
+                const token = await getBearerToken();
+                if (token) {
+                    request.headers['authorization'] = 'Bearer ' + token;
+                }
+                return request;
+            },
+        },
     });
     if (isPublic) {
-        if (!tags) {
-            tags = new URLSearchParams();
-        }
-        tags === null || tags === void 0 ? void 0 : tags.append('public-read', 'yes');
+        tags.append('public-read', 'yes');
     }
     const managedUpload = new lib_storage_1.Upload({
         client: s3Client,
         partSize: 5 * 1024 * 1024,
-        queueSize: requestHandler.determineQueueSize(),
-        //Related github issue: https://github.com/aws/aws-sdk-js-v3/issues/2311
-        //This is a variable that is set to false by default, setting it to true
-        //means that it will force the upload to fail when one part fails on
-        //an upload. The S3 client has built in retry logic to retry uploads by default
+        queueSize: oneBlinkHttpHandler.determineQueueSize(),
+        // Related github issue: https://github.com/aws/aws-sdk-js-v3/issues/2311
+        // This is a variable that is set to false by default, setting it to true
+        // means that it will force the upload to fail when one part fails on
+        // an upload. The S3 client has built in retry logic to retry uploads by default
         leavePartsOnError: true,
         params: {
-            // Bucket needs to have something to avoid client side errors
-            // Also needs to have a `.` in it to prevent SDK from using the
-            // new S3 bucket domain concept with includes the bucket in the
-            // domain instead of the path. We need it in the path to use the
-            // API as the domain.
-            Bucket: apiOrigin.split('.').slice(-2).join('.'),
+            Bucket: bucket,
             Key: key,
             Body: body,
             ContentType: contentType,
-            ServerSideEncryption: 'AES256',
-            Expires: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), // Max 1 year
-            CacheControl: 'max-age=31536000', // Max 1 year(365 days),
-            ACL: 'bucket-owner-full-control',
-            Tagging: tags === null || tags === void 0 ? void 0 : tags.toString(),
+            Tagging: tags.toString(),
         },
     });
     managedUpload.on('httpUploadProgress', (progress) => {
-        console.log('S3 upload progress for key', key, progress);
         if (onProgress && progress.total) {
             const percent = (0, exports.determineUploadProgressAsPercentage)({
                 ...progress,
@@ -79,18 +77,18 @@ async function uploadToS3({ region, apiOrigin, key, body, requestBodyHeader, tag
         await managedUpload.done();
     }
     catch (error) {
-        if (requestHandler.failResponse) {
-            throw new OneBlinkStorageError_1.default(requestHandler.failResponse.message, {
-                httpStatusCode: requestHandler.failResponse.statusCode,
+        if (oneBlinkRequestHandler.failResponse) {
+            throw new OneBlinkStorageError_1.default(oneBlinkRequestHandler.failResponse.message, {
+                httpStatusCode: oneBlinkRequestHandler.failResponse.statusCode,
                 originalError: error instanceof Error ? error : undefined,
             });
         }
         throw error;
     }
-    if (!requestHandler.oneblinkResponse) {
+    if (!oneBlinkRequestHandler.oneblinkResponse) {
         throw new Error('No response from server. Something went wrong in "@oneblink/uploads".');
     }
-    return requestHandler.oneblinkResponse;
+    return oneBlinkRequestHandler.oneblinkResponse;
 }
 exports.default = uploadToS3;
 const determineUploadProgressAsPercentage = (progress) => {

package/dist/uploadToS3.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadToS3.js","sourceRoot":"","sources":["../src/uploadToS3.ts"],"names":[],"mappings":"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","sourcesContent":["import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3'\nimport { Upload, Progress } from '@aws-sdk/lib-storage'\nimport { StorageConstructorOptions, UploadOptions } from './types'\nimport OneBlinkStorageError from './OneBlinkStorageError'\nimport { getRequestHandler } from './http-handlers'\nimport { RequestBodyHeader } from './http-handlers/types'\n\nconst RETRY_ATTEMPTS = 3\n\nconst endpointSuffix = '/storage'\n\n/** The properties to be passed to the uploadToS3 function */\ninterface UploadToS3Props extends UploadOptions, StorageConstructorOptions {\n  /** The key of the file that is being uploaded. */\n  key: string\n  /**\n   * The body of the request. This can be a string, a Buffer, a Blob, a\n   * ReadableStream, or a Readable.\n   */\n  body: PutObjectCommandInput['Body']\n  /** Optional header to be included in the request to the OneBlink API */\n  requestBodyHeader?: RequestBodyHeader\n  /** An optional set of tags that will be applied to the uploaded file */\n  tags?: URLSearchParams\n  /** A standard MIME type describing the format of the contents */\n  contentType: PutObjectCommandInput['ContentType']\n  /** Set to `true` to make the upload available to download publicly */\n  isPublic?: boolean\n}\n\nasync function uploadToS3<T>({\n  region,\n  apiOrigin,\n  key,\n  body,\n  requestBodyHeader,\n  tags,\n  getIdToken,\n  onProgress,\n  abortSignal,\n  contentType,\n  isPublic,\n}: UploadToS3Props) {\n  const RequestHandler = getRequestHandler()\n  const requestHandler = new RequestHandler<T>({\n    getIdToken,\n    requestBodyHeader,\n  })\n\n  const s3Client = new S3Client({\n    // The suffix on the end is important as it will allow us to route\n    // traffic to S3 via lambda at edge instead of going to our API\n    endpoint: `${apiOrigin}${endpointSuffix}`,\n    region: region,\n    requestHandler,\n    // Have to put something here otherwise the SDK throws errors.\n    // Might be able to remove the validation from the middleware somehow?\n    credentials: {\n      accessKeyId: 'AWS_ACCESS_KEY_ID',\n      secretAccessKey: 'AWS_SECRET_ACCESS_KEY',\n    },\n    maxAttempts: RETRY_ATTEMPTS,\n  })\n\n  if (isPublic) {\n    if (!tags) {\n      tags = new URLSearchParams()\n    }\n    tags?.append('public-read', 'yes')\n  }\n\n  const managedUpload = new Upload({\n    client: s3Client,\n    partSize: 5 * 1024 * 1024,\n    queueSize: requestHandler.determineQueueSize(),\n    //Related github issue: https://github.com/aws/aws-sdk-js-v3/issues/2311\n    //This is a variable that is set to false by default, setting it to true\n    //means that it will force the upload to fail when one part fails on\n    //an upload. The S3 client has built in retry logic to retry uploads by default\n    leavePartsOnError: true,\n    params: {\n      // Bucket needs to have something to avoid client side errors\n      // Also needs to have a `.` in it to prevent SDK from using the\n      // new S3 bucket domain concept with includes the bucket in the\n      // domain instead of the path. We need it in the path to use the\n      // API as the domain.\n      Bucket: apiOrigin.split('.').slice(-2).join('.'),\n      Key: key,\n      Body: body,\n      ContentType: contentType,\n      ServerSideEncryption: 'AES256',\n      Expires: new Date(new Date().setFullYear(new Date().getFullYear() + 1)), // Max 1 year\n      CacheControl: 'max-age=31536000', // Max 1 year(365 days),\n      ACL: 'bucket-owner-full-control',\n      Tagging: tags?.toString(),\n    },\n  })\n\n  managedUpload.on('httpUploadProgress', (progress) => {\n    console.log('S3 upload progress for key', key, progress)\n    if (onProgress && progress.total) {\n      const percent = determineUploadProgressAsPercentage({\n        ...progress,\n        total: progress.total,\n      })\n      onProgress({ progress: percent, total: 100 })\n    }\n  })\n\n  abortSignal?.addEventListener('abort', () => {\n    managedUpload.abort()\n  })\n\n  try {\n    await managedUpload.done()\n  } catch (error) {\n    if (requestHandler.failResponse) {\n      throw new OneBlinkStorageError(requestHandler.failResponse.message, {\n        httpStatusCode: requestHandler.failResponse.statusCode,\n        originalError: error instanceof Error ? error : undefined,\n      })\n    }\n    throw error\n  }\n\n  if (!requestHandler.oneblinkResponse) {\n    throw new Error(\n      'No response from server. Something went wrong in \"@oneblink/uploads\".',\n    )\n  }\n  return requestHandler.oneblinkResponse\n}\n\nexport default uploadToS3\n\nexport const determineUploadProgressAsPercentage = (\n  progress: Required<Pick<Progress, 'total'>> & Omit<Progress, 'total'>,\n) => {\n  const percent = ((progress.loaded || 0) / progress.total) * 100\n  return Math.floor(percent)\n}\n"]}
+{"version":3,"file":"uploadToS3.js","sourceRoot":"","sources":["../src/uploadToS3.ts"],"names":[],"mappings":"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","sourcesContent":["import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3'\nimport { Upload, Progress } from '@aws-sdk/lib-storage'\nimport { StorageConstructorOptions, UploadOptions } from './types'\nimport OneBlinkStorageError from './OneBlinkStorageError'\nimport { RequestBodyHeader } from './http-handlers/types'\nimport { getOneBlinkHttpHandler } from './http-handlers'\nimport { OneBlinkRequestHandler } from './OneBlinkRequestHandler'\n\nconst RETRY_ATTEMPTS = 3\n\nconst endpointSuffix = '/storage'\n\n/** The properties to be passed to the uploadToS3 function */\ninterface UploadToS3Props extends UploadOptions, StorageConstructorOptions {\n  /** The key of the file that is being uploaded. */\n  key: string\n  /**\n   * The body of the request. This can be a string, a Buffer, a Blob, a\n   * ReadableStream, or a Readable.\n   */\n  body: PutObjectCommandInput['Body']\n  /** Optional header to be included in the request to the OneBlink API */\n  requestBodyHeader?: RequestBodyHeader\n  /** An optional set of tags that will be applied to the uploaded file */\n  tags?: URLSearchParams\n  /** A standard MIME type describing the format of the contents */\n  contentType: PutObjectCommandInput['ContentType']\n  /** Set to `true` to make the upload available to download publicly */\n  isPublic?: boolean\n}\n\nasync function uploadToS3<T>({\n  region,\n  apiOrigin,\n  key,\n  body,\n  requestBodyHeader,\n  tags = new URLSearchParams(),\n  getBearerToken,\n  onProgress,\n  abortSignal,\n  contentType,\n  isPublic,\n}: UploadToS3Props) {\n  const oneBlinkHttpHandler = getOneBlinkHttpHandler()\n  const oneBlinkRequestHandler = new OneBlinkRequestHandler<T>(\n    oneBlinkHttpHandler,\n    requestBodyHeader,\n  )\n\n  // The endpoint we use instead of the the AWS S3 endpoint is\n  // formatted internally by the AWS S3 SDK. It will add the Bucket\n  // parameter below as the subdomain to the URL (as long as the\n  // bucket does not contain a `.`). The logic below allows the final\n  // URL used to upload the object to be the origin that is passed in.\n  // The suffix on the end is important as it will allow us to route\n  // traffic to S3 via lambda at edge instead of going to our API.\n  const url = new URL(endpointSuffix, apiOrigin)\n  const [bucket, ...domainParts] = url.hostname.split('.')\n  url.hostname = domainParts.join('.')\n\n  const s3Client = new S3Client({\n    endpoint: url.href,\n    region: region,\n    maxAttempts: RETRY_ATTEMPTS,\n    requestHandler: oneBlinkRequestHandler,\n    // Sign requests with our own Authorization header instead\n    // of letting AWS SDK attempt to generate credentials\n    signer: {\n      sign: async (request) => {\n        const token = await getBearerToken()\n        if (token) {\n          request.headers['authorization'] = 'Bearer ' + token\n        }\n\n        return request\n      },\n    },\n  })\n\n  if (isPublic) {\n    tags.append('public-read', 'yes')\n  }\n\n  const managedUpload = new Upload({\n    client: s3Client,\n    partSize: 5 * 1024 * 1024,\n    queueSize: oneBlinkHttpHandler.determineQueueSize(),\n    // Related github issue: https://github.com/aws/aws-sdk-js-v3/issues/2311\n    // This is a variable that is set to false by default, setting it to true\n    // means that it will force the upload to fail when one part fails on\n    // an upload. The S3 client has built in retry logic to retry uploads by default\n    leavePartsOnError: true,\n    params: {\n      Bucket: bucket,\n      Key: key,\n      Body: body,\n      ContentType: contentType,\n      Tagging: tags.toString(),\n    },\n  })\n\n  managedUpload.on('httpUploadProgress', (progress) => {\n    if (onProgress && progress.total) {\n      const percent = determineUploadProgressAsPercentage({\n        ...progress,\n        total: progress.total,\n      })\n      onProgress({ progress: percent, total: 100 })\n    }\n  })\n\n  abortSignal?.addEventListener('abort', () => {\n    managedUpload.abort()\n  })\n\n  try {\n    await managedUpload.done()\n  } catch (error) {\n    if (oneBlinkRequestHandler.failResponse) {\n      throw new OneBlinkStorageError(\n        oneBlinkRequestHandler.failResponse.message,\n        {\n          httpStatusCode: oneBlinkRequestHandler.failResponse.statusCode,\n          originalError: error instanceof Error ? error : undefined,\n        },\n      )\n    }\n    throw error\n  }\n\n  if (!oneBlinkRequestHandler.oneblinkResponse) {\n    throw new Error(\n      'No response from server. Something went wrong in \"@oneblink/uploads\".',\n    )\n  }\n  return oneBlinkRequestHandler.oneblinkResponse\n}\n\nexport default uploadToS3\n\nexport const determineUploadProgressAsPercentage = (\n  progress: Required<Pick<Progress, 'total'>> & Omit<Progress, 'total'>,\n) => {\n  const percent = ((progress.loaded || 0) / progress.total) * 100\n  return Math.floor(percent)\n}\n"]}

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@oneblink/storage",
   "description": "SDK for managing storage files in the OneBlink ecosystem",
-  "version": "1.0.0-beta.9",
+  "version": "2.0.0-beta.1",
   "author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
   "bugs": {
     "url": "https://github.com/oneblink/storage/issues"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.554.0",
-    "@aws-sdk/lib-storage": "^3.554.0",
+    "@aws-sdk/client-s3": "^3.569.0",
+    "@aws-sdk/lib-storage": "^3.569.0",
     "browser-or-node": "^3.0.0"
   },
   "devDependencies": {
     "@microsoft/eslint-plugin-sdl": "^0.2.2",
     "@oneblink/types": "github:oneblink/types",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.6.0",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
@@ -28,7 +28,7 @@
     "ts-jest": "^29.1.2",
     "tsc-watch": "^6.2.0",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "directories": {
     "doc": "docs"

package/dist/http-handlers/handleRequest.d.ts

@@ -1,4 +0,0 @@
-import { IOneBlinkRequestHandler } from './types';
-import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
-export declare function prepareRequest<T>(oneBlinkRequestHandler: IOneBlinkRequestHandler<T>, request: HttpRequest): Promise<void>;
-export declare function handleResponse<T>(oneBlinkRequestHandler: IOneBlinkRequestHandler<T>, request: HttpRequest, response: HttpResponse): Promise<void>;

package/dist/http-handlers/handleRequest.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleResponse = exports.prepareRequest = void 0;
-async function prepareRequest(oneBlinkRequestHandler, request) {
-    delete request.headers['authorization'];
-    const token = await oneBlinkRequestHandler.getIdToken();
-    if (token) {
-        request.headers['authorization'] = 'Bearer ' + token;
-    }
-    if (oneBlinkRequestHandler.requestBodyHeader) {
-        request.headers['x-oneblink-request-body'] = JSON.stringify(oneBlinkRequestHandler.requestBodyHeader);
-    }
-    if (oneBlinkRequestHandler.oneblinkResponse) {
-        request.query['key'] = oneBlinkRequestHandler.oneblinkResponse.s3.key;
-    }
-    console.log('S3 upload request path', request.path);
-}
-exports.prepareRequest = prepareRequest;
-async function handleResponse(oneBlinkRequestHandler, request, response) {
-    console.log('S3 upload result for request path', request.path);
-    const oneblinkResponse = response.headers['x-oneblink-response'];
-    if (typeof oneblinkResponse === 'string') {
-        oneBlinkRequestHandler.oneblinkResponse = JSON.parse(oneblinkResponse);
-    }
-}
-exports.handleResponse = handleResponse;
-//# sourceMappingURL=handleRequest.js.map

package/dist/http-handlers/handleRequest.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"handleRequest.js","sourceRoot":"","sources":["../../src/http-handlers/handleRequest.ts"],"names":[],"mappings":";;;AAGO,KAAK,UAAU,cAAc,CAClC,sBAAkD,EAClD,OAAoB;IAEpB,OAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IAEvC,MAAM,KAAK,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,CAAA;IACvD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,SAAS,GAAG,KAAK,CAAA;IACtD,CAAC;IAED,IAAI,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;QAC7C,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,GAAG,IAAI,CAAC,SAAS,CACzD,sBAAsB,CAAC,iBAAiB,CACzC,CAAA;IACH,CAAC;IAED,IAAI,sBAAsB,CAAC,gBAAgB,EAAE,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,CAAA;IACvE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;AACrD,CAAC;AAtBD,wCAsBC;AAEM,KAAK,UAAU,cAAc,CAClC,sBAAkD,EAClD,OAAoB,EACpB,QAAsB;IAEtB,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IAE9D,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAChE,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QACzC,sBAAsB,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACxE,CAAC;AACH,CAAC;AAXD,wCAWC","sourcesContent":["import { IOneBlinkRequestHandler } from './types'\nimport { HttpRequest, HttpResponse } from '@smithy/protocol-http'\n\nexport async function prepareRequest<T>(\n  oneBlinkRequestHandler: IOneBlinkRequestHandler<T>,\n  request: HttpRequest,\n) {\n  delete request.headers['authorization']\n\n  const token = await oneBlinkRequestHandler.getIdToken()\n  if (token) {\n    request.headers['authorization'] = 'Bearer ' + token\n  }\n\n  if (oneBlinkRequestHandler.requestBodyHeader) {\n    request.headers['x-oneblink-request-body'] = JSON.stringify(\n      oneBlinkRequestHandler.requestBodyHeader,\n    )\n  }\n\n  if (oneBlinkRequestHandler.oneblinkResponse) {\n    request.query['key'] = oneBlinkRequestHandler.oneblinkResponse.s3.key\n  }\n\n  console.log('S3 upload request path', request.path)\n}\n\nexport async function handleResponse<T>(\n  oneBlinkRequestHandler: IOneBlinkRequestHandler<T>,\n  request: HttpRequest,\n  response: HttpResponse,\n) {\n  console.log('S3 upload result for request path', request.path)\n\n  const oneblinkResponse = response.headers['x-oneblink-response']\n  if (typeof oneblinkResponse === 'string') {\n    oneBlinkRequestHandler.oneblinkResponse = JSON.parse(oneblinkResponse)\n  }\n}\n"]}