@steedos/service-package-loader 2.2.10 → 2.2.13

package/index.js

@@ -8,6 +8,8 @@ const path = require('path');
 const Future = require('fibers/future');
 const _ = require('lodash');
 const globby = require("globby");
+const express = require('express');
+const fs = require("fs");
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -20,7 +22,8 @@ module.exports = {
      */
     settings: {
         path: '', // 扫描加载原数据的路径
-        name: '' // service name
+        name: '', // service name
+		loadedPackagePublicFiles: false
     },
 
     /**
@@ -46,6 +49,9 @@ module.exports = {
                     return;
                 }
                 const { path : _path } = packageInfo;
+
+                this.loadPackagePublicFiles(_path);
+
                 if(_path){
                     //此处延迟10秒加载流程文件，防止工作区初始化未完成
                     setTimeout(() => {
@@ -112,6 +118,29 @@ module.exports = {
                     this.logger.error(error)
                 }
             }
+        },
+        loadPackagePublicFiles: {
+            handler(packagePath) {
+                let publicPath = path.join(packagePath, 'public');
+				if (!fs.existsSync(publicPath) ||this.settings.loadedPackagePublicFiles || !WebApp) {
+					return;
+				}
+
+				this.settings.loadedPackagePublicFiles = true;
+				try {
+					const router = express.Router();
+					let routerPath = "";
+					if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+						routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+					}
+					const cacheTime = 86400000 * 1; // one day
+					router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
+					WebApp.rawConnectHandlers.use(router);
+				} catch (error) {
+					console.error(error)
+					this.settings.loadedPackagePublicFiles = false;
+				}
+			}
         }
     },
 
@@ -158,6 +187,8 @@ module.exports = {
 
         await this.loadPackageMetadataServices(_path);
 
+        await this.loadPackagePublicFiles(_path);
+
         console.timeEnd(`service ${this.name} started`)
         // console.log(`service ${this.name} started`);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.2.10",
+  "version": "2.2.13",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,8 +11,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.2.10",
-    "@steedos/objectql": "2.2.10",
+    "@steedos/core": "2.2.13",
+    "@steedos/objectql": "2.2.13",
     "clone": "^2.1.2",
     "globby": "^9.1.0",
     "moleculer": "^0.14.12",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d67480163010b3de090e84e6b899ee810d4037c1"
+  "gitHead": "4436bff1d9f493542f74c7114bb69c62f49dee14"
 }