@next-core/brick-container 3.13.6 → 3.13.7

package/tools/package-union/report_union_micro_app.py

@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+import json as simplejson
+import sys
+import os
+import ens_api
+import requests
+import simplejson
+
+reload(sys)
+sys.setdefaultencoding("utf-8")
+
+class NameServiceError(Exception):
+    pass
+
+
+def join_host_port(host, port):
+    template = "%s:%s"
+    host_requires_bracketing = ':' in host or '%' in host
+    if host_requires_bracketing:
+        template = "[%s]:%s"
+    return template % (host, port)
+
+
+session_id, ip, port = ens_api.get_service_by_name("", "logic.micro_app_service")
+if session_id <= 0:
+    raise Exception("get name service logic.micro_app_service failed, no session_id")
+MICRO_APP_ADDR = join_host_port(ip, port)
+
+session_id, ip, port = ens_api.get_service_by_name("", "logic.micro_app_standalone_service")
+if session_id <= 0:
+    raise NameServiceError("get nameservice logic.micro_app_standalone error, session_id={}".format(session_id))
+MICRO_APP_SA_ADDR = join_host_port(ip, port)
+
+
+def get_version(install_path):
+    # 开发环境没有version.ini文件，直接返回0.0.0
+    if not os.path.exists(os.path.join(install_path, "version.ini")):
+        return "0.0.0"
+    with open(os.path.join(install_path, "version.ini")) as f:
+        lines = f.readlines()
+        return lines[-1].strip()
+
+
+def collect_app_info(app_path, report_app_id, version):
+    if not os.path.exists(app_path):
+        print u"could not find app path {}".format(app_path)
+        return 
+    bootstrap_file_name = ""
+    for f in os.listdir(app_path):
+        if f.startswith("bootstrap-mini.") and f.endswith(".json"):
+            bootstrap_file_name = f
+    if bootstrap_file_name is "":
+        print u"bootstrap-mini.*.json not found in dir {}".format(app_path)
+        return
+    bootstrap_file = os.path.join(app_path, bootstrap_file_name)
+    print u"report app: {}, bootstrap_file: {}".format(report_app_id, bootstrap_file)
+    with open(bootstrap_file) as f:
+        bootstrap_content = f.read()
+        bootstrap_content_json = simplejson.loads(bootstrap_content)
+        # 跳过没有app字段的storyboard
+        if not bootstrap_content_json.get("storyboards"):
+            return None
+        storyboards = bootstrap_content_json.get("storyboards")
+        for story_board in storyboards:
+            if story_board["app"]["id"] == report_app_id:
+                app = {
+                    "appId": story_board["app"]["id"],
+                    "name": story_board["app"]["name"],
+                    "internal": "true" if story_board["app"].get("internal") else "false",
+                    "version": version,
+                    "homepage": story_board["app"]["homepage"],
+                    "status": "enabled",  # 新安装状态默认是enabled的
+                    "setActiveVersion": True,
+                    "meta": simplejson.dumps(story_board["meta"], ensure_ascii=False),
+                    "defaultConfig": story_board["app"].get("defaultConfig"),
+                    "defaultContainer": story_board["app"].get("defaultContainer"),
+                    "icons": story_board["app"].get("icons", {}),
+                    "menuIcon": story_board["app"].get("menuIcon", {}),
+                    "locales": story_board["app"].get("locales", {}),
+                    "description": story_board["app"].get("description"),
+                    "author": story_board["app"].get("author"),
+                    "isFromUnionApp": True,
+                }
+                return app
+
+
+def report(org, app):
+    try:
+        create_or_update_micro_app_sa(org, app)
+    except NameServiceError, e:
+        raise e
+    except requests.HTTPError, e:
+        raise e
+
+
+def create_or_update_micro_app_sa(org, app):
+    headers = {"org": str(org), "user": "defaultUser"}
+    url = "http://{}/api/v1/micro_app_standalone/report".format(MICRO_APP_SA_ADDR)
+    rsp = requests.post(url, json=app, headers=headers)
+    rsp.raise_for_status()
+    print "report app end"
+
+
+def import_micro_app_permissions(org, permission_path):
+    if not os.path.exists(permission_path):
+        print "could not find permission path {}, will not import permissions".format(permission_path)
+        return
+    headers = {"org": str(org), "user": "defaultUser"}
+    url = "http://{}/api/micro_app/v1/permission/import".format(MICRO_APP_ADDR)
+
+    print "permission path is {}, will start import permissions".format(permission_path)
+    with open(permission_path) as f:
+        p_f_content = f.read()
+        permission_list = simplejson.loads(p_f_content)
+        body = {"permissionList": permission_list}
+        rsp = requests.post(url, json=body, headers=headers)
+        rsp.raise_for_status()
+
+def read_union_apps_file(install_app_path):
+    union_app_file = os.path.join(install_app_path, "union-apps", "union-apps.json")
+    if not os.path.exists(union_app_file):
+        return []
+    with open(union_app_file, "r") as f:
+        return simplejson.load(f)
+
+
+def report_union_apps(org, install_app_path):
+    union_apps = read_union_apps_file(install_path)
+    for app in union_apps:
+        app_id = app["app_id"]
+        version = app["version"]
+        if app["use_brick_next_v3"]:
+            subdir_snippet = "v3"
+        else:
+            subdir_snippet = "v2"
+        union_app_path = os.path.join(install_app_path, "micro-apps", subdir_snippet, app_id, version)
+        print u"report app: {},  current app path: {}".format(app_id, union_app_path)
+        app = collect_app_info(union_app_path, app_id, version)
+        if app:
+            report(org, app)
+            permission_file_path = os.path.join(union_app_path, "permissions", "permissions.json")
+            import_micro_app_permissions(org, permission_file_path)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print "Usage: ./report_union_micro_app.py $org $install_path"
+        sys.exit(1)
+    org = sys.argv[1]
+    install_path = sys.argv[2]
+    report_union_apps(org, install_path)

