@zondax/zemu - npm Package Compare versions

Comparing version 0.34.0-beta.11 to 0.34.0-beta.13

dist/index.js

@@ -134,3 +134,3 @@ "use strict";
         });
-        this.containerName = constants_1.BASE_NAME + randomstring_1["default"].generate(8); // generate 8 chars long string
+        this.containerName = constants_1.BASE_NAME + randomstring_1["default"].generate(12); // generate 12 chars long string
         this.emuContainer = new emulator_1["default"](this.elfPath, this.libElfs, constants_1.DEFAULT_EMU_IMG, this.containerName);
@@ -269,7 +269,7 @@ }
         return __awaiter(this, void 0, void 0, function () {
-            var transport_url, start, connected, maxWait, currentTime, elapsed, _c, e_2;
+            var transportUrl, start, connected, maxWait, currentTime, elapsed, _c, e_2;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        transport_url = "".concat(this.transportProtocol, "://").concat(this.host, ":").concat(this.transportPort);
+                        transportUrl = "".concat(this.transportProtocol, "://").concat(this.host, ":").concat(this.transportPort);
                         start = new Date();
@@ -286,3 +286,3 @@ connected = false;
                         }
-                        Zemu.delay(250);
+                        Zemu.delay(100);
                         _d.label = 2;
@@ -296,3 +296,3 @@ case 2:
                         _c = this;
-                        return [4 /*yield*/, (0, hw_transport_http_1["default"])(transport_url).open(transport_url)];
+                        return [4 /*yield*/, (0, hw_transport_http_1["default"])(transportUrl).open(transportUrl)];
                     case 3:
@@ -308,3 +308,3 @@ // here we should be able to import directly HttpTransport, instead of that Ledger
                         e_2 = _d.sent();
-                        this.log("WAIT ".concat(this.containerName, " ").concat(elapsed, " - ").concat(e_2, " ").concat(transport_url));
+                        this.log("WAIT ".concat(this.containerName, " ").concat(elapsed, " - ").concat(e_2, " ").concat(transportUrl));
                         connected = false;
@@ -631,3 +631,3 @@ return [3 /*break*/, 5];
         return __awaiter(this, void 0, void 0, function () {
-            var snapshotPrefixGolden, snapshotPrefixTmp, imageIndex, filename, start, prev_events_qty, current_events_qty, found, currentTime, elapsed, events, _i, events_1, eventEntry;
+            var snapshotPrefixGolden, snapshotPrefixTmp, imageIndex, filename, start, currentEventsAmount, found, currentTime, elapsed, events;
             return __generator(this, function (_a) {
@@ -650,4 +650,3 @@ switch (_a.label) {
                     case 2:
-                        prev_events_qty = (_a.sent()).length;
-                        current_events_qty = prev_events_qty;
+                        currentEventsAmount = (_a.sent()).length;
                         found = false;
@@ -667,11 +666,5 @@ _a.label = 3;
                         filename = this.getSnapshotPath(snapshotPrefixTmp, imageIndex, takeSnapshots);
-                        if (current_events_qty != events.length) {
-                            current_events_qty = events.length;
-                            for (_i = 0, events_1 = events; _i < events_1.length; _i++) {
-                                eventEntry = events_1[_i];
-                                if (eventEntry['text'].includes(text)) {
-                                    found = true;
-                                    break;
-                                }
-                            }
+                        if (currentEventsAmount != events.length) {
+                            currentEventsAmount = events.length;
+                            found = events.some(function (event) { return event.text.includes(text); });
                         }
@@ -689,3 +682,3 @@ if (!found) return [3 /*break*/, 6];
                         _a.sent();
-                        start = currentTime;
+                        start = new Date();
                         _a.label = 8;
@@ -830,7 +823,4 @@ case 8: return [3 /*break*/, 3];
                         events = _a.sent();
-                        events.forEach(function (element) {
-                            var v = element['text'];
-                            found = startRegex.test(v);
-                        });
-                        Zemu.delay(250);
+                        found = events.some(function (event) { return startRegex.test(event.text); });
+                        Zemu.delay(100);
                         return [3 /*break*/, 1];
@@ -870,4 +860,4 @@ case 3: return [2 /*return*/];
                         this.log('sleep');
-                        Zemu.delay(250);
-                        watchdog -= 250;
+                        Zemu.delay(100);
+                        watchdog -= 100;
                         if (watchdog <= 0)
@@ -874,0 +864,0 @@ throw 'Timeout waiting for screen update';

package.json

@@ -5,3 +5,3 @@ {
   "license": "Apache-2.0",
-  "version": "0.34.0-beta.11",
+  "version": "0.34.0-beta.13",
   "description": "Zemu Testing Framework",
@@ -8,0 +8,0 @@ "main": "./dist/index.js",

src/index.ts

@@ -126,3 +126,3 @@ /** ******************************************************************************
 
-    this.containerName = BASE_NAME + rndstr.generate(8) // generate 8 chars long string
+    this.containerName = BASE_NAME + rndstr.generate(12) // generate 12 chars long string
     this.emuContainer = new EmuContainer(this.elfPath, this.libElfs, DEFAULT_EMU_IMG, this.containerName)
@@ -223,3 +223,3 @@ }
   async connect() {
-    const transport_url = `${this.transportProtocol}://${this.host}:${this.transportPort}`
+    const transportUrl = `${this.transportProtocol}://${this.host}:${this.transportPort}`
     const start = new Date()
@@ -235,3 +235,3 @@ let connected = false
       }
-      Zemu.delay(250)
+      Zemu.delay(100)
 
@@ -243,6 +243,6 @@ try {
         // @ts-expect-error
-        this.transport = await HttpTransport(transport_url).open(transport_url)
+        this.transport = await HttpTransport(transportUrl).open(transportUrl)
         connected = true
       } catch (e) {
-        this.log(`WAIT ${this.containerName} ${elapsed} - ${e} ${transport_url}`)
+        this.log(`WAIT ${this.containerName} ${elapsed} - ${e} ${transportUrl}`)
         connected = false
@@ -511,4 +511,3 @@ }
     let start = new Date()
-    const prev_events_qty = (await this.getEvents()).length
-    let current_events_qty = prev_events_qty
+    let currentEventsAmount = (await this.getEvents()).length
 
@@ -529,10 +528,5 @@ let found = false
 
-      if (current_events_qty != events.length) {
-        current_events_qty = events.length
-        for (const eventEntry of events) {
-          if (eventEntry['text'].includes(text)) {
-            found = true
-            break
-          }
-        }
+      if (currentEventsAmount != events.length) {
+        currentEventsAmount = events.length
+        found = events.some((event: any) => event.text.includes(text))
       }
@@ -545,3 +539,3 @@
         await this.clickRight(filename, waitForScreenUpdate)
-        start = currentTime
+        start = new Date()
       }
@@ -623,7 +617,4 @@ }
       const events = await this.getEvents()
-      events.forEach((element: any) => {
-        const v = element['text']
-        found = startRegex.test(v)
-      })
-      Zemu.delay(250)
+      found = events.some((event: any) => startRegex.test(event.text))
+      Zemu.delay(100)
     }
@@ -648,4 +639,4 @@ }
         this.log('sleep')
-        Zemu.delay(250)
-        watchdog -= 250
+        Zemu.delay(100)
+        watchdog -= 100
         if (watchdog <= 0) throw 'Timeout waiting for screen update'
@@ -652,0 +643,0 @@ currentScreen = await this.snapshot()

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

Worsened metrics

Total package byte prevSize

3032288

decreased by-0.02%

Lines of code

2658

decreased by-0.71%

No dependency changes