@zondax/zemu - npm Package Compare versions

Comparing version 0.11.2 to 0.11.3

dist/emuContainer/index.js

@@ -87,5 +87,5 @@ "use strict";
 
-                  var app_filename = path.basename(_this.elfLocalPath);
-                  var app_dir = path.dirname(_this.elfLocalPath);
-                  var dirBindings = ["".concat(app_dir, ":").concat(DEFAULT_APP_PATH)];
+                  var appFilename = path.basename(_this.elfLocalPath);
+                  var appDir = path.dirname(_this.elfLocalPath);
+                  var dirBindings = ["".concat(appDir, ":").concat(DEFAULT_APP_PATH)];
                   var libArgs = "";
@@ -97,4 +97,4 @@ Object.entries(_this.libElfs).forEach(function (_ref) {
 
-                    var lib_filename = path.basename(libPath);
-                    libArgs += " -l ".concat(libName, ":").concat(DEFAULT_APP_PATH, "/").concat(lib_filename);
+                    var libFilename = path.basename(libPath);
+                    libArgs += " -l ".concat(libName, ":").concat(DEFAULT_APP_PATH, "/").concat(libFilename);
                   });
@@ -120,3 +120,3 @@ var displaySetting = "--display headless";
 
-                  var command = "/home/zondax/speculos/speculos.py --color LAGOON_BLUE ".concat(displaySetting, " ").concat(customOptions, " -m ").concat(model, " --vnc-port ").concat(DEFAULT_VNC_PORT, " ").concat(DEFAULT_APP_PATH, "/").concat(app_filename, " ").concat(libArgs);
+                  var command = "/home/zondax/speculos/speculos.py --color LAGOON_BLUE ".concat(displaySetting, " ").concat(customOptions, " -m ").concat(model, " --vnc-port ").concat(DEFAULT_VNC_PORT, " ").concat(DEFAULT_APP_PATH, "/").concat(appFilename, " ").concat(libArgs);
 
@@ -127,2 +127,8 @@ if (_this.logging) {
 
+                  var displayEnvironment = process.env.DISPLAY;
+
+                  if (process.platform === "darwin") {
+                    displayEnvironment = "host.docker.internal:0";
+                  }
+
                   docker.createContainer({
@@ -136,3 +142,3 @@ Image: _this.image,
                     User: "1000",
-                    Env: ["SCP_PRIVKEY=".concat(SCP_PRIVKEY), "BOLOS_SDK=".concat(BOLOS_SDK), "BOLOS_ENV=/opt/bolos", "DISPLAY=".concat(process.env.DISPLAY) // needed if X forwarding
+                    Env: ["SCP_PRIVKEY=".concat(SCP_PRIVKEY), "BOLOS_SDK=".concat(BOLOS_SDK), "BOLOS_ENV=/opt/bolos", "DISPLAY=".concat(displayEnvironment) // needed if X forwarding
                     ],
@@ -139,0 +145,0 @@ PortBindings: (_PortBindings = {}, (0, _defineProperty2["default"])(_PortBindings, "1234/tcp", [{

package.json

 {
   "name": "@zondax/zemu",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Zemu Testing Framework",
@@ -5,0 +5,0 @@ "main": "./dist/index.js",

src/emuContainer/index.js

@@ -37,5 +37,5 @@ /** ******************************************************************************
     await new Promise((resolve) => {
-      docker.listContainers({ all: true, filters: { name: [name] } }, function (err, containers) {
-        containers.forEach(function (containerInfo) {
-          docker.getContainer(containerInfo.Id).remove({ force: true }, function () {
+      docker.listContainers({ all: true, filters: { name: [name] } }, function(err, containers) {
+        containers.forEach(function(containerInfo) {
+          docker.getContainer(containerInfo.Id).remove({ force: true }, function() {
             // console.log("container removed");
@@ -89,11 +89,11 @@ });
 
-      const app_filename = path.basename(this.elfLocalPath);
-      const app_dir = path.dirname(this.elfLocalPath);
+      const appFilename = path.basename(this.elfLocalPath);
+      const appDir = path.dirname(this.elfLocalPath);
 
-      const dirBindings = [`${app_dir}:${DEFAULT_APP_PATH}`];
+      const dirBindings = [`${appDir}:${DEFAULT_APP_PATH}`];
 
       let libArgs = "";
       Object.entries(this.libElfs).forEach(([libName, libPath]) => {
-        const lib_filename = path.basename(libPath);
-        libArgs += ` -l ${libName}:${DEFAULT_APP_PATH}/${lib_filename}`;
+        const libFilename = path.basename(libPath);
+        libArgs += ` -l ${libName}:${DEFAULT_APP_PATH}/${libFilename}`;
       });
@@ -117,3 +117,3 @@
 
-      const command = `/home/zondax/speculos/speculos.py --color LAGOON_BLUE ${displaySetting} ${customOptions} -m ${model} --vnc-port ${DEFAULT_VNC_PORT} ${DEFAULT_APP_PATH}/${app_filename} ${libArgs}`;
+      const command = `/home/zondax/speculos/speculos.py --color LAGOON_BLUE ${displaySetting} ${customOptions} -m ${model} --vnc-port ${DEFAULT_VNC_PORT} ${DEFAULT_APP_PATH}/${appFilename} ${libArgs}`;
 
@@ -124,2 +124,7 @@ if (this.logging) {
 
+      let displayEnvironment = process.env.DISPLAY;
+      if (process.platform === "darwin") {
+        displayEnvironment = "host.docker.internal:0";
+      }
+
       docker
@@ -138,3 +143,3 @@ .createContainer({
             `BOLOS_ENV=/opt/bolos`,
-            `DISPLAY=${process.env.DISPLAY}`, // needed if X forwarding
+            `DISPLAY=${displayEnvironment}`, // needed if X forwarding
           ],
@@ -159,3 +164,3 @@ PortBindings: {
           if (this.logging) {
-            container.attach({ stream: true, stdout: true, stderr: true }, function (err, stream) {
+            container.attach({ stream: true, stdout: true, stderr: true }, function(err, stream) {
               stream.pipe(process.stdout);
@@ -167,3 +172,3 @@ });
         })
-        .then(function () {
+        .then(function() {
           resolve(true);
@@ -170,0 +175,0 @@ });

tests/basic.spec.js

@@ -35,9 +35,9 @@ /** ******************************************************************************
 const ZEMU_OPTIONS_S = {
-  model : 'nanos',
-  ...ZEMU_OPTIONS
+  model: "nanos",
+  ...ZEMU_OPTIONS,
 };
 
 const ZEMU_OPTIONS_X = {
-  model : 'nanox',
-  ...ZEMU_OPTIONS
+  model: "nanox",
+  ...ZEMU_OPTIONS,
 };
@@ -74,3 +74,3 @@
     await sim.start(ZEMU_OPTIONS_X);
-  } catch(err) {
+  } catch (err) {
     expect(err).toEqual(new Error("Zemu model is set to 'nanox' but elf file doesn't seem to be nano x build. Did you pass the right elf ?"));
@@ -207,2 +207,2 @@ } finally {
   }
-});
+});

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

Total package byte prevSize

2963072

increased by0.01%

Lines of code

2023

increased by0.45%

No dependency changes