Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.3.0 Update #77

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ddcd949
Bump WebSocket4Net from 0.15.0-beta6 to 0.15.2
dependabot-preview[bot] Jan 28, 2020
fec6a8b
Bump Microsoft.Owin.Host.HttpListener from 2.0.2 to 4.1.0
dependabot-preview[bot] Jan 28, 2020
ed5d51d
Bump Microsoft.AspNet.WebApi.OwinSelfHost from 5.1.1 to 5.2.7
dependabot-preview[bot] Jan 28, 2020
eba7998
Bump Newtonsoft.Json from 9.0.1 to 12.0.3
dependabot-preview[bot] Jan 28, 2020
74af035
Bump Microsoft.AspNet.WebApi.Core from 5.1.1 to 5.2.7
dependabot-preview[bot] Jan 28, 2020
701c573
Merge pull request #13 from skrusty/master
seiggy Apr 16, 2020
0f28933
Merge pull request #12 from seiggy/dependabot/nuget/Microsoft.AspNet.…
seiggy Jun 18, 2020
31921c6
Merge pull request #11 from seiggy/dependabot/nuget/Newtonsoft.Json-1…
seiggy Jun 18, 2020
74158c2
Merge pull request #10 from seiggy/dependabot/nuget/Microsoft.AspNet.…
seiggy Jun 18, 2020
ecbbd15
Merge pull request #9 from seiggy/dependabot/nuget/Microsoft.Owin.Hos…
seiggy Jun 18, 2020
6746f1d
Merge pull request #8 from seiggy/dependabot/nuget/WebSocket4Net-0.15.2
seiggy Jun 18, 2020
994f54d
Bump Microsoft.AspNet.WebApi.Cors from 5.1.1 to 5.2.7
dependabot-preview[bot] Jun 18, 2020
0138919
Bump Microsoft.AspNet.WebApi.Client from 5.1.1 to 5.2.7
dependabot-preview[bot] Jun 18, 2020
ddf6d2c
Merge pull request #7 from seiggy/dependabot/nuget/Microsoft.AspNet.W…
seiggy Jun 18, 2020
d2a4eea
Bump Microsoft.AspNet.WebApi.WebHost from 5.1.1 to 5.2.7
dependabot-preview[bot] Jun 18, 2020
3b10acc
Merge pull request #6 from seiggy/dependabot/nuget/Microsoft.AspNet.W…
seiggy Jun 18, 2020
b3eadaf
Merge pull request #5 from seiggy/dependabot/nuget/Microsoft.AspNet.W…
seiggy Jun 18, 2020
8877187
Bump Microsoft.AspNet.WebApi from 5.1.1 to 5.2.7
dependabot-preview[bot] Jun 18, 2020
6a51000
Merge branch 'master' into dependabot/nuget/Microsoft.AspNet.WebApi-5…
seiggy Jun 18, 2020
54d2746
Merge pull request #4 from seiggy/dependabot/nuget/Microsoft.AspNet.W…
seiggy Jun 18, 2020
b515667
Bump Microsoft.Owin from 2.1.0 to 4.1.0
dependabot-preview[bot] Jun 18, 2020
bc556fc
Merge pull request #3 from seiggy/dependabot/nuget/Microsoft.Owin-4.1.0
seiggy Jun 18, 2020
3d71473
v1.3 Updates
Jun 23, 2020
5bbdff5
Upgrade to GitHub-native Dependabot
dependabot-preview[bot] Apr 29, 2021
33e2236
Merge pull request #30 from seiggy/dependabot/add-v2-config-file
seiggy Jul 4, 2021
a1954b1
Bump Microsoft.Owin.Hosting from 4.1.0 to 4.2.0
dependabot-preview[bot] May 11, 2021
aef20b0
Bump Microsoft.Owin from 4.1.0 to 4.2.0
dependabot-preview[bot] May 11, 2021
eb24d4d
Bump Microsoft.Owin.Host.HttpListener from 4.1.0 to 4.2.0
dependabot-preview[bot] May 11, 2021
7a1dc42
Bump Microsoft.Owin.Cors from 4.1.0 to 4.2.0
dependabot-preview[bot] May 11, 2021
9dabfae
Bump Newtonsoft.Json from 12.0.3 to 13.0.1
dependabot-preview[bot] Mar 23, 2021
ae2c77f
Bump SuperSocket.ClientEngine.Core from 0.8.0.8 to 0.10.0
dependabot-preview[bot] Jun 24, 2020
2d2ba03
Bump RestSharp from 106.11.4 to 106.11.7
dependabot-preview[bot] Jul 4, 2021
64722c5
Updated proj file
Sep 13, 2021
7cdf98b
Merge branch 'master' of https://github.com/seiggy/AsterNET.ARI
Sep 13, 2021
5eb1e09
Bump RestSharp from 106.11.7 to 106.12.0
dependabot[bot] Jul 16, 2021
42eb5fb
Updated to Asterisk 20, made ARIClient methods virtual to assist with…
Jun 21, 2023
ff62f41
fixing restsharp upgrade
Jun 21, 2023
fab6f64
Setting all methods to virtual to allow for better unit tests
Jun 23, 2023
63aac3f
v2.0 upgrade and refactor
Jun 23, 2023
ffc9f08
fixing github action build
Jun 23, 2023
88f1fdd
fixing nuget source
Jun 23, 2023
87b0182
trying to fix package release
Jun 23, 2023
e99535f
more action fixing attempts
Jun 23, 2023
3ac6262
adding nuget publish
Jun 23, 2023
2780e85
fixing typo
Jun 23, 2023
b6225fc
hotfix for RestSharp 107 bug
Jul 19, 2023
1464887
fixing codeql-analysis build
Jul 19, 2023
7bc0be9
updating version
Jul 19, 2023
ca25316
Fixed more AsterNET names - fix bug #76
Jul 20, 2023
b681447
Housekeeping, renaming sample project RootNamespace and AssemblyName …
nakchak Jul 20, 2023
4a45388
Create FUNDING.yml
seiggy Aug 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: [seiggy, skrusty]
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: nuget
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10

71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '20 17 * * 0'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
32 changes: 32 additions & 0 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: .NET Core

on:
push:
branches: [ master ]
# pull_request:
# branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-restore --verbosity normal
- name: Create NuGet Packages
run: dotnet pack --configuration Release --include-symbols --include-source
- name: Publish NuGet Packages
run: |
dotnet nuget add source https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json --username ${{ github.repository_owner }} --password ${{ github.token }} --store-password-in-clear-text --name github
dotnet nuget push "Arke.ARI/**/*.nupkg" --source github --skip-duplicate
dotnet nuget push "Arke.ARI/**/*.nupkg" -k ${{ secrets.NUGET_ORG_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
25 changes: 25 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Pull Request Validation

on:
# push:
# branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-restore --verbosity normal
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dotnet.defaultSolution": "Arke.ARI.sln"
}
28 changes: 11 additions & 17 deletions AsterNET.ARI.sln → Arke.ARI.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsterNET.ARI", "AsterNET.ARI\AsterNET.ARI.csproj", "{F4C8C633-2207-4C25-89A8-4D23D9CFA964}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arke.ARI", "Arke.ARI\Arke.ARI.csproj", "{F4C8C633-2207-4C25-89A8-4D23D9CFA964}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FBB847F2-AC1C-47DD-B5F7-37C160743F53}"
EndProject
Expand All @@ -17,29 +17,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Package.nuspec = Package.nuspec
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBridge", "Samples\SimpleBridge\SimpleBridge.csproj", "{4E7F6185-4433-4C75-96A6-8859411577CC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBridge", "Samples\SimpleBridge\SimpleBridge.csproj", "{4E7F6185-4433-4C75-96A6-8859411577CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleConf", "Samples\SimpleConfExample\SimpleConf.csproj", "{BD04EEB4-0475-4D2F-ADA9-76E4F55BB5BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleConf", "Samples\SimpleConfExample\SimpleConf.csproj", "{BD04EEB4-0475-4D2F-ADA9-76E4F55BB5BB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleRecordAndPlayback", "Samples\SimpleRecordAndPlayback\SimpleRecordAndPlayback.csproj", "{F8C2150F-7D48-4E30-AE9A-E2354E5A536D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleRecordAndPlayback", "Samples\SimpleRecordAndPlayback\SimpleRecordAndPlayback.csproj", "{F8C2150F-7D48-4E30-AE9A-E2354E5A536D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleTestApplication", "Samples\SimpleTestApplication\SimpleTestApplication.csproj", "{1DD784F3-809C-465E-9F3B-8575705A5C6C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestApplication", "Samples\SimpleTestApplication\SimpleTestApplication.csproj", "{1DD784F3-809C-465E-9F3B-8575705A5C6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARICodeGen", "CodeGeneratror\ARICodeGen\ARICodeGen.csproj", "{9A6809EF-E0C7-4552-98FA-2D75A33CCFE3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AsyncSamples", "AsyncSamples", "{31012840-0DA0-4F79-8C4E-952D1422DD0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBridgeAsync", "AsyncSamples\SimpleBridgeAsync\SimpleBridgeAsync.csproj", "{C9AE28E1-5D6E-4995-A40D-FFB9A3B39CE1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBridgeAsync", "AsyncSamples\SimpleBridgeAsync\SimpleBridgeAsync.csproj", "{C9AE28E1-5D6E-4995-A40D-FFB9A3B39CE1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleConfAsync", "AsyncSamples\SimpleConfAsync\SimpleConfAsync.csproj", "{BEDEAA1C-0513-4CFB-8B5C-794E4C682820}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleConfAsync", "AsyncSamples\SimpleConfAsync\SimpleConfAsync.csproj", "{BEDEAA1C-0513-4CFB-8B5C-794E4C682820}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleRecordAndPlaybackAsync", "AsyncSamples\SimpleRecordAndPlaybackAsync\SimpleRecordAndPlaybackAsync.csproj", "{DEE23389-A37D-484F-BB35-E63CF7977C7E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleRecordAndPlaybackAsync", "AsyncSamples\SimpleRecordAndPlaybackAsync\SimpleRecordAndPlaybackAsync.csproj", "{DEE23389-A37D-484F-BB35-E63CF7977C7E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleTestApplicationAsync", "AsyncSamples\SimpleTestApplicationAsync\SimpleTestApplicationAsync.csproj", "{55979546-152E-4157-9AA3-839F6E3CE4E8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestApplicationAsync", "AsyncSamples\SimpleTestApplicationAsync\SimpleTestApplicationAsync.csproj", "{55979546-152E-4157-9AA3-839F6E3CE4E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordingSample", "RecordingSample\RecordingSample.csproj", "{830E8CF5-E8DD-4E2E-82FA-6433E3BF174B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsterNET.ARI.NetStandard", "AsterNET.ARI.NetStandard\AsterNET.ARI.NetStandard.csproj", "{431A2DF3-F413-4FC4-A6E3-FEA97212FD9C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RecordingSample", "RecordingSample\RecordingSample.csproj", "{830E8CF5-E8DD-4E2E-82FA-6433E3BF174B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -86,10 +84,6 @@ Global
{830E8CF5-E8DD-4E2E-82FA-6433E3BF174B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{830E8CF5-E8DD-4E2E-82FA-6433E3BF174B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{830E8CF5-E8DD-4E2E-82FA-6433E3BF174B}.Release|Any CPU.Build.0 = Release|Any CPU
{431A2DF3-F413-4FC4-A6E3-FEA97212FD9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{431A2DF3-F413-4FC4-A6E3-FEA97212FD9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{431A2DF3-F413-4FC4-A6E3-FEA97212FD9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{431A2DF3-F413-4FC4-A6E3-FEA97212FD9C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
20 changes: 10 additions & 10 deletions AsterNET.ARI/ARIClient.cs → Arke.ARI/ARIClient.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Diagnostics;
using System.Threading;
using AsterNET.ARI.Actions;
using AsterNET.ARI.Dispatchers;
using AsterNET.ARI.Middleware;
using AsterNET.ARI.Middleware.Default;
using AsterNET.ARI.Models;
using Arke.ARI.Actions;
using Arke.ARI.Dispatchers;
using Arke.ARI.Middleware;
using Arke.ARI.Middleware.Default;
using Arke.ARI.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace AsterNET.ARI
namespace Arke.ARI
{
public enum EventDispatchingStrategy
{
Expand Down Expand Up @@ -149,7 +149,7 @@ private void _eventProducer_OnMessageReceived(object sender, MessageEventArgs e)
// load the message
var jsonMsg = (JObject)JToken.Parse(e.Message);
var eventName = jsonMsg.SelectToken("type").Value<string>();
var type = Type.GetType("AsterNET.ARI.Models." + eventName + "Event");
var type = Type.GetType("Arke.ARI.Models." + eventName + "Event");
var evnt =
(type != null)
? (Event)JsonConvert.DeserializeObject(e.Message, type)
Expand All @@ -166,7 +166,7 @@ private void _eventProducer_OnMessageReceived(object sender, MessageEventArgs e)
{
FireEvent(evnt.Type, evnt, this);
}
catch(Exception ex)
catch (Exception ex)
{
// Handle any exceptions that were thrown by the invoked event handler
if (!UnhandledException(this, ex))
Expand Down Expand Up @@ -222,7 +222,7 @@ public bool Connected
get { return _eventProducer.State == ConnectionState.Open; }
}

public void Connect(bool autoReconnect = true, int autoReconnectDelay = 5)
public virtual void Connect(bool autoReconnect = true, int autoReconnectDelay = 5)
{
lock (_syncRoot)
{
Expand All @@ -235,7 +235,7 @@ public void Connect(bool autoReconnect = true, int autoReconnectDelay = 5)
_eventProducer.Connect(_subscribeAllEvents, _ssl);
}

public void Disconnect()
public virtual void Disconnect()
{
lock (_syncRoot)
{
Expand Down
2 changes: 1 addition & 1 deletion AsterNET.ARI/ARIException.cs → Arke.ARI/ARIException.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace AsterNET.ARI
namespace Arke.ARI
{
/// <summary>
/// An excpetion within the ARI framework
Expand Down
Loading