++

Author: jin

build/server/server.node.ts

@@ -316,7 +316,7 @@ namespace $ {
 
 			const server = $node.child_process.spawn(
 				'node',
-				[ `./${path}/-/node.js`, ... args ],
+				[ '--enable-source-maps', '--trace-uncaught', `./${path}/-/node.js`, ... args ],
 				{
 					stdio: [ 'pipe', 'inherit', 'inherit' ],
 				}

rest/server/server.node.ts

@@ -143,9 +143,7 @@ namespace $ {
 
 			} ) )
 
-			socket.on( 'data', ( chunk: Buffer )=> {
-				$mol_wire_async( this ).ws_income( chunk, upgrade, socket )
-			} )
+			socket.on( 'data', ( chunk: Buffer )=> this.ws_income( chunk, upgrade, socket ) )
 
 			const key_in = req.headers["sec-websocket-key"]
 			const magic = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
@@ -170,34 +168,32 @@ namespace $ {
 
 		_ws_icome_partial = [] as Uint8Array[]
 
-		@ $mol_action
-		ws_income(
+		async ws_income(
 			chunk: Buffer,
 			upgrade: $mol_rest_message,
 			sock: InstanceType< typeof $node.stream.Duplex >,
 		) {
 			console.log(chunk.byteLength)
+			sock.pause()
+			
+			this._ws_icome_partial.push( chunk )
 			const patial_size = this._ws_icome_partial.reduce( ( sum, buf )=> sum + buf.byteLength, 0 )
-			const frame = $mol_wire_sync( $mol_websocket_frame ).from( chunk ) as $mol_websocket_frame
-			const msg_size = frame.size() + frame.data().size
 
-			sock.pause()
+			let frame = $mol_websocket_frame.from( this._ws_icome_partial[0] )
+			const msg_size = frame.size() + frame.data().size
 
-			if( msg_size > patial_size + chunk.byteLength ) {
+			if( msg_size > patial_size ) {
 				setTimeout( ()=> sock.resume() )
-				this._ws_icome_partial.push( chunk )
 				return
 			}
 
-			if( this._ws_icome_partial.length ) {
-				this._ws_icome_partial.push( chunk )
-				chunk = Buffer.alloc( patial_size + chunk.byteLength )
-				let offset = 0
-				for( const buf of this._ws_icome_partial.splice( 0 ) ) {
-					chunk.set( buf, offset )
-					offset += buf.byteLength
-				}
+			chunk = Buffer.alloc( patial_size )
+			let offset = 0
+			for( const buf of this._ws_icome_partial.splice( 0 ) ) {
+				chunk.set( buf, offset )
+				offset += buf.byteLength
 			}
+			frame = $mol_websocket_frame.from( chunk )
 
 			if( msg_size < chunk.byteLength ) {
 				const tail = new Uint8Array( chunk.buffer, chunk.byteOffset + msg_size )
@@ -221,7 +217,7 @@ namespace $ {
 			if( op !== 'txt' && op !== 'bin' ) return
 
 			if( data.length !== 0 ) {
-				$mol_wire_sync( this.$ ).$mol_log3_rise({
+				this.$.$mol_log3_rise({
 					place: this,
 					message: message.method(),
 					url: message.uri(),
@@ -231,14 +227,14 @@ namespace $ {
 
 			try {
 
-				$mol_wire_sync( this.root() ).REQUEST( message )
+				await $mol_wire_async( this.root() ).REQUEST( message )
 				sock.resume()
 
 			} catch( error: any ) {
 
 				if( $mol_promise_like( error ) ) $mol_fail_hidden( error )
-					
-				$mol_wire_sync( $$ ).$mol_log3_fail({
+				
+				$$.$mol_log3_fail({
 					place: this,
 					message: error.message ?? '',
 					stack: error.stack,