Version 5.0.0 beta 1

This commit is contained in:
Neo committed 2025-12-19 16:27:35 -08:00
1 parent 25ddeb65d6
commit 15c7beabc5
6736 files changed
+627902 -497943

No files matched your search

+98 -29
View File
@@ -11,17 +11,42 @@
namespace IPS\core\tasks;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\IPS;
use IPS\Db;
use IPS\Db\Exception;
use IPS\Log;
use IPS\Platform\Bridge;
use IPS\Redis;
use IPS\Task;
use OutOfRangeException;
use Throwable;
use UnderflowException;
use function defined;
use function in_array;
use function intval;
use function is_array;
use const IPS\CACHE_CONFIG;
use const IPS\CACHE_METHOD;
use const IPS\REDIS_CONFIG;
use const IPS\REDIS_ENABLED;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* view_updates Task
*/
class _viewupdates extends \IPS\Task
class viewupdates extends Task
{
/**
* @breif Stored data to send to Cloud in one go
*/
protected array $_sendToCloud = [];
/**
* Execute
*
@@ -31,17 +56,16 @@ class _viewupdates extends \IPS\Task
* Tasks should execute within the time of a normal HTTP request.
*
* @return mixed Message to log or NULL
* @throws \IPS\Task\Exception
* @throws Task\Exception
*/
public function execute()
public function execute() : mixed
{
$this->runUntilTimeout(function(){
$hasCount = FALSE;
try
{
/* @note SELECT_FROM_WRITE_SERVER added in 72724569ca77f6686f6be0861ce673f793a862e8 to avoid a race condition that caused high view counts */
$database = \IPS\Db::i()->select( 'classname, id, count(*) AS count', 'core_view_updates', NULL, NULL, 20, array( 'classname', 'id' ), NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER );
$database = Db::i()->select( 'classname, id, count(*) AS count', 'core_view_updates', NULL, NULL, 20, array( 'classname', 'id' ), NULL, Db::SELECT_FROM_WRITE_SERVER );
/* Database results first */
foreach( $database as $row )
@@ -52,39 +76,42 @@ class _viewupdates extends \IPS\Task
{
$this->update( $row['classname'], $row['id'], $row['count'] );
}
catch( \OutOfRangeException $e )
catch( OutOfRangeException $e )
{
\IPS\Db::i()->delete( 'core_view_updates', array( 'classname=?', $row['classname'] ) );
Db::i()->delete( 'core_view_updates', array( 'classname=?', $row['classname'] ) );
}
\IPS\Db::i()->delete( 'core_view_updates', array( 'classname=? AND id=?', $row['classname'], $row['id'] ) );
Db::i()->delete( 'core_view_updates', array( 'classname=? AND id=?', $row['classname'], $row['id'] ) );
}
}
catch ( \UnderflowException $e ) { }
catch ( UnderflowException $e ) { }
/* Now do cloud */
Bridge::i()->viewTask( $this->_sendToCloud );
/* Now try redis */
if ( \IPS\REDIS_ENABLED and \IPS\CACHE_METHOD == 'Redis' and ( \IPS\CACHE_CONFIG or \IPS\REDIS_CONFIG ) )
if ( Redis::isEnabled() )
{
try
{
$redis = \IPS\Redis::i()->zRevRangeByScore( 'topic_views', '+inf', '-inf', array('withscores' => TRUE, 'limit' => array( 0, 20 ) ) );
$redis = Redis::i()->zRevRangeByScore( 'topic_views', '+inf', '-inf', array('withscores' => TRUE, 'limit' => array( 0, 20 ) ) );
if( \is_array( $redis ) AND \count( $redis ) )
if( is_array( $redis ) and count( $redis ) )
{
foreach ( $redis as $data => $count )
{
$hasCount = TRUE;
list( $class, $id ) = explode( '__', $data );
[ $class, $id ] = explode( '__', $data );
try
{
$this->update( $class, $id, \intval( $count ) );
$this->update( $class, $id, intval( $count ) );
}
catch ( \OutOfRangeException $e ) {}
catch ( OutOfRangeException $e ) {}
}
\IPS\Redis::i()->zRem( 'topic_views', ...array_keys( $redis ) );
Redis::i()->zRem( 'topic_views', ...array_keys( $redis ) );
}
}
catch( \Exception $e ) { }
@@ -92,9 +119,9 @@ class _viewupdates extends \IPS\Task
/* Now try advert impressions */
try
{
$redis = \IPS\Redis::i()->zRevRangeByScore( 'advert_impressions', '+inf', '-inf', array('withscores' => TRUE, 'limit' => array( 0, 20 ) ) );
$redis = Redis::i()->zRevRangeByScore( 'advert_impressions', '+inf', '-inf', array('withscores' => TRUE, 'limit' => array( 0, 20 ) ) );
if( \is_array( $redis ) )
if( is_array( $redis ) )
{
$updates = [];
foreach ( $redis as $id => $count )
@@ -102,12 +129,12 @@ class _viewupdates extends \IPS\Task
$hasCount = TRUE;
$updates[ $count ][] = $id;
\IPS\Redis::i()->zRem( 'advert_impressions', $id );
Redis::i()->zRem( 'advert_impressions', $id );
}
foreach ( $updates as $incrementBy => $ids )
{
\IPS\Db::i()->update( 'core_advertisements', "ad_impressions=ad_impressions+" . $incrementBy, [ \IPS\Db::i()->in( 'ad_id', $ids ) ] );
Db::i()->update( 'core_advertisements', "ad_impressions=ad_impressions+" . $incrementBy, [ Db::i()->in( 'ad_id', $ids ) ] );
}
}
}
@@ -124,6 +151,8 @@ class _viewupdates extends \IPS\Task
return FALSE;
}
});
return null;
}
/**
@@ -132,26 +161,66 @@ class _viewupdates extends \IPS\Task
* @param string $class Class to update
* @param int $id ID of item
* @param int $count Count to update
* @throws \OutOfRangeException When table to update no longer exists
* @throws OutOfRangeException When table to update no longer exists
*/
protected function update( $class, $id, $count )
protected function update( string $class, int $id, int $count ) : void
{
if ( class_exists( $class ) and \IPS\IPS::classUsesTrait( $class, 'IPS\Content\ViewUpdates' ) AND isset( $class::$databaseColumnMap['views'] ) )
if ( class_exists( $class ) and IPS::classUsesTrait( $class, 'IPS\Content\ViewUpdates' ) AND isset( $class::$databaseColumnMap['views'] ) )
{
try
{
\IPS\Db::i()->update(
$item = $class::load( $id );
$title = '';
/* If we specify a title specifically for analytics, use that always. */
if ( method_exists( $item, 'titleForAnalytics' ) )
{
$title = $item->titleForAnalytics();
}
/* Otherwise use titleForLog for Nodes */
else if ( in_array( 'IPS\Node\Model', class_parents( $item ) ) )
{
$title = $item->titleForLog();
}
/* Or the defined title column for content items. */
else if ( in_array( 'IPS\Content\Item', class_parents( $item ) ) )
{
$title = $item->mapped('title');
}
$url = '';
if ( method_exists( $item, 'url' ) )
{
$url = $item->url();
}
$this->_sendToCloud[] = [
'contentClass' => $class,
'contentId' => $id,
'views' => $count,
'title' => $title,
'url' => (string) $url
];
}
catch( Throwable $e )
{
Log::log( $e, 'views' );
}
try
{
Db::i()->update(
$class::$databaseTable,
"`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`=`{$class::$databasePrefix}{$class::$databaseColumnMap['views']}`+{$count}",
array( "{$class::$databasePrefix}{$class::$databaseColumnId}=?", $id )
);
}
catch( \IPS\Db\Exception $e )
catch( Exception $e )
{
/* Table to update no longer exists */
if( $e->getCode() == 1146 )
{
throw new \OutOfRangeException;
throw new OutOfRangeException;
}
throw $e;