Merge branch 'koszko' into jahoti

1 files changed, 105 insertions, 212 deletions

diff --git a/build.sh b/build.sh
index 675dc2c..3d3d4be 100755
--- a/build.sh
+++ b/build.sh
@@ -3,279 +3,172 @@
 # Copyright (C) 2021 Wojtek Kosior
 # Redistribution terms are gathered in the `copyright' file.
 
-. ./shell_utils.sh
-
-handle_export_line() {
-    if [ "x$1" = "xEXPORTS_START" ]; then
-	if [ "$STATE" = "before_block" ]; then
-	    STATE="in_block"
-	fi
-    elif [ "x$1" = "xEXPORT" ]; then
-	if [ "$STATE" != "in_block" ]; then
-	    return
-	fi
-
-	EXPORTCODE="${EXPORTCODE}window.killtheweb.$2 = $2;$ENDL"
-
-	PREVIOUS_FILE="$(map_get EXPORTS $2)"
-	if [ "x$PREVIOUS_FILE" != "x" ]; then
-	    errcho "export $2 present in both $PREVIOUS_FILE and $FILE"
-	    return 1
-	fi
-
-	map_set_instr EXPORTS $2 "$FILE"
-
-    elif [ "x$1" = "xEXPORTS_END" ]; then
-	if [ "$STATE" = "in_block" ]; then
-	    STATE="after_block"
-	fi
-    fi
-}
-
-translate_exports() {
-    STATE="before_block"
-    EXPORTCODE=''
-
-    while read EXPORT_LINE; do
-	handle_export_line $EXPORT_LINE || return 1
-    done
-
-    map_set_instr EXPORTCODES $FILEKEY "$EXPORTCODE"
-}
-
-add_exports() {
-    FILE="$1"
-    FILEKEY="$(sanitize "$FILE")"
-
-    eval "$(grep -o 'EXPORT.\+' "$1" | translate_exports || exit 1)"
-}
-
-handle_import_line() {
-    if [ "x$1" = "xIMPORTS_START" ]; then
-	if [ "$STATE" = "before_block" ]; then
-	    STATE="in_block"
-	fi
-    elif [ "x$1" = "xIMPORT" ]; then
-	if [ "$STATE" != "in_block" ]; then
-	    return
-	fi
-
-	IMPORTCODE="${IMPORTCODE}const $2 = window.killtheweb.$2;$ENDL"
-
-	IMPORTS="$IMPORTS $2"
-
-    elif [ "x$1" = "xIMPORTS_END" ]; then
-	if [ "$STATE" = "in_block" ]; then
-	    STATE="after_block"
-	fi
-    fi
-}
-
-translate_imports() {
-    STATE="before_block"
-    IMPORTCODE=''
-    IMPORTS=''
-
-    while read IMPORT_LINE; do
-	handle_import_line $IMPORT_LINE || return 1
-    done
-
-    map_set_instr IMPORTCODES $FILEKEY "$IMPORTCODE"
-    map_set_instr IMPORTS $FILEKEY "$IMPORTS"
-}
-
-add_imports() {
-    FILE="$1"
-    FILEKEY="$(sanitize "$FILE")"
-
-    eval "$(grep -o 'IMPORT.\+' "$1" | translate_imports || exit 1)"
-}
-
-compute_scripts_list_rec() {
-    local FILE="$1"
-    local FILEKEY=$(sanitize "$1")
-
-    local FILESTATE="$(map_get FILESTATES $FILEKEY)"
-    if [ "xprocessed" = "x$FILESTATE" ]; then
-	return
-    fi
-    if [ "xprocessing" = "x$FILESTATE" ]; then
-	errcho "import loop on $FILE"
-	return 1
-    fi
-
-    USED="$USED $FILEKEY"
-
-    map_set FILESTATES $FILEKEY "processing"
+set -e
 
-    local IMPORT
-    for IMPORT in $(map_get IMPORTS $FILEKEY); do
-	NEXT_FILE="$(map_get EXPORTS $IMPORT)"
-	if [ "x" = "x$NEXT_FILE" ]; then
-	    errcho "nothing exports $IMPORT, required by $FILE"
-	    return 1
-	fi
-	if ! compute_scripts_list_rec "$NEXT_FILE"; then
-	    errcho "when satisfying $IMPORT for $FILE"
-	    return 1
-	fi
-    done
-
-    [ "x$FILE" = "xexports_init.js" ] || echo $FILE # exports_init.js is hardcoded to load first; the entire export system depends on it
-    map_set FILESTATES $FILEKEY "processed"
-}
-
-compute_scripts_list() {
-    USED=''
-    echo COMPUTED_SCRIPTS=\"exports_init.js
-    compute_scripts_list_rec "$1"
-    echo \"
-
-    for FILEKEY in $USED; do
-	map_set_instr USED $FILEKEY yes
-    done
-}
+. ./shell_utils.sh
 
 as_json_list() {
     while true; do
 	if [ "x" = "x$2" ]; then
-	    echo -n '\\n'"\t\t\"$1\""'\\n\t'
+	    printf '\\n\t\t"%s"\\n\t' "$1"
 	    return
 	fi
-	echo -n '\\n'"\t\t\"$1\","
+	printf '\\n\t\t"%s",' "$1"
 	shift
     done
 }
 
 as_html_list() {
     while [ "x" != "x$1" ]; do
-	echo -n '\\n'"    <script src=\"/$1\"></script>"
+	printf '\\n    <script src="/%s"></script>' "$1"
 	shift
     done
 }
 
