Fix plugin loading issue with phar files

Leantime · Nov 15, 2024 · 608a409 · 608a409
1 parent 28d8c23
commit 608a409
Show file tree

Hide file tree

Showing 10 changed files with 310 additions and 1,739 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/app/Core/Controller/Frontcontroller.php b/app/Core/Controller/Frontcontroller.php
@@ -143,10 +143,18 @@ public function parseRequestParts(IncomingRequest $request)
             $method = $segments[2];
         }
 
+        //If a third segment is set it is the id
+        if(isset($segments[3])) {
+            $id = $segments[3];
+            $method = $segments[2];
+            $request_parts = join('.', array_slice($segments, 3));
+            $this->incomingRequest->query->set('request_parts', $request_parts);
+        }
+
         $this->incomingRequest->query->set('act', $moduleName.'.'.$controllerName.'.'.$method);
         $this->incomingRequest->setCurrentRoute($moduleName.'.'.$controllerName);
 
-        if (! empty($id)) {
+        if ($id === "0" || !empty($id)) {
             $this->incomingRequest->query->set('id', $id);
         }
 
@@ -213,20 +221,20 @@ public function getValidControllerCall(string $moduleName, string $actionName, s
 
         $moduleName = Str::studly($moduleName);
         $actionName = Str::studly($actionName);
-        $methodName = Str::lower($methodName);
+        $methodNameLower = Str::lower($methodName);
         $routepath = $moduleName.'.'.$controllerType.'.'.$actionName;
         $actionPath = $moduleName.'\\'.$controllerType.'\\'.$actionName;
 
         if ($this->config->debug == false) {
-            if (Cache::store('installation')->has('routes.'.$routepath.'.'.$methodName)) {
-                return Cache::store('installation')->get('routes.'.$routepath.'.'.$methodName);
+            if (Cache::store('installation')->has('routes.'.$routepath.'.'.$methodNameLower)) {
+                return Cache::store('installation')->get('routes.'.$routepath.'.'.$methodNameLower);
             }
         }
 
         $classPath = $this->getClassPath($controllerType, $moduleName, $actionName);
         $classMethod = $this->getValidControllerMethod($classPath, $methodName);
 
-        Cache::store('installation')->set('routes.'.$routepath.'.'.($classMethod == 'run' ? $methodName : $classMethod), ['class' => $classPath, 'method' => $classMethod]);
+        Cache::store('installation')->set('routes.'.$routepath.'.'.($classMethod == 'run' ? $methodNameLower : $classMethod), ['class' => $classPath, 'method' => $classMethod]);
 
         return ['class' => $classPath, 'method' => $classMethod];
     }

diff --git a/app/Core/Http/HttpKernel.php b/app/Core/Http/HttpKernel.php
@@ -105,12 +105,25 @@ protected function sendRequestThroughRouter($request)
 
         //This filter only works for system plugins
         //Regular plugins are not available until after install verification
-        $this->middleware = self::dispatch_filter('plugins_middleware', $this->middleware, ['request' => $request]);
+        $this->middleware = self::dispatch_filter('middleware', $this->middleware, ['request' => $request]);
 
-        return (new \Illuminate\Routing\Pipeline($this->app))
+        //Main Pipeline
+        $response = (new \Illuminate\Routing\Pipeline($this->app))
             ->send($request)
-            ->through($this->app->shouldSkipMiddleware() ? [] : $this->middleware)
-            ->then(fn () => Frontcontroller::dispatch_request($request));
+            ->through($this->middleware)
+            ->then(fn ($request) =>
+                //Then run through plugin pipeline
+            (new \Illuminate\Routing\Pipeline($this->app))
+                ->send($request)
+                ->through(self::dispatch_filter(
+                    hook: 'plugins_middleware',
+                    payload: [],
+                    function: 'handle',
+                ))
+                ->then(fn () => Frontcontroller::dispatch_request($request))
+            );
+
+        return $response;
     }
 
     public function handle($request)

diff --git a/app/Core/Middleware/Auth.php b/app/Core/Middleware/Auth.php
@@ -40,7 +40,6 @@ class Auth
 
     public function __construct(
         private AuthService $authService,
-        private ProjectsService $projectsService,
     ) {
         $this->publicActions = self::dispatchFilter('publicActions', $this->publicActions, ['bootloader' => $this]);
     }

diff --git a/app/Core/Providers/Views.php b/app/Core/Providers/Views.php
@@ -79,7 +79,7 @@ public function registerFactory()
             foreach ($composers as $key => $composerClass) {
                 if (
                     (is_subclass_of($composerClass, \Leantime\Core\UI\Composer::class)
-                    || is_subclass_of($composerClass, \Leantime\Core\Controller\Composer::class))
+                        || is_subclass_of($composerClass, \Leantime\Core\Controller\Composer::class))
                     &&
 
                     ! (new \ReflectionClass($composerClass))->isAbstract()
@@ -254,7 +254,35 @@ private function discoverComposerPaths()
 
         $enabledPlugins = $this->app->make(\Leantime\Domain\Plugins\Services\Plugins::class)->getEnabledPlugins();
         $pluginComposerClasses = collect($enabledPlugins)
-            ->map(fn ($plugin) => glob(APP_ROOT.'/app/Plugins/'.$plugin->foldername.'/Composers/*.php'))
+            ->map(function ($plugin) {
+                if ($plugin->format === 'phar') {
+                    $pharPath = APP_ROOT.'/app/Plugins/'.$plugin->foldername.'/'.$plugin->foldername.'.phar';
+
+                    if (!file_exists($pharPath)) {
+                        return [];
+                    }
+
+                    try {
+
+                        $composers = [];
+                        $composerPath = 'phar://'.$pharPath.'/Composers';
+                        $p = new \Phar($composerPath, 0);
+                        $paths = collect(new \RecursiveIteratorIterator($p));
+
+                        foreach($paths as $path) {
+                            $something = $path;
+                            $composers[] = 'Plugins/'.$plugin->foldername.'/Composers/'.$path->getFileName();
+                        }
+
+                        return $composers;
+
+                    } catch (\Exception $e) {
+                        return [];
+                    }
+                }
+
+                return glob($basePath.'/Composers/*.php') ?: [];
+            })
             ->flatten();
 
         $composerList = $appComposerClasses

diff --git a/app/Domain/Plugins/Hxcontrollers/Details.php b/app/Domain/Plugins/Hxcontrollers/Details.php
@@ -51,10 +51,11 @@ public function install(): string
 
             //Parse and clean up error message
             $errorJson = str_replace('HTTP request returned status code 500:', '', $e->getMessage());
+            $errorJson = str_replace('HTTP request returned status code 200:', '', $errorJson);
             $errors = json_decode(trim($errorJson));
             report($e);
 
-            $this->tpl->assign('formError', $errors->error ?? 'There was an error installing the plugin');
+            $this->tpl->assign('formError', $errors->error ?? $errors->message ?? 'There was an error installing the plugin');
 
             return 'plugin-installation';
         }

diff --git a/app/Domain/Plugins/Services/Plugins.php b/app/Domain/Plugins/Services/Plugins.php
@@ -373,7 +373,6 @@ public function removePlugin(int $id): bool
 
             return $this->pluginRepository->removePlugin($id);
 
-            //TODO remove files savely
         }
 
         /**
@@ -579,6 +578,10 @@ public function clearCache()
             $files = app()->make(\Illuminate\Filesystem\Filesystem::class);
             $viewPathCachePath = storage_path('framework/viewPaths.php');
             $files->delete($viewPathCachePath);
+
+            $composerPathCachePath = storage_path('framework/composerPaths.php');
+            $files->delete($composerPathCachePath);
+
         }
     }
 }
diff --git a/app/Domain/Plugins/Templates/plugindetails.blade.php b/app/Domain/Plugins/Templates/plugindetails.blade.php
@@ -105,14 +105,16 @@
                         <div class="tw-text-green-500">{!! $formNotification !!}</div>
                     @else
                         <div id="installForm{{ $plugin->marketplaceId }}">
+
+
                             @if (! empty($formError))
                                 <div class="tw-text-red-500">{!! $formError !!}</div>
                             @endif
                             <form
                                 class="tw-flex tw-gap-2 tw-items-center"
                                 hx-post="{{ BASE_URL }}/hx/plugins/details/install"
                                 hx-swap="outerHTML"
-                                hx-indicator=".htmx-indicator, .htmx-loaded-content"
+                                hx-indicator=".htmx-indicator-small, .htmx-loaded-content"
                                 hx-target="#installForm{{ $plugin->marketplaceId }}"
                             >
                                 @php
@@ -133,8 +135,8 @@ class="tw-flex tw-gap-2 tw-items-center"
                                     :tag="'button'"
                                     :type="'secondary'"
                                 >Install</x-global::button>
-                                <div class="htmx-indicator">
-                                    <x-global::loadingText type="text" :count="5" />
+                                <div class="htmx-indicator-small">
+                                    <x-global::loader id="loadingthis" size="25px" />
                                 </div>
                             </form>
                         </div>