@steedos/service-package-registry 3.0.0-beta.2 → 3.0.0-beta.9

package/main/default/manager/loader.js

@@ -1,6 +1,5 @@
 const yaml = require('js-yaml');
 const _ = require('lodash');
-const steedos = require('@steedos/core');
 const fs = require("fs");
 const path = require('path');
 const objectql = require('@steedos/objectql');
@@ -101,7 +100,6 @@ const appendToPackagesConfig = (packageName, options, actionName)=>{
 
 const loadPackages = async ()=>{
     let schema = objectql.getSteedosSchema();
-    let broker = schema.broker;
     const packages = loadPackagesConfig();
     for (const packageName in packages) {
         const package = packages[packageName]
@@ -116,7 +114,7 @@ const loadPackages = async ()=>{
                         }
                     }
                 } catch (error) {
-                    broker.logger.error(`start package ${packageName} error: ${error.message}`)
+                    console.error(`start package ${packageName} error: ${error.message}`)
                 }
 
             }else if(package.local !== true){
@@ -134,7 +132,7 @@ const loadPackages = async ()=>{
                         const packageInfo = await loadPackage(packageName);
                         appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: false});
                     } catch (error) {
-                        broker.logger.error(`start package ${packageName} error: ${error.message}`)
+                        console.error(`start package ${packageName} error: ${error.message}`)
                     }
                 }
             }else if(package.local === true && package.static != true){
@@ -149,7 +147,7 @@ const loadPackages = async ()=>{
                             appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
                         }
                     } catch (error) {
-                        broker.logger.error(`start package ${packageName} error: ${error.message}`)
+                        console.error(`start package ${packageName} error: ${error.message}`)
                     }
                 }
             }
@@ -183,7 +181,7 @@ const destroyExistThePackageService = async (packageInfo)=>{
         });
     }
     if (svc) {
-        broker.logger.info(`Destroy previous '${schema.name}' service...`);
+        console.info(`Destroy previous '${schema.name}' service...`);
         await broker.destroyService(svc);
     }
 }
