Skip to content
Draft
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
36,860 changes: 17,944 additions & 18,916 deletions package-lock.json

Large diffs are not rendered by default.

75 changes: 37 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,57 +19,56 @@
"iobroker.js-controller": "file:packages/controller"
},
"devDependencies": {
"@alcalzone/esm2cjs": "^1.3.0",
"@alcalzone/esm2cjs": "^1.4.1",
"@alcalzone/pak": "^0.11.0",
"@alcalzone/release-script": "~3.8.0",
"@alcalzone/release-script-plugin-iobroker": "~3.7.0",
"@alcalzone/release-script-plugin-iobroker": "~3.7.2",
"@alcalzone/release-script-plugin-lerna": "~3.7.0",
"@alcalzone/release-script-plugin-license": "~3.5.0",
"@alcalzone/release-script-plugin-manual-review": "~3.5.9",
"@iobroker/eslint-config": "^0.1.6",
"@alcalzone/release-script-plugin-license": "~3.7.0",
"@alcalzone/release-script-plugin-manual-review": "~3.7.0",
"@iobroker/eslint-config": "^0.1.7",
"@iobroker/types": "file:packages/types-public",
"@iobroker/types-dev": "file:packages/types-dev",
"@microsoft/api-extractor": "^7.43.0",
"@tsconfig/node22": "^22.0.0",
"@types/chai": "^4.3.3",
"@types/chai-as-promised": "^7.1.5",
"@microsoft/api-extractor": "^7.52.13",
"@tsconfig/node18": "^18.2.4",
"@types/chai": "^4.3.20",
"@types/chai-as-promised": "^7.1.8",
"@types/debug": "^4.1.12",
"@types/event-stream": "^4.0.0",
"@types/fs-extra": "^11.0.1",
"@types/ioredis": "^4.28.10",
"@types/event-stream": "^4.0.5",
"@types/fs-extra": "^11.0.4",
"@types/jsonwebtoken": "^8.5.9",
"@types/mime-types": "^2.1.1",
"@types/mocha": "^10.0.6",
"@types/node": "^20.17.6",
"@types/node-forge": "^1.3.0",
"@types/node-schedule": "^2.1.0",
"@types/pidusage": "^2.0.2",
"@types/prompt": "^1.1.5",
"@types/readline-sync": "^1.4.4",
"@types/semver": "^7.3.10",
"@types/sinon": "^10.0.13",
"@types/sinon-chai": "^3.2.9",
"@types/tar": "^6.1.3",
"@types/mime-types": "^3.0.1",
"@types/mocha": "^10.0.10",
"@types/node": "^20.19.17",
"@types/node-forge": "^1.3.14",
"@types/node-schedule": "^2.1.8",
"@types/pidusage": "^2.0.5",
"@types/prompt": "^1.1.9",
"@types/readline-sync": "^1.4.8",
"@types/semver": "^7.7.1",
"@types/sinon": "^17.0.4",
"@types/sinon-chai": "^3.2.12",
"@types/tar": "^6.1.13",
"@types/triple-beam": "^1.3.5",
"@types/winston-syslog": "^2.4.0",
"@types/yargs": "^17.0.8",
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
"@types/winston-syslog": "^2.4.3",
"@types/yargs": "^17.0.33",
"chai": "^4.5.0",
"chai-as-promised": "^7.1.2",
"cpy-cli": "^4.2.0",
"fs-extra": "^11.3.2",
"lerna": "^7.4.2",
"mocha": "^10.4.0",
"prettier": "^3.0.1",
"semver": "^7.5.2",
"sinon": "^15.0.0",
"mocha": "^11.7.2",
"prettier": "^3.6.2",
"semver": "^7.7.2",
"sinon": "^21.0.0",
"sinon-chai": "^3.7.0",
"ts-json-schema-generator": "~1.2.0",
"ts-json-schema-generator": "~1.5.1",
"ts-node": "^10.9.2",
"tsc-alias": "^1.8.8",
"typedoc": "^0.26.11",
"typedoc-plugin-markdown": "^4.2.10",
"typedoc-plugin-missing-exports": "^3.0.0",
"typescript": "~5.6.3"
"tsc-alias": "^1.8.16",
"typedoc": "^0.28.13",
"typedoc-plugin-markdown": "^4.9.0",
"typedoc-plugin-missing-exports": "^4.1.0",
"typescript": "~5.8.3"
},
"scripts": {
"clean": "rimraf packages/*/build packages/*/*.tsbuildinfo",
Expand Down
12 changes: 6 additions & 6 deletions packages/adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"node": ">=18.0.0"
},
"dependencies": {
"@alcalzone/pak": "^0.8.1",
"@alcalzone/pak": "^0.11.0",
"@iobroker/db-objects-file": "file:../db-objects-file",
"@iobroker/db-objects-jsonl": "file:../db-objects-jsonl",
"@iobroker/db-objects-redis": "file:../db-objects-redis",
Expand All @@ -18,12 +18,12 @@
"@iobroker/plugin-base": "~2.0.1",
"deep-clone": "^3.0.3",
"fs-extra": "^11.3.2",
"jsonwebtoken": "^9.0.0",
"node-schedule": "^2.1.0",
"node.extend": "^2.0.2",
"pidusage": "^3.0.2",
"jsonwebtoken": "^9.0.2",
"node-schedule": "^2.1.1",
"node.extend": "^2.0.3",
"pidusage": "^4.0.1",
"readline": "^1.3.0",
"semver": "^7.5.2",
"semver": "^7.7.2",
"yargs": "^17.7.2"
},
"keywords": [
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
"@iobroker/js-controller-common": "file:../common",
"@iobroker/js-controller-common-db": "file:../common-db",
"@iobroker/plugin-base": "~2.0.1",
"axios": "^1.12.0",
"chokidar": "^3.5.3",
"debug": "^4.3.4",
"axios": "^1.12.2",
"chokidar": "^3.6.0",
"debug": "^4.4.3",
"deep-clone": "^3.0.3",
"event-stream": "^4.0.1",
"fs-extra": "^11.3.2",
"mime-types": "^2.1.35",
"promisify-child-process": "^4.1.1",
"mime-types": "^3.0.1",
"promisify-child-process": "^4.1.2",
"readline-sync": "^1.4.10",
"semver": "^7.5.2",
"yargs": "^17.6.2"
"semver": "^7.7.2",
"yargs": "^17.7.2"
},
"keywords": [
"ioBroker"
Expand Down
26 changes: 13 additions & 13 deletions packages/common-db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
"node": ">=18.0.0"
},
"optionalDependencies": {
"@datalust/winston-seq": "^1.0.0",
"diskusage": "^1.1.3",
"winston-syslog": "^2.6.0"
"@datalust/winston-seq": "^1.0.2",
"diskusage": "^1.2.0",
"winston-syslog": "^2.7.1"
},
"dependencies": {
"@alcalzone/pak": "^0.8.1",
"axios": "^1.12.0",
"ci-info": "^3.8.0",
"@alcalzone/pak": "^0.11.0",
"axios": "^1.12.2",
"ci-info": "^4.3.0",
"deep-clone": "^3.0.3",
"event-stream": "^4.0.1",
"fs-extra": "^11.3.2",
"jsonwebtoken": "^9.0.0",
"node-forge": "^1.3.0",
"node.extend": "^2.0.2",
"jsonwebtoken": "^9.0.2",
"node-forge": "^1.3.1",
"node.extend": "^2.0.3",
"promisify-child-process": "^4.1.2",
"readline": "^1.3.0",
"semver": "^7.5.2",
"triple-beam": "^1.3.0",
"winston": "^3.7.2",
"semver": "^7.7.2",
"triple-beam": "^1.4.1",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0",
"winston-transport": "^4.5.0"
"winston-transport": "^4.9.0"
},
"keywords": [
"ioBroker"
Expand Down
8 changes: 5 additions & 3 deletions packages/common-db/src/lib/common/tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,16 @@ export function checkNonEditable(
// If new Object wants to update the nonEdit information
if (newObject.nonEdit?.password) {
const hash = crypto.createHash('sha256').update(newObject.nonEdit.password.toString()).digest('base64');
if (oldObject.nonEdit.passHash !== hash) {
if (oldObject.nonEdit?.passHash !== hash) {
delete newObject.nonEdit;
return false;
}
oldObject.nonEdit = deepClone(newObject.nonEdit);
delete oldObject.nonEdit.password;
if (oldObject.nonEdit) {
delete oldObject.nonEdit.password;
oldObject.nonEdit.passHash = hash;
}
delete newObject.nonEdit.password;
oldObject.nonEdit.passHash = hash;
newObject.nonEdit.passHash = hash;

copyAttributes(newObject.nonEdit, newObject, newObject);
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"optionalDependencies": {
"winston-seq-updated": "^1.0.4",
"winston-syslog": "^2.6.0"
"winston-syslog": "^2.7.1"
},
"dependencies": {
"@iobroker/db-objects-file": "file:../db-objects-file",
Expand Down
20 changes: 10 additions & 10 deletions packages/controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
"@iobroker/js-controller-common-db": "file:../common-db",
"@iobroker/plugin-base": "~2.0.1",
"@iobroker/plugin-sentry": "~2.0.4",
"axios": "^1.12.0",
"cron-parser": "^4.9.0",
"debug": "^4.3.4",
"decache": "^4.6.1",
"axios": "^1.12.2",
"cron-parser": "^5.4.0",
"debug": "^4.4.3",
"decache": "^4.6.2",
"deep-clone": "^3.0.3",
"fs-extra": "^11.3.2",
"jsonwebtoken": "^9.0.0",
"jsonwebtoken": "^9.0.2",
"loadavg-windows": "^1.1.1",
"node-schedule": "^2.1.1",
"pidusage": "^3.0.2",
"promisify-child-process": "^4.1.1",
"prompt": "^1.2.2",
"pidusage": "^4.0.1",
"promisify-child-process": "^4.1.2",
"prompt": "^1.3.0",
"readline-sync": "^1.4.10",
"semver": "^7.5.2",
"tar": "^6.2.1"
"semver": "^7.7.2",
"tar": "^7.5.1"
},
"homepage": "https://www.iobroker.com",
"description": "Updated by reinstall.js on 2018-06-11T15:19:56.688Z",
Expand Down
4 changes: 2 additions & 2 deletions packages/controller/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import type { Client as ObjectsClient } from '@iobroker/db-objects-redis';
import type { Client as StatesClient } from '@iobroker/db-states-redis';
import { Upload, PacketManager, type UpgradePacket } from '@iobroker/js-controller-cli';
import decache from 'decache';
import cronParser from 'cron-parser';
import { CronExpressionParser } from 'cron-parser';
import type { PluginHandlerSettings } from '@iobroker/plugin-base/types';
import type { GetDiskInfoResponse } from '@iobroker/js-controller-common-db/tools';
import { DEFAULT_DISK_WARNING_LEVEL, getCronExpression, getDiskWarningLevel } from '@/lib/utils.js';
Expand Down Expand Up @@ -4713,7 +4713,7 @@ async function startInstance(id: ioBroker.ObjectIDs.Instance, wakeUp = false): P
}

try {
cronParser.parseExpression(instance.common.schedule);
CronExpressionParser.parse(instance.common.schedule);
} catch (e) {
logger.error(`${hostLogPrefix} Cannot schedule start of instance ${instance._id}: ${e.message}`);
break;
Expand Down
8 changes: 4 additions & 4 deletions packages/db-objects-redis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"dependencies": {
"@iobroker/db-base": "file:../db-base",
"deep-clone": "^3.0.3",
"ioredis": "^4.28.2",
"mime-types": "^2.1.35",
"node.extend": "^2.0.2",
"semver": "^7.5.2"
"ioredis": "^5.8.0",
"mime-types": "^3.0.1",
"node.extend": "^2.0.3",
"semver": "^7.7.2"
},
"keywords": [
"ioBroker",
Expand Down
Loading
Loading