0.0.3: rebuilt based on new APIs

Author: guo-yu

.gitignore

@@ -46,29 +46,6 @@ wifi.token(function(err,result){
 
 可以使用类似上方那样的`token`这类快捷方法，也可以使用下方的API：
 
-与用户相关的API：
-````javascript
-// 登录
-wifi.user.signin({
-    body: {
-        username: '123',
-        password: '123'
-    }
-},function(err,result){
-    console.log(result);
-});
-
-// 登出
-wifi.user.signout({
-    body: {
-        token: 123
-    }
-},function(err,result){
-    // console.log result token
-    console.log(result) 
-});
-````
-
 与设备相关的API：
 
 ````javascript

.npmignore

@@ -7,42 +7,4 @@
 // @brief: the sdk and package manager of wifi.io based on Node.js
 // @author: [turingou](http://guoyu.me)
 
-var sdk = require('sdk'),
-    apis = require('./apis'),
-    led = require('./modules/led'),
-    dht11 = require('./modules/dht11'),
-    rgb = require('./modules/rgb'),
-    camera = require('./modules/camera');
-
-var Wifi = function(params) {
-    this.account = params;
-    this.server = 'http://api.wifi.io';
-    Wifi.prototype.user = new sdk(apis.user, this);
-    Wifi.prototype.device = new sdk(apis.device, this);
-    Wifi.prototype.data = new sdk(apis.data, this);
-};
-
-// shotcut method to fetch token
-Wifi.prototype.token = function(callback) {
-    var self = this;
-    self.user.signin({
-        body: self.account
-    },function(err, result){
-        if (result.body && result.body.token && result.body.token != '') self.token = result.body.token;
-        callback(err, result.body);
-    })
-}
-
-// shotcut method to store device id
-Wifi.prototype.connect = function(id) {
-    if (id && typeof(id) == 'number') this.did = id;
-    return this;
-}
-
-// load modules
-Wifi.prototype.led = led;
-Wifi.prototype.dht11 = dht11;
-Wifi.prototype.rgb = rgb;
-Wifi.prototype.camera = camera;
-
-module.exports = Wifi;
+module.exports = require('./libs/wifi');

README.en.md

@@ -0,0 +1,24 @@
+module.exports = {
+    device: {
+        get: {
+            url: '/device/{{did}}'
+        },
+        post: {
+            method: 'post',
+            url: '/device/{{did}}'
+        },
+        exec: {
+            method: 'post',
+            url: '/device/{{did}}/{{action}}'
+        }
+    },
+    data: {
+        get: {
+            url: '/data/{{key}}'
+        },
+        post: {
+            method: 'post',
+            url: '/data'
+        }
+    }
+}

README.md

@@ -0,0 +1,24 @@
+// define callbacks
+var errorMap = {
+    '0': '接口调用正常，没有错误发生',
+    '-101': 'appkey无效',
+    '-102': '访问权限不足',
+    '-103': '访问频率超过了限制',
+    '-201': '要访问的设备没有回应',
+    '-202': '要访问的设备当前不在线',
+    '-203': '设备执行过程中发生了错误',
+    '-301': '访问超时',
+    '-302': '数据库操作失败',
+    '-303': '未找到相应的数据内容',
+    '-304': '服务器发生了内部错误',
+    '-401': '请求的参数格式不合法'
+};
+
+exports = module.exports = function(callback) {
+    return function(err, result) {
+        if (err) return callback(err);
+        var results = result.body;
+        if (results.error < 0) return callback(new Error(errorMap(results.error)));
+        return callback(results);
+    }
+}

apis.js

@@ -0,0 +1,27 @@
+// extends from basic api instance
+var cb = require('./callback');
+
+exports = module.exports = function(data, wifi) {
+    
+    var self = data,
+        key = wifi.key;
+
+    // shorthand of fetch
+    data.fetch = function(params, callback) {
+        var query = { body:{}};
+        if (typeof(params) === 'string') query.key = params;
+        if (typeof(params) === 'object') query.body = params;
+        query.body.appkey = key;
+        self.get(query, cb(callback));
+    };
+
+    // shorthand of create
+    data.create = function(params, callback) {
+        var body = params;
+        body.appkey = key;
+        self.post({
+            body: body
+        }, cb(callback));
+    };
+
+};

index.js

@@ -0,0 +1,71 @@
+// extends from basic api instance
+var cb = require('./callback');
+
+exports = module.exports = function(device, wifi) {
+    
+    var self = device,
+        key = wifi.key;
+
+    // shorthand of list
+    device.list = function(params, callback) {
+        var body = params;
+        body.appkey = key;
+        self.get({
+            query: body
+        }, cb(callback));
+    };
+
+    // shorthand of fetch
+    device.fetch = function(did, callback) {
+        var body = {};
+        body.appkey = key;
+        self.get({
+            did: did,
+            query: body
+        }, cb(callback));
+    };
+
+    // shorthand of bind
+    device.bind = function(did, params, callback) {
+        var body = params;
+        body.appkey = key;
+        self.post({
+            did: did,
+            body: body
+        }, cb(callback));
+    };
+
+    // shorthand of notify
+    device.notify = function(did, params, callback) {
+        var body = params;
+        body.appkey = key;
+        self.exec({
+            action: 'notify',
+            did: did,
+            body: body
+        }, cb(callback));
+    };
+
+    // shorthand of command
+    device.command = function(did, params, callback) {
+        var body = params;
+        body.appkey = key;
+        self.exec({
+            action: 'command',
+            did: did,
+            body: body
+        }, cb(callback));
+    };
+
+    // shorthand of unbind
+    device.unbind = function(did, callback) {
+        var body = {};
+        body.appkey = key;
+        self.exec({
+            action: 'unbind',
+            did: did,
+            body: body
+        }, cb(callback));
+    };
+
+};

libs/apis.js

@@ -0,0 +1,25 @@
+var sdk = require('sdk'),
+    apis = require('./apis'),
+    device = require('./device'),
+    data = require('./data');
+
+var Wifi = function(key) {
+    this.key = key;
+    this.server = 'http://api.wifi.io';
+    Wifi.prototype.device = device(new sdk(apis.device, this), this);
+    Wifi.prototype.data = data(new sdk(apis.data, this), this);
+};
+
+// shorthand to store device id
+Wifi.prototype.connect = function(id) {
+    if (id && !isNaN(parseInt(did))) this.did = id;
+    return this;
+};
+
+// load modules
+Wifi.prototype.led = require('../modules/led');
+Wifi.prototype.dht11 = require('../modules/dht11');
+Wifi.prototype.rgb = require('../modules/rgb');
+Wifi.prototype.camera = require('../modules/camera');
+
+exports = module.exports = Wifi;

libs/callback.js

@@ -1,11 +1,5 @@
 module.exports = function(params, callback) {
-    var self = this;
-    self.device.exec({
-        body: {
-            token: self.token ? self.token : params.token,
-            did: self.did ? self.did : params.did,
-            method: 'camera.shot',
-            params: {}
-        }
-    }, callback);
-}
+    if (!this.did) return callback(new Error('deviceID required'));
+    params.method = 'camera.shot';
+    this.device.command(this.did, params, callback);
+};

libs/data.js

@@ -1,13 +1,7 @@
 module.exports = function(params, callback) {
-    var self = this,
-        cb = (!callback && typeof(params) == 'function') ? params : callback,
+    if (!this.did) return callback(new Error('deviceID required'));
+    var cb = (!callback && typeof(params) == 'function') ? params : callback,
         params = (typeof(params) == 'object') ? params : {};
-    self.device.exec({
-        body: {
-            token: self.token ? self.token : params.token,
-            did: self.did ? self.did : params.did,
-            method: 'dht11.read',
-            params: {}
-        }
-    }, cb);
+    params.method = 'dht11.read';
+    this.device.command(this.did, params, cb);
 }

libs/device.js

@@ -1,14 +1,11 @@
+var defaults = {
+    OutPP: [1, 2],
+    Toggle: [1, 2]
+};
+
 module.exports = function(params, callback) {
-    var self = this;
-    self.device.exec({
-        body: {
-            token: self.token ? self.token : params.token,
-            did: self.did ? self.did : params.did,
-            method: 'wifiIO.io_op',
-            params: {
-                OutPP:[1,2],
-                Toggle:[1,2]
-            }
-        }
-    }, callback);
+    if (!this.did) return callback(new Error('deviceID required'));
+    params.method = 'wifiIO.io_op';
+    params.params = params.params ? params.params : defaults;
+    this.device.command(this.did, params, callback);
 }

libs/wifi.js

@@ -1,15 +1,12 @@
+var defaults = {
+    r: 88,
+    g: 12,
+    b: 99
+};
+
 module.exports = function(params, callback) {
-    var self = this;
-    self.device.exec({
-        body: {
-            token: self.token ? self.token : params.token,
-            did: self.did ? self.did : params.did,
-            method: 'rgb.pwm',
-            params: {
-                r: params.r ? params.r : 88,
-                g: params.g ? params.g : 12,
-                b: params.b ? params.b : 99
-            }
-        }
-    }, callback);
-}
+    if (!this.did) return callback(new Error('deviceID required'));
+    params.method = 'rgb.pwm';
+    params.params = params.params ? params.params : defaults;
+    this.device.command(this.did, params, callback);
+};