@steedos/service-package-registry 3.0.0-beta.15 → 3.0.0-beta.151

package/main/default/manager/loader.js

@@ -114,7 +114,7 @@ const loadPackages = async ()=>{
                         }
                     }
                 } catch (error) {
-                    console.error(`start package ${packageName} error: ${error.message}`)
+                    console.error(`start package ${packageName} error[117]: ${error.message}`)
                 }
 
             }else if(package.local !== true){
@@ -132,7 +132,7 @@ const loadPackages = async ()=>{
                         const packageInfo = await loadPackage(packageName);
                         appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: false});
                     } catch (error) {
-                        console.error(`start package ${packageName} error: ${error.message}`)
+                        console.error(`start package ${packageName} error[135]: ${error.message}`)
                     }
                 }
             }else if(package.local === true && package.static != true){
@@ -147,7 +147,7 @@ const loadPackages = async ()=>{
                             appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
                         }
                     } catch (error) {
-                        console.error(`start package ${packageName} error: ${error.message}`)
+                        console.error(`start package ${packageName} error[150]: ${error.message}`)
                     }
                 }
             }
@@ -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'
@@ -71,6 +71,7 @@ const getAllPackages = async ()=>{
             _package.instance_id = packageInfo.instanceID
             _package.version = packageInfo.version
             _package.homepage = packageInfo.homepage
+            _package.isUnmanaged = packageInfo.isUnmanaged
         }else{
             packages.push({
                 label: packageInfo.label || packageName,
@@ -84,7 +85,8 @@ const getAllPackages = async ()=>{
                 instance_id: packageInfo.instanceID,
                 status : 'enable',
                 version : packageInfo.version,
-                local: false
+                local: false,
+                isUnmanaged: packageInfo.isUnmanaged
             })
         }
     })
@@ -129,7 +131,7 @@ const maintainSystemFiles = ()=>{
 const getPackageVersions = async (packageName, options)=>{
     //TODO 处理 registry_url
 
-    let registry_url = registryUrl(packageName.toLowerCase().split('/')[0]);
+    let registry_url = process.env.NPM_REGISTRY_URL ||  registryUrl(packageName.toLowerCase().split('/')[0]);
 
     const result = await packageJson(packageName.toLowerCase(), {
         allVersions: true,

package/main/default/manager/registry.js

@@ -269,26 +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'))){
-            steedosPackages.push({
-                name: parsed.name,
-                version: parsed.rawSpec,
-                path: packagePath
-            })
+    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
+                })
+            }
+        })
+    }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

@@ -124,4 +124,22 @@ actions:
   uninstall:
     label: Uninstall
   upgradePackage:
-    label: Upgrade Package
+    label: Upgrade Package
+  edit_npmrc:
+    label: NPM Settings
+CustomLabels:
+  steedos_packages_tab_introduce_title: Introduction
+  steedos_packages_tab_components_title: Package Components
+  steedos_packages_tab_details_title: Details
+  steedos_packages_button_enable_dialog_title: Enable
+  steedos_packages_button_enable_dialog_confirm_text_prefix: "Make sure to enable \""
+  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: "##### 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
+  steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_npmjs: npmjs
+  steedos_packages_button_installPackageFromUrl_dialog_describe1: "##### You can specify a version using one of the following options:\r- `package-name` Install the 'latest' version of the package.\r- `package-name@1.2.3` Install a specific version of the package from the registry.\r- `package-name@tag` Install a specific 'tag', such as beta, next, or latest."
+  steedos_packages_button_installPackageFromUrl_dialog_describe2: "##### You can also specify packages from different locations:\r- `package-name` Install the package from the npm registry.\r- `file:/path/to/local/folder` Install a package located on your local filesystem. This is useful for testing packages you haven’t published to the registry yet.\r- `file:/path/to/local/tarball.tgz` Install from a gzipped tarball, which can be used to share packages before publishing.\r- `link:/path/to/local/folder` Install a symbolic link to a package on your local filesystem. Useful in monorepo environments.\r- `<git remote url>` Install a package from a remote Git repository.\r- `<git remote url>#<branch/commit/tag>` Install a package from a specific git branch, commit, or tag in the remote Git repository.\r- `https://my-project.org/package.tgz` Install from a remote gzipped tarball."

package/main/default/objectTranslations/steedos_packages.zh-CN/steedos_packages.zh-CN.objectTranslation.yml

