serverless-plugin-warmup 7.0.0 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-warmup",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Keep your lambdas warm during winter.",
   "main": "src/index.js",
   "scripts": {
@@ -35,6 +35,6 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.24.2",
     "husky": "^7.0.2",
-    "jest": "^27.2.0"
+    "jest": "^27.5.0"
   }
 }

package/src/index.js

@@ -71,8 +71,8 @@ class WarmUp {
       'warmup:cleanupTempDir:cleanup': this.cleanUp.bind(this),
       'before:warmup:prewarm:start': this.configPlugin.bind(this),
       'warmup:prewarm:start': this.prewarmFunctions.bind(this),
-      // Workaround webpack/bundle plugins, reset the plugin and ignore changes
-      'before:package:createDeploymentArtifacts': this.initializeWarmers.bind(this),
+      // Workaround webpack/bundle plugins and serverless_sdk
+      'before:package:createDeploymentArtifacts': this.resetWarmerConfigs.bind(this),
     };
 
     // Fixed for issues in Serverles
@@ -102,6 +102,23 @@ class WarmUp {
       .map(([warmerName, warmerConfig]) => this.configureWarmer(warmerName, warmerConfig)));
   }
 
+  /**
+   * @description Workaround webpack/bundle plugins and serverless_sdk.
+   * Reset the plugin and ignore changes
+   *
+   * @fulfil {} — Warm up set
+   * @reject {Error} Warm up error
+   *
+   * @return {Promise}
+   * */
+  async resetWarmerConfigs() {
+    await Promise.all(Object.entries(this.configsByWarmer)
+      .map(([
+        warmerName,
+        warmerConfig,
+      ]) => addWarmUpFunctionToService(this.serverless.service, warmerName, warmerConfig)));
+  }
+
   /**
    * @description Warmup cleanup hook.
    *
@@ -178,12 +195,6 @@ class WarmUp {
       return;
     }
 
-    // Avoid double processing due to the workaround for webpack/bundle plugins
-    // resetting the plugin and ignoring changes
-    if (this.serverless.service.functions[`warmUpPlugin${capitalize(warmerName)}`]) {
-      return;
-    }
-
     this.log.notice(`WarmUp: Creating warmer "${warmerName}" to warm up ${warmerConfig.functions.length} function${warmerConfig.functions.length === 1 ? '' : 's'}`);
     this.log.info(':');
     warmerConfig.functions.forEach((func) => this.log.info(`          * ${func.name}`));