@ray-js/api 1.6.2 → 1.6.3-alpha.0

package/lib/getCdnUrl/index.thing.d.ts

@@ -1,3 +1,5 @@
-export declare function getRegionCode(): Promise<string>;
-export default function getCdnUrl(path: string, cdnMap?: Record<string, string>, region?: string): string;
-export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string>, region?: string): Promise<string>;
+type IRegionCode = 'AY' | 'AZ' | 'EU' | 'IN' | 'UE' | 'WE' | 'RU';
+export declare function getRegionCode(): Promise<IRegionCode>;
+export default function getCdnUrl(path: string, cdnMap?: Record<string, string> | Record<IRegionCode, Record<string, string>>, region?: IRegionCode): string;
+export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string> | Record<IRegionCode, Record<string, string>>, region?: IRegionCode): Promise<string>;
+export {};

package/lib/getCdnUrl/index.thing.js

@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 const regionMap = {
   AY: 'images.tuyacn.com',
   AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
@@ -16,7 +17,8 @@ let getInternalRegionCode = () => {
       }
     });
   }
-  return 'EU';
+  // FIXME: 第一次调用时，_regionCode 为 undefined 时，返回 'EU'
+  return _regionCode || 'EU';
 };
 export function getRegionCode() {
   return new Promise((resolve, reject) => {
@@ -33,19 +35,23 @@ export function getRegionCode() {
 }
 export default function getCdnUrl(path, cdnMap, region) {
   if (!cdnMap) {
-    console.warn('Please pass in cdnMap');
+    console.warn('Please provider `cdnImage.json` data');
     return path;
   }
-  const cdnShortPath = cdnMap[path];
+  const regionCode = region || getInternalRegionCode();
+  const cdnShortPath = get(cdnMap, [regionCode, path]) || get(cdnMap, [path]);
   if (!cdnShortPath) {
     console.warn("[App] cdn \"".concat(path, "\" is not exist."));
     return path;
   }
-  return "https://".concat(regionMap[region || getInternalRegionCode()], "/").concat(cdnShortPath);
+  if (cdnShortPath.indexOf('http') === 0 || cdnShortPath.indexOf('//') === 0) {
+    return cdnShortPath;
+  }
+  return "https://".concat(regionMap[regionCode], "/").concat(cdnShortPath);
 }
 export async function getCdnUrlAsync(path, cdnMap, region) {
   if (!cdnMap) {
-    console.warn('Please pass in cdnMap');
+    console.warn('Please provider `cdnImage.json` data');
     return path;
   }
   let _regionCode = 'EU';
@@ -58,10 +64,5 @@ export async function getCdnUrlAsync(path, cdnMap, region) {
       console.warn('[App] getRegionCode error, use default region EU', error);
     }
   }
-  const cdnShortPath = cdnMap[path];
-  if (!cdnShortPath) {
-    console.warn("[App] cdn \"".concat(path, "\" is not exist."));
-    return path;
-  }
-  return "https://".concat(regionMap[_regionCode], "/").concat(cdnShortPath);
+  return getCdnUrl(path, cdnMap, _regionCode);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.6.2",
+  "version": "1.6.3-alpha.0",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,16 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.6.2",
-    "@ray-js/router": "1.6.2",
+    "@ray-js/framework": "1.6.3-alpha.0",
+    "@ray-js/router": "1.6.3-alpha.0",
     "@ray-js/wechat": "^0.2.19",
     "base64-browser": "^1.0.1",
+    "lodash.get": "^4.4.2",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.2",
+    "@ray-js/cli": "1.6.3-alpha.0",
+    "@types/lodash.get": "^4",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.3",
@@ -46,5 +48,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "3b5d2fa88a51ed215543b93d99e10c6977cce04d"
+  "gitHead": "6c03feeff88f61004021f4264eb9bd2e59c30def"
 }