@adobe/helix-google-support 3.3.1 → 3.3.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.3.2](https://github.com/adobe/helix-google-support/compare/v3.3.1...v3.3.2) (2025-06-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency googleapis-common to v8 ([#492](https://github.com/adobe/helix-google-support/issues/492)) ([75c0148](https://github.com/adobe/helix-google-support/commit/75c01485a9fa8593015fb2f85d583a855ee5e281))
+
 ## [3.3.1](https://github.com/adobe/helix-google-support/compare/v3.3.0...v3.3.1) (2025-06-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -35,14 +35,14 @@
   },
   "dependencies": {
     "@adobe/helix-shared-string": "^2.1.0",
-    "googleapis": "149.0.0",
-    "googleapis-common": "7.2.0",
+    "googleapis": "150.0.1",
+    "googleapis-common": "8.0.0",
     "lru-cache": "^11.0.2"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.3",
+    "@adobe/eslint-config-helix": "3.0.4",
     "@adobe/helix-shared-tokencache": "1.5.0",
-    "@eslint/config-helpers": "0.2.2",
+    "@eslint/config-helpers": "0.2.3",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.3",
@@ -51,7 +51,7 @@
     "eslint-plugin-import": "2.31.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "16.1.0",
+    "lint-staged": "16.1.2",
     "mocha": "11.6.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",

package/src/GoogleClient.js

@@ -64,6 +64,20 @@ function getCacheKey(parentId, pathSegments, type = 'file') {
   return `${parentId}:${pathSegments.join('/')}:${type}`;
 }
 
+/**
+ * Replaces a generic error message `Request failed with status code ...` with
+ * a more descriptive one found in the response itself.
+ *
+ * @param {Error} e error
+ * @returns processed error
+ */
+function processError(e) {
+  if (/^Request failed with status code /.test(e.message) && e.response?.data?.error?.message) {
+    e.message = e.response.data.error.message;
+  }
+  return e;
+}
+
 /**
  * Google auth client
  */
@@ -393,12 +407,13 @@ export class GoogleClient {
     try {
       return await this.getItems(fileId, roots);
     } catch (e) {
-      if (e.response && e.response.status === 404) {
+      const err = processError(e);
+      if (err.response && err.response.status === 404) {
         log.info(`unable to get items for ${fileId}. Not found`);
         return [];
       }
-      log.warn(`unable to get items for ${fileId}. ${e}`);
-      throw e;
+      log.warn(`unable to get items for ${fileId}. ${err}`);
+      throw err;
     }
   }
 
@@ -463,10 +478,11 @@ export class GoogleClient {
         path: `/${data.name}`,
       }, data);
     } catch (e) {
-      if (e.response && e.response.status === 404) {
+      const err = processError(e);
+      if (err.response && err.response.status === 404) {
         return null;
       }
-      throw e;
+      throw err;
     }
   }
 
@@ -484,15 +500,16 @@ export class GoogleClient {
       }, { ...(this.googleApiOpts || {}), responseType: 'arraybuffer' });
       return Buffer.from(res.data);
     } catch (e) {
-      if (e.response && e.response.status === 404) {
+      const err = processError(e);
+      if (err.response && err.response.status === 404) {
         throw new StatusCodeError(`Not Found: ${fileId}`, 404);
       }
       // convert message to string
       /* c8 ignore next 3 */
-      if (e.message instanceof ArrayBuffer) {
-        e.message = Buffer.from(e.message).toString('utf-8');
+      if (err.message instanceof ArrayBuffer) {
+        err.message = Buffer.from(err.message).toString('utf-8');
       }
-      throw e;
+      throw err;
     }
   }
 
@@ -516,6 +533,7 @@ export class GoogleClient {
       return await this.getFile(item.id);
     } catch (e) {
       if (e.statusCode === 404) {
+        // this is a StatusCodeError we threw ourselves in `getFile`
         if (noRetry) {
           return null;
         }
@@ -542,10 +560,11 @@ export class GoogleClient {
       const res = await docs.documents.get({ documentId });
       return res.data;
     } catch (e) {
-      if (e.response && e.response.status === 404) {
+      const err = processError(e);
+      if (err.response && err.response.status === 404) {
         throw new StatusCodeError(`Not Found: ${documentId}`, 404);
       }
-      throw e;
+      throw err;
     }
   }
 
@@ -568,6 +587,7 @@ export class GoogleClient {
       return await this.getDocument(item.id);
     } catch (e) {
       if (e.statusCode === 404) {
+        // this is a StatusCodeError we threw ourselves in `getDocument`
         if (noRetry) {
           return null;
         }
@@ -611,7 +631,7 @@ export class GoogleClient {
       return response.data;
     } catch (e) {
       this.log.info(`Error creating file ${name}`);
-      throw e;
+      throw processError(e);
     }
   }
 
@@ -682,9 +702,9 @@ export class GoogleClient {
         });
       }
       return sheetId;
-    } catch (error) {
-      this.log.info(`Error in updating sheet: ${error.message}`);
-      throw error;
+    } catch (e) {
+      this.log.info(`Error in updating sheet: ${e.message}`);
+      throw processError(e);
     }
   }
 
@@ -721,9 +741,9 @@ export class GoogleClient {
           ],
         },
       });
-    } catch (error) {
-      this.log.info(`Error deleting sheet from spreadsheet: ${error.message}`);
-      throw error;
+    } catch (e) {
+      this.log.info(`Error deleting sheet from spreadsheet: ${e.message}`);
+      throw processError(e);
     }
   }
 }