netlify-cli 8.15.2 → 8.15.3

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "8.15.2",
+  "version": "8.15.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.15.2",
+      "version": "8.15.3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.15.2",
+  "version": "8.15.3",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",

package/src/commands/functions/functions-invoke.js

@@ -3,7 +3,6 @@ const fs = require('fs')
 const path = require('path')
 const process = require('process')
 
-const CronParser = require('cron-parser')
 const inquirer = require('inquirer')
 const fetch = require('node-fetch')
 
@@ -131,13 +130,6 @@ const getFunctionToTrigger = function (options, argumentName) {
   return argumentName
 }
 
-const getNextRun = function (schedule) {
-  const cron = CronParser.parseExpression(schedule, {
-    tz: 'Etc/UTC',
-  })
-  return cron.next().toDate()
-}
-
 /**
  * The functions:invoke command
  * @param {string} nameArgument
@@ -164,10 +156,8 @@ const functionsInvoke = async (nameArgument, options, command) => {
   let body = {}
 
   if (functionObj.schedule) {
-    body.next_run = getNextRun(functionObj.schedule)
     headers = {
       'user-agent': CLOCKWORK_USERAGENT,
-      'X-NF-Event': 'schedule',
     }
   } else if (eventTriggeredFunctions.has(functionToTrigger)) {
     /** handle event triggered fns  */

package/src/lib/functions/netlify-function.js

@@ -1,4 +1,6 @@
 // @ts-check
+const CronParser = require('cron-parser')
+
 const { error: errorExit } = require('../../utils/command-helpers')
 
 const BACKGROUND_SUFFIX = '-background'
@@ -6,6 +8,13 @@ const BACKGROUND_SUFFIX = '-background'
 // Returns a new set with all elements of `setA` that don't exist in `setB`.
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
 
+const getNextRun = function (schedule) {
+  const cron = CronParser.parseExpression(schedule, {
+    tz: 'Etc/UTC',
+  })
+  return cron.next().toDate()
+}
+
 class NetlifyFunction {
   constructor({
     config,
@@ -51,6 +60,14 @@ class NetlifyFunction {
     return Boolean(this.schedule)
   }
 
+  async getNextRun() {
+    if (!(await this.isScheduled())) {
+      return null
+    }
+
+    return getNextRun(this.schedule)
+  }
+
   // The `build` method transforms source files into invocable functions. Its
   // return value is an object with:
   //

package/src/lib/functions/server.js

@@ -1,7 +1,14 @@
 // @ts-check
 const jwtDecode = require('jwt-decode')
 
-const { NETLIFYDEVERR, NETLIFYDEVLOG, error: errorExit, getInternalFunctionsDir, log } = require('../../utils')
+const {
+  CLOCKWORK_USERAGENT,
+  NETLIFYDEVERR,
+  NETLIFYDEVLOG,
+  error: errorExit,
+  getInternalFunctionsDir,
+  log,
+} = require('../../utils')
 
 const { handleBackgroundFunction, handleBackgroundFunctionResult } = require('./background')
 const { createFormSubmissionHandler } = require('./form-submissions-handler')
@@ -107,7 +114,21 @@ const createHandler = function ({ functionsRegistry }) {
 
       handleBackgroundFunctionResult(functionName, error)
     } else if (await func.isScheduled()) {
-      const { error, result } = await func.invoke(event, clientContext)
+      const { error, result } = await func.invoke(
+        {
+          ...event,
+          body: JSON.stringify({
+            next_run: await func.getNextRun(),
+          }),
+          isBase64Encoded: false,
+          headers: {
+            ...event.headers,
+            'user-agent': CLOCKWORK_USERAGENT,
+            'X-NF-Event': 'schedule',
+          },
+        },
+        clientContext,
+      )
 
       handleScheduledFunction({
         error,