skedyul 1.7.19 → 1.7.23

package/dist/esm/index.mjs

@@ -2452,7 +2452,41 @@ var globalConfig = {
   apiToken: process.env.SKEDYUL_API_TOKEN ?? ""
 };
 function runWithConfig(config, fn) {
-  return requestConfigStorage.run(config, fn);
+  const originalApiToken = process.env.SKEDYUL_API_TOKEN;
+  const originalApiUrl = process.env.SKEDYUL_API_URL;
+  if (config.apiToken) {
+    process.env.SKEDYUL_API_TOKEN = config.apiToken;
+  }
+  if (config.baseUrl) {
+    process.env.SKEDYUL_API_URL = config.baseUrl;
+  }
+  const restoreProcessEnv = () => {
+    if (config.apiToken) {
+      if (originalApiToken === void 0) {
+        delete process.env.SKEDYUL_API_TOKEN;
+      } else {
+        process.env.SKEDYUL_API_TOKEN = originalApiToken;
+      }
+    }
+    if (config.baseUrl) {
+      if (originalApiUrl === void 0) {
+        delete process.env.SKEDYUL_API_URL;
+      } else {
+        process.env.SKEDYUL_API_URL = originalApiUrl;
+      }
+    }
+  };
+  try {
+    const result = requestConfigStorage.run(config, fn);
+    if (result instanceof Promise) {
+      return result.finally(restoreProcessEnv);
+    }
+    restoreProcessEnv();
+    return result;
+  } catch (error) {
+    restoreProcessEnv();
+    throw error;
+  }
 }
 function getEffectiveConfig() {
   const requestConfig = requestConfigStorage.getStore();
@@ -4593,6 +4627,60 @@ function isProvisionConfig(value) {
   return value !== void 0 && value !== null && !(value instanceof Promise);
 }
 
+// src/server/handler-helpers.ts
+function parseHandlerEnvelope(parsedBody) {
+  if (typeof parsedBody !== "object" || parsedBody === null || Array.isArray(parsedBody) || !("env" in parsedBody) || !("request" in parsedBody)) {
+    return null;
+  }
+  const envelope = parsedBody;
+  if (typeof envelope.env !== "object" || envelope.env === null || Array.isArray(envelope.env)) {
+    return null;
+  }
+  if (typeof envelope.request !== "object" || envelope.request === null || Array.isArray(envelope.request)) {
+    return null;
+  }
+  return {
+    env: envelope.env,
+    request: envelope.request,
+    context: envelope.context
+  };
+}
+function buildRequestFromRaw(raw) {
+  let parsedBody = raw.body;
+  const contentType = raw.headers["content-type"] ?? "";
+  if (contentType.includes("application/json")) {
+    try {
+      parsedBody = raw.body ? JSON.parse(raw.body) : {};
+    } catch {
+      parsedBody = raw.body;
+    }
+  }
+  return {
+    method: raw.method,
+    url: raw.url,
+    path: raw.path,
+    headers: raw.headers,
+    query: raw.query,
+    body: parsedBody,
+    rawBody: raw.body ? Buffer.from(raw.body, "utf-8") : void 0
+  };
+}
+function buildRequestScopedConfig(env) {
+  return {
+    baseUrl: env.SKEDYUL_API_URL ?? process.env.SKEDYUL_API_URL ?? "",
+    apiToken: env.SKEDYUL_API_TOKEN ?? process.env.SKEDYUL_API_TOKEN ?? ""
+  };
+}
+async function withRequestEnv(requestEnv, fn) {
+  const originalEnv = { ...process.env };
+  Object.assign(process.env, requestEnv);
+  try {
+    return await fn();
+  } finally {
+    process.env = originalEnv;
+  }
+}
+
 // src/server/handlers/install-handler.ts
 async function handleInstall(body, hooks) {
   if (!hooks?.install) {
@@ -4627,9 +4715,11 @@ async function handleInstall(body, hooks) {
   try {
     const installHook = hooks.install;
     const installHandler = typeof installHook === "function" ? installHook : installHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await installHandler(installContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await installHandler(installContext);
+        });
       });
     });
     return {
@@ -4695,9 +4785,11 @@ async function handleUninstall(body, hooks) {
   try {
     const uninstallHook = hooks.uninstall;
     const uninstallHandlerFn = typeof uninstallHook === "function" ? uninstallHook : uninstallHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await uninstallHandlerFn(uninstallContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await uninstallHandlerFn(uninstallContext);
+        });
       });
     });
     return {
@@ -4756,9 +4848,11 @@ async function handleProvision(body, hooks) {
   try {
     const provisionHook = hooks.provision;
     const provisionHandler = typeof provisionHook === "function" ? provisionHook : provisionHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await provisionHandler(provisionContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await provisionHandler(provisionContext);
+        });
       });
     });
     return {
@@ -4816,9 +4910,11 @@ async function handleSetupRevalidate(body, hooks) {
   };
   try {
     const handler = typeof revalidateHook === "function" ? revalidateHook : revalidateHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await handler(ctx);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await handler(ctx);
+        });
       });
     });
     return {
@@ -4841,51 +4937,6 @@ async function handleSetupRevalidate(body, hooks) {
   }
 }
 
-// src/server/handler-helpers.ts
-function parseHandlerEnvelope(parsedBody) {
-  if (typeof parsedBody !== "object" || parsedBody === null || Array.isArray(parsedBody) || !("env" in parsedBody) || !("request" in parsedBody)) {
-    return null;
-  }
-  const envelope = parsedBody;
-  if (typeof envelope.env !== "object" || envelope.env === null || Array.isArray(envelope.env)) {
-    return null;
-  }
-  if (typeof envelope.request !== "object" || envelope.request === null || Array.isArray(envelope.request)) {
-    return null;
-  }
-  return {
-    env: envelope.env,
-    request: envelope.request,
-    context: envelope.context
-  };
-}
-function buildRequestFromRaw(raw) {
-  let parsedBody = raw.body;
-  const contentType = raw.headers["content-type"] ?? "";
-  if (contentType.includes("application/json")) {
-    try {
-      parsedBody = raw.body ? JSON.parse(raw.body) : {};
-    } catch {
-      parsedBody = raw.body;
-    }
-  }
-  return {
-    method: raw.method,
-    url: raw.url,
-    path: raw.path,
-    headers: raw.headers,
-    query: raw.query,
-    body: parsedBody,
-    rawBody: raw.body ? Buffer.from(raw.body, "utf-8") : void 0
-  };
-}
-function buildRequestScopedConfig(env) {
-  return {
-    baseUrl: env.SKEDYUL_API_URL ?? process.env.SKEDYUL_API_URL ?? "",
-    apiToken: env.SKEDYUL_API_TOKEN ?? process.env.SKEDYUL_API_TOKEN ?? ""
-  };
-}
-
 // src/server/handlers/oauth-callback-handler.ts
 async function handleOAuthCallback(parsedBody, hooks) {
   if (!hooks?.oauth_callback) {
@@ -4918,9 +4969,11 @@ async function handleOAuthCallback(parsedBody, hooks) {
   try {
     const oauthCallbackHook = hooks.oauth_callback;
     const oauthCallbackHandler = typeof oauthCallbackHook === "function" ? oauthCallbackHook : oauthCallbackHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation }, async () => {
-        return await oauthCallbackHandler(oauthCallbackContext);
+    const result = await withRequestEnv(envelope.env, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation }, async () => {
+          return await oauthCallbackHandler(oauthCallbackContext);
+        });
       });
     });
     return {

package/dist/index.js

@@ -2841,7 +2841,41 @@ var globalConfig = {
   apiToken: process.env.SKEDYUL_API_TOKEN ?? ""
 };
 function runWithConfig(config, fn) {
-  return requestConfigStorage.run(config, fn);
+  const originalApiToken = process.env.SKEDYUL_API_TOKEN;
+  const originalApiUrl = process.env.SKEDYUL_API_URL;
+  if (config.apiToken) {
+    process.env.SKEDYUL_API_TOKEN = config.apiToken;
+  }
+  if (config.baseUrl) {
+    process.env.SKEDYUL_API_URL = config.baseUrl;
+  }
+  const restoreProcessEnv = () => {
+    if (config.apiToken) {
+      if (originalApiToken === void 0) {
+        delete process.env.SKEDYUL_API_TOKEN;
+      } else {
+        process.env.SKEDYUL_API_TOKEN = originalApiToken;
+      }
+    }
+    if (config.baseUrl) {
+      if (originalApiUrl === void 0) {
+        delete process.env.SKEDYUL_API_URL;
+      } else {
+        process.env.SKEDYUL_API_URL = originalApiUrl;
+      }
+    }
+  };
+  try {
+    const result = requestConfigStorage.run(config, fn);
+    if (result instanceof Promise) {
+      return result.finally(restoreProcessEnv);
+    }
+    restoreProcessEnv();
+    return result;
+  } catch (error) {
+    restoreProcessEnv();
+    throw error;
+  }
 }
 function getEffectiveConfig() {
   const requestConfig = requestConfigStorage.getStore();
@@ -4982,6 +5016,60 @@ function isProvisionConfig(value) {
   return value !== void 0 && value !== null && !(value instanceof Promise);
 }
 
+// src/server/handler-helpers.ts
+function parseHandlerEnvelope(parsedBody) {
+  if (typeof parsedBody !== "object" || parsedBody === null || Array.isArray(parsedBody) || !("env" in parsedBody) || !("request" in parsedBody)) {
+    return null;
+  }
+  const envelope = parsedBody;
+  if (typeof envelope.env !== "object" || envelope.env === null || Array.isArray(envelope.env)) {
+    return null;
+  }
+  if (typeof envelope.request !== "object" || envelope.request === null || Array.isArray(envelope.request)) {
+    return null;
+  }
+  return {
+    env: envelope.env,
+    request: envelope.request,
+    context: envelope.context
+  };
+}
+function buildRequestFromRaw(raw) {
+  let parsedBody = raw.body;
+  const contentType = raw.headers["content-type"] ?? "";
+  if (contentType.includes("application/json")) {
+    try {
+      parsedBody = raw.body ? JSON.parse(raw.body) : {};
+    } catch {
+      parsedBody = raw.body;
+    }
+  }
+  return {
+    method: raw.method,
+    url: raw.url,
+    path: raw.path,
+    headers: raw.headers,
+    query: raw.query,
+    body: parsedBody,
+    rawBody: raw.body ? Buffer.from(raw.body, "utf-8") : void 0
+  };
+}
+function buildRequestScopedConfig(env) {
+  return {
+    baseUrl: env.SKEDYUL_API_URL ?? process.env.SKEDYUL_API_URL ?? "",
+    apiToken: env.SKEDYUL_API_TOKEN ?? process.env.SKEDYUL_API_TOKEN ?? ""
+  };
+}
+async function withRequestEnv(requestEnv, fn) {
+  const originalEnv = { ...process.env };
+  Object.assign(process.env, requestEnv);
+  try {
+    return await fn();
+  } finally {
+    process.env = originalEnv;
+  }
+}
+
 // src/server/handlers/install-handler.ts
 async function handleInstall(body, hooks) {
   if (!hooks?.install) {
@@ -5016,9 +5104,11 @@ async function handleInstall(body, hooks) {
   try {
     const installHook = hooks.install;
     const installHandler = typeof installHook === "function" ? installHook : installHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await installHandler(installContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await installHandler(installContext);
+        });
       });
     });
     return {
@@ -5084,9 +5174,11 @@ async function handleUninstall(body, hooks) {
   try {
     const uninstallHook = hooks.uninstall;
     const uninstallHandlerFn = typeof uninstallHook === "function" ? uninstallHook : uninstallHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await uninstallHandlerFn(uninstallContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await uninstallHandlerFn(uninstallContext);
+        });
       });
     });
     return {
@@ -5145,9 +5237,11 @@ async function handleProvision(body, hooks) {
   try {
     const provisionHook = hooks.provision;
     const provisionHandler = typeof provisionHook === "function" ? provisionHook : provisionHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await provisionHandler(provisionContext);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await provisionHandler(provisionContext);
+        });
       });
     });
     return {
@@ -5205,9 +5299,11 @@ async function handleSetupRevalidate(body, hooks) {
   };
   try {
     const handler = typeof revalidateHook === "function" ? revalidateHook : revalidateHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation: body.invocation }, async () => {
-        return await handler(ctx);
+    const result = await withRequestEnv(body.env ?? {}, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation: body.invocation }, async () => {
+          return await handler(ctx);
+        });
       });
     });
     return {
@@ -5230,51 +5326,6 @@ async function handleSetupRevalidate(body, hooks) {
   }
 }
 
-// src/server/handler-helpers.ts
-function parseHandlerEnvelope(parsedBody) {
-  if (typeof parsedBody !== "object" || parsedBody === null || Array.isArray(parsedBody) || !("env" in parsedBody) || !("request" in parsedBody)) {
-    return null;
-  }
-  const envelope = parsedBody;
-  if (typeof envelope.env !== "object" || envelope.env === null || Array.isArray(envelope.env)) {
-    return null;
-  }
-  if (typeof envelope.request !== "object" || envelope.request === null || Array.isArray(envelope.request)) {
-    return null;
-  }
-  return {
-    env: envelope.env,
-    request: envelope.request,
-    context: envelope.context
-  };
-}
-function buildRequestFromRaw(raw) {
-  let parsedBody = raw.body;
-  const contentType = raw.headers["content-type"] ?? "";
-  if (contentType.includes("application/json")) {
-    try {
-      parsedBody = raw.body ? JSON.parse(raw.body) : {};
-    } catch {
-      parsedBody = raw.body;
-    }
-  }
-  return {
-    method: raw.method,
-    url: raw.url,
-    path: raw.path,
-    headers: raw.headers,
-    query: raw.query,
-    body: parsedBody,
-    rawBody: raw.body ? Buffer.from(raw.body, "utf-8") : void 0
-  };
-}
-function buildRequestScopedConfig(env) {
-  return {
-    baseUrl: env.SKEDYUL_API_URL ?? process.env.SKEDYUL_API_URL ?? "",
-    apiToken: env.SKEDYUL_API_TOKEN ?? process.env.SKEDYUL_API_TOKEN ?? ""
-  };
-}
-
 // src/server/handlers/oauth-callback-handler.ts
 async function handleOAuthCallback(parsedBody, hooks) {
   if (!hooks?.oauth_callback) {
@@ -5307,9 +5358,11 @@ async function handleOAuthCallback(parsedBody, hooks) {
   try {
     const oauthCallbackHook = hooks.oauth_callback;
     const oauthCallbackHandler = typeof oauthCallbackHook === "function" ? oauthCallbackHook : oauthCallbackHook.handler;
-    const result = await runWithConfig(requestConfig, async () => {
-      return await runWithLogContext({ invocation }, async () => {
-        return await oauthCallbackHandler(oauthCallbackContext);
+    const result = await withRequestEnv(envelope.env, async () => {
+      return await runWithConfig(requestConfig, async () => {
+        return await runWithLogContext({ invocation }, async () => {
+          return await oauthCallbackHandler(oauthCallbackContext);
+        });
       });
     });
     return {

package/dist/server/handler-helpers.d.ts

@@ -22,3 +22,10 @@ export declare function buildRequestScopedConfig(env: Record<string, string>): {
     baseUrl: string;
     apiToken: string;
 };
+/**
+ * Inject per-request env (e.g. SKEDYUL_API_TOKEN) into process.env for a handler.
+ *
+ * Lambda tool/webhook paths rely on this because AsyncLocalStorage from runWithConfig
+ * can be lost across await boundaries; getEffectiveConfig() falls back to process.env.
+ */
+export declare function withRequestEnv<T>(requestEnv: Record<string, string>, fn: () => Promise<T>): Promise<T>;