Релиз 2.0.1.0

Author: ahyahy

OneScriptClientServer/OneScriptClientServer/Action.cs

@@ -0,0 +1,22 @@
+using ScriptEngine.Machine.Contexts;
+using ScriptEngine.Machine;
+
+namespace oscs
+{
+    [ContextClass ("КсДействие", "CsAction")]
+    public class CsAction : AutoContext<CsAction>
+    {
+        public CsAction(IRuntimeContextInstance script, string methodName)
+        {
+            Script = script;
+            MethodName = methodName;
+        }
+        
+        [ContextProperty("ИмяМетода", "MethodName")]
+        public string MethodName { get; set; }
+        
+        [ContextProperty("Сценарий", "Script")]
+        public IRuntimeContextInstance Script { get; set; }
+        
+    }
+}

OneScriptClientServer/OneScriptClientServer/DoAtClientArgs.cs

@@ -42,7 +42,7 @@ public CsDoAtClientArgs(DoAtClientArgs p1)
         public DoAtClientArgs Base_obj;
 
         [ContextProperty("Действие", "EventAction")]
-        public DelegateAction EventAction
+        public IValue EventAction
         {
             get { return Base_obj.EventAction; }
             set { Base_obj.EventAction = value; }

OneScriptClientServer/OneScriptClientServer/DoAtServerArgs.cs

@@ -42,7 +42,7 @@ public CsDoAtServerArgs(DoAtServerArgs p1)
         public DoAtServerArgs Base_obj;
 
         [ContextProperty("Действие", "EventAction")]
-        public DelegateAction EventAction
+        public IValue EventAction
         {
             get { return Base_obj.EventAction; }
             set { Base_obj.EventAction = value; }

OneScriptClientServer/OneScriptClientServer/EventArgs.cs

@@ -7,7 +7,7 @@ namespace oscs
     public class EventArgs
     {
         public CsEventArgs dll_obj;
-        public DelegateAction EventAction;
+        public IValue EventAction;
         public dynamic Sender;
 
         public EventArgs()
@@ -37,7 +37,7 @@ public CsEventArgs(EventArgs p1)
         public EventArgs Base_obj;
 
         [ContextProperty("Действие", "EventAction")]
-        public DelegateAction EventAction
+        public IValue EventAction
         {
             get { return Base_obj.EventAction; }
             set { Base_obj.EventAction = value; }

OneScriptClientServer/OneScriptClientServer/MessageEventArgs.cs

@@ -67,7 +67,7 @@ public CsMessageEventArgs(oscs.MessageEventArgs p1)
 
 
         [ContextProperty("Действие", "EventAction")]
-        public DelegateAction EventAction
+        public IValue EventAction
         {
             get { return Base_obj.EventAction; }
             set { Base_obj.EventAction = value; }

OneScriptClientServer/OneScriptClientServer/OneScriptClientServer.cs

@@ -14,11 +14,11 @@ public class OneScriptClientServer : AutoContext<OneScriptClientServer>
         public static CsServiceApplication CurrentServiceApplication = null;
         public static CsServiceClient CurrentServiceClient = null;
         public static IValue Event = null;
-        public static DelegateAction EventAction = null;
+        public static IValue EventAction = null;
         public static ConcurrentQueue<dynamic> EventQueue = new ConcurrentQueue<dynamic>();
         public static bool goOn = true;
-        public static DelegateAction ServerMessageReceived;
-        public static DelegateAction ServerMessageSent;
+        public static IValue ServerMessageReceived;
+        public static IValue ServerMessageSent;
         public static bool thirdPartyClientMode = false;
 
         [ScriptConstructor]
@@ -67,6 +67,12 @@ public CsTcpClient TcpClient(CsTcpEndPoint p1)
             return new CsTcpClient(p1);
         }
 
+        [ContextMethod("Действие", "Action")]
+        public CsAction Action(IRuntimeContextInstance script, string methodName)
+        {
+            return new CsAction(script, methodName);
+        }
+
         [ContextMethod("TCPКонечнаяТочка", "TcpEndPoint")]
         public CsTcpEndPoint TcpEndPoint(string p1, int p2)
         {
@@ -86,10 +92,16 @@ public DelegateAction DoEvents()
             {
                 System.Threading.Thread.Sleep(7);
             }
-            return EventHandling();
+
+            IValue Action1 = EventHandling();
+            if (Action1.GetType() == typeof(CsAction))
+            {
+                return DelegateAction.Create(((CsAction)Action1).Script, ((CsAction)Action1).MethodName);
+            }
+            return (DelegateAction)Action1;
         }
 
-        public static DelegateAction EventHandling()
+        public static IValue EventHandling()
         {
             dynamic EventArgs1;
             EventQueue.TryDequeue(out EventArgs1);

OneScriptClientServer/OneScriptClientServer/OneScriptClientServer.csproj

@@ -49,6 +49,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Action.cs" />
     <Compile Include="BoolMessage.cs" />
     <Compile Include="ByteMessage.cs" />
     <Compile Include="ClientInfo.cs" />

OneScriptClientServer/OneScriptClientServer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]

OneScriptClientServer/OneScriptClientServer/ServerClient.cs

@@ -106,9 +106,9 @@ public CsServerClient(IScsServerClient p1)
             Base_obj = ServerClient1;
         }
 
-        public DelegateAction MessageSent { get; set; }
+        public IValue MessageSent { get; set; }
 
-        public DelegateAction MessageReceived { get; set; }
+        public IValue MessageReceived { get; set; }
 
         public oscs.ServerClient Base_obj;
 
@@ -119,7 +119,7 @@ public decimal ClientId
         }
 
         [ContextProperty("ПриОтключении", "Disconnected")]
-        public DelegateAction Disconnected { get; set; }
+        public IValue Disconnected { get; set; }
 
         [ContextProperty("СостояниеСоединения", "CommunicationState")]
         public int CommunicationState

OneScriptClientServer/OneScriptClientServer/ServerClientEventArgs.cs

@@ -55,7 +55,7 @@ public CsServerClientEventArgs(oscs.ServerClientEventArgs p1)
 
 
         [ContextProperty("Действие", "EventAction")]
-        public DelegateAction EventAction
+        public IValue EventAction
         {
             get { return Base_obj.EventAction; }
             set { Base_obj.EventAction = value; }