@zapier/zapier-sdk 0.32.0 → 0.32.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @zapier/zapier-sdk
 
+## 0.32.2
+
+### Patch Changes
+
+- a6dec83: Fix base URL with trailing slash bypassing sdkapi.
+
+## 0.32.1
+
+### Patch Changes
+
+- c7be13e: Fix bug where `add` command hangs after completing successfully
+
 ## 0.32.0
 
 ### Minor Changes

package/dist/api/client.js

@@ -373,7 +373,7 @@ class ZapierApiClient {
         // Let's remain compatible with a base URL that is set to a Zapier-inferred
         // domain, rather than requiring the base URL to go to our proxy. Later, the
         // proxy will be removed, so this should make that transition easier.
-        if (zapierBaseUrl === this.options.baseUrl) {
+        if (zapierBaseUrl === this.options.baseUrl.replace(/\/$/, "")) {
             // If baseUrl is already the Zapier base URL, use sdkapi subdomain.
             const originalBaseUrl = new URL(this.options.baseUrl);
             const finalBaseUrl = `https://sdkapi.${originalBaseUrl.hostname}`;

package/dist/api/client.test.js

@@ -219,6 +219,15 @@ describe("ApiClient", () => {
             await client.get("/relay");
             expect(mockFetch).toHaveBeenCalledWith("http://localhost:3000/api/v0/sdk/relay/", expect.any(Object));
         });
+        it("should use sdkapi subdomain when Zapier base URL has trailing slash", async () => {
+            const client = createZapierApi({
+                baseUrl: "https://zapier-staging.com/",
+                credentials: "test-token",
+                debug: false,
+            });
+            await client.get("/zapier/api/v4/profile/");
+            expect(mockFetch).toHaveBeenCalledWith("https://sdkapi.zapier-staging.com/api/v0/sdk/zapier/api/v4/profile/", expect.any(Object));
+        });
         it("should preserve base URL path for localhost with path component", async () => {
             const client = createZapierApi({
                 baseUrl: "http://localhost:3000/a/b/c",

package/dist/index.cjs

@@ -4701,7 +4701,7 @@ var ZapierApiClient = class {
       finalPath = `${config.pathPrefix}${pathWithoutPrefix}`;
     }
     const zapierBaseUrl = getZapierBaseUrl(this.options.baseUrl);
-    if (zapierBaseUrl === this.options.baseUrl) {
+    if (zapierBaseUrl === this.options.baseUrl.replace(/\/$/, "")) {
       const originalBaseUrl = new URL(this.options.baseUrl);
       const finalBaseUrl = `https://sdkapi.${originalBaseUrl.hostname}`;
       return {
@@ -5503,7 +5503,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.32.0"};
+  version: "0.32.2"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {
@@ -5627,6 +5627,20 @@ var APPLICATION_LIFECYCLE_EVENT_SUBJECT = "platform.sdk.ApplicationLifecycleEven
 var ERROR_OCCURRED_EVENT_SUBJECT = "platform.sdk.ErrorOccurredEvent";
 var METHOD_CALLED_EVENT_SUBJECT = "platform.sdk.MethodCalledEvent";
 var transportStates = /* @__PURE__ */ new WeakMap();
+async function emitWithTimeout(transport, subject, event) {
+  try {
+    await Promise.race([
+      transport.emit(subject, event),
+      new Promise((resolve2) => {
+        const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
+        if (typeof timer.unref === "function") {
+          timer.unref();
+        }
+      })
+    ]);
+  } catch {
+  }
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let state = transportStates.get(transport);
@@ -5705,6 +5719,7 @@ var eventEmissionPlugin = ({ context }) => {
   })();
   const startupTime = Date.now();
   let shutdownStartTime = null;
+  let closed = false;
   if (!config.enabled) {
     return {
       context: {
@@ -5724,6 +5739,8 @@ var eventEmissionPlugin = ({ context }) => {
             correlation_id: null
           }),
           emitMethodCalled: () => {
+          },
+          close: async () => {
           }
         }
       }
@@ -5766,6 +5783,7 @@ var eventEmissionPlugin = ({ context }) => {
     if (typeof process?.on === "function") {
       removeExistingListeners();
       const exitHandler = (code) => {
+        if (closed) return;
         const uptime = Date.now() - startupTime;
         const shutdownDuration = shutdownStartTime ? Date.now() - shutdownStartTime : null;
         const exitEvent = buildApplicationLifecycleEvent({
@@ -5799,18 +5817,11 @@ var eventEmissionPlugin = ({ context }) => {
           errorEvent = { ...errorEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          ERROR_OCCURRED_EVENT_SUBJECT,
+          errorEvent
+        );
       };
       registeredListeners.uncaughtException = uncaughtExceptionHandler;
       process.on("uncaughtException", uncaughtExceptionHandler);
@@ -5834,18 +5845,11 @@ var eventEmissionPlugin = ({ context }) => {
           errorEvent = { ...errorEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          ERROR_OCCURRED_EVENT_SUBJECT,
+          errorEvent
+        );
       };
       registeredListeners.unhandledRejection = unhandledRejectionHandler;
       process.on("unhandledRejection", unhandledRejectionHandler);
@@ -5863,18 +5867,11 @@ var eventEmissionPlugin = ({ context }) => {
           signalEvent = { ...signalEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(APPLICATION_LIFECYCLE_EVENT_SUBJECT, signalEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+          signalEvent
+        );
         const exitCode = signal === "SIGINT" ? 130 : 143;
         process.exit(exitCode);
       };
@@ -5886,6 +5883,30 @@ var eventEmissionPlugin = ({ context }) => {
       process.on("SIGTERM", sigtermHandler);
     }
   }
+  const close = async (exitCode) => {
+    if (closed) return;
+    closed = true;
+    const uptime = Date.now() - startupTime;
+    const shutdownDuration = shutdownStartTime ? Date.now() - shutdownStartTime : null;
+    let exitEvent = buildApplicationLifecycleEvent({
+      lifecycle_event_type: "exit",
+      exit_code: exitCode ?? 0,
+      uptime_ms: uptime,
+      is_graceful_shutdown: (exitCode ?? 0) === 0,
+      shutdown_duration_ms: shutdownDuration
+    });
+    try {
+      const userContext = await getUserContext;
+      exitEvent = { ...exitEvent, ...userContext };
+    } catch {
+    }
+    await emitWithTimeout(
+      transport,
+      APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+      exitEvent
+    );
+    removeExistingListeners();
+  };
   return {
     context: {
       eventEmission: {
@@ -5906,7 +5927,8 @@ var eventEmissionPlugin = ({ context }) => {
             event,
             getUserContext
           );
-        }
+        },
+        close
       }
     }
   };

package/dist/index.d.mts

@@ -388,6 +388,7 @@ interface EventEmissionContext {
         emit<T extends any>(subject: string, event: T): void;
         createBaseEvent(): Promise<BaseEvent>;
         emitMethodCalled(data: MethodCalledEventData): void;
+        close(exitCode?: number): Promise<void>;
     };
 }
 interface EventEmissionProvides {

package/dist/index.mjs

@@ -4679,7 +4679,7 @@ var ZapierApiClient = class {
       finalPath = `${config.pathPrefix}${pathWithoutPrefix}`;
     }
     const zapierBaseUrl = getZapierBaseUrl(this.options.baseUrl);
-    if (zapierBaseUrl === this.options.baseUrl) {
+    if (zapierBaseUrl === this.options.baseUrl.replace(/\/$/, "")) {
       const originalBaseUrl = new URL(this.options.baseUrl);
       const finalBaseUrl = `https://sdkapi.${originalBaseUrl.hostname}`;
       return {
@@ -5481,7 +5481,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.32.0"};
+  version: "0.32.2"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {
@@ -5605,6 +5605,20 @@ var APPLICATION_LIFECYCLE_EVENT_SUBJECT = "platform.sdk.ApplicationLifecycleEven
 var ERROR_OCCURRED_EVENT_SUBJECT = "platform.sdk.ErrorOccurredEvent";
 var METHOD_CALLED_EVENT_SUBJECT = "platform.sdk.MethodCalledEvent";
 var transportStates = /* @__PURE__ */ new WeakMap();
+async function emitWithTimeout(transport, subject, event) {
+  try {
+    await Promise.race([
+      transport.emit(subject, event),
+      new Promise((resolve2) => {
+        const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
+        if (typeof timer.unref === "function") {
+          timer.unref();
+        }
+      })
+    ]);
+  } catch {
+  }
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let state = transportStates.get(transport);
@@ -5683,6 +5697,7 @@ var eventEmissionPlugin = ({ context }) => {
   })();
   const startupTime = Date.now();
   let shutdownStartTime = null;
+  let closed = false;
   if (!config.enabled) {
     return {
       context: {
@@ -5702,6 +5717,8 @@ var eventEmissionPlugin = ({ context }) => {
             correlation_id: null
           }),
           emitMethodCalled: () => {
+          },
+          close: async () => {
           }
         }
       }
@@ -5744,6 +5761,7 @@ var eventEmissionPlugin = ({ context }) => {
     if (typeof process?.on === "function") {
       removeExistingListeners();
       const exitHandler = (code) => {
+        if (closed) return;
         const uptime = Date.now() - startupTime;
         const shutdownDuration = shutdownStartTime ? Date.now() - shutdownStartTime : null;
         const exitEvent = buildApplicationLifecycleEvent({
@@ -5777,18 +5795,11 @@ var eventEmissionPlugin = ({ context }) => {
           errorEvent = { ...errorEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          ERROR_OCCURRED_EVENT_SUBJECT,
+          errorEvent
+        );
       };
       registeredListeners.uncaughtException = uncaughtExceptionHandler;
       process.on("uncaughtException", uncaughtExceptionHandler);
@@ -5812,18 +5823,11 @@ var eventEmissionPlugin = ({ context }) => {
           errorEvent = { ...errorEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          ERROR_OCCURRED_EVENT_SUBJECT,
+          errorEvent
+        );
       };
       registeredListeners.unhandledRejection = unhandledRejectionHandler;
       process.on("unhandledRejection", unhandledRejectionHandler);
@@ -5841,18 +5845,11 @@ var eventEmissionPlugin = ({ context }) => {
           signalEvent = { ...signalEvent, ...userContext };
         } catch {
         }
-        try {
-          await Promise.race([
-            transport.emit(APPLICATION_LIFECYCLE_EVENT_SUBJECT, signalEvent),
-            new Promise((resolve2) => {
-              const timer = setTimeout(resolve2, TELEMETRY_EMIT_TIMEOUT_MS);
-              if (typeof timer.unref === "function") {
-                timer.unref();
-              }
-            })
-          ]);
-        } catch {
-        }
+        await emitWithTimeout(
+          transport,
+          APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+          signalEvent
+        );
         const exitCode = signal === "SIGINT" ? 130 : 143;
         process.exit(exitCode);
       };
@@ -5864,6 +5861,30 @@ var eventEmissionPlugin = ({ context }) => {
       process.on("SIGTERM", sigtermHandler);
     }
   }
+  const close = async (exitCode) => {
+    if (closed) return;
+    closed = true;
+    const uptime = Date.now() - startupTime;
+    const shutdownDuration = shutdownStartTime ? Date.now() - shutdownStartTime : null;
+    let exitEvent = buildApplicationLifecycleEvent({
+      lifecycle_event_type: "exit",
+      exit_code: exitCode ?? 0,
+      uptime_ms: uptime,
+      is_graceful_shutdown: (exitCode ?? 0) === 0,
+      shutdown_duration_ms: shutdownDuration
+    });
+    try {
+      const userContext = await getUserContext;
+      exitEvent = { ...exitEvent, ...userContext };
+    } catch {
+    }
+    await emitWithTimeout(
+      transport,
+      APPLICATION_LIFECYCLE_EVENT_SUBJECT,
+      exitEvent
+    );
+    removeExistingListeners();
+  };
   return {
     context: {
       eventEmission: {
@@ -5884,7 +5905,8 @@ var eventEmissionPlugin = ({ context }) => {
             event,
             getUserContext
           );
-        }
+        },
+        close
       }
     }
   };

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

@@ -25,6 +25,7 @@ export interface EventEmissionContext {
         emit<T extends any>(subject: string, event: T): void;
         createBaseEvent(): Promise<BaseEvent>;
         emitMethodCalled(data: MethodCalledEventData): void;
+        close(exitCode?: number): Promise<void>;
     };
 }
 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;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAsCnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;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;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;KACrD,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA6FD,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,CA8StB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,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;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAsCnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;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;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;QAIpD,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAiHD,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,CAwTtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}

package/dist/plugins/eventEmission/index.js

@@ -41,6 +41,22 @@ const ERROR_OCCURRED_EVENT_SUBJECT = "platform.sdk.ErrorOccurredEvent";
 const METHOD_CALLED_EVENT_SUBJECT = "platform.sdk.MethodCalledEvent";
 // Track transport success/failure so we only log failure once.
 const transportStates = new WeakMap();
+async function emitWithTimeout(transport, subject, event) {
+    try {
+        await Promise.race([
+            transport.emit(subject, event),
+            new Promise((resolve) => {
+                const timer = setTimeout(resolve, TELEMETRY_EMIT_TIMEOUT_MS);
+                if (typeof timer.unref === "function") {
+                    timer.unref();
+                }
+            }),
+        ]);
+    }
+    catch {
+        // Silently ignore telemetry failures
+    }
+}
 // Silent emission wrapper with smart first-failure logging
 async function silentEmit(transport, subject, event, userContextPromise) {
     try {
@@ -135,6 +151,7 @@ export const eventEmissionPlugin = ({ context }) => {
     })();
     const startupTime = Date.now();
     let shutdownStartTime = null;
+    let closed = false;
     // If disabled, return noop implementations
     if (!config.enabled) {
         return {
@@ -154,6 +171,7 @@ export const eventEmissionPlugin = ({ context }) => {
                         correlation_id: null,
                     }),
                     emitMethodCalled: () => { },
+                    close: async () => { },
                 },
             },
         };
@@ -201,6 +219,8 @@ export const eventEmissionPlugin = ({ context }) => {
             removeExistingListeners();
             // Handle normal process exit
             const exitHandler = (code) => {
+                if (closed)
+                    return;
                 const uptime = Date.now() - startupTime;
                 const shutdownDuration = shutdownStartTime
                     ? Date.now() - shutdownStartTime
@@ -235,21 +255,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 catch {
                     // Continue with original event if user context fails
                 }
-                // Wait up to 300ms for telemetry to send before allowing process to exit
-                try {
-                    await Promise.race([
-                        transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-                        new Promise((resolve) => {
-                            const timer = setTimeout(resolve, TELEMETRY_EMIT_TIMEOUT_MS);
-                            if (typeof timer.unref === "function") {
-                                timer.unref();
-                            }
-                        }),
-                    ]);
-                }
-                catch {
-                    // Silently ignore telemetry failures
-                }
+                await emitWithTimeout(transport, ERROR_OCCURRED_EVENT_SUBJECT, errorEvent);
             };
             registeredListeners.uncaughtException = uncaughtExceptionHandler;
             process.on("uncaughtException", uncaughtExceptionHandler);
@@ -281,21 +287,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 catch {
                     // Continue with original event if user context fails
                 }
-                // Wait up to 300ms for telemetry to send
-                try {
-                    await Promise.race([
-                        transport.emit(ERROR_OCCURRED_EVENT_SUBJECT, errorEvent),
-                        new Promise((resolve) => {
-                            const timer = setTimeout(resolve, TELEMETRY_EMIT_TIMEOUT_MS);
-                            if (typeof timer.unref === "function") {
-                                timer.unref();
-                            }
-                        }),
-                    ]);
-                }
-                catch {
-                    // Silently ignore telemetry failures
-                }
+                await emitWithTimeout(transport, ERROR_OCCURRED_EVENT_SUBJECT, errorEvent);
             };
             registeredListeners.unhandledRejection = unhandledRejectionHandler;
             process.on("unhandledRejection", unhandledRejectionHandler);
@@ -317,21 +309,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 catch {
                     // Continue with original event if user context fails
                 }
-                // Wait up to 300ms for telemetry to send
-                try {
-                    await Promise.race([
-                        transport.emit(APPLICATION_LIFECYCLE_EVENT_SUBJECT, signalEvent),
-                        new Promise((resolve) => {
-                            const timer = setTimeout(resolve, TELEMETRY_EMIT_TIMEOUT_MS);
-                            if (typeof timer.unref === "function") {
-                                timer.unref();
-                            }
-                        }),
-                    ]);
-                }
-                catch {
-                    // Silently ignore telemetry failures
-                }
+                await emitWithTimeout(transport, APPLICATION_LIFECYCLE_EVENT_SUBJECT, signalEvent);
                 // Exit with appropriate code (128 + signal number)
                 const exitCode = signal === "SIGINT" ? 130 : 143;
                 process.exit(exitCode);
@@ -345,6 +323,31 @@ export const eventEmissionPlugin = ({ context }) => {
             process.on("SIGTERM", sigtermHandler);
         }
     }
+    const close = async (exitCode) => {
+        if (closed)
+            return;
+        closed = true;
+        const uptime = Date.now() - startupTime;
+        const shutdownDuration = shutdownStartTime
+            ? Date.now() - shutdownStartTime
+            : null;
+        let exitEvent = buildApplicationLifecycleEvent({
+            lifecycle_event_type: "exit",
+            exit_code: exitCode ?? 0,
+            uptime_ms: uptime,
+            is_graceful_shutdown: (exitCode ?? 0) === 0,
+            shutdown_duration_ms: shutdownDuration,
+        });
+        try {
+            const userContext = await getUserContext;
+            exitEvent = { ...exitEvent, ...userContext };
+        }
+        catch {
+            // Continue with original event if user context fails
+        }
+        await emitWithTimeout(transport, APPLICATION_LIFECYCLE_EVENT_SUBJECT, exitEvent);
+        removeExistingListeners();
+    };
     return {
         context: {
             eventEmission: {
@@ -361,6 +364,7 @@ export const eventEmissionPlugin = ({ context }) => {
                     };
                     silentEmit(transport, METHOD_CALLED_EVENT_SUBJECT, event, getUserContext);
                 },
+                close,
             },
         },
     };

package/dist/plugins/eventEmission/index.test.js

@@ -661,6 +661,98 @@ describe("emitMethodCalled call_context", () => {
         expect(mockTransport.emit).toHaveBeenCalledWith("platform.sdk.MethodCalledEvent", expect.objectContaining({ call_context: "mcp" }));
     });
 });
+describe("close()", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        cleanupEventListeners();
+        mockGetToken.mockResolvedValue(undefined);
+    });
+    afterEach(() => {
+        cleanupEventListeners();
+    });
+    it("should emit exit lifecycle event", async () => {
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        await plugin.context.eventEmission.close(0);
+        expect(mockTransport.emit).toHaveBeenCalledWith("platform.sdk.ApplicationLifecycleEvent", expect.objectContaining({
+            lifecycle_event_type: "exit",
+            exit_code: 0,
+            is_graceful_shutdown: true,
+        }));
+    });
+    it("should be idempotent — second call is a no-op", async () => {
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        await plugin.context.eventEmission.close(0);
+        const callCountAfterFirst = mockTransport.emit.mock.calls.filter((call) => call[0] === "platform.sdk.ApplicationLifecycleEvent" &&
+            call[1]?.lifecycle_event_type === "exit").length;
+        await plugin.context.eventEmission.close(0);
+        const callCountAfterSecond = mockTransport.emit.mock.calls.filter((call) => call[0] === "platform.sdk.ApplicationLifecycleEvent" &&
+            call[1]?.lifecycle_event_type === "exit").length;
+        expect(callCountAfterSecond).toBe(callCountAfterFirst);
+    });
+    it("should remove process listeners after close", async () => {
+        const initialExitCount = process.listenerCount("exit");
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        expect(process.listenerCount("exit")).toBe(initialExitCount + 1);
+        await plugin.context.eventEmission.close(0);
+        expect(process.listenerCount("exit")).toBe(initialExitCount);
+    });
+    it("should handle transport failures silently", async () => {
+        const failingTransport = {
+            emit: vi.fn().mockRejectedValue(new Error("Network error")),
+            close: vi.fn().mockResolvedValue(undefined),
+        };
+        vi.mocked(createTransport).mockReturnValueOnce(failingTransport);
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: {
+                            type: "http",
+                            endpoint: "https://example.com",
+                        },
+                    },
+                },
+            },
+        });
+        await expect(plugin.context.eventEmission.close(1)).resolves.toBeUndefined();
+    });
+});
 describe("Process Listener Cleanup", () => {
     beforeEach(() => {
         // Clean up any listeners from previous tests

package/dist/plugins/request/index.test.js

@@ -437,6 +437,7 @@ describe("request plugin", () => {
                         emit: () => { },
                         createBaseEvent: (() => ({})),
                         emitMethodCalled: emitSpy,
+                        close: async () => { },
                     },
                 },
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "description": "Complete Zapier SDK - combines all Zapier SDK packages",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",