Compare commits

...

12 Commits

Author SHA1 Message Date
7cf9718a9a v0.6.1 2020-05-07 17:18:38 +08:00
9693dc235f feat: update docs & MSPM
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-05-07 17:13:48 +08:00
40e9d1db6e feat: support source map & reload
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-05-07 17:12:15 +08:00
d50506ab9d v0.6.0 2020-05-03 00:15:06 +08:00
c34d3027e4 refactor: rename scope to @ccms
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-05-03 00:14:47 +08:00
edf8410cd1 v0.5.0 2020-04-26 10:24:49 +08:00
b0b4bbcc2b feat: merge stage exec & catch error
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-26 10:19:44 +08:00
e68689c560 feat: update plugin & websocket
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-24 16:42:36 +08:00
58353cb5b8 feat: support stage decorators and remove space plugin floder
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-24 15:38:00 +08:00
8c6b75ff10 fix: netty inject error
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-24 13:05:46 +08:00
d53287fc51 feat: support base64 source map
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-24 13:04:45 +08:00
13a3611ebd feat: update MiaoConsole
Signed-off-by: MiaoWoo <admin@yumc.pw>
2020-04-07 13:39:35 +08:00
81 changed files with 650 additions and 955 deletions

View File

@@ -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)

View File

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

View File

@@ -9,8 +9,9 @@
"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\"",
"publish": "yarn lerna exec \"npm publish --access=public\" --scope=\"@ccms/!(plugins|client|types)\"",
"ug": "yarn upgrade-interactive --latest",
"lp": "lerna publish"
},

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/api",
"version": "0.4.2",
"name": "@ccms/api",
"version": "0.6.1",
"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.2",
"@ccms/container": "^0.6.0",
"@ccms/ployfill": "^0.6.1",
"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"

View File

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

View File

@@ -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()

View File

@@ -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)
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 {
this.sourceMaps[fileName] = null;
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,26 @@ 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.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;
}

View File

@@ -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'
}
}

View File

@@ -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');
@@ -62,8 +62,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; }

View File

@@ -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'

View File

@@ -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;
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/bukkit",
"version": "0.4.2",
"name": "@ccms/bukkit",
"version": "0.6.1",
"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.2",
"@ms/common": "^0.4.2",
"@ms/container": "^0.4.0"
"@ccms/api": "^0.6.1",
"@ccms/common": "^0.6.1",
"@ccms/container": "^0.6.0"
}
}

View File

@@ -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")

View File

@@ -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');

View File

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

View File

@@ -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

View File

@@ -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';

View File

@@ -1,16 +1,9 @@
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 '@ms/common/dist/reflect'
import * as reflect from '@ccms/common/dist/reflect'
import chat from './enhance/chat'
const refList: Array<{ server: string, future: string }> = [
{ server: 'aq', future: 'g' },//spigot 1.8.8
{ 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
]
let Bukkit = org.bukkit.Bukkit;
@provideSingleton(server.Server)
@@ -68,14 +61,24 @@ export class BukkitServer implements server.Server {
private reflectPipeline() {
let consoleServer = reflect.on(Bukkit.getServer()).get('console').get()
let connection: any;
let promise: any;
for (const ref of refList) {
for (const method of constants.Reflect.Method.getServerConnection) {
try {
promise = reflect.on(consoleServer).call(ref.server).get(ref.future).get().get(0); break;
} catch (error) {
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 ServerConnection or ChannelFuture !"); return }
if (!promise) { console.error("Can't found listeningChannels!"); return }
this.pipeline = reflect.on(promise).get('channel').get().pipeline()
}
}

View File

@@ -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');

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/bungee",
"version": "0.4.2",
"name": "@ccms/bungee",
"version": "0.6.1",
"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.2",
"@ms/common": "^0.4.2",
"@ms/container": "^0.4.0"
"@ccms/api": "^0.6.1",
"@ccms/common": "^0.6.1",
"@ccms/container": "^0.6.0"
}
}

View File

@@ -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()

View File

@@ -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'));

View File

@@ -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")

View File

@@ -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");

View File

@@ -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';

View File

@@ -1,7 +1,7 @@
import { server, task } from '@ms/api'
import { provideSingleton, inject, postConstruct } from '@ms/container'
import { server, task } from '@ccms/api'
import { provideSingleton, inject, postConstruct } from '@ccms/container'
import * as reflect from '@ms/common/dist/reflect'
import * as reflect from '@ccms/common/dist/reflect'
let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();

View File

@@ -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')

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@ms/client",
"version": "0.4.2",
"name": "@ccms/client",
"version": "0.6.0",
"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",

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/common",
"version": "0.4.2",
"name": "@ccms/common",
"version": "0.6.1",
"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.1"
},
"gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
}

