fix stringifed null params; fix wrong context when using multiple nodes of same type

Author: matthiez

.idea/php.xml

@@ -1,3 +1,9 @@
+3.3.0
+==================
+* use empty string for unset parameters
+* fix wrong context when using multiple nodes of the same type
+* bump sms77-client to ^2.25.0
+
 3.2.0
 ==================
 * add missing translations

CHANGELOG.md

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2020-present sms77 e.K.
+Copyright (c) 2020-2022 sms77 e.K.
+Copyright (c) 2023-present seven communications GmbH & Co. KG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,12 +1,12 @@
-![](https://www.sms77.io/wp-content/uploads/2019/07/sms77-Logo-400x79.png "sms77 logo")
+![](https://www.seven.io/wp-content/uploads/Logo.svg "seven Logo")
 
-# nodered-contrib-sms77
+# Official seven nodes for Node-RED
 
 [Node-RED](http://nodered.org) node collection
-for [sending SMS](https://www.sms77.io/en/products/send-sms/)
-, [text-to-speech calls](https://www.sms77.io/en/products/voice/)
-and [number validation](https://www.sms77.io/en/products/number-validation/)
-via [sms77](https://www.sms77.io/).
+for [sending SMS](https://www.seven.io/en/products/send-sms/)
+, [text-to-speech calls](https://www.seven.io/en/products/voice/)
+and [number validation](https://www.seven.io/en/products/number-validation/)
+via [seven](https://www.seven.io/).
 
 ## Installation
 
@@ -22,8 +22,8 @@ Run the following command in your Node-RED user directory - usually `~/.node-red
 
 ### sms77-config node
 
-*API Key*: An API key from sms77 - create one in
-your [developer dashboard](https://app.sms77.io/developer).
+*API Key*: An API key from [seven](https://help.seven.io/en/api-key-access) - create one in
+your [developer dashboard](https://app.seven.io/developer).
 
 *Name*: An arbitrary name for the node, helpful if you use multiple configurations.
 
@@ -39,7 +39,7 @@ Use this node for sending SMS.
 *From (Sender)*: Set a custom sender identifier.
 
 *Label*: Set a custom label for
-sorting [analytics](https://www.sms77.io/en/docs/gateway/http-api/analytics/).
+sorting [analytics](https://www.seven.io/en/docs/gateway/http-api/analytics/).
 
 *Foreign ID*: Optionally set a custom value returned in callbacks.
 
@@ -54,7 +54,7 @@ date/time string formatted as yyyy-mm-dd hh:ii.
 
 *Unicode?*: If enabled, enforce unicode encoding ignoring API detection.
 
-*Flash?*: If enabled, SMS get sent as [flash](https://help.sms77.io/en/flash-sms).
+*Flash?*: If enabled, SMS get sent as [flash](https://help.seven.io/en/flash-sms).
 
 *Details?*: If enabled, the API returns dispatch specific information - is ignored
 if `json` is enabled.
@@ -68,7 +68,7 @@ testing.
 seconds, gets allowed.
 
 *Performance Tracking?*: If enabled, links found in the text get replaced with a shortened
-URL and [click tracking](https://help.sms77.io/en/performance-tracking-1) enabled.
+URL and [click tracking](https://help.seven.io/en/performance-tracking-1) enabled.
 
 *Name*: An arbitrary name for the node helpful for identification.
 
@@ -84,8 +84,8 @@ Use this node for converting a text to speech, call a number and read the messag
 .
 
 *From (Caller)*: The caller identifier which must be your
-own [virtual number](https://help.sms77.io/en/ordering-your-own-number) or
-a [shared number](https://www.sms77.io/en/docs/glossary/shared-numbers/).
+own [virtual number](https://help.seven.io/en/ordering-your-own-number) or
+a [shared number](https://www.seven.io/en/docs/glossary/shared-numbers/).
 
 *Is XML?*: If enabled, the API parses the text as XML format.
 
@@ -109,11 +109,11 @@ other types return JSON by default.
 
 > Required options are marked with an asterisk (*).
 
-Visit our [API Documentation](https://www.sms77.io/en/docs/gateway/http-api/) for a
+Visit our [API Documentation](https://www.seven.io/en/docs/gateway/http-api/) for a
 detailed request description.
 
 ## Support
 
-Need help? Feel free to [contact us](https://www.sms77.io/en/company/contact/).
+Need help? Feel free to [contact us](https://www.seven.io/en/company/contact/).
 
 [![MIT](https://img.shields.io/badge/License-MIT-teal.svg)](LICENSE)

README.md

@@ -1,11 +1,11 @@
 {
-  "author": "sms77 e.K. <support@sms77.io> (https://www.sms77.io/)",
+  "author": "seven communications GmbH & Co. KG <support@seven.io> (https://www.seven.io/)",
   "bugs": {
-    "email": "support@sms77.io",
-    "url": "https://github.com/sms77io/nodered-contrib-sms77/issues"
+    "email": "support@seven.io",
+    "url": "https://github.com/seven-io/node-red/issues"
   },
   "dependencies": {
-    "sms77-client": "^2.24.0",
+    "sms77-client": "^2.25.0",
     "node-fetch": "^2.6.7",
     "globalthis": "^1.0.3"
   },
@@ -19,7 +19,7 @@
       "sms77-voice": "src/nodes/voice/voice.js"
     }
   },
-  "homepage": "https://github.com/sms77io/nodered-contrib-sms77",
+  "homepage": "https://github.com/seven-io/node-red",
   "keywords": [
     "cnam",
     "hlr",
@@ -33,10 +33,10 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sms77io/nodered-contrib-sms77.git"
+    "url": "git+https://github.com/seven-io/node-red.git"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "3.2.2"
+  "version": "3.3.0"
 }

package.json

@@ -1,12 +1,19 @@
 const Util = require('./Util')
 
 module.exports = class NodeUtil {
-    constructor(node) {
+    constructor(node, config) {
         this.node = node
+        this.config = config
+
+        this.status(`${node.name} connected`, 'blue', 'ring')
     }
 
-    emptyStringFallback = (key, value = null) => {
-        const cfg = this.node.constructor.CFG
+    onDone = (done, error, msg) => done
+        ? done(error) // Use done if defined (1.0+)
+        : this.node.error(error, msg) // Fallback to node.error (pre-1.0)
+
+    emptyStringFallback = (key, value = '') => {
+        const cfg = this.config
         if (!key in cfg) return value
         return '' === (cfg[key] || '') ? value : cfg[key]
     }
@@ -15,18 +22,12 @@ module.exports = class NodeUtil {
         this.node.status({fill, shape, text})
     }
 
-    onSuccess = (sent, failed, send, msg, payload, done) => {
-        this.status(`${sent} sent | ${failed} failed`)
+    onSuccess = (send, msg, payload, done) => {
         send({...msg, payload})
         if (done) done() // Check done exists (1.0+)
     }
 
-    onInput = async (msg, send, done) => {
-        if (!send) send = () => this.node.send.apply(this.node, [msg, send, done]) // If this is pre-1.0, 'send' will be undefined, so fallback to node.send
-        await this.node._onInput(msg, send, done)
-    }
-
     errorHandler = (done, msg) => {
-        return e => this.node._done(done, Util.stringify(e), msg)
+        return e => this.onDone(done, Util.stringify(e), msg)
     }
 }

src/BaseMessageNode.js

@@ -1,7 +1,10 @@
 const Sms77Client = require('sms77-client')
+const globalThis = require('globalthis')()
+if (!globalThis.fetch) globalThis.fetch = require('node-fetch')
 
 module.exports = class Util {
-    static initClient(apiKey) {
+    static initClient(RED, config) {
+        const apiKey = RED.nodes.getNode(config.config).credentials.apiKey
         return new Sms77Client(apiKey, 'node-red')
     }
 

src/NodeUtil.js

@@ -1,30 +1,35 @@
-const BaseNode = require('../../BaseMessageNode')
 const Util = require('../../Util')
+const NodeUtil = require('../../NodeUtil')
 
-module.exports = function(RED) {
+module.exports = function (RED) {
     'use strict'
 
-    class Sms77LookupNode {
-        constructor(config) {
-            BaseNode(this, RED, config)
-        }
+    function Sms77LookupNode(config) {
+        RED.nodes.createNode(this, config)
 
-        async _onInput(msg, send, done) {
+        const node = this
+        const nodeUtil = new NodeUtil(node, config)
+        const client = Util.initClient(RED, config)
+
+        this.on('input', async function onInput(msg, send, done) {
+            if (!send) send = () => node.send.apply(node, [msg, send, done]) // If this is pre-1.0, 'send' will be undefined, so fallback to node.send
+
+            const type = config.lookupType
             const params = {
-                json: 'true' === Sms77LookupNode.CFG.json,
-                number: this._emptyStringFallback('numbers', msg.topic),
-                type: Sms77LookupNode.CFG.lookupType,
+                json: 'true' === config.json,
+                number: nodeUtil.emptyStringFallback('numbers', msg.topic),
+                type,
             }
 
             try {
-                const response = await Sms77LookupNode.CLIENT.lookup(params)
-                this._util.status(Util.stringify(response))
-                send({...msg})
+                const response = await client.lookup(params)
+                nodeUtil.status(`Lookup of type "${type}" performed.`)
+                send({...msg, payload: response})
                 if (done) done() // Check done exists (1.0+)
             } catch (e) {
-                this._errorHandler(done, msg)
+                nodeUtil.errorHandler(done, msg)(e)
             }
-        }
+        })
     }
 
     RED.nodes.registerType('sms77-lookup', Sms77LookupNode)