From b0c0f70e577c1f5ec737fab2e209bf708cee498b Mon Sep 17 00:00:00 2001 From: nonameShijian <2954700422@qq.com> Date: Thu, 1 Feb 2024 19:22:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=A3=E6=9E=90ts?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + game/game.js | 17 +++++++++++++- service-worker.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 service-worker.js diff --git a/.gitignore b/.gitignore index 966499c9c..71a62c1a0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ noname.ico package-lock.json package.json Thumbs.db +game/typescript.js diff --git a/game/game.js b/game/game.js index 11484dfec..bb2b6e40e 100644 --- a/game/game.js +++ b/game/game.js @@ -100,9 +100,24 @@ new Promise(resolve => { return module.require(moduleId); } catch { return module.require(path.join(window.__dirname, moduleId)); - } + } }; } + if (location.protocol.startsWith('http') && 'serviceWorker' in navigator) { + let scope = window.location.protocol + '//' + window.location.host + '/'; + navigator.serviceWorker.register(`${scope}service-worker.js`, { + updateViaCache: "all", + scope, + }).then(registration => { + navigator.serviceWorker.addEventListener('message', e => { + console.log(e); + }); + registration.update(); + // console.log(`set scope: ${scope}, service worker instance:`, registration); + }).catch(e => { + console.log('serviceWorker加载失败: ', e); + }); + } const script = document.createElement('script') script.type = "module"; script.src = `${assetURL}game/entry.js`; diff --git a/service-worker.js b/service-worker.js new file mode 100644 index 000000000..68ca420f4 --- /dev/null +++ b/service-worker.js @@ -0,0 +1,57 @@ +/** + * @type { import('typescript') } + */ +var ts; +importScripts('./game/typescript.js'); +// @ts-ignore +if (typeof ts != 'undefined') { + console.log(ts); +} else { + console.log(`ts undefined`); +} + +console.log('version 1'); + +self.addEventListener('message', event => { + console.log(event.data); +}); + +self.addEventListener('fetch', event => { + // @ts-ignore + const request = event.request; + if (typeof request.url != 'string') return console.log(request); + if (!request.url.endsWith('.ts') || request.url.endsWith('.d.ts')) return; + // 请求ts文件 + const res = fetch(request.url, { + method: request.method, + mode: "no-cors", + headers: new Headers({ + "Content-Type": "text/plain" + }), + }); + // @ts-ignore + event.respondWith( + res.then(res => { + if (res.status != 200) { + return res; + } else { + console.log('正在编译', request.url); + return res.text().then(text => { + const js = ts.transpile(text, { module: ts.ModuleKind.ES2015 }); + const rep = new Response(new Blob([js], { type: "text/javascript" }), { + status: 200, + statusText: "OK", + headers: new Headers({ + "Content-Type": "text/javascript" + }), + }); + return rep; + }) + } + }) + .catch(e => { + console.log(e); + throw e; + }) + ); +}); \ No newline at end of file From cb1b81b772f21e4e71847dd20ddf7284b84c0ad8 Mon Sep 17 00:00:00 2001 From: nonameShijian <2954700422@qq.com> Date: Thu, 1 Feb 2024 19:40:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0js=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E8=87=AA=E5=8A=A8=E8=AF=B7=E6=B1=82?= =?UTF-8?q?ts=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname/init/import.js | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/noname/init/import.js b/noname/init/import.js index 1668a2812..0375e3b32 100644 --- a/noname/init/import.js +++ b/noname/init/import.js @@ -38,15 +38,29 @@ function generateImportFunction(type, pathParser) { await game.import(type,createEmptyExtension(name)); return; } - const path = pathParser(name); + let path = pathParser(name); // 通过浏览器自带的script标签导入可直接获取报错信息，且不会影响JS运行 // 此时代码内容也将缓存在浏览器中，故再次import后将不会重新执行代码内容（测试下来如此） - const [status, script] = await new Promise((resolve) => { - const script = document.createElement('script'); - script.type = 'module'; - script.src = `${lib.assetURL}noname/init/${path}`; - script.onerror = () => resolve(['error', script]); - script.onload = () => resolve(['ok', script]); + const [status, script] = await new Promise(resolve => { + const createScript = () => { + const script = document.createElement('script'); + script.type = 'module'; + script.src = `${lib.assetURL}noname/init/${path}`; + script.onload = () => resolve(['ok', script]); + return script; + }; + let script = createScript(); + script.onerror = () => { + if (path.endsWith('.js')) { + path = path.slice(0, -3) + '.ts'; + script.remove(); + let ts = createScript(); + ts.onerror = () => resolve(['error', ts]); + document.head.appendChild(ts); + } else { + resolve(['error', script]); + } + }; document.head.appendChild(script); }); script.remove(); From ec622150a0be37943c1400595ef70e2b0e0b9ce3 Mon Sep 17 00:00:00 2001 From: nonameShijian <2954700422@qq.com> Date: Thu, 1 Feb 2024 20:04:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=BF=E6=9C=AA=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8D=E8=BF=94=E5=9B=9Ehtml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- noname-server.exe | Bin 70686720 -> 70686720 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/noname-server.exe b/noname-server.exe index b2c2b1f2abed449eb95592f023fbd96bbf2e71b7..ee02bee87e4b0a6ab59d4bbd0d28de7b1475c2dd 100644 GIT binary patch delta 3220 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