chore: rework config keys, remove template leftovers

nodemon.json

@@ -2,4 +2,4 @@
   "watch": ["src"],
   "ext": "ts",
   "exec": "node --inspect -r ts-node/register ./src/server.ts"
-}
+}

readme.md

@@ -42,14 +42,14 @@ Note: the ad normalizer assumes that your packager is set up with the output sub
 | ----------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------------- |
 | `ENCORE_URL`            | The URL of your encore instance                                                                                            | none          |
 | `CALLBACK_LISTENER_URL` | The URL of your callback listener                                                                                          | none          |
-| `MINIO_URL`             | The minio instance endpoint                                                                                                | none          |
-| `MINIO_ACCESS_KEY`      | Your minio access key                                                                                                      | none          |
-| `MINIO_SECRET_KEY`      | Your minio secret key                                                                                                      | none          |
+| `S3_ENDPOINT`           | The S3 instance endpoint endpoint                                                                                          | none          |
+| `S3_ACCESS_KEY`         | Your S3 access key                                                                                                         | none          |
+| `S3_SECRET_KEY`         | Your S3 secret key                                                                                                         | none          |
 | `LOG_LEVEL`             | The log level of the service                                                                                               | Info          |
 | `REDIS_URL`             | The url of your redis instance                                                                                             | none          |
 | `AD_SERVER_URL`         | The url of your ad server                                                                                                  | none          |
 | `PORT`                  | The port that the server listens on                                                                                        | 8000          |
-| `MINIO_BUCKET`          | The bucket that the packaged assets will be placed into                                                                    | none          |
+| `OUTPUT_BUCKET_URL`     | The url to the output folder for the packaged assets                                                                       | none          |
 | `SERVICE_ACCESS_TOKEN`  | your OSC service access token for encore (only needed when running the service outside OSC with an encore instance in OSC) | none          |
 
 ### starting the service

src/api.ts

@@ -13,7 +13,7 @@ import { EncoreClient } from './encore/encoreclient';
 import { MinioClient, MinioNotification } from './minio/minio';
 
 const HelloWorld = Type.String({
-  description: 'The magical words!'
+  status: 'HEALTHY'
 });
 
 export interface HealthcheckOptions {
@@ -29,7 +29,7 @@ const healthcheck: FastifyPluginCallback<HealthcheckOptions> = (
     '/',
     {
       schema: {
-        description: 'Say hello',
+        description: 'Health check',
         response: {
           200: HelloWorld
         }
@@ -76,9 +76,9 @@ export default (opts: ApiOptions) => {
   );
 
   const minioClient = new MinioClient(
-    config.minioUrl,
-    config.minioAccessKey,
-    config.minioSecretKey
+    config.s3Endpoint,
+    config.s3AccessKey,
+    config.s3SecretKey
   );
 
   minioClient.setupClient();
@@ -109,14 +109,14 @@ export default (opts: ApiOptions) => {
 
   api.register(vastApi, {
     adServerUrl: config.adServerUrl,
-    assetServerUrl: `https://${config.minioUrl}/${config.minioBucket}/`,
+    assetServerUrl: `https://${config.s3Endpoint}/${config.bucket}/`,
     lookUpAsset: async (mediaFile: string) => redisclient.get(mediaFile),
     onMissingAsset: async (asset: ManifestAsset) =>
       encoreClient.createEncoreJob(asset),
     setupNotification: (asset: ManifestAsset) => {
       logger.debug('Setting up notification for asset', { asset });
       minioClient.listenForNotifications(
-        config.minioBucket,
+        config.bucket,
         asset.creativeId + '/', // TODO: Pass encore job id and add as part of the prefix
         'index.m3u8',
         async (notification: MinioNotification) =>

src/config/config.ts

@@ -1,10 +1,10 @@
 export interface AdNormalizerConfiguration {
   encoreUrl: string;
   callbackListenerUrl: string;
-  minioUrl: string;
-  minioAccessKey: string;
-  minioSecretKey: string;
-  minioBucket: string;
+  s3Endpoint: string;
+  s3AccessKey: string;
+  s3SecretKey: string;
+  bucket: string;
   adServerUrl: string;
   redisUrl: string;
   serviceAccessToken?: string;
@@ -15,22 +15,29 @@ let config: AdNormalizerConfiguration | null = null;
 const loadConfiguration = (): AdNormalizerConfiguration => {
   const encoreUrl = process.env.ENCORE_URL;
   const callbackListenerUrl = process.env.CALLBACK_LISTENER_URL;
-  const minioUrl = process.env.MINIO_URL;
-  const minioAccessKey = process.env.MINIO_ACCESS_KEY;
-  const minioSecretKey = process.env.MINIO_SECRET_KEY;
+  const endpoint = process.env.S3_ENDPOINT;
+  const accessKey = process.env.S3_ACCESS_KEY;
+  const secretKey = process.env.S3_SECRET_KEY;
   const adServerUrl = process.env.AD_SERVER_URL;
   const redisUrl = process.env.REDIS_URL;
-  const minioBucket = process.env.MINIO_BUCKET;
+  const bucketRaw = process.env.OUTPUT_BUCKET_URL;
+  if (!bucketRaw) {
+    throw new Error('OUTPUT_BUCKET_URL is required');
+  }
+  const bucket = new URL(bucketRaw);
+  const bucketPath = bucket.pathname
+    ? bucket.hostname + '/' + bucket.pathname
+    : bucket.hostname;
   const serviceAccessToken = process.env.SERVICE_ACCESS_TOKEN;
   const configuration = {
     encoreUrl: encoreUrl,
     callbackListenerUrl: callbackListenerUrl,
-    minioUrl: minioUrl,
-    minioAccessKey: minioAccessKey,
-    minioSecretKey: minioSecretKey,
+    s3Endpoint: endpoint,
+    s3AccessKey: accessKey,
+    s3SecretKey: secretKey,
     adServerUrl: adServerUrl,
     redisUrl: redisUrl,
-    minioBucket: minioBucket,
+    bucket: bucketPath,
     serviceAccessToken: serviceAccessToken
   } as AdNormalizerConfiguration;
 

src/server.ts

@@ -2,7 +2,7 @@ import api from './api';
 import 'dotenv/config';
 import logger from './util/logger';
 
-const server = api({ title: '@eyevinn/typescript-nodejs' });
+const server = api({ title: '@eyevinn/ad-normalizer' });
 
 const PORT = process.env.PORT ? Number(process.env.PORT) : 8000;
 

src/vast/vastApi.ts

@@ -58,11 +58,17 @@
                 const code = response.status;
                 const url = response.url;
                 const reason = response.statusText;
-                logger.error('Failed to submit encore job', {
-                  code,
-                  reason,
-                  url
-                });
+                if (code == 401) {
+                  logger.error(
+                    'Encore returned status code 401 Unauthorized. Check that your service access token is still valid.'
+                  );
+                } else {
+                  logger.error('Failed to submit encore job', {
+                    code,
+                    reason,
+                    url
+                  });
+                }
                 throw new Error('Failed to submit encore job');
               }
               return response.json();
@@ -136,7 +142,7 @@
       const parser = new XMLParser();
       const parsedVAST = parser.parse(body);
       const creatives = parsedVAST.VAST.Ad.reduce(
         (acc: ManifestAsset[], ad: any) => {
           const adId = ad.InLine.Creatives.Creative.UniversalAdId.replace(
             /[^a-zA-Z0-9]/g,
             ''