diff --git a/.run/backend.pid b/.run/backend.pid index 1b417da..5fec386 100644 --- a/.run/backend.pid +++ b/.run/backend.pid @@ -1 +1 @@ -694518 +3040029 diff --git a/.run/frontend.pid b/.run/frontend.pid index 72869cb..851a07f 100644 --- a/.run/frontend.pid +++ b/.run/frontend.pid @@ -1 +1 @@ -694649 +3040110 diff --git a/cti_app/src/components/application-components/locales/En/English.json b/cti_app/src/components/application-components/locales/En/English.json index 6174f5f..28849fc 100644 --- a/cti_app/src/components/application-components/locales/En/English.json +++ b/cti_app/src/components/application-components/locales/En/English.json @@ -498,6 +498,7 @@ "trunk_of": "Trunk Of", "title": "Trunks", "trunk_placeholder": "Select Trunk", + "missing_trunk": "Missing SIP trunk (remove and reassign)", "row_trunk": "SIP Trunk", "row_duration": "Duration (min)", "row_status": "Enable", @@ -1281,6 +1282,7 @@ "lastName": "Last Name", "firstName": "First Name", "companyName": "Company Name", + "companyName_error": "Enter company name", "lastName_error": "Enter last name", "firstName_error": "Enter First Name", "email": "Email", diff --git a/cti_app/src/components/application-components/locales/Pe/Persian.json b/cti_app/src/components/application-components/locales/Pe/Persian.json index e4c716c..39d36f2 100644 --- a/cti_app/src/components/application-components/locales/Pe/Persian.json +++ b/cti_app/src/components/application-components/locales/Pe/Persian.json @@ -485,6 +485,7 @@ "trunk": { "sip_trunk": "ترانک", "trunk_placeholder": "انتخاب ترانک...", + "missing_trunk": "ترانک سیپ موجود نیست؛ حذف و دوباره انتخاب کنید", "duration": "(دقیقه)مدت زمان", "trunk_of": "ترانک های", "title": "تنظیمات ترانک", @@ -1280,6 +1281,7 @@ "firstName": "نام", "lastName": "نام خانوادگی", "companyName": "نام شرکت", + "companyName_error": "نام شرکت را وارد کنید", "firstName_error": "نام را وارد کنید", "lastName_error": "نام خانوادگی را وارد کنید", "email": "ایمیل", diff --git a/cti_app/src/components/context/AppInfoContext.tsx b/cti_app/src/components/context/AppInfoContext.tsx index aeb91d0..332b6bf 100644 --- a/cti_app/src/components/context/AppInfoContext.tsx +++ b/cti_app/src/components/context/AppInfoContext.tsx @@ -8,6 +8,7 @@ export interface IAppInfo { website?: string; serial?: string; confirm_link?: string; + license_mode?: string; mobile?: string; } interface IAppInfoContext { @@ -33,6 +34,7 @@ export const AppInfoProvider = ({ children }: { children: ReactNode }) => { website: response.data.website, serial: response.data.serial, confirm_link: response.data.confirm_link, + license_mode: response.data.license_mode, }; setAppInfo(data); } diff --git a/cti_app/src/components/pages/Licence/Step1.tsx b/cti_app/src/components/pages/Licence/Step1.tsx index 45e60bb..34eb367 100644 --- a/cti_app/src/components/pages/Licence/Step1.tsx +++ b/cti_app/src/components/pages/Licence/Step1.tsx @@ -28,7 +28,7 @@ const Step1 = () => { if (!correct) { target.mobileNumber = '0' + target.mobileNumber; } - setAppInfo({ ...appInfo, mobile: state.mobileNumber }); + setAppInfo({ ...appInfo, mobile: target.mobileNumber }); validationError(); if (validate()) { const requestPromise = RequestService.PostRequest( diff --git a/cti_app/src/components/pages/Licence/Step3.tsx b/cti_app/src/components/pages/Licence/Step3.tsx index a7ed4c1..6192cb8 100644 --- a/cti_app/src/components/pages/Licence/Step3.tsx +++ b/cti_app/src/components/pages/Licence/Step3.tsx @@ -17,6 +17,7 @@ const Step3 = () => { const [response, setResponse] = useState(); const { goToStep } = useWizard(); const { appInfo } = useContext(AppInfoContext); + const usesRay2Api = appInfo.license_mode === "ray2"; const [state, setState] = useState({ serial: appInfo.serial || "", f_name: "", @@ -24,6 +25,8 @@ const Step3 = () => { company_name: "", email: "", mobile_number: appInfo.mobile || "", + phone_number: "", + address: "", type_job: "", }); const [error, setError] = useState({ @@ -31,26 +34,20 @@ const Step3 = () => { mobile_number: false, f_name: false, l_name: false, + company_name: false, email: false, }); - const validationError = () => { - const newError = { + const validate = () => { + const validationErrors = { serial: state.serial.trim() === "", mobile_number: state.mobile_number.trim() === "", f_name: state.f_name.trim() === "", l_name: state.l_name.trim() === "", + company_name: usesRay2Api && state.company_name.trim() === "", email: state.email ? !PlineTools.isValidEmail(state.email) : false, }; - setError(newError); - }; - - const validate = () => { - return !Object.values(error).some(Boolean) && - state.serial.trim() !== "" && - state.mobile_number.trim() !== "" && - state.f_name.trim() !== "" && - state.l_name.trim() !== "" && - (!state.email || PlineTools.isValidEmail(state.email)); + setError(validationErrors); + return !Object.values(validationErrors).some(Boolean); }; useEffect(() => { @@ -66,6 +63,10 @@ const Step3 = () => { company_name: state.company_name, email: state.email, mobile_number: state.mobile_number, + ...(usesRay2Api ? { + phone_number: state.phone_number, + address: state.address, + } : {}), type_job: state.type_job, }, }; @@ -74,7 +75,6 @@ const Step3 = () => { if (state.mobile_number.trim() === "") toast.error("Mobile number is required", { id: "mobile-error" }); return; } - validationError(); if (validate()) { RequestService.PostRequest( "/app/register", @@ -135,6 +135,10 @@ const Step3 = () => { setState={setState} label={t("license.online.companyName")} value={state.company_name} + error={error.company_name} + setError={setError} + message={t("license.online.companyName_error")} + star={usesRay2Api} /> { message="Invalid Email format" /> + {usesRay2Api && ( + + + + + )} { goToStep(0); diff --git a/cti_app/src/components/pages/call-routes/outbound/trunks/Trunks.tsx b/cti_app/src/components/pages/call-routes/outbound/trunks/Trunks.tsx index db6c5de..560de70 100644 --- a/cti_app/src/components/pages/call-routes/outbound/trunks/Trunks.tsx +++ b/cti_app/src/components/pages/call-routes/outbound/trunks/Trunks.tsx @@ -164,6 +164,8 @@ const Trunks = (props: any) => { const columns = [ { field: "sipTrunk.name", + valueGetter: (params: any) => + params.data?.sipTrunk?.name ?? t("outboundRoute.trunk.missing_trunk"), headerName: t("outboundRoute.trunk.row_trunk"), rowDrag: true, sortable: false, @@ -310,8 +312,8 @@ const Trunks = (props: any) => { if (clipboardData.every((obj: any) => isValidTrunk(obj))) { const uniqueData = clipboardData.filter((newData: any) => { const isDuplicate = rowData.some((existingData: any) => - existingData.sipTrunk.name - ? existingData.sipTrunk.name === newData.sipTrunk.name + existingData.sipTrunk?.name + ? existingData.sipTrunk.name === newData.sipTrunk?.name : existingData.id === newData.id ); return !isDuplicate; diff --git a/cti_app/src/components/pages/sip/sip-users/SipUsers.tsx b/cti_app/src/components/pages/sip/sip-users/SipUsers.tsx index a2b845a..4cb2d35 100644 --- a/cti_app/src/components/pages/sip/sip-users/SipUsers.tsx +++ b/cti_app/src/components/pages/sip/sip-users/SipUsers.tsx @@ -250,6 +250,9 @@ const SipUsers = () => { setIsDeleteModalVisible(false); return; } + if (result.Error) { + return; + } toast.success(t("toasts.successful_delete") + ` {${deleteItem.name}}`, { id: "success-delete", }); diff --git a/cti_app/src/components/pages/sip/sip-users/SipUsersForm.tsx b/cti_app/src/components/pages/sip/sip-users/SipUsersForm.tsx index d27fde3..ec60b9e 100644 --- a/cti_app/src/components/pages/sip/sip-users/SipUsersForm.tsx +++ b/cti_app/src/components/pages/sip/sip-users/SipUsersForm.tsx @@ -47,7 +47,6 @@ const SipUsersForm = () => { sipUserGroup: { id: 1, }, - deadTime: "", callWaiting: false, dnd: false, allowCallBack: true, @@ -146,19 +145,22 @@ const SipUsersForm = () => { updatedState.uid, ); } + const payload = { ...updatedState }; + // These fields are form-only/empty on creation and do not belong in the API body. + if (payload.id == null) delete payload.id; if (validate()) { const url = "/sip-users"; const requestPromise = state.id == null ? RequestService.PostRequest( url, - updatedState, + payload, AccessCodeSip.SipUsers, RequestActions.Create, ) : RequestService.PatchRequest( url, - updatedState, + payload, AccessCodeSip.SipUsers, RequestActions.Update, ); diff --git a/cti_app/src/components/services/PlineTools.tsx b/cti_app/src/components/services/PlineTools.tsx index 5b92e4a..c6109b8 100644 --- a/cti_app/src/components/services/PlineTools.tsx +++ b/cti_app/src/components/services/PlineTools.tsx @@ -311,7 +311,9 @@ export default class PlineTools { return result.length === 0; }; public static duplicateTrunk = (array: any) => { - let data = array.map((a: any) => a.sipTrunk.id); + let data = array + .map((a: any) => a?.sipTrunk?.id) + .filter((id: any) => id != null && id !== 0); let findDuplicates = (arr: any) => arr.filter((item: any, index: any) => arr.indexOf(item) !== index); let result = findDuplicates(data); diff --git a/installer/online-installer.tar.gz b/installer/online-installer.tar.gz new file mode 100644 index 0000000..e350f5b Binary files /dev/null and b/installer/online-installer.tar.gz differ diff --git a/logs/backend/backend.log b/logs/backend/backend.log index 6c181aa..73401cb 100644 --- a/logs/backend/backend.log +++ b/logs/backend/backend.log @@ -18,7 +18,7 @@ WARNING: sun.misc.Unsafe::objectFieldOffset will be removed in a future release [INFO] Nothing to compile - all classes are up to date. [INFO] [INFO] --- maven-resources-plugin:3.5.0:testResources (default-testResources) @ raymandcti --- -[INFO] skip non existing resourceDirectory /home/aslani/Desktop/Projects/cti/p-line/src/test/resources +[INFO] skip non existing resourceDirectory /home/it003/Desktop/project/cti/p-line/src/test/resources [INFO] [INFO] --- maven-compiler-plugin:3.15.0:testCompile (default-testCompile) @ raymandcti --- [INFO] Nothing to compile - all classes are up to date. @@ -43,542 +43,103 @@ Exec: /usr/bin/timedatectl show | grep Timezone Host serial unavailable; check hardware ID command availability and service permissions. Exec: /usr/bin/timedatectl show | grep Timezone +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false +false App Name: RaymandCTI Exec: /usr/bin/date +%A Exec: /usr/bin/date +%T Exec: /usr/bin/date +%F Exec: /usr/bin/timedatectl show | grep Timezone -Date-Time: Friday 22:29:53 - 2026/10/16 (Asia/Tehran) +Date-Time: Monday 13:05:11 - 2026/10/19 (Asia/Tehran) HDD: Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -/dev/nvme1n1p5 467 GB 173 GB 197 GB +/dev/sda2 233 GB 61 GB 73 GB App WbSite: http://raymandcti.com/ App Footer: Copyright Raymand Communications Naqsh Jahan, Inc. All Rights Reserved App Version: 3.0.0 App Serial: 0000-0000-0000-0000 -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/du -s '/var/spool/asterisk/monitor/' | awk '{print $1}' -Exec: /usr/bin/cat /proc/cpuinfo | grep 'model name' diff --git a/logs/frontend/frontend.log b/logs/frontend/frontend.log index 77bc44e..6b4220d 100644 --- a/logs/frontend/frontend.log +++ b/logs/frontend/frontend.log @@ -2,29 +2,8 @@ > cti-app@0.1.0 start > vite -Port 3000 is in use, trying another one... -Port 3001 is in use, trying another one... -Port 3002 is in use, trying another one... -Port 3003 is in use, trying another one... -Port 3004 is in use, trying another one... - VITE v7.2.7 ready in 82 ms + VITE v7.2.7 ready in 226 ms - ➜ Local: http://localhost:3005/ + ➜ Local: http://localhost:3000/ ➜ Network: use --host to expose -11:15:58 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/application-components/charts/MultiLineChart.tsx, /src/components/application-components/charts/StorageChart.tsx -11:15:58 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/application-components/charts/StorageChart.tsx, /src/components/application-components/charts/MultiLineChart.tsx -11:15:58 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/application-components/charts/MultiLineChart.tsx, /src/components/application-components/charts/StorageChart.tsx -11:15:58 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/application-components/charts/StorageChart.tsx, /src/components/application-components/charts/MultiLineChart.tsx -11:15:58 PM [vite] (client) hmr invalidate /src/components/context/AppInfoContext.tsx Could not Fast Refresh ("AppInfoContext" export is incompatible). Learn more at https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports -11:15:58 PM [vite] (client) page reload src/components/context/AppInfoContext.tsx -11:15:58 PM [vite] (client) hmr invalidate /src/components/context/AppInfoContext.tsx Could not Fast Refresh ("AppInfoContext" export is incompatible). Learn more at https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports -11:15:58 PM [vite] (client) page reload src/components/context/AppInfoContext.tsx -11:22:13 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/application-components/charts/MultiLineChart.tsx, /src/components/application-components/charts/StorageChart.tsx -11:22:13 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/application-components/charts/StorageChart.tsx, /src/components/application-components/charts/MultiLineChart.tsx -11:22:13 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/pages/Licence/Licence.tsx, /src/components/pages/Licence/ImportForm.tsx, /src/components/pages/Licence/Step1.tsx, /src/components/pages/Licence/Step2.tsx, /src/components/pages/Licence/Step3.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/application-components/charts/MultiLineChart.tsx, /src/components/application-components/charts/StorageChart.tsx -11:22:13 PM [vite] (client) hmr update /src/App.tsx, /src/components/context/AppInfoContext.tsx, /src/components/application-components/private-route/PrivateRoute.tsx, /src/components/pages/errors/error_502/Error502.tsx, /src/components/pages/login/Login.tsx, /src/components/pages/home/Home.tsx, /src/components/application-components/layout/Header.tsx, /src/components/pages/home/widgets/call-widgets/DailyReportWd.tsx, /src/components/pages/home/widgets/call-widgets/UsersReportWd.tsx, /src/components/pages/home/widgets/call-widgets/DailyHourCountWd.tsx, /src/components/application-components/charts/SwapUsageChart.tsx, /src/components/application-components/charts/RamUsageChart.tsx, /src/components/pages/home/widgets/charts/Storage.tsx, /src/components/pages/home/widgets/charts/CPU.tsx, /src/components/application-components/charts/StorageChart.tsx, /src/components/application-components/charts/MultiLineChart.tsx -11:22:13 PM [vite] (client) hmr invalidate /src/components/context/AppInfoContext.tsx Could not Fast Refresh ("AppInfoContext" export is incompatible). Learn more at https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports -11:22:13 PM [vite] (client) page reload src/components/context/AppInfoContext.tsx -11:22:13 PM [vite] (client) hmr invalidate /src/components/context/AppInfoContext.tsx Could not Fast Refresh ("AppInfoContext" export is incompatible). Learn more at https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#consistent-components-exports -11:22:13 PM [vite] (client) page reload src/components/context/AppInfoContext.tsx diff --git a/p-line/docs/markdown/ASTERISK-DOCKER-NAS-MEMORY.md b/p-line/docs/markdown/ASTERISK-DOCKER-NAS-MEMORY.md index 907ab02..c7df588 100644 --- a/p-line/docs/markdown/ASTERISK-DOCKER-NAS-MEMORY.md +++ b/p-line/docs/markdown/ASTERISK-DOCKER-NAS-MEMORY.md @@ -107,12 +107,23 @@ soundهای استاندارد Asterisk با soundهای آپلودی برنام - همهٔ فرمان‌های متنی CLI باید از `PlineTools.executeAsteriskCliCommand()` (یا wrapperهای آن مانند `execCoreCommandStringResult()`) عبور کنند؛ مسیر fallback داخلی native از `/usr/sbin/asterisk -x` و Docker از `docker exec /usr/sbin/asterisk -x` استفاده می‌کند. - مسیر اصلی ابتدا از pool محدود AMI با `CommandAction` استفاده می‌کند. فقط اگر AMI پیش از ارسال فرمان در دسترس نباشد، اجرای محلی CLI مجاز است. اگر ارسال AMI شروع شده و پاسخ نامشخص/timeout باشد، فرمان دوباره از CLI اجرا نمی‌شود تا اجرای تکراری رخ ندهد. -- pool فرمان AMI چهار اتصال دارد؛ اجرای fallback محلی حداکثر دو پردازهٔ هم‌زمان می‌پذیرد و درخواست اضافی را بدون صف‌کردن رد می‌کند. +- pool فرمان AMI چهار اتصال دارد؛ اتصال‌های بیکار پس از ۳۰ ثانیه (قابل تنظیم با `pline.ami-command-idle-timeout-ms`) بسته می‌شوند و هر ۱۰ ثانیه بررسی می‌شوند. اجرای fallback محلی حداکثر دو پردازهٔ هم‌زمان می‌پذیرد و درخواست اضافی را بدون صف‌کردن رد می‌کند. +- اجرای `File_Generator.GenerateFiles()` همگام‌سازی شده تا تولید فایل‌ها و reloadهای ناشی از چند درخواست هم‌زمان روی هم نیفتند. - API محلی `POST /local-asterisk/command` در `LocalAsteriskCommandController` فقط اتصال مستقیم loopback و token برابر با `pline.local-asterisk-api-token` را می‌پذیرد. هدرهای forwarding باعث رد درخواست می‌شوند؛ برنامه‌های محلی باید مستقیم به پورت 8080 وصل شوند. - افزودن، حذف و pause/unpause اعضای صف در `QueueLiveInfoController` و افزودن اعضای داینامیک/پاک‌سازی آن‌ها در `QueueGenerator` از همان executor مرکزی CLI استفاده می‌کنند؛ برای این عملیات از `QueueAddAction`، `QueueRemoveAction` و `QueuePauseAction` مستقیم استفاده نشود. - رفتار صف باید حفظ شود: اعضای داینامیک زمان ساخت با حالت unpaused اضافه می‌شوند؛ endpoint ورود (`/online/.../true`) عضو را در حالت paused ثبت می‌کند؛ حذف و pause/unpause باید همان queue و Local interface قبلی را هدف بگیرند. - `ManagerGenerator` حساب اصلی `[pline]` را با `allowmultiplelogin = yes` می‌سازد تا اتصال رویدادها و pool فرمان هم‌زمان کار کنند؛ تنظیم AMI کاربران دیگر برنامه مستقل باقی می‌ماند. +### عیب‌یابی reload در Asterisk 22 + +- در لاگ Asterisk 22.11.0، `The previous reload command didn't finish yet` همراه با `loader.c` دیده شد و AMI رویداد `Reload` با `Module: All` و `Status: 4` برگرداند؛ در مستندات AMI نسخهٔ 22، status 4 یعنی reload از قبل در حال اجرا است. این پیام نشانهٔ اتصال بیکار AMI نیست. +- `reloadConfigurations()` باید فقط یک‌بار `module reload` بفرستد؛ این فرمان خودش Manager را هم reload می‌کند. برای reload مهلت طولانی‌تر از فرمان‌های CLI معمولی در نظر گرفته شود و timeout یا پاسخ «reload already in progress» باید به Apply به‌عنوان خطا برگردد، نه موفقیت. +- مسیر Apply باید نتیجهٔ reload را بررسی کند؛ اگر Asterisk پاسخ نداد یا گفت reload دیگری در حال اجرا است، `hasError` فعال بماند و logها/تأیید تغییرات فقط پس از Apply موفق ثبت شوند. مقدار ناموفق باید به‌صورت نتیجهٔ `false` برگردد، نه exception؛ در startup، timeout reload نباید بالا آمدن برنامه را متوقف کند. +- Backtrace زندهٔ Asterisk 22.11.0 در reload گیرکرده، thread مربوط به `res_pjsip_config_wizard.so` را داخل `ast_sorcery_reload` و `__ast_taskpool_push_wait` نشان داد؛ چند thread دریافت PJSIP نیز در `ast_sip_get_transport_states` منتظر mutex بودند. این الگو با deadlock شناخته‌شدهٔ reload در PJSIP Config Wizard هم‌خوان است؛ بازکردن اتصال idle AMI آن را رفع نمی‌کند. اجرای GDB از میزبان Docker به‌خاطر PID namespace ممکن است هشدار بدهد و نام بعضی frameها را نشان ندهد، ولی مسیرهای نماددار برای تشخیص کافی بودند. +- `SipFileGenerator` در CTI objectهای معمول `transport`, `aor`, `auth`, `endpoint`, `registration`, و `identify` می‌نویسد و `type = wizard` تولید نمی‌کند. برای دورزدن deadlock، `PlineSettingsGenerator` باید `res_pjsip_config_wizard.so` را در `modules.conf` با `noload` خارج کند. این workaround فقط پس از بازتولید `modules.conf` و restart کانتینر Asterisk اعمال می‌شود؛ بعد از بالا آمدن، `module show like res_pjsip_config_wizard` باید نشان دهد ماژول load نیست. +- در Asterisk 22 گزینهٔ `automon` در `[featuremap]` پشتیبانی نمی‌شود؛ پیش‌فرض `p-line/features.json` برای آن نسخه به `automixmon` تغییر کرده است. پس از انتشار این فایل، همگام‌سازی FeatureCodeGenerator مقدار پایه را در دیتابیس و `features.conf` به‌روز می‌کند. خطای `features.conf` باید رفع شود، اما از روی لاگ موجود نمی‌توان آن را علت گیرکردن کل reload دانست. +- اگر `/var/log/asterisk/full` وجود ندارد، `logger show channels` را بررسی کنید. در نمونهٔ بررسی‌شده فقط `messages.log` و Console فعال بودند؛ کانال موقت با `logger add channel /tmp/reload-debug.log notice,warning,error,debug,verbose` لاگ تشخیصی را فراهم کرد. + ## ارتباط‌های دیگر Asterisk - AMI رویدادها، AGI و Live API همچنان ارتباط‌های مخصوص خود را دارند و در Docker برای آن‌ها `docker exec` لازم نیست. diff --git a/p-line/features.json b/p-line/features.json index 1bd95e2..2527f32 100755 --- a/p-line/features.json +++ b/p-line/features.json @@ -36,7 +36,7 @@ "enable": true, "base": true, "functions": [ - "automon" + "automixmon" ] }, { @@ -164,4 +164,4 @@ "Hangup()" ] } -] \ No newline at end of file +] diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/AppControllers.java b/p-line/src/main/java/ir/peeco/pline/controllers/AppControllers.java index 8fd400f..8cd12fe 100644 --- a/p-line/src/main/java/ir/peeco/pline/controllers/AppControllers.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/AppControllers.java @@ -32,6 +32,7 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.*; @@ -39,10 +40,14 @@ import java.net.InetAddress; import java.net.URI; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; import java.time.Instant; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; import java.util.regex.Matcher; @@ -98,6 +103,12 @@ public class AppControllers { @Value("${pline.license_url}") private String licenseUrl; + @Value("${pline.license.version:1}") + private int licenseVersion = 1; + + @Value("${pline.license.ray2_url:https://ray2lic.raymandcti.com}") + private String ray2LicenseUrl = "https://ray2lic.raymandcti.com"; + @Value("${pline.app_name}") private String appName; @@ -126,6 +137,7 @@ public class AppControllers { ver.put("website", plineTools.getAppWebsite()); ver.put("serial", GlobalTools.getHostUUID()); ver.put("confirm_link", confirmLink); + ver.put("license_mode", isRay2LicenseMode() ? "ray2" : "legacy"); var lic = licenseService.getLicenseInformation(); ver.put("start_time", lic.getStartTime()); @@ -157,6 +169,19 @@ public class AppControllers { public ResponseEntity sendCode(@RequestBody Map data) { ApiResult apiResult = new ApiResult(); try { + if (isRay2LicenseMode()) { + String mobile = firstNonBlank(data.get("mobileNumber"), data.get("mobile")); + if (mobile == null) { + throw new IllegalArgumentException("Mobile number is required"); + } + URI uri = URI.create(ray2BaseUrl() + "/api/send-code?mobile=" + + URLEncoder.encode(mobile, StandardCharsets.UTF_8)); + ResponseEntity result = new RestTemplate().getForEntity(uri, JsonNode.class); + addRay2Errors(requireRay2Response(result.getBody()), apiResult); + apiResult.setHasError(!apiResult.getMessages().isEmpty()); + return ResponseEntity.ok(apiResult); + } + RestTemplate restTemplate = new RestTemplate(); restTemplate.setErrorHandler(new ApiRequestErrorHandler()); @@ -177,6 +202,40 @@ public class AppControllers { public ResponseEntity mobileVerify(@RequestBody Map data) { ApiResult apiResult = new ApiResult(); try { + if (isRay2LicenseMode()) { + Map request = new LinkedHashMap<>(); + request.put("mobile", Objects.toString(data.get("mobile"), "")); + request.put("code", Objects.toString(data.get("code"), "")); + request.put("serial", Objects.toString(data.get("serial"), "")); + request.put("app_type", "cti"); + + ResponseEntity result = new RestTemplate().postForEntity( + ray2BaseUrl() + "/api/mobile-verify", request, JsonNode.class); + JsonNode response = requireRay2Response(result.getBody()); + if (addRay2Errors(response, apiResult)) { + apiResult.setHasError(true); + return ResponseEntity.ok(apiResult); + } + + JsonNode token = response == null ? null : response.path("result").get("token"); + if (!hasRay2Token(token)) { + String status = response.path("result").path("status").asText(); + boolean pendingRegistration = "pending_registration".equals(status) + || response.path("result").path("is_new_customer").asBoolean(false); + if (!pendingRegistration) { + throw new IllegalStateException("Ray2 response has no license token or registration status"); + } + apiResult.addResult("register", true); + apiResult.addResult("status", status.isBlank() ? "pending_registration" : status); + } else { + saveRay2LicenseToken(token); + licenseService.checkLicense(); + apiResult.addResult("register", false); + } + apiResult.setHasError(!apiResult.getMessages().isEmpty()); + return ResponseEntity.ok(apiResult); + } + RestTemplate restTemplate = new RestTemplate(); restTemplate.setErrorHandler(new ApiRequestErrorHandler()); @@ -213,6 +272,32 @@ public class AppControllers { public ResponseEntity register(@RequestBody Map data) { ApiResult apiResult = new ApiResult(); try { + if (isRay2LicenseMode()) { + Map request = buildRay2RegistrationRequest(data); + ResponseEntity result = new RestTemplate().postForEntity( + ray2BaseUrl() + "/api/register", request, JsonNode.class); + JsonNode response = requireRay2Response(result.getBody()); + if (addRay2Errors(response, apiResult)) { + apiResult.setHasError(true); + return ResponseEntity.ok(apiResult); + } + + JsonNode token = response == null ? null : response.path("result").get("token"); + if (!hasRay2Token(token)) { + apiResult.addResult("register", false); + apiResult.addMessage("Ray2 did not return a license token"); + } else { + saveRay2LicenseToken(token); + licenseService.checkLicense(); + apiResult.addResult("register", true); + fileGenerator.GenerateFiles(); + plineTools.execLinuxCli("/usr/sbin/shutdown", + new String[] { "-r", "now", "Online Register" }, true); + } + apiResult.setHasError(!apiResult.getMessages().isEmpty()); + return ResponseEntity.ok(apiResult); + } + RestTemplate restTemplate = new RestTemplate(); restTemplate.setErrorHandler(new ApiRequestErrorHandler()); @@ -252,6 +337,99 @@ public class AppControllers { } apiResult.setHasError(!apiResult.getMessages().isEmpty()); return ResponseEntity.ok(apiResult); + } + + private boolean isRay2LicenseMode() { + if (licenseVersion == 1) { + return false; + } + if (licenseVersion == 2) { + return true; + } + throw new IllegalStateException("pline.license.version must be 1 or 2"); + } + + private String ray2BaseUrl() { + return ray2LicenseUrl.replaceAll("/+$", ""); + } + + private JsonNode requireRay2Response(JsonNode response) { + if (response == null || response.isNull()) { + throw new IllegalStateException("Ray2 returned an empty response"); + } + return response; + } + + private String firstNonBlank(String first, String second) { + if (first != null && !first.isBlank()) { + return first; + } + return second == null || second.isBlank() ? null : second; + } + + private boolean addRay2Errors(JsonNode response, ApiResult apiResult) { + if (response == null || !response.path("hasError").asBoolean(false)) { + return false; + } + + JsonNode messages = response.path("messages"); + if (messages.isArray()) { + messages.forEach(message -> { + if (!message.asText().isBlank()) { + apiResult.addMessage(message.asText()); + } + }); + } + if (apiResult.getMessages().isEmpty()) { + String message = response.path("message").asText("Online license request failed"); + apiResult.addMessage(message.isBlank() ? "Online license request failed" : message); + } + return true; + } + + private Map buildRay2RegistrationRequest(Map data) { + ObjectMapper objectMapper = new ObjectMapper(); + Map attributes = data.get("attributes") == null + ? Map.of() + : objectMapper.convertValue(data.get("attributes"), new TypeReference>() { }); + Map request = new LinkedHashMap<>(); + for (String field : new String[] { + "mobile_number", "f_name", "l_name", "company_name", "email", "phone_number", "address" }) { + Object value = attributes.getOrDefault(field, data.get(field)); + if (value != null && !value.toString().isBlank()) { + request.put(field, value); + } + } + return request; + } + + private boolean hasRay2Token(JsonNode token) { + if (token == null || token.isNull()) { + return false; + } + if (token.isTextual()) { + return !token.asText().isBlank(); + } + return token.isObject() && token.hasNonNull("body") && token.hasNonNull("signature"); + } + + private void saveRay2LicenseToken(JsonNode tokenNode) throws IOException { + String token = tokenNode.isTextual() ? tokenNode.asText() : tokenNode.toString(); + JsonNode wrappedToken = tokenNode; + if (tokenNode.isTextual() && token.trim().startsWith("{")) { + wrappedToken = new ObjectMapper().readTree(token); + } + + if (wrappedToken != null && wrappedToken.isObject() + && wrappedToken.hasNonNull("body") && wrappedToken.hasNonNull("signature")) { + token = wrappedToken.path("body").asText() + "." + wrappedToken.path("signature").asText(); + } + if (token.isBlank()) { + throw new IllegalArgumentException("Ray2 returned an empty license token"); + } + + Files.writeString(Path.of(GlobalTools.getBaseDir(), "license.lic"), token, StandardCharsets.UTF_8, + StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); } @PostMapping("/upload") diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/ApplyController.java b/p-line/src/main/java/ir/peeco/pline/controllers/ApplyController.java index 8c652e4..590acba 100755 --- a/p-line/src/main/java/ir/peeco/pline/controllers/ApplyController.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/ApplyController.java @@ -39,18 +39,27 @@ public class ApplyController { this.file_Generator = file_Generator; } - @PostMapping("/apply") - public ResponseEntity apply(@RequestBody Map body) { - file_Generator.GenerateFiles(); - ApiResult result = new ApiResult(); - result.setHasError(false); - userLogger.addLog("System Applied"); - var list = userLogsRepository.findAllByApprove(false); - list.forEach(x -> { - x.setApprove(true); - }); - userLogsRepository.saveAll(list); - return ResponseEntity.ok(result); - } + @PostMapping("/apply") + public ResponseEntity apply(@RequestBody Map body) { + ApiResult result = new ApiResult(); + try { + if (!file_Generator.GenerateFiles()) { + result.setHasError(true); + result.addMessage("Asterisk did not confirm the reload. Check its logs before applying again."); + return ResponseEntity.ok(result); + } + userLogger.addLog("System Applied"); + var list = userLogsRepository.findAllByApprove(false); + list.forEach(x -> x.setApprove(true)); + userLogsRepository.saveAll(list); + } catch (Exception ex) { + result.setHasError(true); + result.addMessage(ex.getMessage() == null ? "Apply failed; check the application and Asterisk logs." + : "Apply failed: " + ex.getMessage()); + return ResponseEntity.ok(result); + } + result.setHasError(false); + return ResponseEntity.ok(result); + } } diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/SipTrunksController.java b/p-line/src/main/java/ir/peeco/pline/controllers/SipTrunksController.java index 0060374..68a883f 100755 --- a/p-line/src/main/java/ir/peeco/pline/controllers/SipTrunksController.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/SipTrunksController.java @@ -26,6 +26,7 @@ import ir.peeco.pline.plineServer.apiResult.ApiResult; import ir.peeco.pline.enums.SipTrunkMode; import ir.peeco.pline.enums.SipTrunkStatus; import ir.peeco.pline.repositories.SipTrunksRepository; +import ir.peeco.pline.repositories.outboundRoutes.OutboundRouteTrunksRepository; @RestController @CrossOrigin(value = "*", maxAge = 3600) @@ -33,6 +34,7 @@ import ir.peeco.pline.repositories.SipTrunksRepository; public class SipTrunksController { private SipTrunksRepository sipTrunkRepository; + private OutboundRouteTrunksRepository outboundRouteTrunksRepository; private PlineTools plineTools; @Autowired @@ -45,6 +47,11 @@ public class SipTrunksController { this.sipTrunkRepository = sipTrunkRepository; } + @Autowired + public void setOutboundRouteTrunksRepository(OutboundRouteTrunksRepository outboundRouteTrunksRepository) { + this.outboundRouteTrunksRepository = outboundRouteTrunksRepository; + } + private UserLogger userLogger; @Autowired @@ -186,7 +193,7 @@ public class SipTrunksController { } } - if (licenseService.exceedsLimit("sip_trunk", sipTrunkRepository.count())) { + if (licenseService.exceedsLimit("sip_trunk", sipTrunkRepository.count())) { userLogger.addLog("Failed to Create SIP Trunk (" + sipTrunk.getName() + ")"); result.addMessage("The number of SIP Trunk for you is " + licenseService.getLicenseInformation().getAccessModules().getCountSipTrunk() + " Trunk and you are creating more than the set license limit. It is not possible to create SIP Trunk " + sipTrunk.getName()); @@ -226,6 +233,11 @@ public class SipTrunksController { var item = sipTrunkRepository.findById(id); var result = new ApiResult(); if (item.isPresent()) { + if (outboundRouteTrunksRepository.countBySipTrunkId(id) > 0) { + result.addMessage("Remove this SIP trunk from outbound routes before deleting it."); + result.setHasError(true); + return ResponseEntity.ok(result); + } try { sipTrunkRepository.deleteById(id); userLogger.addLog("Deleted SIP Trunk (" + item.get().getName() + ")"); diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/SipUsersControllers.java b/p-line/src/main/java/ir/peeco/pline/controllers/SipUsersControllers.java index c837160..4c5e679 100755 --- a/p-line/src/main/java/ir/peeco/pline/controllers/SipUsersControllers.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/SipUsersControllers.java @@ -21,6 +21,7 @@ import ir.peeco.pline.repositories.*; import ir.peeco.pline.repositories.callAccessList.CallAccessListMembersRepository; import ir.peeco.pline.repositories.callAccessList.CallAccessListsRepository; import ir.peeco.pline.repositories.ivrs.IvrKeyRepository; +import ir.peeco.pline.repositories.inboundRoutes.InboundRouteActionRepository; import ir.peeco.pline.repositories.queue.QueueMembersRepository; import ir.peeco.pline.repositories.ringGroups.RingGroupUsersRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -255,27 +256,26 @@ public class SipUsersControllers { @DeleteMapping("/{id}") public ResponseEntity delete(@PathVariable(name = "id") long id) { var apiResult = new ApiResult(); - var item = sipUsersRepository.findById(id).get().getCallerIdName(); + var data = sipUsersRepository.findById(id); + if (data.isEmpty()) { + apiResult.setHasError(true); + apiResult.addMessage("SIP User not found"); + return ResponseEntity.ok(apiResult); + } + var item = data.get().getCallerIdName(); try { - var data = sipUsersRepository.findById(id); - if (data.isPresent()) { - deleteSipUser(data.get()); - sipUsersRepository.deleteById(id); - apiResult.setHasError(false); - userLogger.addLog("Deleted SIP User (" + item + ")"); - } else { - apiResult.setHasError(true); - apiResult.addMessage("SIP User not found"); - userLogger.addLog( - "Failed to Deleted SIP User (" + sipUsersRepository.findById(id).get().getCallerIdName() + ")"); - } + deleteSipUser(data.get()); + sipUsersRepository.deleteById(id); + apiResult.setHasError(false); + userLogger.addLog("Deleted SIP User (" + item + ")"); } catch (Exception ex) { apiResult.setHasError(true); - apiResult.addMessage("It is not possible to delete the SIP User due to having a reference"); - userLogger.addLog( - "Failed to Deleted SIP User (" + sipUsersRepository.findById(id).get().getCallerIdName() + ")"); + apiResult.addMessage(ex.getMessage() == null + ? "It is not possible to delete the SIP User due to having a reference" + : ex.getMessage()); + userLogger.addLog("Failed to Delete SIP User (" + item + ")"); } - return ResponseEntity.ok(null); + return ResponseEntity.ok(apiResult); } @GetMapping("/get-profiles-group") @@ -633,6 +633,9 @@ public class SipUsersControllers { } } try { + for (var sipUser : lstSipUsers) { + ensureSipUserNotUsedByInboundRoute(sipUser); + } for (var itm : lstSipUsers) { deleteSipUser(itm); } @@ -677,6 +680,12 @@ public class SipUsersControllers { private CallAccessListsRepository callAccessListsRepository; private CallRecordSpysRepository callRecordSpysRepository; private RingingMusicOnHoldsRepository ringingMusicOnHoldsRepository; + private InboundRouteActionRepository inboundRouteActionRepository; + + @Autowired + public void setInboundRouteActionRepository(InboundRouteActionRepository inboundRouteActionRepository) { + this.inboundRouteActionRepository = inboundRouteActionRepository; + } @Autowired public void setCallAccessListsRepository(CallAccessListsRepository callAccessListsRepository) { @@ -724,6 +733,8 @@ public class SipUsersControllers { } private void deleteSipUser(TblSipUser sipUser) { + ensureSipUserNotUsedByInboundRoute(sipUser); + ringGroupUsersRepository.findAll().stream().filter(x -> x.getSipUser().getId() == sipUser.getId()).findFirst() .ifPresent(tbl -> ringGroupUsersRepository.delete(tbl)); @@ -769,6 +780,12 @@ public class SipUsersControllers { .ifPresent(tbl -> ringingMusicOnHoldsRepository.delete(tbl)); } + private void ensureSipUserNotUsedByInboundRoute(TblSipUser sipUser) { + if (inboundRouteActionRepository.existsByActionAndValue(PlineActions.SIPUser, sipUser.getId())) { + throw new IllegalStateException("This SIP user is selected by an inbound route. Change that route action before deleting the user."); + } + } + @PostMapping("/import") public ResponseEntity UploadCsv(HttpSession session, @RequestParam("file") MultipartFile file) { StringBuilder error = new StringBuilder(); diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/inboundRoutes/InboundRouteActions.java b/p-line/src/main/java/ir/peeco/pline/controllers/inboundRoutes/InboundRouteActions.java index bbaedc7..2028d7e 100755 --- a/p-line/src/main/java/ir/peeco/pline/controllers/inboundRoutes/InboundRouteActions.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/inboundRoutes/InboundRouteActions.java @@ -1,6 +1,8 @@ package ir.peeco.pline.controllers.inboundRoutes; import ir.peeco.pline.models.inboundRoutes.TblInboundRouteAction; +import ir.peeco.pline.enums.PlineActions; +import ir.peeco.pline.repositories.SipUsersRepository; import ir.peeco.pline.plineServer.UserLogger; import ir.peeco.pline.plineServer.apiResult.ApiResult; import ir.peeco.pline.repositories.inboundRoutes.InboundRouteRepository; @@ -18,6 +20,7 @@ public class InboundRouteActions { private final InboundRouteActionRepository inboundRouteActionRepository; private UserLogger userLogger; private InboundRouteRepository inboundRouteRepository; + private SipUsersRepository sipUsersRepository; public InboundRouteActions(InboundRouteActionRepository inboundRouteActionRepository) { this.inboundRouteActionRepository = inboundRouteActionRepository; @@ -33,6 +36,11 @@ public class InboundRouteActions { this.inboundRouteRepository = inboundRouteRepository; } + @Autowired + public void setSipUsersRepository(SipUsersRepository sipUsersRepository) { + this.sipUsersRepository = sipUsersRepository; + } + @GetMapping("/{id}") public ResponseEntity get(@PathVariable("id") Long id) { var data = inboundRouteActionRepository.findByInboundRouteId(id); @@ -45,6 +53,12 @@ public class InboundRouteActions { @PostMapping public ResponseEntity save(@RequestBody TblInboundRouteAction routeAction) { ApiResult result = new ApiResult(); + if (routeAction.getAction() == PlineActions.SIPUser + && (routeAction.getValue() == null || !sipUsersRepository.existsById(routeAction.getValue()))) { + result.setHasError(true); + result.addMessage("The selected SIP user does not exist."); + return ResponseEntity.ok(result); + } try { var data = inboundRouteActionRepository.findAllByInboundRouteId(routeAction.getInboundRoute().getId()); if (!data.isEmpty()) { diff --git a/p-line/src/main/java/ir/peeco/pline/controllers/outboundRoute/OutboundRouteTrunksController.java b/p-line/src/main/java/ir/peeco/pline/controllers/outboundRoute/OutboundRouteTrunksController.java index 3ef1536..c8c8315 100755 --- a/p-line/src/main/java/ir/peeco/pline/controllers/outboundRoute/OutboundRouteTrunksController.java +++ b/p-line/src/main/java/ir/peeco/pline/controllers/outboundRoute/OutboundRouteTrunksController.java @@ -5,8 +5,11 @@ import jakarta.validation.Valid; import ir.peeco.pline.plineServer.UserLogger; import ir.peeco.pline.repositories.outboundRoutes.OutboundRouteRepository; +import ir.peeco.pline.repositories.SipTrunksRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -26,6 +29,7 @@ public class OutboundRouteTrunksController { private final OutboundRouteTrunksRepository outboundRouteTrunksRepository; private OutboundRouteRepository outboundRouteRepository; + private SipTrunksRepository sipTrunksRepository; private UserLogger userLogger; @Autowired @@ -42,6 +46,11 @@ public class OutboundRouteTrunksController { this.outboundRouteRepository = outboundRouteRepository; } + @Autowired + public void setSipTrunksRepository(SipTrunksRepository sipTrunksRepository) { + this.sipTrunksRepository = sipTrunksRepository; + } + @GetMapping("/{id}") public ResponseEntity index(@PathVariable("id") Long id) { List table = outboundRouteTrunksRepository.findAllByOutboundRouteId(id); @@ -50,23 +59,48 @@ public class OutboundRouteTrunksController { } @PostMapping("/{id}") + @Transactional public ResponseEntity create(@PathVariable("id") Long id, @Valid @RequestBody List outboundRoute) { ApiResult apiResult = new ApiResult(); try { + var route = outboundRouteRepository.findById(id).orElse(null); + if (route == null) { + apiResult.setHasError(true); + apiResult.addMessage("Outbound route not found."); + return ResponseEntity.ok(apiResult); + } + for (var assignment : outboundRoute) { + var sipTrunk = assignment == null ? null : assignment.getSipTrunk(); + var sipTrunkId = sipTrunk == null ? null : sipTrunk.getId(); + if (sipTrunkId == null || !sipTrunksRepository.existsById(sipTrunkId)) { + apiResult.setHasError(true); + apiResult.addMessage("Each outbound route trunk must reference an existing SIP trunk."); + return ResponseEntity.ok(apiResult); + } + var assignmentRoute = assignment.getOutboundRoute(); + if (assignmentRoute != null && assignmentRoute.getId() != null + && !id.equals(assignmentRoute.getId())) { + apiResult.setHasError(true); + apiResult.addMessage("Outbound route trunk belongs to a different route."); + return ResponseEntity.ok(apiResult); + } + assignment.setOutboundRoute(route); + } var items = outboundRouteTrunksRepository.findAllByOutboundRouteId(id); if (!items.isEmpty()) { outboundRouteTrunksRepository.deleteAll(items); } outboundRouteTrunksRepository.saveAll(outboundRoute); apiResult.setHasError(false); + userLogger.addLog("Updated SIP Trunks of Outbound Route (" + route.getName() + ")"); } catch (Exception ex) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); apiResult.setHasError(true); apiResult.addMessage("These items are not valid. Error in updating."); - userLogger.addLog("Failed Updated SIP Trunks of Outbound Route (" + outboundRouteRepository.findById(id).get().getName() + ")"); + userLogger.addLog("Failed Updated SIP Trunks of Outbound Route id " + id); apiResult.addMessage(ex.getMessage()); } - userLogger.addLog("Updated SIP Trunks of Outbound Route (" + outboundRouteRepository.findById(id).get().getName() + ")"); return ResponseEntity.ok(apiResult); } diff --git a/p-line/src/main/java/ir/peeco/pline/coreController/CallRouteController.java b/p-line/src/main/java/ir/peeco/pline/coreController/CallRouteController.java index 0c2c89c..d94e790 100755 --- a/p-line/src/main/java/ir/peeco/pline/coreController/CallRouteController.java +++ b/p-line/src/main/java/ir/peeco/pline/coreController/CallRouteController.java @@ -7,6 +7,8 @@ import org.asteriskjava.fastagi.AgiChannel; import org.asteriskjava.fastagi.AgiException; import org.asteriskjava.fastagi.AgiRequest; import org.asteriskjava.fastagi.BaseAgiScript; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import ir.peeco.pline.plineServer.PlineTools; import ir.peeco.pline.repositories.callAccessList.CallAccessListMembersRepository; @@ -19,6 +21,8 @@ import lombok.Setter; @Setter public class CallRouteController extends BaseAgiScript { + private static final Logger logger = LoggerFactory.getLogger(CallRouteController.class); + private PlineTools plineTools; private SipUsersRepository sipUsersRepository; @@ -113,6 +117,17 @@ public class CallRouteController extends BaseAgiScript { channel.verbose(logMessage, 1); } catch (Exception ignore) { } + } catch (RuntimeException ex) { + logger.error("FastAGI script '{}' failed", request.getScript(), ex); + try { + channel.exec("NoOP", "CTI FastAGI script failed"); + channel.exec("Congestion", "45"); + } catch (Exception ignore) { + } + try { + channel.hangup(); + } catch (AgiException ignore) { + } } } } diff --git a/p-line/src/main/java/ir/peeco/pline/coreController/ExternalCall.java b/p-line/src/main/java/ir/peeco/pline/coreController/ExternalCall.java index 7ed6aba..afdf621 100755 --- a/p-line/src/main/java/ir/peeco/pline/coreController/ExternalCall.java +++ b/p-line/src/main/java/ir/peeco/pline/coreController/ExternalCall.java @@ -37,10 +37,17 @@ public class ExternalCall { public void run(AgiRequest request, AgiChannel channel) throws AgiException { var route_id = channel.getVariable("route"); - var trunks = outboundRouteTrunksRepository.findAllByOutboundRouteIdAndEnable(Long.parseLong(route_id), true); + var configuredTrunks = outboundRouteTrunksRepository.findAllByOutboundRouteIdAndEnable(Long.parseLong(route_id), true); + var trunks = configuredTrunks.stream() + .filter(t -> t != null && t.getSipTrunk() != null) + .toList(); channel.answer(); + if (trunks.size() != configuredTrunks.size()) { + plineTools.plineLogger("Outbound route {} contains {} enabled trunk assignment(s) without a SIP trunk; skipping them", + route_id, configuredTrunks.size() - trunks.size()); + } if (trunks.isEmpty()) { - channel.exec("NoOP", "In route Id " + route_id + " Trunk not found"); + channel.exec("NoOP", "In route Id " + route_id + " no valid SIP trunk found"); channel.exec("Congestion", "45"); channel.hangup(); return; diff --git a/p-line/src/main/java/ir/peeco/pline/init/Initializer.java b/p-line/src/main/java/ir/peeco/pline/init/Initializer.java index 7cb3346..43fb645 100755 --- a/p-line/src/main/java/ir/peeco/pline/init/Initializer.java +++ b/p-line/src/main/java/ir/peeco/pline/init/Initializer.java @@ -162,6 +162,7 @@ public class Initializer { protected CommandLineRunner init() { return args -> { + ensureAsteriskCdrIdDefault(); removeObsoleteManyToOneUniqueConstraints(); licenseService.checkLicense(); @@ -589,4 +590,51 @@ public class Initializer { $$ """); } + + /** + * cdr_pgsql checks pg_attrdef to decide whether it can omit a required column + * with no CDR value. PostgreSQL identity columns keep their sequence internally + * and are not reported as ordinary column defaults, so cdr_pgsql tries to insert + * an empty string into tbl_cdr.id. Use a normal sequence default for this shared + * table; Hibernate and cdr_pgsql can both use it. + */ + private void ensureAsteriskCdrIdDefault() { + var columns = jdbcTemplate.queryForList(""" + SELECT is_identity, is_nullable, column_default + FROM information_schema.columns + WHERE table_schema = current_schema() + AND table_name = 'tbl_cdr' + AND column_name = 'id' + """); + if (columns.isEmpty()) { + return; + } + + var column = columns.get(0); + boolean identity = "YES".equalsIgnoreCase(String.valueOf(column.get("is_identity"))); + boolean notNull = "NO".equalsIgnoreCase(String.valueOf(column.get("is_nullable"))); + boolean hasDefault = column.get("column_default") != null; + if (!identity && (!notNull || hasDefault)) { + return; + } + + if (identity) { + jdbcTemplate.execute("ALTER TABLE tbl_cdr ALTER COLUMN id DROP IDENTITY IF EXISTS"); + } + jdbcTemplate.execute("CREATE SEQUENCE IF NOT EXISTS tbl_cdr_asterisk_id_seq AS BIGINT"); + jdbcTemplate.execute("ALTER SEQUENCE tbl_cdr_asterisk_id_seq OWNED BY tbl_cdr.id"); + jdbcTemplate.execute("ALTER TABLE tbl_cdr ALTER COLUMN id SET DEFAULT nextval('tbl_cdr_asterisk_id_seq'::regclass)"); + jdbcTemplate.queryForObject(""" + SELECT CASE + WHEN is_called AND last_value < COALESCE((SELECT MAX(id) FROM tbl_cdr), 0) + OR NOT is_called AND last_value <= COALESCE((SELECT MAX(id) FROM tbl_cdr), 0) + THEN setval( + 'tbl_cdr_asterisk_id_seq'::regclass, + GREATEST(COALESCE((SELECT MAX(id) FROM tbl_cdr), 0) + 1, 1), + false) + ELSE last_value + END + FROM tbl_cdr_asterisk_id_seq + """, Long.class); + } } diff --git a/p-line/src/main/java/ir/peeco/pline/models/TblCdr.java b/p-line/src/main/java/ir/peeco/pline/models/TblCdr.java index a74266a..27dc205 100755 --- a/p-line/src/main/java/ir/peeco/pline/models/TblCdr.java +++ b/p-line/src/main/java/ir/peeco/pline/models/TblCdr.java @@ -3,6 +3,7 @@ package ir.peeco.pline.models; import lombok.Data; import jakarta.persistence.*; +import org.hibernate.annotations.ColumnDefault; @Data @Table(name = "tbl_cdr", indexes = { @@ -12,7 +13,9 @@ import jakarta.persistence.*; public class TblCdr { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @SequenceGenerator(name = "tbl_cdr_id_generator", sequenceName = "tbl_cdr_asterisk_id_seq", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tbl_cdr_id_generator") + @ColumnDefault("nextval('tbl_cdr_asterisk_id_seq'::regclass)") private Long id; @Column(nullable = false, columnDefinition = "timestamp WITH TIME ZONE") diff --git a/p-line/src/main/java/ir/peeco/pline/models/outbounRoutes/TblOutboundRouteTrunk.java b/p-line/src/main/java/ir/peeco/pline/models/outbounRoutes/TblOutboundRouteTrunk.java index cb61193..764c1b0 100755 --- a/p-line/src/main/java/ir/peeco/pline/models/outbounRoutes/TblOutboundRouteTrunk.java +++ b/p-line/src/main/java/ir/peeco/pline/models/outbounRoutes/TblOutboundRouteTrunk.java @@ -1,12 +1,14 @@ package ir.peeco.pline.models.outbounRoutes; -import lombok.Data; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.persistence.*; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import ir.peeco.pline.models.TblSipTrunk; +import lombok.Data; @Data @Table(indexes = @Index(columnList = "outbound_route_id", unique = false)) @@ -28,7 +30,9 @@ public class TblOutboundRouteTrunk { @ManyToOne @JoinColumn(name = "sip_trunk_id") - private TblSipTrunk SipTrunk; + @JsonProperty("sipTrunk") + @JsonAlias("SipTrunk") + private TblSipTrunk sipTrunk; @Column(nullable = false) @Min(value = 0, message = "Duration must be equal or greater than 0") diff --git a/p-line/src/main/java/ir/peeco/pline/plineServer/PlineTools.java b/p-line/src/main/java/ir/peeco/pline/plineServer/PlineTools.java index b82eea9..bf4f2ee 100755 --- a/p-line/src/main/java/ir/peeco/pline/plineServer/PlineTools.java +++ b/p-line/src/main/java/ir/peeco/pline/plineServer/PlineTools.java @@ -40,6 +40,8 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.*; import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -50,13 +52,26 @@ public class PlineTools { private static final int DEFAULT_AMI_COMMAND_CONNECTIONS = 4; private static final long AMI_COMMAND_TIMEOUT_MS = 5000; + private static final long AMI_RELOAD_TIMEOUT_MS = 60_000; + private static final long DEFAULT_AMI_COMMAND_IDLE_TIMEOUT_MS = 30_000; + private static final long AMI_COMMAND_POOL_SWEEP_INTERVAL_SECONDS = 10; private static final long ASTERISK_CLI_TIMEOUT_SECONDS = 10; + private static final long ASTERISK_RELOAD_CLI_TIMEOUT_SECONDS = 60; private final Object amiCommandPoolLock = new Object(); private final AtomicInteger amiCommandConnectionsCreated = new AtomicInteger(); - private final ArrayBlockingQueue idleAmiCommandConnections = + private final ArrayBlockingQueue idleAmiCommandConnections = new ArrayBlockingQueue<>(DEFAULT_AMI_COMMAND_CONNECTIONS); private final Semaphore amiCommandSlots = new Semaphore(DEFAULT_AMI_COMMAND_CONNECTIONS, true); private final Semaphore localCliFallbackSlots = new Semaphore(2, true); + private final ScheduledExecutorService amiCommandPoolMaintenance = + Executors.newSingleThreadScheduledExecutor(runnable -> { + Thread thread = new Thread(runnable, "ami-command-pool-maintenance"); + thread.setDaemon(true); + return thread; + }); + + @Value("${pline.ami-command-idle-timeout-ms:" + DEFAULT_AMI_COMMAND_IDLE_TIMEOUT_MS + "}") + private long amiCommandIdleTimeoutMs = DEFAULT_AMI_COMMAND_IDLE_TIMEOUT_MS; private AppSettingsService appSettingsService; @@ -281,6 +296,11 @@ public class PlineTools { this.logger = LogManager.getLogger(PlineTools.class); ConnectSocketToCore(); + amiCommandPoolMaintenance.scheduleWithFixedDelay( + this::expireIdleAmiCommandConnections, + AMI_COMMAND_POOL_SWEEP_INTERVAL_SECONDS, + AMI_COMMAND_POOL_SWEEP_INTERVAL_SECONDS, + TimeUnit.SECONDS); tmrTryConnect = new Timer(); tmrTryConnect.scheduleAtFixedRate(new TimerTask() { @Override @@ -429,9 +449,11 @@ public class PlineTools { return wantResult ? String.join("\n", result) + (result.isEmpty() ? "" : "\n") : ""; } + private record IdleAmiCommandConnection(ManagerConnection connection, long returnedAtNanos) { } + private record AmiCommandAttempt(boolean actionSent, List output) { } - private AmiCommandAttempt executeAmiCommand(String command) { + private AmiCommandAttempt executeAmiCommand(String command, long timeoutMs) { if (!amiCommandSlots.tryAcquire()) { plineLogger("AMI command pool is busy; using local Asterisk CLI fallback"); return new AmiCommandAttempt(false, null); @@ -451,7 +473,7 @@ public class PlineTools { // Once sendAction starts, a timeout has an uncertain outcome. Never retry it // through the CLI, since the first execution might already have completed. actionSent = true; - var response = connection.sendAction(new CommandAction(command), AMI_COMMAND_TIMEOUT_MS); + var response = connection.sendAction(new CommandAction(command), timeoutMs); reusable = connection.getState() == ManagerConnectionState.CONNECTED; if (response instanceof CommandResponse commandResponse) return new AmiCommandAttempt(true, commandResponse.getResult()); @@ -464,7 +486,8 @@ public class PlineTools { } finally { if (connection != null) { if (reusable && connection.getState() == ManagerConnectionState.CONNECTED - && idleAmiCommandConnections.offer(connection)) { + && idleAmiCommandConnections.offer( + new IdleAmiCommandConnection(connection, System.nanoTime()))) { // Keep healthy connections warm for the next command. } else { discardAmiCommandConnection(connection); @@ -475,9 +498,16 @@ public class PlineTools { } private ManagerConnection borrowAmiCommandConnection() { - ManagerConnection idle = idleAmiCommandConnections.poll(); - if (idle != null) - return idle; + IdleAmiCommandConnection idle; + while ((idle = idleAmiCommandConnections.poll()) != null) { + ManagerConnection connection = idle.connection(); + if (isAmiCommandConnectionExpired(idle) + || connection.getState() != ManagerConnectionState.CONNECTED) { + discardAmiCommandConnection(connection); + continue; + } + return connection; + } synchronized (amiCommandPoolLock) { if (amiCommandConnectionsCreated.get() >= DEFAULT_AMI_COMMAND_CONNECTIONS) @@ -507,6 +537,31 @@ public class PlineTools { } } + private boolean isAmiCommandConnectionExpired(IdleAmiCommandConnection idle) { + long idleTimeoutMs = Math.max(1, amiCommandIdleTimeoutMs); + long idleNanos = System.nanoTime() - idle.returnedAtNanos(); + return idleNanos >= TimeUnit.MILLISECONDS.toNanos(idleTimeoutMs); + } + + private void expireIdleAmiCommandConnections() { + try { + List keep = new ArrayList<>(); + IdleAmiCommandConnection idle; + while ((idle = idleAmiCommandConnections.poll()) != null) { + if (isAmiCommandConnectionExpired(idle)) + discardAmiCommandConnection(idle.connection()); + else + keep.add(idle); + } + for (IdleAmiCommandConnection connection : keep) { + if (!idleAmiCommandConnections.offer(connection)) + discardAmiCommandConnection(connection.connection()); + } + } catch (Exception ex) { + plineLogger("AMI command pool idle cleanup failed: " + ex.getMessage()); + } + } + private void discardAmiCommandConnection(ManagerConnection connection) { try { if (connection.getState() == ManagerConnectionState.CONNECTED) @@ -520,26 +575,35 @@ public class PlineTools { @PreDestroy public void closeAmiCommandConnections() { - ManagerConnection connection; - while ((connection = idleAmiCommandConnections.poll()) != null) - discardAmiCommandConnection(connection); + amiCommandPoolMaintenance.shutdownNow(); + IdleAmiCommandConnection idle; + while ((idle = idleAmiCommandConnections.poll()) != null) + discardAmiCommandConnection(idle.connection()); } public record AsteriskCliExecution(List output, String transport) { } public AsteriskCliExecution executeAsteriskCliCommand(String command) { + return executeAsteriskCliCommand(command, AMI_COMMAND_TIMEOUT_MS, ASTERISK_CLI_TIMEOUT_SECONDS); + } + + private AsteriskCliExecution executeAsteriskCliCommand(String command, long amiTimeoutMs, + long cliTimeoutSeconds) { if (command == null || command.isBlank() || command.length() > 4096 || command.indexOf('\n') >= 0 || command.indexOf('\r') >= 0 || command.indexOf('\0') >= 0) { plineLogger("Rejected invalid Asterisk CLI command input"); return new AsteriskCliExecution(null, "NONE"); } - AmiCommandAttempt amiAttempt = executeAmiCommand(command); + AmiCommandAttempt amiAttempt = executeAmiCommand(command, amiTimeoutMs); if (amiAttempt.actionSent()) { - plineLogger("Asterisk CLI command completed through AMI"); + if (amiAttempt.output() == null) + plineLogger("AMI command was sent but its result is unknown"); + else + plineLogger("Asterisk CLI command completed through AMI"); return new AsteriskCliExecution(amiAttempt.output(), "AMI"); } - String cliOutput = executeAsteriskCliFallback(command); + String cliOutput = executeAsteriskCliFallback(command, cliTimeoutSeconds); if (cliOutput == null) return new AsteriskCliExecution(null, "CLI"); List lines = cliOutput.isEmpty() ? List.of() : cliOutput.lines().toList(); @@ -551,7 +615,7 @@ public class PlineTools { return executeAsteriskCliCommand(command).output(); } - private String executeAsteriskCliFallback(String command) { + private String executeAsteriskCliFallback(String command, long timeoutSeconds) { if (!localCliFallbackSlots.tryAcquire()) { plineLogger("Local Asterisk CLI fallback is busy; rejecting this execution without queueing"); return null; @@ -573,10 +637,10 @@ public class PlineTools { ProcessBuilder pb = new ProcessBuilder(cmd).redirectErrorStream(true) .redirectOutput(outputFile.toFile()); process = pb.start(); - if (!process.waitFor(ASTERISK_CLI_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { + if (!process.waitFor(timeoutSeconds, TimeUnit.SECONDS)) { process.destroyForcibly(); process.waitFor(); - plineLogger("Asterisk CLI fallback timed out after " + ASTERISK_CLI_TIMEOUT_SECONDS + " seconds"); + plineLogger("Asterisk CLI fallback timed out after " + timeoutSeconds + " seconds"); return null; } if (process.exitValue() != 0) { @@ -648,7 +712,7 @@ public class PlineTools { return result == null ? null : String.join("\n", result) + (result.isEmpty() ? "" : "\n"); } - public void reloadConfigurations() { + public boolean reloadConfigurations() { // Apply rewrites Asterisk configuration only. Recursively changing the // owner of the spool/lib trees walks recordings and voicemail data and // can make a routine Apply take minutes on a live PBX. @@ -658,10 +722,23 @@ public class PlineTools { this.getConfigPath() }, true); - // Apply manager.conf changes (including allowmultiplelogin) before the - // command connections are reused; this is also needed on in-place upgrades. - execCoreCommand("manager reload"); - execCoreCommand("module reload"); + // The global module reload below also applies manager.conf changes, + // including allowmultiplelogin, during in-place upgrades. + // A full module reload also reloads the manager module. Send one reload + // request, allow it longer than ordinary CLI commands, and surface an + // in-progress reload instead of reporting Apply as successful. + AsteriskCliExecution execution = executeAsteriskCliCommand("module reload", AMI_RELOAD_TIMEOUT_MS, + ASTERISK_RELOAD_CLI_TIMEOUT_SECONDS); + if (execution.output() == null) { + plineLogger("Asterisk reload did not return a result; it may still be running. Check Asterisk logs."); + return false; + } + String output = String.join("\n", execution.output()); + if (output.toLowerCase(Locale.ROOT).contains("the previous reload command didn't finish yet")) { + plineLogger("Asterisk rejected the reload because a previous reload is still running."); + return false; + } + return true; } public boolean checkSipUid(String uid) { diff --git a/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/File_Generator.java b/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/File_Generator.java index b35aa5c..a33559a 100755 --- a/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/File_Generator.java +++ b/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/File_Generator.java @@ -133,7 +133,7 @@ public class File_Generator { this.voiceMailGenerator = voiceMailGenerator; } - public void GenerateFiles() { + public synchronized boolean GenerateFiles() { managerGenerator.run(); plineSettingsGenerator.run(); httpGenerator.run(); @@ -153,6 +153,6 @@ public class File_Generator { plineInterfaceGenerator.run(); spyGenerator.run(); faxGenerator.run(); - plineTools.reloadConfigurations(); + return plineTools.reloadConfigurations(); } } diff --git a/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/PlineSettingsGenerator.java b/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/PlineSettingsGenerator.java index e060e08..157d763 100755 --- a/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/PlineSettingsGenerator.java +++ b/p-line/src/main/java/ir/peeco/pline/plineServer/fileGeneratorTools/PlineSettingsGenerator.java @@ -67,6 +67,13 @@ public class PlineSettingsGenerator { modules.addElement("noload", "app_url.so", AssignMark.PriorityOperator); modules.addElement("noload", "res_adsi.so", AssignMark.PriorityOperator); modules.addElement("noload", "res_monitor.so", AssignMark.PriorityOperator); + // CTI writes native PJSIP objects and does not use the config wizard; + // avoid its reload deadlock in the deployed Asterisk 22.11 image. + modules.addElement("noload", "res_pjsip_config_wizard.so", AssignMark.PriorityOperator); + modules.addElement("noload", "res_phoneprov.so", AssignMark.PriorityOperator); + modules.addElement("noload", "chan_iax2.so", AssignMark.PriorityOperator); + + modules.addElement("\n;**** Load Modules ****", "", AssignMark.Empty); modules.addElement("load", "cdr_pgsql.so", AssignMark.PriorityOperator); modules.addElement("load", "res_ari.so", AssignMark.PriorityOperator); diff --git a/p-line/src/main/java/ir/peeco/pline/plineServer/tools/ConvertActionToDialplanExtension.java b/p-line/src/main/java/ir/peeco/pline/plineServer/tools/ConvertActionToDialplanExtension.java index 98b4e59..3c060bd 100755 --- a/p-line/src/main/java/ir/peeco/pline/plineServer/tools/ConvertActionToDialplanExtension.java +++ b/p-line/src/main/java/ir/peeco/pline/plineServer/tools/ConvertActionToDialplanExtension.java @@ -217,7 +217,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction(new DialPlanObject( "Goto(outbound-route-" + id + "," + exten + ",1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("SIP User Not found")); + addMissingTarget(dialPlanExtension, "outbound route", id); } } break; @@ -230,7 +230,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction( new DialPlanObject("Goto(ivr-" + action.getValue() + ",ivr,1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("IVR Not found")); + addMissingTarget(dialPlanExtension, "IVR", action.getValue()); } } @@ -244,7 +244,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction( new DialPlanObject("Goto(pline-queues,queue" + action.getValue() + ",1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("IVR Not found")); + addMissingTarget(dialPlanExtension, "queue", action.getValue()); } } break; @@ -265,7 +265,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction( new DialPlanObject("Goto(ring-groups-" + action.getValue() + ",s,1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("Ring Group Not found")); + addMissingTarget(dialPlanExtension, "ring group", action.getValue()); } } break; @@ -351,7 +351,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction(new DialPlanObject( "Goto(local-dial," + user.get().getCallerIdNumber() + ",1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("SIP User Not found")); + addMissingTarget(dialPlanExtension, "SIP user", action.getValue()); } } break; @@ -363,7 +363,7 @@ ConvertActionToDialplanExtension { dialPlanExtension.addFunction( new DialPlanObject("Goto(time-condition-" + action.getValue() + ",s,1)")); } else { - dialPlanExtension.addFunction(new DialPlanObject("Time Condition Not found")); + addMissingTarget(dialPlanExtension, "time condition", action.getValue()); } } break; @@ -387,4 +387,11 @@ ConvertActionToDialplanExtension { } } + private void addMissingTarget(DialPlanExtension dialPlanExtension, String targetType, Long targetId) { + dialPlanExtension.addFunction(new DialPlanObject( + "NoOp(Configured " + targetType + " target id=" + targetId + " was not found)")); + dialPlanExtension.addFunction(new DialPlanObject("Congestion(45)")); + dialPlanExtension.addFunction(new DialPlanObject("Hangup()")); + } + } diff --git a/p-line/src/main/java/ir/peeco/pline/repositories/inboundRoutes/InboundRouteActionRepository.java b/p-line/src/main/java/ir/peeco/pline/repositories/inboundRoutes/InboundRouteActionRepository.java index a9af5e7..7da976f 100755 --- a/p-line/src/main/java/ir/peeco/pline/repositories/inboundRoutes/InboundRouteActionRepository.java +++ b/p-line/src/main/java/ir/peeco/pline/repositories/inboundRoutes/InboundRouteActionRepository.java @@ -1,6 +1,7 @@ package ir.peeco.pline.repositories.inboundRoutes; import ir.peeco.pline.models.inboundRoutes.TblInboundRouteAction; +import ir.peeco.pline.enums.PlineActions; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -11,6 +12,8 @@ import java.util.Optional; public interface InboundRouteActionRepository extends JpaRepository { + boolean existsByActionAndValue(PlineActions action, Long value); + @Query("SELECT t FROM tbl_inbound_route_actions t WHERE" + " t.inboundRoute.id=:inbound_route_id" + " ORDER BY t.id ASC") diff --git a/p-line/src/main/java/ir/peeco/pline/repositories/outboundRoutes/OutboundRouteTrunksRepository.java b/p-line/src/main/java/ir/peeco/pline/repositories/outboundRoutes/OutboundRouteTrunksRepository.java index cb7ec57..631aa84 100755 --- a/p-line/src/main/java/ir/peeco/pline/repositories/outboundRoutes/OutboundRouteTrunksRepository.java +++ b/p-line/src/main/java/ir/peeco/pline/repositories/outboundRoutes/OutboundRouteTrunksRepository.java @@ -9,6 +9,9 @@ import ir.peeco.pline.models.outbounRoutes.TblOutboundRouteTrunk; public interface OutboundRouteTrunksRepository extends JpaRepository { + @Query(value = "SELECT COUNT(*) FROM tbl_outbound_route_trunks WHERE sip_trunk_id = :sip_trunk_id", nativeQuery = true) + long countBySipTrunkId(@Param("sip_trunk_id") Long sipTrunkId); + @Query(value = "SELECT r.* FROM tbl_outbound_route_trunks r LEFT OUTER JOIN tbl_sip_trunks t ON r.sip_trunk_id = t.id " + " WHERE r.outbound_route_id=:outbound_route_id " + " AND t.name LIKE %:sip_trunk_name% " diff --git a/p-line/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/p-line/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 0ea5e0f..a6ceae0 100755 --- a/p-line/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/p-line/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -89,6 +89,18 @@ "type": "java.lang.String", "description": "A description for 'pline.license_url'" }, + { + "name": "pline.license.version", + "type": "java.lang.Integer", + "defaultValue": 1, + "description": "Online license API version: 1=legacy, 2=ray2. Offline license handling is unchanged." + }, + { + "name": "pline.license.ray2_url", + "type": "java.lang.String", + "defaultValue": "https://ray2lic.raymandcti.com", + "description": "Base URL for the Ray2 online license API." + }, { "name": "pline.license.enforce", "type": "java.lang.Boolean", diff --git a/p-line/src/main/resources/application.properties b/p-line/src/main/resources/application.properties index fa0843b..e48bc1f 100755 --- a/p-line/src/main/resources/application.properties +++ b/p-line/src/main/resources/application.properties @@ -151,5 +151,8 @@ pline.app_footer=Copyright Raymand Communications Naqsh Jahan, Inc. All Rights R pline.app_website=http://raymandcti.com/ pline.license_url=http://license.raymandcti.com:8008 +# Online licensing API: 1=legacy, 2=ray2. Offline license handling is unchanged. +pline.license.version=2 +pline.license.ray2_url=https://ray2lic.raymandcti.com pline.license.enforce=false pline.confirm_link=http://raymandcti.com/rules-for-using-the-call-center/