Skip to content

Prevent readline from resuming after it is closed #2

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
sefinek merged 1 commit into from
Nov 17, 2025
Merged

Prevent readline from resuming after it is closed #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 96 additions & 20 deletions tools/updatedb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ async function processCountryData(src, dest) {
let tstart = Date.now();
const datFile = fs.createWriteStream(dataFile);

function processLine(line) {
const fields = CSVtoArray(line);
if (!fields || fields.length < 6) return log.warn('Malformed line detected:', line);
function processLine(line) {
const fields = CSVtoArray(line);
if (!fields || fields.length < 6) return log.warn('Malformed line detected:', line);

lines++;

Expand Down Expand Up @@ -405,15 +405,53 @@ async function processCountryData(src, dest) {
}
}

const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
let i = 0;
for await (const line of rl) {
i++;
if (i === 1) continue;
await processLine(line);
}
datFile.close();
log.done();
await new Promise((resolve, reject) => {
const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
let settled = false;
let i = 0;

function finish(err) {
if (settled) return;
settled = true;
if (!rl.closed) rl.close();
if (err) reject(err);
else resolve();
}

function resume() {
if (!settled && !rl.closed) rl.resume();
}

rl.on('line', line => {
rl.pause();
i++;
if (i === 1) {
resume();
return;
}

let result;
try {
result = processLine(line);
} catch (err) {
finish(err);
return;
}

if (result && typeof result.then === 'function') {
result.then(() => {
resume();
}).catch(finish);
} else {
resume();
}
});

rl.on('close', () => finish());
rl.on('error', finish);
});
datFile.close();
log.done();
}

async function processCityData(src, dest) {
Expand Down Expand Up @@ -514,14 +552,52 @@ async function processCityData(src, dest) {
}
}

const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
let i = 0;
for await (const line of rl) {
i++;
if (i === 1) continue;
await processLine(line);
}
datFile.close();
await new Promise((resolve, reject) => {
const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
let settled = false;
let i = 0;

function finish(err) {
if (settled) return;
settled = true;
if (!rl.closed) rl.close();
if (err) reject(err);
else resolve();
}

function resume() {
if (!settled && !rl.closed) rl.resume();
}

rl.on('line', line => {
rl.pause();
i++;
if (i === 1) {
resume();
return;
}

let result;
try {
result = processLine(line);
} catch (err) {
finish(err);
return;
}

if (result && typeof result.then === 'function') {
result.then(() => {
resume();
}).catch(finish);
} else {
resume();
}
});

rl.on('close', () => finish());
rl.on('error', finish);
});
datFile.close();
}

function processCityDataNames(src, dest, cb) {
Expand Down