✨ [rmcn] mdnsでサービスを公開するように

Author: ci7lus

package.json

@@ -82,6 +82,7 @@
     "@types/react-dom": "^18.0.6",
     "axios": "^1.0.0-alpha.1",
     "axios-retry": "^3.3.1",
+    "bonjour-service": "^1.0.14",
     "clsx": "^1.2.1",
     "dayjs": "^1.11.3",
     "discord-rpc": "^4.0.1",

src/miraktest-rmcn/Main.ts

@@ -1,6 +1,8 @@
 import { Server } from "net"
 import { networkInterfaces } from "os"
 import Router from "@koa/router"
+import Bonjour from "bonjour-service"
+import type { Service as BonjourServcie } from "bonjour-service"
 import { eventmit } from "eventmit"
 import getPort from "get-port"
 import Koa from "koa"
@@ -20,20 +22,39 @@ import {
 
 export const Main: InitPlugin["main"] = async ({ appInfo, packages }) => {
   let server: Server | null = null
+  let bonjour: Bonjour | null = null
   return {
     ...RMCN_META,
     setup: async () => {
+      let service: BonjourServcie | null = null
       const port = await getPort({ port: 10171 }) // TODO: Configurable
+      try {
+        bonjour = new Bonjour()
+        service = bonjour.publish({
+          name: "miraktest-rmcn",
+          host: "miraktest-rmcn.local",
+          type: "http",
+          port,
+          txt: appInfo,
+        })
+        console.info("[rmcn] Published Bonjour service:", service)
+      } catch (error) {
+        console.warn(error, "[rmcn] Bonjour not supported")
+      }
       packages.Electron.ipcMain.handle(RMCN_GET_PORT, () => {
         let ip = "unknown"
-        try {
-          const addr = Object.values(networkInterfaces())
-            .flat()
-            .find((i) => i && i.family === "IPv4" && !i.internal)?.address
-          if (addr) {
-            ip = addr
-          }
-        } catch {}
+        if (service && service.host) {
+          ip = service.host
+        } else {
+          try {
+            const addr = Object.values(networkInterfaces())
+              .flat()
+              .find((i) => i && i.family === "IPv4" && !i.internal)?.address
+            if (addr) {
+              ip = addr
+            }
+          } catch {}
+        }
         return `${ip}:${port}`
       })
       type ContentPlayerState = {
@@ -160,6 +181,9 @@ export const Main: InitPlugin["main"] = async ({ appInfo, packages }) => {
       if (server) {
         server.close()
       }
+      if (bonjour) {
+        bonjour.destroy()
+      }
       packages.Electron.ipcMain.removeHandler(RMCN_GET_PORT)
       packages.Electron.ipcMain.removeHandler(RMCN_SET_CP_STATE)
       packages.Electron.ipcMain.removeHandler(RMCN_SET_SERVICES)

src/miraktest-rmcn/constants.ts

@@ -4,7 +4,7 @@ export const RMCN_META = {
   id: RMCN_ID,
   name: "rmcn",
   author: "ci7lus",
-  version: "0.0.3",
+  version: "0.1.0",
   description: "リモコン用のAPIを生やすプラグイン",
   authorUrl: "https://github.com/ci7lus",
   url: "https://github.com/ci7lus/miraktest-plugins/tree/master/src/miraktest-rmcn",

yarn.lock

@@ -1343,6 +1343,11 @@
     methods "^1.1.2"
     path-to-regexp "^6.2.1"
 
+"@leichtgewicht/ip-codec@^2.0.1":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
+  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
+
 "@maxim_mazurok/gapi.client.drive@latest":
   version "3.0.20220731"
   resolved "https://registry.yarnpkg.com/@maxim_mazurok/gapi.client.drive/-/gapi.client.drive-3.0.20220731.tgz#1b8523aaefebcba41c87b9392e50d47eed3a7e63"
@@ -2159,6 +2164,11 @@ aribb24.js@1.9.16:
   resolved "https://registry.yarnpkg.com/aribb24.js/-/aribb24.js-1.9.16.tgz#b024c37debf9fc7acc17dcaad3eb7065de97517a"
   integrity sha512-HooKo7kYsfMzAG7QTZG+p1hhiVLB1I+SAkYZx5xP/wTVGh/3V6qVJ3RKS1rxyzlh4PRVQoMwAdkWqqS5OqaNNA==
 
+array-flatten@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
 array-includes@^3.1.4:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
@@ -2363,6 +2373,16 @@ bn.js@^5.0.0, bn.js@^5.1.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
+bonjour-service@^1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7"
+  integrity sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==
+  dependencies:
+    array-flatten "^2.1.2"
+    dns-equal "^1.0.0"
+    fast-deep-equal "^3.1.3"
+    multicast-dns "^7.2.5"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3231,6 +3251,18 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
+
+dns-packet@^5.2.2:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
+  dependencies:
+    "@leichtgewicht/ip-codec" "^2.0.1"
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -5427,6 +5459,14 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+multicast-dns@^7.2.5:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
+  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
+  dependencies:
+    dns-packet "^5.2.2"
+    thunky "^1.0.2"
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -7006,6 +7046,11 @@ through@^2.3.6, through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
+thunky@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
+
 title-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"