fix(dynamodb-streams|kinesis|s3): fix unresolved promise blocking further serverless processes

Author: godu

packages/serverless-offline-dynamodb-streams/src/index.js

@@ -29,7 +29,7 @@ class ServerlessOfflineDynamodbStreams {
     this.hooks = {
       'offline:start:init': this.start.bind(this),
       'offline:start:ready': this.ready.bind(this),
-      'offline:start': this._startWithExplicitEnd.bind(this),
+      'offline:start': this._startWithReady.bind(this),
       'offline:start:end': this.end.bind(this)
     };
   }
@@ -56,24 +56,27 @@ class ServerlessOfflineDynamodbStreams {
     );
   }
 
-  async ready() {
+  ready() {
     if (process.env.NODE_ENV !== 'test') {
-      await this._listenForTermination();
+      this._listenForTermination();
     }
   }
 
-  async _listenForTermination() {
-    const command = await new Promise(resolve => {
-      process.on('SIGINT', () => resolve('SIGINT')).on('SIGTERM', () => resolve('SIGTERM'));
-    });
+  _listenForTermination() {
+    const signals = ['SIGINT', 'SIGTERM'];
+
+    signals.map(signal =>
+      process.on(signal, async () => {
+        this.serverless.cli.log(`Got ${signal} signal. Offline Halting...`);
 
-    this.serverless.cli.log(`Got ${command} signal. Offline Halting...`);
+        await this.end();
+      })
+    );
   }
 
   async _startWithExplicitEnd() {
     await this.start();
-    await this.ready();
-    this.end();
+    this.ready();
   }
 
   async end(skipExit) {

packages/serverless-offline-kinesis/src/index.js

@@ -29,7 +29,7 @@ class ServerlessOfflineKinesis {
     this.hooks = {
       'offline:start:init': this.start.bind(this),
       'offline:start:ready': this.ready.bind(this),
-      'offline:start': this._startWithExplicitEnd.bind(this),
+      'offline:start': this._startWithReady.bind(this),
       'offline:start:end': this.end.bind(this)
     };
   }
@@ -56,24 +56,27 @@ class ServerlessOfflineKinesis {
     );
   }
 
-  async ready() {
+  ready() {
     if (process.env.NODE_ENV !== 'test') {
-      await this._listenForTermination();
+      this._listenForTermination();
     }
   }
 
-  async _listenForTermination() {
-    const command = await new Promise(resolve => {
-      process.on('SIGINT', () => resolve('SIGINT')).on('SIGTERM', () => resolve('SIGTERM'));
-    });
+  _listenForTermination() {
+    const signals = ['SIGINT', 'SIGTERM'];
+
+    signals.map(signal =>
+      process.on(signal, async () => {
+        this.serverless.cli.log(`Got ${signal} signal. Offline Halting...`);
 
-    this.serverless.cli.log(`Got ${command} signal. Offline Halting...`);
+        await this.end();
+      })
+    );
   }
 
-  async _startWithExplicitEnd() {
+  async _startWithReady() {
     await this.start();
-    await this.ready();
-    this.end();
+    this.ready();
   }
 
   async end(skipExit) {

packages/serverless-offline-s3/src/index.js

@@ -30,7 +30,7 @@ class ServerlessOfflineS3 {
     this.hooks = {
       'offline:start:init': this.start.bind(this),
       'offline:start:ready': this.ready.bind(this),
-      'offline:start': this._startWithExplicitEnd.bind(this),
+      'offline:start': this._startWithReady.bind(this),
       'offline:start:end': this.end.bind(this)
     };
   }
@@ -57,24 +57,27 @@ class ServerlessOfflineS3 {
     );
   }
 
-  async ready() {
+  ready() {
     if (process.env.NODE_ENV !== 'test') {
-      await this._listenForTermination();
+      this._listenForTermination();
     }
   }
 
-  async _listenForTermination() {
-    const command = await new Promise(resolve => {
-      process.on('SIGINT', () => resolve('SIGINT')).on('SIGTERM', () => resolve('SIGTERM'));
-    });
+  _listenForTermination() {
+    const signals = ['SIGINT', 'SIGTERM'];
+
+    signals.map(signal =>
+      process.on(signal, async () => {
+        this.serverless.cli.log(`Got ${signal} signal. Offline Halting...`);
 
-    this.serverless.cli.log(`Got ${command} signal. Offline Halting...`);
+        await this.end();
+      })
+    );
   }
 
-  async _startWithExplicitEnd() {
+  async _startWithReady() {
     await this.start();
-    await this.ready();
-    this.end();
+    this.ready();
   }
 
   async end(skipExit) {