Compare commits

..

3 Commits

Author SHA1 Message Date
Jeronimo Vallelunga 88bb7a96bd Ignore dist folder 2017-11-01 18:57:10 -03:00
jvallelunga 3ba1138cd5 [ISSUE-14] Multiple clients write support (#15)
* 0.1.17

* 0.1.18

* [ISSUE-14] Multiple clients write support
2017-11-01 18:57:10 -03:00
Jeronimo Vallelunga cea4e2b20f 0.1.18 2017-10-25 20:53:51 -03:00
45 changed files with 2321 additions and 36596 deletions

View File

@ -1,5 +1,4 @@
{ {
"verbose": true, "testPathIgnorePatterns": ["/build/"],
"testPathIgnorePatterns": ["<rootDir>/build", "<rootDir>/example"], "collectCoverageFrom": ["src/**/*.js"]
"collectCoverageFrom": ["<rootDir>/src/**/*.js"]
} }

2
.nvmrc
View File

@ -1 +1 @@
8.10.0 6

View File

@ -9,8 +9,23 @@ addons:
packages: packages:
- gcc-4.8 - gcc-4.8
- g++-4.8 - g++-4.8
script:
- npm run ci:test
- npm run ci:bundlesize
- npm run ci:example:build
branches: branches:
only: only:
- master - master
cache:
directories:
- node_modules
- example/webapp/node_modules
deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: example/webapp/build
on:
branch: master
after_success: after_success:
- npm run test:coverage:codecov - npm run ci:report:coverage

View File

@ -77,31 +77,13 @@ $ npm run example:install
Make sure you have your bluetooth enabled Make sure you have your bluetooth enabled
```shell ```shell
$ npm run example:peripheral:start $ npm run example:start
```
### Start Webapp Server
In a different terminal window
```shell
$ npm run example:webapp:start
``` ```
### Open Webapp ### Open Webapp
After starting the server you will see something similar to this. Before starting the webapp, go to `chrome://flags/#enable-experimental-web-platform-features`, enable the highlighted flag, and restart Chrome on your mobile.
```shell
Compiled successfully!
You can now view webapp in the browser.
Local: https://localhost:3000/
On Your Network: https://192.168.0.105:3000/
````
Before opening the webapp, go to `chrome://flags/#enable-experimental-web-platform-features`, enable the highlighted flag, and restart Chrome on your mobile.
Then, Make sure you have your bluetooth enabled. Then, Make sure you have your bluetooth enabled.
Finally, open this url https://jvallelunga.github.io/redux-bluetooth/ on your mobile.
Finally, use the url **On Your Netrowk** to access the web app from your mobile.

File diff suppressed because it is too large Load Diff

View File

@ -5,16 +5,15 @@
"main": "build/index.js", "main": "build/index.js",
"scripts": { "scripts": {
"prestart": "npm run build", "prestart": "npm run build",
"start": "babel-node src/index.js", "start": "node build/index.js",
"dev": "watch 'npm run build' src", "dev": "watch 'npm run build' src",
"prebuild": "cd ../.. && npm run build",
"build": "babel src -d build", "build": "babel src -d build",
"test": "jest", "test": "jest",
"test:watch": "npm test -- --watch" "test:watch": "npm test -- --watch"
}, },
"babel": { "babel": {
"presets": [ "presets": [
"@babel/preset-env" "es2015-node5"
], ],
"plugins": [ "plugins": [
[ [
@ -42,17 +41,17 @@
}, },
"homepage": "https://github.com/jvallelunga/redux-bluetooth#readme", "homepage": "https://github.com/jvallelunga/redux-bluetooth#readme",
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.2.3", "babel-cli": "^6.24.1",
"@babel/core": "^7.3.4",
"@babel/node": "^7.2.2",
"@babel/preset-env": "^7.3.4",
"babel-plugin-transform-react-jsx": "^6.24.1", "babel-plugin-transform-react-jsx": "^6.24.1",
"nodemon": "^1.18.10" "babel-preset-es2015-node5": "^1.2.0",
"jest": "^20.0.4",
"watch": "^1.0.2"
}, },
"dependencies": { "dependencies": {
"ink": "^0.1.2", "ink": "^0.1.2",
"ink-redux": "^1.0.0", "ink-redux": "^1.0.0",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"redux": "^3.7.1" "redux": "^3.7.1",
"redux-bluetooth": "^0.1.1"
} }
} }

View File

@ -1,5 +1,5 @@
import { createStore } from 'redux'; import { createStore } from 'redux';
import { connectSyncStore } from '../../../build/peripheral'; import { connectSyncStore } from 'redux-bluetooth/build/peripheral';
import reducer from './reducer'; import reducer from './reducer';
import output from './output'; import output from './output';

View File

@ -3,7 +3,7 @@ const { h, mount, Text } = require('ink');
const { Provider, connect } = require('ink-redux'); const { Provider, connect } = require('ink-redux');
const PropTypes = require('prop-types'); const PropTypes = require('prop-types');
export default store => { export default (store) => {
function Counter({ counter, quote }) { function Counter({ counter, quote }) {
const color = { const color = {
blue: counter > 0, blue: counter > 0,
@ -12,7 +12,7 @@ export default store => {
return ( return (
<div> <div>
Counter: Counter:
<Text {...color} > {counter}</Text> <Text {...color}> {counter}</Text>
<br /> <br />
<Text>{quote}</Text> <Text>{quote}</Text>
</div> </div>

View File

@ -1,9 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/ignore-files/ for more about ignoring files.
# dependencies # dependencies
/node_modules /node_modules
/.pnp
.pnp.js
# testing # testing
/coverage /coverage

File diff suppressed because it is too large Load Diff

View File

@ -1,93 +0,0 @@
'use strict';
const fs = require('fs');
const path = require('path');
const paths = require('./paths');
// Make sure that including paths.js after env.js will read .env variables.
delete require.cache[require.resolve('./paths')];
const NODE_ENV = process.env.NODE_ENV;
if (!NODE_ENV) {
throw new Error(
'The NODE_ENV environment variable is required but was not specified.'
);
}
// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
var dotenvFiles = [
`${paths.dotenv}.${NODE_ENV}.local`,
`${paths.dotenv}.${NODE_ENV}`,
// Don't include `.env.local` for `test` environment
// since normally you expect tests to produce the same
// results for everyone
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
paths.dotenv,
].filter(Boolean);
// Load environment variables from .env* files. Suppress warnings using silent
// if this file is missing. dotenv will never modify any environment variables
// that have already been set. Variable expansion is supported in .env files.
// https://github.com/motdotla/dotenv
// https://github.com/motdotla/dotenv-expand
dotenvFiles.forEach(dotenvFile => {
if (fs.existsSync(dotenvFile)) {
require('dotenv-expand')(
require('dotenv').config({
path: dotenvFile,
})
);
}
});
// We support resolving modules according to `NODE_PATH`.
// This lets you use absolute paths in imports inside large monorepos:
// https://github.com/facebook/create-react-app/issues/253.
// It works similar to `NODE_PATH` in Node itself:
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
// We also resolve them to make sure all tools using them work consistently.
const appDirectory = fs.realpathSync(process.cwd());
process.env.NODE_PATH = (process.env.NODE_PATH || '')
.split(path.delimiter)
.filter(folder => folder && !path.isAbsolute(folder))
.map(folder => path.resolve(appDirectory, folder))
.join(path.delimiter);
// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
// injected into the application via DefinePlugin in Webpack configuration.
const REACT_APP = /^REACT_APP_/i;
function getClientEnvironment(publicUrl) {
const raw = Object.keys(process.env)
.filter(key => REACT_APP.test(key))
.reduce(
(env, key) => {
env[key] = process.env[key];
return env;
},
{
// Useful for determining whether were running in production mode.
// Most importantly, it switches React into the correct mode.
NODE_ENV: process.env.NODE_ENV || 'development',
// Useful for resolving the correct path to static assets in `public`.
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
// This should only be used as an escape hatch. Normally you would put
// images into the `src` and `import` them in code to get their paths.
PUBLIC_URL: publicUrl,
}
);
// Stringify all values so we can feed into Webpack DefinePlugin
const stringified = {
'process.env': Object.keys(raw).reduce((env, key) => {
env[key] = JSON.stringify(raw[key]);
return env;
}, {}),
};
return { raw, stringified };
}
module.exports = getClientEnvironment;

View File

@ -1,14 +0,0 @@
'use strict';
// This is a custom Jest transformer turning style imports into empty objects.
// http://facebook.github.io/jest/docs/en/webpack.html
module.exports = {
process() {
return 'module.exports = {};';
},
getCacheKey() {
// The output is always the same.
return 'cssTransform';
},
};

View File

@ -1,31 +0,0 @@
'use strict';
const path = require('path');
// This is a custom Jest transformer turning file imports into filenames.
// http://facebook.github.io/jest/docs/en/webpack.html
module.exports = {
process(src, filename) {
const assetFilename = JSON.stringify(path.basename(filename));
if (filename.match(/\.svg$/)) {
return `const React = require('react');
module.exports = {
__esModule: true,
default: ${assetFilename},
ReactComponent: React.forwardRef((props, ref) => ({
$$typeof: Symbol.for('react.element'),
type: 'svg',
ref: ref,
key: null,
props: Object.assign({}, props, {
children: ${assetFilename}
})
})),
};`;
}
return `module.exports = ${assetFilename};`;
},
};

View File

@ -1,89 +0,0 @@
'use strict';
const path = require('path');
const fs = require('fs');
const url = require('url');
// Make sure any symlinks in the project folder are resolved:
// https://github.com/facebook/create-react-app/issues/637
const appDirectory = fs.realpathSync(process.cwd());
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
const envPublicUrl = process.env.PUBLIC_URL;
function ensureSlash(inputPath, needsSlash) {
const hasSlash = inputPath.endsWith('/');
if (hasSlash && !needsSlash) {
return inputPath.substr(0, inputPath.length - 1);
} else if (!hasSlash && needsSlash) {
return `${inputPath}/`;
} else {
return inputPath;
}
}
const getPublicUrl = appPackageJson =>
envPublicUrl || require(appPackageJson).homepage;
// We use `PUBLIC_URL` environment variable or "homepage" field to infer
// "public path" at which the app is served.
// Webpack needs to know it to put the right <script> hrefs into HTML even in
// single-page apps that may serve index.html for nested URLs like /todos/42.
// We can't use a relative path in HTML because we don't want to load something
// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
function getServedPath(appPackageJson) {
const publicUrl = getPublicUrl(appPackageJson);
const servedUrl =
envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
return ensureSlash(servedUrl, true);
}
const moduleFileExtensions = [
'web.mjs',
'mjs',
'web.js',
'js',
'web.ts',
'ts',
'web.tsx',
'tsx',
'json',
'web.jsx',
'jsx',
];
// Resolve file paths in the same order as webpack
const resolveModule = (resolveFn, filePath) => {
const extension = moduleFileExtensions.find(extension =>
fs.existsSync(resolveFn(`${filePath}.${extension}`))
);
if (extension) {
return resolveFn(`${filePath}.${extension}`);
}
return resolveFn(`${filePath}.js`);
};
// config after eject: we're in ./config/
module.exports = {
dotenv: resolveApp('.env'),
appPath: resolveApp('.'),
appBuild: resolveApp('build'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'),
yarnLockFile: resolveApp('yarn.lock'),
testsSetup: resolveModule(resolveApp, 'src/setupTests'),
proxySetup: resolveApp('src/setupProxy.js'),
appNodeModules: resolveApp('node_modules'),
publicUrl: getPublicUrl(resolveApp('package.json')),
servedPath: getServedPath(resolveApp('package.json')),
};
module.exports.moduleFileExtensions = moduleFileExtensions;

View File

@ -1,606 +0,0 @@
'use strict';
const fs = require('fs');
const path = require('path');
const webpack = require('webpack');
const resolve = require('resolve');
const PnpWebpackPlugin = require('pnp-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
const TerserPlugin = require('terser-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const safePostCssParser = require('postcss-safe-parser');
const ManifestPlugin = require('webpack-manifest-plugin');
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
// const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
const paths = require('./paths');
const getClientEnvironment = require('./env');
const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
// Source maps are resource heavy and can cause out of memory issue for large source files.
const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
// Some apps do not need the benefits of saving a web request, so not inlining the chunk
// makes for a smoother build process.
const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
// Check if TypeScript is setup
const useTypeScript = fs.existsSync(paths.appTsConfig);
// style files regexes
const cssRegex = /\.css$/;
const cssModuleRegex = /\.module\.css$/;
const sassRegex = /\.(scss|sass)$/;
const sassModuleRegex = /\.module\.(scss|sass)$/;
// This is the production and development configuration.
// It is focused on developer experience, fast rebuilds, and a minimal bundle.
module.exports = function(webpackEnv) {
const isEnvDevelopment = webpackEnv === 'development';
const isEnvProduction = webpackEnv === 'production';
// Webpack uses `publicPath` to determine where the app is being served from.
// It requires a trailing slash, or the file assets will get an incorrect path.
// In development, we always serve from the root. This makes config easier.
const publicPath = isEnvProduction
? paths.servedPath
: isEnvDevelopment && '/';
// Some apps do not use client-side routing with pushState.
// For these, "homepage" can be set to "." to enable relative asset paths.
const shouldUseRelativeAssetPaths = publicPath === './';
// `publicUrl` is just like `publicPath`, but we will provide it to our app
// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
const publicUrl = isEnvProduction
? publicPath.slice(0, -1)
: isEnvDevelopment && '';
// Get environment variables to inject into our app.
const env = getClientEnvironment(publicUrl);
// common function to get style loaders
const getStyleLoaders = (cssOptions, preProcessor) => {
const loaders = [
isEnvDevelopment && require.resolve('style-loader'),
isEnvProduction && {
loader: MiniCssExtractPlugin.loader,
options: Object.assign(
{},
shouldUseRelativeAssetPaths ? { publicPath: '../../' } : undefined
),
},
{
loader: require.resolve('css-loader'),
options: cssOptions,
},
{
// Options for PostCSS as we reference these options twice
// Adds vendor prefixing based on your specified browser support in
// package.json
loader: require.resolve('postcss-loader'),
options: {
// Necessary for external CSS imports to work
// https://github.com/facebook/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
require('postcss-flexbugs-fixes'),
require('postcss-preset-env')({
autoprefixer: {
flexbox: 'no-2009',
},
stage: 3,
}),
],
sourceMap: isEnvProduction && shouldUseSourceMap,
},
},
].filter(Boolean);
if (preProcessor) {
loaders.push({
loader: require.resolve(preProcessor),
options: {
sourceMap: isEnvProduction && shouldUseSourceMap,
},
});
}
return loaders;
};
return {
mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
// Stop compilation early in production
bail: isEnvProduction,
devtool: isEnvProduction
? shouldUseSourceMap
? 'source-map'
: false
: isEnvDevelopment && 'cheap-module-source-map',
// These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle.
entry: [
// Include an alternative client for WebpackDevServer. A client's job is to
// connect to WebpackDevServer by a socket and get notified about changes.
// When you save a file, the client will either apply hot updates (in case
// of CSS changes), or refresh the page (in case of JS changes). When you
// make a syntax error, this client will display a syntax error overlay.
// Note: instead of the default WebpackDevServer client, we use a custom one
// to bring better experience for Create React App users. You can replace
// the line below with these two lines if you prefer the stock client:
// require.resolve('webpack-dev-server/client') + '?/',
// require.resolve('webpack/hot/dev-server'),
isEnvDevelopment &&
require.resolve('react-dev-utils/webpackHotDevClient'),
// Finally, this is your app's code:
paths.appIndexJs,
// We include the app code last so that if there is a runtime error during
// initialization, it doesn't blow up the WebpackDevServer client, and
// changing JS code would still trigger a refresh.
].filter(Boolean),
output: {
// The build folder.
path: isEnvProduction ? paths.appBuild : undefined,
// Add /* filename */ comments to generated require()s in the output.
pathinfo: isEnvDevelopment,
// There will be one main bundle, and one file per asynchronous chunk.
// In development, it does not produce real files.
filename: isEnvProduction
? 'static/js/[name].[contenthash:8].js'
: isEnvDevelopment && 'static/js/bundle.js',
// There are also additional JS chunk files if you use code splitting.
chunkFilename: isEnvProduction
? 'static/js/[name].[contenthash:8].chunk.js'
: isEnvDevelopment && 'static/js/[name].chunk.js',
// We inferred the "public path" (such as / or /my-project) from homepage.
// We use "/" in development.
publicPath: publicPath,
// Point sourcemap entries to original disk location (format as URL on Windows)
devtoolModuleFilenameTemplate: isEnvProduction
? info =>
path
.relative(paths.appSrc, info.absoluteResourcePath)
.replace(/\\/g, '/')
: isEnvDevelopment &&
(info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
},
optimization: {
minimize: isEnvProduction,
minimizer: [
// This is only used in production mode
new TerserPlugin({
terserOptions: {
parse: {
// we want terser to parse ecma 8 code. However, we don't want it
// to apply any minfication steps that turns valid ecma 5 code
// into invalid ecma 5 code. This is why the 'compress' and 'output'
// sections only apply transformations that are ecma 5 safe
// https://github.com/facebook/create-react-app/pull/4234
ecma: 8,
},
compress: {
ecma: 5,
warnings: false,
// Disabled because of an issue with Uglify breaking seemingly valid code:
// https://github.com/facebook/create-react-app/issues/2376
// Pending further investigation:
// https://github.com/mishoo/UglifyJS2/issues/2011
comparisons: false,
// Disabled because of an issue with Terser breaking valid code:
// https://github.com/facebook/create-react-app/issues/5250
// Pending futher investigation:
// https://github.com/terser-js/terser/issues/120
inline: 2,
},
mangle: {
safari10: true,
},
output: {
ecma: 5,
comments: false,
// Turned on because emoji and regex is not minified properly using default
// https://github.com/facebook/create-react-app/issues/2488
ascii_only: true,
},
},
// Use multi-process parallel running to improve the build speed
// Default number of concurrent runs: os.cpus().length - 1
parallel: true,
// Enable file caching
cache: true,
sourceMap: shouldUseSourceMap,
}),
// This is only used in production mode
new OptimizeCSSAssetsPlugin({
cssProcessorOptions: {
parser: safePostCssParser,
map: shouldUseSourceMap
? {
// `inline: false` forces the sourcemap to be output into a
// separate file
inline: false,
// `annotation: true` appends the sourceMappingURL to the end of
// the css file, helping the browser find the sourcemap
annotation: true,
}
: false,
},
}),
],
// Automatically split vendor and commons
// https://twitter.com/wSokra/status/969633336732905474
// https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
splitChunks: {
chunks: 'all',
name: false,
},
// Keep the runtime chunk separated to enable long term caching
// https://twitter.com/wSokra/status/969679223278505985
runtimeChunk: true,
},
resolve: {
// This allows you to set a fallback for where Webpack should look for modules.
// We placed these paths second because we want `node_modules` to "win"
// if there are any conflicts. This matches Node resolution mechanism.
// https://github.com/facebook/create-react-app/issues/253
modules: ['node_modules'].concat(
// It is guaranteed to exist because we tweak it in `env.js`
process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
),
// These are the reasonable defaults supported by the Node ecosystem.
// We also include JSX as a common component filename extension to support
// some tools, although we do not recommend using it, see:
// https://github.com/facebook/create-react-app/issues/290
// `web` extension prefixes have been added for better support
// for React Native Web.
extensions: paths.moduleFileExtensions
.map(ext => `.${ext}`)
.filter(ext => useTypeScript || !ext.includes('ts')),
alias: {
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
'react-native': 'react-native-web',
},
plugins: [
// Adds support for installing with Plug'n'Play, leading to faster installs and adding
// guards against forgotten dependencies and such.
PnpWebpackPlugin,
// Prevents users from importing files from outside of src/ (or node_modules/).
// This often causes confusion because we only process files within src/ with babel.
// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
// please link the files into your node_modules/ and let module-resolution kick in.
// Make sure your source files are compiled, as they will not be processed in any way.
// new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
],
},
resolveLoader: {
plugins: [
// Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
// from the current package.
PnpWebpackPlugin.moduleLoader(module),
],
},
module: {
strictExportPresence: true,
rules: [
// Disable require.ensure as it's not a standard language feature.
{ parser: { requireEnsure: false } },
// First, run the linter.
// It's important to do this before Babel processes the JS.
{
test: /\.(js|mjs|jsx)$/,
enforce: 'pre',
use: [
{
options: {
formatter: require.resolve('react-dev-utils/eslintFormatter'),
eslintPath: require.resolve('eslint'),
},
loader: require.resolve('eslint-loader'),
},
],
include: paths.appSrc,
},
{
// "oneOf" will traverse all following loaders until one will
// match the requirements. When no loader matches it will fall
// back to the "file" loader at the end of the loader list.
oneOf: [
// "url" loader works like "file" loader except that it embeds assets
// smaller than specified limit in bytes as data URLs to avoid requests.
// A missing `test` is equivalent to a match.
{
test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
loader: require.resolve('url-loader'),
options: {
limit: 10000,
name: 'static/media/[name].[hash:8].[ext]',
},
},
// Process application JS with Babel.
// The preset includes JSX, Flow, TypeScript, and some ESnext features.
{
test: /\.(js|mjs|jsx|ts|tsx)$/,
include: paths.appSrc,
loader: require.resolve('babel-loader'),
options: {
customize: require.resolve(
'babel-preset-react-app/webpack-overrides'
),
plugins: [
[
require.resolve('babel-plugin-named-asset-import'),
{
loaderMap: {
svg: {
ReactComponent: '@svgr/webpack?-svgo,+ref![path]',
},
},
},
],
],
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables caching results in ./node_modules/.cache/babel-loader/
// directory for faster rebuilds.
cacheDirectory: true,
cacheCompression: isEnvProduction,
compact: isEnvProduction,
},
},
// Process any JS outside of the app with Babel.
// Unlike the application JS, we only compile the standard ES features.
{
test: /\.(js|mjs)$/,
exclude: /@babel(?:\/|\\{1,2})runtime/,
loader: require.resolve('babel-loader'),
options: {
babelrc: false,
configFile: false,
compact: false,
presets: [
[
require.resolve('babel-preset-react-app/dependencies'),
{ helpers: true },
],
],
cacheDirectory: true,
cacheCompression: isEnvProduction,
// If an error happens in a package, it's possible to be
// because it was compiled. Thus, we don't want the browser
// debugger to show the original code. Instead, the code
// being evaluated would be much more helpful.
sourceMaps: false,
},
},
// "postcss" loader applies autoprefixer to our CSS.
// "css" loader resolves paths in CSS and adds assets as dependencies.
// "style" loader turns CSS into JS modules that inject <style> tags.
// In production, we use MiniCSSExtractPlugin to extract that CSS
// to a file, but in development "style" loader enables hot editing
// of CSS.
// By default we support CSS Modules with the extension .module.css
{
test: cssRegex,
exclude: cssModuleRegex,
use: getStyleLoaders({
importLoaders: 1,
sourceMap: isEnvProduction && shouldUseSourceMap,
}),
// Don't consider CSS imports dead code even if the
// containing package claims to have no side effects.
// Remove this when webpack adds a warning or an error for this.
// See https://github.com/webpack/webpack/issues/6571
sideEffects: true,
},
// Adds support for CSS Modules (https://github.com/css-modules/css-modules)
// using the extension .module.css
{
test: cssModuleRegex,
use: getStyleLoaders({
importLoaders: 1,
sourceMap: isEnvProduction && shouldUseSourceMap,
modules: true,
getLocalIdent: getCSSModuleLocalIdent,
}),
},
// Opt-in support for SASS (using .scss or .sass extensions).
// By default we support SASS Modules with the
// extensions .module.scss or .module.sass
{
test: sassRegex,
exclude: sassModuleRegex,
use: getStyleLoaders(
{
importLoaders: 2,
sourceMap: isEnvProduction && shouldUseSourceMap,
},
'sass-loader'
),
// Don't consider CSS imports dead code even if the
// containing package claims to have no side effects.
// Remove this when webpack adds a warning or an error for this.
// See https://github.com/webpack/webpack/issues/6571
sideEffects: true,
},
// Adds support for CSS Modules, but using SASS
// using the extension .module.scss or .module.sass
{
test: sassModuleRegex,
use: getStyleLoaders(
{
importLoaders: 2,
sourceMap: isEnvProduction && shouldUseSourceMap,
modules: true,
getLocalIdent: getCSSModuleLocalIdent,
},
'sass-loader'
),
},
// "file" loader makes sure those assets get served by WebpackDevServer.
// When you `import` an asset, you get its (virtual) filename.
// In production, they would get copied to the `build` folder.
// This loader doesn't use a "test" so it will catch all modules
// that fall through the other loaders.
{
loader: require.resolve('file-loader'),
// Exclude `js` files to keep "css" loader working as it injects
// its runtime that would otherwise be processed through "file" loader.
// Also exclude `html` and `json` extensions so they get processed
// by webpacks internal loaders.
exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
options: {
name: 'static/media/[name].[hash:8].[ext]',
},
},
// ** STOP ** Are you adding a new loader?
// Make sure to add the new loader(s) before the "file" loader.
],
},
],
},
plugins: [
// Generates an `index.html` file with the <script> injected.
new HtmlWebpackPlugin(
Object.assign(
{},
{
inject: true,
template: paths.appHtml,
},
isEnvProduction
? {
minify: {
removeComments: true,
collapseWhitespace: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true,
removeStyleLinkTypeAttributes: true,
keepClosingSlash: true,
minifyJS: true,
minifyCSS: true,
minifyURLs: true,
},
}
: undefined
)
),
// Inlines the webpack runtime script. This script is too small to warrant
// a network request.
isEnvProduction &&
shouldInlineRuntimeChunk &&
new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime~.+[.]js/]),
// Makes some environment variables available in index.html.
// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
// In production, it will be an empty string unless you specify "homepage"
// in `package.json`, in which case it will be the pathname of that URL.
// In development, this will be an empty string.
new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
// This gives some necessary context to module not found errors, such as
// the requesting resource.
new ModuleNotFoundPlugin(paths.appPath),
// Makes some environment variables available to the JS code, for example:
// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
// It is absolutely essential that NODE_ENV is set to production
// during a production build.
// Otherwise React will be compiled in the very slow development mode.
new webpack.DefinePlugin(env.stringified),
// This is necessary to emit hot updates (currently CSS only):
isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
// Watcher doesn't work well if you mistype casing in a path so we use
// a plugin that prints an error when you attempt to do this.
// See https://github.com/facebook/create-react-app/issues/240
isEnvDevelopment && new CaseSensitivePathsPlugin(),
// If you require a missing module and then `npm install` it, you still have
// to restart the development server for Webpack to discover it. This plugin
// makes the discovery automatic so you don't have to restart.
// See https://github.com/facebook/create-react-app/issues/186
isEnvDevelopment &&
new WatchMissingNodeModulesPlugin(paths.appNodeModules),
isEnvProduction &&
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// both options are optional
filename: 'static/css/[name].[contenthash:8].css',
chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
}),
// Generate a manifest file which contains a mapping of all asset filenames
// to their corresponding output file so that tools can pick it up without
// having to parse `index.html`.
new ManifestPlugin({
fileName: 'asset-manifest.json',
publicPath: publicPath,
}),
// Moment.js is an extremely popular library that bundles large locale files
// by default due to how Webpack interprets its code. This is a practical
// solution that requires the user to opt into importing specific locales.
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
// Generate a service worker script that will precache, and keep up to date,
// the HTML & assets that are part of the Webpack build.
isEnvProduction &&
new WorkboxWebpackPlugin.GenerateSW({
clientsClaim: true,
exclude: [/\.map$/, /asset-manifest\.json$/],
importWorkboxFrom: 'cdn',
navigateFallback: publicUrl + '/index.html',
navigateFallbackBlacklist: [
// Exclude URLs starting with /_, as they're likely an API call
new RegExp('^/_'),
// Exclude URLs containing a dot, as they're likely a resource in
// public/ and not a SPA route
new RegExp('/[^/]+\\.[^/]+$'),
],
}),
// TypeScript type checking
useTypeScript &&
new ForkTsCheckerWebpackPlugin({
typescript: resolve.sync('typescript', {
basedir: paths.appNodeModules,
}),
async: isEnvDevelopment,
useTypescriptIncrementalApi: true,
checkSyntacticErrors: true,
tsconfig: paths.appTsConfig,
reportFiles: [
'**',
'!**/*.json',
'!**/__tests__/**',
'!**/?(*.)(spec|test).*',
'!**/src/setupProxy.*',
'!**/src/setupTests.*',
],
watch: paths.appSrc,
silent: true,
// The formatter is invoked directly in WebpackDevServerUtils during development
formatter: isEnvProduction ? typescriptFormatter : undefined,
}),
].filter(Boolean),
// Some libraries import Node modules but don't use them in the browser.
// Tell Webpack to provide empty mocks for them so importing them works.
node: {
module: 'empty',
dgram: 'empty',
dns: 'mock',
fs: 'empty',
net: 'empty',
tls: 'empty',
child_process: 'empty',
},
// Turn off performance processing because we utilize
// our own hints via the FileSizeReporter
performance: false,
};
};

View File

@ -1,104 +0,0 @@
'use strict';
const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
const ignoredFiles = require('react-dev-utils/ignoredFiles');
const paths = require('./paths');
const fs = require('fs');
const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
const host = process.env.HOST || '0.0.0.0';
module.exports = function(proxy, allowedHost) {
return {
// WebpackDevServer 2.4.3 introduced a security fix that prevents remote
// websites from potentially accessing local content through DNS rebinding:
// https://github.com/webpack/webpack-dev-server/issues/887
// https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
// However, it made several existing use cases such as development in cloud
// environment or subdomains in development significantly more complicated:
// https://github.com/facebook/create-react-app/issues/2271
// https://github.com/facebook/create-react-app/issues/2233
// While we're investigating better solutions, for now we will take a
// compromise. Since our WDS configuration only serves files in the `public`
// folder we won't consider accessing them a vulnerability. However, if you
// use the `proxy` feature, it gets more dangerous because it can expose
// remote code execution vulnerabilities in backends like Django and Rails.
// So we will disable the host check normally, but enable it if you have
// specified the `proxy` setting. Finally, we let you override it if you
// really know what you're doing with a special environment variable.
disableHostCheck:
!proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
// Enable gzip compression of generated files.
compress: true,
// Silence WebpackDevServer's own logs since they're generally not useful.
// It will still show compile warnings and errors with this setting.
clientLogLevel: 'none',
// By default WebpackDevServer serves physical files from current directory
// in addition to all the virtual build products that it serves from memory.
// This is confusing because those files wont automatically be available in
// production build folder unless we copy them. However, copying the whole
// project directory is dangerous because we may expose sensitive files.
// Instead, we establish a convention that only files in `public` directory
// get served. Our build script will copy `public` into the `build` folder.
// In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
// In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
// Note that we only recommend to use `public` folder as an escape hatch
// for files like `favicon.ico`, `manifest.json`, and libraries that are
// for some reason broken when imported through Webpack. If you just want to
// use an image, put it in `src` and `import` it from JavaScript instead.
contentBase: paths.appPublic,
// By default files from `contentBase` will not trigger a page reload.
watchContentBase: true,
// Enable hot reloading server. It will provide /sockjs-node/ endpoint
// for the WebpackDevServer client so it can learn when the files were
// updated. The WebpackDevServer client is included as an entry point
// in the Webpack development configuration. Note that only changes
// to CSS are currently hot reloaded. JS changes will refresh the browser.
hot: true,
// It is important to tell WebpackDevServer to use the same "root" path
// as we specified in the config. In development, we always serve from /.
publicPath: '/',
// WebpackDevServer is noisy by default so we emit custom message instead
// by listening to the compiler events with `compiler.hooks[...].tap` calls above.
quiet: true,
// Reportedly, this avoids CPU overload on some systems.
// https://github.com/facebook/create-react-app/issues/293
// src/node_modules is not ignored to support absolute imports
// https://github.com/facebook/create-react-app/issues/1065
watchOptions: {
ignored: ignoredFiles(paths.appSrc),
},
// Enable HTTPS if the HTTPS environment variable is set to 'true'
https: protocol === 'https',
host,
overlay: false,
historyApiFallback: {
// Paths with dots should still use the history fallback.
// See https://github.com/facebook/create-react-app/issues/387.
disableDotRule: true,
},
public: allowedHost,
proxy,
before(app, server) {
if (fs.existsSync(paths.proxySetup)) {
// This registers user provided middleware for proxy reasons
require(paths.proxySetup)(app);
}
// This lets us fetch source contents from webpack for the error overlay
app.use(evalSourceMapMiddleware(server));
// This lets us open files from the runtime error overlay.
app.use(errorOverlayMiddleware());
// This service worker file is effectively a 'no-op' that will reset any
// previous service worker registered for the same host:port combination.
// We do this in development to avoid hitting the production cache if
// it used the same host and port.
// https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
app.use(noopServiceWorkerMiddleware());
},
};
};

File diff suppressed because it is too large Load Diff

View File

@ -1,125 +1,44 @@
{ {
"name": "webapp", "name": "redux-bluetooth-counter-webapp",
"version": "0.1.0", "version": "0.1.0",
"description": "Redux Bluetooth example: Counter webapp",
"private": true, "private": true,
"dependencies": {
"@babel/core": "7.2.2",
"@svgr/webpack": "4.1.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
"babel-jest": "23.6.0",
"babel-loader": "8.0.5",
"babel-plugin-named-asset-import": "^0.3.1",
"babel-preset-react-app": "^7.0.2",
"bfj": "6.1.1",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"css-loader": "1.0.0",
"dotenv": "6.0.0",
"dotenv-expand": "4.2.0",
"eslint": "5.12.0",
"eslint-config-react-app": "^3.0.8",
"eslint-loader": "2.1.1",
"eslint-plugin-flowtype": "2.50.1",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-plugin-react": "7.12.4",
"file-loader": "2.0.0",
"fs-extra": "7.0.1",
"gh-pages": "^2.0.1",
"html-webpack-plugin": "4.0.0-alpha.2",
"identity-obj-proxy": "3.0.0",
"jest": "23.6.0",
"jest-pnp-resolver": "1.0.2",
"jest-resolve": "23.6.0",
"jest-watch-typeahead": "^0.2.1",
"mini-css-extract-plugin": "0.5.0",
"optimize-css-assets-webpack-plugin": "5.0.1",
"pnp-webpack-plugin": "1.2.1",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-loader": "3.0.0",
"postcss-preset-env": "6.5.0",
"postcss-safe-parser": "4.0.1",
"predator-quotes": "^1.1.16",
"prop-types": "^15.7.2",
"react": "^16.8.5",
"react-app-polyfill": "^0.2.2",
"react-dev-utils": "^8.0.0",
"react-dom": "^16.8.5",
"react-redux": "^6.0.1",
"redux": "^4.0.1",
"redux-thunk": "^2.3.0",
"resolve": "1.10.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"terser-webpack-plugin": "1.2.2",
"url-loader": "1.1.2",
"webpack": "4.28.3",
"webpack-dev-server": "3.1.14",
"webpack-manifest-plugin": "2.0.4",
"workbox-webpack-plugin": "3.6.3"
},
"scripts": { "scripts": {
"start": "SKIP_PREFLIGHT_CHECK=true HTTPS=true node scripts/start.js", "start": "react-scripts start",
"build": "node scripts/build.js", "build": "react-scripts build",
"test": "node scripts/test.js" "test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"predeploy": "npm run build",
"deploy": "gh-pages -d build"
}, },
"eslintConfig": { "repository": {
"extends": "react-app" "type": "git",
"url": "git+ssh://git@github.com/jvallelunga/redux-bluetooth.git"
}, },
"browserslist": [ "keywords": [
">0.2%", "redux-bluetooth",
"not dead", "example",
"not ie <= 11", "counter",
"not op_mini all" "webapp"
], ],
"jest": { "author": "Jeronimo Vallelunga",
"collectCoverageFrom": [ "license": "ISC",
"src/**/*.{js,jsx,ts,tsx}", "bugs": {
"!src/**/*.d.ts" "url": "https://github.com/jvallelunga/redux-bluetooth/issues"
],
"resolver": "jest-pnp-resolver",
"setupFiles": [
"react-app-polyfill/jsdom"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testURL": "http://localhost",
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"moduleNameMapper": {
"^react-native$": "react-native-web",
"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
},
"moduleFileExtensions": [
"web.js",
"js",
"web.ts",
"ts",
"web.tsx",
"tsx",
"json",
"web.jsx",
"jsx",
"node"
],
"watchPlugins": [
"/Users/jvallelunga/Workspaces/Unicen/tesis/redux-bluetooth/example/webapp/node_modules/jest-watch-typeahead/filename.js",
"/Users/jvallelunga/Workspaces/Unicen/tesis/redux-bluetooth/example/webapp/node_modules/jest-watch-typeahead/testname.js"
]
}, },
"babel": { "homepage": "https://jvallelunga.github.io/redux-bluetooth",
"presets": [ "dependencies": {
"react-app" "predator-quotes": "^1.1.16",
] "prop-types": "^15.5.10",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-redux": "^5.0.5",
"redux": "^3.7.1",
"redux-bluetooth": "^0.1.1",
"redux-thunk": "^2.2.0"
},
"devDependencies": {
"gh-pages": "^1.0.0",
"react-scripts": "1.0.10"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,18 +1,15 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" /> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta <meta name="theme-color" content="#000000">
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<!-- <!--
manifest.json provides metadata used when your web app is installed on a manifest.json provides metadata used when your web app is added to the
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
@ -25,7 +22,9 @@
<title>React App</title> <title>React App</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div> <div id="root"></div>
<!-- <!--
This HTML file is a template. This HTML file is a template.

View File

@ -4,11 +4,11 @@
"icons": [ "icons": [
{ {
"src": "favicon.ico", "src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16", "sizes": "192x192",
"type": "image/x-icon" "type": "image/png"
} }
], ],
"start_url": ".", "start_url": "./index.html",
"display": "standalone", "display": "standalone",
"theme_color": "#000000", "theme_color": "#000000",
"background_color": "#ffffff" "background_color": "#ffffff"

View File

@ -1,192 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'production';
process.env.NODE_ENV = 'production';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const path = require('path');
const chalk = require('react-dev-utils/chalk');
const fs = require('fs-extra');
const webpack = require('webpack');
const bfj = require('bfj');
const configFactory = require('../config/webpack.config');
const paths = require('../config/paths');
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
const printBuildError = require('react-dev-utils/printBuildError');
const measureFileSizesBeforeBuild =
FileSizeReporter.measureFileSizesBeforeBuild;
const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
const useYarn = fs.existsSync(paths.yarnLockFile);
// These sizes are pretty large. We'll warn for bundles exceeding them.
const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
const isInteractive = process.stdout.isTTY;
// Warn and crash if required files are missing
if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
process.exit(1);
}
// Process CLI arguments
const argv = process.argv.slice(2);
const writeStatsJson = argv.indexOf('--stats') !== -1;
// Generate configuration
const config = configFactory('production');
// We require that you explicitly set browsers and do not fall back to
// browserslist defaults.
const { checkBrowsers } = require('react-dev-utils/browsersHelper');
checkBrowsers(paths.appPath, isInteractive)
.then(() => {
// First, read the current file sizes in build directory.
// This lets us display how much they changed later.
return measureFileSizesBeforeBuild(paths.appBuild);
})
.then(previousFileSizes => {
// Remove all content but keep the directory so that
// if you're in it, you don't end up in Trash
fs.emptyDirSync(paths.appBuild);
// Merge with the public folder
copyPublicFolder();
// Start the webpack build
return build(previousFileSizes);
})
.then(
({ stats, previousFileSizes, warnings }) => {
if (warnings.length) {
console.log(chalk.yellow('Compiled with warnings.\n'));
console.log(warnings.join('\n\n'));
console.log(
'\nSearch for the ' +
chalk.underline(chalk.yellow('keywords')) +
' to learn more about each warning.'
);
console.log(
'To ignore, add ' +
chalk.cyan('// eslint-disable-next-line') +
' to the line before.\n'
);
} else {
console.log(chalk.green('Compiled successfully.\n'));
}
console.log('File sizes after gzip:\n');
printFileSizesAfterBuild(
stats,
previousFileSizes,
paths.appBuild,
WARN_AFTER_BUNDLE_GZIP_SIZE,
WARN_AFTER_CHUNK_GZIP_SIZE
);
console.log();
const appPackage = require(paths.appPackageJson);
const publicUrl = paths.publicUrl;
const publicPath = config.output.publicPath;
const buildFolder = path.relative(process.cwd(), paths.appBuild);
printHostingInstructions(
appPackage,
publicUrl,
publicPath,
buildFolder,
useYarn
);
},
err => {
console.log(chalk.red('Failed to compile.\n'));
printBuildError(err);
process.exit(1);
}
)
.catch(err => {
if (err && err.message) {
console.log(err.message);
}
process.exit(1);
});
// Create the production build and print the deployment instructions.
function build(previousFileSizes) {
console.log('Creating an optimized production build...');
let compiler = webpack(config);
return new Promise((resolve, reject) => {
compiler.run((err, stats) => {
let messages;
if (err) {
if (!err.message) {
return reject(err);
}
messages = formatWebpackMessages({
errors: [err.message],
warnings: [],
});
} else {
messages = formatWebpackMessages(
stats.toJson({ all: false, warnings: true, errors: true })
);
}
if (messages.errors.length) {
// Only keep the first error. Others are often indicative
// of the same problem, but confuse the reader with noise.
if (messages.errors.length > 1) {
messages.errors.length = 1;
}
return reject(new Error(messages.errors.join('\n\n')));
}
if (
process.env.CI &&
(typeof process.env.CI !== 'string' ||
process.env.CI.toLowerCase() !== 'false') &&
messages.warnings.length
) {
console.log(
chalk.yellow(
'\nTreating warnings as errors because process.env.CI = true.\n' +
'Most CI servers set it automatically.\n'
)
);
return reject(new Error(messages.warnings.join('\n\n')));
}
const resolveArgs = {
stats,
previousFileSizes,
warnings: messages.warnings,
};
if (writeStatsJson) {
return bfj
.write(paths.appBuild + '/bundle-stats.json', stats.toJson())
.then(() => resolve(resolveArgs))
.catch(error => reject(new Error(error)));
}
return resolve(resolveArgs);
});
});
}
function copyPublicFolder() {
fs.copySync(paths.appPublic, paths.appBuild, {
dereference: true,
filter: file => file !== paths.appHtml,
});
}

View File

@ -1,132 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'development';
process.env.NODE_ENV = 'development';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const fs = require('fs');
const chalk = require('react-dev-utils/chalk');
const webpack = require('webpack');
const WebpackDevServer = require('webpack-dev-server');
const clearConsole = require('react-dev-utils/clearConsole');
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
const {
choosePort,
createCompiler,
prepareProxy,
prepareUrls,
} = require('react-dev-utils/WebpackDevServerUtils');
const openBrowser = require('react-dev-utils/openBrowser');
const paths = require('../config/paths');
const configFactory = require('../config/webpack.config');
const createDevServerConfig = require('../config/webpackDevServer.config');
const useYarn = fs.existsSync(paths.yarnLockFile);
const isInteractive = process.stdout.isTTY;
// Warn and crash if required files are missing
if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
process.exit(1);
}
// Tools like Cloud9 rely on this.
const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
const HOST = process.env.HOST || '0.0.0.0';
if (process.env.HOST) {
console.log(
chalk.cyan(
`Attempting to bind to HOST environment variable: ${chalk.yellow(
chalk.bold(process.env.HOST)
)}`
)
);
console.log(
`If this was unintentional, check that you haven't mistakenly set it in your shell.`
);
console.log(
`Learn more here: ${chalk.yellow('https://bit.ly/CRA-advanced-config')}`
);
console.log();
}
// We require that you explictly set browsers and do not fall back to
// browserslist defaults.
const { checkBrowsers } = require('react-dev-utils/browsersHelper');
checkBrowsers(paths.appPath, isInteractive)
.then(() => {
// We attempt to use the default port but if it is busy, we offer the user to
// run on a different port. `choosePort()` Promise resolves to the next free port.
return choosePort(HOST, DEFAULT_PORT);
})
.then(port => {
if (port == null) {
// We have not found a port.
return;
}
const config = configFactory('development');
const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
const appName = require(paths.appPackageJson).name;
const useTypeScript = fs.existsSync(paths.appTsConfig);
const urls = prepareUrls(protocol, HOST, port);
const devSocket = {
warnings: warnings =>
devServer.sockWrite(devServer.sockets, 'warnings', warnings),
errors: errors =>
devServer.sockWrite(devServer.sockets, 'errors', errors),
};
// Create a webpack compiler that is configured with custom messages.
const compiler = createCompiler({
appName,
config,
devSocket,
urls,
useYarn,
useTypeScript,
webpack,
});
// Load proxy config
const proxySetting = require(paths.appPackageJson).proxy;
const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
// Serve webpack assets generated by the compiler over a web server.
const serverConfig = createDevServerConfig(
proxyConfig,
urls.lanUrlForConfig
);
const devServer = new WebpackDevServer(compiler, serverConfig);
// Launch WebpackDevServer.
devServer.listen(port, HOST, err => {
if (err) {
return console.log(err);
}
if (isInteractive) {
clearConsole();
}
console.log(chalk.cyan('Starting the development server...\n'));
openBrowser(urls.localUrlForBrowser);
});
['SIGINT', 'SIGTERM'].forEach(function(sig) {
process.on(sig, function() {
devServer.close();
process.exit();
});
});
})
.catch(err => {
if (err && err.message) {
console.log(err.message);
}
process.exit(1);
});

View File

@ -1,60 +0,0 @@
'use strict';
// Do this as the first thing so that any code reading it knows the right env.
process.env.BABEL_ENV = 'test';
process.env.NODE_ENV = 'test';
process.env.PUBLIC_URL = '';
// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
process.on('unhandledRejection', err => {
throw err;
});
// Ensure environment variables are read.
require('../config/env');
const jest = require('jest');
const execSync = require('child_process').execSync;
let argv = process.argv.slice(2);
function isInGitRepository() {
try {
execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}
function isInMercurialRepository() {
try {
execSync('hg --cwd . root', { stdio: 'ignore' });
return true;
} catch (e) {
return false;
}
}
// Watch unless on CI, in coverage mode, explicitly adding `--no-watch`,
// or explicitly running all tests
if (
!process.env.CI &&
argv.indexOf('--coverage') === -1 &&
argv.indexOf('--no-watch') === -1 &&
argv.indexOf('--watchAll') === -1
) {
// https://github.com/facebook/create-react-app/issues/5210
const hasSourceControl = isInGitRepository() || isInMercurialRepository();
argv.push(hasSourceControl ? '--watch' : '--watchAll');
}
// Jest doesn't have this option so we'll remove it
if (argv.indexOf('--no-watch') !== -1) {
argv = argv.filter(arg => arg !== '--no-watch');
}
jest.run(argv);

View File

@ -16,9 +16,7 @@ export default class App extends PureComponent {
} }
render() { render() {
const { const { counter, quote, status, onIncrement, onDecrement } = this.props;
counter, quote, status, onIncrement, onDecrement,
} = this.props;
const nCounter = Number(counter); const nCounter = Number(counter);
let className = 'app-counter'; let className = 'app-counter';
@ -27,23 +25,25 @@ export default class App extends PureComponent {
return ( return (
<div className="app"> <div className="app">
{status === 'CONNECTED' && ( {status === 'CONNECTED' &&
<div> <div>
<span className={className}>{counter}</span> <span className={className}>{counter}</span>
<br /> <br />
<span>{quote}</span> <span>{quote}</span>
</div> </div>}
)}
<div className="app-actions"> <div className="app-actions">
{status !== 'CONNECTED' && ( {status !== 'CONNECTED' &&
<button type="button" className="app-actions__buton" onClick={this.handlerConnect}>Connect</button> <button className="app-actions__buton" onClick={this.handlerConnect}>
)} Connect
{status === 'CONNECTED' && ( </button>}
<button type="button" className="app-actions__buton" onClick={onIncrement}>+</button> {status === 'CONNECTED' &&
)} <button className="app-actions__buton" onClick={onIncrement}>
{status === 'CONNECTED' && ( +
<button type="button" className="app-actions__buton" onClick={onDecrement}>-</button> </button>}
)} {status === 'CONNECTED' &&
<button className="app-actions__buton" onClick={onDecrement}>
-
</button>}
</div> </div>
</div> </div>
); );

View File

@ -1,17 +1,14 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { actions } from '../../../../build/webapp'; import { actions } from 'redux-bluetooth/build/webapp';
import { increment, decrement } from '../actions'; import { increment, decrement } from '../actions';
import Component from './component'; import Component from './component';
const mapState = (state) => { const mapState = ({ status, store }) => ({
const { status, remote } = state; status,
return ({ ...store,
status, });
...remote,
});
};
const mapAction = { const mapAction = {
onConnect: actions.connectStore, onConnect: actions.connectStore,

View File

@ -2,9 +2,8 @@
import React from 'react'; import React from 'react';
import { render } from 'react-dom'; import { render } from 'react-dom';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
// import * as serviceWorker from './serviceWorker';
import { createSyncStore } from '../../../build/webapp'; import { createSyncStore } from 'redux-bluetooth/build/webapp';
import './index.css'; import './index.css';
import * as TYPES from './actions/types'; import * as TYPES from './actions/types';
@ -22,9 +21,3 @@ render(
document.getElementById('root'), document.getElementById('root'),
); );
/* eslint-enable */ /* eslint-enable */
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
// serviceWorker.unregister();

View File

@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
<g fill="#61DAFB">
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
<circle cx="420.9" cy="296.5" r="45.7"/>
<path d="M520.5 78.1z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -1,135 +0,0 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.1/8 is considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
);
});
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
);
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
};
})
.catch(error => {
console.error('Error during service worker registration:', error);
});
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl)
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
}
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
);
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready.then(registration => {
registration.unregister();
});
}
}

11424
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "redux-bluetooth", "name": "redux-bluetooth",
"version": "0.1.22", "version": "0.1.18",
"description": "Redux middleware to dispatch actions via bluetooth to a peripheral store", "description": "Redux middleware to dispatch actions via bluetooth to a peripheral store",
"main": "build/index.js", "main": "build/index.js",
"scripts": { "scripts": {
@ -11,15 +11,23 @@
"test": "jest --config .jest.json", "test": "jest --config .jest.json",
"test:watch": "npm test -- --watch", "test:watch": "npm test -- --watch",
"test:coverage": "npm test -- --coverage", "test:coverage": "npm test -- --coverage",
"test:coverage:codecov": "npm run test -- --coverage && codecov -t $CODECOV_TOKEN",
"prepublish": "npm run build", "prepublish": "npm run build",
"bundlesize": "webpack && bundlesize",
"prerelease": "npm run bundlesize",
"release": "np", "release": "np",
"example:install": "npm run example:peripheral:install && npm run example:webapp:install", "example:install": "npm run example:peripheral:install && npm run example:webapp:install",
"example:start": "npm run example:peripheral:start",
"example:deploy": "npm run example:webapp:deploy",
"example:webapp:install": "cd example/webapp && npm install", "example:webapp:install": "cd example/webapp && npm install",
"example:webapp:start": "cd example/webapp && npm run start", "example:webapp:build": "cd example/webapp && npm run build",
"example:webapp:deploy": "cd example/webapp && npm run deploy", "example:webapp:deploy": "cd example/webapp && npm run deploy",
"example:peripheral:install": "cd example/peripheral && npm install", "example:peripheral:install": "cd example/peripheral && npm install",
"example:peripheral:start": "cd example/peripheral && npm start" "example:peripheral:build": "cd example/peripheral && npm run build",
"example:peripheral:start": "cd example/peripheral && npm start",
"ci:test": "jest ./build/",
"ci:bundlesize": "npm run bundlesize",
"ci:report:coverage": "npm run ci:test -- --coverage && codecov -t $CODECOV_TOKEN",
"ci:example:build": "npm run example:webapp:install && npm run example:webapp:build"
}, },
"babel": { "babel": {
"presets": [ "presets": [
@ -45,22 +53,22 @@
"homepage": "https://github.com/jvallelunga/redux-bluetooth#readme", "homepage": "https://github.com/jvallelunga/redux-bluetooth#readme",
"devDependencies": { "devDependencies": {
"babel-cli": "^6.24.1", "babel-cli": "^6.24.1",
"babel-jest": "23.6.0", "babel-jest": "^20.0.3",
"babel-loader": "^8.0.5", "babel-loader": "^7.1.1",
"babel-preset-latest": "^6.24.1", "babel-preset-latest": "^6.24.1",
"bundlesize": "^0.11.2", "bundlesize": "^0.11.2",
"codecov": "^2.2.0", "codecov": "^2.2.0",
"eslint": "^5.15.3", "eslint": "^3.19.0",
"eslint-config-airbnb": "^17.1.0", "eslint-config-airbnb": "^15.0.2",
"eslint-plugin-import": "^2.16.0", "eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-react": "^7.12.4", "eslint-plugin-react": "^7.1.0",
"jest": "^23.6.0", "jest": "^20.0.4",
"np": "^2.16.0", "np": "^2.16.0",
"watch": "^1.0.2" "watch": "^1.0.2",
"webpack": "^3.4.1"
}, },
"dependencies": { "dependencies": {
"babel-jest": "^24.5.0",
"bleno": "^0.4.2", "bleno": "^0.4.2",
"redux": "^3.7.1", "redux": "^3.7.1",
"text-encoding": "^0.6.4" "text-encoding": "^0.6.4"

View File

@ -12,3 +12,4 @@ test('encode / decode', () => {
expect(result).toEqual(message); expect(result).toEqual(message);
}); });

View File

@ -11,8 +11,8 @@ export default function Characteristic(uuid, Parent, util, descriptor, { encode,
util.inherits(ReduxCharacteristic, Parent); util.inherits(ReduxCharacteristic, Parent);
ReduxCharacteristic.prototype.onWriteRequest = function ReduxCharacteristic.prototype.onWriteRequest =
(data, offset, withoutResponse, callback) { function (data, offset, withoutResponse, callback) {
if (offset) { if (offset) {
callback(this.RESULT_ATTR_NOT_LONG); callback(this.RESULT_ATTR_NOT_LONG);
return this.RESULT_ATTR_NOT_LONG; return this.RESULT_ATTR_NOT_LONG;
@ -21,7 +21,7 @@ export default function Characteristic(uuid, Parent, util, descriptor, { encode,
const buffer = decode(data); const buffer = decode(data);
const id = buffer.slice(0, 9); const id = buffer.slice(0, 9);
const chunk = buffer.slice(10, this.maxValueSize); const chunk = buffer.slice(10, this.maxValueSize);
const message = (this.messages[id] || '') + chunk; const message = ((this.messages[id] || '') + chunk);
if (message.startsWith('[[[') && message.endsWith(']]]')) { if (message.startsWith('[[[') && message.endsWith(']]]')) {
const action = JSON.parse(message.slice(3, message.length - 3)); const action = JSON.parse(message.slice(3, message.length - 3));
this.onAction(action); this.onAction(action);
@ -39,7 +39,9 @@ export default function Characteristic(uuid, Parent, util, descriptor, { encode,
callback(this.RESULT_ATTR_NOT_LONG, null); callback(this.RESULT_ATTR_NOT_LONG, null);
return; return;
} }
const configuration = encode(`|||${JSON.stringify(this.configuration)}|||`); const configuration = encode(
`|||${JSON.stringify(this.configuration)}|||`,
);
callback(this.RESULT_SUCCESS, configuration); callback(this.RESULT_SUCCESS, configuration);
}; };

View File

@ -26,18 +26,8 @@ export default function Actions(central, TYPES) {
}, },
}); });
const disconnectStore = () => ({
type: TYPES.BLUETOOTH_DISCONNECT_REQUEST,
request: (dispatch) => {
dispatch({ type: TYPES.BLUETOOTH_DISCONNECTING });
central.disconnect();
dispatch({ type: TYPES.BLUETOOTH_DISCONNECTED });
},
});
return { return {
connectStore, connectStore,
disconnectStore,
syncState, syncState,
sendAction, sendAction,
}; };

View File

@ -1,13 +1,10 @@
export const BLUETOOTH_CONNECTING = '@@bluetooth/CONNECTING'; export const BLUETOOTH_CONNECTING = '@@bluetooth/CONNECTING';
export const BLUETOOTH_CONNECTED = '@@bluetooth/CONNECTED'; export const BLUETOOTH_CONNECTED = '@@bluetooth/CONNECTED';
export const BLUETOOTH_DISCONNECTING = '@@bluetooth/DISCONNECTING';
export const BLUETOOTH_DISCONNECTED = '@@bluetooth/DISCONNECTED';
export const BLUETOOTH_ERROR = '@@bluetooth/ERROR'; export const BLUETOOTH_ERROR = '@@bluetooth/ERROR';
export const BLUETOOTH_READ = '@@bluetooth/READ'; export const BLUETOOTH_READ = '@@bluetooth/READ';
export const BLUETOOTH_SYNC = '@@bluetooth/SYNC'; export const BLUETOOTH_SYNC = '@@bluetooth/SYNC';
export const BLUETOOTH_SEND = '@@bluetooth/SEND'; export const BLUETOOTH_SEND = '@@bluetooth/SEND';
export const BLUETOOTH_CONNECT_REQUEST = '@@bluetooth/CONNECT_REQUEST'; export const BLUETOOTH_CONNECT_REQUEST = '@@bluetooth/CONNECT_REQUEST';
export const BLUETOOTH_DISCONNECT_REQUEST = '@@bluetooth/DISCONNECT_REQUEST';
export const BLUETOOTH_SEND_REQUEST = '@@bluetooth/SEND_REQUEST'; export const BLUETOOTH_SEND_REQUEST = '@@bluetooth/SEND_REQUEST';
export const BLUETOOTH_SYNC_REQUEST = '@@bluetooth/SYNC_REQUEST'; export const BLUETOOTH_SYNC_REQUEST = '@@bluetooth/SYNC_REQUEST';

View File

@ -2,42 +2,30 @@ export default function Central(
id, id,
bluetooth, bluetooth,
{ encode, decode }, { encode, decode },
{ SERVICE_UUID, CHARACTERISTIC_UUID }, { SERVICE_UUID, CHARACTERISTIC_UUID }) {
) {
const state = { const state = {
server: null, server: null,
characteristic: null, characteristic: null,
message: '', message: '',
configuration: { configuration: {
limit: 20, // HARDCODE: https://devzone.nordicsemi.com/question/3860/largest-allowed-setting-for-variable-length-characteristic/ limit: 20,
}, },
id, id,
}; };
const isConnected = () => state.server && state.server.connected;
const connect = name => bluetooth const connect = name => bluetooth
.requestDevice({ .requestDevice({
filters: [{ services: [SERVICE_UUID], name }], filters: [{ services: [SERVICE_UUID], name }],
}) })
.then((device) => { .then(device => device.gatt.connect())
state.device = device; .then((server) => {
return device.gatt.connect(); state.server = server;
}) return server.getPrimaryService(SERVICE_UUID);
.then((server) => { })
state.server = server; .then(service => service.getCharacteristic(CHARACTERISTIC_UUID))
return server.getPrimaryService(SERVICE_UUID); .then((characteristic) => {
}) state.characteristic = characteristic;
.then(service => service.getCharacteristic(CHARACTERISTIC_UUID)) });
.then((characteristic) => {
state.characteristic = characteristic;
});
const disconnect = () => {
if (isConnected()) {
state.device.gatt.disconnect();
}
};
const listener = callback => (event) => { const listener = callback => (event) => {
const chunk = decode(event.target.value); const chunk = decode(event.target.value);
@ -58,6 +46,10 @@ export default function Central(
.then(() => { .then(() => {
const eventListener = listener(callback); const eventListener = listener(callback);
state.characteristic.addEventListener('characteristicvaluechanged', eventListener); state.characteristic.addEventListener('characteristicvaluechanged', eventListener);
return state.characteristic.readValue();
}).then((data) => {
const configuration = decode(data);
state.configuration = JSON.parse(configuration.slice(3, configuration.length - 3));
return state.configuration; return state.configuration;
}); });
@ -84,15 +76,14 @@ export default function Central(
} while (i < message.length); } while (i < message.length);
// Serialize Promises // Serialize Promises
return writes.reduce((promise, chunk) => promise return writes.reduce((promise, chunk) =>
.then(() => state.characteristic.writeValue(chunk)), promise.then(() => state.characteristic.writeValue(chunk)),
Promise.resolve()); Promise.resolve());
}; };
return { return {
connected: isConnected(), connected: state.server && state.server.connected,
connect, connect,
disconnect,
handler, handler,
write, write,
listener, listener,

View File

@ -60,14 +60,15 @@ test('Central: connect', () => {
test('Central: handler', () => { test('Central: handler', () => {
const callback = jest.fn(); const callback = jest.fn();
expect.assertions(3); expect.assertions(4);
const promise = central.connect('mockName').then(() => central.handler(callback)) const promise = central.connect('mockName').then(() => central.handler(callback))
.then((configuration) => { .then((configuration) => {
expect(configuration).toEqual({ limit: 20 }); expect(configuration).toEqual({ mockDecode: 'mockDecode' });
expect(characteristic.startNotifications).toBeCalled(); expect(characteristic.startNotifications).toBeCalled();
return true; expect(characteristic.readValue).toBeCalled();
}); return true;
});
return expect(promise).resolves.toBe(true); return expect(promise).resolves.toBe(true);
}); });
@ -80,13 +81,13 @@ test('Central: listener - chunk message', () => {
central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG); central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG);
const promise = central.connect('mockName') const promise = central.connect('mockName')
.then(() => { .then(() => {
const listener = central.listener(callback); const listener = central.listener(callback);
const message = listener({ target: { value: 'mockEvent' } }); const message = listener({ target: { value: 'mockEvent' } });
expect(callback).not.toBeCalled(); expect(callback).not.toBeCalled();
expect(message).toEqual('{"mockDecode":"mockDecode"}'); expect(message).toEqual('{"mockDecode":"mockDecode"}');
return true; return true;
}); });
return expect(promise).resolves.toBe(true); return expect(promise).resolves.toBe(true);
}); });
@ -99,13 +100,13 @@ test('Central: listener - complete message', () => {
central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG); central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG);
const promise = central.connect('mockName') const promise = central.connect('mockName')
.then(() => { .then(() => {
const listener = central.listener(callback); const listener = central.listener(callback);
const message = listener({ target: { value: 'mockEvent' } }); const message = listener({ target: { value: 'mockEvent' } });
expect(callback).toBeCalledWith({ mockDecode: 'mockDecode' }); expect(callback).toBeCalledWith({ mockDecode: 'mockDecode' });
expect(message).toEqual(''); expect(message).toEqual('');
return true; return true;
}); });
return expect(promise).resolves.toBe(true); return expect(promise).resolves.toBe(true);
}); });
@ -118,13 +119,13 @@ test('Central: listener - internal message', () => {
central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG); central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG);
const promise = central.connect('mockName') const promise = central.connect('mockName')
.then(() => { .then(() => {
const listener = central.listener(callback); const listener = central.listener(callback);
const message = listener({ target: { value: 'mockEvent' } }); const message = listener({ target: { value: 'mockEvent' } });
expect(callback).not.toBeCalled(); expect(callback).not.toBeCalled();
expect(message).toEqual(''); expect(message).toEqual('');
return true; return true;
}); });
return expect(promise).resolves.toBe(true); return expect(promise).resolves.toBe(true);
}); });
@ -136,14 +137,13 @@ test('Central: write - empty message', () => {
central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG); central = new Central(123, bluetooth, encoder, CENTRAL_CONFIG);
const promise = central.connect('mockName') const promise = central.connect('mockName')
.then(() => central.write({ type: 'ACTION' })) .then(() => central.write({ type: 'ACTION' }))
.then(() => { .then(() => {
expect(characteristic.writeValue) expect(characteristic.writeValue)
.toBeCalledWith( .toBeCalledWith(new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]));
new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]), return true;
); });
return true;
});
return expect(promise).resolves.toBe(true); return expect(promise).resolves.toBe(true);
}); });

View File

@ -2,14 +2,14 @@ import * as TYPES from './actions/types';
import * as STATUS from './central/status'; import * as STATUS from './central/status';
import ACTIONS from './actions'; import ACTIONS from './actions';
import MIDDLEWARE from './middleware'; import MIDDLEWARE from './middleware';
import * as REDUCERS from './reducers'; import REDUCERS from './reducers';
import STORE from './store'; import STORE from './store';
const { connectStore, disconnectStore } = ACTIONS; const { connectStore } = ACTIONS;
export const types = TYPES; export const types = TYPES;
export const status = STATUS; export const status = STATUS;
export const actions = { connectStore, disconnectStore }; export const actions = { connectStore };
export const reducers = REDUCERS; export const reducers = REDUCERS;
export const middleware = MIDDLEWARE; export const middleware = MIDDLEWARE;
export const createSyncStore = STORE; export const createSyncStore = STORE;

View File

@ -5,13 +5,11 @@ const { sendAction } = ACTIONS;
const { const {
BLUETOOTH_CONNECT_REQUEST, BLUETOOTH_CONNECT_REQUEST,
BLUETOOTH_DISCONNECT_REQUEST,
BLUETOOTH_SEND_REQUEST, BLUETOOTH_SEND_REQUEST,
} = TYPES; } = TYPES;
const REQUESTS = [ const REQUESTS = [
BLUETOOTH_CONNECT_REQUEST, BLUETOOTH_CONNECT_REQUEST,
BLUETOOTH_DISCONNECT_REQUEST,
BLUETOOTH_SEND_REQUEST, BLUETOOTH_SEND_REQUEST,
]; ];

View File

@ -3,26 +3,15 @@ import * as STATUS from '../central/status';
import initial from './initial'; import initial from './initial';
export function status(state = initial.status, { type }) { export default (autosync = true) => (state = initial, { type, payload }) => {
switch (type) { switch (type) {
case TYPES.BLUETOOTH_CONNECTING: case TYPES.BLUETOOTH_CONNECTING:
return STATUS.CONNECTING; return Object.assign({}, state, { status: STATUS.CONNECTING });
case TYPES.BLUETOOTH_CONNECTED: case TYPES.BLUETOOTH_CONNECTED:
return STATUS.CONNECTED; return Object.assign({}, state, { status: STATUS.CONNECTED });
case TYPES.BLUETOOTH_DISCONNECTING:
return STATUS.DISCONNECTING;
case TYPES.BLUETOOTH_DISCONNECTED:
return STATUS.DISCONNECTED;
default:
return state;
}
}
export function remote(state = null, { type, payload }) {
switch (type) {
case TYPES.BLUETOOTH_SYNC: case TYPES.BLUETOOTH_SYNC:
return payload; return autosync ? Object.assign({}, state, { store: payload }) : state;
default: default:
return state; return state;
} }
} };

View File

@ -57,3 +57,4 @@ test('type: BLUETOOTH_SYNC, autosync: false', () => {
return expect(nextState).toEqual({ }); return expect(nextState).toEqual({ });
}); });

