Fix async publishing

server/src/main/java/org/eclipse/openvsx/ExtensionService.java

@@ -22,12 +22,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.openvsx.cache.CacheService;
 import org.eclipse.openvsx.entities.*;
-import org.eclipse.openvsx.publish.PublishExtensionVersionHandler;
+import org.eclipse.openvsx.publish.PublishExtensionVersionJobRequest;
+import org.eclipse.openvsx.publish.PublishExtensionVersionService;
 import org.eclipse.openvsx.repositories.RepositoryService;
 import org.eclipse.openvsx.search.SearchUtilService;
 import org.eclipse.openvsx.util.ErrorResultException;
 import org.eclipse.openvsx.util.TempFile;
 import org.eclipse.openvsx.util.TimeUtil;
+import org.jobrunr.scheduling.JobRequestScheduler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
@@ -48,28 +50,40 @@ public class ExtensionService {
     CacheService cache;
 
     @Autowired
-    PublishExtensionVersionHandler publishHandler;
+    PublishExtensionVersionService publishService;
+
+    @Autowired
+    JobRequestScheduler scheduler;
 
     @Value("${ovsx.publishing.require-license:false}")
     boolean requireLicense;
 
     @Transactional
     public ExtensionVersion mirrorVersion(TempFile extensionFile, String signatureName, PersonalAccessToken token, String binaryName, String timestamp) {
         var download = doPublish(extensionFile, binaryName, token, TimeUtil.fromUTCString(timestamp), false);
-        publishHandler.mirror(download, extensionFile, signatureName);
+        publishService.mirror(download, extensionFile, signatureName);
         return download.getExtension();
     }
 
     public ExtensionVersion publishVersion(InputStream content, PersonalAccessToken token) {
-        var extensionFile = createExtensionFile(content);
-        var download = doPublish(extensionFile, null, token, TimeUtil.getCurrentUTC(), true);
-        publishHandler.publishAsync(download, extensionFile, this);
-        return download.getExtension();
+        try(var extensionFile = createExtensionFile(content)) {
+            var download = doPublish(extensionFile, null, token, TimeUtil.getCurrentUTC(), true);
+            download.setContent(Files.readAllBytes(extensionFile.getPath()));
+            download.setStorageType(FileResource.STORAGE_DB);
+            publishService.persistDownload(download);
+
+            var jobRequest = new PublishExtensionVersionJobRequest(download.getId());
+            scheduler.enqueue(jobRequest);
+
+            return download.getExtension();
+        } catch (IOException e) {
+            throw new ErrorResultException("failed to read extension VSIX package", e);
+        }
     }
 
     private FileResource doPublish(TempFile extensionFile, String binaryName, PersonalAccessToken token, LocalDateTime timestamp, boolean checkDependencies) {
         try (var processor = new ExtensionProcessor(extensionFile)) {
-            var extVersion = publishHandler.createExtensionVersion(processor, token, timestamp, checkDependencies);
+            var extVersion = publishService.createExtensionVersion(processor, token, timestamp, checkDependencies);
             if (requireLicense) {
                 // Check the extension's license
                 var license = processor.getLicense(extVersion);

server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java

@@ -640,7 +640,7 @@ public ExtensionJson publish(InputStream content, String tokenValue) throws Erro
 
         var extVersion = extensions.publishVersion(content, token);
         var json = toExtensionVersionJson(extVersion, null, true, true);
-        json.success = "It can take a couple minutes before the extension version is available";
+        json.success = "It can take a couple minutes before the extension version becomes active";
 
         var sameVersions = repositories.findVersions(extVersion.getVersion(), extVersion.getExtension());
         if(sameVersions.stream().anyMatch(ev -> ev.isPreRelease() != extVersion.isPreRelease())) {

server/src/main/java/org/eclipse/openvsx/adapter/VSCodeIdService.java

@@ -10,6 +10,8 @@
 package org.eclipse.openvsx.adapter;
 
 import com.google.common.collect.Lists;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.openvsx.UrlConfigService;
 import org.eclipse.openvsx.entities.Extension;
@@ -43,6 +45,14 @@ public class VSCodeIdService {
     @Autowired
     UrlConfigService urlConfigService;
 
+    @Autowired
+    EntityManager entityManager;
+
+    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    public void updateExtensionPublicId(Extension extension) {
+        entityManager.merge(extension);
+    }
+
     public boolean setPublicIds(Extension extension) {
         var updateExistingPublicIds = false;
         var upstream = getUpstreamExtension(extension);