@financial-times/cp-content-pipeline-schema 2.7.0 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [2.9.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.8.0...cp-content-pipeline-schema-v2.9.0) (2024-05-09)
+
+
+### Features
+
+* construct OperationalError at the call site for datasources ([f07cb89](https://github.com/Financial-Times/cp-content-pipeline/commit/f07cb8933f63ebfbe96d9ccadb370c275bce8b43))
+* use fetch-error-handler and centralize datasource error handling ([4c5d0d6](https://github.com/Financial-Times/cp-content-pipeline/commit/4c5d0d66dd78cb6a5db316759a2c8788b1d30576))
+* use native fetch ([58e682b](https://github.com/Financial-Times/cp-content-pipeline/commit/58e682b149d65e6ff55a0f828f8e8f7e6f06c200))
+
+
+### Bug Fixes
+
+* only wrap getPerson errors in OperationalError at call site ([05b1c51](https://github.com/Financial-Times/cp-content-pipeline/commit/05b1c51ddf6d63f73cacde895faa256cff8a676f))
+* return null for containedIn on error instead of throwing ([a7e96f3](https://github.com/Financial-Times/cp-content-pipeline/commit/a7e96f3e180e994c37482e93e1e396a612f7db0f))
+* use logger.warn for RECOVERABLE_ERROR ([d7f44a5](https://github.com/Financial-Times/cp-content-pipeline/commit/d7f44a526e300afad82f4296014b61c1e19a0a9c))
+* use return await to let it catch promise rejections ([bc08819](https://github.com/Financial-Times/cp-content-pipeline/commit/bc088199263d92023ba03b71fb6497aa10eebe3f))
+
+## [2.8.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.7.0...cp-content-pipeline-schema-v2.8.0) (2024-04-29)
+
+
+### Features
+
+* clickable bylines and headshots in opinion posts ([9295ce3](https://github.com/Financial-Times/cp-content-pipeline/commit/9295ce31e6e58d59882c1b74232ed5c7338f001d))
+
 ## [2.7.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.6.2...cp-content-pipeline-schema-v2.7.0) (2024-04-26)
 
 

package/lib/datasources/capi.d.ts

@@ -7,7 +7,7 @@ export declare class CapiDataSource extends InstrumentedRESTDataSource {
     capiKey: string;
     articleCacheTTL: number;
     peopleCacheTTL: number;
-    backendSystemCodes: string[];
+    backendSystemCode: string;
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
     nextNotificationLink?: string;

package/lib/datasources/capi.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CapiDataSource = void 0;
 const CapiResponse_1 = require("../model/CapiResponse");
 const instrumented_1 = require("./instrumented");
-const errors_1 = require("@dotcom-reliability-kit/errors");
 const REQUEST_TIMEOUT = 5000; // 5 seconds
 class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
     constructor() {
@@ -16,7 +15,7 @@ class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
         this.peopleCacheTTL = process.env.PEOPLE_CACHE_TTL
             ? parseInt(process.env.PEOPLE_CACHE_TTL)
             : 600; // 10 minutes
-        this.backendSystemCodes = ['up-ica'];
+        this.backendSystemCode = 'up-ica';
         this.abortController = new AbortController();
         this.timeout = undefined;
     }
@@ -27,45 +26,21 @@ class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
         this.timeout = setTimeout(() => this.abortController.abort(), REQUEST_TIMEOUT);
     }
     async getContent(uuid, packageContainer) {
-        try {
-            const content = await this.get(`internalcontent/${uuid}`, {
-                cacheOptions: { ttl: this.articleCacheTTL },
-            });
-            this.context.contentRequestedOnce = true;
-            this.calls.push(uuid);
-            if (this.timeout) {
-                clearTimeout(this.timeout);
-                this.timeout = undefined;
-            }
-            return CapiResponse_1.CapiResponse.fromJSON(content, this.context, packageContainer);
-        }
-        catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
-                throw new errors_1.UpstreamServiceError({
-                    code: 'CAPI_DATASOURCE_TIMEOUT',
-                    message: `Request to Internal Content API took longer than ${REQUEST_TIMEOUT}ms, and so has been aborted.`,
-                    statusCode: 408,
-                    relatesToSystems: this.backendSystemCodes,
-                });
-            }
-            throw error;
+        const content = await this.get(`internalcontent/${uuid}`, {
+            cacheOptions: { ttl: this.articleCacheTTL },
+        });
+        this.context.contentRequestedOnce = true;
+        this.calls.push(uuid);
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
         }
+        return CapiResponse_1.CapiResponse.fromJSON(content, this.context, packageContainer);
     }
-    async getPerson(uuid) {
-        try {
-            return await this.get(`people/${uuid}`, {
-                cacheOptions: { ttl: this.peopleCacheTTL },
-            });
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                throw new errors_1.OperationalError({
-                    cause: error,
-                    code: 'CAPI_DATASOURCE_PERSON_ERROR',
-                });
-            }
-            throw error;
-        }
+    getPerson(uuid) {
+        return this.get(`people/${uuid}`, {
+            cacheOptions: { ttl: this.peopleCacheTTL },
+        });
     }
 }
 exports.CapiDataSource = CapiDataSource;

package/lib/datasources/capi.js.map

@@ -1 +1 @@
-{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AACpD,iDAA2D;AAI3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,cAAe,SAAQ,yCAA0B;IAA9D;;QACE,YAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,uBAAuB,CAAA;QACzD,YAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;QACxC,oBAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC7C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACzC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,UAAU;QACnC,mBAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB;YAC3C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACxC,CAAC,CAAC,GAAG,CAAA,CAAC,aAAa;QAErB,sBAAiB,GAAG,QAAQ,CAAA;QAE5B,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IAsChE,CAAC;IAlCU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAAY,EACZ,gBAA+B;QAE/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,EAAE;YACxD,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE;SAC5C,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAA;QACxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAErB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;SACzB;QAED,OAAO,2BAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACvE,CAAC;IAED,SAAS,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,EAAE;YAChC,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;SAC3C,CAAC,CAAA;IACJ,CAAC;CACF;AAnDD,wCAmDC"}

package/lib/datasources/instrumented.d.ts

@@ -1,15 +1,18 @@
 import { RESTDataSource, CacheOptions, DataSourceFetchResult, DataSourceRequest, AugmentedRequest } from '@apollo/datasource-rest';
+import type { FetchErrorHandler } from '@dotcom-reliability-kit/fetch-error-handler/lib/create-handler';
 import { QueryContext } from '..';
 import { BaseDataSource, BaseDataSourceOptions } from './base';
 export declare class InstrumentedRESTDataSource extends RESTDataSource implements BaseDataSource {
     startTime?: bigint;
-    backendSystemCodes: string[];
+    backendSystemCode: string | undefined;
     context: QueryContext;
     calls: string[];
+    errorHandler: FetchErrorHandler;
     constructor({ cache, context }: BaseDataSourceOptions);
     get cachePrefix(): string;
     protected cacheKeyFor(url: URL): string;
     willSendRequest(path: string, request: AugmentedRequest): void;
     throwIfResponseIsError(): Promise<void>;
+    logResponseMetrics(status: number, duration: bigint): void;
     fetch<TResult>(path: string, incomingRequest?: DataSourceRequest<CacheOptions>): Promise<DataSourceFetchResult<TResult>>;
 }

package/lib/datasources/instrumented.js

@@ -3,17 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstrumentedRESTDataSource = void 0;
 const datasource_rest_1 = require("@apollo/datasource-rest");
 const utils_keyvaluecache_1 = require("@apollo/utils.keyvaluecache");
-const errors_1 = require("@dotcom-reliability-kit/errors");
+const fetch_error_handler_1 = require("@dotcom-reliability-kit/fetch-error-handler");
 const cache_1 = require("../types/cache");
+const errors_1 = require("@dotcom-reliability-kit/errors");
 class InstrumentedRESTDataSource extends datasource_rest_1.RESTDataSource {
     constructor({ cache, context }) {
         const wrappedCache = new utils_keyvaluecache_1.PrefixingKeyValueCache((0, cache_1.isContextableCache)(cache) ? cache.withContext(context) : cache, 'placeholder_prefix_if_you_see_this_in_redis_something_is_very_wrong:' // can't use `this` yet to get our prefix
         );
         super({
             cache: wrappedCache,
+            fetch: (url, init) => this.errorHandler(global.fetch(url, init)),
         });
-        this.backendSystemCodes = [];
         this.calls = [];
+        this.errorHandler = (0, fetch_error_handler_1.createFetchErrorHandler)({
+            upstreamSystemCode: this.backendSystemCode,
+        });
         // okay _now_ we can use `this`
         // also that's a private property so use the [] escape hatch
         // sorry
@@ -35,30 +39,26 @@ class InstrumentedRESTDataSource extends datasource_rest_1.RESTDataSource {
     // we implement our own error handling so skip the built-in GraphQLError
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     async throwIfResponseIsError() { }
+    logResponseMetrics(status, duration) {
+        this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${status}.count`, 1);
+        this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${status}.time`, Number(duration));
+    }
     async fetch(path, incomingRequest) {
         const startTime = process.hrtime.bigint();
         this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.request.count`, 1);
         try {
             const result = await super.fetch(path, incomingRequest);
             const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6);
-            this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${result.response.status}.count`, 1);
-            this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${result.response.status}.time`, Number(duration));
-            if (!result.response.ok) {
-                throw new errors_1.UpstreamServiceError({
-                    message: `${result.response.status}: ${result.response.statusText} from ${this.constructor.name}`,
-                    statusCode: result.response.status,
-                    relatesToSystems: this.backendSystemCodes,
-                    url: result.response.url,
-                    body: result.parsedBody,
-                });
-            }
+            this.logResponseMetrics(result.response.status, duration);
             return result;
         }
         catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
+            if (error instanceof errors_1.BaseError) {
+                const status = error.code === 'FETCH_ABORT_ERROR'
+                    ? 408
+                    : Number(error.data.upstreamStatusCode ?? 0);
                 const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6);
-                this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.408.count`, 1);
-                this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.408.time`, Number(duration));
+                this.logResponseMetrics(status, duration);
             }
             throw error;
         }

package/lib/datasources/instrumented.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"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"}

package/lib/datasources/origami-image.d.ts

@@ -2,7 +2,7 @@ import { InstrumentedRESTDataSource } from './instrumented';
 import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest';
 export declare class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
-    backendSystemCodes: string[];
+    backendSystemCode: string;
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
     imageMetadataCacheTTL: number;

package/lib/datasources/origami-image.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrigamiImageDataSource = void 0;
-const errors_1 = require("@dotcom-reliability-kit/errors");
 const instrumented_1 = require("./instrumented");
 const REQUEST_TIMEOUT = 5000; // 5 seconds
 class OrigamiImageDataSource extends instrumented_1.InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
         this.baseURL = 'https://www.ft.com/__origami/service/image/v2/';
-        this.backendSystemCodes = ['origami-image-service-v2'];
+        this.backendSystemCode = 'origami-image-service-v2';
         this.abortController = new AbortController();
         this.timeout = undefined;
         this.imageMetadataCacheTTL = process.env.IMAGE_METADATA_CACHE_TTL
@@ -24,26 +23,13 @@ class OrigamiImageDataSource extends instrumented_1.InstrumentedRESTDataSource {
         return { ttl: this.imageMetadataCacheTTL };
     }
     async getImageMetadata(url) {
-        try {
-            const imageMetadata = await this.get(`images/metadata/${encodeURIComponent(url)}?source=next`);
-            this.calls.push(url);
-            if (this.timeout) {
-                clearTimeout(this.timeout);
-                this.timeout = undefined;
-            }
-            return imageMetadata;
-        }
-        catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
-                throw new errors_1.UpstreamServiceError({
-                    code: 'ORIGAMI_DATASOURCE_TIMEOUT',
-                    message: `Request to Image Service took longer than ${REQUEST_TIMEOUT}ms, and so has been aborted.`,
-                    statusCode: 408,
-                    relatesToSystems: this.backendSystemCodes,
-                });
-            }
-            throw error;
+        const imageMetadata = await this.get(`images/metadata/${encodeURIComponent(url)}?source=next`);
+        this.calls.push(url);
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
         }
+        return imageMetadata;
     }
 }
 exports.OrigamiImageDataSource = OrigamiImageDataSource;

package/lib/datasources/origami-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,iDAA2D;AAG3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,sBAAuB,SAAQ,yCAA0B;IAAtE;;QACE,YAAO,GAAG,gDAAgD,CAAA;QAC1D,uBAAkB,GAAG,CAAC,0BAA0B,CAAC,CAAA;QAEjD,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;QAE9D,0BAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAC1D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAChD,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,SAAS;IA4ChC,CAAC;IA1CU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAES,eAAe;QACvB,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAClC,mBAAmB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CACzD,CAAA;YAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEpB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YACD,OAAO,aAAa,CAAA;SACrB;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,6CAA6C,eAAe,8BAA8B;oBACnG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF;AArDD,wDAqDC"}
+{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAG3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,sBAAuB,SAAQ,yCAA0B;IAAtE;;QACE,YAAO,GAAG,gDAAgD,CAAA;QAC1D,sBAAiB,GAAG,0BAA0B,CAAA;QAE9C,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;QAE9D,0BAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAC1D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAChD,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,SAAS;IA+BhC,CAAC;IA7BU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAES,eAAe;QACvB,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAClC,mBAAmB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CACzD,CAAA;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEpB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;SACzB;QACD,OAAO,aAAa,CAAA;IACtB,CAAC;CACF;AAxCD,wDAwCC"}

package/lib/datasources/twitter.d.ts

@@ -2,7 +2,7 @@ import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest';
 import { InstrumentedRESTDataSource } from './instrumented';
 export declare class TwitterDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
-    backendSystemCodes: string[];
+    backendSystemCode: string;
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
     willSendRequest(path: string, request: AugmentedRequest): void;

package/lib/datasources/twitter.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TwitterDataSource = void 0;
-const errors_1 = require("@dotcom-reliability-kit/errors");
 const instrumented_1 = require("./instrumented");
 const REQUEST_TIMEOUT = 5000; // 5 seconds
 class TwitterDataSource extends instrumented_1.InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
         this.baseURL = 'https://publish.twitter.com';
-        this.backendSystemCodes = ['twitter-oembed-api'];
+        this.backendSystemCode = 'twitter-oembed-api';
         this.abortController = new AbortController();
         this.timeout = undefined;
     }
@@ -18,26 +17,13 @@ class TwitterDataSource extends instrumented_1.InstrumentedRESTDataSource {
         this.timeout = setTimeout(() => this.abortController.abort(), REQUEST_TIMEOUT);
     }
     async getTweet(tweetUrl) {
-        try {
-            const tweet = await this.get(`oembed?url=${tweetUrl}&omit_script=true`);
-            this.calls.push(tweetUrl);
-            if (this.timeout) {
-                clearTimeout(this.timeout);
-                this.timeout = undefined;
-            }
-            return tweet;
-        }
-        catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
-                throw new errors_1.UpstreamServiceError({
-                    code: 'TWITTER_DATASOURCE_TIMEOUT',
-                    message: `Request to Twitter API took longer than ${REQUEST_TIMEOUT}ms, and so has been aborted.`,
-                    statusCode: 408,
-                    relatesToSystems: this.backendSystemCodes,
-                });
-            }
-            throw error;
+        const tweet = await this.get(`oembed?url=${tweetUrl}&omit_script=true`);
+        this.calls.push(tweetUrl);
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+            this.timeout = undefined;
         }
+        return tweet;
     }
     cacheOptionsFor() {
         // HACK:20221110:KB twitter does return a cache_age property, but cacheOptionsFor

package/lib/datasources/twitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"twitter.js","sourceRoot":"","sources":["../../src/datasources/twitter.ts"],"names":[],"mappings":";;;AACA,2DAAqE;AACrE,iDAA2D;AAE3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AACzC,MAAa,iBAAkB,SAAQ,yCAA0B;IAAjE;;QACE,YAAO,GAAG,6BAA6B,CAAA;QACvC,uBAAkB,GAAG,CAAC,oBAAoB,CAAC,CAAA;QAE3C,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IA2ChE,CAAC;IAzCU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,QAAQ,mBAAmB,CAAC,CAAA;YAEvE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEzB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YAED,OAAO,KAAK,CAAA;SACb;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,2CAA2C,eAAe,8BAA8B;oBACjG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED,eAAe;QACb,iFAAiF;QACjF,oFAAoF;QACpF,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IACtB,CAAC;CACF;AAhDD,8CAgDC"}
+{"version":3,"file":"twitter.js","sourceRoot":"","sources":["../../src/datasources/twitter.ts"],"names":[],"mappings":";;;AACA,iDAA2D;AAE3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AACzC,MAAa,iBAAkB,SAAQ,yCAA0B;IAAjE;;QACE,YAAO,GAAG,6BAA6B,CAAA;QACvC,sBAAiB,GAAG,oBAAoB,CAAA;QAExC,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IA8BhE,CAAC;IA5BU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,QAAQ,mBAAmB,CAAC,CAAA;QAEvE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEzB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;SACzB;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,eAAe;QACb,iFAAiF;QACjF,oFAAoF;QACpF,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IACtB,CAAC;CACF;AAnCD,8CAmCC"}

package/lib/generated/index.d.ts

@@ -1,5 +1,6 @@
 import type { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from 'graphql';
 import type { Concept as ConceptModel } from '../model/Concept';
+import type { Person as PersonModel } from '../model/Person';
 import type { CapiResponse } from '../model/CapiResponse';
 import type { Image as ImageModel } from '../model/Image';
 import type { Clip as ClipModel } from '../model/Clip';
@@ -972,6 +973,7 @@ export type LiveBlogPost = Content & {
     readonly altTitle?: Maybe<AltTitle>;
     /** An array of concepts related to the article, eg. organisations or topics. */
     readonly annotations?: Maybe<ReadonlyArray<Maybe<Concept>>>;
+    readonly authors?: Maybe<ReadonlyArray<Maybe<Person>>>;
     /** An abstract syntax tree of the article content. */
     readonly body?: Maybe<RichText>;
     /** The raw string of the XML as returned from ContentAPI. */
@@ -1077,6 +1079,16 @@ export type OpinionTopper = Topper & TopperWithHeadshot & TopperWithTheme & {
     readonly textShadow?: Maybe<Scalars['Boolean']['output']>;
 };
 export type OpinionTopperHeadshotArgs = {
+    dpr?: InputMaybe<Scalars['Int']['input']>;
+    url?: InputMaybe<Scalars['String']['input']>;
+    width?: InputMaybe<Scalars['Int']['input']>;
+};
+export type Person = {
+    readonly headshot?: Maybe<Scalars['String']['output']>;
+    readonly prefLabel?: Maybe<Scalars['String']['output']>;
+    readonly streamPage?: Maybe<Scalars['String']['output']>;
+};
+export type PersonHeadshotArgs = {
     dpr?: InputMaybe<Scalars['Int']['input']>;
     width?: InputMaybe<Scalars['Int']['input']>;
 };
@@ -1234,6 +1246,7 @@ export type PodcastTopper = Topper & TopperWithBrand & TopperWithHeadshot & Topp
 };
 export type PodcastTopperHeadshotArgs = {
     dpr?: InputMaybe<Scalars['Int']['input']>;
+    url?: InputMaybe<Scalars['String']['input']>;
     width?: InputMaybe<Scalars['Int']['input']>;
 };
 export type Query = {
@@ -1390,6 +1403,7 @@ export type TopperWithHeadshot = {
 };
 export type TopperWithHeadshotHeadshotArgs = {
     dpr?: InputMaybe<Scalars['Int']['input']>;
+    url?: InputMaybe<Scalars['String']['input']>;
     width?: InputMaybe<Scalars['Int']['input']>;
 };
 export type TopperWithImages = {
@@ -1582,6 +1596,7 @@ export type ResolversTypes = ResolversObject<{
     Mutation: ResolverTypeWrapper<{}>;
     OpinionTopper: ResolverTypeWrapper<TopperModel>;
     PackageDesign: ResolverTypeWrapper<Scalars['PackageDesign']['output']>;
+    Person: ResolverTypeWrapper<PersonModel>;
     Picture: ResolverTypeWrapper<PictureModel>;
     PictureFullBleed: ResolverTypeWrapper<PictureModel>;
     PictureInline: ResolverTypeWrapper<PictureModel>;
@@ -1671,6 +1686,7 @@ export type ResolversParentTypes = ResolversObject<{
     Mutation: {};
     OpinionTopper: TopperModel;
     PackageDesign: Scalars['PackageDesign']['output'];
+    Person: PersonModel;
     Picture: PictureModel;
     PictureFullBleed: PictureModel;
     PictureInline: PictureModel;
@@ -2187,6 +2203,7 @@ export type LiveBlogPostResolvers<ContextType = QueryContext, ParentType extends
     altStandfirst: Resolver<Maybe<ResolversTypes['AltStandfirst']>, ParentType, ContextType>;
     altTitle: Resolver<Maybe<ResolversTypes['AltTitle']>, ParentType, ContextType>;
     annotations: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
+    authors: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Person']>>>, ParentType, ContextType>;
     body: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
     bodyXML: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     byline: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<LiveBlogPostBylineArgs>>;
@@ -2248,6 +2265,12 @@ export type OpinionTopperResolvers<ContextType = QueryContext, ParentType extend
 export interface PackageDesignScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['PackageDesign'], any> {
     name: 'PackageDesign';
 }
+export type PersonResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Person'] = ResolversParentTypes['Person']> = ResolversObject<{
+    headshot: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType, Partial<PersonHeadshotArgs>>;
+    prefLabel: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    streamPage: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
 export type PictureResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Picture'] = ResolversParentTypes['Picture']> = ResolversObject<{
     __resolveType?: TypeResolveFn<'PictureFullBleed' | 'PictureInline' | 'PictureStandard', ParentType, ContextType>;
     alt: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2537,6 +2560,7 @@ export type Resolvers<ContextType = QueryContext> = ResolversObject<{
     Mutation: MutationResolvers<ContextType>;
     OpinionTopper: OpinionTopperResolvers<ContextType>;
     PackageDesign: GraphQLScalarType;
+    Person: PersonResolvers<ContextType>;
     Picture: PictureResolvers<ContextType>;
     PictureFullBleed: PictureFullBleedResolvers<ContextType>;
     PictureInline: PictureInlineResolvers<ContextType>;

package/lib/model/CapiResponse.d.ts

@@ -2,6 +2,7 @@ import type { ImageSet, ContentTypeSchemas, ClipSet } from '../types/internal-co
 import type { QueryContext } from '..';
 import { CAPIImage } from './Image';
 import { Concept } from './Concept';
+import { Person } from './Person';
 import { AccessLevel, ContentType, PackageDesign, CanBeSyndicated } from '../resolvers/scalars';
 import { LiteralUnionScalarValues } from '../resolvers/literal-union';
 import { ContentPackageContainsArgs, ContentUrlArgs, Media, TableOfContents } from '../generated';
@@ -73,6 +74,7 @@ export declare class CapiResponse {
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
     } | null | undefined;
+    authors(): Person[] | null;
     accessLevel(): LiteralUnionScalarValues<typeof AccessLevel>;
     editorialDesk(): string | null;
     canBeSyndicated(): LiteralUnionScalarValues<typeof CanBeSyndicated>;

package/lib/model/CapiResponse.js

@@ -17,6 +17,7 @@ const errors_1 = require("@dotcom-reliability-kit/errors");
 const lodash_sortby_1 = __importDefault(require("lodash.sortby"));
 const Image_1 = require("./Image");
 const Concept_1 = require("./Concept");
+const Person_1 = require("./Person");
 const isError_1 = __importDefault(require("../helpers/isError"));
 const metadata_1 = require("../helpers/metadata");
 const capi_1 = require("./schemas/capi");
@@ -101,7 +102,7 @@ class CapiResponse {
          * Don't let this failure block this system from continuing to try and handle the request
          */
         if (!schemaResponse.success) {
-            context.logger.error({
+            context.logger.warn({
                 event: 'RECOVERABLE_ERROR',
                 error: new errors_1.OperationalError({
                     message: 'The data received from the CAPI data source does not match our data source schema. It is likely that our schema will require updating to handle all possible responses from CAPI.',
@@ -170,7 +171,7 @@ class CapiResponse {
             }
             catch (error) {
                 if ((0, isError_1.default)(error)) {
-                    this.context.logger.error({
+                    this.context.logger.warn({
                         event: 'RECOVERABLE_ERROR',
                         error,
                     });
@@ -189,6 +190,12 @@ class CapiResponse {
             return this.capiData.topper;
         return null;
     }
+    authors() {
+        const authors = this.getAuthors();
+        return authors.length === 0
+            ? null
+            : authors.map((author) => new Person_1.Person(author, this, this.context));
+    }
     accessLevel() {
         return this.capiData.accessLevel ?? 'subscribed';
     }
@@ -277,7 +284,22 @@ class CapiResponse {
         else {
             const containerId = 'containedIn' in this.capiData && this.capiData.containedIn?.[0]?.id;
             if (containerId) {
-                container = await this.context.dataSources.capi.getContent((0, metadata_1.uuidFromUrl)(containerId));
+                try {
+                    container = await this.context.dataSources.capi.getContent((0, metadata_1.uuidFromUrl)(containerId));
+                }
+                catch (error) {
+                    if (error instanceof Error) {
+                        this.context.logger.warn({
+                            event: 'RECOVERABLE_ERROR',
+                            error: new errors_1.OperationalError({
+                                message: `Failed to fetch package container ${containerId} for content ${this.id()}`,
+                                code: `PACKAGE_CONTAINEDIN_ERROR`,
+                                cause: error,
+                            }),
+                        });
+                    }
+                    return null;
+                }
                 this.packageContainer = container;
             }
         }
@@ -419,7 +441,21 @@ class CapiResponse {
                 ? this.capiData.contains.slice(Math.max(0, fromIndex - surroundingArticles), fromIndex + surroundingArticles)
                 : this.capiData.contains;
             this.context.addSurrogateKeys(contains.map((article) => article.id));
-            return Promise.all(contains.map(({ id }) => this.context.dataSources.capi.getContent((0, metadata_1.uuidFromUrl)(id), this)));
+            const results = await Promise.allSettled(contains.map(({ id }) => this.context.dataSources.capi.getContent((0, metadata_1.uuidFromUrl)(id), this)));
+            const failed = results.filter((result) => result.status === 'rejected');
+            if (failed.length) {
+                this.context.logger.warn({
+                    event: 'RECOVERABLE_ERROR',
+                    error: new errors_1.OperationalError({
+                        code: 'PACKAGE_CONTAINS_ERROR',
+                        message: `Failed to fetch some of the content contained in the package ${this.id()}`,
+                        cause: new AggregateError(failed.map((result) => result.reason)),
+                    }),
+                });
+            }
+            return results
+                .filter((result) => result.status === 'fulfilled')
+                .map((result) => result.value);
         }
         return null;
     }