+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
import { ACElectricUtils, DCElectricUtils } from '../../../utils/ElectricUtils';
import { AuthorizeRequest, OCPP16AuthorizeResponse, OCPP16StartTransactionResponse, OCPP16StopTransactionReason, OCPP16StopTransactionResponse, StartTransactionRequest, StopTransactionRequest } from '../../../types/ocpp/1.6/Transaction';
import { CurrentType, Voltage } from '../../../types/ChargingStationTemplate';
import { MeterValueUnit, MeterValuesRequest, OCPP16MeterValue, OCPP16MeterValueMeasurand, OCPP16MeterValuePhase } from '../../../types/ocpp/1.6/MeterValues';
import Constants from '../../../utils/Constants';
+import { ErrorType } from '../../../types/ocpp/ErrorType';
import MeasurandPerPhaseSampledValueTemplates from '../../../types/MeasurandPerPhaseSampledValueTemplates';
import MeasurandValues from '../../../types/MeasurandValues';
import { MessageType } from '../../../types/ocpp/MessageType';
import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus';
import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus';
import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
-import OCPPError from '../../OCPPError';
+import OCPPError from '../OCPPError';
import OCPPRequestService from '../OCPPRequestService';
import Utils from '../../../utils/Utils';
import logger from '../../../utils/Logger';
break;
default:
logger.error(errMsg);
- throw new Error(errMsg);
+ throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg);
}
meterValue.sampledValue.push(OCPP16ServiceUtils.buildSampledValue(powerSampledValueTemplate, powerMeasurandValues.allPhases));
const sampledValuesIndex = meterValue.sampledValue.length - 1;
break;
default:
logger.error(errMsg);
- throw new Error(errMsg);
+ throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg);
}
meterValue.sampledValue.push(OCPP16ServiceUtils.buildSampledValue(currentSampledValueTemplate, currentMeasurandValues.allPhases));
const sampledValuesIndex = meterValue.sampledValue.length - 1;
const payload: MeterValuesRequest = {
connectorId,
transactionId,
- meterValue,
+ meterValue: [meterValue],
};
await this.sendMessage(Utils.generateUUID(), payload, MessageType.CALL_MESSAGE, OCPP16RequestCommand.METER_VALUES);
} catch (error) {
const payload: MeterValuesRequest = {
connectorId,
transactionId,
- meterValue: beginMeterValue,
+ meterValue: [beginMeterValue],
};
await this.sendMessage(Utils.generateUUID(), payload, MessageType.CALL_MESSAGE, OCPP16RequestCommand.METER_VALUES);
} catch (error) {
const payload: MeterValuesRequest = {
connectorId,
transactionId,
- meterValue: endMeterValue,
+ meterValue: [endMeterValue],
};
await this.sendMessage(Utils.generateUUID(), payload, MessageType.CALL_MESSAGE, OCPP16RequestCommand.METER_VALUES);
} catch (error) {
public async sendError(messageId: string, error: OCPPError, commandName: OCPP16RequestCommand | OCPP16IncomingRequestCommand): Promise<unknown> {
try {
// Send error
- return this.sendMessage(messageId, error, MessageType.CALL_ERROR_MESSAGE, commandName);
+ return await this.sendMessage(messageId, error, MessageType.CALL_ERROR_MESSAGE, commandName);
} catch (err) {
this.handleRequestError(commandName as OCPP16RequestCommand, err);
}