comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meteor3: port all 18 migration up() bodies to async

Browse source 
percolate:migrations 2.0.1 awaits async up(), so historical migrations
now run on Meteor 3: fetchAsync + for..of instead of cursor forEach,
insert/update/remove -> *Async, _ensureIndex -> createIndexAsync,
Accounts.createUser -> createUserAsync, awaited rawCollection indexes.

Verified: empty Mongo 7 DB migrates 0->18 cleanly (indexes + industry
registries created, control unlocked at v18); pre-marking version=18 is
no longer needed (UPGRADE.md updated). REST smoke stays byte-identical.
This commit is contained in:
vjrj 2026-07-14 11:36:30 +02:00
parent 1892c0ead0
commit 1f1f5c697d
2 changed files with 90 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

11
UPGRADE.md
View file

@ -199,8 +199,8 @@ work lives on `meteor3-wip` until (a) production Mongo is migrated to 7 and
```bash ```bash
docker run -d --name tcef-mongo7 -p 27019:27019 mongo:7 --replSet rs0 --port 27019 --bind_ip_all docker run -d --name tcef-mongo7 -p 27019:27019 mongo:7 --replSet rs0 --port 27019 --bind_ip_all
docker exec tcef-mongo7 mongosh --port 27019 --quiet --eval 'rs.initiate({_id:"rs0",members:[{_id:0,host:"localhost:27019"}]})' docker exec tcef-mongo7 mongosh --port 27019 --quiet --eval 'rs.initiate({_id:"rs0",members:[{_id:0,host:"localhost:27019"}]})'
# mark migrations current so historical (still-sync) up() bodies don't run: # (migrations run from scratch on an empty DB — all up() bodies are async now,
docker exec tcef-mongo7 mongosh --port 27019 fuegos --quiet --eval 'db.migrations.replaceOne({_id:"control"},{_id:"control",version:18,locked:false},{upsert:true})' # no need to pre-mark db.migrations at version 18)
export MONGO_URL="mongodb://localhost:27019/fuegos?replicaSet=rs0" export MONGO_URL="mongodb://localhost:27019/fuegos?replicaSet=rs0"
export NODE_OPTIONS="--dns-result-order=ipv4first --no-network-family-autoselection" # reach warehouse.meteor.com on Node 22 export NODE_OPTIONS="--dns-result-order=ipv4first --no-network-family-autoselection" # reach warehouse.meteor.com on Node 22
meteor --settings settings-development.json --port 3100 meteor --settings settings-development.json --port 3100
@ -272,8 +272,11 @@ MONGO_CONTAINER=tcef-mongo7 MONGO_SHELL=mongosh MONGO_PORT=27019 ./smoke/smoke.s
- Map/server publications not exercised by the REST smoke converted to - Map/server publications not exercised by the REST smoke converted to
async: `activefiresmyloc`, `activefiresunionmyloc`, `fireAlerts` async: `activefiresmyloc`, `activefiresunionmyloc`, `fireAlerts`
(countAsync/fetchAsync/awaited firesUnion), and `oauth.verifyConfiguration` (countAsync/fetchAsync/awaited firesUnion), and `oauth.verifyConfiguration`
(findOneAsync). `migrations.js` bodies stay sync **by design** (control is (findOneAsync). `migrations.js`: all 18 historical `up()` bodies ported to
pinned at v18; prod data arrives pre-migrated) — tracked as debt. async (`fetchAsync`+`for..of`, `*Async` writes, `createIndexAsync`,
`Accounts.createUserAsync`; percolate:migrations 2.0.1 awaits async `up()`).
Verified: empty Mongo 7 DB migrates 0→18 with no errors (indexes +
industry registries created); pre-marking `version=18` is no longer needed.
Verified in a real browser: `/` and `/fires` render (map, search, layers, Verified in a real browser: `/` and `/fires` render (map, search, layers,
cookie banner), zero uncaught exceptions; REST smoke byte-identical. cookie banner), zero uncaught exceptions; REST smoke byte-identical.
- ✅ **React 16 → 18.3** — `react`/`react-dom` bumped to `^18.3.1` - ✅ **React 16 → 18.3** — `react`/`react-dom` bumped to `^18.3.1`

163
imports/startup/server/migrations.js
View file

