From 4226ef5a8fc15de6a14a81563ff60d52483c88b8 Mon Sep 17 00:00:00 2001 From: Simon Nilsson Date: Wed, 27 Mar 2024 20:28:21 +0100 Subject: [PATCH] Fixed errors --- server/notification-providers/cellsynt.js | 186 +++++++++++----------- server/notification.js | 1 - 2 files changed, 93 insertions(+), 94 deletions(-) diff --git a/server/notification-providers/cellsynt.js b/server/notification-providers/cellsynt.js index ca0901c3..b72d7353 100644 --- a/server/notification-providers/cellsynt.js +++ b/server/notification-providers/cellsynt.js @@ -10,108 +10,108 @@ class Cellsynt extends NotificationProvider { async send(notification, msg, monitorJSON = null, heartbeatJSON = null) { const okMsg = "Sent Successfully."; - let data = { - params: { - /* Your username (received when account is setup). - */ - "username": notification.cellsyntLogin, + let data = { + params: { + /* Your username (received when account is setup). + */ + "username": notification.cellsyntLogin, - /* Your password to use together with the username for - authentication (received when account is setup). - */ - "password": notification.cellsyntPassword, + /* Your password to use together with the username for + authentication (received when account is setup). + */ + "password": notification.cellsyntPassword, - /* Recipient's telephone number on international format with - leading 00 followed by country code, e.g. 00447920110000 for - UK number 07920 110 000 (max 17 digits in total). - To send the same message to multiple recipients, separate - numbers with comma. Max 25000 recipients per HTTP request. - */ - "destination": notification.cellsyntDestination, + /* Recipient's telephone number on international format with + leading 00 followed by country code, e.g. 00447920110000 for + UK number 07920 110 000 (max 17 digits in total). + To send the same message to multiple recipients, separate + numbers with comma. Max 25000 recipients per HTTP request. + */ + "destination": notification.cellsyntDestination, - "text": msg.replace(/[^\x00-\x7F]/g, ""), - /* Character set text and other data is sent as in the HTTP - request. Possible values: ISO-8859-1 (default) and UTF-8 - */ - "charset": "UTF-8", + "text": msg.replace(/[^\x00-\x7F]/g, ""), + /* Character set text and other data is sent as in the HTTP + request. Possible values: ISO-8859-1 (default) and UTF-8 + */ + "charset": "UTF-8", - /* Controls the originator type the message should be sent with. - Possible values: numeric, shortcode and alpha. - */ - "originatortype": notification.cellsyntOriginatortype, - /* Identifier which will be visible on recipient's mobile phone as - originator of the message. Allowed values and function depends - on parameter originatortype's value according to below: - ** alpha ** - 3Send SMS - Alphanumeric string (max 11 characters). The following - characters are guaranteed to work: a-z, A-Z and 0-9. Other - characters may work but functionality can not be guaranteed. - Recipients can not reply to messages with alphanumeric - originators - ** numeric ** - Numeric value (max 15 digits) with telephone number on - international format without leading 00 (example UK number - 07920 110 000 should be set as 447920110000). Receiving - mobile phone will add a leading + sign and thus see the - originator as a normal mobile phone number (+447920110000). - Therefore it is also possible to reply to the message. - */ - //"originator": "uptime-kuma", - "originator": notification.cellsyntOriginator, - /* Type of message that should be sent. Possible values: text - (default), binary and unicode */ - //"type": "text", + /* Controls the originator type the message should be sent with. + Possible values: numeric, shortcode and alpha. + */ + "originatortype": notification.cellsyntOriginatortype, + /* Identifier which will be visible on recipient's mobile phone as + originator of the message. Allowed values and function depends + on parameter originatortype's value according to below: + ** alpha ** + 3Send SMS + Alphanumeric string (max 11 characters). The following + characters are guaranteed to work: a-z, A-Z and 0-9. Other + characters may work but functionality can not be guaranteed. + Recipients can not reply to messages with alphanumeric + originators + ** numeric ** + Numeric value (max 15 digits) with telephone number on + international format without leading 00 (example UK number + 07920 110 000 should be set as 447920110000). Receiving + mobile phone will add a leading + sign and thus see the + originator as a normal mobile phone number (+447920110000). + Therefore it is also possible to reply to the message. + */ + //"originator": "uptime-kuma", + "originator": notification.cellsyntOriginator, + /* Type of message that should be sent. Possible values: text + (default), binary and unicode */ + //"type": "text", - /* Maximum number of SMS permitted to be linked together when - needed (default value is 1, see Long SMS). Maximum value is 6 - (i.e. max 153 x 6 = 918 characters). - */ - "allowconcat": notification.cellsyntAllowLongSMS ? 6 : 1, + /* Maximum number of SMS permitted to be linked together when + needed (default value is 1, see Long SMS). Maximum value is 6 + (i.e. max 153 x 6 = 918 characters). + */ + "allowconcat": notification.cellsyntAllowLongSMS ? 6 : 1, - /* Value can be set to true if message should be sent as "flash - message", i.e. displayed directly on phone screen instead of - being saved to inbox. This is identical to setting class=0. - Please note that support for flash messages cannot be - guaranteed to all operator networks. If flash is not supported the - message will be sent as a regular text message instead - (class=1). - */ - //"flash": "", - /* Message class can be set to 0 (flash message), 1 (default, MEspecific), 2 (SIM-specific) or 3 (TE-specific). - */ - //"class": "", + /* Value can be set to true if message should be sent as "flash + message", i.e. displayed directly on phone screen instead of + being saved to inbox. This is identical to setting class=0. + Please note that support for flash messages cannot be + guaranteed to all operator networks. If flash is not supported the + message will be sent as a regular text message instead + (class=1). + */ + //"flash": "", + /* Message class can be set to 0 (flash message), 1 (default, MEspecific), 2 (SIM-specific) or 3 (TE-specific). + */ + //"class": "", - /* UDH (User Data Header) can be used to send concatenated - SMS, contain formatting information, convey port numbers as a - mean to cause start of an application etc. The value should be - given on hexadecimal format for the corresponding bytes you - wish to send (e.g. AABBCC). - */ - //"udh": "", + /* UDH (User Data Header) can be used to send concatenated + SMS, contain formatting information, convey port numbers as a + mean to cause start of an application etc. The value should be + given on hexadecimal format for the corresponding bytes you + wish to send (e.g. AABBCC). + */ + //"udh": "", - /* Protocol Identifier (specified in GSM 03.40) says how the - message should be interpreted. Value should be given on - hexadecimal format, e.g. 00 for a regular message and 7D - (decimal 125) for a configuration message ("ME Data - download"). - */ - //"pid": "", - } - }; - try { - if (heartbeatJSON != null) { - data.params.text = msg.replace(/[^\x00-\x7F]/g, ""); - } - const resp = await axios.post("https://se-1.cellsynt.net/sms.php", null, data); - if (resp.data == null || resp.data.includes("Error")) { - throw new Error(resp.data); - }else{ - return okMsg; - } - } catch (error) { - this.throwGeneralAxiosError(error); + /* Protocol Identifier (specified in GSM 03.40) says how the + message should be interpreted. Value should be given on + hexadecimal format, e.g. 00 for a regular message and 7D + (decimal 125) for a configuration message ("ME Data + download"). + */ + //"pid": "", } + }; + try { + if (heartbeatJSON != null) { + data.params.text = msg.replace(/[^\x00-\x7F]/g, ""); + } + const resp = await axios.post("https://se-1.cellsynt.net/sms.php", null, data); + if (resp.data == null || resp.data.includes("Error")) { + throw new Error(resp.data); + } else { + return okMsg; + } + } catch (error) { + this.throwGeneralAxiosError(error); + } } } diff --git a/server/notification.js b/server/notification.js index 154d212b..b68e7a6c 100644 --- a/server/notification.js +++ b/server/notification.js @@ -57,7 +57,6 @@ const ServerChan = require("./notification-providers/serverchan"); const ZohoCliq = require("./notification-providers/zoho-cliq"); const GtxMessaging = require("./notification-providers/gtx-messaging"); const Cellsynt = require("./notification-providers/cellsynt"); - class Notification { providerList = {};