package/tools/report_installed_brick_next_package.py

@@ -30,7 +30,7 @@ def join_host_port(host, port):
 session_id, ip, port = ens_api.get_service_by_name("", "logic.micro_app_service")
 if session_id <= 0:
     raise Exception("get name service logic.micro_app_service failed, no session_id")
-MICRO_APP_ADDR = join_host_port("127.0.0.1", port)
+MICRO_APP_ADDR = join_host_port(ip, port)
 
 
 def get_snippets_from_stories(stories_content):
@@ -373,7 +373,7 @@ if __name__ == "__main__":
     if install_path.endswith(os.sep):
         install_path = install_path[:-1]
 
-    if install_path.endswith(("brick_next_v3", "brick_next")):
+    if install_path.endswith("brick_next"):
         report_brick_next(org, install_path)
     elif install_path.endswith("-NB"):
         report_nb(org, install_path)

package/tools/report_installed_micro_app_sa.py

@@ -22,12 +22,12 @@ def join_host_port(host, port):
 session_id, ip, port = ens_api.get_service_by_name("", "logic.micro_app_service")
 if session_id <= 0:
     raise Exception("get name service logic.micro_app_service failed, no session_id")
-MICRO_APP_ADDR = join_host_port("127.0.0.1", port)
+MICRO_APP_ADDR = join_host_port(ip, port)
 
 session_id, ip, port = ens_api.get_service_by_name("", "logic.micro_app_standalone_service")
 if session_id <= 0:
     raise NameServiceError("get nameservice logic.micro_app_standalone error, session_id={}".format(session_id))
-MICRO_APP_SA_ADDR = join_host_port("127.0.0.1", port)
+MICRO_APP_SA_ADDR = join_host_port(ip, port)
 
 def get_version(install_path):
     # 开发环境没有version.ini文件，直接返回0.0.0