Skip to content

Commit

Permalink
fix: disabled request module
Browse files Browse the repository at this point in the history
biuuu committed May 31, 2022
1 parent 2c89af5 commit a5b60c5
Showing 6 changed files with 43 additions and 35 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "shinycolors-zh",
"version": "1.8.16",
"version": "1.9.0",
"main": "main.js",
"repository": "[email protected]:biuuu/ShinyColors.git",
"author": "biuuu",
"license": "MIT",
"scripts": {
"build": "rollup --config ./script/build.js",
"data": "node ./script/cleanDist.js && cross-env PUBLISH=skip node ./script/deploy.js",
"dev": "yarn data && rollup --config ./script/build.js --environment BUILD:development,DEV && yarn server",
"dev-s": "rollup --config ./script/build.js --environment BUILD:development,DEV && yarn server",
"dev-text": "yarn data && rollup --config ./script/build.js --environment BUILD:development,DEV,TEXT && yarn server",
"dev": "npm run data && rollup --config ./script/build.js --environment BUILD:development,DEV && npm run server",
"dev-s": "rollup --config ./script/build.js --environment BUILD:development,DEV && npm run server",
"dev-text": "npm run data && rollup --config ./script/build.js --environment BUILD:development,DEV,TEXT && npm run server",
"deploy": "node ./script/cleanDist.js && rollup --config ./script/build.js && node ./script/deploy.js",
"deploy_action": "cross-env CUSTOM_DOMAIN=true GITHUB_ACTION=true yarn deploy",
"deploy_action": "cross-env CUSTOM_DOMAIN=true GITHUB_ACTION=true npm run deploy",
"server": "node ./script/server.js"
},
"dependencies": {
14 changes: 7 additions & 7 deletions script/MODULE_ID.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"AOBA": 0,
"REQUEST": 5,
"PHRASE": 4,
"SCENARIO": 177,
"SPEAKER": 675,
"WEBP": 151
}
"AOBA": 77180,
"REQUEST": 80569,
"PHRASE": 8947,
"SCENARIO": 15210,
"SPEAKER": 18955,
"WEBP": 73888
}
12 changes: 9 additions & 3 deletions script/searchModule.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
const getModule = async (name, condition) => {
for (let i = 1; i < 1200; i++) {
let module = _require(i)
for (let i = 1; i < 202000; i++) {
let module
try {
module = _require(i)
} catch (e) {}

if (module && condition(module)) {
console.info(`${name}: ${i}`)
break
}
}
}

getModule('AOBA', (module) => {
return module && module.loaders && module.Text && module.BLEND_MODES
})
getModule('REQUEST', (module) => {
return module.get && module.post && module.put && module.patch
})
4 changes: 2 additions & 2 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import './modules/index'
import transPhrase from './modules/phrase'
import watchText from './modules/text'
import requestHook from './modules/request'
// import requestHook from './modules/request'
import resourceHook from './modules/resourse'
import transStory from './modules/story'
import { isReady } from './modules/get-module'
@@ -16,7 +16,7 @@ const main = async () => {
addFont(),
transPhrase(),
watchText(),
requestHook(),
// requestHook(),
transStory()])
} catch (e) {
log(e)
17 changes: 9 additions & 8 deletions src/modules/get-module.js
Original file line number Diff line number Diff line change
@@ -43,19 +43,17 @@ Object.freeze = new Proxy(originFreeze, {
return data
}
})

const requireRegExp = /^function\s(\w)\((\w)\){if\((\w)\[\2\]\)return\s\3\[\2\]\.exports;var\s(\w)=\3\[\2\]={\w:\2,(\w):!1,exports:{}};return\s\w\[\2\]\.call\(\4.exports,\4,\4\.exports,\1\),\4\.\5=!0,\4\.exports}$/
// function\s\w\((\w)\){var\s(\w)=(\w)\[\1\];if\(void\s0!==\2\)return\s\2\.exports;var\s(\w)=\3\[\1\]={id:\1,loaded:!1,exports:{}};return\s\w\[\1\]\.call\(\4\.exports,\4,\4\.exports,\w\),\4\.loaded=!0,\4\.exports}
const requireRegExp = /^function\s\w\((\w)\){var\s(\w)=(\w)\[\1\];if\(void\s0!==\2\)return\s\2\.exports;var\s(\w)=\3\[\1\]={id:\1,loaded:!1,exports:{}};return\s\w\[\1\]\.call\(\4\.exports,\4,\4\.exports,\w\),\4\.loaded=!0,\4\.exports}$/
const originCall = Function.prototype.call
let win = { Reflect: window.Reflect }
Function.prototype.call = new Proxy(originCall, {
apply (target, self, args) {
if (args?.[3]?.toString) {
if (requireRegExp.test(args[3].toString())) {
if (args[3].caller?.arguments?.[0]?.length > 1000) {
require = args[3]
if (ENVIRONMENT === 'development') unsafeWindow._require = require
Function.prototype.call = originCall
}
require = args[3]
if (ENVIRONMENT === 'development') unsafeWindow._require = require
Function.prototype.call = originCall
}
}
return win.Reflect.apply(target, self, args)
@@ -81,7 +79,10 @@ const findModule = (id, conditionFunc) => {
let module
let realId
for (let i = 0; i < idList.length; i++) {
let _module = require(idList[i])
let _module
try {
_module = require(idList[i])
} catch (e) {}
if (conditionFunc(_module)) {
module = _module
realId = idList[i]
21 changes: 11 additions & 10 deletions src/modules/request.js
Original file line number Diff line number Diff line change
@@ -104,16 +104,17 @@ export default async function requestHook () {
const request = await getModule('REQUEST')

// GET
const originGet = request.get
request.get = async function (...args) {
const type = args[0]
const res = await originGet.apply(this, args)
if (!type) return res
let data = res.body
requestLog('GET', '#009688', args, data)
await requestRouter(data, type, routerMaps['get'])
return res
}
// const originGet = request.get
// request.get = async function (...args) {
// const type = args[0]
// const res = await originGet.apply(this, args)
// if (!type) return res
// let data = res.body
// requestLog('GET', '#009688', args, data)
// await requestRouter(data, type, routerMaps['get'])
// return res
// }
// request.get.query = originGet.query

// PATCH
const originPatch = request.patch

0 comments on commit a5b60c5

Please sign in to comment.