@ -1,5 +1,6 @@
/* global Migrations */ /* global Migrations */
/* eslint-disable import/no-absolute-path */ /* eslint-disable import/no-absolute-path */
/* eslint-disable no-await-in-loop, no-restricted-syntax */
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import Comments from '/imports/api/Comments/Comments'; import Comments from '/imports/api/Comments/Comments';
import { Accounts } from 'meteor/accounts-base'; import { Accounts } from 'meteor/accounts-base';
@ -24,38 +25,40 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 1, version: 1,
up: function migrateIds() { up: async function migrateIds() {
// https://docs.mongodb.com/manual/reference/operator/query/type/ // https://docs.mongodb.com/manual/reference/operator/query/type/
Meteor.users.find({ _id: { $type: 7 } }).forEach((user) => { const users = await Meteor.users.find({ _id: { $type: 7 } }).fetchAsync();
for (const user of users) {
const migratedUser = user; const migratedUser = user;
const id = user._id.valueOf(); const id = user._id.valueOf();
console.log(`Migrating id of user: ${JSON.stringify(user)}`); console.log(`Migrating id of user: ${JSON.stringify(user)}`);
Meteor.users.remove({ _id: user._id }); await Meteor.users.removeAsync({ _id: user._id });
migratedUser._id = id; migratedUser._id = id;
Meteor.users.insert(migratedUser); await Meteor.users.insertAsync(migratedUser);
}); }
} }
}); });
Migrations.add({ Migrations.add({
version: 2, version: 2,
up: function migrateSubsForeignKey() { up: async function migrateSubsForeignKey() {
UserSubsToFiresCollection.find({ owner: null }).forEach((sub) => { const subs = await UserSubsToFiresCollection.find({ owner: null }).fetchAsync();
for (const sub of subs) {
console.log(`Migrating subs of chatId: ${sub.chatId}`); console.log(`Migrating subs of chatId: ${sub.chatId}`);
const subsUser = Meteor.users.findOne({ telegramChatId: sub.chatId }); const subsUser = await Meteor.users.findOneAsync({ telegramChatId: sub.chatId });
if (subsUser) { if (subsUser) {
console.log(`Migrating linking to user: ${JSON.stringify(subsUser)}`); console.log(`Migrating linking to user: ${JSON.stringify(subsUser)}`);
UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { owner: subsUser._id } }); await UserSubsToFiresCollection.updateAsync({ _id: sub._id }, { $set: { owner: subsUser._id } });
} else { } else {
// create user with chatId and def language // create user with chatId and def language
const username = `tel${sub.chatId.toString().replace(/^-/, '')}`; const username = `tel${sub.chatId.toString().replace(/^-/, '')}`;
console.log(`Linking to new user: ${username}`); console.log(`Linking to new user: ${username}`);
const newUserId = Accounts.createUser({ const newUserId = await Accounts.createUserAsync({
username, username,
password: randomHex(50), password: randomHex(50),
profile: { name: {} } profile: { name: {} }
}); });
Meteor.users.update({ _id: newUserId }, { await Meteor.users.updateAsync({ _id: newUserId }, {
$set: { $set: {
emails: [], emails: [],
roles: ['user'], roles: ['user'],
@ -63,87 +66,90 @@ Meteor.startup(async () => {
lang: 'es' lang: 'es'
} }
}); });
UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { owner: newUserId } }); await UserSubsToFiresCollection.updateAsync({ _id: sub._id }, { $set: { owner: newUserId } });
} }
}); }
} }
}); });
Migrations.add({ Migrations.add({
version: 3, version: 3,
up: function emptySubsTypes() { up: async function emptySubsTypes() {
UserSubsToFiresCollection.find({ type: null }).forEach((sub) => { const subs = await UserSubsToFiresCollection.find({ type: null }).fetchAsync();
UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { type: 'telegram' } }); for (const sub of subs) {
}); await UserSubsToFiresCollection.updateAsync({ _id: sub._id }, { $set: { type: 'telegram' } });
}
} }
}); });
Migrations.add({ Migrations.add({
version: 4, version: 4,
up: function deleteOldAlertFiresAndIndexes() { up: async function deleteOldAlertFiresAndIndexes() {
FireAlertsCollection.remove({ createdAd: null }); await FireAlertsCollection.removeAsync({ createdAd: null });
const raw = FireAlertsCollection.rawCollection(); const raw = FireAlertsCollection.rawCollection();
raw.createIndex({ ourid: '2dsphere' }); await raw.createIndex({ ourid: '2dsphere' });
raw.createIndex({ when: 1 }); await raw.createIndex({ when: 1 });
raw.createIndex({ updatedAt: 1 }); await raw.createIndex({ updatedAt: 1 });
raw.createIndex({ createdAt: 1 }); await raw.createIndex({ createdAt: 1 });
raw.createIndex({ ourid: 1, type: 1 }); await raw.createIndex({ ourid: 1, type: 1 });
} }
}); });
Migrations.add({ Migrations.add({
version: 5, version: 5,
up: function siteSettingsIndex() { up: async function siteSettingsIndex() {
// other way: // other way:
SiteSettings._ensureIndex({ name: 1 }, { unique: 1 }); await SiteSettings.createIndexAsync({ name: 1 }, { unique: true });
} }
}); });
Migrations.add({ Migrations.add({
version: 6, version: 6,
up: function falsePositiveIndexes() { up: async function falsePositiveIndexes() {
FalsePositives._ensureIndex({ chatId: 1 }); await FalsePositives.createIndexAsync({ chatId: 1 });
FalsePositives._ensureIndex({ owner: 1 }); await FalsePositives.createIndexAsync({ owner: 1 });
FalsePositives._ensureIndex({ fireId: 1 }); await FalsePositives.createIndexAsync({ fireId: 1 });
FalsePositives._ensureIndex({ type: 1 }); await FalsePositives.createIndexAsync({ type: 1 });
FalsePositives._ensureIndex({ geo: '2dsphere' }); await FalsePositives.createIndexAsync({ geo: '2dsphere' });
} }
}); });
Migrations.add({ Migrations.add({
version: 7, version: 7,
up: function defLangIfNull() { up: async function defLangIfNull() {
Meteor.users.find({ lang: null }).forEach((user) => { const users = await Meteor.users.find({ lang: null }).fetchAsync();
Meteor.users.update({ _id: user._id }, { for (const user of users) {
await Meteor.users.updateAsync({ _id: user._id }, {
$set: { $set: {
lang: 'es' lang: 'es'
} }
}); });
}); }
} }
}); });
Migrations.add({ Migrations.add({
version: 8, version: 8,
up: function siteSettingsAddIndex() { up: async function siteSettingsAddIndex() {
SiteSettings._ensureIndex({ isPublic: 1 }); await SiteSettings.createIndexAsync({ isPublic: 1 });
SiteSettings.find({ isPublic: null }).forEach((setting) => { const settings = await SiteSettings.find({ isPublic: null }).fetchAsync();
SiteSettings.update({ _id: setting._id }, { $set: { isPublic: true } }); for (const setting of settings) {
}); await SiteSettings.updateAsync({ _id: setting._id }, { $set: { isPublic: true } });
}
} }
}); });
Migrations.add({ Migrations.add({
version: 9, version: 9,
up: function siteSettingsAddIndex() { up: async function industriesIndexesAndRegistries() {
Industries._ensureIndex({ registry: 1 }); await Industries.createIndexAsync({ registry: 1 });
Industries._ensureIndex({ geo: '2dsphere' }); await Industries.createIndexAsync({ geo: '2dsphere' });
// https://www.eea.europa.eu/data-and-maps/data/member-states-reporting-art-7-under-the-european-pollutant-release-and-transfer-register-e-prtr-regulation-16 // https://www.eea.europa.eu/data-and-maps/data/member-states-reporting-art-7-under-the-european-pollutant-release-and-transfer-register-e-prtr-regulation-16
IndustryRegistries.insert({ await IndustryRegistries.insertAsync({
_id: '1', name: 'E-PRTR', agency: 'EEA', region: 'EU' _id: '1', name: 'E-PRTR', agency: 'EEA', region: 'EU'
}); });
// https://www.epa.gov/enviro/epa-frs-facilities-state-single-file-csv-download // https://www.epa.gov/enviro/epa-frs-facilities-state-single-file-csv-download
IndustryRegistries.insert({ await IndustryRegistries.insertAsync({
_id: '2', name: 'FRS', agency: 'EPA', region: 'US' _id: '2', name: 'FRS', agency: 'EPA', region: 'US'
}); });
} }
@ -151,11 +157,11 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 10, version: 10,
up: function siteSettingsAddIndex() { up: async function moreIndustryRegistries() {
IndustryRegistries.insert({ await IndustryRegistries.insertAsync({
_id: '3', name: 'NPRI', agency: 'GCODP', region: 'Canada' _id: '3', name: 'NPRI', agency: 'GCODP', region: 'Canada'
}); });
IndustryRegistries.insert({ await IndustryRegistries.insertAsync({
_id: '4', name: 'NPI', agency: 'DEE', region: 'Australia' _id: '4', name: 'NPI', agency: 'DEE', region: 'Australia'
}); });
} }
@ -163,15 +169,15 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 11, version: 11,
up: function noAnonComments() { up: async function noAnonComments() {
Comments.remove({ isAnonymous: true }); await Comments.removeAsync({ isAnonymous: true });
} }
}); });
Migrations.add({ Migrations.add({
version: 12, version: 12,
up: function setTelegramUsersBotId() { up: async function setTelegramUsersBotId() {
Meteor.users.update({ telegramChatId: { $ne: null }, telegramBot: null }, { await Meteor.users.updateAsync({ telegramChatId: { $ne: null }, telegramBot: null }, {
$set: { $set: {
telegramBot: 'es' telegramBot: 'es'
} }
@ -181,8 +187,8 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 13, version: 13,
up: function removeTelegramBotFromUsersId() { up: async function removeTelegramBotFromUsersId() {
Meteor.users.update({}, { await Meteor.users.updateAsync({}, {
$unset: { $unset: {
telegramBot: '' telegramBot: ''
} }
@ -192,8 +198,8 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 14, version: 14,
up: function setTelegramUsersBotId() { up: async function setTelegramSubsBotId() {
UserSubsToFiresCollection.update({ chatId: { $ne: null }, telegramBot: null }, { await UserSubsToFiresCollection.updateAsync({ chatId: { $ne: null }, telegramBot: null }, {
$set: { $set: {
telegramBot: 'es' telegramBot: 'es'
} }
@ -203,40 +209,41 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 15, version: 15,
up: function moveToFalsePositivesUppercase() { up: async function moveToFalsePositivesUppercase() {
/* const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' }); /* const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' });
* falsepositiveslower.find({}).forEach((falseDoc) => { * falsepositiveslower.find({}).forEach((falseDoc) => {
* FalsePositives.insert(falseDoc); * FalsePositives.insert(falseDoc);
* });*/ * }); */
// TODO remove falsepositives lowercase collection // TODO remove falsepositives lowercase collection
} }
}); });
Migrations.add({ Migrations.add({
version: 16, version: 16,
up: function moveToFalsePositivesUppercaseWithUser() { up: async function moveToFalsePositivesUppercaseWithUser() {
const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' }); const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' });
const now = new Date(); const now = new Date();
falsepositiveslower.find({}).forEach((falseDoc) => { const falseDocs = await falsepositiveslower.find({}).fetchAsync();
const user = Meteor.users.findOne({ telegramChatId: falseDoc.chatId }); for (const falseDoc of falseDocs) {
const user = await Meteor.users.findOneAsync({ telegramChatId: falseDoc.chatId });
if (user) { if (user) {
falseDoc.owner= user._id; falseDoc.owner = user._id;
} }
falseDoc.type = 'industry'; falseDoc.type = 'industry';
falseDoc.createdAt = now; falseDoc.createdAt = now;
falseDoc.updatedAt = now; falseDoc.updatedAt = now;
FalsePositives.insert(falseDoc); await FalsePositives.insertAsync(falseDoc);
}); }
} }
}); });
Migrations.add({ Migrations.add({
version: 17, version: 17,
up: function renameWebNotifiedField() { up: async function renameWebNotifiedField() {
Notifications.update({ webNotified: { $exists: true } }, { await Notifications.updateAsync({ webNotified: { $exists: true } }, {
$rename: { webNotifiedAt: 'notifiedAt' } $rename: { webNotifiedAt: 'notifiedAt' }
}, { upsert: false, multi: true }); }, { upsert: false, multi: true });
Notifications.update({ webNotified: { $exists: true } }, { await Notifications.updateAsync({ webNotified: { $exists: true } }, {
$rename: { webNotified: 'notified' } $rename: { webNotified: 'notified' }
}, { upsert: false, multi: true }); }, { upsert: false, multi: true });
} }
@ -244,22 +251,18 @@ Meteor.startup(async () => {
Migrations.add({ Migrations.add({
version: 18, version: 18,
up: () => { up: async () => {
const raw = ActiveFiresUnion.rawCollection(); const raw = ActiveFiresUnion.rawCollection();
raw.createIndex({ centerid: '2dsphere' }); await raw.createIndex({ centerid: '2dsphere' });
raw.createIndex({ shape: '2dsphere' }); await raw.createIndex({ shape: '2dsphere' });
raw.createIndex({ when: 1 }); await raw.createIndex({ when: 1 });
raw.createIndex({ createdAt: 1 }); await raw.createIndex({ createdAt: 1 });
raw.createIndex({ updatedAt: 1 }); await raw.createIndex({ updatedAt: 1 });
} }
}); });
// Set createdAt in users & subs // Meteor 3: migrateTo is async and awaits each async up(), so a fresh DB can
// Meteor 3: migrateTo is async now. // migrate from 0 to latest without pre-marking the control version.
// NOTE: the individual up() bodies below still use SYNC Mongo — they only run
// on a DB whose migration version is behind. Production data is restored from
// rsmain already at the latest version, so they never execute. If migrations
// must ever run on a truly-fresh DB, their up() bodies need async conversion.
await Migrations.migrateTo('latest'); await Migrations.migrateTo('latest');
// Migrations.migrateTo('14,rerun'); // Migrations.migrateTo('14,rerun');