@financial-times/cp-content-pipeline-schema 3.12.2 → 3.14.0

package/lib/resolvers/content-tree/references/ClipSet.js.map

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

package/lib/resolvers/content-tree/references/RawImage.js

@@ -29,7 +29,7 @@ class RawImageModel {
     url() {
         return (0, imageService_1.default)({
             url: this.rawImage.url,
-            systemCode: this.context.systemCode ?? 'cp-content-pipeline',
+            systemCode: this.context.systemCode,
             width: this.rawImage.width,
         });
     }

package/lib/resolvers/content-tree/references/RawImage.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "3.12.2",
+  "version": "3.14.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/datasources/origami-image.ts

@@ -6,9 +6,9 @@ const REQUEST_TIMEOUT = process.env.ORIGAMI_DATASOURCE_REQUEST_TIMEOUT
   : 200
 
 export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
-  baseURL = 'https://www.ft.com/__origami/service/image/v2/'
+  baseURL = 'https://images.ft.com/v3/image/'
   get backendSystemCode() {
-    return 'origami-image-service-v2'
+    return 'image-service'
   }
 
   imageMetadataCacheTTL = process.env.IMAGE_METADATA_CACHE_TTL
@@ -29,7 +29,7 @@ export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     url: string
   ): Promise<{ width: number; height: number }> {
     const imageMetadata = await this.get(
-      `images/metadata/${encodeURIComponent(url)}?source=next`
+      `metadata/${encodeURIComponent(url)}?source=cp-content-pipeline-api`
     )
 
     this.calls.push(url)

package/src/datasources/url-management.test.ts

@@ -9,6 +9,7 @@ import nUrlManagementApiReadClient from '@financial-times/n-url-management-api-r
 import type { QueryContext } from '..'
 import { InMemoryLRUCache } from '@apollo/utils.keyvaluecache'
 import { jest } from '@jest/globals'
+import { BaseError, HttpError } from '@dotcom-reliability-kit/errors'
 
 const getMock = nUrlManagementApiReadClient.get as jest.Mock<
   typeof import('@financial-times/n-url-management-api-read-client')['get']
@@ -95,4 +96,129 @@ describe('URL management data source', () => {
     expect(different).toEqual('different.url.vanity')
     expect(nUrlManagementApiReadClient.get).toHaveBeenCalledTimes(2)
   })
+
+  describe('error handling', () => {
+    it('wraps 4xx errors in HttpError', async () => {
+      getMock.mockRejectedValueOnce(
+        new HttpError({
+          statusCode: 400,
+          code: 'UnrecognisedClientException',
+        })
+      )
+
+      const datasource = new URLManagementDataSource({
+        context,
+        cache: new InMemoryLRUCache(),
+      })
+
+      await expect(datasource.get('original.url')).rejects
+        .toMatchInlineSnapshot(`
+        HttpError: "Internal Server Error" {
+          "cause": "HttpError: "Bad Request" {
+          "cause": null,
+          "code": "UNRECOGNISEDCLIENTEXCEPTION",
+          "data": {},
+        }",
+          "code": "URL_MANAGEMENT_CLIENT_ERROR",
+          "data": {
+            "upstreamStatusCode": 400,
+          },
+        }
+      `)
+    })
+
+    it('wraps 5xx errors in UpstreamError', async () => {
+      getMock.mockRejectedValueOnce(
+        new HttpError({
+          statusCode: 500,
+          code: 'InternalServerException',
+        })
+      )
+
+      const datasource = new URLManagementDataSource({
+        context,
+        cache: new InMemoryLRUCache(),
+      })
+
+      await expect(datasource.get('original.url')).rejects
+        .toMatchInlineSnapshot(`
+        UpstreamServiceError: "Bad Gateway" {
+          "cause": "HttpError: "Internal Server Error" {
+          "cause": null,
+          "code": "INTERNALSERVEREXCEPTION",
+          "data": {},
+        }",
+          "code": "URL_MANAGEMENT_SERVER_ERROR",
+          "data": {
+            "upstreamStatusCode": 500,
+          },
+        }
+      `)
+    })
+
+    it('wraps other HTTP errors in HttpError', async () => {
+      const error = new BaseError({
+        code: 'SomethingElseException',
+      })
+
+      Object.assign(error, {
+        // HttpError normalises status codes to the 400-599 range
+        statusCode: 137,
+      })
+
+      getMock.mockRejectedValueOnce(error)
+
+      const datasource = new URLManagementDataSource({
+        context,
+        cache: new InMemoryLRUCache(),
+      })
+
+      await expect(datasource.get('original.url')).rejects
+        .toMatchInlineSnapshot(`
+        HttpError: "Internal Server Error" {
+          "cause": "BaseError: "An error occurred" {
+          "cause": null,
+          "code": "SOMETHINGELSEEXCEPTION",
+          "data": {},
+        }",
+          "code": "URL_MANAGEMENT_UNKNOWN_ERROR",
+          "data": {
+            "upstreamStatusCode": 137,
+          },
+        }
+      `)
+    })
+
+    it('rethrows unknown errors', async () => {
+      getMock.mockRejectedValueOnce('not an error')
+
+      const datasource = new URLManagementDataSource({
+        context,
+        cache: new InMemoryLRUCache(),
+      })
+
+      await expect(
+        datasource.get('original.url')
+      ).rejects.toMatchInlineSnapshot(`"not an error"`)
+    })
+
+    it("doesn't cache error responses", async () => {
+      getMock.mockRejectedValueOnce(new Error())
+
+      const datasource = new URLManagementDataSource({
+        context,
+        cache: new InMemoryLRUCache(),
+      })
+
+      await expect(datasource.get('original.url')).rejects.toThrow()
+
+      getMock.mockImplementation((fromURL) =>
+        Promise.resolve({ fromURL, toURL: `${fromURL}.vanity`, code: 0 })
+      )
+
+      await expect(datasource.get('original.url')).resolves.toEqual(
+        `original.url.vanity`
+      )
+    })
+  })
 })

