From 22fbad2664f75c70c52e2db1ded31e762abf43d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A5=B6=E5=9F=B9=E6=B3=BD?= <peizerao@gmail.com>
Date: Fri, 20 Oct 2017 01:06:58 -0500
Subject: [PATCH] fix: getStream support options.process (#304)

closes https://github.com/ali-sdk/ali-oss/issues/300
---
 lib/object.js                  |   6 ++++++
 package.json                   |   1 +
 test/nodejs-processed-w200.png | Bin 21567 -> 21572 bytes
 test/object.test.js            |  20 ++++++++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/lib/object.js b/lib/object.js
index c979f5d54..0620c3cf7 100644
--- a/lib/object.js
+++ b/lib/object.js
@@ -204,6 +204,12 @@ proto.get = function* get(name, file, options) {
 
 proto.getStream = function* getStream(name, options) {
   options = options || {};
+
+  if (options.process) {
+    options.subres = options.subres || {};
+    options.subres['x-oss-process'] = options.process;
+  }
+  
   var params = this._objectRequestParams('GET', name, options);
   params.customResponse = true;
   params.successStatuses = [200, 206, 304];
diff --git a/package.json b/package.json
index b49bf737e..62c1ae88c 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "mocha": "^3.0.0",
     "should": "^11.0.0",
     "sinon": "^1.17.6",
+    "stream-equal": "^1.1.0",
     "thunk-mocha": "^1.0.3",
     "uglify-js": "^2.7.1"
   },
diff --git a/test/nodejs-processed-w200.png b/test/nodejs-processed-w200.png
index f4ae7e0b094493fb7fb3395bd23401cf9a269761..dd0200178e1dc7eca8061000fa74c30ad2a9753b 100644
GIT binary patch
delta 820
zcmV-41Izrsr~$;N0kAwk0rRsxK&lXbiF*Yn%qDThHWxDIm<KYaj9D}1*{qrK%qE+2
z%v&+%8FP-!ear)x2eZUCajyU@v%x%=F`LXO+nh2NGN)v-!E7>{#2Is**<kb5Z0=$1
zWtsb#2QtX!o48kCV@}!TBIcAiW6TC)){MD;*<?<cd)cg6W|Mgf=7hPJxt9Tdb3bzd
z+k6xE3rk$UHW#ruWiDh+8FR)UPMK2%%qiP!G8=3*7%*$b*t{j#oF^W{fVq$PCN2`#
zoU*xqZBE%-z~(~clnt0S*}Oewlg%b$Hko@Ev&oqI*nAWJ5>(dAImTSTY%u4UHQTJ2
z3)!5p*<j2DW6lwnx5?bYGUhygn|qlP=7DU!i3bZ#*=#bWY;yr)-UiuRL_ClIbH?1q
ztl8!*nR5&>_cHgB&4U<&_$D5#@<8Td<^r}^GiHN1W1BUbGsbK(8;sdt%*Bk^WbS9~
zWgfs>zykA4JXr7`#;n<FvN>gQA#=($Yvvy20y1aJz04VNj=^j)C(H&pnS0pgel`~}
z-^7K2yKK&wbIgUznlWqUVm7C2HkdQUW`o#d%m#Cg#W@DddB$uq68AF?X7f$FrIVUc
zEq~&z1YnFgV@}!r|JsA297%BifMPGDx&M{DBaMKhfNu65yB*E6Lw9JWTUyXzG(i*e
zMKfcxGPD|98R^;>z53CozqFGUqm3rIgErD+qzxUU86BkmK?~7BT4{8F&Ls5eN1xJ6
z2bHc!8)-)~%{0?SD=oC6g}%^?zUgGp34dKM^y+t?bVu6I6UOL@R$6JJG@;2Dnn(-%
zg1$*7x;84k`priNw4;SK=pY?vL%UIEqlsoCO*BIjEzr+sp^`2bUC^sXK5ewnGn#0j
zjlSp~H8i1}bfD3M(PFeh6P*lnroVJT^y-06o6#*gXr_sFw9ro4jp#r#Eoh+$`bg2}
zn?{%D+UV6IpEhVm3vHwwO*GSnN;}=r=%9PjLMv&7zUYi@Xz0}=f4ZWBZfQcdbV;S1
yN*kKd4|Jl19@CjLO0ORI^beB^R2&%9Q~v>g&I?qi3FONF0000<MNUMnLSTY2B#_Mj

delta 815
zcmV+~1JL}$r~$vI0kAwk0q(OsK&lXb={~^;vq_w>&4tW4=7G#9W7f=hHf!cQv&rTh
z^H$7x#++kwAM*g_!7TAj_X)r<8_a_lv&o#Y%_(ysb4oTF%qFu*oH6H_4K{Dh<{su=
zmbssKAcJha={|vtIc1xRm{aDAF&m6oGv)$jlR0JXWwU0PP3A3_6Xs&(UIxs6{mcby
z^Gy#BmbidzE@E@aT*#a<=8Qp{GN%lfQ?}V;HrQ-1VAhPWc}uc6PdtbLb070f7Yb}n
z*<8Rjr)(}@b0Kre2F#mm-X62bW|J|S%sq_RWXyeRzUg0v%9=UHm<yN<<~*}zn>BMG
zn=>{WjM-q!IRf)GnR{5qoM&@?FLS~?kj*z;AUI{S$(*vy1&nzcWOEVmKnBbib04#2
zo3~`nG05D@+)p+SVhrM&E>L+Ob1`!P+pHP0!JM(pn#~zwHkl2^Y%u0x#%wb8GxstN
zU@l;R`KAj54`R%k%_f^uHWxCdY_n$WVJ;wZ#@x%CG3OY}CUe4UkhzC8ZSH4tA@fZa
z3+}QxW6m)bGHb@HnTy$+ve{tH7@G}ZlQA32ITq&_Fy|Sw$w=JKJebWly|t5_QZ0Xa
zO92>T&X`lSIc2lSoU;A@wFd{ea>4)r#a>3e|CQZJ6_5<@OZV8_p`C7NL5I-<P0$z3
zjM2)_YIJ3!Yh(2K*{46WlNO_mCc1+*(qyC!9i$l@r2n9WXd$gMx<F?Vdj0HEn(3g@
z6=@^wXr`HF+GwSPcC^qJn$b6%3_5?I3x-|~e9|3hLr)l^D_Uu#jnafBV`w5R^bhn+
zI?=UJ>Ge+^9ng*z+Mt7UpbhOtp^YY*jWp2=O|(EiqlHSkV01yRXFhGT&@-B7p^d)i
zFEuowophklgwbNOLKB?~bf!OaLiBp#(`Iyw4w`AA9WAtzb|X5_Obc3Qf__Id`lit(
zx;A<}^J#;2w9rP{(L^(CsI=1^jSjjeEwqwW=!?$ihK63x{OXDhx}^!-(j}F4Ds5;+
tKhTL5dQ4~1D7~Kf^cRy5R2&!e*l&Q&3sk1N&i?=a002ovPDHLkV1krVi9`SZ

diff --git a/test/object.test.js b/test/object.test.js
index 25bb3ac90..899c04152 100644
--- a/test/object.test.js
+++ b/test/object.test.js
@@ -13,6 +13,7 @@ var stsConfig = require('./config').sts;
 var urllib = require('urllib');
 var copy = require('copy-to');
 var mm = require('mm');
+const streamEqual = require('stream-equal');
 
 var tmpdir = path.join(__dirname, '.tmp');
 if (!fs.existsSync(tmpdir)) {
@@ -914,6 +915,25 @@ describe('test/object.test.js', function () {
       assert.equal(fs.readFileSync(tmpfile, 'utf8'), fs.readFileSync(__filename, 'utf8'));
     });
 
+    it('should get image stream with image process', function* () {
+      var name = prefix + 'ali-sdk/oss/nodejs-test-getstream-image-1024x768.png';
+      var originImagePath = path.join(__dirname, 'nodejs-1024x768.png');
+      var processedImagePath = path.join(__dirname, 'nodejs-processed-w200.png');
+      var object = yield this.store.put(name, originImagePath, {
+        mime: 'image/png'
+      });
+
+      var result = yield this.store.getStream(name, {process: 'image/resize,w_200'});
+      assert.equal(result.res.status, 200);
+      var isEqual = yield streamEqual(result.stream, fs.createReadStream(processedImagePath));
+      assert(isEqual);
+      result = yield this.store.getStream(name,
+        {process: 'image/resize,w_200', subres: {'x-oss-process': 'image/resize,w_100'}});
+      assert.equal(result.res.status, 200);
+      isEqual = yield streamEqual(result.stream, fs.createReadStream(processedImagePath));
+      assert(isEqual);
+    });
+
     it('should throw error when object not exists', function* () {
       try {
         yield this.store.getStream(this.name + 'not-exists');