@ray-js/api 1.7.50 → 1.7.52

package/lib/cloud/interface.d.ts

@@ -1908,6 +1908,7 @@ export type Audio = {
 export type FileInfo = {
     objectKey: string;
     fileName: string;
+    fileSize: number;
 };
 export type FileSign = {
     action: string;

package/lib/getCdnUrl/index.d.ts

@@ -1,5 +1,23 @@
 type IRegionCode = 'AY' | 'AZ' | 'EU' | 'IN' | 'UE' | 'WE' | 'RU' | 'SG';
 type ICdnMap = Record<string, string> | Record<IRegionCode, Record<string, string>>;
+interface IImageProcessOptions {
+    crop?: {
+        h?: number;
+        w?: number;
+        x?: number;
+        y?: number;
+    };
+    resize?: {
+        h?: number;
+        w?: number;
+    };
+    rotate?: {
+        value: 90 | 180 | 270 | 360;
+    };
+    format?: {
+        value: string;
+    };
+}
 /**
  * 获取 CDN 地址
  * @description 基础库 2.26.0 及以上版本推荐使用此方法，可以准确获取区域码。
@@ -8,9 +26,8 @@ type ICdnMap = Record<string, string> | Record<IRegionCode, Record<string, strin
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
  * @returns CDN 完整地址
- * @deprecated - 推荐使用 getCdnUrlAsync 方法
  */
-export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode): string;
+export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode, process?: IImageProcessOptions): string;
 /**
  * 获取 CDN 地址
  * @description 基础库 2.26.0 以下版本请使用此方法，以避免区域码获取不准确的问题。

package/lib/getCdnUrl/index.js

@@ -6,7 +6,6 @@
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
  * @returns CDN 完整地址
- * @deprecated - 推荐使用 getCdnUrlAsync 方法
  */
 export default function getCdnUrl(path) {
   return path;

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

@@ -1,5 +1,23 @@
 type IRegionCode = 'AY' | 'AZ' | 'EU' | 'IN' | 'UE' | 'WE' | 'RU' | 'SG';
 type ICdnMap = Record<string, string> | Record<IRegionCode, Record<string, string>>;
+interface IImageProcessOptions {
+    crop?: {
+        h?: number;
+        w?: number;
+        x?: number;
+        y?: number;
+    };
+    resize?: {
+        h?: number;
+        w?: number;
+    };
+    rotate?: {
+        value: 90 | 180 | 270 | 360;
+    };
+    format?: {
+        value: string;
+    };
+}
 export declare function getRegionCode(): Promise<IRegionCode>;
 /**
  * 获取 CDN 地址
@@ -8,9 +26,10 @@ export declare function getRegionCode(): Promise<IRegionCode>;
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
+ * @param process - 图片处理参数对象（可选）
  * @returns CDN 完整地址
  */
-export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode): string;
+export default function getCdnUrl(path: string, cdnMap?: ICdnMap, region?: IRegionCode, process?: IImageProcessOptions): string;
 /**
  * 获取 CDN 地址
  * @description 基础库 2.26.0 以下版本请使用此方法，以避免区域码获取不准确的问题。

package/lib/getCdnUrl/index.thing.js

@@ -9,6 +9,9 @@ const regionMap = {
   WE: 'https://weimages57vdxnr.cdn5th.com',
   UE: 'https://ueimages58yny2.cdn5th.com'
 };
+
+// 国外有处理参数时统一使用该域名
+const unifiedProcessDomain = 'https://d395y9yyizm1zb.cdn5th.com';
 let _globalRegionCode;
 const getInternalRegionCode = () => {
   if (!_globalRegionCode) {
@@ -51,6 +54,58 @@ const isEmptyOrUndefined = obj => {
   return !obj || Object.keys(obj).length === 0;
 };
 
+// 构建裸操作串 image/crop,.../resize,.../rotate,.../format,... (调整顺序：crop → resize)
+const buildOperationChain = opts => {
+  if (!opts || Object.keys(opts).length === 0) return '';
+  const seg = ['image'];
+  if (opts.crop && !isEmptyOrUndefined(opts.crop)) {
+    const {
+      w,
+      h,
+      x,
+      y
+    } = opts.crop;
+    const cropParts = ['crop'];
+    if (w != null) cropParts.push(`w_${w}`);
+    if (h != null) cropParts.push(`h_${h}`);
+    if (x != null) cropParts.push(`x_${x}`);
+    if (y != null) cropParts.push(`y_${y}`);
+    seg.push(cropParts.join(','));
+  }
+  if (opts.resize && !isEmptyOrUndefined(opts.resize)) {
+    const {
+      w,
+      h
+    } = opts.resize;
+    const resizeParts = ['resize'];
+    if (w != null) resizeParts.push(`w_${w}`);
+    if (h != null) resizeParts.push(`h_${h}`);
+    seg.push(resizeParts.join(','));
+  }
+  if (opts.rotate && opts.rotate.value) {
+    seg.push(`rotate,${opts.rotate.value}`);
+  }
+  if (opts.format && opts.format.value) {
+    seg.push(`format,${opts.format.value}`);
+  }
+  if (seg.length === 1) return '';
+  return seg.join('/');
+};
+
+// 根据区域生成查询键名与完整查询片段
+const buildProcessQuery = (regionCode, opts) => {
+  if (!opts || isEmptyOrUndefined(opts)) return '';
+  const chain = buildOperationChain(opts);
+  if (!chain) return '';
+  const key = regionCode === 'AY' ? 'x-oss-process' : 'process';
+  return `${key}=${chain}`;
+};
+const appendQuery = (url, query) => {
+  if (!query) return url;
+  if (url.indexOf('?') === -1) return `${url}?${query}`;
+  return url.endsWith('?') || url.endsWith('&') ? `${url}${query}` : `${url}&${query}`;
+};
+
 /**
  * 获取 CDN 地址
  * @description 基础库 2.26.0 及以上版本推荐使用此方法，可以准确获取区域码。
@@ -58,28 +113,46 @@ const isEmptyOrUndefined = obj => {
  * @param path - 图片路径
  * @param cdnMap - CDN 地址映射表，若未提供，则使用内置 regionMap 直接与 path 进行拼接
  * @param region - 区域代码，若未提供，则使用内置方法获取，EU 兜底
+ * @param process - 图片处理参数对象（可选）
  * @returns CDN 完整地址
  */
