Merge pull request #12 from redribbon0403/dev

Fix https issue
redribbon0403 · Dec 8, 2022 · 6789fd2 · 6789fd2
2 parents ca4a9f8 + afba7e2
commit 6789fd2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/service/core/scraper.js b/src/service/core/scraper.js
@@ -116,8 +116,9 @@ export default class Scraper {
         let voiceUrl = []
         let jumpUrl = ""
 
+        const regexp = new RegExp('^(?:http|https)://resource.mobamas.net');
         for (let i of extraUrl){
-          if (i.startsWith("http://resource.mobamas.net")) {
+          if (regexp.test(i)) {
             voiceUrl.push(i)
           } else {
             jumpUrl = i

diff --git a/src/service/utils/swf-manage.js b/src/service/utils/swf-manage.js
@@ -9,7 +9,7 @@ function getUrlFromSwf(data) {
   let pos = 0
 
   while(true){
-    let start = data.indexOf(Buffer.from("http://"), pos)
+    let start = data.indexOf(Buffer.from("http"), pos)
     let end = data.indexOf(Buffer.from(["0x00"]), start)
 
     if (start == -1 || end == -1){
@@ -18,7 +18,10 @@ function getUrlFromSwf(data) {
 
     let str = data.subarray(start, end).toString("utf8")
 
-    if(str.startsWith("http://sp.pf.mbga.jp") || str.startsWith("http://resource.mobamas.net")){
+    const regexp1 = new RegExp('^(?:http|https)://resource.mobamas.net');
+    const regexp2 = new RegExp('^(?:http|https)://sp.pf.mbga.jp');
+
+    if(regexp1.test(str) || regexp2.test(str)){
       result.push(str)
     }
 

diff --git a/src/service/utils/utils.js b/src/service/utils/utils.js
@@ -37,6 +37,7 @@ function replaceTextByDict({page, data, fromKey="from", toKey="to"}){
 function convertJumpUrl(jump_url) {
   let newJumpUrl = decodeURIComponent(jump_url)
   newJumpUrl = newJumpUrl.replaceAll("http://sp.pf.mbga.jp/12008305/?guid=ON&amp;url=http://mobamas.net", "")
+  newJumpUrl = newJumpUrl.replaceAll("https://sp.pf.mbga.jp/12008305/?guid=ON&amp;url=http://mobamas.net", "")
   newJumpUrl = newJumpUrl.split("/").slice(0, -1).join("/")
 
   return newJumpUrl