Added support for multi single command handler and implemented the new music song list method

file.ts

@@ -497,7 +497,7 @@ namespace server {
     let php: string;
     let options: Options;
 
-    const use_https = true;
+    const use_https = false;
     export async function launch(_files: ProjectResource[], options_: Options) {
         options = options_;
         files = _files;

shared/js/connection/AbstractCommandHandler.ts

@@ -58,6 +58,8 @@ export abstract class AbstractCommandHandlerBoss {
 
 
     register_single_handler(handler: SingleCommandHandler) {
+        if(typeof handler.command === "string")
+            handler.command = [handler.command];
         this.single_command_handler.push(handler);
     }
 
@@ -82,7 +84,8 @@ export abstract class AbstractCommandHandlerBoss {
         }
 
         for(const handler of [...this.single_command_handler]) {
-            if(handler.command && handler.command != command.command)
+            // We already know that handler.command must be an array (It will be converted within the register single handler methode)
+            if(handler.command && (handler.command as string[]).findIndex(e => e === command.command) == -1)
                 continue;
 
             try {

shared/js/connection/CommandHelper.ts

@@ -263,20 +263,28 @@ export class CommandHelper extends AbstractCommandHandler {
     }
 
     request_playlist_songs(playlist_id: number) : Promise<PlaylistSong[]> {
-        //FIXME: notifyplaylistsonglistfinish for the result!
+        let bulked_response = false;
+        let bulk_index = 0;
+
+        const result: PlaylistSong[] = [];
         return new Promise((resolve, reject) => {
             const single_handler: SingleCommandHandler = {
-                command: "notifyplaylistsonglist",
+                command: ["notifyplaylistsonglist", "notifyplaylistsonglistfinished"],
                 function: command => {
                     const json = command.arguments;
 
-                    if(json[0]["playlist_id"] != playlist_id) {
+                    if(bulk_index === 0) {
-                        log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist songs"));
+                        /* we're sending the response as bulk */
-                        return false;
+                        bulked_response = parseInt(json[0]["version"]) >= 2;
                     }
 
-                    const result: PlaylistSong[] = [];
+                    if(parseInt(json[0]["playlist_id"]) !== playlist_id)
+                        return false; /* not our request */
 
+                    if(command.command === "notifyplaylistsonglistfinished") {
+                        resolve(result);
+                        return true;
+                    } else {
                         for(const entry of json) {
                             try {
                                 result.push({
@@ -294,9 +302,15 @@ export class CommandHelper extends AbstractCommandHandler {
                             }
                         }
 
+                        if(bulked_response) {
+                            bulk_index++;
+                            return false;
+                        } else {
                             resolve(result);
                             return true;
                         }
+                    }
+                }
             };
             this.handler_boss.register_single_handler(single_handler);
 

shared/js/connection/ConnectionBase.ts

@@ -121,7 +121,7 @@ export class ServerCommand {
 
 export interface SingleCommandHandler {
     name?: string;
-    command?: string;
+    command?: string | string[];
     timeout?: number;
 
     /* if the return is true then the command handler will be removed */