v0.6.5

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

.gitpod.Dockerfile

@@ -0,0 +1,10 @@
+FROM gitpod/workspace-full
+                    
+USER gitpod
+
+# Install custom tools, runtime, etc. using apt-get
+# For example, the command below would install "bastet" - a command line tetris clone:
+#
+# RUN sudo apt-get -q update && #     sudo apt-get install -yq bastet && #     sudo rm -rf /var/lib/apt/lists/*
+#
+# More information: https://www.gitpod.io/docs/config-docker/

.gitpod.yml

@@ -0,0 +1,5 @@
+tasks:
+  - init: yarn && yarn bs && yarn build
+    command: yarn watch
+# image:
+#   file: .gitpod.Dockerfile

doc/MCBBS.MD

@@ -1,478 +1,6 @@
 - 构建状态 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square)](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/)
-- 当前版本 ![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=version&status=0.1.0beta&color=darkturquoise)
-- 下载地址 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=download&status=MiaoScript&color=darkgreen)](http://w.yumc.pw/free.html#MiaoScript-download)
-- 为了方便阅读 我对帖子进行了分页 请点击目录阅读!
-
-### 更新日志
-
-- 2020-03-03
-  - 发布 `v0.3.1` 版本
-- 2020-03-02
-  - 杂项 更新文档以及示例插件
-- 2020-03-01
-  - 修复 多个包之间的循环依赖问题
-  - 优化 `@ms/types` 的引用逻辑
-- 2020-02-29
-  - 更新 `TypeScript` 版本为 `3.8.3`
-  - 新增 `@ms/common` 的 `http` 下载功能
-- 2020-02-27
-  - 发布 `v0.3.0` 版本
-  - 新增 `@ms/i18n` 国际化包的支持
-  - 修复 `@ms/plugin` 对 `servers` 相关处理异常
-  - 优化 `@ms/api` 的 `Channel` 处理增加 扩展原始数据
-- 2020-02-26
-  - 优化 `@ms/container` 使用 `autoProvide` 自动注入依赖
-- 2020-02-25
-  - 修复 `@ms/api` 对 `evnet` 的类型处理异常
-- 2020-02-24
-  - 发布 `v0.2.1` 版本
-  - 完善 对 `Nukkit` 端的支持
-  - 新增 `@ms/api` 通道相关的支持
-- 2020-02-23
-  - 新增 `@ms/nukkit` 包 对 `Nukkit` 端的支持
-  - 新增 `@ms/type` 的 `nukkit` 类型自动补全
-- 2020-02-22
-  - 发布 `v0.2.0` 版本
-  - 新增 `@ms/plugin` 的 `@config` 注解 目前支持 `json` `yml` 格式的配置
-- 2020-02-15
-  - 新增 `SourceMap` 的支持 用于跟踪源代码行数
-- 2020-02-09
-  - 新增 `core-js` 用于支持大部分新ES语法
-- 2020-01-31
-  - 优化 `@ms/ployfill` 全局处理
-- 2020-01-15
-  - 新增 `@ms/bungee` 包 对 `BungeeCord` 端的支持
-- 2020-01-14
-  - 新增 `@ms/type` 的 `bungee` 类型自动补全
-- 2019-11-10
-  - 新增 `WebSocket` 的注入支持
-- 2019-11-07
-  - 新增 `@ms/type` 的 `jdk` 类型自动补全
-- 2019-09-27
-  - 新增 `CatServer` MOD端的支持
-- 2019-09-25
-  - 新增 `@ms/type` 的 `sponge` 类型自动补全
-- 2019-09-24
-  - 新增 `@ms/type` 的 `bukkit` 类型自动补全
-
-## 插件简介
-
-- 此插件可以实现跨端使用 `TypeScript` 开发 脚本插件
-- 目前已经兼容 `Spigot` `Sponge` `Paper` `CatServer` `BungeeCord` `Nukkit`
-- 后续计划兼容 暂无
-
-## 起源 (可以略过)
-
-### 简介
-
-> 这个坑是我自己刨的 但是发现坑太大 需要更多的人一起填
-
-### 起源
-
-- 诞生于 `2016年08月25日` 这是 Git 上的第一个提交 具体啥时候我也忘了
-- 起初 `MiaoScript` 只是用于服务器其他插件的变量执行 并且依赖于PAPI(不知道是啥的自己百度)
-  - 比如 [`MiaoMenu`](http://w.yumc.pw/zc/MiaoMenu.html) 的部分复杂脚本 
-  - 比如 [`MiaoChat`](http://mcbbs.net/thread-631240-1-1.html) 的聊天变量
-- 突然有一天 圈内的大佬 `QSB` @qiu1995 过来找我 说能不能用脚本监听玩家的事件
-  - PS: 这货自从用过 `DeluxeMenu` 之后就喜欢上了用JS写菜单
-- 当初感觉没啥问题 就出了第一个简易的 `MiaoScript` 版本 还是用 yml 做的配置文件
-- 但是由于设计 BukkitAPI 等内容 对Java要求太高 后来 邱也弃坑了 我也弃坑了
-
-### 刨坑
-
-- 时隔多年(也就一年) 看到了Sponge的兴起 (估摸着是MCPC系列的MOD端都弃坑了)
-- 同时 这期间 收到很多腐竹的单子 但是又是非常基础的东西
-  - 比如 开服给玩家发一条消息啦
-  - 比如 修改玩家某些数据啦
-- 这些东西实际上也就几行代码的事情
-- 同时 很多想入坑 插件开发 但是又有一些被卡死在环境搭建上
-  - 比如 `Bukkit` 需要 `BukkitAPI`
-  - `Sponge` 需要 `SpongeAPI` 如果涉及 `MOD` 还要 `Forge` 环境
-  - 再或者 BungeeCord 的插件开发 我也是经常懒得搞
-- 当然 最主要的是 某个 咕咕咕的群 天天有人问我 喵系插件能不能支持 Sponge
-  - 内心当然是拒绝的 现在要上班养老婆孩子(咳咳 不要以为我是大叔 我也才刚毕业而已) 那里还有时间免费给你们写插件
-- 于是乎 我又想起了当初的 `MiaoScript`
-- 突发奇想 一个插件的雏形出现在我的脑海中
-  - 可以兼容多种服务器
-  - 不需要开发环境 有记事本就可以开发
-  - 语法要简单 比如 JavaScript
-  - 能够自动搜索安装依赖(毕竟很多人天天问我为何喵系插件跑不起来 都是缺少PAPI)
-  - 能够不重启更新插件(当然得保证代码安全的前提下)
-- 在 2017年9月14号(距离 第一个版本正式版发布(2016-09-21) 相差一年整)
-- 一个全新的 `MiaoScript` 诞生了
-  - Java部分代码 只有一个启动类
-  - 核心全部由 JS 编写
-  - 兼容 `CommonJS` 规范
-  - 实时重载
-- 2019年9月14号 emm 咸鱼2年之后
-  - TypeScript 重构版本横空出世
-  - 只保留 基础Java启动类 三个环境初始化js
-  - 完整的服务端Java类自动补全
-  - 全新的 IOC容器 注入功能
-  - 注解式 注册命令 注册事件
-- 2020年3月2日 发布0.3.0版本
-  - 支持 Bukkit Nukkit BungeeCord Sponge
-
-### 进展
-
-- [项目发布](https://git.yumc.pw/502647092/MiaoScript/releases)
-- [项目代码](https://git.yumc.pw/502647092/MiaoScript)
-- [项目脑图](http://naotu.baidu.com/file/293b9a0fc7cef23c69de81c55e3617d5?token=1eee8fd759198eb7)
-
-### 规划
-
-- 初期只会支持JS类型的插件开发
-- 二期会出一个建议版本的MS脚本 可以用简单的语法实现简单的功能
-- 各个层级会有依赖控制 比如 `MS脚本 => JS脚本 => 调用Java原生API`
-
-## 框架设计 
-
-### MiaoScript TS 实现
-
-项目具体实现 由 TypeScript 进行编写 然后编译至 `es5` 用于兼容 Java8 的 `Nashorn`
-
-### Project Structure
-
-```txt
-└─packages
-    ├─api         全平台兼容的接口
-    ├─core        核心代码 用于引导加载
-    ├─common      公共类库代码 例如 http reflect 模块
-    ├─client      NodeJS的Minecraft客户端 用于调试插件
-    ├─container   IOC容器 用于注入具体实现
-    ├─ployfill    Nashorn 的一些自定义增强
-    ├─nashorn     Nashorn 的类型定义
-    ├─bungee      BungeeCordAPI内部实现
-    ├─bukkit      BukkitAPI内部实现
-    ├─sponge      SpongeAPI内部实现
-    ├─nukkit      NukkitAPI内部实现
-    ├─ployfill    JS环境的相关环境补全
-    ├─plugin      插件管理器
-    ├─websocket   Netty的WebSocket注入
-    ├─type        Java的类型定义
-    |   ├─bungee  BungeeCord类型定义
-    |   ├─bukkit  Bukkit类型定义
-    |   ├─sponge  Sponge类型定义
-    |   └─nukkit  Nukkit类型定义
-    └─plugins     这里当然是插件啦
-        ├─bungee  只兼容BungeeCord的插件
-        ├─bukkit  只兼容Bukkit的插件
-        ├─sponge  只兼容Sponge的插件
-        └─nukkit  只兼容Nukkit的插件
-```
-
-详细的内容就不逼逼了 自己看代码吧
-
-Github: https://github.com/circlecloud/ms
-YUMC: https://git.yumc.pw/circlecloud/ms
-
-## 插件开发基础
-
-### 开发IDE (推荐VSCode或者MiaoScrit在线IDE)
-
-如果只是简单的开发 你可用记事本 (但是没有任何补全和错误提示)
-
-### 开发环境准备(针对高级用户)
-
-- 安装 `NodeJS` 和 `Yarn`
-- 拉取代码
-  - `git clone https://github.com/circlecloud/ms.git`
-- 进入目录 `ms`
-- 安装 npm 包
-  - `yarn`
-- 建立内部依赖链接
-  - `yarn bs`
-- 编译一次生成对应的类库
-  - `yarn build`
-- 编译插件
-  - `yarn build:plugins`
-
-### 直接在 MiaoScript Online WebIDE 开发
-
-填坑中...
-
-## 基本插件框架
-
-### HelloWorld 示例插件
-
-先来一个 `HelloWorld.ts` 插件示范!
-
-```ts
-/// <reference types="@ms/types" />
-
-import { server } from '@ms/api';
-import { inject } from '@ms/container';
-import { plugin, interfaces, cmd, listener, tab } from '@ms/plugin'
-
-@plugin({ name: 'HelloWorld', version: '1.0.0', author: 'MiaoWoo', source: __filename })
-export class HelloWorld extends interfaces.Plugin {
-    @inject(server.Server)
-    private Server: server.Server
-    @config()
-    private config = {
-        version: 1.0.0
-    }
-
-    load() {
-        this.logger.log('Plugin load from MiaoScript Plugin System...');
-    }
-    enable() {
-        this.logger.log('Plugin enable from MiaoScript Plugin System...');
-    }
-    disable() {
-        this.logger.log('Plugin disable from MiaoScript Plugin System...');
-    }
-
-    bukkitload() {
-        this.logger.log('Load When ServerType is Bukkit!')
-    }
-    bukkitenable() {
-        this.logger.log('Enable When ServerType is Bukkit!')
-    }
-    bukkitdisable() {
-        this.logger.log('Disable When ServerType is Bukkit!')
-    }
-
-    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!')
-    }
-
-    bungeeload() {
-        this.logger.log('Load When ServerType is BungeeCord!')
-    }
-    bungeeenable() {
-        this.logger.log('Enable When ServerType is BungeeCord!')
-    }
-    bungeedisable() {
-        this.logger.log('Disable When ServerType is BungeeCord!')
-    }
-
-    nukkitload() {
-        this.logger.log('Load When ServerType is Nukkit!')
-    }
-    nukkitenable() {
-        this.logger.log('Enable When ServerType is Nukkit!')
-    }
-    nukkitdisable() {
-        this.logger.log('Disable When ServerType is Nukkit!')
-    }
-
-    @cmd()
-    hello(sender: any, command: string, args: string[]) {
-        this.logger.log(sender, command, args);
-        sender.sendMessage(JSON.stringify({ command, ...args }))
-    }
-
-    @tab()
-    tabhello(_sender: any, _command: string, _args: string[]) {
-        return ['world']
-    }
-
-    // bukkit nukkit 大部分API神似 可以直接用
-    @listener({ servers: ['bukkit', 'nukkit'] })
-    PlayerJoin(event: org.bukkit.event.player.PlayerJoinEvent) {
-        let plyaer = event.getPlayer();
-        this.logger.console(`§cBukkit §aPlayerJoinEvent: §b${plyaer.getName()}`)
-        setTimeout(() => this.sendWelcome(plyaer), 10);
-    }
-
-    @listener({ servers: ['sponge'] })
-    ClientConnectionEvent$Join(event: org.spongepowered.api.event.network.ClientConnectionEvent.Join) {
-        this.logger.console(`§cSponge §aClientConnectionEvent.Join: §b${event.getTargetEntity().getName()}`)
-        setTimeout(() => this.sendWelcome(event.getTargetEntity()), 10);
-    }
-
-    private sendWelcome(player: any) {
-        this.logger.sender(player, `§a欢迎来到 §bMiaoScript §a的世界!`)
-        this.logger.sender(player, `§6当前版本: §c${this.Server.getVersion()}`)
-    }
-
-    @listener({ servers: ['bungee'] })
-    ServerConnected(e: any) {
-        let event = e as net.md_5.bungee.api.event.ServerConnectedEvent
-        this.logger.console(`§cBungeeCord §aServerConnectedEvent: §b${event.getPlayer().getDisplayName()}`)
-        setTimeout(() => this.logger.sender(event.getPlayer(), `§a欢迎来到 §bMiaoScript §a的世界 §6来自 §cBungeeCord §6的问候!`), 10);
-    }
-}
-```
-
-- 进入 `ms`目录
-- 执行编译 `yarn build:plugins`
-- 从 `packages/plugins/dist` 中复制 `HelloWorld.js` 和 `HelloWorld.js.map`(可选 用于显示插件原有行数) 文件 到对应的插件目录
-  - Bungee: plugins/MiaoScript/plugins/
-  - Bukkit: plugins/MiaoScript/plugins/
-  - Sponge: config/miaoscript/plugins/
-  - Nukkit: plugins/MiaoScript/plugins/
-- 重载 `MiaoScript`
-- 打开客户端进入游戏 预览一下效果
-- 从 Spigot 服务端进入
-![image.png](https://i.loli.net/2019/09/22/2BZuwF65WV1xGnv.png)
-![image.png](https://i.loli.net/2019/09/22/m2CftwbalnXsxvg.png)
-- 从 Sponge 服务端进入
-![image.png](https://i.loli.net/2019/09/22/QD1jrShtJpPXyVl.png)
-![image.png](https://i.loli.net/2019/09/22/GzLFVC3sjAJ4obm.png)
-
-## 注册插件
-
-- 从上面的示例可以看到 一个插件 通过注解 `@plugin` 即可启动
-- 此注解接受一个 `PluginMetadata` 对象 定义如下
-```ts
-export interface PluginMetadata {
-    /**
-        * 插件名称
-        */
-    name: string;
-    /**
-     * 支持的服务器列表 为空则代表所有
-     */
-    servers?: string[];
-    /**
-        * 前缀
-        */
-    prefix?: string;
-    /**
-        * 插件版本
-        */
-    version: string;
-    /**
-        * 插件版本
-        */
-    author: string | string[];
-    /**
-        * 插件源文件 必须指定为 __filename
-        */
-    source: string;
-    /**
-        * 插件本体
-        */
-    target?: any;
-}
-```
-
-### 插件生命周期
-
-MiaoScript 的生命周期遵循了 Bukkit 的生命周期
-
-MiaoScript 针对不同的服务端 提供了扩展的周期
-以服务端类型开头阶段名结束 例如 `bukkitload` `spongeenbale` `bungeedisable`
-扩展的生命周期只会在特定的服务器执行
-
-### load 加载阶段
-
-此阶段通常用于初始化基础配置 数据库链接等
-某些对外提供功能的插件 需要在此阶段初始化完成
-
-### enable 启动阶段
-
-此阶段通常用于注册命令 注册事件等
-由于命令和事件 MiaoScript 已经托管了 所以开发者可以直接用注解实现
-
-### disable 关闭阶段
-
-此阶段通常用于注销命令 注销事件等
-由于命令和事件 MiaoScript 已经托管了 所以开发者可以直接用注解实现
-
-## 注册命令/补全
-
-### cmd 命令
-
-命令 就是玩家在Minecraft中执行命令 下面是一个示例的命令
-
-- 命令是一个 `function` 通过 `@cmd` 注解注册
-- 由于不同的服务端有不同的逻辑 所以支持通过 `servers` 指定注册的类型 加上 `!` 代表不注册 不指定 `servers` 则注册所有的类型
-- 命令注册时默认使用方法名称为命令名称 当前你可以传入 name 参数指定命令名称 例如 `{name: 'test'}` 
-- 接受三个参数 `sender: any, command: string, args: string[]`
-- 分别代表 命令发送者 命令名称 命令参数
-
-```ts
-@cmd({ servers: ["bukkit", "sponge", "!bungee"] })
-hello(sender: any, command: string, args: string[]) {
-    this.logger.log(sender, command, args);
-    this.logger.sender(sender, JSON.stringify({ command, args }));
-}
-```
-
-### tab 补全
-
-补全就是 玩家在Minecraft执行命令时 使用 Tab键 补全
-
-- 补全是一个 `function` 一般以 `tab` 开头 需要补全的命令结尾 通过 `@tab` 注解注册
-- 补全注册时默认使用方法名称为补全名称 当前你可以传入 name 参数指定命令名称 例如 `{name: 'test'}` 
-- 接受三个参数 `sender: any, command: string, args: string[]`
-- 分别代表 命令发送者 命令名称 命令参数
-
-_注意: 当补全命令未注册时 补全无效! 且补全和命令必须在同一个Class内!_
-
-```ts
-@tab()
-tabhello(_sender: any, _command: string, _args: string[]) {
-    return ['world']
-}
-```
-
-## 监听事件
-
-事件是指 Minecraft 中发生的各种事情
-
-- 监听事件是一个 `function` 通过 `@listener` 注册
-- 由于不同的服务端有不同的逻辑 所以支持通过 `servers` 指定注册的类型 加上 `!` 代表不注册 不指定 `servers` 则注册所有的类型
-- 事件名称默认为方法名称
-  - 所有类型服务端的事件 MiaoScript 都会进行一次映射 方便使用
-  - 例如 `PlayerJoinEvent` 会映射为 `PlayerJoinEvent, playerjoinevent, playerjoin` 等
-  - 一般规则就是 类名直接小写 如果遇到子类 则保留 `$`
-  - 例如 `ClientConnectionEvent.Join` 会映射为 `clientconnectionevent$join`
-- 事件的注可以传入 `servertype` 来指定这个事件类型的服务端加载 默认是所有服务端都加载
-- 事件监听方法的第一个参数就是本次事件的具体内容 (这里就需要自己去查询对应的JavaDoc了)
-
-```ts
-// bukkit nukkit 大部分API神似 可以直接用
-@listener({ servers: ['bukkit', 'nukkit'] })
-PlayerJoin(event: org.bukkit.event.player.PlayerJoinEvent) {
-    let plyaer = event.getPlayer();
-    this.logger.console(`§cBukkit §aPlayerJoinEvent: §b${plyaer.getName()}`)
-    setTimeout(() => this.sendWelcome(plyaer), 10);
-}
-
-@listener({ servers: ['sponge'] })
-ClientConnectionEvent$Join(event: org.spongepowered.api.event.network.ClientConnectionEvent.Join) {
-    this.logger.console(`§cSponge §aClientConnectionEvent.Join: §b${event.getTargetEntity().getName()}`)
-    setTimeout(() => this.sendWelcome(event.getTargetEntity()), 10);
-}
-
-private sendWelcome(player: any) {
-    this.logger.sender(player, `§a欢迎来到 §bMiaoScript §a的世界!`)
-    this.logger.sender(player, `§6当前版本: §c${this.Server.getVersion()}`)
-}
-
-@listener({ servers: ['bungee'] })
-ServerConnected(e: any) {
-    let event = e as net.md_5.bungee.api.event.ServerConnectedEvent
-    this.logger.console(`§cBungeeCord §aServerConnectedEvent: §b${event.getPlayer().getDisplayName()}`)
-    setTimeout(() => this.logger.sender(event.getPlayer(), `§a欢迎来到 §bMiaoScript §a的世界 §6来自 §cBungeeCord §6的问候!`), 10);
-}
-```
-
-## 配置文件
-
-配置文件 默认读取的是 `MiaoScript根目录/plugins/插件名称/配置名称.配置格式`
-
-例如下面文件 默认处理的是 `plugins/MiaoScript/plugins/HelloWorld/config.yml`
-
-```ts
-@config()
-private config = {
-    version: 1.0.0
-}
-```
-
-## 插件列表
-
-暂无
-
-> 注意: 一楼的列表是老版本的 新版本无法加载!
+- 当前版本 ![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=VERSION&status=0.1.0beta&color=darkturquoise)
+- 下载地址 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=DOWNLOAD&color=darkgreen)](http://w.yumc.pw/free.html#MiaoScript-download)
+- 更新日志 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=CHANGELOG&color=green)](https://docs.yumc.pw/MiaoScript/CHANGELOG.html)
+- 安装文档 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=MiaoDoc%20USER&color=red)](https://docs.yumc.pw/MiaoScript/1-user/1.1-check-env.html)
+- 开发文档 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=MiaoDoc%20DEVELOP&color=darkred)](https://docs.yumc.pw/MiaoScript/2-develop/1.1-check-env.html)

lerna.json

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

package.json

@@ -9,8 +9,8 @@
         "bs": "lerna bootstrap",
         "clean": "lerna run clean",
         "watch": "lerna run watch --parallel",
-        "build": "lerna run build --scope=\"@ms/!(plugins)\"",
-        "build:plugins": "lerna run build --scope=\"@ms/plugins\"",
+        "build": "lerna run build --scope=\"@ccms/!(plugins)\"",
+        "build:plugins": "lerna run build --scope=\"@ccms/plugins\"",
         "ug": "yarn upgrade-interactive --latest",
         "lp": "lerna publish"
     },

packages/api/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/api",
-    "version": "0.4.0",
+    "name": "@ccms/api",
+    "version": "0.6.5",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -22,11 +19,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/container": "^0.4.0",
-        "@ms/ployfill": "^0.4.0",
+        "@ccms/container": "^0.6.0",
+        "@ccms/ployfill": "^0.6.5",
+        "base64-js": "^1.3.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
+        "@types/base64-js": "^1.2.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.8.3"

packages/api/src/channel.ts

@@ -1,4 +1,4 @@
-import { injectable } from "@ms/container";
+import { injectable } from "@ccms/container";
 
 export namespace channel {
     /**

packages/api/src/command.ts

@@ -1,5 +1,5 @@
-import i18n from '@ms/i18n'
-import { injectable } from "@ms/container";
+import i18n from '@ccms/i18n'
+import { injectable } from "@ccms/container";
 
 export namespace command {
     @injectable()
@@ -41,9 +41,11 @@ export namespace command {
                 try {
                     return executor(sender, command, Java.from(args));
                 } catch (ex) {
-                    console.i18n("ms.api.command.execute.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
+                    console.i18n("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
                     console.ex(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)])
+                    if (sender.name != 'CONSOLE') {
+                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                    }
                     return true;
                 }
             }

packages/api/src/console.ts

@@ -1,10 +1,9 @@
-import i18m from '@ms/i18n'
+import i18m from '@ccms/i18n'
 import { SourceMapBuilder } from 'source-map-builder'
+import * as base64 from 'base64-js'
 
 const Arrays = Java.type('java.util.Arrays');
 const Level = Java.type('java.util.logging.Level');
-const JavaString = Java.type('java.lang.String');
-const Files = Java.type('java.nio.file.Files');
 const Paths = Java.type('java.nio.file.Paths');
 const ignoreLogPrefix = ['java.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.'];
 
@@ -23,6 +22,7 @@ export class MiaoScriptConsole implements Console {
     Console: NodeJS.ConsoleConstructor;
 
     private sourceMaps: { [key: string]: SourceMapBuilder } = {};
+    private sourceFileMaps: { [key: string]: string } = {};
     private _name: string = '';
     private _level: LogLevel = LogLevel.INFO;
 
@@ -83,7 +83,7 @@ export class MiaoScriptConsole implements Console {
         this.console(i18m.translate(name, param))
     }
     object(obj) {
-        for (var i in obj) {
+        for (const i in obj) {
             this.info(i, '=>', obj[i])
         }
     }
@@ -93,23 +93,31 @@ export class MiaoScriptConsole implements Console {
     readSourceMap(fileName: string, lineNumber: number) {
         try {
             if (fileName.endsWith('js')) {
-                var file = Paths.get(fileName + '.map');
                 if (this.sourceMaps[fileName] === undefined) {
-                    if (file.toFile().exists()) {
-                        var sourceMapObj = JSON.parse(new JavaString(Files.readAllBytes(file), "UTF-8"))
-                        this.sourceMaps[fileName] = new SourceMapBuilder(sourceMapObj)
-                    } else {
-                        this.sourceMaps[fileName] = null;
+                    this.sourceMaps[fileName] = null
+                    let sourceLine = base.read(fileName).split('\n');
+                    let lastLine = sourceLine[sourceLine.length - 1]
+                    if (lastLine.startsWith('//# sourceMappingURL=')) {
+                        let sourceContent = null;
+                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1];
+                        if (sourceMappingURL.startsWith('data:application/json;base64,')) {
+                            sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
+                        } else if (sourceMappingURL.startsWith('http')) {
+                            // TODO
+                        } else {
+                            let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile();
+                            if (file.exists()) { sourceContent = base.read(file) }
+                        }
+                        if (sourceContent) {
+                            this.sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
+                            this.sourceFileMaps[fileName] = Paths.get(fileName, '..', this.sourceMaps[fileName].sources[0]).toFile().getCanonicalPath();
+                        }
                     }
                 }
                 if (this.sourceMaps[fileName]) {
-                    var sourceMapping = this.sourceMaps[fileName].getSource(lineNumber, 25, true);
-                    if (sourceMapping) {
-                        if (lineNumber != sourceMapping.mapping.sourceLine) {
-                            fileName = fileName.replace(".js", ".ts");
-                            lineNumber = sourceMapping.mapping.sourceLine;
-                        }
-                    }
+                    let sourceMapping = this.sourceMaps[fileName].getSource(lineNumber, 25, true, true);
+                    fileName = this.sourceFileMaps[fileName]
+                    if (sourceMapping && lineNumber != sourceMapping.mapping.sourceLine) { lineNumber = sourceMapping.mapping.sourceLine; }
                 }
             }
         } catch (error) {
@@ -121,26 +129,27 @@ export class MiaoScriptConsole implements Console {
         }
     }
     stack(ex: Error): string[] {
-        var stack = ex.getStackTrace();
-        var cache = ['§c' + ex];
+        let stack = ex.getStackTrace();
+        let cache = ['§c' + ex];
         //@ts-ignore
         if (stack.class) {
             stack = Arrays.asList(stack)
         }
         stack.forEach(trace => {
+            if (!trace.fileName || trace.fileName.startsWith('jar:file:')) { return }
             if (trace.className.startsWith('<')) {
-                var { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
+                let { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
                 if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
                 cache.push(`    §e->§c ${fileName} => §4${trace.methodName}:${lineNumber}`)
             } else {
-                var className = trace.className;
+                let className = trace.className;
                 var fileName = trace.fileName as string;
                 if (className.startsWith('jdk.nashorn.internal.scripts')) {
                     className = className.substr(className.lastIndexOf('$') + 1)
                     var { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
                     if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
                 } else {
-                    for (var prefix in ignoreLogPrefix) {
+                    for (let prefix in ignoreLogPrefix) {
                         if (className.startsWith(ignoreLogPrefix[prefix])) {
                             return;
                         }

packages/api/src/constants.ts

@@ -0,0 +1,16 @@
+export namespace constants {
+    export namespace Reflect {
+        export const Method = {
+            getServerConnection: [/*spigot 1.8.8*/'aq',/*spigot 1.12.2*/ 'an', /*spigot 1.14.4+*/'getServerConnection', /*catserver 1.12.2*/'func_147137_ag']
+        }
+        export const Field = {
+            listeningChannels: [/*spigot 1.8.8-1.12.2*/'g', /*spigot 1.14.4*/'f', /*spigot 1.15.2+*/'listeningChannels', /*catserver 1.12.2*/'field_151274_e']
+        }
+    }
+    export enum ServerType {
+        Bukkit = 'bukkit',
+        Sponge = 'sponge',
+        Nukkit = 'nukkit',
+        Bungee = 'bungee'
+    }
+}

packages/api/src/event.ts

@@ -1,8 +1,8 @@
 /**
  * MiaoScript Event处理类
  */
-import i18n from '@ms/i18n'
-import { injectable, unmanaged } from '@ms/container'
+import i18n from '@ccms/i18n'
+import { injectable, unmanaged } from '@ccms/container'
 
 const Thread = Java.type('java.lang.Thread');
 
@@ -21,6 +21,9 @@ export namespace event {
 
     @injectable()
     export abstract class Event {
+        // export EventPriority to blockly
+        public EventPriority = EventPriority;
+
         private mapEvent = [];
         private listenerMap = [];
 
@@ -62,8 +65,8 @@ export namespace event {
             return count;
         }
 
-        getJarFile(resource: string) {
-            let dirs = Thread.currentThread().getContextClassLoader().getResources(resource);
+        getJarFile(resource: string, loader?: any) {
+            let dirs = (loader || Thread.currentThread().getContextClassLoader()).getResources(resource);
             if (dirs.hasMoreElements()) {
                 let url = dirs.nextElement();
                 if (url.protocol === "jar") { return url.openConnection().jarFile; }

packages/api/src/index.ts

@@ -1,7 +1,8 @@
-import "@ms/nashorn"
+import "@ccms/nashorn"
 export * from './task'
 export * from './event'
 export * from './console'
 export * from './channel'
 export * from './command'
+export * from './constants'
 export * from './interfaces'

packages/api/src/interfaces/plugin.ts

@@ -21,10 +21,54 @@ export namespace plugin {
     export interface PluginManager {
         scan(folder: string): void;
         build(): void;
+        loadFromFile(file: string): Plugin;
         load(...args: any[]): void;
         enable(...args: any[]): void;
         disable(...args: any[]): void;
         reload(...args: any[]): void;
         getPlugins(): Map<string, any>;
     }
+    export interface Plugin {
+        description: PluginMetadata;
+        logger: Console;
+        load(): void;
+        enable(): void;
+        disable(): void;
+    }
+    interface BaseMetadata {
+        /**
+         * 名称 为空则为对象名称
+         */
+        name?: string;
+        /**
+         * 支持的服务器列表 为空则代表所有
+         */
+        servers?: string[];
+    }
+    export interface PluginMetadata extends BaseMetadata {
+        /**
+         * 插件名称
+         */
+        name: string;
+        /**
+         * 前缀
+         */
+        prefix?: string;
+        /**
+         * 插件版本
+         */
+        version: string;
+        /**
+         * 插件版本
+         */
+        author: string | string[];
+        /**
+         * 插件源文件 必须指定为 __filename
+         */
+        source: string;
+        /**
+         * 插件本体
+         */
+        target?: any;
+    }
 }

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

@@ -30,6 +30,7 @@ export namespace server {
         dispatchConsoleCommand(command: string): boolean;
         getPluginsFolder(): string;
         getNativePluginManager(): NativePluginManager;
+        getNettyPipeline(): any;
         sendJson(sender: string | any, json: object | string): void;
     }
 }

packages/api/src/task.ts

@@ -11,6 +11,10 @@ export namespace task {
          * @param func 执行内容
          */
         callSyncMethod(func: Function): any;
+        /**
+         * 关闭任务管理器
+         */
+        disable();
     }
     /**
      * 任务抽象

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/bukkit",
-    "version": "0.4.0",
+    "name": "@ccms/bukkit",
+    "version": "0.6.5",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,8 +24,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/common": "^0.4.0",
-        "@ms/container": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/common": "^0.6.4",
+        "@ccms/container": "^0.6.0"
     }
 }

packages/bukkit/src/channel.ts

@@ -1,5 +1,5 @@
-import { channel, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container'
+import { channel, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container'
 
 const Bukkit = org.bukkit.Bukkit
 const PluginMessageListener = Java.type("org.bukkit.plugin.messaging.PluginMessageListener")

packages/bukkit/src/command.ts

@@ -1,8 +1,8 @@
-import '@ms/nashorn'
+import '@ccms/nashorn'
 
-import { command, plugin } from '@ms/api'
-import * as reflect from '@ms/common/dist/reflect'
-import { provideSingleton, postConstruct, inject } from '@ms/container'
+import { command, plugin } from '@ccms/api'
+import * as reflect from '@ccms/common/dist/reflect'
+import { provideSingleton, postConstruct, inject } from '@ccms/container'
 
 let Bukkit = org.bukkit.Bukkit;
 let TabCompleter = Java.type('org.bukkit.command.TabCompleter');

packages/bukkit/src/console.ts

@@ -1,4 +1,4 @@
-import { MiaoScriptConsole } from '@ms/api'
+import { MiaoScriptConsole } from '@ccms/api'
 
 let Bukkit = org.bukkit.Bukkit;
 

packages/bukkit/src/event.ts

@@ -1,6 +1,6 @@
-import { event, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container';
-import * as reflect from '@ms/common/dist/reflect'
+import { event, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container';
+import * as reflect from '@ccms/common/dist/reflect'
 
 const Bukkit = Java.type("org.bukkit.Bukkit");
 const Event = Java.type("org.bukkit.event.Event");
@@ -19,7 +19,7 @@ export class BukkitEvent extends event.Event {
     }
 
     getJarFile(resource: string) {
-        return super.getJarFile('org/bukkit/Bukkit.class')
+        return super.getJarFile('org/bukkit/Bukkit.class', Bukkit.class.classLoader)
     }
     isValidEvent(clazz: any): boolean {
         // 继承于 org.bukkit.event.Event

packages/bukkit/src/index.ts

@@ -1,7 +1,7 @@
-/// <reference types="@ms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
 
-import { server } from '@ms/api'
-import { Container } from '@ms/container'
+import { server } from '@ccms/api'
+import { Container } from '@ccms/container'
 
 import { BukkitConsole } from './console';
 import './event';

packages/bukkit/src/server.ts

@@ -1,6 +1,7 @@
-import { server } from '@ms/api'
-import { provideSingleton } from '@ms/container';
+import { server, constants } from '@ccms/api'
+import { provideSingleton } from '@ccms/container';
 
+import * as reflect from '@ccms/common/dist/reflect'
 import chat from './enhance/chat'
 
 let Bukkit = org.bukkit.Bukkit;
@@ -8,9 +9,11 @@ let Bukkit = org.bukkit.Bukkit;
 @provideSingleton(server.Server)
 export class BukkitServer implements server.Server {
     private pluginsFolder: string;
+    private pipeline: any;
 
     constructor() {
         this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath();
+        this.reflectPipeline()
     }
 
     getPlayer(name: string) {
@@ -43,6 +46,9 @@ export class BukkitServer implements server.Server {
     getNativePluginManager() {
         return Bukkit.getPluginManager() as any;
     }
+    getNettyPipeline() {
+        return this.pipeline;
+    }
     sendJson(sender: string | any, json: object | string): void {
         if (typeof sender === "string") {
             sender = this.getPlayer(sender)
@@ -52,4 +58,27 @@ export class BukkitServer implements server.Server {
             this.dispatchConsoleCommand(result)
         }
     }
+
+    private reflectPipeline() {
+        let consoleServer = reflect.on(Bukkit.getServer()).get('console').get()
+        let connection: any;
+        let promise: any;
+        for (const method of constants.Reflect.Method.getServerConnection) {
+            try {
+                connection = reflect.on(consoleServer).call(method).get()
+                if (connection.class.name.indexOf('ServerConnection') !== -1) { break; }
+                connection = undefined;
+            } catch (error) { }
+        }
+        if (!connection) { console.error("Can't found ServerConnection!"); return }
+        for (const field of constants.Reflect.Field.listeningChannels) {
+            try {
+                promise = reflect.on(connection).get(field).get().get(0);
+                if (promise.class.name.indexOf('Promise') !== -1) { break; }
+                promise = undefined;
+            } catch (error) { }
+        }
+        if (!promise) { console.error("Can't found listeningChannels!"); return }
+        this.pipeline = reflect.on(promise).get('channel').get().pipeline()
+    }
 }

packages/bukkit/src/task.ts

@@ -1,5 +1,5 @@
-import { task, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container';
+import { task, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container';
 
 const Bukkit = Java.type('org.bukkit.Bukkit');
 const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable');
@@ -17,6 +17,9 @@ export class BukkitTaskManager implements task.TaskManager {
     callSyncMethod(func: Function): any {
         return Bukkit.getScheduler().callSyncMethod(this.pluginInstance, new Callable({ call: () => func() })).get()
     }
+    disable() {
+        Bukkit.getScheduler().cancelTasks(this.pluginInstance);
+    }
 }
 
 export class BukkitTask extends task.Task {

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/bungee",
-    "version": "0.4.0",
+    "name": "@ccms/bungee",
+    "version": "0.6.5",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,8 +24,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/common": "^0.4.0",
-        "@ms/container": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/common": "^0.6.4",
+        "@ccms/container": "^0.6.0"
     }
 }

packages/bungee/src/channel.ts

@@ -1,5 +1,5 @@
-import { channel, event } from '@ms/api'
-import { provideSingleton, inject } from '@ms/container'
+import { channel, event } from '@ccms/api'
+import { provideSingleton, inject } from '@ccms/container'
 
 const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
 

packages/bungee/src/command.ts

@@ -1,5 +1,5 @@
-import { command, plugin } from "@ms/api";
-import { inject, provideSingleton } from "@ms/container";
+import { command, plugin } from "@ccms/api";
+import { inject, provideSingleton } from "@ccms/container";
 
 const Arrays = Java.type('java.util.Arrays')
 const Command = Java.extend(Java.type('net.md_5.bungee.api.plugin.Command'), Java.type('net.md_5.bungee.api.plugin.TabExecutor'));

packages/bungee/src/console.ts

@@ -1,6 +1,6 @@
-import '@ms/nashorn'
-import { plugin, MiaoScriptConsole } from '@ms/api'
-import { inject, injectable } from "@ms/container";
+import '@ccms/nashorn'
+import { plugin, MiaoScriptConsole } from '@ccms/api'
+import { inject, injectable } from "@ccms/container";
 
 let CommandSender = Java.type("net.md_5.bungee.api.CommandSender")
 

packages/bungee/src/event.ts

@@ -1,6 +1,6 @@
-import { event } from '@ms/api'
-import { provideSingleton, postConstruct } from '@ms/container'
-import * as reflect from '@ms/common/dist/reflect'
+import { event } from '@ccms/api'
+import { provideSingleton, postConstruct } from '@ccms/container'
+import * as reflect from '@ccms/common/dist/reflect'
 
 const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
 const Event = Java.type("net.md_5.bungee.api.plugin.Event");

packages/bungee/src/index.ts

@@ -1,7 +1,7 @@
-/// <reference types="@ms/types/dist/typings/bungee" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
-import { server } from '@ms/api'
-import { Container } from '@ms/container'
+import { server } from '@ccms/api'
+import { Container } from '@ccms/container'
 
 import { BungeeConsole } from './console';
 import './event';

packages/bungee/src/server.ts

@@ -1,16 +1,42 @@
-import { server } from '@ms/api'
-import { provideSingleton } from '@ms/container';
+import { server, task } from '@ccms/api'
+import { provideSingleton, inject, postConstruct } from '@ccms/container'
+
+import * as reflect from '@ccms/common/dist/reflect'
 
 let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
 
 @provideSingleton(server.Server)
 export class BungeeServer implements server.Server {
     private pluginsFolder: string;
+    private pipeline: any;
+
+    @inject(task.TaskManager)
+    private task: task.TaskManager
 
     constructor() {
         this.pluginsFolder = Bungee.getPluginsFolder().getCanonicalPath();
     }
 
+    @postConstruct()
+    initialize() {
+        let count = 0;
+        let wait = this.task.create(() => {
+            try {
+                // @ts-ignore
+                this.pipeline = reflect.on(base.getInstance().getProxy()).get('listeners').get().toArray()[0].pipeline()
+                wait.cancel();
+            } catch (ex) {
+                count++
+                if (count > 50) {
+                    console.error('Reflect BungeeCord netty channel pipeline error time > 50times. Err: ' + ex)
+                    wait.cancel()
+                } else {
+                    console.warn('Wait BungeeCord start ready to get netty channel pipeline. Err: ' + ex)
+                }
+            }
+        }).later(10).timer(20).submit()
+    }
+
     getPlayer(name: string) {
         return Bungee.getPlayer(name);
     }
@@ -41,6 +67,9 @@ export class BungeeServer implements server.Server {
     getNativePluginManager() {
         return Bungee.getPluginManager() as any
     }
+    getNettyPipeline() {
+        return this.pipeline;
+    }
     sendJson(sender: string | any, json: string): void {
         throw new Error("Method not implemented.");
     }

packages/bungee/src/task.ts

@@ -1,5 +1,5 @@
-import { task, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container';
+import { task, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container';
 
 var Runnable = Java.type('java.lang.Runnable')
 let TimeUnit = Java.type('java.util.concurrent.TimeUnit')
@@ -16,6 +16,9 @@ export class BungeeTaskManager implements task.TaskManager {
     callSyncMethod(func: Function): any {
         return func();
     }
+    disable() {
+        this.pluginInstance.getProxy().getScheduler().cancel(this.pluginInstance)
+    }
 }
 
 export class BungeeTask extends task.Task {
@@ -25,9 +28,9 @@ export class BungeeTask extends task.Task {
             return this.plugin.getProxy().getScheduler().runAsync(this.plugin, run)
         }
         if (this.interval) {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime, this.interval, TimeUnit.MILLISECONDS)
+            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
         } else {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime, TimeUnit.MILLISECONDS)
+            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, TimeUnit.MILLISECONDS)
         }
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
-    "name": "@ms/client",
-    "version": "0.4.0",
+    "name": "@ccms/client",
+    "version": "0.6.3",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -13,9 +13,6 @@
     "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",
@@ -28,7 +25,6 @@
         "minecraft-protocol": "^1.11.0"
     },
     "devDependencies": {
-        "@nestjs/cli": "^6.14.2",
         "rimraf": "^3.0.2",
         "typescript": "^3.8.3"
     }

packages/client/src/index.ts

@@ -5,11 +5,14 @@ import { attachForge } from './forge'
 import { attachEvents } from './event'
 
 let username = process.argv[2] || 'Mr_jtb'
-let client = createConnection('192.168.2.5', 25577, username)
+let version = process.argv[3] || '1.12.2'
+let address = process.argv[4] || '192.168.2.5:25577'
+let realAddress = address.split(":");
+let client = createConnection(realAddress[0], parseInt(realAddress[1] || "25565"), username)
 
 function createConnection(host: string, port: number, username: string) {
     let client = createClient({
-        version: '1.12.2',
+        version,
         host,
         port,
         username,

packages/common/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/common",
-    "version": "0.4.0",
+    "name": "@ccms/common",
+    "version": "0.6.4",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,7 +24,7 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.4.0"
+        "@ccms/nashorn": "^0.6.4"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/common/src/fs.ts

@@ -1,4 +1,4 @@
-import '@ms/nashorn'
+import '@ccms/nashorn'
 
 /*global Java, base, module, exports, require, __FILE__*/
 const Path = Java.type("java.nio.file.Path");
@@ -23,9 +23,7 @@ export function concat(...args: string[]) {
  * @returns {*}
  */
 export function file(...opts: any[]): any {
-    if (!opts[0]) {
-        console.warn("文件名称不得为 undefined 或者 null !");
-    }
+    if (!opts[0]) { throw new Error("文件名称不得为 undefined 或者 null !") }
     switch (opts.length) {
         case 1:
             var f = opts[0];
@@ -143,7 +141,7 @@ export function del(file) {
         return;
     }
     if (file.isDirectory()) {
-        Files.list(file.toPath()).collect(Collector.toList()).forEach(function(f) {
+        Files.list(file.toPath()).collect(Collector.toList()).forEach(function (f) {
             del(f);
         })
     }

packages/common/src/http.ts

@@ -27,7 +27,7 @@ function request(config: RequestConfig) {
     for (const header in config.headers) {
         xhr.setRequestHeader(header, config.headers[header]);
     }
-    xhr.send(config.data);
+    xhr.send(typeof config.data === "string" ? config.data : JSON.stringify(config.data));
     if ((xhr.getResponseHeader("Content-Type") + '').indexOf('application/json') != -1) {
         xhr.responseType = "json"
     }

packages/common/src/reflect.ts

@@ -198,4 +198,4 @@ export = {
     accessible,
     declaredMethods,
     mapToObject
-};
+}

packages/common/src/tgz.ts

@@ -1,4 +1,4 @@
-import '@ms/nashorn'
+import '@ccms/nashorn'
 
 let Files = Java.type("java.nio.file.Files");
 let Paths = Java.type("java.nio.file.Paths");

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/compile",
-    "version": "0.4.0",
+    "name": "@ccms/compile",
+    "version": "0.6.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/container",
-    "version": "0.4.0",
+    "name": "@ccms/container",
+    "version": "0.6.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",

packages/container/src/decorators.ts

@@ -2,7 +2,7 @@ import { interfaces, Container } from "inversify";
 
 let _container: Container;
 
-const ContainerInstance = Symbol.for("@ms/ioc:Container");
+const ContainerInstance = Symbol.for("@ccms/ioc:Container");
 const INJECTION = Symbol.for("INJECTION");
 
 function _proxyGetter(

packages/core/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/core",
-    "version": "0.4.0",
+    "name": "@ccms/core",
+    "version": "0.6.5",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,8 +24,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/container": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/container": "^0.6.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -1,96 +1,110 @@
-let containerStartTime = Date.now();
-console.i18n("ms.core.ioc.initialize");
-import { plugin, server, task } from '@ms/api'
-import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ms/container'
-console.i18n("ms.core.ioc.completed", { time: (Date.now() - containerStartTime) / 1000 })
+let containerStartTime = Date.now()
+console.i18n("ms.core.ioc.initialize", { scope: global.scope })
+import { plugin, server, task, constants } from '@ccms/api'
+import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ccms/container'
+console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() - containerStartTime) / 1000 })
+import http from '@ccms/common/dist/http'
 
 @provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {
     @inject(server.Console)
-    private Console: Console;
+    private Console: Console
     @inject(task.TaskManager)
-    private taskManager: task.TaskManager;
+    private taskManager: task.TaskManager
     @inject(plugin.PluginFolder)
-    private pluginFolder: string;
+    private pluginFolder: string
     @inject(plugin.PluginManager)
-    private pluginManager: plugin.PluginManager;
+    private pluginManager: plugin.PluginManager
 
     enable() {
-        this.loadServerConsole();
-        this.loadTaskFunction();
+        this.loadServerConsole()
+        this.loadTaskFunction()
         global.level = "TRACE"
-        this.loadPlugins();
-        return () => this.disable();
+        this.loadPlugins()
+        return () => this.disable()
     }
 
     loadServerConsole() {
-        // @ts-ignore
-        console = new this.Console();
+        //@ts-ignore
+        global.setGlobal('console', new this.Console(), { writable: false, configurable: false })
     }
 
     loadTaskFunction() {
-        //@ts-ignore
-        global.setTimeout = (func: Function, tick: number, async: boolean = false) => this.taskManager.create(func).later(tick).async(async).submit()
-        //@ts-ignore
-        global.setInterval = (func: Function, tick: number, async: boolean = false) => this.taskManager.create(func).timer(tick).async(async).submit()
+        global.setGlobal('setTimeout', (func: Function, tick: number, async: boolean = false) => {
+            this.taskManager.create(func).later(tick).async(async).submit()
+        }, { writable: false, configurable: false })
+        global.setGlobal('setInterval', (func: Function, tick: number, async: boolean = false) => {
+            this.taskManager.create(func).timer(tick).async(async).submit()
+        }, { writable: false, configurable: false })
     }
 
     loadPlugins() {
         let loadPluginStartTime = new Date().getTime()
         console.i18n("ms.core.plugin.initialize")
-        this.pluginManager.scan(this.pluginFolder);
-        this.pluginManager.build();
-        this.pluginManager.load();
-        this.pluginManager.enable();
+        this.pluginManager.scan(this.pluginFolder)
+        this.pluginManager.build()
+        this.pluginManager.load(this.pluginManager.getPlugins())
+        this.pluginManager.enable(this.pluginManager.getPlugins())
         console.i18n("ms.core.plugin.completed", { time: (new Date().getTime() - loadPluginStartTime) / 1000 })
     }
 
     disable() {
         console.i18n("ms.core.engine.disable")
-        this.pluginManager.disable();
+        this.pluginManager.disable(this.pluginManager.getPlugins())
+        this.taskManager.disable()
+        //@ts-ignore
+        require.disable()
     }
 }
 
-function detectServer() {
+function detectServer(): constants.ServerType {
     try {
-        Java.type("org.bukkit.Bukkit");
-        return 'bukkit'
+        Java.type("org.bukkit.Bukkit")
+        return constants.ServerType.Bukkit
     } catch (ex) {
     }
     try {
-        Java.type("org.spongepowered.api.Sponge");
-        return 'sponge'
+        Java.type("org.spongepowered.api.Sponge")
+        return constants.ServerType.Sponge
     } catch (ex) {
     }
     try {
-        Java.type("cn.nukkit.Nukkit");
-        return 'nukkit'
+        Java.type("cn.nukkit.Nukkit")
+        return constants.ServerType.Nukkit
     } catch (ex) {
     }
     try {
-        Java.type("net.md_5.bungee.api.ProxyServer");
-        return 'bungee'
+        Java.type("net.md_5.bungee.api.ProxyServer")
+        return constants.ServerType.Bungee
     } catch (ex) {
     }
     throw Error('Unknow Server Type...')
 }
 
 function initialize() {
-    let corePackageStartTime = new Date().getTime()
-    container.bind(ContainerInstance).toConstantValue(container);
-    container.bind(plugin.PluginInstance).toConstantValue(base.getInstance());
-    container.bind(plugin.PluginFolder).toConstantValue('plugins');
-    let type = detectServer();
-    console.i18n("ms.core.initialize.detect", { type });
-    container.bind(server.ServerType).toConstantValue(type);
-    console.i18n("ms.core.package.initialize", { type });
-    require(`@ms/${type}`).default(container);
-    require('@ms/plugin')
-    container.load(buildProviderModule());
-    console.i18n("ms.core.package.completed", { type, time: (Date.now() - corePackageStartTime) / 1000 });
-    let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-    console.i18n("ms.core.engine.completed", { time: (Date.now() - global.NashornEngineStartTime) / 1000 });
-    return disable;
+    // @ts-ignore
+    try { engineLoad({ script: http.get("http://ms.yumc.pw/api/plugin/download/name/initialize"), name: 'core/initialize.js' }) } catch (error) { console.debug(error) }
+    try {
+        let corePackageStartTime = new Date().getTime()
+        container.bind(ContainerInstance).toConstantValue(container)
+        container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
+        container.bind(plugin.PluginFolder).toConstantValue('plugins')
+        let type = detectServer()
+        console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
+        container.bind(server.ServerType).toConstantValue(type)
+        console.i18n("ms.core.package.initialize", { scope: global.scope, type })
+        require(`${global.scope}/${type}`).default(container)
+        require(`${global.scope}/plugin`)
+        container.load(buildProviderModule())
+        console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
+        let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
+        console.i18n("ms.core.engine.completed", { time: (Date.now() - global.NashornEngineStartTime) / 1000 })
+        return disable
+    } catch (error) {
+        console.i18n("ms.core.initialize.error", { error })
+        console.ex(error)
+        return () => console.i18n('ms.core.engine.disable.abnormal')
+    }
 }
 
-export default initialize();
+export default initialize()

packages/i18n/languages/en.yml

@@ -1,15 +1,18 @@
+ms.i18n.completed: "Internationalization component initialization completed. Current Language: English"
 ms.ployfill.initialize: "Initialization Java Nashorn ployfill. Please wait..."
 ms.ployfill.completed: "Java Nashorn ployfill loading completed... Cost ({time}s)!"
 
-ms.core.ioc.initialize: "Initialization MiaoScript IOC Container @ms/container. Please wait..."
-ms.core.ioc.completed: "MiaoScript IOC Container @ms/container loading completed({time}s)!"
+ms.core.ioc.initialize: "Initialization MiaoScript IOC Container {scope}/container. Please wait..."
+ms.core.ioc.completed: "MiaoScript IOC Container {scope}/container loading completed({time}s)!"
 ms.core.initialize.detect: "Detect Compatible Server set ServerType to {type} ..."
-ms.core.package.initialize: "Initialization MiaoScript Package @ms/core @ms/{type} @ms/plugin. Please wait..."
-ms.core.package.completed: "MiaoScript Package @ms/core @ms/{type} @ms/plugin loading completed({time}s)!"
+ms.core.initialize.error: "MiaoScript Engine Initialization Error: {error} ..."
+ms.core.package.initialize: "Initialization MiaoScript Package {scope}/core {scope}/{type} {scope}/plugin. Please wait..."
+ms.core.package.completed: "MiaoScript Package {scope}/core {scope}/{type} {scope}/plugin loading completed({time}s)!"
 ms.core.plugin.initialize: "Initialization MiaoScript Plugin System. Please wait..."
 ms.core.plugin.completed: "MiaoScript Plugin System loading completed({time}s)!"
 ms.core.engine.completed: "MiaoScript ScriptEngine loading completed... Done({time}s)!"
 ms.core.engine.disable: "Disable MiaoScript Engine..."
+ms.core.engine.disable.abnormal: "abnormal Initialization MiaoScript Engine. Skip disable step..."
 
 ms.api.event.resource.not.found: "Can't Mapping Event Because not found Resources {resource}!"
 ms.api.event.empty.event.dir: "base event dir is empty, can't map event name !"
@@ -26,14 +29,17 @@ 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.initialize: "Initialization MiaoScript Plugin System: Plugin: {plugin} Loader: {loader}..."
 ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."
 ms.plugin.manager.scan: "Scanning Plugins in {folder} ..."
 ms.plugin.manager.initialize.error: "§6Plugin §b{name} §6initialize error §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} version {version} by {author}"
+ms.plugin.manager.stage.exec: "[{plugin}] Exec {name} Stage {stage} When servers is {servers}..."
+ms.plugin.manager.stage.exec.error: "§6Plugin §b{plugin} §6exec §d{executor} §6function error §4{error}"
 ms.plugin.manager.stage.load: "Loading"
 ms.plugin.manager.stage.enable: "Enabling"
 ms.plugin.manager.stage.disable: "Disabling"
+ms.plugin.manager.build.error: "§6Load Plugin From §b{file} §6failed. §4Error: §c{error}"
 ms.plugin.manager.build.update: "Auto Update Plugin {name} ..."
 ms.plugin.manager.build.not.extends: "§4Found error plugin §b{source} §4it's not extends interfaces.Plugin, the plugin will be ignore!"
 ms.plugin.manager.build.exists: "§4Found duplicate plugin §b{exists} §4and §b{source}§4. the first plugin will be ignore!"

packages/i18n/languages/zh_cn.yml

@@ -1,15 +1,18 @@
+ms.i18n.completed: "国际化组件 初始化完成 当前语言: 简体中文"
 ms.ployfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
 ms.ployfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
 
-ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 @ms/container. 请稍候..."
-ms.core.ioc.completed: "MiaoScript IOC 容器 @ms/container 加载完成 耗时({time}s)"
+ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 {scope}/container. 请稍候..."
+ms.core.ioc.completed: "MiaoScript IOC 容器 {scope}/container 加载完成 耗时({time}s)"
 ms.core.initialize.detect: "检测到兼容的服务器类型. 设置 ServerType 值 {type} ..."
-ms.core.package.initialize: "初始化 MiaoScript 扩展 @ms/core @ms/{type} @ms/plugin. 请稍候..."
-ms.core.package.completed: "MiaoScript 扩展 @ms/core @ms/{type} @ms/plugin 加载完成 耗时({time}s)"
+ms.core.initialize.error: "§4MiaoScript 系统初始化失败 §c{error} ..."
+ms.core.package.initialize: "初始化 MiaoScript 扩展 {scope}/core {scope}/{type} {scope}/plugin. 请稍候..."
+ms.core.package.completed: "MiaoScript 扩展 {scope}/core {scope}/{type} {scope}/plugin 加载完成 耗时({time}s)"
 ms.core.plugin.initialize: "MiaoScript 开始引导插件系统. 请稍候..."
 ms.core.plugin.completed: "MiaoScript 插件加载完毕 耗时({time}s)!"
 ms.core.engine.completed: "MiaoScript 脚本引擎 加载完毕... 耗时({time}s)!"
 ms.core.engine.disable: "关闭 MiaoScript 引擎..."
+ms.core.engine.disable.abnormal: "引擎异常启动或初始化未完成 跳过关闭流程..."
 
 ms.api.event.resource.not.found: "无法映射事件 未找到资源文件 {resource}!"
 ms.api.event.empty.event.dir: "事件基础目录为空, 无法映射事件!"
@@ -26,14 +29,17 @@ 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.initialize: "初始化 MiaoScript 插件系统: 实例: {plugin} 加载器: {loader}..."
 ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
 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.exec: "[{plugin}] 执行 {stage} 阶段函数 {name} 匹配类型 {servers}..."
+ms.plugin.manager.stage.exec.error: "§6插件 §b{plugin} §6执行 §d{executor} §6函数发生异常 错误: §4{error}"
 ms.plugin.manager.stage.load: "加载"
 ms.plugin.manager.stage.enable: "启用"
 ms.plugin.manager.stage.disable: "关闭"
+ms.plugin.manager.build.error: "§6从文件 §b{file} §6加载插件失败 §4错误: §c{error}"
 ms.plugin.manager.build.update: "自动更新插件 {name} ..."
 ms.plugin.manager.build.not.extends: "§4发现错误的插件 §b{source} §4未继承接口 interfaces.Plugin, 将不会被载入到服务器!"
 ms.plugin.manager.build.duplicate: "§4发现已存在插件 §b{exists} §4和 §b{source}§4 存在冲突. 已存在插件将会被替换!"

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/i18n",
-    "version": "0.4.0",
+    "name": "@ccms/i18n",
+    "version": "0.6.4",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -22,13 +19,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@types/js-yaml": "^3.12.2",
+        "@types/js-yaml": "^3.12.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.4.0",
+        "@ccms/nashorn": "^0.6.4",
         "js-yaml": "^3.13.1"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"

packages/i18n/src/index.ts

@@ -1,51 +1,70 @@
-/// <reference types="@ms/nashorn" />
+/// <reference types="@ccms/nashorn" />
 import * as yaml from 'js-yaml'
 
 const File = Java.type("java.io.File");
 const separatorChar = File.separatorChar;
-
-let langMap = {};
-let fallbackMap = {};
-
 type TranslateParam = { [key: string]: any }
 
-function translate(name: string, param?: TranslateParam) {
-    let langText: string = langMap[name] || fallbackMap[name];
-    if (!langText) { return '[WARN] @ms/i18n miss lang translate: ' + name }
-    for (const key in param) {
-        langText = langText.replace("{" + key + "}", param[key])
-    }
-    return langText;
-}
-
-function initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
-    langMap = readYamlFile(root, lang) || readYamlFile(concat(__dirname, '..'), lang)
-    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 = concat(dir, 'languages', name + '.yml');
-    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 {
     interface Console {
         i18n(name: string, param?: TranslateParam);
     }
 }
 
+type TranslateContent = {
+    langMap: TranslateParam,
+    fallbackMap?: TranslateParam
+}
+
+export class Translate {
+    private root = '';
+    private langMap = {};
+    private fallbackMap = {};
+
+    constructor(root: string | TranslateContent) {
+        if (typeof root == 'string') {
+            this.root = root;
+        } else {
+            this.langMap = root.langMap;
+            this.fallbackMap = root.fallbackMap || {};
+        }
+    }
+
+    translate(name: string, param?: TranslateParam) {
+        let langText: string = this.langMap[name] || this.fallbackMap[name];
+        if (!langText) { return '[WARN] @ccms/i18n miss lang translate: ' + name }
+        for (const key in param) {
+            langText = langText.replace(new RegExp("{" + key + "}", 'gm'), param[key])
+        }
+        return langText;
+    }
+
+    initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
+        this.langMap = this.readYamlFile(this.root, lang) || this.readYamlFile(this.concat(__dirname, '..'), lang)
+        this.fallbackMap = this.readYamlFile(this.root, fallback) || this.readYamlFile(this.concat(__dirname, '..'), fallback)
+        console.i18n = (name: string, param?: TranslateParam) => {
+            console.log(this.translate(name, param))
+        }
+        console.i18n('ms.i18n.completed')
+    }
+
+    readYamlFile(dir: string, name: string) {
+        let langFile = this.concat(dir, 'languages', name + '.yml');
+        return this.exists(langFile) && yaml.safeLoad(base.read(langFile))
+    }
+
+    concat(...args: string[]) {
+        return args.join(separatorChar)
+    }
+
+    exists(path: string) {
+        return new File(path).exists()
+    }
+}
+
+let systemTranslate = new Translate(root)
+
 export default {
-    initialize,
-    translate
-};
+    initialize: systemTranslate.initialize.bind(systemTranslate),
+    translate: systemTranslate.translate.bind(systemTranslate)
+}

packages/nashorn/.npmignore

@@ -0,0 +1,22 @@
+test
+typings
+bundled
+build
+coverage
+docs
+wiki
+gulpfile.js
+bower.json
+karma.conf.js
+tsconfig.json
+typings.json
+CONTRIBUTING.md
+ISSUE_TEMPLATE.md
+PULL_REQUEST_TEMPLATE.md
+tslint.json
+wallaby.js
+.travis.yml
+.gitignore
+.vscode
+.theia
+type_definitions

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/nashorn",
-    "version": "0.4.0",
+    "name": "@ccms/nashorn",
+    "version": "0.6.4",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -13,9 +13,6 @@
     "license": "ISC",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",

packages/nashorn/src/index.ts

@@ -30,22 +30,23 @@ declare global {
     }
 
     interface String {
-        trimLeft();
-        trimRight();
+        trimLeft(): string;
+        trimRight(): string;
     }
 
     interface Object {
-        setPrototypeOf(obj: object, prototype: object);
-        bindProperties(to: object, from: object);
+        setPrototypeOf(obj: object, prototype: object): void;
+        bindProperties(to: object, from: object): void;
     }
 
     namespace NodeJS {
         interface Global {
+            scope: string;
             logger: any;
             debug: boolean;
             level: string;
             NashornEngineStartTime: number;
-            setGlobal: (key: string, value: any) => void;
+            setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void;
             noop: () => void;
             console: Console;
         }
@@ -67,7 +68,7 @@ declare global {
         stack(err: Error): string[];
         sender(...args: any): void;
         console(...args: any): void;
-        i18n(name: string, ...params: any[]);
+        i18n(name: string, ...params: any[]): void;
     }
 }
 

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/nodejs",
-    "version": "0.4.0",
+    "name": "@ccms/nodejs",
+    "version": "0.6.4",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,7 +24,7 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.4.0"
+        "@ccms/nashorn": "^0.6.4"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nodejs/src/fs/index.ts

@@ -0,0 +1,101 @@
+import '@ccms/nashorn'
+import { URL } from "url";
+
+const Path = Java.type("java.nio.file.Path");
+const JavaString = Java.type("java.lang.String");
+const File = Java.type("java.io.File");
+const Files = Java.type("java.nio.file.Files");
+const Collector = Java.type("java.util.stream.Collector")
+const separatorChar = File.separatorChar;
+const StandardCopyOption = Java.type("java.nio.file.StandardCopyOption");
+
+/**
+ * Valid types for path values in "fs".
+ */
+type PathLike = string | Buffer | URL;
+
+function javaFile(...opts: any[]) {
+    if (!opts[0]) {
+        console.warn("文件名称不得为 undefined 或者 null !");
+    }
+    switch (opts.length) {
+        case 1:
+            var f = opts[0];
+            if (f instanceof File) {
+                return f;
+            }
+            if (typeof f === "string") {
+                return new File(f);
+            }
+            if (f instanceof Path) {
+                return f.toFile();
+            }
+            break;
+        default:
+            return new File(javaFile(opts[0]), opts[1]);
+    }
+}
+
+export function renameSync(oldPath: PathLike, newPath: PathLike): void {
+
+}
+export function truncateSync() {
+
+}
+export function chownSync() {
+
+}
+export function chmodSync() {
+
+}
+export function statSync() {
+
+}
+export function symlinkSync() {
+
+}
+export function readlinkSync() {
+
+}
+export function realpathSync() {
+
+}
+export function unlinkSync() {
+
+}
+export function rmdirSync() {
+
+}
+export function mkdirSync() {
+
+}
+export function mkdtempSync() {
+
+}
+export function readdirSync() {
+
+}
+export function readFileSync() {
+
+}
+export function writeFileSync() {
+
+}
+export function appendFileSync() {
+
+}
+export function watchFile() {
+
+}
+export function unwatchFile() {
+
+}
+export function existsSync() {
+
+}
+export function accessSync() {
+
+}
+export function copyFileSync() {
+
+}

packages/nodejs/src/index.ts

@@ -1,51 +1 @@
-/// <reference types="@ms/nashorn" />
-import * as yaml from 'js-yaml'
-
-const File = Java.type("java.io.File");
-const separatorChar = File.separatorChar;
-
-let langMap = {};
-let fallbackMap = {};
-
-type TranslateParam = { [key: string]: any }
-
-function translate(name: string, param?: TranslateParam) {
-    let langText: string = langMap[name] || fallbackMap[name];
-    if (!langText) { return '[WARN] @ms/i18n miss lang translate: ' + name }
-    for (const key in param) {
-        langText = langText.replace("{" + key + "}", param[key])
-    }
-    return langText;
-}
-
-function initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
-    langMap = readYamlFile(root, lang) || readYamlFile(concat(__dirname, '..'), lang)
-    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 = concat(dir, 'languages', name + '.yml');
-    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 {
-    interface Console {
-        i18n(name: string, param?: TranslateParam);
-    }
-}
-
-export default {
-    initialize,
-    translate
-};
+export { }

packages/nodejs/src/path/index.ts

@@ -0,0 +1,626 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+// @ts-ignore
+var isWindows = java.lang.System.getProperties().getProperty("os.name").toUpperCase().indexOf("WINDOWS") != -1;
+// @ts-ignore
+var util = require('util');
+
+// resolves . and .. elements in a path array with directory names there
+// must be no slashes or device names (c:\) in the array
+// (so also no leading and trailing slashes - it does not distinguish
+// relative and absolute paths)
+function normalizeArray(parts, allowAboveRoot) {
+    var res = [];
+    for (var i = 0; i < parts.length; i++) {
+        var p = parts[i];
+
+        // ignore empty parts
+        if (!p || p === '.')
+            continue;
+
+        if (p === '..') {
+            if (res.length && res[res.length - 1] !== '..') {
+                res.pop();
+            } else if (allowAboveRoot) {
+                res.push('..');
+            }
+        } else {
+            res.push(p);
+        }
+    }
+
+    return res;
+}
+
+// returns an array with empty elements removed from either end of the input
+// array or the original array if no elements need to be removed
+function trimArray(arr) {
+    var lastIndex = arr.length - 1;
+    var start = 0;
+    for (; start <= lastIndex; start++) {
+        if (arr[start])
+            break;
+    }
+
+    var end = lastIndex;
+    for (; end >= 0; end--) {
+        if (arr[end])
+            break;
+    }
+
+    if (start === 0 && end === lastIndex)
+        return arr;
+    if (start > end)
+        return [];
+    return arr.slice(start, end + 1);
+}
+
+// Regex to split a windows path into three parts: [*, device, slash,
+// tail] windows-only
+var splitDeviceRe =
+    /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+
+// Regex to split the tail part of the above into [*, dir, basename, ext]
+var splitTailRe =
+    /^([\s\S]*?)((?:\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))(?:[\\\/]*)$/;
+
+var win32: any = {};
+
+// Function to split a filename into [root, dir, basename, ext]
+function win32SplitPath(filename) {
+    // Separate device+slash from tail
+    var result = splitDeviceRe.exec(filename),
+        device = (result[1] || '') + (result[2] || ''),
+        tail = result[3] || '';
+    // Split the tail into dir, basename and extension
+    var result2 = splitTailRe.exec(tail),
+        dir = result2[1],
+        basename = result2[2],
+        ext = result2[3];
+    return [device, dir, basename, ext];
+}
+
+function win32StatPath(path) {
+    var result = splitDeviceRe.exec(path),
+        device = result[1] || '',
+        isUnc = !!device && device[1] !== ':';
+    return {
+        device: device,
+        isUnc: isUnc,
+        isAbsolute: isUnc || !!result[2], // UNC paths are always absolute
+        tail: result[3]
+    };
+}
+
+function normalizeUNCRoot(device) {
+    return '\\\\' + device.replace(/^[\\\/]+/, '').replace(/[\\\/]+/g, '\\');
+}
+
+// path.resolve([from ...], to)
+win32.resolve = function () {
+    var resolvedDevice = '',
+        resolvedTail = '',
+        resolvedAbsolute = false;
+
+    for (var i = arguments.length - 1; i >= -1; i--) {
+        var path;
+        if (i >= 0) {
+            path = arguments[i];
+        } else if (!resolvedDevice) {
+            path = process.cwd();
+        } else {
+            // Windows has the concept of drive-specific current working
+            // directories. If we've resolved a drive letter but not yet an
+            // absolute path, get cwd for that drive. We're sure the device is not
+            // an unc path at this points, because unc paths are always absolute.
+            path = process.env['=' + resolvedDevice];
+            // Verify that a drive-local cwd was found and that it actually points
+            // to our drive. If not, default to the drive's root.
+            if (!path || path.substr(0, 3).toLowerCase() !==
+                resolvedDevice.toLowerCase() + '\\') {
+                path = resolvedDevice + '\\';
+            }
+        }
+
+        // Skip empty and invalid entries
+        if (!util.isString(path)) {
+            throw new TypeError('Arguments to path.resolve must be strings');
+        } else if (!path) {
+            continue;
+        }
+
+        var result = win32StatPath(path),
+            device = result.device,
+            isUnc = result.isUnc,
+            isAbsolute = result.isAbsolute,
+            tail = result.tail;
+
+        if (device &&
+            resolvedDevice &&
+            device.toLowerCase() !== resolvedDevice.toLowerCase()) {
+            // This path points to another device so it is not applicable
+            continue;
+        }
+
+        if (!resolvedDevice) {
+            resolvedDevice = device;
+        }
+        if (!resolvedAbsolute) {
+            resolvedTail = tail + '\\' + resolvedTail;
+            resolvedAbsolute = isAbsolute;
+        }
+
+        if (resolvedDevice && resolvedAbsolute) {
+            break;
+        }
+    }
+
+    // Convert slashes to backslashes when `resolvedDevice` points to an UNC
+    // root. Also squash multiple slashes into a single one where appropriate.
+    if (isUnc) {
+        resolvedDevice = normalizeUNCRoot(resolvedDevice);
+    }
+
+    // At this point the path should be resolved to a full absolute path,
+    // but handle relative paths to be safe (might happen when process.cwd()
+    // fails)
+
+    // Normalize the tail path
+    resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/),
+        !resolvedAbsolute).join('\\');
+
+    return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) ||
+        '.';
+};
+
+
+win32.normalize = function (path) {
+    var result = win32StatPath(path),
+        device = result.device,
+        isUnc = result.isUnc,
+        isAbsolute = result.isAbsolute,
+        tail = result.tail,
+        trailingSlash = /[\\\/]$/.test(tail);
+
+    // Normalize the tail path
+    tail = normalizeArray(tail.split(/[\\\/]+/), !isAbsolute).join('\\');
+
+    if (!tail && !isAbsolute) {
+        tail = '.';
+    }
+    if (tail && trailingSlash) {
+        tail += '\\';
+    }
+
+    // Convert slashes to backslashes when `device` points to an UNC root.
+    // Also squash multiple slashes into a single one where appropriate.
+    if (isUnc) {
+        device = normalizeUNCRoot(device);
+    }
+
+    return device + (isAbsolute ? '\\' : '') + tail;
+};
+
+
+win32.isAbsolute = function (path) {
+    return win32StatPath(path).isAbsolute;
+};
+
+win32.join = function () {
+    var paths = [];
+    for (var i = 0; i < arguments.length; i++) {
+        var arg = arguments[i];
+        if (!util.isString(arg)) {
+            throw new TypeError('Arguments to path.join must be strings');
+        }
+        if (arg) {
+            paths.push(arg);
+        }
+    }
+
+    var joined = paths.join('\\');
+
+    // Make sure that the joined path doesn't start with two slashes, because
+    // normalize() will mistake it for an UNC path then.
+    //
+    // This step is skipped when it is very clear that the user actually
+    // intended to point at an UNC path. This is assumed when the first
+    // non-empty string arguments starts with exactly two slashes followed by
+    // at least one more non-slash character.
+    //
+    // Note that for normalize() to treat a path as an UNC path it needs to
+    // have at least 2 components, so we don't filter for that here.
+    // This means that the user can use join to construct UNC paths from
+    // a server name and a share name; for example:
+    //   path.join('//server', 'share') -> '\\\\server\\share\')
+    if (!/^[\\\/]{2}[^\\\/]/.test(paths[0])) {
+        joined = joined.replace(/^[\\\/]{2,}/, '\\');
+    }
+
+    return win32.normalize(joined);
+};
+
+
+// path.relative(from, to)
+// it will solve the relative path from 'from' to 'to', for instance:
+// from = 'C:\\orandea\\test\\aaa'
+// to = 'C:\\orandea\\impl\\bbb'
+// The output of the function should be: '..\\..\\impl\\bbb'
+win32.relative = function (from, to) {
+    from = win32.resolve(from);
+    to = win32.resolve(to);
+
+    // windows is not case sensitive
+    var lowerFrom = from.toLowerCase();
+    var lowerTo = to.toLowerCase();
+
+    var toParts = trimArray(to.split('\\'));
+
+    var lowerFromParts = trimArray(lowerFrom.split('\\'));
+    var lowerToParts = trimArray(lowerTo.split('\\'));
+
+    var length = Math.min(lowerFromParts.length, lowerToParts.length);
+    var samePartsLength = length;
+    for (var i = 0; i < length; i++) {
+        if (lowerFromParts[i] !== lowerToParts[i]) {
+            samePartsLength = i;
+            break;
+        }
+    }
+
+    if (samePartsLength == 0) {
+        return to;
+    }
+
+    var outputParts = [];
+    for (var i = samePartsLength; i < lowerFromParts.length; i++) {
+        outputParts.push('..');
+    }
+
+    outputParts = outputParts.concat(toParts.slice(samePartsLength));
+
+    return outputParts.join('\\');
+};
+
+
+win32._makeLong = function (path) {
+    // Note: this will *probably* throw somewhere.
+    if (!util.isString(path))
+        return path;
+
+    if (!path) {
+        return '';
+    }
+
+    var resolvedPath = win32.resolve(path);
+
+    if (/^[a-zA-Z]\:\\/.test(resolvedPath)) {
+        // path is local filesystem path, which needs to be converted
+        // to long UNC path.
+        return '\\\\?\\' + resolvedPath;
+    } else if (/^\\\\[^?.]/.test(resolvedPath)) {
+        // path is network UNC path, which needs to be converted
+        // to long UNC path.
+        return '\\\\?\\UNC\\' + resolvedPath.substring(2);
+    }
+
+    return path;
+};
+
+
+win32.dirname = function (path) {
+    var result = win32SplitPath(path),
+        root = result[0],
+        dir = result[1];
+
+    if (!root && !dir) {
+        // No dirname whatsoever
+        return '.';
+    }
+
+    if (dir) {
+        // It has a dirname, strip trailing slash
+        dir = dir.substr(0, dir.length - 1);
+    }
+
+    return root + dir;
+};
+
+
+win32.basename = function (path, ext) {
+    var f = win32SplitPath(path)[2];
+    // TODO: make this comparison case-insensitive on windows?
+    if (ext && f.substr(-1 * ext.length) === ext) {
+        f = f.substr(0, f.length - ext.length);
+    }
+    return f;
+};
+
+
+win32.extname = function (path) {
+    return win32SplitPath(path)[3];
+};
+
+
+win32.format = function (pathObject) {
+    if (!util.isObject(pathObject)) {
+        throw new TypeError(
+            "Parameter 'pathObject' must be an object, not " + typeof pathObject
+        );
+    }
+
+    var root = pathObject.root || '';
+
+    if (!util.isString(root)) {
+        throw new TypeError(
+            "'pathObject.root' must be a string or undefined, not " +
+            typeof pathObject.root
+        );
+    }
+
+    var dir = pathObject.dir;
+    var base = pathObject.base || '';
+    if (!dir) {
+        return base;
+    }
+    if (dir[dir.length - 1] === win32.sep) {
+        return dir + base;
+    }
+    return dir + win32.sep + base;
+};
+
+
+win32.parse = function (pathString) {
+    if (!util.isString(pathString)) {
+        throw new TypeError(
+            "Parameter 'pathString' must be a string, not " + typeof pathString
+        );
+    }
+    var allParts = win32SplitPath(pathString);
+    if (!allParts || allParts.length !== 4) {
+        throw new TypeError("Invalid path '" + pathString + "'");
+    }
+    return {
+        root: allParts[0],
+        dir: allParts[0] + allParts[1].slice(0, -1),
+        base: allParts[2],
+        ext: allParts[3],
+        name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+    };
+};
+
+
+win32.sep = '\\';
+win32.delimiter = ';';
+
+
+// Split a filename into [root, dir, basename, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+var posix: any = {};
+
+function posixSplitPath(filename) {
+    return splitPathRe.exec(filename).slice(1);
+}
+
+// path.resolve([from ...], to)
+// posix version
+posix.resolve = function () {
+    var resolvedPath = '',
+        resolvedAbsolute = false;
+
+    for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
+        var path = (i >= 0) ? arguments[i] : process.cwd();
+
+        // Skip empty and invalid entries
+        if (!util.isString(path)) {
+            throw new TypeError('Arguments to path.resolve must be strings');
+        } else if (!path) {
+            continue;
+        }
+
+        resolvedPath = path + '/' + resolvedPath;
+        resolvedAbsolute = path[0] === '/';
+    }
+
+    // At this point the path should be resolved to a full absolute path, but
+    // handle relative paths to be safe (might happen when process.cwd() fails)
+
+    // Normalize the path
+    resolvedPath = normalizeArray(resolvedPath.split('/'),
+        !resolvedAbsolute).join('/');
+
+    return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
+};
+
+// path.normalize(path)
+// posix version
+posix.normalize = function (path) {
+    var isAbsolute = posix.isAbsolute(path),
+        trailingSlash = path && path[path.length - 1] === '/';
+
+    // Normalize the path
+    path = normalizeArray(path.split('/'), !isAbsolute).join('/');
+
+    if (!path && !isAbsolute) {
+        path = '.';
+    }
+    if (path && trailingSlash) {
+        path += '/';
+    }
+
+    return (isAbsolute ? '/' : '') + path;
+};
+
+// posix version
+posix.isAbsolute = function (path) {
+    return path.charAt(0) === '/';
+};
+
+// posix version
+posix.join = function () {
+    var path = '';
+    for (var i = 0; i < arguments.length; i++) {
+        var segment = arguments[i];
+        if (!util.isString(segment)) {
+            throw new TypeError('Arguments to path.join must be strings');
+        }
+        if (segment) {
+            if (!path) {
+                path += segment;
+            } else {
+                path += '/' + segment;
+            }
+        }
+    }
+    return posix.normalize(path);
+};
+
+
+// path.relative(from, to)
+// posix version
+posix.relative = function (from, to) {
+    from = posix.resolve(from).substr(1);
+    to = posix.resolve(to).substr(1);
+
+    var fromParts = trimArray(from.split('/'));
+    var toParts = trimArray(to.split('/'));
+
+    var length = Math.min(fromParts.length, toParts.length);
+    var samePartsLength = length;
+    for (var i = 0; i < length; i++) {
+        if (fromParts[i] !== toParts[i]) {
+            samePartsLength = i;
+            break;
+        }
+    }
+
+    var outputParts = [];
+    for (var i = samePartsLength; i < fromParts.length; i++) {
+        outputParts.push('..');
+    }
+
+    outputParts = outputParts.concat(toParts.slice(samePartsLength));
+
+    return outputParts.join('/');
+};
+
+
+posix._makeLong = function (path) {
+    return path;
+};
+
+
+posix.dirname = function (path) {
+    var result = posixSplitPath(path),
+        root = result[0],
+        dir = result[1];
+
+    if (!root && !dir) {
+        // No dirname whatsoever
+        return '.';
+    }
+
+    if (dir) {
+        // It has a dirname, strip trailing slash
+        dir = dir.substr(0, dir.length - 1);
+    }
+
+    return root + dir;
+};
+
+
+posix.basename = function (path, ext) {
+    var f = posixSplitPath(path)[2];
+    // TODO: make this comparison case-insensitive on windows?
+    if (ext && f.substr(-1 * ext.length) === ext) {
+        f = f.substr(0, f.length - ext.length);
+    }
+    return f;
+};
+
+
+posix.extname = function (path) {
+    return posixSplitPath(path)[3];
+};
+
+
+posix.format = function (pathObject) {
+    if (!util.isObject(pathObject)) {
+        throw new TypeError(
+            "Parameter 'pathObject' must be an object, not " + typeof pathObject
+        );
+    }
+
+    var root = pathObject.root || '';
+
+    if (!util.isString(root)) {
+        throw new TypeError(
+            "'pathObject.root' must be a string or undefined, not " +
+            typeof pathObject.root
+        );
+    }
+
+    var dir = pathObject.dir ? pathObject.dir + posix.sep : '';
+    var base = pathObject.base || '';
+    return dir + base;
+};
+
+
+posix.parse = function (pathString) {
+    if (!util.isString(pathString)) {
+        throw new TypeError(
+            "Parameter 'pathString' must be a string, not " + typeof pathString
+        );
+    }
+    var allParts = posixSplitPath(pathString);
+    if (!allParts || allParts.length !== 4) {
+        throw new TypeError("Invalid path '" + pathString + "'");
+    }
+    allParts[1] = allParts[1] || '';
+    allParts[2] = allParts[2] || '';
+    allParts[3] = allParts[3] || '';
+
+    return {
+        root: allParts[0],
+        dir: allParts[0] + allParts[1].slice(0, -1),
+        base: allParts[2],
+        ext: allParts[3],
+        name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+    };
+};
+
+
+posix.sep = '/';
+posix.delimiter = ':';
+
+
+if (isWindows)
+    module.exports = win32;
+else /* posix */
+    module.exports = posix;
+
+module.exports.posix = posix;
+module.exports.win32 = win32;

packages/nodejs/src/punycode/index.ts

@@ -0,0 +1,442 @@
+'use strict';
+
+/** Highest positive signed 32-bit float value */
+const maxInt = 2147483647; // aka. 0x7FFFFFFF or 2^31-1
+
+/** Bootstring parameters */
+const base = 36;
+const tMin = 1;
+const tMax = 26;
+const skew = 38;
+const damp = 700;
+const initialBias = 72;
+const initialN = 128; // 0x80
+const delimiter = '-'; // '\x2D'
+
+/** Regular expressions */
+const regexPunycode = /^xn--/;
+const regexNonASCII = /[^\0-\x7E]/; // non-ASCII chars
+const regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g; // RFC 3490 separators
+
+/** Error messages */
+const errors = {
+    'overflow': 'Overflow: input needs wider integers to process',
+    'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+    'invalid-input': 'Invalid input'
+};
+
+/** Convenience shortcuts */
+const baseMinusTMin = base - tMin;
+const floor = Math.floor;
+const stringFromCharCode = String.fromCharCode;
+
+/*--------------------------------------------------------------------------*/
+
+/**
+ * A generic error utility function.
+ * @private
+ * @param {String} type The error type.
+ * @returns {Error} Throws a `RangeError` with the applicable error message.
+ */
+function error(type) {
+    throw new RangeError(errors[type]);
+}
+
+/**
+ * A generic `Array#map` utility function.
+ * @private
+ * @param {Array} array The array to iterate over.
+ * @param {Function} callback The function that gets called for every array
+ * item.
+ * @returns {Array} A new array of values returned by the callback function.
+ */
+function map(array, fn) {
+    const result = [];
+    let length = array.length;
+    while (length--) {
+        result[length] = fn(array[length]);
+    }
+    return result;
+}
+
+/**
+ * A simple `Array#map`-like wrapper to work with domain name strings or email
+ * addresses.
+ * @private
+ * @param {String} domain The domain name or email address.
+ * @param {Function} callback The function that gets called for every
+ * character.
+ * @returns {Array} A new string of characters returned by the callback
+ * function.
+ */
+function mapDomain(string, fn) {
+    const parts = string.split('@');
+    let result = '';
+    if (parts.length > 1) {
+        // In email addresses, only the domain name should be punycoded. Leave
+        // the local part (i.e. everything up to `@`) intact.
+        result = parts[0] + '@';
+        string = parts[1];
+    }
+    // Avoid `split(regex)` for IE8 compatibility. See #17.
+    string = string.replace(regexSeparators, '\x2E');
+    const labels = string.split('.');
+    const encoded = map(labels, fn).join('.');
+    return result + encoded;
+}
+
+/**
+ * Creates an array containing the numeric code points of each Unicode
+ * character in the string. While JavaScript uses UCS-2 internally,
+ * this function will convert a pair of surrogate halves (each of which
+ * UCS-2 exposes as separate characters) into a single code point,
+ * matching UTF-16.
+ * @see `punycode.ucs2.encode`
+ * @see <https://mathiasbynens.be/notes/javascript-encoding>
+ * @memberOf punycode.ucs2
+ * @name decode
+ * @param {String} string The Unicode input string (UCS-2).
+ * @returns {Array} The new array of code points.
+ */
+function ucs2decode(string) {
+    const output = [];
+    let counter = 0;
+    const length = string.length;
+    while (counter < length) {
+        const value = string.charCodeAt(counter++);
+        if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+            // It's a high surrogate, and there is a next character.
+            const extra = string.charCodeAt(counter++);
+            if ((extra & 0xFC00) == 0xDC00) { // Low surrogate.
+                output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+            } else {
+                // It's an unmatched surrogate; only append this code unit, in case the
+                // next code unit is the high surrogate of a surrogate pair.
+                output.push(value);
+                counter--;
+            }
+        } else {
+            output.push(value);
+        }
+    }
+    return output;
+}
+
+/**
+ * Creates a string based on an array of numeric code points.
+ * @see `punycode.ucs2.decode`
+ * @memberOf punycode.ucs2
+ * @name encode
+ * @param {Array} codePoints The array of numeric code points.
+ * @returns {String} The new Unicode string (UCS-2).
+ */
+const ucs2encode = array => String.fromCodePoint(...array);
+
+/**
+ * Converts a basic code point into a digit/integer.
+ * @see `digitToBasic()`
+ * @private
+ * @param {Number} codePoint The basic numeric code point value.
+ * @returns {Number} The numeric value of a basic code point (for use in
+ * representing integers) in the range `0` to `base - 1`, or `base` if
+ * the code point does not represent a value.
+ */
+const basicToDigit = function (codePoint) {
+    if (codePoint - 0x30 < 0x0A) {
+        return codePoint - 0x16;
+    }
+    if (codePoint - 0x41 < 0x1A) {
+        return codePoint - 0x41;
+    }
+    if (codePoint - 0x61 < 0x1A) {
+        return codePoint - 0x61;
+    }
+    return base;
+};
+
+/**
+ * Converts a digit/integer into a basic code point.
+ * @see `basicToDigit()`
+ * @private
+ * @param {Number} digit The numeric value of a basic code point.
+ * @returns {Number} The basic code point whose value (when used for
+ * representing integers) is `digit`, which needs to be in the range
+ * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+ * used; else, the lowercase form is used. The behavior is undefined
+ * if `flag` is non-zero and `digit` has no uppercase form.
+ */
+const digitToBasic = function (digit: number, flag: number) {
+    //  0..25 map to ASCII a..z or A..Z
+    // 26..35 map to ASCII 0..9
+    //@ts-ignore
+    return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+};
+
+/**
+ * Bias adaptation function as per section 3.4 of RFC 3492.
+ * https://tools.ietf.org/html/rfc3492#section-3.4
+ * @private
+ */
+const adapt = function (delta, numPoints, firstTime) {
+    let k = 0;
+    delta = firstTime ? floor(delta / damp) : delta >> 1;
+    delta += floor(delta / numPoints);
+    for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+        delta = floor(delta / baseMinusTMin);
+    }
+    return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+};
+
+/**
+ * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+ * symbols.
+ * @memberOf punycode
+ * @param {String} input The Punycode string of ASCII-only symbols.
+ * @returns {String} The resulting string of Unicode symbols.
+ */
+const decode = function (input) {
+    // Don't use UCS-2.
+    const output = [];
+    const inputLength = input.length;
+    let i = 0;
+    let n = initialN;
+    let bias = initialBias;
+
+    // Handle the basic code points: let `basic` be the number of input code
+    // points before the last delimiter, or `0` if there is none, then copy
+    // the first basic code points to the output.
+
+    let basic = input.lastIndexOf(delimiter);
+    if (basic < 0) {
+        basic = 0;
+    }
+
+    for (let j = 0; j < basic; ++j) {
+        // if it's not a basic code point
+        if (input.charCodeAt(j) >= 0x80) {
+            error('not-basic');
+        }
+        output.push(input.charCodeAt(j));
+    }
+
+    // Main decoding loop: start just after the last delimiter if any basic code
+    // points were copied; start at the beginning otherwise.
+
+    for (let index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+        // `index` is the index of the next character to be consumed.
+        // Decode a generalized variable-length integer into `delta`,
+        // which gets added to `i`. The overflow checking is easier
+        // if we increase `i` as we go, then subtract off its starting
+        // value at the end to obtain `delta`.
+        let oldi = i;
+        for (let w = 1, k = base; /* no condition */; k += base) {
+
+            if (index >= inputLength) {
+                error('invalid-input');
+            }
+
+            const digit = basicToDigit(input.charCodeAt(index++));
+
+            if (digit >= base || digit > floor((maxInt - i) / w)) {
+                error('overflow');
+            }
+
+            i += digit * w;
+            const t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+            if (digit < t) {
+                break;
+            }
+
+            const baseMinusT = base - t;
+            if (w > floor(maxInt / baseMinusT)) {
+                error('overflow');
+            }
+
+            w *= baseMinusT;
+
+        }
+
+        const out = output.length + 1;
+        bias = adapt(i - oldi, out, oldi == 0);
+
+        // `i` was supposed to wrap around from `out` to `0`,
+        // incrementing `n` each time, so we'll fix that now:
+        if (floor(i / out) > maxInt - n) {
+            error('overflow');
+        }
+
+        n += floor(i / out);
+        i %= out;
+
+        // Insert `n` at position `i` of the output.
+        output.splice(i++, 0, n);
+
+    }
+
+    return String.fromCodePoint(...output);
+};
+
+/**
+ * Converts a string of Unicode symbols (e.g. a domain name label) to a
+ * Punycode string of ASCII-only symbols.
+ * @memberOf punycode
+ * @param {String} input The string of Unicode symbols.
+ * @returns {String} The resulting Punycode string of ASCII-only symbols.
+ */
+const encode = function (input) {
+    const output = [];
+
+    // Convert the input in UCS-2 to an array of Unicode code points.
+    input = ucs2decode(input);
+
+    // Cache the length.
+    let inputLength = input.length;
+
+    // Initialize the state.
+    let n = initialN;
+    let delta = 0;
+    let bias = initialBias;
+
+    // Handle the basic code points.
+    for (const currentValue of input) {
+        if (currentValue < 0x80) {
+            output.push(stringFromCharCode(currentValue));
+        }
+    }
+
+    let basicLength = output.length;
+    let handledCPCount = basicLength;
+
+    // `handledCPCount` is the number of code points that have been handled;
+    // `basicLength` is the number of basic code points.
+
+    // Finish the basic string with a delimiter unless it's empty.
+    if (basicLength) {
+        output.push(delimiter);
+    }
+
+    // Main encoding loop:
+    while (handledCPCount < inputLength) {
+
+        // All non-basic code points < n have been handled already. Find the next
+        // larger one:
+        let m = maxInt;
+        for (const currentValue of input) {
+            if (currentValue >= n && currentValue < m) {
+                m = currentValue;
+            }
+        }
+
+        // Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+        // but guard against overflow.
+        const handledCPCountPlusOne = handledCPCount + 1;
+        if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+            error('overflow');
+        }
+
+        delta += (m - n) * handledCPCountPlusOne;
+        n = m;
+
+        for (const currentValue of input) {
+            if (currentValue < n && ++delta > maxInt) {
+                error('overflow');
+            }
+            if (currentValue == n) {
+                // Represent delta as a generalized variable-length integer.
+                let q = delta;
+                for (let k = base; /* no condition */; k += base) {
+                    const t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+                    if (q < t) {
+                        break;
+                    }
+                    const qMinusT = q - t;
+                    const baseMinusT = base - t;
+                    output.push(
+                        stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+                    );
+                    q = floor(qMinusT / baseMinusT);
+                }
+
+                output.push(stringFromCharCode(digitToBasic(q, 0)));
+                bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+                delta = 0;
+                ++handledCPCount;
+            }
+        }
+
+        ++delta;
+        ++n;
+
+    }
+    return output.join('');
+};
+
+/**
+ * Converts a Punycode string representing a domain name or an email address
+ * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+ * it doesn't matter if you call it on a string that has already been
+ * converted to Unicode.
+ * @memberOf punycode
+ * @param {String} input The Punycoded domain name or email address to
+ * convert to Unicode.
+ * @returns {String} The Unicode representation of the given Punycode
+ * string.
+ */
+const toUnicode = function (input) {
+    return mapDomain(input, function (string) {
+        return regexPunycode.test(string)
+            ? decode(string.slice(4).toLowerCase())
+            : string;
+    });
+};
+
+/**
+ * Converts a Unicode string representing a domain name or an email address to
+ * Punycode. Only the non-ASCII parts of the domain name will be converted,
+ * i.e. it doesn't matter if you call it with a domain that's already in
+ * ASCII.
+ * @memberOf punycode
+ * @param {String} input The domain name or email address to convert, as a
+ * Unicode string.
+ * @returns {String} The Punycode representation of the given domain name or
+ * email address.
+ */
+const toASCII = function (input) {
+    return mapDomain(input, function (string) {
+        return regexNonASCII.test(string)
+            ? 'xn--' + encode(string)
+            : string;
+    });
+};
+
+/*--------------------------------------------------------------------------*/
+
+/** Define the public API */
+//@ts-ignore
+const punycode = {
+	/**
+	 * A string representing the current Punycode.js version number.
+	 * @memberOf punycode
+	 * @type String
+	 */
+    'version': '2.1.0',
+	/**
+	 * An object of methods to convert from JavaScript's internal character
+	 * representation (UCS-2) to Unicode code points, and back.
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode
+	 * @type Object
+	 */
+    'ucs2': {
+        'decode': ucs2decode,
+        'encode': ucs2encode
+    },
+    'decode': decode,
+    'encode': encode,
+    'toASCII': toASCII,
+    'toUnicode': toUnicode
+};
+
+export = punycode;

packages/nodejs/src/querystring/decode.ts

@@ -0,0 +1,81 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+// If obj.hasOwnProperty has been overridden, then calling
+// obj.hasOwnProperty(prop) will break.
+// See: https://github.com/joyent/node/issues/1707
+// @ts-ignore
+function hasOwnProperty(obj, prop) {
+    return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+module.exports = function (qs, sep, eq, options) {
+    sep = sep || '&';
+    eq = eq || '=';
+    var obj = {};
+
+    if (typeof qs !== 'string' || qs.length === 0) {
+        return obj;
+    }
+
+    var regexp = /\+/g;
+    qs = qs.split(sep);
+
+    var maxKeys = 1000;
+    if (options && typeof options.maxKeys === 'number') {
+        maxKeys = options.maxKeys;
+    }
+
+    var len = qs.length;
+    // maxKeys <= 0 means that we should not limit keys count
+    if (maxKeys > 0 && len > maxKeys) {
+        len = maxKeys;
+    }
+
+    for (var i = 0; i < len; ++i) {
+        var x = qs[i].replace(regexp, '%20'),
+            idx = x.indexOf(eq),
+            kstr, vstr, k, v;
+
+        if (idx >= 0) {
+            kstr = x.substr(0, idx);
+            vstr = x.substr(idx + 1);
+        } else {
+            kstr = x;
+            vstr = '';
+        }
+
+        k = decodeURIComponent(kstr);
+        v = decodeURIComponent(vstr);
+
+        if (!hasOwnProperty(obj, k)) {
+            obj[k] = v;
+        } else if (Array.isArray(obj[k])) {
+            obj[k].push(v);
+        } else {
+            obj[k] = [obj[k], v];
+        }
+    }
+
+    return obj;
+};

packages/nodejs/src/querystring/encode.ts

@@ -0,0 +1,64 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+var stringifyPrimitive = function (v) {
+    switch (typeof v) {
+        case 'string':
+            return v;
+
+        case 'boolean':
+            return v ? 'true' : 'false';
+
+        case 'number':
+            return isFinite(v) ? v : '';
+
+        default:
+            return '';
+    }
+};
+
+module.exports = function (obj, sep, eq, name) {
+    sep = sep || '&';
+    eq = eq || '=';
+    if (obj === null) {
+        obj = undefined;
+    }
+
+    if (typeof obj === 'object') {
+        return Object.keys(obj).map(function (k) {
+            var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
+            if (Array.isArray(obj[k])) {
+                return obj[k].map(function (v) {
+                    return ks + encodeURIComponent(stringifyPrimitive(v));
+                }).join(sep);
+            } else {
+                return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+            }
+        }).filter(Boolean).join(sep);
+
+    }
+
+    if (!name) return '';
+    return encodeURIComponent(stringifyPrimitive(name)) + eq +
+        encodeURIComponent(stringifyPrimitive(obj));
+};

packages/nodejs/src/querystring/index.ts

@@ -0,0 +1,4 @@
+'use strict';
+
+exports.decode = exports.parse = require('./decode');
+exports.encode = exports.stringify = require('./encode');

packages/nodejs/src/url/index.ts

@@ -0,0 +1,747 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+import * as punycode from 'punycode'
+
+var util = {
+    isString: function (arg) {
+        return typeof (arg) === 'string';
+    },
+    isObject: function (arg) {
+        return typeof (arg) === 'object' && arg !== null;
+    },
+    isNull: function (arg) {
+        return arg === null;
+    },
+    isNullOrUndefined: function (arg) {
+        return arg == null;
+    }
+}
+
+exports.parse = urlParse;
+exports.resolve = urlResolve;
+exports.resolveObject = urlResolveObject;
+exports.format = urlFormat;
+
+exports.Url = Url;
+
+function Url(this: any) {
+    this.protocol = null;
+    this.slashes = null;
+    this.auth = null;
+    this.host = null;
+    this.port = null;
+    this.hostname = null;
+    this.hash = null;
+    this.search = null;
+    this.query = null;
+    this.pathname = null;
+    this.path = null;
+    this.href = null;
+}
+
+// Reference: RFC 3986, RFC 1808, RFC 2396
+
+// define these here so at least they only have to be
+// compiled once on the first module load.
+var protocolPattern = /^([a-z0-9.+-]+:)/i,
+    portPattern = /:[0-9]*$/,
+
+    // Special case for a simple path URL
+    simplePathPattern = /^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,
+
+    // RFC 2396: characters reserved for delimiting URLs.
+    // We actually just auto-escape these.
+    delims = ['<', '>', '"', '`', ' ', '\r', '\n', '\t'],
+
+    // RFC 2396: characters not allowed for various reasons.
+    unwise = ['{', '}', '|', '\\', '^', '`'].concat(delims),
+
+    // Allowed by RFCs, but cause of XSS attacks.  Always escape these.
+    autoEscape = ['\''].concat(unwise),
+    // Characters that are never ever allowed in a hostname.
+    // Note that any invalid chars are also handled, but these
+    // are the ones that are *expected* to be seen, so we fast-path
+    // them.
+    nonHostChars = ['%', '/', '?', ';', '#'].concat(autoEscape),
+    hostEndingChars = ['/', '?', '#'],
+    hostnameMaxLen = 255,
+    hostnamePartPattern = /^[+a-z0-9A-Z_-]{0,63}$/,
+    hostnamePartStart = /^([+a-z0-9A-Z_-]{0,63})(.*)$/,
+    // protocols that can allow "unsafe" and "unwise" chars.
+    unsafeProtocol = {
+        'javascript': true,
+        'javascript:': true
+    },
+    // protocols that never have a hostname.
+    hostlessProtocol = {
+        'javascript': true,
+        'javascript:': true
+    },
+    // protocols that always contain a // bit.
+    slashedProtocol = {
+        'http': true,
+        'https': true,
+        'ftp': true,
+        'gopher': true,
+        'file': true,
+        'http:': true,
+        'https:': true,
+        'ftp:': true,
+        'gopher:': true,
+        'file:': true
+    },
+    querystring = require('querystring');
+
+function urlParse(url, parseQueryString?, slashesDenoteHost?) {
+    if (url && util.isObject(url) && url instanceof Url) return url;
+
+    var u = new Url;
+    u.parse(url, parseQueryString, slashesDenoteHost);
+    return u;
+}
+
+Url.prototype.parse = function (url, parseQueryString, slashesDenoteHost) {
+    if (!util.isString(url)) {
+        throw new TypeError("Parameter 'url' must be a string, not " + typeof url);
+    }
+
+    // Copy chrome, IE, opera backslash-handling behavior.
+    // Back slashes before the query string get converted to forward slashes
+    // See: https://code.google.com/p/chromium/issues/detail?id=25916
+    var queryIndex = url.indexOf('?'),
+        splitter =
+            (queryIndex !== -1 && queryIndex < url.indexOf('#')) ? '?' : '#',
+        uSplit = url.split(splitter),
+        slashRegex = /\\/g;
+    uSplit[0] = uSplit[0].replace(slashRegex, '/');
+    url = uSplit.join(splitter);
+
+    var rest = url;
+
+    // trim before proceeding.
+    // This is to support parse stuff like "  http://foo.com  \n"
+    rest = rest.trim();
+
+    if (!slashesDenoteHost && url.split('#').length === 1) {
+        // Try fast path regexp
+        var simplePath = simplePathPattern.exec(rest);
+        if (simplePath) {
+            this.path = rest;
+            this.href = rest;
+            this.pathname = simplePath[1];
+            if (simplePath[2]) {
+                this.search = simplePath[2];
+                if (parseQueryString) {
+                    this.query = querystring.parse(this.search.substr(1));
+                } else {
+                    this.query = this.search.substr(1);
+                }
+            } else if (parseQueryString) {
+                this.search = '';
+                this.query = {};
+            }
+            return this;
+        }
+    }
+
+    var proto: any = protocolPattern.exec(rest);
+    if (proto) {
+        proto = proto[0];
+        var lowerProto = proto.toLowerCase();
+        this.protocol = lowerProto;
+        rest = rest.substr(proto.length);
+    }
+
+    // figure out if it's got a host
+    // user@server is *always* interpreted as a hostname, and url
+    // resolution will treat //foo/bar as host=foo,path=bar because that's
+    // how the browser resolves relative URLs.
+    if (slashesDenoteHost || proto || rest.match(/^\/\/[^@\/]+@[^@\/]+/)) {
+        var slashes = rest.substr(0, 2) === '//';
+        if (slashes && !(proto && hostlessProtocol[proto])) {
+            rest = rest.substr(2);
+            this.slashes = true;
+        }
+    }
+
+    if (!hostlessProtocol[proto] &&
+        (slashes || (proto && !slashedProtocol[proto]))) {
+
+        // there's a hostname.
+        // the first instance of /, ?, ;, or # ends the host.
+        //
+        // If there is an @ in the hostname, then non-host chars *are* allowed
+        // to the left of the last @ sign, unless some host-ending character
+        // comes *before* the @-sign.
+        // URLs are obnoxious.
+        //
+        // ex:
+        // http://a@b@c/ => user:a@b host:c
+        // http://a@b?@c => user:a host:c path:/?@c
+
+        // v0.12 TODO(isaacs): This is not quite how Chrome does things.
+        // Review our test case against browsers more comprehensively.
+
+        // find the first instance of any hostEndingChars
+        var hostEnd = -1;
+        for (var i = 0; i < hostEndingChars.length; i++) {
+            var hec = rest.indexOf(hostEndingChars[i]);
+            if (hec !== -1 && (hostEnd === -1 || hec < hostEnd))
+                hostEnd = hec;
+        }
+
+        // at this point, either we have an explicit point where the
+        // auth portion cannot go past, or the last @ char is the decider.
+        var auth, atSign;
+        if (hostEnd === -1) {
+            // atSign can be anywhere.
+            atSign = rest.lastIndexOf('@');
+        } else {
+            // atSign must be in auth portion.
+            // http://a@b/c@d => host:b auth:a path:/c@d
+            atSign = rest.lastIndexOf('@', hostEnd);
+        }
+
+        // Now we have a portion which is definitely the auth.
+        // Pull that off.
+        if (atSign !== -1) {
+            auth = rest.slice(0, atSign);
+            rest = rest.slice(atSign + 1);
+            this.auth = decodeURIComponent(auth);
+        }
+
+        // the host is the remaining to the left of the first non-host char
+        hostEnd = -1;
+        for (var i = 0; i < nonHostChars.length; i++) {
+            var hec = rest.indexOf(nonHostChars[i]);
+            if (hec !== -1 && (hostEnd === -1 || hec < hostEnd))
+                hostEnd = hec;
+        }
+        // if we still have not hit it, then the entire thing is a host.
+        if (hostEnd === -1)
+            hostEnd = rest.length;
+
+        this.host = rest.slice(0, hostEnd);
+        rest = rest.slice(hostEnd);
+
+        // pull out port.
+        this.parseHost();
+
+        // we've indicated that there is a hostname,
+        // so even if it's empty, it has to be present.
+        this.hostname = this.hostname || '';
+
+        // if hostname begins with [ and ends with ]
+        // assume that it's an IPv6 address.
+        var ipv6Hostname = this.hostname[0] === '[' &&
+            this.hostname[this.hostname.length - 1] === ']';
+
+        // validate a little.
+        if (!ipv6Hostname) {
+            var hostparts = this.hostname.split(/\./);
+            for (var i = 0, l = hostparts.length; i < l; i++) {
+                var part = hostparts[i];
+                if (!part) continue;
+                if (!part.match(hostnamePartPattern)) {
+                    var newpart = '';
+                    for (var j = 0, k = part.length; j < k; j++) {
+                        if (part.charCodeAt(j) > 127) {
+                            // we replace non-ASCII char with a temporary placeholder
+                            // we need this to make sure size of hostname is not
+                            // broken by replacing non-ASCII by nothing
+                            newpart += 'x';
+                        } else {
+                            newpart += part[j];
+                        }
+                    }
+                    // we test again with ASCII char only
+                    if (!newpart.match(hostnamePartPattern)) {
+                        var validParts = hostparts.slice(0, i);
+                        var notHost = hostparts.slice(i + 1);
+                        var bit = part.match(hostnamePartStart);
+                        if (bit) {
+                            validParts.push(bit[1]);
+                            notHost.unshift(bit[2]);
+                        }
+                        if (notHost.length) {
+                            rest = '/' + notHost.join('.') + rest;
+                        }
+                        this.hostname = validParts.join('.');
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (this.hostname.length > hostnameMaxLen) {
+            this.hostname = '';
+        } else {
+            // hostnames are always lower case.
+            this.hostname = this.hostname.toLowerCase();
+        }
+
+        if (!ipv6Hostname) {
+            // IDNA Support: Returns a punycoded representation of "domain".
+            // It only converts parts of the domain name that
+            // have non-ASCII characters, i.e. it doesn't matter if
+            // you call it with a domain that already is ASCII-only.
+            this.hostname = punycode.toASCII(this.hostname);
+        }
+
+        var p = this.port ? ':' + this.port : '';
+        var h = this.hostname || '';
+        this.host = h + p;
+        this.href += this.host;
+
+        // strip [ and ] from the hostname
+        // the host field still retains them, though
+        if (ipv6Hostname) {
+            this.hostname = this.hostname.substr(1, this.hostname.length - 2);
+            if (rest[0] !== '/') {
+                rest = '/' + rest;
+            }
+        }
+    }
+
+    // now rest is set to the post-host stuff.
+    // chop off any delim chars.
+    if (!unsafeProtocol[lowerProto]) {
+
+        // First, make 100% sure that any "autoEscape" chars get
+        // escaped, even if encodeURIComponent doesn't think they
+        // need to be.
+        for (var i = 0, m = autoEscape.length; i < m; i++) {
+            var ae = autoEscape[i];
+            if (rest.indexOf(ae) === -1)
+                continue;
+            var esc = encodeURIComponent(ae);
+            if (esc === ae) {
+                esc = escape(ae);
+            }
+            rest = rest.split(ae).join(esc);
+        }
+    }
+
+
+    // chop off from the tail first.
+    var hash = rest.indexOf('#');
+    if (hash !== -1) {
+        // got a fragment string.
+        this.hash = rest.substr(hash);
+        rest = rest.slice(0, hash);
+    }
+    var qm = rest.indexOf('?');
+    if (qm !== -1) {
+        this.search = rest.substr(qm);
+        this.query = rest.substr(qm + 1);
+        if (parseQueryString) {
+            this.query = querystring.parse(this.query);
+        }
+        rest = rest.slice(0, qm);
+    } else if (parseQueryString) {
+        // no query string, but parseQueryString still requested
+        this.search = '';
+        this.query = {};
+    }
+    if (rest) this.pathname = rest;
+    if (slashedProtocol[lowerProto] &&
+        this.hostname && !this.pathname) {
+        this.pathname = '/';
+    }
+
+    //to support http.request
+    if (this.pathname || this.search) {
+        var q = this.pathname || '';
+        var s = this.search || '';
+        this.path = q + s;
+    }
+
+    // finally, reconstruct the href based on what has been validated.
+    this.href = this.format();
+    return this;
+};
+
+// format a parsed object into a url string
+function urlFormat(obj) {
+    // ensure it's an object, and not a string url.
+    // If it's an obj, this is a no-op.
+    // this way, you can call url_format() on strings
+    // to clean up potentially wonky urls.
+    if (util.isString(obj)) obj = urlParse(obj);
+    if (!(obj instanceof Url)) return Url.prototype.format.call(obj);
+    // @ts-ignore
+    return obj.format();
+}
+
+Url.prototype.format = function () {
+    var auth = this.auth || '';
+    if (auth) {
+        auth = encodeURIComponent(auth);
+        auth = auth.replace(/%3A/i, ':');
+        auth += '@';
+    }
+
+    var protocol = this.protocol || '',
+        pathname = this.pathname || '',
+        hash = this.hash || '',
+        host: any = false,
+        query = '';
+
+    if (this.host) {
+        host = auth + this.host;
+    } else if (this.hostname) {
+        host = auth + (this.hostname.indexOf(':') === -1 ?
+            this.hostname :
+            '[' + this.hostname + ']');
+        if (this.port) {
+            host += ':' + this.port;
+        }
+    }
+
+    if (this.query &&
+        util.isObject(this.query) &&
+        Object.keys(this.query).length) {
+        query = querystring.stringify(this.query);
+    }
+
+    var search = this.search || (query && ('?' + query)) || '';
+
+    if (protocol && protocol.substr(-1) !== ':') protocol += ':';
+
+    // only the slashedProtocols get the //.  Not mailto:, xmpp:, etc.
+    // unless they had them to begin with.
+    if (this.slashes ||
+        (!protocol || slashedProtocol[protocol]) && host !== false) {
+        host = '//' + (host || '');
+        if (pathname && pathname.charAt(0) !== '/') pathname = '/' + pathname;
+    } else if (!host) {
+        host = '';
+    }
+
+    if (hash && hash.charAt(0) !== '#') hash = '#' + hash;
+    if (search && search.charAt(0) !== '?') search = '?' + search;
+
+    pathname = pathname.replace(/[?#]/g, function (match) {
+        return encodeURIComponent(match);
+    });
+    search = search.replace('#', '%23');
+
+    return protocol + host + pathname + search + hash;
+};
+
+function urlResolve(source, relative) {
+    return urlParse(source, false, true).resolve(relative);
+}
+
+Url.prototype.resolve = function (relative) {
+    return this.resolveObject(urlParse(relative, false, true)).format();
+};
+
+function urlResolveObject(source, relative) {
+    if (!source) return relative;
+    return urlParse(source, false, true).resolveObject(relative);
+}
+
+Url.prototype.resolveObject = function (relative) {
+    if (util.isString(relative)) {
+        var rel = new Url();
+        rel.parse(relative, false, true);
+        relative = rel;
+    }
+
+    var result = new Url();
+    var tkeys = Object.keys(this);
+    for (var tk = 0; tk < tkeys.length; tk++) {
+        var tkey = tkeys[tk];
+        result[tkey] = this[tkey];
+    }
+
+    // hash is always overridden, no matter what.
+    // even href="" will remove it.
+    result.hash = relative.hash;
+
+    // if the relative url is empty, then there's nothing left to do here.
+    if (relative.href === '') {
+        result.href = result.format();
+        return result;
+    }
+
+    // hrefs like //foo/bar always cut to the protocol.
+    if (relative.slashes && !relative.protocol) {
+        // take everything except the protocol from relative
+        var rkeys = Object.keys(relative);
+        for (var rk = 0; rk < rkeys.length; rk++) {
+            var rkey = rkeys[rk];
+            if (rkey !== 'protocol')
+                result[rkey] = relative[rkey];
+        }
+
+        //urlParse appends trailing / to urls like http://www.example.com
+        if (slashedProtocol[result.protocol] &&
+            result.hostname && !result.pathname) {
+            result.path = result.pathname = '/';
+        }
+
+        result.href = result.format();
+        return result;
+    }
+
+    if (relative.protocol && relative.protocol !== result.protocol) {
+        // if it's a known url protocol, then changing
+        // the protocol does weird things
+        // first, if it's not file:, then we MUST have a host,
+        // and if there was a path
+        // to begin with, then we MUST have a path.
+        // if it is file:, then the host is dropped,
+        // because that's known to be hostless.
+        // anything else is assumed to be absolute.
+        if (!slashedProtocol[relative.protocol]) {
+            var keys = Object.keys(relative);
+            for (var v = 0; v < keys.length; v++) {
+                var k = keys[v];
+                result[k] = relative[k];
+            }
+            result.href = result.format();
+            return result;
+        }
+
+        result.protocol = relative.protocol;
+        if (!relative.host && !hostlessProtocol[relative.protocol]) {
+            var relPath = (relative.pathname || '').split('/');
+            while (relPath.length && !(relative.host = relPath.shift()));
+            if (!relative.host) relative.host = '';
+            if (!relative.hostname) relative.hostname = '';
+            if (relPath[0] !== '') relPath.unshift('');
+            if (relPath.length < 2) relPath.unshift('');
+            result.pathname = relPath.join('/');
+        } else {
+            result.pathname = relative.pathname;
+        }
+        result.search = relative.search;
+        result.query = relative.query;
+        result.host = relative.host || '';
+        result.auth = relative.auth;
+        result.hostname = relative.hostname || relative.host;
+        result.port = relative.port;
+        // to support http.request
+        if (result.pathname || result.search) {
+            var p = result.pathname || '';
+            var s = result.search || '';
+            result.path = p + s;
+        }
+        result.slashes = result.slashes || relative.slashes;
+        result.href = result.format();
+        return result;
+    }
+
+    var isSourceAbs = (result.pathname && result.pathname.charAt(0) === '/'),
+        isRelAbs = (
+            relative.host ||
+            relative.pathname && relative.pathname.charAt(0) === '/'
+        ),
+        mustEndAbs = (isRelAbs || isSourceAbs ||
+            (result.host && relative.pathname)),
+        removeAllDots = mustEndAbs,
+        srcPath = result.pathname && result.pathname.split('/') || [],
+        relPath = relative.pathname && relative.pathname.split('/') || [],
+        psychotic = result.protocol && !slashedProtocol[result.protocol];
+
+    // if the url is a non-slashed url, then relative
+    // links like ../.. should be able
+    // to crawl up to the hostname, as well.  This is strange.
+    // result.protocol has already been set by now.
+    // Later on, put the first path part into the host field.
+    if (psychotic) {
+        result.hostname = '';
+        result.port = null;
+        if (result.host) {
+            if (srcPath[0] === '') srcPath[0] = result.host;
+            else srcPath.unshift(result.host);
+        }
+        result.host = '';
+        if (relative.protocol) {
+            relative.hostname = null;
+            relative.port = null;
+            if (relative.host) {
+                if (relPath[0] === '') relPath[0] = relative.host;
+                else relPath.unshift(relative.host);
+            }
+            relative.host = null;
+        }
+        mustEndAbs = mustEndAbs && (relPath[0] === '' || srcPath[0] === '');
+    }
+
+    if (isRelAbs) {
+        // it's absolute.
+        result.host = (relative.host || relative.host === '') ?
+            relative.host : result.host;
+        result.hostname = (relative.hostname || relative.hostname === '') ?
+            relative.hostname : result.hostname;
+        result.search = relative.search;
+        result.query = relative.query;
+        srcPath = relPath;
+        // fall through to the dot-handling below.
+    } else if (relPath.length) {
+        // it's relative
+        // throw away the existing file, and take the new path instead.
+        if (!srcPath) srcPath = [];
+        srcPath.pop();
+        srcPath = srcPath.concat(relPath);
+        result.search = relative.search;
+        result.query = relative.query;
+    } else if (!util.isNullOrUndefined(relative.search)) {
+        // just pull out the search.
+        // like href='?foo'.
+        // Put this after the other two cases because it simplifies the booleans
+        if (psychotic) {
+            result.hostname = result.host = srcPath.shift();
+            //occationaly the auth can get stuck only in host
+            //this especially happens in cases like
+            //url.resolveObject('mailto:local1@domain1', 'local2@domain2')
+            var authInHost = result.host && result.host.indexOf('@') > 0 ?
+                result.host.split('@') : false;
+            if (authInHost) {
+                result.auth = authInHost.shift();
+                result.host = result.hostname = authInHost.shift();
+            }
+        }
+        result.search = relative.search;
+        result.query = relative.query;
+        //to support http.request
+        if (!util.isNull(result.pathname) || !util.isNull(result.search)) {
+            result.path = (result.pathname ? result.pathname : '') +
+                (result.search ? result.search : '');
+        }
+        result.href = result.format();
+        return result;
+    }
+
+    if (!srcPath.length) {
+        // no path at all.  easy.
+        // we've already handled the other stuff above.
+        result.pathname = null;
+        //to support http.request
+        if (result.search) {
+            result.path = '/' + result.search;
+        } else {
+            result.path = null;
+        }
+        result.href = result.format();
+        return result;
+    }
+
+    // if a url ENDs in . or .., then it must get a trailing slash.
+    // however, if it ends in anything else non-slashy,
+    // then it must NOT get a trailing slash.
+    var last = srcPath.slice(-1)[0];
+    var hasTrailingSlash = (
+        (result.host || relative.host || srcPath.length > 1) &&
+        (last === '.' || last === '..') || last === '');
+
+    // strip single dots, resolve double dots to parent dir
+    // if the path tries to go above the root, `up` ends up > 0
+    var up = 0;
+    for (var i = srcPath.length; i >= 0; i--) {
+        last = srcPath[i];
+        if (last === '.') {
+            srcPath.splice(i, 1);
+        } else if (last === '..') {
+            srcPath.splice(i, 1);
+            up++;
+        } else if (up) {
+            srcPath.splice(i, 1);
+            up--;
+        }
+    }
+
+    // if the path is allowed to go above the root, restore leading ..s
+    if (!mustEndAbs && !removeAllDots) {
+        for (; up--; up) {
+            srcPath.unshift('..');
+        }
+    }
+
+    if (mustEndAbs && srcPath[0] !== '' &&
+        (!srcPath[0] || srcPath[0].charAt(0) !== '/')) {
+        srcPath.unshift('');
+    }
+
+    if (hasTrailingSlash && (srcPath.join('/').substr(-1) !== '/')) {
+        srcPath.push('');
+    }
+
+    var isAbsolute = srcPath[0] === '' ||
+        (srcPath[0] && srcPath[0].charAt(0) === '/');
+
+    // put the host back
+    if (psychotic) {
+        result.hostname = result.host = isAbsolute ? '' :
+            srcPath.length ? srcPath.shift() : '';
+        //occationaly the auth can get stuck only in host
+        //this especially happens in cases like
+        //url.resolveObject('mailto:local1@domain1', 'local2@domain2')
+        var authInHost = result.host && result.host.indexOf('@') > 0 ?
+            result.host.split('@') : false;
+        if (authInHost) {
+            result.auth = authInHost.shift();
+            result.host = result.hostname = authInHost.shift();
+        }
+    }
+
+    mustEndAbs = mustEndAbs || (result.host && srcPath.length);
+
+    if (mustEndAbs && !isAbsolute) {
+        srcPath.unshift('');
+    }
+
+    if (!srcPath.length) {
+        result.pathname = null;
+        result.path = null;
+    } else {
+        result.pathname = srcPath.join('/');
+    }
+
+    //to support request.http
+    if (!util.isNull(result.pathname) || !util.isNull(result.search)) {
+        result.path = (result.pathname ? result.pathname : '') +
+            (result.search ? result.search : '');
+    }
+    result.auth = relative.auth || result.auth;
+    result.slashes = result.slashes || relative.slashes;
+    result.href = result.format();
+    return result;
+};
+
+Url.prototype.parseHost = function () {
+    var host = this.host;
+    var port: any = portPattern.exec(host);
+    if (port) {
+        port = port[0];
+        if (port !== ':') {
+            this.port = port.substr(1);
+        }
+        host = host.substr(0, host.length - port.length);
+    }
+    if (host) this.hostname = host;
+};

packages/nodejs/src/util/index.ts

@@ -0,0 +1,727 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var getOwnPropertyDescriptors = Object.getOwnPropertyDescriptors ||
+    function getOwnPropertyDescriptors(obj) {
+        var keys = Object.keys(obj);
+        var descriptors = {};
+        for (var i = 0; i < keys.length; i++) {
+            descriptors[keys[i]] = Object.getOwnPropertyDescriptor(obj, keys[i]);
+        }
+        return descriptors;
+    };
+
+var formatRegExp = /%[sdj%]/g;
+exports.format = function (f) {
+    if (!isString(f)) {
+        var objects = [];
+        for (var i = 0; i < arguments.length; i++) {
+            objects.push(inspect(arguments[i]));
+        }
+        return objects.join(' ');
+    }
+
+    var i = 1;
+    var args = arguments;
+    var len = args.length;
+    // @ts-ignore
+    var str = String(f).replace(formatRegExp, function (x) {
+        if (x === '%%') return '%';
+        if (i >= len) return x;
+        switch (x) {
+            case '%s': return String(args[i++]);
+            case '%d': return Number(args[i++]);
+            case '%j':
+                try {
+                    return JSON.stringify(args[i++]);
+                } catch (_) {
+                    return '[Circular]';
+                }
+            default:
+                return x;
+        }
+    });
+    for (var x = args[i]; i < len; x = args[++i]) {
+        if (isNull(x) || !isObject(x)) {
+            str += ' ' + x;
+        } else {
+            str += ' ' + inspect(x);
+        }
+    }
+    return str;
+};
+
+
+// Mark that a method should not be used.
+// Returns a modified function which warns once by default.
+// If --no-deprecation is set, then it is a no-op.
+exports.deprecate = function (fn, msg) {
+    // @ts-ignore
+    if (typeof process !== 'undefined' && process.noDeprecation === true) {
+        return fn;
+    }
+
+    // Allow for deprecating things in the process of starting up.
+    if (typeof process === 'undefined') {
+        return function () {
+            // @ts-ignore
+            return exports.deprecate(fn, msg).apply(this, arguments);
+        };
+    }
+
+    var warned = false;
+    function deprecated() {
+        if (!warned) {
+            // @ts-ignore
+            if (process.throwDeprecation) {
+                throw new Error(msg);
+                // @ts-ignore
+            } else if (process.traceDeprecation) {
+                console.trace(msg);
+            } else {
+                console.error(msg);
+            }
+            warned = true;
+        }
+        // @ts-ignore
+        return fn.apply(this, arguments);
+    }
+
+    return deprecated;
+};
+
+
+var debugs = {};
+var debugEnvRegex = /^$/;
+
+if (process.env.NODE_DEBUG) {
+    var debugEnv = process.env.NODE_DEBUG;
+    debugEnv = debugEnv.replace(/[|\\{}()[\]^$+?.]/g, '\\$&')
+        .replace(/\*/g, '.*')
+        .replace(/,/g, '$|^')
+        .toUpperCase();
+    debugEnvRegex = new RegExp('^' + debugEnv + '$', 'i');
+}
+exports.debuglog = function (set) {
+    set = set.toUpperCase();
+    if (!debugs[set]) {
+        if (debugEnvRegex.test(set)) {
+            var pid = process.pid;
+            debugs[set] = function () {
+                var msg = exports.format.apply(exports, arguments);
+                console.error('%s %d: %s', set, pid, msg);
+            };
+        } else {
+            debugs[set] = function () { };
+        }
+    }
+    return debugs[set];
+};
+
+
+/**
+ * Echos the value of a value. Trys to print the value out
+ * in the best way possible given the different types.
+ *
+ * @param {Object} obj The object to print out.
+ * @param {Object} opts Optional options object that alters the output.
+ */
+/* legacy: obj, showHidden, depth, colors*/
+function inspect(obj, opts?) {
+    // default options
+    var ctx: any = {
+        seen: [],
+        stylize: stylizeNoColor
+    };
+    // legacy...
+    if (arguments.length >= 3) ctx.depth = arguments[2];
+    if (arguments.length >= 4) ctx.colors = arguments[3];
+    if (isBoolean(opts)) {
+        // legacy...
+        ctx.showHidden = opts;
+    } else if (opts) {
+        // got an "options" object
+        exports._extend(ctx, opts);
+    }
+    // set default options
+    if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+    if (isUndefined(ctx.depth)) ctx.depth = 2;
+    if (isUndefined(ctx.colors)) ctx.colors = false;
+    if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+    if (ctx.colors) ctx.stylize = stylizeWithColor;
+    return formatValue(ctx, obj, ctx.depth);
+}
+exports.inspect = inspect;
+
+
+// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+inspect.colors = {
+    'bold': [1, 22],
+    'italic': [3, 23],
+    'underline': [4, 24],
+    'inverse': [7, 27],
+    'white': [37, 39],
+    'grey': [90, 39],
+    'black': [30, 39],
+    'blue': [34, 39],
+    'cyan': [36, 39],
+    'green': [32, 39],
+    'magenta': [35, 39],
+    'red': [31, 39],
+    'yellow': [33, 39]
+};
+
+// Don't use 'blue' not visible on cmd.exe
+inspect.styles = {
+    'special': 'cyan',
+    'number': 'yellow',
+    'boolean': 'yellow',
+    'undefined': 'grey',
+    'null': 'bold',
+    'string': 'green',
+    'date': 'magenta',
+    // "name": intentionally not styling
+    'regexp': 'red'
+};
+
+
+function stylizeWithColor(str, styleType) {
+    var style = inspect.styles[styleType];
+
+    if (style) {
+        return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+            '\u001b[' + inspect.colors[style][1] + 'm';
+    } else {
+        return str;
+    }
+}
+
+
+function stylizeNoColor(str, styleType) {
+    return str;
+}
+
+
+function arrayToHash(array) {
+    var hash = {};
+
+    array.forEach(function (val, idx) {
+        hash[val] = true;
+    });
+
+    return hash;
+}
+
+
+function formatValue(ctx, value, recurseTimes) {
+    // Provide a hook for user-specified inspect functions.
+    // Check that value is an object with an inspect function on it
+    if (ctx.customInspect &&
+        value &&
+        isFunction(value.inspect) &&
+        // Filter out the util module, it's inspect function is special
+        value.inspect !== exports.inspect &&
+        // Also filter out any prototype objects using the circular check.
+        !(value.constructor && value.constructor.prototype === value)) {
+        var ret = value.inspect(recurseTimes, ctx);
+        if (!isString(ret)) {
+            ret = formatValue(ctx, ret, recurseTimes);
+        }
+        return ret;
+    }
+
+    // Primitive types cannot have properties
+    var primitive = formatPrimitive(ctx, value);
+    if (primitive) {
+        return primitive;
+    }
+
+    // Look up the keys of the object.
+    var keys = Object.keys(value);
+    var visibleKeys = arrayToHash(keys);
+
+    if (ctx.showHidden) {
+        keys = Object.getOwnPropertyNames(value);
+    }
+
+    // IE doesn't make error fields non-enumerable
+    // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
+    if (isError(value)
+        && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+        return formatError(value);
+    }
+
+    // Some type of object without properties can be shortcutted.
+    if (keys.length === 0) {
+        if (isFunction(value)) {
+            var name = value.name ? ': ' + value.name : '';
+            return ctx.stylize('[Function' + name + ']', 'special');
+        }
+        if (isRegExp(value)) {
+            return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+        }
+        if (isDate(value)) {
+            return ctx.stylize(Date.prototype.toString.call(value), 'date');
+        }
+        if (isError(value)) {
+            return formatError(value);
+        }
+    }
+
+    var base = '', array = false, braces = ['{', '}'];
+
+    // Make Array say that they are Array
+    if (isArray(value)) {
+        array = true;
+        braces = ['[', ']'];
+    }
+
+    // Make functions say that they are functions
+    if (isFunction(value)) {
+        var n = value.name ? ': ' + value.name : '';
+        base = ' [Function' + n + ']';
+    }
+
+    // Make RegExps say that they are RegExps
+    if (isRegExp(value)) {
+        base = ' ' + RegExp.prototype.toString.call(value);
+    }
+
+    // Make dates with properties first say the date
+    if (isDate(value)) {
+        base = ' ' + Date.prototype.toUTCString.call(value);
+    }
+
+    // Make error with message first say the error
+    if (isError(value)) {
+        base = ' ' + formatError(value);
+    }
+
+    if (keys.length === 0 && (!array || value.length == 0)) {
+        return braces[0] + base + braces[1];
+    }
+
+    if (recurseTimes < 0) {
+        if (isRegExp(value)) {
+            return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+        } else {
+            return ctx.stylize('[Object]', 'special');
+        }
+    }
+
+    ctx.seen.push(value);
+
+    var output;
+    if (array) {
+        output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+    } else {
+        output = keys.map(function (key) {
+            return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+        });
+    }
+
+    ctx.seen.pop();
+
+    return reduceToSingleString(output, base, braces);
+}
+
+
+function formatPrimitive(ctx, value) {
+    if (isUndefined(value))
+        return ctx.stylize('undefined', 'undefined');
+    if (isString(value)) {
+        var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+            .replace(/'/g, "\\'")
+            .replace(/\\"/g, '"') + '\'';
+        return ctx.stylize(simple, 'string');
+    }
+    if (isNumber(value))
+        return ctx.stylize('' + value, 'number');
+    if (isBoolean(value))
+        return ctx.stylize('' + value, 'boolean');
+    // For some reason typeof null is "object", so special case here.
+    if (isNull(value))
+        return ctx.stylize('null', 'null');
+}
+
+
+function formatError(value) {
+    return '[' + Error.prototype.toString.call(value) + ']';
+}
+
+
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+    var output = [];
+    for (var i = 0, l = value.length; i < l; ++i) {
+        if (hasOwnProperty(value, String(i))) {
+            output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+                String(i), true));
+        } else {
+            output.push('');
+        }
+    }
+    keys.forEach(function (key) {
+        if (!key.match(/^\d+$/)) {
+            output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+                key, true));
+        }
+    });
+    return output;
+}
+
+
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+    var name, str, desc;
+    desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+    if (desc.get) {
+        if (desc.set) {
+            str = ctx.stylize('[Getter/Setter]', 'special');
+        } else {
+            str = ctx.stylize('[Getter]', 'special');
+        }
+    } else {
+        if (desc.set) {
+            str = ctx.stylize('[Setter]', 'special');
+        }
+    }
+    if (!hasOwnProperty(visibleKeys, key)) {
+        name = '[' + key + ']';
+    }
+    if (!str) {
+        if (ctx.seen.indexOf(desc.value) < 0) {
+            if (isNull(recurseTimes)) {
+                str = formatValue(ctx, desc.value, null);
+            } else {
+                str = formatValue(ctx, desc.value, recurseTimes - 1);
+            }
+            if (str.indexOf('\n') > -1) {
+                if (array) {
+                    str = str.split('\n').map(function (line) {
+                        return '  ' + line;
+                    }).join('\n').substr(2);
+                } else {
+                    str = '\n' + str.split('\n').map(function (line) {
+                        return '   ' + line;
+                    }).join('\n');
+                }
+            }
+        } else {
+            str = ctx.stylize('[Circular]', 'special');
+        }
+    }
+    if (isUndefined(name)) {
+        if (array && key.match(/^\d+$/)) {
+            return str;
+        }
+        name = JSON.stringify('' + key);
+        if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+            name = name.substr(1, name.length - 2);
+            name = ctx.stylize(name, 'name');
+        } else {
+            name = name.replace(/'/g, "\\'")
+                .replace(/\\"/g, '"')
+                .replace(/(^"|"$)/g, "'");
+            name = ctx.stylize(name, 'string');
+        }
+    }
+
+    return name + ': ' + str;
+}
+
+
+function reduceToSingleString(output, base, braces) {
+    var numLinesEst = 0;
+    var length = output.reduce(function (prev, cur) {
+        numLinesEst++;
+        if (cur.indexOf('\n') >= 0) numLinesEst++;
+        return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+    }, 0);
+
+    if (length > 60) {
+        return braces[0] +
+            (base === '' ? '' : base + '\n ') +
+            ' ' +
+            output.join(',\n  ') +
+            ' ' +
+            braces[1];
+    }
+
+    return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
+
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+exports.types = require('./support/types');
+
+function isArray(ar) {
+    return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+    return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+    return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+    return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+    return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+    return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+    return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+    return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+    return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+exports.types.isRegExp = isRegExp;
+
+function isObject(arg) {
+    return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+    return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+exports.types.isDate = isDate;
+
+function isError(e) {
+    return isObject(e) &&
+        (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+exports.types.isNativeError = isError;
+
+function isFunction(arg) {
+    return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+    return arg === null ||
+        typeof arg === 'boolean' ||
+        typeof arg === 'number' ||
+        typeof arg === 'string' ||
+        typeof arg === 'symbol' ||  // ES6 symbol
+        typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+exports.isBuffer = require('./support/isBuffer');
+
+function objectToString(o) {
+    return Object.prototype.toString.call(o);
+}
+
+
+function pad(n) {
+    return n < 10 ? '0' + n.toString(10) : n.toString(10);
+}
+
+
+var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+    'Oct', 'Nov', 'Dec'];
+
+// 26 Feb 16:19:34
+function timestamp() {
+    var d = new Date();
+    var time = [pad(d.getHours()),
+    pad(d.getMinutes()),
+    pad(d.getSeconds())].join(':');
+    return [d.getDate(), months[d.getMonth()], time].join(' ');
+}
+
+
+// log is just a thin wrapper to console.log that prepends a timestamp
+exports.log = function () {
+    console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+};
+
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * The Function.prototype.inherits from lang.js rewritten as a standalone
+ * function (not on Function.prototype). NOTE: If this file is to be loaded
+ * during bootstrapping this function needs to be rewritten using some native
+ * functions as prototype setup using normal JavaScript does not work as
+ * expected during bootstrapping (see mirror.js in r114903).
+ *
+ * @param {function} ctor Constructor function which needs to inherit the
+ *     prototype.
+ * @param {function} superCtor Constructor function to inherit prototype from.
+ */
+exports.inherits = require('inherits');
+
+exports._extend = function (origin, add) {
+    // Don't do anything if add isn't an object
+    if (!add || !isObject(add)) return origin;
+
+    var keys = Object.keys(add);
+    var i = keys.length;
+    while (i--) {
+        origin[keys[i]] = add[keys[i]];
+    }
+    return origin;
+};
+
+// @ts-ignore
+function hasOwnProperty(obj, prop) {
+    return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+var kCustomPromisifiedSymbol = typeof Symbol !== 'undefined' ? Symbol('util.promisify.custom') : undefined;
+
+exports.promisify = function promisify(original) {
+    if (typeof original !== 'function')
+        throw new TypeError('The "original" argument must be of type Function');
+
+    if (kCustomPromisifiedSymbol && original[kCustomPromisifiedSymbol]) {
+        // @ts-ignore
+        var fn = original[kCustomPromisifiedSymbol];
+        if (typeof fn !== 'function') {
+            throw new TypeError('The "util.promisify.custom" argument must be of type Function');
+        }
+        Object.defineProperty(fn, kCustomPromisifiedSymbol, {
+            value: fn, enumerable: false, writable: false, configurable: true
+        });
+        return fn;
+    }
+    // @ts-ignore
+    function fn() {
+        var promiseResolve, promiseReject;
+        var promise = new Promise(function (resolve, reject) {
+            promiseResolve = resolve;
+            promiseReject = reject;
+        });
+
+        var args = [];
+        for (var i = 0; i < arguments.length; i++) {
+            args.push(arguments[i]);
+        }
+        args.push(function (err, value) {
+            if (err) {
+                promiseReject(err);
+            } else {
+                promiseResolve(value);
+            }
+        });
+
+        try {
+            // @ts-ignore
+            original.apply(this, args);
+        } catch (err) {
+            promiseReject(err);
+        }
+
+        return promise;
+    }
+
+    Object.setPrototypeOf(fn, Object.getPrototypeOf(original));
+
+    if (kCustomPromisifiedSymbol) Object.defineProperty(fn, kCustomPromisifiedSymbol, {
+        value: fn, enumerable: false, writable: false, configurable: true
+    });
+    return Object.defineProperties(
+        fn,
+        getOwnPropertyDescriptors(original)
+    );
+}
+
+exports.promisify.custom = kCustomPromisifiedSymbol
+
+function callbackifyOnRejected(reason, cb) {
+    // `!reason` guard inspired by bluebird (Ref: https://goo.gl/t5IS6M).
+    // Because `null` is a special error value in callbacks which means "no error
+    // occurred", we error-wrap so the callback consumer can distinguish between
+    // "the promise rejected with null" or "the promise fulfilled with undefined".
+    if (!reason) {
+        var newReason = new Error('Promise was rejected with a falsy value');
+        // @ts-ignore
+        newReason.reason = reason;
+        reason = newReason;
+    }
+    return cb(reason);
+}
+
+function callbackify(original) {
+    if (typeof original !== 'function') {
+        throw new TypeError('The "original" argument must be of type Function');
+    }
+
+    // We DO NOT return the promise as it gives the user a false sense that
+    // the promise is actually somehow related to the callback's execution
+    // and that the callback throwing will reject the promise.
+    function callbackified() {
+        var args = [];
+        for (var i = 0; i < arguments.length; i++) {
+            args.push(arguments[i]);
+        }
+
+        var maybeCb = args.pop();
+        if (typeof maybeCb !== 'function') {
+            throw new TypeError('The last argument must be of type Function');
+        }
+        // @ts-ignore
+        var self = this;
+        var cb = function () {
+            return maybeCb.apply(self, arguments);
+        };
+        // In true node style we process the callback on `nextTick` with all the
+        // implications (stack, `uncaughtException`, `async_hooks`)
+        // @ts-ignore
+        original.apply(this, args)
+            .then(function (ret) { process.nextTick(cb.bind(null, null, ret)) },
+                function (rej) { process.nextTick(callbackifyOnRejected.bind(null, rej, cb)) });
+    }
+
+    Object.setPrototypeOf(callbackified, Object.getPrototypeOf(original));
+    Object.defineProperties(callbackified,
+        getOwnPropertyDescriptors(original));
+    return callbackified;
+}
+exports.callbackify = callbackify;

packages/nodejs/src/util/support/isBuffer.ts

@@ -0,0 +1,3 @@
+module.exports = function isBuffer(arg) {
+    return arg instanceof Buffer;
+}

packages/nodejs/src/util/support/isBufferBrowser.ts

@@ -0,0 +1,6 @@
+module.exports = function isBuffer(arg) {
+    return arg && typeof arg === 'object'
+        && typeof arg.copy === 'function'
+        && typeof arg.fill === 'function'
+        && typeof arg.readUInt8 === 'function';
+}

packages/nodejs/src/util/support/types.ts

@@ -0,0 +1,424 @@
+// Currently in sync with Node.js lib/internal/util/types.js
+// https://github.com/nodejs/node/commit/112cc7c27551254aa2b17098fb774867f05ed0d9
+
+'use strict';
+
+var isBuffer = require('./isBuffer');
+
+var isArgumentsObject = require('is-arguments');
+var isGeneratorFunction = require('is-generator-function');
+
+function uncurryThis(f) {
+    return f.call.bind(f);
+}
+
+var BigIntSupported = typeof BigInt !== 'undefined';
+var SymbolSupported = typeof Symbol !== 'undefined';
+var SymbolToStringTagSupported = SymbolSupported && typeof Symbol.toStringTag !== 'undefined';
+var Uint8ArraySupported = typeof Uint8Array !== 'undefined';
+var ArrayBufferSupported = typeof ArrayBuffer !== 'undefined';
+
+if (Uint8ArraySupported && SymbolToStringTagSupported) {
+    var TypedArrayPrototype = Object.getPrototypeOf(Uint8Array.prototype);
+
+    var TypedArrayProto_toStringTag =
+        uncurryThis(
+            Object.getOwnPropertyDescriptor(TypedArrayPrototype,
+                Symbol.toStringTag).get);
+
+}
+
+var ObjectToString = uncurryThis(Object.prototype.toString);
+
+var numberValue = uncurryThis(Number.prototype.valueOf);
+var stringValue = uncurryThis(String.prototype.valueOf);
+var booleanValue = uncurryThis(Boolean.prototype.valueOf);
+
+if (BigIntSupported) {
+    var bigIntValue = uncurryThis(BigInt.prototype.valueOf);
+}
+
+if (SymbolSupported) {
+    var symbolValue = uncurryThis(Symbol.prototype.valueOf);
+}
+
+function checkBoxedPrimitive(value, prototypeValueOf) {
+    if (typeof value !== 'object') {
+        return false;
+    }
+    try {
+        prototypeValueOf(value);
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+exports.isArgumentsObject = isArgumentsObject;
+
+exports.isGeneratorFunction = isGeneratorFunction;
+
+// Taken from here and modified for better browser support
+// https://github.com/sindresorhus/p-is-promise/blob/cda35a513bda03f977ad5cde3a079d237e82d7ef/index.js
+function isPromise(input) {
+    return (
+        (
+            typeof Promise !== 'undefined' &&
+            input instanceof Promise
+        ) ||
+        (
+            input !== null &&
+            typeof input === 'object' &&
+            typeof input.then === 'function' &&
+            typeof input.catch === 'function'
+        )
+    );
+}
+exports.isPromise = isPromise;
+
+function isArrayBufferView(value) {
+    if (ArrayBufferSupported && ArrayBuffer.isView) {
+        return ArrayBuffer.isView(value);
+    }
+
+    return (
+        isTypedArray(value) ||
+        isDataView(value)
+    );
+}
+exports.isArrayBufferView = isArrayBufferView;
+
+function isTypedArray(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) !== undefined;
+    } else {
+        return (
+            isUint8Array(value) ||
+            isUint8ClampedArray(value) ||
+            isUint16Array(value) ||
+            isUint32Array(value) ||
+            isInt8Array(value) ||
+            isInt16Array(value) ||
+            isInt32Array(value) ||
+            isFloat32Array(value) ||
+            isFloat64Array(value) ||
+            isBigInt64Array(value) ||
+            isBigUint64Array(value)
+        );
+    }
+}
+exports.isTypedArray = isTypedArray;
+
+function isUint8Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Uint8Array';
+    } else {
+        return (
+            ObjectToString(value) === '[object Uint8Array]' ||
+            // If it's a Buffer instance _and_ has a `.buffer` property,
+            // this is an ArrayBuffer based buffer; thus it's an Uint8Array
+            // (Old Node.js had a custom non-Uint8Array implementation)
+            isBuffer(value) && value.buffer !== undefined
+        );
+    }
+}
+exports.isUint8Array = isUint8Array;
+
+function isUint8ClampedArray(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Uint8ClampedArray';
+    } else {
+        return ObjectToString(value) === '[object Uint8ClampedArray]';
+    }
+}
+exports.isUint8ClampedArray = isUint8ClampedArray;
+
+function isUint16Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Uint16Array';
+    } else {
+        return ObjectToString(value) === '[object Uint16Array]';
+    }
+}
+exports.isUint16Array = isUint16Array;
+
+function isUint32Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Uint32Array';
+    } else {
+        return ObjectToString(value) === '[object Uint32Array]';
+    }
+}
+exports.isUint32Array = isUint32Array;
+
+function isInt8Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Int8Array';
+    } else {
+        return ObjectToString(value) === '[object Int8Array]';
+    }
+}
+exports.isInt8Array = isInt8Array;
+
+function isInt16Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Int16Array';
+    } else {
+        return ObjectToString(value) === '[object Int16Array]';
+    }
+}
+exports.isInt16Array = isInt16Array;
+
+function isInt32Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Int32Array';
+    } else {
+        return ObjectToString(value) === '[object Int32Array]';
+    }
+}
+exports.isInt32Array = isInt32Array;
+
+function isFloat32Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Float32Array';
+    } else {
+        return ObjectToString(value) === '[object Float32Array]';
+    }
+}
+exports.isFloat32Array = isFloat32Array;
+
+function isFloat64Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'Float64Array';
+    } else {
+        return ObjectToString(value) === '[object Float64Array]';
+    }
+}
+exports.isFloat64Array = isFloat64Array;
+
+function isBigInt64Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'BigInt64Array';
+    } else {
+        return ObjectToString(value) === '[object BigInt64Array]';
+    }
+}
+exports.isBigInt64Array = isBigInt64Array;
+
+function isBigUint64Array(value) {
+    if (Uint8ArraySupported && SymbolToStringTagSupported) {
+        return TypedArrayProto_toStringTag(value) === 'BigUint64Array';
+    } else {
+        return ObjectToString(value) === '[object BigUint64Array]';
+    }
+}
+exports.isBigUint64Array = isBigUint64Array;
+
+function isMapToString(value) {
+    return ObjectToString(value) === '[object Map]';
+}
+isMapToString.working = (
+    typeof Map !== 'undefined' &&
+    isMapToString(new Map())
+);
+
+function isMap(value) {
+    if (typeof Map === 'undefined') {
+        return false;
+    }
+
+    return isMapToString.working
+        ? isMapToString(value)
+        : value instanceof Map;
+}
+exports.isMap = isMap;
+
+function isSetToString(value) {
+    return ObjectToString(value) === '[object Set]';
+}
+isSetToString.working = (
+    typeof Set !== 'undefined' &&
+    isSetToString(new Set())
+);
+function isSet(value) {
+    if (typeof Set === 'undefined') {
+        return false;
+    }
+
+    return isSetToString.working
+        ? isSetToString(value)
+        : value instanceof Set;
+}
+exports.isSet = isSet;
+
+function isWeakMapToString(value) {
+    return ObjectToString(value) === '[object WeakMap]';
+}
+isWeakMapToString.working = (
+    typeof WeakMap !== 'undefined' &&
+    isWeakMapToString(new WeakMap())
+);
+function isWeakMap(value) {
+    if (typeof WeakMap === 'undefined') {
+        return false;
+    }
+
+    return isWeakMapToString.working
+        ? isWeakMapToString(value)
+        : value instanceof WeakMap;
+}
+exports.isWeakMap = isWeakMap;
+
+function isWeakSetToString(value) {
+    return ObjectToString(value) === '[object WeakSet]';
+}
+isWeakSetToString.working = (
+    typeof WeakSet !== 'undefined' &&
+    isWeakSetToString(new WeakSet())
+);
+function isWeakSet(value) {
+    return isWeakSetToString(value);
+    if (typeof WeakSet === 'undefined') {
+        return false;
+    }
+
+    return isWeakSetToString.working
+        ? isWeakSetToString(value)
+        : value instanceof WeakSet;
+}
+exports.isWeakSet = isWeakSet;
+
+function isArrayBufferToString(value) {
+    return ObjectToString(value) === '[object ArrayBuffer]';
+}
+isArrayBufferToString.working = (
+    typeof ArrayBuffer !== 'undefined' &&
+    // @ts-ignore
+    isArrayBufferToString(new ArrayBuffer())
+);
+function isArrayBuffer(value) {
+    if (typeof ArrayBuffer === 'undefined') {
+        return false;
+    }
+
+    return isArrayBufferToString.working
+        ? isArrayBufferToString(value)
+        : value instanceof ArrayBuffer;
+}
+exports.isArrayBuffer = isArrayBuffer;
+
+function isDataViewToString(value) {
+    return ObjectToString(value) === '[object DataView]';
+}
+isDataViewToString.working = (
+    typeof ArrayBuffer !== 'undefined' &&
+    typeof DataView !== 'undefined' &&
+    isDataViewToString(new DataView(new ArrayBuffer(1), 0, 1))
+);
+function isDataView(value) {
+    if (typeof DataView === 'undefined') {
+        return false;
+    }
+
+    return isDataViewToString.working
+        ? isDataViewToString(value)
+        : value instanceof DataView;
+}
+exports.isDataView = isDataView;
+
+function isSharedArrayBufferToString(value) {
+    return ObjectToString(value) === '[object SharedArrayBuffer]';
+}
+isSharedArrayBufferToString.working = (
+    typeof SharedArrayBuffer !== 'undefined' &&
+    // @ts-ignore
+    isSharedArrayBufferToString(new SharedArrayBuffer())
+);
+function isSharedArrayBuffer(value) {
+    if (typeof SharedArrayBuffer === 'undefined') {
+        return false;
+    }
+
+    return isSharedArrayBufferToString.working
+        ? isSharedArrayBufferToString(value)
+        : value instanceof SharedArrayBuffer;
+}
+exports.isSharedArrayBuffer = isSharedArrayBuffer;
+
+function isAsyncFunction(value) {
+    return ObjectToString(value) === '[object AsyncFunction]';
+}
+exports.isAsyncFunction = isAsyncFunction;
+
+function isMapIterator(value) {
+    return ObjectToString(value) === '[object Map Iterator]';
+}
+exports.isMapIterator = isMapIterator;
+
+function isSetIterator(value) {
+    return ObjectToString(value) === '[object Set Iterator]';
+}
+exports.isSetIterator = isSetIterator;
+
+function isGeneratorObject(value) {
+    return ObjectToString(value) === '[object Generator]';
+}
+exports.isGeneratorObject = isGeneratorObject;
+
+function isWebAssemblyCompiledModule(value) {
+    return ObjectToString(value) === '[object WebAssembly.Module]';
+}
+exports.isWebAssemblyCompiledModule = isWebAssemblyCompiledModule;
+
+function isNumberObject(value) {
+    return checkBoxedPrimitive(value, numberValue);
+}
+exports.isNumberObject = isNumberObject;
+
+function isStringObject(value) {
+    return checkBoxedPrimitive(value, stringValue);
+}
+exports.isStringObject = isStringObject;
+
+function isBooleanObject(value) {
+    return checkBoxedPrimitive(value, booleanValue);
+}
+exports.isBooleanObject = isBooleanObject;
+
+function isBigIntObject(value) {
+    return BigIntSupported && checkBoxedPrimitive(value, bigIntValue);
+}
+exports.isBigIntObject = isBigIntObject;
+
+function isSymbolObject(value) {
+    return SymbolSupported && checkBoxedPrimitive(value, symbolValue);
+}
+exports.isSymbolObject = isSymbolObject;
+
+function isBoxedPrimitive(value) {
+    return (
+        isNumberObject(value) ||
+        isStringObject(value) ||
+        isBooleanObject(value) ||
+        isBigIntObject(value) ||
+        isSymbolObject(value)
+    );
+}
+exports.isBoxedPrimitive = isBoxedPrimitive;
+
+function isAnyArrayBuffer(value) {
+    return Uint8ArraySupported && (
+        isArrayBuffer(value) ||
+        isSharedArrayBuffer(value)
+    );
+}
+exports.isAnyArrayBuffer = isAnyArrayBuffer;
+
+['isProxy', 'isExternal', 'isModuleNamespaceObject'].forEach(function (method) {
+    Object.defineProperty(exports, method, {
+        enumerable: false,
+        value: function () {
+            throw new Error(method + ' is not supported in userland');
+        }
+    });
+});

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/nukkit",
-    "version": "0.4.0",
+    "name": "@ccms/nukkit",
+    "version": "0.6.5",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,8 +24,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/common": "^0.4.0",
-        "@ms/container": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/common": "^0.6.4",
+        "@ccms/container": "^0.6.0"
     }
 }

packages/nukkit/src/command.ts

@@ -1,7 +1,7 @@
-import '@ms/nashorn'
+import '@ccms/nashorn'
 
-import { command, plugin } from '@ms/api'
-import { inject, provideSingleton, postConstruct } from '@ms/container'
+import { command, plugin } from '@ccms/api'
+import { inject, provideSingleton, postConstruct } from '@ccms/container'
 
 let PluginCommand = Java.type('cn.nukkit.command.PluginCommand');
 let CommandExecutor = Java.type('cn.nukkit.command.CommandExecutor');

packages/nukkit/src/console.ts

@@ -1,4 +1,4 @@
-import { MiaoScriptConsole } from '@ms/api'
+import { MiaoScriptConsole } from '@ccms/api'
 
 let Nukkit = base.getInstance().getServer();
 let CommandSender = Java.type('cn.nukkit.command.CommandSender')

packages/nukkit/src/event.ts

@@ -1,5 +1,5 @@
-import { event, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container'
+import { event, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container'
 
 const Nukkit: cn.nukkit.Server = base.getInstance().getServer();
 const Event = Java.type("cn.nukkit.event.Event");

packages/nukkit/src/index.ts

@@ -1,7 +1,7 @@
-/// <reference types="@ms/types/dist/typings/nukkit" />
+/// <reference types="@ccms/types/dist/typings/nukkit" />
 
-import { server } from '@ms/api'
-import { Container } from '@ms/container'
+import { server } from '@ccms/api'
+import { Container } from '@ccms/container'
 
 import { NukkitConsole } from './console';
 import './event';

packages/nukkit/src/server.ts

@@ -1,5 +1,5 @@
-import { server } from '@ms/api'
-import { provideSingleton } from '@ms/container';
+import { server } from '@ccms/api'
+import { provideSingleton } from '@ccms/container';
 
 let Nukkit: cn.nukkit.Server = base.getInstance().getServer();
 const File = Java.type("java.io.File");
@@ -42,6 +42,9 @@ export class NukkitServer implements server.Server {
     getNativePluginManager() {
         return Nukkit.getPluginManager() as any;
     }
+    getNettyPipeline() {
+        throw new Error("Method not implemented.");
+    }
     sendJson(sender: string | any, json: object | string): void {
         throw new Error("Method not implemented.");
     }

packages/nukkit/src/task.ts

@@ -1,5 +1,5 @@
-import { task, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container';
+import { task, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container';
 
 const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable');
 
@@ -15,6 +15,9 @@ export class NukkitTaskManager implements task.TaskManager {
     callSyncMethod(func: Function): any {
         return func()
     }
+    disable() {
+        base.getInstance().getServer().getScheduler().cancelTask(this.pluginInstance)
+    }
 }
 
 export class NukkitTask extends task.Task {

packages/ployfill/package.json

@@ -1,15 +1,12 @@
 {
-    "name": "@ms/ployfill",
-    "version": "0.4.0",
+    "name": "@ccms/ployfill",
+    "version": "0.6.5",
     "description": "MiaoScript ployfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "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/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -17,8 +14,8 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/i18n": "^0.4.0",
-        "@ms/nashorn": "^0.4.0",
+        "@ccms/i18n": "^0.6.4",
+        "@ccms/nashorn": "^0.6.4",
         "core-js": "^3.6.4"
     },
     "devDependencies": {

packages/ployfill/src/index.ts

@@ -1,11 +1,12 @@
-/// <reference types="@ms/nashorn" />
+/// <reference types="@ccms/nashorn" />
 
-import i18n from '@ms/i18n'
+import i18n from '@ccms/i18n'
 let ployfillStartTime = new Date().getTime();
 i18n.initialize();
 console.i18n("ms.ployfill.initialize");
 require('./es5-ext');
 require('core-js');
+require('./node-shim');
 global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 global.setGlobal('Blob', require('blob-polyfill').Blob)

packages/ployfill/src/node-shim.ts

@@ -0,0 +1,8 @@
+global.setGlobal('process', {
+    env: {
+        __noSuchProperty__: (prop) => {
+            return Packages.java.lang.System.getenv(prop)
+        }
+    },
+    platform: Packages.java.lang.System.getProperty("os.name")
+}, {})

packages/ployfill/src/xml-http-request.ts

@@ -1,4 +1,4 @@
-import '@ms/nashorn'
+import '@ccms/nashorn'
 
 const URL = Java.type("java.net.URL");
 const Files = Java.type("java.nio.file.Files");
@@ -82,12 +82,14 @@ export class XMLHttpRequest {
     private _url: string;
     private _async: boolean;
     private _mimeType: string;
+    private _requestHeaders: HttpHeader = {};
 
     private _status: number = 0;
     private _statusText: string = null;
     private _response: any;
+    private _responseText: any;
     private _responseURL: string;
-    private _responseHeaders: HttpHeader;
+    private _responseHeaders: HttpHeader = {};
 
     private _connection = null;
 
@@ -114,10 +116,10 @@ export class XMLHttpRequest {
         return this._statusText;
     }
     get response() {
-        return this._response ? JSON.parse(this._response) : this._response;
+        return this._response || this.get();
     }
     get responseText() {
-        return this._response;
+        return this._responseText;
     }
     get responseXML() {
         return this._response;
@@ -126,17 +128,17 @@ export class XMLHttpRequest {
         return this._responseURL;
     }
 
-    onload() { }
-    onerror(ex: Error) { }
-    onabort() { }
-    onprogress() { }
-    ontimeout(ex: Error) { }
-    onloadend() { }
-    onloadstart() { }
-    onreadystatechange() { }
+    public onload: () => void;
+    public onerror: (ex: Error) => void;
+    public onabort: () => void;
+    public onprogress: () => void;
+    public ontimeout: (ex: Error) => void;
+    public onloadend: () => void;
+    public onloadstart: () => void;
+    public onreadystatechange: () => void;
 
     setRequestHeader(key: string, val: string) {
-        this._connection.setRequestProperty(key, val);
+        this._requestHeaders[key] = val;
     }
     getResponseHeader(key: string): string {
         return this._responseHeaders[key];
@@ -151,6 +153,8 @@ export class XMLHttpRequest {
         this._mimeType = mimeType;
     }
     open(method: RequestMethod, url: string, async: boolean = true, user?: string, password?: string) {
+        if (this._readyState !== ReadyState.UNSENT) { throw new Error(`Error Status ${this._readyState}!`) }
+
         this._method = method;
         this._url = url;
         this._async = async;
@@ -169,33 +173,39 @@ export class XMLHttpRequest {
         this.setReadyState(ReadyState.OPENED);
     }
     send(body?: string | object): Future<string> {
+        for (const header in this._requestHeaders) {
+            this._connection.setRequestProperty(header, this._requestHeaders[header]);
+        }
         if (this._readyState !== ReadyState.OPENED) { throw new Error(`Error Status ${this._readyState}!`) }
         let future = executor.submit(new Callable({ call: () => this._send(body) }));
         if (!this._async) { future.get() }
         return future;
     }
     get() {
-        switch (this._responseType) {
-            case "json":
-                return this.response;
-            case "text":
-                return this.responseText;
-            default:
-                throw Error(`Unsupport ResponseType: ${this._responseType} !`)
+        if (this._response === undefined) {
+            switch (this._responseType) {
+                case "json":
+                    return this._response = JSON.parse(this._responseText);
+                case "text":
+                    return this._response = this._responseText;
+                default:
+                    throw Error(`Unsupport ResponseType: ${this._responseType} !`)
+            }
         }
+        return this._response;
     }
     abort() {
         this._connection.disconnect();
-        this.onabort();
+        this.onabort && this.onabort();
     }
 
     private _send(body?: string | object) {
         try {
             this._connection.connect();
-            this.onloadstart();
+            this.onloadstart && this.onloadstart();
             if (body) {
                 let bodyType = Object.prototype.toString.call(body);
-                if (bodyType !== '[object String]') { throw new Error(`body(${bodyType}) must be string!`) }
+                if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string!`) }
                 var out = this._connection.getOutputStream();
                 out.write(new JavaString(body).getBytes(UTF_8));
                 out.flush();
@@ -204,15 +214,15 @@ export class XMLHttpRequest {
             this.setReadyState(ReadyState.LOADING);
             this._status = this._connection.getResponseCode();
             this._statusText = this._connection.getResponseMessage();
-            this.setResponseHeaders(this._connection.getHeaderFields());
             if (this._status >= 0 && this._status < 300) {
-                this._response = this.readOutput(this._connection.getInputStream());
+                this._responseText = this.readOutput(this._connection.getInputStream());
             } else if (this._status >= 300 && this._status < 400) {
                 this._responseURL = this.getResponseHeader('Location');
             } else {
-                this._response = this.readOutput(this._connection.getErrorStream());
+                this._responseText = this.readOutput(this._connection.getErrorStream());
             }
-            this.onloadend();
+            this.setResponseHeaders(this._connection.getHeaderFields());
+            this.onloadend && this.onloadend();
         } catch (ex) {
             if (ex instanceof SocketTimeoutException && this.ontimeout) {
                 return this.ontimeout(ex)
@@ -227,15 +237,14 @@ export class XMLHttpRequest {
     }
 
     private setResponseHeaders(header: any) {
-        this._responseHeaders = {};
-        header.forEach((key, value) => {
+        header.forEach((key: string | number, value: string | any[]) => {
             this._responseHeaders[key] = value[value.length - 1]
         });
     }
 
     private setReadyState(state: ReadyState) {
         this._readyState = state;
-        this.onreadystatechange();
+        this.onreadystatechange && this.onreadystatechange();
     }
 
     private readOutput(input: any) {

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/plugin",
-    "version": "0.4.0",
+    "name": "@ccms/plugin",
+    "version": "0.6.5",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -22,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@types/js-yaml": "^3.12.2",
+        "@types/js-yaml": "^3.12.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/common": "^0.4.0",
-        "@ms/container": "^0.4.0",
-        "@ms/i18n": "^0.4.0",
+        "@ccms/api": "^0.6.5",
+        "@ccms/common": "^0.6.4",
+        "@ccms/container": "^0.6.0",
+        "@ccms/i18n": "^0.6.4",
         "js-yaml": "^3.13.1"
     }
 }

packages/plugin/src/constants.ts

@@ -1,7 +1,13 @@
 export const METADATA_KEY = {
-    plugin: "@ms/plugin:plugin",
-    cmd: "@ms/plugin:cmd",
-    tab: "@ms/plugin:tab",
-    listener: "@ms/plugin:listener",
-    config: "@ms/plugin:config",
+    plugin: Symbol.for("@ccms/plugin:plugin"),
+    souece: Symbol.for("@ccms/plugin:souece"),
+    cmd: Symbol.for("@ccms/plugin:cmd"),
+    tab: Symbol.for("@ccms/plugin:tab"),
+    listener: Symbol.for("@ccms/plugin:listener"),
+    config: Symbol.for("@ccms/plugin:config"),
+    stage: {
+        load: Symbol.for("@ccms/plugin:stage:load"),
+        enable: Symbol.for("@ccms/plugin:stage:enable"),
+        disable: Symbol.for("@ccms/plugin:stage:disable")
+    }
 };

packages/plugin/src/decorators.ts

@@ -1,20 +1,24 @@
-import { injectable, decorate } from "@ms/container";
+import { injectable, decorate } from "@ccms/container";
 import { interfaces } from './interfaces'
 import { METADATA_KEY } from './constants'
-import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPluginTabCompleterMetadata, getPluginConfigMetadata } from './utils'
+import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPluginTabCompleterMetadata, getPluginConfigMetadata, getPluginStageMetadata, getPluginSources } from './utils'
 
 /**
  * MiaoScript plugin
  * @param metadata PluginMetadata
  */
 export function plugin(metadata: interfaces.PluginMetadata) {
-    return function(target: any) {
+    return function (target: any) {
         metadata.target = target;
+        metadata.type = "ioc";
         decorate(injectable(), target);
         Reflect.defineMetadata(METADATA_KEY.plugin, metadata, target);
         const previousMetadata: Map<string, interfaces.PluginMetadata> = getPluginMetadatas();
         previousMetadata.set(metadata.name, metadata);
         Reflect.defineMetadata(METADATA_KEY.plugin, previousMetadata, Reflect);
+        const previousSources: Map<string, interfaces.PluginMetadata> = getPluginSources();
+        previousSources.set(metadata.source.toString(), metadata);
+        Reflect.defineMetadata(METADATA_KEY.souece, previousSources, Reflect);
     };
 }
 
@@ -23,7 +27,7 @@ export function plugin(metadata: interfaces.PluginMetadata) {
  * @param metadata CommandMetadata
  */
 export function cmd(metadata: interfaces.CommandMetadata = {}) {
-    return function(target: any, key: string, value: any) {
+    return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || key;
         metadata.executor = key;
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
@@ -37,13 +41,13 @@ export function cmd(metadata: interfaces.CommandMetadata = {}) {
  * MiaoScript TabComplete
  * @param metadata TabCompleterMetadata
  */
-export function tab(metadata: interfaces.TabCompleterMetadata = {}) {
-    return function(target: any, key: string, value: any) {
+export function tab(metadata: interfaces.CommandMetadata = {}) {
+    return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || (key.startsWith('tab') ? key.split('tab', 2)[1] : key);
         if (!metadata.name) { return; }
         metadata.executor = key;
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
-        const previousMetadata: Map<string, interfaces.TabCompleterMetadata> = getPluginTabCompleterMetadata(target)
+        const previousMetadata: Map<string, interfaces.CommandMetadata> = getPluginTabCompleterMetadata(target)
         previousMetadata.set(metadata.name, metadata)
         Reflect.defineMetadata(METADATA_KEY.tab, previousMetadata, target.constructor);
     };
@@ -54,7 +58,7 @@ export function tab(metadata: interfaces.TabCompleterMetadata = {}) {
  * @param metadata ListenerMetadata
  */
 export function listener(metadata: interfaces.ListenerMetadata = {}) {
-    return function(target: any, key: string, value: any) {
+    return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || key;
         metadata.executor = key;
         const previousMetadata: interfaces.ListenerMetadata[] = getPluginListenerMetadata(target)
@@ -63,7 +67,7 @@ export function listener(metadata: interfaces.ListenerMetadata = {}) {
 }
 
 export function config(metadata: interfaces.ConfigMetadata = { version: 1, format: 'yml' }) {
-    return function(target: any, key: string) {
+    return function (target: any, key: string) {
         metadata.name = metadata.name || key;
         metadata.variable = key;
         const previousMetadata: Map<string, interfaces.ConfigMetadata> = getPluginConfigMetadata(target)
@@ -71,3 +75,24 @@ export function config(metadata: interfaces.ConfigMetadata = { version: 1, forma
         Reflect.defineMetadata(METADATA_KEY.config, previousMetadata, target.constructor);
     }
 }
+
+function stage(metadata: interfaces.ExecMetadata = {}, stage: string) {
+    return function (target: any, key: string, value: any) {
+        metadata.name = metadata.name || key;
+        metadata.executor = key;
+        const previousMetadata: interfaces.ExecMetadata[] = getPluginStageMetadata(target, stage)
+        Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...previousMetadata], target.constructor);
+    };
+}
+
+export function load(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'load')
+}
+
+export function enable(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'enable')
+}
+
+export function disable(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'disable')
+}

packages/plugin/src/interfaces.ts

@@ -1,6 +1,5 @@
-import { server, MiaoScriptConsole } from "@ms/api";
-import { METADATA_KEY } from './constants'
-import { injectable, inject, postConstruct } from "@ms/container";
+import { server, MiaoScriptConsole, event } from "@ccms/api";
+import { injectable, inject, postConstruct } from "@ccms/container";
 import { getPluginMetadata } from "./utils";
 
 export namespace interfaces {
@@ -8,11 +7,17 @@ export namespace interfaces {
     export abstract class Plugin {
         public description: PluginMetadata;
         public logger: Console;
+        @inject(server.Console)
+        private Console: MiaoScriptConsole;
 
-        constructor(@inject(server.Console) Console: MiaoScriptConsole) {
+        constructor() {
             this.description = getPluginMetadata(this)
+        }
+
+        @postConstruct()
+        private initialize() {
             // @ts-ignore
-            this.logger = new Console(this.description.prefix || this.description.name)
+            this.logger = new this.Console(this.description.prefix || this.description.name)
         }
 
         public load() { }
@@ -50,12 +55,16 @@ export namespace interfaces {
          * 插件源文件 必须指定为 __filename
          */
         source: string;
+        /**
+         * 插件类型 默认为 ioc 执行 MiaoScript 加载逻辑
+         */
+        type?: string;
         /**
          * 插件本体
          */
         target?: any;
     }
-    interface ExecMetadata extends BaseMetadata {
+    export interface ExecMetadata extends BaseMetadata {
         /**
          * 执行器
          */
@@ -67,13 +76,16 @@ export namespace interfaces {
          */
         paramtypes?: string[];
     }
-    export interface TabCompleterMetadata extends ExecMetadata {
-        /**
-         * 参数列表
-         */
-        paramtypes?: string[];
-    }
     export interface ListenerMetadata extends ExecMetadata {
+        /**
+         * 监听优先级
+         */
+        priority?: event.EventPriority;
+        /**
+         * 是否忽略已取消的事件
+         */
+        ignoreCancel?: boolean;
+
     }
     export interface ConfigMetadata extends BaseMetadata {
         /**

packages/plugin/src/manager.ts

@@ -1,12 +1,14 @@
-import i18n from '@ms/i18n'
-import { plugin, server, command, event } from '@ms/api'
-import { inject, provideSingleton, postConstruct, Container, ContainerInstance } from '@ms/container'
-import * as fs from '@ms/common/dist/fs'
+import i18n from '@ccms/i18n'
+import { plugin, server, command, event } from '@ccms/api'
+import { inject, provideSingleton, Container, ContainerInstance } from '@ccms/container'
+import * as fs from '@ccms/common/dist/fs'
 
-import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPlugin, getPluginTabCompleterMetadata, getPluginConfigMetadata } from './utils'
+import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPlugin, getPluginTabCompleterMetadata, getPluginConfigMetadata, getPluginStageMetadata, getPluginSources } from './utils'
 import { interfaces } from './interfaces'
 import { getConfigLoader } from './config'
 
+const Thread = Java.type('java.lang.Thread')
+
 @provideSingleton(plugin.PluginManager)
 export class PluginManagerImpl implements plugin.PluginManager {
     @inject(ContainerInstance)
@@ -22,25 +24,27 @@ export class PluginManagerImpl implements plugin.PluginManager {
     @inject(event.Event)
     private EventManager: event.Event
 
-    private pluginMap: Map<string, interfaces.Plugin>
+    private initialized: boolean = false
+    private pluginRequireMap: Map<string, any>
+    private pluginInstanceMap: Map<string, interfaces.Plugin>
+    private pluginMetadataMap: Map<string, interfaces.PluginMetadata>
 
-    @postConstruct()
     initialize() {
-        if (this.pluginInstance !== null) {
+        if (this.pluginInstance !== null && this.initialized !== true) {
             // 如果plugin不等于null 则代表是正式环境
-            console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance })
-            this.pluginMap = new Map()
+            console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
             console.i18n('ms.plugin.event.map', { count: this.EventManager.mapEventName().toFixed(0), type: this.serverType });
+            this.pluginRequireMap = new Map()
+            this.pluginInstanceMap = new Map()
+            this.pluginMetadataMap = getPluginSources();
+            this.initialized = true;
         }
     }
 
     scan(folder: string): void {
+        this.initialize()
         var plugin = fs.file(root, folder)
-        var files = []
-            // load common plugin
-            .concat(this.scanFolder(plugin))
-            // load space plugin
-            .concat(this.scanFolder(fs.file(plugin, this.serverType)))
+        var files = this.scanFolder(plugin)
         this.loadPlugins(files)
     }
 
@@ -52,62 +56,77 @@ export class PluginManagerImpl implements plugin.PluginManager {
         console.i18n("ms.plugin.manager.stage", { stage, plugin: plugin.description.name, version: plugin.description.version, author: plugin.description.author })
     }
 
+    private runPluginStage(plugin: interfaces.Plugin, stage: string, ext: Function) {
+        this.logStage(plugin, i18n.translate(`ms.plugin.manager.stage.${stage}`))
+        ext()
+        this.runCatch(plugin, stage)
+        this.runCatch(plugin, `${this.serverType}${stage}`)
+        this.execPluginStage(plugin, stage)
+    }
+
+    /**
+     * 从文件加载插件
+     * @param file java.io.File
+     */
+    loadFromFile(file: string): interfaces.Plugin {
+        let metadata = this.loadPlugin(file);
+        let plugin = this.buildPlugin(metadata && metadata.description ? metadata.description : this.pluginMetadataMap.get(file.toString()))
+        this.load(plugin)
+        this.enable(plugin)
+        return plugin;
+    }
+
     load(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.load"))
-            this.loadConfig(plugin)
-            this.runCatch(plugin, 'load')
-            this.runCatch(plugin, `${this.serverType}load`)
+            this.runPluginStage(plugin, 'load', () => {
+                this.loadConfig(plugin)
+            })
         })
     }
 
     enable(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.enable"))
-            this.registryCommand(plugin)
-            this.registryListener(plugin)
-            this.runCatch(plugin, 'enable')
-            this.runCatch(plugin, `${this.serverType}enable`)
+            this.runPluginStage(plugin, 'enable', () => {
+                this.registryCommand(plugin)
+                this.registryListener(plugin)
+            })
         })
     }
 
     disable(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.disable"))
-            this.unregistryCommand(plugin)
-            this.unregistryListener(plugin)
-            this.runCatch(plugin, 'disable')
-            this.runCatch(plugin, `${this.serverType}disable`)
+            this.runPluginStage(plugin, 'disable', () => {
+                this.unregistryCommand(plugin)
+                this.unregistryListener(plugin)
+            })
         })
     }
 
     reload(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((pl: interfaces.Plugin) => {
             this.disable(pl)
-            this.loadPlugin(pl.description.source)
-            pl = this.buildPlugin(getPlugin(pl.description.name))
-            this.load(pl)
-            this.enable(pl)
+            this.loadFromFile(pl.description.source)
         })
     }
 
     getPlugins() {
-        return this.pluginMap
+        return this.pluginInstanceMap
     }
 
     private runCatch(pl: any, func: string) {
         try {
             if (pl[func]) pl[func].call(pl)
         } catch (ex) {
-            console.console(`§6Plugin §b${pl.description.name} §6exec §d${func} §6function error §4${ex}`)
+            console.i18n("ms.plugin.manager.stage.exec.error", { plugin: pl.description.name, executor: func, error: ex })
             console.ex(ex)
         }
     }
 
-    private checkAndGet(name: string | interfaces.Plugin | undefined): Map<string, interfaces.Plugin> | interfaces.Plugin[] {
-        if (name == undefined) { return this.pluginMap }
-        if (typeof name == 'string' && this.pluginMap.has(name)) { return [this.pluginMap.get(name)] }
+    private checkAndGet(name: string | interfaces.Plugin | undefined | any): Map<string, interfaces.Plugin> | interfaces.Plugin[] {
+        if (name == this.pluginInstanceMap) { return this.pluginInstanceMap }
+        if (typeof name == 'string' && this.pluginInstanceMap.has(name)) { return [this.pluginInstanceMap.get(name)] }
         if (name instanceof interfaces.Plugin) { return [name as interfaces.Plugin] }
+        if (name.description || name.description.name) { return [name as interfaces.Plugin] }
         throw new Error(`Plugin ${JSON.stringify(name)} not exist!`)
     }
 
@@ -139,17 +158,19 @@ export class PluginManagerImpl implements plugin.PluginManager {
     * JS类型插件预加载
     */
     private loadJsPlugins(files: any[]) {
-        files.filter(file => file.name.endsWith(".js")).forEach(file => this.loadPlugin(file))
+        files.filter(file => file.name.endsWith(".js")).forEach(file => {
+            try {
+                this.loadPlugin(file)
+            } catch (ex) {
+                console.i18n("ms.plugin.manager.initialize.error", { name: file.name, ex })
+                console.ex(ex)
+            }
+        })
     }
 
     private loadPlugin(file: any) {
-        try {
-            this.updatePlugin(file)
-            this.createPlugin(file)
-        } catch (ex) {
-            console.i18n("ms.plugin.manager.initialize.error", { name: file.name, ex })
-            console.ex(ex)
-        }
+        this.updatePlugin(file)
+        return this.createPlugin(file.toString())
     }
 
     private updatePlugin(file: any) {
@@ -161,44 +182,60 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
 
     private allowProcess(servers: string[]) {
-        // Not set servers allow
-        if (!servers) return true
-        // include !type deny
+        // Not set servers -> allow
+        if (!servers || !servers.length) return true
+        // include !type -> deny
         let denyServers = servers.filter(svr => svr.startsWith("!"))
         if (denyServers.length !== 0) {
             return !denyServers.includes(`!${this.serverType}`)
         } else {
+            // only include -> allow
             return servers.includes(this.serverType)
         }
     }
 
     private createPlugin(file: string) {
         //@ts-ignore
-        require(file, { cache: false })
+        let instance = require(file, { cache: false })
+        this.pluginRequireMap.set(file, instance);
+        return instance;
     }
 
     private buildPlugins() {
+        let metadatas = [];
         let pluginMetadatas = getPluginMetadatas()
-        for (const [_, metadata] of pluginMetadatas) {
+        for (const [_, metadata] of pluginMetadatas) { metadatas.push(metadata); }
+        for (const [_, instance] of this.pluginRequireMap) { if (instance.description) { this.buildPlugin(instance.description) } }
+        for (const metadata of metadatas) {
             if (!this.allowProcess(metadata.servers)) { continue }
             this.buildPlugin(metadata)
         }
     }
 
     private buildPlugin(metadata: interfaces.PluginMetadata) {
-        try {
-            this.bindPlugin(metadata)
-            let pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
-            if (!(pluginInstance instanceof interfaces.Plugin)) {
-                console.i18n('ms.plugin.manager.build.not.extends', { source: metadata.source })
-                return
-            }
-            this.pluginMap.set(metadata.name, pluginInstance)
-            return pluginInstance;
-        } catch (ex) {
-            console.i18n("ms.plugin.manager.initialize.error", { name: metadata.name, ex })
-            console.ex(ex)
+        let pluginInstance: interfaces.Plugin;
+        switch (metadata.type) {
+            case "ioc":
+                try {
+                    this.bindPlugin(metadata)
+                    pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
+                    if (!(pluginInstance instanceof interfaces.Plugin)) {
+                        console.i18n('ms.plugin.manager.build.not.extends', { source: metadata.source })
+                        return
+                    }
+                } catch (ex) {
+                    console.i18n("ms.plugin.manager.initialize.error", { name: metadata.name, ex })
+                    console.ex(ex)
+                }
+                break;
+            case "basic":
+                pluginInstance = this.pluginRequireMap.get(metadata.source.toString())
+                break;
+            default:
+                throw new Error('§4不支持的插件类型 请检查加载器是否正常启用!')
         }
+        this.pluginInstanceMap.set(metadata.name, pluginInstance)
+        return pluginInstance;
     }
 
     private bindPlugin(metadata: interfaces.PluginMetadata) {
@@ -260,4 +297,18 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private unregistryListener(pluginInstance: interfaces.Plugin) {
         this.EventManager.disable(pluginInstance)
     }
+
+    private execPluginStage(pluginInstance: interfaces.Plugin, stageName: string) {
+        let stages = getPluginStageMetadata(pluginInstance, stageName);
+        for (const stage of stages) {
+            if (!this.allowProcess(stage.servers)) { continue }
+            console.i18n("ms.plugin.manager.stage.exec", { plugin: pluginInstance.description.name, name: stage.executor, stage: stageName, servers: stage.servers })
+            try {
+                pluginInstance[stage.executor].apply(pluginInstance)
+            } catch (error) {
+                console.i18n("ms.plugin.manager.stage.exec.error", { plugin: pluginInstance.description.name, executor: stage.executor, error })
+                console.ex(error)
+            }
+        }
+    }
 }

packages/plugin/src/utils.ts

@@ -1,6 +1,8 @@
 import { interfaces } from './interfaces'
 import { METADATA_KEY } from './constants'
 
+const pluginSourceCache = new Map<string, interfaces.PluginMetadata>();
+
 function getPlugins() {
     return [...getPluginMetadatas().values()].map((target) => target.target);
 }
@@ -9,6 +11,14 @@ function getPlugin(name: string) {
     return getPluginMetadatas().get(name);
 }
 
+function getPluginSources() {
+    let pluginSources: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
+        METADATA_KEY.souece,
+        Reflect
+    ) || pluginSourceCache;
+    return pluginSources;
+}
+
 function getPluginMetadatas() {
     let pluginMetadatas: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
         METADATA_KEY.plugin,
@@ -34,10 +44,10 @@ function getPluginCommandMetadata(target: any) {
 }
 
 function getPluginTabCompleterMetadata(target: any) {
-    let tabcompleterMetadata: Map<string, interfaces.TabCompleterMetadata> = Reflect.getMetadata(
+    let tabcompleterMetadata: Map<string, interfaces.CommandMetadata> = Reflect.getMetadata(
         METADATA_KEY.tab,
         target.constructor
-    ) || new Map<string, interfaces.TabCompleterMetadata>();
+    ) || new Map<string, interfaces.CommandMetadata>();
     return tabcompleterMetadata;
 }
 
@@ -57,13 +67,23 @@ function getPluginConfigMetadata(target: any) {
     return configMetadata;
 }
 
+function getPluginStageMetadata(target: any, stage: string) {
+    let stageMetadata: interfaces.ExecMetadata[] = Reflect.getMetadata(
+        METADATA_KEY.stage[stage],
+        target.constructor
+    ) || [];
+    return stageMetadata;
+}
+
 export {
     getPlugin,
     getPlugins,
+    getPluginSources,
     getPluginMetadatas,
     getPluginMetadata,
     getPluginCommandMetadata,
     getPluginTabCompleterMetadata,
     getPluginListenerMetadata,
-    getPluginConfigMetadata
+    getPluginConfigMetadata,
+    getPluginStageMetadata
 }

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
-    "name": "@ms/plugins",
-    "version": "0.4.0",
+    "name": "@ccms/plugins",
+    "version": "0.6.5",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -13,9 +13,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -28,8 +25,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/container": "^0.4.0",
-        "@ms/plugin": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/container": "^0.6.0",
+        "@ccms/plugin": "^0.6.5"
     }
 }

packages/plugins/public/index.html

@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-	<!-- UC应用模式 -->
-	<meta name="browsermode" content="application">
-	<!-- QQ应用模式 -->
-	<meta name="x5-page-mode" content="app">
-	<title>MiaoConsole 调试工具</title>
-	<script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/avalon2@2.2.10/dist/avalon.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/js-yaml@3.13.0/dist/js-yaml.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/messenger-hubspot@1.5.0/build/js/messenger.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/messenger-hubspot@1.5.0/build/js/messenger-theme-future.js"></script>
-
-	<script src="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/xterm.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/addons/fit/fit.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/addons/attach/attach.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/addons/fullscreen/fullscreen.js"></script>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/xterm.css" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@3.12.2/dist/addons/fullscreen/fullscreen.css">
-
-	<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.18.1/min/vs/loader.js"></script>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/monaco-editor@0.18.1/min/vs/editor/editor.main.css">
-
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css">
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/github-markdown-css@3.0.1/github-markdown.min.css">
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/messenger-hubspot@1.5.0/build/css/messenger.min.css">
-	<link rel="stylesheet"
-		href="https://cdn.jsdelivr.net/npm/messenger-hubspot@1.5.0/build/css/messenger-theme-future.min.css">
-
-	<script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
-
-	<!-- <script src="https://raw.githubusercontent.com/imaya/zlib.js/develop/bin/gzip.min.js"></script>
-	<script src="https://raw.githubusercontent.com/imaya/zlib.js/develop/bin/gunzip.min.js"></script> -->
-
-	<script src="js/message.js"></script>
-	<script src="js/term.js"></script>
-	<script src="js/websocket.js"></script>
-	<script src="js/main.js"></script>
-	<script src="js/editor.js"></script>
-</head>
-
-<body noscroll="true">
-	<div class="container-fluid bs-docs-container" :controller="main">
-		<h3>欢迎使用 MiaoConsole 调试控制台</h3>
-		<div class="input-group">
-			<span class="input-group-addon">服务器地址</span>
-			<input id="address" class="form-control" :duplex="@server" :keydown="@connect" style="width: 100%"></input>
-			<a class="input-group-addon btn" :click="@connect">连接</a>
-		</div>
-		<div class="panel panel-success" style="margin-top: 10px; height: 332px;">
-			<div class="panel-heading">服务器日志 当前服务器类型: {{@type}}</div>
-			<div id="terminal" style="height: 300px; width:100%;"></div>
-		</div>
-		<div class="progress progress-striped active" :visible='@classes.total != @classes.loaded'>
-			<div class="progress-bar progress-bar-primary" role="progressbar" aria-valuenow="60" aria-valuemin="0"
-				aria-valuemax="100" :css="{width: (@classes.loaded/@classes.total*100) +'%', 'min-width': '20em'}">
-				<span>正在加载 {{@type}} 类型定义 {{@classes.loaded}}/{{@classes.total}}({{~~(@classes.loaded/@classes.total*100)|percent}}%) </span>
-			</div>
-		</div>
-		<div class="panel panel-info" :visible='@classes.total == @classes.loaded && @classes.total != 0'>
-			<div class="panel-heading">代码编辑器</div>
-			<label class="col-sm-1 control-label">代码页</label>
-			<label :for="el in @codes" class="radio-inline">
-                <input type="radio" :duplex="@code" :attr="{value:el}"> {{el}}
-            </label>
-			<div id="editor" style="height: 450px; width:100%;"></div>
-		</div>
-	</div>
-</body>
-
-</html>

packages/plugins/public/js/editor.js

@@ -1,69 +0,0 @@
-let editor
-let monaco_path = 'https://cdn.jsdelivr.net/npm/monaco-editor@0.18.1/min'
-require.config({ paths: { 'vs': monaco_path + '/vs' } });
-window.MonacoEnvironment = { getWorkerUrl: () => proxy };
-let proxy = URL.createObjectURL(new Blob([`self.MonacoEnvironment = {baseUrl: '${monaco_path}/'};
-importScripts('${monaco_path}/vs/base/worker/workerMain.js');`], { type: 'text/javascript' }));
-
-function loadExtraLibs(ts_d_src, filter) {
-    let count = 0;
-    axios.get(`${ts_d_src}/index.d.ts`).then(async result => {
-        monaco.languages.typescript.javascriptDefaults.addExtraLib(result.data, 'file:///src/typings/index.d.ts')
-        let classes = result.data.split('\n').map(line => line.match(/.*\.\/(.*)".*/)).filter(line => line).map(dts => dts[1])
-        if (filter) {
-            classes = classes.filter(line => filter(line))
-        }
-        main.classes.total += classes.length
-        for (let fname of classes) {
-            if (count++ % 50 == 0) { await axios.get(`${ts_d_src}/${fname}`) }
-            loadExtraLib(`${ts_d_src}/${fname}`, `file:///src/typings/${fname}`)
-        }
-    })
-}
-
-function loadExtraLib(url, file) {
-    axios.get(url).then(result => monaco.languages.typescript.javascriptDefaults.addExtraLib(result.data, file)).finally(() => main.classes.loaded++)
-}
-
-require(["vs/editor/editor.main"], async function() {
-    main.classes.total = 0
-    main.classes.loaded = 0
-    editor = monaco.editor.create(document.getElementById('editor'), {
-        value: '',
-        language: 'javascript',
-        automaticLayout: true,
-        scrollBeyondLastLine: false,
-        theme: 'vs-dark'
-    });
-    main.load(editor)
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_S, function() {
-        main.save(editor)
-    })
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_R, function() {
-        main.send('execCode', getSelectContent(editor) || editor.getValue())
-    })
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_E, function() {
-        main.send('execCommand', getSelectContent(editor))
-    })
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_Q, function() {
-        main.switch(editor)
-    })
-    loadExtraLibs(`https://cdn.jsdelivr.net/gh/circlecloud/ms@master/packages/types/dist/typings/jdk`, (line) => line.startsWith('java.lang'))
-    if (main.type !== 'unknow') {
-        loadExtraLibs(`https://cdn.jsdelivr.net/gh/circlecloud/ms@master/packages/types/dist/typings/${main.type}`)
-    }
-});
-function getSelectContent(editor) {
-    let selInfo = editor.getSelection();
-    if (selInfo.startLineNumber === selInfo.endLineNumber) {
-        return editor.getModel().getLineContent(selInfo.startLineNumber).substr(selInfo.startColumn - 1, selInfo.endColumn - selInfo.startColumn);
-    } else {
-        let first = editor.getModel().getLineContent(selInfo.startLineNumber).substr(selInfo.startColumn - 1)
-        let content = '\n'
-        for (let i = selInfo.startLineNumber + 1; i < selInfo.endLineNumber; i++) {
-            content += editor.getModel().getLineContent(i) + '\n'
-        }
-        let last = editor.getModel().getLineContent(selInfo.endLineNumber).substr(0, selInfo.endColumn - 1)
-        return first + content + last
-    }
-}

packages/plugins/public/js/main.js

@@ -1,55 +0,0 @@
-var SPLIT_LINE = '\\M\\W\\S|T|S|S/L/T/'
-let serverKey = 'MiaoScript:server'
-let codeStorageKey = "MiaoScript:code:"
-var main = avalon.define({
-    $id: 'main',
-    server: window.localStorage.getItem(serverKey) || location.host,
-    type: 'unknow',
-    logs: '',
-    codes: ["default", "bukkit", "sponge", "bungee", "common", "test", "dev", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-    code: 'default',
-    classes: {
-        total: 0,
-        loaded: 0,
-    },
-    precent: () => {
-        return classes.total
-    },
-    log: (info) => {
-        info.split("\n").forEach((line) => { term.writeln(mcColor2ANSI(line + '§r')) })
-    },
-    send: (type, content) => {
-        if (!ws || ws.readyState != 1) { term.writeln('Please Connect to Server first!'); return; }
-        ws.send(`${type}${SPLIT_LINE}${content}`);
-    },
-    connect: (event = { key: 'Enter' }) => {
-        if (event.key !== "Enter") {
-            return;
-        }
-        connectWebSocket()
-    },
-    init: () => {
-        if (main.server) {
-            main.connect()
-        }
-    },
-    load: (editor) => {
-        editor.setValue(window.localStorage.getItem(codeStorageKey + main.code) || '')
-    },
-    save: (editor) => {
-        window.localStorage.setItem(codeStorageKey + main.code, editor.getValue())
-        showMessenger('代码页 ' + main.code + ' 保存成功!')
-    },
-    switch: (editor) => {
-        let index = main.codes.indexOf(main.code) + 1
-        main.code = main.codes[index == main.codes.length ? 0 : index]
-    }
-});
-
-main.$watch('code', (now, old, name) => {
-    window.localStorage.setItem(codeStorageKey + old, editor.getValue())
-    showMessenger('代码页 ' + old + ' 保存成功!')
-    editor.setValue(window.localStorage.getItem(codeStorageKey + now) || '// empty code page ' + now)
-})
-
-main.init()

packages/plugins/public/js/message.js

@@ -1,10 +0,0 @@
-$._messengerDefaults = {
-    extraClasses: 'messenger-fixed messenger-theme-future messenger-on-top messenger-on-right'
-};
-var showMessenger = function(message, type) {
-    return Messenger().post({
-        message: message,
-        type: type || 'info',
-        showClo6seButton: true
-    });
-};

packages/plugins/public/js/term.js

@@ -1,54 +0,0 @@
-Terminal.applyAddon(fit);
-var term = new Terminal();
-avalon.ready(() => {
-    term.open(document.getElementById('terminal'));
-    window.onresize = () => {
-        term.fit();
-    }
-    window.onresize()
-})
-term.on('data', (data) => {
-    if (data == '\r') {
-        term.writeln(data)
-    }
-});
-term.attachCustomKeyEventHandler(e => {
-    if (e.ctrlKey && e.key == 'c' && term.hasSelection()) {
-        showMessenger('内容已复制到粘贴板')
-        return false;
-    }
-    if (e.ctrlKey && e.key == 'v') {
-        return false;
-    }
-    return true;
-})
-var colorMap = []
-colorMap['0'] = '38;5;0'
-colorMap['1'] = '38;5;4'
-colorMap['2'] = '38;5;2'
-colorMap['3'] = '38;5;6'
-colorMap['4'] = '38;5;1'
-colorMap['5'] = '38;5;5'
-colorMap['6'] = '38;5;3'
-colorMap['7'] = '38;5;7'
-colorMap['8'] = '38;5;8'
-colorMap['9'] = '38;5;12'
-colorMap['a'] = '38;5;10'
-colorMap['b'] = '38;5;14'
-colorMap['c'] = '38;5;9'
-colorMap['d'] = '38;5;13'
-colorMap['e'] = '38;5;11'
-colorMap['f'] = '38;5;15'
-colorMap['r'] = '0'
-colorMap['l'] = '1'
-colorMap['n'] = '4'
-var regexMap = []
-for (const c in colorMap) {
-    regexMap[colorMap[c]] = new RegExp(`§${c}`, "g")
-}
-function mcColor2ANSI(str) {
-    for (const regex in regexMap) {
-        str = str.replace(regexMap[regex], `\u001b[${regex}m`)
-    }
-    return str;
-}

packages/plugins/public/js/websocket.js

@@ -1,30 +0,0 @@
-var ws;
-function connectWebSocket() {
-    if (ws && ws.readyState == 1) {
-        ws.close()
-    }
-    window.localStorage.setItem(serverKey, main.server)
-    ws = new WebSocket(`${location.protocol == 'http:' ? 'ws' : 'wss'}://${main.server}/ws`)
-    ws.onmessage = (event) => {
-        const [type, obj] = event.data.split(SPLIT_LINE)
-        switch (type) {
-            case "log":
-                main.log(obj)
-                break;
-            case "type":
-                main.type = obj;
-                break;
-        }
-    }
-    ws.onopen = () => {
-        main.send("execDetect", "type");
-    }
-    ws.onclose = (ev) => {
-        main.log(`Remote Server Close Connection... ${ev.code}`)
-        if (ev.code == 1006) {
-            setTimeout(() => {
-                main.connect()
-            }, 1000)
-        }
-    }
-}

packages/plugins/src/HelloWorld.ts

@@ -1,11 +1,11 @@
-/// <reference types="@ms/types/dist/typings/bukkit" />
-/// <reference types="@ms/types/dist/typings/sponge" />
-/// <reference types="@ms/types/dist/typings/bungee" />
-/// <reference types="@ms/types/dist/typings/nukkit" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
+/// <reference types="@ccms/types/dist/typings/nukkit" />
 
-import { server } from '@ms/api';
-import { inject } from '@ms/container';
-import { plugin, interfaces, cmd, listener, tab } from '@ms/plugin'
+import { server } from '@ccms/api';
+import { inject } from '@ccms/container';
+import { plugin, interfaces, cmd, listener, tab } from '@ccms/plugin'
 
 @plugin({ name: 'HelloWorld', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class HelloWorld extends interfaces.Plugin {

packages/plugins/src/MiaoChat.ts

@@ -1,21 +1,19 @@
-/// <reference types="@ms/types/dist/typings/bukkit" />
-/// <reference types="@ms/types/dist/typings/sponge" />
-/// <reference types="@ms/types/dist/typings/bungee" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
-import { server, plugin as pluginApi, channel } from '@ms/api'
-import { inject, optional } from '@ms/container';
-import { plugin, interfaces, cmd, listener, tab, config } from '@ms/plugin'
-import Tellraw from '@ms/common/dist/tellraw'
+import { server, plugin as pluginApi, channel, constants } from '@ccms/api'
+import { inject, optional } from '@ccms/container';
+import { plugin, interfaces, cmd, listener, tab, config, enable } from '@ccms/plugin'
+import Tellraw from '@ccms/common/dist/tellraw'
 
 const ByteArrayInputStream = Java.type("java.io.ByteArrayInputStream");
 const ByteArrayOutputStream = Java.type("java.io.ByteArrayOutputStream");
 const StandardCharsets = Java.type("java.nio.charset.StandardCharsets");
 const GZIPInputStream = Java.type("java.util.zip.GZIPInputStream");
 const GZIPOutputStream = Java.type("java.util.zip.GZIPOutputStream");
-const Consumer = Java.type("java.util.function.Consumer");
-const ByteArray = Java.type("byte[]")
-
 const BiConsumer = Java.type('java.util.function.BiConsumer')
+const ByteArray = Java.type("byte[]")
 
 class MiaoMessage {
     // public static final String CHANNEL = "MiaoChat:Default".toLowerCase();
@@ -146,7 +144,7 @@ export class MiaoChat extends interfaces.Plugin {
     }
 
     private compare(prop: string) {
-        return function(obj1: { [x: string]: any; }, obj2: { [x: string]: any; }) {
+        return function (obj1: { [x: string]: any; }, obj2: { [x: string]: any; }) {
             var val1 = obj1[prop];
             var val2 = obj2[prop];
             if (!isNaN(Number(val1)) && !isNaN(Number(val2))) {
@@ -184,9 +182,6 @@ 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)
-        })
     }
 
     spongeenable() {
@@ -205,6 +200,10 @@ 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)
         }
+    }
+
+    @enable({ servers: [constants.ServerType.Bukkit, constants.ServerType.Sponge] })
+    serverEnbale() {
         this.channelOff = this.Channel?.listen(this, MiaoMessage.CHANNEL, (data) => {
             this.sendChatAll(MiaoMessage.decode(data).json)
         })
@@ -244,7 +243,7 @@ export class MiaoChat extends interfaces.Plugin {
 
     @listener({ servers: ['bukkit'] })
     AsyncPlayerChatEvent(event: org.bukkit.event.player.AsyncPlayerChatEvent) {
-        this.sendChat(event.getPlayer(), event.getMessage(), function() {
+        this.sendChat(event.getPlayer(), event.getMessage(), function () {
             event.setCancelled(true);
         });
     }
@@ -260,7 +259,7 @@ export class MiaoChat extends interfaces.Plugin {
         if (plain.startsWith(Tellraw.duplicateChar)) {
             return;
         }
-        this.sendChat(player, plain, function() {
+        this.sendChat(player, plain, function () {
             event.setMessageCancelled(true)
         });
     }

packages/plugins/src/MiaoConsole.ts

@@ -1,250 +1,135 @@
-/// <reference types="@ms/types/dist/typings/bukkit" />
-/// <reference types="@ms/types/dist/typings/sponge" />
-/// <reference types="@ms/types/dist/typings/bungee" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
-import { plugin as pluginApi, server, task } from '@ms/api'
-import { plugin, interfaces, cmd } from '@ms/plugin'
-import { inject, Container, ContainerInstance, postConstruct } from '@ms/container'
-import * as reflect from '@ms/common/dist/reflect'
+import { plugin as pluginApi, server, task } from '@ccms/api'
+import { plugin, interfaces, cmd } from '@ccms/plugin'
+import { inject, ContainerInstance, Container } from '@ccms/container'
+import io, { Server as SocketIOServer, Socket as SocketIOSocket } from '@ccms/websocket'
+import * as fs from '@ccms/common/dist/fs'
 
-let clients: any[] = []
-let SPLIT_LINE = '\\M\\W\\S|T|S|S/L/T/'
-let MessageHandle = Symbol.for('MiaoConsole:MessageHandle')
-const refList: Array<{ server: string, future: string }> = [
-    { server: 'an', future: 'g' },//spigot 1.12.2
-    { server: 'getServerConnection', future: 'f' },//after spigot 1.14.4
-    { server: 'func_147137_ag', future: 'field_151274_e' }//catserver 1.12.2
-]
+const suffixMap = {
+    ts: 'typescript',
+    js: 'javascript',
+    yml: 'yaml'
+}
 
 @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
-
     @inject(ContainerInstance)
     private container: Container
-    @inject(pluginApi.PluginManager)
-    private PluginManager: pluginApi.PluginManager
     @inject(server.ServerType)
-    private ServerType: string
+    private serverType: string
     @inject(server.Server)
-    private Server: server.Server
+    private server: server.Server
     @inject(task.TaskManager)
-    private Task: task.TaskManager
+    private task: task.TaskManager
+    @inject(pluginApi.PluginManager)
+    private pluginManager: pluginApi.PluginManager
+    @inject(pluginApi.PluginFolder)
+    private pluginFolder: string;
 
-    private pipeline: any
+    private pipeline: any;
+    private socketIOServer: SocketIOServer;
 
     @cmd()
     mconsole(sender: any, command: string, args: string[]) {
-        switch (args[0]) {
-            case "reload":
-                this.PluginManager.reload(this)
-                break
-            default:
+        if (args[0] == 'reload') {
+            // @ts-ignore
+            require.clear('websocket');
+            this.pluginManager.reload(this);
+            return
         }
+        let tfunc = new Function('pipeline', args.join(' '))
+        tfunc.apply(this, [this.pipeline])
     }
 
     enable() {
-        MiaoConsole.GlobalLogger = this.logger
-        MiaoConsole.GlobalContainer = this.container
+        let count = 0;
+        let wait = this.task.create(() => {
+            this.pipeline = this.server.getNettyPipeline()
+            if (this.pipeline) {
+                wait.cancel()
+                this.createSocketIOServer()
+                this.startSocketIOServer()
+            }
+            if (count > 30) { wait.cancel() }
+            count++
+        }).later(20).timer(40).submit()
     }
 
     disable() {
-        if (this.pipeline) {
-            if (this.pipeline.names().contains('miao_detect')) {
-                this.pipeline.remove('miao_detect')
-            }
-            clients.forEach(c => c.close())
-            this.container.unbind(MessageHandle)
+        this.socketIOServer?.close()
+        if (this.container.isBound(io.Instance)) {
+            this.container.unbind(io.Instance)
         }
     }
 
-    bukkitenable() {
-        let Bukkit = Java.type('org.bukkit.Bukkit')
-        let consoleServer = reflect.on(Bukkit.getServer()).get('console').get()
-        this.reflectChannel(this.reflectPromise(consoleServer))
-        this.injectMiaoDetect()
+    createSocketIOServer() {
+        this.socketIOServer = io(this.pipeline, {
+            path: '/ws',
+            root: '/home/project/TSWorkSpace/ms/packages/plugins/public'
+        });
+        this.container.bind(io.Instance).toConstantValue(this.socketIOServer)
     }
 
-    spongeenable() {
-        let Sponge = Java.type('org.spongepowered.api.Sponge')
-        let consoleServer = reflect.on(Sponge.getServer()).get()
-        this.reflectChannel(this.reflectPromise(consoleServer))
-        this.injectMiaoDetect()
-    }
+    startSocketIOServer() {
+        let namespace = this.socketIOServer.of('/MiaoConsole')
+        namespace.on('connect', (client: SocketIOSocket) => {
+            this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
+            client.on('type', (fn) => {
+                fn && fn(this.serverType)
+                client.emit('log', `Currect Server Version is ${this.server.getVersion()}`)
+            })
+            client.on('command', (cmd) => {
+                setTimeout(() => this.server.dispatchConsoleCommand(cmd), 0)
+                client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
+            })
+            client.on('exec', (code) => {
+                try {
+                    client.emit('log', this.runCode(code, namespace, client))
+                } catch (ex) {
+                    client.emit('log', '§4代码执行异常\n' + console.stack(ex).join('\n'))
+                }
+            })
+            client.on('edit', (file: string, fn) => {
+                fn && fn(base.read(file), suffixMap[file.split('.', 2)[1]])
+            })
+            client.on('save', (name: string, content: string, fn) => {
+                this.logger.console(`§6客户端 §b${client.id} §6请求更新插件 §a${name} §6...`)
+                let file = fs.concat(root, this.pluginFolder, name + '.js')
+                if (!fs.exists(file)) { return fn('§6插件 §a' + name + ' §6尚未安装 §c请先创建空文件 或安装插件!') }
+                try {
+                    base.save(file, content)
+                    this.pluginManager.reload(name);
+                    fn('§6插件 §a' + name + ' §6更新成功!')
+                } catch (error) {
+                    this.logger.error(error)
+                    fn('§6插件 §a' + name + ' §4更新异常 错误: ' + error)
 
-    bungeeenable() {
-        let wait = this.Task.create(() => {
-            try {
-                // @ts-ignore
-                this.pipeline = reflect.on(base.getInstance().getProxy()).get('listeners').get().toArray()[0].pipeline()
-                this.injectMiaoDetect()
-                wait.cancel();
-            } catch (ex) {
-                this.logger.warn('Wait BungeeCord start ready to get netty channel pipeline. Err: ' + ex)
-            }
-        }).later(300).timer(500).submit()
-    }
-
-    reflectPromise(consoleServer) {
-        for (const ref of refList) {
-            try { return reflect.on(consoleServer).call(ref.server).get(ref.future).get().get(0) } catch (error) { }
-        }
-    }
-
-    reflectChannel(promise) {
-        if (!promise) { throw Error(`Can't found ServerConnection or ChannelFuture !`) }
-        this.pipeline = reflect.on(promise).get('channel').get().pipeline()
-    }
-
-    injectMiaoDetect() {
-        let MiaoDetectHandler = getMiaoDetectHandler();
-        this.pipeline.addFirst('miao_detect', new MiaoDetectHandler())
-        this.container.bind(MessageHandle).toFunction(this.onmessage.bind(this))
+                }
+            })
+            client.on('error', (error) => {
+                this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
+                this.logger.error(error)
+            })
+            client.on('disconnect', () => {
+                this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+            })
+        })
         this.logger.info('Netty Channel Pipeline Inject MiaoDetectHandler Successful!')
     }
 
-    onmessage(ctx: any, msg: any) {
-        let text: string = msg.text()
-        const [type, content] = text.split(SPLIT_LINE)
-        try {
-            var result = this[type](ctx, content)
-        } catch (ex) {
-            var result = '§4代码执行异常\n' + console.stack(ex).join('\n')
+    private runCode(code: string, namespace: any, client: any) {
+        let tfunc = new Function('namespace', 'client', `
+        var reflect = require('@ccms/common/dist/reflect');
+        var tempconcent = '';
+        function print(text) {
+            tempconcent += text + "\\n"
         }
-        result && this.sendResult(ctx, "log", result)
-    }
-
-    execCommand(ctx: any, cmd: string) {
-        setTimeout(() => this.Server.dispatchConsoleCommand(cmd), 0)
-        return `§6命令: §b${cmd} §a执行成功!`
-    }
-
-    execCode(ctx: any, code: string) {
-        return this.Task.callSyncMethod(() => eval(code)) + '';
-    }
-
-    execDetect(ctx: any, cmd: string) {
-        switch (cmd) {
-            case "type":
-                this.sendResult(ctx, "type", this.ServerType)
-                return `Currect Server Version is ${this.Server.getVersion()}`
-        }
-    }
-
-    sendResult(ctx: any, type: string, msg: string) {
-        let TextWebSocketFrame = getTextWebSocketFrame()
-        ctx.writeAndFlush(new TextWebSocketFrame(`${type}${SPLIT_LINE}${msg}`))
+        var result = eval(${JSON.stringify(code)});
+        return tempconcent + result
+        `)
+        return this.task.callSyncMethod(() => tfunc.apply(this, [namespace, client])) + ''
     }
 }
-
-function getMiaoDetectHandler() {
-    const ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter')
-    const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
-    const MiaoDetectHandler = Java.extend(ChannelInboundHandlerAdapter, {
-        channelRead: (ctx: any, channel: any) => {
-            channel.pipeline().addFirst('miaowebsocket', new WebSocketHandler())
-            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 TextWebSocketFrameMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.websocketx.TextWebSocketFrame'))
-    const TextWebSocketFrameHandler = Java.extend(SimpleChannelInboundHandler, {
-        userEventTriggered: (ctx: any, evt: any) => {
-            if (evt == 'HANDSHAKE_COMPLETE') {
-                clients.push(ctx.channel())
-                MiaoConsole.GlobalLogger.console(`new client §b${ctx.channel().id()} §aconnected...`)
-            }
-        },
-        acceptInboundMessage: (msg: any) => {
-            return TextWebSocketFrameMatcher.match(msg)
-        },
-        channelRead0: (ctx: any, msg: any) => {
-            MiaoConsole.GlobalContainer.get<any>(MessageHandle)(ctx, msg)
-        }
-    })
-    const WebSocketHandler = Java.extend(ChannelInboundHandlerAdapter, {
-        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,11 +1,11 @@
-/// <reference types="@ms/types" />
+/// <reference types="@ccms/types" />
 
-import { task, server } from "@ms/api";
-import { inject } from "@ms/container";
-import { plugin, interfaces, cmd } from "@ms/plugin";
+import { task, server } from "@ccms/api";
+import { inject } from "@ccms/container";
+import { plugin, interfaces, cmd } from "@ccms/plugin";
 
-import http from '@ms/common/dist/http'
-import * as fs from '@ms/common/dist/fs'
+import http from '@ccms/common/dist/http'
+import * as fs from '@ccms/common/dist/fs'
 
 @plugin({ name: 'MiaoPluginManager', prefix: 'MPM', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class MiaoPluginManager extends interfaces.Plugin {

packages/plugins/src/MiaoScriptPackageManager.ts

@@ -1,22 +1,54 @@
-import { plugin as pluginApi, task, server } from '@ms/api'
+import { plugin as pluginApi, task, server } from '@ccms/api'
 
-import * as fs from '@ms/common/dist/fs'
-import { inject } from '@ms/container';
-import { interfaces, plugin, cmd, tab } from '@ms/plugin'
+import { Translate } from '@ccms/i18n'
+import { inject } from '@ccms/container';
+import { interfaces, plugin, cmd, tab } from '@ccms/plugin'
+
+import * as fs from '@ccms/common/dist/fs'
+import http from '@ccms/common/dist/http'
 
 let help = [
-    '§6========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §b喵♂呜 §6=========',
-    '§6/mpm §ainstall §e<插件名称> §6- §3安装插件',
-    '§6/mpm §auninstall §e<插件名称> §6- §3卸载插件',
-    '§6/mpm §alist [install]§6- §3列出仓库插件[已安装的插件]',
-    '§6/mpm §aupdate §e<插件名称> §6- §3更新插件(无插件名称则更新源)',
-    '§6/mpm §aupgrade §e<插件名称> §6- §3及时更新插件(update需要重启生效)',
-    '§6/mpm §areload §e<插件名称> §6- §3重载插件(无插件名称则重载自身)',
-    '§6/mpm §arun §e<JS代码> §6- §3运行JS代码',
-    '§6/mpm §acreate §e<插件名称> [作者] [版本] [主命令] §6- §3通过模板创建名称',
-    '§6/mpm §crestart §6- §4重启MiaoScript脚本引擎'
+    '§6========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §bMiaoWoo §6=========',
+    '§6/mpm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
+    '§6/mpm §aload §e<插件名称>     §6-  §3安装本地插件',
+    '§6/mpm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
+    '§6/mpm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
+    '§6/mpm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
+    '§6/mpm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
+    '§6/mpm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
+    '§6/mpm §arun §e<JS代码>        §6-  §3运行JS代码',
+    '§6/mpm §adeploy §e<插件名称>   §6-  §3发布插件',
+    '§6/mpm §crestart             §6-  §4重启MiaoScript脚本引擎'
 ];
 
+let langMap = {
+    'main.command.not.exists': '§4未知的子命令: §c{command}',
+    'main.command.help.tip': '§6请执行 §b/{command} §ahelp §6查看帮助!',
+    'list.install.header': '§6当前 §bMiaoScript §6已安装下列插件:',
+    'list.install.body': '§6插件名称: §b{name} §6版本: §a{version} §6作者: §3{author}',
+    'list.header': '§6当前 §bMiaoScriptPackageCenter §6中存在下列插件:',
+    'list.body': '§6插件名称: §b{name} §6版本: §a{version} §6作者: §3{author} §6更新时间: §9{updated_at}',
+    'plugin.not.exists': '§6插件 §b{name} §c不存在!',
+    'plugin.unload.finish': '§6插件 §b{name} §a已卸载!',
+    'plugin.reload.finish': '§6插件 §b{name} §a重载完成!',
+    'plugin.name.empty': '§c请输入插件名称!',
+    'cloud.update.finish': '§6成功从 §aMiaoScriptPackageCenter §6获取到 §a{length} §6个插件!',
+    'cloud.not.exists': '§6当前 §aMiaoScriptPackageCenter §c不存在 §a{name} §c插件!',
+    'download.start': '§6开始下载插件: §b{name}',
+    'download.url': '§6插件下载地址: §b{url}',
+    'download.finish': '§6插件 §b{name} §a下载完毕 开始加载 ...',
+    'install.finish': '§6插件 §b{name} §a安装成功!',
+    'update.finish': '§6插件 §b{name} §a更新成功!',
+    'deploy.token.not.exists': '§4请先配置发布Token!',
+    'deploy.success': '§6插件 §b{name} §a发布成功! §6服务器返回: §a{msg}',
+    'deploy.fail': '§6插件 §b{name} §c发布失败! §6服务器返回: §c{msg}',
+    'run.script': '§b运行脚本:§r {script}',
+    'run.result': '§a返回结果:§r {result}',
+    'run.noresult': '§4没有返回结果!',
+}
+
+let fallbackMap = langMap
+
 @plugin({ name: 'MiaoScriptPackageManager', prefix: 'PM', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class MiaoScriptPackageManager extends interfaces.Plugin {
     @inject(pluginApi.PluginManager)
@@ -27,13 +59,20 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     private serverType: string;
     @inject(server.Server)
     private server: server.Server
+    @inject(pluginApi.PluginFolder)
+    private pluginFolder: string;
 
     private packageCache: any[] = [];
-    private packageNameCache: any[] = [];
+    private packageNameCache: string[] = [];
+
+    private translate: Translate;
 
     load() {
-        this.taskManager.create(() => {
-        }).async().submit();
+        this.translate = new Translate({
+            langMap,
+            fallbackMap
+        })
+        this.updateRepo(this.server.getConsoleSender())
     }
 
     @cmd()
@@ -41,142 +80,158 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         this.taskManager.create(() => this.main(sender, command, args)).async().submit();
     }
 
+    i18n(sender: any, name: string, params?: any) {
+        this.logger.sender(sender, this.translate.translate(name, params))
+    }
+
     main(sender: any, command: string, args: string[]) {
-        if (!args[0] || args[1] === 'help') {
-            this.logger.sender(sender, help);
+        let cmdKey = 'cmd' + args[0]
+        if (!this[cmdKey]) {
+            this.i18n(sender, 'main.command.not.exists', { command: args[0] })
+            this.i18n(sender, 'main.command.help.tip', { command })
             return;
         }
-        switch (args[0]) {
-            case "list":
-                if (args[1]) {
-                    this.logger.sender(sender, '§6当前 §bMiaoScript §6已安装下列插件:');
-                    this.pluginManager.getPlugins().forEach((plugin) => {
-                        var desc = plugin.description;
-                        this.logger.sender(sender, `§6插件名称: §b${desc.name} §6版本: §a${desc.version || '1.0'} §6作者: §3${desc.author || '未知'}`)
-                    })
-                } else {
-                    this.logger.sender(sender, '§6当前 §bMiaoScriptPackageCenter §6中存在下列插件:');
-                    for (var pkgName in this.packageCache) {
-                        var pkg = this.packageCache[pkgName];
-                        // console.sender(sender, '§6插件名称: §b%s §6版本: §a%s §6作者: §3%s'.format(pkg.name, pkg.version || '1.0', pkg.author || '未知'))
-                    }
-                }
-                break;
-            case "install":
-                // if (args.length > 1) {
-                //     download(sender, args[1]);
-                // } else {
-                //     console.sender(sender, '§c请输入插件名称!')
-                // }
-                break;
-            case "uninstall":
-                break;
-            case "update":
-                // if (args.length > 1) {
-                //     update(sender, args[1]);
-                // } else {
-                //     load();
-                //     console.sender(sender, "§a仓库缓存刷新成功 共存在 §b" + Object.keys(packageCache).length + " §a个插件!")
-                // }
-                break;
-            case "upgrade":
-                if (args[3] === "engine") {
-                    fs.del(fs.concat(root, '', ''))
-                }
-                break;
-            case "delete":
-                // if (args.length > 1) {
-                //     del(sender, args[1]);
-                // } else {
-                //     console.sender(sender, '§c请输入插件名称!')
-                // }
-                break;
-            case "load":
-                if (args.length > 1) {
-                    var pname = args[1];
-                    if (!this.pluginManager.getPlugins().has(pname)) {
-                        this.logger.sender(sender, `§6插件 §b${pname} §c不存在!`)
-                        return
-                    }
-                    this.pluginManager.load(pname)
-                    this.pluginManager.enable(pname)
-                    this.logger.sender(sender, `§6插件 §b${pname} §a已加载!`)
-                }
-                break;
-            case "unload":
-                if (args.length > 1) {
-                    var pname = args[1];
-                    if (!this.pluginManager.getPlugins().has(pname)) {
-                        this.logger.sender(sender, `§6插件 §b${pname} §c不存在!`)
-                        return
-                    }
-                    this.pluginManager.disable(pname)
-                    this.logger.sender(sender, `§6插件 §b${pname} §a已卸载!`)
-                }
-                break;
-            case "reload":
-                if (args.length > 1) {
-                    var pname = args[1];
-                    if (!this.pluginManager.getPlugins().has(pname)) {
-                        this.logger.sender(sender, `§6插件 §b${pname} §c不存在!`)
-                        return
-                    }
-                    this.pluginManager.reload(pname);
-                    this.logger.sender(sender, `§6插件 §b${pname} §a重载完成!`)
-                }
-                break;
-            case "restart":
-                if (this.serverType === "sponge") {
-                    setTimeout(() => this.server.dispatchConsoleCommand('sponge plugins reload'), 0)
-                    return
-                }
-                try {
-                    this.logger.sender(sender, '§6Reloading §3MiaoScript Engine...');
-                    ScriptEngineContextHolder.disableEngine();
-                    ScriptEngineContextHolder.enableEngine();
-                    this.logger.sender(sender, '§3MiaoScript Engine §6Reload §aSuccessful...');
-                } catch (ex) {
-                    this.logger.sender(sender, "§3MiaoScript Engine §6Reload §cError! ERR: " + ex);
-                    this.logger.sender(sender, this.logger.stack(ex));
-                }
-                break;
-            case "run":
-                args.shift();
-                try {
-                    var script = args.join(' ');
-                    this.logger.sender(sender, '§b运行脚本:§r', script);
-                    this.logger.sender(sender, '§a返回结果:§r', eval(script) || '§4没有返回结果!');
-                } catch (ex) {
-                    this.logger.sender(sender, this.logger.stack(ex));
-                }
-                break;
-            case "create":
-                this.logger.sender(sender, `§4当前暂不支持生成插件模板!`);
-                // var name = args[1];
-                // if (!name) {
-                //     this.logger.sender(sender, '§4参数错误 /mpm create <插件名称> [作者] [版本] [主命令]');
-                //     return;
-                // }
-                // // var result = template.create(http.get(self.config.template)).render({
-                // //     name: name,
-                // //     author: args[2] || 'MiaoWoo',
-                // //     version: args[3] || '1.0',
-                // //     command: args[4] || name.toLowerCase(),
-                // // });
-                // // fs.save(fs.file(__dirname, name + '.js'), result);
-                // this.logger.sender(sender, '§6插件 §a' + name + ' §6已生成到插件目录...');
-                break;
-            default:
-                this.logger.sender(sender, help);
-                break;
+        args.shift()
+        this[cmdKey](sender, ...args);
+    }
+
+    cmdhelp(sender: any) {
+        this.logger.sender(sender, help);
+    }
+
+    cmdload(sender: any, name: string) {
+        let pluginFile = fs.concat(__dirname + '', name);
+        if (!fs.exists(pluginFile)) {
+            this.i18n(sender, 'plugin.not.exists', { name: `${name}(${pluginFile})` })
+            return;
+        }
+        this.pluginManager.loadFromFile(fs.file(pluginFile));
+    }
+
+    cmdlist(sender: any, type: string = 'cloud') {
+        if (type == "install") {
+            this.i18n(sender, 'list.install.header')
+            this.pluginManager.getPlugins().forEach((plugin) => {
+                this.i18n(sender, 'list.install.body', plugin.description);
+            })
+        } else {
+            this.i18n(sender, 'list.header')
+            for (var pkgName in this.packageCache) {
+                this.i18n(sender, 'list.body', this.packageCache[pkgName]);
+            }
+        }
+    }
+
+    cmdinstall(sender: any, name: string) {
+        if (!name) { return this.i18n(sender, 'plugin.name.empty') }
+        this.download(sender, name);
+    }
+
+    cmdupdate(sender: any, name: string) {
+        if (name) {
+            this.update(sender, name);
+        } else {
+            this.updateRepo(sender)
+        }
+    }
+
+    cmdupgrade(sender: any, name: string) {
+        if (name == "system") {
+            let enginePath = fs.path(fs.file(fs.concat(root, 'node_modules', '@ccms')))
+            if (enginePath.startsWith(root)) {
+                base.delete(enginePath);
+                this.cmdrestart(sender);
+            }
+        }
+        if (this.checkPlugin(sender, name)) {
+            this.update(sender, name);
+            this.pluginManager.reload(name);
+        }
+    }
+
+    cmdunload(sender: any, name: string) {
+        if (this.checkPlugin(sender, name)) {
+            this.pluginManager.disable(name)
+            this.i18n(sender, 'plugin.unload.finish', { name })
+        }
+    }
+
+    cmdreload(sender: any, name: string) {
+        name = name || this.description.name
+        if (this.checkPlugin(sender, name)) {
+            this.pluginManager.reload(name);
+            this.i18n(sender, 'plugin.reload.finish', { name })
+        }
+    }
+
+    checkPlugin(sender: any, name: string) {
+        if (name && this.pluginManager.getPlugins().has(name)) { return true }
+        this.i18n(sender, 'plugin.not.exists', { name })
+        return false
+    }
+
+    checkCloudPlugin(sender: any, name: string) {
+        if (name && this.packageNameCache.includes(name)) { return true }
+        this.i18n(sender, 'cloud.not.exists', { name })
+        return false
+    }
+
+    cmdrestart(sender: any) {
+        if (this.serverType === "sponge") {
+            setTimeout(() => this.server.dispatchConsoleCommand('sponge plugins reload'), 0)
+            return
+        }
+        try {
+            this.logger.sender(sender, '§6Reloading §3MiaoScript Engine...');
+            ScriptEngineContextHolder.disableEngine();
+            Packages.java.lang.System.gc();
+            ScriptEngineContextHolder.enableEngine();
+            this.logger.sender(sender, '§3MiaoScript Engine §6Reload §aSuccessful...');
+        } catch (ex) {
+            this.logger.sender(sender, "§3MiaoScript Engine §6Reload §cError! ERR: " + ex);
+            this.logger.sender(sender, this.logger.stack(ex));
+        }
+    }
+
+    cmdrun(sender: any, ...args: any[]) {
+        try {
+            var script = args.join(' ');
+            this.i18n(sender, 'run.script', { script })
+            this.i18n(sender, 'run.result', { result: eval(script) || this.translate.translate('run.noresult') })
+        } catch (ex) {
+            this.logger.sender(sender, this.logger.stack(ex));
+        }
+    }
+
+    cmddeploy(sender: any, name: any) {
+        if (!process.env.AccessToken) { return this.i18n(sender, 'deploy.token.not.exists') }
+        this.taskManager.create(() => {
+            if (this.checkPlugin(sender, name)) {
+                let plugin: interfaces.Plugin = this.pluginManager.getPlugins().get(name);
+                let result = http.post("http://ms.yumc.pw/api/plugin/deploy?access_token=" + process.env.AccessToken, {
+                    name,
+                    author: plugin.description.author,
+                    version: plugin.description.version,
+                    source: base.read(plugin.description.source.toString())
+                })
+                this.i18n(sender, result.code == 200 ? 'deploy.success' : 'deploy.fail', { name, msg: result.msg })
+            }
+        }).async().submit()
+    }
+
+    update(sender: any, name: string) {
+        if (this.checkCloudPlugin(sender, name)) {
+            this.download(sender, name, true);
         }
     }
 
     @tab()
-    tabmpm(sender, command, args) {
-        if (args.length === 1) return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'help', 'create'];
+    tabmpm(sender: any, command: any, args: string | any[]) {
+        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'help', 'create', 'deploy'] }
         if (args.length > 1) {
             switch (args[0]) {
+                case "list":
+                    return ["install", "cloud"]
                 case "install":
                     return this.packageNameCache;
                 case "update":
@@ -184,8 +239,30 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
                 case "load":
                 case "unload":
                 case "reload":
+                case "deploy":
                     return [...this.pluginManager.getPlugins().keys()];
             }
         }
     }
+
+    updateRepo(sender: any) {
+        this.taskManager.create(() => {
+            let result = http.get('http://ms.yumc.pw/api/plugin/list');
+            for (const pl of result.data) { this.packageCache[pl.name] = pl; }
+            this.packageNameCache = Object.keys(this.packageCache);
+            this.i18n(sender, 'cloud.update.finish', { length: this.packageNameCache.length })
+        }).async().submit();
+    }
+
+    download(sender: any, name: string, update: boolean = false) {
+        this.taskManager.create(() => {
+            this.i18n(sender, 'download.start', { name })
+            this.i18n(sender, 'download.url', { url: this.packageCache[name].url })
+            let pluginFile = update ? fs.concat(this.pluginFolder, 'update', name + '.js') : fs.concat(this.pluginFolder, name + '.js')
+            http.download(this.packageCache[name].url, pluginFile)
+            this.i18n(sender, 'download.finish', { name })
+            this.pluginManager.loadFromFile(pluginFile)
+            this.i18n(sender, update ? 'update.finish' : 'install.finish', { name })
+        }).async().submit()
+    }
 }

packages/plugins/src/Test.ts

@@ -1,9 +1,9 @@
-import { plugin as pluginApi } from '@ms/api'
-import { plugin, interfaces, cmd, listener, tab } from '@ms/plugin'
-import { inject } from '@ms/container';
+import { plugin as pluginApi } from '@ccms/api'
+import { plugin, interfaces, cmd, listener, tab } from '@ccms/plugin'
+import { inject } from '@ccms/container';
 
-import * as reflect from '@ms/common/dist/reflect';
-import http from '@ms/common/dist/http';
+import * as reflect from '@ccms/common/dist/reflect';
+import http from '@ccms/common/dist/http';
 
 @plugin({ name: 'Test', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class Test extends interfaces.Plugin {

packages/plugins/tsconfig.json

@@ -3,7 +3,9 @@
     "compilerOptions": {
         "baseUrl": "src",
         "outDir": "dist",
-        "skipLibCheck": true
+        "skipLibCheck": true,
+        "sourceMap": false,
+        "inlineSourceMap": true
     },
     "exclude": [
         "dist",

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@ms/sponge",
-    "version": "0.4.0",
+    "name": "@ccms/sponge",
+    "version": "0.6.5",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,9 +12,6 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
-    "publishConfig": {
-        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
-    },
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
@@ -27,8 +24,8 @@
         "typescript": "^3.8.3"
     },
     "dependencies": {
-        "@ms/api": "^0.4.0",
-        "@ms/common": "^0.4.0",
-        "@ms/container": "^0.4.0"
+        "@ccms/api": "^0.6.5",
+        "@ccms/common": "^0.6.4",
+        "@ccms/container": "^0.6.0"
     }
 }

packages/sponge/src/channel.ts

@@ -1,5 +1,5 @@
-import { channel, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container'
+import { channel, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container'
 
 const Sponge = org.spongepowered.api.Sponge
 const RawDataListener = Java.type("org.spongepowered.api.network.RawDataListener")

packages/sponge/src/command.ts

@@ -1,5 +1,5 @@
-import { command, plugin } from "@ms/api";
-import { inject, provideSingleton } from "@ms/container";
+import { command, plugin } from "@ccms/api";
+import { inject, provideSingleton } from "@ccms/container";
 
 let Sponge = Java.type('org.spongepowered.api.Sponge');
 let Text = Java.type('org.spongepowered.api.text.Text');

packages/sponge/src/console.ts

@@ -1,5 +1,5 @@
-import '@ms/nashorn'
-import { MiaoScriptConsole } from '@ms/api'
+import '@ccms/nashorn'
+import { MiaoScriptConsole } from '@ccms/api'
 
 let Sponge = Java.type('org.spongepowered.api.Sponge');
 var Text = Java.type('org.spongepowered.api.text.Text');

packages/sponge/src/event.ts

@@ -1,5 +1,5 @@
-import { event, plugin } from '@ms/api'
-import { inject, provideSingleton } from '@ms/container';
+import { event, plugin } from '@ccms/api'
+import { inject, provideSingleton } from '@ccms/container';
 
 let Modifier = Java.type("java.lang.reflect.Modifier");
 let Order = Java.type("org.spongepowered.api.event.Order");

packages/sponge/src/index.ts

@@ -1,7 +1,7 @@
-/// <reference types="@ms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
 
-import { server } from '@ms/api'
-import { Container } from '@ms/container'
+import { server } from '@ccms/api'
+import { Container } from '@ccms/container'
 
 import { SpongeConsole } from './console';
 import './event';