X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F00_XNet.js;h=90693963a7b992dd65e4e0d73dccea361c80d8ee;hb=4e4ab3be10850546063d4a4b93250ed142bb8cd2;hp=03d336a633893b8cf2b4dbbc5b3f8589faf1c321;hpb=a130cabd01fde8865990a59d849f5d5d08ed2119;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js
index 03d336a..9069396 100644
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -3,43 +3,200 @@
 
 // http://bugs.jquery.com/ticket/2709
 // <head><base> ãããå ´åã<script>ã®è¿½å ã«å¤±æãã
-X.Net = {
 
-	xhrGet : function( url, type ){
-		return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'GET', url : url, type : type } );
-	},
-	
-	xhrPost : function( url, type, postbody ){
-		return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'POST', url : url, type : type, postbody : postbody } );
-	},
-	
-	formGet : function(){
-		
-	},
-	
-	formPost : function(){
-		
-	},
-	
-	// TODO chashe
-	// TODO iframe useful or not. TODO dynamicIframe
-	// TODO file: ã§ã¯ãhttp: ã¯ä½¿ããªã
-	jsonp : function( url, useIframe ){
-		return new X_NET_Queue( X_NET_TYPE_JSONP, url );
-	},
-	
-	image : function( url, needSize, delay, timeout ){
-		return new X_NET_Queue( X_NET_TYPE_IMAGE, { url : url, needSize : needSize } );
-	},
-	
-	// <script>, <link>
-	
-	amountQueue : function(){
-		return X_NET_QUEUE_LIST.length;
-	}
 
-};
 
+/**
+ * <p>state() ã¡ã½ããã ããæã¤ãéä¿¡ç¨ã®ãã­ããã£ã¯ X.Pair ã«ãã£ã¦é è½ããã¦ãã¾ãã
+ * <h4>éä¿¡ã®ã­ã£ã³ã»ã«</h4>
+ * <p>kill() ã§éä¿¡å¾ã¡ä¸­ã¯ã­ã£ã³ã»ã«&ç ´æ£ãéä¿¡ä¸­ã®å ´åã¯éä¿¡ã®ä¸­æ­&ç ´æ£ãè¡ãã
+ * <h4>ã¤ãã³ã</h4>
+ * <dl>
+ * <dt>X.Event.PROGRESS<dd>éä¿¡é²è¡ç¶æ³
+ * <dt>X.Event.SUCCESS<dd>éä¿¡æå
+ * <dt>X.Event.ERROR<dd>éä¿¡ã¨ã©ã¼ãã¿ã¤ã ã¢ã¦ãã®å ´åãe.timeout == true ã§åããã
+ * <dt>X.Event.CANCELED<dd>éä¿¡ã®ã¦ã¼ã¶ã¼ããã­ã°ã©ã ã«ããã­ã£ã³ã»ã«ãSUCCESS, ERROR, COMPLETE å¾ã« kill()ãã¦ãCANCELEDã¯å¼ã°ãã¾ããã
+ * <dt>X.Event.COMPLETE<dd>éä¿¡å®äºãSUCCESS, ERROR, CANCELED å¾ã«çºçã
+ * </dl>
+ * <p>X.Net ã¤ã³ã¹ã¿ã³ã¹ã¯ COMPLETE å¾ã«èªåã§ç ´æ£ãããã
+ * <h4>å¿é ãã­ããã£</h4>
+ * <dl>
+ * <dt>url<dd>URL
+ * <dt>type<dd>'xhr', 'jsonp', 'form', 'image', 'img'
+ * <dt>xhr<dd>URL { url : 'hoge', type : 'xhr' } ã®çç¥å½¢
+ * <dt>jsonp<dd>URL { url : 'hoge', type : 'jsonp' } ã®çç¥å½¢
+ * <dt>form<dd>URL { url : 'hoge', type : 'form' } ã®çç¥å½¢
+ * <dt>image, img<dd>URL { url : 'hoge', type : 'image' } ã®çç¥å½¢
+ * </dl>
+ * <h4>XHR ç¨ãã­ããã£</h4>
+ * <dl>
+ * <dt>method<dd>'GET', 'POST' æªæå®ãã¤ postdata ãè¨­å®ãã¦ããå ´åã'POST' ã«ãªãã
+ * <dt>params<dd>url ãã©ã¡ã¼ã¿ã object ã§æ¸¡ããã¨ãåºæ¥ãã
+ * <dt>postdata<dd>string, object ã®å ´åã¯ X.String.serialize ãããã
+ * <dt>async<dd>boolean
+ * <dt>username<dd>BASIC èªè¨¼
+ * <dt>password<dd>BASIC èªè¨¼
+ * <dt>headers<dd>object xhr.setRequestHeader ããå¤
+ * <dt>timeout<dd>ã¿ã¤ã ã¢ã¦ã ms
+ * <dt>cache<dd>headers[ 'Pragma' ] = 'no-cache' ç­ãè¨­å®ããã?
+ * <dt>dataType<dd>'text', 'json', 'xml', 'blob', 'arraybuffer' ç­ãxhr.responseType ã«æå®ããå¤
+ * <dt>mimeType<dd>'text/xml', 'audio/mpeg' ç­ãxhr.overrideMimeType ããå¤
+ * <dt>auth<dd>X.OAuth2 ã¤ã³ã¹ã¿ã³ã¹(OAuth2 ãµã¼ãã¹ã®å®ç¾©)
+ * <dt>getFullHeaders<dd>getAllResponseHeaders() ããã¼ã¹ããããã·ã¥ãè¿ããå¤ã¯éåã«ãªã£ã¦ãããXDR ã¯ Content-Type ããåå¾ã§ããªãã
+ * <dt>canUse<dd>æªå®è£ãgadget proxy, YQL, <del>YPipes</del> ç­ã®ããã·ã¥ã¢ããã®è¨±å¯ãç¾å¨ã¯ test : 'gadget' ã¨ãã¦ãã
+ * </dl>
+ * 
+ * <h4>JSONP ç¨ãã­ããã£</h4>
+ * <dl>
+ * <dt>params<dd>url ãã©ã¡ã¼ã¿ã object ã§æ¸¡ããã¨ãåºæ¥ãã
+ * <dt>callbackName<dd>callback(json) ã³ã¼ã«ããã¯åãåºå®ããã¦ããéã«æå®ãã¾ãã¯ &callback=hoge ä»¥å¤ã®ååã§ã³ã¼ã«ããã¯ãæå®ããå ´åã« params ã¨ callbackName ã«æ¸ãã¦ãããurl ãã©ã¡ã¼ã¿ã« callback ãç¡ããcallbackName ããªãå ´åããã¬ã¼ã ã¯ã¼ã¯åã§èªåã§è¨­å®ããã
+ * <dt>charset<dd>ãã¼ã¸ã¨ç°ãªãjsonpãèª­ã¿è¾¼ãå ´åã«æå® 'EUC-JP', 'Shift-JIS' ç­ script ã¿ã°ã® charset ã«å¥ããhttps://code.google.com/p/ajaxzip3/issues/detail?id=5
+ * <dt>useFireWall<dd>ç°ãªããã¡ã¤ã³ã« jsonp ãèª­ã¿è¾¼ãã å¾ãxdomain iframe éä¿¡ãä½¿ã£ã¦ãã¼ã¿ãåãåããä¸æ­£ãªã³ã¼ãã®å®è¡ãé²ããã¨ãåºæ¥ã(ã¯ã)ãæªå®è£
+ * </dl>
+ * 
+ * <h4>Form ç¨ãã­ããã£</h4>
+ * <dl>
+ * <dt>method<dd>'GET' or 'POST'
+ * <dt>params<dd>ãã©ã¡ã¼ã¿ object ã¯ input ã¿ã°ã® name & value ã«å±éããããobject ãå¥ãå­ã«ãããã¨ã¯ã§ããªãã
+ * <dt>target<dd>'_self', '_parent', '_top' ã®å ´åããã¼ã¸ããé¢è±ãããtarget ãæå®ããåä¸ãã¡ã¤ã³ã®å ´å response ã« body.innerHTML ãè¿ããTODO X.Window
+ * <dt>timeout<dd>ms ã¿ã¤ã ã¢ã¦ãæéãçç¥å¯è½
+ * <dt>charset<dd>æªå®è£
+ * </dl>
+ * 
+ * @alias X.Net
+ * @class åç¨®ãããã¯ã¼ã¯æ©è½ãã©ãããã¤ã³ã¿ã¼ãã§ã¤ã¹ãå±éåããã
+ * @constructs Net
+ * @extends {EventDispatcher}
+ * @example // XHR - GET
+ * var net = X.Net( { xhr : urlString } )
+ * 		.listen( X.Event.PROGRESS )
+ * 		.listenOnce( [ X.Event.SUCCESS, X.Event.ERROR, X.Event.TIMEOUT, X.Event.CANCELED ] );
+ * 
+ * // XHR - GET 
+ * var net = X.Net( urlString );
+ * 
+ * // XHR - POST 
+ * var net = X.Net( { xhr : urlString, postdata : myData } );
+ * 
+ * // JSONP
+ * var net = X.Net( { jsonp : urlString, params : params, callbackName : callbackName, charset : charset, useFireWall : false } );
+ * 
+ * // Form
+ * var net = X.Net( { form : urlString, method : 'POST', target : '_self', params : {} } );
+ * 
+ * // Image preload & getSize
+ * var net = X.Net( { image : src, sizeDetection : true } );
+ * 
+ * // load &lt;script&gt;, &lt;link&gt;
+ */
+X[ 'Net' ] = X_EventDispatcher[ 'inherits' ](
+		'X.Net',
+		X_Class.NONE,
+		{
+			
+			'Constructor' : function( urlOrObject, opt_options ){
+				var opt, url, type, auth;
+				
+				if( X_Type_isObject( opt = urlOrObject ) ){
+					//{+xhr
+					if( X_Type_isString( url = opt[ 'xhr' ] ) ){
+						type = X_NET_TYPE_XHR;
+					} else
+					//}+xhr
+					//{+jsonp
+					if( X_Type_isString( url = opt[ 'jsonp' ] ) ){
+						type = X_NET_TYPE_JSONP;
+					} else
+					//}+jsonp
+					//{+netimage
+					if( X_Type_isString( url = opt[ 'img' ] || opt[ 'image' ] ) ){
+						type = X_NET_TYPE_IMAGE;
+					} else
+					//}+netimage
+					//{+netform
+					if( X_Type_isString( url = opt[ 'form' ] ) ){
+						type = X_NET_TYPE_FORM;
+					} else
+					//}+netform
+					if( !( type = X_NET_NAME_TO_ID[ opt[ 'type' ] ] ) ){
+						//{+dev
+						alert( 'X.Net args error' );
+						//}+dev
+						return;
+					} else {
+						url = opt[ 'url' ];
+					};
+					//{+dev
+					if( !X_Type_isString( url ) ){
+						alert( 'X.Net args error' );
+						return;
+					};
+					//}+dev
+				} else
+				if( X_Type_isString( urlOrObject ) ){
+					url = urlOrObject;
+					
+					if( X_Type_isObject( opt = opt_options ) ){
+						type = opt[ 'type' ] || X_NET_TYPE_XHR;
+					} else {
+						type = X_NET_TYPE_XHR;
+						opt  = { 'url' : url, 'method' : 'GET' };
+					};
+				//{+dev	
+				} else {
+					alert( 'X.Net args error' );
+					return;
+				//}+dev
+				};
+				
+				// auth ã®éé¿
+				if( auth = opt[ 'auth' ] ){
+					delete opt[ 'auth' ];
+				};
+				opt = X_Object_deepCopy( opt );
+				if( auth ){
+					opt[ 'auth' ] = auth; // auth ã¯ deep copy ãããã¨ã¾ãã
+				};
+				
+				// params ã url ã«è¿½å  ä½ã form ã¯é¤ã
+				if( opt[ 'params' ] && type !== X_NET_TYPE_FORM ){
+					url = X_URL_create( url, opt[ 'params' ] );
+					delete opt[ 'params' ];
+				};				
+				
+				if( type === X_NET_TYPE_XHR ){
+					opt[ 'method' ] = opt[ 'method' ] || ( opt[ 'postdata' ] ? 'POST' : 'GET' );
+
+					// XDomain ä¸å¯ -> Flash, Gears, Silverlight, canUseGadget ãªã gadget ã«åæ¿?
+					// PUT DELETE UPDATE ä¸å¯ -> Flash, Gears, Silverlight, canUseGadget ãªã gadget ã«åæ¿?
+					// xãã­ãã³ã«(X_URL_isSameProtocol) ãª binary ã®ã­ã¼ã -> gadget åã§ proxyURL ã«ãã XHR
+					//  or X_EVENT_ERROR
+					
+					opt[ 'dataType' ] = opt[ 'dataType' ] || X_URL_getEXT( url );
+				};
+				
+				opt.netType   = type;
+				opt[ 'url'  ] = url;
+				
+				X_Pair_create( this, opt );
+				
+				this[ 'listen' ]( X_EVENT_KILL_INSTANCE, X_NET_proxyDispatch );
+				
+				X_NET_QUEUE_LIST[ X_NET_QUEUE_LIST.length ] = this;
+				!X_NET_currentQueue && X_NET_shiftQueue();
+			},
+
+		/**
+		 * ç¾å¨ã®ç¶æã1:é çªå¾ã¡, 2:éä¿¡ä¸­, 3:éä¿¡å®äºãã§ã¼ãº
+		 * @alias Net.prototype.state
+		 */
+			'state' : function(){
+				return this === X_NET_currentQueue ?
+					( X_NET_completePhase ? 3 : 2 ) :
+					0 <= X_NET_QUEUE_LIST.indexOf( this ) ? 1 : 0;
+			}
+		}
+	);
 /*
  * @interface
  */
