Merge branch 'development'

Author: KillerJulian

insomnia.yml

@@ -9,18 +9,18 @@
 	"author": "KillerJulian <info@killerjulian.de>",
 	"license": "MIT",
 	"dependencies": {
-		"axios": "^1.4.0",
-		"tslib": "^2.6.0"
+		"axios": "^1.6.2",
+		"tslib": "^2.6.2"
 	},
 	"devDependencies": {
-		"@types/node": "^16.18.39",
-		"@typescript-eslint/eslint-plugin": "6.1.0",
-		"@typescript-eslint/parser": "6.1.0",
-		"eslint": "8.45.0",
-		"eslint-config-prettier": "8.8.0",
-		"prettier": "3.0.0",
-		"typescript": "5.1.6",
-		"typedoc": "~0.24.8"
+		"@types/node": "^16.18.65",
+		"@typescript-eslint/eslint-plugin": "6.12.0",
+		"@typescript-eslint/parser": "6.12.0",
+		"eslint": "8.54.0",
+		"eslint-config-prettier": "9.0.0",
+		"prettier": "3.1.0",
+		"typescript": "^5.3.2",
+		"typedoc": "~0.25.3"
 	},
 	"scripts": {
 		"build": "yarn build:lib && yarn build:docs",

package.json

@@ -17,7 +17,7 @@ export type BoxData = {
 	currentLocation: BoxLocation;
 	loc: BoxLoc[];
 	updatedAt: RFC3339Date;
-	sensors: Sensor<Measurement | LastMeasurement | Measurement['_id']>[];
+	sensors: Sensor<Measurement | LastMeasurement | Measurement['_id'] | null>[];
 	lastMeasurementAt?: RFC3339Date;
 };
 
@@ -93,7 +93,7 @@ export type TTN = {
  * @linkcode https://github.com/sensebox/openSenseMap-API/blob/2e645bdc4c80e668720b5eaaf384a35d2909569e/packages/models/src/sensor/sensor.js#L8
  * @linkcode https://github.com/sensebox/openSenseMap-API/blob/2e645bdc4c80e668720b5eaaf384a35d2909569e/packages/models/src/box/box.js#L1057
  */
-export type Sensor<T extends Measurement | LastMeasurement | Measurement['_id'] | undefined> = {
+export type Sensor<T extends Measurement | LastMeasurement | Measurement['_id'] | null | undefined> = {
 	_id: OpenSenseMapID;
 	title: string;
 	unit: string;

src/api/box/_boxModels.ts

@@ -6,6 +6,7 @@ export * from './_boxModels';
 export * from './claimBox';
 export * from './createTransfer';
 export * from './deleteBox';
+export * from './getAllTags';
 export * from './getBox';
 export * from './getBoxLocations';
 export * from './getBoxes';

src/api/box/_index.ts

@@ -2,7 +2,6 @@ import axios from 'axios';
 import { OpenSenseMapID } from '../globalTypes';
 
 /**
- * ❗❗ BREAKING CHANGE!
  * @see https://docs.opensensemap.org/#api-Boxes-deleteBox
  */
 export async function deleteBox(senseBoxId: OpenSenseMapID, password: string, authorization: string): Promise<DeleteBoxResult> {

src/api/box/deleteBox.ts

@@ -0,0 +1,16 @@
+import axios from 'axios';
+
+/**
+ * @see https://docs.opensensemap.org/#api-Boxes-getAllTags
+ */
+export async function getAllTags(): Promise<GetAllTagsResult> {
+	return (await axios.get(`https://api.opensensemap.org/tags`)).data;
+}
+
+/**
+ * @linkcode https://github.com/sensebox/openSenseMap-API/blob/11695a33cf0260a62aecbefd76c46735b690be62/packages/api/lib/controllers/boxesController.js#L704C5-L704C5
+ */
+export type GetAllTagsResult = {
+	code: 'Ok';
+	data: string[];
+};

src/api/box/getAllTags.ts

@@ -33,10 +33,15 @@ export async function postNewBox(
 }
 
 export type PostNewBoxOptions = {
+	description?: string;
 	grouptag?: string;
 	model?: BoxModel;
 	sensors?: PostNewBoxSensor[];
 	sensorTemplates?: SensorTemplates[];
+	serialPort?: 'Serial1' | 'Serial2';
+	soilDigitalPort?: 'A' | 'B' | 'C';
+	soundMeterPort?: 'A' | 'B' | 'C';
+	windSpeedPort?: 'A' | 'B' | 'C';
 	mqtt?: MQTT;
 	ttn?: TTN;
 	useAuth?: boolean;

src/api/box/postNewBox.ts

@@ -11,6 +11,7 @@ export type UserData = {
 	boxes: OpenSenseMapID[];
 	sharedBoxes?: OpenSenseMapID[];
 	emailIsConfirmed: boolean;
+	integrations?: object;
 };
 
 /**

src/api/user/_userModels.ts

@@ -21,7 +21,8 @@ export async function register(userName: UserName, email: string, password: stri
 }
 
 export type RegisterOptions = {
-	language: Language;
+	language?: Language;
+	integrations?: object;
 };
 
 /**

src/api/user/register.ts

@@ -28,6 +28,7 @@ export type UpdateUserOptions = {
 	language?: Language;
 	name?: string;
 	newPassword?: string;
+	integrations?: object;
 };
 
 export type UpdateUserResult = UpdateUserResultResultUpdated | UpdateUserResultUserNotUpdated;
@@ -47,12 +48,9 @@ export type UpdateUserResultResultUpdated = {
 };
 
 /**
- * @linkcode https://github.com/sensebox/openSenseMap-API/blob/2e645bdc4c80e668720b5eaaf384a35d2909569e/packages/models/src/user/user.js#L533
+ * @linkcode https://github.com/sensebox/openSenseMap-API/blob/11695a33cf0260a62aecbefd76c46735b690be62/packages/api/lib/controllers/usersController.js#L320
  */
 export type UpdateUserResultUserNotUpdated = {
 	code: 'Ok';
-	message: 'User successfully saved.';
-	data: {
-		me: { updated: false };
-	};
+	message: 'No changed properties supplied. User remains unchanged.';
 };