From 71db08f56360cca8eb0fd5cc240ea7bf6f976087 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Thu, 18 Jul 2024 19:33:31 +0530 Subject: [PATCH 01/12] FireboltExampleInvoker import change --- src/App.js | 2 +- src/Card.js | 2 +- src/EventInvocation.js | 2 +- src/LifeCycleHistory.js | 2 +- src/MethodInvoker.js | 4 ++-- src/Test_Runner.js | 4 ++-- src/pubsub/handlers/RegisterProviderHandler.js | 10 ++++++++++ src/utils/Utils.js | 2 +- webpack.dev.js | 4 ++++ webpack.prod.js | 4 ++++ 10 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/App.js b/src/App.js index 726133ef..b2eb4419 100644 --- a/src/App.js +++ b/src/App.js @@ -21,7 +21,7 @@ import Menu from './Menu'; import MenuBuilder from './MenuBuilder'; import LifecycleHistory from './LifeCycleHistory'; import { Settings, Accessibility, Discovery } from '@firebolt-js/sdk'; -import FireboltExampleInvoker from './FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import Modal from './Modal'; import PubSubCommunication from './PubSubCommunication'; import { CONSTANTS } from './constant'; diff --git a/src/Card.js b/src/Card.js index 568f0ee4..9e29e401 100644 --- a/src/Card.js +++ b/src/Card.js @@ -18,7 +18,7 @@ import { Button } from '@lightningjs/ui-components'; import lng from '@lightningjs/core'; -import FireboltExampleInvoker from './FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import ResultHandler from './ResultHandler'; import { CONSTANTS } from './constant'; diff --git a/src/EventInvocation.js b/src/EventInvocation.js index 63297d1a..7dd9dc1a 100644 --- a/src/EventInvocation.js +++ b/src/EventInvocation.js @@ -24,7 +24,7 @@ // ************* End Description ********** import { dereferenceOpenRPC, errorSchemaCheck } from './utils/Utils'; -import { MODULE_MAP } from './FireboltExampleInvoker'; +import { MODULE_MAP } from 'FireboltExampleInvoker'; import { CONSTANTS } from './constant'; import Transport from '@firebolt-js/sdk/dist/lib/Transport/index.mjs'; diff --git a/src/LifeCycleHistory.js b/src/LifeCycleHistory.js index c16d1dbd..e46d22a5 100644 --- a/src/LifeCycleHistory.js +++ b/src/LifeCycleHistory.js @@ -22,7 +22,7 @@ require('dotenv').config(); import { CONSTANTS } from './constant'; import { getschemaValidationDone, getCurrentAppID } from './utils/Utils'; const logger = require('./utils/Logger')('LifeCycleHistory.js'); -import FireboltExampleInvoker from './FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import IntentReader from 'IntentReader'; import PubSubCommunication from './PubSubCommunication'; diff --git a/src/MethodInvoker.js b/src/MethodInvoker.js index d5d2305b..f0f5fd4f 100644 --- a/src/MethodInvoker.js +++ b/src/MethodInvoker.js @@ -16,11 +16,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import FireboltExampleInvoker from './FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import { handleAsyncFunction, dereferenceOpenRPC, errorSchemaCheck } from './utils/Utils'; import { CONSTANTS } from './constant'; -import { MODULE_MAP } from './FireboltExampleInvoker'; +import { MODULE_MAP } from 'FireboltExampleInvoker'; import { removeSetInMethodName, findTypeInOneOF } from './utils/Utils'; const Validator = require('jsonschema').Validator; const logger = require('./utils/Logger')('MethodInvoker.js'); diff --git a/src/Test_Runner.js b/src/Test_Runner.js index 3f46f0f4..035b4195 100644 --- a/src/Test_Runner.js +++ b/src/Test_Runner.js @@ -26,7 +26,7 @@ // ************* End Description ********** import { dereferenceOpenRPC } from './utils/Utils'; -import FireboltExampleInvoker from './FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import MethodFilters from './MethodFilters'; @@ -35,7 +35,7 @@ import { handleAsyncFunction, errorSchemaCheck, overrideParamsFromTestData } fro const utils = require('./utils/Utils'); import LifecycleHistory from './LifeCycleHistory'; import { Device } from '@firebolt-js/sdk'; -import { MODULE_MAP } from './FireboltExampleInvoker'; +import { MODULE_MAP } from 'FireboltExampleInvoker'; import errorSchema from './source/errorSchema.json'; const $RefParser = require('@apidevtools/json-schema-ref-parser'); const Validator = require('jsonschema').Validator; diff --git a/src/pubsub/handlers/RegisterProviderHandler.js b/src/pubsub/handlers/RegisterProviderHandler.js index 8654c7be..bd414200 100644 --- a/src/pubsub/handlers/RegisterProviderHandler.js +++ b/src/pubsub/handlers/RegisterProviderHandler.js @@ -51,6 +51,16 @@ export default class RegisterProviderHandler extends BaseHandler { report: 'AcknowledgeChallenge ' + CONSTANTS.PROVIDER_REGISTRATION, }); break; + case 'broadcastplayer': + case 'player': + case 'streamingplayer': + try { + const provider = require('../../../plugins/playerProviderHandler'); + reportString = provider.integratedPlayerProvider(providerClass); + } catch (err) { + reportString = JSON.stringify({ report: `Unable to register for ${providerClass}` }); + } + break; default: reportString = JSON.stringify({ report: CONSTANTS.PROVIDER_REGISTRATION_FAILED }); break; diff --git a/src/utils/Utils.js b/src/utils/Utils.js index 1d954147..987949ac 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -17,7 +17,7 @@ */ import { CONSTANTS } from '../constant'; -import FireboltExampleInvoker from '../FireboltExampleInvoker'; +import FireboltExampleInvoker from 'FireboltExampleInvoker'; import errorSchema from '../source/errorSchema.json'; const { v4: uuidv4 } = require('uuid'); diff --git a/webpack.dev.js b/webpack.dev.js index 4c76fcb5..1aebdc76 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -104,6 +104,10 @@ module.exports = { name: 'IntentReader', alias: ['/plugins/IntentReader.js', '/src/IntentReader.js'], }, + { + name: 'FireboltExampleInvoker', + alias: ['/plugins/FireboltExampleInvoker.js', '/src/FireboltExampleInvoker.js'], + }, ], 'resolve' ), diff --git a/webpack.prod.js b/webpack.prod.js index da3c23d8..0f34a681 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -87,6 +87,10 @@ module.exports = { name: 'IntentReader', alias: ['/plugins/IntentReader.js', '/src/IntentReader.js'], }, + { + name: 'FireboltExampleInvoker', + alias: ['/plugins/FireboltExampleInvoker.js', '/src/FireboltExampleInvoker.js'], + }, ], 'resolve' ), From eb39f6c1e660a5e785b258c5b7670b119fb54b15 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Thu, 18 Jul 2024 22:10:55 +0530 Subject: [PATCH 02/12] Fixed unit testcase failure --- test/jest.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/jest.config.js b/test/jest.config.js index 373f0fd7..03bfd865 100644 --- a/test/jest.config.js +++ b/test/jest.config.js @@ -33,6 +33,7 @@ module.exports = { '^Test_Runner$': '/../src/Test_Runner.js', '^EventInvocation$': '/../src//EventInvocation.js', '^IntentReader$': '../src/IntentReader.js', + '^FireboltExampleInvoker$': '/../src/FireboltExampleInvoker.js', }, collectCoverage: true, coverageThreshold: { From 97c07cd87d97c4dfad346b9ed25ad98eed778eb4 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Fri, 19 Jul 2024 09:56:21 +0530 Subject: [PATCH 03/12] Revert the fireboltExampleInvoker import --- src/App.js | 2 +- src/Card.js | 2 +- src/EventInvocation.js | 2 +- src/LifeCycleHistory.js | 2 +- src/MethodInvoker.js | 4 ++-- src/Test_Runner.js | 4 ++-- src/utils/Utils.js | 2 +- test/jest.config.js | 1 - webpack.dev.js | 4 ---- webpack.prod.js | 4 ---- 10 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/App.js b/src/App.js index b2eb4419..726133ef 100644 --- a/src/App.js +++ b/src/App.js @@ -21,7 +21,7 @@ import Menu from './Menu'; import MenuBuilder from './MenuBuilder'; import LifecycleHistory from './LifeCycleHistory'; import { Settings, Accessibility, Discovery } from '@firebolt-js/sdk'; -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from './FireboltExampleInvoker'; import Modal from './Modal'; import PubSubCommunication from './PubSubCommunication'; import { CONSTANTS } from './constant'; diff --git a/src/Card.js b/src/Card.js index 9e29e401..568f0ee4 100644 --- a/src/Card.js +++ b/src/Card.js @@ -18,7 +18,7 @@ import { Button } from '@lightningjs/ui-components'; import lng from '@lightningjs/core'; -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from './FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import ResultHandler from './ResultHandler'; import { CONSTANTS } from './constant'; diff --git a/src/EventInvocation.js b/src/EventInvocation.js index 7dd9dc1a..63297d1a 100644 --- a/src/EventInvocation.js +++ b/src/EventInvocation.js @@ -24,7 +24,7 @@ // ************* End Description ********** import { dereferenceOpenRPC, errorSchemaCheck } from './utils/Utils'; -import { MODULE_MAP } from 'FireboltExampleInvoker'; +import { MODULE_MAP } from './FireboltExampleInvoker'; import { CONSTANTS } from './constant'; import Transport from '@firebolt-js/sdk/dist/lib/Transport/index.mjs'; diff --git a/src/LifeCycleHistory.js b/src/LifeCycleHistory.js index e46d22a5..c16d1dbd 100644 --- a/src/LifeCycleHistory.js +++ b/src/LifeCycleHistory.js @@ -22,7 +22,7 @@ require('dotenv').config(); import { CONSTANTS } from './constant'; import { getschemaValidationDone, getCurrentAppID } from './utils/Utils'; const logger = require('./utils/Logger')('LifeCycleHistory.js'); -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from './FireboltExampleInvoker'; import IntentReader from 'IntentReader'; import PubSubCommunication from './PubSubCommunication'; diff --git a/src/MethodInvoker.js b/src/MethodInvoker.js index f0f5fd4f..d5d2305b 100644 --- a/src/MethodInvoker.js +++ b/src/MethodInvoker.js @@ -16,11 +16,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from './FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import { handleAsyncFunction, dereferenceOpenRPC, errorSchemaCheck } from './utils/Utils'; import { CONSTANTS } from './constant'; -import { MODULE_MAP } from 'FireboltExampleInvoker'; +import { MODULE_MAP } from './FireboltExampleInvoker'; import { removeSetInMethodName, findTypeInOneOF } from './utils/Utils'; const Validator = require('jsonschema').Validator; const logger = require('./utils/Logger')('MethodInvoker.js'); diff --git a/src/Test_Runner.js b/src/Test_Runner.js index 035b4195..3f46f0f4 100644 --- a/src/Test_Runner.js +++ b/src/Test_Runner.js @@ -26,7 +26,7 @@ // ************* End Description ********** import { dereferenceOpenRPC } from './utils/Utils'; -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from './FireboltExampleInvoker'; import FireboltTransportInvoker from './FireboltTransportInvoker'; import MethodFilters from './MethodFilters'; @@ -35,7 +35,7 @@ import { handleAsyncFunction, errorSchemaCheck, overrideParamsFromTestData } fro const utils = require('./utils/Utils'); import LifecycleHistory from './LifeCycleHistory'; import { Device } from '@firebolt-js/sdk'; -import { MODULE_MAP } from 'FireboltExampleInvoker'; +import { MODULE_MAP } from './FireboltExampleInvoker'; import errorSchema from './source/errorSchema.json'; const $RefParser = require('@apidevtools/json-schema-ref-parser'); const Validator = require('jsonschema').Validator; diff --git a/src/utils/Utils.js b/src/utils/Utils.js index 987949ac..1d954147 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -17,7 +17,7 @@ */ import { CONSTANTS } from '../constant'; -import FireboltExampleInvoker from 'FireboltExampleInvoker'; +import FireboltExampleInvoker from '../FireboltExampleInvoker'; import errorSchema from '../source/errorSchema.json'; const { v4: uuidv4 } = require('uuid'); diff --git a/test/jest.config.js b/test/jest.config.js index 03bfd865..373f0fd7 100644 --- a/test/jest.config.js +++ b/test/jest.config.js @@ -33,7 +33,6 @@ module.exports = { '^Test_Runner$': '/../src/Test_Runner.js', '^EventInvocation$': '/../src//EventInvocation.js', '^IntentReader$': '../src/IntentReader.js', - '^FireboltExampleInvoker$': '/../src/FireboltExampleInvoker.js', }, collectCoverage: true, coverageThreshold: { diff --git a/webpack.dev.js b/webpack.dev.js index 1aebdc76..4c76fcb5 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -104,10 +104,6 @@ module.exports = { name: 'IntentReader', alias: ['/plugins/IntentReader.js', '/src/IntentReader.js'], }, - { - name: 'FireboltExampleInvoker', - alias: ['/plugins/FireboltExampleInvoker.js', '/src/FireboltExampleInvoker.js'], - }, ], 'resolve' ), diff --git a/webpack.prod.js b/webpack.prod.js index 0f34a681..da3c23d8 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -87,10 +87,6 @@ module.exports = { name: 'IntentReader', alias: ['/plugins/IntentReader.js', '/src/IntentReader.js'], }, - { - name: 'FireboltExampleInvoker', - alias: ['/plugins/FireboltExampleInvoker.js', '/src/FireboltExampleInvoker.js'], - }, ], 'resolve' ), From 78f81b1597a004741d78475aab5fd8db7201f23b Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Fri, 19 Jul 2024 12:34:05 +0530 Subject: [PATCH 04/12] Player provider registration changes --- src/App.js | 18 +++++++++++++++++- src/FireboltExampleInvoker.js | 7 +++++++ src/constant.js | 1 + src/pubsub/handlers/RegisterProviderHandler.js | 10 ---------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/App.js b/src/App.js index 726133ef..95a0d35d 100644 --- a/src/App.js +++ b/src/App.js @@ -117,6 +117,7 @@ export default class App extends Base { process.env.STANDALONE_PREFIX = standalonePrefix; process.env.ID = 0; process.env.REGISTERPROVIDER = true; + process.env.PROVIDERNAME = null; // Set the pubSub URL if present process.env.PUB_SUB_URL = new URLSearchParams(window.location.search).get('pubSubUrl'); @@ -218,6 +219,17 @@ export default class App extends Base { } catch (err) { logger.error('Could not set up providers' + err, 'LoadedState'); } + try { + if (process.env.REGISTERPROVIDER && process.env.PROVIDERNAME) { + console.log('line 224--------'); + const provider = require('../plugins/playerProviderHandler.js'); + provider.integratedPlayerProvider(process.env.PROVIDERNAME); + } else { + logger.info('Could not set up player providers', 'LoadedState'); + } + } catch (err) { + logger.error('Could not set up player providers' + err, 'LoadedState'); + } process.env.APPOBJECT = this; const menusBuilder = new MenuBuilder(); LifecycleHistory.get().init(this); @@ -421,7 +433,11 @@ export default class App extends Base { if (query.params.hasOwnProperty(CONSTANTS.REGISTERPROVIDER)) { process.env.REGISTERPROVIDER = query.params.registerprovider; } - + console.log('process.env.REGISTERPROVIDER-----:', process.env.REGISTERPROVIDER); + if (query.params.hasOwnProperty(CONSTANTS.PROVIDERNAME)) { + process.env.PROVIDERNAME = query.params.providername.toLowerCase(); + } + console.log('process.env.PROVIDERNAME-----:', process.env.PROVIDERNAME); // Set the pubSub URL if present if (query.params.pubSubUrl) { process.env.PUB_SUB_URL = query.params.pubSubUrl; diff --git a/src/FireboltExampleInvoker.js b/src/FireboltExampleInvoker.js index ffa1f666..6d2ad93a 100644 --- a/src/FireboltExampleInvoker.js +++ b/src/FireboltExampleInvoker.js @@ -100,6 +100,13 @@ export const MODULE_MAP = { discovery: DISCOVERY_MODULE_MAP, }; +try { + const additionalInvoker = require('../plugins/AdditionalExampleInvoker'); + MODULE_MAP.integratedPlayer = additionalInvoker.default; +} catch (err) { + logger.error('Unable to import additional invoker', 'MODULE_MAP'); +} + let instance = null; export default class FireboltExampleInvoker { diff --git a/src/constant.js b/src/constant.js index 7e0ec2d8..2e032502 100644 --- a/src/constant.js +++ b/src/constant.js @@ -141,6 +141,7 @@ export const CONSTANTS = { EXCLUDED_METHODS_FOR_SDK: [], EXCLUDED_METHODS_FOR_TRANSPORT: [], REGISTERPROVIDER: 'registerprovider', + PROVIDERNAME: 'providername', defaultSDKs: [ { name: 'Core', diff --git a/src/pubsub/handlers/RegisterProviderHandler.js b/src/pubsub/handlers/RegisterProviderHandler.js index bd414200..8654c7be 100644 --- a/src/pubsub/handlers/RegisterProviderHandler.js +++ b/src/pubsub/handlers/RegisterProviderHandler.js @@ -51,16 +51,6 @@ export default class RegisterProviderHandler extends BaseHandler { report: 'AcknowledgeChallenge ' + CONSTANTS.PROVIDER_REGISTRATION, }); break; - case 'broadcastplayer': - case 'player': - case 'streamingplayer': - try { - const provider = require('../../../plugins/playerProviderHandler'); - reportString = provider.integratedPlayerProvider(providerClass); - } catch (err) { - reportString = JSON.stringify({ report: `Unable to register for ${providerClass}` }); - } - break; default: reportString = JSON.stringify({ report: CONSTANTS.PROVIDER_REGISTRATION_FAILED }); break; From 780b34dbe46bd65a69d77424790f2f3a223952b6 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Fri, 19 Jul 2024 14:43:47 +0530 Subject: [PATCH 05/12] Minor fix --- src/FireboltExampleInvoker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FireboltExampleInvoker.js b/src/FireboltExampleInvoker.js index 6d2ad93a..651315f8 100644 --- a/src/FireboltExampleInvoker.js +++ b/src/FireboltExampleInvoker.js @@ -102,7 +102,7 @@ export const MODULE_MAP = { try { const additionalInvoker = require('../plugins/AdditionalExampleInvoker'); - MODULE_MAP.integratedPlayer = additionalInvoker.default; + MODULE_MAP.integratedplayer = additionalInvoker.default; } catch (err) { logger.error('Unable to import additional invoker', 'MODULE_MAP'); } From 94e47accb5773b7eadf1ffecd77d09ba9d474da6 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Mon, 22 Jul 2024 10:15:31 +0530 Subject: [PATCH 06/12] Reverted external provider registration --- src/App.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/App.js b/src/App.js index 95a0d35d..db961ec6 100644 --- a/src/App.js +++ b/src/App.js @@ -117,7 +117,6 @@ export default class App extends Base { process.env.STANDALONE_PREFIX = standalonePrefix; process.env.ID = 0; process.env.REGISTERPROVIDER = true; - process.env.PROVIDERNAME = null; // Set the pubSub URL if present process.env.PUB_SUB_URL = new URLSearchParams(window.location.search).get('pubSubUrl'); @@ -219,17 +218,6 @@ export default class App extends Base { } catch (err) { logger.error('Could not set up providers' + err, 'LoadedState'); } - try { - if (process.env.REGISTERPROVIDER && process.env.PROVIDERNAME) { - console.log('line 224--------'); - const provider = require('../plugins/playerProviderHandler.js'); - provider.integratedPlayerProvider(process.env.PROVIDERNAME); - } else { - logger.info('Could not set up player providers', 'LoadedState'); - } - } catch (err) { - logger.error('Could not set up player providers' + err, 'LoadedState'); - } process.env.APPOBJECT = this; const menusBuilder = new MenuBuilder(); LifecycleHistory.get().init(this); @@ -433,11 +421,6 @@ export default class App extends Base { if (query.params.hasOwnProperty(CONSTANTS.REGISTERPROVIDER)) { process.env.REGISTERPROVIDER = query.params.registerprovider; } - console.log('process.env.REGISTERPROVIDER-----:', process.env.REGISTERPROVIDER); - if (query.params.hasOwnProperty(CONSTANTS.PROVIDERNAME)) { - process.env.PROVIDERNAME = query.params.providername.toLowerCase(); - } - console.log('process.env.PROVIDERNAME-----:', process.env.PROVIDERNAME); // Set the pubSub URL if present if (query.params.pubSubUrl) { process.env.PUB_SUB_URL = query.params.pubSubUrl; From 48b4854226bed7a5b3ccbae676a7198be6986d42 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Mon, 22 Jul 2024 10:34:57 +0530 Subject: [PATCH 07/12] Removed unused constants --- src/App.js | 1 + src/constant.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index db961ec6..726133ef 100644 --- a/src/App.js +++ b/src/App.js @@ -421,6 +421,7 @@ export default class App extends Base { if (query.params.hasOwnProperty(CONSTANTS.REGISTERPROVIDER)) { process.env.REGISTERPROVIDER = query.params.registerprovider; } + // Set the pubSub URL if present if (query.params.pubSubUrl) { process.env.PUB_SUB_URL = query.params.pubSubUrl; diff --git a/src/constant.js b/src/constant.js index 2e032502..7e0ec2d8 100644 --- a/src/constant.js +++ b/src/constant.js @@ -141,7 +141,6 @@ export const CONSTANTS = { EXCLUDED_METHODS_FOR_SDK: [], EXCLUDED_METHODS_FOR_TRANSPORT: [], REGISTERPROVIDER: 'registerprovider', - PROVIDERNAME: 'providername', defaultSDKs: [ { name: 'Core', From 16dec1c813c3e3ceb6dd98a248c5f307cfe0da3c Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Tue, 23 Jul 2024 11:04:44 +0530 Subject: [PATCH 08/12] Generic way of importing additionalInvokers --- src/FireboltExampleInvoker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FireboltExampleInvoker.js b/src/FireboltExampleInvoker.js index 651315f8..d29fd3a1 100644 --- a/src/FireboltExampleInvoker.js +++ b/src/FireboltExampleInvoker.js @@ -101,10 +101,10 @@ export const MODULE_MAP = { }; try { - const additionalInvoker = require('../plugins/AdditionalExampleInvoker'); - MODULE_MAP.integratedplayer = additionalInvoker.default; + const additionalInvoker = require('../plugins/AdditionalExampleInvoker').default; + Object.assign(MODULE_MAP, additionalInvoker); } catch (err) { - logger.error('Unable to import additional invoker', 'MODULE_MAP'); + logger.error(`Unable to import additional invoker - ${err.message}`, 'MODULE_MAP'); } let instance = null; From 541ca8804f5a93deb9a133e23799a5e9b0f7dc01 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Wed, 24 Jul 2024 15:28:38 +0530 Subject: [PATCH 09/12] Added set apiResponse for external module --- src/pubsub/handlers/setApiResponseHandler.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pubsub/handlers/setApiResponseHandler.js b/src/pubsub/handlers/setApiResponseHandler.js index 364e26de..69419da5 100644 --- a/src/pubsub/handlers/setApiResponseHandler.js +++ b/src/pubsub/handlers/setApiResponseHandler.js @@ -45,6 +45,8 @@ export default class SetApiResponseHandler extends BaseHandler { return this.setResponseAckChallenge(message); case 'userinterest': return this.setResponseUserInterestChallenge(message); + case 'external': + return this.setExternalResponse(message); default: const defaultIdString = JSON.stringify({ report: 'Selected module provider is not available', @@ -102,4 +104,13 @@ export default class SetApiResponseHandler extends BaseHandler { const reportIdString = JSON.stringify({ report: 'Received UserInterest apiResponse parameters' }); return reportIdString; } + + setExternalResponse(message) { + try { + const externalFunction = require('../../../plugins/setExternalApiResponse'); + return externalFunction.setExternalApiResponse(message); + } catch (err) { + return JSON.stringify({ report: 'Unable to import and set the data for external module' }); + } + } } From e42384915ac50ba60ca3c2c0c473c9780174d1fc Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Wed, 24 Jul 2024 15:36:53 +0530 Subject: [PATCH 10/12] Latest changes --- src/pubsub/handlers/setApiResponseHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pubsub/handlers/setApiResponseHandler.js b/src/pubsub/handlers/setApiResponseHandler.js index 69419da5..fbd9f02f 100644 --- a/src/pubsub/handlers/setApiResponseHandler.js +++ b/src/pubsub/handlers/setApiResponseHandler.js @@ -103,7 +103,7 @@ export default class SetApiResponseHandler extends BaseHandler { process.env.userInterestError = userInterestData.userInterestError; const reportIdString = JSON.stringify({ report: 'Received UserInterest apiResponse parameters' }); return reportIdString; - } + } setExternalResponse(message) { try { From 6947f9e9055c6cdf25d497f2385724b44bf779e9 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Wed, 24 Jul 2024 15:38:06 +0530 Subject: [PATCH 11/12] Latest changes --- src/pubsub/handlers/setApiResponseHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pubsub/handlers/setApiResponseHandler.js b/src/pubsub/handlers/setApiResponseHandler.js index fbd9f02f..69419da5 100644 --- a/src/pubsub/handlers/setApiResponseHandler.js +++ b/src/pubsub/handlers/setApiResponseHandler.js @@ -103,7 +103,7 @@ export default class SetApiResponseHandler extends BaseHandler { process.env.userInterestError = userInterestData.userInterestError; const reportIdString = JSON.stringify({ report: 'Received UserInterest apiResponse parameters' }); return reportIdString; - } + } setExternalResponse(message) { try { From 0da0e3e088e230c7dbe084a3555c0823911a4c18 Mon Sep 17 00:00:00 2001 From: Kummithi Guru Eswar Sainath Reddy Date: Tue, 30 Jul 2024 10:42:29 +0530 Subject: [PATCH 12/12] Added comments to functions --- src/FireboltExampleInvoker.js | 1 + src/pubsub/handlers/setApiResponseHandler.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/FireboltExampleInvoker.js b/src/FireboltExampleInvoker.js index d29fd3a1..b814b05e 100644 --- a/src/FireboltExampleInvoker.js +++ b/src/FireboltExampleInvoker.js @@ -100,6 +100,7 @@ export const MODULE_MAP = { discovery: DISCOVERY_MODULE_MAP, }; +// importing additional invoker which has external sdk's being exported and adding those modules in the MODULE_MAP try { const additionalInvoker = require('../plugins/AdditionalExampleInvoker').default; Object.assign(MODULE_MAP, additionalInvoker); diff --git a/src/pubsub/handlers/setApiResponseHandler.js b/src/pubsub/handlers/setApiResponseHandler.js index 69419da5..4eb54a3b 100644 --- a/src/pubsub/handlers/setApiResponseHandler.js +++ b/src/pubsub/handlers/setApiResponseHandler.js @@ -105,6 +105,7 @@ export default class SetApiResponseHandler extends BaseHandler { return reportIdString; } + // importing external Api resonse function, which can set the pre-requisite values to external modules setExternalResponse(message) { try { const externalFunction = require('../../../plugins/setExternalApiResponse');