@@ -0,0 +1,23 @@
+name: steedos_packages
+label: 软件包
+description: 
+actions:
+  edit_npmrc:
+    label: 验证信息
+CustomLabels:
+  steedos_packages_tab_introduce_title: 简介
+  steedos_packages_tab_components_title: 软件包组件
+  steedos_packages_tab_details_title: 详细信息
+  steedos_packages_button_enable_dialog_title: 启用
+  steedos_packages_button_enable_dialog_confirm_text_prefix: 确定要启用「
+  steedos_packages_button_enable_dialog_confirm_text_suffix: 」？
+  steedos_packages_button_enable_dialog_button_ok: 启用
+  steedos_packages_button_enable_dialog_message_success: 已启用
+  steedos_packages_button_edit_npmrc_dialog_describe: "##### 验证信息说明(.npmrc)：\r- `; 为范围包设置新的注册表`\r- `@myscope:registry=https://mycustomregistry.example.org`\r- `; 配置新注册表的认证信息(可选)`\r- `//mycustomregistry.example.org:_authToken=\"认证信息\"`"
+  steedos_packages_button_installPackageFromUrl_dialog_field_registry: 镜像源
+  steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_taobao: 淘宝源
+  steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_cnpm: cnpm
+  steedos_packages_button_installPackageFromUrl_dialog_field_registry_option_npmjs: 官方源
+  steedos_packages_button_installPackageFromUrl_dialog_describe1: "##### 您可以使用以下选项之一指定版本： \r- `package-name`安装包的“最新”版本。 \r- `package-name@1.2.3`从以下位置安装包的特定版本 注册表。 \r- `package-name@tag`安装特定的“标签”。（例如）beta、next、latest"
+  steedos_packages_button_installPackageFromUrl_dialog_describe2: "##### 您还可以指定来自不同位置的包：\r- `package-name` 从 npm 注册表安装包 \r- `file:/path/to/local/folder`安装一个位于本地文件系统的包。这对于测试您尚未发布到注册表的软件包很有用。 \r- `file:/path/to/local/tarball.tgz`从 gzip 压缩的 tarball，可用于在发布包之前共享包。 \r- `link:/path/to/local/folder`安装指向软件包的符号链接:在本地文件系统上。适用于monorepo环境。 \r- `<git remote url>`从远程 Git 存储库安装包。 \r- `<git remote url>#<branch/commit/tag>`从远程安装软件包特定 git 分支、git commit 或 git 标签处的 git 存储库。 \r- `https://my-project.org/package.tgz` 从远程gzip压缩压缩包。"
+

package/main/default/objects/steedos_packages/buttons/disable.button.js

@@ -0,0 +1,51 @@
+module.exports = {
+    disable: function (object_name, record_id) {
+        Steedos.sobject(object_name).retrieve(record_id).then((record)=>{
+            if(!record){
+                return SteedosUI.notification.error({message: '未找到软件包'})
+            }
+            SteedosUI.Modal.confirm({
+                title: t('steedos_packages.disable.title'),
+                content: t('steedos_packages.disable.text') + ` ${record.name}?`,
+                okText: t('steedos_packages.disable.title'),
+                cancelText: t('Cancel'),
+                onOk: function(){
+                    Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/disable'), {type: 'post', async: false, data: JSON.stringify({
+                            module: record.name,
+                            nodeID: window.$("#steedos_package_main_node").val()
+                        }),
+                        success: function(data){
+                            if(data.status == 1){
+                                SteedosUI.notification.error({message: data.msg});
+                                return;
+                            }
+                            setTimeout(function(){
+                                SteedosUI.notification.success({
+                                    message: t('steedos_packages.disable.toastr_success')
+                                });
+                                window.location.reload()
+                            }, 1000 * 2)
+                        },
+                        error: function(XMLHttpRequest){
+                            SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.msg});
+                        }
+                    })
+                }
+            });
+        })
+        
+    },
+    disableVisible: function (object_name, record_id, permission, data) {
+        if(Steedos.settings.public.enable_saas){
+            return false;
+        }
+        const record = data?.record || {};
+        if(record.isUnmanaged){
+            return false
+        }
+        if (record.status === 'enable') {
+            return true;
+        }
+        return false
+    }
+}

package/main/default/objects/steedos_packages/buttons/disable.button.yml

@@ -0,0 +1,4 @@
+name: disable
+is_enable: true
+label: 停用
+'on': record

package/main/default/objects/steedos_packages/buttons/edit_npmrc.button.js

