Flow is now the internal api

cloudshift · Mar 12, 2012 · 2020726 · 2020726
1 parent 9c7aaf0
commit 2020726
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 106 deletions.
diff --git a/cloudshift/Channel.hx b/cloudshift/Channel.hx
@@ -108,4 +108,44 @@ class Channel {
     return new cloudshift.channel.TChannelClient();
   }
   #end
+
+  public static function
+  chanID(pkt:Pkt<Dynamic>) {
+    return pkt.m.ch;
+  }
+
+  public static function
+  operation(pkt:Pkt<Dynamic>) {
+    return pkt.m.op;
+  }
+
+  public static function
+  payload(pkt:Pkt<Dynamic>) {
+    return pkt.p;
+  }
+
+  public static function
+  setPayload(pkt:Pkt<Dynamic>,pl:Dynamic) {
+    pkt.p = pl;
+  }
+
+  public static function
+  sessID(pkt:Pkt<Dynamic>) {
+    return pkt.s;
+  }
+
+  public static function oldmeta(pkt:Pkt<Dynamic>) {
+    return pkt.m;
+  }
+
+  public static function meta(pkt:Pkt<Dynamic>):Dynamic {
+    return pkt.m.um;
+  }
+
+  public static function
+  createPkt<T>(userData:T,sessID:String,chan:String,op="m",meta:Dynamic=null):Pkt<T> {
+    return { p:userData,s:sessID,m:{ch:chan,op:op,um:meta} };
+  }
+
+
 }
diff --git a/cloudshift/channel/ClientSinkImpl.hx b/cloudshift/channel/ClientSinkImpl.hx
@@ -5,7 +5,6 @@ import cloudshift.Core;
 import cloudshift.Session;
 import cloudshift.Channel;
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 
 
 class ClientSinkImpl extends SinkImpl {

diff --git a/cloudshift/channel/Flow.hx b/cloudshift/channel/Flow.hx
@@ -8,9 +8,23 @@ import cloudshift.Channel;
 
 #if nodejs
 import cloudshift.Http;
-import cloudshift.channel.InternalApi;
 #end
 
+interface MessageQ {
+  function append(pkt:Dynamic):Void;
+  function setFlusher(cb:MessageQ->Bool):Void;
+  function sessID():String;
+  function deQueue():Array<Dynamic>;
+}
+
+interface ConduitSession {
+  function append(pkt:Dynamic):Void;
+  function flusher(flush:MessageQ->Bool):Void;
+  function subscriptions():Hash<Void->Void>;
+  function shutDown():Void;
+  var lastConnection(default,default):Float;
+  var sessID(default,default):String;
+}
 
 typedef ConduitClientStart = {
     var host:String;
@@ -52,15 +66,6 @@ enum SinkEvent {
   function direct<T>(sessID:String):Chan<T>;
 }
 
-
-  /*
-typedef QuickFlow = {
-    var conduit:Conduit;
-    var session:SessionMgr;
-    var sink:Sink;
-}
-  */
-
 class Flow {
 
   public static var PUSH = Core.CSROOT+"p";

diff --git a/cloudshift/channel/InternalApi.hx b/cloudshift/channel/InternalApi.hx
diff --git a/cloudshift/channel/MessageQImpl.hx b/cloudshift/channel/MessageQImpl.hx
@@ -1,7 +1,6 @@
 
 package cloudshift.channel;
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 
 using cloudshift.Mixin;
 

diff --git a/cloudshift/channel/PipeImpl.hx b/cloudshift/channel/PipeImpl.hx
@@ -5,7 +5,6 @@ import cloudshift.Core;
 using cloudshift.Mixin;
 import cloudshift.Channel;
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 
 using cloudshift.channel.Flow;
 

diff --git a/cloudshift/channel/PushClientImpl.hx b/cloudshift/channel/PushClientImpl.hx
@@ -6,7 +6,6 @@ import cloudshift.Channel;
 
 import cloudshift.channel.Flow;
 import cloudshift.Session;
-import cloudshift.channel.InternalApi;
 import cloudshift.core.ObservableImpl;
 using cloudshift.Mixin;
 using cloudshift.channel.Flow;

diff --git a/cloudshift/channel/PushListenerImpl.hx b/cloudshift/channel/PushListenerImpl.hx
@@ -7,7 +7,6 @@ import cloudshift.Session;
 import cloudshift.Channel;
 
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 import cloudshift.Http;
 import cloudshift.http.HttpImpl;
 import cloudshift.core.ObservableImpl;

diff --git a/cloudshift/channel/PushSessionImpl.hx b/cloudshift/channel/PushSessionImpl.hx
@@ -3,7 +3,6 @@ package cloudshift.channel;
 
 import cloudshift.Http;
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 import cloudshift.channel.MessageQImpl;
 
 using cloudshift.Mixin;

diff --git a/cloudshift/channel/QuickFlowImpl.hx b/cloudshift/channel/QuickFlowImpl.hx
diff --git a/cloudshift/channel/ServerSinkImpl.hx b/cloudshift/channel/ServerSinkImpl.hx
@@ -6,7 +6,6 @@ import cloudshift.Session;
 import cloudshift.Channel;
 import cloudshift.channel.Flow;
 import cloudshift.Http;
-import cloudshift.channel.InternalApi;
 
 using cloudshift.Mixin;
 

diff --git a/cloudshift/channel/SinkImpl.hx b/cloudshift/channel/SinkImpl.hx
@@ -4,7 +4,6 @@ package cloudshift.channel;
 import cloudshift.Core;
 import cloudshift.Channel;
 import cloudshift.channel.Flow;
-import cloudshift.channel.InternalApi;
 import cloudshift.core.ObservableImpl;
 using cloudshift.Mixin;
 

diff --git a/cloudshift/channel/TChannelServer.hx b/cloudshift/channel/TChannelServer.hx
@@ -5,8 +5,8 @@ import cloudshift.Core;
 import cloudshift.Channel;
 import cloudshift.Http;
 import cloudshift.Session;
-import cloudshift.channel.Flow;
 using cloudshift.Mixin;
+import cloudshift.channel.Flow;
 
 class TChannelServer implements ChannelServer,implements Part<Dynamic,String,ChannelServer,ChannelEvent> {
   public var part_:Part_<Dynamic,String,ChannelServer,ChannelEvent>;