@openapi-typescript-infra/service 4.4.0 → 4.5.1

package/config/development.json

@@ -6,10 +6,5 @@
   "server": {
     "port": 0,
     "internalPort": 0
-  },
-  "connections": {
-    "default": {
-      "proxy": "http://localhost:9990"
-    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "4.4.0",
+  "version": "4.5.1",
   "description": "An opinionated framework for building configuration driven services - web, api, or  ob. Uses OpenAPI, pino logging, express, confit, Typescript and vitest.",
   "main": "build/index.js",
   "scripts": {

package/src/config/index.ts

@@ -121,3 +121,4 @@ export function insertConfigurationBefore(
 }
 
 export * from './schema';
+export * from './validation';

package/src/config/schema.ts

@@ -1,14 +1,6 @@
 import type { BaseConfitSchema } from '@sesamecare-oss/confit';
 import type { Level } from 'pino';
 
-export interface ServiceConfiguration {
-  protocol?: string;
-  port?: number;
-  host?: string;
-  basePath?: string;
-  proxy?: string | false;
-}
-
 export interface ConfigurationItemEnabled {
   enabled?: boolean;
 }
@@ -66,10 +58,9 @@ export interface ConfigurationSchema extends BaseConfitSchema {
     // Note that generally it's better to offload tls termination,
     // but this is useful for dev.
     key?: string | Uint8Array;
-    certificate?: string;
+    certificate?: string | Uint8Array;
     // If you have an alternate host name (other than localhost) that
     // should be used when referring to this service, set it here.
     hostname?: string;
   };
-  connections: Record<string, ServiceConfiguration>;
 }

package/src/config/validation.ts

@@ -0,0 +1,22 @@
+import { ConfigurationSchema } from './schema';
+
+export interface ConfigValidationError {
+  path: string;
+  message: string;
+}
+
+export type ConfigurationValidator<Config extends ConfigurationSchema> = (config: Config) => {
+  success: boolean;
+  errors: ConfigValidationError[];
+};
+
+export function validateConfiguration<Config extends ConfigurationSchema>(
+  config: Config,
+  validator: ConfigurationValidator<Config>,
+) {
+  const result = validator(config);
+  if (!result.success) {
+    throw new Error(`Configuration validation failed:
+${result.errors.map((e) => `  - ${e.path}: ${e.message}`).join('\n')}`);
+  }
+}

package/src/express-app/app.ts

@@ -271,7 +271,7 @@ function httpServer<
   return https.createServer(
     {
       key: config.key ? Buffer.from(config.key) : undefined,
-      cert: config.certificate,
+      cert: config.certificate ? Buffer.from(config.certificate) : undefined,
     },
     app,
   );

package/.github/workflows/npmpublish.yml

@@ -1,48 +0,0 @@
-name: Node.js Package
-
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - run: yarn install --immutable
-      - run: yarn build
-      - run: yarn lint
-      - run: yarn test
-
-  publish-npm:
-    needs: build
-    permissions:
-      contents: write
-      issues: write
-      id-token: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          registry-url: https://registry.npmjs.org/
-      - run: yarn install --immutable
-      - run: yarn build
-
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          yarn dlx semantic-release