@pipedream/google_drive 0.6.5 → 0.6.7

package/package.json

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

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

@@ -1,4 +1,5 @@
 import cronParser from "cron-parser";
+import sampleEmit from "./test-event.mjs";
 import includes from "lodash/includes.js";
 import { v4 as uuid } from "uuid";
 
@@ -16,7 +17,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.1",
+  version: "0.1.2",
   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
@@ -223,4 +224,5 @@ export default {
 
     this.processChange(file, headers);
   },
+  sampleEmit,
 };

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

@@ -0,0 +1 @@
+export default  JSON.parse("{\n  \"file\": {\n    \"kind\": \"drive#file\",\n    \"id\": \"1LmXTIQ0wqKP7T3-l9r127MaTXn3pVbTmw4Pt\",\n    \"name\": \"Pipedream 2213\",\n    \"mimeType\": \"application/vnd.google-apps.spreadsheet\"\n  },\n  \"change\": {\n    \"state\": \"update\",\n    \"resourceURI\": \"https://www.googleapis.com/drive/v3/files/1LmXTIQ0wqKP7T3-l9r127MaTXn3pVbTmw4P?alt=json&supportsAllDrives=true\",\n    \"changed\": \"properties\"\n  }\n}")

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

@@ -10,7 +10,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.2",
+  version: "0.1.3",
   type: "source",
   dedupe: "unique",
   props: {
@@ -47,11 +47,13 @@ export default {
       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)",
+        q: `mimeType != "application/vnd.google-apps.folder" and createdTime > "${timeString}" and trashed = false`,
+        orderBy: "createdTime desc",
+        fields: "*",
+        pageSize: 25,
       });
 
-      await this.processChanges(data.files);
+      this.emitFiles(data.files);
     },
     ...common.hooks,
     async activate() {
@@ -80,29 +82,35 @@ export default {
         GOOGLE_DRIVE_NOTIFICATION_CHANGE,
       ];
     },
-    async processChanges(changedFiles) {
-      const lastFileCreatedTime = this._getLastFileCreatedTime();
-      let maxCreatedTime = lastFileCreatedTime;
-
-      for (const file of changedFiles) {
-        const fileInfo = await this.googleDrive.getFile(file.id);
-        const createdTime = Date.parse(fileInfo.createdTime);
-        if (
-          !this.shouldProcess(fileInfo) ||
-          createdTime < lastFileCreatedTime
-        ) {
+    emitFiles(files) {
+      for (const file of files) {
+        if (!this.shouldProcess(file)) {
           continue;
         }
-
-        this.$emit(fileInfo, {
-          summary: `New File: ${fileInfo.name}`,
+        this.$emit(file, {
+          summary: `New File: ${file.name}`,
           id: file.id,
-          ts: createdTime,
+          ts: Date.parse(file.createdTime),
         });
+      }
+    },
+    async processChanges() {
+      const lastFileCreatedTime = this._getLastFileCreatedTime();
+      const timeString = new Date(lastFileCreatedTime).toISOString();
 
-        maxCreatedTime = Math.max(createdTime, maxCreatedTime);
-        this._setLastFileCreatedTime(maxCreatedTime);
+      const { data } = await this.googleDrive.drive().files.list({
+        q: `mimeType != "application/vnd.google-apps.folder" and createdTime > "${timeString}" and trashed = false`,
+        orderBy: "createdTime desc",
+        fields: "*",
+      });
+
+      if (!data.files?.length) {
+        return;
       }
+
+      this.emitFiles(data.files);
+
+      this._setLastFileCreatedTime(Date.parse(data.files[0].createdTime));
     },
   },
   sampleEmit,