@xapp/stentor-templates 1.18.113 → 1.18.116
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/lib/Constants.d.ts +1 -1
- package/lib/TemplateFactory.d.ts +7 -5
- package/lib/TemplateFactory.js +0 -1
- package/lib/TemplateFactory.js.map +1 -1
- package/lib/Types.d.ts +1 -1
- package/lib/onDemand/Constants.d.ts +1 -1
- package/lib/onDemand/OnDemandTemplate.d.ts +2 -1
- package/lib/onDemand/OnDemandTemplateFactory.d.ts +5 -3
- package/lib/onDemand/OnDemandTemplateFactory.js +4 -4
- package/lib/onDemand/OnDemandTemplateFactory.js.map +1 -1
- package/lib/radio/Constants.d.ts +1 -1
- package/lib/radio/RadioTemplate.d.ts +2 -1
- package/lib/radio/RadioTemplateFactory.d.ts +5 -3
- package/lib/radio/RadioTemplateFactory.js +6 -7
- package/lib/radio/RadioTemplateFactory.js.map +1 -1
- package/package.json +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,39 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.18.116](https://github.com/XappMedia/stentor-core/compare/v1.18.115...v1.18.116) (2020-03-23)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **deps:** update stentor ([85332a9](https://github.com/XappMedia/stentor-core/commit/85332a94c42a1f549155a4161951cca5b8d50350))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [1.18.115](https://github.com/XappMedia/stentor-core/compare/v1.18.114...v1.18.115) (2020-03-23)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* Last decoupling, move Analyze code to it's own package ([#1615](https://github.com/XappMedia/stentor-core/issues/1615)) ([733fe43](https://github.com/XappMedia/stentor-core/commit/733fe433e568dc7e63a0e9df0ffc7c59d7b91654))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
## [1.18.114](https://github.com/XappMedia/stentor-core/compare/v1.18.113...v1.18.114) (2020-03-22)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Bug Fixes
|
|
32
|
+
|
|
33
|
+
* Decoupling handler for Client ([#1608](https://github.com/XappMedia/stentor-core/issues/1608)) ([2176a07](https://github.com/XappMedia/stentor-core/commit/2176a0763d184d08a208b4f5eec19c240c19f2fc))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
6
39
|
## [1.18.113](https://github.com/XappMedia/stentor-core/compare/v1.18.112...v1.18.113) (2020-03-22)
|
|
7
40
|
|
|
8
41
|
**Note:** Version bump only for package @xapp/stentor-templates
|
package/lib/Constants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
-
import { CustomType, Template } from "
|
|
2
|
+
import { CustomType, Template } from "@xapp/ovai-lib";
|
|
3
3
|
export declare const CUSTOM_TYPE: CustomType;
|
|
4
4
|
export declare const GLOBAL_KEYWORDS: string[];
|
|
5
5
|
export declare const TEMPLATE_DEFAULTS: Template;
|
package/lib/TemplateFactory.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
+
import { Template, OVAIApp } from "@xapp/ovai-lib";
|
|
3
|
+
import { Handler, Intent } from "stentor-models";
|
|
2
4
|
/**
|
|
3
5
|
* Abstract TemplateFactory for generating Templates of a certain type.
|
|
4
6
|
*/
|
|
@@ -18,7 +20,7 @@ export declare abstract class TemplateFactory<T extends Template> {
|
|
|
18
20
|
* @returns {(T | undefined)}
|
|
19
21
|
* @memberof TemplateFactory
|
|
20
22
|
*/
|
|
21
|
-
abstract generateTemplate(app:
|
|
23
|
+
abstract generateTemplate(app: OVAIApp, handlers: (Handler | Intent)[]): T | undefined;
|
|
22
24
|
/**
|
|
23
25
|
* Overrides template properties with those from the provided app
|
|
24
26
|
*
|
|
@@ -28,7 +30,7 @@ export declare abstract class TemplateFactory<T extends Template> {
|
|
|
28
30
|
* @returns {T}
|
|
29
31
|
* @memberof TemplateFactory
|
|
30
32
|
*/
|
|
31
|
-
protected overrideWithAppProps(template: T, app?:
|
|
33
|
+
protected overrideWithAppProps(template: T, app?: OVAIApp): T;
|
|
32
34
|
/**
|
|
33
35
|
* Generate an App from the provided template with optional App is used to fill in
|
|
34
36
|
* already existing information that did not exist on the template.
|
|
@@ -39,7 +41,7 @@ export declare abstract class TemplateFactory<T extends Template> {
|
|
|
39
41
|
* @returns {App}
|
|
40
42
|
* @memberof TemplateFactory
|
|
41
43
|
*/
|
|
42
|
-
generateApp(template: T, app?:
|
|
44
|
+
generateApp(template: T, app?: OVAIApp): OVAIApp;
|
|
43
45
|
/**
|
|
44
46
|
* Template specific cleaner to remove the template properties making it
|
|
45
47
|
* just a partial App.
|
|
@@ -49,7 +51,7 @@ export declare abstract class TemplateFactory<T extends Template> {
|
|
|
49
51
|
* @returns {Partial<App>}
|
|
50
52
|
* @memberof TemplateFactory
|
|
51
53
|
*/
|
|
52
|
-
protected abstract removeTemplateProperties(template: T): Partial<
|
|
54
|
+
protected abstract removeTemplateProperties(template: T): Partial<OVAIApp>;
|
|
53
55
|
/**
|
|
54
56
|
* Generate an array of Intents & Handlers from the provided template and optional existing handlers
|
|
55
57
|
* that are merged with the new handlers. Additionally, if other Intents or Handler are in the optional
|
package/lib/TemplateFactory.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateFactory.js","sourceRoot":"","sources":["../src/TemplateFactory.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"TemplateFactory.js","sourceRoot":"","sources":["../src/TemplateFactory.ts"],"names":[],"mappings":";;AAEA,mDAAoG;AACpG,yDAA8C;AAE9C;;GAEG;AACH,MAAsB,eAAe;IAkBjC;;;;;;;;OAQG;IACO,oBAAoB,CAAC,QAAW,EAAE,GAAa;QACrD,oDAAoD;QACpD,IAAI,GAAG,EAAE;YACL,gDAAgD;YAChD,QAAQ,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAEjF,kDAAkD;YAClD,IAAI,GAAG,CAAC,mBAAmB,EAAE;gBACzB,6DAA6D;gBAC7D,MAAM,OAAO,GAAG,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,6BAAS,CAAC,IAAI,EAAE,CAAC;gBAC/D,0BAA0B;gBAC1B,QAAQ,CAAC,yBAAyB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;aACnD;YAED,qCAAqC;YACrC,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,GAAG,CAAC,QAAQ,CAAC,aAAa,IAAI,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrE,QAAQ,CAAC,QAAQ,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;iBAChE;gBAED,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;oBAC3E,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;iBACtE;gBAED,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE;oBAC5E,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;iBACxE;aACJ;YAED,gBAAgB;YAChB,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,kCAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrE,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,kCAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAErE,QAAQ,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,iCAAmB,CAAC,GAAG,CAAC,CAAC;YAE7D,uBAAuB;YACvB,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,EAAE;gBAC3F,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,CAAC;aAClG;SACJ;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CAAC,QAAW,EAAE,GAAa;QAClC,wDAAwD;QACxD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzC,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE5D,gDAAgD;QAChD,MAAM,MAAM,mCAAiB,GAAG,GAAK,eAAe,CAAE,CAAC;QAEvD,uCAAuC;QACvC,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE;YACtD,MAAM,CAAC,QAAQ,mCACR,MAAM,CAAC,QAAQ,KAClB,aAAa,EAAE,QAAQ,CAAC,QAAQ,CAAC,aAAa,GACjD,CAAC;SACL;QAED,qDAAqD;QACrD,6CAA6C;QAC7C,MAAM,CAAC,mBAAmB;YACtB,2FAA2F;gBAC3F,mFACA,MAAM,CAAC,cACP,gBAAgB;gBAChB,wHAAwH;gBACxH,iIACA,MAAM,CAAC,cACP,eAAe;gBACf,0CAA0C,CAAC;QAE/C,yBAAyB;QACzB,IAAI,cAAsB,CAAC;QAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YACxC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM;YACH,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;SAC5C;QACD,qFAAqF;QACrF,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,0FAA0F;QAC1F,eAAe;QACf,IAAI,MAAM,CAAC,cAAc,EAAE;YACvB,0DAA0D;YAC1D,0CAA0C;YAC1C,MAAM,CAAC,WAAW;gBACd,QAAQ,CAAC,OAAO;oBAChB,+DACA,MAAM,CAAC,cACP,uBAAuB,CAAC;YAC5B,0CAA0C;YAC1C,MAAM,CAAC,cAAc,GAAG,CAAC,eAAe,MAAM,CAAC,cAAc,EAAE,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;SACrG;QACD,SAAS;QACT,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC5B,MAAM,CAAC,SAAS,GAAG,kCAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,SAAS,GAAG,kCAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrD,2CAA2C;QAC3C,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,iCAAmB,CAAC,MAAM,CAAC,CAAC;QAEjE,mBAAmB;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;CAyBJ;AAtKD,0CAsKC"}
|
package/lib/Types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
-
import { OnDemandTemplateType, RadioTemplateType } from "
|
|
2
|
+
import { OnDemandTemplateType, RadioTemplateType } from "@xapp/ovai-lib";
|
|
3
3
|
import { ON_DEMAND_TEMPLATE } from "./onDemand";
|
|
4
4
|
import { RADIO_TEMPLATE } from "./radio";
|
|
5
5
|
export { RADIO_TEMPLATE, ON_DEMAND_TEMPLATE, OnDemandTemplateType, RadioTemplateType };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
-
import { OnDemandTemplateType } from "
|
|
2
|
+
import { OnDemandTemplateType } from "@xapp/ovai-lib";
|
|
3
3
|
import { OnDemandTemplate } from "./OnDemandTemplate";
|
|
4
4
|
export declare const ON_DEMAND_TEMPLATE: OnDemandTemplateType;
|
|
5
5
|
export declare const ON_DEMAND_CONTENT_TYPE_STAND_ALONE = "STAND_ALONE";
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
-
import {
|
|
2
|
+
import { Template } from "@xapp/ovai-lib";
|
|
3
|
+
import { Response } from "stentor-models";
|
|
3
4
|
export declare type OnDemandContentTypeStandAlone = "STAND_ALONE";
|
|
4
5
|
/**
|
|
5
6
|
* Content where as soon as a new one is
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
+
import { OVAIApp } from "@xapp/ovai-lib";
|
|
3
|
+
import { Handler, Intent } from "stentor-models";
|
|
2
4
|
import { TemplateFactory } from "../TemplateFactory";
|
|
3
5
|
import { OnDemandTemplate } from "./OnDemandTemplate";
|
|
4
6
|
export declare class OnDemandTemplateFactory extends TemplateFactory<OnDemandTemplate> {
|
|
5
|
-
generateTemplate(app:
|
|
6
|
-
removeTemplateProperties(template: OnDemandTemplate): Partial<
|
|
7
|
+
generateTemplate(app: OVAIApp, handlers?: (Handler | Intent)[]): OnDemandTemplate | undefined;
|
|
8
|
+
removeTemplateProperties(template: OnDemandTemplate): Partial<OVAIApp>;
|
|
7
9
|
generateHandlers(template: OnDemandTemplate, handlers?: (Handler | Intent)[]): (Handler | Intent)[];
|
|
8
10
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
4
|
+
const ovai_lib_1 = require("@xapp/ovai-lib");
|
|
4
5
|
const stentor_alexa_lib_1 = require("@xapp/stentor-alexa-lib");
|
|
5
|
-
const stentor_handler_media_1 = require("@xapp/stentor-handler-media");
|
|
6
6
|
const stentor_interaction_model_1 = require("stentor-interaction-model");
|
|
7
7
|
const Constants_1 = require("../Constants");
|
|
8
8
|
const TemplateFactory_1 = require("../TemplateFactory");
|
|
@@ -16,7 +16,7 @@ class OnDemandTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
16
16
|
if (handlers) {
|
|
17
17
|
// Try to find the handler and take the data!
|
|
18
18
|
handlers.forEach(handler => {
|
|
19
|
-
if (
|
|
19
|
+
if (ovai_lib_1.isPlayPodcastHandlerProps(handler)) {
|
|
20
20
|
const data = handler.data;
|
|
21
21
|
if (data) {
|
|
22
22
|
if (data.url) {
|
|
@@ -53,7 +53,7 @@ class OnDemandTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
53
53
|
let oldYesIntentIndex = -1;
|
|
54
54
|
let oldNoIntentIndex = -1;
|
|
55
55
|
handlers.forEach((handler, index) => {
|
|
56
|
-
if (
|
|
56
|
+
if (ovai_lib_1.isPlayPodcastHandlerProps(handler)) {
|
|
57
57
|
existingPlayPodcastHandlerProps = Object.assign({}, handler);
|
|
58
58
|
existingPlayPodcastData = Object.assign({}, existingPlayPodcastHandlerProps.data);
|
|
59
59
|
}
|
|
@@ -89,7 +89,7 @@ class OnDemandTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
89
89
|
const url = template.rssFeedUrl ? template.rssFeedUrl.trim() : "";
|
|
90
90
|
const newLaunchRequestHandler = Object.assign(Object.assign({}, existingPlayPodcastHandlerProps), {
|
|
91
91
|
// overwrite with what needs to be standard
|
|
92
|
-
organizationId: template.organizationId, appId: template.appId, intentId: "LaunchRequest", name: "Play Podcast", type:
|
|
92
|
+
organizationId: template.organizationId, appId: template.appId, intentId: "LaunchRequest", name: "Play Podcast", type: ovai_lib_1.PLAY_PODCAST_HANDLER_TYPE, data: {
|
|
93
93
|
url,
|
|
94
94
|
alwaysPlayLatest: template.contentType === Constants_2.ON_DEMAND_CONTENT_TYPE_REPLACED,
|
|
95
95
|
nextIsOlder,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnDemandTemplateFactory.js","sourceRoot":"","sources":["../../src/onDemand/OnDemandTemplateFactory.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,+DAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"OnDemandTemplateFactory.js","sourceRoot":"","sources":["../../src/onDemand/OnDemandTemplateFactory.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,6CAMwB;AACxB,+DAAkD;AAClD,yEAOmC;AAEnC,4CAAiD;AACjD,wDAAqD;AACrD,2CAOqB;AAGrB,MAAa,uBAAwB,SAAQ,iCAAiC;IAC1E,gBAAgB,CAAC,GAAY,EAAE,WAAiC,EAAE;QAC9D,IAAI,QAAQ,iDACL,6BAAiB,GACjB,GAAG,KACN,YAAY,EAAE,8BAAkB,EAChC,YAAY,EAAE,EAAE,EAChB,aAAa,EAAE,2BAAO;YACtB,8CAA8C;YAC9C,qBAAqB,EAAE,oDAAwC,EAC/D,QAAQ,EAAE,uCAA2B,CAAC,KAAK,EAAE,GAChD,CAAC;QAEF,QAAQ,GAAG,KAAK,CAAC,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAErD,IAAI,QAAQ,EAAE;YACV,6CAA6C;YAC7C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACvB,IAAI,oCAAyB,CAAC,OAAO,CAAC,EAAE;oBACpC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;oBAE1B,IAAI,IAAI,EAAE;wBACN,IAAI,IAAI,CAAC,GAAG,EAAE;4BACV,QAAQ,CAAC,UAAU,GAAqB,OAAO,CAAC,IAAK,CAAC,GAAG,CAAC;yBAC7D;wBAED,IAAI,IAAI,CAAC,gBAAgB,EAAE;4BACvB,QAAQ,CAAC,WAAW,GAAG,2CAA+B,CAAC;yBAC1D;wBAED,IAAI,IAAI,CAAC,iBAAiB,EAAE;4BACxB,QAAQ,CAAC,WAAW,GAAG,8CAAkC,CAAC;yBAC7D;qBACJ;oBAED,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACpF;YACL,CAAC,CAAC,CAAC;SACN;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,wBAAwB,CAAC,QAA0B;QAC/C,OAAO,QAAQ,CAAC,WAAW,CAAC;QAC5B,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC3B,OAAO,QAAQ,CAAC,YAAY,CAAC;QAC7B,OAAO,QAAQ,CAAC,yBAAyB,CAAC;QAE1C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,gBAAgB,CAAC,QAA0B,EAAE,QAA+B;QACxE,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5C,0DAA0D;QAC1D,yCAAyC;QACzC,IAAI,+BAAwD,CAAC;QAC7D,IAAI,uBAAwC,CAAC;QAC7C,IAAI,qBAAqB,GAAW,CAAC,CAAC,CAAC;QACvC,IAAI,kBAAkB,GAAW,CAAC,CAAC,CAAC;QACpC,IAAI,iBAAiB,GAAW,CAAC,CAAC,CAAC;QACnC,IAAI,gBAAgB,GAAW,CAAC,CAAC,CAAC;QAElC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,oCAAyB,CAAC,OAAO,CAAC,EAAE;gBACpC,+BAA+B,qBAAQ,OAAO,CAAE,CAAC;gBACjD,uBAAuB,qBAAQ,+BAA+B,CAAC,IAAI,CAAE,CAAC;aACzE;YAED,IAAI,OAAO,CAAC,QAAQ,KAAK,eAAe,EAAE;gBACtC,qBAAqB,GAAG,KAAK,CAAC;aACjC;YAED,IAAI,OAAO,CAAC,QAAQ,KAAK,uCAAW,EAAE;gBAClC,kBAAkB,GAAG,KAAK,CAAC;aAC9B;YAED,IAAI,OAAO,CAAC,QAAQ,KAAK,sCAAU,EAAE;gBACjC,iBAAiB,GAAG,KAAK,CAAC;aAC7B;YAED,IAAI,OAAO,CAAC,QAAQ,KAAK,qCAAS,EAAE;gBAChC,gBAAgB,GAAG,KAAK,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;QAEH,2CAA2C;QAC3C,IAAI,qBAAqB,GAAG,CAAC,CAAC,EAAE;YAC5B,QAAQ,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;SAC7C;QACD,mBAAmB;QACnB,IAAI,kBAAkB,GAAG,CAAC,CAAC,EAAE;YACzB,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;SAC1C;QAED,0DAA0D;QAC1D,iBAAiB;QACjB,IAAI,WAAW,GAAY,QAAQ,CAAC,WAAW,KAAK,2CAA+B,CAAC;QACpF,IAAI,uBAAuB,IAAI,uBAAuB,CAAC,WAAW,KAAK,SAAS,EAAE;YAC9E,2CAA2C;YAC3C,4CAA4C;YAC5C,WAAW,GAAG,uBAAuB,CAAC,WAAW,CAAC;SACrD;QAED,MAAM,GAAG,GAAW,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1E,MAAM,uBAAuB,mCAEtB,+BAA+B;YAClC,2CAA2C;YAC3C,cAAc,EAAE,QAAQ,CAAC,cAAc,EACvC,KAAK,EAAE,QAAQ,CAAC,KAAK,EACrB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,oCAAyB,EAC/B,IAAI,EAAE;gBACF,GAAG;gBACH,gBAAgB,EAAE,QAAQ,CAAC,WAAW,KAAK,2CAA+B;gBAC1E,WAAW;gBACX,iBAAiB,EAAE,QAAQ,CAAC,WAAW,KAAK,8CAAkC;aACjF,EACD,OAAO,EAAE;gBACL,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,YAAY;gBACxC,CAAC,GAAG,uCAAW,IAAI,yCAAa,EAAE,CAAC,EAAE,4CAAgC;gBACrE,CAAC,yCAAa,CAAC,EAAE;oBACb;wBACI,YAAY,EAAE,wBAAwB;qBACzC;iBACJ;aACJ,GACJ,CAAC;QAEF,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAEtD,qCAAqC;QACrC,IAAI,iBAAiB,KAAK,CAAC,CAAC,EAAE;YAC1B,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;gBACvB,+CAAmB,CAAC;oBAChB,cAAc,EAAE,QAAQ,CAAC,cAAc;oBACvC,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,QAAQ,EAAE,sCAAU;iBACvB,CAAC;aACL,CAAC,CAAC;SACN;QAED,IAAI,gBAAgB,KAAK,CAAC,CAAC,EAAE;YACzB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;gBACvB,+CAAmB,CAAC;oBAChB,cAAc,EAAE,QAAQ,CAAC,cAAc;oBACvC,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,QAAQ,EAAE,qCAAS;iBACtB,CAAC;aACL,CAAC,CAAC;SACN;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AA9JD,0DA8JC"}
|
package/lib/radio/Constants.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
-
import { RadioTemplateType } from "
|
|
2
|
+
import { RadioTemplateType } from "@xapp/ovai-lib";
|
|
3
3
|
import { RadioTemplate } from "./RadioTemplate";
|
|
4
4
|
export declare const RADIO_TEMPLATE: RadioTemplateType;
|
|
5
5
|
export declare const RADIO_TEMPLATE_HELP_RESPONSE: {
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/*! Copyright (c) 2019, XAPPmedia */
|
|
2
|
+
import { OVAIApp } from "@xapp/ovai-lib";
|
|
3
|
+
import { Handler, Intent } from "stentor-models";
|
|
2
4
|
import { TemplateFactory } from "../TemplateFactory";
|
|
3
5
|
import { RadioTemplate } from "./RadioTemplate";
|
|
4
6
|
export declare class RadioTemplateFactory extends TemplateFactory<RadioTemplate> {
|
|
5
|
-
generateTemplate(app:
|
|
6
|
-
removeTemplateProperties(template: RadioTemplate): Partial<
|
|
7
|
+
generateTemplate(app: OVAIApp, handlers?: (Handler | Intent)[]): RadioTemplate | undefined;
|
|
8
|
+
removeTemplateProperties(template: RadioTemplate): Partial<OVAIApp>;
|
|
7
9
|
generateHandlers(template: RadioTemplate, handlers?: (Handler | Intent)[]): (Handler | Intent)[];
|
|
8
10
|
}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
4
|
+
const ovai_lib_1 = require("@xapp/ovai-lib");
|
|
4
5
|
const stentor_alexa_lib_1 = require("@xapp/stentor-alexa-lib");
|
|
5
6
|
const stentor_constants_1 = require("stentor-constants");
|
|
6
|
-
const
|
|
7
|
-
const stentor_handler_media_1 = require("@xapp/stentor-handler-media");
|
|
7
|
+
const stentor_guards_1 = require("stentor-guards");
|
|
8
8
|
const stentor_interaction_model_1 = require("stentor-interaction-model");
|
|
9
|
-
const stentor_request_1 = require("stentor-request");
|
|
10
9
|
const Constants_1 = require("../Constants");
|
|
11
10
|
const TemplateFactory_1 = require("../TemplateFactory");
|
|
12
11
|
const Constants_2 = require("./Constants");
|
|
@@ -21,7 +20,7 @@ class RadioTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
21
20
|
if (handlers) {
|
|
22
21
|
// Try to find the handler and take the data!
|
|
23
22
|
handlers.forEach(handler => {
|
|
24
|
-
if (
|
|
23
|
+
if (stentor_guards_1.isHandler(handler) && handler.type === ovai_lib_1.PLAY_LIVE_STREAM_HANDLER_TYPE) {
|
|
25
24
|
if (handler.data.url) {
|
|
26
25
|
template.liveStreamUrl = handler.data.url;
|
|
27
26
|
}
|
|
@@ -46,7 +45,7 @@ class RadioTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
46
45
|
let oldLaunchRequestIndex = -1;
|
|
47
46
|
let oldHelpIntentIndex = -1;
|
|
48
47
|
handlers.forEach((handler, index) => {
|
|
49
|
-
if (
|
|
48
|
+
if (stentor_guards_1.isHandler(handler) && handler.type === ovai_lib_1.PLAY_LIVE_STREAM_HANDLER_TYPE) {
|
|
50
49
|
playLiveStreamHandler = Object.assign({}, handler);
|
|
51
50
|
}
|
|
52
51
|
if (handler.intentId === "LaunchRequest") {
|
|
@@ -65,10 +64,10 @@ class RadioTemplateFactory extends TemplateFactory_1.TemplateFactory {
|
|
|
65
64
|
handlers.splice(oldHelpIntentIndex, 1);
|
|
66
65
|
}
|
|
67
66
|
const url = template.liveStreamUrl ? template.liveStreamUrl.trim() : "";
|
|
68
|
-
const newLaunchRequestHandler = Object.assign(Object.assign({}, playLiveStreamHandler), { organizationId: template.organizationId, appId: template.appId, intentId:
|
|
67
|
+
const newLaunchRequestHandler = Object.assign(Object.assign({}, playLiveStreamHandler), { organizationId: template.organizationId, appId: template.appId, intentId: stentor_constants_1.LAUNCH_REQUEST_ID, name: "Live Stream", type: ovai_lib_1.PLAY_LIVE_STREAM_HANDLER_TYPE, data: {
|
|
69
68
|
url
|
|
70
69
|
}, content: {
|
|
71
|
-
[
|
|
70
|
+
[stentor_constants_1.LAUNCH_REQUEST_ID]: template.customIntros,
|
|
72
71
|
[`${stentor_interaction_model_1.HELP_INTENT}|${stentor_interaction_model_1.INPUT_UNKNOWN}`]: Constants_2.RADIO_TEMPLATE_HELP_RESPONSE,
|
|
73
72
|
[stentor_interaction_model_1.CANCEL_INTENT]: [...stentor_constants_1.GOODBYE]
|
|
74
73
|
} });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioTemplateFactory.js","sourceRoot":"","sources":["../../src/radio/RadioTemplateFactory.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,+DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"RadioTemplateFactory.js","sourceRoot":"","sources":["../../src/radio/RadioTemplateFactory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "restricted"
|
|
6
6
|
},
|
|
7
|
-
"version": "1.18.
|
|
8
|
-
"description": "
|
|
7
|
+
"version": "1.18.116",
|
|
8
|
+
"description": "Custom App templates for OVAI stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
11
11
|
"files": [
|
|
@@ -19,18 +19,18 @@
|
|
|
19
19
|
"@xapp/config": "0.2.3",
|
|
20
20
|
"chai": "4.2.0",
|
|
21
21
|
"mocha": "7.1.1",
|
|
22
|
-
"stentor-models": "1.23.
|
|
22
|
+
"stentor-models": "1.23.37",
|
|
23
23
|
"ts-node": "8.7.0",
|
|
24
24
|
"typescript": "3.8.3"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@xapp/
|
|
28
|
-
"@xapp/stentor-
|
|
29
|
-
"@xapp/stentor-
|
|
30
|
-
"stentor-constants": "1.23.
|
|
31
|
-
"stentor-
|
|
32
|
-
"stentor-interaction-model": "1.23.
|
|
33
|
-
"stentor-request": "1.23.
|
|
27
|
+
"@xapp/ovai-lib": "1.18.116",
|
|
28
|
+
"@xapp/stentor-alexa-lib": "1.18.114",
|
|
29
|
+
"@xapp/stentor-app": "1.18.115",
|
|
30
|
+
"stentor-constants": "1.23.37",
|
|
31
|
+
"stentor-guards": "1.23.47",
|
|
32
|
+
"stentor-interaction-model": "1.23.47",
|
|
33
|
+
"stentor-request": "1.23.47"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
36
|
"stentor-models": "1.x"
|
|
@@ -40,5 +40,5 @@
|
|
|
40
40
|
"clean": "rm -rf ./lib/*",
|
|
41
41
|
"test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "8d7484b41bf1588baf90a9dc5e1ed82dc6a017c9"
|
|
44
44
|
}
|