@adobe/helix-google-support 1.3.0 → 1.3.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.3.3](https://github.com/adobe/helix-google-support/compare/v1.3.2...v1.3.3) (2022-05-03)
+
+
+### Bug Fixes
+
+* more fixes ([#17](https://github.com/adobe/helix-google-support/issues/17)) ([87b3ea8](https://github.com/adobe/helix-google-support/commit/87b3ea8a4621a8773d072d20be33e2b5d4ce2e54))
+
+## [1.3.2](https://github.com/adobe/helix-google-support/compare/v1.3.1...v1.3.2) (2022-04-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency lru-cache to v7.9.0 ([de4e8e3](https://github.com/adobe/helix-google-support/commit/de4e8e3918a04dbb646c33946791168f434b872d))
+
+## [1.3.1](https://github.com/adobe/helix-google-support/compare/v1.3.0...v1.3.1) (2022-04-28)
+
+
+### Bug Fixes
+
+* more fixes ([#14](https://github.com/adobe/helix-google-support/issues/14)) ([f52b01d](https://github.com/adobe/helix-google-support/commit/f52b01d575fb17602ea57b35f0e4c93dbbd41dd1))
+
 # [1.3.0](https://github.com/adobe/helix-google-support/compare/v1.2.2...v1.3.0) (2022-04-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-google-support",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "Helix Google Support",
   "main": "src/index.js",
   "type": "module",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@adobe/helix-onedrive-support": "https://github.com/adobe/helix-onedrive-support.git#d279dda0abdc05df14628d45a7c716042d94ec45",
     "googleapis": "100.0.0",
-    "lru-cache": "7.8.1"
+    "lru-cache": "7.9.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
@@ -47,8 +47,8 @@
     "eslint-plugin-import": "2.26.0",
     "husky": "7.0.4",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.4.0",
-    "mocha": "9.2.2",
+    "lint-staged": "12.4.1",
+    "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.4",
     "semantic-release": "19.0.2"

package/src/GoogleClient.js

@@ -25,19 +25,25 @@ let lru = new LRU({ max: 1000, ttl: 60000 });
  * @property {string} name
  * @property {string} url
  * @property {string} path
+ * @property {string} mimeType
+ * @property {number} lastModified
  */
 
 /**
- * Adds the last modified property if defined in item
+ * Adds the last modified property and mimeType if defined in item
  * @param {DriveItemInfo} itemInfo
  * @param item
  * @returns {DriveItemInfo}
  */
-function addLastModified(itemInfo, item) {
+function addFields(itemInfo, item) {
   if (item.modifiedTime) {
     // eslint-disable-next-line no-param-reassign
     itemInfo.lastModified = Date.parse(item.modifiedTime);
   }
+  if (item.mimeType) {
+    // eslint-disable-next-line no-param-reassign
+    itemInfo.mimeType = item.mimeType;
+  }
   return itemInfo;
 }
 
@@ -232,11 +238,10 @@ export class GoogleClient {
     if (!children) {
       return null;
     }
-    const pathItem = addLastModified({
+    const pathItem = addFields({
       name,
       path: itemPath,
       id: item.id,
-      mimeType: item.mimeType,
     }, item);
 
     if (children.length) {
@@ -320,7 +325,7 @@ export class GoogleClient {
     const root = roots[fileId];
     if (root) {
       // stop at mount root
-      return [addLastModified({
+      return [addFields({
         id: fileId,
         name: '',
         path: root,
@@ -330,7 +335,7 @@ export class GoogleClient {
     const parentId = data.parents ? data.parents[0] : '';
     if (!parentId) {
       // outside mountpoint
-      return [addLastModified({
+      return [addFields({
         id: fileId,
         name: data.name,
         path: `/root:/${data.name}`,
@@ -339,7 +344,7 @@ export class GoogleClient {
 
     const ancestors = await this.getItems(data.parents[0], roots);
     const parentPath = ancestors[0].path.replace(/\/+$/, '');
-    ancestors.unshift(addLastModified({
+    ancestors.unshift(addFields({
       id: fileId,
       name: data.name,
       path: `${parentPath}/${data.name}`,
@@ -370,27 +375,38 @@ export class GoogleClient {
    * Returns the (cached) item for the given path or {@code null} if the item cannot be found.
    * The item will contains a `invalidate()` method which can be used to remove it from the cache.
    *
-   * @param {string} parentId
-   * @param {string} path
+   * @param {string} parentId the parent id or the id of the item itself, if the path is missing
+   * @param {string} [path]
    * @returns {Promise<DriveItemInfo>}
    */
   async getItemFromPath(parentId, path) {
     if (!path) {
       try {
-        const { data } = (await this.drive.files.get({
-          fileId: parentId,
-          fields: [
-            'name',
-            'parents',
-            'mimeType',
-            'modifiedTime',
-          ].join(','),
-        }));
-
-        return addLastModified({
-          id: parentId,
-          path: `/${data.name}`,
-        }, data);
+        let item = lru.get(parentId);
+        if (!item) {
+          const { data } = (await this.drive.files.get({
+            fileId: parentId,
+            fields: [
+              'name',
+              'parents',
+              'mimeType',
+              'modifiedTime',
+            ].join(','),
+          }));
+          item = addFields({
+            id: parentId,
+            path: `/${data.name}`,
+          }, data);
+          // todo: extend caching to all items ?
+          Object.defineProperty(item, 'invalidate', {
+            enumerable: false,
+            value() {
+              lru.delete(parentId);
+            },
+          });
+          lru.set(parentId, item);
+        }
+        return item;
       } catch (e) {
         if (e.response && e.response.status === 404) {
           return null;