View File

@@ -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");

View File

@@ -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");

View File

@@ -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",

View File

@@ -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",

View File

@@ -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(

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/core",
"version": "0.4.2",
"name": "@ccms/core",
"version": "0.6.1",
"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.2",
"@ms/container": "^0.4.0"
"@ccms/api": "^0.6.1",
"@ccms/container": "^0.6.0"
},
"gitHead": "781524f83e52cad26d7c480513e3c525df867121"
}

View File

@@ -1,8 +1,8 @@
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 })
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 })
@provideSingleton(MiaoScriptCore)
class MiaoScriptCore {
@@ -25,14 +25,12 @@ class MiaoScriptCore {
loadServerConsole() {
//@ts-ignore
console = new this.Console();
global.setGlobal('console', new this.Console())
}
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())
global.setGlobal('setInterval', (func: Function, tick: number, async: boolean = false) => this.taskManager.create(func).timer(tick).async(async).submit())
}
loadPlugins() {
@@ -49,49 +47,57 @@ class MiaoScriptCore {
console.i18n("ms.core.engine.disable")
this.pluginManager.disable();
this.taskManager.disable();
//@ts-ignore
require.disable()
}
}
function detectServer() {
function detectServer(): constants.ServerType {
try {
Java.type("org.bukkit.Bukkit");
return 'bukkit'
return constants.ServerType.Bukkit
} catch (ex) {
}
try {
Java.type("org.spongepowered.api.Sponge");
return 'sponge'
return constants.ServerType.Sponge
} catch (ex) {
}
try {
Java.type("cn.nukkit.Nukkit");
return 'nukkit'
return constants.ServerType.Nukkit
} catch (ex) {
}
try {
Java.type("net.md_5.bungee.api.ProxyServer");
return 'bungee'
return constants.ServerType.Bungee
} catch (ex) {
}
throw Error('Unknow Server Type...')
}
function initialize() {
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", { type });
console.i18n("ms.core.initialize.detect", { scope: global.scope, type });
container.bind(server.ServerType).toConstantValue(type);
console.i18n("ms.core.package.initialize", { type });
require(`@ms/${type}`).default(container);
require('@ms/plugin')
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", { type, time: (Date.now() - corePackageStartTime) / 1000 });
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();

View File

@@ -1,15 +1,17 @@
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,11 +28,13 @@ 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"

View File

@@ -1,15 +1,17 @@
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,11 +28,13 @@ 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: "关闭"

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/i18n",
"version": "0.4.2",
"name": "@ccms/i18n",
"version": "0.6.1",
"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",
@@ -28,7 +25,7 @@
"typescript": "^3.8.3"
},
"dependencies": {
"@ms/nashorn": "^0.4.0",
"@ccms/nashorn": "^0.6.1",
"js-yaml": "^3.13.1"
},
"gitHead": "781524f83e52cad26d7c480513e3c525df867121"

View File

@@ -1,4 +1,4 @@
/// <reference types="@ms/nashorn" />
/// <reference types="@ccms/nashorn" />
import * as yaml from 'js-yaml'
const File = Java.type("java.io.File");
@@ -32,9 +32,9 @@ export class Translate {
translate(name: string, param?: TranslateParam) {
let langText: string = this.langMap[name] || this.fallbackMap[name];
if (!langText) { return '[WARN] @ms/i18n miss lang translate: ' + name }
if (!langText) { return '[WARN] @ccms/i18n miss lang translate: ' + name }
for (const key in param) {
langText = langText.replace("{" + key + "}", param[key])
langText = langText.replace(new RegExp("{" + key + "}", 'gm'), param[key])
}
return langText;
}

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/nashorn",
"version": "0.4.0",
"name": "@ccms/nashorn",
"version": "0.6.1",
"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",

View File

@@ -30,17 +30,18 @@ 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;
@@ -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;
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/nodejs",
"version": "0.4.2",
"name": "@ccms/nodejs",
"version": "0.6.1",
"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.1"
},
"gitHead": "781524f83e52cad26d7c480513e3c525df867121"
}

