Eslint: airbnb configuration
This commit is contained in:
parent
7c047f8231
commit
9981a25367
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"extends": "airbnb",
|
||||
"rules": {
|
||||
"func-names": ["error", "never"]
|
||||
}
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
import { createStore } from 'redux';
|
||||
import { startPeripheral } from 'redux-bluetooth/build/peripheral';
|
||||
import startPeripheral from 'redux-bluetooth/build/peripheral';
|
||||
|
||||
import reducer from './reducer';
|
||||
|
||||
let store = createStore(reducer);
|
||||
const store = createStore(reducer);
|
||||
|
||||
startPeripheral('Counter', store);
|
|
@ -1,13 +1,13 @@
|
|||
export default function counter(state = 0, { type }) {
|
||||
console.log('Counter: ---------------------------');
|
||||
console.log(type)
|
||||
console.log(state)
|
||||
console.log(type);
|
||||
console.log(state);
|
||||
switch (type) {
|
||||
case 'INCREMENT':
|
||||
return state + 1
|
||||
return state + 1;
|
||||
case 'DECREMENT':
|
||||
return state - 1
|
||||
return state - 1;
|
||||
default:
|
||||
return state
|
||||
return state;
|
||||
}
|
||||
}
|
|
@ -16,32 +16,32 @@ export default class App extends PureComponent {
|
|||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
store, status,
|
||||
onIncrement, onDecrement
|
||||
} = this.props;
|
||||
const { store, status, onIncrement, onDecrement } = this.props;
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
|
||||
{ (status === 'CONNECTED') &&
|
||||
<div className="app-counter">{store}</div>
|
||||
}
|
||||
{status === 'CONNECTED' &&
|
||||
<div className="app-counter">
|
||||
{store}
|
||||
</div>}
|
||||
<div className="app-actions">
|
||||
{ (status !== 'CONNECTED') &&
|
||||
<button className="app-actions__buton" onClick={this.handlerConnect}>Connect</button>
|
||||
}
|
||||
{ (status === 'CONNECTED') &&
|
||||
<button className="app-actions__buton" onClick={onIncrement}>+</button>
|
||||
}
|
||||
{ (status === 'CONNECTED') &&
|
||||
<button className="app-actions__buton" onClick={onDecrement}>-</button>
|
||||
}
|
||||
{status !== 'CONNECTED' &&
|
||||
<button className="app-actions__buton" onClick={this.handlerConnect}>
|
||||
Connect
|
||||
</button>}
|
||||
{status === 'CONNECTED' &&
|
||||
<button className="app-actions__buton" onClick={onIncrement}>
|
||||
+
|
||||
</button>}
|
||||
{status === 'CONNECTED' &&
|
||||
<button className="app-actions__buton" onClick={onDecrement}>
|
||||
-
|
||||
</button>}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
App.propTypes = {
|
||||
store: PropTypes.number,
|
||||
|
@ -52,6 +52,8 @@ App.propTypes = {
|
|||
};
|
||||
|
||||
App.defaultProps = {
|
||||
store: 0,
|
||||
status: '',
|
||||
onConnect: () => true,
|
||||
onIncrement: () => true,
|
||||
onDecrement: () => true,
|
|
@ -5,9 +5,7 @@ import { increment, decrement } from '../actions';
|
|||
|
||||
import Component from './component';
|
||||
|
||||
const mapState = (state) => {
|
||||
return state;
|
||||
}
|
||||
const mapState = state => state;
|
||||
|
||||
const mapAction = {
|
||||
onConnect: actions.connectStore,
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* global document */
|
||||
import React from 'react';
|
||||
import { render } from 'react-dom';
|
||||
import { Provider } from 'react-redux';
|
||||
|
@ -11,11 +12,12 @@ import App from './app';
|
|||
|
||||
const ACTIONS = Object.keys(TYPES);
|
||||
|
||||
/* eslint-disable react/jsx-filename-extension */
|
||||
const store = createSyncStore(ACTIONS);
|
||||
render(
|
||||
<Provider store={store}>
|
||||
<App />
|
||||
</Provider>,
|
||||
document.getElementById('root')
|
||||
document.getElementById('root'),
|
||||
);
|
||||
|
||||
/* eslint-enable */
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
"main": "build/index.js",
|
||||
"scripts": {
|
||||
"dev": "watch 'npm run build' src",
|
||||
"eslint": "eslint src",
|
||||
"prebuild": "npm run eslint",
|
||||
"build": "babel src -d build",
|
||||
"test": "jest",
|
||||
"test:watch": "npm test -- --watch",
|
||||
|
@ -39,12 +41,19 @@
|
|||
"devDependencies": {
|
||||
"babel-cli": "^6.24.1",
|
||||
"babel-preset-latest": "^6.24.1",
|
||||
"eslint": "^3.19.0",
|
||||
"eslint-config-airbnb": "^15.0.2",
|
||||
"eslint-plugin-import": "^2.7.0",
|
||||
"eslint-plugin-jsx-a11y": "^5.1.1",
|
||||
"eslint-plugin-react": "^7.1.0",
|
||||
"jest": "^20.0.4",
|
||||
"np": "^2.16.0",
|
||||
"watch": "^1.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"bleno": "^0.4.2",
|
||||
"redux": "^3.7.1",
|
||||
"redux-thunk": "^2.2.0",
|
||||
"text-encoding": "^0.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
const CONFIG = {
|
||||
SERVICE_UUID: '13333333-3333-3333-3333-333333333337',
|
||||
CHARACTERISTIC_UUID: '13333333-3333-3333-3333-333333330001'
|
||||
CHARACTERISTIC_UUID: '13333333-3333-3333-3333-333333330001',
|
||||
};
|
||||
|
||||
export const CENTRAL_CONFIG = CONFIG;
|
||||
export const BLENO_CONFIG = {
|
||||
SERVICE_UUID: CONFIG.SERVICE_UUID.replace(/-/g, ''),
|
||||
CHARACTERISTIC_UUID: CONFIG.CHARACTERISTIC_UUID.replace(/-/g, ''),
|
||||
DESCRIPTOR_UUID: '2901'
|
||||
DESCRIPTOR_UUID: '2901',
|
||||
};
|
|
@ -5,13 +5,13 @@ export default function Encoder({ TextEncoder, TextDecoder}) {
|
|||
const encode = (json) => {
|
||||
const string = JSON.stringify(json);
|
||||
return encoder.encode(string);
|
||||
}
|
||||
};
|
||||
|
||||
const decode = (data) => {
|
||||
const string = decoder.decode(data);
|
||||
const json = JSON.parse(string);
|
||||
return typeof json === 'string' ? JSON.parse(json) : json;
|
||||
}
|
||||
};
|
||||
|
||||
return { encode, decode };
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
/* global test, expect */
|
||||
import TextEncoding from 'text-encoding';
|
||||
|
||||
import Encoder from '.';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import * as peripheral from './peripheral';
|
||||
import peripheral from './peripheral';
|
||||
import * as webapp from './webapp';
|
||||
|
||||
export default { peripheral, webapp };
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
export default function Characteristic(
|
||||
uuid,
|
||||
Parent,
|
||||
util,
|
||||
descriptor,
|
||||
{ encode, decode } ) {
|
||||
|
||||
export default function Characteristic(uuid, Parent, util, descriptor, { encode, decode }) {
|
||||
function ReduxCharacteristic() {
|
||||
Parent.call(this, {
|
||||
uuid,
|
||||
properties: ['read', 'write', 'notify'],
|
||||
descriptors: [ descriptor ]
|
||||
descriptors: [descriptor],
|
||||
});
|
||||
|
||||
this.store = null;
|
||||
|
@ -25,19 +19,20 @@ export default function Characteristic(
|
|||
this.updateValueCallback(encode(state));
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
ReduxCharacteristic.prototype.disconnect = function () {
|
||||
this.store = null;
|
||||
}
|
||||
};
|
||||
|
||||
ReduxCharacteristic.prototype.onWriteRequest = function(data, offset, withoutResponse, callback) {
|
||||
ReduxCharacteristic.prototype.onWriteRequest =
|
||||
function (data, offset, withoutResponse, callback) {
|
||||
if (offset) {
|
||||
callback(this.RESULT_ATTR_NOT_LONG);
|
||||
return;
|
||||
}
|
||||
|
||||
this.store && this.store.dispatch(decode(data));
|
||||
if (this.store) this.store.dispatch(decode(data));
|
||||
|
||||
callback(this.RESULT_SUCCESS);
|
||||
};
|
||||
|
@ -57,11 +52,11 @@ export default function Characteristic(
|
|||
|
||||
ReduxCharacteristic.prototype.onSubscribe = function (maxValueSize, updateValueCallback) {
|
||||
this.updateValueCallback = updateValueCallback;
|
||||
}
|
||||
};
|
||||
|
||||
ReduxCharacteristic.prototype.onUnsubscribe = function () {
|
||||
this.updateValueCallback = null;
|
||||
}
|
||||
};
|
||||
|
||||
return new ReduxCharacteristic();
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
import util from 'util';
|
||||
import bleno from 'bleno';
|
||||
import BLENO from 'bleno';
|
||||
import TextEncoding from 'text-encoding';
|
||||
|
||||
import { BLENO_CONFIG } from '../../common/config';
|
||||
|
@ -7,36 +7,26 @@ import Encoder from '../../common/encoder';
|
|||
|
||||
import Service from './service';
|
||||
import Characteristic from './characteristic';
|
||||
import Descriptor from './Descriptor';
|
||||
import Descriptor from './descriptor';
|
||||
|
||||
export function Bleno(
|
||||
bleno,
|
||||
encoder,
|
||||
{ SERVICE_UUID, CHARACTERISTIC_UUID, DESCRIPTOR_UUID }) {
|
||||
|
||||
const descriptor = Descriptor(
|
||||
DESCRIPTOR_UUID,
|
||||
bleno.Descriptor
|
||||
);
|
||||
export function Bleno(bleno, encoder, { SERVICE_UUID, CHARACTERISTIC_UUID, DESCRIPTOR_UUID }) {
|
||||
const descriptor = Descriptor(DESCRIPTOR_UUID, bleno.Descriptor);
|
||||
|
||||
const characteristic = Characteristic(
|
||||
CHARACTERISTIC_UUID,
|
||||
bleno.Characteristic,
|
||||
util,
|
||||
descriptor,
|
||||
encoder);
|
||||
encoder,
|
||||
);
|
||||
|
||||
const service = Service(
|
||||
SERVICE_UUID,
|
||||
bleno.PrimaryService,
|
||||
util,
|
||||
characteristic);
|
||||
const service = Service(SERVICE_UUID, bleno.PrimaryService, util, characteristic);
|
||||
|
||||
const start = (name, store) => {
|
||||
bleno.on('stateChange', function(state) {
|
||||
bleno.on('stateChange', (state) => {
|
||||
if (state === 'poweredOn') {
|
||||
bleno.startAdvertising(name, [SERVICE_UUID], function(err) {
|
||||
err && console.log('startAdvertising.err: ', err);
|
||||
bleno.startAdvertising(name, [SERVICE_UUID], (err) => {
|
||||
if (err) console.log('startAdvertising.err: ', err);
|
||||
});
|
||||
} else {
|
||||
bleno.stopAdvertising();
|
||||
|
@ -44,19 +34,15 @@ export function Bleno(
|
|||
}
|
||||
});
|
||||
|
||||
bleno.on('advertisingStart', function(err) {
|
||||
bleno.on('advertisingStart', (err) => {
|
||||
if (!err) {
|
||||
bleno.setServices([service]);
|
||||
characteristic.connect(store);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return { start };
|
||||
}
|
||||
|
||||
export default new Bleno(
|
||||
bleno,
|
||||
Encoder(TextEncoding),
|
||||
BLENO_CONFIG
|
||||
);
|
||||
export default new Bleno(BLENO, Encoder(TextEncoding), BLENO_CONFIG);
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
export default function Service(
|
||||
uuid,
|
||||
Parent,
|
||||
util,
|
||||
characteristic) {
|
||||
|
||||
export default function Service(uuid, Parent, util, characteristic) {
|
||||
function ReduxService() {
|
||||
Parent.call(this, {
|
||||
uuid,
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
import bleno from './bleno';
|
||||
|
||||
export const startPeripheral = (name, store) => bleno.start(name, store);
|
||||
export default (name, store) => bleno.start(name, store);
|
||||
|
|
|
@ -1,31 +1,26 @@
|
|||
export default function Actions(central, TYPES) {
|
||||
|
||||
const syncState = (state) => ({
|
||||
const syncState = state => ({
|
||||
type: TYPES.BLUETOOTH_SYNC,
|
||||
payload: state
|
||||
payload: state,
|
||||
});
|
||||
|
||||
const connectStore = (name) => dispatch => {
|
||||
const syncStore = () => dispatch => central.read().then(state => dispatch(syncState(state)));
|
||||
|
||||
const connectStore = name => (dispatch) => {
|
||||
dispatch({ type: TYPES.BLUETOOTH_CONNECTING });
|
||||
return central.connect(name)
|
||||
.then(() => central.handler((state) => dispatch(syncState(state))))
|
||||
return central
|
||||
.connect(name)
|
||||
.then(() => central.handler(state => dispatch(syncState(state))))
|
||||
.then(() => dispatch({ type: TYPES.BLUETOOTH_CONNECTED }))
|
||||
.then(() => dispatch(syncStore()));
|
||||
};
|
||||
|
||||
const syncStore = () => dispatch => {
|
||||
return central.read()
|
||||
.then(state => dispatch(syncState(state)));
|
||||
};
|
||||
|
||||
const sendAction = (action) => _ => {
|
||||
return central.write(action);
|
||||
};
|
||||
const sendAction = action => () => central.write(action);
|
||||
|
||||
return {
|
||||
connectStore,
|
||||
syncStore,
|
||||
syncState,
|
||||
sendAction,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* global jest, beforeEach, afterEach, test, expect */
|
||||
import * as TYPES from './types';
|
||||
import Actions from './actions';
|
||||
|
||||
|
@ -25,7 +26,7 @@ test('syncState', () => {
|
|||
|
||||
expect(action).toEqual({
|
||||
type: TYPES.BLUETOOTH_SYNC,
|
||||
payload: 'mockState'
|
||||
payload: 'mockState',
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -33,7 +34,7 @@ test('connectStore', () => {
|
|||
const { connectStore } = Actions(central, TYPES);
|
||||
expect.assertions(6);
|
||||
|
||||
const promise = connectStore('mockName')(dispatch).then(_ => {
|
||||
const promise = connectStore('mockName')(dispatch).then(() => {
|
||||
expect(central.connect).toBeCalled();
|
||||
expect(central.handler).toBeCalled();
|
||||
|
||||
|
@ -51,7 +52,7 @@ test('syncStore', () => {
|
|||
const { syncStore } = Actions(central, TYPES);
|
||||
expect.assertions(3);
|
||||
|
||||
const promise = syncStore()(dispatch).then(_ => {
|
||||
const promise = syncStore()(dispatch).then(() => {
|
||||
expect(central.read).toBeCalled();
|
||||
expect(dispatch).toBeCalledWith({ type: TYPES.BLUETOOTH_SYNC, payload: 'mockState' });
|
||||
|
||||
|
@ -65,7 +66,7 @@ test('sendAction', () => {
|
|||
const { sendAction } = Actions(central, TYPES);
|
||||
expect.assertions(2);
|
||||
|
||||
const promise = sendAction('mockAction')(dispatch).then(_ => {
|
||||
const promise = sendAction('mockAction')(dispatch).then(() => {
|
||||
expect(central.write).toBeCalledWith('mockAction');
|
||||
|
||||
return true;
|
||||
|
|
|
@ -1,69 +1,59 @@
|
|||
import { CENTRAL_CONFIG } from '../../common/config';
|
||||
import Encoder from '../../common/encoder';
|
||||
|
||||
export function Central(
|
||||
bluetooth,
|
||||
{ encode, decode },
|
||||
{ SERVICE_UUID, CHARACTERISTIC_UUID }) {
|
||||
|
||||
export function Central(bluetooth, { encode, decode }, { SERVICE_UUID, CHARACTERISTIC_UUID }) {
|
||||
const state = {
|
||||
server: null,
|
||||
characteristic: null,
|
||||
}
|
||||
};
|
||||
|
||||
const connect = (name) => {
|
||||
return bluetooth.requestDevice({
|
||||
filters: [{ services: [ SERVICE_UUID ], name: name }]
|
||||
const connect = name => bluetooth
|
||||
.requestDevice({
|
||||
filters: [{ services: [SERVICE_UUID], name }],
|
||||
})
|
||||
.then((device) => device.gatt.connect())
|
||||
.then(device => device.gatt.connect())
|
||||
.then((server) => {
|
||||
state.server = server;
|
||||
return server.getPrimaryService(SERVICE_UUID)
|
||||
return server.getPrimaryService(SERVICE_UUID);
|
||||
})
|
||||
.then((service) => service.getCharacteristic(CHARACTERISTIC_UUID))
|
||||
.then(service => service.getCharacteristic(CHARACTERISTIC_UUID))
|
||||
.then((characteristic) => {
|
||||
state.characteristic = characteristic;
|
||||
});
|
||||
};
|
||||
|
||||
const handler = ( callback ) => {
|
||||
return state.characteristic.startNotifications()
|
||||
.then(() => {
|
||||
const handler = callback => state.characteristic.startNotifications().then(() => {
|
||||
state.characteristic.addEventListener('characteristicvaluechanged', (event) => {
|
||||
callback(decode(event.target.value));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
const read = () => {
|
||||
if (state.server && state.server.connected && state.characteristic) {
|
||||
return state.characteristic.readValue().then(data => {
|
||||
return decode(data);
|
||||
});
|
||||
return state.characteristic.readValue().then(data => decode(data));
|
||||
}
|
||||
return Promise.reject(new Error('Bluetooth: Not Connected'));
|
||||
}
|
||||
};
|
||||
|
||||
const write = (action) => {
|
||||
if ( state.server && state.server.connected && state.characteristic ) {
|
||||
if (!state.server || !state.server.connected || !state.characteristic) return null;
|
||||
const stringify = JSON.stringify(action);
|
||||
const serialized = encode(stringify);
|
||||
|
||||
return state.characteristic.writeValue(serialized);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
connected: state.server && state.server.connected,
|
||||
connect,
|
||||
handler,
|
||||
read,
|
||||
write
|
||||
}
|
||||
write,
|
||||
};
|
||||
}
|
||||
|
||||
/* global navigator TextEncoder TextDecoder */
|
||||
export default new Central(
|
||||
navigator.bluetooth,
|
||||
Encoder({ TextEncoder, TextDecoder }),
|
||||
CENTRAL_CONFIG
|
||||
CENTRAL_CONFIG,
|
||||
);
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
import actions from '../actions';
|
||||
const { sendAction } = actions;
|
||||
import ACTIONS from '../actions';
|
||||
|
||||
export default (actions = []) => store => next => action => {
|
||||
const { sendAction } = ACTIONS;
|
||||
|
||||
export default (actions = []) => store => next => (action) => {
|
||||
const { type } = action;
|
||||
actions.includes(type) && store.dispatch(sendAction(action));
|
||||
if (actions.includes(type)) store.dispatch(sendAction(action));
|
||||
return next(action);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@ import * as TYPES from '../actions/types';
|
|||
import * as STATUS from '../central/status';
|
||||
|
||||
const initial = {
|
||||
status: STATUS.INIT
|
||||
status: STATUS.INIT,
|
||||
};
|
||||
|
||||
export default (autosync = true) => (state = initial, { type, payload }) => {
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/* global window */
|
||||
import { createStore, applyMiddleware, compose } from 'redux';
|
||||
import thunk from 'redux-thunk';
|
||||
|
||||
|
@ -5,20 +6,14 @@ import middleware from '../middleware';
|
|||
import reducers from '../reducers';
|
||||
|
||||
export default (actions) => {
|
||||
const middlewares = [
|
||||
middleware(actions),
|
||||
thunk
|
||||
];
|
||||
const enhancers = [
|
||||
applyMiddleware(...middlewares),
|
||||
];
|
||||
const middlewares = [middleware(actions), thunk];
|
||||
const enhancers = [applyMiddleware(...middlewares)];
|
||||
|
||||
/* eslint-disable no-underscore-dangle */
|
||||
if (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION__) {
|
||||
enhancers.push(window.__REDUX_DEVTOOLS_EXTENSION__());
|
||||
}
|
||||
/* eslint-enable */
|
||||
|
||||
return createStore(
|
||||
reducers(),
|
||||
compose(...enhancers),
|
||||
);
|
||||
}
|
||||
return createStore(reducers(), compose(...enhancers));
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue