node-red-contrib-power-saver 4.1.5 → 4.2.1

package/docs/.vuepress/components/BestSaveVerificator.vue

@@ -86,7 +86,7 @@
       <tr v-for="(hour, i) in payload.hours" :key="hour.start">
         <td>{{ DateTime.fromISO(hour.start).day }}</td>
         <td>
-          {{ DateTime.fromISO(hour.start).toLocaleString(DateTime.TIME_SIMPLE) }}
+          {{ DateTime.fromISO(hour.start).toFormat("HH:mm") }}
         </td>
         <td :class="priceClasses(i)">{{ hour.price }}</td>
         <td>{{ hour.onOff ? "On" : "Off" }}</td>

package/docs/.vuepress/components/DonateButtons.vue

@@ -16,15 +16,6 @@
         />
       </form>
     </div>
-    <div v-if="patreon" class="center">
-      <a
-        class="patreonButton"
-        href="https://www.patreon.com/bePatron?u=65948417"
-        data-patreon-widget-type="become-patron-button"
-        target="_blank"
-        >Become a Patron!
-      </a>
-    </div>
     <div v-if="vipps" class="right vipps-box">
       <span>
         <img src="../../images/vipps-smiling-rgb-orange-pos.png" height="30" />

package/docs/.vuepress/config.js

