Default server accept port from command line

Author: d3x0r

apps/http-ws/imageLoader.js

@@ -1,69 +1,43 @@
-
-export const moreWork = [];
-const requiredImages = [];
 // can count required and retreived for a progresss bar indicator...
-const pendingLoad = [];
 let didWork = false;
 let useOrigin = null;
 
-//------------------------ Image Library ---------------------------------
-export function newImage(src) {  
-	var i = new Image();
-	var timeout;
-	if( src[0] !== '/' && src.substring(0,4)!='http' && useOrigin ) 
-		src = useOrigin + src;
-	i.crossOrigin = "Anonymous";
-	i.onerror = (err)=>{	
-		console.log( "ERROR:", err );
-		
-	}
-	i.onload = ()=>{ 
-		var pl = pendingLoad;
-		const rii = requiredImages.indexOf( i );
-		if( rii >= 0 )
-			requiredImages.splice( rii,1); 
-
-		if( pl.length ) {
-			var pi = pl.shift();
-			requiredImages.push( pi.i ); 
-			//console.log( "loading:", pi.src );
-			window.lastImage = pi.i;
-			pi.i.src = pi.src;
-			tick();
-			pendingLoad = pl;
-			//return;
-		}
-
-			if( requiredImages.length == 0 ) 
-				doWork(); 
-	};
-	i.onerror = ()=>{
-		console.log( "Error result; removing item" );
-		const rii = requiredImages.indexOf( i );
-		if( rii >= 0 )
-			requiredImages.splice( rii,1); 
-		if( requiredImages.length == 0 ) 
-			doWork(); 
-
-	}
-
-	//if( pendingLoad.length ) { pendingLoad.push( {i:i,src:src} ); return i; }
-	//if( requiredImages.length ) { pendingLoad.push({i:i,src:src}); return i; }
-	i.src = src;
+let pending = [];
 
-	if( requiredImages.length == 0 ) {
-		if( didWork ) console.log( "Clearing that we did work already");
-		didWork = false;
-	}
-	requiredImages.push( i ); 
-
-	return i;
+export async function wait() {
+	await Promise.all( pending );
 }
 
+//------------------------ Image Library ---------------------------------
 
 export function getImage(src) {
 	return new Promise( (res,rej)=>{
-		var i = new Image();
+		const i = new Image();
+		let resi;
+		let pi = new Promise( (res,rej)=>{
+			resi = i;
+		} );
+		if( src[0] !== '/' && src.substring(0,4)!='http' && useOrigin ) 
+			src = useOrigin + src;
+		i.crossOrigin = "Anonymous";
+		i.onload = ()=>{ 
+			const idx = pending.find( p=>p===pi  );
+			if( idx >= 0 ) pending.splice( idx, 1 );
+			res( i );
+		};
+		i.onerror = ()=>{
+			const idx = pending.find( p=>p===pi  );
+			if( idx >= 0 ) pending.splice( idx, 1 );
+			rej( src, i );
+		}
+		i.src = src;
+		pending.push(pi);
+	} );
+}
+
+export function getSound(src) {
+	return new Promise( (res,rej)=>{
+		var i = document.createElement( "AUDIO" );
 		if( src[0] !== '/' && src.substring(0,4)!='http' && useOrigin ) 
 			src = useOrigin + src;
 		i.crossOrigin = "Anonymous";
@@ -121,32 +95,6 @@ export function newVideo(src) {
 	return i;
 }
 
-export function addWork( cb ) {
-	if( !didWork && requiredImages.length )
-		moreWork.push(cb);
-	else
-		cb();
-}
-
-
-async function doWork() {
-	doOne(0);
-	function doOne( n ){
-		if( n < moreWork.length ){
-			const w = moreWork[n];
-			const result = w();
-			if( result instanceof Promise ) 
-				result.then( ()=>{
-					doOne( n+1 );
-				})			
-			else	
-				doOne( n+1 );
-		}else {
-			moreWork.length = 0;
-			didWork = true;
-		}
-	}
-}
 
 export function setOrigin( origin ) {
 	useOrigin = origin;

apps/http-ws/serve.mjs

@@ -1,4 +1,4 @@
 import {openServer} from "./server.mjs"
 
 openServer();
-console.log( "serving on?", process.env.PORT || 8080 );
+console.log( "serving on?", process.env.PORT || (process.argv.length > 2?Number(process.argv[2]) : 8080) );