add S3 related events for monitoring purposes #38

PruvoNet · May 25, 2019 · 1daac30 · 1daac30
1 parent ae8b37e
commit 1daac30
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ build/Release
 node_modules/
 .idea/
 dist/
+build/
 jspm_packages/
 
 # Typescript v1 declaration files

diff --git a/src/Message.ts b/src/Message.ts
@@ -38,6 +38,8 @@ interface IMessageEvents {
     deleted: string;
     autoExtendFail: AWSError;
     autoExtendError: AWSError;
+    s3Download: IS3Upload;
+    s3Delete: IS3Upload;
 }
 
 type MessageEmitter = StrictEventEmitter<EventEmitter, IMessageEvents>;
@@ -99,9 +101,15 @@ export class Message extends (EventEmitter as new() => MessageEmitter) {
             const s3 = this._s3Retriever();
             promise = getBlob(s3, uploadData)
                 .then((resolvedBody) => {
+                    this.emit('s3Download', uploadData);
+                    this._squiss.emit('s3Download', {data: uploadData, message: this});
                     if (!this._s3Retain) {
                         this._deleteCallback = () => {
-                            return deleteBlob(s3, uploadData);
+                            return deleteBlob(s3, uploadData)
+                                .then(() => {
+                                    this.emit('s3Delete', uploadData);
+                                    this._squiss.emit('s3Delete', {data: uploadData, message: this});
+                                });
                         };
                     }
                     return Promise.resolve(resolvedBody);

diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,7 @@ import {createMessageAttributes, IMessageAttributes} from './attributeUtils';
 import {isString} from 'ts-type-guards';
 import {SQS, S3} from 'aws-sdk';
 import {GZIP_MARKER, compressMessage} from './gzipUtils';
-import {S3_MARKER, uploadBlob} from './s3Utils';
+import {IS3Upload, S3_MARKER, uploadBlob} from './s3Utils';
 import {getMessageSize} from './messageSizeUtils';
 import {BatchResultErrorEntry} from 'aws-sdk/clients/sqs';
 import {AWSError} from 'aws-sdk';
@@ -129,6 +129,11 @@ export interface IMessageDeleteErrorEventPayload {
     error: BatchResultErrorEntry;
 }
 
+export interface IMessageS3EventPayload {
+    message: Message;
+    data: IS3Upload;
+}
+
 interface ISquissEvents {
     delQueued: Message;
     handled: Message;
@@ -148,6 +153,9 @@ interface ISquissEvents {
     delError: IMessageDeleteErrorEventPayload;
     autoExtendFail: IMessageErrorEventPayload;
     autoExtendError: IMessageErrorEventPayload;
+    s3Download: IMessageS3EventPayload;
+    s3Delete: IMessageS3EventPayload;
+    s3Upload: IS3Upload;
 }
 
 type SquissEmitter = StrictEventEmitter<EventEmitter, ISquissEvents>;
@@ -755,6 +763,7 @@ export class Squiss extends (EventEmitter as new() => SquissEmitter) {
                         }
                         return uploadBlob(this.getS3(), this._opts.s3Bucket!, finalMessage, this._opts.s3Prefix || '')
                             .then((uploadData) => {
+                                this.emit('s3Upload', uploadData);
                                 params.MessageBody = JSON.stringify(uploadData);
                                 params.MessageAttributes = params.MessageAttributes || {};
                                 params.MessageAttributes[S3_MARKER] = {

diff --git a/test/src/Message.spec.ts b/test/src/Message.spec.ts
@@ -262,6 +262,9 @@ describe('Message', () => {
           toDel.should.equal(msg);
           done();
         },
+        emit: (event: string, data: any) => {
+
+        },
       } as any as Squiss,
       msg: rawMsg,
       bodyFormat: 'json',
@@ -294,6 +297,9 @@ describe('Message', () => {
           toDel.should.equal(msg);
           done();
         },
+        emit: (event: string, data: any) => {
+
+        },
       } as any as Squiss,
       msg: rawMsg,
       bodyFormat: 'json',