@ray-js/api 1.7.54 → 1.7.55

package/lib/getCdnUrl/index.d.ts

@@ -25,6 +25,7 @@ interface IImageProcessOptions {
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
+ * @param process - 图片处理参数对象
  * @returns CDN 完整地址
  */
 export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode, process?: IImageProcessOptions): string;

package/lib/getCdnUrl/index.js

@@ -5,6 +5,7 @@
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
+ * @param process - 图片处理参数对象
  * @returns CDN 完整地址
  */
 export default function getCdnUrl(path) {

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

@@ -26,7 +26,7 @@ export declare function getRegionCode(): Promise<IRegionCode>;
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
- * @param process - 图片处理参数对象（可选）
+ * @param process - 图片处理参数对象
  * @returns CDN 完整地址
  */
 export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode, process?: IImageProcessOptions): string;

package/lib/getCdnUrl/index.thing.js

@@ -14,6 +14,8 @@ const regionMap = {
 
 // 国外有处理参数时统一使用该域名
 const unifiedProcessDomain = 'https://d395y9yyizm1zb.cdn5th.com';
+// 西欧区不接受 aws 相关服务，有处理参数时使用该域名
+const weProcessDomain = 'https://weimagedq8qoz7.cdn5th.com';
 let _globalRegionCode;
 const getInternalRegionCode = () => {
   if (!_globalRegionCode) {
@@ -115,16 +117,17 @@ const appendQuery = (url, query) => {
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
- * @param process - 图片处理参数对象（可选）
+ * @param process - 图片处理参数对象
  * @returns CDN 完整地址
  */
 export default function getCdnUrl(path, cdnMap, region, process) {
   const regionCode = region || getInternalRegionCode();
   const hasProcess = !!process && !isEmptyOrUndefined(process);
   const queryPart = buildProcessQuery(regionCode, process);
+  const processDomain = regionCode === 'WE' ? weProcessDomain : unifiedProcessDomain;
   if (isEmptyOrUndefined(cdnMap)) {
     if (hasProcess && regionCode !== 'AY') {
-      const url = path.indexOf('/') === 0 ? "".concat(unifiedProcessDomain).concat(path) : "".concat(unifiedProcessDomain, "/").concat(path);
+      const url = path.indexOf('/') === 0 ? "".concat(processDomain).concat(path) : "".concat(processDomain, "/").concat(path);
       return appendQuery(url, queryPart);
     }
     return appendQuery(concatRegionOrigin(regionCode, path), queryPart);
@@ -135,7 +138,7 @@ export default function getCdnUrl(path, cdnMap, region, process) {
   if (!cdnShortPath) {
     console.warn("[App] cdn \"".concat(path, "\" is not exist."));
     if (hasProcess && regionCode !== 'AY') {
-      const url = path.indexOf('/') === 0 ? "".concat(unifiedProcessDomain).concat(path) : "".concat(unifiedProcessDomain, "/").concat(path);
+      const url = path.indexOf('/') === 0 ? "".concat(processDomain).concat(path) : "".concat(processDomain, "/").concat(path);
       return appendQuery(url, queryPart);
     }
     return appendQuery(path, queryPart);
@@ -151,7 +154,7 @@ export default function getCdnUrl(path, cdnMap, region, process) {
   if (hasProcess && regionCode !== 'AY') {
     const originPrefix = regionMap[regionCode];
     if (finalUrl.startsWith(originPrefix)) {
-      finalUrl = finalUrl.replace(originPrefix, unifiedProcessDomain);
+      finalUrl = finalUrl.replace(originPrefix, processDomain);
     }
   }
   return appendQuery(finalUrl, queryPart);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.7.54",
+  "version": "1.7.55",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,8 +29,8 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.7.54",
-    "@ray-js/router": "1.7.54",
+    "@ray-js/framework": "1.7.55",
+    "@ray-js/router": "1.7.55",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
@@ -38,7 +38,7 @@
     "@ray-js/wechat": "^0.3.13"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.7.54",
+    "@ray-js/cli": "1.7.55",
     "art-template": "^4.13.4",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.3",
@@ -48,5 +48,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "5116e3b87db4744a118a9fe97f88a8c708b44a93"
+  "gitHead": "99c603c95b6dc57833bd51784cf28c93a4d36b96"
 }