-export default function getCdnUrl(path, cdnMap, region) {
+export default function getCdnUrl(path, cdnMap, region, process) {
   const regionCode = region || getInternalRegionCode();
+  const hasProcess = !!process && !isEmptyOrUndefined(process);
+  const queryPart = buildProcessQuery(regionCode, process);
   if (isEmptyOrUndefined(cdnMap)) {
-    // 如果未提供 cdnMap，则使用 regionMap 直接与 path 进行拼接
-    return concatRegionOrigin(regionCode, path);
+    if (hasProcess && regionCode !== 'AY') {
+      const url = path.indexOf('/') === 0 ? `${unifiedProcessDomain}${path}` : `${unifiedProcessDomain}/${path}`;
+      return appendQuery(url, queryPart);
+    }
+    return appendQuery(concatRegionOrigin(regionCode, path), queryPart);
   }
 
   // 总是使用 EU 进行兜底
   const cdnShortPath = get(cdnMap, [regionCode, path]) || get(cdnMap, ['EU', path]) || get(cdnMap, [path]);
   if (!cdnShortPath) {
     console.warn(`[App] cdn "${path}" is not exist.`);
-    return path;
+    if (hasProcess && regionCode !== 'AY') {
+      const url = path.indexOf('/') === 0 ? `${unifiedProcessDomain}${path}` : `${unifiedProcessDomain}/${path}`;
+      return appendQuery(url, queryPart);
+    }
+    return appendQuery(path, queryPart);
   }
+  let finalUrl;
   if (cdnShortPath.indexOf('http') === 0 || cdnShortPath.indexOf('//') === 0) {
-    return cdnShortPath;
+    finalUrl = cdnShortPath;
+  } else if (cdnShortPath.indexOf('/') === 0) {
+    finalUrl = `${regionMap[regionCode]}${cdnShortPath}`;
+  } else {
+    finalUrl = `${regionMap[regionCode]}/${cdnShortPath}`;
   }
-  if (cdnShortPath.indexOf('/') === 0) {
-    return `${regionMap[regionCode]}${cdnShortPath}`;
+  if (hasProcess && regionCode !== 'AY') {
+    const originPrefix = regionMap[regionCode];
+    if (finalUrl.startsWith(originPrefix)) {
+      finalUrl = finalUrl.replace(originPrefix, unifiedProcessDomain);
+    }
   }
-  return `${regionMap[regionCode]}/${cdnShortPath}`;
+  return appendQuery(finalUrl, queryPart);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.7.50",
+  "version": "1.7.52",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,8 +29,8 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.7.50",
-    "@ray-js/router": "1.7.50",
+    "@ray-js/framework": "1.7.52",
+    "@ray-js/router": "1.7.52",
     "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.50",
+    "@ray-js/cli": "1.7.52",
     "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": "f518f3b1907c30d12f9cad69790609530c68f44f"
+  "gitHead": "14ced414dd88e28032bde51c350b8dae60fe6892"
 }