small tweaks

cloudshift · Mar 14, 2012 · c889221 · c889221
1 parent 04e5a55
commit c889221
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/cloudshift/Channel.hx b/cloudshift/Channel.hx
@@ -86,7 +86,7 @@ interface ChannelClient
       implements ChannelProvider,
       implements Part<String,ChannelClientError,ChannelClient,ESession> {
 
-  function unsub(chan:Chan<Dynamic>):Void;
+  //  function unsub(chan:Chan<Dynamic>):Void;
   function channel<T>(id:String):Outcome<String,Chan<T>>;
   function direct<T>(sessID:String):Outcome<String,Chan<T>>;
 }

diff --git a/cloudshift/channel/Flow.hx b/cloudshift/channel/Flow.hx
@@ -57,7 +57,7 @@ enum SinkEvent {
   ConnectionClose(sessID:String);
 }
 
-  interface Sink implements Part<Conduit,String,Sink,SinkEvent>  {
+interface Sink implements Part<Conduit,String,Sink,SinkEvent>  {
   function chan<T>(chanID:String):Chan<T>;
   function addConduit(conduit:Conduit):Void ;  
   function chanFromId(chanID:String):Option<Chan<Dynamic>>;
@@ -84,15 +84,6 @@ class Flow {
     return pl;
   }
 
-
-  /*
-  public static function
-  quickFlow() {
-    return new cloudshift.channel.QuickFlowImpl();
-  }
-  */
-
-
   #elseif CS_BROWSER
 
   public static function

diff --git a/cloudshift/channel/PushListenerImpl.hx b/cloudshift/channel/PushListenerImpl.hx
@@ -156,12 +156,12 @@ class PushListenerImpl implements Conduit {
 
   public function
   pump(sessID:String,payload:Dynamic,chanID:String,meta:Dynamic) {
-    _sessions.get(sessID).append(Flow.createPkt(payload,sessID,chanID,meta));
+    _sessions.get(sessID).append(Channel.createPkt(payload,sessID,chanID,meta));
   }
 
   public function
   direct(sessID:String,payload:Dynamic) {
-    _sessions.get(sessID).append(Flow.createPkt(payload,sessID,"/__cs/direct"));
+    _sessions.get(sessID).append(Channel.createPkt(payload,sessID,Core.CSROOT+"direct"));
   }
 
   public function

diff --git a/cloudshift/channel/TChannelClient.hx b/cloudshift/channel/TChannelClient.hx
@@ -55,17 +55,11 @@ class TChannelClient implements ChannelClient,
 
   public function
   channel<T>(id:String):Outcome<String,Chan<T>> {
-    var oc = Core.outcome();
+    return _sink.authorize(_sink.chan(id));
-    _sink.authorize(_sink.chan(id)).outcome(function(val) {
-        oc.resolve(Right(val));
-      });
-    return oc;
   }
 
   public function direct<T>(sessID:String):Outcome<String,Chan<T>> {
-    var oc = Core.outcome();
+    return _sink.authorize(_sink.chan(sessID));
-    _sink.authorize(_sink.chan(sessID)).deliver(cast oc.resolve);
-    return oc;
   }
 
   public function unsub(chan:Chan<Dynamic>) {