Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"bs58": "^4.0.1",
"chalk": "^4.1.0",
"cron": "^2.1.0",
"diskusage": "^1.2.0",
"diskusage-ng": "^1.0.4",
"dockerode": "^4.0.5",
"dot": "^1.1.3",
"dotenv": "^8.6.0",
Expand Down
22 changes: 19 additions & 3 deletions packages/dashmate/src/util/getOperatingSystemInfoFactory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import si from 'systeminformation';
import * as diskusage from 'diskusage';
import diskusage from 'diskusage-ng';
import os from 'os';
import obfuscateObjectRecursive from './obfuscateObjectRecursive.js';
import hideString from './hideString.js';
Expand Down Expand Up @@ -153,7 +153,15 @@ export default function getOperatingSystemInfoFactory(
// Get disk usage info
if (result.dockerSystemInfo) {
try {
result.diskSpace = await diskusage.check(result.dockerSystemInfo.DockerRootDir);
result.diskSpace = await new Promise((resolve, reject) => {
diskusage(result.dockerSystemInfo.DockerRootDir, (err, usage) => {
if (err) {
reject(err);
} else {
resolve(usage);
}
});
});
} catch (e) {
if (process.env.DEBUG) {
// eslint-disable-next-line no-console
Expand All @@ -164,7 +172,15 @@ export default function getOperatingSystemInfoFactory(

if (!result.diskSpace) {
try {
result.diskSpace = await diskusage.check(os.platform() === 'win32' ? 'c:' : '/');
result.diskSpace = await new Promise((resolve, reject) => {
diskusage(os.platform() === 'win32' ? 'c:' : '/', (err, usage) => {
if (err) {
reject(err);
} else {
resolve(usage);
}
});
});
} catch (e) {
if (process.env.DEBUG) {
// eslint-disable-next-line no-console
Expand Down
25 changes: 6 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6612,7 +6612,7 @@ __metadata:
chalk: "npm:^4.1.0"
cron: "npm:^2.1.0"
dirty-chai: "npm:^2.0.1"
diskusage: "npm:^1.2.0"
diskusage-ng: "npm:^1.0.4"
dockerode: "npm:^4.0.5"
dot: "npm:^1.1.3"
dotenv: "npm:^8.6.0"
Expand Down Expand Up @@ -6990,14 +6990,10 @@ __metadata:
languageName: node
linkType: hard

"diskusage@npm:^1.2.0":
version: 1.2.0
resolution: "diskusage@npm:1.2.0"
dependencies:
es6-promise: "npm:^4.2.8"
nan: "npm:^2.18.0"
node-gyp: "npm:latest"
checksum: cf37552dd9b2731f44d802a6b4d9ea7fbff4f6d33d3f67ce736538fd09fbb276d146a61be0d3e40e27afe232c7cd54d91487c5ca3770f1fe11c865ac240b9674
"diskusage-ng@npm:^1.0.4":
version: 1.0.4
resolution: "diskusage-ng@npm:1.0.4"
checksum: b219f4197fc7b1eed1062757a648ae21d8408f21581cd92ac2ee3cb5f770094e1225c889c880110c7f7a0786c92656cca9b5b2d10c66a4f28c0bc45c3018dcff
languageName: node
linkType: hard

Expand Down Expand Up @@ -7501,7 +7497,7 @@ __metadata:
languageName: node
linkType: hard

"es6-promise@npm:^4.0.3, es6-promise@npm:^4.2.8":
"es6-promise@npm:^4.0.3":
version: 4.2.8
resolution: "es6-promise@npm:4.2.8"
checksum: b250c55523c496c43c9216c2646e58ec182b819e036fe5eb8d83fa16f044ecc6b8dcefc88ace2097be3d3c4d02b6aa8eeae1a66deeaf13e7bee905ebabb350a3
Expand Down Expand Up @@ -11674,15 +11670,6 @@ __metadata:
languageName: node
linkType: hard

"nan@npm:^2.18.0":
version: 2.20.0
resolution: "nan@npm:2.20.0"
dependencies:
node-gyp: "npm:latest"
checksum: 5f16e4c9953075d9920229c703c1d781c0b74118ce3d9e926b448a4eef92b7d8be5ac6adc748a13a5fafb594436cbfe63250e3471aefdd78e3a0cd14603b9ba7
languageName: node
linkType: hard

"nan@npm:^2.20.0":
version: 2.22.2
resolution: "nan@npm:2.22.2"
Expand Down
Loading