@@ -30,7 +30,7 @@ export default defineUserConfig({
   ],
   theme: defaultTheme({
     contributors: false,
-    logo: "/Ukraine-heart-shape-flag.png",
+    logo: "/ps-logo.png",
     navbar,
     sidebar: {
       "/guide/": [{ text: "Guide", children: ["/guide/README.md"] }],
@@ -70,6 +70,7 @@ export default defineUserConfig({
             "/examples/example-cascade-temperature-control.md",
             "/examples/example-visualize-on-off/example-visualize-on-off.md",
             "/examples/example-grid-tariff-capacity-part.md",
+            "/examples/example-stromstotte.md",
           ],
         },
       ],

package/docs/changelog/README.md

@@ -7,6 +7,15 @@ sidebarDepth: 1
 
 List the most significant changes.
 
+## 4.2.1
+
+ - Bugfix version 4.2.0. Change was not effective.
+
+## 4.2.0
+
+ - Format time on node status with HH:MM format. No AM/PM any more.
+ - Remove warning for `No schedule` in debug output.
+
 ## 4.1.5
 
  - Fixed bug based on [this issue](https://github.com/ottopaulsen/node-red-contrib-power-saver/issues/184). Now correctly uses the value for `outputOutsidePeriod` when the planning period spans midnight, and there is no data available before midnight. In this case, the period from midnight to end time cannot be planned, so `outputIfNoSchedule` will be used until end time, and `outputOutsidePeriod` will be used from then. See the issue for more details.

package/docs/contribute/README.md

@@ -6,11 +6,9 @@ sidebar: "auto"
 
 ## Donate
 
-Developing software is time consuming. This solution has taken the better part of all my free time for a couple of years now. Getting something back would make it easier to also spend future time on this.
+Developing software is time consuming. This solution took the better part of my free time for a couple of years, and still takes a lot of time. Getting something back would make it easier to also spend future time on this.
 
-<VippsPlakat/>
-
-The software is open source, and you can use it for free, but if you feel it has value, you can support the development by donating or becoming a patron, paying a fee of your choice.
+The software is open source, and you can use it for free, but if you feel it has value, you can support the development by donating, paying a fee of your choice.
 
 <br/>
 <br/>
@@ -37,7 +35,15 @@ It would be very nice to get more examples into the documentation. If you have m
 
 ## Bug reports
 
-If you find a bug, please describe it thoroughly and make a [GitHub issue](https://github.com/ottopaulsen/node-red-contrib-power-saver/issues). If the bug is related to the scheduling, **please provide the full output from output 3** on the strategy node.
+If you find a bug, please describe it thoroughly and make a [GitHub issue](https://github.com/ottopaulsen/node-red-contrib-power-saver/issues). 
+
+::: tip Bug reports for strategy nodes
+If the bug is related to a strategy node, please provide:
+* The full input
+* The full output from output 3
+:::
+
+If you have problems with the Best Save node, you can try the [Best Save Viewer](../faq/best-save-viewer.md) to see if it makes more sense.
 
 ## Ideas
 

package/docs/examples/README.md

@@ -16,6 +16,8 @@
 
 [Capacity part of grid tariff](./example-grid-tariff-capacity-part)
 
+[Strømstøtte (governmentall support)](./example-stromstotte)
+
 ## User provided examples
 
 [Output schedule to a sensor entity](./example-next-schedule-entity.md) (by Stefan)

package/docs/examples/example-stromstotte.md

@@ -0,0 +1,31 @@
+# Strømstøtte
+
+::: tip Strømstøtte = Norwegian governental support
+:::
+
+In Norway there is currently economical support from the government when the power prices are high.
+The support per December 2023 is supposed to continue until end of 2024, and is calculated as follows:
+
+::: tip Calculation
+The government will cover 90% of the cost that is over 0.875 NOK per kWh.
+:::
+
+This will have great effect on how the PowerSaver nodes calculates the saving, especially the Best Save node.
+
+To take the governmental support into the calculation, insert a Function node after the Price Receiver node:
+
+![Node med strømstøtte](../images/stromstotte.png)
+
+And use the following code in the function node:
+
+```js
+const LIMIT = 0.875
+const OVER_LIMIT_SHARE = 0.1
+
+msg.payload.priceData.forEach((hour) => {
+    if (hour.value > LIMIT) {
+        hour.value = LIMIT + (hour.value - LIMIT) * OVER_LIMIT_SHARE
+    }
+})
+return msg;
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "4.1.5",
+  "version": "4.2.1",
   "description": "A module for Node-RED that you can use to turn on and off a switch based on power prices",
   "main": "index.js",
   "scripts": {
@@ -55,7 +55,7 @@
     "eslint": "8.52.0",
     "expect": "29.7.0",
     "mocha": "^10.2.0",
-    "node-red": "^3.1.0",
+    "node-red": "^3.1.1",
     "node-red-node-test-helper": "0.3.2",
     "sass-loader": "^13.3.2",
     "vuepress": "2.0.0-beta.67"

package/src/handle-output.js

@@ -77,7 +77,7 @@ function runSchedule(node, schedule, time, currentSent = false) {
     node.log("Switching " + onOff + " in " + wait + " milliseconds");
     const statusMessage = `${remainingSchedule.length} changes - ${
       remainingSchedule[0].value ? "on" : "off"
-    } at ${nextTime.toLocaleString(DateTime.TIME_SIMPLE)}`;
+    } at ${nextTime.toFormat("HH:mm")}`;
     node.status({ fill: "green", shape: "dot", text: statusMessage });
     return setTimeout(() => {
       sendSwitch(node, entry.value);
@@ -85,7 +85,7 @@ function runSchedule(node, schedule, time, currentSent = false) {
     }, wait);
   } else {
     const message = "No schedule";
-    node.warn(message);
+    // node.warn(message);
     node.status({ fill: "yellow", shape: "dot", text: message });
     if (!currentSent) {
       sendSwitch(node, node.outputIfNoSchedule);

package/src/schedule-merger-functions.js

@@ -39,7 +39,7 @@ function mergeSchedules(node, logicFunction) {
   const savedSchedules = node.context().get("savedSchedules", node.contextStorage);
   if (!savedSchedules) {
     const msg = "No schedules";
-    node.warn(msg);
+    // node.warn(msg);
     node.status({ fill: "red", shape: "dot", text: msg });
     return [];
   }

package/test/commands-input-schedule-merger.test.js

@@ -93,7 +93,6 @@ describe("send command as input to schedule merger", () => {
         expect(equalHours(someOn, msg.payload.hours, ["price", "onOff", "start"])).to.equal(true);
         n1.warn.should.not.be.called;
         n1.receive({ payload: { commands: { reset: true } } });
-        n1.warn.should.be.calledWithExactly("No schedule");
         done();
       });
       n1.receive({ payload: makePayload("s1", someOn) });

package/test/data/lowest-price-bug187-input.json

@@ -0,0 +1,197 @@
+{
+    "priceData": [
+        {
+            "value": 0.3417,
+            "start": "2023-11-30T00:00:00.000+01:00"
+        },
+        {
+            "value": 0.3414,
+            "start": "2023-11-30T01:00:00.000+01:00"
+        },
+        {
+            "value": 0.3387,
+            "start": "2023-11-30T02:00:00.000+01:00"
+        },
+        {
+            "value": 0.336,
+            "start": "2023-11-30T03:00:00.000+01:00"
+        },
+        {
+            "value": 0.338,
+            "start": "2023-11-30T04:00:00.000+01:00"
+        },
+        {
+            "value": 0.3435,
+            "start": "2023-11-30T05:00:00.000+01:00"
+        },
+        {
+            "value": 0.371,
+            "start": "2023-11-30T06:00:00.000+01:00"
+        },
+        {
+            "value": 0.4171,
+            "start": "2023-11-30T07:00:00.000+01:00"
+        },
+        {
+            "value": 0.478,
+            "start": "2023-11-30T08:00:00.000+01:00"
+        },
+        {
+            "value": 0.4992,
+            "start": "2023-11-30T09:00:00.000+01:00"
+        },
+        {
+            "value": 0.4818,
+            "start": "2023-11-30T10:00:00.000+01:00"
+        },
+        {
+            "value": 0.4828,
+            "start": "2023-11-30T11:00:00.000+01:00"
+        },
+        {
+            "value": 0.4493,
+            "start": "2023-11-30T12:00:00.000+01:00"
+        },
+        {
+            "value": 0.4429,
+            "start": "2023-11-30T13:00:00.000+01:00"
+        },
+        {
+            "value": 0.4491,
+            "start": "2023-11-30T14:00:00.000+01:00"
+        },
+        {
+            "value": 0.4491,
+            "start": "2023-11-30T15:00:00.000+01:00"
+        },
+        {
+            "value": 0.486,
+            "start": "2023-11-30T16:00:00.000+01:00"
+        },
+        {
+            "value": 0.5276,
+            "start": "2023-11-30T17:00:00.000+01:00"
+        },
+        {
+            "value": 0.5137,
+            "start": "2023-11-30T18:00:00.000+01:00"
+        },
+        {
+            "value": 0.4485,
+            "start": "2023-11-30T19:00:00.000+01:00"
+        },
+        {
+            "value": 0.4002,
+            "start": "2023-11-30T20:00:00.000+01:00"
+        },
+        {
+            "value": 0.375,
+            "start": "2023-11-30T21:00:00.000+01:00"
+        },
+        {
+            "value": 0.3654,
+            "start": "2023-11-30T22:00:00.000+01:00"
+        },
+        {
+            "value": 0.3524,
+            "start": "2023-11-30T23:00:00.000+01:00"
+        },
+        {
+            "value": 0.3443,
+            "start": "2023-12-01T00:00:00.000+01:00"
+        },
+        {
+            "value": 0.3392,
+            "start": "2023-12-01T01:00:00.000+01:00"
+        },
+        {
+            "value": 0.335,
+            "start": "2023-12-01T02:00:00.000+01:00"
+        },
+        {
+            "value": 0.3311,
+            "start": "2023-12-01T03:00:00.000+01:00"
+        },
+        {
+            "value": 0.3314,
+            "start": "2023-12-01T04:00:00.000+01:00"
+        },
+        {
+            "value": 0.3388,
+            "start": "2023-12-01T05:00:00.000+01:00"
+        },
+        {
+            "value": 0.3599,
+            "start": "2023-12-01T06:00:00.000+01:00"
+        },
+        {
+            "value": 0.398,
+            "start": "2023-12-01T07:00:00.000+01:00"
+        },
+        {
+            "value": 0.4591,
+            "start": "2023-12-01T08:00:00.000+01:00"
+        },
+        {
+            "value": 0.482,
+            "start": "2023-12-01T09:00:00.000+01:00"
+        },
+        {
+            "value": 0.4733,
+            "start": "2023-12-01T10:00:00.000+01:00"
+        },
+        {
+            "value": 0.4711,
+            "start": "2023-12-01T11:00:00.000+01:00"
+        },
+        {
+            "value": 0.4516,
+            "start": "2023-12-01T12:00:00.000+01:00"
+        },
+        {
+            "value": 0.4255,
+            "start": "2023-12-01T13:00:00.000+01:00"
+        },
+        {
+            "value": 0.4245,
+            "start": "2023-12-01T14:00:00.000+01:00"
+        },
+        {
+            "value": 0.4365,
+            "start": "2023-12-01T15:00:00.000+01:00"
+        },
+        {
+            "value": 0.4551,
+            "start": "2023-12-01T16:00:00.000+01:00"
+        },
+        {
+            "value": 0.4916,
+            "start": "2023-12-01T17:00:00.000+01:00"
+        },
+        {
+            "value": 0.454,
+            "start": "2023-12-01T18:00:00.000+01:00"
+        },
+        {
+            "value": 0.4176,
+            "start": "2023-12-01T19:00:00.000+01:00"
+        },
+        {
+            "value": 0.3865,
+            "start": "2023-12-01T20:00:00.000+01:00"
+        },
+        {
+            "value": 0.3659,
+            "start": "2023-12-01T21:00:00.000+01:00"
+        },
+        {
+            "value": 0.3579,
+            "start": "2023-12-01T22:00:00.000+01:00"
+        },
+        {
+            "value": 0.3457,
+            "start": "2023-12-01T23:00:00.000+01:00"
+        }
+    ],
+    "source": "Tibber"
+}

package/test/data/lowest-price-bug187.json

@@ -0,0 +1,331 @@
+{
+  "schedule": [
+    {
+      "time": "2023-11-30T00:00:00.000+01:00",
+      "value": false,
+      "countHours": 2
+    },
+    {
+      "time": "2023-11-30T02:00:00.000+01:00",
+      "value": true,
+      "countHours": 3
+    },
+    {
+      "time": "2023-11-30T05:00:00.000+01:00",
+      "value": false,
+      "countHours": 43
+    }
+  ],
+  "hours": [
+    {
+      "start": "2023-11-30T00:00:00.000+01:00",
+      "price": 0.3417,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T01:00:00.000+01:00",
+      "price": 0.3414,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T02:00:00.000+01:00",
+      "price": 0.3387,
+      "onOff": true,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T03:00:00.000+01:00",
+      "price": 0.336,
+      "onOff": true,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T04:00:00.000+01:00",
+      "price": 0.338,
+      "onOff": true,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T05:00:00.000+01:00",
+      "price": 0.3435,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T06:00:00.000+01:00",
+      "price": 0.371,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T07:00:00.000+01:00",
+      "price": 0.4171,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T08:00:00.000+01:00",
+      "price": 0.478,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T09:00:00.000+01:00",
+      "price": 0.4992,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T10:00:00.000+01:00",
+      "price": 0.4818,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T11:00:00.000+01:00",
+      "price": 0.4828,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T12:00:00.000+01:00",
+      "price": 0.4493,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T13:00:00.000+01:00",
+      "price": 0.4429,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T14:00:00.000+01:00",
+      "price": 0.4491,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T15:00:00.000+01:00",
+      "price": 0.4491,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T16:00:00.000+01:00",
+      "price": 0.486,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T17:00:00.000+01:00",
+      "price": 0.5276,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T18:00:00.000+01:00",
+      "price": 0.5137,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T19:00:00.000+01:00",
+      "price": 0.4485,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T20:00:00.000+01:00",
+      "price": 0.4002,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T21:00:00.000+01:00",
+      "price": 0.375,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T22:00:00.000+01:00",
+      "price": 0.3654,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-11-30T23:00:00.000+01:00",
+      "price": 0.3524,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T00:00:00.000+01:00",
+      "price": 0.3443,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T01:00:00.000+01:00",
+      "price": 0.3392,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T02:00:00.000+01:00",
+      "price": 0.335,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T03:00:00.000+01:00",
+      "price": 0.3311,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T04:00:00.000+01:00",
+      "price": 0.3314,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T05:00:00.000+01:00",
+      "price": 0.3388,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T06:00:00.000+01:00",
+      "price": 0.3599,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T07:00:00.000+01:00",
+      "price": 0.398,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T08:00:00.000+01:00",
+      "price": 0.4591,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T09:00:00.000+01:00",
+      "price": 0.482,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T10:00:00.000+01:00",
+      "price": 0.4733,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T11:00:00.000+01:00",
+      "price": 0.4711,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T12:00:00.000+01:00",
+      "price": 0.4516,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T13:00:00.000+01:00",
+      "price": 0.4255,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T14:00:00.000+01:00",
+      "price": 0.4245,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T15:00:00.000+01:00",
+      "price": 0.4365,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T16:00:00.000+01:00",
+      "price": 0.4551,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T17:00:00.000+01:00",
+      "price": 0.4916,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T18:00:00.000+01:00",
+      "price": 0.454,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T19:00:00.000+01:00",
+      "price": 0.4176,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T20:00:00.000+01:00",
+      "price": 0.3865,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T21:00:00.000+01:00",
+      "price": 0.3659,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T22:00:00.000+01:00",
+      "price": 0.3579,
+      "onOff": false,
+      "saving": null
+    },
+    {
+      "start": "2023-12-01T23:00:00.000+01:00",
+      "price": 0.3457,
+      "onOff": false,
+      "saving": null
+    }
+  ],
+  "source": "Tibber",
+  "config": {
+    "fromTime": "00",
+    "toTime": "00",
+    "hoursOn": 3,
+    "maxPrice": 0.35,
+    "doNotSplit": false,
+    "sendCurrentValueWhenRescheduling": true,
+    "outputIfNoSchedule": false,
+    "outputOutsidePeriod": false,
+    "outputValueForOn": true,
+    "outputValueForOff": false,
+    "outputValueForOntype": "bool",
+    "outputValueForOfftype": "bool",
+    "override": "auto",
+    "contextStorage": "memory",
+    "hasChanged": false
+  },
+  "time": "2023-11-30T17:29:23.336+00:00",
+  "version": "4.1.5",
+  "strategyNodeId": "n1",
+  "current": false
+}

package/test/strategy-lowest-price-bug184.test.js

@@ -7,7 +7,7 @@ const { makePayload } = require("./strategy-lowest-price-test-utils.js");
 
 helper.init(require.resolve("node-red"));
 
-describe("ps-strategy-lowest-price-bug", function () {
+describe("ps-strategy-lowest-price-bugs", function () {
   beforeEach(function (done) {
     helper.startServer(done);
   });

package/test/strategy-lowest-price-bug187.test.js

@@ -0,0 +1,61 @@
+const { DateTime } = require("luxon");
+const expect = require("chai").expect;
+const helper = require("node-red-node-test-helper");
+const lowestPrice = require("../src/strategy-lowest-price.js");
+const { version } = require("../package.json");
+const { makePayload } = require("./strategy-lowest-price-test-utils.js");
+
+helper.init(require.resolve("node-red"));
+
+describe("ps-strategy-lowest-price-bugs", function () {
+  beforeEach(function (done) {
+    helper.startServer(done);
+  });
+
+  afterEach(function (done) {
+    helper.unload().then(function () {
+      helper.stopServer(done);
+    });
+  });
+
+  it("cannot reproduce this bug", function (done) {
+    const input = require("./data/lowest-price-bug187-input.json");
+    const result = require("./data/lowest-price-bug187.json");
+  //   result.version = version;
+  //   result.strategyNodeId = "n1";
+  //   result.current = false;
+  //   const flow = [
+  //     {
+  //       id: "n1",
+  //       type: "ps-strategy-lowest-price",
+  //       name: "test name",
+  //       fromTime: "00",
+  //       toTime: "00",
+  //       hoursOn: 3,
+  //       maxPrice: 0.35,
+  //       doNotSplit: false,
+  //       sendCurrentValueWhenRescheduling: true,
+  //       outputIfNoSchedule: false,
+  //       outputOutsidePeriod: false,
+  //       contextStorage: "memory",
+  //       wires: [["n3"], ["n4"], ["n2"]],
+  //     },
+  //     { id: "n2", type: "helper" },
+  //     { id: "n3", type: "helper" },
+  //     { id: "n4", type: "helper" },
+  //   ];
+  //   helper.load(lowestPrice, flow, function () {
+  //     const n1 = helper.getNode("n1");
+  //     const n2 = helper.getNode("n2");
+  //     n2.on("input", function (msg) {
+  //       result.current = msg.payload.current;
+  //       expect(msg).to.have.deep.property("payload", result);
+  //       n1.warn.should.not.be.called;
+        done();
+  //     });
+  //     const time = DateTime.fromISO("2023-11-30T17:29:23.336+00:00");
+  //     result.time = time.toISO();
+  //     n1.receive({ payload: makePayload(input, time) });
+  //   });
+  });
+});