CB-6051 ability to download drivers

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebDriverRegistry.java

@@ -63,4 +63,9 @@
         return webDrivers.contains(driver.getFullId());
     }
 
+
+    public boolean validateDriverFilesAvailability() {
+        return true;
+    }
+
 }

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java

@@ -735,6 +735,7 @@ protected void sendConfigChangedEvent(SMCredentialsProvider credentialsProvider)
     public abstract CBServerConfigurationController<T> getServerConfigurationController();
 
     private void refreshDisabledDriversConfig() {
+        CBPlatform.getInstance().refreshApplicableDrivers();
         CBAppConfig config = getAppConfiguration();
         Set<String> disabledDrivers = new LinkedHashSet<>(Arrays.asList(config.getDisabledDrivers()));
         for (DBPDriver driver : CBPlatform.getInstance().getApplicableDrivers()) {

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBPlatform.java

@@ -18,6 +18,7 @@
 package io.cloudbeaver.server;
 
 import io.cloudbeaver.auth.NoAuthCredentialsProvider;
+import io.cloudbeaver.registry.WebDriverRegistry;
 import io.cloudbeaver.server.jobs.SessionStateJob;
 import io.cloudbeaver.server.jobs.WebDataSourceMonitorJob;
 import io.cloudbeaver.server.jobs.WebSessionMonitorJob;
@@ -39,6 +40,7 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -76,8 +78,6 @@
         log.info("Initialize web platform...: ");
         this.preferenceStore = new WebServerPreferenceStore(WebPlatformActivator.getInstance().getPreferences());
         super.initialize();
-        refreshApplicableDrivers();
-
         scheduleServerJobs();
         log.info("Web platform initialized (" + (System.currentTimeMillis() - startTime) + "ms)");
     }
@@ -140,21 +140,22 @@
         return false;
     }
 
     public void refreshApplicableDrivers() {
         this.applicableDrivers.clear();
+        assert application != null;
+        WebDriverRegistry driverRegistry = application.getDriverRegistry();
 
         for (DBPDataSourceProviderDescriptor dspd : DataSourceProviderRegistry.getInstance().getEnabledDataSourceProviders()) {
             for (DBPDriver driver : dspd.getEnabledDrivers()) {
                 List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
                 {
-                    if (!application.getDriverRegistry().isDriverEnabled(driver)) {
+                    if (!driverRegistry.isDriverEnabled(driver)) {
                         continue;
                     }
                     boolean hasAllFiles = true, hasJars = false;
                     for (DBPDriverLibrary lib : libraries) {
-                        if (!DBWorkbench.isDistributed() && !lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&
-                            (lib.getLocalFile() == null || !Files.exists(lib.getLocalFile())))
+                        if (driverRegistry.validateDriverFilesAvailability() && !isDriverLibraryFilePresent(lib))
                         {
                             hasAllFiles = false;
                             log.error("\tDriver '" + driver.getId() + "' is missing library '" + lib.getDisplayName() + "'");
                         } else {
@@ -172,6 +173,14 @@
         log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getFullName).collect(Collectors.joining(",")));
     }
 
+    private boolean isDriverLibraryFilePresent(@NotNull DBPDriverLibrary lib) {
+        if (lib.getType() == DBPDriverLibrary.FileType.license) {
+            return true;
+        }
+        Path localFile = lib.getLocalFile();
+        return localFile != null && Files.exists(localFile);
+    }
+
     @NotNull
     @Override
     public DBFileController createFileController() {

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

@@ -269,6 +269,13 @@ type DriverLibraryInfo {
     id: ID!
     name: String!
     icon: String
+    libraryFiles: [DriverFileInfo!]
+}
+
+type DriverFileInfo @since(version: "24.3.2") {
+    id: ID!
+    fileName: String!
+    icon: String
 }
 
 enum ResultDataFormat {

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java

@@ -400,4 +400,11 @@
         }
         return webProps.toArray(new WebPropertyInfo[0]);
     }
+
+    public static void validateDriverLibrariesPresence(@NotNull DBPDataSourceContainer container) throws DBWebException {
+        if (container.getDriver().needsExternalDependencies()) {
+            throw new DBWebException("Driver files for %s are not found. Please, ask administrator to download it."
+                .formatted(container.getDriver().getName()));
+        }
+    }
 }

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverInfo.java

@@ -53,7 +53,7 @@ public class WebDatabaseDriverInfo {
     public static final String URL_DATABASE_FIELD = ".*(?:\\{(?:database|file|folder)}).*";
     private final WebSession webSession;
     private final DBPDriver driver;
-    private String id;
+    private final String id;
 
     public WebDatabaseDriverInfo(WebSession webSession, DBPDriver driver) {
         this.webSession = webSession;
@@ -296,13 +296,13 @@ public boolean getRequiresDatabaseName() {
     @Property
     public WebDriverLibraryInfo[] getDriverLibraries() {
         return driver.getDriverLibraries().stream()
-            .map(dbpDriverLibrary -> new WebDriverLibraryInfo(webSession, dbpDriverLibrary))
+            .map(dbpDriverLibrary -> new WebDriverLibraryInfo(driver, dbpDriverLibrary))
             .toArray(WebDriverLibraryInfo[]::new);
     }
 
     @Property
     public boolean isDriverInstalled() {
-        return !driver.needsExternalDependencies(webSession.getProgressMonitor());
+        return !driver.needsExternalDependencies();
     }
 
     @Property

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDriverLibraryFileInfo.java

@@ -0,0 +1,53 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import io.cloudbeaver.WebServiceUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBIcon;
+import org.jkiss.dbeaver.model.connection.DBPDriverLibrary;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
+
+public class WebDriverLibraryFileInfo {
+
+    @NotNull
+    private final DriverDescriptor.DriverFileInfo fileInfo;
+
+    public WebDriverLibraryFileInfo(@NotNull DriverDescriptor.DriverFileInfo fileInfo) {
+        this.fileInfo = fileInfo;
+    }
+
+
+    @Property
+    public String getId() {
+        return fileInfo.getId();
+    }
+
+    @Property
+    public String getFileName() {
+        return fileInfo.toString();
+    }
+
+    @Property
+    public String getIcon() {
+        if (fileInfo.getType() == DBPDriverLibrary.FileType.license) {
+            return WebServiceUtils.makeIconId(DBIcon.TYPE_TEXT);
+        }
+        return WebServiceUtils.makeIconId(DBIcon.JAR);
+    }
+}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDriverLibraryInfo.java

@@ -17,18 +17,24 @@
 package io.cloudbeaver.model;
 
 import io.cloudbeaver.WebServiceUtils;
-import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPDriverLibrary;
 import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
+
+import java.util.List;
 
 public class WebDriverLibraryInfo {
 
-    private final WebSession webSession;
+    @NotNull
+    private final DBPDriver driver;
+    @NotNull
     private final DBPDriverLibrary driverLibrary;
 
-    public WebDriverLibraryInfo(@NotNull WebSession webSession, @NotNull DBPDriverLibrary driverLibrary) {
-        this.webSession = webSession;
+    public WebDriverLibraryInfo(@NotNull DBPDriver driver, @NotNull DBPDriverLibrary driverLibrary) {
+        this.driver = driver;
         this.driverLibrary = driverLibrary;
     }
 
@@ -43,6 +49,18 @@ public String getName() {
         return driverLibrary.getDisplayName();
     }
 
+    @Property
+    @Nullable
+    public List<WebDriverLibraryFileInfo> getLibraryFiles() {
+        var libraryFiles = ((DriverDescriptor) driver).getLibraryFiles(driverLibrary);
+        if (libraryFiles == null) {
+            return null;
+        }
+        return libraryFiles.stream()
+            .map(WebDriverLibraryFileInfo::new)
+            .toList();
+    }
+
     @Property
     public String getIcon() {
         return WebServiceUtils.makeIconId(driverLibrary.getIcon());

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java

@@ -366,8 +366,10 @@ public WebConnectionInfo initConnection(
         }
 
         boolean oldSavePassword = dataSourceContainer.isSavePassword();
+        DBRProgressMonitor monitor = webSession.getProgressMonitor();
+        WebServiceUtils.validateDriverLibrariesPresence(dataSourceContainer);
         try {
-            boolean connect = dataSourceContainer.connect(webSession.getProgressMonitor(), true, false);
+            boolean connect = dataSourceContainer.connect(monitor, true, false);
             if (connect) {
                 webSession.addSessionEvent(
                     new WSDataSourceConnectEvent(
@@ -755,6 +757,7 @@ public WebConnectionInfo testConnection(
             testDataSource = (DataSourceDescriptor) WebServiceUtils.createConnectionFromConfig(connectionConfig,
                 sessionRegistry);
         }
+        WebServiceUtils.validateDriverLibrariesPresence(testDataSource);
         webSession.provideAuthParameters(webSession.getProgressMonitor(),
             testDataSource,
             testDataSource.getConnectionConfiguration());

webapp/packages/core-sdk/src/queries/fragments/DatabaseDriver.gql

@@ -22,6 +22,8 @@ fragment DatabaseDriver on DriverInfo {
   applicableAuthModels
   applicableNetworkHandlers
   configurationTypes
+  driverId
+  driverInstalled
 
   mainProperties @include(if: $includeMainProperties) {
     ...DriverPropertyInfo

webapp/packages/plugin-connection-custom/src/DriverSelector/Driver.module.css

@@ -5,8 +5,24 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+.icon {
+  position: relative;
+}
+
 .staticImage {
   box-sizing: border-box;
   width: 24px;
   max-height: 24px;
-};
+}
+
+.indicator {
+  position: absolute;
+  bottom: 2px;
+  right: 0;
+  width: 12px;
+  height: 12px;
+  display: flex;
+  border-radius: 50%;
+  background-color: var(--theme-surface);
+  border: 1px solid var(--theme-surface);
+}

webapp/packages/plugin-connection-custom/src/DriverSelector/Driver.tsx

@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useCallback } from 'react';
 
-import { ListItem, ListItemDescription, ListItemIcon, ListItemName, s, StaticImage, useS } from '@cloudbeaver/core-blocks';
+import { IconOrImage, ListItem, ListItemDescription, ListItemIcon, ListItemName, s, StaticImage, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
 import style from './Driver.module.css';
 
@@ -17,6 +17,7 @@ export interface IDriver {
   icon?: string;
   name?: string;
   description?: string;
+  driverInstalled?: boolean;
 }
 
 interface Props {
@@ -25,13 +26,19 @@ interface Props {
 }
 
 export const Driver = observer<Props>(function Driver({ driver, onSelect }) {
+  const translate = useTranslate();
   const select = useCallback(() => onSelect(driver.id), [driver]);
   const styles = useS(style);
 
   return (
     <ListItem onClick={select}>
-      <ListItemIcon>
+      <ListItemIcon className={s(styles, { icon: true })}>
         <StaticImage icon={driver.icon} className={s(styles, { staticImage: true })} />
+        {!driver.driverInstalled && (
+          <div className={s(styles, { indicator: true })} title={translate('plugin_connection_custom_drivers_driver_not_installed')}>
+            <IconOrImage icon="/icons/info_icon.svg" />
+          </div>
+        )}
       </ListItemIcon>
       <ListItemName>{driver.name}</ListItemName>
       <ListItemDescription title={driver.description}>{driver.description}</ListItemDescription>

webapp/packages/plugin-connection-custom/src/locales/en.ts

@@ -5,4 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export default [['plugin_connection_custom_action_custom_label', 'New Connection']];
+export default [
+  ['plugin_connection_custom_action_custom_label', 'New Connection'],
+  ['plugin_connection_custom_drivers_driver_not_installed', 'Driver is not installed'],
+];

webapp/packages/plugin-connection-custom/src/locales/fr.ts

@@ -5,4 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export default [['plugin_connection_custom_action_custom_label', 'Nouvelle connexion']];
+export default [
+  ['plugin_connection_custom_action_custom_label', 'Nouvelle connexion'],
+  ['plugin_connection_custom_drivers_driver_not_installed', 'Driver is not installed'],
+];

webapp/packages/plugin-connection-custom/src/locales/it.ts

@@ -5,4 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export default [['plugin_connection_custom_action_custom_label', 'New Connection']];
+export default [
+  ['plugin_connection_custom_action_custom_label', 'New Connection'],
+  ['plugin_connection_custom_drivers_driver_not_installed', 'Driver is not installed'],
+];

webapp/packages/plugin-connection-custom/src/locales/ru.ts

@@ -5,4 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export default [['plugin_connection_custom_action_custom_label', 'Новое подключение']];
+export default [
+  ['plugin_connection_custom_action_custom_label', 'Новое подключение'],
+  ['plugin_connection_custom_drivers_driver_not_installed', 'Драйвер не установлен'],
+];

webapp/packages/plugin-connection-custom/src/locales/zh.ts

@@ -5,4 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export default [['plugin_connection_custom_action_custom_label', '新建连接']];
+export default [
+  ['plugin_connection_custom_action_custom_label', '新建连接'],
+  ['plugin_connection_custom_drivers_driver_not_installed', 'Driver is not installed'],
+];