@adobe/helix-google-support 1.5.10 → 2.0.2

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [2.0.2](https://github.com/adobe/helix-google-support/compare/v2.0.1...v2.0.2) (2022-08-22)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-onedrive-support to v8.2.6 ([#65](https://github.com/adobe/helix-google-support/issues/65)) ([b0411d4](https://github.com/adobe/helix-google-support/commit/b0411d45f8a1c289ec3c1dcda4a2f60e060aa35c))
+
+## [2.0.1](https://github.com/adobe/helix-google-support/compare/v2.0.0...v2.0.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* **deps:** update dependency googleapis to v107 ([#64](https://github.com/adobe/helix-google-support/issues/64)) ([5c0b0bc](https://github.com/adobe/helix-google-support/commit/5c0b0bccd99be2f48950558d3eaf5d7f418ef81e))
+
+# [2.0.0](https://github.com/adobe/helix-google-support/compare/v1.5.10...v2.0.0) (2022-08-22)
+
+
+### Bug Fixes
+
+* getFile() should return Buffer ([bd50867](https://github.com/adobe/helix-google-support/commit/bd50867e9b19aaa4d609203d876e39af57f2868d))
+
+
+### BREAKING CHANGES
+
+* getFile and getFileFromPath now return a Buffer
+
 ## [1.5.10](https://github.com/adobe/helix-google-support/compare/v1.5.9...v1.5.10) (2022-08-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "1.5.10",
+  "version": "2.0.2",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -30,16 +30,16 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "dependencies": {
-    "@adobe/helix-onedrive-support": "8.2.5",
-    "googleapis": "105.0.0",
-    "lru-cache": "7.13.2"
+    "@adobe/helix-onedrive-support": "8.2.6",
+    "googleapis": "107.0.0",
+    "lru-cache": "7.14.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "c8": "7.12.0",
-    "eslint": "8.21.0",
+    "eslint": "8.22.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "husky": "8.0.1",
@@ -48,7 +48,7 @@
     "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.9",
-    "semantic-release": "19.0.3"
+    "semantic-release": "19.0.4"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/GoogleClient.d.ts

@@ -9,6 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { Buffer } from 'node:buffer';
+
 declare interface ICachePlugin {}
 
 declare interface DriveItemInfo {}
@@ -121,9 +123,9 @@ declare class GoogleClient {
   /**
    * Returns an (uncached) file directly via the google api
    * @param {string} fileId
-   * @returns {Promise<string>} file data
+   * @returns {Promise<Buffer>} file data
    */
-  getFile(fileId:string):Promise<string>;
+  getFile(fileId:string):Promise<Buffer>;
 
   /**
    * Fetches the file data from the give path. If the file with the internal id could not be
@@ -133,9 +135,9 @@ declare class GoogleClient {
    * @param {string} path
    * @param {boolean} noRetry {@code true} to avoid retry
    * @param {string} [type] optional file mimetype filter.
-   * @returns {Promise<string>|null} The data of the file or {@code null} if the file does not exist
+   * @returns {Promise<Buffer>|null} The data of the file or {@code null} if the file does not exist
    */
-  getFileFromPath(parentId:string, path:string, noRetry:boolean, type?:string):Promise<string>;
+  getFileFromPath(parentId:string, path:string, noRetry:boolean, type?:string):Promise<Buffer>;
 
   /**
    * Returns an (uncached) document directly via the google docs api

package/src/GoogleClient.js

@@ -443,19 +443,23 @@ export class GoogleClient {
   /**
    * Returns an (uncached) file directly via the google api
    * @param {string} fileId
-   * @returns {Promise<string>} file data
+   * @returns {Promise<Buffer>} file data
    */
   async getFile(fileId) {
     try {
       const res = await this.drive.files.get({
         fileId,
         alt: 'media',
-      });
-      return res.data;
+      }, { responseType: 'arraybuffer' });
+      return Buffer.from(res.data);
     } catch (e) {
       if (e.response && e.response.status === 404) {
         throw new StatusCodeError(`Not Found: ${fileId}`, 404);
       }
+      // convert message to string
+      if (e.message instanceof ArrayBuffer) {
+        e.message = Buffer.from(e.message).toString('utf-8');
+      }
       throw e;
     }
   }
@@ -468,7 +472,7 @@ export class GoogleClient {
    * @param {string} path
    * @param {boolean} noRetry {@code true} to avoid retry
    * @param {string} [type] optional file mimetype
-   * @returns {Promise<string>|null} The data of the file or {@code null} if the file does not exist
+   * @returns {Promise<Buffer>|null} The data of the file or {@code null} if the file does not exist
    */
   async getFileFromPath(parentId, path, noRetry, type) {
     const item = await this.getItemFromPath(parentId, path, type);