Compare commits
6
Commits
47c894cc1d
...
v0.3.14
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f1e7573b36 | ||
|
|
2082e8ae48 | ||
|
|
313126768b | ||
|
|
78953a4633 | ||
|
|
703e6b6356 | ||
|
|
2c545cd1b0 |
Generated
+1
-1
@@ -2948,7 +2948,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.11"
|
version = "0.3.14"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.11"
|
version = "0.3.14"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|||||||
+26
-2
@@ -430,10 +430,9 @@ main.not-found {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.feature-icon {
|
.feature-icon {
|
||||||
float: left;
|
|
||||||
width: 1.3rem;
|
width: 1.3rem;
|
||||||
height: 1.3rem;
|
height: 1.3rem;
|
||||||
margin: 0.1rem 0.6rem 0.4rem 0;
|
margin-top: 0.1rem;
|
||||||
background-color: var(--feature-accent, currentColor);
|
background-color: var(--feature-accent, currentColor);
|
||||||
mask-repeat: no-repeat;
|
mask-repeat: no-repeat;
|
||||||
mask-size: contain;
|
mask-size: contain;
|
||||||
@@ -443,6 +442,26 @@ main.not-found {
|
|||||||
-webkit-mask-position: center;
|
-webkit-mask-position: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* With an icon the feature is two columns: the icon in the first,
|
||||||
|
everything else - name, description, fields, resources - in the
|
||||||
|
second, so every line of text shares one left edge instead of
|
||||||
|
wrapping back under the icon. */
|
||||||
|
.feature:has(> .feature-icon) {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1.3rem minmax(0, 1fr);
|
||||||
|
column-gap: 0.7rem;
|
||||||
|
align-items: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.feature:has(> .feature-icon) > .feature-icon {
|
||||||
|
grid-column: 1;
|
||||||
|
grid-row: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.feature:has(> .feature-icon) > :not(.feature-icon) {
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
|
|
||||||
.feature h3 {
|
.feature h3 {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
margin-bottom: 0.15em;
|
margin-bottom: 0.15em;
|
||||||
@@ -499,6 +518,11 @@ main.not-found {
|
|||||||
margin-top: 0.4rem;
|
margin-top: 0.4rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* display:block above would beat the hidden attribute */
|
||||||
|
.voice-preview[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
/* links inside markdown descriptions */
|
/* links inside markdown descriptions */
|
||||||
.alt-description a,
|
.alt-description a,
|
||||||
.feature p a {
|
.feature p a {
|
||||||
|
|||||||
@@ -6,8 +6,14 @@
|
|||||||
// likes), decodes that to PCM with WebAudio, resamples to mono 48 kHz,
|
// likes), decodes that to PCM with WebAudio, resamples to mono 48 kHz,
|
||||||
// and ships one binary frame `[0x01][20-byte key][i16le PCM]` to the
|
// and ships one binary frame `[0x01][20-byte key][i16le PCM]` to the
|
||||||
// relay, which encodes with the one recording codec, signs as itself,
|
// relay, which encodes with the one recording codec, signs as itself,
|
||||||
// keeps it and announces it (ADR-0015). The field's value becomes
|
// keeps it and announces it (ADR-0015).
|
||||||
// {key, digest, duration_ms} once the relay confirms.
|
//
|
||||||
|
// Nothing leaves the browser until the alternative's own submit
|
||||||
|
// ("Keep it here") is pressed: the widget intercepts that click,
|
||||||
|
// uploads, sets the field's value to {key, digest, duration_ms} on
|
||||||
|
// the relay's confirmation, and only then lets the submit through.
|
||||||
|
// A relay error keeps the recording for another try and submits
|
||||||
|
// nothing.
|
||||||
//
|
//
|
||||||
// Palette: colors come from the page's custom properties, no copy here.
|
// Palette: colors come from the page's custom properties, no copy here.
|
||||||
|
|
||||||
@@ -40,6 +46,14 @@ class VoiceWidget {
|
|||||||
|
|
||||||
this._onClick = () => this.toggle();
|
this._onClick = () => this.toggle();
|
||||||
this.button.addEventListener('click', this._onClick);
|
this.button.addEventListener('click', this._onClick);
|
||||||
|
this.pcm = null; // decoded, ready to upload
|
||||||
|
this.published = null;
|
||||||
|
this.passthrough = false;
|
||||||
|
// The alternative's submit button: hold it until the recording
|
||||||
|
// is kept at the relay.
|
||||||
|
this.card = container.closest('.alt-card');
|
||||||
|
this._onSubmit = (e) => this.onSubmitClick(e);
|
||||||
|
if (this.card) this.card.addEventListener('click', this._onSubmit, true);
|
||||||
if (!this.key || this.key.length !== 40) {
|
if (!this.key || this.key.length !== 40) {
|
||||||
this.button.disabled = true;
|
this.button.disabled = true;
|
||||||
this.say('This page has no address to leave a voice at.');
|
this.say('This page has no address to leave a voice at.');
|
||||||
@@ -84,15 +98,35 @@ class VoiceWidget {
|
|||||||
if (!blob.size) { this.say('Nothing was recorded.'); return; }
|
if (!blob.size) { this.say('Nothing was recorded.'); return; }
|
||||||
this.preview.src = URL.createObjectURL(blob);
|
this.preview.src = URL.createObjectURL(blob);
|
||||||
this.preview.hidden = false;
|
this.preview.hidden = false;
|
||||||
this.say('Sending…');
|
this.published = null;
|
||||||
let pcm;
|
this.setValue(null);
|
||||||
try {
|
try {
|
||||||
pcm = await this.toPcm16(await blob.arrayBuffer());
|
this.pcm = await this.toPcm16(await blob.arrayBuffer());
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.say('Could not decode the recording.');
|
this.pcm = null;
|
||||||
|
this.say('Could not decode the recording — try once more.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.upload(pcm);
|
this.say(`${Math.round(this.pcm.length / 2 / SAMPLE_RATE)} s recorded. Listen back, then press the button below to keep it here.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmitClick(e) {
|
||||||
|
const button = e.target.closest && e.target.closest('.alt-submit');
|
||||||
|
if (!button || this.passthrough) return;
|
||||||
|
if (this.published) return; // already kept: let the submit go
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
if (!this.pcm) {
|
||||||
|
this.say(this.recorder && this.recorder.state === 'recording' ? 'Stop the recording first.' : 'Record something first.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.say('Sending to the relay…');
|
||||||
|
this.upload(this.pcm, () => {
|
||||||
|
// The relay confirmed: now the answer itself is submitted.
|
||||||
|
this.passthrough = true;
|
||||||
|
button.click();
|
||||||
|
this.passthrough = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decode → mono 48 kHz Float32 → Int16 little-endian bytes.
|
// Decode → mono 48 kHz Float32 → Int16 little-endian bytes.
|
||||||
@@ -117,7 +151,7 @@ class VoiceWidget {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
upload(pcm) {
|
upload(pcm, onPublished) {
|
||||||
if (!this.relayUrl) { this.say('No relay to send to.'); return; }
|
if (!this.relayUrl) { this.say('No relay to send to.'); return; }
|
||||||
const frame = new Uint8Array(1 + 20 + pcm.length);
|
const frame = new Uint8Array(1 + 20 + pcm.length);
|
||||||
frame[0] = 1;
|
frame[0] = 1;
|
||||||
@@ -130,20 +164,28 @@ class VoiceWidget {
|
|||||||
ws.addEventListener('message', (e) => {
|
ws.addEventListener('message', (e) => {
|
||||||
let msg; try { msg = JSON.parse(e.data); } catch { return; }
|
let msg; try { msg = JSON.parse(e.data); } catch { return; }
|
||||||
if (msg.type === 'published') {
|
if (msg.type === 'published') {
|
||||||
this.setValue({ key: this.key, digest: msg.digest, duration_ms: msg.duration_ms });
|
this.published = { key: this.key, digest: msg.digest, duration_ms: msg.duration_ms };
|
||||||
|
this.setValue(this.published);
|
||||||
this.say(`Kept at this address — ${Math.round(msg.duration_ms / 1000)} s.`);
|
this.say(`Kept at this address — ${Math.round(msg.duration_ms / 1000)} s.`);
|
||||||
|
this.button.disabled = true;
|
||||||
ws.close();
|
ws.close();
|
||||||
|
if (onPublished) onPublished();
|
||||||
} else if (msg.type === 'error') {
|
} else if (msg.type === 'error') {
|
||||||
this.say(msg.message || 'The relay declined the recording.');
|
this.say((msg.message || 'The relay declined the recording.') + ' Your recording is still here — try again.');
|
||||||
ws.close();
|
ws.close();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ws.addEventListener('error', () => this.say('The relay could not be reached.'));
|
ws.addEventListener('error', () => this.say('The relay could not be reached. Your recording is still here — try again.'));
|
||||||
|
ws.addEventListener('close', (e) => {
|
||||||
|
if (!this.published && e.code !== 1000 && e.code !== 1005) {
|
||||||
|
this.say('The relay closed the connection. Your recording is still here — try again.');
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setValue(value) {
|
setValue(value) {
|
||||||
if (!this.hidden) return;
|
if (!this.hidden) return;
|
||||||
this.hidden.value = JSON.stringify(value);
|
this.hidden.value = value ? JSON.stringify(value) : '';
|
||||||
this.hidden.dispatchEvent(new Event('input', { bubbles: true }));
|
this.hidden.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,6 +196,7 @@ class VoiceWidget {
|
|||||||
if (this.stream) this.stream.getTracks().forEach((t) => t.stop());
|
if (this.stream) this.stream.getTracks().forEach((t) => t.stop());
|
||||||
if (this.ws) this.ws.close();
|
if (this.ws) this.ws.close();
|
||||||
this.button.removeEventListener('click', this._onClick);
|
this.button.removeEventListener('click', this._onClick);
|
||||||
|
if (this.card) this.card.removeEventListener('click', this._onSubmit, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user