Comparing version 0.0.1 to 0.0.2
@@ -44,8 +44,8 @@ { | ||
"cmdhDefaults": 2050, | ||
"CmdhDefEcValues": 2051, | ||
"cmdhDefEcValues": 2051, | ||
"cmdhDefEcParamsValues": 2052, | ||
"CmdhLimits": 2053, | ||
"CmdhNetworkAccessRules": 2054, | ||
"CmdhNwAccessRule": 2055, | ||
"CmdhBuffer": 2056, | ||
"cmdhLimits": 2053, | ||
"cmdhNetworkAccessRules": 2054, | ||
"cmdhNwAccessRule": 2055, | ||
"cmdhBuffer": 2056, | ||
"digitalInput": 3200, | ||
@@ -162,3 +162,3 @@ "digitalOutput": 3201, | ||
"ACL": 2, | ||
"accessControlOwner": 3 | ||
"ACLOwner": 3 | ||
}, | ||
@@ -165,0 +165,0 @@ "device": { |
30
index.js
@@ -14,4 +14,3 @@ 'use strict'; | ||
SpecificRid: {}, | ||
SpecificResrc: {}, | ||
specificResrcChar: _defs.specificResrcChar | ||
SpecificResrcChar: _defs.specificResrcChar | ||
}; | ||
@@ -42,6 +41,7 @@ | ||
if (typeof oidNumber === 'number') | ||
if (!isNaN(oidNumber)) | ||
oid = oidNumber; | ||
oidItem = this.Oid.get(oid); | ||
return oidItem; | ||
@@ -55,3 +55,5 @@ }; | ||
if (this.Oid.get(key)) | ||
throw new Error(`oid: ${key} conflicts.`); | ||
throw new Error(`oid: ${key} name conflicts.`); | ||
else if (this.Oid.get(items[key])) | ||
throw new Error(`oid: ${key} value conflicts.`); | ||
else | ||
@@ -69,2 +71,3 @@ _oid[key] = items[key]; | ||
var oidItem = this.getOid(oid), | ||
ridNumber, | ||
ridItem, | ||
@@ -81,2 +84,6 @@ oidKey; | ||
ridNumber = parseInt(rid); | ||
if (!isNaN(ridNumber)) | ||
rid = ridNumber; | ||
if (typeof oid !== 'undefined') { // searching in MDEFS.RIDOFOID | ||
@@ -101,7 +108,8 @@ if (typeof rid === 'undefined') | ||
for (var key in items) { | ||
if (this.UniqueRid.get(key)) { | ||
throw new Error(`unique rid: ${key} conflicts.`); | ||
} else { | ||
if (this.UniqueRid.get(key)) | ||
throw new Error(`unique rid: ${key} name conflicts.`); | ||
else if (this.UniqueRid.get(items[key])) | ||
throw new Error(`unique rid: ${key} value conflicts.`); | ||
else | ||
_uRid[key] = items[key]; | ||
} | ||
} | ||
@@ -129,4 +137,5 @@ | ||
for (var key in items) { | ||
if (typeof _spfRid[oidKey][key] !== undefined) | ||
if (typeof _spfRid[oidKey][key] !== 'undefined') { | ||
throw new Error(`rid: ${key} within oid: ${oidKey} conflicts.`); | ||
} | ||
@@ -148,3 +157,3 @@ _spfRid[oidKey][key] = items[key]; | ||
if (oidItem) { | ||
characteristic = DEFS.SpecificResrc[oidItem.key]; | ||
characteristic = DEFS.SpecificResrcChar[oidItem.key]; | ||
if (ridItem) | ||
@@ -187,3 +196,2 @@ characteristic = characteristic[ridItem.key]; | ||
/*************************************************************************************************/ | ||
@@ -190,0 +198,0 @@ /*** Private Functions ***/ |
{ | ||
"name": "lwm2m-id", | ||
"version": "0.0.1", | ||
"description": "ipso id definition of lwm2m", | ||
"version": "0.0.2", | ||
"description": "lwm2m-id is a module that implements a dictionary of ip-based smart object(IPSO) identfiers defined by lwm2m spec.", | ||
"main": "index.js", | ||
@@ -25,3 +25,6 @@ "scripts": { | ||
"enum": "^2.2.0" | ||
}, | ||
"devDependencies": { | ||
"should": "^7.1.1" | ||
} | ||
} |
64421
7
1272
1