skuba 13.0.3 → 13.1.0

package/lib/utils/wait.js

@@ -18,20 +18,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var wait_exports = {};
 __export(wait_exports, {
-  sleep: () => sleep,
   throwOnTimeout: () => throwOnTimeout,
   withTimeout: () => withTimeout
 });
 module.exports = __toCommonJS(wait_exports);
 var import_error = require("./error.js");
 var import_logging = require("./logging.js");
-const sleep = (ms) => {
-  let timeout;
-  return Object.assign(
-    new Promise((resolve) => timeout = setTimeout(resolve, ms)),
-    { clear: () => clearTimeout(timeout) }
-  );
-};
+var import_sleep = require("./sleep.js");
 const throwOnTimeout = async (promise, { s }) => {
   const result = await withTimeout(promise, { s });
   if (!result.ok) {
@@ -40,7 +33,7 @@ const throwOnTimeout = async (promise, { s }) => {
   return result.value;
 };
 const withTimeout = async (promise, { s }) => {
-  const timeout = sleep(s * 1e3);
+  const timeout = (0, import_sleep.sleep)(s * 1e3);
   try {
     return await Promise.race([
       Promise.resolve(promise).then((value) => ({ ok: true, value })),
@@ -52,7 +45,6 @@ const withTimeout = async (promise, { s }) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  sleep,
   throwOnTimeout,
   withTimeout
 });

package/lib/utils/wait.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/wait.ts"],
-  "sourcesContent": ["import { createTerseError } from './error.js';\nimport { pluralise } from './logging.js';\n\ninterface Timeout extends PromiseLike<void> {\n  clear?: () => void;\n}\n\nexport const sleep = (ms: number): Timeout => {\n  let timeout: NodeJS.Timeout;\n\n  return Object.assign(\n    new Promise<void>((resolve) => (timeout = setTimeout(resolve, ms))),\n    { clear: () => clearTimeout(timeout) },\n  );\n};\n\nexport const throwOnTimeout = async <T>(\n  promise: PromiseLike<T>,\n  { s }: { s: number },\n): Promise<T> => {\n  const result = await withTimeout(promise, { s });\n\n  if (!result.ok) {\n    throw createTerseError(`Timed out after ${pluralise(s, 'second')}`);\n  }\n\n  return result.value;\n};\n\ntype TimeoutResult<T> = { ok: true; value: T } | { ok: false };\n\nexport const withTimeout = async <T>(\n  promise: T | PromiseLike<T>,\n  { s }: { s: number },\n): Promise<TimeoutResult<T>> => {\n  const timeout = sleep(s * 1_000);\n\n  try {\n    return await Promise.race<TimeoutResult<T>>([\n      Promise.resolve(promise).then((value) => ({ ok: true, value })),\n      timeout.then(() => ({ ok: false })),\n    ]);\n  } finally {\n    timeout.clear?.();\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,qBAA0B;AAMnB,MAAM,QAAQ,CAAC,OAAwB;AAC5C,MAAI;AAEJ,SAAO,OAAO;AAAA,IACZ,IAAI,QAAc,CAAC,YAAa,UAAU,WAAW,SAAS,EAAE,CAAE;AAAA,IAClE,EAAE,OAAO,MAAM,aAAa,OAAO,EAAE;AAAA,EACvC;AACF;AAEO,MAAM,iBAAiB,OAC5B,SACA,EAAE,EAAE,MACW;AACf,QAAM,SAAS,MAAM,YAAY,SAAS,EAAE,EAAE,CAAC;AAE/C,MAAI,CAAC,OAAO,IAAI;AACd,cAAM,+BAAiB,uBAAmB,0BAAU,GAAG,QAAQ,CAAC,EAAE;AAAA,EACpE;AAEA,SAAO,OAAO;AAChB;AAIO,MAAM,cAAc,OACzB,SACA,EAAE,EAAE,MAC0B;AAC9B,QAAM,UAAU,MAAM,IAAI,GAAK;AAE/B,MAAI;AACF,WAAO,MAAM,QAAQ,KAAuB;AAAA,MAC1C,QAAQ,QAAQ,OAAO,EAAE,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,MAAM,EAAE;AAAA,MAC9D,QAAQ,KAAK,OAAO,EAAE,IAAI,MAAM,EAAE;AAAA,IACpC,CAAC;AAAA,EACH,UAAE;AACA,YAAQ,QAAQ;AAAA,EAClB;AACF;",
+  "sourcesContent": ["import { createTerseError } from './error.js';\nimport { pluralise } from './logging.js';\nimport { sleep } from './sleep.js';\n\nexport const throwOnTimeout = async <T>(\n  promise: PromiseLike<T>,\n  { s }: { s: number },\n): Promise<T> => {\n  const result = await withTimeout(promise, { s });\n\n  if (!result.ok) {\n    throw createTerseError(`Timed out after ${pluralise(s, 'second')}`);\n  }\n\n  return result.value;\n};\n\ntype TimeoutResult<T> = { ok: true; value: T } | { ok: false };\n\nexport const withTimeout = async <T>(\n  promise: T | PromiseLike<T>,\n  { s }: { s: number },\n): Promise<TimeoutResult<T>> => {\n  const timeout = sleep(s * 1_000);\n\n  try {\n    return await Promise.race<TimeoutResult<T>>([\n      Promise.resolve(promise).then((value) => ({ ok: true, value })),\n      timeout.then(() => ({ ok: false })),\n    ]);\n  } finally {\n    timeout.clear?.();\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,qBAA0B;AAC1B,mBAAsB;AAEf,MAAM,iBAAiB,OAC5B,SACA,EAAE,EAAE,MACW;AACf,QAAM,SAAS,MAAM,YAAY,SAAS,EAAE,EAAE,CAAC;AAE/C,MAAI,CAAC,OAAO,IAAI;AACd,cAAM,+BAAiB,uBAAmB,0BAAU,GAAG,QAAQ,CAAC,EAAE;AAAA,EACpE;AAEA,SAAO,OAAO;AAChB;AAIO,MAAM,cAAc,OACzB,SACA,EAAE,EAAE,MAC0B;AAC9B,QAAM,cAAU,oBAAM,IAAI,GAAK;AAE/B,MAAI;AACF,WAAO,MAAM,QAAQ,KAAuB;AAAA,MAC1C,QAAQ,QAAQ,OAAO,EAAE,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,MAAM,EAAE;AAAA,MAC9D,QAAQ,KAAK,OAAO,EAAE,IAAI,MAAM,EAAE;AAAA,IACpC,CAAC;AAAA,EACH,UAAE;AACA,YAAQ,QAAQ;AAAA,EAClB;AACF;",
   "names": []
 }

package/lib/utils/worker.d.ts

@@ -12,9 +12,9 @@ export declare const postWorkerOutput: <Input, Output>(fn: (input: Input) => Pro
         prefixes: unknown[];
         suffixes: unknown[];
     };
-    bold: import("chalk/index.js").Chalk;
-    dim: import("chalk/index.js").Chalk;
-    formatSubtle: import("chalk/index.js").Chalk;
+    bold: (text: string) => string;
+    dim: (text: string) => string;
+    formatSubtle: (text: string) => string;
     timing: (start: bigint, end: bigint) => string;
     debug: (...message: unknown[]) => void;
     subtle: (...message: unknown[]) => void;

package/lib/wrapper/http.d.ts

@@ -12,9 +12,3 @@ export declare const createRequestListenerFromFunction: (fn: (...args: unknown[]
  * This function resolves when the server is closed.
  */
 export declare const serveRequestListener: (requestListener: http.RequestListener, port?: number) => Promise<void>;
-/**
- * Returns a HTTP server wrapped in a promise
- *
- * This function resolves when the server is closed.
- */
-export declare const startServer: (server: http.Server, port?: number) => Promise<void>;

package/lib/wrapper/http.js

@@ -29,13 +29,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var http_exports = {};
 __export(http_exports, {
   createRequestListenerFromFunction: () => createRequestListenerFromFunction,
-  serveRequestListener: () => serveRequestListener,
-  startServer: () => startServer
+  serveRequestListener: () => serveRequestListener
 });
 module.exports = __toCommonJS(http_exports);
 var import_http = __toESM(require("http"));
 var import_util = __toESM(require("util"));
-var import_logging = require("../utils/logging.js");
+var import_server = require("./server.js");
 const createRequestListenerFromFunction = (fn) => async (req, res) => {
   const writeResponse = (response) => new Promise(
     (resolve, reject) => response === void 0 ? res.end(resolve) : res.write(
@@ -61,18 +60,11 @@ const createRequestListenerFromFunction = (fn) => async (req, res) => {
 };
 const serveRequestListener = (requestListener, port) => {
   const server = import_http.default.createServer(requestListener);
-  return startServer(server, port);
+  return (0, import_server.startServer)(server, port);
 };
-const startServer = (server, port) => new Promise(
-  (resolve, reject) => server.listen(port).on("close", resolve).on("error", reject).on("listening", () => {
-    const address = server.address();
-    import_logging.log.ok("listening on port", import_logging.log.bold(address.port));
-  })
-);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createRequestListenerFromFunction,
-  serveRequestListener,
-  startServer
+  serveRequestListener
 });
 //# sourceMappingURL=http.js.map

package/lib/wrapper/http.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/http.ts"],
-  "sourcesContent": ["import http from 'http';\nimport type { AddressInfo } from 'net';\nimport util from 'util';\n\nimport { log } from '../utils/logging.js';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n  (fn: (...args: unknown[]) => Promise<unknown>): http.RequestListener =>\n  async (req, res) => {\n    const writeResponse = (response: unknown) =>\n      new Promise<void>((resolve, reject) =>\n        response === undefined\n          ? res.end(resolve)\n          : res.write(response, 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\n      );\n\n    try {\n      const requestBody = await new Promise<string>((resolve, reject) => {\n        const data: Buffer[] = [];\n\n        req\n          .on('data', (chunk: Buffer) => data.push(chunk))\n          .on('end', () => resolve(Buffer.concat(data).toString()))\n          .on('error', (err) => reject(err));\n      });\n\n      // Treat an empty body as no arguments\n      const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n      // Pass a non-array request body as the first parameter\n      const args: unknown[] = Array.isArray(jsonRequest)\n        ? jsonRequest\n        : [jsonRequest];\n\n      const response: unknown = await fn(...args);\n\n      res.writeHead(200, { 'Content-Type': 'application/json' });\n\n      await writeResponse(JSON.stringify(response, null, 2));\n    } catch (err) {\n      res.writeHead(500);\n\n      await writeResponse(util.inspect(err));\n    }\n  };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n  requestListener: http.RequestListener,\n  port?: number,\n) => {\n  const server = http.createServer(requestListener);\n  return startServer(server, port);\n};\n\n/**\n * Returns a HTTP server wrapped in a promise\n *\n * This function resolves when the server is closed.\n */\nexport const startServer = (server: http.Server, port?: number) =>\n  new Promise<void>((resolve, reject) =>\n    server\n      .listen(port)\n      .on('close', resolve)\n      .on('error', reject)\n      .on('listening', () => {\n        const address = server.address() as AddressInfo;\n\n        log.ok('listening on port', log.bold(address.port));\n      }),\n  );\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,kBAAiB;AAEjB,qBAAoB;AAQb,MAAM,oCACX,CAAC,OACD,OAAO,KAAK,QAAQ;AAClB,QAAM,gBAAgB,CAAC,aACrB,IAAI;AAAA,IAAc,CAAC,SAAS,WAC1B,aAAa,SACT,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,MAAM;AAAA,MAAU;AAAA,MAAQ,CAAC,QAC3B,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,IACrC;AAAA,EACN;AAEF,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,QAAI,UAAU,KAAK,EAAE,gBAAgB,mBAAmB,CAAC;AAEzD,UAAM,cAAc,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,EACvD,SAAS,KAAK;AACZ,QAAI,UAAU,GAAG;AAEjB,UAAM,cAAc,YAAAA,QAAK,QAAQ,GAAG,CAAC;AAAA,EACvC;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAC,QAAK,aAAa,eAAe;AAChD,SAAO,YAAY,QAAQ,IAAI;AACjC;AAOO,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,EACpD,CAAC;AACL;",
+  "sourcesContent": ["import http from 'http';\nimport util from 'util';\n\nimport { startServer } from './server.js';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n  (fn: (...args: unknown[]) => Promise<unknown>): http.RequestListener =>\n  async (req, res) => {\n    const writeResponse = (response: unknown) =>\n      new Promise<void>((resolve, reject) =>\n        response === undefined\n          ? res.end(resolve)\n          : res.write(response, 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\n      );\n\n    try {\n      const requestBody = await new Promise<string>((resolve, reject) => {\n        const data: Buffer[] = [];\n\n        req\n          .on('data', (chunk: Buffer) => data.push(chunk))\n          .on('end', () => resolve(Buffer.concat(data).toString()))\n          .on('error', (err) => reject(err));\n      });\n\n      // Treat an empty body as no arguments\n      const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n      // Pass a non-array request body as the first parameter\n      const args: unknown[] = Array.isArray(jsonRequest)\n        ? jsonRequest\n        : [jsonRequest];\n\n      const response: unknown = await fn(...args);\n\n      res.writeHead(200, { 'Content-Type': 'application/json' });\n\n      await writeResponse(JSON.stringify(response, null, 2));\n    } catch (err) {\n      res.writeHead(500);\n\n      await writeResponse(util.inspect(err));\n    }\n  };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n  requestListener: http.RequestListener,\n  port?: number,\n) => {\n  const server = http.createServer(requestListener);\n  return startServer(server, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAiB;AAEjB,oBAA4B;AAQrB,MAAM,oCACX,CAAC,OACD,OAAO,KAAK,QAAQ;AAClB,QAAM,gBAAgB,CAAC,aACrB,IAAI;AAAA,IAAc,CAAC,SAAS,WAC1B,aAAa,SACT,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,MAAM;AAAA,MAAU;AAAA,MAAQ,CAAC,QAC3B,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,IACrC;AAAA,EACN;AAEF,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,QAAI,UAAU,KAAK,EAAE,gBAAgB,mBAAmB,CAAC;AAEzD,UAAM,cAAc,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,EACvD,SAAS,KAAK;AACZ,QAAI,UAAU,GAAG;AAEjB,UAAM,cAAc,YAAAA,QAAK,QAAQ,GAAG,CAAC;AAAA,EACvC;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAC,QAAK,aAAa,eAAe;AAChD,aAAO,2BAAY,QAAQ,IAAI;AACjC;",
   "names": ["util", "http"]
 }

package/lib/wrapper/requestListener.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(requestListener_exports);
 var import_http = __toESM(require("http"));
 var import_validation = require("../utils/validation.js");
 var import_http2 = require("./http.js");
+var import_server = require("./server.js");
 const isConfig = (data) => (0, import_validation.isFunction)(data) || (0, import_validation.isObject)(data);
 const runRequestListener = async ({
   availablePort,
@@ -51,10 +52,10 @@ const runRequestListener = async ({
   }
   const port = (0, import_validation.isIpPort)(config.port) ? config.port : availablePort;
   if (typeof config !== "function" && config instanceof import_http.default.Server) {
-    return (0, import_http2.startServer)(config, port);
+    return (0, import_server.startServer)(config, port);
   }
   if (typeof config !== "function" && config.server && config.server instanceof import_http.default.Server) {
-    return (0, import_http2.startServer)(config.server, port);
+    return (0, import_server.startServer)(config.server, port);
   }
   const requestListener = typeof config === "function" ? config : config.requestListener ?? config.callback?.();
   if (typeof requestListener !== "function") {

package/lib/wrapper/requestListener.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/requestListener.ts"],
-  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation.js';\n\nimport { serveRequestListener, startServer } from './http.js';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : (config.requestListener ?? config.callback?.());\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACC,OAAO,mBAAmB,OAAO,WAAW;AAEnD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
+  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation.js';\n\nimport { serveRequestListener } from './http.js';\nimport { startServer } from './server.js';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : (config.requestListener ?? config.callback?.());\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAqC;AACrC,oBAA4B;AAoB5B,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,2BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,2BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACC,OAAO,mBAAmB,OAAO,WAAW;AAEnD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
   "names": ["import_http", "http"]
 }

package/lib/wrapper/server.d.ts

@@ -0,0 +1,7 @@
+import type http from 'http';
+/**
+ * Returns a HTTP server wrapped in a promise
+ *
+ * This function resolves when the server is closed.
+ */
+export declare const startServer: (server: http.Server, port?: number) => Promise<void>;

package/lib/wrapper/server.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  startServer: () => startServer
+});
+module.exports = __toCommonJS(server_exports);
+var import_logging = require("../utils/logging.js");
+const startServer = (server, port) => new Promise(
+  (resolve, reject) => server.listen(port).on("close", resolve).on("error", reject).on("listening", () => {
+    const address = server.address();
+    import_logging.log.ok("listening on port", import_logging.log.bold(String(address.port)));
+  })
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  startServer
+});
+//# sourceMappingURL=server.js.map

package/lib/wrapper/server.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/wrapper/server.ts"],
+  "sourcesContent": ["import type http from 'http';\nimport type { AddressInfo } from 'net';\n\nimport { log } from '../utils/logging.js';\n\n/**\n * Returns a HTTP server wrapped in a promise\n *\n * This function resolves when the server is closed.\n */\nexport const startServer = (server: http.Server, port?: number) =>\n  new Promise<void>((resolve, reject) =>\n    server\n      .listen(port)\n      .on('close', resolve)\n      .on('error', reject)\n      .on('listening', () => {\n        const address = server.address() as AddressInfo;\n\n        log.ok('listening on port', log.bold(String(address.port)));\n      }),\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,qBAAoB;AAOb,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,OAAO,QAAQ,IAAI,CAAC,CAAC;AAAA,EAC5D,CAAC;AACL;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "13.0.3",
+  "version": "13.1.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -56,20 +56,18 @@
   },
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
-    "@eslint/migrate-config": "~1.3.8",
+    "@inquirer/prompts": "^7.9.0",
     "@jest/types": "^30.0.0",
     "@octokit/graphql": "^9.0.0",
     "@octokit/graphql-schema": "^15.3.0",
     "@octokit/rest": "^22.0.0",
-    "@octokit/types": "^15.0.0",
+    "@octokit/types": "^16.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.0.0",
-    "chalk": "^4.1.0",
     "concurrently": "^9.0.0",
     "ejs": "^3.1.6",
-    "enquirer": "^2.3.6",
-    "esbuild": "~0.25.0",
-    "eslint": "^9.11.1",
+    "esbuild": "~0.27.0",
+    "eslint": "^9.39.1",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
     "find-up": "^5.0.0",
@@ -89,7 +87,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.6.0",
+    "prettier": "~3.7.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^24.2.3",
@@ -103,40 +101,40 @@
     "typescript": "~5.9.0",
     "zod": "^4.0.0",
     "@skuba-lib/api": "^1.0.1",
-    "eslint-config-skuba": "7.2.0"
+    "eslint-config-skuba": "7.2.1"
   },
   "devDependencies": {
-    "@changesets/cli": "2.29.7",
-    "@changesets/get-github-info": "0.6.0",
+    "@changesets/cli": "2.29.8",
+    "@changesets/get-github-info": "0.7.0",
     "@jest/reporters": "30.2.0",
     "@jest/test-result": "30.2.0",
     "@types/ejs": "3.1.5",
     "@types/express": "5.0.3",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "3.0.0",
+    "@types/koa": "3.0.1",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
-    "@types/npm-registry-fetch": "8.0.8",
+    "@types/npm-registry-fetch": "8.0.9",
     "@types/npm-which": "3.0.4",
     "@types/picomatch": "4.0.2",
     "@types/semver": "7.7.1",
     "@types/supertest": "6.0.3",
     "enhanced-resolve": "5.18.3",
     "express": "5.1.0",
-    "fastify": "5.6.1",
+    "fastify": "5.6.2",
     "jest-diff": "30.2.0",
     "jsonfile": "6.2.0",
-    "koa": "3.0.1",
-    "memfs": "4.48.1",
+    "koa": "3.1.1",
+    "memfs": "4.51.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
-    "semver": "7.7.2",
+    "semver": "7.7.3",
     "supertest": "7.1.4",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
-    "skuba-dive": "1 || 2"
+    "skuba-dive": "1 || 2 || 3"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {

package/template/base/_pnpm-workspace.yaml

@@ -11,6 +11,7 @@ minimumReleaseAgeExclude:
   - tsconfig-seek
 packageManagerStrictVersion: true
 publicHoistPattern:
+  - '@eslint/*'
   - '@types*'
   - eslint
   - eslint-config-skuba

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

package/template/express-rest-api/.gantry/dev.yml

@@ -1,8 +1,8 @@
-deployment: dev
+deployment: <%- devGantryEnvironmentName %>
 env: development
 
-maxInstanceCount: 1
 minInstanceCount: 1
+maxInstanceCount: 1
 
 # Disable dashboard for cost savings
 cloudwatchDashboardDisabled: true

package/template/express-rest-api/.gantry/prod.yml

@@ -1,8 +1,8 @@
-deployment: prod
+deployment: <%- prodGantryEnvironmentName %>
 env: production
 
-maxInstanceCount: 10
 minInstanceCount: 3
+maxInstanceCount: 10
 
 openTelemetry:
   enabled: true

package/template/express-rest-api/package.json

@@ -21,11 +21,11 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.205.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.61.0",
-    "@opentelemetry/instrumentation-http": "^0.205.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.208.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.64.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.205.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
     "@seek/logger": "^11.1.0",
     "express": "^5.0.0",
     "hot-shots": "^11.0.0",
@@ -40,7 +40,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.24.0",
   "engines": {
     "node": ">=22"
   }

package/template/greeter/.buildkite/pipeline.yml

@@ -29,7 +29,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

package/template/greeter/package.json

@@ -19,13 +19,13 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "skuba-dive": "^2.0.0"
+    "skuba-dive": "^3.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.24.0",
   "engines": {
     "node": ">=22"
   }

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

package/template/koa-rest-api/.gantry/dev.yml

@@ -1,8 +1,8 @@
-deployment: dev
+deployment: <%- devGantryEnvironmentName %>
 env: development
 
-maxInstanceCount: 1
 minInstanceCount: 1
+maxInstanceCount: 1
 
 # Disable dashboard for cost savings
 cloudwatchDashboardDisabled: true

package/template/koa-rest-api/.gantry/prod.yml

@@ -1,8 +1,8 @@
-deployment: prod
+deployment: <%- prodGantryEnvironmentName %>
 env: production
 
-maxInstanceCount: 10
 minInstanceCount: 3
+maxInstanceCount: 10
 
 openTelemetry:
   enabled: true

package/template/koa-rest-api/package.json

@@ -23,11 +23,11 @@
     "@koa/router": "^14.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.205.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.61.0",
-    "@opentelemetry/instrumentation-http": "^0.205.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.208.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.64.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.205.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
     "@seek/logger": "^11.1.0",
     "hot-shots": "^11.0.0",
     "koa": "^3.0.1",
@@ -49,7 +49,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.24.0",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml

@@ -23,7 +23,7 @@ configs:
       concurrency: 1
       plugins:
         - *docker-ecr-cache
-        - docker-compose#v5.11.0:
+        - docker-compose#v5.12.1:
             dependencies: false
             environment:
               - GITHUB_API_TOKEN
@@ -53,7 +53,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -184,7 +184,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -920,14 +919,13 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
-            "DD_API_KEY_SECRET_ARN": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME",
+            "DD_API_KEY_SECRET_ARN": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key",
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
             "DD_ENV": "production",
             "DD_FLUSH_TO_LOG": "false",
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -1384,7 +1382,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 "secretsmanager:DescribeSecret",
               ],
               "Effect": "Allow",
-              "Resource": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME-??????",
+              "Resource": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key-??????",
             },
             {
               "Action": [

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -19,7 +19,7 @@ import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 import { config } from './config.js';
 
 // Updated by https://github.com/seek-oss/rynovate
-const DATADOG_EXTENSION_LAYER_VERSION = 87;
+const DATADOG_EXTENSION_LAYER_VERSION = 90;
 
 // Updated by https://github.com/seek-oss/rynovate
 const DATADOG_NODE_LAYER_VERSION = 126;

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -40,8 +40,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- devDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
   prod: {
@@ -57,8 +56,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- prodDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
 };

package/template/lambda-sqs-worker-cdk/package.json

@@ -20,10 +20,11 @@
   "dependencies": {
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
+    "@aws-sdk/client-secrets-manager": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^11.1.0",
-    "skuba-dive": "^2.0.0",
+    "skuba-dive": "^3.0.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -43,7 +44,7 @@
     "pino-pretty": "^13.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.24.0",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/skuba.template.js

@@ -22,6 +22,18 @@ module.exports = {
       initial: 'my-team-aws-account-prod:cicd',
       validate: (value) => /^.+:.+$/.test(value),
     },
+    {
+      name: 'devDataDogApiKeySecretArn',
+      message: 'Dev DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
+    {
+      name: 'prodDataDogApiKeySecretArn',
+      message: 'Prod DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
   ],
   packageManager: 'pnpm',
   type: 'application',

package/template/oss-npm-package/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
         uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc