@vrplatform/log 1.0.13 → 1.0.15

package/build/module/tracking/intercom.js

@@ -0,0 +1,121 @@
+export class IntercomAPI {
+    constructor(token, log) {
+        this.headers = {
+            'Content-Type': 'application/json',
+            Accept: 'application/json',
+            'Intercom-Version': '2.11',
+            Authorization: `Bearer ${token}`,
+        };
+        this.log = log;
+    }
+    headers;
+    log;
+    async fetch(path, options) {
+        if (options?.data) {
+            options.body = JSON.stringify(options.data);
+            options.data = undefined;
+        }
+        try {
+            const result = await fetch(`https://api.intercom.io${path}`, {
+                method: 'GET',
+                ...options,
+                headers: this.headers,
+            });
+            if (!result.ok) {
+                this.log.info('Failed to fetch from Intercom', {
+                    result: {
+                        status: result.status,
+                        statusText: result.statusText,
+                        body: await result.text(),
+                    },
+                });
+                return undefined;
+            }
+            return result.status === 202 ? {} : (await result.json());
+        }
+        catch (error) {
+            this.log.error(error);
+            return undefined;
+        }
+    }
+    async updateUser({ data, contactId, }) {
+        return await this.fetch(`/contacts/${contactId}`, {
+            method: 'PUT',
+            data,
+        });
+    }
+    async updateCompany({ data, companyId, }) {
+        return await this.fetch(`/companies/${companyId}`, {
+            method: 'PUT',
+            data,
+        });
+    }
+    async createUser({ data, userId, }) {
+        return await this.fetch('/contacts', {
+            method: 'POST',
+            data: { ...data, external_id: userId },
+        });
+    }
+    async createCompany({ data, tenantId, }) {
+        return await this.fetch('/companies', {
+            method: 'POST',
+            data: {
+                ...data,
+                company_id: tenantId,
+            },
+        });
+    }
+    async createCompanyUser(data) {
+        return await this.fetch(`/contacts/${data.intercom_contact_id}/companies`, {
+            method: 'POST',
+            data: {
+                id: data.intercom_company_id,
+            },
+        });
+    }
+    async getCompanyByTenantId(tenantId) {
+        return await this.fetch(`/companies?company_id=${tenantId}`, {
+            method: 'GET',
+        });
+    }
+    async getUserByUserId(userId) {
+        return await this.fetch('/contacts/search', {
+            method: 'POST',
+            data: {
+                query: {
+                    field: 'external_id',
+                    operator: '=',
+                    value: userId,
+                },
+            },
+        });
+    }
+    async deleteUser(intercom_contact_id) {
+        return await this.fetch(`/contacts/${intercom_contact_id}`, {
+            method: 'DELETE',
+        });
+    }
+    async deleteCompany(intercom_company_id) {
+        return await this.fetch(`/companies/${intercom_company_id}`, {
+            method: 'DELETE',
+        });
+    }
+    async deleteCompanyUser({ intercom_company_id, intercom_contact_id, }) {
+        return await this.fetch(`/contacts/${intercom_contact_id}/companies/${intercom_company_id}`, {
+            method: 'DELETE',
+        });
+    }
+    async trackEvent(data) {
+        return await this.fetch('/events', {
+            method: 'POST',
+            data: {
+                created_at: Math.floor(new Date().getTime() / 1000), // to seconds
+                ...data,
+            },
+        });
+    }
+}
+export function useIntercom(token, log) {
+    return new IntercomAPI(token, log);
+}
+//# sourceMappingURL=intercom.js.map

package/build/module/tracking/intercom.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"intercom.js","sourceRoot":"src/","sources":["tracking/intercom.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,30 @@
 {
   "name": "@vrplatform/log",
-  "version": "1.0.13",
-  "main": "build/main/index.js",
+  "version": "1.0.15",
+  "main": "src/index.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "main": "build/main/index.js",
+    "typings": "build/main/index.d.ts",
+    "module": "build/module/index.js"
   },
   "description": "Finalytic cf",
   "repository": "https://github.com/finalytic/ecosystem",
   "license": "UNLICENSED",
   "keywords": [],
+  "scripts": {
+    "pub": "bun run build && npm version patch --no-commit-hooks --no-git-tag-version && npm publish --no-git-checks",
+    "build": "bun build:main & bun build:module",
+    "build:main": "tsc -b tsconfig.main.json",
+    "build:module": "tsc -b tsconfig.esm.json",
+    "typecheck": "tsc --noEmit",
+    "lint": "biome check .",
+    "lint:fix": "biome check --apply-unsafe --skip-errors .",
+    "pre-commit": "echo precommit",
+    "pre-push": "bun typecheck && bun lint",
+    "post-merge": "bun i",
+    "prepare": "husky"
+  },
   "files": [
     "build/main",
     "build/module",
@@ -17,15 +33,19 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@axiomhq/js": "1.0.0-rc.3"
+    "@axiomhq/js": "1.0.0-rc.3",
+    "@june-so/analytics-node": "^8.0.0",
+    "posthog-node": "^4.0.1",
+    "serialize-error": "11.0.3"
   },
-  "scripts": {
-    "pub": "bun run build && pnpm publish --no-git-checks",
-    "build": "bun build:main & bun build:module",
-    "build:main": "tsc -b tsconfig.main.json",
-    "build:module": "tsc -b tsconfig.esm.json",
-    "typecheck": "tsc --noEmit"
+  "devDependencies": {
+    "@biomejs/biome": "1.8.3",
+    "@cloudflare/workers-types": "4.20240620.0",
+    "@types/node": "^20.14.9",
+    "husky": "^9.0.11",
+    "typescript": "5.5.3"
   },
-  "typings": "build/main/index.d.ts",
-  "module": "build/module/index.js"
-}
+  "trustedDependencies": [
+    "@biomejs/biome"
+  ]
+}

package/src/index.ts

@@ -1,127 +1,2 @@
-import { createBaseLog } from './baselog';
-import {
-  AXIOM_AUTH_TOKEN_ENV,
-  AXIOM_DATASET_ENV,
-  AXIOM_ORG_ID_ENV,
-  LOG_ENV,
-  TASK_QUEUE_HEADER,
-  WORKFLOW_ID_HEADER,
-  getCorrelationId,
-  getEnvironment,
-  requestToContext,
-} from './common';
-import type { RequestLike, WorkerLog } from './type';
-
-export * from './common';
-export * from './baselog';
-export * from './type';
-
-export function useLog({
-  environment: _environment,
-  name,
-  request,
-  body,
-  env,
-  correlationId: cid,
-  version,
-  executionContext,
-  logRequest,
-  dataset: _dataset,
-  context: initialContext = {},
-}: {
-  environment?: string;
-  name: string;
-  request?: RequestLike & { cf?: any };
-  logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
-  body?: any;
-  correlationId?: string;
-  version?: string;
-  dataset?: string;
-  env?: Record<string, any>;
-  context?: Record<string, any>;
-  executionContext?: {
-    waitUntil(promise: Promise<any>): void;
-  };
-}): WorkerLog {
-  const environment = _environment || getEnvironment(env);
-  const colorLogs = env?.[LOG_ENV] === '*' || environment === 'development';
-  const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
-
-  const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
-
-  const axiom = createBaseLog(
-    {
-      token: axiomToken,
-      orgId: env?.[AXIOM_ORG_ID_ENV],
-      dataset: _dataset || env?.[AXIOM_DATASET_ENV] || 'default',
-      consoleLog: colorLogs ? 'color' : false,
-    },
-    {
-      environment,
-      type: 'worker',
-      executionContext,
-      workerId: env?.MACHINE_NAME || name || 'default',
-      app: name || 'default',
-      version: version || 'default',
-      correlationId,
-      context: {
-        ...initialContext,
-        rootCorrelationId: correlationId,
-        correlationId,
-        taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
-        workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
-        child: undefined as any as string,
-      },
-    }
-  ) as WorkerLog;
-
-  if (logRequest !== false) {
-    const { message, ...raw } =
-      typeof logRequest === 'function'
-        ? logRequest(requestToContext(request, body))
-        : requestToContext(request, body);
-    axiom.info(message || 'Request', raw);
-  }
-
-  axiom.respond = async (res) => {
-    const temp = await (typeof res === 'function' ? res() : res);
-
-    const response = (() => {
-      if (temp instanceof Response) {
-        axiom?.info(`Response ${temp.status}`, {
-          response: {
-            body: temp
-              .clone()
-              .json()
-              .catch(() => undefined),
-            response: temp,
-            status: temp.status,
-            statusText: temp.statusText,
-            headers: temp.headers,
-          },
-        });
-
-        return temp;
-      } else {
-        // We have no response status code YET
-        axiom?.info('Response 200', {
-          response: temp,
-        });
-
-        return new Response(
-          typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body,
-          {
-            status: temp.status,
-            statusText: temp.statusText,
-            headers: temp.headers,
-          }
-        );
-      }
-    })();
-
-    await axiom?.flush();
-
-    return response!;
-  };
-  return axiom;
-}
+export * from './log';
+export * from './tracking';

package/src/{common.ts → log/common.ts}

@@ -83,7 +83,10 @@ export function requestToContext(
     headers: getHeaderMap(request?.headers),
     method: request?.method,
     cloudflare: cf as any,
-    body: body || undefined,
+    body:
+      body && typeof body === 'object'
+        ? JSON.stringify(body)
+        : body || undefined,
   };
   if (request?.url) {
     const url = new URL(request.url);

package/src/log/index.ts

@@ -0,0 +1,127 @@
+import { createBaseLog } from './baselog';
+import {
+  AXIOM_AUTH_TOKEN_ENV,
+  AXIOM_DATASET_ENV,
+  AXIOM_ORG_ID_ENV,
+  LOG_ENV,
+  TASK_QUEUE_HEADER,
+  WORKFLOW_ID_HEADER,
+  getCorrelationId,
+  getEnvironment,
+  requestToContext,
+} from './common';
+import type { RequestLike, WorkerLog } from './type';
+
+export * from './common';
+export * from './baselog';
+export * from './type';
+
+export function useLog({
+  environment: _environment,
+  name,
+  request,
+  body,
+  env,
+  correlationId: cid,
+  version,
+  executionContext,
+  logRequest,
+  dataset: _dataset,
+  context: initialContext = {},
+}: {
+  environment?: string;
+  name: string;
+  request?: RequestLike & { cf?: any };
+  logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
+  body?: any;
+  correlationId?: string;
+  version?: string;
+  dataset?: string;
+  env?: Record<string, any>;
+  context?: Record<string, any>;
+  executionContext?: {
+    waitUntil(promise: Promise<any>): void;
+  };
+}): WorkerLog {
+  const environment = _environment || getEnvironment(env);
+  const colorLogs = env?.[LOG_ENV] === '*' || environment === 'development';
+  const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
+
+  const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
+
+  const axiom = createBaseLog(
+    {
+      token: axiomToken,
+      orgId: env?.[AXIOM_ORG_ID_ENV],
+      dataset: _dataset || env?.[AXIOM_DATASET_ENV] || 'default',
+      consoleLog: colorLogs ? 'color' : false,
+    },
+    {
+      environment,
+      type: 'worker',
+      executionContext,
+      workerId: env?.MACHINE_NAME || name || 'default',
+      app: name || 'default',
+      version: version || 'default',
+      correlationId,
+      context: {
+        ...initialContext,
+        rootCorrelationId: correlationId,
+        correlationId,
+        taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
+        workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
+        child: undefined as any as string,
+      },
+    }
+  ) as WorkerLog;
+
+  if (logRequest !== false) {
+    const { message, ...raw } =
+      typeof logRequest === 'function'
+        ? logRequest(requestToContext(request, body))
+        : requestToContext(request, body);
+    axiom.info(message || 'Request', raw);
+  }
+
+  axiom.respond = async (res) => {
+    const temp = await (typeof res === 'function' ? res() : res);
+
+    const response = (() => {
+      if (temp instanceof Response) {
+        axiom?.info(`Response ${temp.status}`, {
+          response: {
+            body: temp
+              .clone()
+              .json()
+              .catch(() => undefined),
+            response: temp,
+            status: temp.status,
+            statusText: temp.statusText,
+            headers: temp.headers,
+          },
+        });
+
+        return temp;
+      } else {
+        // We have no response status code YET
+        axiom?.info('Response 200', {
+          response: temp,
+        });
+
+        return new Response(
+          typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body,
+          {
+            status: temp.status,
+            statusText: temp.statusText,
+            headers: temp.headers,
+          }
+        );
+      }
+    })();
+
+    await axiom?.flush();
+
+    return response!;
+  };
+  return axiom;
+}

package/src/tracking/index.ts

@@ -0,0 +1,131 @@
+import { Analytics } from '@june-so/analytics-node';
+import { PostHog } from 'posthog-node';
+import { useLog } from '../log';
+import { type IntercomAPI, useIntercom } from './intercom';
+
+type Props = {
+  name: string;
+  dataset: string;
+  env: {
+    INTERCOM_TOKEN: string;
+    JUNESO_ANALYTICS_WRITE_KEY: string;
+    POSTHOG_API_KEY: string;
+  };
+};
+
+export type Tracking = ReturnType<typeof useTracking>;
+
+export const useTracking = ({ dataset, env, name }: Props, isDev: boolean) => {
+  const log = useLog({ name, dataset, env });
+  const intercom = useIntercom(env.INTERCOM_TOKEN, log);
+  const juneso = new Analytics(env.JUNESO_ANALYTICS_WRITE_KEY);
+  const posthog = new PostHog(env.POSTHOG_API_KEY, {
+    host: 'https://app.posthog.com',
+  });
+
+  return {
+    track: async ({
+      userId,
+      event,
+      tenantId,
+      properties,
+    }: {
+      userId: string;
+      event: string;
+      tenantId: string;
+      properties: Record<string, any>;
+    }) => {
+      if (isDev) return;
+
+      posthog.capture({
+        distinctId: userId,
+        event,
+        groups: {
+          tenant: tenantId,
+        },
+        properties,
+      });
+      juneso.track({
+        userId,
+        event,
+        properties,
+        context: { groupId: tenantId },
+      });
+
+      try {
+        await intercom.trackEvent({
+          user_id: userId,
+          event_name: event,
+          metadata: properties,
+        });
+      } catch (error: any) {
+        console.error(error);
+      }
+    },
+    identify: ({
+      properties,
+      userId,
+    }: { userId: string; properties: Record<string, any> }) => {
+      posthog.identify({
+        distinctId: userId,
+        properties,
+      });
+      juneso.identify({
+        userId,
+        traits: properties,
+      });
+    },
+    group: ({
+      properties,
+      tenantId,
+      userId,
+    }: {
+      tenantId: string;
+      userId: string;
+      properties: Record<string, any>;
+    }) => {
+      posthog.groupIdentify({
+        groupKey: tenantId,
+        groupType: 'tenant',
+        properties,
+        distinctId: userId,
+      });
+      juneso.group({
+        userId,
+        groupId: tenantId,
+        traits: properties,
+      });
+    },
+    alias: ({ distinctId, alias }: { distinctId: string; alias: string }) =>
+      posthog.alias({ distinctId, alias }),
+    shutdown: async () => {
+      await posthog.shutdown();
+      await juneso.closeAndFlush();
+    },
+    setIntercomCompanyAttributes: async ({
+      tenantId,
+      customerId,
+      data,
+    }: {
+      tenantId: string;
+      customerId: string;
+      data: Parameters<IntercomAPI['updateCompany']>[0]['data'];
+    }) => {
+      const intercomCompanies = await intercom.getCompanyByTenantId(tenantId);
+      const intercomCompany = intercomCompanies?.data?.[0];
+
+      if (!intercomCompany) return;
+
+      await intercom.updateCompany({
+        companyId: intercomCompany.id,
+        data: {
+          ...data,
+          custom_attributes: {
+            ...data.custom_attributes,
+            billingPortalUrl: `https://billing.vrplatform.app/portal/${customerId}`,
+          },
+        },
+      });
+    },
+  };
+};