skuba 0.0.0-master-20230319220011 → 0.0.0-master-20230815032514

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';\n\nimport { serializeError } from 'serialize-error';\n\nimport { log } from '../utils/logging';\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  (\n    fn: (...args: unknown[]) => unknown | Promise<unknown>,\n  ): http.RequestListener =>\n  async (req, res) => {\n    const writeJsonResponse = (statusCode: number, jsonResponse: unknown) => {\n      res.writeHead(statusCode, { 'Content-Type': 'application/json' });\n\n      return new Promise<void>((resolve, reject) =>\n        jsonResponse === undefined\n          ? res.end(resolve)\n          : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\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      await writeJsonResponse(200, response);\n    } catch (err) {\n      await writeJsonResponse(500, serializeError(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;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CACE,OAEF,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,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,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAP;AACA,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,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 type { AddressInfo } from 'net';\n\nimport { serializeError } from 'serialize-error';\n\nimport { log } from '../utils/logging';\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 writeJsonResponse = (statusCode: number, jsonResponse: unknown) => {\n      res.writeHead(statusCode, { 'Content-Type': 'application/json' });\n\n      return new Promise<void>((resolve, reject) =>\n        jsonResponse === undefined\n          ? res.end(resolve)\n          : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\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      await writeJsonResponse(200, response);\n    } catch (err) {\n      await writeJsonResponse(500, serializeError(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;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CAAC,OACD,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,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,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAK;AACZ,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,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;",
   "names": ["http"]
 }

package/lib/wrapper/index.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/wrapper/index.ts"],
   "sourcesContent": ["/**\n * Wrapper around an entry point provided to `skuba node` or `skuba start`.\n *\n * Beyond simply loading the entry point, it supports the following features:\n *\n * - If you set the entry point to an exported function like `src/app#handler`,\n *   it will spin up a local HTTP server that calls into the function.\n *\n * - If you `export =` or `export default` an Express or Koa application,\n *   it will spin up a local HTTP server based on the request listener.\n */\n\nimport { handleCliError } from '../utils/error';\nimport { log } from '../utils/logging';\n\nimport { main } from './main';\n\nconst ENTRY_POINT_VAR = '__SKUBA_ENTRY_POINT';\nconst PORT_VAR = '__SKUBA_PORT';\n\nconst rawEntryPoint = process.env[ENTRY_POINT_VAR];\nif (!rawEntryPoint) {\n  throw new Error(`Missing environment variable: ${log.bold(ENTRY_POINT_VAR)}`);\n}\n\nconst rawPort = process.env[PORT_VAR];\nif (!rawPort) {\n  throw new Error(`Missing environment variable: ${log.bold(PORT_VAR)}`);\n}\n\nmain(rawEntryPoint, rawPort).catch(handleCliError);\n"],
-  "mappings": ";AAYA,mBAA+B;AAC/B,qBAAoB;AAEpB,kBAAqB;AAErB,MAAM,kBAAkB;AACxB,MAAM,WAAW;AAEjB,MAAM,gBAAgB,QAAQ,IAAI,eAAe;AACjD,IAAI,CAAC,eAAe;AAClB,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,eAAe,GAAG;AAC9E;AAEA,MAAM,UAAU,QAAQ,IAAI,QAAQ;AACpC,IAAI,CAAC,SAAS;AACZ,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,QAAQ,GAAG;AACvE;AAAA,IAEA,kBAAK,eAAe,OAAO,EAAE,MAAM,2BAAc;",
+  "mappings": ";AAYA,mBAA+B;AAC/B,qBAAoB;AAEpB,kBAAqB;AAErB,MAAM,kBAAkB;AACxB,MAAM,WAAW;AAEjB,MAAM,gBAAgB,QAAQ,IAAI,eAAe;AACjD,IAAI,CAAC,eAAe;AAClB,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,eAAe,CAAC,EAAE;AAC9E;AAEA,MAAM,UAAU,QAAQ,IAAI,QAAQ;AACpC,IAAI,CAAC,SAAS;AACZ,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,QAAQ,CAAC,EAAE;AACvE;AAAA,IAEA,kBAAK,eAAe,OAAO,EAAE,MAAM,2BAAc;",
   "names": []
 }

package/lib/wrapper/main.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/main.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n  const availablePort = Number(rawPort) || undefined;\n\n  // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n  const [modulePath, functionName] = path\n    .join(process.cwd(), rawEntryPoint)\n    .split('#', 2);\n\n  // Load entry point as module\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const entryPoint = require(modulePath) as unknown;\n\n  return functionName\n    ? runFunctionHandler({ availablePort, entryPoint, functionName })\n    : runRequestListener({ availablePort, entryPoint });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAU;AAErC,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
+  "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n  const availablePort = Number(rawPort) || undefined;\n\n  // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n  const [modulePath, functionName] = path\n    .join(process.cwd(), rawEntryPoint)\n    .split('#', 2);\n\n  // Load entry point as module\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const entryPoint = require(modulePath as string) as unknown;\n\n  return functionName\n    ? runFunctionHandler({ availablePort, entryPoint, functionName })\n    : runRequestListener({ availablePort, entryPoint });\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAoB;AAE/C,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
   "names": ["path"]
 }

package/lib/wrapper/requestListener.js

@@ -50,6 +50,9 @@ const runRequestListener = async ({
     return;
   }
   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);
+  }
   if (typeof config !== "function" && config.server && config.server instanceof import_http.default.Server) {
     return (0, import_http2.startServer)(config.server, port);
   }

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';\n\nimport { serveRequestListener, startServer } from './http';\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  // 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,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAC,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,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';\n\nimport { serveRequestListener, startServer } from './http';\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,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
   "names": ["import_http", "http"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "0.0.0-master-20230319220011",
+  "version": "0.0.0-master-20230815032514",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -65,25 +65,25 @@
     ]
   },
   "resolutions": {
-    "**/@types/node": ">=16.11"
+    "**/@types/node": ">=18.12"
   },
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
     "@jest/types": "^29.0.0",
-    "@octokit/graphql": "^5.0.0",
-    "@octokit/graphql-schema": "^13.0.0",
-    "@octokit/rest": "^19.0.0",
-    "@octokit/types": "^9.0.0",
+    "@octokit/graphql": "^7.0.0",
+    "@octokit/graphql-schema": "^14.5.0",
+    "@octokit/rest": "^20.0.0",
+    "@octokit/types": "^11.0.0",
     "@types/jest": "^29.0.0",
-    "@types/node": ">=16.11",
+    "@types/node": ">=18.12",
     "chalk": "^4.1.0",
-    "concurrently": "^7.0.0",
+    "concurrently": "^8.0.0",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.17.0",
+    "esbuild": "~0.19.0",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.4.1",
+    "eslint-config-skuba": "3.0.1",
     "execa": "^5.0.0",
     "fdir": "^6.0.0",
     "fs-extra": "^11.0.0",
@@ -102,47 +102,47 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "~2.8.0",
+    "prettier": "~3.0.0",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
-    "semantic-release": "^19.0.0",
+    "semantic-release": "^21.0.0",
     "serialize-error": "^8.0.1",
     "simple-git": "^3.5.0",
     "sort-package-json": "^1.57.0",
     "strip-ansi": "^6.0.1",
     "ts-dedent": "^2.2.0",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.7.0",
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
-    "tsconfig-seek": "1.0.2",
-    "typescript": "~5.0.0",
+    "tsconfig-seek": "2.0.0",
+    "typescript": "~5.1.5",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.26.0",
+    "@changesets/cli": "2.26.2",
     "@changesets/get-github-info": "0.5.2",
-    "@jest/reporters": "29.4.3",
+    "@jest/reporters": "29.6.2",
     "@types/ejs": "3.1.2",
     "@types/express": "4.17.17",
     "@types/fs-extra": "11.0.1",
-    "@types/koa": "2.13.5",
+    "@types/koa": "2.13.8",
     "@types/libnpmsearch": "2.0.3",
     "@types/lodash.mergewith": "4.6.7",
-    "@types/module-alias": "2.0.1",
+    "@types/module-alias": "2.0.2",
     "@types/npm-which": "3.0.1",
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
     "@types/validate-npm-package-name": "4.0.0",
-    "enhanced-resolve": "5.12.0",
+    "enhanced-resolve": "5.15.0",
     "express": "4.18.2",
-    "fastify": "4.13.0",
+    "fastify": "4.21.0",
     "jsonfile": "6.1.0",
-    "koa": "2.14.1",
-    "memfs": "3.4.13",
+    "koa": "2.14.2",
+    "memfs": "4.2.1",
     "remark-cli": "11.0.0",
-    "remark-preset-lint-recommended": "6.1.2",
-    "semver": "7.3.8",
+    "remark-preset-lint-recommended": "6.1.3",
+    "semver": "7.5.4",
     "supertest": "6.3.3",
     "type-fest": "2.19.0"
   },
@@ -155,7 +155,10 @@
     }
   },
   "engines": {
-    "node": ">=16.11"
+    "node": ">=18.12"
+  },
+  "publishConfig": {
+    "provenance": true
   },
   "skuba": {
     "build": "esbuild",

package/template/base/.github/CODEOWNERS

@@ -1,5 +1 @@
 * @<%- ownerName %>
-
-# Configured by Renovate
-package.json
-yarn.lock

package/template/base/_.prettierignore

@@ -1,20 +1,8 @@
 # managed by skuba
-.idea/*
-.vscode/*
-
-.cdk.staging/
-.serverless/
-cdk.out/
-node_modules*/
-
-/coverage*/
-/dist*/
-/lib*/
-/tmp*/
-
 # Gantry resource files support non-standard template syntax
 /.gantry/**/*.yaml
 /.gantry/**/*.yml
 gantry*.yaml
 gantry*.yml
+pnpm-lock.yaml
 # end managed by skuba

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

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.14.0:
           run: app
     timeout_in_minutes: 10
 

package/template/express-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs:18 AS runtime
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs18-debian11 AS runtime
 
 WORKDIR /workdir
 

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

@@ -108,8 +108,6 @@ cpu: 256
 memory: 512
 
 deployment:
-  # SEEK-Jobs/gantry#488
-  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

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

@@ -12,7 +12,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^5.0.1",
+    "@seek/logger": "^6.0.0",
     "express": "^4.17.1",
     "skuba-dive": "^2.0.0"
   },
@@ -25,6 +25,6 @@
     "supertest": "^6.1.6"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.12"
   }
 }

package/template/express-rest-api/src/api/healthCheck.ts

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Signifies that the API is available to serve requests.

package/template/express-rest-api/src/api/smokeTest.ts

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

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

@@ -32,6 +32,6 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.14.0:
           run: app
     timeout_in_minutes: 10

package/template/greeter/package.json

@@ -19,6 +19,6 @@
     "skuba": "*"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.12"
   }
 }

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

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.14.0:
           run: app
     timeout_in_minutes: 10
 

package/template/koa-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs:18 AS runtime
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs18-debian11 AS runtime
 
 WORKDIR /workdir
 

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

@@ -115,8 +115,6 @@ cpu: 256
 memory: 512
 
 deployment:
-  # SEEK-Jobs/gantry#488
-  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

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

@@ -14,17 +14,17 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.36.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.34.0",
-    "@opentelemetry/instrumentation-http": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.36.0",
-    "@seek/logger": "^5.0.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.41.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.36.0",
+    "@opentelemetry/instrumentation-http": "^0.41.0",
+    "@opentelemetry/sdk-node": "^0.41.0",
+    "@seek/logger": "^6.0.0",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.2.0",
-    "seek-datadog-custom-metrics": "^4.0.0",
+    "seek-datadog-custom-metrics": "^4.2.1",
     "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -42,6 +42,6 @@
     "supertest": "^6.1.6"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.12"
   }
 }

package/template/koa-rest-api/src/api/healthCheck.ts

@@ -1,4 +1,4 @@
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Signifies that the API is available to serve requests.

package/template/koa-rest-api/src/api/jobs/getJobs.ts

@@ -1,7 +1,7 @@
 import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import * as storage from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const getJobsHandler: Middleware = async (ctx) => {
   const jobs = await storage.readJobs();

package/template/koa-rest-api/src/api/jobs/postJob.ts

@@ -3,7 +3,7 @@ import { metricsClient } from 'src/framework/metrics';
 import { validateRequestBody } from 'src/framework/validation';
 import * as storage from 'src/storage/jobs';
 import { JobInputSchema } from 'src/types/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const postJobHandler: Middleware = async (ctx) => {
   const jobInput = validateRequestBody(ctx, JobInputSchema);

package/template/koa-rest-api/src/api/smokeTest.ts

@@ -1,5 +1,5 @@
 import { smokeTestJobStorage } from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

package/template/koa-rest-api/src/framework/server.test.ts

@@ -4,7 +4,7 @@ import { logger } from 'src/testing/logging';
 import { metricsClient } from 'src/testing/metrics';
 import { agentFromRouter } from 'src/testing/server';
 import { chance } from 'src/testing/types';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 const middleware = jest.fn<void, Parameters<Middleware>>();
 

package/template/koa-rest-api/src/framework/server.ts

@@ -36,7 +36,7 @@ const version = VersionMiddleware.create({
 });
 
 export const createApp = <State, Context>(
-  ...middleware: Koa.Middleware<State, Context>[]
+  ...middleware: Array<Koa.Middleware<State, Context>>
 ) =>
   new Koa()
     // TODO: consider using a middleware that adds secure HTTP headers.

package/template/koa-rest-api/src/framework/validation.ts

@@ -1,7 +1,7 @@
 import { ErrorMiddleware } from 'seek-koala';
-import { z } from 'zod';
+import type { z } from 'zod';
 
-import { Context } from 'src/types/koa';
+import type { Context } from 'src/types/koa';
 
 /**
  * Converts a `ZodError` into an `invalidFields` object

package/template/koa-rest-api/src/storage/jobs.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 
-import { Job, JobInput } from 'src/types/jobs';
+import type { Job, JobInput } from 'src/types/jobs';
 
 const jobStore: Record<string, Job> = {};
 

package/template/koa-rest-api/src/testing/server.ts

@@ -1,5 +1,5 @@
-import Router from '@koa/router';
-import Koa from 'koa';
+import type Router from '@koa/router';
+import type Koa from 'koa';
 import request from 'supertest';
 
 import { createApp } from 'src/framework/server';
@@ -14,7 +14,7 @@ export const agentFromApp = <State, Context>(app: Koa<State, Context>) =>
  * Create a new SuperTest agent from a set of Koa middleware.
  */
 export const agentFromMiddleware = <State, Context>(
-  ...middleware: Koa.Middleware<State, Context>[]
+  ...middleware: Array<Koa.Middleware<State, Context>>
 ) => {
   const app = createApp(...middleware);
 

package/template/koa-rest-api/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import { z } from 'zod';
 
-import { JobInput } from 'src/types/jobs';
+import type { JobInput } from 'src/types/jobs';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

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

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.11.0:
+        - docker-compose#v4.14.0:
             dependencies: false
             run: app
       retry:
@@ -60,7 +60,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.14.0:
           run: app
     timeout_in_minutes: 10
 

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

@@ -14,13 +14,13 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@aws-sdk/client-codedeploy": "^3.259.0",
-    "@aws-sdk/client-lambda": "^3.259.0",
-    "@aws-sdk/client-sns": "^3.259.0",
+    "@aws-sdk/client-codedeploy": "^3.363.0",
+    "@aws-sdk/client-lambda": "^3.363.0",
+    "@aws-sdk/client-sns": "^3.363.0",
     "@aws-sdk/util-utf8-node": "^3.259.0",
-    "@seek/logger": "^5.0.1",
-    "datadog-lambda-js": "^6.83.0",
-    "dd-trace": "^3.8.0",
+    "@seek/logger": "^6.0.0",
+    "datadog-lambda-js": "^7.0.0",
+    "dd-trace": "^4.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },
@@ -28,8 +28,8 @@
     "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
     "@types/node": "^18.11.9",
-    "aws-sdk-client-mock": "^2.0.1",
-    "aws-sdk-client-mock-jest": "^2.0.1",
+    "aws-sdk-client-mock": "^3.0.0",
+    "aws-sdk-client-mock-jest": "^3.0.0",
     "chance": "^1.1.8",
     "pino-pretty": "^10.0.0",
     "serverless": "^3.25.0",
@@ -39,6 +39,6 @@
     "skuba": "*"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.12"
   }
 }

package/template/lambda-sqs-worker/src/app.test.ts

@@ -47,7 +47,7 @@ describe('handler', () => {
 
     expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info.mock.calls).toEqual([
+    expect(logger.debug.mock.calls).toEqual([
       [{ count: 1 }, 'Received jobs'],
       [{ snsMessageId: expect.any(String) }, 'Scored job'],
       ['Function succeeded'],

package/template/lambda-sqs-worker/src/app.ts

@@ -1,6 +1,6 @@
 import 'skuba-dive/register';
 
-import { SQSEvent } from 'aws-lambda';
+import type { SQSEvent } from 'aws-lambda';
 
 import { createHandler } from 'src/framework/handler';
 import { logger } from 'src/framework/logging';
@@ -20,7 +20,7 @@ const smokeTest = async () => {
 export const handler = createHandler<SQSEvent>(async (event) => {
   // Treat an empty object as our smoke test event.
   if (!Object.keys(event).length) {
-    logger.info('Received smoke test request');
+    logger.debug('Received smoke test request');
     return smokeTest();
   }
 
@@ -30,23 +30,28 @@ export const handler = createHandler<SQSEvent>(async (event) => {
     throw Error(`Received ${count} records`);
   }
 
-  logger.info({ count }, 'Received jobs');
+  logger.debug({ count }, 'Received jobs');
 
   metricsClient.distribution('job.received', event.Records.length);
 
   const record = event.Records[0];
+  if (!record) {
+    throw new Error('Malformed SQS event with no records');
+  }
+
+  const { body } = record;
 
   // TODO: this throws an error, which will cause the Lambda function to retry
   // the event and eventually send it to your dead-letter queue. If you don't
   // trust your source to provide consistently well-formed input, consider
   // catching and handling this error in code.
-  const publishedJob = validateJson(record.body, JobPublishedEventSchema);
+  const publishedJob = validateJson(body, JobPublishedEventSchema);
 
   const scoredJob = await scoreJobPublishedEvent(publishedJob);
 
   const snsMessageId = await sendPipelineEvent(scoredJob);
 
-  logger.info({ snsMessageId }, 'Scored job');
+  logger.debug({ snsMessageId }, 'Scored job');
 
   metricsClient.distribution('job.scored', 1);
 });

package/template/lambda-sqs-worker/src/framework/handler.test.ts

@@ -18,7 +18,7 @@ describe('createHandler', () => {
     const handler = createHandler((event) => {
       expect(event).toBe(input);
 
-      logger.info('Handler invoked');
+      logger.debug('Handler invoked');
 
       return Promise.resolve(output);
     });
@@ -27,7 +27,7 @@ describe('createHandler', () => {
 
     expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info.mock.calls).toEqual([
+    expect(logger.debug.mock.calls).toEqual([
       ['Handler invoked'],
       ['Function succeeded'],
     ]);
@@ -42,7 +42,7 @@ describe('createHandler', () => {
 
     expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
 
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(logger.debug).not.toHaveBeenCalled();
   });
 
   it('handles sync error', async () => {
@@ -56,6 +56,6 @@ describe('createHandler', () => {
 
     expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
 
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(logger.debug).not.toHaveBeenCalled();
   });
 });