@scrypted/server 0.115.7 → 0.115.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ip.js.map +1 -1
- package/dist/services/backup.js +10 -1
- package/dist/services/backup.js.map +1 -1
- package/package.json +2 -2
- package/src/ip.ts +0 -1
- package/src/services/backup.ts +11 -1
package/dist/ip.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ip.js","sourceRoot":"","sources":["../src/ip.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"ip.js","sourceRoot":"","sources":["../src/ip.ts"],"names":[],"mappings":"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"}
|
package/dist/services/backup.js
CHANGED
|
@@ -34,7 +34,16 @@ class Backup {
|
|
|
34
34
|
force: true,
|
|
35
35
|
});
|
|
36
36
|
const zip = new adm_zip_1.default();
|
|
37
|
-
|
|
37
|
+
// addLocalFolderPromise broken
|
|
38
|
+
// https://github.com/cthackers/adm-zip/issues/532
|
|
39
|
+
await new Promise((resolve, reject) => {
|
|
40
|
+
zip.addLocalFolderAsync(backupDbPath, (success, error) => {
|
|
41
|
+
if (error)
|
|
42
|
+
reject(error);
|
|
43
|
+
else
|
|
44
|
+
resolve();
|
|
45
|
+
});
|
|
46
|
+
});
|
|
38
47
|
return zip.toBufferPromise();
|
|
39
48
|
}
|
|
40
49
|
async restore(b) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/services/backup.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,4CAAoB;AACpB,gDAAwB;AACxB,qDAA6B;AAC7B,2DAA8E;AAE9E,oCAAiC;
|
|
1
|
+
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/services/backup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scrypted/server",
|
|
3
|
-
"version": "0.115.
|
|
3
|
+
"version": "0.115.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@mapbox/node-pre-gyp": "^1.0.11",
|
|
7
7
|
"@scrypted/deno": "^1.45.5",
|
|
8
8
|
"@scrypted/ffmpeg-static": "^6.1.0-build1",
|
|
9
9
|
"@scrypted/node-pty": "^1.0.18",
|
|
10
|
-
"@scrypted/types": "^0.3.
|
|
10
|
+
"@scrypted/types": "^0.3.48",
|
|
11
11
|
"adm-zip": "^0.5.15",
|
|
12
12
|
"body-parser": "^1.20.2",
|
|
13
13
|
"cookie-parser": "^1.4.6",
|
package/src/ip.ts
CHANGED
package/src/services/backup.ts
CHANGED
|
@@ -5,6 +5,7 @@ import Level from '../level';
|
|
|
5
5
|
import { getPluginsVolume, getScryptedVolume } from '../plugin/plugin-volume';
|
|
6
6
|
import { ScryptedRuntime } from '../runtime';
|
|
7
7
|
import { sleep } from '../sleep';
|
|
8
|
+
import util from 'util';
|
|
8
9
|
|
|
9
10
|
export class Backup {
|
|
10
11
|
constructor(public runtime: ScryptedRuntime) {}
|
|
@@ -32,7 +33,16 @@ export class Backup {
|
|
|
32
33
|
});
|
|
33
34
|
|
|
34
35
|
const zip = new AdmZip();
|
|
35
|
-
|
|
36
|
+
// addLocalFolderPromise broken
|
|
37
|
+
// https://github.com/cthackers/adm-zip/issues/532
|
|
38
|
+
await new Promise<void>((resolve, reject) => {
|
|
39
|
+
zip.addLocalFolderAsync(backupDbPath, (success, error) => {
|
|
40
|
+
if (error)
|
|
41
|
+
reject(error);
|
|
42
|
+
else
|
|
43
|
+
resolve();
|
|
44
|
+
})
|
|
45
|
+
});
|
|
36
46
|
return zip.toBufferPromise();
|
|
37
47
|
}
|
|
38
48
|
|