@vrplatform/log 2.0.0-alpha.5 → 2.0.0-alpha.51

package/src/log/common.ts

@@ -1,17 +1,4 @@
-import type { RequestLike } from './type';
-
-// Headers
-export const CONNECTION_ID_HEADER = 'X-Connection-ID';
-export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
-export const TASK_QUEUE_HEADER = 'X-Task-Queue';
-export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
-export const VERIFICATION_HEADER = 'X-Verification-Key';
-
-// Env
-export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
-export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
-export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
-export const LOG_ENV = 'LOG';
+import { CORRELATION_ID_HEADER, type RequestLike } from './type';
 
 export const requestHeadersToCapture = ['user-agent'];
 

package/src/log/index.ts

@@ -1,16 +1,16 @@
 import { createBaseLog } from './baselog';
+import { getCorrelationId, getEnvironment, requestToContext } from './common';
 import {
   AXIOM_AUTH_TOKEN_ENV,
   AXIOM_DATASET_ENV,
   AXIOM_ORG_ID_ENV,
   LOG_ENV,
+  type LogBindings,
+  type RequestLike,
   TASK_QUEUE_HEADER,
   WORKFLOW_ID_HEADER,
-  getCorrelationId,
-  getEnvironment,
-  requestToContext,
-} from './common';
-import type { RequestLike, WorkerLog } from './type';
+  type WorkerLog,
+} from './type';
 
 export * from './common';
 export * from './baselog';
@@ -37,7 +37,7 @@ export function useLog({
   correlationId?: string;
   version?: string;
   dataset?: string;
-  env?: Record<string, any>;
+  env?: LogBindings;
   context?: Record<string, any>;
   executionContext?: {
     waitUntil(promise: Promise<any>): void;

package/src/log/type.ts

@@ -1,12 +1,39 @@
+// Headers
+export const CONNECTION_ID_HEADER = 'X-Connection-ID';
+export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
+export const TASK_QUEUE_HEADER = 'X-Task-Queue';
+export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
+export const VERIFICATION_HEADER = 'X-Verification-Key';
+
+// Env
+export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
+export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
+export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
+export const LOG_ENV = 'LOG';
+
+export type LogBindings = {
+  [LOG_ENV]?: string;
+  [AXIOM_AUTH_TOKEN_ENV]?: string;
+  [AXIOM_ORG_ID_ENV]?: string;
+  [AXIOM_DATASET_ENV]?: string;
+  NODE_ENV?: string;
+  IS_LOCAL_DEV?: string;
+  MACHINE_NAME?: string;
+};
+
 export type LogFn = (
   message: any,
   additionalContext?: Record<string, any>
 ) => void;
-export type Log = {
+
+export type LogFns = {
   error: LogFn;
   info: LogFn;
   debug: LogFn;
   warn: LogFn;
+};
+
+export type Log = LogFns & {
   child: (data: ChildLogOptions) => Log;
   addContext: (data: Record<string, any>) => void;
 };

package/src/tracking/index.ts

@@ -1,52 +1,161 @@
+declare module 'intercom-client' {
+  export namespace Intercom {
+    export interface CreateContactRequestWithExternalId {
+      /** A unique identifier for the contact which is given to Intercom */
+      external_id: string;
+      /** The contacts phone */
+      phone?: string;
+      /** The contacts name */
+      name?: string;
+      /** An image URL containing the avatar of a contact */
+      avatar?: string;
+      /** The time specified for when a contact signed up */
+      signed_up_at?: number;
+      /** The time when the contact was last seen (either where the Intercom Messenger was installed or when specified manually) */
+      last_seen_at?: number;
+      /** The id of an admin that has been assigned account ownership of the contact */
+      owner_id?: number;
+      /** Whether the contact is unsubscribed from emails */
+      unsubscribed_from_emails?: boolean;
+      /** The custom attributes which are set for the contact */
+      custom_attributes?: ContactCustomAttributes;
+    }
+    interface UpdateContactRequest {
+      /** The role of the contact. */
+      role?: 'user' | 'lead';
+      /** A unique identifier for the contact which is given to Intercom */
+      external_id?: string;
+      /** The contacts email */
+      email?: string;
+      /** The contacts phone */
+      phone?: string;
+      /** The contacts name */
+      name?: string;
+      /** An image URL containing the avatar of a contact */
+      avatar?: string;
+      /** The time specified for when a contact signed up */
+      signed_up_at?: number;
+      /** The time when the contact was last seen (either where the Intercom Messenger was installed or when specified manually) */
+      last_seen_at?: number;
+      /** The id of an admin that has been assigned account ownership of the contact */
+      owner_id?: number;
+      /** Whether the contact is unsubscribed from emails */
+      unsubscribed_from_emails?: boolean;
+      /** The custom attributes which are set for the contact */
+      custom_attributes?: ContactCustomAttributes;
+    }
+    interface ContactCustomAttributes {
+      Onboarding_Support?: string; // The customer's preferred onboarding level
+      userType?: string; // User Type (user or owner)
+      // ARCHIVED
+      // article_id?: string; // undefined
+      // workflowInstanceId?: number; // undefined
+      // Active_Listings?: string; // The number of active listings a user has
+      // Accounting_Software?: string; // The client's accounting software
+    }
+    interface CreateOrUpdateCompanyRequest {
+      /** The name of the Company */
+      name?: string;
+      /** The company id you have defined for the company. Can't be updated */
+      company_id?: string;
+      /** The name of the plan you have associated with the company. */
+      plan?: string;
+      /** The number of employees in this company. */
+      size?: number;
+      /** The URL for this company's website. Please note that the value specified here is not validated. Accepts any string. */
+      website?: string;
+      /** The industry that this company operates in. */
+      industry?: string;
+      /** A hash of key/value pairs containing any other data about the company you want Intercom to store. */
+      custom_attributes?: CompanyCustomAttributes;
+      /** The time the company was created by you. */
+      remote_created_at?: number;
+      /** How much revenue the company generates for your business. Note that this will truncate floats. i.e. it only allow for whole integers, 155.98 will be truncated to 155. Note that this has an upper limit of 2\*\*31-1 or 2147483647.. */
+      monthly_spend?: number;
+    }
+    interface CompanyCustomAttributes {
+      teamId?: string; // undefined
+      team?: string; // undefined
+      type?: string; // undefined
+      status?: string; // undefined
+      pms?: string; // undefined
+      accountingSoftware?: string; // Accounting software used by the team.
+      creation_source?: string; // undefined
+      activeListings?: number; // Active Listings
+      paymentMethodType?: string; // Payment Method
+      partnerName?: string; // Partner Name
+      billingPortalUrl?: string; // Billing Portal URL
+      billingStatus?: string; // undefined
+      billingPartner?: string; // Name of billing partner
+      // ARCHIVED
+      // firstName?: string; // undefined
+      // lastName?: string; // undefined
+      // email?: string; // undefined
+      // apps?: string; // All active connections besides pms/accounting
+      // accountingPartner?: string; // Name of accounting partner
+      // 'SaaS User'?: boolean; // undefined
+    }
+  }
+}
+
 import { Analytics } from '@june-so/analytics-node';
+import { Intercom, IntercomClient } from 'intercom-client';
+import { fetcher } from 'intercom-client/core/fetcher/Fetcher';
 import { PostHog } from 'posthog-node';
-import { useLog } from '../log';
-import { useIntercom } from './intercom';
-
-const E2E_TEST_USERS = [
-  '9e7dfc88-503c-4222-9905-9116169d2203', // lars+checkly@finalytic.co
-  '113d73d8-ee21-46b7-a12a-a74f632401ca', // e2e-invite-member@finalytic.io
-  '917b7c4e-cb03-491c-9e94-d33a5bdeca05', // e2e-invite-owner@finalytic.io
-  'ec8e5572-74d0-4ae6-af73-bca8db9a27e9', // e2e-sign-up@finalytic.io
-];
-const E2E_TEST_TEAMS = [
-  'c4fd21b4-8447-43a2-bdcb-f06a85a935ad', // VRP Automated Testing
-  '8f21060e-afe6-410a-b2f4-00a3caa20786', // test_company_xxxx
-];
-
-const isTest = (userId: string, groupId?: string) =>
-  E2E_TEST_USERS.includes(userId) ||
-  (groupId && E2E_TEST_TEAMS.includes(groupId));
-
-export type TrackingProps = {
+import { type LogBindings, type WorkerLog, useLog } from '../log';
+import { convertKeysToSnakeCase, isTest } from '../utils';
+import { convertValuesToString } from '../utils/convertValuesToString';
+import type {
+  GroupProps,
+  IdentifyProps,
+  TrackProps,
+  TrackingEvent,
+} from './types';
+
+export * from './types';
+export * from 'intercom-client';
+export * from '../utils';
+
+export type Tracking = ReturnType<typeof useTracking>;
+export type UseTracking = {
   name: string;
   dataset: string;
   env: {
-    INTERCOM_TOKEN: string;
-    JUNESO_TOKEN: string;
-    POSTHOG_TOKEN: string;
-  };
+    INTERCOM_TOKEN?: string;
+    JUNESO_TOKEN?: string;
+    POSTHOG_TOKEN?: string;
+  } & LogBindings;
+  debugging?: boolean;
 };
-export type Tracking = ReturnType<typeof useTracking>;
-
-type OptionalUser<T> = T &
-  (
-    | { userId: string; anonymousId?: string }
-    | {
-        userId?: string;
-        anonymousId: string;
-      }
-  );
 
 export const useTracking = (
-  { dataset, env, name }: TrackingProps,
+  { dataset, env, name }: UseTracking,
   isDev?: boolean
-) => {
-  const axiom = useLog({ name, dataset, env });
+): {
+  track: <T extends TrackingEvent>(props: TrackProps<T>) => Promise<void>;
+  identify: (props: IdentifyProps) => Promise<void>;
+  group: (props: GroupProps) => Promise<void>;
+  shutdown: () => Promise<any>;
+  log: WorkerLog;
+  june?: Analytics;
+  intercom?: IntercomClient;
+  posthog?: PostHog;
+} => {
+  const log = useLog({ name, dataset, env });
+
   const intercom = env.INTERCOM_TOKEN
-    ? useIntercom(env.INTERCOM_TOKEN, axiom)
+    ? new IntercomClient({
+        token: env.INTERCOM_TOKEN,
+        fetcher: (args) =>
+          fetcher({
+            ...args,
+            headers: { ...args.headers, accept: 'application/json' },
+          }),
+      })
     : undefined;
-  const juneso = env.JUNESO_TOKEN ? new Analytics(env.JUNESO_TOKEN) : undefined;
+
+  const june = env.JUNESO_TOKEN ? new Analytics(env.JUNESO_TOKEN) : undefined;
+
   const posthog = env.POSTHOG_TOKEN
     ? new PostHog(env.POSTHOG_TOKEN, {
         host: 'https://app.posthog.com',
@@ -55,96 +164,220 @@ export const useTracking = (
 
   return {
     // General
-    track: async ({
+    track: async <T extends TrackingEvent>({
       userId,
+      anonymousId,
       groupId,
       event,
       properties,
-    }: {
-      userId: string;
-      groupId: string;
-      event: string;
-      properties: Record<string, any>;
-    }) => {
-      if (isDev || isTest(userId, groupId)) return;
-
-      posthog?.capture({
-        distinctId: userId,
-        event,
-        groups: {
-          tenant: groupId,
-        },
-        properties,
-      });
-      juneso?.track({
-        userId,
-        event,
-        properties,
-        context: { groupId },
-      });
+      timestamp,
+    }: TrackProps<T>) => {
+      if (isDev || isTest(userId || anonymousId || '', groupId)) return;
 
-      try {
-        await intercom?.trackEvent({
-          user_id: userId,
-          event_name: event,
-          metadata: properties,
+      if (anonymousId) {
+        posthog?.capture({
+          distinctId: anonymousId,
+          event,
+          groups: {
+            tenant: groupId,
+          },
+          timestamp,
+          properties: convertKeysToSnakeCase(properties),
         });
-      } catch (error: any) {
-        console.error(error);
+
+        june?.track(
+          {
+            anonymousId,
+            event,
+            properties,
+            timestamp,
+            context: { groupId },
+          },
+          (err) => {
+            if (err) console.error(err);
+          }
+        );
+
+        // no intercom for anonymous
+      } else if (userId) {
+        posthog?.capture({
+          distinctId: userId,
+          event,
+          groups: {
+            tenant: groupId,
+          },
+          timestamp,
+          properties: convertKeysToSnakeCase(properties),
+        });
+
+        june?.track(
+          {
+            userId,
+            event,
+            properties,
+            timestamp,
+            context: { groupId },
+          },
+          (err) => {
+            if (err) console.error(err);
+          }
+        );
+
+        const intercomUserId = (
+          await intercom?.contacts.search({
+            query: {
+              field: 'external_id',
+              operator: Intercom.SingleFilterSearchRequestOperator.Equals,
+              value: userId,
+            },
+          })
+        )?.data.at(0)?.id;
+        if (intercomUserId)
+          await intercom?.events.create({
+            user_id: intercomUserId,
+            event_name: event,
+            metadata: convertValuesToString(properties),
+            created_at: timestamp ? timestamp.getTime() : Date.now(),
+          });
       }
     },
-    identify: ({
+    identify: async ({
       traits,
       userId,
       disableGeoip,
-    }: {
-      userId: string;
-      traits: Record<string, any>;
-      disableGeoip?: boolean;
-    }) => {
+      timestamp,
+    }: IdentifyProps) => {
       if (isDev || isTest(userId)) return;
 
       posthog?.identify({
         distinctId: userId,
-        properties: traits,
+        properties: convertKeysToSnakeCase(traits),
         disableGeoip,
       });
-      juneso?.identify({
-        userId,
-        traits,
-      });
+
+      june?.identify(
+        {
+          userId,
+          traits,
+          timestamp,
+        },
+        (err) => (err ? console.error(err) : {})
+      );
+
+      // upsert intercom user
+      const data = {
+        external_id: userId,
+        email: traits?.email,
+        name:
+          traits?.name ||
+          (traits?.firstName
+            ? `${traits.firstName} ${traits.lastName}`
+            : traits?.lastName),
+        avatar: traits?.avatar,
+        signed_up_at: traits?.createdAt
+          ? new Date(traits.createdAt).getTime() / 1000
+          : undefined,
+        last_seen_at: new Date().getTime() / 1000,
+        custom_attributes: { userType: traits?.role },
+      };
+
+      const intercomUser = (
+        await intercom?.contacts.search({
+          query: {
+            field: 'external_id',
+            operator: Intercom.SingleFilterSearchRequestOperator.Equals,
+            value: userId,
+          },
+        })
+      )?.data.at(0);
+      if (intercomUser?.id)
+        await intercom?.contacts.update(intercomUser?.id, data);
+      else await intercom?.contacts.create(data);
     },
-    group: ({
+    group: async ({
       traits,
       groupId,
       userId,
       anonymousId,
-    }: OptionalUser<{
-      groupId: string;
-      traits?: Record<string, any>;
-    }>) => {
+      timestamp,
+    }: GroupProps) => {
       if (isDev || isTest(userId || anonymousId || '', groupId)) return;
 
-      posthog?.groupIdentify({
-        groupKey: groupId,
-        groupType: 'tenant',
-        properties: traits,
-        distinctId: userId,
+      const cid = traits?.billingCustomerId || traits?.hyperlineCustomerId;
+      const intercomCompany = await intercom?.companies.create({
+        name: traits?.name,
+        company_id: groupId,
+        plan: traits?.plan,
+        remote_created_at: traits?.createdAt
+          ? new Date(traits.createdAt).getTime() / 1000
+          : undefined,
+        monthly_spend: traits?.mrr,
+        custom_attributes: {
+          teamId: groupId,
+          team: traits?.name,
+          type: traits?.type,
+          status: traits?.status,
+          pms: traits?.pms,
+          accountingSoftware: traits?.accountingSoftware,
+          activeListings: traits?.activeListings,
+          paymentMethodType: traits?.paymentMethodType,
+          partnerName: traits?.partner || traits?.accountingPartner,
+          billingPortalUrl: cid
+            ? `https://billing.vrplatform.app/portal/${cid}`
+            : undefined,
+          billingStatus: traits?.billingSubscriptionStatus,
+          billingPartner:
+            traits?.billingPartner ||
+            traits?.partner ||
+            traits?.accountingPartner,
+        },
       });
-      if (anonymousId) juneso?.group({ anonymousId, groupId, traits });
-      else if (userId) juneso?.group({ userId, groupId, traits });
+
+      if (anonymousId) {
+        posthog?.groupIdentify({
+          groupKey: groupId,
+          groupType: 'tenant',
+          properties: convertKeysToSnakeCase(traits),
+          distinctId: anonymousId,
+        });
+
+        june?.group({ anonymousId, groupId, traits, timestamp }, (err) =>
+          err ? console.error(err) : {}
+        );
+      } else if (userId) {
+        posthog?.groupIdentify({
+          groupKey: groupId,
+          groupType: 'tenant',
+          properties: convertKeysToSnakeCase(traits),
+          distinctId: userId,
+        });
+
+        june?.group({ userId, groupId, traits, timestamp }, (err) =>
+          err ? console.error(err) : {}
+        );
+
+        // attach intercom user to intercom company
+        const intercomUser = (
+          await intercom?.contacts.search({
+            query: {
+              field: 'external_id',
+              operator: Intercom.SingleFilterSearchRequestOperator.Equals,
+              value: userId,
+            },
+          })
+        )?.data.at(0);
+        if (intercomUser?.id && intercomCompany?.id)
+          intercom?.companies.attachContact(intercomUser?.id, {
+            id: intercomCompany?.id,
+          });
+      }
     },
     shutdown: async () =>
-      Promise.all([
-        posthog?.shutdown(),
-        juneso?.closeAndFlush(),
-        axiom.flush(),
-      ]),
-    // Posthog specific
-    alias: posthog?.alias,
-    isFeatureEnabled: posthog?.isFeatureEnabled,
-    // export intercom and axiom
+      Promise.all([posthog?.shutdown(), june?.closeAndFlush(), log?.flush()]),
+    // export dependencies
     intercom,
-    log: axiom,
+    posthog,
+    june,
+    log,
   };
 };