Skip to content

T
TourDataManager
Commit d3bb78b0 authored by Kirill's avatar Kirill
Browse files
Options

Теперь точно удалена реализация ipc через named pipes (Clifton.Core.Pipes)

parent d768e60a
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 470 deletions
Clifton.Core.Pipes/BasicPipe.cs deleted 100644 → 0
View file @ d768e60a
/* The MIT License (MIT)
*
* Copyright (c) 2015 Marc Clifton
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
// From: http://stackoverflow.com/questions/34478513/c-sharp-full-duplex-asynchronous-named-pipes-net
// See Eric Frazer's Q and self answer
using System;
using System.IO.Pipes;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Clifton.Core.Pipes
{
public abstract class BasicPipe
{
public event EventHandler<PipeEventArgs> DataReceived;
public event EventHandler<EventArgs> PipeClosed;
protected PipeStream pipeStream;
protected Action<BasicPipe> asyncReaderStart;
public BasicPipe()
{
}
public void Close()
{
pipeStream.WaitForPipeDrain();
pipeStream.Close();
pipeStream.Dispose();
pipeStream = null;
}
/// <summary>
/// Reads an array of bytes, where the first [n] bytes (based on the server's intsize) indicates the number of bytes to read
/// to complete the packet.
/// </summary>
public void StartByteReaderAsync()
{
StartByteReaderAsync((b) => DataReceived?.Invoke(this, new PipeEventArgs(b, b.Length)));
}
/// <summary>
/// Reads an array of bytes, where the first [n] bytes (based on the server's intsize) indicates the number of bytes to read
/// to complete the packet, and invokes the DataReceived event with a string converted from UTF8 of the byte array.
/// </summary>
public void StartStringReaderAsync()
{
StartByteReaderAsync((b) =>
{
string str = Encoding.UTF8.GetString(b).TrimEnd('\0');
DataReceived?.Invoke(this, new PipeEventArgs(str));
});
}
public void Flush()
{
pipeStream.Flush();
}
public Task WriteString(string str)
{
return WriteBytes(Encoding.UTF8.GetBytes(str));
}
public Task WriteBytes(byte[] bytes)
{
var blength = BitConverter.GetBytes(bytes.Length);
var bfull = blength.Concat(bytes).ToArray();
return pipeStream.WriteAsync(bfull, 0, bfull.Length);
}
protected void StartByteReaderAsync(Action<byte[]> packetReceived)
{
int intSize = sizeof(int);
byte[] bDataLength = new byte[intSize];
pipeStream.ReadAsync(bDataLength, 0, intSize).ContinueWith(t =>
{
int len = t.Result;
if (len == 0)
{
PipeClosed?.Invoke(this, EventArgs.Empty);
}
else
{
int dataLength = BitConverter.ToInt32(bDataLength, 0);
byte[] data = new byte[dataLength];
pipeStream.ReadAsync(data, 0, dataLength).ContinueWith(t2 =>
{
len = t2.Result;
if (len == 0)
{
PipeClosed?.Invoke(this, EventArgs.Empty);
}
else
{
packetReceived(data);
StartByteReaderAsync(packetReceived);
}
});
}
});
}
}
}
\ No newline at end of file
Clifton.Core.Pipes/ClientPipe.cs deleted 100644 → 0
View file @ d768e60a
/* The MIT License (MIT)
*
* Copyright (c) 2015 Marc Clifton
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
// From: http://stackoverflow.com/questions/34478513/c-sharp-full-duplex-asynchronous-named-pipes-net
// See Eric Frazer's Q and self answer
using System;
using System.IO.Pipes;
namespace Clifton.Core.Pipes
{
public class ClientPipe : BasicPipe
{
protected NamedPipeClientStream clientPipeStream;
public ClientPipe(string serverName, string pipeName, Action<BasicPipe> asyncReaderStart)
{
this.asyncReaderStart = asyncReaderStart;
clientPipeStream = new NamedPipeClientStream(serverName, pipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
pipeStream = clientPipeStream;
}
public void Connect()
{
clientPipeStream.Connect();
asyncReaderStart(this);
}
}
}
Clifton.Core.Pipes/Clifton.Core.Pipes.csproj deleted 100644 → 0
View file @ d768e60a
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B826097C-CC24-4CAC-8D31-8A65C4B76BE9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Clifton.Core.Pipes</RootNamespace>
<AssemblyName>Clifton.Core.Pipes</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BasicPipe.cs" />
<Compile Include="ClientPipe.cs" />
<Compile Include="PipeEventArgs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServerPipe.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Clifton.Core.Pipes/PipeEventArgs.cs deleted 100644 → 0
View file @ d768e60a
/* The MIT License (MIT)
*
* Copyright (c) 2015 Marc Clifton
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
// From: http://stackoverflow.com/questions/34478513/c-sharp-full-duplex-asynchronous-named-pipes-net
// See Eric Frazer's Q and self answer
namespace Clifton.Core.Pipes
{
public class PipeEventArgs
{
public byte[] Data { get; protected set; }
public int Len { get; protected set; }
public string String { get; protected set; }
public PipeEventArgs(string str)
{
String = str;
}
public PipeEventArgs(byte[] data, int len)
{
Data = data;
Len = len;
}
}
}
\ No newline at end of file
Clifton.Core.Pipes/Properties/AssemblyInfo.cs deleted 100644 → 0
View file @ d768e60a
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Clifton.Core.Pipes")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Clifton.Core.Pipes")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b826097c-cc24-4cac-8d31-8a65c4b76be9")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Clifton.Core.Pipes/ServerPipe.cs deleted 100644 → 0
View file @ d768e60a
/* The MIT License (MIT)
*
* Copyright (c) 2015 Marc Clifton
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
// From: http://stackoverflow.com/questions/34478513/c-sharp-full-duplex-asynchronous-named-pipes-net
// See Eric Frazer's Q and self answer
using System;
using System.IO.Pipes;
namespace Clifton.Core.Pipes
{
public class ServerPipe : BasicPipe
{
public event EventHandler<EventArgs> Connected;
protected NamedPipeServerStream serverPipeStream;
protected string PipeName { get; set; }
public ServerPipe(string pipeName, Action<BasicPipe> asyncReaderStart)
{
this.asyncReaderStart = asyncReaderStart;
PipeName = pipeName;
serverPipeStream = new NamedPipeServerStream(
pipeName,
PipeDirection.InOut,
NamedPipeServerStream.MaxAllowedServerInstances,
PipeTransmissionMode.Message,
PipeOptions.Asynchronous);
pipeStream = serverPipeStream;
serverPipeStream.BeginWaitForConnection(new AsyncCallback(PipeConnected), null);
}
protected void PipeConnected(IAsyncResult ar)
{
serverPipeStream.EndWaitForConnection(ar);
Connected?.Invoke(this, new EventArgs());
asyncReaderStart(this);
}
}
}
\ No newline at end of file
Clifton.Core.Pipes/readme.md deleted 100644 → 0
View file @ d768e60a
https://www.codeproject.com/Articles/1179195/Full-Duplex-Asynchronous-Read-Write-with-Named-Pip
TourDataManager.sln
View file @ d3bb78b0
......@@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TourDataManager", "TourData
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TourDataManagerConsoleApplication", "TourDataManagerConsoleApplication\TourDataManagerConsoleApplication.csproj", "{66F0D20A-DA45-45CB-8DDF-0F9900E03AE3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rest", "Rest\Rest.csproj", "{6708BCDF-A4C5-4D48-95A4-5C51B4C140B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -18,5 +20,9 @@ Global
{66F0D20A-DA45-45CB-8DDF-0F9900E03AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66F0D20A-DA45-45CB-8DDF-0F9900E03AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66F0D20A-DA45-45CB-8DDF-0F9900E03AE3}.Release|Any CPU.Build.0 = Release|Any CPU
{6708BCDF-A4C5-4D48-95A4-5C51B4C140B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6708BCDF-A4C5-4D48-95A4-5C51B4C140B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6708BCDF-A4C5-4D48-95A4-5C51B4C140B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6708BCDF-A4C5-4D48-95A4-5C51B4C140B9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
TourDataManagerConsoleApplication/Program.cs
View file @ d3bb78b0
......@@ -2,109 +2,27 @@
using System.Text;
using System.Threading.Tasks;
using TourDataManager;
using TourDataManager.Entities;
namespace TourDataManagerConsoleApplication {
internal class Program {
const string PersistentPath = "C:\\Users\\Bigantounity\\AppData\\LocalLow\\Biganto\\StandalonePlayer";
const string PersistentPath = "";
const string defaultLogin = "demo@biganto.ru";
const string defaultPassword = "demo";
public static TourDataManager.TourDataManagerPlugin TourDataManagerPlugin;
public static void Main(string[] args){
// TODO Get PersistentPath from args
Console.OutputEncoding = Encoding.UTF8;
Console.InputEncoding = Encoding.UTF8;
//var plugin = new TourDataManagerPlugin(PersistentPath);
//var input = new CmdInputMethod(plugin);
Console.WriteLine("Привет");
var line = Console.ReadLine();
Console.WriteLine(line);
//TourDataManagerPlugin = new TourDataManager.TourDataManagerPlugin(PersistentPath);
//CreateServer("Test3");
//MainWindow();
//tourDataManager.Login(defaultLogin, defaultPassword);
//AsyncMethod(tourDataManager);
Console.Read();
}
public static void MainWindow(){
Debug.Log("Commands : \n0 - Auth\n1 - Show estates list\n2 - exit");
var ch = Debug.ReadLine()[0];
switch (ch){
case '0' :
Debug.Log("Login : ");
var login = Console.ReadLine();
Debug.Log("Password : ");
var pass = Console.ReadLine();
var result = TourDataManagerPlugin.Login(login,pass);
Debug.Log($"Auth result : {result.Item1} {result.Item2}");
MainWindow();
break;
case '1' :
var estates = TourDataManagerPlugin.FetchEstatesAsync().Result;
foreach (var estate in estates){
Debug.Log(estate);
}
EstateWindow();
break;
case '2' : Environment.Exit(0); break;
}
}
public static void EstateWindow(){
Debug.Log("Commands : \n0 - Fetch tours of estate\n1 - back\n2 - exit");
var ch = Debug.ReadLine()[0];
switch (ch){
case '0' :
Debug.Log("Estate id : ");
var id = Console.ReadLine();
var tours = TourDataManagerPlugin.FetchTourPreviewsAsync(Int32.Parse(id)).Result;
foreach (var tour in tours){
Debug.Log(tour);
}
EstateWindow();
break;
case '1' : MainWindow(); break;
case '2' : Environment.Exit(0); break;
}
}
public static async void AsyncMethod(TourDataManager.TourDataManagerPlugin plugin){
try{
var estates = await plugin.FetchEstatesAsync();
Tour[] tours = null;
foreach (var estate in estates){
Debug.Log(estate);
tours = await plugin.FetchTourPreviewsAsync(estate.Id);
foreach (var tour in tours){
Debug.Log(tour);
}
}
System.Diagnostics.Debug.Assert(tours != null, nameof(tours) + " != null");
var contentLoadingTask = plugin.DownloadTourContent(tours[2].Id);
var x = Task.Factory
.StartNew(() => { contentLoadingTask.Run(); })
.ContinueWith(task => {
Debug.Log("Done");
});
} catch (Exception e){
Debug.Log(e);
for(int i = 0; i < args.Length; i++){
Console.WriteLine(args[i]);
}
Console.Read();
}
......
TourDataManagerConsoleApplication/TourDataManagerConsoleApplication.csproj
View file @ d3bb78b0
......@@ -64,10 +64,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Clifton.Core.Pipes\Clifton.Core.Pipes.csproj">
<Project>{b826097c-cc24-4cac-8d31-8a65c4b76be9}</Project>
<Name>Clifton.Core.Pipes</Name>
</ProjectReference>
<ProjectReference Include="..\TourDataManager\TourDataManager.csproj">
<Project>{a62d5535-a31a-466e-8255-a5e74a98666a}</Project>
<Name>TourDataManager</Name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment