@steedos/service-package-loader 3.0.0-beta.14 → 3.0.0-beta.141

package/index.js

@@ -19,7 +19,7 @@ const {
 } = require('@steedos/metadata-core');
 const sRouter = require('@steedos/router');
 
-const loadFlowFile = new metaDataCore.LoadFlowFile();
+const chalk = require("chalk");
 
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
@@ -87,8 +87,10 @@ module.exports = {
                 }
                 const { path: packagePath, isUnmanaged } = packageInfo;
                 if (isUnmanaged && packagePath) {
+                    // eslint-disable-next-line @typescript-eslint/no-require-imports
+                    const packageJSON = require(`${packagePath}/package.json`)
                     const userSession = { spaceId: spaceId, userId: spaceDoc.owner };
-                    await this.deployPackage(packagePath, userSession);
+                    await this.deployPackage(packagePath, userSession, {name: packageJSON.name, version: packageJSON.version});
                 }
             }
         }
@@ -112,7 +114,9 @@ module.exports = {
             ]
             const matchedPaths2 = metaDataCore.syncMatchFiles(filePatten2);
             for await (const filePath of matchedPaths2) {
-                this.broker.logger.warn(`The object.js file has been deprecated. ${filePath}`); 
+                if(!filePath.endsWith("_base/base.object.js")){
+                    this.broker.logger.warn(`The object.js file has been deprecated. ${filePath}`); 
+                }
             }
 
             // 扫描软件包中的元数据, 如果有 .router.js 文件, 则输出警告信息
