@vrplatform/log 2.0.42 → 2.0.44

package/build/module/log/index.js

@@ -1,13 +1,14 @@
 import { createBaseLog } from './baselog';
-import { getCorrelationId, getEnvironment, requestToContext } from './common';
+import { getCorrelationId, getEnvironment, getSessionId, requestToContext, } from './common';
 import { AXIOM_AUTH_TOKEN_ENV, AXIOM_DATASET_ENV, AXIOM_ORG_ID_ENV, LOG_ENV, TASK_QUEUE_HEADER, WORKFLOW_ID_HEADER, } 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, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
+export function useLog({ environment: _environment, name, request, body, env, correlationId: cid, sessionId: sid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
     const environment = _environment || getEnvironment(env);
     // const colorLogs =  env?.[LOG_ENV] === '*' || ;
     const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
+    const sessionId = sid || getSessionId(request);
     const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
     const isNodeJsCompat = typeof process !== 'undefined';
     const isDev = environment === 'development';
@@ -28,10 +29,12 @@ export function useLog({ environment: _environment, name, request, body, env, co
         app: name || 'default',
         version: version || 'default',
         correlationId,
+        sessionId,
         context: {
             ...initialContext,
             rootCorrelationId: correlationId,
             correlationId,
+            sessionId,
             taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
             workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
             child: undefined,

package/build/module/log/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,aAAa,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,OAAO,EAGP,iBAAiB,EACjB,kBAAkB,GAEnB,MAAM,QAAQ,CAAC;AAEhB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,MAAM,UAAU,MAAM,CAAC,EACrB,WAAW,EAAE,YAAY,EACzB,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,aAAa,EAAE,GAAG,EAClB,SAAS,EAAE,GAAG,EACd,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,cAAc,GAAG,EAAE,GAiB7B;IACC,MAAM,WAAW,GAAG,YAAY,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;IACxD,iDAAiD;IACjD,MAAM,aAAa,GAAG,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,8BAA8B;IACtF,MAAM,SAAS,GAAG,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;IAE/C,MAAM,cAAc,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC;IACtD,MAAM,KAAK,GAAG,WAAW,KAAK,aAAa,CAAC;IAC5C,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC;IAC5C,MAAM,UAAU,GAAG,CAAC,UAAU,IAAI,KAAK,IAAI,YAAY,CAAC;IACxD,MAAM,QAAQ,GAAG,UAAU,IAAI,cAAc,CAAC;IAE9C,MAAM,KAAK,GAAG,aAAa,CACzB;QACE,KAAK,EAAE,UAAU;QACjB,KAAK,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC;QAC9B,OAAO,EAAE,QAAQ,IAAI,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,SAAS;QAC1D,2CAA2C;QAC3C,UAAU,EAAE,WAAW,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;KAC7D,EACD;QACE,WAAW;QACX,IAAI,EAAE,QAAQ;QACd,gBAAgB;QAChB,QAAQ,EAAE,GAAG,EAAE,YAAY,IAAI,IAAI,IAAI,SAAS;QAChD,GAAG,EAAE,IAAI,IAAI,SAAS;QACtB,OAAO,EAAE,OAAO,IAAI,SAAS;QAC7B,aAAa;QACb,SAAS;QACT,OAAO,EAAE;YACP,GAAG,cAAc;YACjB,iBAAiB,EAAE,aAAa;YAChC,aAAa;YACb,SAAS;YACT,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,iBAAiB,CAAC,IAAI,SAAS;YAChE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,IAAI,SAAS;YAClE,KAAK,EAAE,SAA0B;SAClC;KACF,CACW,CAAC;IAEf,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,EAAE,GACvB,OAAO,UAAU,KAAK,UAAU;YAC9B,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;YACrB,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;gBAC7B,KAAK,EAAE,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,EAAE;oBACrC,QAAQ,EAAE;wBACR,IAAI,EAAE,IAAI;6BACP,KAAK,EAAE;6BACP,IAAI,EAAE;6BACN,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;wBACzB,QAAQ,EAAE,IAAI;wBACd,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;qBACtB;iBACF,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,sCAAsC;gBACtC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE;oBAC1B,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;gBAEH,OAAO,IAAI,QAAQ,CACjB,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EACrE;oBACE,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,KAAK,EAAE,KAAK,EAAE,CAAC;QAErB,OAAO,QAAS,CAAC;IACnB,CAAC,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC"}

package/build/module/log/type.d.ts

@@ -2,6 +2,7 @@ export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
 export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
 export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
 export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
+export declare const SESSION_ID_HEADER = "X-Session-ID";
 export declare const VERIFICATION_HEADER = "X-Verification-Key";
 export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
 export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";

package/build/module/log/type.js

@@ -3,6 +3,7 @@ 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 SESSION_ID_HEADER = 'X-Session-ID';
 export const VERIFICATION_HEADER = 'X-Verification-Key';
 // Env
 export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';

package/build/module/log/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACN,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC"}
+{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACN,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC"}

package/build/module/type.d.ts

@@ -0,0 +1,39 @@
+export type LogFn = (message: any, additionalContext?: Record<string, any>) => void;
+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;
+};
+export type ChildLogOptions = {
+    correlationId?: string;
+    name?: string;
+    request?: any;
+    context?: Record<string, any>;
+};
+type Res = Response | {
+    status: number;
+    statusText?: string;
+    headers?: Record<string, string>;
+    body?: any;
+    response?: Response;
+};
+export type BaseLog = Log & {
+    flush(): Promise<void> | void;
+};
+export type WorkerLog = BaseLog & {
+    respond(response: Res | Promise<Res> | (() => Res | Promise<Res>)): Promise<Response>;
+};
+export type RequestLike = {
+    headers: {
+        get: (key: string) => string | null;
+    };
+    method: string;
+    url: string;
+    json: () => Promise<any>;
+};
+export {};

package/build/module/type.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=type.js.map

package/build/module/type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type.js","sourceRoot":"src/","sources":["type.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrplatform/log",
-  "version": "2.0.42",
+  "version": "2.0.44",
   "main": "build/main/index.js",
   "publishConfig": {
     "access": "public"

package/src/log/baselog.ts

@@ -35,9 +35,11 @@ export function createBaseLog(
     context,
     type,
     correlationId,
+    sessionId,
     executionContext,
   }: {
     correlationId?: string;
+    sessionId?: string;
     environment?: 'development' | 'production';
     type?: 'worker' | 'durableObject';
     workerId?: string;
@@ -85,6 +87,8 @@ export function createBaseLog(
     });
   }
 
+  const sid = sessionId || crypto.randomUUID().substring(0, 13);
+
   function createBaseLog(arg: ChildLogOptions = {}): Log {
     const childContext = arg.context || {};
     if (arg.request) {
@@ -106,6 +110,7 @@ export function createBaseLog(
         ...childContext,
         ...additionalContext,
         correlationId: cid,
+        sessionId: sid,
       });
       if (consoleLog) {
         const name = arg.name ? `${app}/${arg.name}` : app;
@@ -119,7 +124,8 @@ export function createBaseLog(
 
         error = message instanceof Error ? message : error;
         message = message instanceof Error ? message.message : message;
-        const formatted = `[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`;
+        const s = [sid, cid].filter(Boolean).join('/');
+        const formatted = `[${lev}] [${name}]${s ? ` [${s}]` : ''} ${message}`;
         if (typeof consoleLog === 'function')
           consoleLog({
             formatted,
@@ -141,7 +147,7 @@ export function createBaseLog(
             .reset()
             .color('blue')
             .bold()
-            .append(cid ? `[${cid}] ` : '')
+            .append(s ? `[${s}] ` : '')
             .reset()
             .append(message)
             .log();

package/src/log/common.ts

@@ -1,4 +1,8 @@
-import { CORRELATION_ID_HEADER, type RequestLike } from './type';
+import {
+  CORRELATION_ID_HEADER,
+  type RequestLike,
+  SESSION_ID_HEADER,
+} from './type';
 
 export const requestHeadersToCapture = ['user-agent'];
 
@@ -18,6 +22,17 @@ export function getCorrelationId(request?: RequestLike) {
   );
 }
 
+export function getSessionId(request?: RequestLike) {
+  if (!request?.headers) return undefined;
+  return (
+    request.headers.get(SESSION_ID_HEADER) ||
+    request.headers.get('fi-session-id') ||
+    request.headers.get('x-session-id') ||
+    request.headers.get('session-id') ||
+    undefined
+  );
+}
+
 export function getEnvironment(env?: Record<string, any>) {
   if (env?.NODE_ENV) return env?.NODE_ENV;
   return env?.IS_LOCAL_DEV ? 'development' : 'production';

package/src/log/index.ts

@@ -1,5 +1,10 @@
 import { type ConsoleLog, createBaseLog } from './baselog';
-import { getCorrelationId, getEnvironment, requestToContext } from './common';
+import {
+  getCorrelationId,
+  getEnvironment,
+  getSessionId,
+  requestToContext,
+} from './common';
 import {
   AXIOM_AUTH_TOKEN_ENV,
   AXIOM_DATASET_ENV,
@@ -23,6 +28,7 @@ export function useLog({
   body,
   env,
   correlationId: cid,
+  sessionId: sid,
   version,
   executionContext,
   logRequest,
@@ -36,6 +42,7 @@ export function useLog({
   logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
   body?: any;
   correlationId?: string;
+  sessionId?: string;
   version?: string;
   dataset?: string;
   env?: LogBindings;
@@ -48,6 +55,7 @@ export function useLog({
   const environment = _environment || getEnvironment(env);
   // const colorLogs =  env?.[LOG_ENV] === '*' || ;
   const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
+  const sessionId = sid || getSessionId(request);
 
   const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
 
@@ -73,10 +81,12 @@ export function useLog({
       app: name || 'default',
       version: version || 'default',
       correlationId,
+      sessionId,
       context: {
         ...initialContext,
         rootCorrelationId: correlationId,
         correlationId,
+        sessionId,
         taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
         workflowId: request?.headers?.get(WORKFLOW_ID_HEADER) || undefined,
         child: undefined as any as string,

package/src/log/type.ts

@@ -3,6 +3,7 @@ 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 SESSION_ID_HEADER = 'X-Session-ID';
 export const VERIFICATION_HEADER = 'X-Verification-Key';
 
 // Env

package/build/main/tracking/_intercom.d.ts

@@ -1,109 +0,0 @@
-import type { Log } from '../log';
-export declare class IntercomAPI {
-    constructor(token: string, log?: Log);
-    private headers;
-    private log?;
-    private fetch;
-    getUserByUserId(userId: string): Promise<{
-        type: "list";
-        data: {
-            id: string;
-        }[] | undefined;
-        total_count: 0;
-        pages: {
-            type: "pages";
-            page: 1;
-            per_page: 10;
-            total_pages: 0;
-        };
-    } | undefined>;
-    createUser({ data, userId, }: {
-        userId: string;
-        data: {
-            email: string;
-            name: string;
-            custom_attributes: Record<string, any>;
-        };
-    }): Promise<unknown>;
-    updateUser({ data, contactId, }: {
-        contactId: string;
-        data: {
-            email?: string;
-            name?: string;
-            custom_attributes: Record<string, any>;
-            [key: string]: any;
-        };
-    }): Promise<unknown>;
-    deleteUser(intercom_contact_id: string): Promise<{
-        id: "6657adf56abd0167d9419d1c";
-        external_id: "70";
-        type: "contact";
-        deleted: true;
-    } | undefined>;
-    createCompanyUser(data: {
-        intercom_contact_id: string;
-        intercom_company_id: string;
-    }): Promise<unknown>;
-    deleteCompanyUser({ intercom_company_id, intercom_contact_id, }: {
-        intercom_contact_id: string;
-        intercom_company_id: string;
-    }): Promise<{
-        id: "6657adc96abd0167d9419ca7";
-    } | undefined>;
-    trackEvent(data: {
-        user_id: string;
-        event_name: string;
-        metadata: Record<string, any>;
-    }): Promise<unknown>;
-    getCompanyByTenantId(tenantId: string): Promise<{
-        type: "list";
-        data: [{
-            type: "company";
-            company_id: "remote_companies_scroll_2";
-            id: "664df5436abd01f7945e1a78";
-            app_id: "this_is_an_id111_that_should_be_at_least_";
-            name: "IntercomQATest1";
-            remote_created_at: 1716385091;
-            created_at: 1716385091;
-            updated_at: 1716385091;
-            monthly_spend: 0;
-            session_count: 0;
-            user_count: 4;
-            tags: {
-                type: "tag.list";
-                tags: [];
-            };
-            segments: {
-                type: "segment.list";
-                segments: [];
-            };
-            custom_attributes: Record<string, string>;
-        }] | undefined;
-        pages: {
-            type: "pages";
-            next: null;
-            page: 1;
-            per_page: 15;
-            total_pages: 1;
-        };
-        total_count: 1;
-    } | undefined>;
-    createCompany({ data, tenantId, }: {
-        tenantId: string;
-        data: {
-            name: string;
-            remote_created_at: number;
-            custom_attributes: Record<string, any>;
-        };
-    }): Promise<unknown>;
-    updateCompany({ data, companyId, }: {
-        companyId: string;
-        data: Record<string, any>;
-    }): Promise<unknown>;
-    deleteCompany(intercom_company_id: string): Promise<{
-        id: "6657adc96abd0167d9419ca7";
-        object: "company";
-        deleted: true;
-    } | undefined>;
-}
-export declare function useIntercom(token: string, log?: Log): IntercomAPI;

package/build/main/tracking/_intercom.js

@@ -1,139 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IntercomAPI = void 0;
-exports.useIntercom = useIntercom;
-class IntercomAPI {
-    constructor(token, log) {
-        this.headers = {
-            'Content-Type': 'application/json',
-            Accept: 'application/json',
-            'Intercom-Version': '2.11',
-            Authorization: `Bearer ${token}`,
-        };
-        this.log = 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',
-                headers: this.headers,
-                ...options,
-            });
-            if (!result.ok) {
-                this.log?.info('Failed to fetch from Intercom', {
-                    result: {
-                        status: result.status,
-                        statusText: result.statusText,
-                        body: await result.text(),
-                    },
-                });
-                if (result.status === 404)
-                    return undefined;
-                if (result.status === 429) {
-                    console.log('Intercom rate limit exceeded, waiting for 1 minute');
-                    // X-RateLimit-Reset: 1487332520 => timestamp from header response when resetting
-                    const reset = Number(result.headers.get('X-RateLimit-Reset'));
-                    if (reset) {
-                        const now = Math.floor(Date.now() / 1000);
-                        const wait = reset - now + 1;
-                        console.log(`Waiting for ${wait} seconds`);
-                        await new Promise((resolve) => setTimeout(resolve, wait * 1000));
-                        return await this.fetch(path, options);
-                    }
-                }
-            }
-            return result.status === 202 ? {} : (await result.json());
-        }
-        catch (error) {
-            this.log?.error(error);
-            return undefined;
-        }
-    }
-    // User
-    async getUserByUserId(userId) {
-        return await this.fetch('/contacts/search', {
-            method: 'POST',
-            data: {
-                query: {
-                    field: 'external_id',
-                    operator: '=',
-                    value: userId,
-                },
-            },
-        });
-    }
-    async createUser({ data, userId, }) {
-        return await this.fetch('/contacts', {
-            method: 'POST',
-            data: { ...data, external_id: userId },
-        });
-    }
-    async updateUser({ data, contactId, }) {
-        return await this.fetch(`/contacts/${contactId}`, {
-            method: 'PUT',
-            data,
-        });
-    }
-    async deleteUser(intercom_contact_id) {
-        return await this.fetch(`/contacts/${intercom_contact_id}`, {
-            method: 'DELETE',
-        });
-    }
-    async createCompanyUser(data) {
-        return await this.fetch(`/contacts/${data.intercom_contact_id}/companies`, {
-            method: 'POST',
-            data: {
-                id: data.intercom_company_id,
-            },
-        });
-    }
-    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,
-            },
-        });
-    }
-    // Company
-    async getCompanyByTenantId(tenantId) {
-        return await this.fetch(`/companies?company_id=${tenantId}`, {
-            method: 'GET',
-        });
-    }
-    async createCompany({ data, tenantId, }) {
-        return await this.fetch('/companies', {
-            method: 'POST',
-            data: {
-                ...data,
-                company_id: tenantId,
-            },
-        });
-    }
-    async updateCompany({ data, companyId, }) {
-        return await this.fetch(`/companies/${companyId}`, {
-            method: 'PUT',
-            data,
-        });
-    }
-    async deleteCompany(intercom_company_id) {
-        return await this.fetch(`/companies/${intercom_company_id}`, {
-            method: 'DELETE',
-        });
-    }
-}
-exports.IntercomAPI = IntercomAPI;
-function useIntercom(token, log) {
-    return new IntercomAPI(token, log);
-}
-//# sourceMappingURL=_intercom.js.map

package/build/main/tracking/_intercom.js.map

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

package/build/main/tracking/eventTypes.d.ts

@@ -1,16 +0,0 @@
-type AuthEvent = 'account_signin_completed' | 'account_signup_code_requested' | 'account_signup_code_completed' | 'account_signup_code_failed' | 'account_signup_completed' | 'account_password_reset_requested' | 'account_password_reset_failed' | 'account_password_reset_completed' | 'account_invitation_accepted' | 'account_signed_out';
-type TeamEvent = 'team_added' | 'team_info_updated' | 'team_deleted' | 'team_member_removed';
-type ConnectionEvent = 'connection_created' | 'connection_reconnected' | 'connection_deleted' | 'connection_requested';
-type OwnershipEvent = 'ownership_created' | 'ownership_updated' | 'ownership_deleted';
-type OwnerEvent = 'owner_created' | 'owner_updated' | 'owner_deleted' | 'owner_tax_info_modal_opened' | 'owner_tax_info_modal_submitted';
-type SetupEvent = 'setup_classes_set' | 'setup_accounting_version_completed' | 'setup_accounting_config_completed' | 'setup_owner_imported' | 'setup_listing_imported';
-type AutomationEvent = 'automation_created' | 'automation_updated' | 'automation_deleted';
-type TaxStatementEvent = 'tax_statement_preview_opened' | 'tax_statement_downloaded';
-type GLOwnerStatementEvent = 'gl_owner_statement_preview_opened' | 'gl_owner_statement_downloaded';
-type HyperlineEvent = 'hyperline_invoice_ready' | 'hyperline_invoice_settled' | 'hyperline_trial_started' | 'hyperline_trial_ended' | 'hyperline_subscription_activated' | 'hyperline_subscription_cancelled' | 'hyperline_subscription_created' | 'hyperline_subscription_errored' | 'hyperline_subscription_paused' | 'hyperline_subscription_voided' | 'hyperline_subscription_charged' | 'hyperline_customer_created' | 'hyperline_customer_updated' | 'hyperline_payment_method_created' | 'hyperline_payment_method_errored' | 'hyperline_payment_method_deleted';
-type ListingEvent = 'listing_activated' | 'listing_deactivated';
-type ReportEvent = 'listings_reported';
-type UserEvent = 'update_refresh_accepted' | 'owner_statement_opened';
-type TestEvent = 'test_event' | 'test_error';
-export type TrackingEvent = AuthEvent | TeamEvent | ConnectionEvent | OwnershipEvent | OwnerEvent | SetupEvent | AutomationEvent | TaxStatementEvent | GLOwnerStatementEvent | HyperlineEvent | UserEvent | ListingEvent | ReportEvent | TestEvent;
-export {};

package/build/main/tracking/eventTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eventTypes.js","sourceRoot":"src/","sources":["tracking/eventTypes.ts"],"names":[],"mappings":""}

package/build/main/tracking/intercom.d.ts

@@ -1,109 +0,0 @@
-import type { Log } from '../log';
-export declare class IntercomAPI {
-    constructor(token: string, log?: Log);
-    private headers;
-    private log?;
-    private fetch;
-    getUserByUserId(userId: string): Promise<{
-        type: "list";
-        data: {
-            id: string;
-        }[] | undefined;
-        total_count: 0;
-        pages: {
-            type: "pages";
-            page: 1;
-            per_page: 10;
-            total_pages: 0;
-        };
-    } | undefined>;
-    createUser({ data, userId, }: {
-        userId: string;
-        data: {
-            email: string;
-            name: string;
-            custom_attributes: Record<string, any>;
-        };
-    }): Promise<unknown>;
-    updateUser({ data, contactId, }: {
-        contactId: string;
-        data: {
-            email?: string;
-            name?: string;
-            custom_attributes: Record<string, any>;
-            [key: string]: any;
-        };
-    }): Promise<unknown>;
-    deleteUser(intercom_contact_id: string): Promise<{
-        id: "6657adf56abd0167d9419d1c";
-        external_id: "70";
-        type: "contact";
-        deleted: true;
-    } | undefined>;
-    createCompanyUser(data: {
-        intercom_contact_id: string;
-        intercom_company_id: string;
-    }): Promise<unknown>;
-    deleteCompanyUser({ intercom_company_id, intercom_contact_id, }: {
-        intercom_contact_id: string;
-        intercom_company_id: string;
-    }): Promise<{
-        id: "6657adc96abd0167d9419ca7";
-    } | undefined>;
-    trackEvent(data: {
-        user_id: string;
-        event_name: string;
-        metadata: Record<string, any>;
-    }): Promise<unknown>;
-    getCompanyByTenantId(tenantId: string): Promise<{
-        type: "list";
-        data: [{
-            type: "company";
-            company_id: "remote_companies_scroll_2";
-            id: "664df5436abd01f7945e1a78";
-            app_id: "this_is_an_id111_that_should_be_at_least_";
-            name: "IntercomQATest1";
-            remote_created_at: 1716385091;
-            created_at: 1716385091;
-            updated_at: 1716385091;
-            monthly_spend: 0;
-            session_count: 0;
-            user_count: 4;
-            tags: {
-                type: "tag.list";
-                tags: [];
-            };
-            segments: {
-                type: "segment.list";
-                segments: [];
-            };
-            custom_attributes: Record<string, string>;
-        }] | undefined;
-        pages: {
-            type: "pages";
-            next: null;
-            page: 1;
-            per_page: 15;
-            total_pages: 1;
-        };
-        total_count: 1;
-    } | undefined>;
-    createCompany({ data, tenantId, }: {
-        tenantId: string;
-        data: {
-            name: string;
-            remote_created_at: number;
-            custom_attributes: Record<string, any>;
-        };
-    }): Promise<unknown>;
-    updateCompany({ data, companyId, }: {
-        companyId: string;
-        data: Record<string, any>;
-    }): Promise<unknown>;
-    deleteCompany(intercom_company_id: string): Promise<{
-        id: "6657adc96abd0167d9419ca7";
-        object: "company";
-        deleted: true;
-    } | undefined>;
-}
-export declare function useIntercom(token: string, log?: Log): IntercomAPI;