Merge branch 'helix'

build/tasks/webpack/configurators/tests.js

@@ -41,6 +41,17 @@ module.exports = {
 		});
 	},
 
+	common( config ) {
+		config.module.rules.push({
+			test: /\.ya?ml$/,
+			include: pTestFixtures,
+			type: "json",
+			use: [
+				"yaml-loader"
+			]
+		});
+	},
+
 	test( config ) {
 		this._tests( config );
 		this._aliases( config );

src/app/data/models/auth/model.js

@@ -1,26 +1,28 @@
-import { get, computed } from "@ember/object";
+import { computed } from "@ember/object";
 import attr from "ember-data/attr";
 import Model from "ember-data/model";
 
 
+// noinspection JSValidateTypes
 export default Model.extend( /** @class Auth */ {
+	/** @type {string} */
 	access_token: attr( "string" ),
-	scope       : attr( "string" ),
-	date        : attr( "date" ),
+	/** @type {string} */
+	scope: attr( "string" ),
+	/** @type {Date} */
+	date: attr( "date" ),
 
 
-	// volatile property
+	// state properties
 	user_id: null,
 	user_name: null,
 
-	// status properties
-	isPending : false,
+	isPending: false,
 	isLoggedIn: computed( "access_token", "user_id", "isPending", function() {
-		let token   = get( this, "access_token" );
-		let id      = get( this, "user_id" );
-		let pending = get( this, "isPending" );
+		/** @this {Auth} */
+		const { access_token, user_id, isPending } = this;
 
-		return token && id && !pending;
+		return access_token && user_id && !isPending;
 	})
 
 }).reopenClass({

src/app/data/models/search/model.js

@@ -1,42 +1,22 @@
-import { get, computed } from "@ember/object";
 import attr from "ember-data/attr";
 import Model from "ember-data/model";
 
 
-const { hasOwnProperty } = {};
-
-
-export default Model.extend({
-	query : attr( "string" ),
+// noinspection JSValidateTypes
+export default Model.extend( /** @class Search */ {
+	/** @type {string} */
+	query: attr( "string" ),
+	/** @type {string} */
 	filter: attr( "string" ),
-	date  : attr( "date" ),
-
-	label: computed( "filter", function() {
-		const filter = get( this, "filter" );
-		return this.constructor.getLabel( filter );
-	})
+	/** @type {Date} */
+	date: attr( "date" )
 
 }).reopenClass({
 	toString() { return "Search"; },
 
 	filters: [
-		{ label: "All", id: "all" },
-		{ label: "Game", id: "games" },
-		{ label: "Channel", id: "channels" },
-		{ label: "Stream", id: "streams" }
-	],
-
-	filtersmap: computed(function() {
-		return this.filters.reduce( ( map, filter ) => {
-			map[ filter.id ] = filter;
-			return map;
-		}, {} );
-	}),
-
-	getLabel( filter ) {
-		const map = get( this, "filtersmap" );
-		return hasOwnProperty.call( map, filter )
-			? map[ filter ].label
-			: "All";
-	}
+		{ id: "all" },
+		{ id: "games" },
+		{ id: "channels" }
+	]
 });

src/app/data/models/settings/gui/fragment.js

@@ -21,7 +21,7 @@ export default Fragment.extend({
 	externalcommands: attr( "boolean", { defaultValue: false } ),
 	focusrefresh: attr( "number", { defaultValue: ATTR_GUI_FOCUSREFRESH_NONE } ),
 	hidebuttons: attr( "boolean", { defaultValue: false } ),
-	homepage: attr( "string", { defaultValue: "/featured" } ),
+	homepage: attr( "string", { defaultValue: "/streams" } ),
 	integration: attr( "number", { defaultValue: ATTR_GUI_INTEGRATION_BOTH } ),
 	language: attr( "string",  { defaultValue: "auto" } ),
 	minimize: attr( "number", { defaultValue: ATTR_GUI_MINIMIZE_NOOP } ),

src/app/data/models/stream/model.js

@@ -64,14 +64,18 @@ export {
 };
 
 
-/**
- * @class Stream
- */
-export default Model.extend({
-	/** @property {TwitchStream} stream */
-	stream: belongsTo( "twitchStream", { async: false } ),
-	/** @property {TwitchChannel} channel */
-	channel: belongsTo( "twitchChannel", { async: false } ),
+export default Model.extend( /** @class Stream */ {
+	/** @type {AuthService} */
+	auth: service(),
+	/** @type {SettingsService} */
+	settings: service(),
+	/** @type {StreamingService} */
+	streaming: service(),
+
+	/** @type {TwitchStream} */
+	stream: belongsTo( "twitch-stream", { async: false } ),
+	/** @type {TwitchUser} */
+	user: belongsTo( "twitch-user", { async: false } ),
 	quality: attr( "string" ),
 	low_latency: attr( "boolean" ),
 	disable_ads: attr( "boolean" ),
@@ -96,12 +100,6 @@ export default Model.extend({
 	log: null,
 	showLog: false,
 
-
-	auth: service(),
-	settings: service(),
-	streaming: service(),
-
-
 	session: alias( "auth.session" ),
 
 
@@ -166,14 +164,14 @@ export default Model.extend({
 		cpQualityFromPresetOrCustomValue( "quality" )
 	),
 
-	streamUrl: computed( "channel.name", function() {
-		const channel = get( this, "channel.name" );
-
-		return twitchStreamUrl.replace( "{channel}", channel );
-	})
+	streamUrl: computed(
+		"stream.user_login",
+		/** @this {Stream} */
+		function() {
+			return twitchStreamUrl.replace( "{channel}", this.stream.user_login );
+		}
+	)
 
 }).reopenClass({
-
 	toString() { return "Stream"; }
-
 });

src/app/data/models/twitch/adapter.js

@@ -1,5 +1,4 @@
 import { get, observer } from "@ember/object";
-import { inject as service } from "@ember/service";
 import RESTAdapter from "ember-data/adapters/rest";
 import { twitch } from "config";
 import AdapterMixin from "data/models/-mixins/adapter";
@@ -9,42 +8,18 @@ const { oauth: { "client-id": clientId } } = twitch;
 
 
 export default RESTAdapter.extend( AdapterMixin, {
-	auth: service(),
-
 	host: "https://api.twitch.tv",
 	namespace: "",
 	headers: {
-		"Accept": "application/vnd.twitchtv.v5+json",
 		"Client-ID": clientId
 	},
 
 	defaultSerializer: "twitch",
 
-
-	urlFragments: {
-		user_id() {
-			let user_id = get( this, "auth.session.user_id" );
-			if ( !user_id ) {
-				throw new Error( "Unknown user_id" );
-			}
-
-			return user_id;
-		},
-		user_name() {
-			let user_name = get( this, "auth.session.user_name" );
-			if ( !user_name ) {
-				throw new Error( "Unknown user_name" );
-			}
-
-			return user_name;
-		}
-	},
-
-
 	coalesceFindRequests: false,
-
-	findManyIdString: null,
-	findManyIdSeparator: ",",
+	findIdParam: null,
+	findIdSeparator: null,
+	findIdMax: 100,
 
 
 	access_token: null,
@@ -53,7 +28,7 @@ export default RESTAdapter.extend( AdapterMixin, {
 		if ( token === null ) {
 			delete this.headers[ "Authorization" ];
 		} else {
-			this.headers[ "Authorization" ] = `OAuth ${token}`;
+			this.headers[ "Authorization" ] = `Bearer ${token}`;
 		}
 	}),
 
@@ -69,61 +44,100 @@ export default RESTAdapter.extend( AdapterMixin, {
 		return {};
 	},
 
-	findMany( store, type, ids, snapshots ) {
-		const url = this.buildURL( type, null, snapshots, "findMany" );
+	/**
+	 * @param {DS.Store} store
+	 * @param {DS.Model} type
+	 * @param {string} id
+	 * @param {DS.Snapshot} snapshot
+	 * @return {Promise}
+	 */
+	findRecord( store, type, id, snapshot ) {
+		const url = this.buildURL( type, null, snapshot, "findRecord" );
+		const paramName = this.findIdParam || store.serializerFor( type.modelName ).primaryKey;
 		const data = {
-			[ this.findManyIdString ]: ids.join( this.findManyIdSeparator )
+			[ paramName ]: id
 		};
 
 		return this.ajax( url, "GET", { data } );
 	},
 
+	/**
+	 * @param {DS.Store} store
+	 * @param {DS.Model} type
+	 * @param {string[]} ids
+	 * @param {DS.Snapshot[]} snapshots
+	 * @return {Promise}
+	 */
+	findMany( store, type, ids, snapshots ) {
+		const url = this.buildURL( type, null, snapshots, "findMany" );
+		const paramName = this.findIdParam || store.serializerFor( type.modelName ).primaryKey;
+		const data = this.findIdSeparator
+			? { [ paramName ]: ids.join( this.findIdSeparator ) }
+			: ids.map( id => ({ name: paramName, value: id }) );
+
+		return this.ajax( url, "GET", { data } );
+	},
+
 
+	/**
+	 * @param {DS.Store} store
+	 * @param {DS.Snapshot[]} snapshots
+	 * @return {Array<Array<DS.Snapshot>>}
+	 */
 	groupRecordsForFindMany( store, snapshots ) {
 		const snapshotsByType = new Map();
 
 		// group snapshots by type
-		snapshots.forEach( snapshot => {
-			const type = snapshot.type;
-			const typeArray = snapshotsByType.get( type ) || [];
-			typeArray.push( snapshot );
-			snapshotsByType.set( type, typeArray );
-		});
+		for ( const snapshot of snapshots ) {
+			const { type } = snapshot;
+			let snapshotGroup = snapshotsByType.get( type );
+			if ( !snapshotGroup ) {
+				snapshotGroup = [];
+				snapshotsByType.set( type, snapshotGroup );
+			}
+			snapshotGroup.push( snapshot );
+		}
 
 		// build request groups
 		const groups = [];
-		snapshotsByType.forEach( ( snapshotGroup, type ) => {
+		for ( const [ type, snapshotGroup ] of snapshotsByType ) {
 			const adapter = store.adapterFor( type.modelName );
-
-			const baseLength = adapter._buildURL( type ).length
-				// "?[findManyIdString]="
-				+ 2 + adapter.findManyIdString.length;
-			const findManyIdSeparatorLength = adapter.findManyIdSeparator.length;
-			const maxLength = adapter.maxURLLength;
+			const {
+				maxURLLength,
+				findIdParam,
+				findIdMax,
+				findIdSeparator
+			} = adapter;
+
+			const baseLength = adapter._buildURL( type ).length;
+			const paramName = findIdParam || store.serializerFor( type.modelName ).primaryKey;
+			const paramNameLength = paramName.length;
+			const findIdSeparatorLength = findIdSeparator?.length || 0;
 
 			let group = [];
 			let length = baseLength;
 
-			snapshotGroup.forEach( snapshot => {
-				const id = get( snapshot, "record.id" );
-				const idLength = String( id ).length;
-				const separatorLength = group.length === 0 ? 0 : findManyIdSeparatorLength;
-				const newLength = length + separatorLength + idLength;
+			for ( const snapshot of snapshotGroup ) {
+				length += group.length === 0 || findIdSeparatorLength === 0
+					// ${url}?${paramName}=${id1} ... &${paramName}=${id2}
+					? 2 + paramNameLength
+					// ${url}?${paramName}=${id1} ... ${findIdSeparator}${id2}
+					: findIdSeparatorLength;
+				length += String( snapshot.record.id ).length;
 
-				if ( newLength <= maxLength ) {
+				if ( length <= maxURLLength && group.length < findIdMax ) {
 					group.push( snapshot );
-					length = newLength;
 				} else {
 					groups.push( group );
 					group = [ snapshot ];
 					length = baseLength;
 				}
-			});
+			}
 
 			if ( group.length ) {
 				groups.push( group );
 			}
-		});
+		}
 
 		return groups;
 	}