@steedos/service-package-registry 3.0.0-beta.9 → 3.0.0-beta.92

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}`)
                     }
                 }
             }

package/main/default/manager/packages.js

@@ -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

@@ -282,10 +282,17 @@ async function yarnAddPackage(yarnPackage){
             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
+                path: packagePath,
+                isUnmanaged: schema.settings.packageInfo.isUnmanaged
             })
         }
     })

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": "验证信息",
+              "id": "u:edit_npmrc",
+              "editorState": "default",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "actionType": "dialog",
+                              "dialog": {
+                                  "type": "dialog",
+                                  "title": "验证信息",
+                                  "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": "##### 验证信息说明(.npmrc)：\r- `; 为范围包设置新的注册表`\r- `@myscope:registry=https://mycustomregistry.example.org`\r- `; 配置新注册表的认证信息(可选)`\r- `//mycustomregistry.example.org:_authToken=\"认证信息\"`"
+                                        }
+                                  ],
+                                  "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,52 @@
+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: '启用',
+                content: `确定要启用${record.name}?`,
+                okText: '启用',
+                cancelText: '取消',
+                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('已启用')
+                                });
+                                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();
+    }
+}

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

@@ -0,0 +1,135 @@
+name: installPackageFromUrl
+label: 手动安装软件包
+'on': list
+#TODO: ${'steedos_packages.install.initialization_failure' | t} ,${'steedos_packages.install.installation_success' | t}，${'steedos_packages.install.installation_failure' | t}，等待amis合并分支，可用该代码,用于form组件的message属性
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "${'steedos_packages.install.install_package_from_url' | t}",
+              "id": "u:install_package_from_url",
+              "onEvent": {
+                  "click": {
+                      "actions": [
+                          {
+                              "actionType": "dialog",
+                              "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'steedos_packages.install.install_package_from_url' | t}",
+                                  "body": [
+                                      {
+                                          "type": "form",
+                                          "id": "u:add9d810b386",
+                                          "title": "",
+                                          "body": [
+                                              {
+                                                  "label": "${'steedos_packages.install.package_name' | t}",
+                                                  "type": "input-text",
+                                                  "name": "package",
+                                                  "id": "u:524cb8f8d888",
+                                                  "required": true
+                                              },
+                                              {
+                                                  "label": "镜像源",
+                                                  "type": "input-text",
+                                                  "name": "registry",
+                                                  "id": "u:524cb8f8d666",
+                                                  "required": false,
+                                                  "options": [
+                                                        {
+                                                            "label": "淘宝源",
+                                                            "value": "https://registry.npmmirror.com"
+                                                        },
+                                                        {
+                                                            "label": "cnpm",
+                                                            "value": "https://r.cnpmjs.org"
+                                                        },
+                                                        {
+                                                            "label": "官方源",
+                                                            "value": "https://registry.npmjs.org"
+                                                        }
+                                                    ]
+                                              }
+                                          ],
+                                          "mode": "normal",
+                                          "api": {
+                                              "method": "post",
+                                              "url": "${context.rootUrl}/api/nodes/package/add",
+                                              "data": {
+                                                  "&": "$$"
+                                              },
+                                              "dataType": "json",
+                                              "requestAdaptor": "api.data = {package: api.body.registry ? `${api.body.package} --registry ${api.body.registry}` : api.body.package};",
+                                              "headers": {
+                                                  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                              }
+                                          },
+                                          "messages": {
+                                              "fetchFailed": "初始化失败",
+                                              "saveSuccess": "安装成功", 
+                                              "saveFailed": "安装失败" 
+                                          },
+                                          "onEvent": {
+                                            "submitSucc": {
+                                                "weight": 0,
+                                                "actions": [
+                                                    {
+                                                        "actionType": "wait",
+                                                        "args": {
+                                                            "time": 3000
+                                                        }
+                                                    },
+                                                    {
+                                                        "actionType": "broadcast",
+                                                        "args": {
+                                                            "eventName": "@data.changed.steedos_packages"
+                                                        },
+                                                        "data": {
+                                                            "objectName": "steedos_packages",
+                                                            "recordId": "install"
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                            }
+                                      },
+                                      {
+                                        "type": "tpl",
+                                        "tpl": "<br/>"
+                                      },
+                                      {
+                                        "type": "markdown",
+                                        "value": "##### 您可以使用以下选项之一指定版本： \r- `package-name`安装包的“最新”版本。 \r- `package-name@1.2.3`从以下位置安装包的特定版本 注册表。 \r- `package-name@tag`安装特定的“标签”。（例如）beta、next、latest"
+                                        },
+                                        {
+                                        "type": "markdown",
+                                        "value": "##### 您还可以指定来自不同位置的包：\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压缩压缩包。"
+                                        }
+                                  ],
+                                  "id": "u:efa30bace722",
+                                  "closeOnEsc": true,
+                                  "closeOnOutside": false,
+                                  "showCloseButton": true,
+                                  "size": "lg"
+                              }
+                          }
+                      ],
+                      "weight": 0
+                  }
+              }
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+         
+      },
+      "bodyClassName": "p-0",
+      "id": "u:43363bc48c62"
+  }
+is_enable: true
+type: amis_button
+visible: true

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

@@ -0,0 +1,34 @@
+module.exports = {
+    reload: function (object_name, record_id, permission, data) {
+        SteedosUI.notification.info({message: t('steedos_packages.reload.toastr_info')})
+        const record = data?.record || {};
+        //TODO nodeID
+        Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/reload'), {type: 'post', async: false, data: JSON.stringify({
+                module: record.name,
+                nodeID: record.node_id
+            }),
+            success: function(){
+                setTimeout(function(){
+                    SteedosUI.notification.success({message: t('steedos_packages.reload.toastr_success')})
+                    window.location.reload()
+                }, 1000 * 5)
+            },
+            error: function(XMLHttpRequest){
+                SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.error})
+            }
+        })
+    },
+    reloadVisible: 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/reload.button.yml

