@steedos/service-package-registry 2.7.15-beta.2 → 2.7.15-beta.20

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.15-beta.2",
+  "version": "2.7.15-beta.20",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.15-beta.2",
-    "@steedos/core": "2.7.15-beta.2",
-    "@steedos/metadata-core": "2.7.15-beta.2",
-    "@steedos/objectql": "2.7.15-beta.2",
-    "@steedos/service-package-loader": "2.7.15-beta.2",
+    "@steedos/auth": "2.7.15-beta.20",
+    "@steedos/core": "2.7.15-beta.20",
+    "@steedos/metadata-core": "2.7.15-beta.20",
+    "@steedos/objectql": "2.7.15-beta.20",
+    "@steedos/service-package-loader": "2.7.15-beta.20",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af6620fc0fa40d3df7028e9671fb42396d2e8d8c"
+  "gitHead": "c79584f0be4965760d55f34df5aef9f8df9e310e"
 }

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);
@@ -430,7 +431,7 @@ module.exports = {
 								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);
+								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}`);