YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1167 from nonameShijian/PR-Branch 

使import可以解析node内部模块
This commit is contained in:
Spmario233 2024-04-07 22:40:26 +08:00 committed by GitHub
parent 749ed78f7f a5e9ef12f9
commit 614e153722
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 297 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
index.html
View File

@ -6,6 +6,28 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="user-scalable=no, viewport-fit=cover">
<title>无名杀</title>
<script>
if (typeof window.require == 'function' &&
typeof window.process == 'object' &&
typeof window.__dirname == 'string') {
// 使importMap解析node内置模块
const builtinModules = require('module').builtinModules;
if (Array.isArray(builtinModules)) {
const importMap = {
imports: {}
};
for (const module of builtinModules) {
importMap.imports[module] =
importMap.imports[`node:${module}`] =
`./noname-builtinModules/${module}`
}
const im = document.createElement('script');
im.type = 'importmap';
im.textContent = JSON.stringify(importMap);
document.currentScript.after(im);
}
}
</script>
<script>
"use strict";
(() => {

160
noname/ui/create/menu/pages/otherMenu.js
View File

@ -360,9 +360,6 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
return;
}
else if (game.download) {
// if (!confirm('请保证一小时内没有进行过素材和游戏更新，否则会请求失败，是否继续？')) {
// return;
// }
if (!localStorage.getItem('noname_authorization') && !sessionStorage.getItem('noname_authorization')) {
if (confirm('素材更新或许会直接超过每小时的访问限制，是否输入您github的token以解除访问每小时60次的限制？')) await gainAuthorization();
}
@ -372,9 +369,24 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
checkAssetButton.innerHTML = '检查素材更新';
checkAssetButton.disabled = false;
}
// 暂定更新这四个文件夹
const assetDirs = ['audio', 'font', 'image', 'theme'];
const assetDirs = [];
if (lib.config.asset_font) {
assetDirs.push('font');
}
if (lib.config.asset_audio) {
assetDirs.push('audio');
}
if (lib.config.asset_image) {
assetDirs.push('image');
}
const files = await Promise.all(assetDirs.map(dir => flattenRepositoryFiles(dir)));
assetDirs.forEach((value, index) => {
const arr = files[index];
const size = arr.reduce((previous, current) => {
return previous + current.size;
}, 0);
game.saveConfig(`asset_${value}_size`, parseSize(size));
});
/**
* @param { any[] } arr
* @param { Function } predicate
@ -389,7 +401,20 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
const result = await asyncFilter(files.flat(), async v => {
return v.size != (await game.promises.readFile(v.path)).length;
}).then(arr => arr.map(v => v.path));
console.log(result);
console.log('需要更新的文件有:', result);
game.print('需要更新的文件有:', result);
const finish = async () => {
await lib.init.promises.js('game', 'asset.js');
if (Array.isArray(window.noname_asset_list)) {
game.saveConfig('asset_version', window.noname_asset_list[0]);
delete window.noname_asset_list;
}
if (confirm('更新完成，是否重启？')) {
game.reload();
}
refresh();
};
if (result.length > 0) {
const progress = createProgress('正在更新素材包.zip');
/**
* @type {progress}
@ -412,7 +437,7 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
}, {
method: 'post',
body: JSON.stringify({
fileList: result
fileList: result.concat('game/asset.js')
})
}).then(async blob => {
progress.remove();
@ -437,21 +462,16 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
await game.promises.writeFile(value.asArrayBuffer(), path, name);
}
unZipProgress.remove();
await lib.init.promises.js('game', 'update.js');
if (Array.isArray(window.noname_asset_list)) {
game.saveConfig('asset_version', window.noname_asset_list[0]);
delete window.noname_asset_list;
}
if (confirm('更新完成，是否重启？')) {
game.reload();
}
refresh();
await finish();
}).catch(e => {
if (progress.parentNode) progress.remove();
if (unZipProgress && unZipProgress.parentNode) unZipProgress.remove();
refresh();
throw e;
});
} else {
await finish();
}
}
else {
alert('此版本不支持游戏内更新素材，请手动更新');
@ -563,11 +583,11 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
if (!this.classList.toggle('on')) {
game.saveConfig('asset_toggle_off', true);
[
span2, span2_br, span2_check,
/* span2, span2_br, span2_check,*/
span3, span3_br, span3_check,
span4, span4_br, span4_check,
span5, span5_br, span5_check,
span6, span6_br, span6_check,
/* span6, span6_br, span6_check,*/
].forEach(item => HTMLDivElement.prototype.css.call(item, {
display: 'none'
}));
@ -575,11 +595,11 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
else {
game.saveConfig('asset_toggle_off');
[
span2, span2_br, span2_check,
/* span2, span2_br, span2_check,*/
span3, span3_br, span3_check,
span4, span4_br, span4_check,
span5, span5_br, span5_check,
span6, span6_br, span6_check,
/* span6, span6_br, span6_check,*/
].forEach(item => HTMLDivElement.prototype.css.call(item, {
display: ''
}));
@ -588,24 +608,11 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
span1.listen(span1.toggle);
li2.lastChild.appendChild(span1);
var span6_br = ui.create.node('br');
li2.lastChild.appendChild(span6_br);
// var span6_br = ui.create.node('br');
// li2.lastChild.appendChild(span6_br);
// var span2_br = ui.create.node('br');
var span5 = ui.create.div('', '图片素材（精简，126MB）');
span5.style.fontSize = 'small';
span5.style.lineHeight = '16px';
var span5_check = document.createElement('input');
span5_check.type = 'checkbox';
span5_check.style.marginLeft = '5px';
if (lib.config.asset_image) {
span5_check.checked = true;
}
span5_check.onchange = function () {
game.saveConfig('asset_image', this.checked);
};
var span2_br = ui.create.node('br');
var span4 = ui.create.div('', '字体素材（48MB）');
var span4 = ui.create.div('', `字体素材（${ lib.config.asset_font_size || '23.4MB' }）`);
span4.style.fontSize = 'small';
span4.style.lineHeight = '16px';
li2.lastChild.appendChild(span4);
@ -622,7 +629,7 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
var span3_br = ui.create.node('br');
li2.lastChild.appendChild(span3_br);
var span3 = ui.create.div('', '音效素材（125MB）');
var span3 = ui.create.div('', `音效素材（${ lib.config.asset_audio_size || '350MB' }）`);
span3.style.fontSize = 'small';
span3.style.lineHeight = '16px';
li2.lastChild.appendChild(span3);
@ -639,49 +646,60 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
var span4_br = ui.create.node('br');
li2.lastChild.appendChild(span4_br);
var span2 = ui.create.div('', '皮肤素材（351MB）');
span2.style.fontSize = 'small';
span2.style.lineHeight = '16px';
li2.lastChild.appendChild(span2);
var span2_check = document.createElement('input');
span2_check.type = 'checkbox';
span2_check.style.marginLeft = '5px';
if (lib.config.asset_skin) {
span2_check.checked = true;
// var span2 = ui.create.div('', '皮肤素材（351MB）');
// span2.style.fontSize = 'small';
// span2.style.lineHeight = '16px';
// li2.lastChild.appendChild(span2);
// var span2_check = document.createElement('input');
// span2_check.type = 'checkbox';
// span2_check.style.marginLeft = '5px';
// if (lib.config.asset_skin) {
// span2_check.checked = true;
// }
// span2_check.onchange = function () {
// game.saveConfig('asset_skin', this.checked);
// };
// li2.lastChild.appendChild(span2_check);
var span5 = ui.create.div('', `图片素材（${lib.config.asset_image_size || '363MB'}）`);
span5.style.fontSize = 'small';
span5.style.lineHeight = '16px';
li2.lastChild.appendChild(span5);
var span5_check = document.createElement('input');
span5_check.type = 'checkbox';
span5_check.style.marginLeft = '5px';
if (lib.config.asset_image) {
span5_check.checked = true;
}
span2_check.onchange = function () {
game.saveConfig('asset_skin', this.checked);
span5_check.onchange = function () {
// @ts-ignore
game.saveConfig('asset_image', this.checked);
};
li2.lastChild.appendChild(span2_check);
li2.lastChild.appendChild(span5_check);
var span5_br = ui.create.node('br');
li2.lastChild.appendChild(span5_br);
// li2.lastChild.appendChild(span2_br);
li2.lastChild.appendChild(span5);
li2.lastChild.appendChild(span5_check);
li2.lastChild.appendChild(span2_br);
var span6 = ui.create.div('', '图片素材（完整，203MB）');
span6.style.fontSize = 'small';
span6.style.lineHeight = '16px';
li2.lastChild.appendChild(span6);
var span6_check = document.createElement('input');
span6_check.type = 'checkbox';
span6_check.style.marginLeft = '5px';
if (lib.config.asset_full) {
span6_check.checked = true;
}
span6_check.onchange = function () {
game.saveConfig('asset_full', this.checked);
};
li2.lastChild.appendChild(span6_check);
// var span6 = ui.create.div('', '图片素材（完整，203MB）');
// span6.style.fontSize = 'small';
// span6.style.lineHeight = '16px';
// li2.lastChild.appendChild(span6);
// var span6_check = document.createElement('input');
// span6_check.type = 'checkbox';
// span6_check.style.marginLeft = '5px';
// if (lib.config.asset_full) {
// span6_check.checked = true;
// }
// span6_check.onchange = function () {
// game.saveConfig('asset_full', this.checked);
// };
// li2.lastChild.appendChild(span6_check);
[
span2, span2_br, span2_check,
/* span2, span2_br, span2_check,*/
span3, span3_br, span3_check,
span4, span4_br, span4_check,
span5, span5_br, span5_check,
span6, span6_br, span6_check,
/* span6, span6_br, span6_check,*/
].forEach(item => HTMLDivElement.prototype.css.call(item, {
display: 'none'
}));

17
service-worker.js
View File

@ -59,11 +59,25 @@ self.addEventListener('fetch', event => {
event.respondWith(rep);
return;
}
if (!['.ts', '.json', '.vue', 'css'].some(ext => request.url.endsWith(ext))) return;
if (!['.ts', '.json', '.vue', 'css'].some(ext => request.url.endsWith(ext)) && !request.url.replace(location.origin, '').startsWith('/noname-builtinModules/')) return;
if (request.url.endsWith('.d.ts')) return;
if (request.url.endsWith('.json') || request.url.endsWith('css')) {
if (!event.request.headers.get('origin')) return;
}
if (request.url.replace(location.origin, '').startsWith('/noname-builtinModules/')) {
const moduleName = request.url.replace(location.origin + '/noname-builtinModules/', '');
console.log('正在编译', moduleName);
let js = `const module = require('${ moduleName }');\nexport default module;`;
const rep = new Response(new Blob([js], { type: "text/javascript" }), {
status: 200,
statusText: "OK",
headers: new Headers({
"Content-Type": "text/javascript"
}),
});
console.log(moduleName, '编译成功');
event.respondWith(Promise.resolve(rep));
} else {
// 请求原文件
const res = fetch(request.url, {
method: request.method,
@ -201,4 +215,5 @@ self.addEventListener('fetch', event => {
throw e;
})
);
}
});