@@ -0,0 +1,4 @@
+name: reload
+is_enable: true
+label: 重新加载
+'on': record

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

@@ -0,0 +1,57 @@
+module.exports = {
+    uninstall: 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.uninstall.text') + ` ${record.name} 吗?` ,
+                content: `卸载后，该软件包中的所有组件将被永久删除且无法恢复`,
+                okText: t('steedos_packages.uninstall.title'),
+                cancelText: t('Cancel'),
+                width: 480,
+                onOk: function(){
+                    return new Promise((resolve, reject) => {
+                        Steedos.authRequest(Steedos.absoluteUrl('/api/nodes/uninstall'), {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});
+                                    resolve(data);
+                                    return;
+                                }
+                                setTimeout(function(){
+                                    SteedosUI.notification.success({
+                                        message: t('steedos_packages.uninstall.toastr_success')
+                                    });
+                                    resolve(data);
+                                    navigate("/app/admin/steedos_packages")
+                                }, 1000 * 2)
+                            },
+                            error: function(XMLHttpRequest){
+                                SteedosUI.notification.error({message: XMLHttpRequest.responseJSON.msg});
+                                reject()
+                            }
+                        })
+                    })
+                }
+            });
+        })
+    },
+    uninstallVisible: function (object_name,record_id, permission, data) {
+        if(Steedos.settings.public.enable_saas){
+            return false;
+        }
+        const record = data?.record;
+        if(record.local || record.static){
+            return false;
+        }
+        if(record.status){
+            return true;
+        }
+        return false
+    }
+}

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

@@ -0,0 +1,4 @@
+name: uninstall
+is_enable: true
+label: 卸载
+'on': record

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

@@ -0,0 +1,22 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-12-09 18:23:36
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-03-07 11:59:52
+ * @Description: 
+ */
+module.exports = {
+    upgradePackageVisible: 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' && !record.local && !record.static) {
+            return true;
+        }
+        return false
+    }
+}

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

