@quintype/framework 7.34.0-gulfnews-amp-changes.0 → 7.34.0

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.34.0](https://github.com/quintype/quintype-node-framework/compare/v7.33.6...v7.34.0) (2025-03-19)
+
+
+### Features
+
+* support JW player ([#459](https://github.com/quintype/quintype-node-framework/issues/459)) ([ce325df](https://github.com/quintype/quintype-node-framework/commit/ce325dfea69d4dc806b2b767c43d782dd096099e))
+
+### [7.33.6](https://github.com/quintype/quintype-node-framework/compare/v7.33.5...v7.33.6) (2025-03-17)
+
+
+### Bug Fixes
+
+* **FCM:** remove deprecated server key & use firebase admin to register to topic ([#458](https://github.com/quintype/quintype-node-framework/issues/458)) ([b179dd4](https://github.com/quintype/quintype-node-framework/commit/b179dd4594e94cf5639b020b1991a061c6c11105))
+
+### [7.33.5](https://github.com/quintype/quintype-node-framework/compare/v7.33.4...v7.33.5) (2025-02-13)
+
+### [7.33.4](https://github.com/quintype/quintype-node-framework/compare/v7.33.3...v7.33.4) (2025-02-13)
+
+### [7.33.3](https://github.com/quintype/quintype-node-framework/compare/v7.33.2...v7.33.3) (2025-02-13)
+
+### [7.33.2](https://github.com/quintype/quintype-node-framework/compare/v7.33.1...v7.33.2) (2025-02-13)
+
+### [7.33.1](https://github.com/quintype/quintype-node-framework/compare/v7.33.0...v7.33.1) (2025-01-20)
+
+
+### Bug Fixes
+
+* **Static routes:** support 404 if no loader ([#452](https://github.com/quintype/quintype-node-framework/issues/452)) ([735b778](https://github.com/quintype/quintype-node-framework/commit/735b77887ae0359b85fde8db1a203f7576244a3b))
+
 ## [7.33.0](https://github.com/quintype/quintype-node-framework/compare/v7.32.0...v7.33.0) (2024-12-10)
 
 

package/README.md

@@ -171,7 +171,7 @@ startApp(renderApplication,
 ```js
 isomorphicRoutes(app, {
   ...
-  fcmServerKey: (config) => <ServerKey> || fcmServerKey: <ServerKey> {(function|string)}
+  fcmServiceCreds: (config) => <ServiceCreds> || fcmServiceCreds: <ServiceCreds> {(function|object)}
   ...
 });
 

package/client/impl/fcm.js

@@ -13,14 +13,13 @@ export function initializeFCM(firebaseConfig) {
         appId: firebaseConfig.appId,
       });
       const messaging = m.getMessaging(app);
-      return m.getToken(messaging);
-      // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
+      return m.getToken(messaging, { vapidKey: firebaseConfig.vapidKey });
     })
     .then((token) => {
       return registerFCMTopic(token);
     })
     .catch((err) => {
-      console.error(err);
+      console.error(`Fcm initialization error: ${err}`);
     });
 }
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@quintype/framework",
-  "version": "7.34.0-gulfnews-amp-changes.0",
+  "version": "7.34.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
-    "node": "^16.0.0",
+    "node": "^20.0.0",
     "npm": "^8.5.0"
   },
   "scripts": {
@@ -31,7 +31,9 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@quintype/amp": "^2.20.1-also-in-package-story-element.0",
+    "@grpc/grpc-js": "^1.12.5",
+    "@jsdoc/salty": "^0.2.9",
+    "@quintype/amp": "^2.21.0",
     "@quintype/backend": "^2.7.0",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",
@@ -43,9 +45,9 @@
     "compression": "^1.7.4",
     "ejs": "^3.1.6",
     "express": "^4.17.1",
-    "firebase": "^9.6.10",
+    "firebase": "^10.6.0",
+    "firebase-admin": "^13.1.0",
     "get-youtube-id": "^1.0.1",
-    "grpc": "^1.21.1",
     "http-proxy": "^1.18.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
@@ -65,7 +67,7 @@
     "@babel/eslint-parser": "^7.15.7",
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.1",
-    "@quintype/build": "^4.0.0",
+    "@quintype/build": "^4.0.1",
     "babel-plugin-quintype-assets": "^1.1.1",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -73,7 +75,7 @@
     "babel-preset-es2015-tree-shaking": "^1.0.1",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
-    "better-docs": "^2.3.2",
+    "better-docs": "^2.7.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.3",
@@ -120,5 +122,8 @@
       "npx eslint --fix",
       "git add"
     ]
+  },
+  "overrides": {
+    "grpc": "@grpc/grpc-js"
   }
 }

package/server/handlers/fcm-registration-handler.js

@@ -1,38 +1,34 @@
-const { get } = require("lodash");
-const request = require("request-promise");
+const { get } = require('lodash')
+const admin = require('firebase-admin')
+const logger = require('../logger')
 
-exports.registerFCMTopic = async function registerFCM(
+exports.registerFCMTopic = async function registerFCM (
   req,
   res,
   next,
-  { config, client, publisherConfig, fcmServerKey }
+  { config, client, publisherConfig, fcmServiceCreds }
 ) {
-  const token = get(req, ["body", "token"], null);
+
+  const token = get(req, ['body', 'token'], null)
   if (!token) {
-    res.status(400).send("No Token Found");
-    return;
+    res.status(400).send('No Token Found')
+    return
   }
 
-  const serverKey = typeof fcmServerKey === "function" ? await fcmServerKey(config) : fcmServerKey;
+  const serviceAccount = typeof fcmServiceCreds === 'function' ? await fcmServiceCreds(config) : fcmServiceCreds
 
-  if (!serverKey) {
-    res.status(500).send("Server Key is not available");
-    return;
+  if (!admin.apps.length) {
+    admin.initializeApp({ credential: admin.credential.cert(serviceAccount) })
   }
-  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`;
+
   try {
-    await request({
-      uri: url,
-      method: "POST",
-      headers: {
-        Authorization: `key=${serverKey}`,
-        "content-type": "application/json",
-      },
-    });
-    res.status(200).send("Registration Done Suceessfuly");
-    return;
+    await admin.messaging().subscribeToTopic(token, 'all')
+    res.status(200).send('Topic Registered Successfully')
+    return
   } catch (error) {
-    res.status(500).send("FCM Subscription Failed");
-    return;
+    const publisherId = get(config, ["config" , "publisher-id"], "");
+    res.status(500).send(`FCM Subscription Failed: ${error}`)
+    logger.error(`Fcm register to topic error for publisher ${publisherId}: ${error}`);
+    return
   }
-};
+}

package/server/handlers/isomorphic-handler.js

@@ -123,8 +123,10 @@ function loadDataForPageType(
     )
   )
     .then((result) => {
-      if (result && result.data && result.data[ABORT_HANDLER]) {
-        return null;
+      if (result && result.data) {
+        if (result.data[ABORT_HANDLER] || (result.data.error && result.data.error.message)) {
+          return null
+        }
       }
       return result;
     })

package/server/routes.js

@@ -304,7 +304,7 @@ function getWithConfig (app, route, handler, opts = {}) {
  * @param {boolean|function} shouldEncodeAmpUri If set to true, then for every story-page request the slug will be encoded, in case of a vernacular slug this should be set to false. Receives path as param (default: true)
  * @param {number} sMaxAge Overrides the s-maxage value, the default value is set to 900 seconds. We can set `isomorphicRoutesSmaxage: 900` under `publisher` in publisher.yml config file that comes from BlackKnight or pass sMaxAge as a param.
  * @param {number} maxAge Overrides the max-age value, the default value is set to 15 seconds. We can set `isomorphicRoutesMaxage: 15` under `publisher` in publisher.yml config file that comes from BlackKnight or pass maxAge as a param.
- * @param {(string|function)} fcmServerKey  FCM serverKey is used for registering FCM Topic.
+ * @param {(object|function)} fcmServiceCreds  FCM service creds is used for registering FCM Topic.
  * @param {string} appLoadingPlaceholder This string gets injected into the app container when the page is loaded via service worker. Can be used to show skeleton layouts, animations or other progress indicators before it is replaced by the page content.
  * @param {boolean|function} enableExternalStories If set to true, then for every request an external story api call is made and renders the story-page if the story is found. (default: false)
  * @param {string|function} externalIdPattern This string specifies the external id pattern the in the url. Mention `EXTERNAL_ID` to specify the position of external id in the url. Ex: "/parent-section/child-section/EXTERNAL_ID"
@@ -352,7 +352,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     sMaxAge = 900,
     maxAge = 15,
     appLoadingPlaceholder = '',
-    fcmServerKey = '',
+    fcmServiceCreds = {},
     webengageConfig = {},
     externalIdPattern = '',
     enableExternalStories = false,
@@ -469,7 +469,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     })
   )
 
-  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServerKey }))
+  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServiceCreds }))
 
   if (webengageConfig.enableWebengage) {
     app.post(