@pipedream/google_drive 0.5.0 → 0.6.1

package/actions/add-file-sharing-preference/add-file-sharing-preference.mjs

@@ -11,7 +11,7 @@ export default {
   name: "Add File Sharing Preference",
   description:
     "Add a [sharing](https://support.google.com/drive/answer/7166529) permission to the sharing preferences of a file and provide a sharing URL. [See the docs](https://developers.google.com/drive/api/v3/reference/permissions/create) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/copy-file/copy-file.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-copy-file",
   name: "Copy File",
   description: "Create a copy of the specified file. [See the docs](https://developers.google.com/drive/api/v3/reference/files/copy) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/create-file/create-file.mjs

@@ -7,7 +7,7 @@ export default {
   key: "google_drive-create-file",
   name: "Create a New File",
   description: "Create a new file from a URL or /tmp/filepath. [See the docs](https://developers.google.com/drive/api/v3/reference/files/create) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/create-file-from-template/create-file-from-template.mjs

@@ -8,7 +8,7 @@ export default {
   key: "google_drive-create-file-from-template",
   name: "Create New File From Template",
   description: "Create a new Google Docs file from a template. Optionally include placeholders in the template document that will get replaced from this action. [See documentation](https://www.npmjs.com/package/google-docs-mustaches)",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/create-file-from-text/create-file-from-text.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-create-file-from-text",
   name: "Create New File From Text",
   description: "Create a new file from plain text. [See the docs](https://developers.google.com/drive/api/v3/reference/files/create) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/create-folder/create-folder.mjs

@@ -13,7 +13,7 @@ export default {
   key: "google_drive-create-folder",
   name: "Create Folder",
   description: "Create a new empty folder. [See the docs](https://developers.google.com/drive/api/v3/reference/files/create) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/create-shared-drive/create-shared-drive.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-create-shared-drive",
   name: "Create Shared Drive",
   description: "Create a new shared drive. [See the docs](https://developers.google.com/drive/api/v3/reference/drives/create) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/delete-file/delete-file.mjs

@@ -5,7 +5,7 @@ export default {
   name: "Delete File",
   description:
     "Permanently delete a file or folder without moving it to the trash. [See the docs](https://developers.google.com/drive/api/v3/reference/files/delete) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/delete-shared-drive/delete-shared-drive.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-delete-shared-drive",
   name: "Delete Shared Drive",
   description: "Delete a shared drive without any content. [See the docs](https://developers.google.com/drive/api/v3/reference/drives/delete) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/download-file/download-file.mjs

@@ -18,7 +18,7 @@ export default {
   key: "google_drive-download-file",
   name: "Download File",
   description: "Download a file. [See the docs](https://developers.google.com/drive/api/v3/manage-downloads) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/find-file/find-file.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-find-file",
   name: "Find File",
   description: "Search for a specific file by name. [See the docs](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/find-folder/find-folder.mjs

@@ -7,7 +7,7 @@ export default {
   key: "google_drive-find-folder",
   name: "Find Folder",
   description: "Search for a specific folder by name. [See the docs](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/find-forms/find-forms.mjs

@@ -0,0 +1,54 @@
+import googleDrive from "../../google_drive.app.mjs";
+import { getListFilesOpts } from "../../common/utils.mjs";
+
+export default {
+  key: "google_drive-find-forms",
+  name: "Find Forms",
+  description: "List Google Form documents or search for a Form by name. [See the docs](https://developers.google.com/drive/api/v3/search-files) for more information",
+  version: "0.0.2",
+  type: "action",
+  props: {
+    googleDrive,
+    drive: {
+      propDefinition: [
+        googleDrive,
+        "watchedDrive",
+      ],
+      optional: true,
+    },
+    folderId: {
+      propDefinition: [
+        googleDrive,
+        "folderId",
+        (c) => ({
+          drive: c.drive,
+        }),
+      ],
+      label: "Parent Folder",
+      description: "The ID of the parent folder which contains the file. If not specified, it will list files from the drive's top-level folder.",
+      optional: true,
+    },
+    nameSearchTerm: {
+      propDefinition: [
+        googleDrive,
+        "fileNameSearchTerm",
+      ],
+      optional: true,
+    },
+  },
+  async run({ $ }) {
+    let q = "mimeType = 'application/vnd.google-apps.form'";
+    if (this.nameSearchTerm) {
+      q = `${q} and name contains '${this.nameSearchTerm}'`;
+    }
+    if (this.folderId) {
+      q = `${q} and "${this.folderId}" in parents`;
+    }
+    const opts = getListFilesOpts(this.drive, {
+      q: q.trim(),
+    });
+    const files = (await this.googleDrive.listFilesInPage(null, opts)).files;
+    $.export("$summary", `Successfully found ${files.length} form(s)`);
+    return files;
+  },
+};

package/actions/find-spreadsheets/find-spreadsheets.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-find-spreadsheets",
   name: "Find Spreadsheets",
   description: "Search for a specific spreadsheet by name. [See the docs](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/get-folder-id-for-path/get-folder-id-for-path.mjs

@@ -12,7 +12,7 @@ export default {
   key: "google_drive-get-folder-id-for-path",
   name: "Get Folder ID for a Path",
   description: "Retrieve a folderId for a path. [See the docs](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/get-shared-drive/get-shared-drive.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-get-shared-drive",
   name: "Get Shared Drive",
   description: "Get a shared drive's metadata by ID. [See the docs](https://developers.google.com/drive/api/v3/reference/drives/get) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/list-files/list-files.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-list-files",
   name: "List Files",
   description: "List files from a specific folder. [See the docs](https://developers.google.com/drive/api/v3/reference/files/list) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/move-file/move-file.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-move-file",
   name: "Move File",
   description: "Move a file from one folder to another. [See the docs](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/move-file-to-trash/move-file-to-trash.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-move-file-to-trash",
   name: "Move File to Trash",
   description: "Move a file or folder to trash. [See the docs](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/replace-file/replace-file.mjs

@@ -15,7 +15,7 @@ export default {
   key: "google_drive-replace-file",
   name: "Replace File",
   description: "Upload a file that replaces an existing file. [See the docs](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/search-shared-drives/search-shared-drives.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-search-shared-drives",
   name: "Search for Shared Drives",
   description: "Search for shared drives with query options. [See the docs](https://developers.google.com/drive/api/v3/search-shareddrives) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/update-file/update-file.mjs

@@ -8,7 +8,7 @@ export default {
   key: "google_drive-update-file",
   name: "Update File",
   description: "Update a file's metadata and/or content. [See the docs](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/update-shared-drive/update-shared-drive.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-update-shared-drive",
   name: "Update Shared Drive",
   description: "Update an existing shared drive. [See the docs](https://developers.google.com/drive/api/v3/reference/drives/update) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/actions/upload-file/upload-file.mjs

@@ -10,7 +10,7 @@ export default {
   key: "google_drive-upload-file",
   name: "Upload File",
   description: "Copy an existing file to Google Drive. [See the docs](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "action",
   props: {
     googleDrive,

package/google_drive.app.mjs

@@ -442,7 +442,7 @@ export default {
           pageToken,
         );
 
-        for (const drive in drives) {
+        for (const drive of drives) {
           yield drive;
         }
 
@@ -626,6 +626,7 @@ export default {
      * @type {Comment}
      */
     async *listComments(fileId, startModifiedTime = null) {
+      let data;
       const drive = this.drive();
       const opts = {
         fileId,
@@ -633,12 +634,17 @@ export default {
         pageSize: 100,
       };
 
-      if (startModifiedTime !== null) {
+      if (startModifiedTime !== null && startModifiedTime !== undefined) {
         opts.startModifiedTime = new Date(startModifiedTime).toISOString();
       }
 
       while (true) {
-        const { data } = await drive.comments.list(opts);
+        try {
+          ({ data } = await drive.comments.list(opts));
+        } catch (error) {
+          console.log("listComments error!!", error);
+          break;
+        }
         const {
           comments = [],
           nextPageToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [

package/sources/changes-to-specific-files/changes-to-specific-files.mjs

@@ -16,7 +16,7 @@ export default {
   key: "google_drive-changes-to-specific-files",
   name: "Changes to Specific Files",
   description: "Watches for changes to specific files, emitting an event any time a change is made to one of those files. To watch for changes to [shared drive](https://support.google.com/a/users/answer/9310351) files, use the **Changes to Specific Files (Shared Drive)** source instead.",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests

package/sources/changes-to-specific-files-shared-drive/changes-to-specific-files-shared-drive.mjs

@@ -25,7 +25,7 @@ export default {
   key: "google_drive-changes-to-specific-files-shared-drive",
   name: "Changes to Specific Files (Shared Drive)",
   description: "Watches for changes to specific files in a shared drive, emitting an event any time a change is made to one of those files",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
@@ -40,20 +40,27 @@ export default {
       default: [],
       options({ prevContext }) {
         const { nextPageToken } = prevContext;
-        const baseOpts = {};
-        const opts = this.isMyDrive()
-          ? baseOpts
-          : {
-            ...baseOpts,
-            corpora: "drive",
-            driveId: this.getDriveId(),
-            includeItemsFromAllDrives: true,
-            supportsAllDrives: true,
-          };
-        return this.googleDrive.listFilesOptions(nextPageToken, opts);
+        return this.googleDrive.listFilesOptions(nextPageToken, this.getFilesOpts());
       },
     },
   },
+  hooks: {
+    async deploy() {
+      const daysAgo = new Date();
+      daysAgo.setDate(daysAgo.getDate() - 30);
+      const timeString = daysAgo.toISOString();
+
+      const args = this.getFilesOpts({
+        q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
+        fields: "files",
+      });
+
+      const { data } = await this.googleDrive.drive().files.list(args);
+
+      this.processChanges(data.files);
+    },
+    ...common.hooks,
+  },
   methods: {
     ...common.methods,
     getUpdateTypes() {
@@ -69,35 +76,48 @@ export default {
         name: fileName,
         modifiedTime: tsString,
       } = data;
-      const {
-        "x-goog-message-number": eventId,
-        "x-goog-resource-state": resourceState,
-      } = headers;
+      const ts = Date.parse(tsString);
+      const eventId = headers && headers["x-goog-message-number"];
+      const resourceState = headers && headers["x-goog-resource-state"];
+
+      const summary = resourceState
+        ? `${resourceState.toUpperCase()} - ${fileName || "Untitled"}`
+        : fileName || "Untitled";
 
       return {
-        id: `${fileId}-${eventId}`,
-        summary: `${resourceState.toUpperCase()} - ${
-          fileName || "Untitled"
-        }`,
-        ts: Date.parse(tsString),
+        id: `${fileId}-${eventId || ts}`,
+        summary,
+        ts,
       };
     },
     isFileRelevant(file) {
       return this.files.includes(file.id);
     },
-    async processChange(file, headers) {
-      const eventToEmit = {
-        file,
+    getChanges(headers) {
+      if (!headers) {
+        return;
+      }
+      return {
         change: {
           state: headers["x-goog-resource-state"],
           resourceURI: headers["x-goog-resource-uri"],
           changed: headers["x-goog-changed"], // "Additional details about the changes. Possible values: content, parents, children, permissions"
         },
       };
+    },
+    processChange(file, headers) {
+      const changes = this.getChanges(headers);
+      const eventToEmit = {
+        file,
+        ...changes,
+      };
       const meta = this.generateMeta(file, headers);
       this.$emit(eventToEmit, meta);
     },
-    async processChanges(changedFiles, headers) {
+    processChanges(changedFiles, headers) {
+      console.log(`Processing ${changedFiles.length} changed files`);
+      console.log(`Changed files: ${JSON.stringify(changedFiles, null, 2)}!!!`);
+      console.log(`Files: ${this.files}!!!`);
       for (const file of changedFiles) {
         if (!this.isFileRelevant(file)) {
           console.log(`Skipping event for irrelevant file ${file.id}`);

package/sources/common-webhook.mjs

@@ -96,6 +96,21 @@ export default {
     getDriveId(drive = this.drive) {
       return googleDrive.methods.getDriveId(drive);
     },
+    getFilesOpts(args = {}) {
+      const opts = {
+        q: "mimeType != 'application/vnd.google-apps.folder' and trashed = false",
+        ...args,
+      };
+      return this.isMyDrive()
+        ? opts
+        : {
+          ...opts,
+          corpora: "drive",
+          driveId: this.getDriveId(),
+          includeItemsFromAllDrives: true,
+          supportsAllDrives: true,
+        };
+    },
     /**
      * This method returns the types of updates/events from Google Drive that
      * the event source should listen to. This base implementation returns an

package/sources/new-files-instant/new-files-instant.mjs

@@ -9,7 +9,7 @@ export default {
   key: "google_drive-new-files-instant",
   name: "New Files (Instant)",
   description: "Emit new event any time a new file is added in your linked Google Drive",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   dedupe: "unique",
   props: {
@@ -24,7 +24,7 @@ export default {
       options({ prevContext }) {
         const { nextPageToken } = prevContext;
         const baseOpts = {
-          q: "mimeType = 'application/vnd.google-apps.folder'",
+          q: "mimeType = 'application/vnd.google-apps.folder' and trashed = false",
         };
         const opts = this.isMyDrive()
           ? baseOpts
@@ -40,6 +40,18 @@ export default {
     },
   },
   hooks: {
+    async deploy() {
+      const daysAgo = new Date();
+      daysAgo.setDate(daysAgo.getDate() - 30);
+      const timeString = daysAgo.toISOString();
+
+      const { data } = await this.googleDrive.drive().files.list({
+        q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
+        fields: "files(id)",
+      });
+
+      await this.processChanges(data.files);
+    },
     ...common.hooks,
     async activate() {
       await common.hooks.activate.bind(this)();

package/sources/new-or-modified-comments/new-or-modified-comments.mjs

@@ -17,13 +17,27 @@ export default {
   name: "New or Modified Comments",
   description:
     "Emits a new event any time a file comment is added, modified, or deleted in your linked Google Drive",
-  version: "0.1.0",
+  // version: "0.1.1",
+  version: "0.1.3",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
   dedupe: "unique",
   hooks: {
-    ...common.hooks,
+    async deploy() {
+      const daysAgo = new Date();
+      daysAgo.setDate(daysAgo.getDate() - 30);
+      const timeString = daysAgo.toISOString();
+
+      const args = this.getFilesOpts({
+        q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
+        fields: "files",
+      });
+
+      const { data } = await this.googleDrive.drive().files.list(args);
+
+      await this.processChanges(data.files);
+    },
     async activate() {
       await common.hooks.activate.bind(this)();
       this._setInitTime(Date.now());
@@ -58,14 +72,32 @@ export default {
         content: summary,
         modifiedTime: tsString,
       } = data;
-      const { "x-goog-message-number": eventId } = headers;
+      const ts = Date.parse(tsString);
+      const eventId = headers && headers["x-goog-message-number"];
+
       return {
-        id: `${commentId}-${eventId}`,
+        id: `${commentId}-${eventId || ts}`,
         summary,
-        ts: Date.parse(tsString),
+        ts,
+      };
+    },
+    getChanges(headers) {
+      if (!headers) {
+        return;
+      }
+      return {
+        change: {
+          state: headers["x-goog-resource-state"],
+          resourceURI: headers["x-goog-resource-uri"],
+          // Additional details about the changes. Possible values: content,
+          // parents, children, permissions.
+          changed: headers["x-goog-changed"],
+        },
       };
     },
     async processChanges(changedFiles, headers) {
+      const changes = this.getChanges(headers);
+
       for (const file of changedFiles) {
         const lastCommentTimeForFile = this._getLastCommentTimeForFile(file.id);
         let maxModifiedTime = lastCommentTimeForFile;
@@ -83,14 +115,7 @@ export default {
           const eventToEmit = {
             comment,
             file,
-            change: {
-              state: headers["x-goog-resource-state"],
-              resourceURI: headers["x-goog-resource-uri"],
-
-              // Additional details about the changes. Possible values: content,
-              // parents, children, permissions.
-              changed: headers["x-goog-changed"],
-            },
+            ...changes,
           };
           const meta = this.generateMeta(comment, headers);
           this.$emit(eventToEmit, meta);

package/sources/new-or-modified-files/new-or-modified-files.mjs

@@ -20,11 +20,26 @@ export default {
   key: "google_drive-new-or-modified-files",
   name: "New or Modified Files",
   description: "Emit new event any time any file in your linked Google Drive is added, modified, or deleted",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
   dedupe: "unique",
+  hooks: {
+    async deploy() {
+      const daysAgo = new Date();
+      daysAgo.setDate(daysAgo.getDate() - 30);
+      const timeString = daysAgo.toISOString();
+
+      const { data } = await this.googleDrive.drive().files.list({
+        q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
+        fields: "files",
+      });
+
+      await this.processChanges(data.files);
+    },
+    ...common.hooks,
+  },
   methods: {
     ...common.methods,
     getUpdateTypes() {
@@ -40,25 +55,37 @@ export default {
         name: summary,
         modifiedTime: tsString,
       } = data;
-      const { "x-goog-message-number": eventId } = headers;
+      const ts = Date.parse(tsString);
+      const eventId = headers && headers["x-goog-message-number"];
+
       return {
-        id: `${fileId}-${eventId}`,
+        id: `${fileId}-${eventId || ts}`,
         summary,
-        ts: Date.parse(tsString),
+        ts,
+      };
+    },
+    async getChanges(headers) {
+      if (!headers) {
+        return;
+      }
+      const resourceUri = headers["x-goog-resource-uri"];
+      const metadata = await this.googleDrive.getFileMetadata(`${resourceUri}&fields=*`);
+      return {
+        ...metadata,
+        change: {
+          state: headers["x-goog-resource-state"],
+          resourceURI: headers["x-goog-resource-uri"],
+          changed: headers["x-goog-changed"], // "Additional details about the changes. Possible values: content, parents, children, permissions"
+        },
       };
     },
     async processChanges(changedFiles, headers) {
-      for (const file of changedFiles) {
-        const metadata = await this.googleDrive.getFileMetadata(`${headers["x-goog-resource-uri"]}&fields=*`);
+      const changes = await this.getChanges(headers);
 
+      for (const file of changedFiles) {
         const eventToEmit = {
           file,
-          ...metadata,
-          change: {
-            state: headers["x-goog-resource-state"],
-            resourceURI: headers["x-goog-resource-uri"],
-            changed: headers["x-goog-changed"], // "Additional details about the changes. Possible values: content, parents, children, permissions"
-          },
+          ...changes,
         };
         const meta = this.generateMeta(file, headers);
         this.$emit(eventToEmit, meta);

package/sources/new-or-modified-folders/new-or-modified-folders.mjs

@@ -20,11 +20,26 @@ export default {
   key: "google_drive-new-or-modified-folders",
   name: "New or Modified Folders",
   description: "Emit new event any time any folder in your linked Google Drive is added, modified, or deleted",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
   dedupe: "unique",
+  hooks: {
+    async deploy() {
+      const daysAgo = new Date();
+      daysAgo.setDate(daysAgo.getDate() - 30);
+      const timeString = daysAgo.toISOString();
+
+      const { data } = await this.googleDrive.drive().files.list({
+        q: `mimeType = "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
+        fields: "files(id, mimeType)",
+      });
+
+      await this.processChanges(data.files);
+    },
+    ...common.hooks,
+  },
   methods: {
     ...common.methods,
     _getLastModifiedTimeForFile(fileId) {
@@ -51,6 +66,21 @@ export default {
         ts,
       };
     },
+    async getChanges(headers) {
+      if (!headers) {
+        return;
+      }
+      const resourceUri = headers["x-goog-resource-uri"];
+      const metadata = await this.googleDrive.getFileMetadata(`${resourceUri}&fields=*`);
+      return {
+        ...metadata,
+        change: {
+          state: headers["x-goog-resource-state"],
+          resourceURI: headers["x-goog-resource-uri"],
+          changed: headers["x-goog-changed"], // "Additional details about the changes. Possible values: content, parents, children, permissions"
+        },
+      };
+    },
     async processChanges(changedFiles, headers) {
       const files = changedFiles.filter(
         // API docs that define Google Drive folders:
@@ -67,18 +97,14 @@ export default {
         const modifiedTime = Date.parse(fileInfo.modifiedTime);
         if (lastModifiedTimeForFile == modifiedTime) continue;
 
-        const metadata = await this.googleDrive.getFileMetadata(`${headers["x-goog-resource-uri"]}&fields=*`);
+        const changes = await this.getChanges(headers);
 
         const eventToEmit = {
-          file,
-          ...metadata,
-          change: {
-            state: headers["x-goog-resource-state"],
-            resourceURI: headers["x-goog-resource-uri"],
-            changed: headers["x-goog-changed"], // "Additional details about the changes. Possible values: content, parents, children, permissions"
-          },
+          file: fileInfo,
+          ...changes,
         };
-        const meta = this.generateMeta(file, modifiedTime);
+        const meta = this.generateMeta(fileInfo, modifiedTime);
+
         this.$emit(eventToEmit, meta);
 
         this._setModifiedTimeForFile(file.id, modifiedTime);

package/sources/new-shared-drive/new-shared-drive.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-new-shared-drive",
   name: "New Shared Drive",
   description: "Emits a new event any time a shared drive is created.",
-  version: "0.1.0",
+  version: "0.1.1",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/new-spreadsheet/new-spreadsheet.mjs

@@ -6,7 +6,7 @@ export default {
   type: "source",
   name: "New Spreadsheet (Instant)",
   description: "Emit new event each time a new spreadsheet is created in a drive.",
-  version: "0.1.0",
+  version: "0.1.1",
   props: {
     googleDrive: newFilesInstant.props.googleDrive,
     db: newFilesInstant.props.db,
@@ -54,19 +54,30 @@ export default {
       }
       return opts;
     },
+    getSpreadsheetsFromFiles(files, limit) {
+      return files.reduce(async (acc, file) => {
+        const spreadsheets = await acc;
+        const fileInfo = await this.googleDrive.getFile(file.id);
+        return spreadsheets.length >= limit
+          ? spreadsheets
+          : spreadsheets.concat(fileInfo);
+      }, []);
+    },
     async getSpreadsheets(limit) {
-      const spreadsheets = [];
       const foldersIds = this.folders;
-      for (const folderId of foldersIds) {
-        const opts = this.getSpreadsheetsFromFolderOpts(folderId);
-        const filesWrapper = await this.googleDrive.listFilesInPage(null, opts);
-        for (const file of filesWrapper.files) {
-          const fileInfo = await this.googleDrive.getFile(file.id);
-          spreadsheets.push(fileInfo);
-          if (spreadsheets.length >= limit) { return spreadsheets; }
-        }
+
+      if (!foldersIds.length) {
+        const opts = this.getSpreadsheetsFromFolderOpts("root");
+        const { files } = await this.googleDrive.listFilesInPage(null, opts);
+        return this.getSpreadsheetsFromFiles(files, limit);
       }
-      return spreadsheets;
+
+      return foldersIds.reduce(async (spreadsheets, folderId) => {
+        const opts = this.getSpreadsheetsFromFolderOpts(folderId);
+        const { files } = await this.googleDrive.listFilesInPage(null, opts);
+        const nextSpreadsheets = await this.getSpreadsheetsFromFiles(files, limit);
+        return (await spreadsheets).concat(nextSpreadsheets);
+      }, []);
     },
   },
 };