@@ -0,0 +1,147 @@
+name: upgradePackage
+is_enable: true
+label: 升级
+'on': record_only
+amis_schema: |-
+  {
+  "type": "service",
+  "body": [
+    {
+      "type": "button",
+      "label": "${'steedos_packages.upgrade.upgrade_package' | t}",
+      "id": "u:upgrade_package",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "actionType": "dialog",
+              "dialog": {
+                "type": "dialog",
+                "title": "${'steedos_packages.upgrade.select_version' | t}",
+                "body": [
+                  {
+                    "type": "form",
+                    "body": [
+                      {
+                        "type": "picker",
+                        "required": true,
+                        "id": "u:ae8d73bea81b",
+                        "label": false,
+                        "name": "version",
+                        "valueField": "version",
+                        "options": [
+                        ],
+                        "modalMode": "dialog",
+                        "multiple": false,
+                        "embed": true,
+                        "source": {
+                          "method": "get",
+                          "url": "${context.rootUrl}/api/nodes/versions?module=${record.name}",
+                          "requestAdaptor": "api.data={}; return api;",
+                          "headers": {
+                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                          }
+                        },
+                        "pickerSchema": {
+                          "mode": "table",
+                          "id": "u:34518bacaba7",
+                          "perPageAvailable": [
+                            10
+                          ],
+                          "messages": {
+                          },
+                          "filter": null,
+                          "columns": [
+                            {
+                              "label": "${'steedos_packages.upgrade.version_number' | t}",
+                              "name": "version",
+                              "id": "u:b0e787352cf4",
+                              "placeholder": "-"
+                            },
+                            {
+                              "label": "${'steedos_packages.upgrade.label' | t}",
+                              "name": "tag",
+                              "id": "u:f17df7e102a2",
+                              "placeholder": "-"
+                            }
+                          ]
+                        }
+                      }
+                    ],
+                    "id": "u:14efe3589478",
+                    "api": {
+                      "method": "post",
+                      "url": "${context.rootUrl}/api/nodes/upgrade",
+                      "dataType": "json",
+                      "requestAdaptor": "api.data = {module: api.body.record.name, version: api.body.version}",
+                      "data": {
+                        "&": "$$",
+                        "context": "${context}",
+                        "record": "${record}"
+                      },
+                      "headers": {
+                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                      }
+                    },
+                     "messages": {
+                        "saveSuccess": "升级成功",
+                        "saveFailed": "安装失败"
+                      }
+                  }
+                ],
+                "id": "u:c3960c3b1049",
+                "closeOnEsc": false,
+                "closeOnOutside": false,
+                "showCloseButton": true,
+                "data": {
+                  "&": "$$",
+                  "context": "${context}",
+                  "record": "${record}"
+                },
+                "size": "md",
+                "actions": [
+                  {
+                    "type": "button",
+                    "label": "${'steedos_packages.upgrade.cancel' | t}",
+                    "onEvent": {
+                      "click": {
+                        "actions": [
+                          {
+                            "componentId": "",
+                            "args": {
+                            },
+                            "actionType": "closeDialog"
+                          }
+                        ]
+                      }
+                    },
+                    "id": "u:dbf7b7a9821c"
+                  },
+                  {
+                    "type": "submit",
+                    "label": "${'steedos_packages.upgrade.confirm' | t}",
+                    "id": "u:0318127b7745",
+                    "close": true,
+                    "confirmText": "${'steedos_packages.upgrade.second_confirm' | t}",
+                    "level": "primary"
+                  }
+                ]
+              }
+            }
+          ],
+          "weight": 0
+        }
+      }
+    }
+  ],
+  "regions": [
+    "body"
+  ],
+  "data": {
+    
+  },
+  "bodyClassName": "p-0",
+  "id": "u:721e4093f456"
+  }
+type: amis_button
+visible: true

package/main/default/objects/steedos_packages/fields/isUnmanaged.field.yml

@@ -0,0 +1,4 @@
+name: isUnmanaged
+type: boolean
+label: 模板
+visible_on: "{{false}}"

package/main/default/objects/steedos_packages/listviews/all.listview.yml

@@ -9,6 +9,7 @@ columns:
   - field: status
   - field: static
   - field: icon
+  - field: isUnmanaged
 filter_scope: space
 label: 所有软件包
 scrolling_mode: standard

package/main/default/pages/steedos_package_detail.page.amis.json