@@ -249,7 +247,7 @@ const loadPackage = async (packageName, packagePath)=>{
         let schema = objectql.getSteedosSchema();
         let broker = schema.broker;
         if(!fs.existsSync(packagePath) || !fs.existsSync(path.join(packagePath, 'package.json'))){
-            broker.logger.warn(`已经从 steedos-packages.yml 文件中删除无效的软件包配置 ${packageName} : ${packagePath}`)
+            console.warn(`已经从 steedos-packages.yml 文件中删除无效的软件包配置 ${packageName} : ${packagePath}`)
             removePackageConfig(packageName);
             return ;
         }
@@ -264,7 +262,7 @@ const loadPackage = async (packageName, packagePath)=>{
         }
         
         await destroyExistThePackageService(packageInfo);
-        await steedos.loadPackage(packagePath);
+        await metaDataCore.loadPackage(packagePath);
         // const packageConfig = getPackageConfig(packageName);
         // if(packageInfo.dependencies){
         //     for (const dependencyName in packageInfo.dependencies) {

package/main/default/pages/steedos_packages_list.page.amis.json

@@ -32,7 +32,7 @@
           "actions": [
             {
               "label": "${uiSchema.actions.enable.label}",
-              "disabledOn": "${status === 'enable' || window:Meteor.settings.public.enable_saas}",
+              "disabledOn": "${status === 'enable' || window:Steedos.settings.public.enable_saas}",
               "className": "mr-4",
               "onEvent": {
                 "click": {
@@ -48,7 +48,7 @@
             },
             {
               "label": "${uiSchema.actions.disable.label}",
-              "disabledOn": "${status !== 'enable' || window:Meteor.settings.public.enable_saas}",
+              "disabledOn": "${status !== 'enable' || window:Steedos.settings.public.enable_saas}",
               "onEvent": {
                 "click": {
                   "actions": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.9",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "3.0.0-beta.2",
-    "@steedos/core": "3.0.0-beta.2",
-    "@steedos/metadata-core": "3.0.0-beta.2",
-    "@steedos/objectql": "3.0.0-beta.2",
-    "@steedos/service-package-loader": "3.0.0-beta.2",
+    "@steedos/auth": "3.0.0-beta.9",
+    "@steedos/metadata-core": "3.0.0-beta.9",
+    "@steedos/objectql": "3.0.0-beta.9",
+    "@steedos/service-package-loader": "3.0.0-beta.9",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -32,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74"
+  "gitHead": "9111ae9e9ce7c57c67c6bd670706f4344c28d69d"
 }

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-16 15:58:42
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2024-01-08 15:36:18
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-02-18 11:23:24
  * @Description: 
  */
 "use strict";
@@ -47,6 +47,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
+		
 	},
 
 	/**

package/project.package.service.js

@@ -42,7 +42,7 @@ module.exports = {
 	/**
 	 * Dependencies
 	 */
-	dependencies: ['~packages-standard-objects'],
+	dependencies: ['@steedos/service-packages'],
 
 	/**
 	 * Actions
@@ -260,7 +260,38 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-
+		'steedos-server.started': async function(){
+			const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
+			if(PACKAGE_INSTALL_NODE){
+				await this.broker.call('metadata.add', {key: `#package_install_node.${this.broker.nodeID}`, data: {nodeID: PACKAGE_INSTALL_NODE}}, {meta: {}}) 
+			}
+			packages.maintainSystemFiles()
+			// 单包路径steedos-app
+			try {
+				const packagePath = path.join(process.cwd(), 'steedos-app');
+				if(fs.existsSync(packagePath)){
+					const packageInfo = require(path.join(packagePath, 'package.json'));
+					loader.appendToPackagesConfig(`${packageInfo.name}`, {version: packageInfo.version, description: packageInfo.description || '', local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
+				}
+			} catch (error) {
+				console.log(`started error`, error)
+			}
+	
+			await metadata.uncompressPackages(process.cwd());
+			const mPackages = metadata.getAllPackages(process.cwd());
+			_.each(mPackages, (packagePath)=>{
+				try {
+					const packageInfo = require(path.join(packagePath, 'package.json'));
+					loader.appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
+				} catch (error) {
+					console.log(`started error`, error)
+				}
+			})
+			await this.initialPackages();
+			await loader.loadPackages();
+	
+			await this.installPackagesSyncToMetaData()
+		}
 	},
 
 	/**
@@ -420,19 +451,30 @@ module.exports = {
 								case "directory":
 								case "remote":
 								case "file":
+									installProps.name = parsed.rawSpec;
+									break;
 								case "git":
 									installProps.url = parsed.rawSpec;
 									break;
 								case "alias":
 									throw new Error(`not support ${parsed.type}`);
 							}
-							if(installProps.url){
-								//module, version, url, auth, enable, registry_url, broker
-								await this.installPackageFromUrl(installProps.url, installProps.version, installProps.url, null, true, null, this.broker);
+							if(parsed.type === 'file' || parsed.type === 'directory'){
+								const pInfos = await this.yarnAddPackage(packageName)
+								for(const pInfo of pInfos){
+									await this.broker.call('@steedos/service-project.enablePackage', {module: pInfo.name})
+								}
+								
 							}else{
-								//module, version, label, description, enable, broker
-								await this.installPackage(installProps.name, installProps.version, null, null, true, this.broker, process.env.NPM_REGISTRY_URL);
+								if(installProps.url){
+									//module, version, url, auth, enable, registry_url, broker
+									await this.installPackageFromUrl(installProps.url, installProps.version, installProps.url, null, true, null, this.broker);
+								}else{
+									//module, version, label, description, enable, broker
+									await this.installPackage(installProps.name, installProps.version, null, null, true, this.broker, process.env.NPM_REGISTRY_URL);
+								}
 							}
+							
 						} catch (error) {
 							this.broker.logger.error(`initialPackages: ${packageName}. ${error.message}`);
 						}
@@ -548,6 +590,7 @@ module.exports = {
 						})
 					})
 				}
+				return packages;
             }
 		}
 	},
@@ -563,36 +606,6 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
- 
-		const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
-		if(PACKAGE_INSTALL_NODE){
-			await this.broker.call('metadata.add', {key: `#package_install_node.${this.broker.nodeID}`, data: {nodeID: PACKAGE_INSTALL_NODE}}, {meta: {}}) 
-		}
-		packages.maintainSystemFiles()
-		// 单包路径steedos-app
-		try {
-			const packagePath = path.join(process.cwd(), 'steedos-app');
-			if(fs.existsSync(packagePath)){
-				const packageInfo = require(path.join(packagePath, 'package.json'));
-				loader.appendToPackagesConfig(`${packageInfo.name}`, {version: packageInfo.version, description: packageInfo.description || '', local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
-			}
-		} catch (error) {
-			console.log(`started error`, error)
-		}
-
-		await metadata.uncompressPackages(process.cwd());
-		const mPackages = metadata.getAllPackages(process.cwd());
-		_.each(mPackages, (packagePath)=>{
-			try {
-				const packageInfo = require(path.join(packagePath, 'package.json'));
-				loader.appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
-			} catch (error) {
-				console.log(`started error`, error)
-			}
-		})
-		await loader.loadPackages();
-
-		await this.installPackagesSyncToMetaData()
 		
 	},