diff --git a/src/modbus-flex-connector.js b/src/modbus-flex-connector.js
index c03f6f2b..249eba4b 100644
--- a/src/modbus-flex-connector.js
+++ b/src/modbus-flex-connector.js
@@ -5,9 +5,10 @@
@author
Klaus Landsdorf (Bianco Royal)
*/
+
/**
- * Modbus flexible Getter node.
- * @module NodeRedModbusFlexGetter
+ * Flex Connector Node.
+ * @module NodeRedModbusFlexConnector
*
* @param RED
*/
@@ -19,6 +20,7 @@ module.exports = function (RED) {
function ModbusFlexConnector (config) {
RED.nodes.createNode(this, config)
+
this.name = config.name
this.maxReconnectsPerMinute = config.maxReconnectsPerMinute || 4
this.emptyQueue = config.emptyQueue
@@ -29,53 +31,82 @@ module.exports = function (RED) {
this.internalDebugLog = internalDebugLog
this.verboseLogging = RED.settings.verbose
this.server = RED.nodes.getNode(config.server)
+ this.emptyMsgOnFail = config.emptyMsgOnFail
+ this.configMsgOnChange = config.configMsgOnChange
+
const node = this
+
mbBasics.setNodeStatusTo('waiting', node)
- if (!this.server) {
+
+ if (!node.server) {
+ mbBasics.setNodeStatusTo('disconnected', node)
return
}
- this.server.registerForModbus(node)
+
+ mbBasics.setNodeStatusTo('connecting', node)
+
+ node.server.registerForModbus(node)
mbBasics.initModbusClientEvents(node, this.server)
node.onConfigDone = function (msg) {
- const shouldShowStatus = node.showStatusActivities
- if (shouldShowStatus) {
- mbBasics.setNodeStatusTo('config done', node)
- }
- if (shouldShowStatus) {
- mbBasics.setNodeStatusTo(this.server.actualServiceState, node)
- }
-
- if (!shouldShowStatus) {
+ if (node.showStatusActivities) {
+ mbBasics.setNodeStatusTo(node.server.actualServiceState, node)
+ } else {
mbBasics.setNodeDefaultStatus(node)
}
- msg.error.nodeStatus = node.statusText
-
- if (node.emptyMsgOnFail) {
- msg.payload = ''
+ if (node.configMsgOnChange) {
+ msg.payload = msg.payload || {}
+ msg.payload.status = 'changed'
+ } else {
+ msg.config_change = 'emitted'
}
node.send(msg)
}
+ node.onConfigError = function (err, msg) {
+ internalDebugLog(err.message)
+
+ if (node.showErrors) {
+ if (node.showStatusActivities) {
+ mbBasics.setNodeStatusTo('error', node)
+ } else {
+ mbBasics.setNodeDefaultStatus(node)
+ }
+
+ if (err && err.message) {
+ msg.error = err
+ } else {
+ msg.error = new Error(err)
+ }
+
+ msg.error.nodeStatus = node.statusText
+
+ node.error(msg.error, msg)
+
+ if (node.emptyMsgOnFail) {
+ msg.payload = ''
+ }
+
+ node.send(msg)
+ }
+ }
+
node.on('input', function (msg) {
if (mbBasics.invalidPayloadIn(msg)) {
return
}
- // if (!this.server) {
- // return
- // }
-
if (node.showStatusActivities) {
- mbBasics.setNodeStatusTo(this.server.actualServiceState, node)
+ mbBasics.setNodeStatusTo(node.server.actualServiceState, node)
}
if (msg.payload.connectorType) {
internalDebugLog(`dynamicReconnect: ${JSON.stringify(msg.payload)}`)
+
msg.payload.emptyQueue = node.emptyQueue
- this.server.emit('dynamicReconnect', msg, node.onConfigDone, node.onConfigError)
+ node.server.emit('dynamicReconnect', msg, node.onConfigDone, node.onConfigError)
} else {
const error = new Error('Payload Not Valid - Connector Type')
node.error(error, msg)
@@ -84,7 +115,9 @@ module.exports = function (RED) {
}
})
- if (!node.showStatusActivities) {
+ if (node.showStatusActivities) {
+ mbBasics.setNodeStatusTo('active', node)
+ } else {
mbBasics.setNodeDefaultStatus(node)
}
}
diff --git a/src/modbus-flex-getter.js b/src/modbus-flex-getter.js
index 8a17232e..e46c2611 100644
--- a/src/modbus-flex-getter.js
+++ b/src/modbus-flex-getter.js
@@ -51,6 +51,7 @@ module.exports = function (RED) {
mbBasics.setNodeStatusTo('waiting', node)
const modbusClient = RED.nodes.getNode(config.server)
+
if (!modbusClient) {
return
}
@@ -180,41 +181,53 @@ module.exports = function (RED) {
node.initializeInputDelayTimer()
+ // Add a queue to store incoming messages
+ const messageQueue = []
+
node.on('input', function (msg) {
- /* istanbul ignore next */
if (mbBasics.invalidPayloadIn(msg)) {
+ /* istanbul ignore next */
verboseWarn('Invalid message on input.')
return
}
- /* istanbul ignore next */
if (node.isNotReadyForInput()) {
+ /* istanbul ignore next */
verboseWarn('Inject while node is not ready for input.')
return
}
- /* istanbul ignore next */
if (modbusClient.isInactive()) {
+ /* istanbul ignore next */
verboseWarn('You sent an input to inactive client. Please use initial delay on start or send data more slowly.')
return
}
- const origMsgInput = Object.assign({}, msg) // keep it origin
+ messageQueue.push(msg)
+ processNextMessage()
+ })
+
+ function processNextMessage () {
+ if (messageQueue.length === 0) {
+ node.emit('modbusFlexGetterNodeDone')
+ return
+ }
+ const msg = messageQueue.shift()
+ const origMsgInput = Object.assign({}, msg)
try {
const inputMsg = node.prepareMsg(origMsgInput)
if (node.isValidModbusMsg(inputMsg)) {
const newMsg = node.buildNewMessageObject(node, inputMsg)
node.bufferMessageList.set(newMsg.messageId, mbBasics.buildNewMessage(node.keepMsgProperties, inputMsg, newMsg))
modbusClient.emit('readModbus', newMsg, node.onModbusReadDone, node.onModbusReadError)
+ } else {
+ node.errorProtocolMsg(new Error('Invalid Modbus message'), origMsgInput)
+ mbBasics.sendEmptyMsgOnFail(node, new Error('Invalid Modbus message'), origMsgInput)
}
} catch (err) {
node.errorProtocolMsg(err, origMsgInput)
mbBasics.sendEmptyMsgOnFail(node, err, origMsgInput)
}
-
- if (node.showStatusActivities) {
- mbBasics.setNodeStatusTo(modbusClient.actualServiceState, node)
- }
- })
-
+ processNextMessage()
+ }
node.on('close', function (done) {
node.resetInputDelayTimer()
mbBasics.setNodeStatusTo('closed', node)
diff --git a/src/modbus-io-config.js b/src/modbus-io-config.js
index 4f962917..6452fd95 100644
--- a/src/modbus-io-config.js
+++ b/src/modbus-io-config.js
@@ -7,6 +7,12 @@
@author
Klaus Landsdorf (Bianco Royal)
*/
+/**
+ * Modbus IO Config node.
+ * @module NodeRedModbusIOConfig
+ *
+ * @param RED
+ */
module.exports = function (RED) {
'use strict'
// SOURCE-MAP-REQUIRED
@@ -27,60 +33,58 @@ module.exports = function (RED) {
node.setMaxListeners(UNLIMITED_LISTENERS)
node.lastUpdatedAt = null
- /* istanbul ignore next */
if (!fs.existsSync(node.path)) {
coreIO.internalDebug('IO File Not Found ' + node.path)
node.warn('Modbus IO File Not Found ' + node.path)
- return
- }
+ } else {
+ node.lineReader = new coreIO.LineByLineReader(node.path)
+ coreIO.internalDebug('Read IO File ' + node.path)
+ node.configData = []
- node.lineReader = new coreIO.LineByLineReader(node.path)
- coreIO.internalDebug('Read IO File ' + node.path)
- node.configData = []
-
- function setLineReaderEvents () {
- node.lineReader.removeAllListeners()
+ function setLineReaderEvents () {
+ node.lineReader.removeAllListeners()
- node.lineReader.on('error', function (err) {
- coreIO.internalDebug(err.message)
- })
+ node.lineReader.on('error', function (err) {
+ coreIO.internalDebug(err.message)
+ })
- node.lineReader.on('line', function (line) {
- if (line) {
- node.configData.push(line)
- }
- })
+ node.lineReader.on('line', function (line) {
+ if (line) {
+ node.configData.push(line)
+ }
+ })
- node.lineReader.on('end', function () {
- node.lastUpdatedAt = Date.now()
- coreIO.internalDebug('Read IO Done From File ' + node.path)
- node.warn({
- payload: coreIO.allValueNamesFromIOFile(node),
- name: 'Modbus Value Names From IO File',
- path: node.path
+ node.lineReader.on('end', function () {
+ node.lastUpdatedAt = Date.now()
+ coreIO.internalDebug('Read IO Done From File ' + node.path)
+ node.warn({
+ payload: coreIO.allValueNamesFromIOFile(node),
+ name: 'Modbus Value Names From IO File',
+ path: node.path
+ })
+ node.emit('updatedConfig', node.configData)
})
- node.emit('updatedConfig', node.configData)
- })
- coreIO.internalDebug('Loading IO File Started For ' + node.path)
- }
+ coreIO.internalDebug('Loading IO File Started For ' + node.path)
+ }
- setLineReaderEvents()
+ setLineReaderEvents()
- node.watcher = fs.watchFile(node.path, (curr, prev) => {
- coreIO.internalDebug(`the current mtime is: ${curr.mtime}`)
- coreIO.internalDebug(`the previous mtime was: ${prev.mtime}`)
+ node.watcher = fs.watchFile(node.path, (curr, prev) => {
+ coreIO.internalDebug(`the current mtime is: ${curr.mtime}`)
+ coreIO.internalDebug(`the previous mtime was: ${prev.mtime}`)
- if (curr.mtime !== prev.mtime) {
- coreIO.internalDebug('Reload IO File ' + node.path)
- node.configData = []
- delete node.lastUpdatedAt
- node.lineReader.removeAllListeners()
- node.lineReader = new coreIO.LineByLineReader(node.path)
- setLineReaderEvents()
- coreIO.internalDebug('Reloading IO File Started For ' + node.path)
- }
- })
+ if (curr.mtime !== prev.mtime) {
+ coreIO.internalDebug('Reload IO File ' + node.path)
+ node.configData = []
+ delete node.lastUpdatedAt
+ node.lineReader.removeAllListeners()
+ node.lineReader = new coreIO.LineByLineReader(node.path)
+ setLineReaderEvents()
+ coreIO.internalDebug('Reloading IO File Started For ' + node.path)
+ }
+ })
+ }
node.on('close', function (done) {
fs.unwatchFile(node.path)
diff --git a/src/modbus-queue-info.js b/src/modbus-queue-info.js
index e6e2482c..43870d3c 100644
--- a/src/modbus-queue-info.js
+++ b/src/modbus-queue-info.js
@@ -7,8 +7,8 @@
**/
/**
- * Modbus Read node.
- * @module NodeRedModbusRead
+ * Modbus Queue Info node.
+ * @module NodeRedModbusQueueInfo
*
* @param RED
*/
diff --git a/src/modbus-response-filter.js b/src/modbus-response-filter.js
index 02720cb3..95c6b453 100644
--- a/src/modbus-response-filter.js
+++ b/src/modbus-response-filter.js
@@ -5,9 +5,10 @@
@author
Klaus Landsdorf (Bianco Royal)
*/
+
/**
- * Modbus flexible Getter node.
- * @module NodeRedModbusFlexGetter
+ * Modbus Response Filter node.
+ * @module NodeRedModbusResponseFilter
*
* @param RED
*/
diff --git a/src/modbus-response.js b/src/modbus-response.js
index 8d9fa7df..f6fe0c96 100644
--- a/src/modbus-response.js
+++ b/src/modbus-response.js
@@ -7,6 +7,7 @@
@author
Klaus Landsdorf (Bianco Royal)
**/
+
/**
* Modbus Response node.
* @module NodeRedModbusResponse
diff --git a/test/units/flows/modbus-client-flows.js b/test/units/flows/modbus-client-flows.js
index cd59907b..e7762d0d 100644
--- a/test/units/flows/modbus-client-flows.js
+++ b/test/units/flows/modbus-client-flows.js
@@ -1,6 +1,139 @@
const helperExtensions = require('../../helper/test-helper-extensions')
module.exports = {
+ testParallelUnitIdsAllowed: helperExtensions.cleanFlowPositionData(
+ [
+ {
+ "id": "94ea44bb692463f2",
+ "type": "tab",
+ "label": "Flow 1",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "22809a5a7e0bac07",
+ "type": "modbus-flex-getter",
+ "z": "94ea44bb692463f2",
+ "name": "",
+ "showStatusActivities": true,
+ "showErrors": true,
+ "showWarnings": true,
+ "logIOActivities": false,
+ "server": "79e791b851e85bfc",
+ "useIOFile": false,
+ "ioFile": "",
+ "useIOForPayload": false,
+ "emptyMsgOnFail": false,
+ "keepMsgProperties": false,
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "x": 620,
+ "y": 340,
+ "wires": [
+ [
+ "a1f29b71179b8de8"
+ ],
+ []
+ ]
+ },
+ {
+ "id": "18702449c6a2a321",
+ "type": "inject",
+ "z": "94ea44bb692463f2",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "",
+ "payloadType": "date",
+ "x": 200,
+ "y": 340,
+ "wires": [
+ [
+ "3f337ccb0f1dc5e0"
+ ]
+ ]
+ },
+ {
+ "id": "3f337ccb0f1dc5e0",
+ "type": "function",
+ "z": "94ea44bb692463f2",
+ "name": "function 81",
+ "func": "\nnode.send({payload: { fc: 4, unitid: 14, address: 0, quantity: 1 }})\nnode.send({payload: { fc: 3, unitid: 137, address: 20498, quantity: 2 }})\n//node.send({payload: { fc: 3, unitid: 1, address: 20498, quantity: 2 }})\n node.send({payload: { fc: 3, unitid: 137, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n",
+ "outputs": 1,
+ "timeout": 0,
+ "noerr": 0,
+ "initialize": "",
+ "finalize": "",
+ "libs": [],
+ "x": 410,
+ "y": 340,
+ "wires": [
+ [
+ "22809a5a7e0bac07"
+ ]
+ ]
+ },
+ {
+ "id": "a1f29b71179b8de8",
+ "type": "helper",
+ "z": "94ea44bb692463f2",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 860,
+ "y": 340,
+ "wires": []
+ },
+ {
+ "id": "79e791b851e85bfc",
+ "type": "modbus-client",
+ "name": "modbus-bridge",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": true,
+ "queueLogEnabled": true,
+ "failureLogEnabled": true,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "502",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyACM0",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "10",
+ "serialAsciiResponseStartDelimiter": "0x3A",
+ "unit_id": "27",
+ "commandDelay": "10",
+ "clientTimeout": "1000",
+ "reconnectOnTimeout": false,
+ "reconnectTimeout": "500",
+ "parallelUnitIdsAllowed": false,
+ "showErrors": false,
+ "showWarnings": true,
+ "showLogs": true
+ }
+ ]
+ ),
testModbusReadNodeIsActive: helperExtensions.cleanFlowPositionData(
[
{
diff --git a/test/units/flows/modbus-flex-connector-flows.js b/test/units/flows/modbus-flex-connector-flows.js
index 40e9a159..031905e3 100644
--- a/test/units/flows/modbus-flex-connector-flows.js
+++ b/test/units/flows/modbus-flex-connector-flows.js
@@ -3,49 +3,61 @@ const helperExtensions = require('../../helper/test-helper-extensions')
module.exports = {
testShouldBeLoadedFlow: helperExtensions.cleanFlowPositionData([
-
{
- id: '40ddaabb.fd44d4',
- type: 'modbus-flex-connector',
- z: '43f07d0e121df598',
- name: 'FlexConnector',
- maxReconnectsPerMinute: 4,
- emptyQueue: true,
- showStatusActivities: false,
- showErrors: false,
- server: '2a253153.fae3ce',
- x: 460,
- y: 200,
- wires: [
+ "id": "cb3ef46652ca069f",
+ "type": "tab",
+ "label": "Flex-Connector No Server",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "40ddaabb.fd44d4",
+ "type": "modbus-flex-connector",
+ "z": "cb3ef46652ca069f",
+ "name": "FlexConnector",
+ "maxReconnectsPerMinute": 4,
+ "emptyQueue": true,
+ "showStatusActivities": true,
+ "showErrors": false,
+ "server": "2a253153.fae3ce",
+ "emptyMsgOnFail": false,
+ "configMsgOnChange": false,
+ "x": 520,
+ "y": 120,
+ "wires": [
[]
]
},
{
- id: '2a253153.fae3ce',
- type: 'modbus-client',
- name: '',
- clienttype: 'tcp',
- bufferCommands: true,
- stateLogEnabled: false,
- queueLogEnabled: false,
- failureLogEnabled: false,
- tcpHost: '127.0.0.1',
- tcpPort: '11522',
- tcpType: 'DEFAULT',
- serialPort: '/dev/ttyUSB',
- serialType: 'RTU-BUFFERD',
- serialBaudrate: '9600',
- serialDatabits: '8',
- serialStopbits: '1',
- serialParity: 'none',
- serialConnectionDelay: '100',
- serialAsciiResponseStartDelimiter: '',
- unit_id: '1',
- commandDelay: '100',
- clientTimeout: '100',
- reconnectOnTimeout: true,
- reconnectTimeout: '200',
- parallelUnitIdsAllowed: true
+ "id": "2a253153.fae3ce",
+ "type": "modbus-client",
+ "name": "",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": false,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "11522",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "",
+ "unit_id": "1",
+ "commandDelay": "100",
+ "clientTimeout": "100",
+ "reconnectOnTimeout": true,
+ "reconnectTimeout": "2000",
+ "parallelUnitIdsAllowed": true,
+ "showErrors": false,
+ "showWarnings": false,
+ "showLogs": false
}
]),
@@ -184,123 +196,422 @@ module.exports = {
testFlowAsExpected: helperExtensions.cleanFlowPositionData(
[
{
- id: 'ea7e082eac96bb8f',
- type: 'modbus-server',
- z: '3b249606fb2722a7',
- name: '',
- logEnabled: false,
- hostname: '127.0.0.1',
- serverPort: '10512',
- responseDelay: 100,
- delayUnit: 'ms',
- coilsBufferSize: 10000,
- holdingBufferSize: 10000,
- inputBufferSize: 10000,
- discreteBufferSize: 10000,
- showErrors: false,
- x: 445,
- y: 460,
- wires: [
+ "id": "f24eb98786e83747",
+ "type": "tab",
+ "label": "Test Felx-Connector UnitId",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "ea7e082eac96bb8f",
+ "type": "modbus-server",
+ "z": "f24eb98786e83747",
+ "name": "",
+ "logEnabled": false,
+ "hostname": "127.0.0.1",
+ "serverPort": "10512",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "showStatusActivities": false,
+ "x": 345,
+ "y": 80,
+ "wires": [
[],
[],
[],
[],
- []
+ [
+ "b04c7187f283f1a6"
+ ]
],
- l: false
+ "l": false
},
{
- id: '1b4644a214cfdec6',
- type: 'modbus-flex-connector',
- z: '3b249606fb2722a7',
- name: '',
- maxReconnectsPerMinute: 4,
- emptyQueue: false,
- showStatusActivities: false,
- showErrors: false,
- server: '115bd58ae573c942',
- x: 530,
- y: 600,
- wires: [
+ "id": "1b4644a214cfdec6",
+ "type": "modbus-flex-connector",
+ "z": "f24eb98786e83747",
+ "name": "",
+ "maxReconnectsPerMinute": 4,
+ "emptyQueue": false,
+ "showStatusActivities": true,
+ "showErrors": true,
+ "server": "115bd58ae573c942",
+ "emptyMsgOnFail": true,
+ "configMsgOnChange": false,
+ "x": 610,
+ "y": 220,
+ "wires": [
[
- '221de567904726a1'
+ "0b116c8f15c103bc"
]
]
},
{
- id: '88ef999a1a2c4c5d',
- type: 'inject',
- z: '3b249606fb2722a7',
- name: '',
- props: [
+ "id": "88ef999a1a2c4c5d",
+ "type": "inject",
+ "z": "f24eb98786e83747",
+ "name": "Change for Unit-ID",
+ "props": [
{
- p: 'payload'
+ "p": "payload"
},
{
- p: 'topic',
- vt: 'str'
+ "p": "topic",
+ "vt": "str"
}
],
- repeat: '',
- crontab: '',
- once: false,
- onceDelay: 0.1,
- topic: '',
- payload: '{"connectorType":"TCP","tcpHost":"127.0.0.1","tcpPort":"10512"}',
- payloadType: 'json',
- x: 270,
- y: 560,
- wires: [
+ "repeat": "",
+ "crontab": "",
+ "once": true,
+ "onceDelay": "0.5",
+ "topic": "",
+ "payload": "{\"connectorType\":\"TCP\",\"tcpHost\":\"127.0.0.1\",\"tcpPort\":\"10512\",\"unitId\":1}",
+ "payloadType": "json",
+ "x": 190,
+ "y": 200,
+ "wires": [
[
- '1b4644a214cfdec6'
+ "1b4644a214cfdec6"
]
]
},
{
- id: '221de567904726a1',
- type: 'helper',
- z: '3b249606fb2722a7',
- name: 'helper 14',
- active: true,
- tosidebar: true,
- console: false,
- tostatus: false,
- complete: 'false',
- statusVal: '',
- statusType: 'auto',
- x: 780,
- y: 520,
- wires: []
+ "id": "0b116c8f15c103bc",
+ "type": "helper",
+ "z": "f24eb98786e83747",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 860,
+ "y": 220,
+ "wires": []
},
{
- id: '115bd58ae573c942',
- type: 'modbus-client',
- name: '12 Channel 192.168.0.41',
- clienttype: 'tcp',
- bufferCommands: true,
- stateLogEnabled: false,
- queueLogEnabled: false,
- failureLogEnabled: false,
- tcpHost: '127.0.0.1',
- tcpPort: '10512',
- tcpType: 'DEFAULT',
- serialPort: '/dev/ttyUSB',
- serialType: 'RTU-BUFFERD',
- serialBaudrate: '9600',
- serialDatabits: '8',
- serialStopbits: '1',
- serialParity: 'none',
- serialConnectionDelay: '100',
- serialAsciiResponseStartDelimiter: '0x3A',
- unit_id: 41,
- commandDelay: 100,
- clientTimeout: 1000,
- reconnectOnTimeout: true,
- reconnectTimeout: 2000,
- parallelUnitIdsAllowed: false,
- showErrors: false,
- showWarnings: false,
- showLogs: false
+ "id": "c7eb8fe4f9b1904a",
+ "type": "inject",
+ "z": "f24eb98786e83747",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "1",
+ "payloadType": "num",
+ "x": 180,
+ "y": 80,
+ "wires": [
+ [
+ "ea7e082eac96bb8f"
+ ]
+ ]
+ },
+ {
+ "id": "b04c7187f283f1a6",
+ "type": "helper",
+ "z": "f24eb98786e83747",
+ "name": "helper 2",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "true",
+ "targetType": "full",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 490,
+ "y": 100,
+ "wires": []
+ },
+ {
+ "id": "42075d85efccbcad",
+ "type": "inject",
+ "z": "f24eb98786e83747",
+ "name": "Change for Unit-ID with Error",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "{\"connectorType\":\"TCP\",\"tcpHost\":\"0.0.0.0\",\"tcpPort\":\"10513\",\"unitId\":300}",
+ "payloadType": "json",
+ "x": 220,
+ "y": 240,
+ "wires": [
+ [
+ "1b4644a214cfdec6"
+ ]
+ ]
+ },
+ {
+ "id": "115bd58ae573c942",
+ "type": "modbus-client",
+ "name": "12 Channel 192.168.0.41",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": false,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "10512",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "0x3A",
+ "unit_id": 41,
+ "commandDelay": 100,
+ "clientTimeout": 1000,
+ "reconnectOnTimeout": true,
+ "reconnectTimeout": 2000,
+ "parallelUnitIdsAllowed": false,
+ "showErrors": false,
+ "showWarnings": false,
+ "showLogs": false
+ }
+ ]
+ ),
+ testFlowAsExpectedWithConfigMessage: helperExtensions.cleanFlowPositionData(
+ [
+ {
+ "id": "a7aa10e1f0e1cdc6",
+ "type": "tab",
+ "label": "Test Felx-Connector With Config Msg",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "046bd4d2ce7ca5a2",
+ "type": "modbus-server",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "",
+ "logEnabled": false,
+ "hostname": "127.0.0.1",
+ "serverPort": "10512",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "showStatusActivities": false,
+ "x": 345,
+ "y": 80,
+ "wires": [
+ [],
+ [],
+ [],
+ [],
+ [
+ "82f1e05498822790"
+ ]
+ ],
+ "l": false
+ },
+ {
+ "id": "bf2ba5ae45aefab1",
+ "type": "modbus-flex-connector",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "",
+ "maxReconnectsPerMinute": 4,
+ "emptyQueue": false,
+ "showStatusActivities": true,
+ "showErrors": true,
+ "server": "115bd58ae573c942",
+ "emptyMsgOnFail": true,
+ "configMsgOnChange": true,
+ "x": 610,
+ "y": 220,
+ "wires": [
+ [
+ "a3769d4f97d705c0"
+ ]
+ ]
+ },
+ {
+ "id": "88cbf42790afe657",
+ "type": "inject",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "Change for Unit-ID",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": true,
+ "onceDelay": "0.5",
+ "topic": "",
+ "payload": "{\"connectorType\":\"TCP\",\"tcpHost\":\"127.0.0.1\",\"tcpPort\":\"10512\",\"unitId\":1}",
+ "payloadType": "json",
+ "x": 190,
+ "y": 200,
+ "wires": [
+ [
+ "bf2ba5ae45aefab1"
+ ]
+ ]
+ },
+ {
+ "id": "a3769d4f97d705c0",
+ "type": "helper",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 860,
+ "y": 220,
+ "wires": []
+ },
+ {
+ "id": "bb16ef64ed8e8e26",
+ "type": "inject",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "1",
+ "payloadType": "num",
+ "x": 180,
+ "y": 80,
+ "wires": [
+ [
+ "046bd4d2ce7ca5a2"
+ ]
+ ]
+ },
+ {
+ "id": "82f1e05498822790",
+ "type": "helper",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "helper 2",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "true",
+ "targetType": "full",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 490,
+ "y": 100,
+ "wires": []
+ },
+ {
+ "id": "0725eaebc8c950d0",
+ "type": "inject",
+ "z": "a7aa10e1f0e1cdc6",
+ "name": "Change for Unit-ID with Error",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "{\"connectorType\":\"TCP\",\"tcpHost\":\"0.0.0.0\",\"tcpPort\":\"10513\",\"unitId\":300}",
+ "payloadType": "json",
+ "x": 220,
+ "y": 240,
+ "wires": [
+ [
+ "bf2ba5ae45aefab1"
+ ]
+ ]
+ },
+ {
+ "id": "115bd58ae573c942",
+ "type": "modbus-client",
+ "name": "12 Channel 192.168.0.41",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": false,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "10512",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "0x3A",
+ "unit_id": 41,
+ "commandDelay": 100,
+ "clientTimeout": 1000,
+ "reconnectOnTimeout": true,
+ "reconnectTimeout": 2000,
+ "parallelUnitIdsAllowed": false,
+ "showErrors": false,
+ "showWarnings": false,
+ "showLogs": false
}
]
),
diff --git a/test/units/flows/modbus-flex-getter-flows.js b/test/units/flows/modbus-flex-getter-flows.js
index e103522d..ee93bc93 100644
--- a/test/units/flows/modbus-flex-getter-flows.js
+++ b/test/units/flows/modbus-flex-getter-flows.js
@@ -1,34 +1,193 @@
const helperExtensions = require('../../helper/test-helper-extensions')
module.exports = {
-
+ testFlexGetterRequest: helperExtensions.cleanFlowPositionData(
+ [
+ {
+ "id": "94ea44bb692463f2",
+ "type": "tab",
+ "label": "Flow 1",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "22809a5a7e0bac07",
+ "type": "modbus-flex-getter",
+ "z": "94ea44bb692463f2",
+ "name": "",
+ "showStatusActivities": true,
+ "showErrors": true,
+ "showWarnings": true,
+ "logIOActivities": false,
+ "server": "79e791b851e85bfc",
+ "useIOFile": false,
+ "ioFile": "",
+ "useIOForPayload": false,
+ "emptyMsgOnFail": false,
+ "keepMsgProperties": false,
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "x": 620,
+ "y": 340,
+ "wires": [
+ [
+ "a1f29b71179b8de8"
+ ],
+ []
+ ]
+ },
+ {
+ "id": "18702449c6a2a321",
+ "type": "inject",
+ "z": "94ea44bb692463f2",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "",
+ "payloadType": "date",
+ "x": 200,
+ "y": 340,
+ "wires": [
+ [
+ "3f337ccb0f1dc5e0"
+ ]
+ ]
+ },
+ {
+ "id": "3f337ccb0f1dc5e0",
+ "type": "function",
+ "z": "94ea44bb692463f2",
+ "name": "function 81",
+ "func": "\nnode.send({payload: { fc: 4, unitid: 14, address: 0, quantity: 1 }})\nnode.send({payload: { fc: 3, unitid: 137, address: 20498, quantity: 2 }})\n//node.send({payload: { fc: 3, unitid: 1, address: 20498, quantity: 2 }})\n node.send({payload: { fc: 3, unitid: 137, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n// node.send({payload: { fc: 3, unitid: 1, address: 24576, quantity: 2 }})\n",
+ "outputs": 1,
+ "timeout": 0,
+ "noerr": 0,
+ "initialize": "",
+ "finalize": "",
+ "libs": [],
+ "x": 410,
+ "y": 340,
+ "wires": [
+ [
+ "22809a5a7e0bac07"
+ ]
+ ]
+ },
+ {
+ "id": "a1f29b71179b8de8",
+ "type": "helper",
+ "z": "94ea44bb692463f2",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 860,
+ "y": 340,
+ "wires": []
+ },
+ {
+ "id": "4b9f9a23f96d2b80",
+ "type": "modbus-server",
+ "z": "94ea44bb692463f2",
+ "name": "",
+ "logEnabled": true,
+ "hostname": "127.0.0.1",
+ "serverPort": "8506",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "showStatusActivities": false,
+ "x": 480,
+ "y": 180,
+ "wires": [
+ [],
+ [],
+ [],
+ [],
+ []
+ ]
+ },
+ {
+ "id": "79e791b851e85bfc",
+ "type": "modbus-client",
+ "name": "modbus-bridge",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": true,
+ "queueLogEnabled": true,
+ "failureLogEnabled": true,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "8506",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyACM0",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "10",
+ "serialAsciiResponseStartDelimiter": "0x3A",
+ "unit_id": "27",
+ "commandDelay": "10",
+ "clientTimeout": "1000",
+ "reconnectOnTimeout": false,
+ "reconnectTimeout": "500",
+ "parallelUnitIdsAllowed": false,
+ "showErrors": false,
+ "showWarnings": true,
+ "showLogs": true
+ }
+ ]
+ ),
testFlexGetterWithInjectFlow: helperExtensions.cleanFlowPositionData([
{
- id: 'de0ae33276a95fc3',
- type: 'tab',
- label: 'Flex Getter With Inject Flow',
- disabled: false,
- info: '',
- env: []
+ "id": "62bb5e77ce4bbd34",
+ "type": "tab",
+ "label": "Flex Getter With Inject Flow",
+ "disabled": false,
+ "info": "",
+ "env": []
},
{
- id: '445454e4.968564',
- type: 'modbus-server',
- z: 'de0ae33276a95fc3',
- name: '',
- logEnabled: true,
- hostname: '127.0.0.1',
- serverPort: '8505',
- responseDelay: 100,
- delayUnit: 'ms',
- coilsBufferSize: 10000,
- holdingBufferSize: 10000,
- inputBufferSize: 10000,
- discreteBufferSize: 10000,
- showErrors: false,
- x: 340,
- y: 260,
- wires: [
+ "id": "4b9f9a23f96d2b80",
+ "type": "modbus-server",
+ "z": "62bb5e77ce4bbd34",
+ "name": "",
+ "logEnabled": true,
+ "hostname": "127.0.0.1",
+ "serverPort": "8505",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "showStatusActivities": false,
+ "x": 400,
+ "y": 280,
+ "wires": [
[],
[],
[],
@@ -37,99 +196,123 @@ module.exports = {
]
},
{
- id: 'bc5a61b6.a3972',
- type: 'modbus-flex-getter',
- z: 'de0ae33276a95fc3',
- name: '',
- showStatusActivities: true,
- showErrors: false,
- logIOActivities: false,
- server: '92e7bf63.2efd7',
- useIOFile: false,
- ioFile: '',
- useIOForPayload: false,
- emptyMsgOnFail: false,
- keepMsgProperties: false,
- x: 350,
- y: 160,
- wires: [
+ "id": "6d373a8628c3fc70",
+ "type": "modbus-flex-getter",
+ "z": "62bb5e77ce4bbd34",
+ "name": "",
+ "showStatusActivities": true,
+ "showErrors": true,
+ "showWarnings": true,
+ "logIOActivities": false,
+ "server": "92e7bf63.2efd7",
+ "useIOFile": false,
+ "ioFile": "",
+ "useIOForPayload": false,
+ "emptyMsgOnFail": true,
+ "keepMsgProperties": false,
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "x": 420,
+ "y": 160,
+ "wires": [
[
- 'h1'
+ "ba2b29b9cb35764c"
],
- []
+ [
+ "10b6b681d06613ad"
+ ]
]
},
{
- id: 'h1',
- type: 'helper',
- z: 'de0ae33276a95fc3',
- name: '',
- tosidebar: true,
- console: false,
- tostatus: false,
- complete: 'payload',
- targetType: 'msg',
- statusVal: '',
- statusType: 'auto',
- x: 810,
- y: 160,
- wires: []
- },
- {
- id: 'fda9ed0f.c27278',
- type: 'inject',
- z: 'de0ae33276a95fc3',
- name: 'Flex Inject',
- props: [
+ "id": "72e0bf7950bbf625",
+ "type": "inject",
+ "z": "62bb5e77ce4bbd34",
+ "name": "Flex Inject",
+ "props": [
{
- p: 'payload'
+ "p": "payload"
},
{
- p: 'topic',
- vt: 'str'
+ "p": "topic",
+ "vt": "str"
}
],
- repeat: '0.1',
- crontab: '',
- once: true,
- onceDelay: 0.1,
- topic: '',
- payload: '{"value":0,"fc":1,"unitid":1,"address":0,"quantity":1}',
- payloadType: 'json',
- x: 130,
- y: 160,
- wires: [
+ "repeat": "0.1",
+ "crontab": "",
+ "once": true,
+ "onceDelay": "1",
+ "topic": "",
+ "payload": "{\"value\":0,\"fc\":1,\"unitid\":1,\"address\":0,\"quantity\":1}",
+ "payloadType": "json",
+ "x": 190,
+ "y": 160,
+ "wires": [
[
- 'bc5a61b6.a3972'
+ "6d373a8628c3fc70"
]
]
},
{
- id: '92e7bf63.2efd7',
- type: 'modbus-client',
- name: 'ModbusServer',
- clienttype: 'tcp',
- bufferCommands: true,
- stateLogEnabled: true,
- queueLogEnabled: false,
- failureLogEnabled: false,
- tcpHost: '127.0.0.1',
- tcpPort: '8505',
- tcpType: 'DEFAULT',
- serialPort: '/dev/ttyUSB',
- serialType: 'RTU-BUFFERD',
- serialBaudrate: '9600',
- serialDatabits: '8',
- serialStopbits: '1',
- serialParity: 'none',
- serialConnectionDelay: '100',
- serialAsciiResponseStartDelimiter: '',
- unit_id: '1',
- commandDelay: '1',
- clientTimeout: '100',
- reconnectOnTimeout: false,
- reconnectTimeout: '200',
- parallelUnitIdsAllowed: true
+ "id": "ba2b29b9cb35764c",
+ "type": "helper",
+ "z": "62bb5e77ce4bbd34",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 670,
+ "y": 120,
+ "wires": []
+ },
+ {
+ "id": "10b6b681d06613ad",
+ "type": "helper",
+ "z": "62bb5e77ce4bbd34",
+ "name": "helper 2",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 670,
+ "y": 200,
+ "wires": []
+ },
+ {
+ "id": "92e7bf63.2efd7",
+ "type": "modbus-client",
+ "name": "ModbusServer",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": true,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "8505",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "",
+ "unit_id": "1",
+ "commandDelay": "1",
+ "clientTimeout": "100",
+ "reconnectOnTimeout": false,
+ "reconnectTimeout": "200",
+ "parallelUnitIdsAllowed": true,
+ "showErrors": false,
+ "showWarnings": true,
+ "showLogs": true
}
]),
@@ -444,31 +627,31 @@ module.exports = {
testFlexGetterFlow: helperExtensions.cleanFlowPositionData([
{
- id: '8c99fb2559058c40',
- type: 'tab',
- label: 'Flex Getter Flow',
- disabled: false,
- info: '',
- env: []
+ "id": "8c99fb2559058c40",
+ "type": "tab",
+ "label": "Flex Getter Flow",
+ "disabled": false,
+ "info": "",
+ "env": []
},
{
- id: '445454e4.968564',
- type: 'modbus-server',
- z: '8c99fb2559058c40',
- name: '',
- logEnabled: true,
- hostname: '127.0.0.1',
- serverPort: '7605',
- responseDelay: 100,
- delayUnit: 'ms',
- coilsBufferSize: 10000,
- holdingBufferSize: 10000,
- inputBufferSize: 10000,
- discreteBufferSize: 10000,
- showErrors: false,
- x: 620,
- y: 380,
- wires: [
+ "id": "445454e4.968564",
+ "type": "modbus-server",
+ "z": "8c99fb2559058c40",
+ "name": "",
+ "logEnabled": true,
+ "hostname": "127.0.0.1",
+ "serverPort": "7605",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "x": 620,
+ "y": 380,
+ "wires": [
[],
[],
[],
@@ -477,70 +660,120 @@ module.exports = {
]
},
{
- id: 'bc5a61b6.a3972',
- type: 'modbus-flex-getter',
- z: '8c99fb2559058c40',
- name: '',
- showStatusActivities: true,
- showErrors: false,
- logIOActivities: false,
- server: '92e7bf63.2efd7',
- useIOFile: false,
- ioFile: '',
- useIOForPayload: false,
- emptyMsgOnFail: false,
- keepMsgProperties: false,
- x: 550,
- y: 280,
- wires: [
+ "id": "bc5a61b6.a3972",
+ "type": "modbus-flex-getter",
+ "z": "8c99fb2559058c40",
+ "name": "",
+ "showStatusActivities": true,
+ "showErrors": false,
+ "showWarnings": true,
+ "logIOActivities": false,
+ "server": "92e7bf63.2efd7",
+ "useIOFile": false,
+ "ioFile": "",
+ "useIOForPayload": false,
+ "emptyMsgOnFail": true,
+ "keepMsgProperties": false,
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "x": 620,
+ "y": 280,
+ "wires": [
[
- 'h1'
+ "d7d5a41f495c591e"
],
- []
+ [
+ "e2ca3275b10d1d1f"
+ ]
]
},
{
- id: 'h1',
- type: 'helper',
- z: '8c99fb2559058c40',
- name: '',
- tosidebar: true,
- console: false,
- tostatus: false,
- complete: 'payload',
- targetType: 'msg',
- statusVal: '',
- statusType: 'auto',
- x: 870,
- y: 280,
- wires: []
+ "id": "c2ed69ae2984dfda",
+ "type": "inject",
+ "z": "8c99fb2559058c40",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": true,
+ "onceDelay": "1",
+ "topic": "",
+ "payload": "{\"fc\":1,\"address\":10,\"quantity\":5}",
+ "payloadType": "json",
+ "x": 310,
+ "y": 280,
+ "wires": [
+ [
+ "bc5a61b6.a3972"
+ ]
+ ]
},
{
- id: '92e7bf63.2efd7',
- type: 'modbus-client',
- name: 'ModbusServer',
- clienttype: 'tcp',
- bufferCommands: true,
- stateLogEnabled: true,
- queueLogEnabled: false,
- failureLogEnabled: false,
- tcpHost: '127.0.0.1',
- tcpPort: '7605',
- tcpType: 'DEFAULT',
- serialPort: '/dev/ttyUSB',
- serialType: 'RTU-BUFFERD',
- serialBaudrate: '9600',
- serialDatabits: '8',
- serialStopbits: '1',
- serialParity: 'none',
- serialConnectionDelay: '100',
- serialAsciiResponseStartDelimiter: '',
- unit_id: '1',
- commandDelay: '1',
- clientTimeout: '100',
- reconnectOnTimeout: false,
- reconnectTimeout: '200',
- parallelUnitIdsAllowed: true
+ "id": "d7d5a41f495c591e",
+ "type": "helper",
+ "z": "8c99fb2559058c40",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 880,
+ "y": 240,
+ "wires": []
+ },
+ {
+ "id": "e2ca3275b10d1d1f",
+ "type": "helper",
+ "z": "8c99fb2559058c40",
+ "name": "helper 2",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 890,
+ "y": 320,
+ "wires": []
+ },
+ {
+ "id": "92e7bf63.2efd7",
+ "type": "modbus-client",
+ "name": "ModbusServer",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": true,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "7605",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "",
+ "unit_id": "1",
+ "commandDelay": "1",
+ "clientTimeout": "100",
+ "reconnectOnTimeout": false,
+ "reconnectTimeout": "200",
+ "parallelUnitIdsAllowed": true
}
]),
diff --git a/test/units/flows/modbus-io-config-flows.js b/test/units/flows/modbus-io-config-flows.js
index d800e51e..9b26df8c 100644
--- a/test/units/flows/modbus-io-config-flows.js
+++ b/test/units/flows/modbus-io-config-flows.js
@@ -248,6 +248,55 @@ module.exports = {
format: 'utf8',
addressOffset: ''
}
- ])
+ ]),
+
+ testShouldBeLoadedWithoutFileExistsFlow: helperExtensions.cleanFlowPositionData([
+ {
+ "id": "ec42ecc63a604e82",
+ "type": "tab",
+ "label": "Should Be Loaded",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
+ {
+ "id": "9c36e42ffe84d1ef",
+ "type": "modbus-read",
+ "z": "ec42ecc63a604e82",
+ "name": "",
+ "topic": "",
+ "showStatusActivities": false,
+ "logIOActivities": false,
+ "showErrors": false,
+ "showWarnings": true,
+ "unitid": "",
+ "dataType": "",
+ "adr": "",
+ "quantity": "",
+ "rate": "",
+ "rateUnit": "",
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "server": "",
+ "useIOFile": true,
+ "ioFile": "181cab926ad54b56",
+ "useIOForPayload": false,
+ "emptyMsgOnFail": false,
+ "x": 450,
+ "y": 160,
+ "wires": [
+ [],
+ []
+ ]
+ },
+ {
+ "id": "181cab926ad54b56",
+ "type": "modbus-io-config",
+ "name": "ModbusIOTest",
+ "path": "./test/resources/devices_not_existing.json",
+ "format": "utf8",
+ "addressOffset": ""
+ }
+ ]),
}
diff --git a/test/units/flows/modbus-write-flows.js b/test/units/flows/modbus-write-flows.js
index bd26b76d..3f1cf9bf 100644
--- a/test/units/flows/modbus-write-flows.js
+++ b/test/units/flows/modbus-write-flows.js
@@ -113,111 +113,178 @@ module.exports = {
testSimpleWriteFlow: helperExtensions.cleanFlowPositionData(
[
{
- "id": "56859c3a72fde2a9",
- "type": "tab",
- "label": "Test Simple Write Flow",
- "disabled": false,
- "info": "",
- "env": []
+ "id": "56859c3a72fde2a9",
+ "type": "tab",
+ "label": "Test Simple Write Flow",
+ "disabled": false,
+ "info": "",
+ "env": []
},
{
- "id": "49d48c465bed0677",
- "type": "modbus-server",
- "z": "56859c3a72fde2a9",
- "name": "",
- "logEnabled": false,
- "hostname": "127.0.0.1",
- "serverPort": "7512",
- "responseDelay": 100,
- "delayUnit": "ms",
- "coilsBufferSize": 10000,
- "holdingBufferSize": 10000,
- "inputBufferSize": 10000,
- "discreteBufferSize": 10000,
- "showErrors": false,
- "x": 460,
- "y": 360,
- "wires": [
- [],
- [],
- [],
- [],
- []
+ "id": "49d48c465bed0677",
+ "type": "modbus-server",
+ "z": "56859c3a72fde2a9",
+ "name": "",
+ "logEnabled": false,
+ "hostname": "127.0.0.1",
+ "serverPort": "7512",
+ "responseDelay": 100,
+ "delayUnit": "ms",
+ "coilsBufferSize": 10000,
+ "holdingBufferSize": 10000,
+ "inputBufferSize": 10000,
+ "discreteBufferSize": 10000,
+ "showErrors": false,
+ "x": 220,
+ "y": 100,
+ "wires": [
+ [],
+ [],
+ [],
+ [],
+ []
+ ]
+ },
+ {
+ "id": "258dc103f99d2f2e",
+ "type": "modbus-write",
+ "z": "56859c3a72fde2a9",
+ "name": "",
+ "showStatusActivities": false,
+ "showErrors": false,
+ "showWarnings": true,
+ "unitid": "1",
+ "dataType": "Coil",
+ "adr": "10",
+ "quantity": "1",
+ "server": "80aeec4c.0cb9e8",
+ "emptyMsgOnFail": false,
+ "keepMsgProperties": false,
+ "delayOnStart": false,
+ "startDelayTime": "",
+ "x": 540,
+ "y": 220,
+ "wires": [
+ [
+ "f780a7d088ac2b22"
+ ],
+ [
+ "7dc3bdb75f5a590d"
]
+ ]
},
{
- "id": "258dc103f99d2f2e",
- "type": "modbus-write",
- "z": "56859c3a72fde2a9",
- "name": "",
- "showStatusActivities": false,
- "showErrors": false,
- "showWarnings": true,
- "unitid": "1",
- "dataType": "Coil",
- "adr": "10",
- "quantity": "1",
- "server": "80aeec4c.0cb9e8",
- "emptyMsgOnFail": false,
- "keepMsgProperties": false,
- "delayOnStart": false,
- "startDelayTime": "",
- "x": 260,
- "y": 540,
- "wires": [
- [
- "36799705ed88c983"
- ],
- []
+ "id": "f780a7d088ac2b22",
+ "type": "helper",
+ "z": "56859c3a72fde2a9",
+ "name": "helper 1",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 740,
+ "y": 200,
+ "wires": []
+ },
+ {
+ "id": "7dc3bdb75f5a590d",
+ "type": "helper",
+ "z": "56859c3a72fde2a9",
+ "name": "helper 2",
+ "active": true,
+ "tosidebar": true,
+ "console": false,
+ "tostatus": false,
+ "complete": "false",
+ "statusVal": "",
+ "statusType": "auto",
+ "x": 750,
+ "y": 240,
+ "wires": []
+ },
+ {
+ "id": "395c28cb84e084a4",
+ "type": "inject",
+ "z": "56859c3a72fde2a9",
+ "name": "",
+ "props": [
+ {
+ "p": "payload"
+ },
+ {
+ "p": "topic",
+ "vt": "str"
+ }
+ ],
+ "repeat": "0.2",
+ "crontab": "",
+ "once": true,
+ "onceDelay": "1",
+ "topic": "",
+ "payload": "",
+ "payloadType": "date",
+ "x": 170,
+ "y": 220,
+ "wires": [
+ [
+ "8edecf59f1950e6c"
]
+ ]
},
{
- "id": "36799705ed88c983",
- "type": "helper",
- "z": "56859c3a72fde2a9",
- "name": "helper 4",
- "active": true,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "false",
- "statusVal": "",
- "statusType": "auto",
- "x": 560,
- "y": 540,
- "wires": []
+ "id": "8edecf59f1950e6c",
+ "type": "function",
+ "z": "56859c3a72fde2a9",
+ "name": "function 1",
+ "func": "msg.payload = [1,0,1,0,1,0,1,0,1,0]\nreturn msg;",
+ "outputs": 1,
+ "timeout": 0,
+ "noerr": 0,
+ "initialize": "",
+ "finalize": "",
+ "libs": [],
+ "x": 340,
+ "y": 220,
+ "wires": [
+ [
+ "258dc103f99d2f2e"
+ ]
+ ]
},
{
- "id": "80aeec4c.0cb9e8",
- "type": "modbus-client",
- "name": "Modbus Server",
- "clienttype": "tcp",
- "bufferCommands": true,
- "stateLogEnabled": false,
- "queueLogEnabled": false,
- "failureLogEnabled": false,
- "tcpHost": "127.0.0.1",
- "tcpPort": "7512",
- "tcpType": "DEFAULT",
- "serialPort": "/dev/ttyUSB",
- "serialType": "RTU-BUFFERD",
- "serialBaudrate": "9600",
- "serialDatabits": "8",
- "serialStopbits": "1",
- "serialParity": "none",
- "serialConnectionDelay": "100",
- "serialAsciiResponseStartDelimiter": "",
- "unit_id": "1",
- "commandDelay": "1",
- "clientTimeout": "100",
- "reconnectOnTimeout": false,
- "reconnectTimeout": "200",
- "parallelUnitIdsAllowed": true,
- "showErrors": false,
- "showWarnings": true,
- "showLogs": true
+ "id": "80aeec4c.0cb9e8",
+ "type": "modbus-client",
+ "name": "Modbus Server",
+ "clienttype": "tcp",
+ "bufferCommands": true,
+ "stateLogEnabled": false,
+ "queueLogEnabled": false,
+ "failureLogEnabled": false,
+ "tcpHost": "127.0.0.1",
+ "tcpPort": "7512",
+ "tcpType": "DEFAULT",
+ "serialPort": "/dev/ttyUSB",
+ "serialType": "RTU-BUFFERD",
+ "serialBaudrate": "9600",
+ "serialDatabits": "8",
+ "serialStopbits": "1",
+ "serialParity": "none",
+ "serialConnectionDelay": "100",
+ "serialAsciiResponseStartDelimiter": "",
+ "unit_id": "1",
+ "commandDelay": "1",
+ "clientTimeout": "100",
+ "reconnectOnTimeout": false,
+ "reconnectTimeout": "200",
+ "parallelUnitIdsAllowed": true,
+ "showErrors": false,
+ "showWarnings": true,
+ "showLogs": true
}
- ]
+ ]
),
testWriteFlow: helperExtensions.cleanFlowPositionData([
diff --git a/test/units/modbus-flex-connector-test.js b/test/units/modbus-flex-connector-test.js
index 0837da98..1ff6d0fd 100644
--- a/test/units/modbus-flex-connector-test.js
+++ b/test/units/modbus-flex-connector-test.js
@@ -23,6 +23,7 @@ helper.init(require.resolve('node-red'))
const testFlows = require('./flows/modbus-flex-connector-flows')
const mBasics = require('../../src/modbus-basics')
const _ = require('underscore')
+const { getPort } = require('../helper/test-helper-extensions')
describe('Flex Connector node Unit Testing', function () {
before(function (done) {
@@ -55,45 +56,53 @@ describe('Flex Connector node Unit Testing', function () {
})
})
- // it('should change the TCP-Port of the client from 7522 to 8522', function (done) {
- // helper.load(testFlexConnectorNodes, testFlows.testShouldChangeTcpPortFlow, function () {
- // const modbusNode = helper.getNode('40ddaabb.fd44d4')
- // const clientNode = helper.getNode('2a253153.fae3ce')
- // modbusNode.should.have.property('name', 'FlexConnector')
- // modbusNode.should.have.property('emptyQueue', true)
- // setTimeout(function () {
- // modbusNode.receive({ payload: { connectorType: 'TCP', tcpHost: '127.0.0.1', tcpPort: 8522 } })
- // }, 1000)
- // clientNode.on('mbconnected', () => {
- // if (clientNode && clientNode.tcpPort === 8522) {
- // done()
- // }
- // })
- // })
- // })
-
- // it('should change the Serial-Port of the client from /dev/ttyUSB to /dev/ttyUSB0', function (done) {
- // helper.load(testFlexConnectorNodes, testFlows.testShouldChangeSerialPortFlow, function () {
- // const modbusNode = helper.getNode('40ddaabb.fd44d4')
- // const clientNode = helper.getNode('2a253153.fae3ef')
- // modbusNode.should.have.property('name', 'FlexConnector')
- // modbusNode.should.have.property('emptyQueue', true)
- // setTimeout(function () {
- // modbusNode.receive({
- // payload: {
- // connectorType: 'SERIAL',
- // serialPort: '/dev/ttyUSB0',
- // serialBaudrate: '9600'
- // }
- // })
- // }, 1000)
- // clientNode.on('mbinit', () => {
- // if (clientNode && clientNode.serialBaudrate === 9600 && clientNode.serialPort === '/dev/ttyUSB0') {
- // done()
- // }
- // })
- // })
- // })
+ it('should change the TCP-Port of the client from 7522 to 8522', function (done) {
+ const flow = Array.from(testFlows.testShouldChangeTcpPortFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+
+ helper.load(testFlexConnectorNodes, flow, function () {
+ const modbusNode = helper.getNode('40ddaabb.fd44d4')
+ const clientNode = helper.getNode('2a253153.fae3ce')
+ modbusNode.should.have.property('name', 'FlexConnector')
+ modbusNode.should.have.property('emptyQueue', true)
+
+ clientNode.on('mbconnected', () => {
+ if (clientNode && clientNode.tcpPort === port) {
+ done()
+ }
+ })
+
+ setTimeout(function () {
+ modbusNode.receive({ payload: { connectorType: 'TCP', tcpHost: '127.0.0.1', tcpPort: port } })
+ }, 1000)
+ })
+ })
+ })
+
+ it('should change the Serial-Port of the client from /dev/ttyUSB to /dev/ttyUSB0', function (done) {
+ helper.load(testFlexConnectorNodes, testFlows.testShouldChangeSerialPortFlow, function () {
+ const modbusNode = helper.getNode('40ddaabb.fd44d4')
+ const clientNode = helper.getNode('2a253153.fae3ef')
+ modbusNode.should.have.property('name', 'FlexConnector')
+ modbusNode.should.have.property('emptyQueue', true)
+ setTimeout(function () {
+ modbusNode.receive({
+ payload: {
+ connectorType: 'SERIAL',
+ serialPort: '/dev/ttyUSB0',
+ serialBaudrate: '9600'
+ }
+ })
+ }, 1000)
+ clientNode.on('mbinit', () => {
+ if (clientNode && clientNode.serialBaudrate === 9600 && clientNode.serialPort === '/dev/ttyUSB0') {
+ done()
+ }
+ })
+ })
+ })
it('should be inactive if message not allowed', function (done) {
helper.load(testFlexConnectorNodes, testFlows.testShouldBeLoadedFlow, function () {
@@ -119,17 +128,15 @@ describe('Flex Connector node Unit Testing', function () {
})
})
- // it('should be state queueing - ready to send', function (done) {
- // helper.load(testFlexConnectorNodes, testFlows.testShouldBeLoadedFlow, function () {
- // const modbusClientNode = helper.getNode('2a253153.fae3ce')
- // setTimeout(() => {
- // mBasics.setNodeStatusTo('queueing', modbusClientNode)
- // const isReady = modbusClientNode.isReadyToSend(modbusClientNode)
- // isReady.should.be.true()
- // done()
- // }, 1500)
- // })
- // })
+ it('should be state reconnecting - not ready to send', function (done) {
+ helper.load(testFlexConnectorNodes, testFlows.testShouldBeLoadedFlow, function () {
+ const modbusNode = helper.getNode('40ddaabb.fd44d4')
+ setTimeout(() => {
+ modbusNode.statusText.should.containEql('reconnecting')
+ done()
+ }, 800)
+ })
+ })
it('should be not state queueing - not ready to send', function (done) {
helper.load(testFlexConnectorNodes, testFlows.testShouldBeLoadedFlow, function () {
@@ -143,13 +150,39 @@ describe('Flex Connector node Unit Testing', function () {
})
})
- // it('should process the flow as expected', function (done) {
- // helper.load(testFlexConnectorNodes, testFlows.testFlowAsExpected, function () {
- // const flexNode = helper.getNode('1b4644a214cfdec6')
- // expect(flexNode).to.be.any()
- // done()
- // })
- // })
+ it('should process the flow as expected', function (done) {
+ const flow = Array.from(testFlows.testFlowAsExpected)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[8].tcpPort = port
+
+ helper.load(testFlexConnectorNodes, flow, function () {
+ const flexNode = helper.getNode('1b4644a214cfdec6')
+ if (flexNode) {
+ flexNode.onConfigError(new Error('Test Error'), { payload: {} })
+ done()
+ }
+ })
+ })
+ })
+
+ it('should process the flow as expected with config msg', function (done) {
+ const flow = Array.from(testFlows.testFlowAsExpectedWithConfigMessage)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[8].tcpPort = port
+
+ helper.load(testFlexConnectorNodes, testFlows.testFlowAsExpectedWithConfigMessage, function () {
+ const flexNode = helper.getNode('bf2ba5ae45aefab1')
+ if (flexNode) {
+ flexNode.onConfigError(new Error('Test Error'), { payload: {} })
+ done()
+ }
+ })
+ })
+ })
})
describe('post', function () {
diff --git a/test/units/modbus-flex-getter-test.js b/test/units/modbus-flex-getter-test.js
index c910cd9c..660c9969 100644
--- a/test/units/modbus-flex-getter-test.js
+++ b/test/units/modbus-flex-getter-test.js
@@ -81,70 +81,70 @@ describe('Flex Getter node Testing', function () {
})
})
- // it('simple flow with inject should be loaded', function (done) {
- // const flow = Array.from(testFlows.testFlexGetterWithInjectFlow)
-
- // getPort().then((port) => {
- // flow[1].serverPort = port
- // flow[5].tcpPort = port
-
- // helper.load(testFlexGetterNodes, flow, function () {
- // const modbusGetter = helper.getNode('bc5a61b6.a3972')
- // const h1 = helper.getNode('h1')
- // let counter = 0
- // h1.on('input', function () {
- // counter++
- // if (modbusGetter.bufferMessageList.size === 0 && counter === 1) {
- // done()
- // }
- // })
- // })
- // })
- // })
-
- // it('simple flow with inject should be loaded and read be done', function (done) {
- // const flow = Array.from(testFlows.testFlexGetterWithInjectFlow)
-
- // getPort().then((port) => {
- // flow[1].serverPort = port
- // flow[5].tcpPort = port
-
- // helper.load(testFlexGetterNodes, flow, function () {
- // const modbusGetter = helper.getNode('bc5a61b6.a3972')
- // let counter = 0
- // modbusGetter.on('modbusFlexGetterNodeDone', function () {
- // counter++
- // if (modbusGetter.bufferMessageList.size === 0 && counter === 1) {
- // done()
- // }
- // })
- // })
- // })
- // })
-
- // it('simple flow should be loaded and with receive got input', function (done) {
- // const flow = Array.from(testFlows.testFlexGetterFlow)
-
- // getPort().then((port) => {
- // flow[1].serverPort = port
- // flow[4].tcpPort = port
-
- // helper.load(testFlexGetterNodes, flow, function () {
- // const modbusGetter = helper.getNode('bc5a61b6.a3972')
- // const h1 = helper.getNode('h1')
- // let counter = 0
- // h1.on('input', function () {
- // counter++
- // if (modbusGetter.bufferMessageList.size === 0 && counter === 1) {
- // done()
- // }
- // })
- // setTimeout(function () {
- // modbusGetter.receive({ payload: '{ "fc": 1, "unitid": 1,"address": 0, "quantity": 4 }' })
- // }, 800)
- // })
- // })
- // })
+ it('simple flow with inject should be loaded', function (done) {
+ const flow = Array.from(testFlows.testFlexGetterWithInjectFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[6].tcpPort = port
+
+ helper.load(testFlexGetterNodes, flow, function () {
+ const modbusGetter = helper.getNode('6d373a8628c3fc70')
+ const h1 = helper.getNode('ba2b29b9cb35764c')
+ let counter = 0
+ h1.on('input', function () {
+ counter++
+ if (modbusGetter.bufferMessageList.size === 0 && counter === 1) {
+ done()
+ }
+ })
+ })
+ })
+ })
+
+ it('simple flow with inject should be loaded and read be done and some msgs are queued', function (done) {
+ const flow = Array.from(testFlows.testFlexGetterWithInjectFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[6].tcpPort = port
+
+ helper.load(testFlexGetterNodes, flow, function () {
+ const modbusGetter = helper.getNode('6d373a8628c3fc70')
+ let counter = 0
+ modbusGetter.on('modbusFlexGetterNodeDone', function () {
+ counter++
+ if (modbusGetter.bufferMessageList.size >= 0 && counter === 1) {
+ done()
+ }
+ })
+ })
+ })
+ })
+
+ it('simple flow should be loaded and with receive got input', function (done) {
+ const flow = Array.from(testFlows.testFlexGetterFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[4].tcpPort = port
+
+ helper.load(testFlexGetterNodes, flow, function () {
+ const modbusGetter = helper.getNode('bc5a61b6.a3972')
+ const h1 = helper.getNode('d7d5a41f495c591e')
+ let counter = 0
+ h1.on('input', function () {
+ counter++
+ if (modbusGetter.bufferMessageList.size >= 0 && counter === 1) {
+ done()
+ }
+ })
+ setTimeout(function () {
+ modbusGetter.receive({ payload: '{ "fc": 1, "unitid": 1,"address": 0, "quantity": 4 }' })
+ }, 800)
+ })
+ })
+ })
it('simple flow with wrong write inject should not crash', function (done) {
const flow = Array.from(testFlows.testFlexGetterFlow)
@@ -292,27 +292,34 @@ describe('Flex Getter node Testing', function () {
})
})
- // it('should return true for valid Modbus message', function (done) {
- // const modbusMsg = {
- // payload: {
- // fc: 1,
- // address: 10,
- // quantity: 5
- // }
- // }
- // const flow = Array.from(testFlows.testFlexGetterFlow)
- // flow[1].serverPort = "50114"
- // helper.load(testFlexGetterNodes, flow, function () {
- // const n1 = helper.getNode('bc5a61b6.a3972');
- // setTimeout(() => {
- // n1.on('input', function (msg) {
- //
- // const isValid = n1.isValidModbusMsg(msg)
- // isValid.should.be.true
- // done() } , 1500)
- // })
- // })
- // })
+ it('should return true for valid Modbus message', function (done) {
+ const modbusMsg = {
+ payload: {
+ fc: 1,
+ address: 10,
+ quantity: 5,
+ unitId: NaN
+ }
+ }
+ const flow = Array.from(testFlows.testFlexGetterFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[4].tcpPort = port
+
+ helper.load(testFlexGetterNodes, flow, function () {
+ const n1 = helper.getNode('bc5a61b6.a3972')
+ setTimeout(() => {
+ n1.on('input', function (msg) {
+ const isValid = msg.payload.fc.should.equal(modbusMsg.payload.fc)
+ if (isValid) {
+ done()
+ }
+ }, 1500)
+ })
+ })
+ })
+ })
/**
it('should not be ready for input - no client', function (done) {
@@ -535,6 +542,41 @@ describe('Flex Getter node Testing', function () {
})
})
+ describe('ModbusFlexGetter', () => {
+ it('should send requests sequentially and not get stuck in a queueing state', (done) => {
+ const flow = Array.from(testFlows.testFlexGetterRequest)
+
+ getPort().then((port) => {
+ flow[5].serverPort = port
+ flow[6].tcpPort = port
+
+ helper.load(testFlexGetterNodes, flow, function () {
+ let count = 0
+ const modbusFlexGetter = helper.getNode('22809a5a7e0bac07')
+
+ const msg = [
+ { payload: { fc: 4, unitid: 1, address: 0, quantity: 1 } }, // timeout
+ { payload: { fc: 3, unitid: 1, address: 20, quantity: 2 } },
+ { payload: { fc: 3, unitid: 1, address: 10, quantity: 2 } }
+ ]
+
+ setTimeout(() => {
+ modbusFlexGetter.on('modbusFlexGetterNodeDone', () => {
+ count++
+ if (count === msg.length) {
+ done()
+ }
+ })
+
+ msg.forEach((m) => {
+ modbusFlexGetter.receive(m)
+ })
+ }, 1000)
+ })
+ })
+ })
+ })
+
describe('post', function () {
it('should fail for invalid node', function (done) {
helper.load(testFlexGetterNodes, [], function () {
diff --git a/test/units/modbus-io-config-test.js b/test/units/modbus-io-config-test.js
index e69a42f5..b96748f0 100644
--- a/test/units/modbus-io-config-test.js
+++ b/test/units/modbus-io-config-test.js
@@ -152,6 +152,14 @@ describe('IO Config node Testing', function () {
done()
})
})
+
+ it('should be loaded while file does not exist', function (done) {
+ helper.load(testIoConfigNodes, testFlows.testShouldBeLoadedWithoutFileExistsFlow, function () {
+ const modbusIOConfigNode = helper.getNode('181cab926ad54b56')
+ modbusIOConfigNode.should.have.property('name', 'ModbusIOTest')
+ done()
+ })
+ })
})
describe('post', function () {
diff --git a/test/units/modbus-write-test.js b/test/units/modbus-write-test.js
index b5ba9217..56115d02 100644
--- a/test/units/modbus-write-test.js
+++ b/test/units/modbus-write-test.js
@@ -15,15 +15,17 @@ const injectNode = require('@node-red/nodes/core/common/20-inject.js')
const clientNode = require('../../src/modbus-client.js')
const serverNode = require('../../src/modbus-server.js')
const nodeUnderTest = require('../../src/modbus-write.js')
+const functionNode = require('@node-red/nodes/core/function/10-function')
+
const sinon = require('sinon')
const helper = require('node-red-node-test-helper')
helper.init(require.resolve('node-red'))
const expect = require('chai').expect
-const testSimpleWriteParametersNodes = [injectNode, clientNode, serverNode, nodeUnderTest]
-// const { getPort } = require('../helper/test-helper-extensions')
+const testSimpleWriteParametersNodes = [injectNode, clientNode, serverNode, nodeUnderTest, functionNode]
const testFlows = require('./flows/modbus-write-flows')
+const { getPort } = require('../helper/test-helper-extensions')
describe('Write node Testing', function () {
before(function (done) {
@@ -134,84 +136,102 @@ describe('Write node Testing', function () {
})
})
- // it('simple flow with boolean injects and write should be loaded', function (done) {
- // helper.load(testSimpleWriteParametersNodes, testFlows.testWriteCycleFlow, function () {
- // const modbusWrite = helper.getNode('1ed908da.427ecf')
- // const h1 = helper.getNode('h1')
- // h1.on('input', function () {
- // if (modbusWrite.bufferMessageList.size === 0) {
- // done()
- // }
- // })
- // })
- // })
-
- // it('simple flow with string false http inject and write should be loaded', function (done) {
- // helper.load(testSimpleWriteParametersNodes, testFlows.testSimpleWriteFlow, function () {
- // const modbusWrite = helper.getNode('258dc103f99d2f2e')
- // setTimeout(function () {
- // modbusWrite.receive({ payload: { value: 'false', fc: 5, unitid: 1, address: 0, quantity: 1 } })
- // }, 800)
- // const h1 = helper.getNode('h1')
- // h1.on('input', function () {
- // if (modbusWrite.bufferMessageList.size === 0) {
- // done()
- // }
- // })
- // })
- // })
-
- // it('simple flow with string with array of values input from http should be parsed and written', function (done) {
- // testFlows.testSimpleWriteFlow[1].serverPort = 5802
- // testFlows.testSimpleWriteFlow[4].tcpPort = 5802
- // helper.load(testSimpleWriteParametersNodes, testFlows.testSimpleWriteFlow, function () {
- // const h1 = helper.getNode('h1')
- // h1.on('input', function () {
- // if (modbusWrite.bufferMessageList.size === 0) {
- // done()
- // }
- // })
- // const modbusWrite = helper.getNode('1ed908da.427ecf')
- // setTimeout(function () {
- // modbusWrite.receive({ payload: '{ "value": [0,1,0,1], "fc": 5, "unitid": 1,"address": 0, "quantity": 4 }' })
- // }, 800)
- // })
- // })
-
- // it('should inject at least 4 messages but only use one to test initial delay', function (done) {
- // const flow = Array.from(testFlows.testWriteDelayFlow)
- // flow[1].serverPort = 5803
- // flow[10].tcpPort = 5803
- // helper.load(testSimpleWriteParametersNodes, flow, function () {
- // const writeNode = helper.getNode('1ed908da.427ecf')
- // const helperNode = helper.getNode('h1')
- // let getterCounter = 0
- // let helperCounter = 0
- // let startingTimestamp = null
- // let endTimestamp = null
-
- // writeNode.on('input', () => {
- // getterCounter++
-
- // if (getterCounter === 1) {
- // startingTimestamp = Date.now()
- // }
- // endTimestamp = Date.now()
- // })
+ it('simple flow with boolean injects and write should be loaded', function (done) {
+ helper.load(testSimpleWriteParametersNodes, testFlows.testWriteCycleFlow, function () {
+ const modbusWrite = helper.getNode('1ed908da.427ecf')
+ const h1 = helper.getNode('h1')
+ h1.on('input', function () {
+ if (modbusWrite.bufferMessageList.size === 0) {
+ done()
+ }
+ })
+ })
+ })
- // helperNode.on('input', () => {
- // helperCounter++
+ it('simple flow with string false http inject and write should be loaded', function (done) {
+ const flow = Array.from(testFlows.testSimpleWriteFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[7].tcpPort = port
+
+ helper.load(testSimpleWriteParametersNodes, flow, function () {
+ const modbusWrite = helper.getNode('258dc103f99d2f2e')
+ setTimeout(function () {
+ modbusWrite.receive({ payload: { value: 'false', fc: 5, unitid: 1, address: 0, quantity: 1 } })
+ }, 800)
+ const h1 = helper.getNode('f780a7d088ac2b22')
+ h1.on('input', function () {
+ if (modbusWrite.bufferMessageList.size === 0) {
+ done()
+ }
+ })
+ })
+ })
+ })
- // const difBetweenTimestamps = endTimestamp - startingTimestamp
- // getterCounter.should.be.greaterThanOrEqual(6)
- // helperCounter.should.be.greaterThanOrEqual(1)
- // helperCounter.should.be.greaterThanOrEqual(3)
- // difBetweenTimestamps.should.be.greaterThanOrEqual(1500)
+ it('simple flow with string with array of values input from http should be parsed and written', function (done) {
+ const flow = Array.from(testFlows.testSimpleWriteFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[7].tcpPort = port
+
+ helper.load(testSimpleWriteParametersNodes, flow, function () {
+ const h1 = helper.getNode('f780a7d088ac2b22')
+ h1.on('input', function () {
+ if (modbusWrite.bufferMessageList.size === 0) {
+ done()
+ }
+ })
+ const modbusWrite = helper.getNode('258dc103f99d2f2e')
+ setTimeout(function () {
+ modbusWrite.receive({ payload: '{ "value": [0,1,0,1], "fc": 5, "unitid": 1,"address": 0, "quantity": 4 }' })
+ }, 800)
+ })
+ })
+ })
- // done()
- // })
- // })
- // })
+ it('should inject at least 4 messages but only use one to test initial delay', function (done) {
+ const flow = Array.from(testFlows.testSimpleWriteFlow)
+
+ getPort().then((port) => {
+ flow[1].serverPort = port
+ flow[7].tcpPort = port
+
+ helper.load(testSimpleWriteParametersNodes, flow, function () {
+ const writeNode = helper.getNode('258dc103f99d2f2e')
+ const helperNode = helper.getNode('f780a7d088ac2b22')
+ let getterCounter = 0
+ let helperCounter = 0
+ let startingTimestamp = null
+ let endTimestamp = null
+
+ writeNode.on('input', () => {
+ getterCounter++
+
+ if (getterCounter === 1) {
+ startingTimestamp = Date.now()
+ }
+ endTimestamp = Date.now()
+ })
+
+ helperNode.on('input', () => {
+ helperCounter++
+
+ if (helperCounter > 3) {
+ const difBetweenTimestamps = endTimestamp - startingTimestamp
+ getterCounter.should.be.greaterThanOrEqual(6)
+ helperCounter.should.be.greaterThanOrEqual(1)
+ helperCounter.should.be.greaterThanOrEqual(3)
+ difBetweenTimestamps.should.be.greaterThanOrEqual(1500)
+
+ done()
+ }
+ })
+ })
+ })
+ })
})
describe('post', function () {
diff --git a/yarn.lock b/yarn.lock
index 54baa8f2..4852fdf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11,9 +11,9 @@
"@jridgewell/trace-mapping" "^0.3.24"
"@babel/cli@^7.24.5":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.7.tgz#eb2868c1fa384b17ea88d60107577d3e6fd05c4e"
- integrity sha512-8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A==
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.8.tgz#79eaa55a69c77cafbea3e87537fd1df5a5a2edf8"
+ integrity sha512-isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg==
dependencies:
"@jridgewell/trace-mapping" "^0.3.25"
commander "^6.2.0"
@@ -34,38 +34,38 @@
"@babel/highlight" "^7.24.7"
picocolors "^1.0.0"
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed"
- integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.8":
+ version "7.24.9"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.9.tgz#53eee4e68f1c1d0282aa0eb05ddb02d033fc43a0"
+ integrity sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==
"@babel/core@^7.24.5", "@babel/core@^7.7.5":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4"
- integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==
+ version "7.24.9"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.9.tgz#dc07c9d307162c97fa9484ea997ade65841c7c82"
+ integrity sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==
dependencies:
"@ampproject/remapping" "^2.2.0"
"@babel/code-frame" "^7.24.7"
- "@babel/generator" "^7.24.7"
- "@babel/helper-compilation-targets" "^7.24.7"
- "@babel/helper-module-transforms" "^7.24.7"
- "@babel/helpers" "^7.24.7"
- "@babel/parser" "^7.24.7"
+ "@babel/generator" "^7.24.9"
+ "@babel/helper-compilation-targets" "^7.24.8"
+ "@babel/helper-module-transforms" "^7.24.9"
+ "@babel/helpers" "^7.24.8"
+ "@babel/parser" "^7.24.8"
"@babel/template" "^7.24.7"
- "@babel/traverse" "^7.24.7"
- "@babel/types" "^7.24.7"
+ "@babel/traverse" "^7.24.8"
+ "@babel/types" "^7.24.9"
convert-source-map "^2.0.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
json5 "^2.2.3"
semver "^6.3.1"
-"@babel/generator@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d"
- integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==
+"@babel/generator@^7.24.8", "@babel/generator@^7.24.9":
+ version "7.24.10"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.10.tgz#a4ab681ec2a78bbb9ba22a3941195e28a81d8e76"
+ integrity sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==
dependencies:
- "@babel/types" "^7.24.7"
+ "@babel/types" "^7.24.9"
"@jridgewell/gen-mapping" "^0.3.5"
"@jridgewell/trace-mapping" "^0.3.25"
jsesc "^2.5.1"
@@ -85,26 +85,26 @@
"@babel/traverse" "^7.24.7"
"@babel/types" "^7.24.7"
-"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9"
- integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz#b607c3161cd9d1744977d4f97139572fe778c271"
+ integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==
dependencies:
- "@babel/compat-data" "^7.24.7"
- "@babel/helper-validator-option" "^7.24.7"
- browserslist "^4.22.2"
+ "@babel/compat-data" "^7.24.8"
+ "@babel/helper-validator-option" "^7.24.8"
+ browserslist "^4.23.1"
lru-cache "^5.1.1"
semver "^6.3.1"
"@babel/helper-create-class-features-plugin@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b"
- integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz#47f546408d13c200c0867f9d935184eaa0851b09"
+ integrity sha512-4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.24.7"
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-function-name" "^7.24.7"
- "@babel/helper-member-expression-to-functions" "^7.24.7"
+ "@babel/helper-member-expression-to-functions" "^7.24.8"
"@babel/helper-optimise-call-expression" "^7.24.7"
"@babel/helper-replace-supers" "^7.24.7"
"@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
@@ -153,13 +153,13 @@
dependencies:
"@babel/types" "^7.24.7"
-"@babel/helper-member-expression-to-functions@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
- integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
+"@babel/helper-member-expression-to-functions@^7.24.7", "@babel/helper-member-expression-to-functions@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6"
+ integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==
dependencies:
- "@babel/traverse" "^7.24.7"
- "@babel/types" "^7.24.7"
+ "@babel/traverse" "^7.24.8"
+ "@babel/types" "^7.24.8"
"@babel/helper-module-imports@^7.24.7":
version "7.24.7"
@@ -169,10 +169,10 @@
"@babel/traverse" "^7.24.7"
"@babel/types" "^7.24.7"
-"@babel/helper-module-transforms@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8"
- integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==
+"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.24.9":
+ version "7.24.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz#e13d26306b89eea569180868e652e7f514de9d29"
+ integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==
dependencies:
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-module-imports" "^7.24.7"
@@ -187,10 +187,10 @@
dependencies:
"@babel/types" "^7.24.7"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0"
- integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+ integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
"@babel/helper-remap-async-to-generator@^7.24.7":
version "7.24.7"
@@ -233,20 +233,20 @@
dependencies:
"@babel/types" "^7.24.7"
-"@babel/helper-string-parser@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"
- integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==
+"@babel/helper-string-parser@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+ integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
"@babel/helper-validator-identifier@^7.24.7":
version "7.24.7"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
-"@babel/helper-validator-option@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6"
- integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==
+"@babel/helper-validator-option@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+ integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
"@babel/helper-wrap-function@^7.24.7":
version "7.24.7"
@@ -258,13 +258,13 @@
"@babel/traverse" "^7.24.7"
"@babel/types" "^7.24.7"
-"@babel/helpers@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416"
- integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==
+"@babel/helpers@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.8.tgz#2820d64d5d6686cca8789dd15b074cd862795873"
+ integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==
dependencies:
"@babel/template" "^7.24.7"
- "@babel/types" "^7.24.7"
+ "@babel/types" "^7.24.8"
"@babel/highlight@^7.24.7":
version "7.24.7"
@@ -276,10 +276,10 @@
js-tokens "^4.0.0"
picocolors "^1.0.0"
-"@babel/parser@^7.24.7", "@babel/parser@^7.9.4":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
- integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
+"@babel/parser@^7.24.7", "@babel/parser@^7.24.8", "@babel/parser@^7.9.4":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.8.tgz#58a4dbbcad7eb1d48930524a3fd93d93e9084c6f"
+ integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==
"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.7":
version "7.24.7"
@@ -502,16 +502,16 @@
"@babel/helper-plugin-utils" "^7.24.7"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-transform-classes@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf"
- integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==
+"@babel/plugin-transform-classes@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz#ad23301fe5bc153ca4cf7fb572a9bc8b0b711cf7"
+ integrity sha512-VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.24.7"
- "@babel/helper-compilation-targets" "^7.24.7"
+ "@babel/helper-compilation-targets" "^7.24.8"
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-function-name" "^7.24.7"
- "@babel/helper-plugin-utils" "^7.24.7"
+ "@babel/helper-plugin-utils" "^7.24.8"
"@babel/helper-replace-supers" "^7.24.7"
"@babel/helper-split-export-declaration" "^7.24.7"
globals "^11.1.0"
@@ -524,12 +524,12 @@
"@babel/helper-plugin-utils" "^7.24.7"
"@babel/template" "^7.24.7"
-"@babel/plugin-transform-destructuring@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e"
- integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==
+"@babel/plugin-transform-destructuring@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550"
+ integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.24.7"
+ "@babel/helper-plugin-utils" "^7.24.8"
"@babel/plugin-transform-dotall-regex@^7.24.7":
version "7.24.7"
@@ -625,13 +625,13 @@
"@babel/helper-module-transforms" "^7.24.7"
"@babel/helper-plugin-utils" "^7.24.7"
-"@babel/plugin-transform-modules-commonjs@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz#9fd5f7fdadee9085886b183f1ad13d1ab260f4ab"
- integrity sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==
+"@babel/plugin-transform-modules-commonjs@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
+ integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
dependencies:
- "@babel/helper-module-transforms" "^7.24.7"
- "@babel/helper-plugin-utils" "^7.24.7"
+ "@babel/helper-module-transforms" "^7.24.8"
+ "@babel/helper-plugin-utils" "^7.24.8"
"@babel/helper-simple-access" "^7.24.7"
"@babel/plugin-transform-modules-systemjs@^7.24.7":
@@ -709,12 +709,12 @@
"@babel/helper-plugin-utils" "^7.24.7"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-transform-optional-chaining@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454"
- integrity sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==
+"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d"
+ integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==
dependencies:
- "@babel/helper-plugin-utils" "^7.24.7"
+ "@babel/helper-plugin-utils" "^7.24.8"
"@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
@@ -794,12 +794,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.24.7"
-"@babel/plugin-transform-typeof-symbol@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz#f074be466580d47d6e6b27473a840c9f9ca08fb0"
- integrity sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==
+"@babel/plugin-transform-typeof-symbol@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c"
+ integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==
dependencies:
- "@babel/helper-plugin-utils" "^7.24.7"
+ "@babel/helper-plugin-utils" "^7.24.8"
"@babel/plugin-transform-unicode-escapes@^7.24.7":
version "7.24.7"
@@ -833,14 +833,14 @@
"@babel/helper-plugin-utils" "^7.24.7"
"@babel/preset-env@^7.24.5":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37"
- integrity sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==
- dependencies:
- "@babel/compat-data" "^7.24.7"
- "@babel/helper-compilation-targets" "^7.24.7"
- "@babel/helper-plugin-utils" "^7.24.7"
- "@babel/helper-validator-option" "^7.24.7"
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.8.tgz#e0db94d7f17d6f0e2564e8d29190bc8cdacec2d1"
+ integrity sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==
+ dependencies:
+ "@babel/compat-data" "^7.24.8"
+ "@babel/helper-compilation-targets" "^7.24.8"
+ "@babel/helper-plugin-utils" "^7.24.8"
+ "@babel/helper-validator-option" "^7.24.8"
"@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.7"
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7"
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
@@ -871,9 +871,9 @@
"@babel/plugin-transform-block-scoping" "^7.24.7"
"@babel/plugin-transform-class-properties" "^7.24.7"
"@babel/plugin-transform-class-static-block" "^7.24.7"
- "@babel/plugin-transform-classes" "^7.24.7"
+ "@babel/plugin-transform-classes" "^7.24.8"
"@babel/plugin-transform-computed-properties" "^7.24.7"
- "@babel/plugin-transform-destructuring" "^7.24.7"
+ "@babel/plugin-transform-destructuring" "^7.24.8"
"@babel/plugin-transform-dotall-regex" "^7.24.7"
"@babel/plugin-transform-duplicate-keys" "^7.24.7"
"@babel/plugin-transform-dynamic-import" "^7.24.7"
@@ -886,7 +886,7 @@
"@babel/plugin-transform-logical-assignment-operators" "^7.24.7"
"@babel/plugin-transform-member-expression-literals" "^7.24.7"
"@babel/plugin-transform-modules-amd" "^7.24.7"
- "@babel/plugin-transform-modules-commonjs" "^7.24.7"
+ "@babel/plugin-transform-modules-commonjs" "^7.24.8"
"@babel/plugin-transform-modules-systemjs" "^7.24.7"
"@babel/plugin-transform-modules-umd" "^7.24.7"
"@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"
@@ -896,7 +896,7 @@
"@babel/plugin-transform-object-rest-spread" "^7.24.7"
"@babel/plugin-transform-object-super" "^7.24.7"
"@babel/plugin-transform-optional-catch-binding" "^7.24.7"
- "@babel/plugin-transform-optional-chaining" "^7.24.7"
+ "@babel/plugin-transform-optional-chaining" "^7.24.8"
"@babel/plugin-transform-parameters" "^7.24.7"
"@babel/plugin-transform-private-methods" "^7.24.7"
"@babel/plugin-transform-private-property-in-object" "^7.24.7"
@@ -907,7 +907,7 @@
"@babel/plugin-transform-spread" "^7.24.7"
"@babel/plugin-transform-sticky-regex" "^7.24.7"
"@babel/plugin-transform-template-literals" "^7.24.7"
- "@babel/plugin-transform-typeof-symbol" "^7.24.7"
+ "@babel/plugin-transform-typeof-symbol" "^7.24.8"
"@babel/plugin-transform-unicode-escapes" "^7.24.7"
"@babel/plugin-transform-unicode-property-regex" "^7.24.7"
"@babel/plugin-transform-unicode-regex" "^7.24.7"
@@ -916,7 +916,7 @@
babel-plugin-polyfill-corejs2 "^0.4.10"
babel-plugin-polyfill-corejs3 "^0.10.4"
babel-plugin-polyfill-regenerator "^0.6.1"
- core-js-compat "^3.31.0"
+ core-js-compat "^3.37.1"
semver "^6.3.1"
"@babel/preset-modules@0.1.6-no-external-plugins":
@@ -945,9 +945,9 @@
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
"@babel/runtime@^7.17.2", "@babel/runtime@^7.23.8", "@babel/runtime@^7.24.5", "@babel/runtime@^7.8.4":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
- integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
+ integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
dependencies:
regenerator-runtime "^0.14.0"
@@ -960,28 +960,28 @@
"@babel/parser" "^7.24.7"
"@babel/types" "^7.24.7"
-"@babel/traverse@^7.24.7":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5"
- integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.8.tgz#6c14ed5232b7549df3371d820fbd9abfcd7dfab7"
+ integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==
dependencies:
"@babel/code-frame" "^7.24.7"
- "@babel/generator" "^7.24.7"
+ "@babel/generator" "^7.24.8"
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/helper-function-name" "^7.24.7"
"@babel/helper-hoist-variables" "^7.24.7"
"@babel/helper-split-export-declaration" "^7.24.7"
- "@babel/parser" "^7.24.7"
- "@babel/types" "^7.24.7"
+ "@babel/parser" "^7.24.8"
+ "@babel/types" "^7.24.8"
debug "^4.3.1"
globals "^11.1.0"
-"@babel/types@^7.24.7", "@babel/types@^7.4.4":
- version "7.24.7"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
- integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
+"@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9", "@babel/types@^7.4.4":
+ version "7.24.9"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.9.tgz#228ce953d7b0d16646e755acf204f4cf3d08cc73"
+ integrity sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==
dependencies:
- "@babel/helper-string-parser" "^7.24.7"
+ "@babel/helper-string-parser" "^7.24.8"
"@babel/helper-validator-identifier" "^7.24.7"
to-fast-properties "^2.0.0"
@@ -1023,9 +1023,9 @@
eslint-visitor-keys "^3.3.0"
"@eslint-community/regexpp@^4.6.1":
- version "4.10.1"
- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.1.tgz#361461e5cb3845d874e61731c11cfedd664d83a0"
- integrity sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==
+ version "4.11.0"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
+ integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
"@eslint/eslintrc@^2.1.4":
version "2.1.4"
@@ -1150,9 +1150,9 @@
integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
- version "1.4.15"
- resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
- integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+ integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
version "0.3.25"
@@ -1176,13 +1176,13 @@
resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
-"@node-red/editor-api@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/editor-api/-/editor-api-4.0.0.tgz#2fb5c6aa640b3471659fdb1d8e0b4744d9e8572d"
- integrity sha512-HRhjm7Ckcue27h+v2ZjRwaecM15xxN2EhI00IvVrCc/fKgF2dH8+Y/ivmurmGFeT6i6u1tQ8IC5szS14FkvyYQ==
+"@node-red/editor-api@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/editor-api/-/editor-api-4.0.2.tgz#dd5ead7dbcae40265808571f3ef575fb6fb6dbd5"
+ integrity sha512-ZG0n1fpwAP5qhwa1vXdhHGhtVm6flmQKp1N++RPxqmF8uZlkI5wI0FzDrF3V/En7+gUD+o5ylcca4kq+I8GIdA==
dependencies:
- "@node-red/editor-client" "4.0.0"
- "@node-red/util" "4.0.0"
+ "@node-red/editor-client" "4.0.2"
+ "@node-red/util" "4.0.2"
bcryptjs "2.4.3"
body-parser "1.20.2"
clone "2.1.2"
@@ -1201,15 +1201,15 @@
optionalDependencies:
"@node-rs/bcrypt" "1.10.4"
-"@node-red/editor-client@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/editor-client/-/editor-client-4.0.0.tgz#7bc2b0f8457a9ff75ceed6243d924c66223a7cdb"
- integrity sha512-l1FclKmjp/3k6kj5jp/Zvpveysk0HsSHTYgUGAfguFcYs1j2ey0BoET9JpEOcJCAdl2r49tYHpw5jzQrOnhjiw==
+"@node-red/editor-client@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/editor-client/-/editor-client-4.0.2.tgz#187651897f14271d464a408b094930c3126ab125"
+ integrity sha512-B8UsqaxnTeIshgUFhMKj7hk/ddyxSXFTcRnuSw0uC39+ki3UUQ3pWJT8FLOr0NVypCFD4jq8qDzMundD0FVLFw==
-"@node-red/nodes@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/nodes/-/nodes-4.0.0.tgz#438acd72f44a87420ab26e3a8bf2834354f77cdd"
- integrity sha512-VVqDQzhTFLkPysaNk/Ob5e3QpJu/bhxBbTyLAuXdwLip1vH54D+/1VsiPrOhxtw6j5AovXCOz+xJffDkacD5Zw==
+"@node-red/nodes@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/nodes/-/nodes-4.0.2.tgz#b0c9816292c5a0e679516d2407d359edd5b5fad9"
+ integrity sha512-dK+S6WJ2S8RQ/WMH1kSzYKvubM0+5zyRq7oEvrAyjk3xqQCwkf7Mfb48zdtHh6zW73/qv1pquY0iikIyZOkU6Q==
dependencies:
acorn "8.11.3"
acorn-walk "8.3.2"
@@ -1280,25 +1280,25 @@
ws "7.5.10"
xml2js "0.6.2"
-"@node-red/registry@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/registry/-/registry-4.0.0.tgz#0adbf618f32b2f4f26efa1a078ff9cde6764f4a4"
- integrity sha512-zMlA4HImNmE9GUhgAPDVfO8v6V5TZoIZCbezAYzT14VVUUkvBbDzVaT23xCnC4oZVvwJeCrYLgRvjs+gT6mhBQ==
+"@node-red/registry@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/registry/-/registry-4.0.2.tgz#71d020593f6bec4550208cf6241b7f2be6f2cd47"
+ integrity sha512-1R9DBH4EhWOH5UJffNZ8Wdemch1onc7ZwRPoylnCD0aFpRWT2q1nEqHJDthtBF2l9x9CZejB31/LBAmU1KCkTQ==
dependencies:
- "@node-red/util" "4.0.0"
+ "@node-red/util" "4.0.2"
clone "2.1.2"
fs-extra "11.2.0"
semver "7.5.4"
tar "7.2.0"
uglify-js "3.17.4"
-"@node-red/runtime@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/runtime/-/runtime-4.0.0.tgz#231776a55b74c9fe797be8c55268e7dc1e97e68c"
- integrity sha512-z+t7nwuSvAWgelG/5RhwrYo5EPAHs9sLjVWVZLDdXAZS5Yw5Kf0+uAEeRGacVV5LetED21vQQYrUNSUXnkbLjA==
+"@node-red/runtime@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/runtime/-/runtime-4.0.2.tgz#d89941080e99e3f2eeda75d6008c6cd76bc251b8"
+ integrity sha512-wW1l8ZIeaLvSB8rKj/g7RsGBLq8Q6ladbCm3Zv4tTbuLmx61t04FZo2DNYTrVlMIR3O5R+vmc5UbzJco7WpVxA==
dependencies:
- "@node-red/registry" "4.0.0"
- "@node-red/util" "4.0.0"
+ "@node-red/registry" "4.0.2"
+ "@node-red/util" "4.0.2"
async-mutex "0.5.0"
clone "2.1.2"
express "4.19.2"
@@ -1306,10 +1306,10 @@
json-stringify-safe "5.0.1"
rfdc "^1.3.1"
-"@node-red/util@4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@node-red/util/-/util-4.0.0.tgz#fe2a5509d5dae29359cff1df6485bdd63ec910ae"
- integrity sha512-sKbvPWMVFB6DVdhOE5ueV44dEklRiCCVg3iqng2VIKEcoEodVW6GSo1frQho3NcPlcOViqKP7Okjq1oVNEElmw==
+"@node-red/util@4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@node-red/util/-/util-4.0.2.tgz#009ee6de977cb7b28a16f90434a27f50ce0005ba"
+ integrity sha512-pnAyC3N0JeORyvQQBpW4WQjBJU8iFNC5eG6W6LLfzhW3FvXndOUr85rx4fFtpWXZs8wMtWG4dBw7J4F4QLNJAQ==
dependencies:
fs-extra "11.2.0"
i18next "21.10.0"
@@ -1740,9 +1740,9 @@
integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
"@types/node@*":
- version "20.14.8"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.8.tgz#45c26a2a5de26c3534a9504530ddb3b27ce031ac"
- integrity sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==
+ version "20.14.11"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b"
+ integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==
dependencies:
undici-types "~5.26.4"
@@ -1752,9 +1752,9 @@
integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
"@types/readable-stream@^4.0.0", "@types/readable-stream@^4.0.5":
- version "4.0.14"
- resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.14.tgz#5a76a00e1e3dd6ff921ea2b3fac7485c5a492c19"
- integrity sha512-xZn/AuUbCMShGsqH/ehZtGDwQtbx00M9rZ2ENLe4tOjFZ/JFeWMhEZkk2fEe1jAUqqEAURIkFJ7Az/go8mM1/w==
+ version "4.0.15"
+ resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.15.tgz#e6ec26fe5b02f578c60baf1fa9452e90957d2bfb"
+ integrity sha512-oAZ3kw+kJFkEqyh7xORZOku1YAKvsFTogRY8kVl4vHpEKiDkfnSA/My8haRE7fvmix5Zyy+1pwzOi7yycGLBJw==
dependencies:
"@types/node" "*"
safe-buffer "~5.1.1"
@@ -1773,9 +1773,9 @@
"@types/node" "*"
"@types/ws@^8.5.9":
- version "8.5.10"
- resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
- integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+ version "8.5.11"
+ resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.11.tgz#90ad17b3df7719ce3e6bc32f83ff954d38656508"
+ integrity sha512-4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==
dependencies:
"@types/node" "*"
@@ -1853,9 +1853,9 @@ acorn@^6.4.1:
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
acorn@^8.9.0:
- version "8.12.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
- integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
+ version "8.12.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+ integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
add-stream@^1.0.0:
version "1.0.0"
@@ -1921,11 +1921,6 @@ align-text@^0.1.1, align-text@^0.1.3:
longest "^1.0.1"
repeat-string "^1.5.2"
-ansi-colors@4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
- integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
ansi-colors@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
@@ -2210,16 +2205,6 @@ array.prototype.flatmap@^1.3.2:
es-abstract "^1.22.1"
es-shim-unscopables "^1.0.0"
-array.prototype.toreversed@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz#b989a6bf35c4c5051e1dc0325151bf8088954eba"
- integrity sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==
- dependencies:
- call-bind "^1.0.2"
- define-properties "^1.2.0"
- es-abstract "^1.22.1"
- es-shim-unscopables "^1.0.0"
-
array.prototype.tosorted@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
@@ -2467,9 +2452,9 @@ bl@^4.0.2:
readable-stream "^3.4.0"
bl@^6.0.8:
- version "6.0.13"
- resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.13.tgz#dc5f288d3f849771bb6112b29477abee4c0a9d96"
- integrity sha512-tMncAcpsyjZgAVbVFupVIaB2xud13xxT59fdHkuszY2jdZkqIWfpQdmII1fOe3kOGAz0mNLTIHEm+KxpYsQKKg==
+ version "6.0.14"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.14.tgz#b9ae9862118a3d2ebec999c5318466012314f96c"
+ integrity sha512-TJfbvGdL7KFGxTsEbsED7avqpFdY56q9IW0/aiytyheJzxST/+Io6cx/4Qx0K2/u0BPRDs65mjaQzYvMZeNocQ==
dependencies:
"@types/readable-stream" "^4.0.0"
buffer "^6.0.3"
@@ -2542,20 +2527,20 @@ braces@~3.0.2:
dependencies:
fill-range "^7.1.1"
-browser-stdout@1.3.1:
+browser-stdout@1.3.1, browser-stdout@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-browserslist@^4.22.2, browserslist@^4.23.0:
- version "4.23.1"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96"
- integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==
+browserslist@^4.23.0, browserslist@^4.23.1:
+ version "4.23.2"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed"
+ integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==
dependencies:
- caniuse-lite "^1.0.30001629"
- electron-to-chromium "^1.4.796"
+ caniuse-lite "^1.0.30001640"
+ electron-to-chromium "^1.4.820"
node-releases "^2.0.14"
- update-browserslist-db "^1.0.16"
+ update-browserslist-db "^1.1.0"
bson@~6.7.0:
version "6.7.0"
@@ -2703,10 +2688,10 @@ camelcase@^6.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-caniuse-lite@^1.0.30001629:
- version "1.0.30001636"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
- integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
+caniuse-lite@^1.0.30001640:
+ version "1.0.30001643"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
+ integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
caseless@~0.12.0:
version "0.12.0"
@@ -2778,21 +2763,6 @@ cheerio@1.0.0-rc.10:
parse5-htmlparser2-tree-adapter "^6.0.1"
tslib "^2.2.0"
-chokidar@3.5.3:
- version "3.5.3"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
- integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
- dependencies:
- anymatch "~3.1.2"
- braces "~3.0.2"
- glob-parent "~5.1.2"
- is-binary-path "~2.1.0"
- is-glob "~4.0.1"
- normalize-path "~3.0.0"
- readdirp "~3.6.0"
- optionalDependencies:
- fsevents "~2.3.2"
-
chokidar@^2.0.0:
version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2812,7 +2782,7 @@ chokidar@^2.0.0:
optionalDependencies:
fsevents "^1.2.7"
-chokidar@^3.4.0:
+chokidar@^3.4.0, chokidar@^3.5.3:
version "3.6.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3470,7 +3440,7 @@ copy-props@^2.0.1:
each-props "^1.3.2"
is-plain-object "^5.0.0"
-core-js-compat@^3.31.0, core-js-compat@^3.36.1:
+core-js-compat@^3.36.1, core-js-compat@^3.37.1:
version "3.37.1"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee"
integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==
@@ -3632,7 +3602,7 @@ debug@3.X, debug@^3.1.0, debug@^3.2.7:
dependencies:
ms "^2.1.1"
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.5:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@~4.3.5:
version "4.3.5"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
@@ -3721,7 +3691,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4:
es-errors "^1.3.0"
gopd "^1.0.1"
-define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -3805,11 +3775,6 @@ diff@3.5.0:
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-diff@5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
- integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
-
diff@^5.0.0, diff@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
@@ -3937,10 +3902,10 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-electron-to-chromium@^1.4.796:
- version "1.4.810"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz#7dee01b090b9e048e6db752f7b30921790230654"
- integrity sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==
+electron-to-chromium@^1.4.820:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.0.tgz#0d3123a9f09189b9c7ab4b5d6848d71b3c1fd0e8"
+ integrity sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -3989,7 +3954,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
+es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
version "1.23.3"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
@@ -4162,16 +4127,16 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.3, escape-string-regexp@^1
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
- integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
escape-string-regexp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+escape-string-regexp@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
eslint-config-standard-jsx@^11.0.0:
version "11.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz#70852d395731a96704a592be5b0bfaccfeded239"
@@ -4244,33 +4209,33 @@ eslint-plugin-n@^15.7.0:
semver "^7.3.8"
eslint-plugin-promise@^6.1.1:
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz#e24ab0e3c0a25fa227d98d9ff612156b5af15945"
- integrity sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz#acd3fd7d55cead7a10f92cf698f36c0aafcd717a"
+ integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==
eslint-plugin-react@^7.32.2:
- version "7.34.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b"
- integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==
+ version "7.35.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41"
+ integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==
dependencies:
array-includes "^3.1.8"
array.prototype.findlast "^1.2.5"
array.prototype.flatmap "^1.3.2"
- array.prototype.toreversed "^1.1.2"
array.prototype.tosorted "^1.1.4"
doctrine "^2.1.0"
es-iterator-helpers "^1.0.19"
estraverse "^5.3.0"
+ hasown "^2.0.2"
jsx-ast-utils "^2.4.1 || ^3.0.0"
minimatch "^3.1.2"
object.entries "^1.1.8"
object.fromentries "^2.0.8"
- object.hasown "^1.1.4"
object.values "^1.2.0"
prop-types "^15.8.1"
resolve "^2.0.0-next.5"
semver "^6.3.1"
string.prototype.matchall "^4.0.11"
+ string.prototype.repeat "^1.0.0"
eslint-scope@^7.2.2:
version "7.2.2"
@@ -4378,9 +4343,9 @@ esprima@^4.0.0:
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.4.2:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
- integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+ integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
dependencies:
estraverse "^5.1.0"
@@ -4682,14 +4647,6 @@ find-up-simple@^1.0.0:
resolved "https://registry.yarnpkg.com/find-up-simple/-/find-up-simple-1.0.0.tgz#21d035fde9fdbd56c8f4d2f63f32fd93a1cfc368"
integrity sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==
-find-up@5.0.0, find-up@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
- integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
- dependencies:
- locate-path "^6.0.0"
- path-exists "^4.0.0"
-
find-up@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4720,6 +4677,14 @@ find-up@^4.0.0, find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
+find-up@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+ dependencies:
+ locate-path "^6.0.0"
+ path-exists "^4.0.0"
+
findup-sync@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -5143,21 +5108,10 @@ glob@7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
- integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^5.0.1"
- once "^1.3.0"
-
glob@^10.3.3, glob@^10.3.7:
- version "10.4.2"
- resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.2.tgz#bed6b95dade5c1f80b4434daced233aee76160e5"
- integrity sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==
+ version "10.4.5"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+ integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
dependencies:
foreground-child "^3.1.0"
jackspeak "^3.1.2"
@@ -5178,6 +5132,17 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+ integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^5.0.1"
+ once "^1.3.0"
+
glob@~7.1.1:
version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -5564,7 +5529,7 @@ he@1.1.1:
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
integrity sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==
-he@1.2.0, he@1.2.x:
+he@1.2.x, he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -5885,10 +5850,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1:
- version "2.14.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1"
- integrity sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0:
+ version "2.15.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+ integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
dependencies:
hasown "^2.0.2"
@@ -6293,9 +6258,9 @@ iterator.prototype@^1.1.2:
set-function-name "^2.0.1"
jackspeak@^3.1.2:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"
- integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+ integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
dependencies:
"@isaacs/cliui" "^8.0.2"
optionalDependencies:
@@ -6767,7 +6732,7 @@ log-driver@^1.2.7, log-driver@^1.x:
resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
-log-symbols@4.1.0:
+log-symbols@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -6798,9 +6763,9 @@ lowercase-keys@^3.0.0:
integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
lru-cache@^10.0.1, lru-cache@^10.2.0:
- version "10.2.2"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
- integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+ version "10.4.3"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+ integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
lru-cache@^4.0.3:
version "4.1.5"
@@ -7067,13 +7032,6 @@ minimatch@3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimatch@5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
- integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
- dependencies:
- brace-expansion "^2.0.1"
-
minimatch@9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
@@ -7088,7 +7046,7 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
dependencies:
brace-expansion "^1.1.7"
-minimatch@^5.0.1:
+minimatch@^5.0.1, minimatch@^5.1.6:
version "5.1.6"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
@@ -7096,9 +7054,9 @@ minimatch@^5.0.1:
brace-expansion "^2.0.1"
minimatch@^9.0.4:
- version "9.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
- integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+ integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
dependencies:
brace-expansion "^2.0.1"
@@ -7179,30 +7137,30 @@ mkdirp@~0.3.5:
integrity sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==
mocha@^10.4.0:
- version "10.4.0"
- resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261"
- integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==
+ version "10.7.0"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
+ integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
dependencies:
- ansi-colors "4.1.1"
- browser-stdout "1.3.1"
- chokidar "3.5.3"
- debug "4.3.4"
- diff "5.0.0"
- escape-string-regexp "4.0.0"
- find-up "5.0.0"
- glob "8.1.0"
- he "1.2.0"
- js-yaml "4.1.0"
- log-symbols "4.1.0"
- minimatch "5.0.1"
- ms "2.1.3"
- serialize-javascript "6.0.0"
- strip-json-comments "3.1.1"
- supports-color "8.1.1"
- workerpool "6.2.1"
- yargs "16.2.0"
- yargs-parser "20.2.4"
- yargs-unparser "2.0.0"
+ ansi-colors "^4.1.3"
+ browser-stdout "^1.3.1"
+ chokidar "^3.5.3"
+ debug "^4.3.5"
+ diff "^5.2.0"
+ escape-string-regexp "^4.0.0"
+ find-up "^5.0.0"
+ glob "^8.1.0"
+ he "^1.2.0"
+ js-yaml "^4.1.0"
+ log-symbols "^4.1.0"
+ minimatch "^5.1.6"
+ ms "^2.1.3"
+ serialize-javascript "^6.0.2"
+ strip-json-comments "^3.1.1"
+ supports-color "^8.1.1"
+ workerpool "^6.5.1"
+ yargs "^16.2.0"
+ yargs-parser "^20.2.9"
+ yargs-unparser "^2.0.0"
mocha@^5.2.0:
version "5.2.0"
@@ -7303,9 +7261,9 @@ mqtt@5.7.0:
ws "^8.14.2"
mqtt@^5.2.0:
- version "5.7.2"
- resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-5.7.2.tgz#2e89c466ddc5c1d7593689ac144738dd5b8ef179"
- integrity sha512-b5xIA9J/K1LTubSWKaNYYLxYIusQdip6o9/8bRWad2TelRr8xLifjQt+SnamDAwMp3O6NdvR9E8ae7VMuN02kg==
+ version "5.8.1"
+ resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-5.8.1.tgz#6c05127c3335ae2bdef9e0e5df063f370cb61f47"
+ integrity sha512-EL5yY3yOdEBOyCTM41erawRxdWmGktc48eEGO74NpEBMUbTAPepo5Id4wi+/do85sACFfsycaURvoiCNxQRTHw==
dependencies:
"@types/readable-stream" "^4.0.5"
"@types/ws" "^8.5.9"
@@ -7335,7 +7293,7 @@ ms@2.1.2:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -7494,15 +7452,15 @@ node-red-node-test-helper@^0.3.4:
stoppable "^1.1.0"
supertest "^7.0.0"
-node-red@^4.0.0-beta.4:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/node-red/-/node-red-4.0.0.tgz#d3e3370e654d60e947a3fe282fd8374f01fca1fe"
- integrity sha512-XSmgHWOx/u77mjd2MnIum3q97XrhCP/JghsWwuxCP4691eeQ0JPe01mSI3sSuaFi8aiOhYWOGoQHk90SSLUcXQ==
+node-red@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/node-red/-/node-red-4.0.2.tgz#019446be1b18ff885415dbe619ba39323e8384f0"
+ integrity sha512-19AC1zouBYxaobzkpPb5PdqQptgO1fI9NRcrasFAYoG6wB8S53khFeuy1qiNaggo2JFu6TSJk2zLR+y4wksU1w==
dependencies:
- "@node-red/editor-api" "4.0.0"
- "@node-red/nodes" "4.0.0"
- "@node-red/runtime" "4.0.0"
- "@node-red/util" "4.0.0"
+ "@node-red/editor-api" "4.0.2"
+ "@node-red/nodes" "4.0.2"
+ "@node-red/runtime" "4.0.2"
+ "@node-red/util" "4.0.2"
basic-auth "2.0.1"
bcryptjs "2.4.3"
cors "2.8.5"
@@ -7515,9 +7473,9 @@ node-red@^4.0.0-beta.4:
"@node-rs/bcrypt" "1.10.4"
node-releases@^2.0.14:
- version "2.0.14"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
- integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+ version "2.0.18"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+ integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
node-watch@0.7.4:
version "0.7.4"
@@ -7559,12 +7517,11 @@ normalize-package-data@^3.0.0:
validate-npm-package-license "^3.0.1"
normalize-package-data@^6.0.0:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.1.tgz#fa69e9452210f0fabf4d79ee08d0c2870c51ed88"
- integrity sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.2.tgz#a7bc22167fe24025412bcff0a9651eb768b03506"
+ integrity sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==
dependencies:
hosted-git-info "^7.0.0"
- is-core-module "^2.8.1"
semver "^7.3.5"
validate-npm-package-license "^3.0.4"
@@ -7738,15 +7695,6 @@ object.groupby@^1.0.1:
define-properties "^1.2.1"
es-abstract "^1.23.2"
-object.hasown@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc"
- integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==
- dependencies:
- define-properties "^1.2.1"
- es-abstract "^1.23.2"
- es-object-atoms "^1.0.0"
-
object.map@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
@@ -8352,9 +8300,9 @@ qs@6.11.0:
side-channel "^1.0.4"
qs@^6.11.0:
- version "6.12.1"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
- integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
+ version "6.12.3"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754"
+ integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==
dependencies:
side-channel "^1.0.6"
@@ -8774,9 +8722,9 @@ require-main-filename@^2.0.0:
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
requirejs@~2.3.6:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
- integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
+ version "2.3.7"
+ resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.7.tgz#0b22032e51a967900e0ae9f32762c23a87036bd0"
+ integrity sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==
requires-port@^1.0.0:
version "1.0.0"
@@ -8887,9 +8835,9 @@ rimraf@^3.0.0, rimraf@^3.0.2:
glob "^7.1.3"
rimraf@^5.0.5:
- version "5.0.7"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74"
- integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==
+ version "5.0.9"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.9.tgz#c3baa1b886eadc2ec7981a06a593c3d01134ffe9"
+ integrity sha512-3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA==
dependencies:
glob "^10.3.7"
@@ -8981,9 +8929,9 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
- version "7.6.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
- integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+ version "7.6.3"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+ integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
send@0.18.0:
version "0.18.0"
@@ -9004,10 +8952,10 @@ send@0.18.0:
range-parser "~1.2.1"
statuses "2.0.1"
-serialize-javascript@6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
- integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+ integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
dependencies:
randombytes "^2.1.0"
@@ -9523,6 +9471,14 @@ string.prototype.matchall@^4.0.11:
set-function-name "^2.0.2"
side-channel "^1.0.6"
+string.prototype.repeat@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
+ integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.5"
+
string.prototype.trim@^1.2.9:
version "1.2.9"
resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
@@ -9627,7 +9583,7 @@ strip-indent@^3.0.0:
dependencies:
min-indent "^1.0.0"
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -9662,13 +9618,6 @@ supports-color@5.4.0:
dependencies:
has-flag "^3.0.0"
-supports-color@8.1.1:
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
- integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
- dependencies:
- has-flag "^4.0.0"
-
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -9683,6 +9632,13 @@ supports-color@^7, supports-color@^7.1.0, supports-color@^7.2.0:
dependencies:
has-flag "^4.0.0"
+supports-color@^8.1.1:
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+ integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+ dependencies:
+ has-flag "^4.0.0"
+
supports-preserve-symlinks-flag@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -9981,9 +9937,9 @@ type-fest@^0.8.0, type-fest@^0.8.1:
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
type-fest@^4.6.0, type-fest@^4.7.1:
- version "4.20.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.20.1.tgz#d97bb1e923bf524e5b4b43421d586760fb2ee8be"
- integrity sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==
+ version "4.23.0"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.23.0.tgz#8196561a6b835175473be744f3e41e2dece1496b"
+ integrity sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==
type-is@^1.6.4, type-is@~1.6.18:
version "1.6.18"
@@ -10083,9 +10039,9 @@ uglify-js@3.4.x:
source-map "~0.6.1"
uglify-js@^3.0.5, uglify-js@^3.1.4, uglify-js@^3.17.4:
- version "3.18.0"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.18.0.tgz#73b576a7e8fda63d2831e293aeead73e0a270deb"
- integrity sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==
+ version "3.19.0"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.0.tgz#6d45f1cad2c54117fa2fabd87fc2713a83e3bf7b"
+ integrity sha512-wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==
uglify-to-browserify@~1.0.0:
version "1.0.2"
@@ -10229,10 +10185,10 @@ upath@^1.1.1:
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-update-browserslist-db@^1.0.16:
- version "1.0.16"
- resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
- integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==
+update-browserslist-db@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+ integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
dependencies:
escalade "^3.1.2"
picocolors "^1.0.1"
@@ -10523,10 +10479,10 @@ worker-timers@^7.1.4:
worker-timers-broker "^6.1.8"
worker-timers-worker "^7.0.71"
-workerpool@6.2.1:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
- integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+workerpool@^6.5.1:
+ version "6.5.1"
+ resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
+ integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
@@ -10593,9 +10549,9 @@ ws@7.5.10, ws@^7.5.5:
integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
ws@^8.14.2, ws@^8.17.1:
- version "8.17.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
- integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
+ version "8.18.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+ integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
xdg-basedir@^4.0.0:
version "4.0.0"
@@ -10668,11 +10624,6 @@ yallist@^5.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533"
integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==
-yargs-parser@20.2.4:
- version "20.2.4"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
- integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
yargs-parser@>=5.0.0-security.0:
version "21.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
@@ -10686,7 +10637,7 @@ yargs-parser@^18.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
version "20.2.9"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
@@ -10699,7 +10650,7 @@ yargs-parser@^5.0.1:
camelcase "^3.0.0"
object.assign "^4.1.0"
-yargs-unparser@2.0.0:
+yargs-unparser@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
@@ -10709,19 +10660,6 @@ yargs-unparser@2.0.0:
flat "^5.0.2"
is-plain-obj "^2.1.0"
-yargs@16.2.0, yargs@^16.0.0, yargs@^16.2.0:
- version "16.2.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
- integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
- dependencies:
- cliui "^7.0.2"
- escalade "^3.1.1"
- get-caller-file "^2.0.5"
- require-directory "^2.1.1"
- string-width "^4.2.0"
- y18n "^5.0.5"
- yargs-parser "^20.2.2"
-
yargs@^15.0.2:
version "15.4.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -10739,6 +10677,19 @@ yargs@^15.0.2:
y18n "^4.0.0"
yargs-parser "^18.1.2"
+yargs@^16.0.0, yargs@^16.2.0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+ integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+ dependencies:
+ cliui "^7.0.2"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
+ require-directory "^2.1.1"
+ string-width "^4.2.0"
+ y18n "^5.0.5"
+ yargs-parser "^20.2.2"
+
yargs@^7.1.0:
version "7.1.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db"