@steedos/service-package-registry 2.7.8-beta.1 → 2.7.8-beta.21

package/LICENSE.txt

@@ -1,22 +1,21 @@
-Steedos Licensing
+# Open Source License
 
-SOFTWARE LICENSING
+Steedos is licensed under a modified version of the Apache License 2.0, with the following additional conditions:
 
-To determine under which license you may use a file from the Steedos source code,
-please resort to the header of that file.
+1. Steedos may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer:
 
-If the file has no header, the following rules apply
-1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
+a. Multi-tenant service: Unless explicitly authorized by Steedos in writing, you may not use the Steedos source code to operate a multi-tenant environment.
+    - Tenant Definition: Within the context of Steedos, one tenant corresponds to one space. The space provides a separated area for each tenant's data and configurations.
 
-On request, licenses under different terms are available.
+b. LOGO and copyright information: In the process of using Steedos's frontend, you may not remove or modify the LOGO or copyright information in the Steedos console or applications. This restriction is inapplicable to uses of Steedos that do not involve its frontend.
 
-Source code of enterprise features are files that
-* are in folders named "ee" or start with "ee_", or in subfolders of such folders.
-* contain the strings "ee_" in its filename name.
-The files can be found by running the command `find . -iname ee -or -iname "*_ee*" -or -iname "*ee_*"`
+2. As a contributor, you should agree that:
 
-STEEDOS TRADEMARK GUIDELINES
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.
 
-Your use of the mark Steedos is subject to Steedos, Inc's prior written approval. For trademark approval or any questions
-you have about using these trademarks, please email zhuangjianguo@steedos.com
+Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
+
+The interactive design of this product is protected by appearance patent.
+
+© 2025 Steedos, Inc.

package/main/default/manager/loader.js

@@ -364,8 +364,8 @@ const enablePackage = async (packageName)=>{
     return packageInfo;
 }
 const installPackage = async (broker, options)=>{
-    let {module, version, label, description, enable} = options;
-    const packagePath = await registry.installModule(module, version);
+    let {module, version, label, description, enable, registry: registryUrl} = options;
+    const packagePath = await registry.installModule(module, version, '', registryUrl);
     if(enable){
         await loadPackage(module, packagePath);
     }else{

package/main/default/manager/registry.js

@@ -121,7 +121,7 @@ async function installModule(module, version, url, registry_url) {
     // if( check !== false){
     //     return check;
     // }
-    // console.log(`installModule`, module,version,url)
+    console.log('install package: ', module, version, url, registry_url)
     module = module || "";
     activePromise = activePromise.then(async function() {
         //TODO: ensure module is 'safe'
@@ -194,10 +194,11 @@ async function installModule(module, version, url, registry_url) {
         var installDir = settings.userDir || ".";
         var args = ['install','--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production',installName];
         var yarnArgs = ['add', '-E', installName, '--json']; //yarnCommand  , '--json' --registry
-        if (false && registry_url) {
+        if (registry_url) {
             yarnArgs.push('--registry')
             yarnArgs.push(registry_url)
         }
+        console.log('command run:', yarnCommand, yarnArgs.join(' '))
         return exec.run(yarnCommand,yarnArgs,{
             cwd: installDir
         }, true).then(result => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.7.8-beta.1",
+  "version": "2.7.8-beta.21",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.8-beta.1",
-    "@steedos/core": "2.7.8-beta.1",
-    "@steedos/metadata-core": "2.7.8-beta.1",
-    "@steedos/objectql": "2.7.8-beta.1",
-    "@steedos/service-package-loader": "2.7.8-beta.1",
+    "@steedos/auth": "2.7.8-beta.21",
+    "@steedos/core": "2.7.8-beta.21",
+    "@steedos/metadata-core": "2.7.8-beta.21",
+    "@steedos/objectql": "2.7.8-beta.21",
+    "@steedos/service-package-loader": "2.7.8-beta.21",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8d913c6e5741fc022c36b86db513753f975294a4"
+  "gitHead": "bde64f8e1f880f54583600a8bb0a6018f36061b7"
 }

package/project.package.service.js

@@ -268,8 +268,8 @@ module.exports = {
 	 */
 	methods: {
 		installPackage: {
-			async handler(module, version, label, description, enable, broker) {
-				return await loader.installPackage(broker, {module, version, label, description, enable})
+			async handler(module, version, label, description, enable, broker, registry) {
+				return await loader.installPackage(broker, {module, version, label, description, enable, registry})
             }
 		},
 		getPackageVersions: {
@@ -395,6 +395,7 @@ module.exports = {
 				const settings = this.settings;
 				const packages = settings.STEEDOS_INITIAL_PACKAGES;
 				if(_.isString(packages) && packages){
+					console.log('install initial packages: ', packages);
 					for (const packageName of packages.split(',')) {
 						try {
 							const parsed = npa(packageName);
@@ -419,19 +420,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);
+								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}`);
 						}
@@ -547,6 +559,7 @@ module.exports = {
 						})
 					})
 				}
+				return packages;
             }
 		}
 	},