@@ -14,7 +14,7 @@
                 },
                 {
                     "type": "tabs",
-                    "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
+                    "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:border sm:rounded",
                     "tabs": [
                         {
                             "title": "简介",
@@ -75,35 +75,6 @@
                             ],
                             "className": "p-0",
                             "id": "u:5d4e7e3f6ecc"
-                        },
-                        {
-                            "title": "依赖服务",
-                            "body": [
-                                {
-                                    "type": "steedos-object-form",
-                                    "label": "对象表单",
-                                    "objectApiName": "${objectName}",
-                                    "recordId": "${recordId}",
-                                    "appId": "${appId}",
-                                    "id": "u:fec578db3278",
-                                    "mode": "read",
-                                    "className": "mb-4",
-                                    "fields": [
-                                        "dependencies"
-                                    ],
-                                    "fieldsExtend": {
-                                        "dependencies": {
-                                            "label": false,
-                                            "amis": {
-                                                "type": "tpl",
-                                                "tpl": "${dependencies | join: }"
-                                            }
-                                        }
-                                    }
-                                }
-                            ],
-                            "className": "p-0",
-                            "id": "u:5d4e7e3f6ecc"
                         }
                     ],
                     "id": "u:148cf8e840eb"

package/main/default/pages/steedos_packages_list.page.amis.json

