From a4545051d1e18581a08b687153a0fc933bacabc9 Mon Sep 17 00:00:00 2001 From: coding Date: Thu, 30 Nov 2017 05:21:21 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=BD=E7=A6=BBplugin=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C=E7=9A=84Detect?= =?UTF-8?q?ServerType=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=90=8C=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=9A=84js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/api/mserver.js | 1 - src/main/resources/api/plugin.js | 18 +- src/main/resources/internal/bukkit/plugin.js | 258 ------------------- 3 files changed, 13 insertions(+), 264 deletions(-) delete mode 100644 src/main/resources/internal/bukkit/plugin.js diff --git a/src/main/resources/api/mserver.js b/src/main/resources/api/mserver.js index ff3d90b..6674433 100644 --- a/src/main/resources/api/mserver.js +++ b/src/main/resources/api/mserver.js @@ -7,7 +7,6 @@ module.exports = { command: impl('command'), event: impl('event'), permission: impl('permission'), - plugin: impl('plugin'), server: impl('server'), task: impl('task'), item: impl('item') diff --git a/src/main/resources/api/plugin.js b/src/main/resources/api/plugin.js index 1d23ad5..ecb9f42 100644 --- a/src/main/resources/api/plugin.js +++ b/src/main/resources/api/plugin.js @@ -7,7 +7,7 @@ var fs = require('core/fs'); var yaml = require('modules/yaml'); var event = require('./event'); -var bukkit = require('./server'); +var server = require('./server'); var command = require('./command'); var permission = require('./permission'); @@ -26,6 +26,9 @@ function loadPlugins(dir) { fs.list(plugin).forEach(function (file) { files.push(file.toFile()); }); + fs.list(fs.file(plugin, DetectServerType)).forEach(function (file) { + files.push(file.toFile()); + }); loadZipPlugins(files); loadJsPlugins(files); } @@ -64,7 +67,12 @@ function loadJsPlugins(files) { files.filter(function (file) { return file.name.endsWith(".js") }).forEach(function (file) { - loadPlugin(file); + try { + loadPlugin(file); + } catch (ex) { + console.console('§6插件 §b%s §6初始化时发生错误 §4%s'.format(fs.path(file), ex.message)); + console.ex(ex); + } }) } @@ -226,13 +234,13 @@ function checkAndGet(args) { var plugins = []; +exports.$ = server.plugin.self; exports.plugins = plugins; exports.init = function (path) { - var plugin = bukkit.plugin.self; + var plugin = exports.$ if (plugin !== null) { // 如果过plugin不等于null 则代表是正式环境 - exports.$ = plugin; - console.info("初始化 MiaoScript 插件系统 版本: %s".format(plugin.description.version)); + console.info("初始化 MiaoScript 插件系统: %s".format(plugin)); } loadPlugins(path); }; diff --git a/src/main/resources/internal/bukkit/plugin.js b/src/main/resources/internal/bukkit/plugin.js deleted file mode 100644 index 1df15fb..0000000 --- a/src/main/resources/internal/bukkit/plugin.js +++ /dev/null @@ -1,258 +0,0 @@ -'use strict'; -/** - * MiaoScript脚本插件加载类 - */ -/*global Java, base, module, exports, require, __FILE__*/ -// var zip = require("core/zip"); -var fs = require('core/fs'); -var yaml = require('modules/yaml'); -var event = require('./event'); -var bukkit = require('./server'); -var command = require('./command'); -var permission = require('./permission'); - -/** - * 载入插件 - * @param dir - */ -function loadPlugins(dir) { - var plugin = fs.file(root, dir); - if (!plugin) { - console.info("首次加载 创建文件夹 %s ...".format(plugin)); - } else { - console.info("开始扫描 %s 下的插件 ...".format(plugin)); - createUpdate(plugin); - var files = []; - fs.list(plugin).forEach(function (file) { - files.push(file.toFile()); - }); - loadZipPlugins(files); - loadJsPlugins(files); - } -} - -/** - * 更新插件 - * @param path - */ -function createUpdate(path) { - var update = fs.file(path, "update"); - if (!update.exists()) { - update.mkdirs(); - } -} - -/** - * ZIP类型插件预加载 - * @param files - */ -function loadZipPlugins(files) { - // // TODO ZIP类型插件加载 - // files.filter(function (file) { - // return file.name.endsWith(".zip"); - // }).forEach(function (file) { - // zip.unzip(fs.file(plugins_dir, file)); - // var dir = new File(plugins_dir, file.name.split(".")[0]); - // // TODO 添加文件夹类型的插件兼容 - // }); -} - -/** - * JS类型插件预加载 - */ -function loadJsPlugins(files) { - files.filter(function (file) { - return file.name.endsWith(".js") - }).forEach(function (file) { - loadPlugin(file); - }) -} - -function loadPlugin(file) { - var update = fs.file(fs.file(file.parentFile, 'update'), file.name); - if (update.exists()) { - console.info('自动升级插件 %s'.format(file.name)); - fs.move(update, file, true); - } - var plugin = require(file, { - cache: false, - hook: function (origin) { - return beforeLoadHook(origin); - } - }); - console.debug("插件编译结果: %s".format(plugin.toJson())); - var desc = plugin.description; - if (!desc || !desc.name) { - console.warn("文件 %s 不存在 description 描述信息 无法加载插件!".format(file)); - } else { - initPlugin(file, plugin); - afterLoadHook(plugin); - plugins.push(plugin); - plugins[plugin.description.name] = plugin; - console.info('载入插件 %s 版本 %s By %s'.format(desc.name, desc.version || '未知', desc.author || '未知')); - } - return plugin; -} - -function beforeLoadHook(origin) { - var result = origin; - // 处理 event 为了不影响 正常逻辑 event 还是手动require吧 - // result = result + 'var event = {}; module.exports.event = event;'; - // 注入 console 对象 // 给插件注入单独的 console - result = result + 'var console = Console.createNew(); module.exports.console = console;'; - // 插件注入 self 对象 - result = result + 'var self = {}; module.exports.self = self;'; - return result; -} - -function afterLoadHook(plugin) { - // plugin.event.on = event.on.bind(plugin); - // 给 console 添加插件名称 - plugin.console.name = plugin.description.name; - // 赋值 self - for (var i in plugin) { - plugin.self[i] = plugin[i]; - } -} - -/** - * 初始化插件内容(提供config,__DATA__等参数) - */ -function initPlugin(file, plugin) { - // 初始化 __FILE__ - plugin.__FILE__ = file; - // 初始化 __DATA__ - plugin.__DATA__ = fs.file(file.parentFile, plugin.description.name); - // 初始化 getDataFolder() - plugin.getDataFolder = function () { - return plugin.__DATA__; - }; - // 初始化 getFile() - plugin.getFile = function (name) { - return fs.file(plugin.getDataFolder(), name); - }; - - // 初始化插件配置相关方法 - initPluginConfig(plugin); - - command.enable(plugin); - permission.enable(plugin); -} - -/** - * 初始化插件配置 - */ -function initPluginConfig(plugin) { - // 初始化 config - plugin.configFile = plugin.getFile('config.yml'); - /** - * 获取配置文件 - * @constructor - * @constructor (file|string) - */ - plugin.getConfig = function () { - switch (arguments.length) { - case 0: - return plugin.config; - case 1: - var file = arguments[0]; - if (!file.isFile) { - file = plugin.getFile(file); - } - return yaml.safeLoad(base.read(file)); - } - }; - /** - * 重载配置文件 - * @constructor - * @constructor (file|string) - */ - plugin.reloadConfig = function () { - plugin.config = plugin.getConfig(plugin.configFile); - }; - /** - * 保存配置文件 - * @constructor - * @constructor (file, content) - */ - plugin.saveConfig = function () { - switch (arguments.length) { - case 0: - plugin.configFile.parentFile.mkdirs(); - base.save(plugin.configFile, plugin.config.toYaml()); - break; - case 2: - base.save(arguments[0], arguments[1].toYaml()); - break; - } - }; - if (plugin.configFile.isFile()) { - plugin.config = plugin.getConfig('config.yml'); - } else if (plugin.description.config) { - plugin.config = plugin.description.config; - plugin.saveConfig(); - } -} - -function runAndCatch(jsp, exec, ext) { - if (exec) { - try { - // 绑定方法的this到插件自身 - exec.bind(jsp)(); - if (ext) { - ext(); - } - } catch (ex) { - console.console('§6插件 §b%s §6执行 §d%s §6方法时发生错误 §4%s'.format(jsp.description.name, exec.name, ex.message)); - console.ex(ex); - } - } -} - -function checkAndGet(args) { - if (args.length === 0) { - return plugins; - } - var name = args[0]; - // 如果是插件 则直接返回 - if (name.description) { - return [name]; - } - if (!exports.plugins[name]) { - throw new Error("插件 " + name + " 不存在!"); - } - return [exports.plugins[name]]; -} - -var plugins = []; - -exports.plugins = plugins; -exports.init = function (path) { - var plugin = bukkit.plugin.self; - if (plugin !== null) { - // 如果过plugin不等于null 则代表是正式环境 - exports.$ = plugin; - console.info("初始化 MiaoScript 插件系统 版本: %s".format(plugin.description.version)); - } - loadPlugins(path); -}; -exports.load = function () { - checkAndGet(arguments).forEach(function (p) runAndCatch(p, p.load)); -}; -exports.enable = function () { - checkAndGet(arguments).forEach(function (p) runAndCatch(p, p.enable)); -}; -exports.disable = function () { - checkAndGet(arguments).forEach(function (p) runAndCatch(p, p.disable, function () { - event.disable(p); - // task.cancel(); - })); -}; -exports.reload = function () { - checkAndGet(arguments).forEach(function (p) { - exports.disable(p); - p = loadPlugin(p.__FILE__); - exports.load(p); - exports.enable(p); - }); -}; \ No newline at end of file