@next-core/brick-container 3.21.15 → 3.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.21.15",
+  "version": "3.22.0",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -75,5 +75,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "689c4d3548412ab04fef7ae34194b1124d45be9b"
+  "gitHead": "f26358f18cb64fd9e3bff3c2fb41be674fbc3b36"
 }

package/tools/package-union/report_union_micro_app.py

@@ -11,6 +11,9 @@ from  concurrent.futures import ThreadPoolExecutor,as_completed, wait, ALL_COMPL
 reload(sys)
 sys.setdefaultencoding("utf-8")
 
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))  # 将 tools 目录加入 path
+from utils.get_headers import get_headers
+
 # 公共路径
 _INSTALL_BASE_PATH = "/usr/local/easyops"
 _APPLICATIONS_SA_FOLDER = "applications_sa"
@@ -50,7 +53,7 @@ def get_version(install_path):
 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 
+        return
     bootstrap_file_name = ""
     for f in os.listdir(app_path):
         if f.startswith("bootstrap-mini.") and f.endswith(".json"):
@@ -99,7 +102,7 @@ def report(org, app):
 
 
 def create_or_update_micro_app_sa(org, app):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     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()
@@ -115,7 +118,7 @@ def import_micro_app_permissions(org, permission_path):
     if not os.path.exists(permission_path):
         print "permission path {} does not exist, return...".format(permission_path)
         return
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     url = "http://{}/api/micro_app/v1/permission/import".format(MICRO_APP_ADDR)
 
     print "permission path is {}, will start import permissions".format(permission_path)

package/tools/report_installed_brick_next_package.py

@@ -10,6 +10,9 @@ import tarfile
 
 from copy import deepcopy
 
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from utils.get_headers import get_headers
+
 reload(sys)
 sys.setdefaultencoding("utf-8")
 
@@ -239,7 +242,7 @@ def collect(install_path):
 
 def report_bricks_atom(org, nb_targz_path, package_name, package_version, bricks_content, stories_content,
                        snippets_content):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
     # report atom
     atom_url = "http://{}/api/v1/brick/atom/import".format(MICRO_APP_ADDR)
     data_dict = {"stories": stories_content, "bricks": bricks_content}
@@ -258,7 +261,8 @@ def report_bricks_atom(org, nb_targz_path, package_name, package_version, bricks
 
 def report_brick_next_package(org, brick_targz_path, package_name, package_version):
     # report brick_next or NT
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
+
     # report atom
     atom_url = "http://{}/api/v1/brick_next/report".format(MICRO_APP_ADDR)
     data = {"packageName": package_name, "packageVersion": package_version}
@@ -268,7 +272,8 @@ def report_brick_next_package(org, brick_targz_path, package_name, package_versi
 
 
 def report_provider_into_contract(org, package_name, contract_content):
-    headers = {"org": str(org), "user": "defaultUser"}
+    headers = get_headers(org)
+
     # report contract
     url = "http://{}/api/v1/brick/provider/import_into_contract".format(MICRO_APP_ADDR)
     param = {"packageName": package_name, "data": {

package/tools/report_installed_theme_template.py

@@ -5,6 +5,10 @@ import simplejson
 import requests
 import ens_api
 
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from utils.get_headers import get_headers
+
+
 def collect(install_path):
   if not os.path.exists(install_path):
     raise Exception("could not find install path {}".format(install_path))
@@ -22,7 +26,7 @@ def create_or_update_theme_template_data(data, org):
   if session_id <= 0:
     raise Exception("get nameservice logic.micro_app_service error, session_id={}".format(session_id))
   address = "{}:{}".format(ip, port)
-  headers = {"org": str(org), "user": "defaultUser"}
+  headers = get_headers(org)  
   url = "http://{}/api/v1/next-builder/theme-data-import".format(address)
   param = {"themeData": data}
   rsp = requests.post(url, json=param, headers=headers)

package/tools/utils/get_headers.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+
+TOOLS_DIR = "/usr/local/easyops/deploy_init/tools"
+sys.path.append(TOOLS_DIR)
+get_token = None
+token_util_path = os.path.join(TOOLS_DIR, "get_token_util.py")
+if os.path.exists(token_util_path):
+    from get_token_util import get_token
+
+APP_ID = "brick_next_v3"
+DEFAULT_USER = "defaultUser"
+
+
+def get_headers(org, user=DEFAULT_USER):
+    headers = {"org": str(org), "user": user}
+    if get_token is None:
+        return headers
+
+    token = get_token(user=user, org=int(org), app_id=APP_ID)
+    if not token:
+        return headers
+
+    headers["Authorization"] = "Bearer {}".format(token)
+    return headers

package/dist/main.838a6710.js

@@ -1,2 +0,0 @@
-(()=>{"use strict";var e,t,r,n,o,a,i,l,u,c,s,f,d,h,p,m,b,v,y,g,x,w,_,k,S,j={2585:()=>{},6118:()=>{},7934:(e,t,r)=>{r.a(e,(async(e,t)=>{try{if(r(2585),r(6118),r(8898),window.BRICK_NEXT_VERSIONS={"brick-container":"3.21.15"},window.MOCK_DATE)try{const{set:e}=await r.e(621).then(r.t.bind(r,3132,23));e(window.MOCK_DATE)}catch(e){console.error("Mock date failed:",e)}r.e(668).then(r.bind(r,4310)),t()}catch(e){t(e)}}),1)},8898:()=>{}},E={};function O(e){var t=E[e];if(void 0!==t)return t.exports;var r=E[e]={id:e,loaded:!1,exports:{}};return j[e].call(r.exports,r,r.exports,O),r.loaded=!0,r.exports}O.m=j,O.c=E,e="function"==typeof Symbol?Symbol("webpack queues"):"__webpack_queues__",t="function"==typeof Symbol?Symbol("webpack exports"):"__webpack_exports__",r="function"==typeof Symbol?Symbol("webpack error"):"__webpack_error__",n=e=>{e&&e.d<1&&(e.d=1,e.forEach((e=>e.r--)),e.forEach((e=>e.r--?e.r++:e())))},O.a=(o,a,i)=>{var l;i&&((l=[]).d=-1);var u,c,s,f=new Set,d=o.exports,h=new Promise(((e,t)=>{s=t,c=e}));h[t]=d,h[e]=e=>(l&&e(l),f.forEach(e),h.catch((e=>{}))),o.exports=h,a((o=>{var a;u=(o=>o.map((o=>{if(null!==o&&"object"==typeof o){if(o[e])return o;if(o.then){var a=[];a.d=0,o.then((e=>{i[t]=e,n(a)}),(e=>{i[r]=e,n(a)}));var i={};return i[e]=e=>e(a),i}}var l={};return l[e]=e=>{},l[t]=o,l})))(o);var i=()=>u.map((e=>{if(e[r])throw e[r];return e[t]})),c=new Promise((t=>{(a=()=>t(i)).r=0;var r=e=>e!==l&&!f.has(e)&&(f.add(e),e&&!e.d&&(a.r++,e.push(a)));u.map((t=>t[e](r)))}));return a.r?c:i()}),(e=>(e?s(h[r]=e):c(d),n(l)))),l&&l.d<0&&(l.d=0)},O.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return O.d(t,{a:t}),t},a=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,O.t=function(e,t){if(1&t&&(e=this(e)),8&t)return e;if("object"==typeof e&&e){if(4&t&&e.__esModule)return e;if(16&t&&"function"==typeof e.then)return e}var r=Object.create(null);O.r(r);var n={};o=o||[null,a({}),a([]),a(a)];for(var i=2&t&&e;"object"==typeof i&&!~o.indexOf(i);i=a(i))Object.getOwnPropertyNames(i).forEach((t=>n[t]=()=>e[t]));return n.default=()=>e,O.d(r,n),r},O.d=(e,t)=>{for(var r in t)O.o(t,r)&&!O.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},O.f={},O.e=e=>Promise.all(Object.keys(O.f).reduce(((t,r)=>(O.f[r](e,t),t)),[])),O.u=e=>({621:"mockdate",668:"all"}[e]+"."+{621:"85073b97",668:"7a7dca24"}[e]+".js"),O.miniCssF=e=>"all.ab335b0d.css",O.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),O.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),i={},l="@next-core/brick-container:",O.l=(e,t,r,n)=>{if(i[e])i[e].push(t);else{var o,a;if(void 0!==r)for(var u=document.getElementsByTagName("script"),c=0;c<u.length;c++){var s=u[c];if(s.getAttribute("src")==e||s.getAttribute("data-webpack")==l+r){o=s;break}}o||(a=!0,(o=document.createElement("script")).charset="utf-8",o.timeout=120,O.nc&&o.setAttribute("nonce",O.nc),o.setAttribute("data-webpack",l+r),o.src=e),i[e]=[t];var f=(t,r)=>{o.onerror=o.onload=null,clearTimeout(d);var n=i[e];if(delete i[e],o.parentNode&&o.parentNode.removeChild(o),n&&n.forEach((e=>e(r))),t)return t(r)},d=setTimeout(f.bind(null,void 0,{type:"timeout",target:o}),12e4);o.onerror=f.bind(null,o.onerror),o.onload=f.bind(null,o.onload),a&&document.head.appendChild(o)}},O.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},O.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),O.j=792,(()=>{O.S={};var e={},t={};O.I=(r,n)=>{n||(n=[]);var o=t[r];if(o||(o=t[r]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[r])return e[r];O.o(O.S,r)||(O.S[r]={});var a=O.S[r],i="@next-core/brick-container",l=(e,t,r,n)=>{var o=a[e]=a[e]||{},l=o[t];(!l||!l.loaded&&(!n!=!l.eager?n:i>l.from))&&(o[t]={get:r,from:i,eager:!!n})},u=[];return"default"===r&&(l("@babel/parser","7.27.5",(()=>O.e(668).then((()=>()=>O(6773))))),l("@easyops-cn/brick-next-pipes","0.7.3",(()=>O.e(668).then((()=>()=>O(4306))))),l("@next-core/cook","2.5.10",(()=>O.e(668).then((()=>()=>O(4712))))),l("@next-core/easyops-runtime","0.15.9",(()=>O.e(668).then((()=>()=>O(6990))))),l("@next-core/http","1.2.13",(()=>O.e(668).then((()=>()=>O(2308))))),l("@next-core/i18n","1.0.83",(()=>O.e(668).then((()=>()=>O(7472))))),l("@next-core/inject","1.0.58",(()=>O.e(668).then((()=>()=>O(5774))))),l("@next-core/loader","1.6.16",(()=>O.e(668).then((()=>()=>O(7457))))),l("@next-core/pipes","2.0.34",(()=>O.e(668).then((()=>()=>O(6605))))),l("@next-core/runtime","1.65.7",(()=>O.e(668).then((()=>()=>O(6124))))),l("@next-core/supply","2.3.7",(()=>O.e(668).then((()=>()=>O(2561))))),l("@next-core/theme","1.6.0",(()=>O.e(668).then((()=>()=>O(90))))),l("@next-core/utils/general","1.8.4",(()=>O.e(668).then((()=>()=>O(8220))))),l("@next-core/utils/storyboard","1.8.4",(()=>O.e(668).then((()=>()=>O(6971))))),l("history","4.10.1",(()=>O.e(668).then((()=>()=>O(9669))))),l("i18next-browser-languagedetector","7.2.2",(()=>O.e(668).then((()=>()=>O(726))))),l("i18next","22.5.1",(()=>O.e(668).then((()=>()=>O(843))))),l("js-yaml","3.14.1",(()=>O.e(668).then((()=>()=>O(9515))))),l("lodash","4.17.21",(()=>O.e(668).then((()=>()=>O(5250))))),l("moment/locale/zh-cn.js","2.30.1",(()=>O.e(668).then((()=>()=>O(1329))))),l("moment","2.30.1",(()=>O.e(668).then((()=>()=>O(9420)))))),e[r]=u.length?Promise.all(u).then((()=>e[r]=1)):1}}})(),(()=>{var e;O.g.importScripts&&(e=O.g.location+"");var t=O.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),O.p=e})(),u=e=>{var t=e=>e.split(".").map((e=>+e==e?+e:e)),r=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=r[1]?t(r[1]):[];return r[2]&&(n.length++,n.push.apply(n,t(r[2]))),r[3]&&(n.push([]),n.push.apply(n,t(r[3]))),n},c=(e,t)=>{e=u(e),t=u(t);for(var r=0;;){if(r>=e.length)return r<t.length&&"u"!=(typeof t[r])[0];var n=e[r],o=(typeof n)[0];if(r>=t.length)return"u"==o;var a=t[r],i=(typeof a)[0];if(o!=i)return"o"==o&&"n"==i||"s"==i||"u"==o;if("o"!=o&&"u"!=o&&n!=a)return n<a;r++}},s=e=>{var t=e[0],r="";if(1===e.length)return"*";if(t+.5){r+=0==t?">=":-1==t?"<":1==t?"^":2==t?"~":t>0?"=":"!=";for(var n=1,o=1;o<e.length;o++)n--,r+="u"==(typeof(i=e[o]))[0]?"-":(n>0?".":"")+(n=2,i);return r}var a=[];for(o=1;o<e.length;o++){var i=e[o];a.push(0===i?"not("+l()+")":1===i?"("+l()+" || "+l()+")":2===i?a.pop()+" "+a.pop():s(i))}return l();function l(){return a.pop().replace(/^\((.+)\)$/,"$1")}},f=(e,t)=>{if(0 in e){t=u(t);var r=e[0],n=r<0;n&&(r=-r-1);for(var o=0,a=1,i=!0;;a++,o++){var l,c,s=a<e.length?(typeof e[a])[0]:"";if(o>=t.length||"o"==(c=(typeof(l=t[o]))[0]))return!i||("u"==s?a>r&&!n:""==s!=n);if("u"==c){if(!i||"u"!=s)return!1}else if(i)if(s==c)if(a<=r){if(l!=e[a])return!1}else{if(n?l>e[a]:l<e[a])return!1;l!=e[a]&&(i=!1)}else if("s"!=s&&"n"!=s){if(n||a<=r)return!1;i=!1,a--}else{if(a<=r||c<s!=n)return!1;i=!1}else"s"!=s&&"n"!=s&&(i=!1,a--)}}var d=[],h=d.pop.bind(d);for(o=1;o<e.length;o++){var p=e[o];d.push(1==p?h()|h():2==p?h()&h():p?f(p,t):!h())}return!!h()},d=(e,t)=>e&&O.o(e,t),h=e=>(e.loaded=1,e.get()),p=e=>Object.keys(e).reduce(((t,r)=>(e[r].eager&&(t[r]=e[r]),t)),{}),m=(e,t,r)=>{var n=r?p(e[t]):e[t];return Object.keys(n).reduce(((e,t)=>!e||!n[e].loaded&&c(e,t)?t:e),0)},b=(e,t,r,n)=>"Unsatisfied version "+r+" from "+(r&&e[t][r].from)+" of shared singleton module "+t+" (required "+s(n)+")",v=e=>{throw new Error(e)},y=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},g=(e,t,r)=>r?r():((e,t)=>v("Shared module "+t+" doesn't exist in shared scope "+e))(e,t),x=(e=>function(t,r,n,o,a){var i=O.I(t);return i&&i.then&&!n?i.then(e.bind(e,t,O.S[t],r,!1,o,a)):e(t,O.S[t],r,n,o,a)})(((e,t,r,n,o,a)=>{if(!d(t,r))return g(e,r,a);var i=m(t,r,n);return f(o,i)||y(b(t,r,i,o)),h(t[r][i])})),w={},_={5842:()=>x("default","@next-core/theme",!1,[1,1,6,0],(()=>O.e(668).then((()=>()=>O(90))))),6028:()=>x("default","@next-core/runtime",!1,[0],(()=>O.e(668).then((()=>()=>O(6124))))),7551:()=>x("default","@next-core/http",!1,[0],(()=>O.e(668).then((()=>()=>O(2308))))),7631:()=>x("default","@next-core/i18n",!1,[1,1,0,83],(()=>O.e(668).then((()=>()=>O(7472))))),5222:()=>x("default","@next-core/easyops-runtime",!1,[2,0,15,9],(()=>O.e(668).then((()=>()=>O(6990))))),1030:()=>x("default","lodash",!1,[1,4,17,21],(()=>O.e(668).then((()=>()=>O(5250))))),4113:()=>x("default","@next-core/utils/general",!1,[0],(()=>O.e(668).then((()=>()=>O(8220))))),1060:()=>x("default","js-yaml",!1,[1,3,14,1],(()=>O.e(668).then((()=>()=>O(9515))))),4231:()=>x("default","@next-core/loader",!1,[1,1,6,16],(()=>O.e(668).then((()=>()=>O(7457))))),5069:()=>x("default","@next-core/utils/storyboard",!1,[0],(()=>O.e(668).then((()=>()=>O(6971))))),1858:()=>x("default","moment/locale/zh-cn.js",!1,[0],(()=>O.e(668).then((()=>()=>O(1329))))),1916:()=>x("default","moment",!1,[0],(()=>O.e(668).then((()=>()=>O(9420))))),5630:()=>x("default","i18next",!1,[0],(()=>O.e(668).then((()=>()=>O(843))))),1732:()=>x("default","history",!1,[0],(()=>O.e(668).then((()=>()=>O(9669))))),8303:()=>x("default","@next-core/cook",!1,[0],(()=>O.e(668).then((()=>()=>O(4712))))),3575:()=>x("default","@next-core/inject",!1,[0],(()=>O.e(668).then((()=>()=>O(5774))))),8319:()=>x("default","@next-core/supply",!1,[0],(()=>O.e(668).then((()=>()=>O(2561))))),848:()=>x("default","i18next-browser-languagedetector",!1,[0],(()=>O.e(668).then((()=>()=>O(726))))),5285:()=>x("default","@next-core/pipes",!1,[0],(()=>O.e(668).then((()=>()=>O(6605))))),580:()=>x("default","@babel/parser",!1,[0],(()=>O.e(668).then((()=>()=>O(6773))))),8377:()=>x("default","@easyops-cn/brick-next-pipes",!1,[0],(()=>O.e(668).then((()=>()=>O(4306)))))},k={668:[5842,6028,7551,7631,5222,1030,4113,1060,4231,5069,1858,1916,5630,1732,8303,3575,8319,848,5285,580,8377]},S={},O.f.consumes=(e,t)=>{O.o(k,e)&&k[e].forEach((e=>{if(O.o(w,e))return t.push(w[e]);if(!S[e]){var r=t=>{w[e]=0,O.m[e]=r=>{delete O.c[e],r.exports=t()}};S[e]=!0;var n=t=>{delete w[e],O.m[e]=r=>{throw delete O.c[e],t}};try{var o=_[e]();o.then?t.push(w[e]=o.then(r).catch(n)):r(o)}catch(e){n(e)}}}))},(()=>{if("undefined"!=typeof document){var e={792:0};O.f.miniCss=(t,r)=>{e[t]?r.push(e[t]):0!==e[t]&&{668:1}[t]&&r.push(e[t]=(e=>new Promise(((t,r)=>{var n=O.miniCssF(e),o=O.p+n;if(((e,t)=>{for(var r=document.getElementsByTagName("link"),n=0;n<r.length;n++){var o=(i=r[n]).getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(o===e||o===t))return i}var a=document.getElementsByTagName("style");for(n=0;n<a.length;n++){var i;if((o=(i=a[n]).getAttribute("data-href"))===e||o===t)return i}})(n,o))return t();((e,t,r,n,o)=>{var a=document.createElement("link");a.rel="stylesheet",a.type="text/css",O.nc&&(a.nonce=O.nc),a.onerror=a.onload=r=>{if(a.onerror=a.onload=null,"load"===r.type)n();else{var i=r&&r.type,l=r&&r.target&&r.target.href||t,u=new Error("Loading CSS chunk "+e+" failed.\n("+i+": "+l+")");u.name="ChunkLoadError",u.code="CSS_CHUNK_LOAD_FAILED",u.type=i,u.request=l,a.parentNode&&a.parentNode.removeChild(a),o(u)}},a.href=t,document.head.appendChild(a)})(e,o,0,t,r)})))(t).then((()=>{e[t]=0}),(r=>{throw delete e[t],r})))}}})(),(()=>{var e={792:0};O.f.j=(t,r)=>{var n=O.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var o=new Promise(((r,o)=>n=e[t]=[r,o]));r.push(n[2]=o);var a=O.p+O.u(t),i=new Error;O.l(a,(r=>{if(O.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var o=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;i.message="Loading chunk "+t+" failed.\n("+o+": "+a+")",i.name="ChunkLoadError",i.type=o,i.request=a,n[1](i)}}),"chunk-"+t,t)}};var t=(t,r)=>{var n,o,[a,i,l]=r,u=0;if(a.some((t=>0!==e[t]))){for(n in i)O.o(i,n)&&(O.m[n]=i[n]);l&&l(O)}for(t&&t(r);u<a.length;u++)o=a[u],O.o(e,o)&&e[o]&&e[o][0](),e[o]=0},r=globalThis.webpackChunk_next_core_brick_container=globalThis.webpackChunk_next_core_brick_container||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})(),O(7934)})();
-//# sourceMappingURL=main.838a6710.js.map