Skip to content
Snippets Groups Projects
Unverified Commit 5d1cb28e authored by Pierre Lehnen's avatar Pierre Lehnen Committed by GitHub
Browse files

chore: rename VoIP service to VoipAsterisk (#32377)

parent dd0bbcec
No related branches found
No related tags found
No related merge requests found
Showing
with 24 additions and 24 deletions
......@@ -22,7 +22,7 @@
/apps/meteor/server/models @RocketChat/Architecture
apps/meteor/server/startup/migrations @RocketChat/Architecture
/apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
/apps/meteor/server/services/voip @RocketChat/omnichannel
/apps/meteor/server/services/voip-asterisk @RocketChat/omnichannel
/apps/meteor/server/services/omnichannel-voip @RocketChat/omnichannel
/apps/meteor/server/features/EmailInbox @RocketChat/omnichannel
/apps/meteor/ee/app/canned-responses @RocketChat/omnichannel
......
import { Voip } from '@rocket.chat/core-services';
import { VoipAsterisk } from '@rocket.chat/core-services';
import type { IVoipExtensionBase } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
import { Match, check } from 'meteor/check';
......@@ -14,7 +14,7 @@ API.v1.addRoute(
{ authRequired: true, permissionsRequired: ['manage-voip-call-settings'] },
{
async get() {
const version = await Voip.getConnectorVersion();
const version = await VoipAsterisk.getConnectorVersion();
return API.v1.success(version);
},
},
......@@ -26,7 +26,7 @@ API.v1.addRoute(
{ authRequired: true, permissionsRequired: ['manage-voip-call-settings'] },
{
async get() {
const list = await Voip.getExtensionList();
const list = await VoipAsterisk.getExtensionList();
const result = list.result as IVoipExtensionBase[];
return API.v1.success({ extensions: result });
},
......@@ -48,7 +48,7 @@ API.v1.addRoute(
extension: String,
}),
);
const endpointDetails = await Voip.getExtensionDetails(this.queryParams);
const endpointDetails = await VoipAsterisk.getExtensionDetails(this.queryParams);
return API.v1.success({ ...endpointDetails.result });
},
},
......@@ -68,7 +68,7 @@ API.v1.addRoute(
extension: String,
}),
);
const endpointDetails = await Voip.getRegistrationInfo(this.queryParams);
const endpointDetails = await VoipAsterisk.getRegistrationInfo(this.queryParams);
const encKey = settings.get<string>('VoIP_JWT_Secret');
if (!encKey) {
logger.warn('No JWT keys set. Sending registration info as plain text');
......@@ -111,7 +111,7 @@ API.v1.addRoute(
return API.v1.notFound('Extension not found');
}
const endpointDetails = await Voip.getRegistrationInfo({ extension });
const endpointDetails = await VoipAsterisk.getRegistrationInfo({ extension });
const encKey = settings.get<string>('VoIP_JWT_Secret');
if (!encKey) {
logger.warn('No JWT keys set. Sending registration info as plain text');
......
import { Voip } from '@rocket.chat/core-services';
import { VoipAsterisk } from '@rocket.chat/core-services';
import type { IVoipConnectorResult, IQueueSummary, IQueueMembershipDetails, IQueueMembershipSubscription } from '@rocket.chat/core-typings';
import { Match, check } from 'meteor/check';
......@@ -9,7 +9,7 @@ API.v1.addRoute(
{ authRequired: true, permissionsRequired: ['inbound-voip-calls'] },
{
async get() {
const queueSummary = await Voip.getQueueSummary();
const queueSummary = await VoipAsterisk.getQueueSummary();
return API.v1.success({ summary: queueSummary.result as IQueueSummary[] });
},
},
......@@ -26,7 +26,7 @@ API.v1.addRoute(
extension: String,
}),
);
const membershipDetails: IVoipConnectorResult = await Voip.getQueuedCallsForThisExtension(this.queryParams);
const membershipDetails: IVoipConnectorResult = await VoipAsterisk.getQueuedCallsForThisExtension(this.queryParams);
return API.v1.success(membershipDetails.result as IQueueMembershipDetails);
},
},
......@@ -43,7 +43,7 @@ API.v1.addRoute(
extension: String,
}),
);
const membershipDetails: IVoipConnectorResult = await Voip.getQueueMembership(this.queryParams);
const membershipDetails: IVoipConnectorResult = await VoipAsterisk.getQueueMembership(this.queryParams);
return API.v1.success(membershipDetails.result as IQueueMembershipSubscription);
},
},
......
import { Voip } from '@rocket.chat/core-services';
import { VoipAsterisk } from '@rocket.chat/core-services';
import { Match, check } from 'meteor/check';
import { API } from '../../api';
......@@ -18,7 +18,7 @@ API.v1.addRoute(
}),
);
const { host, port, username, password } = this.queryParams;
return API.v1.success(await Voip.checkManagementConnection(host, port, username, password));
return API.v1.success(await VoipAsterisk.checkManagementConnection(host, port, username, password));
},
},
);
......@@ -53,7 +53,7 @@ API.v1.addRoute(
}
}
return API.v1.success(await Voip.checkCallserverConnection(socketUrl));
return API.v1.success(await VoipAsterisk.checkCallserverConnection(socketUrl));
},
},
);
import { Voip } from '@rocket.chat/core-services';
import { VoipAsterisk } from '@rocket.chat/core-services';
import { settings } from '../../settings/server';
settings.watch('VoIP_Enabled', async (value: boolean) => {
try {
if (value) {
await Voip.init();
await VoipAsterisk.init();
} else {
await Voip.stop();
await VoipAsterisk.stop();
}
} catch (e) {
// do nothing
......@@ -21,7 +21,7 @@ settings.changeMultiple(
// So to avoid stopping/starting voip too often, we debounce the call and restart 1 second after the last setting has reached us.
if (settings.get('VoIP_Enabled')) {
try {
await Voip.refresh();
await VoipAsterisk.refresh();
} catch (e) {
// do nothing
}
......
import type { IOmnichannelVoipService, FindVoipRoomsParams } from '@rocket.chat/core-services';
import { api, ServiceClassInternal, Voip } from '@rocket.chat/core-services';
import { api, ServiceClassInternal, VoipAsterisk } from '@rocket.chat/core-services';
import type {
IVoipExtensionBase,
IVoipExtensionWithAgentInfo,
......@@ -197,7 +197,7 @@ export class OmnichannelVoipService extends ServiceClassInternal implements IOmn
}
async getFreeExtensions(): Promise<string[]> {
const allExtensions = await Voip.getExtensionList();
const allExtensions = await VoipAsterisk.getExtensionList();
const allocatedExtensions = await this.getAllocatedExtesionAllocationData({
extension: 1,
});
......@@ -349,8 +349,8 @@ export class OmnichannelVoipService extends ServiceClassInternal implements IOmn
}
async getExtensionListWithAgentData(): Promise<IVoipExtensionWithAgentInfo[]> {
const { result: extensions } = await Voip.getExtensionList();
const summary = await (await Voip.cachedQueueDetails())();
const { result: extensions } = await VoipAsterisk.getExtensionList();
const summary = await (await VoipAsterisk.cachedQueueDetails())();
const allocatedExtensions = await this.getAllocatedExtesionAllocationData({
extension: 1,
_id: 1,
......
......@@ -30,7 +30,7 @@ import { UiKitCoreAppService } from './uikit-core-app/service';
import { UploadService } from './upload/service';
import { UserService } from './user/service';
import { VideoConfService } from './video-conference/service';
import { VoipService } from './voip/service';
import { VoipAsteriskService } from './voip-asterisk/service';
export const registerServices = async (): Promise<void> => {
const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;
......@@ -46,7 +46,7 @@ export const registerServices = async (): Promise<void> => {
api.registerService(new NPSService());
api.registerService(new RoomService());
api.registerService(new SAUMonitorService());
api.registerService(new VoipService(db));
api.registerService(new VoipAsteriskService(db));
api.registerService(new OmnichannelService());
api.registerService(new OmnichannelVoipService());
api.registerService(new TeamService());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment