Gh #734 update worker (#770)

* [gh-#734] remove defunct activityLogId and fallback to 0 * [gh-#734] 0.24.2 * [gh-#734] account for empty activityLogId
NangoHQ · Jul 13, 2023 · 225af2b · 225af2b
1 parent 16902e4
commit 225af2b
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 59 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/docker/docker-compose.yaml b/packages/cli/docker/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
             - nango
 
     nango-server:
-        image: nangohq/nango-server:0.24.1
+        image: nangohq/nango-server:0.24.4
         container_name: nango-server
         environment:
             - TEMPORAL_ADDRESS=temporal:7233
@@ -47,7 +47,7 @@ services:
             - nango
 
     nango-worker:
-        image: nangohq/nango-worker:0.24.1
+        image: nangohq/nango-worker:0.24.4
         container_name: nango-worker
         restart: always
         ports:

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nango",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "description": "Nango's CLI tool.",
     "type": "module",
     "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "dependencies": {
         "@babel/traverse": "^7.22.5",
         "@inquirer/prompts": "^2.3.0",
-        "@nangohq/shared": "0.24.1",
+        "@nangohq/shared": "0.24.4",
         "@vercel/ncc": "^0.36.1",
         "axios": "^1.2.0",
         "byots": "^5.0.0-dev.20221103.1.34",

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/frontend",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "description": "Nango's frontend library for OAuth handling.",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/node-client/package.json b/packages/node-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/node",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "description": "Nango's Node client.",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/server/lib/controllers/sync.controller.ts b/packages/server/lib/controllers/sync.controller.ts
@@ -211,7 +211,7 @@ class SyncController {
             const activityLogId = await createActivityLog(log);
 
             const syncClient = await SyncClient.getInstance();
-            syncClient?.runSyncCommand(schedule_id, command, activityLogId as number);
+            await syncClient?.runSyncCommand(schedule_id, command, activityLogId as number);
             await updateScheduleStatus(schedule_id, command, activityLogId as number);
 
             await createActivityLogMessageAndEnd({

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/nango-server",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "description": "Nango OAuth's server.",
     "type": "module",
     "main": "dist/server.js",
@@ -21,7 +21,7 @@
     },
     "dependencies": {
         "@hapi/boom": "^10.0.1",
-        "@nangohq/shared": "0.24.1",
+        "@nangohq/shared": "0.24.4",
         "@sentry/node": "^7.37.2",
         "@temporalio/client": "^1.7.4",
         "axios": "^1.3.4",

diff --git a/packages/shared/lib/services/sync/job.service.ts b/packages/shared/lib/services/sync/job.service.ts
@@ -9,7 +9,7 @@ export const createSyncJob = async (
     type: SyncType,
     status: SyncStatus,
     job_id: string,
-    activity_log_id: number
+    activity_log_id: number | null
 ): Promise<Pick<SyncJob, 'id'> | null> => {
     const job: SyncJob = {
         sync_id,

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/shared",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "description": "Nango's shared components.",
     "type": "module",
     "main": "dist/lib/index.js",
@@ -18,7 +18,7 @@
     "dependencies": {
         "@aws-sdk/client-s3": "^3.348.0",
         "@hapi/boom": "^10.0.1",
-        "@nangohq/node": "0.24.1",
+        "@nangohq/node": "0.24.4",
         "@sentry/node": "^7.37.2",
         "@temporalio/client": "^1.5.2",
         "@types/fs-extra": "^11.0.1",

diff --git a/packages/webapp/package-lock.json b/packages/webapp/package-lock.json
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -1,14 +1,14 @@
 {
     "name": "webapp",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "private": true,
     "dependencies": {
         "@geist-ui/core": "^2.3.8",
         "@geist-ui/icons": "^1.0.2",
         "@headlessui/react": "^1.7.12",
         "@heroicons/react": "^2.0.16",
         "@mantine/prism": "^5.10.5",
-        "@nangohq/frontend": "0.24.1",
+        "@nangohq/frontend": "0.24.4",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",

diff --git a/packages/worker/lib/activities.ts b/packages/worker/lib/activities.ts
@@ -11,7 +11,6 @@ import {
     updateJobActivityLogId,
     NangoConnection,
     environmentService,
-    createActivityLogMessage,
     createActivityLogAndLogMessage
 } from '@nangohq/shared';
 import type { ContinuousSyncArgs, InitialSyncArgs } from './models/Worker';
@@ -21,15 +20,6 @@ export async function routeSync(args: InitialSyncArgs): Promise<boolean | object
     let environmentId = nangoConnection?.environment_id;
     if (!nangoConnection?.environment_id) {
         environmentId = (await environmentService.getEnvironmentIdForAccountAssumingProd(nangoConnection.account_id as number)) as number;
-
-        if (debug) {
-            await createActivityLogMessage({
-                level: 'info',
-                activity_log_id: activityLogId,
-                timestamp: Date.now(),
-                content: `The environment id was not provided for the initial sync: ${syncName}. The environment id was obtained from the account id: ${nangoConnection.account_id} and is: ${environmentId}`
-            });
-        }
     }
     const syncConfig: ProviderConfig = (await configService.getProviderConfig(nangoConnection?.provider_config_key as string, environmentId)) as ProviderConfig;
 
@@ -39,20 +29,14 @@ export async function routeSync(args: InitialSyncArgs): Promise<boolean | object
 export async function scheduleAndRouteSync(args: ContinuousSyncArgs): Promise<boolean | object> {
     const { syncId, activityLogId, syncName, nangoConnection, debug } = args;
     let environmentId = nangoConnection?.environment_id;
+    let syncJobId;
     if (!nangoConnection?.environment_id) {
         environmentId = (await environmentService.getEnvironmentIdForAccountAssumingProd(nangoConnection.account_id as number)) as number;
-
-        if (debug) {
-            await createActivityLogMessage({
-                level: 'info',
-                activity_log_id: activityLogId,
-                timestamp: Date.now(),
-                content: `The environment id was not provided for the continuous sync: ${syncName}. The environment id was obtained from the account id: ${nangoConnection.account_id} and is: ${environmentId}`
-            });
-        }
+        // TODO recreate the job id to be in the format created by temporal: nango-syncs.accounts-syncs-schedule-29768402-c6a8-462b-8334-37adf2b76be4-workflow-2023-05-30T08:45:00Z
+        syncJobId = await createSyncJob(syncId as string, SyncType.INCREMENTAL, SyncStatus.RUNNING, '', null);
+    } else {
+        syncJobId = await createSyncJob(syncId as string, SyncType.INCREMENTAL, SyncStatus.RUNNING, '', activityLogId);
     }
-    // TODO recreate the job id to be in the format created by temporal: nango-syncs.accounts-syncs-schedule-29768402-c6a8-462b-8334-37adf2b76be4-workflow-2023-05-30T08:45:00Z
-    const syncJobId = await createSyncJob(syncId as string, SyncType.INCREMENTAL, SyncStatus.RUNNING, '', activityLogId);
 
     try {
         const syncConfig: ProviderConfig = (await configService.getProviderConfig(
@@ -67,7 +51,7 @@ export async function scheduleAndRouteSync(args: ContinuousSyncArgs): Promise<bo
             syncName,
             SyncType.INCREMENTAL,
             { ...nangoConnection, environment_id: environmentId },
-            activityLogId,
+            activityLogId ?? 0,
             debug
         );
     } catch (err: any) {
@@ -124,13 +108,15 @@ export async function syncProvider(
             connection_id: nangoConnection?.connection_id as string,
             provider_config_key: nangoConnection?.provider_config_key as string,
             provider: syncConfig.provider,
-            session_id: syncJobId.toString(),
+            session_id: syncJobId ? syncJobId?.toString() : '',
             environment_id: nangoConnection?.environment_id as number,
             operation_name: syncName
         };
         activityLogId = (await createActivityLog(log)) as number;
 
-        await updateJobActivityLogId(syncJobId, activityLogId);
+        if (syncJobId && activityLogId) {
+            await updateJobActivityLogId(syncJobId, activityLogId);
+        }
     }
 
     const syncRun = new syncRunService({

diff --git a/packages/worker/package.json b/packages/worker/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nangohq/nango-worker",
-    "version": "0.24.1",
+    "version": "0.24.4",
     "type": "module",
     "main": "dist/worker.js",
     "scripts": {
@@ -15,7 +15,7 @@
         "directory": "packages/worker"
     },
     "dependencies": {
-        "@nangohq/shared": "0.24.1",
+        "@nangohq/shared": "0.24.4",
         "@temporalio/activity": "^1.5.2",
         "@temporalio/client": "^1.5.2",
         "@temporalio/worker": "^1.5.2",