v0.3.1

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

README.MD

@@ -7,23 +7,30 @@
 ### Project Path
 
 ```txt
+└─packages
 └─packages
     ├─api         全平台兼容的接口
     ├─core        核心代码 用于引导加载
     ├─common      公共类库代码 例如 http reflect 模块
-    ├─compile     实时编译模块 自动编译TS文件为js
+    ├─client      NodeJS的Minecraft客户端 用于调试插件
     ├─container   IOC容器 用于注入具体实现
+    ├─ployfill    Nashorn 的一些自定义增强
     ├─nashorn     Nashorn 的类型定义
-    ├─ployfill    Java Nashorn的补丁
     ├─bungee      BungeeCordAPI内部实现
     ├─bukkit      BukkitAPI内部实现
     ├─sponge      SpongeAPI内部实现
+    ├─nukkit      NukkitAPI内部实现
+    ├─ployfill    JS环境的相关环境补全
     ├─plugin      插件管理器
-    ├─manager     插件管理中心后端服务
+    ├─websocket   Netty的WebSocket注入
-    ├─types       Java在TypeScript的类型定义文件
+    ├─type        Java的类型定义
-    ├─websocket   Netty的WebSocket的MiaoScript实现(兼容socket.io)
+    |   ├─bungee  BungeeCord类型定义
+    |   ├─bukkit  Bukkit类型定义
+    |   ├─sponge  Sponge类型定义
+    |   └─nukkit  Nukkit类型定义
     └─plugins     这里当然是插件啦
         ├─bungee  只兼容BungeeCord的插件
         ├─bukkit  只兼容Bukkit的插件
-        └─sponge  只兼容Sponge的插件
+        ├─sponge  只兼容Sponge的插件
+        └─nukkit  只兼容Nukkit的插件
 ```

cli.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-SHELL_PREFIX="[FAAS-CLI]"
-# Shell Base Script
-set -e
-
-c_red="\033[38;5;1m"
-c_blue="\033[38;5;4m"
-c_green="\033[38;5;2m"
-c_reset="\033[0m"
-c_yellow="\033[38;5;3m"
-
-c_prefix="${c_blue}${SHELL_PREFIX}>>${c_reset}"
-
-dateStr() {
-    echo -e "[$(date '+%H:%M:%S')]"
-}
-
-info() {
-    echo -e "${c_prefix}$(dateStr) ${*}"
-}
-
-warn() {
-    echo -e "${c_prefix}$(dateStr) ${c_yellow}${*}${c_reset}"
-}
-
-error() {
-    echo -e "${c_prefix}$(dateStr) ${c_red}${*}${c_reset}"
-}
-#====================
-cd $(dirname $0)
-
-# User Input Variable
-action=
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        -a)
-            action="$2"
-            shift
-            ;;
-        -*)
-            echo "Illegal option $1"
-            ;;
-    esac
-    shift $(( $# > 0 ? 1 : 0 ))
-done
-
-case "${action}" in
-    undo)
-        hash=$(git log -n 1 --format=format:%H)
-        tag=$(git tag -l --contains=${hash})
-        if [[ -z "${tag}" ]]; then
-            error "last commit not have tag exit..."
-            exit 0
-        fi
-        git reset HEAD^
-        git tag -d ${tag}
-        git push origin master -f
-        git push origin :${tag}
-        ;;
-esac
-

doc/MCBBS.MD

@@ -65,6 +65,8 @@
   - 完整的服务端Java类自动补全
   - 全新的 IOC容器 注入功能
   - 注解式 注册命令 注册事件
+- 2020年3月2日 发布0.3.0版本
+  - 支持 Bukkit Nukkit BungeeCord Sponge
 
 ### 进展
 
@@ -98,14 +100,15 @@
     ├─bungee      BungeeCordAPI内部实现
     ├─bukkit      BukkitAPI内部实现
     ├─sponge      SpongeAPI内部实现
+    ├─nukkit      NukkitAPI内部实现
     ├─ployfill    JS环境的相关环境补全
     ├─plugin      插件管理器
+    ├─websocket   Netty的WebSocket注入
     ├─type        Java的类型定义
     |   ├─bungee  BungeeCord类型定义
     |   ├─bukkit  Bukkit类型定义
     |   ├─sponge  Sponge类型定义
     |   └─nukkit  Nukkit类型定义
-    ├─websocket   Netty的WebSocket注入
     └─plugins     这里当然是插件啦
         ├─bungee  只兼容BungeeCord的插件
         ├─bukkit  只兼容Bukkit的插件
@@ -132,8 +135,12 @@ YUMC: https://git.yumc.pw/circlecloud/ms
 - 进入目录 `ms`
 - 安装 npm 包
   - `yarn`
+- 建立内部依赖链接
+  - `yarn bs`
 - 编译一次生成对应的类库
   - `yarn build`
+- 编译插件
+  - `yarn build:plugins`
 
 ### 直接在 MiaoScript Online WebIDE 开发
 
@@ -146,10 +153,7 @@ YUMC: https://git.yumc.pw/circlecloud/ms
 先来一个 `HelloWorld.ts` 插件示范!
 
 ```ts
-/// <reference types="@ms/types/dist/typings/bukkit" />
+/// <reference types="@ms/types" />
-/// <reference types="@ms/types/dist/typings/sponge" />
-/// <reference types="@ms/types/dist/typings/bungee" />
-/// <reference types="@ms/types/dist/typings/nukkit" />
 
 import { server } from '@ms/api';
 import { inject } from '@ms/container';
@@ -275,6 +279,10 @@ export interface PluginMetadata {
         * 插件名称
         */
     name: string;
+    /**
+     * 支持的服务器列表 为空则代表所有
+     */
+    servers?: string[];
     /**
         * 前缀
         */
@@ -300,10 +308,10 @@ export interface PluginMetadata {
 
 ### 插件生命周期
 
-MiaoScript的生命周期遵循了 Bukkit 的生命周期
+MiaoScript 的生命周期遵循了 Bukkit 的生命周期
 
-MiaoScript针对不同的服务端 提供了扩展的周期
+MiaoScript 针对不同的服务端 提供了扩展的周期
-以服务端类型开头阶段名结束 例如 `bukkitload` `spongeenbale`
+以服务端类型开头阶段名结束 例如 `bukkitload` `spongeenbale` `bungeedisable`
 扩展的生命周期只会在特定的服务器执行
 
 ### load 加载阶段

lerna.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/api",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,13 +22,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1",
-        "@ms/ployfill": "^0.3.0",
+        "@ms/ployfill": "^0.3.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     }
 }

packages/api/src/channel.ts

@@ -5,7 +5,7 @@ export namespace channel {
     * handle plugin message
     * @param data byte[]
     */
-    export type ChannelListener = (data: any) => void
+    export type ChannelListener = (data: any, exts?: any) => void
 
     @injectable()
     export abstract class Channel {

packages/api/src/command.ts

@@ -33,9 +33,9 @@ export namespace command {
                 try {
                     return executor(sender, command, Java.from(args));
                 } catch (ex) {
-                    console.console(`§6玩家 §a${sender.name} §6执行 §b${plugin.description.name} §6插件 §d${command} ${Java.from(args).join(' ')} §6命令时发生异常 §4${ex}`);
+                    console.i18n("ms.api.command.execute.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
                     console.ex(ex);
-                    console.sender(sender, [`§6执行 §b${plugin.description.name} §6插件 §d${command} ${Java.from(args).join(' ')} §6命令时发生异常`, ...console.stack(ex)])
+                    console.sender(sender, [i18n.translate("ms.api.command.execute.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
                     return true;
                 }
             }
@@ -48,9 +48,9 @@ export namespace command {
                     var complete = tabCompleter(sender, command, Java.from(args)) || [];
                     return this.copyPartialMatches(complete, token);
                 } catch (ex) {
-                    console.console(`§6玩家 §a${sender.name} §6执行 §b${plugin.description.name} §6插件 §d${command} ${Java.from(args).join(' ')} §6补全时发生异常 §4${ex}`);
+                    console.i18n("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
                     console.ex(ex);
-                    console.sender(sender, [`§6执行 §b${plugin.description.name} §6插件 §d${command} ${Java.from(args).join(' ')} §6补全时发生异常 §4${ex}`, ...console.stack(ex)]);
+                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)]);
                     return [];
                 }
             }

packages/api/src/event.ts

@@ -1,5 +1,3 @@
-/// <reference types='@ms/nashorn' />
-
 /**
  * MiaoScript Event处理类
  */

packages/api/src/index.ts

@@ -1,4 +1,4 @@
-import "@ms/ployfill"
+import "@ms/nashorn"
 export * from './task'
 export * from './event'
 export * from './console'

packages/api/src/interfaces/plugin.ts

@@ -4,7 +4,7 @@ export namespace plugin {
      */
     export const Plugin = Symbol("Plugin");
     /**
-     * MiaoScript Plugin
+     * MiaoScript Plugin Folder
      */
     export const PluginFolder = Symbol("PluginFolder");
     /**

packages/api/src/interfaces/server/index.ts

@@ -1,3 +1,5 @@
+import { NativePluginManager } from './native_plugin'
+
 export namespace server {
     /**
      * Runtime ServerType
@@ -26,6 +28,8 @@ export namespace server {
         getService(service: string): any;
         dispatchCommand(sender: string | any, command: string): boolean;
         dispatchConsoleCommand(command: string): boolean;
+        getPluginsFolder(): string;
+        getNativePluginManager(): NativePluginManager;
         sendJson(sender: string | any, json: object | string): void;
     }
 }

packages/api/src/interfaces/server/native_plugin.ts

@@ -0,0 +1,6 @@
+export interface NativePluginManager {
+    load(name: string): boolean;
+    unload(name: string): boolean;
+    reload(name: string): boolean;
+    delete(name: string): boolean;
+}

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/bukkit",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -24,12 +24,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/common": "^0.3.0",
+        "@ms/common": "^0.3.1",
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1"
-        "@ms/types": "^0.3.0"
     }
 }

packages/bukkit/src/channel.ts

@@ -15,8 +15,8 @@ export class BukkitChannel extends channel.Channel {
     }
     register(channel: string, listener: channel.ChannelListener) {
         Messenger.registerIncomingPluginChannel(this.pluginInstance, channel, new PluginMessageListener({
-            onPluginMessageReceived: (/**String */ var1, /**Player */ var2, /**byte[] */var3) => {
+            onPluginMessageReceived: (/**String */ channel, /**Player */ player, /**byte[] */data) => {
-                listener(var3)
+                listener(data, { channel, player, data })
             }
         }));
         Messenger.registerOutgoingPluginChannel(this.pluginInstance, channel);

packages/bukkit/src/server.ts

@@ -7,6 +7,12 @@ let Bukkit = org.bukkit.Bukkit;
 
 @provideSingleton(server.Server)
 export class BukkitServer implements server.Server {
+    private pluginsFolder: string;
+
+    constructor() {
+        this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath();
+    }
+
     getPlayer(name: string) {
         return Bukkit.getPlayer(name)
     }
@@ -31,6 +37,12 @@ export class BukkitServer implements server.Server {
     dispatchConsoleCommand(command: string): boolean {
         return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command)
     }
+    getPluginsFolder(): string {
+        return this.pluginsFolder;
+    }
+    getNativePluginManager() {
+        return Bukkit.getPluginManager() as any;
+    }
     sendJson(sender: string | any, json: object | string): void {
         if (typeof sender === "string") {
             sender = this.getPlayer(sender)

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/bungee",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -24,12 +24,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/common": "^0.3.0",
+        "@ms/common": "^0.3.1",
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1"
-        "@ms/types": "^0.3.0"
     }
 }

packages/bungee/src/channel.ts

@@ -1,18 +1,25 @@
-import { channel } from '@ms/api'
+import { channel, event } from '@ms/api'
-import { provideSingleton } from '@ms/container'
+import { provideSingleton, inject } from '@ms/container'
 
 const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
 
 @provideSingleton(channel.Channel)
 export class BungeeChannel extends channel.Channel {
+    @inject(event.Event)
+    private eventManager: event.Event;
+
     send(player: any, channel: string, data: any) {
         throw new Error("Method not implemented.");
     }
     register(channel: string, listener: channel.ChannelListener) {
         Bungee.registerChannel(channel);
-        console.console('§6[§eWARN§6] §eBungeeCord Channel only registerChannel you need self hanler PluginMessageEvent!')
+        // console.console('§6[§eWARN§6] §eMiaoScript channel in BungeeCord only register. you need self hanler PluginMessageEvent!')
+        return this.eventManager.listen({ description: { name: channel } }, "PluginMessageEvent", (event: net.md_5.bungee.api.event.PluginMessageEvent) => {
+            listener(event.getData(), event)
+        })
     }
     unregister(channel: string, listener: any) {
         Bungee.unregisterChannel(channel);
+        listener.off();
     }
 }

packages/bungee/src/server.ts

@@ -5,6 +5,12 @@ let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
 
 @provideSingleton(server.Server)
 export class BungeeServer implements server.Server {
+    private pluginsFolder: string;
+
+    constructor() {
+        this.pluginsFolder = Bungee.getPluginsFolder().getCanonicalPath();
+    }
+
     getPlayer(name: string) {
         return Bungee.getPlayer(name);
     }
@@ -29,6 +35,12 @@ export class BungeeServer implements server.Server {
     dispatchConsoleCommand(command: string): boolean {
         return Bungee.getPluginManager().dispatchCommand(Bungee.getConsole(), command)
     }
+    getPluginsFolder(): string {
+        return this.pluginsFolder;
+    }
+    getNativePluginManager() {
+        return Bungee.getPluginManager() as any
+    }
     sendJson(sender: string | any, json: string): void {
         throw new Error("Method not implemented.");
     }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/client",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -30,6 +30,6 @@
     "devDependencies": {
         "@nestjs/cli": "^6.14.2",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     }
 }

packages/client/src/index.ts

@@ -21,6 +21,10 @@ function createConnection(host: string, port: number, username: string) {
     return client;
 }
 
+client.on('error', (error) => {
+    console.log("Client Error", error)
+})
+
 client.on('end', (resone) => {
     console.log("Client End Resone:", resone)
     client = createConnection('192.168.2.5', 25577, username)
@@ -29,19 +33,31 @@ client.on('end', (resone) => {
 const rl = createInterface({
     input: process.stdin,
     output: process.stdout,
+    completer: (line, func) => {
+        let args = line.split(' ')
+        let comp = args[args.length - 1]
+        client.once('tab_complete', (msg) => {
+            let mcts = msg.matches.filter(s => s)
+            func(null, [mcts, comp])
+        })
+        client.write('tab_complete', {
+            text: line
+        })
+    },
     terminal: true,
     prompt: ''
 })
 
-rl.on('line', function(line) {
+rl.on('line', function (line) {
     switch (line) {
         case "":
             break;
+        case "eval":
+            break;
+        case "write":
+            break;
         case "/respawn":
             client.write('client_command', { payload: 0 })
-            // client.write("respawn", {
-
-            // })
             break;
         case "//reco":
             client.end("")

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/common",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,11 +24,10 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.3.0",
+        "@ms/nashorn": "^0.3.1"
-        "@ms/ployfill": "^0.3.0"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/common/src/http.ts

@@ -1,4 +1,7 @@
-import '@ms/api'
+const URL = Java.type('java.net.URL')
+const Paths = Java.type('java.nio.file.Paths');
+const Files = Java.type('java.nio.file.Files');
+const StandardCopyOption = Java.type('java.nio.file.StandardCopyOption');
 
 export type Method =
     | 'get' | 'GET'
@@ -31,8 +34,14 @@ function request(config: RequestConfig) {
     return xhr.get();
 }
 
+function download(url: string, target: string) {
+    console.debug(`Start Download file ${target} from ${url}....`)
+    Files.copy(new URL(url).openStream(), Paths.get(target), StandardCopyOption.REPLACE_EXISTING);
+    console.debug(`File ${target} Download Complate...`)
+}
+
 function _proxy(method: Method) {
-    return function(url: string, data?: any, config?: RequestConfig) {
+    return function (url: string, data?: any, config?: RequestConfig) {
         return request({ url, method, data, ...config });
     }
 }
@@ -40,5 +49,6 @@ function _proxy(method: Method) {
 export default {
     get: _proxy('GET'),
     post: _proxy('POST'),
-    request
+    request,
+    download
 }

packages/common/src/reflect.ts

@@ -1,4 +1,3 @@
-import '@ms/core'
 /**
  * 反射工具类
  * Created by MiaoWoo on 2017/2/9 0009.

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/compile",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -24,6 +24,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     }
 }

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/container",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -24,7 +24,7 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
         "inversify-binding-decorators": "^4.0.0"

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/core",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,15 +24,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/bukkit": "^0.3.0",
+        "@ms/container": "^0.3.1"
-        "@ms/common": "^0.3.0",
-        "@ms/container": "^0.3.0",
-        "@ms/plugin": "^0.3.0",
-        "@ms/sponge": "^0.3.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -1,6 +1,3 @@
-/// <reference types="@ms/nashorn" />
-import '@ms/i18n'
-
 let containerStartTime = Date.now();
 console.i18n("ms.core.ioc.initialize");
 import { plugin, server, task } from '@ms/api'

packages/i18n/languages/en.yml

@@ -23,6 +23,8 @@ ms.api.event.unregister: "[{name}] unregister event {event}"
 ms.api.command.register.input.error: "CommandExec Must be a function... Input: {exec}"
 ms.api.command.register: "[{plugin}] register command {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] unregister command {name}..."
+ms.api.command.execute.error: "§6Player {player} §6exec §b{plugin} §6Plugin Command §d{command} {args} §6error §4{ex}"
+ms.api.command.tab.completer.error: "§6Player {player} §6exec §b{plugin} §6Plugin TabComplete §d{command} {args} §6error §4{ex}"
 
 ms.plugin.initialize: "Initialization MiaoScript Plugin System: {plugin} ..."
 ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."

packages/i18n/languages/zh_cn.yml

@@ -1,4 +1,4 @@
-ms.ployfill.initialize: "初始化 Java Nashorn 补丁. 请稍候..."
+ms.ployfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
 ms.ployfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
 
 ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 @ms/container. 请稍候..."
@@ -23,10 +23,12 @@ ms.api.event.unregister: "[{name}] 注销事件 {event}"
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."
+ms.api.command.execute.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6命令时发生异常 §4{ex}"
+ms.api.command.tab.completer.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全时发生异常 §4{ex}"
 
 ms.plugin.initialize: "初始化 MiaoScript 插件系统: {plugin} ..."
 ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
-ms.plugin.manager.scan: "在 {folder} 文件夹中扫描插件..."
+ms.plugin.manager.scan: "扫描 {folder} 文件夹中插件..."
 ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} 版本 {version} 作者 {author}"
 ms.plugin.manager.stage.load: "加载"

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/i18n",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -25,12 +25,10 @@
         "@types/js-yaml": "^3.12.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/common": "^0.3.0",
+        "@ms/nashorn": "^0.3.1",
-        "@ms/container": "^0.3.0",
-        "@ms/ployfill": "^0.3.0",
         "js-yaml": "^3.13.1"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"

packages/i18n/src/index.ts

@@ -1,7 +1,8 @@
-import '@ms/ployfill'
+/// <reference types="@ms/nashorn" />
 import * as yaml from 'js-yaml'
 
-import * as fs from '@ms/common/dist/fs'
+const File = Java.type("java.io.File");
+const separatorChar = File.separatorChar;
 
 let langMap = {};
 let fallbackMap = {};
@@ -18,16 +19,24 @@ function translate(name: string, param?: TranslateParam) {
 }
 
 function initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
-    langMap = readYamlFile(root, lang) || readYamlFile(fs.concat(__dirname, '..'), lang)
+    langMap = readYamlFile(root, lang) || readYamlFile(concat(__dirname, '..'), lang)
-    fallbackMap = readYamlFile(root, fallback) || readYamlFile(fs.concat(__dirname, '..'), fallback)
+    fallbackMap = readYamlFile(root, fallback) || readYamlFile(concat(__dirname, '..'), fallback)
     console.i18n = function i18n(name: string, param?: TranslateParam) {
         console.log(translate(name, param))
     }
 }
 
 function readYamlFile(dir: string, name: string) {
-    let langFile = fs.concat(dir, 'languages', name + '.yml');
+    let langFile = concat(dir, 'languages', name + '.yml');
-    return fs.exists(langFile) && yaml.safeLoad(base.read(langFile))
+    return exists(langFile) && yaml.safeLoad(base.read(langFile))
+}
+
+function concat(...args: string[]) {
+    return args.join(separatorChar)
+}
+
+function exists(path: string) {
+    return new File(path).exists()
 }
 
 declare global {

packages/manager/package.json

@@ -1,39 +0,0 @@
-{
-    "private": true,
-    "name": "@ms/manager",
-    "version": "0.3.0",
-    "description": "MiaoScript manager package",
-    "keywords": [
-        "miaoscript",
-        "minecraft",
-        "bukkit",
-        "sponge"
-    ],
-    "author": "MiaoWoo <admin@yumc.pw>",
-    "homepage": "https://github.com/circlecloud/ms.git",
-    "license": "ISC",
-    "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
-    "scripts": {
-        "dev": "ts-node-dev --respawn --debounce=1500 src/index.ts",
-        "clean": "rimraf dist",
-        "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
-        "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "dependencies": {
-        "@cc-server/core": "^0.7.0",
-        "mongodb": "^3.5.3"
-    },
-    "devDependencies": {
-        "@types/express": "^4.17.2",
-        "@types/mongodb": "^3.3.16",
-        "@types/socket.io": "^2.1.4",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^3.0.2",
-        "ts-node-dev": "^1.0.0-pre.44",
-        "typescript": "^3.8.2"
-    }
-}

packages/manager/src/controller/Index.ts

@@ -1,37 +0,0 @@
-import { DBClient } from '@cc-server/db'
-import { lazyInjectNamed } from '@cc-server/ioc'
-import { controller, get, post, requestParam, requestBody, Vaild, NotBlank } from '@cc-server/binding'
-
-class Plugins {
-    @NotBlank()
-    name?: string;
-    author?: string;
-    version?: string;
-    source?: string;
-    type?: string;
-    dist?: string;
-}
-
-type distType = 'npm' | 'git' | 'src'
-
-@controller('/plugin')
-class PluginController {
-    @lazyInjectNamed(DBClient, Plugins.name.toLocaleLowerCase())
-    private client: DBClient<Plugins>
-
-    @get('/')
-    index() {
-        return this.client.find({});
-    }
-
-    @get('/:id')
-    details(@requestParam("id") id: string) {
-        return this.client.findOneById(id);
-    }
-
-    @post('/')
-    add(@requestBody() @Vaild() model: Plugins) {
-        return this.client.insertOne(model);
-    }
-
-}

packages/manager/src/index.ts

@@ -1,22 +0,0 @@
-import * as path from 'path'
-import { Db, MongoClient } from 'mongodb'
-import { DBClient } from '@cc-server/db'
-import { interfaces } from '@cc-server/ioc'
-import { CcServerBoot } from '@cc-server/core'
-import { MongoCollection, TYPE } from '@cc-server/db-mongo';
-
-async function main() {
-    let server = new CcServerBoot();
-    let collectionCache = {};
-    server.container.bind(DBClient).toDynamicValue((context: interfaces.Context) => {
-        let name = context.currentRequest.target.getNamedTag().value;
-        if (!name) { return null }
-        if (!collectionCache[name]) { collectionCache[name] = new MongoCollection(context.container.get<Db>(TYPE.DB).collection(name)) }
-        return collectionCache[name];
-    })
-    let client = await MongoClient.connect("mongodb://192.168.2.5:27017", { useNewUrlParser: true, connectTimeoutMS: 10000 })
-    server.container.bind("MONGO_DB").toConstantValue(client.db("mspc"));
-    server.scan(path.join(__dirname, "controller")).start()
-}
-
-main()

packages/manager/tsconfig.json

@@ -1,7 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "baseUrl": "src",
-        "outDir": "dist"
-    }
-}

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/nashorn",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,6 +25,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     }
 }

packages/nashorn/src/index.ts

@@ -38,6 +38,37 @@ declare global {
         setPrototypeOf(obj: object, prototype: object);
         bindProperties(to: object, from: object);
     }
+
+    namespace NodeJS {
+        interface Global {
+            logger: any;
+            debug: boolean;
+            level: string;
+            NashornEngineStartTime: number;
+            setGlobal: (key: string, value: any) => void;
+            noop: () => void;
+            console: Console;
+        }
+    }
+    var root: string;
+    var base: Core;
+    var ScriptEngineContextHolder: any;
+    function engineLoad(str: string): any;
+    interface Core {
+        getClass(name: String): any;
+        getProxyClass(): any;
+        getInstance(): any;
+        read(path: string): string;
+        save(path: string, content: string): void;
+        delete(path: string): void;
+    }
+    interface Console {
+        ex(err: Error): void;
+        stack(err: Error): string[];
+        sender(...args: any): void;
+        console(...args: any): void;
+        i18n(name: string, ...params: any[]);
+    }
 }
 
 export { };

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/nukkit",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -24,12 +24,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/common": "^0.3.0",
+        "@ms/common": "^0.3.1",
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1"
-        "@ms/types": "^0.3.0"
     }
 }

packages/nukkit/src/server.ts

@@ -2,9 +2,16 @@ import { server } from '@ms/api'
 import { provideSingleton } from '@ms/container';
 
 let Nukkit: cn.nukkit.Server = base.getInstance().getServer();
+const File = Java.type("java.io.File");
 
 @provideSingleton(server.Server)
 export class NukkitServer implements server.Server {
+    private pluginsFolder: string;
+
+    constructor() {
+        this.pluginsFolder = new File(base.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getParentFile().getCanonicalPath()
+    }
+
     getPlayer(name: string) {
         return Nukkit.getPlayer(name)
     }
@@ -29,6 +36,12 @@ export class NukkitServer implements server.Server {
     dispatchConsoleCommand(command: string): boolean {
         return Nukkit.dispatchCommand(Nukkit.getConsoleSender(), command)
     }
+    getPluginsFolder(): string {
+        return this.pluginsFolder;
+    }
+    getNativePluginManager() {
+        return Nukkit.getPluginManager() as any;
+    }
     sendJson(sender: string | any, json: object | string): void {
         throw new Error("Method not implemented.");
     }

packages/ployfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/ployfill",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript ployfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "homepage": "https://github.com/circlecloud/ms.git",
@@ -17,12 +17,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.3.0",
+        "@ms/i18n": "^0.3.1",
+        "@ms/nashorn": "^0.3.1",
         "core-js": "^3.6.4"
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     }
 }

packages/ployfill/src/global.ts

@@ -1,33 +0,0 @@
-declare global {
-    namespace NodeJS {
-        interface Global {
-            logger: any;
-            debug: boolean;
-            level: string;
-            NashornEngineStartTime: number;
-            setGlobal: (key: string, value: any) => void;
-            noop: () => void;
-            console: Console;
-        }
-    }
-    var root: string;
-    var base: Core;
-    var ScriptEngineContextHolder: any;
-    function engineLoad(str: string): any;
-    interface Core {
-        getClass(name: String): any;
-        getProxyClass(): any;
-        getInstance(): any;
-        read(path: string): string;
-        save(path: string, content: string): void;
-        delete(path: string): void;
-    }
-    interface Console {
-        ex(err: Error): void;
-        stack(err: Error): string[];
-        sender(...args: any): void;
-        console(...args: any): void;
-        i18n(name: string, ...params: any[]);
-    }
-}
-export { }

packages/ployfill/src/index.ts

@@ -1,5 +1,5 @@
-/// <reference path="./global.ts" />
+/// <reference types="@ms/nashorn" />
-/// <reference types='@ms/nashorn' />
+
 import i18n from '@ms/i18n'
 let ployfillStartTime = new Date().getTime();
 i18n.initialize();

packages/ployfill/src/task.ts

@@ -0,0 +1,141 @@
+(function nashornEventLoopMain(context) {
+    'use strict';
+
+    var Thread = Java.type('java.lang.Thread');
+    var Phaser = Java.type('java.util.concurrent.Phaser');
+    var ArrayDeque = Java.type('java.util.ArrayDeque');
+    var HashMap = Java.type('java.util.HashMap');
+    var TimeUnit = Java.type("java.util.concurrent.TimeUnit");
+    var Runnable = Java.type('java.lang.Runnable');
+
+    var globalTimerId;
+    var timerMap;
+    var eventLoop;
+    var phaser = new Phaser();
+
+    // __NASHORN_POLYFILL_TIMER__ type is ScheduledExecutorService
+    var scheduler = context.__NASHORN_POLYFILL_TIMER__;
+
+    resetEventLoop();
+
+    //   console.log('main javasript thread ' + Thread.currentThread().getName());
+
+    function resetEventLoop() {
+        globalTimerId = 1;
+        if (timerMap) {
+            timerMap.forEach(function(key, value) {
+                value.cancel(true);
+            })
+        }
+        timerMap = new HashMap();
+        eventLoop = new ArrayDeque();
+    }
+
+    function waitForMessages() {
+        phaser.register();
+        var wait = !(eventLoop.size() === 0);
+        phaser.arriveAndDeregister();
+        return wait;
+    }
+
+    function processNextMessages() {
+        var remaining = 1;
+        while (remaining) {
+            phaser.register();
+            var message = eventLoop.removeFirst();
+            remaining = eventLoop.size();
+            phaser.arriveAndDeregister();
+
+            var fn = message.fn;
+            var args = message.args;
+
+            try {
+                fn.apply(context, args);
+            } catch (e) {
+                console.trace(e);
+                console.trace(fn);
+                console.trace(args);
+            }
+        }
+    }
+
+    context.nashornEventLoop = {
+        process: function() {
+            while (waitForMessages()) {
+                processNextMessages()
+            }
+        },
+        reset: resetEventLoop
+    };
+
+
+    function createRunnable(fn, timerId, args, repeated) {
+        return new Runnable({
+            run: function() {
+                try {
+                    var phase = phaser.register();
+                    eventLoop.addLast({
+                        fn: fn,
+                        args: args
+                    });
+                } catch (e) {
+                    console.trace(e);
+                } finally {
+                    if (!repeated) timerMap.remove(timerId);
+                    phaser.arriveAndDeregister();
+                }
+            }
+        })
+    }
+
+    var setTimeout = function(fn, millis /* [, args...] */) {
+        var args = [].slice.call(arguments, 2, arguments.length);
+
+        var timerId = globalTimerId++;
+        var runnable = createRunnable(fn, timerId, args, false);
+
+        var task = scheduler.schedule(runnable, millis, TimeUnit.MILLISECONDS);
+        timerMap.put(timerId, task);
+
+        return timerId;
+    };
+
+    var setImmediate = function(fn /* [, args...] */) {
+        var args = [].slice.call(arguments, 1, arguments.length);
+        // @ts-ignore
+        return setTimeout(fn, 0, args);
+    }
+
+    var clearImmediate = function(timerId) {
+        clearTimeout(timerId);
+    }
+
+    var clearTimeout = function(timerId) {
+        var task = timerMap.get(timerId);
+        if (task) {
+            task.cancel(true);
+            timerMap.remove(timerId);
+        }
+    };
+
+    var setInterval = function(fn, delay /* [, args...] */) {
+        var args = [].slice.call(arguments, 2, arguments.length);
+        var timerId = globalTimerId++;
+        var runnable = createRunnable(fn, timerId, args, true);
+        var task = scheduler.scheduleWithFixedDelay(runnable, delay, delay, TimeUnit.MILLISECONDS);
+        timerMap.put(timerId, task);
+        return timerId;
+    };
+
+    var clearInterval = function(timerId) {
+        clearTimeout(timerId);
+    };
+
+    context.setTimeout = setTimeout;
+    context.clearTimeout = clearTimeout;
+    context.setImmediate = setImmediate;
+    context.clearImmediate = clearImmediate;
+    context.setInterval = setInterval;
+    context.clearInterval = clearInterval;
+    // @ts-ignore
+})(typeof global !== "undefined" && global || typeof self !== "undefined" && self || this);

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/plugin",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,13 +25,13 @@
         "@types/js-yaml": "^3.12.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/common": "^0.3.0",
+        "@ms/common": "^0.3.1",
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1",
-        "@ms/i18n": "^0.3.0",
+        "@ms/i18n": "^0.3.1",
         "js-yaml": "^3.13.1"
     }
 }

packages/plugin/src/manager.ts

@@ -160,10 +160,16 @@ export class PluginManagerImpl implements plugin.PluginManager {
         }
     }
 
-    private checkServers(servers: string[]) {
+    private allowProcess(servers: string[]) {
-        if (!servers) { return true }
+        // Not set servers allow
-        if (servers.indexOf(`!${this.serverType}`) != -1) { return false }
+        if (!servers) return true
-        return servers?.indexOf(this.serverType) != -1
+        // include !type deny
+        let denyServers = servers.filter(svr => svr.startsWith("!"))
+        if (denyServers.length !== 0) {
+            return !denyServers.includes(`!${this.serverType}`)
+        } else {
+            return servers.includes(this.serverType)
+        }
     }
 
     private createPlugin(file: string) {
@@ -174,7 +180,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private buildPlugins() {
         let pluginMetadatas = getPluginMetadatas()
         for (const [_, metadata] of pluginMetadatas) {
-            if (!this.checkServers(metadata.servers)) { continue }
+            if (!this.allowProcess(metadata.servers)) { continue }
             this.buildPlugin(metadata)
         }
     }
@@ -221,7 +227,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         let tabs = getPluginTabCompleterMetadata(pluginInstance)
         for (const [_, cmd] of cmds) {
             let tab = tabs.get(cmd.name)
-            if (!this.checkServers(cmd.servers)) { continue }
+            if (!this.allowProcess(cmd.servers)) { continue }
             this.CommandManager.on(pluginInstance, cmd.name, {
                 cmd: pluginInstance[cmd.executor].bind(pluginInstance),
                 tab: tab ? pluginInstance[tab.executor].bind(pluginInstance) : undefined
@@ -233,7 +239,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         let events = getPluginListenerMetadata(pluginInstance)
         for (const event of events) {
             // ignore space listener
-            if (!this.checkServers(event.servers)) { continue }
+            if (!this.allowProcess(event.servers)) { continue }
             // here must bind this to pluginInstance
             this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance))
         }

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/plugins",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -25,12 +25,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/plugin": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "axios": "^0.19.2",
+        "@ms/container": "^0.3.1",
-        "es6-map": "^0.1.5",
+        "@ms/plugin": "^0.3.1"
-        "inversify": "^5.0.1"
     }
 }

packages/plugins/src/HelloWorld.ts

@@ -23,33 +23,43 @@ export class HelloWorld extends interfaces.Plugin {
     }
 
     bukkitload() {
-        this.logger.log('Load When ServerType is Bukkit!')
+        this.logger.log('Plugin Load When ServerType is Bukkit!')
     }
     bukkitenable() {
-        this.logger.log('Enable When ServerType is Bukkit!')
+        this.logger.log('Plugin Enable When ServerType is Bukkit!')
     }
     bukkitdisable() {
-        this.logger.log('Disable When ServerType is Bukkit!')
+        this.logger.log('Plugin Disable When ServerType is Bukkit!')
     }
 
     spongeload() {
-        this.logger.log('Load When ServerType is Sponge!')
+        this.logger.log('Plugin Load When ServerType is Sponge!')
     }
     spongeenable() {
-        this.logger.log('Enable When ServerType is Sponge!')
+        this.logger.log('Plugin Enable When ServerType is Sponge!')
     }
     spongedisable() {
-        this.logger.log('Disable When ServerType is Sponge!')
+        this.logger.log('Plugin Disable When ServerType is Sponge!')
     }
 
     bungeeload() {
-        this.logger.log('Load When ServerType is BungeeCord!')
+        this.logger.log('Plugin Load When ServerType is BungeeCord!')
     }
     bungeeenable() {
-        this.logger.log('Enable When ServerType is BungeeCord!')
+        this.logger.log('Plugin Enable When ServerType is BungeeCord!')
     }
     bungeedisable() {
-        this.logger.log('Disable When ServerType is BungeeCord!')
+        this.logger.log('Plugin Disable When ServerType is BungeeCord!')
+    }
+
+    nukkitload() {
+        this.logger.log('Plugin Load When ServerType is Nukkit!')
+    }
+    nukkitenable() {
+        this.logger.log('Plugin Enable When ServerType is Nukkit!')
+    }
+    nukkitdisable() {
+        this.logger.log('Plugin Disable When ServerType is Nukkit!')
     }
 
     @cmd()

packages/plugins/src/MiaoChat.ts

@@ -3,7 +3,7 @@
 /// <reference types="@ms/types/dist/typings/bungee" />
 
 import { server, plugin as pluginApi, channel } from '@ms/api'
-import { inject } from '@ms/container';
+import { inject, optional } from '@ms/container';
 import { plugin, interfaces, cmd, listener, tab, config } from '@ms/plugin'
 import Tellraw from '@ms/common/dist/tellraw'
 
@@ -56,10 +56,10 @@ class MiaoMessage {
 export class MiaoChat extends interfaces.Plugin {
     @inject(server.Server)
     private Server: server.Server
-    @inject(server.ServerType)
-    private ServerType: string
     @inject(channel.Channel)
-    private Channel: channel.Channel
+    @optional() private Channel: channel.Channel
+
+    private channelOff: { off: () => void };
 
     @config()
     private config = {
@@ -169,12 +169,10 @@ export class MiaoChat extends interfaces.Plugin {
                 return string;
             }
         }
-        this.Channel.listen(this, MiaoMessage.CHANNEL, (data) => {
-            this.sendChatAll(MiaoMessage.decode(data).json)
-        })
     }
 
     disable() {
+        this.channelOff?.off()
     }
 
     bukkitenable() {
@@ -186,9 +184,9 @@ export class MiaoChat extends interfaces.Plugin {
         } catch (ex) {
             this.logger.console("§cCan't found me.clip.placeholderapi.PlaceholderAPI variable will not be replaced! Err: " + ex)
         }
-    }
+        this.channelOff = this.Channel?.listen(this, MiaoMessage.CHANNEL, (data) => {
-
+            this.sendChatAll(MiaoMessage.decode(data).json)
-    bukkitdisable() {
+        })
     }
 
     spongeenable() {
@@ -207,15 +205,25 @@ export class MiaoChat extends interfaces.Plugin {
         } catch (ex) {
             this.logger.console("§cCan't found me.rojo8399.placeholderapi.PlaceholderService variable will not be replaced! Err: " + ex)
         }
-    }
+        this.channelOff = this.Channel?.listen(this, MiaoMessage.CHANNEL, (data) => {
-
+            this.sendChatAll(MiaoMessage.decode(data).json)
-    spongedisable() {
+        })
     }
 
     bungeeenable() {
-    }
+        this.channelOff = this.Channel?.listen(this, MiaoMessage.CHANNEL, (data, event: net.md_5.bungee.api.event.PluginMessageEvent) => {
-
+            let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
-    bungeedisable() {
+            if (event.getTag() == MiaoMessage.CHANNEL) {
+                let origin = event.getSender().getAddress();
+                bungee.getServers().forEach(new BiConsumer({
+                    accept: (s, server) => {
+                        if (server.getAddress() != origin && server.getPlayers().size() > 0) {
+                            server.sendData(event.getTag(), event.getData())
+                        }
+                    }
+                }))
+            }
+        })
     }
 
     @cmd({ servers: ["bungee"] })
@@ -257,22 +265,6 @@ export class MiaoChat extends interfaces.Plugin {
         });
     }
 
-    @listener({ servers: ['bungee'] })
-    PluginMessageEvent(e: any) {
-        let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
-        let event = e as net.md_5.bungee.api.event.PluginMessageEvent
-        if (event.getTag() == MiaoMessage.CHANNEL) {
-            let origin = event.getSender().getAddress();
-            bungee.getServers().forEach(new BiConsumer({
-                accept: (s, server) => {
-                    if (server.getAddress() != origin && server.getPlayers().size() > 0) {
-                        server.sendData(event.getTag(), event.getData())
-                    }
-                }
-            }))
-        }
-    }
-
     initFormat(chatFormats: any[]) {
         chatFormats.forEach(chatFormat => {
             var chat_format_str = chatFormat.format;
@@ -308,7 +300,7 @@ export class MiaoChat extends interfaces.Plugin {
         chat_format.format_list.forEach((format) => {
             var style = this.styleFormats[format];
             if (style) {
-                tr.then(this.replace(player, style.text));
+                tr.then(this.replace(player, style.text.replace(/&(\w)/g, '§$1')));
                 if (style.hover) {
                     tr.tip(this.replace(player, style.hover.join('\n')));
                 }
@@ -333,7 +325,7 @@ export class MiaoChat extends interfaces.Plugin {
         });
         let json = tr.then(this.replace(player, plain)).json()
         this.sendChatAll(json)
-        this.Channel.send(player, MiaoMessage.CHANNEL, MiaoMessage.encode(json))
+        this.Channel?.send(player, MiaoMessage.CHANNEL, MiaoMessage.encode(json))
     }
 
     sendChatAll(json: string) {

packages/plugins/src/MiaoConsole.ts

@@ -16,7 +16,7 @@ const refList: Array<{ server: string, future: string }> = [
     { server: 'func_147137_ag', future: 'field_151274_e' }//catserver 1.12.2
 ]
 
-@plugin({ name: 'MiaoConsole', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+@plugin({ name: 'MiaoConsole', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
 export class MiaoConsole extends interfaces.Plugin {
     public static GlobalContainer: Container
     public static GlobalLogger: Console
@@ -98,6 +98,7 @@ export class MiaoConsole extends interfaces.Plugin {
     }
 
     injectMiaoDetect() {
+        let MiaoDetectHandler = getMiaoDetectHandler();
         this.pipeline.addFirst('miao_detect', new MiaoDetectHandler())
         this.container.bind(MessageHandle).toFunction(this.onmessage.bind(this))
         this.logger.info('Netty Channel Pipeline Inject MiaoDetectHandler Successful!')
@@ -132,111 +133,118 @@ export class MiaoConsole extends interfaces.Plugin {
     }
 
     sendResult(ctx: any, type: string, msg: string) {
+        let TextWebSocketFrame = getTextWebSocketFrame()
         ctx.writeAndFlush(new TextWebSocketFrame(`${type}${SPLIT_LINE}${msg}`))
     }
 }
 
-const ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter')
+function getMiaoDetectHandler() {
-const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
+    const ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter')
-const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
+    const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
-const MiaoDetectHandler = Java.extend(ChannelInboundHandlerAdapter, {
+    const MiaoDetectHandler = Java.extend(ChannelInboundHandlerAdapter, {
-    channelRead: (ctx: any, channel: any) => {
+        channelRead: (ctx: any, channel: any) => {
-        channel.pipeline().addFirst('miaowebsocket', new WebSocketHandler())
+            channel.pipeline().addFirst('miaowebsocket', new WebSocketHandler())
-        ctx.fireChannelRead(channel)
+            ctx.fireChannelRead(channel)
-    }
-})
-const TypeParameterMatcher = Java.type('io.netty.util.internal.TypeParameterMatcher')
-const DefaultHttpResponse = Java.type('io.netty.handler.codec.http.DefaultHttpResponse')
-const DefaultFullHttpResponse = Java.type('io.netty.handler.codec.http.DefaultFullHttpResponse')
-const HttpHeaders = Java.type('io.netty.handler.codec.http.HttpHeaders')
-const HttpVersion = Java.type('io.netty.handler.codec.http.HttpVersion')
-const HttpResponseStatus = Java.type('io.netty.handler.codec.http.HttpResponseStatus')
-const LastHttpContent = Java.type('io.netty.handler.codec.http.LastHttpContent')
-const HttpServerCodec = Java.type('io.netty.handler.codec.http.HttpServerCodec')
-const ChunkedWriteHandler = Java.type('io.netty.handler.stream.ChunkedWriteHandler')
-const HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAggregator')
-const WebSocketServerProtocolHandler = Java.type('io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler')
-const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')
-const FullHttpRequestMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.FullHttpRequest'))
-const File = Java.type('java.io.File')
-const Runnable = Java.type('java.lang.Runnable')
-const RandomAccessFile = Java.type('java.io.RandomAccessFile')
-const DefaultFileRegion = Java.type('io.netty.channel.DefaultFileRegion')
-const ChannelFutureListener = Java.type('io.netty.channel.ChannelFutureListener')
-const HttpRequestHandler = Java.extend(SimpleChannelInboundHandler, {
-    acceptInboundMessage: (msg: any) => {
-        return FullHttpRequestMatcher.match(msg)
-    },
-    channelRead0: (ctx: any, request: any) => {
-        if ('/ws' == request.getUri()) {
-            ctx.fireChannelRead(request.retain())
-        } else {
-            ctx.executor().execute(new Runnable({
-                run: () => {
-                    if (HttpHeaders.is100ContinueExpected(request)) {
-                        ctx.writeAndFlush(new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.CONTINUE))
-                    }
-                    let filename = request.getUri().split('?')[0].substr(1)
-                    let file = new File('/home/project/WebWorkSpace/MiaoConsole', filename || 'index.html')
-                    if (!file.exists() || !file.isFile()) {
-                        ctx.write(new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.NOT_FOUND))
-                        ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(ChannelFutureListener.CLOSE)
-                        return
-                    }
-                    let response = new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.OK)
-                    response.headers().set(HttpHeaders.Names.CONTENT_TYPE, "text/html charset=UTF-8")
-                    let raf = new RandomAccessFile(file, 'r')
-                    let keepAlive = HttpHeaders.isKeepAlive(request)
-                    if (keepAlive) {
-                        response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, file.length())
-                        response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE)
-                    }
-                    ctx.write(response)
-                    ctx.write(new DefaultFileRegion(raf.getChannel(), 0, raf.length()))
-                    let future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-                    if (!keepAlive) {
-                        future.addListener(ChannelFutureListener.CLOSE)
-                    }
-                }
-            }))
         }
-    }
+    })
-})
+    const TypeParameterMatcher = Java.type('io.netty.util.internal.TypeParameterMatcher')
-const TextWebSocketFrameMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.websocketx.TextWebSocketFrame'))
+    const DefaultHttpResponse = Java.type('io.netty.handler.codec.http.DefaultHttpResponse')
-const TextWebSocketFrameHandler = Java.extend(SimpleChannelInboundHandler, {
+    const DefaultFullHttpResponse = Java.type('io.netty.handler.codec.http.DefaultFullHttpResponse')
-    userEventTriggered: (ctx: any, evt: any) => {
+    const HttpHeaders = Java.type('io.netty.handler.codec.http.HttpHeaders')
-        if (evt == 'HANDSHAKE_COMPLETE') {
+    const HttpVersion = Java.type('io.netty.handler.codec.http.HttpVersion')
-            clients.push(ctx.channel())
+    const HttpResponseStatus = Java.type('io.netty.handler.codec.http.HttpResponseStatus')
-            MiaoConsole.GlobalLogger.console(`new client §b${ctx.channel().id()} §aconnected...`)
+    const LastHttpContent = Java.type('io.netty.handler.codec.http.LastHttpContent')
+    const HttpServerCodec = Java.type('io.netty.handler.codec.http.HttpServerCodec')
+    const ChunkedWriteHandler = Java.type('io.netty.handler.stream.ChunkedWriteHandler')
+    const HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAggregator')
+    const WebSocketServerProtocolHandler = Java.type('io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler')
+    const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')
+    const FullHttpRequestMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.FullHttpRequest'))
+    const File = Java.type('java.io.File')
+    const Runnable = Java.type('java.lang.Runnable')
+    const RandomAccessFile = Java.type('java.io.RandomAccessFile')
+    const DefaultFileRegion = Java.type('io.netty.channel.DefaultFileRegion')
+    const ChannelFutureListener = Java.type('io.netty.channel.ChannelFutureListener')
+    const HttpRequestHandler = Java.extend(SimpleChannelInboundHandler, {
+        acceptInboundMessage: (msg: any) => {
+            return FullHttpRequestMatcher.match(msg)
+        },
+        channelRead0: (ctx: any, request: any) => {
+            if ('/ws' == request.getUri()) {
+                ctx.fireChannelRead(request.retain())
+            } else {
+                ctx.executor().execute(new Runnable({
+                    run: () => {
+                        if (HttpHeaders.is100ContinueExpected(request)) {
+                            ctx.writeAndFlush(new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.CONTINUE))
+                        }
+                        let filename = request.getUri().split('?')[0].substr(1)
+                        let file = new File('/home/project/WebWorkSpace/MiaoConsole', filename || 'index.html')
+                        if (!file.exists() || !file.isFile()) {
+                            ctx.write(new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.NOT_FOUND))
+                            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(ChannelFutureListener.CLOSE)
+                            return
+                        }
+                        let response = new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.OK)
+                        response.headers().set(HttpHeaders.Names.CONTENT_TYPE, "text/html charset=UTF-8")
+                        let raf = new RandomAccessFile(file, 'r')
+                        let keepAlive = HttpHeaders.isKeepAlive(request)
+                        if (keepAlive) {
+                            response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, file.length())
+                            response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE)
+                        }
+                        ctx.write(response)
+                        ctx.write(new DefaultFileRegion(raf.getChannel(), 0, raf.length()))
+                        let future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
+                        if (!keepAlive) {
+                            future.addListener(ChannelFutureListener.CLOSE)
+                        }
+                    }
+                }))
+            }
         }
-    },
+    })
-    acceptInboundMessage: (msg: any) => {
+    const TextWebSocketFrameMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.websocketx.TextWebSocketFrame'))
-        return TextWebSocketFrameMatcher.match(msg)
+    const TextWebSocketFrameHandler = Java.extend(SimpleChannelInboundHandler, {
-    },
+        userEventTriggered: (ctx: any, evt: any) => {
-    channelRead0: (ctx: any, msg: any) => {
+            if (evt == 'HANDSHAKE_COMPLETE') {
-        MiaoConsole.GlobalContainer.get<any>(MessageHandle)(ctx, msg)
+                clients.push(ctx.channel())
-    }
+                MiaoConsole.GlobalLogger.console(`new client §b${ctx.channel().id()} §aconnected...`)
-})
+            }
-const WebSocketHandler = Java.extend(ChannelInboundHandlerAdapter, {
+        },
-    channelRead: function(ctx: any, msg: any) {
+        acceptInboundMessage: (msg: any) => {
-        msg.markReaderIndex()
+            return TextWebSocketFrameMatcher.match(msg)
-        let message: string = msg.toString(CharsetUtil.UTF_8)
+        },
-        let channel = ctx.channel()
+        channelRead0: (ctx: any, msg: any) => {
-        let pipeline = channel.pipeline()
+            MiaoConsole.GlobalContainer.get<any>(MessageHandle)(ctx, msg)
-        if (message.indexOf('HTTP/1.1') > 0) {
-            pipeline.names().forEach(f => {
-                if (f == 'miaowebsocket' || f.indexOf('DefaultChannelPipeline') > -1) { return }
-                pipeline.remove(f)
-            })
-            pipeline.addLast('http', new HttpServerCodec())
-            pipeline.addLast('chunk', new ChunkedWriteHandler())
-            pipeline.addLast('httpobj', new HttpObjectAggregator(64 * 1024))
-            pipeline.addLast('http_request', new HttpRequestHandler())
-            pipeline.addLast('websocket', new WebSocketServerProtocolHandler("/ws"))
-            pipeline.addLast('websocket_handler', new TextWebSocketFrameHandler())
         }
-        pipeline.remove('miaowebsocket')
+    })
-        msg.resetReaderIndex()
+    const WebSocketHandler = Java.extend(ChannelInboundHandlerAdapter, {
-        ctx.fireChannelRead(msg)
+        channelRead: function(ctx: any, msg: any) {
-    }
+            msg.markReaderIndex()
-})
+            let message: string = msg.toString(CharsetUtil.UTF_8)
+            let channel = ctx.channel()
+            let pipeline = channel.pipeline()
+            if (message.indexOf('HTTP/1.1') > 0) {
+                pipeline.names().forEach(f => {
+                    if (f == 'miaowebsocket' || f.indexOf('DefaultChannelPipeline') > -1) { return }
+                    pipeline.remove(f)
+                })
+                pipeline.addLast('http', new HttpServerCodec())
+                pipeline.addLast('chunk', new ChunkedWriteHandler())
+                pipeline.addLast('httpobj', new HttpObjectAggregator(64 * 1024))
+                pipeline.addLast('http_request', new HttpRequestHandler())
+                pipeline.addLast('websocket', new WebSocketServerProtocolHandler("/ws"))
+                pipeline.addLast('websocket_handler', new TextWebSocketFrameHandler())
+            }
+            pipeline.remove('miaowebsocket')
+            msg.resetReaderIndex()
+            ctx.fireChannelRead(msg)
+        }
+    })
+    return MiaoDetectHandler;
+}
+
+function getTextWebSocketFrame() {
+    return Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
+}

packages/plugins/src/MiaoPluginManager.ts

@@ -1,26 +1,97 @@
+/// <reference types="@ms/types" />
+
+import { task, server } from "@ms/api";
+import { inject } from "@ms/container";
 import { plugin, interfaces, cmd } from "@ms/plugin";
 
 import http from '@ms/common/dist/http'
+import * as fs from '@ms/common/dist/fs'
 
 @plugin({ name: 'MiaoPluginManager', prefix: 'MPM', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class MiaoPluginManager extends interfaces.Plugin {
+    @inject(server.Server)
+    private server: server.Server;
+    @inject(task.TaskManager)
+    private taskManager: task.TaskManager;
+
+    private serverPluginsFolder: string;
+    private resourceAPIs = new Map<string, ResourceAPI>()
+
+    enable() {
+        this.resourceAPIs.set("spigot", new SpigotResourceAPI())
+        this.resourceAPIs.set("bukkit", new BukkitResourceAPI())
+    }
+
     @cmd()
     mpman(sender: any, command: string, args: string[]) {
 
     }
     @cmd()
     bktman(sender: any, command: string, args: string[]) {
-        switch (args[0]) {
+        this.main(sender, "bukkit", args[0], args.slice(1))
-            case "s":
+    }
-            case "search":
+    @cmd()
-                if (args[1]) {
+    sptman(sender: any, command: string, args: string[]) {
-                    let result = http.get('https://servermods.forgesvc.net/servermods/projects?search=' + args[1])
+        this.main(sender, "spigot", args[0], args.slice(1))
+    }
+
+    main(sender: any, target: string, command: string, args: string[]) {
+        let api = this.resourceAPIs.get(target);
+        this.taskManager.create(() => {
+            switch (command) {
+                case "s":
+                case "search":
+                    this.logger.sender(sender, `§6正在从 §a${api.name()} §6搜索插件 §b${args[0]} §6请稍候...`)
+                    let result = api.search(args[0])
                     for (let item of result) {
-                        this.logger.sender(sender, "ID:", item.id, "名称:", item.name, JSON.stringify(item))
+                        this.logger.sender(sender, "ID:", item.id, "名称:", item.name)
                     }
-                }
+                    break;
-                break;
+                case "d":
-            default:
+                case "download":
-        }
+                    http.download(api.download(Number(args[0])), fs.concat(this.server.getPluginsFolder(), args[1] + '.jar'))
+                    break;
+                default:
+            }
+        }).async().submit();
     }
 }
+
+class Resource {
+    id: number;
+    name: string;
+}
+
+interface ResourceAPI {
+    name(): string;
+    search(name: string): Resource[];
+    download(id: number): string;
+}
+
+class BukkitResourceAPI implements ResourceAPI {
+    private host = "https://servermods.forgesvc.net/servermods";
+    name() {
+        return "BukkitDev"
+    }
+    search(name: string) {
+        return http.get(`${this.host}/projects?search=${name}`);
+    }
+    download(id: number) {
+        let list = JSON.parse(http.get(`${this.host}/files?projectIds=${id}`));
+        let lastest = list[list.lenght - 1];
+        return lastest.downloadUrl;
+    }
+}
+
+class SpigotResourceAPI implements ResourceAPI {
+    private host = "https://api.spiget.org/v2";
+    name() {
+        return "SpigotMC"
+    }
+    search(name: string) {
+        return http.get(`${this.host}/search/resources/${name}`);
+    }
+    download(id: number) {
+        return `${this.host}/resources/${id}/download`
+    }
+}

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/sponge",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,12 +24,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/api": "^0.3.1",
-        "@ms/common": "^0.3.0",
+        "@ms/common": "^0.3.1",
-        "@ms/container": "^0.3.0",
+        "@ms/container": "^0.3.1"
-        "@ms/types": "^0.3.0"
     }
 }

packages/sponge/src/channel.ts

@@ -25,7 +25,7 @@ export class SpongeChannel extends channel.Channel {
         }
         let innerListener = new RawDataListener({
             handlePayload: (/* ChannelBuf */ data: any, /**RemoteConnection */ connection: any, /**Platform.Type */ side: any) => {
-                listener(data.readBytes(data.available()))
+                listener(data.readBytes(data.available()), { data, connection, side })
             }
         })
         this.channelMap.get(channel).addListener(innerListener);

packages/sponge/src/server.ts

@@ -1,11 +1,21 @@
 import { server } from '@ms/api'
 import { provideSingleton } from '@ms/container';
 
-let Sponge = org.spongepowered.api.Sponge;
+import * as fs from '@ms/common/dist/fs'
-let TextSerializers = org.spongepowered.api.text.serializer.TextSerializers;
+
+const Sponge = org.spongepowered.api.Sponge;
+const TextSerializers = org.spongepowered.api.text.serializer.TextSerializers;
+const URL = Java.type("java.net.URL");
+const File = Java.type("java.io.File");
 
 @provideSingleton(server.Server)
 export class SpongeServer implements server.Server {
+    private pluginsFolder: string;
+
+    constructor() {
+        this.pluginsFolder = new File(base.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getParentFile().getCanonicalPath()
+    }
+
     getPlayer(name: string) {
         return Sponge.getServer().getPlayer(name).orElse(null)
     }
@@ -30,6 +40,12 @@ export class SpongeServer implements server.Server {
     dispatchConsoleCommand(command: string): boolean {
         return Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command).getQueryResult()
     }
+    getPluginsFolder(): string {
+        return this.pluginsFolder;
+    }
+    getNativePluginManager() {
+        return Sponge.getPluginManager() as any;
+    }
     sendJson(sender: string | any, json: string): void {
         if (typeof sender === "string") {
             sender = this.getPlayer(sender)

packages/types/dist/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference path="./typings/bukkit/index.d.ts" />
+/// <reference path="./typings/bungee/index.d.ts" />
+/// <reference path="./typings/nukkit/index.d.ts" />
+/// <reference path="./typings/sponge/index.d.ts" />

packages/types/package.json

@@ -1,7 +1,6 @@
 {
-    "private": true,
     "name": "@ms/types",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript types package",
     "keywords": [
         "miaoscript",
@@ -13,6 +12,7 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "types": "dist/index.d.ts",
     "publishConfig": {
         "registry": "https://repo.yumc.pw/repository/npm-hosted/"
     }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/websocket",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,11 +24,10 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.8.2"
+        "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.3.0",
+        "@ms/nashorn": "^0.3.1"
-        "@ms/common": "^0.3.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/websocket/src/index.ts

@@ -1 +1 @@
-import '@ms/nashorn'
+/// <reference types="@ms/nashorn" />

packages/websocket/src/netty/httprequest.ts

@@ -1,5 +1,3 @@
-/// <reference types="@ms/ployfill" />
-
 const TypeParameterMatcher = Java.type('io.netty.util.internal.TypeParameterMatcher')
 const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')
 const FullHttpRequestMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.FullHttpRequest'))

packages/websocket/src/netty/text_websocket_frame.ts

@@ -1,5 +1,3 @@
-/// <reference types="@ms/ployfill" />
-
 const TypeParameterMatcher = Java.type('io.netty.util.internal.TypeParameterMatcher')
 const TextWebSocketFrameMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.websocketx.TextWebSocketFrame'))
 const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')

packages/websocket/src/netty/websocket.ts

@@ -1,5 +1,3 @@
-import '@ms/api'
-
 const MiaoWebSocket = 'miaowebsocket'
 const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
 const ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter')