Использовал PbxSettings::getValueByKey('WEBPort') для nchan URL. Fixes #34

Author: Alexey Portnov

bin/AmoCdrDaemon.php

@@ -194,7 +194,7 @@ private function updateUsers():void
             ];
         }
         unset($extensions);
-        $result = ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::CHANNEL_CALL_NAME, ['data' => $data, 'action' => 'USERS']);
+        $result = ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::getChannelUrl(), ['data' => $data, 'action' => 'USERS']);
         if(!$result->success){
             $this->logger->writeError("Update user list. Count: ".count($data));
             try {
@@ -265,7 +265,7 @@ private function updateActiveCalls():void
         $md5Cdr = md5(print_r($params, true));
         if($this->panelIsEnable && $md5Cdr !== $this->lastCacheCdr){
             // Оповещаме только если изменилось состояние.
-            ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::CHANNEL_CALL_NAME, ['data' => $params, 'action' => 'CDRs']);
+            ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::getChannelUrl(), ['data' => $params, 'action' => 'CDRs']);
             $this->lastCacheCdr = $md5Cdr;
         }
     }
@@ -469,7 +469,7 @@ private function alertIncompleteAnswered():void
             }
             if(!empty($call['lead']) || !empty($call['client']) || !empty($call['company'])){
                 $this->logger->writeInfo($call, "alertIncompleteAnswered");
-                ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::CHANNEL_CALL_NAME, ['data' => $call, 'action' => 'open-card']);
+                ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::getChannelUrl(), ['data' => $call, 'action' => 'open-card']);
             }
             $this->incompleteAnswered[$id]['finished'] = true;
         }

bin/ConnectorDb.php

@@ -498,7 +498,7 @@ public function findContacts($numbers):array
                 $this->saveCache(self::class.':'.$phone, [], 10);
             }
         }
-        ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::CHANNEL_CALL_NAME, ['action' => 'findContact', 'data' => $result]);
+        ClientHTTP::sendHttpPostRequest(WorkerAmoCrmAMI::getChannelUrl(), ['action' => 'findContact', 'data' => $result]);
         return $result;
     }
 

bin/WorkerAmoCrmAMI.php

@@ -20,6 +20,7 @@
 namespace Modules\ModuleAmoCrm\bin;
 require_once 'Globals.php';
 
+use MikoPBX\Common\Models\PbxSettings;
 use MikoPBX\Core\System\BeanstalkClient;
 use MikoPBX\Core\System\Util;
 use MikoPBX\Core\Workers\WorkerBase;
@@ -28,7 +29,14 @@
 
 class WorkerAmoCrmAMI extends WorkerBase
 {
-    public const CHANNEL_CALL_NAME = 'http://127.0.0.1/pbxcore/api/nchan/pub/pbx-events';
+    /**
+     * @return string
+     */
+    public static function getChannelUrl(): string
+    {
+        $port = PbxSettings::getValueByKey('WEBPort');
+        return "http://127.0.0.1:{$port}/pbxcore/api/nchan/pub/pbx-events";
+    }
 
     private int     $extensionLength = 3;
     private array   $users = [];
@@ -251,7 +259,7 @@ private function actionCreateCdr($data, $generalNumber):void
                 $this->calls[$call['id']][] = $call;
             }
             $this->activeChannels[$data['src_chan']] = $data['src_num'];
-            ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $call);
+            ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $call);
         }
     }
 
@@ -419,7 +427,7 @@ private function actionHangupChan($data):void
                 'user'    => $userId,
                 'action'  => 'hangup'
             ];
-            ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $params);
+            ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $params);
         }
     }
 
@@ -466,15 +474,15 @@ private function cloneCdr($data, &$transferCall, $call):void
             'dst'     => $transferCall['dst'],
             'action'  => 'call'
         ];
-        ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $params);
+        ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $params);
 
         $data = [
             'action'   => 'answer',
             'date'     => $endTime,
             'id'       => $data['linkedid'],
             'uid'      => $transferCall['uid'],
         ];
-        ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $data);
+        ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $data);
     }
 
     /**
@@ -514,7 +522,7 @@ private function actionDialCreateChan($data):void{
             'user'    => $this->users[$number],
             'action'  => 'create-chan'
         ];
-        ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $params);
+        ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $params);
     }
 
     /**
@@ -538,7 +546,7 @@ private function actionDialAnswer($params):void
                 'id'       => $params['linkedid'],
                 'uid'      => $call['uid'],
             ];
-            ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $data);
+            ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $data);
             break;
         }
         unset($call);
@@ -567,7 +575,7 @@ private function actionDialEnd($data):void
             'dst'              => '', // Канал назначения не был создан.
             'action'           => 'end-dial',
         ];
-        ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $call);
+        ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $call);
     }
 
     /**
@@ -611,7 +619,7 @@ private function actionCompleteCdr($data):void
             'filename'         => $data['recordingfile'],
             'action'           => 'end-call',
         ];
-        ClientHTTP::sendHttpPostRequest(self::CHANNEL_CALL_NAME, $call);
+        ClientHTTP::sendHttpPostRequest(self::getChannelUrl(), $call);
 
         // Чистим мусор.
         unset(