feat: 优化WebSocket客户端 兼容1.7.10

Signed-off-by: MiaoWoo <admin@yumc.pw>

packages/plugin/src/config.ts

@@ -92,16 +92,8 @@ export class PluginConfigManager {
                 console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: metadata.name, format: metadata.format })
             } else {
                 configValue = configLoader.load(base.read(metadata.file)) || {}
-                if (defaultValue) {
+                if (defaultValue && this.setDefaultValue(configValue, defaultValue)) {
-                    let needSave = false
+                    base.save(metadata.file, configLoader.dump(configValue))
-                    for (const key of Object.keys(defaultValue)) {
-                        // 当配置文件不存在当前属性时才进行赋值
-                        if (!Object.prototype.hasOwnProperty.call(configValue, key)) {
-                            configValue[key] = defaultValue[key]
-                            needSave = true
-                        }
-                    }
-                    needSave && base.save(metadata.file, configLoader.dump(configValue))
                 }
                 console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>\n${JSON.stringify(configValue, undefined, 4).substr(0, 500)}`)
             }
@@ -112,6 +104,21 @@ export class PluginConfigManager {
         }
     }
 
+    private setDefaultValue(configValue, defaultValue) {
+        let needSave = false
+        for (const key of Object.keys(defaultValue)) {
+            // 当配置文件不存在当前属性时才进行赋值
+            if (!Object.prototype.hasOwnProperty.call(configValue, key)) {
+                configValue[key] = defaultValue[key]
+                needSave = true
+            } else if (Object.prototype.toString.call(configValue[key]) == "[object Object]") {
+                // 对象需要递归检测
+                needSave ||= this.setDefaultValue(configValue[key], defaultValue[key])
+            }
+        }
+        return needSave
+    }
+
     private saveConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
         try {
             metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)

packages/websocket/src/client/netty/handler.ts

@@ -1,4 +1,3 @@
-import { EventEmitter } from 'events'
 import { NettyWebSocket } from '.'
 import { WebSocketClientHandlerAdapter } from './adapter/handler'
 
@@ -6,6 +5,7 @@ const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
 const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
 const CloseWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.CloseWebSocketFrame')
 const FullHttpResponse = Java.type('io.netty.handler.codec.http.FullHttpResponse')
+const DefaultChannelPromise = Java.type('io.netty.channel.DefaultChannelPromise')
 
 export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
     public handshaker: any
@@ -21,7 +21,11 @@ export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
     }
     handlerAdded(ctx: any) {
         console.debug(`${ctx} handlerAdded`)
+        if (ctx.newPromise) {
             this.handshakeFuture = ctx.newPromise()
+        } else {
+            this.handshakeFuture = new DefaultChannelPromise(ctx.channel(), ctx.executor())
+        }
     }
     channelActive(ctx: any) {
         console.debug(`${ctx} channelActive`)

packages/websocket/src/client/netty/index.ts

@@ -4,16 +4,12 @@ import { Transport } from '../transport'
 import { WebSocketClientHandler } from './handler'
 
 const URI = Java.type('java.net.URI')
-const Epoll = Java.type('io.netty.channel.epoll.Epoll')
 const Bootstrap = Java.type('io.netty.bootstrap.Bootstrap')
 const ChannelFutureListener = Java.type('io.netty.channel.ChannelFutureListener')
 
 const NioEventLoopGroup = Java.type('io.netty.channel.nio.NioEventLoopGroup')
 const NioSocketChannel = Java.type('io.netty.channel.socket.nio.NioSocketChannel')
 
-const EpollEventLoopGroup = Java.type('io.netty.channel.epoll.EpollEventLoopGroup')
-const EpollSocketChannel = Java.type('io.netty.channel.epoll.EpollSocketChannel')
-
 const WebSocketClientHandshakerFactory = Java.type('io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory')
 const WebSocketVersion = Java.type('io.netty.handler.codec.http.websocketx.WebSocketVersion')
 
@@ -25,12 +21,35 @@ const CloseWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.Cl
 const ChannelInitializer = Java.type('io.netty.channel.ChannelInitializer')
 const DefaultHttpHeaders = Java.type('io.netty.handler.codec.http.DefaultHttpHeaders')
 
-const SslContextBuilder = Java.type('io.netty.handler.ssl.SslContextBuilder')
+const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
-const InsecureTrustManagerFactory = Java.type('io.netty.handler.ssl.util.InsecureTrustManagerFactory')
+const channelCount = new AtomicInteger(0)
 
+var SslContextBuilder: any
+var InsecureTrustManagerFactory: any
+var SSLContext: any
+var SslHandler: any
+try {
+    SslContextBuilder = Java.type('io.netty.handler.ssl.SslContextBuilder')
+    InsecureTrustManagerFactory = Java.type('io.netty.handler.ssl.util.InsecureTrustManagerFactory')
+} catch (error) {
+    SSLContext = Java.type('javax.net.ssl.SSLContext')
+    SslHandler = Java.type('io.netty.handler.ssl.SslHandler')
+}
+
+var group: any
+var socketChannelClass: any
+try {
+    const Epoll = Java.type('io.netty.channel.epoll.Epoll')
     const epull = Epoll.isAvailable()
-const group = epull ? new EpollEventLoopGroup() : new NioEventLoopGroup()
+    const EpollEventLoopGroup = Java.type('io.netty.channel.epoll.EpollEventLoopGroup')
-const socketChannelClass = epull ? EpollSocketChannel.class : NioSocketChannel.class
+    const EpollSocketChannel = Java.type('io.netty.channel.epoll.EpollSocketChannel')
+    group = epull ? new EpollEventLoopGroup() : new NioEventLoopGroup()
+    socketChannelClass = epull ? EpollSocketChannel.class : NioSocketChannel.class
+} catch (error) {
+    group = new NioEventLoopGroup()
+    socketChannelClass = NioSocketChannel.class
+}
+
 process.on('exit', () => group.shutdownGracefully())
 
 export class NettyWebSocket extends Transport {
@@ -66,8 +85,11 @@ export class NettyWebSocket extends Transport {
         console.debug(`constructor NettyWebSocket url: ${url} scheme: ${this._schema} host: ${this._host} port: ${this._port} header: ${JSON.stringify(headers)}`)
     }
     getId() {
+        if (this.channel?.id) {
             return this.channel?.id() + ''
         }
+        return 'NettyWebSocket#' + channelCount.incrementAndGet()
+    }
     doConnect() {
         console.debug('client NettyWebSocket doConnect', this._url)
         let uri = URI.create(this._url)
@@ -86,8 +108,14 @@ export class NettyWebSocket extends Transport {
                 initChannel: (ch: any) => {
                     let pipeline = ch.pipeline()
                     if (this._schema == "wss") {
+                        if (SslContextBuilder) {
                             let sslCtx = SslContextBuilder.forClient().trustManager(InsecureTrustManagerFactory.INSTANCE).build()
                             pipeline.addLast(sslCtx.newHandler(ch.alloc(), this._host, this._port))
+                        } else {
+                            let sslEngine = SSLContext.getDefault().createSSLEngine()
+                            sslEngine.setUseClientMode(true)
+                            pipeline.addLast("ssl", new SslHandler(sslEngine))
+                        }
                     }
                     pipeline.addLast("http-codec", new HttpClientCodec())
                     pipeline.addLast("aggregator", new HttpObjectAggregator(65536))