@zapier/zapier-sdk 0.15.3 → 0.15.4

package/dist/index.d.mts

@@ -330,7 +330,7 @@ interface EventEmissionContext {
         transport: EventTransport;
         config: EventEmissionConfig;
         emit<T extends any>(subject: string, event: T): void;
-        createBaseEvent(): BaseEvent;
+        createBaseEvent(): Promise<BaseEvent>;
     };
 }
 interface EventEmissionProvides {
@@ -455,19 +455,19 @@ declare const ActionSchema: z.ZodObject<{
     key: string;
     name: string;
     description: string;
+    selected_api?: string | undefined;
     id?: string | undefined;
     is_important?: boolean | undefined;
     is_hidden?: boolean | undefined;
-    selected_api?: string | undefined;
 }, {
     type: "search" | "filter" | "read" | "read_bulk" | "run" | "search_and_write" | "search_or_write" | "write";
     key: string;
     name: string;
     description: string;
+    selected_api?: string | undefined;
     id?: string | undefined;
     is_important?: boolean | undefined;
     is_hidden?: boolean | undefined;
-    selected_api?: string | undefined;
 }>;
 declare const ChoiceSchema: z.ZodObject<{
     value: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
@@ -616,17 +616,17 @@ declare const AuthenticationSchema: z.ZodObject<{
     members: z.ZodOptional<z.ZodString>;
     permissions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
+    account_id: number;
+    selected_api: string;
     id: number;
     date: string;
-    selected_api: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    customuser_id?: number | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
-    customuser_id?: number | undefined;
     destination_selected_api?: string | null | undefined;
     is_stale?: string | undefined;
     is_shared?: string | undefined;
@@ -637,17 +637,17 @@ declare const AuthenticationSchema: z.ZodObject<{
     members?: string | undefined;
     permissions?: Record<string, boolean> | undefined;
 }, {
+    account_id: number;
+    selected_api: string;
     id: number;
     date: string;
-    selected_api: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    customuser_id?: number | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
-    customuser_id?: number | undefined;
     destination_selected_api?: string | null | undefined;
     is_stale?: string | undefined;
     is_shared?: string | undefined;
@@ -684,17 +684,17 @@ declare const AuthenticationsResponseSchema: z.ZodObject<{
         members: z.ZodOptional<z.ZodString>;
         permissions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
+        account_id: number;
+        selected_api: string;
         id: number;
         date: string;
-        selected_api: string;
-        account_id: number;
         is_invite_only: boolean;
         is_private: boolean;
         shared_with_all: boolean;
         url?: string | undefined;
+        customuser_id?: number | undefined;
         label?: string | null | undefined;
         lastchanged?: string | undefined;
-        customuser_id?: number | undefined;
         destination_selected_api?: string | null | undefined;
         is_stale?: string | undefined;
         is_shared?: string | undefined;
@@ -705,17 +705,17 @@ declare const AuthenticationsResponseSchema: z.ZodObject<{
         members?: string | undefined;
         permissions?: Record<string, boolean> | undefined;
     }, {
+        account_id: number;
+        selected_api: string;
         id: number;
         date: string;
-        selected_api: string;
-        account_id: number;
         is_invite_only: boolean;
         is_private: boolean;
         shared_with_all: boolean;
         url?: string | undefined;
+        customuser_id?: number | undefined;
         label?: string | null | undefined;
         lastchanged?: string | undefined;
-        customuser_id?: number | undefined;
         destination_selected_api?: string | null | undefined;
         is_stale?: string | undefined;
         is_shared?: string | undefined;
@@ -729,17 +729,17 @@ declare const AuthenticationsResponseSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     count: number;
     results: {
+        account_id: number;
+        selected_api: string;
         id: number;
         date: string;
-        selected_api: string;
-        account_id: number;
         is_invite_only: boolean;
         is_private: boolean;
         shared_with_all: boolean;
         url?: string | undefined;
+        customuser_id?: number | undefined;
         label?: string | null | undefined;
         lastchanged?: string | undefined;
-        customuser_id?: number | undefined;
         destination_selected_api?: string | null | undefined;
         is_stale?: string | undefined;
         is_shared?: string | undefined;
@@ -755,17 +755,17 @@ declare const AuthenticationsResponseSchema: z.ZodObject<{
 }, {
     count: number;
     results: {
+        account_id: number;
+        selected_api: string;
         id: number;
         date: string;
-        selected_api: string;
-        account_id: number;
         is_invite_only: boolean;
         is_private: boolean;
         shared_with_all: boolean;
         url?: string | undefined;
+        customuser_id?: number | undefined;
         label?: string | null | undefined;
         lastchanged?: string | undefined;
-        customuser_id?: number | undefined;
         destination_selected_api?: string | null | undefined;
         is_stale?: string | undefined;
         is_shared?: string | undefined;
@@ -3022,7 +3022,7 @@ declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     groups: z.ZodOptional<z.ZodString>;
     members: z.ZodOptional<z.ZodString>;
     permissions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
-}, "selected_api" | "customuser_id"> & {
+}, "customuser_id" | "selected_api"> & {
     implementation_id: z.ZodOptional<z.ZodString>;
     is_expired: z.ZodOptional<z.ZodString>;
     expired_at: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -3030,9 +3030,9 @@ declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     app_version: z.ZodOptional<z.ZodString>;
     user_id: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
+    account_id: number;
     id: number;
     date: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
@@ -3055,9 +3055,9 @@ declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     app_key?: string | undefined;
     app_version?: string | undefined;
 }, {
+    account_id: number;
     id: number;
     date: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
@@ -3101,7 +3101,7 @@ declare const AuthItemSchema: z.ZodObject<Omit<{
     groups: z.ZodOptional<z.ZodString>;
     members: z.ZodOptional<z.ZodString>;
     permissions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
-}, "selected_api" | "customuser_id"> & {
+}, "customuser_id" | "selected_api"> & {
     implementation_id: z.ZodOptional<z.ZodString>;
     is_expired: z.ZodOptional<z.ZodString>;
     expired_at: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -3109,9 +3109,9 @@ declare const AuthItemSchema: z.ZodObject<Omit<{
     app_version: z.ZodOptional<z.ZodString>;
     user_id: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
+    account_id: number;
     id: number;
     date: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
@@ -3134,9 +3134,9 @@ declare const AuthItemSchema: z.ZodObject<Omit<{
     app_key?: string | undefined;
     app_version?: string | undefined;
 }, {
+    account_id: number;
     id: number;
     date: string;
-    account_id: number;
     is_invite_only: boolean;
     is_private: boolean;
     shared_with_all: boolean;
@@ -3170,7 +3170,7 @@ declare const ActionItemSchema: z.ZodObject<Omit<{
     is_important: z.ZodOptional<z.ZodBoolean>;
     is_hidden: z.ZodOptional<z.ZodBoolean>;
     selected_api: z.ZodOptional<z.ZodString>;
-}, "type" | "name" | "selected_api"> & {
+}, "type" | "selected_api" | "name"> & {
     app_key: z.ZodString;
     app_version: z.ZodOptional<z.ZodString>;
     action_type: z.ZodEnum<["filter", "read", "read_bulk", "run", "search", "search_and_write", "search_or_write", "write"]>;

package/dist/index.mjs

@@ -3177,6 +3177,34 @@ function getAuthorizationHeader(token) {
   }
   return `Bearer ${token}`;
 }
+function extractUserIdsFromJwt(token) {
+  try {
+    const parts = token.split(".");
+    if (parts.length !== 3) {
+      return { customuser_id: null, account_id: null };
+    }
+    const payload = JSON.parse(
+      Buffer.from(parts[1], "base64url").toString("utf-8")
+    );
+    let actualPayload = payload;
+    if (payload.sub_type === "service" && payload.njwt) {
+      const nestedParts = payload.njwt.split(".");
+      if (nestedParts.length === 3) {
+        actualPayload = JSON.parse(
+          Buffer.from(nestedParts[1], "base64url").toString("utf-8")
+        );
+      }
+    }
+    const accountId = actualPayload["zap:acc"] != null ? parseInt(String(actualPayload["zap:acc"]), 10) : null;
+    const customUserId = actualPayload.sub_type === "customuser" && actualPayload.sub != null ? parseInt(String(actualPayload.sub), 10) : null;
+    return {
+      customuser_id: customUserId !== null && !isNaN(customUserId) ? customUserId : null,
+      account_id: accountId !== null && !isNaN(accountId) ? accountId : null
+    };
+  } catch {
+    return { customuser_id: null, account_id: null };
+  }
+}
 
 // src/api/debug.ts
 var utilModule = null;
@@ -4573,7 +4601,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.15.3"};
+  version: "0.15.4"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {
@@ -4644,17 +4672,26 @@ function buildErrorEventWithContext(data, context = {}) {
 }
 
 // src/plugins/eventEmission/index.ts
+var TELEMETRY_EMIT_TIMEOUT_MS = 300;
 var APPLICATION_LIFECYCLE_EVENT_SUBJECT = "platform.sdk.ApplicationLifecycleEvent";
 var ERROR_OCCURRED_EVENT_SUBJECT = "platform.sdk.ErrorOccurredEvent";
 var transportStates = /* @__PURE__ */ new WeakMap();
-async function silentEmit(transport, subject, event) {
+async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let state = transportStates.get(transport);
     if (!state) {
       state = { hasWorked: false, hasLoggedFailure: false };
       transportStates.set(transport, state);
     }
-    transport.emit(subject, event).then(() => {
+    let enrichedEvent = event;
+    if (userContextPromise) {
+      try {
+        const userContext = await userContextPromise;
+        enrichedEvent = Object.assign({}, event, userContext);
+      } catch {
+      }
+    }
+    transport.emit(subject, enrichedEvent).then(() => {
       state.hasWorked = true;
     }).catch((error) => {
       if (!state.hasWorked && !state.hasLoggedFailure) {
@@ -4702,6 +4739,19 @@ var eventEmissionPlugin = ({ context }) => {
       )
     )
   };
+  const getUserContext = (async () => {
+    try {
+      const { getToken } = await import('@zapier/zapier-sdk-cli-login');
+      const token = await getToken({
+        baseUrl: context.options.baseUrl
+      });
+      if (token) {
+        return extractUserIdsFromJwt(token);
+      }
+    } catch {
+    }
+    return { customuser_id: null, account_id: null };
+  })();
   const startupTime = Date.now();
   let shutdownStartTime = null;
   if (!config.enabled) {
@@ -4712,7 +4762,7 @@ var eventEmissionPlugin = ({ context }) => {
           config,
           emit: () => {
           },
-          createBaseEvent: () => ({
+          createBaseEvent: async () => ({
             event_id: generateEventId(),
             timestamp_ms: getCurrentTimestamp(),
             release_id: getReleaseId(),
@@ -4732,21 +4782,34 @@ var eventEmissionPlugin = ({ context }) => {
   } catch {
     transport = createTransport({ type: "noop" });
   }
-  const createBaseEventHelper = () => ({
-    event_id: generateEventId(),
-    timestamp_ms: getCurrentTimestamp(),
-    release_id: getReleaseId(),
-    customuser_id: null,
-    account_id: null,
-    identity_id: null,
-    visitor_id: null,
-    correlation_id: null
-  });
+  const createBaseEventHelper = async () => {
+    const baseEvent = {
+      event_id: generateEventId(),
+      timestamp_ms: getCurrentTimestamp(),
+      release_id: getReleaseId(),
+      customuser_id: null,
+      account_id: null,
+      identity_id: null,
+      visitor_id: null,
+      correlation_id: null
+    };
+    try {
+      const userContext = await getUserContext;
+      return { ...baseEvent, ...userContext };
+    } catch {
+      return baseEvent;
+    }
+  };
   if (config.enabled) {
     const startupEvent = buildApplicationLifecycleEvent({
       lifecycle_event_type: "startup"
     });
-    silentEmit(transport, APPLICATION_LIFECYCLE_EVENT_SUBJECT, startupEvent);
+    silentEmit(
+      transport,
+      APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+      startupEvent,
+      getUserContext
+    );
     if (typeof process?.on === "function") {
       process.on("exit", (code) => {
         const uptime = Date.now() - startupTime;
@@ -4758,10 +4821,15 @@ var eventEmissionPlugin = ({ context }) => {
           is_graceful_shutdown: code === 0,
           shutdown_duration_ms: shutdownDuration
         });
-        silentEmit(transport, APPLICATION_LIFECYCLE_EVENT_SUBJECT, exitEvent);
+        silentEmit(
+          transport,
+          APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+          exitEvent,
+          getUserContext
+        );
       });
       process.on("uncaughtException", async (error) => {
-        const errorEvent = buildErrorEventWithContext({
+        let errorEvent = buildErrorEventWithContext({
           error_message: error.message || "Unknown error",
           error_type: "UncaughtException",
           error_stack_trace: error.stack || null,
@@ -4770,10 +4838,17 @@ var eventEmissionPlugin = ({ context }) => {
           is_recoverable: false,
           execution_start_time: startupTime
         });
+        try {
+          const userContext = await getUserContext;
+          errorEvent = { ...errorEvent, ...userContext };
+        } catch {
+        }
         try {
           await Promise.race([
             transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-            new Promise((resolve2) => setTimeout(resolve2, 300))
+            new Promise(
+              (resolve2) => setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS)
+            )
           ]);
         } catch {
         }
@@ -4783,7 +4858,7 @@ var eventEmissionPlugin = ({ context }) => {
         async (reason, promise) => {
           const errorMessage = reason instanceof Error ? reason.message : typeof reason === "string" ? reason : "Unhandled promise rejection";
           const errorStack = reason instanceof Error ? reason.stack : null;
-          const errorEvent = buildErrorEventWithContext({
+          let errorEvent = buildErrorEventWithContext({
             error_message: errorMessage,
             error_type: "UnhandledRejection",
             error_stack_trace: errorStack,
@@ -4795,10 +4870,17 @@ var eventEmissionPlugin = ({ context }) => {
               promise: String(promise)
             }
           });
+          try {
+            const userContext = await getUserContext;
+            errorEvent = { ...errorEvent, ...userContext };
+          } catch {
+          }
           try {
             await Promise.race([
               transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-              new Promise((resolve2) => setTimeout(resolve2, 300))
+              new Promise(
+                (resolve2) => setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS)
+              )
             ]);
           } catch {
           }
@@ -4807,16 +4889,23 @@ var eventEmissionPlugin = ({ context }) => {
       const handleSignal = async (signal) => {
         shutdownStartTime = Date.now();
         const uptime = Date.now() - startupTime;
-        const signalEvent = buildApplicationLifecycleEvent({
+        let signalEvent = buildApplicationLifecycleEvent({
           lifecycle_event_type: "signal_termination",
           signal_name: signal,
           uptime_ms: uptime,
           is_graceful_shutdown: true
         });
+        try {
+          const userContext = await getUserContext;
+          signalEvent = { ...signalEvent, ...userContext };
+        } catch {
+        }
         try {
           await Promise.race([
             transport.emit(APPLICATION_LIFECYCLE_EVENT_SUBJECT, signalEvent),
-            new Promise((resolve2) => setTimeout(resolve2, 300))
+            new Promise(
+              (resolve2) => setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS)
+            )
           ]);
         } catch {
         }
@@ -4832,7 +4921,7 @@ var eventEmissionPlugin = ({ context }) => {
         transport,
         config,
         emit: (subject, event) => {
-          silentEmit(transport, subject, event);
+          silentEmit(transport, subject, event, getUserContext);
         },
         createBaseEvent: createBaseEventHelper
       }

package/dist/plugins/eventEmission/index.d.ts

@@ -16,7 +16,7 @@ export interface EventEmissionContext {
         transport: EventTransport;
         config: EventEmissionConfig;
         emit<T extends any>(subject: string, event: T): void;
-        createBaseEvent(): BaseEvent;
+        createBaseEvent(): Promise<BaseEvent>;
     };
 }
 export interface EventEmissionProvides {

package/dist/plugins/eventEmission/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAUnE,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,SAAS,CAAC;KAC9B,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA+ED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAoMtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAenE,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;KACvC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA4FD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAyQtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}