@zondax/zemu
Advanced tools
Comparing version 0.42.2-beta.1 to 0.42.2-beta.2
@@ -12,3 +12,3 @@ "use strict"; | ||
y: 65, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -18,3 +18,3 @@ const quitAppButton = { | ||
y: 0, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -24,3 +24,3 @@ exports.tapContinueButton = { | ||
y: 250, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -30,3 +30,3 @@ const prevPageButton = { | ||
y: 45, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -36,3 +36,3 @@ const toggleOption1 = { | ||
y: 125, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -42,3 +42,3 @@ const toggleOption2 = { | ||
y: 200, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -48,3 +48,3 @@ const toggleOption3 = { | ||
y: 250, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -54,3 +54,3 @@ const navRightButton = { | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -60,3 +60,3 @@ const navLeftButton = { | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -66,3 +66,3 @@ const quitSettingsButton = { | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -72,3 +72,3 @@ const approveTapButton = { | ||
y: 550, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -78,3 +78,3 @@ const approveHoldButton = { | ||
y: 525, | ||
delay: 3, | ||
delay: 4, | ||
}; | ||
@@ -84,3 +84,3 @@ const rejectButton = { | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -90,3 +90,3 @@ const confirmYesButton = { | ||
y: 550, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -96,3 +96,3 @@ const confirmNoButton = { | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -102,3 +102,3 @@ const showQRButton = { | ||
y: 300, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -108,3 +108,3 @@ const closeQRButton = { | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -111,0 +111,0 @@ exports.TouchElements = new Map([ |
@@ -12,3 +12,3 @@ export declare const DEV_CERT_PRIVATE_KEY = "ff701d781f43ce106f72dc26a46b6a83e053b5d07bb3d4ceab79c91ca822a66b"; | ||
constructor(elfLocalPath: string, libElfs: Record<string, string>, image: string, name: string); | ||
static killContainerByName(name: string): void; | ||
static killContainerByName(name: string): Promise<void>; | ||
static checkAndPullImage(imageName: string): Promise<void>; | ||
@@ -15,0 +15,0 @@ log(message: string): void; |
@@ -35,17 +35,20 @@ "use strict"; | ||
} | ||
static killContainerByName(name) { | ||
static async killContainerByName(name) { | ||
const docker = new dockerode_1.default(); | ||
docker.listContainers({ all: true, filters: { name: [name] } }, (listError, containers) => { | ||
if (listError != null) | ||
throw listError; | ||
if (containers == null || containers.length === 0) { | ||
console.log("No containers found"); | ||
return; | ||
} | ||
containers.forEach((containerInfo) => { | ||
docker.getContainer(containerInfo.Id).remove({ force: true }, (removeError) => { | ||
if (removeError != null) | ||
throw removeError; | ||
await new Promise((resolve) => { | ||
docker.listContainers({ all: true, filters: { name: [name] } }, (listError, containers) => { | ||
if (listError != null) | ||
throw listError; | ||
if (containers == null || containers.length === 0) { | ||
console.log("No containers found"); | ||
return; | ||
} | ||
containers.forEach((containerInfo) => { | ||
docker.getContainer(containerInfo.Id).remove({ force: true }, (removeError) => { | ||
if (removeError != null) | ||
throw removeError; | ||
}); | ||
}); | ||
}); | ||
resolve(); | ||
}); | ||
@@ -143,6 +146,5 @@ } | ||
const container = this.currentContainer; | ||
delete this.currentContainer; | ||
this.log(`[ZEMU] Stopping container`); | ||
try { | ||
await container.stop({ t: 0 }); | ||
await container.stop(); | ||
} | ||
@@ -155,3 +157,3 @@ catch (e) { | ||
try { | ||
await container.remove(); | ||
await container.remove({ force: true }); | ||
} | ||
@@ -158,0 +160,0 @@ catch (err) { |
@@ -40,3 +40,3 @@ /// <reference types="node" /> | ||
static sleep(timeInMs?: number): Promise<void>; | ||
static stopAllEmuContainers(): void; | ||
static stopAllEmuContainers(): Promise<void>; | ||
static checkAndPullImage(): Promise<void>; | ||
@@ -43,0 +43,0 @@ static checkElf(model: TModel, elfPath: string): void; |
@@ -66,3 +66,3 @@ "use strict"; | ||
} | ||
static stopAllEmuContainers() { | ||
static async stopAllEmuContainers() { | ||
const timer = setTimeout(function () { | ||
@@ -72,3 +72,3 @@ console.log("Could not kill all containers before timeout!"); | ||
}, constants_1.KILL_TIMEOUT); | ||
emulator_1.default.killContainerByName(constants_1.BASE_NAME); | ||
await emulator_1.default.killContainerByName(constants_1.BASE_NAME); | ||
clearTimeout(timer); | ||
@@ -75,0 +75,0 @@ } |
@@ -5,3 +5,3 @@ { | ||
"license": "Apache-2.0", | ||
"version": "0.42.2-beta.1", | ||
"version": "0.42.2-beta.2", | ||
"description": "Zemu Testing Framework", | ||
@@ -63,3 +63,3 @@ "main": "./dist/index.js", | ||
"eslint-plugin-import": "^2.27.5", | ||
"eslint-plugin-n": "^15.6.1", | ||
"eslint-plugin-n": "^16.0.0", | ||
"eslint-plugin-promise": "^6.0.0", | ||
@@ -66,0 +66,0 @@ "jest": "^29.5.0", |
@@ -27,3 +27,3 @@ /** ****************************************************************************** | ||
y: 65, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -34,3 +34,3 @@ | ||
y: 0, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -41,3 +41,3 @@ | ||
y: 250, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -48,3 +48,3 @@ | ||
y: 45, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -55,3 +55,3 @@ | ||
y: 125, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -62,3 +62,3 @@ | ||
y: 200, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -69,3 +69,3 @@ | ||
y: 250, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -76,3 +76,3 @@ | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -83,3 +83,3 @@ | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -90,3 +90,3 @@ | ||
y: 625, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -97,3 +97,3 @@ | ||
y: 550, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -104,3 +104,3 @@ | ||
y: 525, | ||
delay: 3, | ||
delay: 4, | ||
}; | ||
@@ -111,3 +111,3 @@ | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -118,3 +118,3 @@ | ||
y: 550, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -125,3 +125,3 @@ | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -132,3 +132,3 @@ | ||
y: 300, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -139,3 +139,3 @@ | ||
y: 650, | ||
delay: 0.1, | ||
delay: 0.25, | ||
}; | ||
@@ -142,0 +142,0 @@ |
@@ -39,15 +39,18 @@ /** ****************************************************************************** | ||
static killContainerByName(name: string): void { | ||
static async killContainerByName(name: string): Promise<void> { | ||
const docker = new Docker(); | ||
docker.listContainers({ all: true, filters: { name: [name] } }, (listError, containers?: ContainerInfo[]) => { | ||
if (listError != null) throw listError; | ||
if (containers == null || containers.length === 0) { | ||
console.log("No containers found"); | ||
return; | ||
} | ||
containers.forEach((containerInfo) => { | ||
docker.getContainer(containerInfo.Id).remove({ force: true }, (removeError) => { | ||
if (removeError != null) throw removeError; | ||
await new Promise<void>((resolve) => { | ||
docker.listContainers({ all: true, filters: { name: [name] } }, (listError, containers?: ContainerInfo[]) => { | ||
if (listError != null) throw listError; | ||
if (containers == null || containers.length === 0) { | ||
console.log("No containers found"); | ||
return; | ||
} | ||
containers.forEach((containerInfo) => { | ||
docker.getContainer(containerInfo.Id).remove({ force: true }, (removeError) => { | ||
if (removeError != null) throw removeError; | ||
}); | ||
}); | ||
}); | ||
resolve(); | ||
}); | ||
@@ -172,6 +175,5 @@ } | ||
const container = this.currentContainer; | ||
delete this.currentContainer; | ||
this.log(`[ZEMU] Stopping container`); | ||
try { | ||
await container.stop({ t: 0 }); | ||
await container.stop(); | ||
} catch (e) { | ||
@@ -183,3 +185,3 @@ this.log(`[ZEMU] Stopping: ${e}`); | ||
try { | ||
await container.remove(); | ||
await container.remove({ force: true }); | ||
} catch (err) { | ||
@@ -186,0 +188,0 @@ this.log("[ZEMU] Unable to remove container"); |
@@ -129,3 +129,3 @@ /** ****************************************************************************** | ||
static stopAllEmuContainers(): void { | ||
static async stopAllEmuContainers(): Promise<void> { | ||
const timer = setTimeout(function () { | ||
@@ -135,3 +135,3 @@ console.log("Could not kill all containers before timeout!"); | ||
}, KILL_TIMEOUT); | ||
EmuContainer.killContainerByName(BASE_NAME); | ||
await EmuContainer.killContainerByName(BASE_NAME); | ||
clearTimeout(timer); | ||
@@ -138,0 +138,0 @@ } |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
3033877
3126