1.2.0 (#1032)

Merging Next (1.2.0) into --> Main

Author: thisismayuresh

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/api",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,
@@ -43,7 +43,7 @@
     "ajv-formats": "^2.1.1",
     "ajv-keywords": "^5.1.0",
     "async-mutex": "^0.4.0",
-    "axios": "1.6.2",
+    "axios": "1.8.2",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.0",
     "class-transformer": "^0.5.1",

apps/api/src/app/import-jobs/usecase/create-userjob/create-userjob.usecase.ts

@@ -1,10 +1,9 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { UserJobEntity, UserJobRepository } from '@impler/dal';
 import { CreateUserJobCommand } from './create-userjob.command';
 import { APIMessages } from '@shared/constants';
-import { BadRequestException } from '@nestjs/common';
 import { RSSXMLService } from '@impler/services';
-import { isValidXMLMimeType } from '@shared/helpers/common.helper';
+import { getMimeType, isValidXMLMimeType } from '@shared/helpers/common.helper';
 import { WebSocketService } from '@shared/services';
 
 @Injectable()
@@ -24,10 +23,11 @@ export class CreateUserJob {
   }: CreateUserJobCommand): Promise<UserJobEntity> {
     const rssService = new RSSXMLService(url);
 
-    const mimeType = await rssService.getMimeType(url);
+    try {
+      const mimeType = await getMimeType(url);
+      console.log('mime type is >>', mimeType);
 
-    if (isValidXMLMimeType(mimeType)) {
-      try {
+      if (isValidXMLMimeType(mimeType)) {
         const abortController = new AbortController();
 
         this.webSocketService.registerSessionAbort(webSocketSessionId, abortController);
@@ -54,9 +54,11 @@ export class CreateUserJob {
           _templateId: _templateId,
           externalUserId: externalUserId || (formattedExtra as unknown as Record<string, any>)?.externalUserId,
         });
-      } catch (error) {}
-    } else {
-      throw new BadRequestException(APIMessages.INVALID_RSS_URL);
+      } else {
+        throw new BadRequestException(APIMessages.INVALID_RSS_URL);
+      }
+    } catch (error) {
+      throw new BadRequestException(error);
     }
   }
 }

apps/api/src/app/shared/helpers/common.helper.ts

@@ -1,4 +1,5 @@
 import * as Sentry from '@sentry/node';
+import axios from 'axios';
 import { BadRequestException } from '@nestjs/common';
 import { APIMessages } from '../constants';
 import { PaginationResult, Defaults, FileMimeTypesEnum } from '@impler/shared';
@@ -95,3 +96,56 @@ export function isValidXMLMimeType(mimeType: string): boolean {
 
   return false;
 }
