feat: add cancellation mechanism for all network ops

Author: m90

bin/cmd.js

@@ -5,6 +5,8 @@ import { pickLanguages, pickKeys } from './../lib/util.js'
 import { execCmd } from './../lib/exec.js'
 import { trap } from './../lib/signals.js'
 
+const abortController = new AbortController()
+
 Promise.race([
   (async () => {
     const args = process.argv.slice(2)
@@ -27,8 +29,8 @@ Promise.race([
       )
     }
 
-    const sourceRepo = new WikibaseRepo(source)
-    const targetRepo = new WikibaseRepo(target, { oauth })
+    const sourceRepo = new WikibaseRepo(source, { abortController })
+    const targetRepo = new WikibaseRepo(target, { oauth, abortController })
 
     const contentLanguages = await targetRepo.getContentLanguages()
 
@@ -55,6 +57,7 @@ Promise.race([
     console.error('An error occurred executing the command:')
     console.error(err)
     process.exitCode = 1
+    abortController.abort()
   })
   .then(() => {
     if (process.env.CALLBACK_ON_SUCCESS && process.exitCode === 0) {

lib/repo.js

@@ -2,8 +2,9 @@ import WBEdit from 'wikibase-edit'
 import { WBK } from 'wikibase-sdk'
 
 export default class WikibaseRepository {
-  constructor (origin, opts = {}) {
+  constructor (origin, opts = { abortController: new AbortController() }) {
     this.origin = origin
+    this.abortController = opts.abortController
 
     this.read = new WBK({
       instance: origin
@@ -19,8 +20,16 @@ export default class WikibaseRepository {
     }
   }
 
+  async withCancellationContext (thunk) {
+    this.abortController.signal.throwIfAborted()
+    return thunk()
+  }
+
   getContentLanguages () {
-    return fetch(`${this.origin}/w/api.php?action=query&meta=wbcontentlanguages&format=json`)
+    return fetch(
+        `${this.origin}/w/api.php?action=query&meta=wbcontentlanguages&format=json`,
+        { signal: this.abortController.signal }
+      )
       .then(r => r.json())
       .then(body => Object.keys(body.query.wbcontentlanguages))
   }
@@ -30,7 +39,7 @@ export default class WikibaseRepository {
       return Promise.reject(new Error('Cannot edit a read only instance.'))
     }
     return Promise.allSettled(entities.map(async entity => {
-      return this.edit.entity.create(entity)
+      return this.withCancellationContext(() => this.edit.entity.create(entity))
     }))
       .then((results) => {
         for (const result of results) {
@@ -46,14 +55,16 @@ export default class WikibaseRepository {
     return Promise.all(identifiers.map(async identifier => {
       const [entityId, revision] = identifier.split('@')
       const url = revision
-        ? await this.read.getEntityRevision({
+        ? await this.withCancellationContext(() => this.read.getEntityRevision({
           id: entityId,
           revision
-        })
-        : await this.read.getEntities({
+        }))
+        : await this.withCancellationContext(() => this.read.getEntities({
           ids: [entityId]
-        })
-      const { entities } = await fetch(url).then(res => res.json())
+        }))
+      const { entities } = await fetch(
+        url, { signal: this.abortController.signal }
+      ).then(res => res.json())
       return entities[entityId]
     }))
   }