v0.1.1

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

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.1.0",
+    "version": "0.1.1",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/api",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",

packages/api/src/index.ts

@@ -1,4 +1,4 @@
-import './typings/global'
+/// <reference path="./typings/global.ts" />
 
 export * from './task'
 export * from './event'

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/bukkit",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,7 +27,7 @@
         "typescript": "^3.6.2"
     },
     "dependencies": {
-        "@ms/api": "^0.1.0",
+        "@ms/api": "^0.1.1",
         "@ms/common": "^0.1.0",
         "@ms/container": "^0.1.0"
     }

packages/bukkit/src/index.ts

@@ -1,4 +1,4 @@
-import './typings'
+/// <reference path="./typings/index.ts" />
 
 import { server, plugin, command, event, task } from '@ms/api'
 import { DefaultContainer as container } from '@ms/container'

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/core",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,11 +27,11 @@
         "typescript": "^3.6.2"
     },
     "dependencies": {
-        "@ms/api": "^0.1.0",
-        "@ms/bukkit": "^0.1.0",
+        "@ms/api": "^0.1.1",
+        "@ms/bukkit": "^0.1.1",
         "@ms/common": "^0.1.0",
         "@ms/container": "^0.1.0",
-        "@ms/plugin": "^0.1.0",
-        "@ms/sponge": "^0.1.0"
+        "@ms/plugin": "^0.1.1",
+        "@ms/sponge": "^0.1.1"
     }
 }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/plugin",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,7 +27,7 @@
         "typescript": "^3.6.2"
     },
     "dependencies": {
-        "@ms/api": "^0.1.0",
+        "@ms/api": "^0.1.1",
         "@ms/common": "^0.1.0",
         "@ms/container": "^0.1.0"
     }

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/plugins",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -28,7 +28,7 @@
         "typescript": "^3.6.2"
     },
     "dependencies": {
-        "@ms/plugin": "^0.1.0",
+        "@ms/plugin": "^0.1.1",
         "es6-map": "^0.1.5",
         "inversify": "^5.0.1"
     }

packages/plugins/src/Test.ts

@@ -1,16 +1,12 @@
 import { plugin as pluginApi } from '@ms/api'
 import { plugin, interfaces, cmd, listener, tab } from '@ms/plugin'