-set_browser() {
-    if [ "x$1" = "xmozilla" -o "x$1" = "xchromium" ]; then
-	BROWSER="$1"
-    else
-	errcho "usage:  $0 mozilla|chromium"
-	exit 1
-    fi
+compute_scripts() {
+    local DIRS="$1"
+    local ROOT_SCRIPT="$2"
+
+    local AVAILABLE="$(find $DIRS -name '[^.#]*.js')"
+
+    awk -f compute_scripts.awk script_dependencies "$ROOT_SCRIPT" $AVAILABLE
 }
 
-main() {
-    set_browser "$1"
+build_main() {
+    local ALL_SCRIPTDIRS='background html common content'
+
+    local ALL_SCRIPTS_AVAILABLE="$(find $ALL_SCRIPTDIRS -name '[^.#]*.js')"
+
+    local SCRIPT
+    for SCRIPT in $ALL_SCRIPTS_AVAILABLE; do
+	map_set SCRIPTS_UNUSED $(sanitize $SCRIPT) yes
+    done
+
+    local ROOT=background/main.js
+    local SCRIPTS_BG="$(      compute_scripts 'common/ background/' $ROOT)"
+
+    local ROOT=content/main.js
+    local SCRIPTS_CONTENT="$( compute_scripts 'common/ content/'    $ROOT)"
 
-    # placate importers of these, as they are exported by the yet-to-be-created exports_init.js
-    EXPORTS__browser=exports_init.js
-    EXPORTS__is_chrome=exports_init.js
-    EXPORTS__is_mozilla=exports_init.js
+    local ROOT=html/display-panel.js
+    local SCRIPTS_POPUP="$(   compute_scripts 'common/ html/'       $ROOT)"
 
-    SCRIPTDIRS='background html common content'
+    local ROOT=html/options_main.js
+    local SCRIPTS_OPTIONS="$( compute_scripts 'common/ html/'       $ROOT)"
 
-    SCRIPTS=$(find $SCRIPTDIRS -name '[^.#]*.js')
+    local BGSCRIPTS="$(      as_json_list $SCRIPTS_BG      )"
+    local CONTENTSCRIPTS="$( as_json_list $SCRIPTS_CONTENT )"
+    local POPUPSCRIPTS="$(   as_html_list $SCRIPTS_POPUP   )"
+    local OPTIONSSCRIPTS="$( as_html_list $SCRIPTS_OPTIONS )"
 
-    for SCRIPT in $SCRIPTS; do
-	add_exports $SCRIPT
-	add_imports $SCRIPT
+    for SCRIPT in $SCRIPTS_BG $SCRIPTS_CONTENT $SCRIPTS_POPUP $SCRIPTS_OPTIONS
+    do
+	map_del SCRIPTS_UNUSED $(sanitize $SCRIPT)
     done
 
-    eval "$(compute_scripts_list background/main.js || exit 1)"
-    BGSCRIPTS="$(as_json_list $COMPUTED_SCRIPTS)"
-    eval "$(compute_scripts_list content/main.js || exit 1)"
-    CONTENTSCRIPTS="$(as_json_list $COMPUTED_SCRIPTS)"
-    eval "$(compute_scripts_list html/display-panel.js || exit 1)"
-    POPUPSCRIPTS="$(as_html_list $COMPUTED_SCRIPTS)"
-    eval "$(compute_scripts_list html/options_main.js || exit 1)"
-    OPTIONSSCRIPTS="$(as_html_list $COMPUTED_SCRIPTS)"
-
-    BUILDDIR=build_$BROWSER
-    rm -rf $BUILDDIR
-    mkdir $BUILDDIR
-    for DIR in $(find $SCRIPTDIRS -type d); do
-	mkdir -p $BUILDDIR/$DIR
+    for DIR in $(find $ALL_SCRIPTDIRS -type d); do
+	mkdir -p "$BUILDDIR"/$DIR
     done
 
-    CHROMIUM_KEY=''
+    CHROMIUM_UPDATE_URL=''
     GECKO_APPLICATIONS=''
 
+    if [ "x$UPDATE_URL" != x ]; then
+	UPDATE_URL=",\n    \"update_url\": \"$UPDATE_URL\""
+    fi
+
     if [ "$BROWSER" = "chromium" ]; then
-	CHROMIUM_KEY="\n\
-\n\
-    // WARNING!!!\n\
-    // EACH USER SHOULD REPLACE \"key\" WITH A UNIQUE VALUE!!!\n\
-    // OTHERWISE, SECURITY CAN BE TRIVIALLY COMPROMISED!\n\
-    //\n\
-    // A unique key can be generated with:\n\
-    // $ ssh-keygen -f /path/to/new/key.pem -t rsa -b 1024\n\
-    //\n\
-    // Only relevant to users of chrome-based browsers.\n\
-    // Users of Firefox forks are safe.\n\
-\n\
-    \"key\": \"b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAlwAAAAdzc2gtcnNhAAAAAwEAAQAAAIEA+0GT5WNmRRo8e5tL9+BmNtY6aBPwLIgbPnLShYBMSR40iYwLTsccrkwBXb3bs1o4p6q5WJugI8Lsia+GXZc/XHGFkq7D1aWiTxlJLs8z0JC2TQ2/yatYmBMchogYGeeUfP7aI7JJZwpATts+VhIvgga/4FYj+DijMIEpwdckqFEAAAII4Dh7HOA4exwAAAAHc3NoLXJzYQAAAIEA+0GT5WNmRRo8e5tL9+BmNtY6aBPwLIgbPnLShYBMSR40iYwLTsccrkwBXb3bs1o4p6q5WJugI8Lsia+GXZc/XHGFkq7D1aWiTxlJLs8z0JC2TQ2/yatYmBMchogYGeeUfP7aI7JJZwpATts+VhIvgga/4FYj+DijMIEpwdckqFEAAAADAQABAAAAgEHB5/MhEKMFOs8e1cMJ97ZiWubiUPlWpcqyQmauLUj1nspg3JTBh8AWJEVkaxuFgU5gYCHQmRjC6yUdywyziOEkFA4r/WpX4WmbIe+GQHRHhitLN0dgF8N6/fVNOoa5StTdfZqyl23pVXyepoDNjrJFKyupqPMmpwfH5lGr9RwBAAAAQG76HflB/5j8P2YgIYX6dQT4Ei0SqiIjNVy7jFJUQDKSJg/PYkedE02JZJBJPcMYxEJUxXtMgq+upamNILfkmY0AAABBAP4v0O5dqjy16xDDFzb4DPNAcw5Za9KJaXKVkUuKXMNZOKTR0RC/upjNTmttY980RKdIx5zA25dO8cx563bSDIsAAABBAP0MaOpBiai/eRmLqhlthHODa+Mur6W3uc9PyhWhgDBjLNMR/doaYeyfVKxtIiN3a+HkN++G+vbokRweQv++bhMAAAANdXJ6QGxvY2FsaG9zdAECAwQFBg==\","
+	CHROMIUM_UPDATE_URL="$UPDATE_URL"
     else
 	GECKO_APPLICATIONS="\n\
     \"applications\": {\n\
 	\"gecko\": {\n\
 	    \"id\": \"{6fe13369-88e9-440f-b837-5012fb3bedec}\",\n\
-	    \"strict_min_version\": \"60.0\"\n\
+	    \"strict_min_version\": \"60.0\"$UPDATE_URL\n\
 	}\n\
     },"
     fi
 
     sed "\
 s^_GECKO_APPLICATIONS_^$GECKO_APPLICATIONS^
-s^_CHROMIUM_KEY_^$CHROMIUM_KEY^
+s^_CHROMIUM_UPDATE_URL_^$CHROMIUM_UPDATE_URL^
 s^_BGSCRIPTS_^$BGSCRIPTS^
 s^_CONTENTSCRIPTS_^$CONTENTSCRIPTS^" \
-	< manifest.json > $BUILDDIR/manifest.json
+	< manifest.json > "$BUILDDIR"/manifest.json
 
     ./process_html_file.sh html/display-panel.html |
 	sed "s^_POPUPSCRIPTS_^$POPUPSCRIPTS^" \
-	    > $BUILDDIR/html/display-panel.html
+	    > "$BUILDDIR"/html/display-panel.html
 
     ./process_html_file.sh html/options.html |
 	sed "s^_OPTIONSSCRIPTS_^$OPTIONSSCRIPTS^" \
-	    > $BUILDDIR/html/options.html
+	    > "$BUILDDIR"/html/options.html
 
-    for FILE in $SCRIPTS; do
+    for FILE in $ALL_SCRIPTS_AVAILABLE; do
 	FILEKEY=$(sanitize "$FILE")
-	if [ "xyes" != "x$(map_get USED $FILEKEY)" ]; then
-	    errcho "WARNING! $FILE not used"
+	if [ "x$(map_get SCRIPTS_UNUSED $FILEKEY)" = "xyes" ]; then
+	    printf 'WARNING! %s not used\n' "$FILE" >&2
 	else
-	    (echo "\
-\"use strict\";
+	    awk -f compute_scripts.awk wrapped_code "$FILE" > "$BUILDDIR"/$FILE
+	fi
+    done
 
-(() => {
-$(map_get IMPORTCODES $FILEKEY)
+    # A hack to insert the contents of default_settings.json at the appropriate
+    # location in background/main.js. Uses an internal sed expression to escape
+    # and indent the JSON file for use in the external sed expression.
+    sed -i 's/^        `DEFAULT SETTINGS`$/'"$(sed -E 's/([\\\&\/])/\\\1/g; s/^/        /; s/$/\\/' < default_settings.json) "/g "$BUILDDIR"/background/main.js
 
-";
+    if [ "$BROWSER" = "chromium" ]; then
+	cp CHROMIUM_exports_init.js "$BUILDDIR"/exports_init.js
+    else
+	cp MOZILLA_exports_init.js "$BUILDDIR"/exports_init.js
+    fi
+
+    cp -r copyright licenses/ "$BUILDDIR"
+    cp dummy "$BUILDDIR"
+    cp html/*.css "$BUILDDIR"/html
+    mkdir "$BUILDDIR"/icons
+    cp icons/*.png "$BUILDDIR"/icons
 
-# A hack to insert the contents of default_settings.json at the appropriate location in background/main.js
-if [ "$FILE" = "background/main.js" ]; then
-    # Uses an internal sed expression to escape and indent the JSON file for use in the external sed expression
-    sed 's/^        `DEFAULT SETTINGS`$/'"$(sed -E 's/([\\\&\/])/\\\1/g; s/^/        /; s/$/\\/' < default_settings.json) "/g < "$FILE"
-else
-    cat $FILE
-fi
+    if [ "$BROWSER" = "chromium" ]; then
+	for MOZILLA_FILE in $(find "$BUILDDIR" -name "MOZILLA_*"); do
+	    printf '\n' > "$MOZILLA_FILE"
+	done
+    fi
+    if [ "$BROWSER" = "mozilla" ]; then
+	for CHROMIUM_FILE in $(find "$BUILDDIR" -name "CHROMIUM_*"); do
+	    printf '\n' > "$CHROMIUM_FILE"
+	done
+    fi
+}
 
-echo "
+print_usage() {
+    printf 'usage:  %s mozilla|chromium [source directory] [update url]\n' \
+	   "$0" >&2
+}
 
-$(map_get EXPORTCODES $FILEKEY)
-})();") > $BUILDDIR/$FILE
-	fi
-    done
+main() {
+    if [ "x$1" = "xmozilla" -o "x$1" = "xchromium" ]; then
+	BROWSER=$1
+    else
+	print_usage
+	exit 1
+    fi
 
-    if [ "$BROWSER" = "chromium" ]; then
-	echo "window.killtheweb={is_chrome: true, browser: window.chrome};" > $BUILDDIR/exports_init.js
+    SRCDIR="${2:-.}"
+    if [ -d "$SRCDIR" ]; then
+	BUILDDIR="$(realpath $BROWSER-unpacked)"
+	rm -rf "$BUILDDIR"
+	mkdir "$BUILDDIR"
+	cd "$SRCDIR"
     else
-	echo "window.killtheweb={is_mozilla: true, browser: this.browser};" > $BUILDDIR/exports_init.js
+	print_usage
+	exit 2
     fi
 
-    cp -r copyright licenses/ $BUILDDIR
-    cp html/*.css $BUILDDIR/html
-    mkdir $BUILDDIR/icons
-    cp icons/*.png $BUILDDIR/icons
+    UPDATE_URL="$3"
+
+    build_main
 }
 
 main "$@"