From b50d7e648add7c35ab672742d188d6392215398f Mon Sep 17 00:00:00 2001
From: Hauke D <haukex@zero-g.net>
Date: Sun, 3 Mar 2019 22:40:07 +0100
Subject: [PATCH] More updates for v0.09-beta

---
 _misc/import.pl              | 52 ++++++++++++++++++++++++++++++++++++
 _misc/import_regex_tester.pl | 31 ---------------------
 democode/perlrunner.html     |  5 ++--
 notes.md                     |  4 +--
 regex.html                   | 41 ++++++++++++++++++++--------
 using.md                     |  3 ++-
 6 files changed, 88 insertions(+), 48 deletions(-)
 create mode 100755 _misc/import.pl
 delete mode 100755 _misc/import_regex_tester.pl

diff --git a/_misc/import.pl b/_misc/import.pl
new file mode 100755
index 0000000..f30da95
--- /dev/null
+++ b/_misc/import.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/env perl
+use warnings;
+use 5.026;
+use FindBin ();
+use Path::Class qw/dir file/;
+
+# A quick and dirty script for importing stuff from webperl/master to gh-pages
+
+sub edit (&$$) {
+	my ($code,$source,$dest) = @_;
+	state $basedir = dir($FindBin::Bin)->parent->parent;
+	local $_ = file($source)->absolute($basedir)->slurp(iomode=>'<:raw:encoding(UTF-8)');
+	$code->();
+	file($dest)->absolute($basedir)->spew(iomode=>'>:raw:encoding(UTF-8)', $_);
+}
+
+edit {
+	s{ iframe.perleditor\s*\{ [^\}]* border: \s* \K \N* (?=\n) }{1px dotted lightgrey;}xmsg==1 or die;
+	s{ <!--(?<x>script\s+src="http.+?iframeResizer.min.js"[^>]+crossorigin[^>]+></script)--> }{<$+{x}>}xmsg==1 or die;
+	s{ ^ \s* \K /[/*] (?= \s* iFrameResize ) }{}xmsg==2 or die;
+} 'web/democode/demo.html', 'pages/democode/index.html';
+
+edit {
+	s{ <!-- [^>]* \K demo.html (?= [^>]* --> ) }{index.html}xmsg==1 or die;
+	s{ <!--(?<x>script\s+src="http.+?iframeResizer.contentWindow.min.js"[^>]+crossorigin[^>]+></script)--> }{<$+{x}>}xmsg==1 or die;
+} 'web/democode/perleditor.html', 'pages/democode/perleditor.html';
+
+edit {
+	s{ <!-- [^>]* \K demo.html (?= [^>]* --> ) }{index.html}xmsg==1 or die;
+	s{ <(?<x>script\s+src="[^"]*webperl\.js"\s*></script)> }{<!--$+{x}-->}xmsg==1 or die;
+	s{ <!--(?<x>script\s+src="http.+?webperl\.js"[^>]+crossorigin[^>]+></script)--> }{<$+{x}>}xmsg==1 or die;
+} 'web/democode/perlrunner.html', 'pages/democode/perlrunner.html';
+
+edit {
+} 'web/democode/perleditor.css', 'pages/democode/perleditor.css';
+
+edit {
+	my $msg = <<'ENDMSG';
+This is essentially a copy of
+https://github.com/haukex/webperl/blob/master/web/regex_tester.html
+with the following differences:
+- webperl.js from CDN
+- $RUN_CODE_IN_IFRAME enabled
+- URL updated to https://github.com/haukex/webperl/blob/gh-pages/regex.html
+(see import_regex_tester.pl)
+ENDMSG
+	s{ <(?<x>script\s+src="(?:webperl\.js|__WEBPERLURL__)"\s*></scr_*ipt)> }{<!--$+{x}-->}xmsg==2 or die;
+	s{ <!--(?<x>script\s+src="http.+?webperl\.js"[^>]+crossorigin[^>]+></scr_*ipt)--> }{<$+{x}>}xmsg==2 or die;
+	s{ ^ \s* our \s+ \$RUN_CODE_IN_IFRAME\s*=\s*\K[01](?=\s*;\s*) }{1}xmsg==1 or die;
+	s{ https?://github.com/haukex/webperl/blob/\Kmaster/web/regex_tester.html }{gh-pages/regex.html}xmsg==1 or die;
+	s{ \#\#\#\#\#\s*-->\n\K }{\n<!-- $msg-->\n}xmsg==1 or die;
+} 'web/regex_tester.html', 'pages/regex.html';
diff --git a/_misc/import_regex_tester.pl b/_misc/import_regex_tester.pl
deleted file mode 100755
index 3b330a6..0000000
--- a/_misc/import_regex_tester.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env perl
-use warnings;
-use strict;
-use FindBin ();
-
-# A quick and dirty script for importing regex_tester.html to pages
-
-my $infn = "$FindBin::Bin/../../web/regex_tester.html";
-my $outfn = "$FindBin::Bin/../regex.html";
-
-my $html = do { open my $ifh, '<:encoding(UTF-8)', $infn or die "$infn: $!"; local $/; <$ifh> };
-
-my $msg = <<'ENDMSG';
-This is essentially a copy of
-https://github.com/haukex/webperl/blob/master/web/regex_tester.html
-with the following differences:
-- webperl.js from CDN
-- $RUN_CODE_IN_IFRAME enabled
-- URL updated to https://github.com/haukex/webperl/blob/gh-pages/regex.html
-(see import_regex_tester.pl)
-ENDMSG
-
-( $html =~ s{ <(?<x>script\s+src="(?:webperl\.js|__WEBPERLURL__)"\s*></scr_*ipt)> }{<!--$+{x}-->}xmsg )==2 or die;
-( $html =~ s{ <!--(?<x>script\s+src="http.+?webperl\.js"[^>]+crossorigin[^>]+></scr_*ipt)--> }{<$+{x}>}xmsg )==2 or die;
-( $html =~ s{ ^ \s* our \s+ \$RUN_CODE_IN_IFRAME\s*=\s*\K[01](?=\s*;\s*) }{1}xmsg )==1 or die;
-( $html =~ s{ https?://github.com/haukex/webperl/blob/\Kmaster/web/regex_tester.html }{gh-pages/regex.html}xmsg )==1 or die;
-( $html =~ s{ \#\#\#\#\#\s*-->\n\K }{\n<!-- $msg-->\n}xmsg )==1 or die;
-
-open my $ofh, '>:encoding(UTF-8)', $outfn or die "$outfn: $!";
-print $ofh $html;
-close $ofh;
diff --git a/democode/perlrunner.html b/democode/perlrunner.html
index 00532be..e0362cc 100644
--- a/democode/perlrunner.html
+++ b/democode/perlrunner.html
@@ -39,8 +39,8 @@ If not, see http://perldoc.perl.org/index-licence.html
 	-->
 
 <!--script src="../webperl.js"></script-->
-<script src="https://webperlcdn.zero-g.net/v0.07-beta/webperl.js"
-	integrity="sha256-jL8SB7St5ou4+hb0frK0k6VCQXsWQ1wolDrdU7i4juc=" crossorigin="anonymous"></script>
+<script src="https://webperlcdn.zero-g.net/v0.09-beta/webperl.js"
+	integrity="sha256-1RaYAh/WfDl3WZl+BDpSuSycg4x88pfkAFSxhWjBONk=" crossorigin="anonymous"></script>
 <script>
 "use strict";
 
@@ -60,7 +60,6 @@ function reportErr (err) {
 }
 
 Perl.addStateChangeListener(function (from,to) {
-	if (from==to) return; // won't be needed as of v0.09-beta
 	if (to=="Ended" && currentClient) {
 		for (var chan=1;chan<=2;chan++) // flush buffers
 			if (stdbuf[chan].length) {
diff --git a/notes.md b/notes.md
index 93d54f3..5bb59eb 100644
--- a/notes.md
+++ b/notes.md
@@ -153,8 +153,8 @@ Release Checklist
 
 - Update version numbers everywhere; use `grep` to find them, for example:
   
-      $ grep -Er --exclude-dir=work --exclude-dir=.git --exclude-dir=emperl5 --exclude=emperl.* '0\.0[0-9]' .
-      $ ( cd emperl5; grep -Er '0\.0[0-9]' `git diff --numstat --diff-filter=A v5.28.0 HEAD | cut -f3` )
+      $ grep -Er --exclude-dir=hostperl --exclude-dir=.git --exclude-dir=emperl5 --exclude=emperl.* '0\.[01][0-9]' .
+      $ ( cd emperl5; grep -Er '0\.[01][0-9]' `git diff --numstat --diff-filter=ACMRT v5.28.1 HEAD | cut -f3` )
   
   At a minimum there is:
 	- `web/webperl.js` - `Perl.WebPerlVersion`
diff --git a/regex.html b/regex.html
index 154163d..1b77e32 100644
--- a/regex.html
+++ b/regex.html
@@ -35,8 +35,7 @@ with the following differences:
 -->
 
 <meta name="viewport" content="width=600" />
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css"
-	integrity="sha256-oSrCnRYXvHG31SBifqP2PM1uje7SJUyX0nTwO2RJV54=" crossorigin="anonymous" />
+<!--cacheable--><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css" integrity="sha256-oSrCnRYXvHG31SBifqP2PM1uje7SJUyX0nTwO2RJV54=" crossorigin="anonymous" />
 <style>
 body {
 	margin: 0.4em;
@@ -110,10 +109,9 @@ textarea.samp_ta {
 </style>
 
 <!--script src="webperl.js"></script-->
-<script src="https://webperlcdn.zero-g.net/v0.07-beta/webperl.js"
-	integrity="sha256-jL8SB7St5ou4+hb0frK0k6VCQXsWQ1wolDrdU7i4juc=" crossorigin="anonymous"></script>
-<script src="https://code.jquery.com/jquery-3.3.1.min.js"
-	integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+<script src="https://webperlcdn.zero-g.net/v0.09-beta/webperl.js"
+	integrity="sha256-1RaYAh/WfDl3WZl+BDpSuSycg4x88pfkAFSxhWjBONk=" crossorigin="anonymous"></script>
+<!--cacheable--><script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
 
 <script type="text/perl">
 use warnings;
@@ -127,6 +125,10 @@ sub pp { Data::Dumper->new([@_])->Useqq(1)->Terse(1)->Pair('=>')
 
 our $RUN_CODE_IN_IFRAME=1;
 
+# Possible To-Do for Later: Subs in preamble code produce "subroutine redefined" warnings.
+# I could think about whether there's a decent way around that.
+# Example: https://www.perlmonks.org/?node_id=1225457
+
 my $run_code_body = <<'END_CODE';
 	my (@warns,@output);
 	
@@ -161,11 +163,18 @@ END_CODE
 my $runcode_iframe;
 my $runcode_message_callback; # assume a single callback for now
 if ($RUN_CODE_IN_IFRAME) { # https://www.html5rocks.com/en/tutorials/security/sandboxed-iframes/
+	my $webperlurl;
+	$jq->('script')->each(sub { $webperlurl=$_[1]->{src} if $_[1]->{src}=~/\bwebperl\.js\z/ });
+	if (!$webperlurl) {
+		warn "Warning: Could not determine URL of webperl.js\n";
+		$webperlurl = 'webperl.js';  # probably won't work due to same-origin
+	}
 	my $iframe_html = <<~'END_IFRAME_HTML';
 		<html>
 		<head>
-		<script src="https://webperlcdn.zero-g.net/v0.07-beta/webperl.js"
-			integrity="sha256-jL8SB7St5ou4+hb0frK0k6VCQXsWQ1wolDrdU7i4juc=" crossorigin="anonymous"></scr__ipt>
+		<!--script src="__WEBPERLURL__"></scr__ipt-->
+		<script src="https://webperlcdn.zero-g.net/v0.09-beta/webperl.js"
+			integrity="sha256-1RaYAh/WfDl3WZl+BDpSuSycg4x88pfkAFSxhWjBONk=" crossorigin="anonymous"></scr__ipt>
 		<script>
 		Perl.noMountIdbfs=true; // we're sandboxed
 		</scr__ipt>
@@ -190,8 +199,10 @@ if ($RUN_CODE_IN_IFRAME) { # https://www.html5rocks.com/en/tutorials/security/sa
 		END_IFRAME_HTML
 	$iframe_html=~s#</\w+\K__(?=\w+>)##ig;
 	$iframe_html=~s/__RUNCODEBODY__/$run_code_body/;
+	$iframe_html=~s/__WEBPERLURL__/$webperlurl/g;
 	my $iframe_blob_url = js('URL')->createObjectURL(
 		WebPerl::js_new('Blob',[$iframe_html],{type=>"text/html;charset=utf-8"}) );
+	#TODO Later: Why does the message passing not work when I remove the "sandbox" attr?
 	my $iframe = $jq->('<iframe/>', {id=>'PerlEval_IFrame', sandbox=>'allow-scripts',
 		src=>$iframe_blob_url} )->hide->appendTo('body');
 	$runcode_iframe = $iframe->[0]{contentWindow};
@@ -217,14 +228,20 @@ if ($RUN_CODE_IN_IFRAME) { # https://www.html5rocks.com/en/tutorials/security/sa
 	my $start_time = time;
 	my $intid; $intid = $window->setInterval(sub {
 		if (time-$start_time>10) {
-			$window->alert("Failed to get response from Perl in IFrame, loading failed?");
-			$window->clearInterval($intid);
+			if ($window->confirm("Perl does not appear to have loaded yet, keep waiting?\n"
+			    ."(If you are on a slow connection, click OK to keep waiting.)")) {
+				$start_time = time;
+			}
+			else {
+				$window->clearInterval($intid);
+			}
 		}
 		elsif ($got_response)
 			{ $window->clearInterval($intid) }
 		else { update() }
 	}, 500);
 }
+$jq->('#loading')->text('Loading (Stage 2/2)...');
 
 sub sample_init {
 	my $samp = shift;
@@ -276,6 +293,7 @@ sub newsamp {
 	update();
 	return $samp;
 }
+#TODO: Adding samples causes the code table to grow, but not shrink when they are removed
 $addsamp->click(sub { newsamp('')->click });
 
 # $re_debug is actually a parameter to update()/actual_update(), but since
@@ -344,6 +362,7 @@ $ta_flags->keyup( \&update);
 
 js('$(window)')->on('hashchange',\&hashchange);
 
+#TODO: The auto-sizing causes the textarea to grow on Chrome mobile
 $ta_regex->on('input', sub { # autoexpand for new lines
 	$ta_regex->height($ta_regex->[0]{scrollHeight});
 });
@@ -582,7 +601,7 @@ sub hashchange {
 <div style="margin-bottom:1em;font-size:1.2em;text-align:center;"><b>Perl Regex Tester</b>
 - powered by <a href="http://webperl.zero-g.net" target="_blank">WebPerl</a> (beta)</div>
 
-<div id="loading" style="position:absolute;left:40%;font-size:1.2em;font-weight:bold;color:red;">Loading...</div>
+<div id="loading" style="position:absolute;left:40%;font-size:1.2em;font-weight:bold;color:red;">Loading (Stage 1/2)...</div>
 
 <div style="margin-bottom:1em;">
 <div>
diff --git a/using.md b/using.md
index 354d37e..6975f0e 100644
--- a/using.md
+++ b/using.md
@@ -401,7 +401,8 @@ The states currently are:
 - `"Running"` - The Perl interpreter is running, `Perl.eval` and `Perl.end` may be called
 - `"Ended"` - The Perl interpreter has ended.
   ~~You might receive several state change notifications for this state.~~
-  This is no longer the case as of WebPerl `v0.09-beta`.
+  This is no longer the case as of WebPerl `v0.09-beta`:
+  you should only receive one event per state change.
 
 This function was added in WebPerl `v0.05-beta`.