View File

@@ -1,4 +1,4 @@
import '@ms/nashorn'
import '@ccms/nashorn'
import { URL } from "url";
const Path = Java.type("java.nio.file.Path");

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/nukkit",
"version": "0.4.2",
"name": "@ccms/nukkit",
"version": "0.6.1",
"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.2",
"@ms/common": "^0.4.2",
"@ms/container": "^0.4.0"
"@ccms/api": "^0.6.1",
"@ccms/common": "^0.6.1",
"@ccms/container": "^0.6.0"
}
}

View File

@@ -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');

View File

@@ -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')

View File

@@ -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");

View File

@@ -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';

View File

@@ -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");

View File

@@ -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');

View File

@@ -1,15 +1,12 @@
{
"name": "@ms/ployfill",
"version": "0.4.2",
"name": "@ccms/ployfill",
"version": "0.6.1",
"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.2",
"@ms/nashorn": "^0.4.0",
"@ccms/i18n": "^0.6.1",
"@ccms/nashorn": "^0.6.1",
"core-js": "^3.6.4"
},
"devDependencies": {

View File

@@ -1,6 +1,6 @@
/// <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");

View File

@@ -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");
@@ -87,7 +87,7 @@ export class XMLHttpRequest {
private _statusText: string = null;
private _response: any;
private _responseURL: string;
private _responseHeaders: HttpHeader;
private _responseHeaders: HttpHeader = {};
private _connection = null;
@@ -228,7 +228,7 @@ 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]
});
}

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/plugin",
"version": "0.4.2",
"name": "@ccms/plugin",
"version": "0.6.1",
"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",
@@ -28,10 +25,10 @@
"typescript": "^3.8.3"
},
"dependencies": {
"@ms/api": "^0.4.2",
"@ms/common": "^0.4.2",
"@ms/container": "^0.4.0",
"@ms/i18n": "^0.4.2",
"@ccms/api": "^0.6.1",
"@ccms/common": "^0.6.1",
"@ccms/container": "^0.6.0",
"@ccms/i18n": "^0.6.1",
"js-yaml": "^3.13.1"
}
}

View File

@@ -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")
}
};

View File

@@ -1,7 +1,7 @@
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
@@ -10,11 +10,15 @@ import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata
export function plugin(metadata: interfaces.PluginMetadata) {
return function (target: any) {
metadata.target = target;
metadata.source = metadata.source + '';
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, metadata);
Reflect.defineMetadata(METADATA_KEY.souece, previousSources, Reflect);
};
}
@@ -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')
}

View File

