Skip to content

feat: use legacy message IDs and formats for Mesh V2 connected status #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
takaokouji merged 2 commits into from
Jan 1, 2026
Merged

feat: use legacy message IDs and formats for Mesh V2 connected status #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5824b25
feat: use legacy message IDs and formats for Mesh V2 connected status
takaokouji Jan 1, 2026
640de82
feat: unify Mesh V2 message IDs with legacy Mesh IDs
takaokouji Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/extensions/scratch3_mesh/mesh-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class MeshService {
this.availablePeripherals[hostMeshId] = {
name: formatMessage({
id: 'mesh.hostPeripheralName',
default: 'Host Mesh [{ MESH_ID }]',
description: 'label for "Host Mesh" in connect modal for Mesh extension'
default: 'Become Mesh Host [{ MESH_ID }]',
description: 'label for becoming Host Mesh in connect modal for Mesh extension'
}, {MESH_ID: this.blocks.makeMeshIdLabel(this.meshId)}),
peripheralId: hostMeshId,
rssi: 0
Expand Down
44 changes: 16 additions & 28 deletions src/extensions/scratch3_mesh_v2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ class Scratch3MeshV2Blocks {
const peripherals = validGroups.map(group => ({
peripheralId: group.id,
name: formatMessage({
id: 'mesh.clientPeripheralNameV2',
default: 'Join Mesh V2 [{ MESH_ID }]',
description: 'label for joining Mesh in connect modal for Mesh V2 extension'
id: 'mesh.clientPeripheralName',
default: 'Join Mesh [{ MESH_ID }]',
description: 'label for "Join Mesh" in connect modal for Mesh extension'
}, {MESH_ID: this.makeMeshIdLabel(group.name)}),
rssi: this.calculateRssi(group),
domain: group.domain
Expand All @@ -193,9 +193,9 @@ class Scratch3MeshV2Blocks {
peripherals.unshift({
peripheralId: MESH_V2_HOST_ID,
name: formatMessage({
id: 'mesh.hostPeripheralNameV2',
default: 'Become Mesh V2 Host [{ MESH_ID }]',
description: 'label for becoming Host Mesh in connect modal for Mesh V2 extension'
id: 'mesh.hostPeripheralName',
default: 'Become Mesh Host [{ MESH_ID }]',
description: 'label for becoming Host Mesh in connect modal for Mesh extension'
}, {MESH_ID: this.makeMeshIdLabel(this.nodeId)}),
rssi: 0
});
Expand Down Expand Up @@ -303,38 +303,26 @@ class Scratch3MeshV2Blocks {
connectedMessage () {
if (this.meshService && this.meshService.groupId) {
const meshIdLabel = this.makeMeshIdLabel(this.meshService.groupName);
const expiresAt = this.meshService.expiresAt ?
new Date(this.meshService.expiresAt).toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit'
}) : null;

if (this.meshService.isHost) {
const expiresAtMessage = expiresAt ? formatMessage({
id: 'mesh.expiresAtV2',
default: ' (Expires at { TIME })',
description: 'label for expiration time in connect modal for Mesh V2 extension'
}, {TIME: expiresAt}) : '';

return formatMessage({
id: 'mesh.registeredHostV2',
default: 'Registered Host Mesh V2 [{ MESH_ID }]{ EXPIRES_AT }',
description: 'label for registered Host Mesh in connect modal for Mesh V2 extension'
id: 'mesh.registeredHost',
default: 'Registered Host Mesh [{ MESH_ID }]',
description: 'label for registered Host Mesh in connect modal for Mesh extension'
}, {
MESH_ID: meshIdLabel,
EXPIRES_AT: expiresAtMessage
MESH_ID: meshIdLabel
});
}
return formatMessage({
id: 'mesh.joinedMeshV2',
default: 'Joined Mesh V2 [{ MESH_ID }]',
description: 'label for joined Mesh in connect modal for Mesh V2 extension'
id: 'mesh.joinedMesh',
default: 'Joined Mesh [{ MESH_ID }]',
description: 'label for joined Mesh in connect modal for Mesh extension'
}, {MESH_ID: meshIdLabel});
}
return formatMessage({
id: 'mesh.notConnectedV2',
default: 'Not connected (Mesh V2)',
description: 'label for not connected in connect modal for Mesh V2 extension'
id: 'mesh.notConnected',
default: 'Not connected',
description: 'label for not connected in connect modal for Mesh extension'
});
}

Expand Down
Loading