@abtnode/ux 1.16.11-next-470e8c41 → 1.16.11

package/lib/util/space-gateway.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateSpaceGatewaysFromDIDSpaces = updateSpaceGatewaysFromDIDSpaces;
+var _lodash = require("lodash");
+var _spaces = require("./spaces");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /* eslint-disable import/prefer-default-export */
+/**
+ * @description
+ * @export
+ * @param {{
+ *  nodeApi: import('@abtnode/client'),
+ *  blockletDid: string,
+ *  spaceGateways: import('../blocklet/storage/connected').SpaceGateway[],
+ * }} { nodeApi, blockletDid, spaceGateways }
+ * @return {Promise<import('../blocklet/storage/connected').SpaceGateway[]>}
+ */
+async function updateSpaceGatewaysFromDIDSpaces(_ref) {
+  let {
+    blockletDid,
+    nodeApi,
+    spaceGateways
+  } = _ref;
+  let shouldUpdate = false;
+  const latestSpaceGateways = await Promise.all(spaceGateways.map(async x => {
+    let {
+      name
+    } = x;
+    const newName = await (0, _spaces.getSpaceNameByEndpoint)(x.endpoint);
+    if (!(0, _lodash.isEmpty)(newName) && newName !== name) {
+      name = newName;
+      shouldUpdate = true;
+    }
+    return _objectSpread(_objectSpread({}, x), {}, {
+      name
+    });
+  }));
+  if (shouldUpdate) {
+    await Promise.all(latestSpaceGateways.filter(x => x.did).map(x => {
+      return nodeApi.updateBlockletSpaceGateway({
+        input: {
+          did: blockletDid,
+          where: {
+            did: x.did
+          },
+          spaceGateway: _objectSpread({}, x)
+        }
+      });
+    }));
+  }
+  return latestSpaceGateways;
+}

package/lib/util/spaces.js

@@ -8,9 +8,12 @@ exports.getDIDSpaceDidFromEndpoint = getDIDSpaceDidFromEndpoint;
 exports.getDIDSpaceUrlFromEndpoint = getDIDSpaceUrlFromEndpoint;
 exports.getSpaceBackupEndpoint = getSpaceBackupEndpoint;
 exports.getSpaceGatewayFromEndpoint = getSpaceGatewayFromEndpoint;
+exports.getSpaceNameByEndpoint = getSpaceNameByEndpoint;
 exports.hasPermissionByEndpoint = hasPermissionByEndpoint;
+exports.isValidSpaceGatewayUrl = isValidSpaceGatewayUrl;
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _constant = require("@blocklet/constant");
+var _lodash = require("lodash");
 var _api = require("./api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable import/prefer-default-export */
@@ -97,4 +100,53 @@ function getSpaceBackupEndpoint(environments) {
  */
 function getSpaceGatewayFromEndpoint(endpoint) {
   return endpoint === null || endpoint === void 0 ? void 0 : endpoint.replace(/\/api\/space\/.+/, '');
+}
+
+/**
+ * @description
+ * @export
+ * @param {string} spaceGatewayUrl
+ * @return {Promise<boolean>}
+ */
+async function isValidSpaceGatewayUrl(spaceGatewayUrl) {
+  try {
+    if (!(0, _isUrl.default)(spaceGatewayUrl)) {
+      return false;
+    }
+    const didConnectTokenUrl = joinUrl(spaceGatewayUrl, 'space/api/did/one-click-authorization/token');
+    const {
+      status,
+      data
+    } = await _api.api.get(didConnectTokenUrl, {
+      timeout: 5000
+    });
+    // note: data 必定返回一个对象才行，如果 data 返回了一个非对象，说明失败了，此时可能返回了前端的 404 页面的 html
+    return status === 200 && (0, _lodash.isObject)(data);
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+}
+
+/**
+ * @description
+ * @export
+ * @param {string} endpoint
+ * @return {Promise<string >}
+ */
+async function getSpaceNameByEndpoint(endpoint) {
+  try {
+    if (!(0, _isUrl.default)(endpoint)) {
+      return '';
+    }
+    const {
+      headers
+    } = await _api.api.head(endpoint, {
+      timeout: 3000
+    });
+    return headers['x-space-name'];
+  } catch (error) {
+    console.error(error);
+    return '';
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.11-next-470e8c41",
+  "version": "1.16.11",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-470e8c41",
-    "@abtnode/constant": "1.16.11-next-470e8c41",
-    "@abtnode/util": "1.16.11-next-470e8c41",
+    "@abtnode/auth": "1.16.11",
+    "@abtnode/constant": "1.16.11",
+    "@abtnode/util": "1.16.11",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.80",
-    "@arcblock/did-connect": "^2.5.48",
+    "@arcblock/did": "^1.18.84",
+    "@arcblock/did-connect": "^2.5.49",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.48",
-    "@arcblock/react-hooks": "^2.5.48",
-    "@arcblock/terminal": "^2.5.48",
-    "@arcblock/ux": "^2.5.48",
-    "@blocklet/constant": "1.16.11-next-470e8c41",
-    "@blocklet/launcher-layout": "2.1.12",
+    "@arcblock/icons": "^2.5.49",
+    "@arcblock/react-hooks": "^2.5.49",
+    "@arcblock/terminal": "^2.5.49",
+    "@arcblock/ux": "^2.5.49",
+    "@blocklet/constant": "1.16.11",
+    "@blocklet/launcher-layout": "2.1.18",
     "@blocklet/list": "^0.11.28",
-    "@blocklet/meta": "1.16.11-next-470e8c41",
-    "@blocklet/ui-react": "^2.5.48",
+    "@blocklet/meta": "1.16.11",
+    "@blocklet/ui-react": "^2.5.49",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -47,7 +47,7 @@
     "@mui/lab": "^5.0.0-alpha.102",
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
-    "@ocap/client": "1.18.80",
+    "@ocap/client": "1.18.84",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -93,5 +93,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "2f27bfc6522fdf0db1e9b6df717144c98ae30390"
+  "gitHead": "bf1a5bd70ed2ee7cd044c6b629c18bbc900f1598"
 }