@@ -54,110 +211,164 @@ var X_NET_TYPE_XHR   = 1,
 	X_NET_TYPE_FORM  = 3,
 	X_NET_TYPE_IMAGE = 4,
 
+	X_NET_NAME_TO_ID = {
+		'xhr'   : X_NET_TYPE_XHR,
+		'jsonp' : X_NET_TYPE_JSONP,
+		'form'  : X_NET_TYPE_FORM,
+		'img'   : X_NET_TYPE_IMAGE,
+		'image' : X_NET_TYPE_IMAGE
+	},
+
 	X_NET_QUEUE_LIST = [],
 
-	X_NET_XHRWrapper,
-	X_NET_JSONPWrapper,
-	X_NET_FormWrapper,
-	X_NET_ImageWrapper,
+	X_XHR,
+	X_JSONP,
+	X_FormSender,
+	X_ImgLoader,
+	X_GadgetXHR,
 
 	X_NET_currentWrapper,
 	X_NET_currentQueue,
-
-	X_NET_Queue = X.EventDispatcher.inherits(
-		'XNetQueue',
-		X.Class.POOL_OBJECT,
-		{
-			type : 0,
-			data : null,
-			
-			Constructor : function( type, data ){
-				this.type = type;
-				this.data = data;				
-				
-				//this.listenOnce( X_Event.COMPLETE, X_NET_proxyDispatch );
-				X_EventDispatcher_systemListen( this, X_Event.COMPLETE, X_NET_proxyDispatch );
-				
-				X_NET_QUEUE_LIST[ X_NET_QUEUE_LIST.length ] = this;
-				!X_NET_currentQueue && X_NET_shiftQueue();
-			},
-			
-			busy : function(){
-				return this === X_NET_currentQueue && X_NET_currentWrapper._busy;
-			},
-			
-			cancel : function(){
-				var i = X_NET_QUEUE_LIST.indexOf( this );
-				if( i !== -1 ){
-					X_NET_QUEUE_LIST.splice( i, 1 );
-					this.asyncDispatch( X_Event.CANCELED );
-					this.asyncDispatch( 16, X_Event.COMPLETE );
-				} else
-				if( this === X_NET_currentQueue ){
-					X_NET_currentWrapper.cancel();
-				};
-			}
-		}
-	);
+	X_NET_currentData,
+	X_NET_completePhase;
 
 function X_NET_proxyDispatch( e ){
+	var i, flag, auth;
+	
 	switch( e.type ){
-		case X_Event.BEFORE_KILL_INSTANCE :
-			break;
-		case X_Event.KILL_INSTANCE :
+		case X_EVENT_KILL_INSTANCE :
+			if( this === X_NET_currentQueue && X_NET_completePhase ){
+				if( X_NET_completePhase === 1 ){
+					this[ 'unlisten' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch )
+						[ 'dispatch' ]( X_EVENT_COMPLETE );
+				};
+				X_NET_shiftQueue( true );
+				X_Pair_release( this );
+				X_NET_completePhase = 0;
+			} else
+			if( this === X_NET_currentQueue ){
+				X_NET_currentWrapper.cancel();
+				X_NET_shiftQueue( true );
+				flag = true;
+			} else
+			if( ( i = X_NET_QUEUE_LIST.indexOf( this ) ) !== -1 ){
+				X_NET_QUEUE_LIST.splice( i, 1 );
+				flag = true;
+			};
+			
+			if( flag ){ // flag ãç«ã¤å ´åãããã¯ä¸­æ­
+				this[ 'dispatch' ]( X_EVENT_CANCELED );
+				this[ 'dispatch' ]( { type : X_EVENT_COMPLETE, 'lastEventType' : X_EVENT_CANCELED } );
+				X_Pair_release( this );
+			};
 			break;			
-		case X_Event.KILL_INSTANCE_CANCELED :
-			break;
-		case X_Event.PROGRESS :
-			this.dispatch( e );
+		case X_EVENT_PROGRESS :
+			this[ 'dispatch' ]( e );
 			break;
-		case X_Event.SUCCESS :
-		case X_Event.ERROR :
-		case X_Event.TIMEOUT :
-		case X_Event.CANCELED :
-			this.dispatch( e );
-			this.asyncDispatch( X_Event.COMPLETE );
+		
+		case X_EVENT_ERROR :
+			if( e.status === 401 ){
+				if( auth = X_Pair_get( this )[ 'auth' ] ){
+					X_Pair_get( auth ).onAuthError( auth, e );
+					// TODO ç ´æ£ããªãã§å¾æ©ã
+				};
+			};
+			
+		case X_EVENT_SUCCESS :
+			X_NET_completePhase = 1;
+			this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch )
+				[ 'asyncDispatch' ]( 32, { type : X_EVENT_COMPLETE, 'lastEventType' : e.type } );
+
+			this[ 'asyncDispatch' ]( e );
 			break;
-		case X_Event.COMPLETE :
-			this.kill();
-			X_NET_shiftQueue();
+
+		case X_EVENT_COMPLETE :
+			X_NET_completePhase = 2;
+			this[ 'kill' ]();
 			break;
 	};
 };
 