package/src/datasources/url-management.ts

@@ -7,6 +7,8 @@ import nUrlManagementApiReadClient from '@financial-times/n-url-management-api-r
 import type { ResolvedVanityURL } from '@financial-times/n-url-management-api-read-client'
 import { QueryContext } from '..'
 import { BaseDataSource, BaseDataSourceOptions } from './base'
+import { HttpError, UpstreamServiceError } from '@dotcom-reliability-kit/errors'
+import isError from '../helpers/isError'
 
 const CACHE_PREFIX = 'nurlmgmtapi:'
 const DEFAULT_TTL_IN_SECONDS = 60 * 60 // one hour
@@ -53,16 +55,54 @@ export class URLManagementDataSource implements BaseDataSource {
       return fromDynamoDB.toURL
     }
 
-    let promise = this.memoizedResults.get(fromURL)
+    try {
+      let promise = this.memoizedResults.get(fromURL)
 
-    if (promise) {
-      return promise
-    }
+      if (promise) {
+        return await promise
+      }
+
+      promise = getVanity()
+      this.memoizedResults.set(fromURL, promise)
+
+      this.calls.push(fromURL)
+      return await promise
+    } catch (error) {
+      this.memoizedResults.delete(fromURL)
+      await this.cache.delete(fromURL)
 
-    promise = getVanity()
-    this.memoizedResults.set(fromURL, promise)
+      if (
+        isError(error) &&
+        'statusCode' in error &&
+        typeof error.statusCode === 'number'
+      ) {
+        const baseErrorOptions = {
+          cause: error,
+          relatesToSystems: ['next-url-management-db'],
+          upstreamStatusCode: error.statusCode,
+        }
 
-    this.calls.push(fromURL)
-    return promise
+        if (error.statusCode >= 400 && error.statusCode < 500) {
+          throw new HttpError({
+            code: 'URL_MANAGEMENT_CLIENT_ERROR',
+            statusCode: 500,
+            ...baseErrorOptions,
+          })
+        } else if (error.statusCode >= 500 && error.statusCode < 600) {
+          throw new UpstreamServiceError({
+            code: 'URL_MANAGEMENT_SERVER_ERROR',
+            ...baseErrorOptions,
+          })
+        }
+
+        throw new HttpError({
+          code: 'URL_MANAGEMENT_UNKNOWN_ERROR',
+          statusCode: 500,
+          ...baseErrorOptions,
+        })
+      } else {
+        throw error
+      }
+    }
   }
 }

package/src/generated/index.ts

@@ -767,7 +767,7 @@ export type Image = {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -796,7 +796,7 @@ export type ImageDesktop = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -825,7 +825,7 @@ export type ImageLandscape = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -854,7 +854,7 @@ export type ImageMobile = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -883,7 +883,7 @@ export type ImagePortrait = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -905,7 +905,7 @@ export type ImageSet = Reference & {
 export type ImageSource = {
   /** The device pixel ratio. DPR is calculated as DPR = Physical Pixels (pixels seen on screen) / Logical Pixels (pixel that can fit in a given space). */
   readonly dpr: Scalars['Int']['output'];
-  /** The url of the image source, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image source, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image source in pixels. */
   readonly width: Scalars['Int']['output'];
@@ -928,7 +928,7 @@ export type ImageSquare = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -957,7 +957,7 @@ export type ImageSquareFtEdit = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -986,7 +986,7 @@ export type ImageStandard = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -1015,7 +1015,7 @@ export type ImageStandardInline = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;
@@ -1044,7 +1044,7 @@ export type ImageWide = Image & {
   readonly sourceSet: ReadonlyArray<ImageSource>;
   /** The type of the image, eg. 'graphic'. */
   readonly type?: Maybe<Scalars['ImageType']['output']>;
-  /** The url of the image, eg. 'https://www.ft.com/__origami/service/image/v2/images/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=next&fit=scale-down&width=700'. */
+  /** The url of the image, eg. 'https://images.ft.com/v3/image/raw/ftcms%3Aimage%3A0e7e7b6e-4e7b-11e9-bde6-79e4b4311f90?source=cp-content-pipeline-api&fit=scale-down&width=700'. */
   readonly url: Scalars['String']['output'];
   /** The width of the image in pixels. */
   readonly width?: Maybe<Scalars['Int']['output']>;

package/src/helpers/imageService.ts

@@ -19,7 +19,7 @@ export default function imageServiceUrl({
 }: ImageServiceUrlArguments): string {
   const imageSource = encodeURIComponent(id ? `ftcms:${id}` : url)
   const imageServiceUrl = new URL(
-    `https://www.ft.com/__origami/service/image/v2/images/raw/${imageSource}`
+    `https://images.ft.com/v3/image/raw/${imageSource}`
   )
 
   const adjustedWidth = width > MAX_IMAGE_WIDTH ? MAX_IMAGE_WIDTH : width

package/src/index.ts

@@ -24,7 +24,7 @@ export interface QueryContext {
   redisAdapter: KeyValueCache
   metrics: Metrics
   dataSources: DataSources
-  systemCode?: string
+  systemCode: string
   requestId?: string
   contentRequestedOnce?: boolean
   contentTimedOut?: boolean