@pipedream/google_drive 0.9.2 → 0.10.1

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

@@ -20,7 +20,7 @@ export default {
   name: "Share File or Folder",
   description:
     "Add a [sharing permission](https://support.google.com/drive/answer/7166529) to the sharing preferences of a file or folder and provide a sharing URL. [See the documentation](https://developers.google.com/drive/api/v3/reference/permissions/create)",
-  version: "0.2.1",
+  version: "0.2.2",
   type: "action",
   props: {
     googleDrive,

package/actions/{google-workspace-export-formats.mjs → common/google-workspace-export-formats.mjs}

@@ -39,6 +39,22 @@ export default [
     value: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     label: "MS Word document",
   },
+  {
+    value: "application/vnd.oasis.opendocument.text",
+    label: "OpenDocument Text",
+  },
+  {
+    value: "application/vnd.oasis.opendocument.spreadsheet",
+    label: "OpenDocument Spreadsheet",
+  },
+  {
+    value: "application/vnd.oasis.opendocument.presentation",
+    label: "OpenDocument Presentation",
+  },
+  {
+    value: "application/vnd.google-apps.vid",
+    label: "MP4",
+  },
   {
     value: "application/zip",
     label: "HTML (zipped)",
@@ -71,4 +87,12 @@ export default [
     value: "text/tab-separated-values",
     label: "TSV (sheet only)",
   },
+  {
+    value: "text/markdown",
+    label: "Markdown",
+  },
+  {
+    value: "text/x-markdown",
+    label: "Markdown (Deprecated)",
+  },
 ];

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 documentation](https://developers.google.com/drive/api/v3/reference/files/copy) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   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.8",
+  version: "0.1.9",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/create) for more information",
-  version: "0.2.1",
+  version: "0.2.2",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/create) for more information",
-  version: "0.1.9",
+  version: "0.1.10",
   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 documentation](https://developers.google.com/drive/api/v3/reference/drives/create) for more information",
-  version: "0.1.9",
+  version: "0.1.10",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/delete) for more information",
-  version: "0.1.9",
+  version: "0.1.10",
   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 documentation](https://developers.google.com/drive/api/v3/reference/drives/delete) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   type: "action",
   props: {
     googleDrive,

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

@@ -3,7 +3,7 @@ import fs from "fs";
 import stream from "stream";
 import { promisify } from "util";
 import { GOOGLE_DRIVE_MIME_TYPE_PREFIX } from "../../common/constants.mjs";
-import googleWorkspaceExportFormats from "../google-workspace-export-formats.mjs";
+import googleWorkspaceExportFormats from "../common/google-workspace-export-formats.mjs";
 import { toSingleLineString } from "../../common/utils.mjs";
 
 /**
@@ -18,7 +18,7 @@ export default {
   key: "google_drive-download-file",
   name: "Download File",
   description: "Download a file. [See the documentation](https://developers.google.com/drive/api/v3/manage-downloads) for more information",
-  version: "0.1.8",
+  version: "0.1.10",
   type: "action",
   props: {
     googleDrive,
@@ -82,7 +82,10 @@ export default {
         return exportFormats[file.mimeType].map((f) =>
           googleWorkspaceExportFormats.find(
             (format) => format.value === f,
-          ) ?? f);
+          ) ?? {
+            value: f,
+            label: f,
+          });
       },
     },
   },

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

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

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

@@ -6,7 +6,7 @@ export default {
   key: "google_drive-find-forms",
   name: "Find Forms",
   description: "List Google Form documents or search for a Form by name. [See the documentation](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.0.9",
+  version: "0.0.10",
   type: "action",
   props: {
     googleDrive,

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

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

package/actions/get-file-by-id/get-file-by-id.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-get-file-by-id",
   name: "Get File By ID",
   description: "Get info on a specific file. [See the documentation](https://developers.google.com/drive/api/reference/rest/v3/files/get) for more information",
-  version: "0.0.5",
+  version: "0.0.6",
   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 documentation](https://developers.google.com/drive/api/v3/search-files) for more information",
-  version: "0.1.10",
+  version: "0.1.11",
   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 metadata for one or all shared drives. [See the documentation](https://developers.google.com/drive/api/v3/reference/drives/get) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   type: "action",
   props: {
     googleDrive,

package/actions/list-access-proposals/list-access-proposals.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_drive-list-access-proposals",
   name: "List Access Proposals",
   description: "List access proposals for a file or folder. [See the documentation](https://developers.google.com/workspace/drive/api/reference/rest/v3/accessproposals/list)",
-  version: "0.0.1",
+  version: "0.0.2",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/list) for more information",
-  version: "0.1.12",
+  version: "0.1.13",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   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 documentation](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   type: "action",
   props: {
     googleDrive,

package/actions/resolve-access-proposal/resolve-access-proposal.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-resolve-access-proposal",
   name: "Resolve Access Proposals",
   description: "Accept or deny a request for access to a file or folder in Google Drive. [See the documentation](https://developers.google.com/workspace/drive/api/reference/rest/v3/accessproposals/resolve)",
-  version: "0.0.1",
+  version: "0.0.2",
   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 documentation](https://developers.google.com/drive/api/v3/search-shareddrives) for more information",
-  version: "0.1.9",
+  version: "0.1.10",
   type: "action",
   props: {
     googleDrive,

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

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

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 documentation](https://developers.google.com/drive/api/v3/reference/drives/update) for more information",
-  version: "0.1.8",
+  version: "0.1.9",
   type: "action",
   props: {
     googleDrive,

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

@@ -1,24 +1,22 @@
 import googleDrive from "../../google_drive.app.mjs";
 import path from "path";
 import {
-  getFileStream,
   omitEmptyStringValues,
+  parseObjectEntries,
 } from "../../common/utils.mjs";
 import { GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART } from "../../common/constants.mjs";
 import {
-  additionalProps, updateType,
-} from "../../common/filePathOrUrl.mjs";
+  getFileStream, ConfigurationError,
+} from "@pipedream/platform";
 
 export default {
   key: "google_drive-upload-file",
   name: "Upload File",
   description: "Upload a file to Google Drive. [See the documentation](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
-  version: "1.0.2",
+  version: "1.1.0",
   type: "action",
-  additionalProps,
   props: {
     googleDrive,
-    updateType,
     drive: {
       propDefinition: [
         googleDrive,
@@ -38,21 +36,10 @@ export default {
         "The folder you want to upload the file to. If not specified, the file will be placed directly in the drive's top-level folder.",
       optional: true,
     },
-    fileUrl: {
-      propDefinition: [
-        googleDrive,
-        "fileUrl",
-      ],
-      optional: true,
-      hidden: true,
-    },
-    filePath: {
-      propDefinition: [
-        googleDrive,
-        "filePath",
-      ],
-      optional: true,
-      hidden: true,
+    file: {
+      type: "string",
+      label: "File",
+      description: "Provide either a file URL or a path to a file in the /tmp directory (for example, /tmp/myFlie.pdf).",
     },
     name: {
       propDefinition: [
@@ -84,32 +71,38 @@ export default {
         "fileId",
       ],
       label: "File to replace",
-      description: "Id of the file to replace. Leave it empty to upload a new file.",
+      description: "ID of the file to replace. Leave it empty to upload a new file.",
+      optional: true,
+    },
+    metadata: {
+      type: "object",
+      label: "Metadata",
+      description: "Additional metadata to supply in the upload. [See the documentation](https://developers.google.com/workspace/drive/api/reference/rest/v3/files) for information on available fields. Values will be parsed as JSON where applicable. Example: `{ \"description\": \"my file description\" }`",
       optional: true,
     },
   },
   async run({ $ }) {
     const {
       parentId,
-      fileUrl,
-      filePath,
       name,
       mimeType,
     } = this;
     let { uploadType } = this;
     const driveId = this.googleDrive.getDriveId(this.drive);
 
-    const filename = name || path.basename(fileUrl || filePath);
+    const filename = name || path.basename(this.file);
 
-    const file = await getFileStream({
-      $,
-      fileUrl,
-      filePath: filePath?.startsWith("/tmp/")
-        ? filePath
-        : `/tmp/${filePath}`,
-    });
+    const file = await getFileStream(this.file);
     console.log(`Upload type: ${uploadType}.`);
 
+    const metadata = this.metadata
+      ? parseObjectEntries(this.metadata)
+      : undefined;
+
+    if (metadata?.mimeType && !mimeType) {
+      throw new ConfigurationError(`Please include the file's original MIME type in the \`Mime Type\` prop. File will be converted to \`${metadata.mimeType}\`.`);
+    }
+
     let result = null;
     if (this.fileId) {
       await this.googleDrive.updateFileMedia(this.fileId, file, omitEmptyStringValues({
@@ -120,6 +113,7 @@ export default {
         name: filename,
         mimeType,
         uploadType,
+        requestBody: metadata,
       }));
       $.export("$summary", `Successfully updated file, "${result.name}"`);
     } else {
@@ -130,6 +124,7 @@ export default {
         parentId,
         driveId,
         uploadType,
+        requestBody: metadata,
       }));
       $.export("$summary", `Successfully uploaded a new file, "${result.name}"`);
     }

package/common/utils.mjs

@@ -1,5 +1,7 @@
 import fs from "fs";
-import { axios } from "@pipedream/platform";
+import {
+  axios, ConfigurationError,
+} from "@pipedream/platform";
 import {
   MY_DRIVE_VALUE,
   LEGACY_MY_DRIVE_VALUE,
@@ -257,6 +259,36 @@ function toSingleLineString(multiLineString) {
     .replace(/\s{2,}/g, " ");
 }
 
+function optionalParseAsJSON(value) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
+}
+
+function parseObjectEntries(value = {}) {
+  let obj;
+  if (typeof value === "string") {
+    try {
+      obj = JSON.parse(value);
+    } catch (e) {
+      throw new ConfigurationError(`Invalid JSON string provided: ${e.message}`);
+    }
+  } else {
+    obj = value;
+  }
+  return Object.fromEntries(
+    Object.entries(obj).map(([
+      key,
+      value,
+    ]) => [
+      key,
+      optionalParseAsJSON(value),
+    ]),
+  );
+}
+
 export {
   MY_DRIVE_VALUE,
   isMyDrive,
@@ -269,4 +301,5 @@ export {
   getFilePaths,
   streamToBuffer,
   byteToMB,
+  parseObjectEntries,
 };

package/google_drive.app.mjs

@@ -729,12 +729,12 @@ export default {
       // When watching for changes to an entire account, we must pass a pageToken,
       // which points to the moment in time we want to start watching for changes:
       // https://developers.google.com/drive/api/v3/manage-changes
+      const fn = () => drive.changes.watch(watchRequest);
+      const { data } = await this.retryWithExponentialBackoff(fn);
       const {
         expiration,
         resourceId,
-      } = (
-        await drive.changes.watch(watchRequest)
-      ).data;
+      } = data;
       console.log(`Watch request for drive successful, expiry: ${expiration}`);
       return {
         expiration: parseInt(expiration),
@@ -744,16 +744,16 @@ export default {
     async watchFile(id, address, fileId) {
       const drive = this.drive();
       const requestBody = this._makeWatchRequestBody(id, address);
+      const fn = () => drive.files.watch({
+        fileId,
+        requestBody,
+        supportsAllDrives: true,
+      });
+      const { data } = await this.retryWithExponentialBackoff(fn);
       const {
         expiration,
         resourceId,
-      } = (
-        await drive.files.watch({
-          fileId,
-          requestBody,
-          supportsAllDrives: true,
-        })
-      ).data;
+      } = data;
       console.log(
         `Watch request for file ${fileId} successful, expiry: ${expiration}`,
       );
@@ -1475,5 +1475,32 @@ export default {
       const drive = this.drive();
       return (await drive.accessproposals.resolve(opts)).data;
     },
+    retryWithExponentialBackoff(func, maxAttempts = 3, baseDelayS = 2) {
+      let attempt = 0;
+
+      const execute = async () => {
+        try {
+          return await func();
+        } catch (error) {
+          // retry for error status 422
+          const statusCode = error.status || error.response?.status;
+          if (attempt >= maxAttempts || statusCode !== 422) {
+            throw error;
+          }
+
+          // display error message for 422 status
+          const errorMessage = error.message || error.response?.data?.message || error.response?.statusText || "Unknown error";
+          console.log(`Received 422 error: ${errorMessage}. Retrying attempt ${attempt + 1}/${maxAttempts}...`);
+
+          const delayMs = Math.pow(baseDelayS, attempt) * 1000;
+          await new Promise((resolve) => setTimeout(resolve, delayMs));
+
+          attempt++;
+          return execute();
+        }
+      };
+
+      return execute();
+    },
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.9.2",
+  "version": "0.10.1",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [
@@ -11,7 +11,7 @@
   "author": "Pipedream <support@pipedream.com> (https://pipedream.com/)",
   "dependencies": {
     "@googleapis/drive": "^2.3.0",
-    "@pipedream/platform": "^3.0.3",
+    "@pipedream/platform": "^3.1.0",
     "cron-parser": "^4.9.0",
     "google-docs-mustaches": "^1.2.2",
     "got": "13.0.0",

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

@@ -15,7 +15,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 when 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.2.5",
+  version: "0.2.6",
   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

@@ -27,7 +27,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 when a change is made to one of those files",
-  version: "0.2.5",
+  version: "0.2.6",
   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/new-access-proposal/new-access-proposal.mjs

@@ -6,7 +6,7 @@ export default {
   key: "google_drive-new-access-proposal",
   name: "New Access Proposal",
   description: "Emit new event when a new access proposal is requested in Google Drive",
-  version: "0.0.1",
+  version: "0.0.2",
   type: "source",
   dedupe: "unique",
   props: {

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 when a new file is added in your linked Google Drive",
-  version: "0.1.13",
+  version: "0.1.14",
   type: "source",
   dedupe: "unique",
   props: {

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

@@ -7,7 +7,7 @@ export default {
   key: "google_drive-new-files-shared-drive",
   name: "New Files (Shared Drive)",
   description: "Emit new event when a new file is added in your shared Google Drive",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "source",
   dedupe: "unique",
   props: {

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

@@ -17,7 +17,7 @@ export default {
   name: "New or Modified Comments (Instant)",
   description:
     "Emit new event when a comment is created or modified in the selected file",
-  version: "1.0.4",
+  version: "1.0.5",
   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/new-or-modified-files/new-or-modified-files.mjs

@@ -24,7 +24,7 @@ export default {
   key: "google_drive-new-or-modified-files",
   name: "New or Modified Files (Instant)",
   description: "Emit new event when a file in the selected Drive is created, modified or trashed.",
-  version: "0.3.5",
+  version: "0.3.6",
   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/new-or-modified-folders/new-or-modified-folders.mjs

@@ -20,7 +20,7 @@ export default {
   key: "google_drive-new-or-modified-folders",
   name: "New or Modified Folders (Instant)",
   description: "Emit new event when a folder is created or modified in the selected Drive",
-  version: "0.1.10",
+  version: "0.1.11",
   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/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.8",
+  version: "0.1.9",
   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 when a new spreadsheet is created in a drive.",
-  version: "0.1.10",
+  version: "0.1.11",
   props: {
     googleDrive: newFilesInstant.props.googleDrive,
     db: newFilesInstant.props.db,