-function X_NET_shiftQueue(){
-	var queue;
-	
+// TODO _busy ã¯ X.Net ã§è§¦ã.
+function X_NET_shiftQueue( currentKilled ){
+	var q, auth, authSettings;
+
 	if( X_NET_currentQueue ){
-		console.log( 'X_NET_shiftQueue ' + X_NET_currentWrapper._busy );
-		if( X_NET_currentWrapper._busy ) return;
+		if( !currentKilled ) return;
+		
 		X_NET_currentWrapper
-			.unlisten( [ X_Event.PROGRESS, X_Event.SUCCESS, X_Event.ERROR, X_Event.TIMEOUT, X_Event.CANCELED ], X_NET_currentQueue, X_NET_proxyDispatch )
+			[ 'unlisten' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR ], X_NET_currentQueue, X_NET_proxyDispatch )
 			.reset();
-		X_NET_currentQueue = X_NET_currentWrapper = null;
+
+		X_NET_currentQueue = X_NET_currentWrapper = X_NET_currentData = null;
 	};
 	
+	console.log( 'â â ------------ X_NET_shiftQueue ' + X_NET_QUEUE_LIST.length );
+	
 	if( !X_NET_QUEUE_LIST.length ) return;
 
-	queue = X_NET_QUEUE_LIST.shift();
+
+	X_NET_currentQueue = q = X_NET_QUEUE_LIST.shift();
+	X_NET_currentData  = X_Pair_get( X_NET_currentQueue );
 	
-	switch( queue.type ){
+	switch( X_NET_currentData.netType ){
 		case X_NET_TYPE_XHR :
-			X_NET_currentWrapper = X_NET_XHRWrapper;
+			
+			// TODO (xProtocol |ãmethod='update' | !cors) & canUse -> gadget.io.makeRequset, flash
+			// force 'gadget', 'flash'
+			switch( X_NET_currentData[ 'test' ] ){
+				case 'gadget' :
+					X_NET_currentWrapper = X_GadgetXHR || X_TEMP.X_GadgetXHR_init();
+					break;
+				case 'flash'  :
+					break;
+				
+				default :
+					X_NET_currentWrapper = X_XHR || X_TEMP.X_XHR_init();
+			};
+			
+			
+			// OAuth2
+			if( auth = X_NET_currentData[ 'auth' ] ){
+				authSettings = X_Pair_get( auth );
+				switch( auth[ 'state' ]() ){
+					case 0 :
+					case 1 :
+					case 2 :
+						if( !( auth[ 'dispatch' ]( X_EVENT_NEED_AUTH ) & X_CALLBACK_PREVENT_DEFAULT ) ){
+							// event åã§ kill ããã¦ããªããã¨ãç¢ºèª
+							if( X_NET_currentQueue === q ){
+								authSettings.lazyRequests = authSettings.lazyRequests || [];
+								authSettings.lazyRequests.indexOf( q ) === -1 && authSettings.lazyRequests.push( q );
+								X_NET_currentQueue = null;
+								X_NET_shiftQueue();									
+							};
+						} else {
+							X_NET_currentQueue === q && q[ 'kill' ]();
+						};
+						return;
+					case 3 : // refresh token
+						X_NET_QUEUE_LIST.push( X_NET_currentQueue );
+						X_NET_currentQueue = null;
+						X_NET_shiftQueue();
+						return;
+				};
+				authSettings.updateRequest( auth, X_NET_currentData );
+			};
 			break;
 		case X_NET_TYPE_JSONP :
-			X_NET_currentWrapper = X_NET_JSONPWrapper;
+			X_NET_currentWrapper = X_JSONP || X_TEMP.X_JSONP_init();
 			break;
 		case X_NET_TYPE_FORM :
-			X_NET_currentWrapper = X_NET_FormWrapper;
+			X_NET_currentWrapper = X_FormSender  || X_TEMP.X_FormSender_init();
 			break;
 		case X_NET_TYPE_IMAGE :
-			X_NET_currentWrapper = X_NET_ImageWrapper;
+			X_NET_currentWrapper = X_ImgLoader || X_TEMP.X_ImgLoader_init();
 			break;
 	};
 	
-	X_NET_currentWrapper.listen( [ X_Event.PROGRESS, X_Event.SUCCESS, X_Event.ERROR, X_Event.TIMEOUT, X_Event.CANCELED ], X_NET_currentQueue = queue, X_NET_proxyDispatch );
+	X_NET_currentWrapper[ 'listen' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR ], X_NET_currentQueue, X_NET_proxyDispatch );
 	
-	X_NET_currentWrapper.load( queue.data );
+	X_NET_currentWrapper.load( X_NET_currentData );
 };
 
