mist-api - npm Package Compare versions

Comparing version 0.0.13 to 0.0.15

index.js

@@ -75,13 +75,13 @@
 
-                    //console.log("the answer is:", inspect(msg, { colors: true, depth: 10 }));
+                    //console.log("the answer is:", require('util').inspect(msg, { colors: true, depth: 10 }));
 
-                    if(typeof self.sandbox.requests[id] === 'function') {
+                    if(typeof self.requests[id] === 'function') {
                         if (msg.err) {
-                            self.sandbox.requests[id](true, { code: msg.code, msg: msg.msg });
+                            self.requests[id](true, { code: msg.code, msg: msg.msg });
                         } else {
-                            self.sandbox.requests[id](null, msg.data);
+                            self.requests[id](null, msg.data);
                         }
 
                         if(!msg.sig) {
-                            delete self.sandbox.requests[id];
+                            delete self.requests[id];
                         }
@@ -200,8 +200,15 @@ }
 
-function Sandboxed(mist) {
+function Sandboxed(mist, sandboxId) {
     if (!mist || !mist.opts || !mist.opts.type === 2) {
-        throw new Error('Sandbox constructor parameter must be Mist of type 2.');
+        throw new Error('Sandbox constructor parameter 1 must be Mist of type 2.');
     }
-    this.requests = {};
+    
+    if ( !Buffer.isBuffer(sandboxId) || sandboxId.length !== 32 ) {
+        console.log("sandboxId:", sandboxId);
+        throw new Error('Sandbox constructor parameter 2 must be Buffer(len:32).');
+    }
+    
     this.api = mist.api;
+    this.sandboxId = sandboxId;
+    this.mist = mist;
     mist.registerSandbox(this);
@@ -212,6 +219,7 @@ }
     var id = ++sharedId;
-    var request = { op: op, args: args, id: id };
+    var sandboxArgs = [this.sandboxId].concat(args);
+    var request = { op: 'sandboxed.'+op, args: sandboxArgs, id: id };
     
-    // store callback for response
-    this.requests[id] = cb;
+    // store callback for response in the mist object
+    this.mist.requests[id] = cb;
     
@@ -224,4 +232,7 @@ this.api.sendToAddon('sandboxed', 1, BSON.serialize(request));
 Sandboxed.prototype.requestCancel = function(id) {
-    var request = { cancel: id };
+    var self = this;
+    var request = { cancel: id, sandbox: this.sandboxId };
     
+    setTimeout(function() { if(self.mist.requests[id]) { delete self.mist.requests[id]; } }, 500);
+    
     this.api.sendToAddon('sandboxed', 1, BSON.serialize(request));
@@ -228,0 +239,0 @@ };

package.json

 {
   "name": "mist-api",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Mist API wrapper for node. Used for accessing all Mist APIs.",
@@ -24,4 +24,4 @@ "main": "index.js",
   "devDependencies": {
-    "mocha": "3.1.2"
+    "mocha": "3.2.0"
   }
 }

README.md

@@ -50,6 +50,4 @@ # Mist API
     }
-}
+};
 
-;
-
 // callback for write commands sent to this device
@@ -56,0 +54,0 @@ mist.write(function(endpoint, value) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

181

increased by4.62%

Worsened metrics

Total package byte prevSize

152355

decreased by-15.62%

Number of lines in readme file

83

decreased by-2.35%

No dependency changes