feat: use utility@2

.github/workflows/nodejs.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16, 18, 20]
+        node-version: [16, 18, 20, 22]
         os: [ubuntu-latest]
 
     steps:

.github/workflows/release.yml

@@ -11,5 +11,3 @@ jobs:
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-    with:
-      checkTest: false

package.json

@@ -2,31 +2,6 @@
   "name": "oss-client",
   "version": "2.0.1",
   "description": "Aliyun OSS(Object Storage Service) Node.js Client",
-  "typings": "./dist/esm/index.d.ts",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "type": "module",
-  "tshy": {
-    "exports": {
-      "./package.json": "./package.json",
-      ".": "./src/index.ts"
-    }
-  },
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/index.d.ts",
-        "default": "./dist/commonjs/index.js"
-      }
-    }
-  },
   "scripts": {
     "lint": "eslint src test --ext .ts",
     "test": "egg-bin test",
@@ -61,7 +36,7 @@
     "oss-interface": "^1.3.0",
     "stream-wormhole": "^2.0.0",
     "urllib": "^3.19.2",
-    "utility": "^1.18.0",
+    "utility": "^2.1.0",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
@@ -79,5 +54,30 @@
     "tshy-after": "^1.0.0",
     "typescript": "^5.2.2"
   },
+  "typings": "./dist/esm/index.d.ts",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "type": "module",
+  "tshy": {
+    "exports": {
+      "./package.json": "./package.json",
+      ".": "./src/index.ts"
+    }
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    }
+  },
   "types": "./dist/commonjs/index.d.ts"
 }

src/OSSBaseClient.ts

@@ -4,7 +4,7 @@ import { createHash } from 'node:crypto';
 import { extname } from 'node:path';
 import { sendToWormhole } from 'stream-wormhole';
 import { parseStringPromise } from 'xml2js';
-import utility from 'utility';
+import { encodeURIComponent as safeEncodeURIComponent } from 'utility';
 import mime from 'mime';
 import {
   HttpClient, RequestOptions, HttpClientResponse, IncomingHttpHeaders,
@@ -91,7 +91,7 @@ export abstract class OSSBaseClient {
    * encodeURIComponent name except '/'
    */
   protected escape(name: string) {
-    return utility.encodeURIComponent(name).replaceAll('%2F', '/');
+    return safeEncodeURIComponent(name).replaceAll('%2F', '/');
   }
 
   protected abstract getRequestEndpoint(): string;

src/util/json2xml.ts

@@ -1,4 +1,4 @@
-import utility from 'utility';
+import { escape as escapeHTML } from 'utility';
 
 export function json2xml(json: Record<string, any>, options?: { headers: boolean }) {
   let xml = '';
@@ -19,7 +19,7 @@ export function json2xml(json: Record<string, any>, options?: { headers: boolean
       xml += json2xml(value);
       xml += `</${key}>`;
     } else {
-      xml += `<${key}>${utility.escape(value.toString())}</${key}>`;
+      xml += `<${key}>${escapeHTML(value.toString())}</${key}>`;
     }
   }
   return xml;