📦 NEW: Try to use ctx.httpclient first (#6)

SECURITY.md

@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report security issues to <email>
+Please report security issues to <fengmk2+security@gmail.com>

lib/client.js

@@ -189,8 +189,10 @@ async function request(params) {
   const reqParams = createRequest.call(this, params);
   let result;
   let reqErr;
+  // try ctx.httpclient first
+  const urllib = reqParams.params.ctx?.httpclient ?? reqParams.params.ctx?.urllib ?? this.urllib;
   try {
-    result = await this.urllib.request(reqParams.url, reqParams.params);
+    result = await urllib.request(reqParams.url, reqParams.params);
     debug('response %s %s, got %s, headers: %j', params.method, reqParams.url, result.status, result.headers);
   } catch (err) {
     reqErr = err;
@@ -306,11 +308,11 @@ proto.requestError = async function requestError(result) {
         err.status = 412;
         err.code = 'PreconditionFailed';
       } else {
-        err = new Error(`Unknow error, status: ${result.status}`);
+        err = new Error(`Unknow error, status: ${result.status}, raw error: ${result}`);
         err.name = 'UnknownError';
         err.status = result.status;
       }
-      err.requestId = result.headers['x-oss-request-id'];
+      err.requestId = result.headers?.['x-oss-request-id'];
       err.host = '';
     }
   } else {

lib/image.js

@@ -13,7 +13,6 @@ module.exports = function(OssClient) {
     options.endpoint = options.imageHost;
     this.ossClient = new OssClient(options);
     this.ossClient.options.imageHost = options.imageHost;
-    // this.ossClient._objectRequestParams = objectRequestParams;
   }
 
   /**

lib/sts.js

@@ -90,7 +90,9 @@ proto.assumeRole = async function assumeRole(role, policy, expiration, session,
     ctx: options && options.ctx,
   };
 
-  const result = await this.urllib.request(reqUrl, reqParams);
+  // try ctx.httpclient first
+  const urllib = reqParams.ctx?.httpclient ?? reqParams.ctx?.urllib ?? this.urllib;
+  const result = await urllib.request(reqUrl, reqParams);
   debug(
     'response %s %s, got %s, headers: %j',
     reqParams.method, reqUrl, result.status, result.headers

package.json

@@ -11,6 +11,7 @@
   "scripts": {
     "lint": "eslint lib test",
     "test": "egg-bin test --full-trace --parallel",
+    "test-local": "egg-bin test --full-trace",
     "tsd": "tsd",
     "cov": "egg-bin cov --full-trace --parallel",
     "ci": "npm run lint && npm run tsd && npm run cov"
@@ -51,7 +52,7 @@
   },
   "devDependencies": {
     "@eggjs/tsconfig": "^1.1.0",
-    "@types/node": "^18.11.6",
+    "@types/node": "^14.18.34",
     "egg-bin": "^5.3.1",
     "eslint": "^8.25.0",
     "eslint-config-egg": "^12.1.0",

test/object.test.js

@@ -266,6 +266,36 @@ describe('test/object.test.js', () => {
       assert.equal(object.name, name);
     });
 
+    it('should with options.ctx', async () => {
+      const name = `${prefix}oss-client/oss/put-localfile-options-ctx.js`;
+      let ctx = {
+        httpclient: {},
+      };
+      await assert.rejects(async () => {
+        await store.put(name, __filename, { ctx });
+      }, err => {
+        assert(err.message.includes('raw error: TypeError: urllib.request is not a function'));
+        return true;
+      });
+      ctx = {
+        httpclient: urllib,
+      };
+      let object = await store.put(name, __filename, { ctx });
+      assert.equal(typeof object.res.headers['x-oss-request-id'], 'string');
+      assert.equal(typeof object.res.rt, 'number');
+      assert.equal(object.res.size, 0);
+      assert.equal(object.name, name);
+
+      ctx = {
+        urllib,
+      };
+      object = await store.put(name, __filename, { ctx });
+      assert.equal(typeof object.res.headers['x-oss-request-id'], 'string');
+      assert.equal(typeof object.res.rt, 'number');
+      assert.equal(object.res.size, 0);
+      assert.equal(object.name, name);
+    });
+
     it('should add object with content buffer', async () => {
       const name = `${prefix}oss-client/oss/put-buffer`;
       const object = await store.put(`/${name}`, Buffer.from('foo content'));