@steedos/service-package-registry 2.1.51 → 2.1.55

package/main/default/manager/login.js

@@ -61,7 +61,7 @@ function getYarnrcScopes() {
     const data = fs.readFileSync(yarnrcConfigPath, 'utf-8');
     const scopes = {};
     if (data) {
-        console.log(`data`, data);
+        // console.log(`data`, data);
         try {
             const lines = data.split('\n');
             _.each(lines, (line) => {

package/main/default/manager/npm_login.js

@@ -41,9 +41,17 @@ if (!Array.prototype.findIndex) {
 }
 // jshint freeze:true
 
+function removeSuffix(pattern, suffix) {
+    if (pattern.endsWith(suffix)) {
+        return pattern.slice(0, -suffix.length);
+    }
+    return pattern;
+}
+
 module.exports = {
     processArguments: function (npmUser, npmPass, npmEmail, npmRegistry, npmScope, quotes, configPath) {
         var registry = npmRegistry || 'https://registry.npmjs.org';
+        registry = removeSuffix(registry, '/')
         var homePath = process.env.HOME ? process.env.HOME : process.env.USERPROFILE;
         var finalPath = configPath ? configPath : path.join(homePath, '.npmrc');
         var hasQuotes = quotes ? quotes : false;

package/main/default/manager/packages.js

@@ -8,10 +8,14 @@ const _ = require('lodash');
 const login = require('./login');
 
 function registryUrl(scope) {
-    const result = login.getYarnrcScopes();
-    const url = result[`${scope}:registry`];
-    if (url) {
-        return url.slice(-1) === '/' ? url : `${url}/`;
+    try {
+        const result = login.getYarnrcScopes();
+        const url = result[`${scope}:registry`];
+        if (url) {
+            return url.slice(-1) === '/' ? url : `${url}/`;
+        }
+    } catch (Exception) {
+
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.1.51",
+  "version": "2.1.55",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-package-loader": "2.1.51",
+    "@steedos/service-package-loader": "2.1.55",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7832979d04d09de2e1d522fad30c20dfbfeea046"
+  "gitHead": "4cf71f0e696a28b30084bb07471cfbdc6c875f96"
 }

package/package.service.js

@@ -508,7 +508,7 @@ module.exports = {
 				// 配置主控地址
 				const consoleUrl = settings.STEEDOS_CLOUD_URL;
 				if (!consoleUrl) {
-					console.log(chalk.red('请配置主控地址'));
+					console.log('请配置主控地址');
 					return;
 				}
 
@@ -518,7 +518,7 @@ module.exports = {
 				const apiKey = settings.STEEDOS_CLOUD_API_KEY;
 
 				if (!spaceId || !apiKey) {
-					console.log(chalk.red('请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY。'));
+					console.log('请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY。');
 					return;
 				}
 
@@ -528,7 +528,7 @@ module.exports = {
 				const { info, scopes } = await this.getSafeScopes(spaceId, apiKey, consoleUrl);
 				const { adminPhone } = info;
 				if (!adminPhone) {
-					console.log(chalk.red('缺少工作区信息 工作区名称、管理员姓名、管理员手机号，请检查'));
+					console.log('缺少工作区信息 工作区名称、管理员姓名、管理员手机号，请检查');
 					return;
 				}
 				// let scope = '';