@@ -32,7 +32,7 @@
           "actions": [
             {
               "label": "${uiSchema.actions.enable.label}",
-              "disabledOn": "${status === 'enable' || window:Steedos.settings.public.enable_saas}",
+              "disabledOn": "${status === 'enable' || window:Steedos.settings.public.enable_saas || isUnmanaged === true}",
               "className": "mr-4",
               "onEvent": {
                 "click": {
@@ -48,7 +48,7 @@
             },
             {
               "label": "${uiSchema.actions.disable.label}",
-              "disabledOn": "${status !== 'enable' || window:Steedos.settings.public.enable_saas}",
+              "disabledOn": "${status !== 'enable' || window:Steedos.settings.public.enable_saas || isUnmanaged === true}",
               "onEvent": {
                 "click": {
                   "actions": [
@@ -94,13 +94,7 @@
       "padding-top": "0.5rem",
       "padding-bottom": "0.5rem",
       "padding-left": "1rem",
-      "padding-right": "1rem",
-      "--tw-bg-opacity": "1",
-      "background-color": "rgb(243 244 246 / var(--tw-bg-opacity))",
-      "--tw-border-opacity": "1",
-      "border-color": "rgb(209 213 219 / var(--tw-border-opacity))",
-      "border-style": "solid",
-      "border-bottom-width": "1px"
+      "padding-right": "1rem"
     },
     ".antd-Service.steedos-object-table .antd-Crud .antd-Cards .antd-Cards-body": {
       "margin": "0.25rem"

package/main/default/routes/nodes.router.js

@@ -0,0 +1,292 @@
+const express = require('express');
+const router = express.Router();
+const auth = require('@steedos/auth');
+const objectql = require('@steedos/objectql');
+let schema = objectql.getSteedosSchema();
+const validator = require('validator');
+
+const disabledChangePackageWithSaas = async (req, res, next) => {
+    if (validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true) != true) {
+        next();
+    }else {
+        // 禁止操作packages
+        res.status(500).send({ status: 'error', message: 'No permission' });
+    }
+}
+
+router.get('/api/nodes/install', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = JSON.parse(decodeURIComponent(Buffer.from(req.query.data, "base64").toString('utf8')));
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, version, label, description, nodeID} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.installPackage`, {
+            module, version, label, description
+        },{
+            nodeID: nodeID
+        })
+        res.redirect(302, `/app/admin/steedos_packages/grid/all`);
+        // res.status(200).send(result); //TODO 完善返回信息
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/uninstall', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = req.body;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, nodeID} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.uninstallPackage`, {
+            module
+        },{
+            nodeID: nodeID,
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result); //TODO 完善返回信息
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/reload', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = req.body;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, nodeID} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.reloadPackage`, {
+            module
+        },{
+            nodeID: nodeID
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/disable', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = req.body;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, nodeID} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.disablePackage`, {
+            module
+        },{
+            nodeID: nodeID
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/enable', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = req.body;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, nodeID} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.enablePackage`, {
+            module
+        },{
+            nodeID: nodeID
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(200).send({
+            "status": 1,
+            "msg": error.message
+          }
+          );
+        // res.status(500).send(error.message);
+    }
+});
+router.get('/api/nodes/versions', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    // console.log(`req.query`, req.query)
+    const body = req.query;
+    const { module } = body || {};
+    if(!module){
+        return res.status(500).send({ message: 'Not find module' });
+    }
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+       
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.getPackageVersions`, {
+            module
+        })
+        res.status(200).send(result); //TODO 完善返回信息
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/upgrade', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    const body = req.body;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        const { module, version} = body || {};
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.upgradePackage`, {
+            module, version
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.get('/api/nodes/cloud/saas/packages/purchased', disabledChangePackageWithSaas, auth.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.getCloudSaasPurchasedPackages`, {
+        }, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/cloud/saas/packages/purchased', disabledChangePackageWithSaas, auth.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.installPurchasedPackages`, {}, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/cloud/saas/packages/url', disabledChangePackageWithSaas, auth.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const { module, version, url, auth, registry_url } = req.body;
+        const result = await broker.call(`@steedos/service-project.installPackageFromUrl`, {module, version, url, auth, registry_url, fromClient: true}, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+})
+
+router.get('/api/nodes/npmrc', disabledChangePackageWithSaas, auth.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        let broker = schema.broker;
+        const result = await broker.call(`@steedos/service-project.getNpmrc`, {}, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send({data: {npmrc: result}});
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+})
+
+router.post('/api/nodes/npmrc', disabledChangePackageWithSaas, auth.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        let broker = schema.broker;
+        const { npmrc } = req.body;
+        const result = await broker.call(`@steedos/service-project.setNpmrc`, {npmrc}, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/package/add', disabledChangePackageWithSaas, auth.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    const isSpaceAdmin = userSession.is_space_admin;
+    if(!isSpaceAdmin){
+        return res.status(401).send({ message: 'No permission' });
+    }
+    try {
+        let broker = schema.broker;
+        const { package: yarnPackage } = req.body;
+        const result = await broker.call(`@steedos/service-project.yarnAddPackage`, {yarnPackage, enable: true}, {
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error.message);
+        res.status(500).send("安装软件包异常, 请检查参数或网络");
+    }
+});
+
+exports.default = router;

package/main/default/routes/registry.router.js

@@ -0,0 +1,21 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-11-18 16:32:30
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-01-21 17:28:27
+ * @Description: 
+ */
+const express = require('express');
+const router = express.Router();
+const auth = require("@steedos/auth");
+
+let STEEDOS_REGISTRY_URL = process.env.STEEDOS_REGISTRY_URL ? process.env.STEEDOS_REGISTRY_URL : 'https://registry.steedos.cn/';
+
+router.get("/api/nodes/registry", auth.requireAuthentication, async function (req, res) {
+    res.status(200).send([
+        { label: "https://registry.npmjs.org/", value: "https://registry.npmjs.org/" },
+        { label: "https://registry.npm.taobao.org/", value: "https://registry.npm.taobao.org/" },
+        { label: STEEDOS_REGISTRY_URL, value: STEEDOS_REGISTRY_URL },
+    ]);
+});
+exports.default = router;

package/main/default/triggers/steedos_packages.trigger.js

@@ -18,13 +18,9 @@ module.exports = {
         const { spaceId } = this;
         let dataList = await packages.getAllPackages();
         if (!_.isEmpty(dataList)) {
-            const cloneValues = clone(this.data.values, false);
+            const cloneValues = [];
             dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    cloneValues.push(doc);
-                }
+                cloneValues.push(doc)
             })
             const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
             if (records.length > 0) {
@@ -42,12 +38,10 @@ module.exports = {
         this.data.values = result.length;
     },
     afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            const all = await packages.getAllPackages();
-            const id = this.id;
-            this.data.values = _.find(all, function(item){
-                return item._id === id
-            });
-        }
+        const all = await packages.getAllPackages();
+        const id = this.id;
+        this.data.values = _.find(all, function(item){
+            return item._id === id
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0-beta.92",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "3.0.0-beta.9",
-    "@steedos/metadata-core": "3.0.0-beta.9",
-    "@steedos/objectql": "3.0.0-beta.9",
-    "@steedos/service-package-loader": "3.0.0-beta.9",
+    "@steedos/auth": "3.0.0-beta.92",
+    "@steedos/metadata-core": "3.0.0-beta.92",
+    "@steedos/objectql": "3.0.0-beta.92",
+    "@steedos/service-package-loader": "3.0.0-beta.92",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9111ae9e9ce7c57c67c6bd670706f4344c28d69d"
+  "gitHead": "16a684ff645d0a9b745e4b49309f2c63d6a41395"
 }

package/project.package.service.js

@@ -76,6 +76,11 @@ module.exports = {
 		uninstallPackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
+				const packages = loader.loadPackagesConfig();
+				let packageConfig = _.find(packages, (_p, pname) => {
+					_p.name = pname;
+					return pname === module;
+				})
                 await loader.removePackage(module);
         		await registry.uninstallModule(module)
 				await ctx.broker.call(`@steedos/service-packages.uninstall`, {
@@ -85,6 +90,17 @@ module.exports = {
 						instanceID: ctx.broker.instanceID, 
 					}
 				})
+				if(packageConfig?.isUnmanaged){
+					await ctx.broker.call(`~packages-@steedos/metadata-api.remove`, {
+						name: module
+					}, {
+                        timeout: 0,
+                        meta: {
+                            user: ctx.meta.user
+                        }
+                    })
+				}
+
 				return {};
             }
 		},
@@ -250,8 +266,8 @@ module.exports = {
 		},
 		yarnAddPackage: {
 			async handler(ctx) {
-				const { yarnPackage } = ctx.params;
-				return await this.yarnAddPackage(yarnPackage);
+				const { yarnPackage, enable = false } = ctx.params;
+				return await this.yarnAddPackage(yarnPackage, enable);
             }
 		}
 	},
@@ -460,11 +476,7 @@ module.exports = {
 									throw new Error(`not support ${parsed.type}`);
 							}
 							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})
-								}
-								
+								await this.yarnAddPackage(packageName, false, true)
 							}else{
 								if(installProps.url){
 									//module, version, url, auth, enable, registry_url, broker
@@ -476,6 +488,7 @@ module.exports = {
 							}
 							
 						} catch (error) {
+							console.error(error)
 							this.broker.logger.error(`initialPackages: ${packageName}. ${error.message}`);
 						}
 					}
