🔧 Fixing autodownload functionality

This reverts commit 30168844f3, reversing
changes made to 2e60e2e3d5.

services/library.service.ts

@@ -792,19 +792,21 @@ export default class ImportService extends Service {
 								new ObjectId(ctx.params.comicObjectId)
 							);
 							// 2. Init AirDC++
-							// 3. Get the bundles for the comic object
 							const ADCPPSocket = new AirDCPPSocket(config);
+							await ADCPPSocket.connect();
+							// 3. Get the bundles for the comic object
 							if (comicObject) {
 								// make the call to get the bundles from AirDC++ using the bundleId
-								return comicObject.acquisition.directconnect.downloads.map(
+								const bundles =
-									async (bundle) =>
+									comicObject.acquisition.directconnect.downloads.map(
-										await ADCPPSocket.get(
+										async (bundle) => {
-											`queue/bundles/${bundle.id}`
+											return await ADCPPSocket.get(
-										)
+												`queue/bundles/${bundle.bundleId}`
-								);
+											);
+										}
+									);
+								return Promise.all(bundles);
 							}
-
-							return false;
 						} catch (error) {
 							throw new Errors.MoleculerError(
 								"Couldn't fetch bundles from AirDC++",

services/socket.service.ts

@@ -127,9 +127,10 @@ export default class SocketService extends Service {
 							await ADCPPSocket.addListener(
 								`search`,
 								`search_result_added`,
-								(groupedResult) => {
+								(groupedResult, entityId: number) => {
-									console.log(JSON.stringify(groupedResult, null, 4));
+									namespacedInstance.emit("searchResultAdded", {
-									namespacedInstance.emit("searchResultAdded", groupedResult);
+										groupedResult: { entityId, payload: groupedResult?.result },
+									});
 								},
 								instance.id
 							);
@@ -137,8 +138,10 @@ export default class SocketService extends Service {
 							await ADCPPSocket.addListener(
 								`search`,
 								`search_result_updated`,
-								(updatedResult) => {
+								(updatedResult, entityId: number) => {
-									namespacedInstance.emit("searchResultUpdated", updatedResult);
+									namespacedInstance.emit("searchResultUpdated", {
+										updatedResult: { entityId, payload: updatedResult?.result },
+									});
 								},
 								instance.id
 							);