fix: unexpected exception in debug mode

TypeError: mw.Api is not a constructor
inpageedit · Jan 5, 2024 · 771526c · 771526c
1 parent 6f69d06
commit 771526c
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 42 deletions.
diff --git a/src/method/initQueryData.js b/src/method/initQueryData.js
@@ -1,9 +1,4 @@
-const mwApi = new mw.Api({
-  parameters: {
-    format: 'json',
-    formatversion: 2,
-  },
-})
+import { useMwApi } from '../utils/mw'
 
 export async function initQueryData() {
   // Init
@@ -13,7 +8,7 @@ export async function initQueryData() {
 
   const {
     query: { users, userinfo, specialpagealiases },
-  } = await mwApi.get({
+  } = await useMwApi().get({
     action: 'query',
     ususers: mw.config.get('wgUserName'),
     meta: ['userinfo', 'siteinfo'],

diff --git a/src/module/articleLink.js b/src/module/articleLink.js
@@ -74,7 +74,7 @@ export function articleLink(elements) {
         class: 'in-page-edit-article-link',
         text: _msg('quick-edit'),
       }).on('click', function (event) {
-        event.preventDefault();
+        event.preventDefault()
         var options = {}
         options.page = title
         if (revision !== null) {

diff --git a/src/module/linksHere.js b/src/module/linksHere.js
@@ -6,7 +6,7 @@
 import { _analytics } from './_analytics'
 import { $progress, $link } from './_elements'
 import { _msg } from './_msg'
-import { mwApi, mwConfig } from '../utils/mw'
+import { useMwApi, mwConfig } from '../utils/mw'
 import { quickEdit } from './quickEdit'
 
 /**
@@ -34,7 +34,7 @@ const getList = (title) => {
   } else {
     opt.lhlimit = 'max'
   }
-  return mwApi.get(opt)
+  return useMwApi().get(opt)
 }
 
 /**

diff --git a/src/module/quickDelete.js b/src/module/quickDelete.js
@@ -2,7 +2,7 @@ import { _analysis } from './_analytics'
 import { _msg } from './_msg'
 import { hasRight } from '../utils/hasRight'
 import { $br } from './_elements'
-import { mwApi, mwConfig } from '../utils/mw'
+import { useMwApi, mwConfig } from '../utils/mw'
 
 /**
  * @module quickDelete 删除页面模块
@@ -89,7 +89,7 @@ export function quickDelete(page, givenReason = '') {
             function (result) {
               if (result) {
                 reason = _msg('delete-title') + ' (' + reason + ')'
-                mwApi
+                useMwApi()
                   .postWithToken('csrf', {
                     action: 'delete',
                     title: page,

diff --git a/src/module/quickDiff.js b/src/module/quickDiff.js
@@ -2,7 +2,7 @@ import { _analysis } from './_analytics'
 import { _msg } from './_msg'
 import { $br, $progress } from './_elements'
 import { articleLink } from './articleLink'
-import { mwApi } from '../utils/mw'
+import { useMwApi } from '../utils/mw'
 
 /**
  * @module quickDiff 快速页面差异模块
@@ -55,7 +55,7 @@ export function quickDiff(param) {
   } else if (param.fromtext) {
     param.frompst = true
   }
-  mwApi
+  useMwApi()
     .post(param)
     .done(function (data) {
       const compareTableBody = data.compare.body

diff --git a/src/module/quickEdit.js b/src/module/quickEdit.js
@@ -1,4 +1,4 @@
-import { mwApi, mwConfig } from '../utils/mw'
+import { useMwApi, mwConfig } from '../utils/mw'
 
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
@@ -252,7 +252,7 @@ export function quickEdit(options) {
               if (options.section === 'new') {
                 sectiontitle = $newSectionTitleInput.val()
                 const anchor = (
-                  await mwApi.post({
+                  await useMwApi().post({
                     action: 'parse',
                     text: `==${sectiontitle}==`,
                     contentmodel: 'wikitext',
@@ -415,7 +415,7 @@ export function quickEdit(options) {
       }
 
       // 解析页面内容
-      mwApi
+      useMwApi()
         .get(options.jsonGet)
         .done(function (data) {
           console.timeEnd('[InPageEdit] 获取页面源代码')
@@ -516,7 +516,7 @@ export function quickEdit(options) {
         } else {
           queryJson.titles = options.page
         }
-        mwApi
+        useMwApi()
           .get(queryJson)
           .done(function (data) {
             console.info('[InPageEdit] 获取页面基础信息成功')
@@ -620,7 +620,7 @@ export function quickEdit(options) {
                   ''
                 ) // 去掉名字空间
 
-          mwApi
+          useMwApi()
             .get({
               action: 'query',
               meta: 'allmessages',
@@ -634,7 +634,7 @@ export function quickEdit(options) {
 
               if (!fullWikitext.trim()) return
 
-              mwApi
+              useMwApi()
                 .post({
                   action: 'parse',
                   text: fullWikitext,
@@ -845,7 +845,7 @@ export function quickEdit(options) {
             },
           ],
           onShow() {
-            mwApi
+            useMwApi()
               .get({
                 action: 'query',
                 format: 'json',
@@ -898,7 +898,7 @@ export function quickEdit(options) {
       options.jumpTo = '#' + sectiontitle
     }
 
-    mwApi
+    useMwApi()
       .postWithToken('csrf', options.jsonPost)
       .done(saveSuccess)
       .fail(saveError)

diff --git a/src/module/quickPreview.js b/src/module/quickPreview.js
@@ -1,6 +1,6 @@
 import { _msg } from './_msg'
 import { $progress } from './_elements'
-import { mwApi } from '../utils/mw'
+import { useMwApi } from '../utils/mw'
 
 /**
  * @module quickPreview 快速预览文章页
@@ -50,7 +50,7 @@ export function quickPreview(params, modalSize = 'large', center = false) {
     onShow() {
       $loading.css('margin-top', window.innerHeight / 2 - 100)
       $('.previewbox .hideThisBtn').hide()
-      mwApi
+      useMwApi()
         .post(options)
         .then(function (data) {
           console.timeEnd('[InPageEdit] Request preview')

diff --git a/src/module/quickRedirect.js b/src/module/quickRedirect.js
@@ -1,7 +1,7 @@
 import { _analysis } from './_analytics'
 import { _msg } from './_msg'
 import { $br, $progress } from './_elements'
-import { mwApi, mwConfig } from '../utils/mw'
+import { useMwApi, mwConfig } from '../utils/mw'
 import { _resolveExists } from './_resolveExists'
 import { preference } from './preference'
 
@@ -119,7 +119,7 @@ export function quickRedirect(type = 'to') {
 
           let promise = Promise.resolve()
           if (preference.get('noRedirectIfConvertedTitleExists')) {
-            promise = mwApi
+            promise = useMwApi()
               .get({ titles: json.title, converttitles: 1 })
               .done((data) => {
                 const convertedTitle = data.query.pages[0]
@@ -142,7 +142,10 @@ export function quickRedirect(type = 'to') {
           }
           promise.then(
             () => {
-              mwApi.postWithToken('csrf', json).done(successed).fail(failed)
+              useMwApi()
+                .postWithToken('csrf', json)
+                .done(successed)
+                .fail(failed)
             },
             () => {}
           )

diff --git a/src/module/quickRename.js b/src/module/quickRename.js
@@ -3,7 +3,7 @@ import { _msg } from './_msg'
 import { hasRight } from '../utils/hasRight'
 import { _resolveExists } from './_resolveExists'
 import { $br } from './_elements'
-import { mwApi, mwConfig } from '../utils/mw'
+import { useMwApi, mwConfig } from '../utils/mw'
 import { progress } from './progress'
 
 /**
@@ -106,7 +106,7 @@ export function quickRename(from, to) {
             reason =
               _msg('rename-summary') + ' → [[:' + to + ']] (' + reason + ')'
           }
-          mwApi
+          useMwApi()
             .postWithToken('csrf', {
               action: 'move',
               from,

diff --git a/src/module/syncPreferences.js b/src/module/syncPreferences.js
@@ -3,7 +3,7 @@
 // 将 IPE 的参数设置保存在数据库内，实现多端同步
 // ========================================= //
 
-import { mwApi } from '../utils/mw'
+import { useMwApi } from '../utils/mw'
 
 /**
  * @param {string} name
@@ -21,7 +21,7 @@ export async function setPreferences(name, value) {
     ...mw.user.options.value[prefKey(name)],
     ...value,
   }
-  return mwApi.postWithToken('csrf', {
+  return useMwApi().postWithToken('csrf', {
     format: 'json',
     action: 'options',
     change: new URLSearchParams({
@@ -35,7 +35,7 @@ export async function setPreferences(name, value) {
  * @returns {Promise<Record<string, any>>}
  */
 export async function getPreferences(name) {
-  const data = await mwApi.get({
+  const data = await useMwApi().get({
     format: 'json',
     action: 'query',
     meta: 'userinfo',

diff --git a/src/utils/mw.js b/src/utils/mw.js
@@ -1,14 +1,15 @@
 import version from '../module/version'
 
 export const mwConfig = mw.config.get()
-export const mwApi = new mw.Api({
-  parameters: {
-    formatversion: 2,
-    format: 'json',
-  },
-  ajax: {
-    headers: {
-      'Api-User-Agent': `InPageEdit-v2/${version}`,
+export const useMwApi = () =>
+  new mw.Api({
+    parameters: {
+      formatversion: 2,
+      format: 'json',
     },
-  },
-})
+    ajax: {
+      headers: {
+        'Api-User-Agent': `InPageEdit-v2/${version}`,
+      },
+    },
+  })