View File

@ -1,12 +1,10 @@
/* global window */ /* global window */
import { import { createStore, applyMiddleware, compose } from 'redux';
createStore, combineReducers, applyMiddleware, compose,
} from 'redux';
import middleware from '../middleware'; import middleware from '../middleware';
import { status, remote } from '../reducers'; import reducers from '../reducers';
export default (actions, reducer = () => true) => { export default (actions) => {
const middlewares = [middleware(actions)]; const middlewares = [middleware(actions)];
const enhancers = [applyMiddleware(...middlewares)]; const enhancers = [applyMiddleware(...middlewares)];
@ -16,12 +14,5 @@ export default (actions, reducer = () => true) => {
} }
/* eslint-enable */ /* eslint-enable */
return createStore( return createStore(reducers(), compose(...enhancers));
combineReducers({
status,
remote,
local: reducer,
}),
compose(...enhancers),
);
}; };

31
webpack.config.js Normal file
View File

@ -0,0 +1,31 @@
const path = require('path');
const webpack = require('webpack');
module.exports = {
entry: './src/webapp/index.js',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'redux-bluetooth.webapp.js',
},
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel-loader',
query: {
presets: ['latest'],
},
},
],
},
stats: {
colors: true,
},
plugins: [
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: true,
},
}),
],
};