@steedos/service-package-registry 3.0.0-beta.99 → 3.0.1

package/main/default/manager/loader.js

@@ -173,7 +173,7 @@ const destroyExistThePackageService = async (packageInfo)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     let svc = broker.getLocalService({
-        name: `~packages-${packageInfo.name}`
+        name: `${packageInfo.name}`
     });
     if(!svc){
         svc = broker.getLocalService({
@@ -181,7 +181,7 @@ const destroyExistThePackageService = async (packageInfo)=>{
         });
     }
     if (svc) {
-        console.info(`Destroy previous '${schema.name}' service...`);
+        console.info(`Destroy previous '${packageInfo.name}' service...`);
         await broker.destroyService(svc);
     }
 }
@@ -280,7 +280,7 @@ const disablePackage = async (packageName)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     const serviceList = broker.registry.getServiceList({ withActions: true });
-    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}` || _service.name == packageName;})
+    const service = _.find(serviceList, (_service)=>{return _service.name == `${packageName}` || _service.name == packageName;})
     if(service){
         await broker.destroyService(service);
     }
@@ -301,7 +301,7 @@ const removePackage = async (packageName)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     const serviceList = broker.registry.getServiceList({ withActions: true });
-    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}` || _service.name == packageName;})
+    const service = _.find(serviceList, (_service)=>{return _service.name == `${packageName}` || _service.name == packageName;})
     if(service){
         await broker.destroyService(service);
     }

package/main/default/manager/package-json.js

@@ -68,7 +68,7 @@ const packageJson = async (packageName, options) => {
     try {
         data = await got(packageUrl, gotOptions).json();
     } catch (error) {
-        if (error.response.statusCode === 404) {
+        if (error?.response?.statusCode === 404) {
             throw new PackageNotFoundError(packageName);
         }
 

package/main/default/manager/packages.js

@@ -62,7 +62,7 @@ const getAllPackages = async ()=>{
         }
     })
     _.map(_.map(onlinePackages, 'metadata'), (packageInfo)=>{
-        const packageName = packageInfo.name.replace(`~packages-`, '');
+        const packageName = packageInfo.name.replace(``, '');
         const _package = _.find(packages, (_p)=>{return _p.name == packageName})
         if(_package){
             _package.status = 'enable'

package/main/default/manager/registry.js

@@ -269,33 +269,169 @@ async function installModule(module, version, url, registry_url) {
     return activePromise;
 }
 
+
+/**
+ * 对比两个 package.json 对象的依赖变化，返回新增和修改的依赖
+ * @param {Object} oldPkg 修改前的 package.json 对象
+ * @param {Object} newPkg 修改后的 package.json 对象
+ * @returns {Array} 包含变化信息的数组，每个元素包含名称、版本号、路径和变化类型
+ */
+function comparePackageJsonChanges(oldPkg, newPkg) {
+  const changes = [];
+  
+  // 检查 dependencies 变化
+  const oldDeps = oldPkg?.dependencies || {};
+  const newDeps = newPkg?.dependencies || {};
+  
+  // 检查 devDependencies 变化
+  const oldDevDeps = oldPkg?.devDependencies || {};
+  const newDevDeps = newPkg?.devDependencies || {};
+  
+  // 对比 dependencies
+  for (const [pkg, newVersion] of Object.entries(newDeps)) {
+    const oldVersion = oldDeps[pkg];
+    
+    if (oldVersion === undefined) {
+      // 新增的依赖
+      changes.push({
+        name: pkg,
+        version: newVersion,
+        path: 'dependencies',
+        changeType: 'added'
+      });
+    } else if (oldVersion !== newVersion) {
+      // 版本变化的依赖
+      changes.push({
+        name: pkg,
+        version: newVersion,
+        oldVersion: oldVersion,
+        path: 'dependencies',
+        changeType: 'changed'
+      });
+    }
+  }
+  
+  // 对比 devDependencies
+  for (const [pkg, newVersion] of Object.entries(newDevDeps)) {
+    const oldVersion = oldDevDeps[pkg];
+    
+    if (oldVersion === undefined) {
+      // 新增的依赖
+      changes.push({
+        name: pkg,
+        version: newVersion,
+        path: 'devDependencies',
+        changeType: 'added'
+      });
+    } else if (oldVersion !== newVersion) {
+      // 版本变化的依赖
+      changes.push({
+        name: pkg,
+        version: newVersion,
+        oldVersion: oldVersion,
+        path: 'devDependencies',
+        changeType: 'changed'
+      });
+    }
+  }
+  
+  return changes;
+}
+
+function loadJson(filePath){
+    const packageData = fs.readFileSync(filePath, 'utf8');
+    return JSON.parse(packageData);
+}
+
 async function yarnAddPackage(yarnPackage){
     var installDir = settings.userDir || ".";
+
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+    const oldPackageInfo = loadJson(path.join(installDir, 'package.json'));
+
     var yarnArgs = ['add', '-E', ...yarnPackage.split(' '), '--json'];
     const data = await exec.run(yarnCommand, yarnArgs, {cwd: installDir}, true);
+
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+    const newPackageInfo = loadJson(path.join(installDir, 'package.json'));
+
+    const changes = comparePackageJsonChanges(oldPackageInfo, newPackageInfo);
     const formatData = JSON.parse(_.last(_.compact(data.stdout.split('\n'))))
+    // console.log(`yarnAddPackage:`, yarnPackage, formatData, data)
     // 解析 yarn add 返回的结果
     const steedosPackages = [];
-    _.each(formatData.data.trees, (module)=>{
-        const parsed = npa(module.name);
-        const packagePath = path.dirname(require.resolve(`${parsed.name}/package.json`, {
-            paths: [path.join(installDir, 'node_modules')]
-        }))
-        if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
-            // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
-            const schema = require(path.join(packagePath, 'package.service.js'));
-            schema.settings.packageInfo = {
-                ...schema.settings?.packageInfo,
-                ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+    if(formatData.data.trees){
+        _.each(formatData.data.trees, (module)=>{
+            const parsed = npa(module.name);
+            const packagePath = path.dirname(require.resolve(`${parsed.name}/package.json`, {
+                paths: [path.join(installDir, 'node_modules')]
+            }))
+            if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
+                // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+                const schema = require(path.join(packagePath, 'package.service.js'));
+                schema.settings.packageInfo = {
+                    ...schema.settings?.packageInfo,
+                    ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+                }
+                steedosPackages.push({
+                    name: parsed.name,
+                    version: parsed.rawSpec,
+                    path: packagePath,
+                    isUnmanaged: schema.settings.packageInfo.isUnmanaged
+                })
             }
-            steedosPackages.push({
-                name: parsed.name,
-                version: parsed.rawSpec,
-                path: packagePath,
-                isUnmanaged: schema.settings.packageInfo.isUnmanaged
-            })
+        })
+    }else{
+        // console.log('changes', changes, npa(yarnPackage));
+        const module = npa(yarnPackage);
+        if(module.name){
+            // eslint-disable-next-line no-undef
+            const packagePath = path.dirname(require.resolve(`${module.name}/package.json`, {
+                paths: [path.join(installDir, 'node_modules')]
+            }));
+            if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
+                // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+                const schema = require(path.join(packagePath, 'package.service.js'));
+                const packageInfo = loadJson(path.join(packagePath, 'package.json'));
+                schema.settings.packageInfo = {
+                    ...schema.settings?.packageInfo,
+                    ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+                }
+                steedosPackages.push({
+                    name: module.name,
+                    version: packageInfo.version,
+                    path: packagePath,
+                    isUnmanaged: schema.settings.packageInfo.isUnmanaged
+                })
+            }
+            
         }
-    })
+
+        for (const change of changes) {
+            // eslint-disable-next-line no-undef
+            const packagePath = path.dirname(require.resolve(`${change.name}/package.json`, {
+                paths: [path.join(installDir, 'node_modules')]
+            }))
+            if(fs.existsSync(path.join(packagePath, 'package.service.js'))){
+                // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
+                const schema = require(path.join(packagePath, 'package.service.js'));
+                schema.settings.packageInfo = {
+                    ...schema.settings?.packageInfo,
+                    ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+                }
+                if(!_.find(steedosPackages, {name: change.name})){
+                    steedosPackages.push({
+                        name: change.name,
+                        version: change.version,
+                        path: packagePath,
+                        isUnmanaged: schema.settings.packageInfo.isUnmanaged
+                    })
+                }
+                
+            }
+        }
+    }
+    // console.log('steedosPackages===>', steedosPackages);
     return steedosPackages;
 }
 

package/main/default/objectTranslations/steedos_packages.en/steedos_packages.en.objectTranslation.yml

@@ -126,7 +126,7 @@ actions:
   upgradePackage:
     label: Upgrade Package
   edit_npmrc:
-    label: Verification information
+    label: NPM Settings
 CustomLabels:
   steedos_packages_tab_introduce_title: Introduction
   steedos_packages_tab_components_title: Package Components
@@ -136,7 +136,7 @@ CustomLabels:
   steedos_packages_button_enable_dialog_confirm_text_suffix: "\"?"
   steedos_packages_button_enable_dialog_button_ok: Enable
   steedos_packages_button_enable_dialog_message_success: Enabled Successfully
-  steedos_packages_button_edit_npmrc_dialog_describe: "##### Verification Information Description (.npmrc):\r- `; Set a new registry for scoped packages`\r- `@myscope:registry=https://mycustomregistry.example.org`\r- `; Configure authentication information for the new registry (optional)`\r- `//mycustomregistry.example.org:_authToken=\"Authentication Token\"`"
+  steedos_packages_button_edit_npmrc_dialog_describe: "##### NPM Settings (.npmrc):\r- `; Set a new registry for scoped packages`\r- `@myscope:registry=https://mycustomregistry.example.org`\r- `; Configure authentication information for the new registry (optional)`\r- `//mycustomregistry.example.org:_authToken=\"Authentication Token\"`"
   steedos_packages_button_installPackageFromUrl_dialog_field_registry: Registry
   steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_taobao: taobao
   steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_cnpm: cnpm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "3.0.0-beta.99",
+  "version": "3.0.1",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "3.0.0-beta.99",
-    "@steedos/metadata-core": "3.0.0-beta.99",
-    "@steedos/objectql": "3.0.0-beta.99",
-    "@steedos/service-package-loader": "3.0.0-beta.99",
+    "@steedos/auth": "3.0.1",
+    "@steedos/metadata-core": "3.0.1",
+    "@steedos/objectql": "3.0.1",
+    "@steedos/service-package-loader": "3.0.1",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -27,9 +27,8 @@
     "radwag-mass": "~1.0.5",
     "validator": "^13.5.2"
   },
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a0e9d5ee78766e54048a385b7677f6916aa287c4"
+  "gitHead": "4bbcc1f1ba098d299f5c363e67679f001f715575"
 }

package/project.package.service.js

@@ -91,7 +91,7 @@ module.exports = {
 					}
 				})
 				if(packageConfig?.isUnmanaged){
-					await ctx.broker.call(`~packages-@steedos/metadata-api.remove`, {
+					await ctx.broker.call(`@steedos/metadata-api.remove`, {
 						name: module
 					}, {
                         timeout: 0,