-import { inject, DefaultContainer as container } from '@ms/container';
-import * as ref from '@ms/common/dist/reflect'
+import { inject } from '@ms/container';
 
 @plugin({ name: 'Test', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class Test extends interfaces.Plugin {
     @inject(pluginApi.PluginManager)
     private PluginManager: pluginApi.PluginManager;
 
-    private channel: any;
-    private childHandler: any;
-
     load() {
         this.logger.log('Test Plugin load from MiaoScript Plugin System...');
     }
@@ -19,85 +15,10 @@ export class Test extends interfaces.Plugin {
         this.logger.log('Test Plugin enable from MiaoScript Plugin System...');
     }
 
-    bukkitenable() {
-        let Bukkit = Java.type('org.bukkit.Bukkit');
-        let promise = ref.on(Bukkit.getServer()).get('console').get('serverConnection').get('f').get().get(0);
-        this.channel = ref.on(promise).get('channel').get().pipeline().first();
-        this.childHandler = ref.on(this.channel).get('childHandler').get();
-        let ChannelHandler = Java.extend(Java.type('io.netty.channel.ChannelInitializer'), {
-            initChannel: function(channel: any) {
-                container.get<any>('handle')(channel);
-            }
-        })
-        //=======================
-        let ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter');
-        let CharsetUtil = Java.type('io.netty.util.CharsetUtil')
-        let MiaoDetectHandler = Java.extend(ChannelInboundHandlerAdapter, {
-            channelRead: function(ctx: any, msg: any) {
-                msg.markReaderIndex();
-                console.log(msg.readChar());
-                msg.resetReaderIndex();
-                let message: string = msg.toString(CharsetUtil.UTF_8);
-                console.log(message);
-                let channel = ctx.channel();
-                let pipeline = channel.pipeline();
-                if (message.indexOf('HTTP/1.1') > 0) {
-                    'timeout legacy_query splitter decoder prepender encoder packet_handler'.split(' ').forEach(f => channel.pipeline().remove(f))
-                    let HttpServerCodec = Java.type('io.netty.handler.codec.http.HttpServerCodec');
-                    let ChunkedWriteHandler = Java.type('io.netty.handler.stream.ChunkedWriteHandler');
-                    let HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAggregator');
-                    let WebSocketServerProtocolHandler = Java.type('io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler');
-
-                    let SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler');
-                    let TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame');
-                    let textWsHandler;
-                    let TextWebSocketFrameHandler = Java.extend(SimpleChannelInboundHandler, {
-                        userEventTriggered: (ctx: any, msg: any) => {
-                            ctx.writeAndFlush(new TextWebSocketFrame(`Client ${ctx.channel} connect successful...`))
-                            //@ts-ignore
-                            Java.super(textWsHandler).userEventTriggered(ctx, msg);
-                        },
-                        channelRead0: (ctx: any, msg: any) => {
-                            console.log(msg);
-                            console.log(typeof msg);
-                            console.log(msg.class);
-                            ctx.writeAndFlush(msg.retain())
-                        }
-                    })
-                    textWsHandler = new TextWebSocketFrameHandler()
-                    pipeline.addLast('http', new HttpServerCodec());
-                    pipeline.addLast('chunk', new ChunkedWriteHandler());
-                    pipeline.addLast('httpobj', new HttpObjectAggregator(64 * 1024));
-                    pipeline.addLast('websocket', new WebSocketServerProtocolHandler("/ws"));
-                    pipeline.addLast('websocket_handler', textWsHandler);
-                }
-                pipeline.remove('miaowebsocket');
-                console.log(`Connect Complate. channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
-                msg.resetReaderIndex();
-                ctx.fireChannelRead(msg);
-            }
-        })
-        ref.on(this.channel).set('childHandler', new ChannelHandler());
-        container.bind('handle').toFunction(channel => {
-            ref.on(this.childHandler).call('initChannel', channel);
-            console.log(`channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
-            let pipeline = channel.pipeline();
-
-            pipeline.addFirst('miaowebsocket', new MiaoDetectHandler());
-
-            console.log(`channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
-        });
-    }
-
     disable() {
         this.logger.log('Test Plugin disable from MiaoScript Plugin System...');
     }
 
-    bukkitdisable() {
-        ref.on(this.channel).set('childHandler', this.childHandler);
-        container.unbind('handle')
-    }
-
     @cmd()
     test(sender: any, command: string, args: string[]) {
         switch (args[0]) {
@@ -108,12 +29,6 @@ export class Test extends interfaces.Plugin {
                 break;
             case "reload":
                 this.PluginManager.reload(this);
-                break;
-            case "channel":
-                console.sender(sender, Java.from(sender.handle.playerConnection.networkManager.channel.pipeline().names()).join(' '))
-                break;
-            case "add":
-
                 break;
             case "yaml":
                 let yaml = require("js-yaml");
@@ -130,11 +45,14 @@ export class Test extends interfaces.Plugin {
                 break;
             case "up":
                 if (!sender.openInventory) { return; }
-                var player = sender;
-                var location = player.location;
+                let player = sender;
+                let location = player.location;
                 player.velocity = player.velocity.setY(0.5);
                 setTimeout(() => location.block.type = Java.type('org.bukkit.Material').STONE, 8);
                 break;
+            case "add":
+                require('js-yaml1');
+                break;
             default:
                 this.logger.log(sender, command, args);
                 sender.sendMessage(JSON.stringify({ command, ...args }))

packages/plugins/src/WebSocket.ts

@@ -0,0 +1,107 @@
+import { plugin, interfaces } from '@ms/plugin'
+import { DefaultContainer as container } from '@ms/container';
+import * as ref from '@ms/common/dist/reflect'
+
+@plugin({ name: 'WebSocket', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class WebSocket extends interfaces.Plugin {
+    private channel: any;
+    private childHandler: any;
+
+    load() {
+        this.logger.log('Test Plugin load from MiaoScript Plugin System...');
+    }
+    enable() {
+        this.logger.log('Test Plugin enable from MiaoScript Plugin System...');
+    }
+    disable() {
+        this.logger.log('Test Plugin disable from MiaoScript Plugin System...');
+    }
+
+    bukkitload() {
+        this.logger.log('Load When ServerType is Bukkit!')
+    }
+    bukkitenable() {
+        let Bukkit = Java.type('org.bukkit.Bukkit');
+        let promise = ref.on(Bukkit.getServer()).get('console').get('serverConnection').get('f').get().get(0);
+        this.channel = ref.on(promise).get('channel').get().pipeline().first();
+        this.childHandler = ref.on(this.channel).get('childHandler').get();
+        let ChannelHandler = Java.extend(Java.type('io.netty.channel.ChannelInitializer'), {
+            initChannel: function(channel: any) {
+                container.get<any>('handle')(channel);
+            }
+        })
+        //=======================
+        let ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter');
+        let CharsetUtil = Java.type('io.netty.util.CharsetUtil')
+        let MiaoDetectHandler = Java.extend(ChannelInboundHandlerAdapter, {
+            channelRead: function(ctx: any, msg: any) {
+                msg.markReaderIndex();
+                console.log(msg.readChar());
+                msg.resetReaderIndex();
+                let message: string = msg.toString(CharsetUtil.UTF_8);
+                console.log(message);
+                let channel = ctx.channel();
+                let pipeline = channel.pipeline();
+                if (message.indexOf('HTTP/1.1') > 0) {
+                    'timeout legacy_query splitter decoder prepender encoder packet_handler'.split(' ').forEach(f => channel.pipeline().remove(f))
+                    let HttpServerCodec = Java.type('io.netty.handler.codec.http.HttpServerCodec');
+                    let ChunkedWriteHandler = Java.type('io.netty.handler.stream.ChunkedWriteHandler');
+                    let HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAggregator');
+                    let WebSocketServerProtocolHandler = Java.type('io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler');
+
+                    let SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler');
+                    let TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame');
+                    let textWsHandler;
+                    let TextWebSocketFrameHandler = Java.extend(SimpleChannelInboundHandler, {
+                        userEventTriggered: (ctx: any, msg: any) => {
+                            ctx.writeAndFlush(new TextWebSocketFrame(`Client ${ctx.channel} connect successful...`))
+                            //@ts-ignore
+                            Java.super(textWsHandler).userEventTriggered(ctx, msg);
+                        },
+                        channelRead0: (ctx: any, msg: any) => {
+                            console.log(msg);
+                            console.log(typeof msg);
+                            console.log(msg.class);
+                            ctx.writeAndFlush(msg.retain())
+                        }
+                    })
+                    textWsHandler = new TextWebSocketFrameHandler()
+                    pipeline.addLast('http', new HttpServerCodec());
+                    pipeline.addLast('chunk', new ChunkedWriteHandler());
+                    pipeline.addLast('httpobj', new HttpObjectAggregator(64 * 1024));
+                    pipeline.addLast('websocket', new WebSocketServerProtocolHandler("/ws"));
+                    pipeline.addLast('websocket_handler', textWsHandler);
+                }
+                pipeline.remove('miaowebsocket');
+                console.log(`Connect Complate. channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
+                msg.resetReaderIndex();
+                ctx.fireChannelRead(msg);
+            }
+        })
+        ref.on(this.channel).set('childHandler', new ChannelHandler());
+        container.bind('handle').toFunction(channel => {
+            ref.on(this.childHandler).call('initChannel', channel);
+            console.log(`channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
+            let pipeline = channel.pipeline();
+
+            pipeline.addFirst('miaowebsocket', new MiaoDetectHandler());
+
+            console.log(`channel: ${channel}, pipeline: ${Java.from(channel.pipeline().names()).join(' ')}`)
+        });
+    }
+
+    bukkitdisable() {
+        ref.on(this.channel).set('childHandler', this.childHandler);
+        container.unbind('handle')
+    }
+
+    spongeload() {
+        this.logger.log('Load When ServerType is Sponge!')
+    }
+    spongeenable() {
+        this.logger.log('Enable When ServerType is Sponge!')
+    }
+    spongedisable() {
+        this.logger.log('Disable When ServerType is Sponge!')
+    }
+}

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/sponge",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,7 +27,7 @@
         "typescript": "^3.6.2"
     },
     "dependencies": {
-        "@ms/api": "^0.1.0",
+        "@ms/api": "^0.1.1",
         "@ms/common": "^0.1.0",
         "@ms/container": "^0.1.0"
     }

packages/sponge/src/index.ts

@@ -1,4 +1,4 @@
-import './typings'
+/// <reference path="./typings/index.ts" />
 
 import { server, plugin, command, event, task } from '@ms/api'
 import { DefaultContainer as container } from '@ms/container'