@egova-mobile/app-media-utils 0.0.1 → 0.0.3

package/dist/image/image-processor.d.ts

@@ -14,5 +14,15 @@ export declare class ImageProcessor {
     private compressOptions;
     constructor(file: File, resizeOptions: ResizeOptions, watermarkOptions: WatermarkOptions, compressOptions: CompressOptions);
     process(): Promise<void | File>;
-    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number): Promise<File>;
+    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number, lastCompressFileSize?: number): Promise<File>;
+    /**
+     * 浮点型数据比较大小
+     */
+    compareFloats(a: number, b: number): number;
+    /**
+     * 浮点型数据保留小数(四舍五入)
+     * @param num 浮点型数据
+     * @param decimalPlaces 保留的小数位数
+     */
+    roundToDecimalPlace(num: number, decimalPlaces: number): number;
 }

package/dist/image/watermark.d.ts

@@ -15,15 +15,15 @@ export interface WatermarkContextParams {
     height: string;
 }
 export declare class WatermarkContext {
-    address: string;
-    watermarkTime: Date;
-    humanName: string;
-    projectName: string;
-    logo: string;
-    applicationName: string;
-    pixel: string;
-    width: string;
-    height: string;
+    address?: string;
+    watermarkTime?: Date;
+    humanName?: string;
+    projectName?: string;
+    logo?: string;
+    applicationName?: string;
+    pixel?: string;
+    width?: string;
+    height?: string;
     /**
      * 打水印需要的环境信息
      * @param address
@@ -41,8 +41,8 @@ export interface WatermarkOptionsParams {
 }
 export declare class WatermarkOptions {
     enabled: boolean;
-    watermarkConfigString: string;
-    context: WatermarkContext;
+    watermarkConfigString?: string;
+    context?: WatermarkContext;
     /**
      * 水印配置项
      * @param enabled， 是否开启水印

package/dist/index.cjs.js

@@ -50,9 +50,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports, module2) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js"(exports, module2) {
     !function(t, e) {
       "object" == typeof exports && "undefined" != typeof module2 ? module2.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
@@ -344,9 +344,9 @@ var require_dayjs_min = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js
 var require_zh_cn = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports, module2) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js"(exports, module2) {
     !function(e, _) {
       "object" == typeof exports && "undefined" != typeof module2 ? module2.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e = "undefined" != typeof globalThis ? globalThis : e || self).dayjs_locale_zh_cn = _(e.dayjs);
     }(exports, function(e) {
@@ -1281,7 +1281,7 @@ function renderWatermark(canvas, options) {
     if (!options.enabled || options.watermarkConfigString === "no") {
       return Promise.resolve(canvas);
     }
-    let { watermarkConfigString } = options;
+    let { watermarkConfigString = "" } = options;
     if (watermarkConfigString === "default") {
       watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
     }
@@ -1502,16 +1502,28 @@ var ImageProcessor = class {
       );
     });
   }
-  compress(canvas, filename, lastModified, type, quality) {
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
     return canvas2File(canvas, filename, lastModified, type, quality).then(
       (file) => {
-        if (file.size > this.compressOptions.photoFileSizeLimit * 1024 && quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+        let qualityStep = JPEG_QUALITY_STEP;
+        if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+          let factor = Math.floor(file.size / (1024 * this.compressOptions.photoFileSizeLimit));
+          if (factor > 1 && quality > MIN_JPEG_QUALITY) {
+            qualityStep = this.roundToDecimalPlace(JPEG_QUALITY_STEP * factor, 2);
+            let maxQualityStep = this.roundToDecimalPlace(quality - MIN_JPEG_QUALITY, 2);
+            qualityStep = Math.min(qualityStep, maxQualityStep);
+          }
+        }
+        let compressFileSizeChanged = lastCompressFileSize === -1 || file.size < lastCompressFileSize;
+        let nextCompressQuality = this.roundToDecimalPlace(quality - qualityStep, 2);
+        if (compressFileSizeChanged && file.size > this.compressOptions.photoFileSizeLimit * 1024 && this.compareFloats(nextCompressQuality, MIN_JPEG_QUALITY) >= 0) {
           return this.compress(
             canvas,
             filename,
             lastModified,
             type,
-            quality - JPEG_QUALITY_STEP
+            this.roundToDecimalPlace(nextCompressQuality, 2),
+            file.size
           );
         } else {
           return Promise.resolve(file);
@@ -1519,4 +1531,23 @@ var ImageProcessor = class {
       }
     );
   }
+  /**
+   * 浮点型数据比较大小
+   */
+  compareFloats(a, b) {
+    const diff = Math.abs(a - b);
+    if (diff < Number.EPSILON) {
+      return 0;
+    }
+    return a - b > 0 ? 1 : -1;
+  }
+  /**
+   * 浮点型数据保留小数(四舍五入)
+   * @param num 浮点型数据
+   * @param decimalPlaces 保留的小数位数
+   */
+  roundToDecimalPlace(num, decimalPlaces) {
+    const factor = Math.pow(10, decimalPlaces);
+    return Math.round(num * factor) / factor;
+  }
 };

package/dist/index.esm.mjs

@@ -44,9 +44,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js"(exports, module) {
     !function(t, e) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
@@ -338,9 +338,9 @@ var require_dayjs_min = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js
 var require_zh_cn = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
     !function(e, _) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e = "undefined" != typeof globalThis ? globalThis : e || self).dayjs_locale_zh_cn = _(e.dayjs);
     }(exports, function(e) {
@@ -1256,7 +1256,7 @@ function renderWatermark(canvas, options) {
     if (!options.enabled || options.watermarkConfigString === "no") {
       return Promise.resolve(canvas);
     }
-    let { watermarkConfigString } = options;
+    let { watermarkConfigString = "" } = options;
     if (watermarkConfigString === "default") {
       watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
     }
@@ -1477,16 +1477,28 @@ var ImageProcessor = class {
       );
     });
   }
-  compress(canvas, filename, lastModified, type, quality) {
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
     return canvas2File(canvas, filename, lastModified, type, quality).then(
       (file) => {
-        if (file.size > this.compressOptions.photoFileSizeLimit * 1024 && quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+        let qualityStep = JPEG_QUALITY_STEP;
+        if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+          let factor = Math.floor(file.size / (1024 * this.compressOptions.photoFileSizeLimit));
+          if (factor > 1 && quality > MIN_JPEG_QUALITY) {
+            qualityStep = this.roundToDecimalPlace(JPEG_QUALITY_STEP * factor, 2);
+            let maxQualityStep = this.roundToDecimalPlace(quality - MIN_JPEG_QUALITY, 2);
+            qualityStep = Math.min(qualityStep, maxQualityStep);
+          }
+        }
+        let compressFileSizeChanged = lastCompressFileSize === -1 || file.size < lastCompressFileSize;
+        let nextCompressQuality = this.roundToDecimalPlace(quality - qualityStep, 2);
+        if (compressFileSizeChanged && file.size > this.compressOptions.photoFileSizeLimit * 1024 && this.compareFloats(nextCompressQuality, MIN_JPEG_QUALITY) >= 0) {
           return this.compress(
             canvas,
             filename,
             lastModified,
             type,
-            quality - JPEG_QUALITY_STEP
+            this.roundToDecimalPlace(nextCompressQuality, 2),
+            file.size
           );
         } else {
           return Promise.resolve(file);
@@ -1494,6 +1506,25 @@ var ImageProcessor = class {
       }
     );
   }
+  /**
+   * 浮点型数据比较大小
+   */
+  compareFloats(a, b) {
+    const diff = Math.abs(a - b);
+    if (diff < Number.EPSILON) {
+      return 0;
+    }
+    return a - b > 0 ? 1 : -1;
+  }
+  /**
+   * 浮点型数据保留小数(四舍五入)
+   * @param num 浮点型数据
+   * @param decimalPlaces 保留的小数位数
+   */
+  roundToDecimalPlace(num, decimalPlaces) {
+    const factor = Math.pow(10, decimalPlaces);
+    return Math.round(num * factor) / factor;
+  }
 };
 export {
   CompressOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egova-mobile/app-media-utils",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.mjs",