+
+export const getMimeType = async (url: string): Promise<string | null> => {
+  try {
+    if (!isUrlSafe(url)) {
+      throw new BadRequestException('Invalid URL');
+    }
+
+    const response = await axios.head(url, {
+      timeout: 10000,
+      maxRedirects: 3,
+    });
+
+    const mimeType = response.headers['content-type'] || null;
+
+    return mimeType?.split(';')[0] || null;
+  } catch (error) {
+    throw error;
+  }
+};
+
+export function isUrlSafe(url: string): boolean {
+  try {
+    const parsedUrl = new URL(url);
+
+    // Only allow HTTP and HTTPS
+    if (!['http:', 'https:'].includes(parsedUrl.protocol)) {
+      return false;
+    }
+
+    // Block localhost and private IPs (except in development)
+    const hostname = parsedUrl.hostname.toLowerCase();
+    const isDevelopment = process.env.NODE_ENV === 'dev';
+
+    if (!isDevelopment && ['localhost', '127.0.0.1', '::1'].includes(hostname)) {
+      return false;
+    }
+
+    if (
+      hostname.startsWith('10.') ||
+      hostname.startsWith('192.168.') ||
+      hostname.startsWith('169.254.') ||
+      /^172\.(1[6-9]|2[0-9]|3[01])\./.test(hostname)
+    ) {
+      return false;
+    }
+
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
+export default { getMimeType };

apps/queue-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/queue-manager",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,
@@ -20,7 +20,7 @@
     "@impler/services": "workspace:^",
     "@impler/shared": "workspace:^",
     "@sentry/node": "^7.112.2",
-    "axios": "1.6.2",
+    "axios": "1.8.2",
     "dayjs": "^1.11.11",
     "dotenv": "^16.0.2",
     "envalid": "^7.3.1",

apps/web/components/imports/editor/Editor.tsx

@@ -49,6 +49,9 @@ export function OutputEditor({ templateId, switchToDestination }: OutputEditorPr
     isSyncCustomizationLoading,
     isCustomizationLoading,
     isDestinationLoading,
+    allVariables,
+    formatVariableDisplay,
+    isSystemVariable,
   } = useEditor({
     templateId,
   });
@@ -98,7 +101,7 @@ export function OutputEditor({ templateId, switchToDestination }: OutputEditorPr
                     id="format"
                     value={field.value}
                     onChange={field.onChange}
-                    variables={[...(customization?.recordVariables || []), ...(customization?.chunkVariables || [])]}
+                    variables={allVariables}
                   />
                 )}
               />
@@ -107,14 +110,16 @@ export function OutputEditor({ templateId, switchToDestination }: OutputEditorPr
             </div>
             <div style={{ width: '20%', display: 'flex', flexDirection: 'column', gap: '5' }}>
               <VarLabel label="System Variables">
-                {customization?.chunkVariables.map((variable) => (
-                  <VarItemWrapper key={variable} name={variable} copyText={'"' + variable + '"'} />
+                {allVariables.filter(isSystemVariable).map((variable) => (
+                  <VarItemWrapper key={variable} name={variable} copyText={formatVariableDisplay(variable)} />
                 ))}
               </VarLabel>
               <VarLabel label="Schema Variables">
-                {customization?.recordVariables.map((variable) => (
-                  <VarItemWrapper key={variable} name={variable} copyText={'"' + variable + '"'} />
-                ))}
+                {allVariables
+                  .filter((variable) => !isSystemVariable(variable))
+                  .map((variable) => (
+                    <VarItemWrapper key={variable} name={variable} copyText={formatVariableDisplay(variable)} />
+                  ))}
               </VarLabel>
             </div>
           </Flex>

apps/web/components/imports/validator/Validator.tsx

@@ -20,26 +20,46 @@ import { useValidator } from '@hooks/useValidator';
 import { VarItemWrapper } from '../editor/VarItemWrapper';
 import { InformationIcon } from '@assets/icons/Information.icon';
 import { TooltipLink } from '@components/guide-point';
+import { useMemo } from 'react';
+import { useEditor } from '@hooks/useEditor';
+import { DestinationsEnum } from '@impler/shared';
 
 interface ValidatorProps {
   templateId: string;
 }
 
 export function Validator({ templateId }: ValidatorProps) {
-  const systemVariables = [
+  const { destination } = useEditor({ templateId });
+
+  // Existing system variables
+  const baseSystemVariables = [
     'params.uploadId',
     'params.fileName',
     'params.data',
     'params.extra',
     'params.totalRecords',
     'params.chunkSize',
   ];
+
+  // Bubble.io specific system variables
+  const bubbleIoSystemVariables = ['extra.uploadId', 'extra.userId'];
+
   const { colorScheme } = useMantineColorScheme();
   const { control, editorVariables, onSave, isUpdateValidationsLoading, isValidationsLoading, testCodeResult } =
     useValidator({
       templateId,
     });
 
+  // Combine all variables: base system variables + editor variables + Bubble.io variables (if applicable)
+  const allVariables = useMemo(() => {
+    const variables = [...baseSystemVariables, ...editorVariables];
+    if (destination?.destination === DestinationsEnum.BUBBLEIO) {
+      variables.push(...bubbleIoSystemVariables);
+    }
+
+    return variables;
+  }, [destination?.destination, editorVariables]);
+
   return (
     <div style={{ position: 'relative' }}>
       <LoadingOverlay visible={isValidationsLoading} />
@@ -124,7 +144,7 @@ export function Validator({ templateId }: ValidatorProps) {
                   mode="javascript"
                   value={field.value}
                   onChange={field.onChange}
-                  variables={[...systemVariables]}
+                  variables={allVariables}
                 />
               )}
             />
@@ -134,15 +154,10 @@ export function Validator({ templateId }: ValidatorProps) {
           </div>
           <div style={{ width: '20%', display: 'flex', flexDirection: 'column', gap: '5' }}>
             <VarLabel label="System Variables">
-              {systemVariables.map((variable) => (
+              {allVariables.map((variable) => (
                 <VarItemWrapper key={variable} name={variable} copyText={variable} />
               ))}
             </VarLabel>
-            <VarLabel label="Schema Variables">
-              {editorVariables.map((variable) => (
-                <VarItemWrapper key={variable} name={variable} copyText={'"' + variable + '"'} />
-              ))}
-            </VarLabel>
           </div>
         </Flex>
       </Stack>

apps/web/hooks/useEditor.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
@@ -83,6 +83,38 @@ export function useEditor({ templateId }: UseEditorProps) {
     }
   );
 
+  // Combine all variables: record variables + chunk variables + system variables
+  const allVariables = useMemo(() => {
+    const variables = [];
+
+    // Add schema variables (from record format)
+    if (customization?.recordVariables) {
+      variables.push(...customization.recordVariables.map((variable) => variable.substring(2, variable.length - 2)));
+    }
+
+    // Add system variables (from chunk format)
+    if (customization?.chunkVariables) {
+      variables.push(...customization.chunkVariables);
+    }
+
+    // Add Bubble.io specific system variables
+    if (destination?.destination === DestinationsEnum.BUBBLEIO) {
+      variables.push('extra.uploadId', 'extra.userId');
+    }
+
+    return variables;
+  }, [customization?.recordVariables, customization?.chunkVariables, destination?.destination]);
+
+  // Helper function to format variable display
+  const formatVariableDisplay = (variable: string) => {
+    return `"${variable}"`;
+  };
+
+  // Helper function to categorize variables
+  const isSystemVariable = (variable: string) => {
+    return variable.startsWith('extra.') || variable.startsWith('params.');
+  };
+
   const validateFormat = (data: string): boolean => {
     try {
       JSON.parse(data);
@@ -137,10 +169,13 @@ export function useEditor({ templateId }: UseEditorProps) {
     onSaveClick,
     destination,
     handleSubmit,
+    allVariables,
     customization,
+    isSystemVariable,
     syncCustomization,
     updateCustomization,
     isDestinationLoading,
+    formatVariableDisplay,
     isCustomizationLoading,
     isSyncCustomizationLoading,
     isUpdateCustomizationLoading,

apps/web/hooks/useValidator.tsx

@@ -7,7 +7,7 @@ import { notify } from '@libs/notify';
 import { commonApi } from '@libs/api';
 import { track } from '@libs/amplitude';
 import { API_KEYS, MODAL_KEYS, MODAL_TITLES } from '@config';
-import { ICustomization, IErrorObject, IValidator } from '@impler/shared';
+import { ICustomization, IErrorObject, IValidator, DestinationsEnum } from '@impler/shared';
 import { CodeOutput } from '@components/imports/validator/CodeOutput';
 
 interface UseSchemaProps {
@@ -43,9 +43,14 @@ export function useValidator({ templateId }: UseSchemaProps) {
     () => commonApi<ICustomization>(API_KEYS.TEMPLATE_CUSTOMIZATION_GET as any, { parameters: [templateId] }),
     {
       onSuccess(data) {
-        setEditorVariables([
-          ...(data.recordVariables.map((variable) => variable.substring(2, variable.length - 2)) || []),
-        ]);
+        // Get base variables from customization
+        const baseVariables = data.recordVariables?.map((variable) => variable.substring(2, variable.length - 2)) || [];
+
+        // Add static Bubble.io variables if destination is Bubble.io
+        const bubbleIoVariables =
+          data.destination === DestinationsEnum.BUBBLEIO ? ['extra.uploadId', 'extra.userId'] : [];
+
+        setEditorVariables([...baseVariables, ...bubbleIoVariables]);
       },
     }
   );

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/web",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,
@@ -43,7 +43,7 @@
     "embla-carousel-react": "^7.0.9",
     "jwt-decode": "^3.1.2",
     "lottie-react": "^2.4.0",
-    "next": "14.2.21",
+    "next": "14.2.30",
     "react": "18.2.0",
     "react-ace": "^10.1.0",
     "react-chartjs-2": "^5.2.0",

apps/widget/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@impler/widget",
-	"version": "1.1.1",
+	"version": "1.2.0",
 	"author": "implerhq",
 	"license": "MIT",
 	"private": true,
@@ -52,7 +52,7 @@
 		"@storybook/addon-essentials": "^6.5.13",
 		"@storybook/react": "^6.5.13",
 		"@tanstack/react-query": "^4.14.5",
-		"axios": "1.6.2",
+		"axios": "1.8.2",
 		"cooltipz-css": "^2.3.0",
 		"cross-env": "^7.0.3",
 		"file-saver": "^2.0.5",