@@ -557,7 +570,8 @@ module.exports = {
 								description: _packageInfo.description,
 								metadata: metadata,
 								static: _packageInfo.static,
-								homepage: _packageInfo.homepage
+								homepage: _packageInfo.homepage,
+								isUnmanaged: _packageInfo.isUnmanaged
 							}
 						})
 					}
@@ -565,28 +579,37 @@ module.exports = {
 			}
 		},
 		yarnAddPackage: {
-			async handler(yarnPackage) {
+			async handler(yarnPackage, enable=false, configEnable = false) {
                 const packages = await registry.yarnAddPackage(yarnPackage);
 				for (const packageInfo of packages) {
 					const packagePath = packageInfo.path;
+					if(packageInfo.isUnmanaged){
+						enable = true;
+					}
 					loader.appendToPackagesConfig(packageInfo.name, {
 						version: packageInfo.version,
 						path: util.getPackageRelativePath(process.cwd(), packagePath),
-						enable: false
+						enable: configEnable || enable,
+						isUnmanaged: packageInfo.isUnmanaged || false
 					});
+					if(enable){
+						await this.broker.call('@steedos/service-project.enablePackage', {module: packageInfo.name})
+					}
+
 					const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
 					const packageYmlData = loader.getPackageYmlData(packagePath);
 					await this.broker.call(`@steedos/service-packages.install`, {
 						serviceInfo: Object.assign({}, {
 							version: packageInfo.version,
-							path: packageInfo.path
+							path: packageInfo.path,
+							isUnmanaged: packageInfo.isUnmanaged || false
 						}, {
 							packageYmlData: packageYmlData,
 							name: packageInfo.name,
 							enable: false, 
 							nodeID: broker.nodeID, 
 							instanceID: broker.instanceID,
-							metadata: metadata
+							metadata: metadata,
 						})
 					})
 				}