Skip to content

Commit

Permalink
Feature/multi-sms (#31)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hbjorgo
hbjorgo authored Nov 2, 2023
1 parent 11ea5cc commit 118c2a7
Show file tree
Hide file tree
Showing 49 changed files with 1,722 additions and 924 deletions.
10 changes: 6 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ Feedback is very much welcome and please request features 🙂
[HeboTech.GsmApi](https://github.com/hbjorgo/GsmApi) is a REST API wrapping this library.

## Supported commands:
- Send SMS (text and PDU (GSM7bit, UCS2, ANSI))
- Send SMS in text or PDU (GSM 7 bit or UCS2) format.
- Send concatenated SMS (message that spans over multiple SMSs) in PDU (GSM 7 bit or UCS2) format
- SMS supports emojies
- List SMSs
- Read SMS (text and PDU)
- Read SMS (text or PDU (GSM 7 bit or UCS2)
- Delete SMS
- Set SMS message format (text and PDU (GSM7bit, UCS2, ANSI))
- Set SMS message format (text or PDU (GSM 7 bit or UCS2))
- Dial number
- Answer incoming call
- Hang up call
Expand Down Expand Up @@ -93,7 +95,7 @@ if (simStatus == SimStatus.SIM_PIN)
var smsTextFormatResult = await modem.SetSmsMessageFormatAsync(SmsTextFormat.Text);

// Send SMS to the specified number
var smsReference = await modem.SendSMSAsync(new PhoneNumber("0123456789"), "Hello ATLib!");
var smsReference = await modem.SendSmsInTextFormatAsync(new PhoneNumber("123456789"), "Hello ATLib!");
Console.WriteLine($"SMS Reference: {smsReference}");
```
Because it relies on a stream, you can even control a modem over a network! Either use a network attached modem, or forward a modem serial port to a network port.
Expand Down
14 changes: 9 additions & 5 deletions src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using HeboTech.ATLib.Modems.D_LINK;
using HeboTech.ATLib.Parsers;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace HeboTech.ATLib.TestConsole
Expand Down Expand Up @@ -149,21 +150,24 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
string smsMessage = Console.ReadLine();

Console.WriteLine("Sending SMS...");
ModemResponse<SmsReference> smsReference = null;
switch (smsTextFormat)
{
case SmsTextFormat.PDU:
smsReference = await modem.SendSmsInPduFormatAsync(phoneNumber, smsMessage, smsCodingScheme);
IEnumerable<ModemResponse<SmsReference>> smsReferences = await modem.SendSmsInPduFormatAsync(phoneNumber, smsMessage, smsCodingScheme);
foreach (var smsReference in smsReferences)
Console.WriteLine($"SMS Reference: {smsReference}");
break;
case SmsTextFormat.Text:
smsReference = await modem.SendSmsInTextFormatAsync(phoneNumber, smsMessage);
{
ModemResponse<SmsReference> smsReference = await modem.SendSmsInTextFormatAsync(new PhoneNumber(phoneNumberString), smsMessage);
if (smsReference is not null)
Console.WriteLine($"SMS Reference: {smsReference}");
}
break;
default:
Console.WriteLine("Unsupported SMS text format");
break;
}
if (smsReference is not null)
Console.WriteLine($"SMS Reference: {smsReference}");
}
break;
case ConsoleKey.R:
Expand Down
4 changes: 2 additions & 2 deletions src/HeboTech.ATLib.TestConsole/HeboTech.ATLib.TestConsole.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net48' ">
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/HeboTech.ATLib.TestConsole/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static async Task Main(string[] args)

/* ######## UNCOMMENT THIS SECTION TO USE NETWORK SOCKET ######## */
//using Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
//socket.Connect("192.168.1.81", 7000);
//socket.Connect("192.168.1.144", 7000);
//Console.WriteLine("Network socket opened");
//Stream stream;
//stream = new NetworkStream(socket);
Expand Down
40 changes: 0 additions & 40 deletions src/HeboTech.ATLib.Tests/CodingSchemes/AnsiTests.cs
View file

This file was deleted.

167 changes: 155 additions & 12 deletions src/HeboTech.ATLib.Tests/CodingSchemes/Gsm7Tests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,184 @@
using HeboTech.ATLib.CodingSchemes;
using System;
using Xunit;

namespace HeboTech.ATLib.Tests.PDU
{
public class Gsm7Tests
{
[Theory]
[InlineData("41", "41")]
[InlineData("4142", "4121")]
[InlineData("54616461203A29", "D430390CD2A500")]
[InlineData("54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67", "54741914AFA7C76B9058FEBEBB41E6371EA4AEB7E173D0DB5E9683E8E832881DD6E741E4F719")]
public void Pack_returns_packed_bytes(string gsm7Bit, string expected)
{
byte[] result = Gsm7.Pack(Convert.FromHexString(gsm7Bit));

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData("41" , "41")]
[InlineData("4121", "4142")]
[InlineData("D430390CD2A500", "54616461203A29")]
[InlineData("54741914AFA7C76B9058FEBEBB41E6371EA4AEB7E173D0DB5E9683E8E832881DD6E741E4F719", "54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67")]
public void Unpack_returns_unpacked_bytes(string gsm7Bit, string expected)
{
byte[] result = Gsm7.Unpack(Convert.FromHexString(gsm7Bit));

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData("A", "41")]
[InlineData("AB", "4142")]
[InlineData("The quick brown fox jumps over the lazy dog", "54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67")]
[InlineData("Tada :)", "54616461203A29")]
public void EncodeToBytes_returns_encoded_bytes(string gsm7Bit, string expected)
{
byte[] result = Gsm7.EncodeToBytes(gsm7Bit.ToCharArray());

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData("41", "A")]
[InlineData("4142", "AB")]
[InlineData("54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67", "The quick brown fox jumps over the lazy dog")]
[InlineData("54616461203A29", "Tada :)")]
public void DecodeFromBytes_returns_decoded_text(string gsm7Bit, string expected)
{
string result = Gsm7.DecodeFromBytes(Convert.FromHexString(gsm7Bit));

Assert.Equal(expected, result);
}

[Theory]
[InlineData("A", "41")]
[InlineData("AB", "4121")]
[InlineData("ABC", "41E110")]
[InlineData("Google", "C7F7FBCC2E03")]
[InlineData("SMS Rulz", "D3E61424ADB3F5")]
[InlineData("Hello.", "C8329BFD7601")]
[InlineData("Hello world", "C8329BFD06DDDF723619")]
[InlineData("This is testdata!", "54747A0E4ACF41F4F29C4E0ED3C321")]
[InlineData("The quick brown fox jumps over the lazy dog", "54741914AFA7C76B9058FEBEBB41E6371EA4AEB7E173D0DB5E9683E8E832881DD6E741E4F719")]
[InlineData("Tada :)", "D430390CD2A500")]
public void Encoder_returns_encoded_text(string gsm7Bit, string expected)
[InlineData("hellohello", "E8329BFD4697D9EC37")]
[InlineData("Hi", "C834")]
public void Encode_and_pack_returns_encoded_text(string gsm7Bit, string expected)
{
byte[] result = Gsm7.Pack(Gsm7.EncodeToBytes(gsm7Bit));

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData("41", 0, "A")]
[InlineData("4121", 0, "AB")]
[InlineData("C834", 0, "Hi")]
[InlineData("41E110", 0, "ABC")]
[InlineData("C7F7FBCC2E03", 0, "Google")]
[InlineData("D430390CD2A500", 0, "Tada :)")]
[InlineData("D3E61424ADB3F5", 0, "SMS Rulz")]
[InlineData("C8329BFD7601", 0, "Hello.")]
[InlineData("C8329BFD06DDDF723619", 0, "Hello world")]
[InlineData("54747A0E4ACF41F4F29C4E0ED3C321", 0, "This is testdata!")]
[InlineData("54741914AFA7C76B9058FEBEBB41E6371EA4AEB7E173D0DB5E9683E8E832881DD6E741E4F719", 0, "The quick brown fox jumps over the lazy dog")]
[InlineData(
"986F79B90D4AC3E7F53688FC66BFE5A0799A0E0AB7CB741668FC76CFCB637A995E9783C2E4343C3D1FA7DD6750999DA6B340F33219447E83CAE9FABCFD2683E8E536FC2D07A5DDE334394DAEBBE9A03A1DC40E8BDFF232A84C0791DFECB7BC0C6A87CFEE3028CC4EC7EB6117A84A0795DDE936284C06B5D3EE741B642FBBD3E1360B14AFA7E7", 1,
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis")]
public void Unpack_and_decode_returns_decoded_text(string gsm7Bit, int paddingBits, string expected)
{
string result = Gsm7.Encode(gsm7Bit);
byte[] unpacked = Gsm7.Unpack(Convert.FromHexString(gsm7Bit), paddingBits);
string result = Gsm7.DecodeFromBytes(unpacked);

Assert.Equal(expected, result);
}

[Theory]
[InlineData("41", "A")]
[InlineData("4121", "AB")]
[InlineData("41E110", "ABC")]
[InlineData("C7F7FBCC2E03", "Google")]
[InlineData("D3E61424ADB3F5", "SMS Rulz")]
[InlineData("C8329BFD7601", "Hello.")]
[InlineData("54747A0E4ACF41F4F29C4E0ED3C321", "This is testdata!")]
[InlineData("54741914AFA7C76B9058FEBEBB41E6371EA4AEB7E173D0DB5E9683E8E832881DD6E741E4F719", "The quick brown fox jumps over the lazy dog")]
public void Decoder_returns_decoded_text(string gsm7Bit, string expected)
[InlineData("{", "1B28")]
[InlineData("{}", "1B281B29")]
[InlineData("()", "2829")]
public void EncodeToBytes_returns_encoded_bytes_with_default_extension_table(string gsm7Bit, string expected)
{
byte[] result = Gsm7.EncodeToBytes(gsm7Bit);

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData("À", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, "14")]
[InlineData("Φ", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, "1B12")]
[InlineData("ΦΣ", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, "1B121B18")]
public void EncodeToBytes_returns_encoded_bytes_with_extension_table(string gsm7Bit, Gsm7.Extension singleShift, Gsm7.Extension lockingShift, string expected)
{
byte[] result = Gsm7.EncodeToBytes(gsm7Bit, singleShift, lockingShift);

Assert.Equal(Convert.FromHexString(expected), result);
}

[Theory]
[InlineData(new byte[] { 0x1B }, " ")]
[InlineData(new byte[] { 0x1B, 0x28 }, "{")]
[InlineData(new byte[] { 0x1B, 0x28, 0x1B, 0x29 }, "{}")]
[InlineData(new byte[] { 0x28, 0x29 }, "()")]
public void DecodeFromBytes_returns_decoded_text_with_default_extension_table(byte[] gsm7Bit, string expected)
{
string result = Gsm7.Decode(gsm7Bit);
string result = Gsm7.DecodeFromBytes(gsm7Bit);

Assert.Equal(expected, result);
}

[Theory]
[InlineData("14", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, "À")]
[InlineData("1B", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, " ")]
[InlineData("1B12", Gsm7.Extension.Portugese, Gsm7.Extension.Portugese, "Φ")]
public void DecodeFromBytes_returns_decoded_text_with_extension_table(string gsm7Bit, Gsm7.Extension singleShift, Gsm7.Extension lockingShift, string expected)
{
string result = Gsm7.DecodeFromBytes(Convert.FromHexString(gsm7Bit), singleShift, lockingShift);

Assert.Equal(expected, result);
}

[Theory]
[InlineData("A", 0, "41")]
[InlineData("Hello world", 0, "C8329BFD06DDDF723619")]
[InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostru", 0, "CCB7BCDC06A5E1F37A1B447EB3DF72D03C4D0785DB653A0B347EBBE7E531BD4CAFCB4161721A9E9E8FD3EE33A8CC4ED359A079990C22BF41E5747DDE7E9341F4721BFE9683D2EE719A9C26D7DD74509D0E6287C56F791954A683C86FF65B5E06B5C36777181466A7E3F5B00B54A583CAEE741B142683DA6977BA0DB297DDE9709B058AD7D37390FB3DA7CBEB")]
[InlineData("Hello world", 1, "906536FB0DBABFE56C3200")]
[InlineData("Hi", 2, "20D300")]
[InlineData("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.Ut enim ad minim veniam, quis", 1, "986F79B90D4AC3E7F53688FC66BFE5A0799A0E0AB7CB741668FC76CFCB637A995E9783C2E4343C3D4F8FD3EE33A8CC4ED359A079990C22BF41E5747DDE7E9341F4721BFE9683D2EE719A9C26D7DD74509D0E6287C56F791954A683C86FF65B5E06B5C36777181466A7E3F5B0AB4A0795DDE936284C06B5D3EE741B642FBBD3E1360B14AFA7E700")]
[InlineData(" nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolor", 1, "40EEF79C2EAF9341657C593E4ED3C3F4F4DB0DAAB3D9E1F6F80D6287C56F797A0E72A7E769509D0E0AB3D3F17A1A0E2AE341E53068FC6EB7DFE43768FC76CFCBF17A98EE22D6D37350B84E2F83D2F2BABC0C22BFD96F3928ED06C9CB7079195D7693CBF2341D947683EC6F761D4E0FD3CB207B999DA683CAF37919344EB3D9F53688FC66BFE500")]
[InlineData("e eu fugiat nulla pariatur.Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", 1, "CAA0721D64AE9FD3613AC85D67B3C32078589E0ED3EB7257113F2EC3E9E5BA1C344FBBE9A0F7781C2E8FC374D0B80E4F93C3F4301DE47EBB4170F93B4D2EBBE92CD0BCEEA683D26ED0B8CE868741F17A1AF4369BD3E37418442ECFCBF2BA9B0E6ABFD9EC341D1476A7DBA03419549ED341ECB0F82DAFB75D00")]
public void Encoder_returns_encoded_text_with_padding(string gsm7Bit, int paddingBits, string expected)
{
byte[] result = Gsm7.Pack(Gsm7.EncodeToBytes(gsm7Bit), paddingBits);

Assert.Equal(expected, BitConverter.ToString(result).Replace("-", ""));
}

[Theory]
[InlineData("A")]
[InlineData("AB")]
[InlineData("ABC")]
[InlineData("Google")]
[InlineData("SMS Rulz")]
[InlineData("Hello.")]
[InlineData("Hello world")]
[InlineData("This is testdata!")]
[InlineData("The quick brown fox jumps over the lazy dog")]
[InlineData("Tada :)")]
[InlineData("hellohello")]
[InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud")]
public void Encode_decode_returns_original_text(string text)
{
byte[] encoded = Gsm7.EncodeToBytes(text);
byte[] packed = Gsm7.Pack(encoded);
byte[] decoded = Gsm7.Unpack(packed);
string result = Gsm7.DecodeFromBytes(decoded);

Assert.Equal(text, result);
}
}
}
40 changes: 0 additions & 40 deletions src/HeboTech.ATLib.Tests/DTOs/PhoneNumberExtensionsTests.cs
View file

This file was deleted.

Loading

0 comments on commit 118c2a7

Please sign in to comment.