MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-21991 New Node.js debug protocol incompatibilities

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-06-10 15:15:46 +02:00
parent 089a740db8
commit 4a67242cd9
13 changed files with 151 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
@Override
protected void messageReceived(ChannelHandlerContext context, CmdlineRemoteProto.Message message) throws Exception {
SessionData sessionData = context.attr(SESSION_DATA).get();
SessionData sessionData = context.channel().attr(SESSION_DATA).get();
UUID sessionId;
if (sessionData == null) {
@@ -134,7 +134,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
sessionData = mySessionDescriptors.get(sessionId);
if (sessionData != null) {
sessionData.channel = context.channel();
context.attr(SESSION_DATA).set(sessionData);
context.channel().attr(SESSION_DATA).set(sessionData);
}
if (myCanceledSessions.contains(sessionId)) {
context.channel().writeAndFlush(CmdlineProtoUtil.toMessage(sessionId, CmdlineProtoUtil.createCancelCommand()));
@@ -199,7 +199,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
super.channelInactive(context);
}
finally {
final SessionData sessionData = context.attr(SESSION_DATA).get();
final SessionData sessionData = context.channel().attr(SESSION_DATA).get();
if (sessionData != null) {
final BuilderMessageHandler handler = unregisterBuildMessageHandler(sessionData.sessionId);
if (handler != null) {
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -326,7 +326,7 @@ public class ExternalJavacManager {
private class CompilationRequestsHandler extends SimpleChannelInboundHandler<JavacRemoteProto.Message> {
@Override
public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
JavacProcessDescriptor descriptor = ctx.attr(SESSION_DESCRIPTOR).get();
JavacProcessDescriptor descriptor = ctx.channel().attr(SESSION_DESCRIPTOR).get();
if (descriptor != null) {
descriptor.setDone();
}
@@ -335,7 +335,7 @@ public class ExternalJavacManager {
@Override
public void channelRead0(final ChannelHandlerContext context, JavacRemoteProto.Message message) throws Exception {
JavacProcessDescriptor descriptor = context.attr(SESSION_DESCRIPTOR).get();
JavacProcessDescriptor descriptor = context.channel().attr(SESSION_DESCRIPTOR).get();
UUID sessionId;
if (descriptor == null) {
@@ -345,7 +345,7 @@ public class ExternalJavacManager {
descriptor = myMessageHandlers.get(sessionId);
if (descriptor != null) {
descriptor.channel = context.channel();
context.attr(SESSION_DESCRIPTOR).set(descriptor);
context.channel().attr(SESSION_DESCRIPTOR).set(descriptor);
}
}
else {
lib/annotations/netty/io/netty/channel/annotations.xml
+6
View File
@@ -5,6 +5,12 @@
<item name='io.netty.channel.ChannelInboundHandlerAdapter void channelInactive(io.netty.channel.ChannelHandlerContext) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='io.netty.channel.ChannelInboundHandlerAdapter void channelRead(io.netty.channel.ChannelHandlerContext, java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='io.netty.channel.ChannelInboundHandlerAdapter void channelRead(io.netty.channel.ChannelHandlerContext, java.lang.Object) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='io.netty.channel.ChannelInitializer void channelRegistered(io.netty.channel.ChannelHandlerContext) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
+8
View File
@@ -14,6 +14,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Url;
import com.intellij.util.UrlImpl;
import com.intellij.util.net.NetUtils;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.oio.OioEventLoopGroup;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -123,6 +124,13 @@ public class BuiltInServerManagerImpl extends BuiltInServerManager {
return server;
}
@NotNull
public EventLoopGroup getEventLoopGroup() {
waitForStart();
assert server != null;
return server.getEventLoopGroup();
}
@Override
public boolean isOnBuiltInWebServer(@Nullable Url url) {
return url != null && !StringUtil.isEmpty(url.getAuthority()) && isOnBuiltInWebServerByAuthority(url.getAuthority());
platform/built-in-server/src/org/jetbrains/io/jsonRpc/ClientManager.kt
+4 -4
View File
@@ -5,7 +5,7 @@ import com.intellij.openapi.util.SimpleTimer
import gnu.trove.THashSet
import gnu.trove.TObjectProcedure
import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.Channel
import io.netty.util.AttributeKey
import org.jetbrains.concurrency.Promise
import org.jetbrains.io.webSocket.WebSocketServerOptions
@@ -64,7 +64,7 @@ class ClientManager(private val listener: ClientListener?, val exceptionHandler:
})
}
fun disconnectClient(context: ChannelHandlerContext, client: Client, closeChannel: Boolean): Boolean {
fun disconnectClient(channel: Channel, client: Client, closeChannel: Boolean): Boolean {
synchronized (clients) {
if (!clients.remove(client)) {
return false
@@ -72,10 +72,10 @@ class ClientManager(private val listener: ClientListener?, val exceptionHandler:
}
try {
context.attr(CLIENT).remove()
channel.attr(CLIENT).remove()
if (closeChannel) {
context.channel().close()
channel.close()
}
client.rejectAsyncResults(exceptionHandler)
platform/built-in-server/src/org/jetbrains/io/jsonRpc/socket/RpcBinaryRequestHandler.java
+3 -3
View File
@@ -58,7 +58,7 @@ public class RpcBinaryRequestHandler extends BinaryRequestHandler implements Exc
@Override
public ChannelHandler getInboundHandler(@NotNull ChannelHandlerContext context) {
SocketClient client = new SocketClient(context.channel());
context.attr(ClientManagerKt.getCLIENT()).set(client);
context.channel().attr(ClientManagerKt.getCLIENT()).set(client);
clientManager.getValue().addClient(client);
connected(client, null);
return new MyDecoder(client);
@@ -127,10 +127,10 @@ public class RpcBinaryRequestHandler extends BinaryRequestHandler implements Exc
@Override
public void channelInactive(ChannelHandlerContext context) throws Exception {
Client client = context.attr(ClientManagerKt.getCLIENT()).get();
Client client = context.channel().attr(ClientManagerKt.getCLIENT()).get();
// if null, so, has already been explicitly removed
if (client != null) {
clientManager.getValue().disconnectClient(context, client, false);
clientManager.getValue().disconnectClient(context.channel(), client, false);
}
}
}
platform/built-in-server/src/org/jetbrains/io/webSocket/MessageChannelHandler.java
+39 -27
View File
@@ -1,18 +1,19 @@
package org.jetbrains.io.webSocket;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.websocketx.*;
import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.io.ChannelBufferToString;
import org.jetbrains.io.SimpleChannelInboundHandlerAdapter;
import org.jetbrains.io.jsonRpc.Client;
import org.jetbrains.io.jsonRpc.ClientManager;
import org.jetbrains.io.jsonRpc.ClientManagerKt;
import org.jetbrains.io.jsonRpc.MessageServer;
@ChannelHandler.Sharable
final class MessageChannelHandler extends SimpleChannelInboundHandlerAdapter<WebSocketFrame> {
final class MessageChannelHandler extends WebSocketProtocolHandler {
private final ClientManager clientManager;
private final MessageServer messageServer;
@@ -22,51 +23,62 @@ final class MessageChannelHandler extends SimpleChannelInboundHandlerAdapter<Web
}
@Override
protected void messageReceived(ChannelHandlerContext context, WebSocketFrame message) throws Exception {
WebSocketClient client = (WebSocketClient)context.attr(ClientManagerKt.getCLIENT()).get();
if (message instanceof CloseWebSocketFrame) {
if (client != null) {
try {
clientManager.disconnectClient(context, client, false);
}
finally {
message.retain();
client.disconnect((CloseWebSocketFrame)message);
}
}
protected void closeFrameReceived(@NotNull Channel channel, @NotNull CloseWebSocketFrame message) {
WebSocketClient client = (WebSocketClient)channel.attr(ClientManagerKt.getCLIENT()).get();
if (client == null) {
super.closeFrameReceived(channel, message);
}
else if (message instanceof PingWebSocketFrame) {
context.channel().writeAndFlush(new PongWebSocketFrame(message.content()));
}
else if (message instanceof TextWebSocketFrame) {
else {
try {
messageServer.messageReceived(client, ChannelBufferToString.readChars(message.content()));
clientManager.disconnectClient(channel, client, false);
}
catch (Throwable e) {
finally {
client.disconnect(message);
}
}
}
@Override
protected void textFrameReceived(@NotNull Channel channel, @NotNull TextWebSocketFrame message) {
WebSocketClient client = (WebSocketClient)channel.attr(ClientManagerKt.getCLIENT()).get();
CharSequence chars;
try {
chars = ChannelBufferToString.readChars(message.content());
}
catch (Throwable e) {
try {
message.release();
}
finally {
clientManager.getExceptionHandler().exceptionCaught(e);
}
return;
}
else if (!(message instanceof PongWebSocketFrame)) {
throw new UnsupportedOperationException(message.getClass().getName() + " frame types not supported");
try {
messageServer.messageReceived(client, chars);
}
catch (Throwable e) {
clientManager.getExceptionHandler().exceptionCaught(e);
}
}
@Override
public void channelInactive(ChannelHandlerContext context) throws Exception {
Client client = context.attr(ClientManagerKt.getCLIENT()).get();
Client client = context.channel().attr(ClientManagerKt.getCLIENT()).get();
// if null, so, has already been explicitly removed
if (client != null) {
clientManager.disconnectClient(context, client, false);
clientManager.disconnectClient(context.channel(), client, false);
}
}
@Override
public void exceptionCaught(ChannelHandlerContext context, Throwable cause) throws Exception {
public void exceptionCaught(@NotNull ChannelHandlerContext context, @NotNull Throwable cause) {
try {
clientManager.getExceptionHandler().exceptionCaught(cause);
}
finally {
context.channel().close();
super.exceptionCaught(context, cause);
}
}
}
platform/built-in-server/src/org/jetbrains/io/webSocket/WebSocketHandshakeHandler.java
+2 -2
View File
@@ -75,7 +75,7 @@ public abstract class WebSocketHandshakeHandler extends HttpRequestHandler imple
}
final Client client = new WebSocketClient(context.channel(), handshaker);
context.attr(ClientManagerKt.getCLIENT()).set(client);
context.channel().attr(ClientManagerKt.getCLIENT()).set(client);
handshaker.handshake(context.channel(), request).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
@@ -86,7 +86,7 @@ public abstract class WebSocketHandshakeHandler extends HttpRequestHandler imple
BuiltInServer.replaceDefaultHandler(context, messageChannelHandler);
ChannelHandlerContext messageChannelHandlerContext = context.pipeline().context(messageChannelHandler);
context.pipeline().addBefore(messageChannelHandlerContext.name(), "webSocketFrameAggregator", new WebSocketFrameAggregator(NettyUtil.MAX_CONTENT_LENGTH));
messageChannelHandlerContext.attr(ClientManagerKt.getCLIENT()).set(client);
messageChannelHandlerContext.channel().attr(ClientManagerKt.getCLIENT()).set(client);
connected(client, uriDecoder.parameters());
}
}
platform/built-in-server/src/org/jetbrains/io/webSocket/WebSocketProtocolHandler.kt
+67
View File
@@ -0,0 +1,67 @@
package org.jetbrains.io.webSocket
package org.jetbrains.io.webSocket
import io.netty.channel.Channel
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.ChannelInboundHandlerAdapter
import io.netty.handler.codec.http.FullHttpResponse
import io.netty.handler.codec.http.websocketx.*
import io.netty.util.CharsetUtil
import io.netty.util.ReferenceCountUtil
import org.jetbrains.builtInWebServer.LOG
import org.jetbrains.io.NettyUtil
abstract class WebSocketProtocolHandler : ChannelInboundHandlerAdapter() {
override final fun channelRead(context: ChannelHandlerContext, message: Any) {
// Pong frames need to get ignored
when (message) {
!is WebSocketFrame, is PongWebSocketFrame -> ReferenceCountUtil.release(message)
is PingWebSocketFrame -> context.channel().writeAndFlush(PongWebSocketFrame(message.content()))
is CloseWebSocketFrame -> closeFrameReceived(context.channel(), message)
is TextWebSocketFrame -> {
try {
textFrameReceived(context.channel(), message)
}
finally {
// client should release buffer as soon as possible, so, message could be released already
if (message.refCnt() > 0) {
message.release()
}
}
}
else -> throw UnsupportedOperationException("${message.javaClass.name} frame types not supported")
}
}
abstract protected fun textFrameReceived(channel: Channel, message: TextWebSocketFrame)
protected open fun closeFrameReceived(channel: Channel, message: CloseWebSocketFrame) {
channel.close()
}
@Suppress("OverridingDeprecatedMember")
override fun exceptionCaught(context: ChannelHandlerContext, cause: Throwable) {
NettyUtil.logAndClose(cause, LOG, context.channel())
}
}
open class WebSocketProtocolHandshakeHandler(private val handshaker: WebSocketClientHandshaker) : ChannelInboundHandlerAdapter() {
override final fun channelRead(context: ChannelHandlerContext, message: Any) {
val channel = context.channel()
if (!handshaker.isHandshakeComplete) {
handshaker.finishHandshake(channel, message as FullHttpResponse)
context.pipeline().remove(this)
completed()
return
}
if (message is FullHttpResponse) {
throw IllegalStateException("Unexpected FullHttpResponse (getStatus=${message.status()}, content=${message.content().toString(CharsetUtil.UTF_8)})")
}
context.fireChannelRead(message)
}
open protected fun completed() {
}
}
platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.kt
+4 -2
View File
@@ -41,7 +41,7 @@ internal class DelegatingHttpRequestHandler : DelegatingHttpRequestHandlerBase()
return isSupported(request) && !request.isWriteFromBrowserWithoutOrigin() && isAccessible(request) && process(urlDecoder, request, context)
}
val prevHandlerAttribute = context.attr(PREV_HANDLER)
val prevHandlerAttribute = context.channel().attr(PREV_HANDLER)
val connectedHandler = prevHandlerAttribute.get()
if (connectedHandler != null) {
if (connectedHandler.checkAndProcess()) {
@@ -79,11 +79,13 @@ internal class DelegatingHttpRequestHandler : DelegatingHttpRequestHandlerBase()
return false
}
@Suppress("OverridingDeprecatedMember")
override fun exceptionCaught(context: ChannelHandlerContext, cause: Throwable) {
try {
context.attr(PREV_HANDLER).remove()
context.channel().attr(PREV_HANDLER).remove()
}
finally {
@Suppress("DEPRECATION")
super.exceptionCaught(context, cause)
}
}
platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
+1 -1
View File
@@ -85,7 +85,7 @@ public final class NettyUtil {
int maxAttemptCount,
@NotNull Condition<Void> stopCondition) throws Throwable {
int attemptCount = 0;
if (bootstrap.group() instanceof NioEventLoopGroup) {
if (bootstrap.config().group() instanceof NioEventLoopGroup) {
return connectNio(bootstrap, remoteAddress, promise, maxAttemptCount, stopCondition, attemptCount);
}
platform/platform-impl/src/org/jetbrains/io/netty.kt
+1 -1
View File
@@ -68,7 +68,7 @@ fun oioClientBootstrap(): Bootstrap {
}
inline fun ChannelFuture.addChannelListener(crossinline listener: (future: ChannelFuture) -> Unit) {
addListener(GenericFutureListener<io.netty.channel.ChannelFuture> { listener(it) })
addListener(GenericFutureListener<ChannelFuture> { listener(it) })
}
// if NIO, so, it is shared and we must not shutdown it
platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt
+8 -7
View File
@@ -23,13 +23,14 @@ import com.intellij.ui.ColoredListCellRenderer
import com.intellij.ui.components.JBList
import com.intellij.util.io.socketConnection.ConnectionStatus
import io.netty.bootstrap.Bootstrap
import io.netty.channel.ChannelFuture
import io.netty.util.concurrent.GenericFutureListener
import org.jetbrains.concurrency.AsyncPromise
import org.jetbrains.concurrency.Promise
import org.jetbrains.concurrency.rejectedPromise
import org.jetbrains.concurrency.resolvedPromise
import org.jetbrains.debugger.Vm
import org.jetbrains.io.NettyUtil
import org.jetbrains.io.addChannelListener
import org.jetbrains.io.connect
import org.jetbrains.rpc.LOG
import java.net.ConnectException
@@ -43,12 +44,16 @@ abstract class RemoteVmConnection : VmConnection<Vm>() {
private val connectCancelHandler = AtomicReference<() -> Unit>()
protected val channelCloseListener = GenericFutureListener<ChannelFuture> {
close("Process disconnected unexpectedly", ConnectionStatus.DISCONNECTED)
}
abstract fun createBootstrap(address: InetSocketAddress, vmResult: AsyncPromise<Vm>): Bootstrap
@JvmOverloads
fun open(address: InetSocketAddress, stopCondition: Condition<Void>? = null): Promise<Vm> {
port = address.port
isLocalAddress = address.getAddress().isAnyLocalAddress() || address.getAddress().isLoopbackAddress()
isLocalAddress = address.address.isAnyLocalAddress || address.address.isLoopbackAddress
setState(ConnectionStatus.WAITING_FOR_CONNECTION, "Connecting to ${address.hostName}:${port}")
val result = AsyncPromise<Vm>()
val future = ApplicationManager.getApplication().executeOnPooledThread {
@@ -77,11 +82,7 @@ abstract class RemoteVmConnection : VmConnection<Vm>() {
createBootstrap(address, result)
.connect(address, connectionPromise, maxAttemptCount = if (stopCondition == null) NettyUtil.DEFAULT_CONNECT_ATTEMPT_COUNT else -1, stopCondition = stopCondition)
?.let {
it.closeFuture().addChannelListener {
close("Process disconnected unexpectedly", ConnectionStatus.DISCONNECTED)
}
}
?.let { it.closeFuture().addListener(channelCloseListener) }
}
connectCancelHandler.set {