@steedos/service-package-loader 3.0.0-beta.7 → 3.0.0-beta.71

package/index.js

@@ -19,8 +19,6 @@ const {
 } = require('@steedos/metadata-core');
 const sRouter = require('@steedos/router');
 
-const loadFlowFile = new metaDataCore.LoadFlowFile();
-
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
     if(fs.existsSync(path.join(packagePath, 'package.service.yml'))){
@@ -87,8 +85,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 +112,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 文件, 则输出警告信息
@@ -235,6 +237,13 @@ 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");
+                    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 +254,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)
                 }    
@@ -295,14 +304,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', {
                         fileBase64: base64,
+                        packageInfo
                     }, {
                         timeout: 0,
                         meta: {
@@ -362,9 +375,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.71",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "3.0.0-beta.7",
-    "@steedos/metadata-registrar": "3.0.0-beta.7",
-    "@steedos/router": "3.0.0-beta.7",
-    "@steedos/service-object-mixin": "3.0.0-beta.7",
+    "@steedos/metadata-core": "3.0.0-beta.71",
+    "@steedos/metadata-registrar": "3.0.0-beta.71",
+    "@steedos/router": "3.0.0-beta.71",
+    "@steedos/service-object-mixin": "3.0.0-beta.71",
     "clone": "^2.1.2",
     "csvtojson": "~2.0.10",
     "moleculer": "^0.14.25",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b68a33d2fa33b380aa7ec401b63315886f7de861"
+  "gitHead": "32cf4e8cafda54a3e30a46a6506eaa021fa25fb7"
 }