Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #1569

Merged
merged 2 commits into from
Sep 30, 2023
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
17,973 changes: 6,730 additions & 11,243 deletions package-lock.json

Large diffs are not rendered by default.

114 changes: 57 additions & 57 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"hb-service": "./dist/bin/hb-service.js"
},
"engines": {
"node": ">=16.20.2",
"homebridge": ">=1.6.0"
"node": "^18.18.0 || ^20.8.0",
"homebridge": "^1.6.0"
},
"scripts": {
"check": "npm install && npm outdated",
Expand All @@ -52,76 +52,76 @@
"upgrade-install": "./upgrade-install.sh"
},
"dependencies": {
"@fastify/helmet": "9.1.0",
"@fastify/multipart": "7.1.0",
"@fastify/static": "6.5.0",
"@fastify/swagger": "7.4.1",
"@nestjs/axios": "0.1.0",
"@nestjs/common": "9.0.8",
"@nestjs/core": "9.0.8",
"@nestjs/jwt": "9.0.0",
"@nestjs/passport": "9.0.0",
"@nestjs/platform-fastify": "9.0.8",
"@nestjs/platform-socket.io": "9.0.8",
"@nestjs/swagger": "6.0.5",
"@nestjs/websockets": "9.0.8",
"@fastify/helmet": "11.1.1",
"@fastify/multipart": "8.0.0",
"@fastify/static": "6.11.2",
"@fastify/swagger": "8.10.1",
"@nestjs/axios": "3.0.0",
"@nestjs/common": "10.2.6",
"@nestjs/core": "10.2.6",
"@nestjs/jwt": "10.1.1",
"@nestjs/passport": "10.0.2",
"@nestjs/platform-fastify": "10.2.6",
"@nestjs/platform-socket.io": "10.2.6",
"@nestjs/swagger": "7.1.12",
"@nestjs/websockets": "10.2.6",
"@oznu/hap-client": "1.9.0",
"axios": "0.27.2",
"axios": "1.5.1",
"class-transformer": "0.5.1",
"class-validator": "0.13.2",
"commander": "6.2.1",
"dayjs": "1.11.4",
"fastify": "4.3.0",
"class-validator": "0.14.0",
"commander": "7.2.0",
"dayjs": "1.11.10",
"fastify": "4.23.2",
"fs-extra": "10.1.0",
"node-cache": "5.1.2",
"node-pty-prebuilt-multiarch": "0.10.1-pre.5",
"node-schedule": "2.1.0",
"ora": "5.3.0",
"node-schedule": "2.1.1",
"ora": "5.4.1",
"p-limit": "3.1.0",
"passport": "0.6.0",
"passport-jwt": "4.0.0",
"passport-jwt": "4.0.1",
"reflect-metadata": "0.1.13",
"rxjs": "7.5.6",
"semver": "7.3.7",
"rxjs": "7.8.1",
"semver": "7.5.4",
"systeminformation": "5.16.9",
"tail": "2.2.4",
"tar": "6.1.11",
"tail": "2.2.6",
"tar": "6.2.0",
"tcp-port-used": "1.0.2",
"unzipper": "0.10.11"
"unzipper": "0.10.14"
},
"devDependencies": {
"@nestjs/testing": "^9.0.8",
"@types/fs-extra": "^9.0.12",
"@types/jest": "^29.5.1",
"@types/node": "^16.11.47",
"@types/node-schedule": "^2.1.0",
"@types/semver": "7.3.10",
"@types/tar": "^6.1.2",
"@types/unzipper": "^0.10.5",
"@typescript-eslint/eslint-plugin": "^5.32.0",
"@typescript-eslint/parser": "^5.32.0",
"babel-jest": "^29.5.0",
"bash-color": "0.0.4",
"@nestjs/testing": "^10.2.6",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^29.5.5",
"@types/node": "^18.18.1",
"@types/node-schedule": "^2.1.1",
"@types/semver": "7.5.3",
"@types/tar": "^6.1.6",
"@types/unzipper": "^0.10.7",
"@typescript-eslint/eslint-plugin": "^6.7.3",
"@typescript-eslint/parser": "^6.7.3",
"babel-jest": "^29.7.0",
"bash-color": "^0.0.4",
"buffer-shims": "^1.0.0",
"concurrently": "^7.3.0",
"eslint": "^8.21.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.7.0",
"concurrently": "^8.2.1",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^27.4.2",
"form-data": "^4.0.0",
"jest": "^29.5.0",
"lodash": "^4.17.20",
"nodemon": "^2.0.19",
"jest": "^29.7.0",
"lodash": "^4.17.21",
"nodemon": "^3.0.1",
"otplib": "^12.0.1",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
"ts-jest": "^29.1.0",
"ts-loader": "^9.3.1",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
"ts-jest": "^29.1.1",
"ts-loader": "^9.4.4",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.0",
"typescript": "^4.7.4",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.2.2",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"webpack-node-externals": "^3.0.0"
},
"keywords": [
Expand Down Expand Up @@ -152,4 +152,4 @@
"smart home",
"hb-service"
]
}
}
4 changes: 2 additions & 2 deletions src/bin/hb-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ export class HomebridgeServiceHelper {
if (
this.homebridgePackage &&
process.env.UIX_STRICT_PLUGIN_RESOLUTION === '1' &&
semver.gte(this.homebridgePackage.version, '1.4.1-beta.1', { includePrerelease: true })
semver.gtr(this.homebridgePackage.version, '1.4.1-beta.1', { includePrerelease: true })
) {
if (!this.homebridgeOpts.includes('--strict-plugin-resolution')) {
this.homebridgeOpts.push('--strict-plugin-resolution');
Expand Down Expand Up @@ -1089,7 +1089,7 @@ export class HomebridgeServiceHelper {
}

// check if keep orphans should be enabled, only for Homebridge v1.0.2 and later
if (this.homebridgePackage && semver.gte(this.homebridgePackage.version, '1.0.2', { includePrerelease: true })) {
if (this.homebridgePackage && semver.gtr(this.homebridgePackage.version, '1.0.2', { includePrerelease: true })) {
if (homebridgeStartupOptions.keepOrphans && !this.homebridgeOpts.includes('-K')) {
this.homebridgeOpts.push('-K');
}
Expand Down
6 changes: 3 additions & 3 deletions src/modules/plugins/plugins.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ export class PluginsService {
if (
homebridgeVersion.major === 1 &&
homebridgeVersion.minor === 2 &&
semver.gt(homebridge.installedVersion, homebridge.latestVersion, { includePrerelease: true })
semver.gtr(homebridge.installedVersion, homebridge.latestVersion, { includePrerelease: true })
) {
const versions = await this.getAvailablePluginVersions('homebridge');
if (versions.tags['release-1.2.x'] && semver.gt(versions.tags['release-1.2.x'], homebridge.installedVersion)) {
Expand All @@ -495,10 +495,10 @@ export class PluginsService {
// show beta updates if the user is currently running a beta release
if (
homebridgeVersion.prerelease[0] === 'beta' &&
semver.gt(homebridge.installedVersion, homebridge.latestVersion, { includePrerelease: true })
semver.gtr(homebridge.installedVersion, homebridge.latestVersion, { includePrerelease: true })
) {
const versions = await this.getAvailablePluginVersions('homebridge');
if (versions.tags['beta'] && semver.gt(versions.tags['beta'], homebridge.installedVersion, { includePrerelease: true })) {
if (versions.tags['beta'] && semver.gtr(versions.tags['beta'], homebridge.installedVersion, { includePrerelease: true })) {
homebridge.updateAvailable = true;
homebridge.latestVersion = versions.tags['beta'];
}
Expand Down
6 changes: 3 additions & 3 deletions src/modules/status/status.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class StatusService {
// TODO: be able to specify in the ui the unit size (i.e. bytes, megabytes, gigabytes)
const tx_rx_sec = (net[0].tx_sec + net[0].rx_sec) / 1024 / 1024;

// TODO: break out the sent and received figures to two separate stacked graphs
// TODO: break out the sent and received figures to two separate stacked graphs
// (these should ideally be positive/negative mirrored linecharts)
return { net: net[0], point: tx_rx_sec };
}
Expand Down Expand Up @@ -286,7 +286,7 @@ export class StatusService {
client.emit('homebridge-status', await this.getHomebridgeStats());

// ipc status events are only available in Homebridge 1.3.3 or later - and when running in service mode
if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gt(this.configService.homebridgeVersion, '1.3.3-beta.5', { includePrerelease: true })) {
if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gtr(this.configService.homebridgeVersion, '1.3.3-beta.5', { includePrerelease: true })) {
homebridgeStatusChangeSub = this.homebridgeStatusChange.subscribe(async (status) => {
client.emit('homebridge-status', await this.getHomebridgeStats());
});
Expand Down Expand Up @@ -332,7 +332,7 @@ export class StatusService {
* Check if homebridge is running on the local system
*/
public async checkHomebridgeStatus() {
if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gt(this.configService.homebridgeVersion, '1.3.3-beta.5', { includePrerelease: true })) {
if (this.configService.serviceMode && this.configService.homebridgeVersion && semver.gtr(this.configService.homebridgeVersion, '1.3.3-beta.5', { includePrerelease: true })) {
return this.homebridgeStatus;
}

Expand Down
8 changes: 4 additions & 4 deletions test/e2e/status.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as path from 'path';
import * as fs from 'fs-extra';
import { AxiosResponse, AxiosError } from 'axios';
import { AxiosResponse, AxiosError, InternalAxiosRequestConfig } from 'axios';
import { of, throwError } from 'rxjs';
import { ValidationPipe } from '@nestjs/common';
import { HttpService } from '@nestjs/axios';
Expand Down Expand Up @@ -126,7 +126,7 @@ describe('StatusController (e2e)', () => {
const response: AxiosResponse<any> = {
data: {},
headers: {},
config: { url: 'http://localhost:51826' },
config: { url: 'http://localhost:51826' } as InternalAxiosRequestConfig,
status: 404,
statusText: 'Not Found',
};
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('StatusController (e2e)', () => {
isAxiosError: true,
code: null,
response: null,
config: { url: 'http://localhost:51826' },
config: { url: 'http://localhost:51826' } as InternalAxiosRequestConfig,
};

jest.spyOn(httpService, 'get')
Expand Down Expand Up @@ -202,7 +202,7 @@ describe('StatusController (e2e)', () => {
const response: AxiosResponse<any> = {
data,
headers: {},
config: { url: 'https://nodejs.org/dist/index.json' },
config: { url: 'https://nodejs.org/dist/index.json' } as InternalAxiosRequestConfig,
status: 200,
statusText: 'OK',
};
Expand Down
1 change: 0 additions & 1 deletion test/jest-e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
"^.+\\.(t|j)s$": "ts-jest"
},
"collectCoverageFrom": ["**/*.ts"],
"setupFiles": ["./test/setup.ts"],
"coveragePathIgnorePatterns": ["/ui/", "/test/", "/dist/", "/scripts/"]
}
7 changes: 0 additions & 7 deletions test/setup.ts

This file was deleted.

Loading