diff --git a/.gitignore b/.gitignore index 00cbbdf..ae22dca 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ typings/ # dotenv environment variables file .env +.idea \ No newline at end of file diff --git a/alexa/LICENSE.txt b/alexa/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/alexa/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/alexa/speechAssets/IntentSchema.json b/alexa/speechAssets/IntentSchema.json new file mode 100644 index 0000000..cd3ccea --- /dev/null +++ b/alexa/speechAssets/IntentSchema.json @@ -0,0 +1,9 @@ +{"intents": [ + {"intent": "NumberGuessIntent", "slots": [{"name": "number", "type": "AMAZON.NUMBER"}]}, + {"intent": "AMAZON.YesIntent"}, + {"intent": "AMAZON.NoIntent"}, + {"intent": "AMAZON.HelpIntent"}, + {"intent": "AMAZON.StopIntent"}, + {"intent": "AMAZON.CancelIntent"} + ] +} \ No newline at end of file diff --git a/alexa/speechAssets/Utterances.txt b/alexa/speechAssets/Utterances.txt new file mode 100644 index 0000000..065a795 --- /dev/null +++ b/alexa/speechAssets/Utterances.txt @@ -0,0 +1,4 @@ +NumberGuessIntent {number} +NumberGuessIntent is it {number} +NumberGuessIntent how about {number} +NumberGuessIntent could it be {number} \ No newline at end of file diff --git a/alexa/src/index.js b/alexa/src/index.js new file mode 100644 index 0000000..61b6d2b --- /dev/null +++ b/alexa/src/index.js @@ -0,0 +1,141 @@ +'use strict'; +var Alexa = require("alexa-sdk"); + +exports.handler = function (event, context, callback) { + var alexa = Alexa.handler(event, context); + alexa.APP_ID = process.env.ALEXA_APP_ID; + /*alexa.dynamoDBTableName = 'highLowGuessUsers';*/ + alexa.registerHandlers(newSessionHandlers, guessModeHandlers, startGameHandlers, guessAttemptHandlers); + alexa.execute(); +}; + +var states = { + GUESSMODE: '_GUESSMODE', // User is trying to guess the number. + STARTMODE: '_STARTMODE' // Prompt the user to start or restart the game. +}; + +var newSessionHandlers = { + 'NewSession': function () { + if (Object.keys(this.attributes).length === 0) { + this.attributes['endedSessionCount'] = 0; + this.attributes['gamesPlayed'] = 0; + } + this.handler.state = states.STARTMODE; + this.emit(':ask', 'Welcome to High Low guessing game. You have played ' + + this.attributes['gamesPlayed'].toString() + ' times. would you like to play?', + 'Say yes to start the game or no to quit.'); + }, + "AMAZON.StopIntent": function () { + this.emit(':tell', "Goodbye!"); + }, + "AMAZON.CancelIntent": function () { + this.emit(':tell', "Goodbye!"); + }, + 'SessionEndedRequest': function () { + console.log('session ended!'); + //this.attributes['endedSessionCount'] += 1; + this.emit(":tell", "Goodbye!"); + } +}; + +var startGameHandlers = Alexa.CreateStateHandler(states.STARTMODE, { + 'NewSession': function () { + this.emit('NewSession'); // Uses the handler in newSessionHandlers + }, + 'AMAZON.HelpIntent': function () { + var message = 'I will think of a number between zero and one hundred, try to guess and I will tell you if it' + + ' is higher or lower. Do you want to start the game?'; + this.emit(':ask', message, message); + }, + 'AMAZON.YesIntent': function () { + this.attributes["guessNumber"] = Math.floor(Math.random() * 100); + this.handler.state = states.GUESSMODE; + this.emit(':ask', 'Great! ' + 'Try saying a number to start the game.', 'Try saying a number.'); + }, + 'AMAZON.NoIntent': function () { + console.log("NOINTENT"); + this.emit(':tell', 'Ok, see you next time!'); + }, + "AMAZON.StopIntent": function () { + console.log("STOPINTENT"); + this.emit(':tell', "Goodbye!"); + }, + "AMAZON.CancelIntent": function () { + console.log("CANCELINTENT"); + this.emit(':tell', "Goodbye!"); + }, + 'SessionEndedRequest': function () { + console.log("SESSIONENDEDREQUEST"); + //this.attributes['endedSessionCount'] += 1; + this.emit(':tell', "Goodbye!"); + }, + 'Unhandled': function () { + console.log("UNHANDLED"); + var message = 'Say yes to continue, or no to end the game.'; + this.emit(':ask', message, message); + } +}); + +var guessModeHandlers = Alexa.CreateStateHandler(states.GUESSMODE, { + 'NewSession': function () { + this.handler.state = ''; + this.emitWithState('NewSession'); // Equivalent to the Start Mode NewSession handler + }, + 'NumberGuessIntent': function () { + var guessNum = parseInt(this.event.request.intent.slots.number.value); + var targetNum = this.attributes["guessNumber"]; + console.log('user guessed: ' + guessNum); + + if (guessNum > targetNum) { + this.emit('TooHigh', guessNum); + } else if (guessNum < targetNum) { + this.emit('TooLow', guessNum); + } else if (guessNum === targetNum) { + // With a callback, use the arrow function to preserve the correct 'this' context + this.emit('JustRight', () => { + this.emit(':ask', guessNum.toString() + 'is correct! Would you like to play a new game?', + 'Say yes to start a new game, or no to end the game.'); + }) + } else { + this.emit('NotANum'); + } + }, + 'AMAZON.HelpIntent': function () { + this.emit(':ask', 'I am thinking of a number between zero and one hundred, try to guess and I will tell you' + + ' if it is higher or lower.', 'Try saying a number.'); + }, + "AMAZON.StopIntent": function () { + console.log("STOPINTENT"); + this.emit(':tell', "Goodbye!"); + }, + "AMAZON.CancelIntent": function () { + console.log("CANCELINTENT"); + }, + 'SessionEndedRequest': function () { + console.log("SESSIONENDEDREQUEST"); + this.attributes['endedSessionCount'] += 1; + this.emit(':tell', "Goodbye!"); + }, + 'Unhandled': function () { + console.log("UNHANDLED"); + this.emit(':ask', 'Sorry, I didn\'t get that. Try saying a number.', 'Try saying a number.'); + } +}); + +// These handlers are not bound to a state +var guessAttemptHandlers = { + 'TooHigh': function (val) { + this.emit(':ask', val.toString() + ' is too high.', 'Try saying a smaller number.'); + }, + 'TooLow': function (val) { + this.emit(':ask', val.toString() + ' is too low.', 'Try saying a larger number.'); + }, + 'JustRight': function (callback) { + this.handler.state = states.STARTMODE; + this.attributes['gamesPlayed']++; + callback(); + }, + 'NotANum': function () { + this.emit(':ask', 'Sorry, I didn\'t get that. Try saying a number.', 'Try saying a number.'); + } +}; \ No newline at end of file diff --git a/alexa/src/package.json b/alexa/src/package.json new file mode 100644 index 0000000..a75900c --- /dev/null +++ b/alexa/src/package.json @@ -0,0 +1,27 @@ +{ + "name": "skill-sample-nodejs-highlowgame", + "version": "1.0.0", + "description": "High-low number guessing game for Alexa", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/alexa/skill-sample-nodejs-highlowgame.git" + }, + "keywords": [ + "Alexa", + "game", + "skill" + ], + "author": "Amazon.com", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/alexa/skill-sample-nodejs-highlowgame/issues" + }, + "homepage": "https://github.com/alexa/skill-sample-nodejs-highlowgame#readme", + "dependencies": { + "alexa-sdk": "^1.0.0" + } +} diff --git a/alexa/src/src.zip b/alexa/src/src.zip new file mode 100644 index 0000000..dd2406b Binary files /dev/null and b/alexa/src/src.zip differ diff --git a/droning/droningServer.js b/droning/droningServer.js new file mode 100644 index 0000000..95c9dfa --- /dev/null +++ b/droning/droningServer.js @@ -0,0 +1,46 @@ +const express = require('express'); +const path = require('path'); +const favicon = require('serve-favicon'); +const logger = require('morgan'); +const bodyParser = require('body-parser'); +const Drone = require('parrot-minidrone'); +const drone = new Drone({ + autoconnect: true, + droneFilter: "Mambo_471482" +}); + +const router = express.Router(); +router.get('/', function (req, res, next) { + console.log("Takeoff called"); + drone.takeoffOrLand(); + res.json({message: 'Taken Off'}); +}); + +const app = express(); + +app.use(logger('dev')); +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({extended: false})); + +app.use('/', router); + +// catch 404 and forward to error handler +app.use(function (req, res, next) { + var err = new Error('Not Found'); + err.status = 404; + next(err); +}); + +// error handler +app.use(function (err, req, res, next) { + // set locals, only providing error in development + res.locals.message = err.message; + res.locals.error = req.app.get('env') === 'development' ? err : {}; + + // render the error page + res.status(err.status || 500); + res.render('error'); +}); + + +module.exports = app; diff --git a/droning/fakeFlightCommands.js b/droning/fakeFlightCommands.js new file mode 100644 index 0000000..206492f --- /dev/null +++ b/droning/fakeFlightCommands.js @@ -0,0 +1,36 @@ +module.exports = (drone) => { + + + return { + takeoff: () => { + console.log('Taking Off'); + }, + + land: () => { + console.log('Landing'); + }, + + stabilize: () => { + console.log('Stabilizing'); + }, + + goForward: () => { + console.log('Going Forward'); + }, + + goBackwards: () => { + console.log('Going Backwards'); + }, + + goRight: () => { + console.log('Going Right'); + }, + + goLeft: () => { + console.log('Going Left'); + }, + getReady : () => { + console.log('Getting ready to fly!'); + } + } +}; diff --git a/droning/flightCommands.js b/droning/flightCommands.js new file mode 100644 index 0000000..e771d83 --- /dev/null +++ b/droning/flightCommands.js @@ -0,0 +1,41 @@ +module.exports = (drone) => { + const stableFlightParams = { + yaw: 0, + pitch: 0, + roll: 0, + altitude: 0, + }; + + return { + takeoff: () => { + drone.takeoffOrLand(); + }, + + land: () => { + drone.takeoffOrLand(); + }, + + stabilize: () => { + drone.setFlightParams(stableFlightParams); + }, + + goForward: () => { + drone.setFlightParams(Object.assign({}, stableFlightParams, {pitch: 100})); + }, + + goBackwards: () => { + drone.setFlightParams(Object.assign({}, stableFlightParams, {pitch: -100})); + }, + + goRight: () => { + drone.setFlightParams(Object.assign({}, stableFlightParams, {roll: 100})); + }, + + goLeft: () => { + drone.setFlightParams(Object.assign({}, stableFlightParams, {roll: -100})); + }, + getReady: () => { + drone.setFlightParams(stableFlightParams); + } + } +}; diff --git a/droning/package.json b/droning/package.json new file mode 100644 index 0000000..9cb06ca --- /dev/null +++ b/droning/package.json @@ -0,0 +1,17 @@ +{ + "name": "drone", + "version": "1.0.0", + "description": "Droner dojo", + "repository": "", + "main": "index.js", + "dependencies": { + "keypress": "^0.2.1", + "parrot-minidrone": "^1.1.0" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Jussi Hallila", + "license": "SEE LICENCE IN package.json" +} diff --git a/droning/promiseArrayBasedFlight.js b/droning/promiseArrayBasedFlight.js new file mode 100644 index 0000000..c844c07 --- /dev/null +++ b/droning/promiseArrayBasedFlight.js @@ -0,0 +1,60 @@ +const keypress = require('keypress'); +const Drone = require('parrot-minidrone'); +const drone = new Drone({ + autoconnect: false, + droneFilter: "Mambo_471482" +}); +const commands = require('./fakeFlightCommands')(drone); +keypress(process.stdin); + +// listen for the "keypress" event +process.stdin.on('keypress', (ch, key) => { + const keyName = key && key.name ? key.name : false; + if (!keyName) { + return; + } + + const flightpath = [ + {command: commands.getReady, duration: 2000}, + {command: commands.takeoff, duration: 2000}, + {command: commands.goRight, duration: 2000}, + {command: commands.goLeft, duration: 2000}, + {command: commands.goBackwards, duration: 2000}, + {command: commands.goForward, duration: 2000}, + {command: commands.land, duration: 2000}, + ]; + + const act = ({command, duration}) => { + return (res) => { + command(); + setTimeout(() => { + setTimeout(() => { + res(); + }, 1000); + commands.stabilize(); + }, duration); + } + }; + + flightpath + .map(act) + .reduce((promise, action) => { + return promise.then((_) => new Promise(action)) + }, Promise.resolve() + ); + + switch (keyName) { + case 'escape': + drone.emergency(); + break; + case 'c': + process.exit(); + break; + default: + break; + } +}); + + +process.stdin.setRawMode(true); +process.stdin.resume(); \ No newline at end of file diff --git a/droning/timeoutbasedflight.js b/droning/timeoutbasedflight.js new file mode 100644 index 0000000..4e9b159 --- /dev/null +++ b/droning/timeoutbasedflight.js @@ -0,0 +1,72 @@ +const keypress = require('keypress'); +const Drone = require('parrot-minidrone'); +const drone = new Drone({ + autoconnect: true/*, + droneFilter: "Mambo_471482"*/ +}); +const commands = require('./fakeFlightCommands')(drone); +keypress(process.stdin); + +// listen for the "keypress" event +process.stdin.on('keypress', (ch, key) => { + const keyName = key && key.name ? key.name : false; + if (!keyName) { + return; + } + commands.getReady(); + setTimeout(() => { + commands.takeoff(); + }, 2000); +/* + + setTimeout(() => { + commands.goRight(); + }, 5000); + + setTimeout(() => { + commands.stabilize(); + }, 5350); + + setTimeout(() => { + commands.goForward(); + }, 7000); + + setTimeout(() => { + commands.stabilize(); + }, 10200); + + + setTimeout(() => { + commands.goRight(); + }, 12000); + + setTimeout(() => { + commands.stabilize(); + }, 14000); +*/ + + setTimeout(() => { + commands.land(); + }, 16400); + + + setTimeout(() => { + console.log('Flight Succeeded (?)'); + process.exit(); + }, 20000); + + switch (keyName) { + case 'escape': + drone.emergency(); + break; + case 'c': + process.exit(); + break; + default: + break; + } +}); + + +process.stdin.setRawMode(true); +process.stdin.resume(); \ No newline at end of file