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

package/lib/resolvers/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/resolvers/core.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,wDAAoD;AAEpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CACxE,CAAA;AAEY,QAAA,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;AAE1C,MAAM,SAAS,GAAG;IAChB,KAAK,EAAE;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,eAAO;QACtB,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO;YAC5B,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,CAAC;QACD,eAAe,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO;YACrC,OAAO,2BAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAChD,CAAC;KACF;IACD,QAAQ,EAAE;QACR,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YAC/C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,CAC9C,qDAAqD,IAAI,CAAC,IAAI,EAAE,CACjE,CAAA;YAED,IAAI,MAAM,EAAE;gBACV,OAAO,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAA;aACxC;iBAAM,IAAI,MAAM,KAAK,KAAK,EAAE;gBAC3B,OAAO,WAAW,IAAI,CAAC,IAAI,SAAS,CAAA;aACrC;iBAAM;gBACL,OAAO,iBAAiB,CAAA;aACzB;QACH,CAAC;KACF;CAIF,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/resolvers/core.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,wDAAoD;AACpD,2DAAqE;AAErE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CACxE,CAAA;AAEY,QAAA,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;AAE1C,MAAM,SAAS,GAAG;IAChB,KAAK,EAAE;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,eAAO;QACtB,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO;YAC5B,IAAI;gBACF,OAAO,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAC5D;YAAC,OAAO,KAAK,EAAE;gBACd,IACE,KAAK,YAAY,kBAAS;oBAC1B,KAAK,CAAC,IAAI,CAAC,kBAAkB,KAAK,GAAG,EACrC;oBACA,MAAM,IAAI,kBAAS,CAAC;wBAClB,IAAI,EAAE,mBAAmB;wBACzB,OAAO,EAAE,WAAW,IAAI,CAAC,IAAI,2BAA2B;wBACxD,UAAU,EAAE,GAAG;wBACf,gBAAgB,EAAE,CAAC,QAAQ,CAAC;qBAC7B,CAAC,CAAA;iBACH;gBAED,MAAM,KAAK,CAAA;aACZ;QACH,CAAC;QACD,eAAe,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO;YACrC,OAAO,2BAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAChD,CAAC;KACF;IACD,QAAQ,EAAE;QACR,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YAC/C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,CAC9C,qDAAqD,IAAI,CAAC,IAAI,EAAE,CACjE,CAAA;YAED,IAAI,MAAM,EAAE;gBACV,OAAO,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAA;aACxC;iBAAM,IAAI,MAAM,KAAK,KAAK,EAAE;gBAC3B,OAAO,WAAW,IAAI,CAAC,IAAI,SAAS,CAAA;aACrC;iBAAM;gBACL,OAAO,iBAAiB,CAAA;aACzB;QACH,CAAC;KACF;CAIF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/resolvers/index.d.ts

@@ -1,4 +1,9 @@
 declare const resolvers: {
+    Person: {
+        headshot: (parent: import("../model/Person").Person) => Promise<string | null>;
+        prefLabel: (parent: import("../model/Person").Person) => string;
+        streamPage: (parent: import("../model/Person").Person) => string;
+    };
     Topper: {
         __resolveType: import("../generated").TypeResolveFn<"DeepPortraitTopper" | "DeepLandscapeTopper" | "SplitTextTopper" | "FullBleedTopper" | "PodcastTopper" | "OpinionTopper" | "BrandedTopper" | "BasicTopper", import("../model/Topper").Topper, import("..").QueryContext>;
         backgroundBox: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<boolean>>, import("../model/Topper").Topper, import("..").QueryContext, {}>;
@@ -23,11 +28,11 @@ declare const resolvers: {
         genreConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     TopperWithHeadshot: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => string | Promise<string | null> | null;
     };
     PodcastTopper: {
         brandConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => string | Promise<string | null> | null;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
@@ -42,7 +47,7 @@ declare const resolvers: {
         textShadow: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<boolean>>, import("../model/Topper").Topper, import("..").QueryContext, {}>;
     };
     OpinionTopper: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => string | Promise<string | null> | null;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
@@ -537,6 +542,7 @@ declare const resolvers: {
             isOpinion: boolean;
         };
         isPinned: (parent: import("../model/CapiResponse").CapiResponse) => boolean;
+        authors: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Person").Person[] | null;
         __resolveType?: import("../generated").TypeResolveFn<"Article" | "Placeholder" | "Video" | "Audio" | "LiveBlogPackage" | "LiveBlogPost" | "ContentPackage", import("../model/CapiResponse").CapiResponse, import("..").QueryContext> | undefined;
         accessLevel: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<"premium" | "subscribed" | "registered" | "free">>, import("../model/CapiResponse").CapiResponse, import("..").QueryContext, {}>;
         altStandfirst: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<import("../generated").AltStandfirst>>, import("../model/CapiResponse").CapiResponse, import("..").QueryContext, {}>;

package/lib/resolvers/index.js

@@ -14,6 +14,7 @@ const richText_1 = __importDefault(require("./richText"));
 const scalars_1 = __importDefault(require("./scalars"));
 const teaser_1 = __importDefault(require("./teaser"));
 const topper_1 = __importDefault(require("./topper"));
+const person_1 = __importDefault(require("./person"));
 const references_1 = require("./content-tree/references");
 const resolvers = {
     ...concept_1.default,
@@ -28,6 +29,7 @@ const resolvers = {
     ...scalars_1.default,
     ...teaser_1.default,
     ...topper_1.default,
+    ...person_1.default,
 };
 exports.default = resolvers;
 //# sourceMappingURL=index.js.map

package/lib/resolvers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":";;;;;AAAA,wDAA8C;AAC9C,wDAA8C;AAC9C,kDAAwC;AACxC,oDAA0C;AAC1C,kDAAwC;AACxC,4DAAiD;AACjD,wDAA8C;AAC9C,0DAAgD;AAChD,wDAA8C;AAC9C,sDAA4C;AAC5C,sDAA4C;AAC5C,0DAAmE;AAGnE,MAAM,SAAS,GAAG;IAChB,GAAG,iBAAO;IACV,GAAG,iBAAO;IACV,GAAG,cAAI;IACP,GAAG,eAAK;IACR,GAAG,cAAI;IACP,GAAG,mBAAQ;IACX,GAAG,iBAAO;IACV,GAAG,sBAAU;IACb,GAAG,kBAAQ;IACX,GAAG,iBAAO;IACV,GAAG,gBAAM;IACT,GAAG,gBAAM;CACU,CAAA;AAErB,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":";;;;;AAAA,wDAA8C;AAC9C,wDAA8C;AAC9C,kDAAwC;AACxC,oDAA0C;AAC1C,kDAAwC;AACxC,4DAAiD;AACjD,wDAA8C;AAC9C,0DAAgD;AAChD,wDAA8C;AAC9C,sDAA4C;AAC5C,sDAA4C;AAC5C,sDAA4C;AAC5C,0DAAmE;AAGnE,MAAM,SAAS,GAAG;IAChB,GAAG,iBAAO;IACV,GAAG,iBAAO;IACV,GAAG,cAAI;IACP,GAAG,eAAK;IACR,GAAG,cAAI;IACP,GAAG,mBAAQ;IACX,GAAG,iBAAO;IACV,GAAG,sBAAU;IACb,GAAG,kBAAQ;IACX,GAAG,iBAAO;IACV,GAAG,gBAAM;IACT,GAAG,gBAAM;IACT,GAAG,gBAAM;CACU,CAAA;AAErB,kBAAe,SAAS,CAAA"}

package/lib/resolvers/person.d.ts

@@ -0,0 +1,8 @@
+declare const resolvers: {
+    Person: {
+        headshot: (parent: import("../model/Person").Person) => Promise<string | null>;
+        prefLabel: (parent: import("../model/Person").Person) => string;
+        streamPage: (parent: import("../model/Person").Person) => string;
+    };
+};
+export default resolvers;

package/lib/resolvers/person.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const resolvers = {
+    Person: {
+        headshot: (parent) => parent.headshot(),
+        prefLabel: (parent) => parent.prefLabel(),
+        streamPage: (parent) => parent.streamPage(),
+    },
+};
+exports.default = resolvers;
+//# sourceMappingURL=person.js.map

package/lib/resolvers/person.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"person.js","sourceRoot":"","sources":["../../src/resolvers/person.ts"],"names":[],"mappings":";;AACA,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE;QACN,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;KAC5C;CAGF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/resolvers/topper.d.ts

@@ -23,11 +23,11 @@ declare const resolvers: {
         genreConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     TopperWithHeadshot: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => string | Promise<string | null> | null;
     };
     PodcastTopper: {
         brandConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => string | Promise<string | null> | null;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
@@ -42,7 +42,7 @@ declare const resolvers: {
         textShadow: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<boolean>>, import("../model/Topper").Topper, import("..").QueryContext, {}>;
     };
     OpinionTopper: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => string | Promise<string | null> | null;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "dependencies": {
     "@apollo/datasource-rest": "^6.2.2",
     "@apollo/utils.keyvaluecache": "^1.0.1",
-    "@dotcom-reliability-kit/errors": "^2.0.0",
+    "@dotcom-reliability-kit/fetch-error-handler": "^0.2.3",
     "@dotcom-reliability-kit/log-error": "^2.0.0",
     "@dotcom-reliability-kit/serialize-request": "^2.0.0",
     "@financial-times/n-concept-ids": "^2.1.0",
@@ -50,6 +50,9 @@
     "@types/lodash.sortby": "^4.7.7",
     "type-fest": "^3.13.1"
   },
+  "peerDependencies": {
+    "@dotcom-reliability-kit/errors": "^3.1.0"
+  },
   "engines": {
     "node": "18.x"
   }

package/queries/article.graphql

@@ -75,6 +75,12 @@ fragment Intro on RichText {
   }
 }
 
+fragment Person on Person {
+  headshot(dpr: 2, width: 150)
+  prefLabel
+  streamPage
+}
+
 fragment Topper on Topper {
   __typename
   headline
@@ -590,6 +596,9 @@ fragment ArticleFields on Content {
       ...Content
       url
       ... on LiveBlogPost {
+      authors {
+        ...Person
+      }
       isPinned
       indicators {
         ...Indicators

package/src/datasources/capi.ts

@@ -2,10 +2,6 @@ import { CapiResponse } from '../model/CapiResponse'
 import { InstrumentedRESTDataSource } from './instrumented'
 import { CapiPerson } from '../types/internal-content'
 import { AugmentedRequest } from '@apollo/datasource-rest'
-import {
-  OperationalError,
-  UpstreamServiceError,
-} from '@dotcom-reliability-kit/errors'
 
 const REQUEST_TIMEOUT = 5000 // 5 seconds
 
@@ -19,7 +15,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     ? parseInt(process.env.PEOPLE_CACHE_TTL)
     : 600 // 10 minutes
 
-  backendSystemCodes = ['up-ica']
+  backendSystemCode = 'up-ica'
 
   abortController = new AbortController()
   timeout: ReturnType<typeof setTimeout> | undefined = undefined
@@ -41,47 +37,23 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     uuid: string,
     packageContainer?: CapiResponse
   ): Promise<CapiResponse> {
-    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.fromJSON(content, this.context, packageContainer)
-    } catch (error) {
-      if (error instanceof Error && error.name === 'AbortError') {
-        throw new 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
     }
-  }
 
-  async getPerson(uuid: string): Promise<CapiPerson> {
-    try {
-      return await this.get(`people/${uuid}`, {
-        cacheOptions: { ttl: this.peopleCacheTTL },
-      })
-    } catch (error) {
-      if (error instanceof Error) {
-        throw new OperationalError({
-          cause: error,
-          code: 'CAPI_DATASOURCE_PERSON_ERROR',
-        })
-      }
+    return CapiResponse.fromJSON(content, this.context, packageContainer)
+  }
 
-      throw error
-    }
+  getPerson(uuid: string): Promise<CapiPerson> {
+    return this.get(`people/${uuid}`, {
+      cacheOptions: { ttl: this.peopleCacheTTL },
+    })
   }
 }

package/src/datasources/instrumented.ts

@@ -6,19 +6,22 @@ import {
   AugmentedRequest,
 } from '@apollo/datasource-rest'
 import { PrefixingKeyValueCache } from '@apollo/utils.keyvaluecache'
-import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
+import { createFetchErrorHandler } from '@dotcom-reliability-kit/fetch-error-handler'
+import type { FetchErrorHandler } from '@dotcom-reliability-kit/fetch-error-handler/lib/create-handler'
 import { QueryContext } from '..'
 import { isContextableCache } from '../types/cache'
 import { BaseDataSource, BaseDataSourceOptions } from './base'
+import { BaseError } from '@dotcom-reliability-kit/errors'
 
 export class InstrumentedRESTDataSource
   extends RESTDataSource
   implements BaseDataSource
 {
   startTime?: bigint
-  backendSystemCodes: string[] = []
+  backendSystemCode: string | undefined
   context: QueryContext
   calls: string[] = []
+  errorHandler: FetchErrorHandler
 
   constructor({ cache, context }: BaseDataSourceOptions) {
     const wrappedCache = new PrefixingKeyValueCache(
@@ -28,6 +31,11 @@ export class InstrumentedRESTDataSource
 
     super({
       cache: wrappedCache,
+      fetch: (url, init) => this.errorHandler(global.fetch(url, init)),
+    })
+
+    this.errorHandler = createFetchErrorHandler({
+      upstreamSystemCode: this.backendSystemCode,
     })
 
     // okay _now_ we can use `this`
@@ -59,6 +67,18 @@ export class InstrumentedRESTDataSource
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   async throwIfResponseIsError() {}
 
+  logResponseMetrics(status: number, duration: bigint): void {
+    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<TResult>(
     path: string,
     incomingRequest?: DataSourceRequest<CacheOptions>
@@ -74,40 +94,18 @@ export class InstrumentedRESTDataSource
       const result = await super.fetch<TResult>(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 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 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/src/datasources/origami-image.ts

@@ -1,4 +1,3 @@
-import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
 import { InstrumentedRESTDataSource } from './instrumented'
 import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
 
@@ -6,7 +5,7 @@ const REQUEST_TIMEOUT = 5000 // 5 seconds
 
 export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
   baseURL = 'https://www.ft.com/__origami/service/image/v2/'
-  backendSystemCodes = ['origami-image-service-v2']
+  backendSystemCode = 'origami-image-service-v2'
 
   abortController = new AbortController()
   timeout: ReturnType<typeof setTimeout> | undefined = undefined
@@ -32,29 +31,16 @@ export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
   async getImageMetadata(
     url: string
   ): Promise<{ width: number; height: number }> {
-    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 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
   }
 }

package/src/datasources/twitter.ts

@@ -1,11 +1,10 @@
 import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
-import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
 import { InstrumentedRESTDataSource } from './instrumented'
 
 const REQUEST_TIMEOUT = 5000 // 5 seconds
 export class TwitterDataSource extends InstrumentedRESTDataSource {
   baseURL = 'https://publish.twitter.com'
-  backendSystemCodes = ['twitter-oembed-api']
+  backendSystemCode = 'twitter-oembed-api'
 
   abortController = new AbortController()
   timeout: ReturnType<typeof setTimeout> | undefined = undefined
@@ -21,29 +20,16 @@ export class TwitterDataSource extends InstrumentedRESTDataSource {
   }
 
   async getTweet(tweetUrl: string) {
-    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 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(): CacheOptions {

package/src/generated/index.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';
@@ -990,6 +991,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. */
@@ -1108,6 +1110,19 @@ export type OpinionTopper = Topper & TopperWithHeadshot & TopperWithTheme & {
 
 
 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']>;
 };
@@ -1277,6 +1292,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']>;
 };
 
@@ -1454,6 +1470,7 @@ export type TopperWithHeadshot = {
 
 export type TopperWithHeadshotHeadshotArgs = {
   dpr?: InputMaybe<Scalars['Int']['input']>;
+  url?: InputMaybe<Scalars['String']['input']>;
   width?: InputMaybe<Scalars['Int']['input']>;
 };
 
@@ -1697,6 +1714,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>;
@@ -1783,6 +1801,7 @@ export type ResolversParentTypes = ResolversObject<{
   Mutation: {};
   OpinionTopper: TopperModel;
   PackageDesign: Scalars['PackageDesign']['output'];
+  Person: PersonModel;
   Picture: PictureModel;
   PictureFullBleed: PictureModel;
   PictureInline: PictureModel;
@@ -2341,6 +2360,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>>;
@@ -2409,6 +2429,13 @@ export interface PackageDesignScalarConfig extends GraphQLScalarTypeConfig<Resol
   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>;
@@ -2725,6 +2752,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>;