@jayfong/x-utils 1.0.0-202408290949 → 1.0.0-202409191622

package/_cjs/compressor.js

@@ -0,0 +1,47 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var compressor_exports = {};
+__export(compressor_exports, {
+  XCompressor: () => XCompressor
+});
+module.exports = __toCommonJS(compressor_exports);
+var import_sharp = __toESM(require("sharp"), 1);
+class XCompressor {
+  static png(content) {
+    return (0, import_sharp.default)(content).png({
+      quality: 80,
+      compressionLevel: 6
+    }).toBuffer();
+  }
+  static jpg(content) {
+    return (0, import_sharp.default)(content).jpeg({
+      quality: 80
+    }).toBuffer();
+  }
+}

package/_cjs/upload.js

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(upload_exports);
 var import_x_request = require("@jayfong/x-request");
 var import_file_type = require("file-type");
 var fs = __toESM(require("node:fs"), 1);
-var import_sharp = __toESM(require("sharp"), 1);
 var import_vtils = require("vtils");
 var import_env = require("./env.js");
 class XUpload {
@@ -47,11 +46,12 @@ class XUpload {
    * @param options.source 默认 my-auto-tasks
    */
   static async upload(file, {
+    fileExt: customFileExt,
     serverUrl,
     serverToken,
     provider = "auto",
     source = "my-auto-tasks",
-    compress = false
+    beforeUpload
   } = {}) {
     if (serverUrl == null) {
       serverUrl = await import_env.XEnv.getEnvVar("X_UPLOAD_SERVER_URL");
@@ -59,6 +59,7 @@ class XUpload {
     if (serverToken == null) {
       serverToken = await import_env.XEnv.getEnvVar("X_UPLOAD_SERVER_TOKEN");
     }
+    const rawFile = file;
     if (typeof file === "string") {
       if ((0, import_vtils.isUrl)(file)) {
         const { data: data2 } = await import_x_request.xr.get({
@@ -70,18 +71,18 @@ class XUpload {
         file = await fs.promises.readFile(file);
       }
     }
-    const { ext: fileExt } = await (0, import_file_type.fileTypeFromBuffer)(file);
+    const { ext: fileExt } = customFileExt ? { ext: customFileExt } : await (0, import_file_type.fileTypeFromBuffer)(file) || {
+      ext: (typeof rawFile === "string" ? rawFile.split("?")[0].split(".").pop()?.toLowerCase() : "") || "unknown"
+    };
     const imageExts = ["jpg", "png", "gif"];
     const isImage = imageExts.includes(fileExt);
     provider = provider === "auto" ? isImage ? "image" : "file" : provider;
-    if (isImage && compress) {
-      const compressor = (0, import_sharp.default)(file);
-      file = fileExt === "png" ? await compressor.png({
-        quality: 80,
-        compressionLevel: 6
-      }).toBuffer() : fileExt === "jpg" ? await compressor.jpeg({
-        quality: 80
-      }).toBuffer() : file;
+    if (beforeUpload) {
+      file = await beforeUpload({
+        file,
+        ext: fileExt,
+        isImage
+      });
     }
     const { data } = await import_x_request.xr.postJson({
       url: serverUrl,

package/compressor.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+export declare class XCompressor {
+    static png(content: Buffer): Promise<Buffer>;
+    static jpg(content: Buffer): Promise<Buffer>;
+}

package/compressor.js

@@ -0,0 +1,17 @@
+import sharp from "sharp";
+class XCompressor {
+  static png(content) {
+    return sharp(content).png({
+      quality: 80,
+      compressionLevel: 6
+    }).toBuffer();
+  }
+  static jpg(content) {
+    return sharp(content).jpeg({
+      quality: 80
+    }).toBuffer();
+  }
+}
+export {
+  XCompressor
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jayfong/x-utils",
   "description": "123456",
-  "version": "1.0.0-202408290949",
+  "version": "1.0.0-202409191622",
   "type": "module",
   "dependencies": {
     "vtils": "^4.115.0",
@@ -11,6 +11,7 @@
     "@types/inquirer": "^9.0.7",
     "clipboardy": "^4.0.0",
     "execa": "^8.0.1",
+    "sharp": "^0.32.5",
     "node-html-parser": "^6.1.12",
     "csv": "^6.3.6",
     "exit-hook": "^4.0.0",
@@ -31,7 +32,6 @@
     "consola": "^3.2.3",
     "html-entities": "^2.5.2",
     "file-type": "^19.0.0",
-    "sharp": "^0.32.5",
     "yaml": "^2.3.4"
   },
   "peerDependencies": {
@@ -64,6 +64,11 @@
       "import": "./cmd.js",
       "types": "./cmd.d.ts"
     },
+    "./compressor": {
+      "require": "./_cjs/compressor.js",
+      "import": "./compressor.js",
+      "types": "./compressor.d.ts"
+    },
     "./crawler": {
       "require": "./_cjs/crawler.js",
       "import": "./crawler.js",

package/upload.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import { FileExtension } from 'file-type';
 import { LiteralUnion } from 'vtils/types';
 /**
  * 环境变量：
@@ -15,12 +16,17 @@ export declare class XUpload {
      * @param options.provider 默认 auto
      * @param options.source 默认 my-auto-tasks
      */
-    static upload(file: string | Buffer, { serverUrl, serverToken, provider, source, compress, }?: {
+    static upload(file: string | Buffer, { fileExt: customFileExt, serverUrl, serverToken, provider, source, beforeUpload, }?: {
+        fileExt?: LiteralUnion<FileExtension, string>;
         serverUrl?: string;
         serverToken?: string;
         provider?: LiteralUnion<'image' | 'file' | 'auto', string>;
         source?: string;
-        compress?: boolean;
+        beforeUpload?: (payload: {
+            file: Buffer;
+            ext: string;
+            isImage: boolean;
+        }) => Buffer | Promise<Buffer>;
     }): Promise<{
         url: string;
         rawUrl: string;

package/upload.js

@@ -1,7 +1,6 @@
 import { xr } from "@jayfong/x-request";
 import { fileTypeFromBuffer } from "file-type";
 import * as fs from "node:fs";
-import sharp from "sharp";
 import { isUrl } from "vtils";
 import { XEnv } from "./env.js";
 class XUpload {
@@ -14,11 +13,12 @@ class XUpload {
    * @param options.source 默认 my-auto-tasks
    */
   static async upload(file, {
+    fileExt: customFileExt,
     serverUrl,
     serverToken,
     provider = "auto",
     source = "my-auto-tasks",
-    compress = false
+    beforeUpload
   } = {}) {
     if (serverUrl == null) {
       serverUrl = await XEnv.getEnvVar("X_UPLOAD_SERVER_URL");
@@ -26,6 +26,7 @@ class XUpload {
     if (serverToken == null) {
       serverToken = await XEnv.getEnvVar("X_UPLOAD_SERVER_TOKEN");
     }
+    const rawFile = file;
     if (typeof file === "string") {
       if (isUrl(file)) {
         const { data: data2 } = await xr.get({
@@ -37,18 +38,18 @@ class XUpload {
         file = await fs.promises.readFile(file);
       }
     }
-    const { ext: fileExt } = await fileTypeFromBuffer(file);
+    const { ext: fileExt } = customFileExt ? { ext: customFileExt } : await fileTypeFromBuffer(file) || {
+      ext: (typeof rawFile === "string" ? rawFile.split("?")[0].split(".").pop()?.toLowerCase() : "") || "unknown"
+    };
     const imageExts = ["jpg", "png", "gif"];
     const isImage = imageExts.includes(fileExt);
     provider = provider === "auto" ? isImage ? "image" : "file" : provider;
-    if (isImage && compress) {
-      const compressor = sharp(file);
-      file = fileExt === "png" ? await compressor.png({
-        quality: 80,
-        compressionLevel: 6
-      }).toBuffer() : fileExt === "jpg" ? await compressor.jpeg({
-        quality: 80
-      }).toBuffer() : file;
+    if (beforeUpload) {
+      file = await beforeUpload({
+        file,
+        ext: fileExt,
+        isImage
+      });
     }
     const { data } = await xr.postJson({
       url: serverUrl,