osactl - npm Package Compare versions

Comparing version 0.0.6 to 0.0.7

lib/api/clients.js

@@ -191,3 +191,3 @@ 'use strict';
 
-  call(name, args) {
+  call(name, parameters) {
     const credentials = this.credentials,
@@ -202,3 +202,3 @@ headers = this._client.options.headers;
 
-    return super.call(name, [_util2.default.isObject(args) ? args : {}]).catch(error => {
+    return super.call(name, [_util2.default.isObject(parameters) ? parameters : {}]).catch(error => {
       const body = error.body;
@@ -231,7 +231,7 @@
 
-  call(prefix, name, ...args) {
+  call(prefix, name, ...parameters) {
     const execParams = {
       Server: prefix,
       Method: name,
-      Params: args
+      Params: parameters
     },
@@ -238,0 +238,0 @@ credentials = this.credentials;

lib/host/host.js

@@ -12,6 +12,2 @@ 'use strict';
 
-var _scp = require('scp2');
-
-var _scp2 = _interopRequireDefault(_scp);
-
 var _util = require('../util/util.js');
@@ -18,0 +14,0 @@

lib/osa/ctl.js

@@ -29,2 +29,6 @@ 'use strict';
 
+var _entity = require('./entity.js');
+
+var _entity2 = _interopRequireDefault(_entity);
+
 var _credentials = require('../util/credentials.js');
@@ -83,3 +87,3 @@
     this._builder = new _seleniumWebdriver2.default.Builder().forBrowser(DEFAULTS.BROWSER).usingServer(DEFAULTS.HUB_URL);
-    this.oaAPI = new Proxy(function (name, parameters) {
+    this.oaAPI = new Proxy((name, parameters) => {
       this._assertOAAPI();
@@ -89,3 +93,3 @@
     }, {
-      _parent: this,
+      _osa: this,
 
@@ -97,19 +101,19 @@ get(target, key) {
 
-        this._parent._assertOAAPI();
+        this._osa._assertOAAPI();
 
-        return Reflect.get(this._parent._oaAPI, key);
+        return Reflect.get(this._osa._oaAPI, key);
       },
 
       set(target, property, value) {
-        this._parent._assertOAAPI();
+        this._osa._assertOAAPI();
 
-        return Reflect.set(this._parent._oaAPI, property, value);
+        return Reflect.set(this._osa._oaAPI, property, value);
       }
     });
-    this.baAPI = new Proxy(function (name, parameters) {
+    this.baAPI = new Proxy((prefix, name, ...parameters) => {
       this._assertBAAPI();
 
-      return this._baAPI.call(name, parameters);
+      return this._baAPI.call(prefix, name, ...parameters);
     }, {
-      _parent: this,
+      _osa: this,
 
@@ -121,11 +125,11 @@ get(target, key) {
 
-        this._parent._assertBAAPI();
+        this._osa._assertBAAPI();
 
-        return Reflect.get(this._parent._baAPI, key);
+        return Reflect.get(this._osa._baAPI, key);
       },
 
       set(target, property, value) {
-        this._parent._assertBAAPI();
+        this._osa._assertBAAPI();
 
-        return Reflect.set(this._parent._baAPI, property, value);
+        return Reflect.set(this._osa._baAPI, property, value);
       }
@@ -206,12 +210,6 @@ });
 
-  _updateApscURLOnce(url) {
-    if (_util2.default.isNull(this.apscURL)) {
-      this.apscURL = url;
-    }
-  }
-
   getAPSToken(parameters) {
     const tokenPromise = _token2.default.fromAPI(this, parameters);
 
-    tokenPromise.then(({ controllerURL }) => this._updateApscURLOnce(controllerURL));
+    tokenPromise.then(({ controllerURL }) => this.apscURL = controllerURL);
 
@@ -241,3 +239,3 @@ return tokenPromise;
               return authorization.update().then(token => {
-                this._updateApscURLOnce(token.controllerURL);
+                this.apscURL = token.controllerURL;
 
@@ -250,3 +248,3 @@ return new _session2.default(token.controllerURL, token);
           } else {
-            this._updateApscURLOnce(authorization.controllerURL);
+            this.apscURL = authorization.controllerURL;
             url = authorization.controllerURL;
@@ -260,3 +258,3 @@ }
           return this.getAPSToken(authorization).then(token => {
-            this._updateApscURLOnce(token.controllerURL);
+            this.apscURL = token.controllerURL;
 
@@ -418,5 +416,6 @@ return new _session2.default(token.controllerURL, token);
   CP_URL: Symbol('OSACtl._ENTITY_TYPES.CP_URL'),
-  APPLICATION: _application2.default
+  APPLICATION: _application2.default,
+  ENTITY: _entity2.default
 };
 OSACtl.APSTOKEN_TYPES = _token2.default.TYPES;
 exports.default = OSACtl;

lib/osa/entity.js

@@ -20,2 +20,3 @@ 'use strict';
     this._osa = osa;
+    osa._addEntity(this.constructor, this, this);
   }
@@ -22,0 +23,0 @@

package.json

 {
   "name": "osactl",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Odin Automation control framework",
@@ -10,3 +10,3 @@ "main": "./lib/main.js",
     "request": "^2.81.0",
-    "scp2": "^0.5.0",
+    "request-promise": "^4.2.0",
     "selenium-webdriver": "^3.3.0",
@@ -13,0 +13,0 @@ "ssh2": "^0.5.4",

No alert changes

Worsened metrics

Total package byte prevSize

74217

decreased by-0.55%

Number of package files

27

decreased by-3.57%

Lines of code

1859

decreased by-0.75%

Dependency changes

• + Addedrequest-promise@^4.2.0

• + Addedlodash@4.17.21(transitive)

• + Addedrequest-promise@4.2.6(transitive)

• + Addedrequest-promise-core@1.1.4(transitive)

• + Addedstealthy-require@1.1.1(transitive)

• - Removedscp2@^0.5.0

• - Removedasync@0.9.2(transitive)

• - Removedglob@7.0.6(transitive)

• - Removedisarray@0.0.1(transitive)

• - Removedlodash@4.11.2(transitive)

• - Removedreadable-stream@1.0.34(transitive)

• - Removedscp2@0.5.0(transitive)

• - Removedssh2@0.4.15(transitive)

• - Removedssh2-streams@0.0.23(transitive)

• - Removedstring_decoder@0.10.31(transitive)