@ray-js/api 1.6.11 → 1.6.13-beta.0

package/lib/getCdnUrl/index.wechat.js

@@ -1,3 +1,18 @@
+import get from 'lodash/get';
+const regionMap = {
+  AY: 'https://images.tuyacn.com'
+};
+const concatRegionOrigin = (regionCode, path) => {
+  const regionOrigin = get(regionMap, [regionCode]) || get(regionMap, ['EU']);
+  if (path.indexOf('/') === 0) {
+    return "".concat(regionOrigin).concat(path);
+  }
+  return "".concat(regionOrigin, "/").concat(path);
+};
+const isEmptyOrUndefined = obj => {
+  return !obj || Object.keys(obj).length === 0;
+};
+
 /**
  * 获取 CDN 地址
  * @description 基础库 2.26.0 及以上版本推荐使用此方法，可以准确获取区域码。
@@ -7,8 +22,26 @@
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
  * @returns CDN 完整地址
  */
-export default function getCdnUrl(path) {
-  return path;
+export default function getCdnUrl(path, cdnMap) {
+  const regionCode = 'AY';
+  if (isEmptyOrUndefined(cdnMap)) {
+    // 如果未提供 cdnMap，则使用 regionMap 直接与 path 进行拼接
+    return concatRegionOrigin(regionCode, path);
+  }
+
+  // 总是使用 EU 进行兜底
+  const cdnShortPath = get(cdnMap, [regionCode, path]) || get(cdnMap, ['AY', path]) || get(cdnMap, [path]);
+  if (!cdnShortPath) {
+    console.warn("[App] cdn \"".concat(path, "\" is not exist."));
+    return path;
+  }
+  if (cdnShortPath.indexOf('http') === 0 || cdnShortPath.indexOf('//') === 0) {
+    return cdnShortPath;
+  }
+  if (cdnShortPath.indexOf('/') === 0) {
+    return "".concat(regionMap[regionCode]).concat(cdnShortPath);
+  }
+  return "".concat(regionMap[regionCode], "/").concat(cdnShortPath);
 }
 
 /**
@@ -19,7 +52,11 @@ export default function getCdnUrl(path) {
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
  * @returns CDN 完整地址
  */
-export async function getCdnUrlAsync(path) {
-  // 暂未实现获取cdn方法，将直接返回path
-  return Promise.resolve(path);
+export async function getCdnUrlAsync(path, cdnMap) {
+  let _regionCode = 'AY';
+  if (isEmptyOrUndefined(cdnMap)) {
+    // 如果未提供 cdnMap，则使用 regionMap 直接与 path 进行拼接
+    return concatRegionOrigin(_regionCode, path);
+  }
+  return getCdnUrl(path, cdnMap, _regionCode);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.6.11",
+  "version": "1.6.13-beta.0",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.6.11",
-    "@ray-js/router": "1.6.11",
+    "@ray-js/framework": "1.6.13-beta.0",
+    "@ray-js/router": "1.6.13-beta.0",
     "@ray-js/wechat": "^0.2.19",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.11",
+    "@ray-js/cli": "1.6.13-beta.0",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.3",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "8fa280821fd6a139ffadcd31e985ed9df5683736"
+  "gitHead": "fc9a900b018f61d0b7ce37ac9db633f402ba9044"
 }