From 26e09d1e9d3788a6cb1f30710b1f3365f7fce79d Mon Sep 17 00:00:00 2001 From: SychO9 Date: Sat, 25 Sep 2021 13:59:59 +0100 Subject: [PATCH] Add Update Checker --- extensions/package-manager/extend.php | 6 +- extensions/package-manager/js/dist/admin.js | 168 +++++++++++++++++- .../package-manager/js/dist/admin.js.map | 2 +- .../js/src/admin/components/Installer.tsx | 2 +- .../js/src/admin/components/Updater.tsx | 102 +++++++++++ .../package-manager/js/src/admin/index.js | 8 + extensions/package-manager/less/admin.less | 57 ++++++ extensions/package-manager/locale/en.yml | 6 + .../Controller/CheckForUpdatesController.php | 40 +++++ .../src/Command/CheckForUpdates.php | 22 +++ .../src/Command/CheckForUpdatesHandler.php | 64 +++++++ 11 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 extensions/package-manager/js/src/admin/components/Updater.tsx create mode 100644 extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php create mode 100644 extensions/package-manager/src/Command/CheckForUpdates.php create mode 100644 extensions/package-manager/src/Command/CheckForUpdatesHandler.php diff --git a/extensions/package-manager/extend.php b/extensions/package-manager/extend.php index 75a168b86..b79df3a43 100644 --- a/extensions/package-manager/extend.php +++ b/extensions/package-manager/extend.php @@ -9,6 +9,7 @@ namespace SychO\PackageManager; use Flarum\Extend; use Flarum\Foundation\Paths; use Flarum\Frontend\Document; +use Flarum\Settings\SettingsRepositoryInterface; use SychO\PackageManager\Exception\ComposerCommandFailedExceptionHandler; use SychO\PackageManager\Exception\ComposerRequireFailedException; @@ -16,7 +17,8 @@ return [ (new Extend\Routes('api')) ->post('/package-manager/extensions', 'package-manager.extensions.require', Api\Controller\RequireExtensionController::class) ->patch('/package-manager/extensions/{id}', 'package-manager.extensions.update', Api\Controller\UpdateExtensionController::class) - ->delete('/package-manager/extensions/{id}', 'package-manager.extensions.remove', Api\Controller\RemoveExtensionController::class), + ->delete('/package-manager/extensions/{id}', 'package-manager.extensions.remove', Api\Controller\RemoveExtensionController::class) + ->post('/package-manager/check-for-updates', 'package-manager.check-for-updates', Api\Controller\CheckForUpdatesController::class), (new Extend\Frontend('admin')) ->css(__DIR__ . '/less/admin.less') @@ -28,6 +30,8 @@ return [ && is_writable($paths->storage.'/.composer') && is_writable($paths->base.'/composer.json') && is_writable($paths->base.'/composer.lock'); + + $document->payload['lastUpdateCheck'] = json_decode(resolve(SettingsRepositoryInterface::class)->get('sycho-package-manager.last_update_check', '{}'), true); }), new Extend\Locales(__DIR__ . '/locale'), diff --git a/extensions/package-manager/js/dist/admin.js b/extensions/package-manager/js/dist/admin.js index a6e64a78d..6cd92d981 100644 --- a/extensions/package-manager/js/dist/admin.js +++ b/extensions/package-manager/js/dist/admin.js @@ -313,7 +313,7 @@ var Installer = /*#__PURE__*/function (_Component) { }); } }).then(function (response) { - var extensionId = response.data.attributes.id; + var extensionId = response.id; flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.alerts.show({ type: 'success' }, flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.translator.trans('sycho-package-manager.admin.extensions.successful_install', { @@ -332,6 +332,144 @@ var Installer = /*#__PURE__*/function (_Component) { +/***/ }), + +/***/ "./src/admin/components/Updater.tsx": +/*!******************************************!*\ + !*** ./src/admin/components/Updater.tsx ***! + \******************************************/ +/*! exports provided: default */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return Updater; }); +/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/inheritsLoose */ "./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js"); +/* harmony import */ var flarum_admin_app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! flarum/admin/app */ "flarum/admin/app"); +/* harmony import */ var flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(flarum_admin_app__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var flarum_common_Component__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! flarum/common/Component */ "flarum/common/Component"); +/* harmony import */ var flarum_common_Component__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(flarum_common_Component__WEBPACK_IMPORTED_MODULE_2__); +/* harmony import */ var flarum_common_helpers_icon__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! flarum/common/helpers/icon */ "flarum/common/helpers/icon"); +/* harmony import */ var flarum_common_helpers_icon__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(flarum_common_helpers_icon__WEBPACK_IMPORTED_MODULE_3__); +/* harmony import */ var flarum_common_components_Button__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! flarum/common/components/Button */ "flarum/common/components/Button"); +/* harmony import */ var flarum_common_components_Button__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(flarum_common_components_Button__WEBPACK_IMPORTED_MODULE_4__); +/* harmony import */ var flarum_common_helpers_humanTime__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! flarum/common/helpers/humanTime */ "flarum/common/helpers/humanTime"); +/* harmony import */ var flarum_common_helpers_humanTime__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(flarum_common_helpers_humanTime__WEBPACK_IMPORTED_MODULE_5__); + + + + + + + +var Updater = /*#__PURE__*/function (_Component) { + Object(_babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__["default"])(Updater, _Component); + + function Updater() { + var _this; + + for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + _this = _Component.call.apply(_Component, [this].concat(args)) || this; + _this.isLoading = false; + _this.lastUpdateCheck = flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.data.lastUpdateCheck || {}; + return _this; + } + + var _proto = Updater.prototype; + + _proto.oninit = function oninit(vnode) { + _Component.prototype.oninit.call(this, vnode); + }; + + _proto.view = function view() { + var _this$lastUpdateCheck; + + var extensions = this.getExtensionUpdates(); // @TODO catch `flarum/core` updates and display them differently, since it is the CORE and not an extension. + + return m("div", { + className: "Form-group" + }, m("label", null, flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.translator.trans('sycho-package-manager.admin.updater.updater_title')), m("p", { + className: "helpText" + }, flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.translator.trans('sycho-package-manager.admin.updater.updater_help')), m("p", { + className: "PackageManager-lastUpdatedAt" + }, m("span", { + className: "PackageManager-lastUpdatedAt-label" + }, flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.translator.trans('sycho-package-manager.admin.updater.last_update_checked_at')), m("span", { + className: "PackageManager-lastUpdatedAt-value" + }, flarum_common_helpers_humanTime__WEBPACK_IMPORTED_MODULE_5___default()((_this$lastUpdateCheck = this.lastUpdateCheck) == null ? void 0 : _this$lastUpdateCheck.checkedAt))), m(flarum_common_components_Button__WEBPACK_IMPORTED_MODULE_4___default.a, { + className: "Button", + icon: "fas fa-sync-alt", + onclick: this.checkForUpdates.bind(this), + loading: this.isLoading + }, flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.translator.trans('sycho-package-manager.admin.updater.check_for_updates')), extensions.length ? m("div", { + className: "PackageManager-extensions" + }, m("div", { + className: "PackageManager-extensions-grid" + }, extensions.map(function (extension) { + return m("div", { + className: "PackageManager-extension" + }, m("div", { + className: "PackageManager-extension-icon ExtensionIcon", + style: extension.icon + }, extension.icon ? flarum_common_helpers_icon__WEBPACK_IMPORTED_MODULE_3___default()(extension.icon.name) : ''), m("div", { + className: "PackageManager-extension-info" + }, m("div", { + className: "PackageManager-extension-name" + }, extension.extra['flarum-extension'].title), m("div", { + className: "PackageManager-extension-version" + }, m("span", { + className: "PackageManager-extension-version-current" + }, extension.version), m("span", { + className: "PackageManager-extension-version-latest Label" + }, extension.newPackageUpdate.latest))), m("div", { + className: "PackageManager-extension-controls" + }, m(flarum_common_components_Button__WEBPACK_IMPORTED_MODULE_4___default.a, { + icon: "fas fa-arrow-alt-circle-up", + className: "Button Button--icon Button--flat" + }))); + }))) : null); + }; + + _proto.getExtensionUpdates = function getExtensionUpdates() { + var _this$lastUpdateCheck2, _this$lastUpdateCheck3, _this$lastUpdateCheck4; + + var updates = (_this$lastUpdateCheck2 = this.lastUpdateCheck) == null ? void 0 : (_this$lastUpdateCheck3 = _this$lastUpdateCheck2.updates) == null ? void 0 : (_this$lastUpdateCheck4 = _this$lastUpdateCheck3.installed) == null ? void 0 : _this$lastUpdateCheck4.filter(function (composerPackage) { + var extension = flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.data.extensions[composerPackage.name.replace('/', '-').replace(/(flarum-ext-)|(flarum-)/, '')]; + var safeToUpdate = composerPackage['latest-status'] === 'semver-safe-update'; + + if (extension && safeToUpdate) { + extension.newPackageUpdate = composerPackage; + } + + return extension && safeToUpdate; + }); + return Object.values(flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.data.extensions).filter(function (extension) { + return extension.newPackageUpdate; + }); + }; + + _proto.checkForUpdates = function checkForUpdates() { + var _this2 = this; + + this.isLoading = true; + flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.request({ + method: 'POST', + url: flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.forum.attribute('apiUrl') + "/package-manager/check-for-updates" + }).then(function (response) { + _this2.isLoading = false; + _this2.lastUpdateCheck = response; + m.redraw(); + }); + }; + + return Updater; +}(flarum_common_Component__WEBPACK_IMPORTED_MODULE_2___default.a); + + + /***/ }), /***/ "./src/admin/index.js": @@ -356,6 +494,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var flarum_admin_components_LoadingModal__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! flarum/admin/components/LoadingModal */ "flarum/admin/components/LoadingModal"); /* harmony import */ var flarum_admin_components_LoadingModal__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(flarum_admin_components_LoadingModal__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var _components_Installer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./components/Installer */ "./src/admin/components/Installer.tsx"); +/* harmony import */ var _components_Updater__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./components/Updater */ "./src/admin/components/Updater.tsx"); + @@ -377,6 +517,10 @@ flarum_admin_app__WEBPACK_IMPORTED_MODULE_1___default.a.initializers.add('sycho- if (app.data.isRequiredDirectoriesWritable) { return m(_components_Installer__WEBPACK_IMPORTED_MODULE_6__["default"], null); } + }).registerSetting(function () { + if (app.data.isRequiredDirectoriesWritable) { + return m(_components_Updater__WEBPACK_IMPORTED_MODULE_7__["default"], null); + } }); Object(flarum_common_extend__WEBPACK_IMPORTED_MODULE_0__["extend"])(flarum_admin_components_ExtensionPage__WEBPACK_IMPORTED_MODULE_3___default.a.prototype, 'topItems', function (items) { var _this = this; @@ -492,6 +636,28 @@ module.exports = flarum.core.compat['common/extend']; /***/ }), +/***/ "flarum/common/helpers/humanTime": +/*!*****************************************************************!*\ + !*** external "flarum.core.compat['common/helpers/humanTime']" ***! + \*****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = flarum.core.compat['common/helpers/humanTime']; + +/***/ }), + +/***/ "flarum/common/helpers/icon": +/*!************************************************************!*\ + !*** external "flarum.core.compat['common/helpers/icon']" ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = flarum.core.compat['common/helpers/icon']; + +/***/ }), + /***/ "flarum/common/utils/Stream": /*!************************************************************!*\ !*** external "flarum.core.compat['common/utils/Stream']" ***! diff --git a/extensions/package-manager/js/dist/admin.js.map b/extensions/package-manager/js/dist/admin.js.map index e5c4a111a..9dfc4954d 100644 --- a/extensions/package-manager/js/dist/admin.js.map +++ b/extensions/package-manager/js/dist/admin.js.map @@ -1 +1 @@ -{"version":3,"sources":["webpack://@sycho/flarum-package-manager/webpack/bootstrap","webpack://@sycho/flarum-package-manager/./admin.js","webpack://@sycho/flarum-package-manager/./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack://@sycho/flarum-package-manager/./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js","webpack://@sycho/flarum-package-manager/./src/admin/components/ComposerFailureModal.tsx","webpack://@sycho/flarum-package-manager/./src/admin/components/Installer.tsx","webpack://@sycho/flarum-package-manager/./src/admin/index.js","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/app']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/components/ExtensionPage']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/components/LoadingModal']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/Component']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Alert']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Button']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Modal']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/extend']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/utils/Stream']\""],"names":["_inheritsLoose","subClass","superClass","prototype","Object","create","constructor","setPrototypeOf","_setPrototypeOf","o","p","__proto__","ComposerFailureModal","oninit","vnode","attrs","error","guessed_cause","alertAttrs","type","content","app","translator","trans","className","title","output","Modal","Installer","packageName","isLoading","Stream","view","extiverse","onsubmit","bind","data","modal","show","LoadingModal","request","method","url","forum","attribute","body","errorHandler","e","response","errors","code","then","extensionId","attributes","id","alerts","extension","window","location","href","reload","m","redraw","Component","initializers","add","extensionData","registerSetting","isRequiredDirectoriesWritable","extend","ExtensionPage","items","close"],"mappings":"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","file":"admin.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./admin.js\");\n","export * from './src/admin';","import setPrototypeOf from \"./setPrototypeOf.js\";\nexport default function _inheritsLoose(subClass, superClass) {\n subClass.prototype = Object.create(superClass.prototype);\n subClass.prototype.constructor = subClass;\n setPrototypeOf(subClass, superClass);\n}","export default function _setPrototypeOf(o, p) {\n _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {\n o.__proto__ = p;\n return o;\n };\n\n return _setPrototypeOf(o, p);\n}","import app from 'flarum/admin/app';\nimport Modal from 'flarum/common/components/Modal';\nimport { ComponentAttrs } from \"flarum/common/Component\";\nimport Alert from \"flarum/common/components/Alert\";\nimport Mithril from \"mithril\";\n\ninterface Attrs extends ComponentAttrs {\n output: string;\n}\n\nexport default class ComposerFailureModal extends Modal {\n oninit(vnode: Mithril.Vnode) {\n super.oninit(vnode);\n\n if (this.attrs.error.guessed_cause) {\n this.alertAttrs = {\n type: 'error',\n content: app.translator.trans(`sycho-package-manager.admin.failure_modal.guessed_cause.${this.attrs.error.guessed_cause}`),\n };\n }\n }\n\n className() {\n return 'Modal--large ComposerFailureModal';\n }\n\n title() {\n return app.translator.trans('sycho-package-manager.admin.failure_modal.title');\n }\n\n content() {\n return (\n
\n
\n {app.translator.trans('sycho-package-manager.admin.failure_modal.show_composer_output')}\n 
{this.attrs.error.output}
\n
\n
\n );\n }\n}\n","import type Mithril from 'mithril';\nimport app from 'flarum/admin/app';\nimport Component from 'flarum/common/Component';\nimport Button from \"flarum/common/components/Button\";\nimport Stream from \"flarum/common/utils/Stream\";\nimport LoadingModal from \"flarum/admin/components/LoadingModal\";\nimport ComposerFailureModal from \"./ComposerFailureModal\";\n\nexport default class Installer extends Component {\n packageName!: Stream;\n isLoading: boolean = false;\n\n oninit(vnode: Mithril.Vnode): void {\n super.oninit(vnode);\n\n this.packageName = Stream('');\n }\n\n view(): Mithril.Children {\n return (\n
\n \n

{app.translator.trans('sycho-package-manager.admin.extensions.install_help', {\n extiverse: extiverse.com\n })}

\n
\n \n \n
\n
\n );\n }\n\n data(): any {\n return {\n package: this.packageName(),\n };\n }\n\n onsubmit(): void {\n this.isLoading = true;\n app.modal.show(LoadingModal);\n\n app.request({\n method: 'POST',\n url: `${app.forum.attribute('apiUrl')}/package-manager/extensions`,\n body: {\n data: this.data()\n },\n errorHandler: (e: any) => {\n const error = e.response.errors[0];\n\n if (error.code !== 'composer_command_failure') {\n throw e;\n }\n\n app.modal.show(ComposerFailureModal, { error });\n },\n }).then((response) => {\n const extensionId = response.data.attributes.id;\n app.alerts.show({ type: 'success' }, app.translator.trans('sycho-package-manager.admin.extensions.successful_install', { extension: extensionId }));\n window.location.href = `${app.forum.attribute('adminUrl')}#/extension/${extensionId}`;\n window.location.reload();\n }).finally(() => {\n this.isLoading = false;\n m.redraw();\n });\n }\n}\n","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\nimport Alert from 'flarum/common/components/Alert';\nimport ExtensionPage from 'flarum/admin/components/ExtensionPage';\nimport Button from 'flarum/common/components/Button';\nimport LoadingModal from 'flarum/admin/components/LoadingModal';\nimport Installer from \"./components/Installer\";\n\napp.initializers.add('sycho-package-manager', (app) => {\n app.extensionData\n .for('sycho-package-manager')\n .registerSetting(() => {\n if (!app.data.isRequiredDirectoriesWritable) {\n return (\n
\n {app.translator.trans('sycho-package-manager.admin.file_permissions')}\n
\n );\n }\n })\n .registerSetting(() => {\n if (app.data.isRequiredDirectoriesWritable) {\n return (\n \n );\n }\n });\n\n extend(ExtensionPage.prototype, 'topItems', function (items) {\n items.add(\n 'remove',\n {\n app.modal.show(LoadingModal);\n\n app.request({\n url: `${app.forum.attribute('apiUrl')}/package-manager/extensions/${this.extension.id}`,\n method: 'DELETE',\n }).then(() => {\n app.alerts.show({ type: 'success' }, app.translator.trans('sycho-package-manager.admin.extensions.successful_remove'));\n window.location = app.forum.attribute('adminUrl');\n }).finally(() => {\n app.modal.close();\n });\n }}>\n Remove\n \n );\n });\n});\n","module.exports = flarum.core.compat['admin/app'];","module.exports = flarum.core.compat['admin/components/ExtensionPage'];","module.exports = flarum.core.compat['admin/components/LoadingModal'];","module.exports = flarum.core.compat['common/Component'];","module.exports = flarum.core.compat['common/components/Alert'];","module.exports = flarum.core.compat['common/components/Button'];","module.exports = flarum.core.compat['common/components/Modal'];","module.exports = flarum.core.compat['common/extend'];","module.exports = flarum.core.compat['common/utils/Stream'];"],"sourceRoot":""} \ No newline at end of file +{"version":3,"sources":["webpack://@sycho/flarum-package-manager/webpack/bootstrap","webpack://@sycho/flarum-package-manager/./admin.js","webpack://@sycho/flarum-package-manager/./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack://@sycho/flarum-package-manager/./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js","webpack://@sycho/flarum-package-manager/./src/admin/components/ComposerFailureModal.tsx","webpack://@sycho/flarum-package-manager/./src/admin/components/Installer.tsx","webpack://@sycho/flarum-package-manager/./src/admin/components/Updater.tsx","webpack://@sycho/flarum-package-manager/./src/admin/index.js","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/app']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/components/ExtensionPage']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['admin/components/LoadingModal']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/Component']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Alert']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Button']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/components/Modal']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/extend']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/helpers/humanTime']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/helpers/icon']\"","webpack://@sycho/flarum-package-manager/external \"flarum.core.compat['common/utils/Stream']\""],"names":["_inheritsLoose","subClass","superClass","prototype","Object","create","constructor","setPrototypeOf","_setPrototypeOf","o","p","__proto__","ComposerFailureModal","oninit","vnode","attrs","error","guessed_cause","alertAttrs","type","content","app","translator","trans","className","title","output","Modal","Installer","packageName","isLoading","Stream","view","extiverse","onsubmit","bind","data","modal","show","LoadingModal","request","method","url","forum","attribute","body","errorHandler","e","response","errors","code","then","extensionId","id","alerts","extension","window","location","href","reload","m","redraw","Component","Updater","lastUpdateCheck","extensions","getExtensionUpdates","humanTime","checkedAt","checkForUpdates","length","map","icon","name","extra","version","newPackageUpdate","latest","updates","installed","filter","composerPackage","replace","safeToUpdate","values","initializers","add","extensionData","registerSetting","isRequiredDirectoriesWritable","extend","ExtensionPage","items","close"],"mappings":"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","file":"admin.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./admin.js\");\n","export * from './src/admin';","import setPrototypeOf from \"./setPrototypeOf.js\";\nexport default function _inheritsLoose(subClass, superClass) {\n subClass.prototype = Object.create(superClass.prototype);\n subClass.prototype.constructor = subClass;\n setPrototypeOf(subClass, superClass);\n}","export default function _setPrototypeOf(o, p) {\n _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {\n o.__proto__ = p;\n return o;\n };\n\n return _setPrototypeOf(o, p);\n}","import app from 'flarum/admin/app';\nimport Modal from 'flarum/common/components/Modal';\nimport { ComponentAttrs } from \"flarum/common/Component\";\nimport Alert from \"flarum/common/components/Alert\";\nimport Mithril from \"mithril\";\n\ninterface Attrs extends ComponentAttrs {\n output: string;\n}\n\nexport default class ComposerFailureModal extends Modal {\n oninit(vnode: Mithril.Vnode) {\n super.oninit(vnode);\n\n if (this.attrs.error.guessed_cause) {\n this.alertAttrs = {\n type: 'error',\n content: app.translator.trans(`sycho-package-manager.admin.failure_modal.guessed_cause.${this.attrs.error.guessed_cause}`),\n };\n }\n }\n\n className() {\n return 'Modal--large ComposerFailureModal';\n }\n\n title() {\n return app.translator.trans('sycho-package-manager.admin.failure_modal.title');\n }\n\n content() {\n return (\n
\n
\n {app.translator.trans('sycho-package-manager.admin.failure_modal.show_composer_output')}\n 
{this.attrs.error.output}
\n
\n
\n );\n }\n}\n","import type Mithril from 'mithril';\nimport app from 'flarum/admin/app';\nimport Component from 'flarum/common/Component';\nimport Button from \"flarum/common/components/Button\";\nimport Stream from \"flarum/common/utils/Stream\";\nimport LoadingModal from \"flarum/admin/components/LoadingModal\";\nimport ComposerFailureModal from \"./ComposerFailureModal\";\n\nexport default class Installer extends Component {\n packageName!: Stream;\n isLoading: boolean = false;\n\n oninit(vnode: Mithril.Vnode): void {\n super.oninit(vnode);\n\n this.packageName = Stream('');\n }\n\n view(): Mithril.Children {\n return (\n
\n \n

{app.translator.trans('sycho-package-manager.admin.extensions.install_help', {\n extiverse: extiverse.com\n })}

\n
\n \n \n
\n
\n );\n }\n\n data(): any {\n return {\n package: this.packageName(),\n };\n }\n\n onsubmit(): void {\n this.isLoading = true;\n app.modal.show(LoadingModal);\n\n app.request({\n method: 'POST',\n url: `${app.forum.attribute('apiUrl')}/package-manager/extensions`,\n body: {\n data: this.data()\n },\n errorHandler: (e: any) => {\n const error = e.response.errors[0];\n\n if (error.code !== 'composer_command_failure') {\n throw e;\n }\n\n app.modal.show(ComposerFailureModal, { error });\n },\n }).then((response) => {\n const extensionId = response.id;\n app.alerts.show({ type: 'success' }, app.translator.trans('sycho-package-manager.admin.extensions.successful_install', { extension: extensionId }));\n window.location.href = `${app.forum.attribute('adminUrl')}#/extension/${extensionId}`;\n window.location.reload();\n }).finally(() => {\n this.isLoading = false;\n m.redraw();\n });\n }\n}\n","import app from 'flarum/admin/app';\nimport Component from 'flarum/common/Component';\nimport icon from \"flarum/common/helpers/icon\";\nimport Button from \"flarum/common/components/Button\";\nimport humanTime from \"flarum/common/helpers/humanTime\";\n\ntype UpdatedPackage = {\n name: string;\n version: string;\n latest: string;\n \"latest-status\": string;\n description: string;\n};\n\ntype ComposerUpdates = {\n installed: UpdatedPackage[];\n};\n\ntype LastUpdateCheck = {\n checkedAt: Date;\n updates: ComposerUpdates;\n};\n\nexport default class Updater extends Component {\n isLoading: boolean = false;\n lastUpdateCheck: LastUpdateCheck = app.data.lastUpdateCheck || {};\n\n oninit(vnode) {\n super.oninit(vnode);\n }\n\n view() {\n const extensions: any = this.getExtensionUpdates();\n\n // @TODO catch `flarum/core` updates and display them differently, since it is the CORE and not an extension.\n\n return (\n
\n \n

{app.translator.trans('sycho-package-manager.admin.updater.updater_help')}

\n

\n {app.translator.trans('sycho-package-manager.admin.updater.last_update_checked_at')}\n {humanTime(this.lastUpdateCheck?.checkedAt)}\n

\n \n {extensions.length ? (\n
\n
\n {extensions.map((extension: any) => (\n
\n
\n {extension.icon ? icon(extension.icon.name) : ''}\n
\n
\n
{extension.extra['flarum-extension'].title}
\n
\n {extension.version}\n {extension.newPackageUpdate.latest}\n
\n
\n
\n
\n
\n ))}\n
\n
\n ) : null}\n
\n );\n }\n\n getExtensionUpdates() {\n const updates = this.lastUpdateCheck?.updates?.installed?.filter((composerPackage: UpdatedPackage) => {\n const extension = app.data.extensions[composerPackage.name.replace('/', '-').replace(/(flarum-ext-)|(flarum-)/, '')];\n const safeToUpdate = composerPackage['latest-status'] === 'semver-safe-update';\n\n if (extension && safeToUpdate) {\n extension.newPackageUpdate = composerPackage;\n }\n\n return extension && safeToUpdate;\n });\n\n return Object.values(app.data.extensions).filter((extension: any) => extension.newPackageUpdate);\n }\n\n checkForUpdates() {\n this.isLoading = true;\n\n app.request({\n method: 'POST',\n url: `${app.forum.attribute('apiUrl')}/package-manager/check-for-updates`,\n }).then((response) => {\n this.isLoading = false;\n this.lastUpdateCheck = response as LastUpdateCheck;\n m.redraw();\n });\n }\n}\n","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\nimport Alert from 'flarum/common/components/Alert';\nimport ExtensionPage from 'flarum/admin/components/ExtensionPage';\nimport Button from 'flarum/common/components/Button';\nimport LoadingModal from 'flarum/admin/components/LoadingModal';\nimport Installer from \"./components/Installer\";\nimport Updater from \"./components/Updater\";\n\napp.initializers.add('sycho-package-manager', (app) => {\n app.extensionData\n .for('sycho-package-manager')\n .registerSetting(() => {\n if (!app.data.isRequiredDirectoriesWritable) {\n return (\n
\n {app.translator.trans('sycho-package-manager.admin.file_permissions')}\n
\n );\n }\n })\n .registerSetting(() => {\n if (app.data.isRequiredDirectoriesWritable) {\n return (\n \n );\n }\n })\n .registerSetting(() => {\n if (app.data.isRequiredDirectoriesWritable) {\n return (\n \n );\n }\n });\n\n extend(ExtensionPage.prototype, 'topItems', function (items) {\n items.add(\n 'remove',\n {\n app.modal.show(LoadingModal);\n\n app.request({\n url: `${app.forum.attribute('apiUrl')}/package-manager/extensions/${this.extension.id}`,\n method: 'DELETE',\n }).then(() => {\n app.alerts.show({ type: 'success' }, app.translator.trans('sycho-package-manager.admin.extensions.successful_remove'));\n window.location = app.forum.attribute('adminUrl');\n }).finally(() => {\n app.modal.close();\n });\n }}>\n Remove\n \n );\n });\n});\n","module.exports = flarum.core.compat['admin/app'];","module.exports = flarum.core.compat['admin/components/ExtensionPage'];","module.exports = flarum.core.compat['admin/components/LoadingModal'];","module.exports = flarum.core.compat['common/Component'];","module.exports = flarum.core.compat['common/components/Alert'];","module.exports = flarum.core.compat['common/components/Button'];","module.exports = flarum.core.compat['common/components/Modal'];","module.exports = flarum.core.compat['common/extend'];","module.exports = flarum.core.compat['common/helpers/humanTime'];","module.exports = flarum.core.compat['common/helpers/icon'];","module.exports = flarum.core.compat['common/utils/Stream'];"],"sourceRoot":""} \ No newline at end of file diff --git a/extensions/package-manager/js/src/admin/components/Installer.tsx b/extensions/package-manager/js/src/admin/components/Installer.tsx index ab421b700..fe424d2f7 100644 --- a/extensions/package-manager/js/src/admin/components/Installer.tsx +++ b/extensions/package-manager/js/src/admin/components/Installer.tsx @@ -59,7 +59,7 @@ export default class Installer extends Component { app.modal.show(ComposerFailureModal, { error }); }, }).then((response) => { - const extensionId = response.data.attributes.id; + const extensionId = response.id; app.alerts.show({ type: 'success' }, app.translator.trans('sycho-package-manager.admin.extensions.successful_install', { extension: extensionId })); window.location.href = `${app.forum.attribute('adminUrl')}#/extension/${extensionId}`; window.location.reload(); diff --git a/extensions/package-manager/js/src/admin/components/Updater.tsx b/extensions/package-manager/js/src/admin/components/Updater.tsx new file mode 100644 index 000000000..910866425 --- /dev/null +++ b/extensions/package-manager/js/src/admin/components/Updater.tsx @@ -0,0 +1,102 @@ +import app from 'flarum/admin/app'; +import Component from 'flarum/common/Component'; +import icon from "flarum/common/helpers/icon"; +import Button from "flarum/common/components/Button"; +import humanTime from "flarum/common/helpers/humanTime"; + +type UpdatedPackage = { + name: string; + version: string; + latest: string; + "latest-status": string; + description: string; +}; + +type ComposerUpdates = { + installed: UpdatedPackage[]; +}; + +type LastUpdateCheck = { + checkedAt: Date; + updates: ComposerUpdates; +}; + +export default class Updater extends Component { + isLoading: boolean = false; + lastUpdateCheck: LastUpdateCheck = app.data.lastUpdateCheck || {}; + + oninit(vnode) { + super.oninit(vnode); + } + + view() { + const extensions: any = this.getExtensionUpdates(); + + // @TODO catch `flarum/core` updates and display them differently, since it is the CORE and not an extension. + + return ( +
+ +

{app.translator.trans('sycho-package-manager.admin.updater.updater_help')}

+

+ {app.translator.trans('sycho-package-manager.admin.updater.last_update_checked_at')} + {humanTime(this.lastUpdateCheck?.checkedAt)} +

+ + {extensions.length ? ( +
+
+ {extensions.map((extension: any) => ( +
+
+ {extension.icon ? icon(extension.icon.name) : ''} +
+
+
{extension.extra['flarum-extension'].title}
+
+ {extension.version} + {extension.newPackageUpdate.latest} +
+
+
+
+
+ ))} +
+
+ ) : null} +
+ ); + } + + getExtensionUpdates() { + const updates = this.lastUpdateCheck?.updates?.installed?.filter((composerPackage: UpdatedPackage) => { + const extension = app.data.extensions[composerPackage.name.replace('/', '-').replace(/(flarum-ext-)|(flarum-)/, '')]; + const safeToUpdate = composerPackage['latest-status'] === 'semver-safe-update'; + + if (extension && safeToUpdate) { + extension.newPackageUpdate = composerPackage; + } + + return extension && safeToUpdate; + }); + + return Object.values(app.data.extensions).filter((extension: any) => extension.newPackageUpdate); + } + + checkForUpdates() { + this.isLoading = true; + + app.request({ + method: 'POST', + url: `${app.forum.attribute('apiUrl')}/package-manager/check-for-updates`, + }).then((response) => { + this.isLoading = false; + this.lastUpdateCheck = response as LastUpdateCheck; + m.redraw(); + }); + } +} diff --git a/extensions/package-manager/js/src/admin/index.js b/extensions/package-manager/js/src/admin/index.js index 9d3f933ca..c0bcce2f6 100644 --- a/extensions/package-manager/js/src/admin/index.js +++ b/extensions/package-manager/js/src/admin/index.js @@ -5,6 +5,7 @@ import ExtensionPage from 'flarum/admin/components/ExtensionPage'; import Button from 'flarum/common/components/Button'; import LoadingModal from 'flarum/admin/components/LoadingModal'; import Installer from "./components/Installer"; +import Updater from "./components/Updater"; app.initializers.add('sycho-package-manager', (app) => { app.extensionData @@ -24,6 +25,13 @@ app.initializers.add('sycho-package-manager', (app) => { ); } + }) + .registerSetting(() => { + if (app.data.isRequiredDirectoriesWritable) { + return ( + + ); + } }); extend(ExtensionPage.prototype, 'topItems', function (items) { diff --git a/extensions/package-manager/less/admin.less b/extensions/package-manager/less/admin.less index bb5abb89f..a6cd8f170 100644 --- a/extensions/package-manager/less/admin.less +++ b/extensions/package-manager/less/admin.less @@ -8,3 +8,60 @@ .ComposerFailureModal-output { white-space: break-spaces; } + +.sycho-package-manager-Page .ExtensionPage-settings .Form-group:last-child { + display: none; +} + +.PackageManager-lastUpdatedAt { + color: @control-color; + + &-label { + font-weight: bold; + } +} + +.PackageManager-extensions { + &-grid { + --gap: 12px; + display: grid; + grid-template-columns: repeat(auto-fit, calc(~"100% / 3 - var(--gap)")); + gap: var(--gap); + margin-top: 16px; + } +} + +.PackageManager-extension { + display: flex; + align-items: center; + gap: 8px; + background-color: @control-bg; + padding: 8px; + border-radius: @border-radius; + + &-controls { + margin-left: auto; + } + + &-icon { + --size: 40px; + } + + &-name { + font-weight: bold; + } + + &-version { + display: flex; + align-items: center; + gap: 8px; + + &-latest { + background: @alert-success-bg; + color: @alert-success-color; + border-radius: 30px; + padding: 0 6px; + font-weight: bold; + } + } +} diff --git a/extensions/package-manager/locale/en.yml b/extensions/package-manager/locale/en.yml index a413eb9f6..19f2ec522 100644 --- a/extensions/package-manager/locale/en.yml +++ b/extensions/package-manager/locale/en.yml @@ -15,3 +15,9 @@ sycho-package-manager: file_permissions: > The package manager requires read and write permissions on the following files and directories: composer.json, composer.lock, vendor, storage/.composer + + updater: + check_for_updates: Check for updates + last_update_checked_at: "Last Update Check: " + updater_title: Updates + updater_help: Runs a check for new extension and Flarum updates. diff --git a/extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php b/extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php new file mode 100644 index 000000000..c71dc9c15 --- /dev/null +++ b/extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php @@ -0,0 +1,40 @@ +bus = $bus; + } + + public function handle(ServerRequestInterface $request): ResponseInterface + { + $actor = RequestUtil::getActor($request); + + $lastUpdateCheck = $this->bus->dispatch( + new CheckForUpdates($actor) + ); + + return new JsonResponse($lastUpdateCheck); + } +} diff --git a/extensions/package-manager/src/Command/CheckForUpdates.php b/extensions/package-manager/src/Command/CheckForUpdates.php new file mode 100644 index 000000000..d0a184368 --- /dev/null +++ b/extensions/package-manager/src/Command/CheckForUpdates.php @@ -0,0 +1,22 @@ +actor = $actor; + } +} diff --git a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php new file mode 100644 index 000000000..b79209ec9 --- /dev/null +++ b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php @@ -0,0 +1,64 @@ +composer = $composer; + $this->settings = $settings; + } + + /** + * @throws \Flarum\User\Exception\PermissionDeniedException + */ + public function handle(CheckForUpdates $command) + { + $actor = $command->actor; + + $actor->assertAdmin(); + + $output = new BufferedOutput(); + $input = new ArrayInput([ + 'command' => 'outdated', + '-D' => true, + '--format' => 'json', + ]); + + $this->composer->run($input, $output); + + $lastUpdateCheck = [ + 'checkedAt' => Carbon::now(), + 'updates' => json_decode($output->fetch(), true), + ]; + + $this->settings->set('sycho-package-manager.last_update_check', json_encode($lastUpdateCheck)); + + return $lastUpdateCheck; + } +}