@jayfong/x-utils 1.0.0-202407021348 → 1.0.0-202408101439

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/_cjs/fs.js CHANGED
@@ -33,6 +33,7 @@ __export(fs_exports, {
33
33
  module.exports = __toCommonJS(fs_exports);
34
34
  var import_fs_extra = __toESM(require("fs-extra"), 1);
35
35
  var import_mime = __toESM(require("mime"), 1);
36
+ var import_probe_image_size = __toESM(require("probe-image-size"), 1);
36
37
  const XFsExtra = {
37
38
  getMimeType(extOrName) {
38
39
  return import_mime.default.getType(extOrName) || "application/octet-stream";
@@ -66,6 +67,17 @@ const XFsExtra = {
66
67
  await XFsExtra.toBuffer(file)
67
68
  ];
68
69
  return Buffer.concat(buffers);
70
+ },
71
+ async getImageInfo(urlOrStreamOrBuffer, options) {
72
+ return typeof urlOrStreamOrBuffer === "string" ? (0, import_probe_image_size.default)(urlOrStreamOrBuffer, {
73
+ rejectUnauthorized: false,
74
+ ...options,
75
+ headers: {
76
+ "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/7.0.17(0x17001126) NetType/WIFI Language/zh_CN",
77
+ Referer: urlOrStreamOrBuffer,
78
+ ...options?.headers
79
+ }
80
+ }) : Buffer.isBuffer(urlOrStreamOrBuffer) ? import_probe_image_size.default.sync(urlOrStreamOrBuffer) : (0, import_probe_image_size.default)(urlOrStreamOrBuffer, true);
69
81
  }
70
82
  };
71
83
  const XFs = {
package/fs.d.ts CHANGED
@@ -1,11 +1,23 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  import fs from 'fs-extra';
4
+ import { NeedleOptions } from 'needle';
4
5
  import { Readable } from 'node:stream';
6
+ export type XFsExtraImageInfo = {
7
+ /** 图片宽度(单位: 像素) */
8
+ width: number;
9
+ /** 图片高度(单位: 像素) */
10
+ height: number;
11
+ /** 图片类型: jpg, png... */
12
+ type: string;
13
+ /** 图片 Mime 类型: image/jpg, image/png... */
14
+ mime: string;
15
+ };
5
16
  export declare const XFs: typeof fs & {
6
17
  getMimeType(extOrName: string): string;
7
18
  getExtension(typeOrName: string): string;
8
19
  toBuffer(file: Buffer | Readable): Promise<Buffer>;
9
20
  toText(file: Buffer | Readable): Promise<string>;
10
21
  toMaskImage(file: Buffer | Readable): Promise<Buffer>;
22
+ getImageInfo(urlOrStreamOrBuffer: string | Buffer | Readable, options?: NeedleOptions): Promise<XFsExtraImageInfo | null>;
11
23
  };
package/fs.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import fs from "fs-extra";
2
2
  import mime from "mime";
3
+ import probeImageSize from "probe-image-size";
3
4
  const XFsExtra = {
4
5
  getMimeType(extOrName) {
5
6
  return mime.getType(extOrName) || "application/octet-stream";
@@ -33,6 +34,17 @@ const XFsExtra = {
33
34
  await XFsExtra.toBuffer(file)
34
35
  ];
35
36
  return Buffer.concat(buffers);
37
+ },
38
+ async getImageInfo(urlOrStreamOrBuffer, options) {
39
+ return typeof urlOrStreamOrBuffer === "string" ? probeImageSize(urlOrStreamOrBuffer, {
40
+ rejectUnauthorized: false,
41
+ ...options,
42
+ headers: {
43
+ "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/7.0.17(0x17001126) NetType/WIFI Language/zh_CN",
44
+ Referer: urlOrStreamOrBuffer,
45
+ ...options?.headers
46
+ }
47
+ }) : Buffer.isBuffer(urlOrStreamOrBuffer) ? probeImageSize.sync(urlOrStreamOrBuffer) : probeImageSize(urlOrStreamOrBuffer, true);
36
48
  }
37
49
  };
38
50
  const XFs = {
package/package.json CHANGED
@@ -1,21 +1,25 @@
1
1
  {
2
2
  "name": "@jayfong/x-utils",
3
3
  "description": "123456",
4
- "version": "1.0.0-202407021348",
4
+ "version": "1.0.0-202408101439",
5
5
  "type": "module",
6
6
  "dependencies": {
7
7
  "vtils": "^4.115.0",
8
8
  "@jayfong/x-request": "^2.35.2",
9
9
  "cli-table3": "^0.6.3",
10
10
  "inquirer": "^9.2.13",
11
+ "@types/inquirer": "^9.0.7",
11
12
  "clipboardy": "^4.0.0",
12
13
  "execa": "^8.0.1",
13
14
  "node-html-parser": "^6.1.12",
14
15
  "csv": "^6.3.6",
15
16
  "exit-hook": "^4.0.0",
16
17
  "fs-extra": "^11.2.0",
18
+ "@types/fs-extra": "^11.0.4",
17
19
  "dotenv": "^16.4.5",
18
20
  "mime": "^4.0.3",
21
+ "probe-image-size": "^7.2.3",
22
+ "@types/probe-image-size": "^7.2.5",
19
23
  "docx": "^8.5.0",
20
24
  "image-dimensions": "^2.3.0",
21
25
  "@fastify/cors": "^9.0.1",
package/ofd.d.ts DELETED
@@ -1 +0,0 @@
1
- export {};