@@ -199,7 +203,7 @@ module.exports = {
             }
         },
         async errorHandler(error) {
-            this.broker.logger.error(`[${this.name}] 启动失败: ${error.message}`);
+            console.error(chalk.red(`[${this.name}] 启动失败: ${error.message}`));
             await await this.broker.call(`@steedos/service-project.disablePackage`, {
                 module: this.schema.packageName
             })
@@ -235,6 +239,15 @@ module.exports = {
             if (true != isUnmanaged) {
                 // 受管软件包加载元数据文件，非受管软件包不加载
                 await this.loadPackageMetadataFiles(_path, this.name, datasource);
+            }else{
+                if(process.env.STEEDOS_TENANT_ENABLE_SAAS != "true"){
+                    const primarySpace = await this.broker.call("objectql.getPrimarySpace");
+                    if(primarySpace){
+                        const packageJSON = require(`${_path}/package.json`)
+                        const userSession = { spaceId: primarySpace._id, userId: primarySpace.owner };
+                        await this.deployPackage(_path, userSession, {name: packageJSON.name, version: packageJSON.version});
+                    }
+                }
             }
             if(isPackage !== false){
                 try {
@@ -245,7 +258,7 @@ module.exports = {
                         _packageInfo = metaDataCore.loadJSONFile(path.join(_path, '..', 'package.json'));
                     }
                     const packageYmlData = getPackageYmlData(_path);
-                    await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {packageYmlData: packageYmlData, name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
+                    await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {isUnmanaged: isUnmanaged, packageYmlData: packageYmlData, name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
                 } catch (error) {
                     console.log(`error`, error)
                 }    
@@ -257,12 +270,12 @@ module.exports = {
             this.started = true;
             const endTime = moment();
             const serviceName = this.name.length < 50 ? `${_.padEnd(this.name, 50, ' ')}` : this.name
-            logger.log(`service ${serviceName} started: ${endTime.diff(startTime, 'seconds', true)}s`);
+            console.log(chalk.green(`service ${serviceName} started: ${endTime.diff(startTime, 'seconds', true)}s`));
             if(this.afterStart){
                 try {
                     await this.afterStart();
                 } catch (error) {
-                    this.broker.logger.error(`[${this.name}]: ${error.message}`);
+                    console.error(chalk.error(`[${this.name}]: ${error.message}`));
                 }
             }
         },
@@ -295,14 +308,18 @@ module.exports = {
                 await datasource.init();
             }
         },
-        async deployPackage(sourcePath, userSession){
+        async deployPackage(sourcePath, userSession, packageInfo){
             try {
                 var tempDir = mkTempFolder('deploy-');
                 var option = { includeJs: false, tableTitle: 'Steedos Deploy', showLog: true, inDeploy: true };
-    
+                const dbPackage = await await this.getObject('steedos_packages').directFind({filters: ['name', '=', packageInfo.name]});
+                if(dbPackage.length > 0){
+                    return ;
+                }
                 compressFiles(sourcePath, sourcePath, tempDir, option, async (base64, zipDir) => {
-                    const result = await this.broker.call('~packages-@steedos/metadata-api.deploy', {
+                    const result = await this.broker.call('@steedos/metadata-api.deploy', {
                         fileBase64: base64,
+                        packageInfo
                     }, {
                         timeout: 0,
                         meta: {
@@ -341,7 +358,7 @@ module.exports = {
     merged(schema) {
         schema.packageName = schema.name;
         if(!schema.metadata || !schema.metadata.$package){
-            schema.name = `~packages-${schema.name}`;
+            schema.name = `${schema.name}`;
         }
 
         schema.settings.packageInfo = {
@@ -362,9 +379,12 @@ module.exports = {
      * Service started lifecycle event handler
      */
     async started() {
-        await this.broker.call(`@steedos/service-packages.starting`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
+        const packageInfo = this.settings.packageInfo;
+        const isUnmanaged = packageInfo?.isUnmanaged || false;
+
+        await this.broker.call(`@steedos/service-packages.starting`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, isUnmanaged}})
         await this.onStarted();
-        await this.broker.call(`@steedos/service-packages.started`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
+        await this.broker.call(`@steedos/service-packages.started`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, isUnmanaged}})
     },
 
     /**

package/lib/triggerLoader/index.js

@@ -13,8 +13,8 @@ function load(broker, packagePath, packageServiceName) {
             return;
         }
         for (const trigger of objTriggers) {
-            broker.emit('trigger.loaded', {
-                objectName: trigger['listenTo']
+            broker.emit("trigger.loaded", {
+                objectName: trigger["listenTo"],
             });
         }
     });

package/lib/triggerLoader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;AAyBA,oBAoDC;;AAtED,gCAAgC;AAChC,6BAA6B;AAE7B,oEAAiE;AAejE,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QAGnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,WAAW,GAAG,IAAA,uCAAkB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAeD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAgBhC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;aAClC,CAAC,CAAA;QACN,CAAC;IAWL,CAAC;CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;AAuBA,oBAuDC;;AAvED,gCAAgC;AAChC,6BAA6B;AAE7B,oEAAiE;AAajE,SAAsB,IAAI,CACxB,MAAW,EACX,WAAmB,EACnB,kBAA0B;;QAI1B,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,WAAW,GAAG,IAAA,uCAAkB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QAeD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAgBlC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC5B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;aAChC,CAAC,CAAC;QACL,CAAC;IAUH,CAAC;CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.141",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,13 +10,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "3.0.0-beta.14",
-    "@steedos/metadata-registrar": "3.0.0-beta.14",
-    "@steedos/router": "3.0.0-beta.14",
-    "@steedos/service-object-mixin": "3.0.0-beta.14",
+    "@steedos/metadata-core": "3.0.0-beta.141",
+    "@steedos/metadata-registrar": "3.0.0-beta.141",
+    "@steedos/router": "3.0.0-beta.141",
+    "@steedos/service-object-mixin": "3.0.0-beta.141",
     "clone": "^2.1.2",
     "csvtojson": "~2.0.10",
-    "moleculer": "^0.14.25",
+    "moleculer": "^0.14.35",
     "moment": "^2.24.0",
     "node-xlsx": "^0.16.1",
     "underscore": "^1.12.0"
@@ -24,9 +24,8 @@
   "devDependencies": {
     "typescript": "5.7.3"
   },
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6ecc49f17c754defd373f19417304e88bdce8aa9"
+  "gitHead": "f448582d11cedf0fd7bd9767c6e57da5414f7530"
 }