sebclem/hassio-nextcloud-backup
1
0
Fork 0
mirror of https://github.com/Sebclem/hassio-nextcloud-backup.git synced 2024-11-24 10:12:59 +01:00
Code Issues Projects Releases Wiki Activity

🔨 Convert everything to es6 modules

Browse Source
This commit is contained in:
SebClem 2022-02-15 19:42:51 +01:00
parent 0fa020d0ab
commit 143eecbcf9
No known key found for this signature in database
GPG Key ID: 3D8E353F900B1305
15 changed files with 232 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nextcloud_backup/rootfs/opt/nextcloud_backup/app.js
View File

@ -1,11 +1,26 @@
const createError = require("http-errors"); import createError from "http-errors";
const express = require("express"); import express from "express";
const path = require("path"); import path from "path";
const cookieParser = require("cookie-parser"); import cookieParser from "cookie-parser";
const logger = require("morgan"); import logger from "morgan";
import { fileURLToPath } from 'url';
import { dirname } from 'path';
import fs from "fs"
import newlog from "./config/winston.js"
import * as statusTools from "./tools/status.js"
import * as hassioApiTools from "./tools/hassioApiTools.js"
import webdav from "./tools/webdavTools.js"
import * as settingsTools from "./tools/settingsTools.js"
import cronTools from "./tools/cronTools.js"
const indexRouter = require("./routes/index"); import indexRouter from "./routes/index.js"
const apiRouter = require("./routes/api"); import apiRouter from "./routes/api.js"
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
const app = express(); const app = express();
// view engine setup // view engine setup
@ -71,17 +86,15 @@ app.use(function (err, req, res, next) {
---------------------------------------------------------- ----------------------------------------------------------
*/ */
const fs = require("fs");
const newlog = require("./config/winston");
newlog.info(`Log level: ${ process.env.LOG_LEVEL }`); newlog.info(`Log level: ${ process.env.LOG_LEVEL }`);
newlog.info(`Backup timeout: ${ parseInt(process.env.CREATE_BACKUP_TIMEOUT) || ( 90 * 60 * 1000 ) }`) newlog.info(`Backup timeout: ${ parseInt(process.env.CREATE_BACKUP_TIMEOUT) || ( 90 * 60 * 1000 ) }`)
if (!fs.existsSync("/data")) fs.mkdirSync("/data"); if (!fs.existsSync("/data")) fs.mkdirSync("/data");
const statusTools = require("./tools/status");
statusTools.init(); statusTools.init();
newlog.info("Satus : \x1b[32mGo !\x1b[0m"); newlog.info("Satus : \x1b[32mGo !\x1b[0m");
const hassioApiTools = require("./tools/hassioApiTools");
hassioApiTools.getSnapshots().then( hassioApiTools.getSnapshots().then(
() => { () => {
newlog.info("Hassio API : \x1b[32mGo !\x1b[0m"); newlog.info("Hassio API : \x1b[32mGo !\x1b[0m");
@ -92,8 +105,6 @@ hassioApiTools.getSnapshots().then(
} }
); );
const WebdavTools = require("./tools/webdavTools");
const webdav = new WebdavTools().getInstance();
webdav.confIsValid().then( webdav.confIsValid().then(
() => { () => {
newlog.info("Nextcloud connection : \x1b[32mGo !\x1b[0m"); newlog.info("Nextcloud connection : \x1b[32mGo !\x1b[0m");
@ -103,11 +114,9 @@ webdav.confIsValid().then(
newlog.error("... " + err); newlog.error("... " + err);
} }
); );
const settingTool = require('./tools/settingsTools')
settingTool.check(settingTool.getSettings(), true); settingsTools.check(settingsTools.getSettings(), true);
const cronTools = require("./tools/cronTools"); cronTools.init();
cronTools.startCron();
export default app;
module.exports = app;

8
nextcloud_backup/rootfs/opt/nextcloud_backup/bin/www → nextcloud_backup/rootfs/opt/nextcloud_backup/bin/www.js
View File

@ -4,9 +4,11 @@
* Module dependencies. * Module dependencies.
*/ */
var app = require('../app'); import app from "../app.js"
var debug = require('debug')('nexcloud-backup:server'); import http from "http"
var http = require('http'); import _debug from 'debug';
const debug = _debug('nexcloud-backup:server');
/** /**
* Get port from environment and store in Express. * Get port from environment and store in Express.

5
nextcloud_backup/rootfs/opt/nextcloud_backup/config/winston.js
View File

@ -1,4 +1,4 @@
const winston = require("winston"); import winston from "winston";
const logger = winston.createLogger({ const logger = winston.createLogger({
level: process.env.LOG_LEVEL || 'info', level: process.env.LOG_LEVEL || 'info',
@ -24,4 +24,5 @@ const logger = winston.createLogger({
], ],
}); });
module.exports = logger;
export default logger;

168
nextcloud_backup/rootfs/opt/nextcloud_backup/package-lock.json generated
View File

@ -17,7 +17,7 @@
"ejs": "~3.1.6", "ejs": "~3.1.6",
"express": "~4.17.2", "express": "~4.17.2",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"got": "^11.8.2", "got": "12.0.1",
"http-errors": "~2.0.0", "http-errors": "~2.0.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"moment": "^2.29.1", "moment": "^2.29.1",
@ -64,9 +64,9 @@
} }
}, },
"node_modules/@sindresorhus/is": { "node_modules/@sindresorhus/is": {
"version": "4.0.1", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz",
"integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==", "integrity": "sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ==",
"engines": { "engines": {
"node": ">=10" "node": ">=10"
}, },
@ -75,14 +75,14 @@
} }
}, },
"node_modules/@szmarczak/http-timer": { "node_modules/@szmarczak/http-timer": {
"version": "4.0.6", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
"dependencies": { "dependencies": {
"defer-to-connect": "^2.0.0" "defer-to-connect": "^2.0.1"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=14.16"
} }
}, },
"node_modules/@types/cacheable-request": { "node_modules/@types/cacheable-request": {
@ -275,9 +275,9 @@
} }
}, },
"node_modules/cacheable-lookup": { "node_modules/cacheable-lookup": {
"version": "5.0.4", "version": "6.0.4",
"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz",
"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", "integrity": "sha512-mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A==",
"engines": { "engines": {
"node": ">=10.6.0" "node": ">=10.6.0"
} }
@ -766,6 +766,11 @@
"node": ">= 6" "node": ">= 6"
} }
}, },
"node_modules/form-data-encoder": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz",
"integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
},
"node_modules/forwarded": { "node_modules/forwarded": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@ -797,29 +802,53 @@
} }
}, },
"node_modules/got": { "node_modules/got": {
"version": "11.8.2", "version": "12.0.1",
"resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", "resolved": "https://registry.npmjs.org/got/-/got-12.0.1.tgz",
"integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==", "integrity": "sha512-1Zhoh+lDej3t7Ks1BP/Jufn+rNqdiHQgUOcTxHzg2Dao1LQfp5S4Iq0T3iBxN4Zdo7QqCJL+WJUNzDX6rCP2Ew==",
"dependencies": { "dependencies": {
"@sindresorhus/is": "^4.0.0", "@sindresorhus/is": "^4.2.0",
"@szmarczak/http-timer": "^4.0.5", "@szmarczak/http-timer": "^5.0.1",
"@types/cacheable-request": "^6.0.1", "@types/cacheable-request": "^6.0.2",
"@types/responselike": "^1.0.0", "@types/responselike": "^1.0.0",
"cacheable-lookup": "^5.0.3", "cacheable-lookup": "^6.0.4",
"cacheable-request": "^7.0.1", "cacheable-request": "^7.0.2",
"decompress-response": "^6.0.0", "decompress-response": "^6.0.0",
"http2-wrapper": "^1.0.0-beta.5.2", "form-data-encoder": "1.7.1",
"lowercase-keys": "^2.0.0", "get-stream": "^6.0.1",
"p-cancelable": "^2.0.0", "http2-wrapper": "^2.1.9",
"lowercase-keys": "^3.0.0",
"p-cancelable": "^3.0.0",
"responselike": "^2.0.0" "responselike": "^2.0.0"
}, },
"engines": { "engines": {
"node": ">=10.19.0" "node": ">=14.16"
}, },
"funding": { "funding": {
"url": "https://github.com/sindresorhus/got?sponsor=1" "url": "https://github.com/sindresorhus/got?sponsor=1"
} }
}, },
"node_modules/got/node_modules/get-stream": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/got/node_modules/lowercase-keys": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
"integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/has-flag": { "node_modules/has-flag": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@ -878,12 +907,12 @@
} }
}, },
"node_modules/http2-wrapper": { "node_modules/http2-wrapper": {
"version": "1.0.3", "version": "2.1.10",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.10.tgz",
"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "integrity": "sha512-QHgsdYkieKp+6JbXP25P+tepqiHYd+FVnDwXpxi/BlUcoIB0nsmTOymTNvETuTO+pDuwcSklPE72VR3DqV+Haw==",
"dependencies": { "dependencies": {
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve-alpn": "^1.0.0" "resolve-alpn": "^1.2.0"
}, },
"engines": { "engines": {
"node": ">=10.19.0" "node": ">=10.19.0"
@ -1199,11 +1228,11 @@
} }
}, },
"node_modules/p-cancelable": { "node_modules/p-cancelable": {
"version": "2.1.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
"engines": { "engines": {
"node": ">=8" "node": ">=12.20"
} }
}, },
"node_modules/parseurl": { "node_modules/parseurl": {
@ -1662,16 +1691,16 @@
"peer": true "peer": true
}, },
"@sindresorhus/is": { "@sindresorhus/is": {
"version": "4.0.1", "version": "4.4.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz",
"integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==" "integrity": "sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="
}, },
"@szmarczak/http-timer": { "@szmarczak/http-timer": {
"version": "4.0.6", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
"requires": { "requires": {
"defer-to-connect": "^2.0.0" "defer-to-connect": "^2.0.1"
} }
}, },
"@types/cacheable-request": { "@types/cacheable-request": {
@ -1839,9 +1868,9 @@
"integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==" "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="
}, },
"cacheable-lookup": { "cacheable-lookup": {
"version": "5.0.4", "version": "6.0.4",
"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz",
"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==" "integrity": "sha512-mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A=="
}, },
"cacheable-request": { "cacheable-request": {
"version": "7.0.2", "version": "7.0.2",
@ -2205,6 +2234,11 @@
"mime-types": "^2.1.12" "mime-types": "^2.1.12"
} }
}, },
"form-data-encoder": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz",
"integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
},
"forwarded": { "forwarded": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@ -2224,21 +2258,35 @@
} }
}, },
"got": { "got": {
"version": "11.8.2", "version": "12.0.1",
"resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", "resolved": "https://registry.npmjs.org/got/-/got-12.0.1.tgz",
"integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==", "integrity": "sha512-1Zhoh+lDej3t7Ks1BP/Jufn+rNqdiHQgUOcTxHzg2Dao1LQfp5S4Iq0T3iBxN4Zdo7QqCJL+WJUNzDX6rCP2Ew==",
"requires": { "requires": {
"@sindresorhus/is": "^4.0.0", "@sindresorhus/is": "^4.2.0",
"@szmarczak/http-timer": "^4.0.5", "@szmarczak/http-timer": "^5.0.1",
"@types/cacheable-request": "^6.0.1", "@types/cacheable-request": "^6.0.2",
"@types/responselike": "^1.0.0", "@types/responselike": "^1.0.0",
"cacheable-lookup": "^5.0.3", "cacheable-lookup": "^6.0.4",
"cacheable-request": "^7.0.1", "cacheable-request": "^7.0.2",
"decompress-response": "^6.0.0", "decompress-response": "^6.0.0",
"http2-wrapper": "^1.0.0-beta.5.2", "form-data-encoder": "1.7.1",
"lowercase-keys": "^2.0.0", "get-stream": "^6.0.1",
"p-cancelable": "^2.0.0", "http2-wrapper": "^2.1.9",
"lowercase-keys": "^3.0.0",
"p-cancelable": "^3.0.0",
"responselike": "^2.0.0" "responselike": "^2.0.0"
},
"dependencies": {
"get-stream": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
},
"lowercase-keys": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
"integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="
}
} }
}, },
"has-flag": { "has-flag": {
@ -2286,12 +2334,12 @@
} }
}, },
"http2-wrapper": { "http2-wrapper": {
"version": "1.0.3", "version": "2.1.10",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.10.tgz",
"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "integrity": "sha512-QHgsdYkieKp+6JbXP25P+tepqiHYd+FVnDwXpxi/BlUcoIB0nsmTOymTNvETuTO+pDuwcSklPE72VR3DqV+Haw==",
"requires": { "requires": {
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve-alpn": "^1.0.0" "resolve-alpn": "^1.2.0"
} }
}, },
"iconv-lite": { "iconv-lite": {
@ -2534,9 +2582,9 @@
} }
}, },
"p-cancelable": { "p-cancelable": {
"version": "2.1.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==" "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="
}, },
"parseurl": { "parseurl": {
"version": "1.3.3", "version": "1.3.3",

5
nextcloud_backup/rootfs/opt/nextcloud_backup/package.json
View File

@ -2,8 +2,9 @@
"name": "nexcloud-backup", "name": "nexcloud-backup",
"version": "0.8.0", "version": "0.8.0",
"private": true, "private": true,
"type": "module",
"scripts": { "scripts": {
"start": "node ./bin/www " "start": "node ./bin/www.js "
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^6.0.0", "@fortawesome/fontawesome-free": "^6.0.0",
@ -15,7 +16,7 @@
"ejs": "~3.1.6", "ejs": "~3.1.6",
"express": "~4.17.2", "express": "~4.17.2",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"got": "^11.8.2", "got": "12.0.1",
"http-errors": "~2.0.0", "http-errors": "~2.0.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"moment": "^2.29.1", "moment": "^2.29.1",

1
nextcloud_backup/rootfs/opt/nextcloud_backup/public/js/index.js
View File

@ -243,7 +243,6 @@ function sendNextcloudSettings() {
console.log("Saved"); console.log("Saved");
$("#nextcloud_settings_message").parent().addClass("d-none"); $("#nextcloud_settings_message").parent().addClass("d-none");
create_toast("success", "Nextcloud settings saved !", default_toast_timeout); create_toast("success", "Nextcloud settings saved !", default_toast_timeout);
0;
}) })
.fail((data) => { .fail((data) => {
let nextcloud_settings_message = $("#nextcloud_settings_message"); let nextcloud_settings_message = $("#nextcloud_settings_message");

30
nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js
View File

@ -1,20 +1,18 @@
const express = require("express"); import express from 'express';
const router = express.Router(); import moment from "moment";
const moment = require("moment"); import * as statusTools from "../tools/status.js"
const statusTools = require("../tools/status"); import webdav from "../tools/webdavTools.js"
const WebdavTools = require("../tools/webdavTools"); import * as settingsTools from "../tools/settingsTools.js"
const webdav = new WebdavTools().getInstance(); import * as pathTools from "../tools/pathTools.js"
const settingsTools = require("../tools/settingsTools"); import * as hassioApiTools from "../tools/hassioApiTools.js"
const pathTools = require("../tools/pathTools"); import { humanFileSize } from "../tools/toolbox.js";
const hassioApiTools = require("../tools/hassioApiTools"); import cronTools from "../tools/cronTools.js"
const humanFileSize = require("../tools/toolbox").humanFileSize; import logger from "../config/winston.js"
const cronTools = require("../tools/cronTools"); var router = express.Router();
const logger = require("../config/winston");
router.get("/status", (req, res, next) => { router.get("/status", (req, res, next) => {
cronTools.updatetNextDate(); cronTools.updateNextDate();
let status = statusTools.getStatus(); let status = statusTools.getStatus();
res.json(status); res.json(status);
}); });
@ -191,7 +189,7 @@ router.post("/backup-settings", function (req, res, next) {
let [result, message] = settingsTools.check(req.body) let [result, message] = settingsTools.check(req.body)
if (result) { if (result) {
settingsTools.setSettings(req.body); settingsTools.setSettings(req.body);
cronTools.startCron(); cronTools.init();
res.send(); res.send();
} else { } else {
res.status(400); res.status(400);
@ -225,5 +223,5 @@ router.post("/restore", function (req, res, next) {
} }
}); });
module.exports = router; export default router;

6
nextcloud_backup/rootfs/opt/nextcloud_backup/routes/index.js
View File

@ -1,9 +1,9 @@
const express = require("express"); import express from 'express';
const router = express.Router(); var router = express.Router();
/* GET home page. */ /* GET home page. */
router.get("/", function (req, res, next) { router.get("/", function (req, res, next) {
res.render("index"); res.render("index");
}); });
module.exports = router; export default router;

39
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/cronTools.js
View File

@ -1,23 +1,13 @@
const CronJob = require("cron").CronJob; import { CronJob } from "cron"
import * as settingsTools from "./settingsTools.js"
import * as hassioApiTools from "./hassioApiTools.js"
import * as statusTools from "./status.js"
import * as pathTools from "./pathTools.js"
import webdav from "./webdavTools.js"
const settingsTools = require("./settingsTools");
const WebdavTools = require("./webdavTools");
const webdav = new WebdavTools().getInstance();
const hassioApiTools = require("./hassioApiTools");
const statusTools = require("./status");
const pathTools = require("./pathTools");
const logger = require("../config/winston"); import logger from "../config/winston.js"
function startCron() {
let cronContainer = new Singleton().getInstance();
cronContainer.init();
}
function updatetNextDate() {
let cronContainer = new Singleton().getInstance();
cronContainer.updateNextDate();
}
class CronContainer { class CronContainer {
constructor() { constructor() {
@ -126,17 +116,6 @@ class CronContainer {
} }
} }
class Singleton { const INSTANCE = new CronContainer();
constructor() { export default INSTANCE;
if (!Singleton.instance) {
Singleton.instance = new CronContainer();
}
}
getInstance() {
return Singleton.instance;
}
}
exports.startCron = startCron;
exports.updatetNextDate = updatetNextDate;

47
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
View File

@ -1,15 +1,16 @@
const fs = require("fs"); import fs from "fs"
import moment from "moment";
import stream from "stream"
import { promisify } from "util";
import got from "got";
import FormData from "form-data";
import * as statusTools from "../tools/status.js"
import * as settingsTools from "../tools/settingsTools.js"
const moment = require("moment"); import logger from "../config/winston.js"
const stream = require("stream");
const { promisify } = require("util");
const pipeline = promisify(stream.pipeline); const pipeline = promisify(stream.pipeline);
const got = require("got");
const FormData = require("form-data");
const statusTools = require("./status");
const settingsTools = require("./settingsTools");
const logger = require("../config/winston");
// Default timout to 90min // Default timout to 90min
const create_snap_timeout = parseInt(process.env.CREATE_BACKUP_TIMEOUT) || ( 90 * 60 * 1000 ); const create_snap_timeout = parseInt(process.env.CREATE_BACKUP_TIMEOUT) || ( 90 * 60 * 1000 );
@ -285,7 +286,9 @@ function createNewBackup(name) {
let option = { let option = {
headers: { "Authorization": `Bearer ${token}` }, headers: { "Authorization": `Bearer ${token}` },
responseType: "json", responseType: "json",
timeout: create_snap_timeout, timeout: {
response: create_snap_timeout
},
json: { json: {
name: name, name: name,
addons: addons, addons: addons,
@ -572,14 +575,16 @@ function publish_state(state){
// }); // });
} }
exports.getVersion = getVersion; export {
exports.getAddonList = getAddonList; getVersion,
exports.getFolderList = getFolderList; getAddonList,
exports.getSnapshots = getSnapshots; getFolderList,
exports.downloadSnapshot = downloadSnapshot; getSnapshots,
exports.createNewBackup = createNewBackup; downloadSnapshot,
exports.uploadSnapshot = uploadSnapshot; createNewBackup,
exports.stopAddons = stopAddons; uploadSnapshot,
exports.startAddons = startAddons; stopAddons,
exports.clean = clean; startAddons,
exports.publish_state = publish_state; clean,
publish_state
}

8
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/pathTools.js
View File

@ -1,4 +1,4 @@
let default_root = "/Hassio Backup/"; const default_root = "/Hassio Backup/";
exports.default_root = default_root; export { default_root };
exports.manual = "Manual/"; export const manual = "Manual/";
exports.auto = "Auto/"; export const auto = "Auto/";

16
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/settingsTools.js
View File

@ -1,7 +1,8 @@
const fs = require("fs"); import fs from "fs"
const logger = require("../config/winston"); import moment from "moment";
const moment = require("moment"); import { CronJob } from "cron";
const CronJob = require("cron").CronJob;
import logger from "../config/winston.js"
const settingsPath = "/data/backup_conf.json"; const settingsPath = "/data/backup_conf.json";
@ -24,6 +25,7 @@ function check_cron(conf) {
if (conf.cron_base === "4") { if (conf.cron_base === "4") {
if (conf.cron_custom != null) { if (conf.cron_custom != null) {
try { try {
// TODO Need to be destroy
new CronJob(conf.cron_custom, () => {}); new CronJob(conf.cron_custom, () => {});
return true; return true;
} catch(e) { } catch(e) {
@ -187,8 +189,4 @@ function setSettings(settings) {
fs.writeFileSync(settingsPath, JSON.stringify(settings)); fs.writeFileSync(settingsPath, JSON.stringify(settings));
} }
exports.getSettings = getSettings; export { getSettings, setSettings, check, check_cron, getFormatedName };
exports.setSettings = setSettings;
exports.check = check;
exports.check_cron = check_cron;
exports.getFormatedName = getFormatedName;

14
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/status.js
View File

@ -1,5 +1,5 @@
const fs = require("fs"); import fs from "fs"
const hassioApiTools = require("./hassioApiTools"); import * as hassioApiTools from "./hassioApiTools.js";
const statusPath = "/data/status.json"; const statusPath = "/data/status.json";
@ -9,7 +9,7 @@ let baseStatus = {
next_backup: null, next_backup: null,
}; };
function init() { export function init() {
if (!fs.existsSync(statusPath)) { if (!fs.existsSync(statusPath)) {
fs.writeFileSync(statusPath, JSON.stringify(baseStatus)); fs.writeFileSync(statusPath, JSON.stringify(baseStatus));
} else { } else {
@ -22,14 +22,14 @@ function init() {
} }
} }
function getStatus() { export function getStatus() {
if (!fs.existsSync(statusPath)) { if (!fs.existsSync(statusPath)) {
fs.writeFileSync(statusPath, JSON.stringify(baseStatus)); fs.writeFileSync(statusPath, JSON.stringify(baseStatus));
} }
return JSON.parse(fs.readFileSync(statusPath).toString()); return JSON.parse(fs.readFileSync(statusPath).toString());
} }
function setStatus(state) { export function setStatus(state) {
if (fs.existsSync(statusPath)) { if (fs.existsSync(statusPath)) {
let old_state_str = fs.readFileSync(statusPath).toString(); let old_state_str = fs.readFileSync(statusPath).toString();
if(old_state_str !== JSON.stringify(state)){ if(old_state_str !== JSON.stringify(state)){
@ -43,7 +43,3 @@ function setStatus(state) {
} }
exports.init = init;
exports.getStatus = getStatus;
exports.setStatus = setStatus;

2
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/toolbox.js
View File

@ -18,4 +18,4 @@ function humanFileSize(bytes, si = false, dp = 1) {
return bytes.toFixed(dp) + " " + units[u]; return bytes.toFixed(dp) + " " + units[u];
} }
exports.humanFileSize = humanFileSize; export { humanFileSize } ;

42
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
View File

@ -1,20 +1,21 @@
const { createClient } = require("webdav"); import { createClient } from "webdav";
const fs = require("fs"); import fs from "fs"
const moment = require("moment"); import moment from "moment";
const https = require("https"); import https from "https"
import path from "path";
import got from "got";
import stream from "stream";
import { promisify } from "util";
import * as statusTools from "../tools/status.js"
import * as settingsTools from "../tools/settingsTools.js"
import * as pathTools from "../tools/pathTools.js"
import * as hassioApiTools from "../tools/hassioApiTools.js"
import logger from "../config/winston.js"
const statusTools = require("./status");
const endpoint = "/remote.php/webdav"; const endpoint = "/remote.php/webdav";
const configPath = "/data/webdav_conf.json"; const configPath = "/data/webdav_conf.json";
const path = require("path");
const settingsTools = require("./settingsTools");
const pathTools = require("./pathTools");
const hassioApiTools = require("./hassioApiTools");
const logger = require("../config/winston");
const got = require("got");
const stream = require("stream");
const { promisify } = require("util");
const pipeline = promisify(stream.pipeline); const pipeline = promisify(stream.pipeline);
class WebdavTools { class WebdavTools {
@ -427,16 +428,5 @@ function cleanTempFolder() {
}); });
} }
class Singleton { const INSTANCE = new WebdavTools();
constructor() { export default INSTANCE;
if (!Singleton.instance) {
Singleton.instance = new WebdavTools();
}
}
getInstance() {
return Singleton.instance;
}
}
module.exports = Singleton;