@@ -0,0 +1,8 @@
+module.exports = {
+    edit_npmrcVisible: function (object_name, record_id) {
+        if(Steedos.settings.public.enable_saas){
+            return false;
+        }
+        return Steedos.isSpaceAdmin();
+    }
+}

package/main/default/objects/steedos_packages/buttons/edit_npmrc.button.yml

@@ -0,0 +1,86 @@
+name: edit_npmrc
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "${'CustomAction.steedos_packages.edit_npmrc' | t}",
+              "id": "u:edit_npmrc",
+              "editorState": "default",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "actionType": "dialog",
+                              "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'CustomAction.steedos_packages.edit_npmrc' | t}",
+                                  "body": [
+                                      {
+                                          "type": "form",
+                                          "title": "表单",
+                                          "body": [
+                                              {
+                                                  "type": "editor",
+                                                  "label": false,
+                                                  "name": "npmrc",
+                                                  "id": "u:71b44f532def",
+                                                  "language": "bat"
+                                              }
+                                          ],
+                                          "id": "u:c9b0e17d4ebd",
+                                          "initApi": {
+                                              "url": "/api/nodes/npmrc",
+                                              "method": "get"
+                                          },
+                                          "api": {
+                                              "url": "/api/nodes/npmrc",
+                                              "method": "post",
+                                              "requestAdaptor": "",
+                                              "adaptor": "",
+                                              "messages": {}
+                                          }
+                                      },
+                                      {
+                                        "type": "tpl",
+                                        "tpl": "<br/>"
+                                      },
+                                        {
+                                        "type": "markdown",
+                                        "value": "${'steedos_packages_button_edit_npmrc_dialog_describe' | t}"
+                                        }
+                                  ],
+                                  "showCloseButton": true,
+                                  "showErrorMsg": true,
+                                  "showLoading": true,
+                                  "className": "app-popover",
+                                  "id": "u:00682dd0eb74",
+                                  "closeOnEsc": false,
+                                  "size": "lg"
+                              }
+                          }
+                      ]
+                  }
+              }
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+          "context": {},
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "bodyClassName": "p-0",
+      "id": "u:743d34f49376"
+  }
+is_enable: true
+label: 验证信息
+'on': list
+type: amis_button
+visible: true

package/main/default/objects/steedos_packages/buttons/enable.button.js

@@ -0,0 +1,58 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-07-07 16:57:38
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-09-01 17:04:07
+ */
+module.exports = {
+    enable: function (object_name, record_id) {
+        Steedos.sobject(object_name).retrieve(record_id).then((record)=>{
+            if(!record){
+                return SteedosUI.notification.error({message: '未找到软件包'})
+            }
+            console.log('record.....',record)
+
+            SteedosUI.Modal.confirm({
+                title: t('steedos_packages.enable.title'),
+                content: t('steedos_packages.enable.text') + ` ${record.name}?`,
+                okText: t('steedos_packages.enable.title'),
+                cancelText: t('Cancel'),
+                onOk: function(){
+                    Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/enable'), {type: 'post', async: false, data: JSON.stringify({
+                            module: record.name,
+                            nodeID: window.$("#steedos_package_main_node").val()
+                        }),
+                        success: function(data){
+                            if(data.status == 1){
+                                SteedosUI.notification.error({message: data.msg});
+                                return;
+                            }
+                            setTimeout(function(){
+                                 SteedosUI.notification.success({
+                                    message: t('steedos_packages.enable.toastr_success')
+                                });
+                                window.location.reload()
+                            }, 1000 * 2)
+                        },
+                        error: function(XMLHttpRequest){
+                            SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.msg});
+                        }
+                    })
+                }
+            });
+        })
+    },
+    enableVisible: function (object_name,record_id, permission, data) {
+        if(Steedos.settings.public.enable_saas){
+            return false;
+        }
+        const record = data?.record || {};
+        if(record.isUnmanaged){
+            return false
+        }
+        if(record.status !== 'enable'){
+            return true;
+        }
+        return false
+    }
+}

package/main/default/objects/steedos_packages/buttons/enable.button.yml

@@ -0,0 +1,4 @@
+name: enable
+is_enable: true
+label: 启用
+'on': record

package/main/default/objects/steedos_packages/buttons/installPackageFromUrl.button.js

@@ -0,0 +1,8 @@
+module.exports = {
+    installPackageFromUrlVisible: function (object_name, record_id) {
+        if(Steedos.settings.public.enable_saas){
+            return false;
+        }
+        return Steedos.isSpaceAdmin();
+    }
+}