@podium/client 5.0.6 → 5.1.0-beta.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [5.1.0-beta.1](https://github.com/podium-lib/client/compare/v5.0.7...v5.1.0-beta.1) (2024-03-20)
+
+
+### Features
+
+* add new options to register and use them in fetch ([5aed9d6](https://github.com/podium-lib/client/commit/5aed9d6303681910fc95413535345643bbfa8d62))
+* add support for includeBy and excludeBy options in Resource ([51eb442](https://github.com/podium-lib/client/commit/51eb442398a15b487970ebabe51a5c33f3aede29))
+
+## [5.0.7](https://github.com/podium-lib/client/compare/v5.0.6...v5.0.7) (2024-02-01)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @podium/utils to v5.0.2 ([dd7af21](https://github.com/podium-lib/client/commit/dd7af21c3372e89b25096c1e4833463089dfa290))
+
 ## [5.0.6](https://github.com/podium-lib/client/compare/v5.0.5...v5.0.6) (2024-01-05)
 
 

package/README.md

@@ -152,6 +152,31 @@ The following values can be provided:
 -   `throwable` - {Boolean} - Defines whether an error should be thrown if a failure occurs during the process of fetching a podium component. Defaults to `false` - Optional.
 -   `resolveJs` - {Boolean} - Defines whether to resolve a relative JS uri for a component to be an absolute uri. Defaults to `false` - Optional.
 -   `resolveCss` - {Boolean} - Defines whether to resolve a relative CSS uri for a component to be an absolute uri. Defaults to `false` - Optional.
+-   `excludeBy` - {Object} - Lets you define a set of rules where a `fetch` call will not be resolved if it matches. - Optional.
+-   `includeBy` - {Object} - Inverse of `excludeBy`. - Optional.
+
+##### `excludeBy` and `includeBy`
+
+These options are used by `fetch` to conditionally skip fetching the podlet content based on values on the request. It's an alternative to conditionally fetching podlets in your request handler.
+
+Allowed options:
+
+- `deviceType` - {Array<String>} - List of values for the `x-podium-device-type` header. - Optional.
+
+Example: exclude a header and footer in a hybrid web view.
+
+```js
+import Client from '@podium/client';
+const client = new Client();
+
+const footer = client.register({
+    uri: 'http://footer.site.com/manifest.json',
+    name: 'footer',
+    excludeBy: {
+        deviceType: ["hybrid-ios", "hybrid-android"], // when footer.fetch(incoming) is called, if the incoming request has the header `x-podium-device-type: hybrid-ios`, `fetch` will return an empty response.
+    },
+});
+```
 
 ### .js()
 

package/client.d.ts

@@ -129,7 +129,12 @@ declare namespace PodiumClient {
         redirectable?: boolean;
         resolveJs?: boolean;
         resolveCss?: boolean;
+        includeBy?: RequestFilterOptions;
+        excludeBy?: RequestFilterOptions;
     }
+    export type RequestFilterOptions = {
+        deviceType?: Array<string>;
+    };
 
     export interface PodiumRedirect {
         readonly statusCode: number;

package/lib/client.js

@@ -62,6 +62,8 @@ export default class PodiumClient extends EventEmitter {
             rejectUnauthorized: REJECT_UNAUTHORIZED,
             httpAgent: HTTP_AGENT,
             httpsAgent: HTTPS_AGENT,
+            includeBy: undefined,
+            excludeBy: undefined,
             ...options,
         };
 
@@ -152,6 +154,8 @@ export default class PodiumClient extends EventEmitter {
             timeout: this.#options.timeout,
             logger: this.#options.logger,
             maxAge: this.#options.maxAge,
+            includeBy: this.#options.includeBy,
+            excludeBy: this.#options.excludeBy,
             httpsAgent: this.#options.httpsAgent,
             httpAgent: this.#options.httpAgent,
             ...options,

package/lib/resource.js

@@ -34,7 +34,7 @@ export default class PodiumClientResource {
         this.#metrics = new Metrics();
         this.#state = state;
 
-        this.#metrics.on('error', error => {
+        this.#metrics.on('error', (error) => {
             log.error(
                 'Error emitted by metric stream in @podium/client module',
                 error,
@@ -57,19 +57,71 @@ export default class PodiumClientResource {
     }
 
     async fetch(incoming = {}, reqOptions = {}) {
-        if (!utils.validateIncoming(incoming)) throw new TypeError('you must pass an instance of "HttpIncoming" as the first argument to the .fetch() method');
+        if (!utils.validateIncoming(incoming))
+            throw new TypeError(
+                'you must pass an instance of "HttpIncoming" as the first argument to the .fetch() method',
+            );
         const outgoing = new HttpOutgoing(this.#options, reqOptions, incoming);
 
+        if (this.#options.excludeBy) {
+            /**
+             * @type {string[] | undefined}
+             */
+            const exclucedDeviceTypes = this.#options.excludeBy.deviceType;
+            if (Array.isArray(exclucedDeviceTypes)) {
+                const deviceTypeHeader =
+                    incoming.request.headers['x-podium-device-type'];
+
+                for (let i = 0; i < exclucedDeviceTypes.length; i += 1) {
+                    const shouldSkip =
+                        exclucedDeviceTypes[i] === deviceTypeHeader;
+                    if (shouldSkip) {
+                        return new Response({
+                            headers: {},
+                            content: '',
+                            css: [],
+                            js: [],
+                            redirect: '',
+                        });
+                    }
+                }
+            }
+        }
+
+        if (this.#options.includeBy) {
+            /**
+             * @type {string[] | undefined}
+             */
+            const includeDeviceTypes = this.#options.includeBy.deviceType;
+            if (Array.isArray(includeDeviceTypes)) {
+                const deviceTypeHeader =
+                    incoming.request.headers['x-podium-device-type'];
+
+                const shouldRequest =
+                    !deviceTypeHeader ||
+                    includeDeviceTypes.includes(deviceTypeHeader);
+
+                if (!shouldRequest) {
+                    return new Response({
+                        headers: {},
+                        content: '',
+                        css: [],
+                        js: [],
+                        redirect: '',
+                    });
+                }
+            }
+        }
+
         this.#state.setInitializingState();
 
-        const { manifest, headers, redirect, isFallback } = await this.#resolver.resolve(
-            outgoing,
-        );
+        const { manifest, headers, redirect, isFallback } =
+            await this.#resolver.resolve(outgoing);
 
         const chunks = [];
         // eslint-disable-next-line no-restricted-syntax
         for await (const chunk of outgoing) {
-            chunks.push(chunk)
+            chunks.push(chunk);
         }
 
         const content = !outgoing.redirect
@@ -79,14 +131,23 @@ export default class PodiumClientResource {
         return new Response({
             headers,
             content,
-            css: utils.filterAssets(isFallback ? "fallback" : "content", manifest.css),
-            js: utils.filterAssets(isFallback ? "fallback" : "content", manifest.js),
+            css: utils.filterAssets(
+                isFallback ? 'fallback' : 'content',
+                manifest.css,
+            ),
+            js: utils.filterAssets(
+                isFallback ? 'fallback' : 'content',
+                manifest.js,
+            ),
             redirect,
         });
     }
 
     stream(incoming = {}, reqOptions = {}) {
-        if (!utils.validateIncoming(incoming)) throw new TypeError('you must pass an instance of "HttpIncoming" as the first argument to the .stream() method');
+        if (!utils.validateIncoming(incoming))
+            throw new TypeError(
+                'you must pass an instance of "HttpIncoming" as the first argument to the .stream() method',
+            );
         const outgoing = new HttpOutgoing(this.#options, reqOptions, incoming);
         this.#state.setInitializingState();
         this.#resolver.resolve(outgoing);
@@ -96,7 +157,7 @@ export default class PodiumClientResource {
     refresh(incoming = {}, reqOptions = {}) {
         const outgoing = new HttpOutgoing(this.#options, reqOptions, incoming);
         this.#state.setInitializingState();
-        return this.#resolver.refresh(outgoing).then(obj => obj);
+        return this.#resolver.refresh(outgoing).then((obj) => obj);
     }
 
     [inspect]() {
@@ -110,4 +171,4 @@ export default class PodiumClientResource {
     get [Symbol.toStringTag]() {
         return 'PodiumClientResource';
     }
-};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podium/client",
-  "version": "5.0.6",
+  "version": "5.1.0-beta.1",
   "type": "module",
   "license": "MIT",
   "keywords": [
@@ -38,7 +38,7 @@
     "@hapi/boom": "^10.0.0",
     "@metrics/client": "2.5.2",
     "@podium/schemas": "5.0.0",
-    "@podium/utils": "5.0.1",
+    "@podium/utils": "5.0.2",
     "abslog": "2.4.0",
     "http-cache-semantics": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",
@@ -49,23 +49,23 @@
     "@podium/test-utils": "2.5.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@babel/eslint-parser": "7.23.3",
+    "@babel/eslint-parser": "7.23.10",
     "@semantic-release/github": "9.2.6",
     "@semantic-release/npm": "11.0.2",
     "@semantic-release/release-notes-generator": "12.1.0",
     "@sinonjs/fake-timers": "11.2.2",
     "benchmark": "2.1.4",
-    "eslint": "8.56.0",
+    "eslint": "8.57.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-prettier": "5.1.2",
-    "express": "4.18.2",
+    "eslint-plugin-prettier": "5.1.3",
+    "express": "4.18.3",
     "get-stream": "8.0.1",
     "http-proxy": "1.18.1",
     "is-stream": "3.0.0",
-    "prettier": "3.1.1",
-    "semantic-release": "22.0.12",
-    "tap": "18.6.1"
+    "prettier": "3.2.5",
+    "semantic-release": "23.0.2",
+    "tap": "18.7.0"
   }
 }