@@ -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 } from "@ccms/container";
import { getPluginMetadata } from "./utils";
export namespace interfaces {
@@ -55,7 +54,7 @@ export namespace interfaces {
*/
target?: any;
}
interface ExecMetadata extends BaseMetadata {
export interface ExecMetadata extends BaseMetadata {
/**
* 执行器
*/
@@ -68,6 +67,15 @@ export namespace interfaces {
paramtypes?: string[];
}
export interface ListenerMetadata extends ExecMetadata {
/**
* 监听优先级
*/
priority?: event.EventPriority;
/**
* 是否忽略已取消的事件
*/
ignoreCancel?: boolean;
}
export interface ConfigMetadata extends BaseMetadata {
/**

View File

@@ -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,25 @@ export class PluginManagerImpl implements plugin.PluginManager {
@inject(event.Event)
private EventManager: event.Event
private initialized: boolean = false
private pluginMap: Map<string, interfaces.Plugin>
private plugnMappings: 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 })
console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
this.pluginMap = new Map()
console.i18n('ms.plugin.event.map', { count: this.EventManager.mapEventName().toFixed(0), type: this.serverType });
this.initialized = true;
this.plugnMappings = getPluginSources()
}
}
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,42 +54,52 @@ 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)
}
loadFromFile(file: string): interfaces.Plugin {
this.loadPlugin(file)
let plugin = this.buildPlugin(this.plugnMappings.get(file))
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.runPluginStage(plugin, 'load', () => {
this.loadConfig(plugin)
this.runCatch(plugin, 'load')
this.runCatch(plugin, `${this.serverType}load`)
})
})
}
enable(...args: any[]): void {
this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.enable"))
this.runPluginStage(plugin, 'enable', () => {
this.registryCommand(plugin)
this.registryListener(plugin)
this.runCatch(plugin, 'enable')
this.runCatch(plugin, `${this.serverType}enable`)
})
})
}
disable(...args: any[]): void {
this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.disable"))
this.runPluginStage(plugin, 'disable', () => {
this.unregistryCommand(plugin)
this.unregistryListener(plugin)
this.runCatch(plugin, 'disable')
this.runCatch(plugin, `${this.serverType}disable`)
})
})
}
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)
})
}
@@ -99,7 +111,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
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)
}
}
@@ -161,20 +173,21 @@ 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 })
require(file + '', { cache: false })
}
private buildPlugins() {
@@ -260,4 +273,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)
}
}
}
}

View File

@@ -9,6 +9,14 @@ function getPlugin(name: string) {
return getPluginMetadatas().get(name);
}
function getPluginSources() {
let pluginSources: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
METADATA_KEY.souece,
Reflect
) || new Map<string, interfaces.PluginMetadata>();
return pluginSources;
}
function getPluginMetadatas() {
let pluginMetadatas: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
METADATA_KEY.plugin,
@@ -57,13 +65,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
}

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@ms/plugins",
"version": "0.4.2",
"name": "@ccms/plugins",
"version": "0.6.1",
"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.2",
"@ms/container": "^0.4.0",
"@ms/plugin": "^0.4.2"
"@ccms/api": "^0.6.1",
"@ccms/container": "^0.6.0",
"@ccms/plugin": "^0.6.1"
}
}

View File

@@ -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 {

View File

@@ -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();
@@ -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)
})

View File

@@ -1,104 +1,114 @@
/// <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 } from '@ms/container'
import * as reflect from '@ms/common/dist/reflect'
import { Server as SocketIOServer, Socket as SocketIOSocket } from '@ms/websocket'
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'
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 {
@inject(ContainerInstance)
private container: Container
@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
private pipeline: any;
private socketIOServer: SocketIOServer;
@cmd()
mconsole(sender: any, command: string, args: string[]) {
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() {
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() {
this.socketIOServer?.close()
}
bukkitenable() {
let Bukkit = Java.type('org.bukkit.Bukkit')
let consoleServer = reflect.on(Bukkit.getServer()).get('console').get()
this.reflectChannel(this.reflectPromise(consoleServer))
this.injectMiaoDetect()
}
spongeenable() {
let Sponge = Java.type('org.spongepowered.api.Sponge')
let consoleServer = reflect.on(Sponge.getServer()).get()
this.reflectChannel(this.reflectPromise(consoleServer))
this.injectMiaoDetect()
}
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: any) {
for (const ref of refList) {
try { return reflect.on(consoleServer).call(ref.server).get(ref.future).get().get(0) } catch (error) { }
if (this.container.isBound(io.Instance)) {
this.container.unbind(io.Instance)
}
}
reflectChannel(promise: any) {
if (!promise) { throw Error(`Can't found ServerConnection or ChannelFuture !`) }
this.pipeline = reflect.on(promise).get('channel').get().pipeline()
}
injectMiaoDetect() {
this.socketIOServer = new SocketIOServer(this.pipeline, {
path: '/ws'
createSocketIOServer() {
this.socketIOServer = io(this.pipeline, {
path: '/ws',
root: '/home/project/TSWorkSpace/ms/packages/plugins/public'
});
this.container.bind(io.Instance).toConstantValue(this.socketIOServer)
}
startSocketIOServer() {
let namespace = this.socketIOServer.of('/MiaoConsole')
namespace.on('connect', (client: SocketIOSocket) => {
global.setGlobal('client', client);
client.on('type', (fn) => {
this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
fn && fn(this.ServerType)
client.emit('log', `Currect Server Version is ${this.Server.getVersion()}`)
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)
setTimeout(() => this.server.dispatchConsoleCommand(cmd), 0)
client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
})
client.on('exec', (code) => {
try {
client.emit('log', this.Task.callSyncMethod(() => eval(code)) + '')
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('disconnect', () => {
this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
})
})
this.logger.info('Netty Channel Pipeline Inject MiaoDetectHandler Successful!')
}
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"
}
var result = eval(${JSON.stringify(code)});
return tempconcent + result
`)
return this.task.callSyncMethod(() => tfunc.apply(this, [namespace, client])) + ''
}
}

View File

@@ -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 {

View File

@@ -1,14 +1,14 @@
import { plugin as pluginApi, task, server } from '@ms/api'
import { plugin as pluginApi, task, server } from '@ccms/api'
import { Translate } from '@ms/i18n'
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 '@ms/common/dist/fs'
import http from '@ms/common/dist/http'
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========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §bMiaoWoo §6=========',
'§6/mpm §ainstall §e<插件名称> §6- §3安装插件',
'§6/mpm §auninstall §e<插件名称> §6- §3卸载插件',
'§6/mpm §alist [install]§6- §3列出仓库插件[已安装的插件]',
@@ -16,7 +16,7 @@ let help = [
'§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 §adeploy §e<插件名称> §6- §3发布插件',
'§6/mpm §crestart §6- §4重启MiaoScript脚本引擎'
];
@@ -29,7 +29,11 @@ let langMap = {
'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插件!'
'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安装成功!',
}
let fallbackMap = langMap
@@ -44,6 +48,8 @@ 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: string[] = [];
@@ -77,7 +83,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
this[cmdKey](sender, ...args);
}
cmdlist(sender, type: string = 'cloud') {
cmdlist(sender: any, type: string = 'cloud') {
if (type == "install") {
this.i18n(sender, 'list.header.install')
this.pluginManager.getPlugins().forEach((plugin) => {
@@ -124,6 +130,12 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
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)
@@ -140,7 +152,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
}
}
cmdrun(sender, ...args: any[]) {
cmdrun(sender: any, ...args: any[]) {
try {
var script = args.join(' ');
this.logger.sender(sender, '§b运行脚本:§r', script);
@@ -150,14 +162,29 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
}
}
cmddeploy(sender: any, name: any) {
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", {
name,
author: plugin.description.author,
version: plugin.description.version,
source: base.read(plugin.description.source + '')
})
this.logger.sender(sender, result);
}
}).async().submit()
}
update(sender: any, name: string) {
if (!this.packageNameCache.includes(name)) {
this.i18n(sender, 'cloud.not.exists', { name })
if (this.checkCloudPlugin(sender, name)) {
}
}
@tab()
tabmpm(sender, command, args) {
tabmpm(sender: any, command: any, args: string | any[]) {
if (args.length === 1) return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'help', 'create'];
if (args.length > 1) {
switch (args[0]) {
@@ -177,16 +204,22 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
updateRepo(sender: any) {
this.taskManager.create(() => {
let result = http.get('http://ms.yumc.pw/api/plugin');
for (const pl of result.data) {
this.packageCache[pl.name] = pl;
}
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, name) {
download(sender: any, name: string) {
this.taskManager.create(() => {
this.i18n(sender, 'download.start', { name })
this.i18n(sender, 'download.url', { url: this.packageCache[name].url })
let pluginFile = 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, 'install.finish', { name })
}).async().submit()
}
}

View File

@@ -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 {

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/sponge",
"version": "0.4.2",
"name": "@ccms/sponge",
"version": "0.6.1",
"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.2",
"@ms/common": "^0.4.2",
"@ms/container": "^0.4.0"
"@ccms/api": "^0.6.1",
"@ccms/common": "^0.6.1",
"@ccms/container": "^0.6.0"
}
}

View File

@@ -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")

View File

@@ -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');

View File

@@ -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');

View File

@@ -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");

View File

@@ -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';

View File

@@ -1,13 +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 '@ms/common/dist/reflect'
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
]
import * as reflect from '@ccms/common/dist/reflect'
const Sponge = org.spongepowered.api.Sponge;
const TextSerializers = org.spongepowered.api.text.serializer.TextSerializers;
@@ -64,14 +58,24 @@ export class SpongeServer implements server.Server {
}
private reflectPipeline() {
let consoleServer = reflect.on(Sponge.getServer()).get()
let connection: any;
let promise: any;
for (const ref of refList) {
for (const method of constants.Reflect.Method.getServerConnection) {
try {
promise = reflect.on(consoleServer).call(ref.server).get(ref.future).get().get(0); break;
} catch (error) {
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) { throw Error(`Can't found ServerConnection or ChannelFuture !`) }
if (!promise) { console.error("Can't found listeningChannels!"); return }
this.pipeline = reflect.on(promise).get('channel').get().pipeline()
}
}

View File

@@ -1,5 +1,5 @@
import { task, plugin } from '@ms/api'
import { inject, provideSingleton, postConstruct } from '@ms/container';
import { task, plugin } from '@ccms/api'
import { inject, provideSingleton, postConstruct } from '@ccms/container';
const Sponge = Java.type("org.spongepowered.api.Sponge");
const Task = Java.type("org.spongepowered.api.scheduler.Task");

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/types",
"version": "0.4.0",
"name": "@ccms/types",
"version": "0.6.0",
"description": "MiaoScript types package",
"keywords": [
"miaoscript",
@@ -12,8 +12,5 @@
"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/"
}
"types": "dist/index.d.ts"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@ms/websocket",
"version": "0.4.2",
"name": "@ccms/websocket",
"version": "0.6.1",
"description": "MiaoScript websocket 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,6 +24,6 @@
"typescript": "^3.8.3"
},
"dependencies": {
"@ms/nashorn": "^0.4.0"
"@ccms/nashorn": "^0.6.1"
}
}

View File

@@ -1,4 +1,4 @@
/// <reference types="@ms/nashorn" />
/// <reference types="@ccms/nashorn" />
import { Server, ServerOptions } from './socket-io'
@@ -41,6 +41,6 @@ type SocketStatic = SocketIOStatic & { Instance?: symbol }
let io: SocketStatic = function (pipeline: any, options: ServerOptions) {
return new Server(pipeline, options)
}
io.Instance = Symbol("@ms/websocket")
io.Instance = Symbol("@ccms/websocket")
export default io
export * from './socket-io'

View File

@@ -1,10 +1,10 @@
import { EventEmitter } from 'events'
import { NettyClient } from './client'
import { ServerOptions } from '../socket-io'
import { ServerEvent, Keys } from './constants'
import { WebSocketDetect } from './websocket_detect'
import { WebSocketHandler } from './websocket_handler'
import { NettyClient } from './client'
import { ServerOptions } from '../socket-io'
class NettyWebSocketServer extends EventEmitter {
private pipeline: any;
@@ -22,10 +22,9 @@ class NettyWebSocketServer extends EventEmitter {
ctx.fireChannelRead(channel)
})
connectEvent.on(ServerEvent.connect, (ctx) => {
console.log('NettyWebSocketServer ServerEvent.connect', ctx, ctx.channel().id(), ctx.channel().class.name)
let nettyClient = new NettyClient(this, ctx.channel());
this.allClients[nettyClient.id] = nettyClient;
this.emit(ServerEvent.connect, nettyClient);
let nettyClient = new NettyClient(this, ctx.channel())
this.allClients[nettyClient.id] = nettyClient
this.emit(ServerEvent.connect, nettyClient)
})
connectEvent.on(ServerEvent.message, (ctx, msg) => {
this.emit(ServerEvent.message, this.allClients[ctx.channel().id()], msg.text())
@@ -46,4 +45,4 @@ export {
NettyWebSocketServer,
ServerEvent,
NettyClient
};
}

View File

@@ -1,7 +1,7 @@
import { TextWebSocketFrameHandlerAdapter } from '../netty'
import { EventEmitter } from 'events'
import { ServerEvent } from './constants'
import { ServerOptions } from '../socket-io';
import { TextWebSocketFrameHandlerAdapter } from '../netty'
export class TextWebSocketFrameHandler extends TextWebSocketFrameHandlerAdapter {
private event: EventEmitter;