spotifyplus 0.1.3 → 0.1.4

package/dev.cjs

@@ -32,9 +32,7 @@ var import_node_util = require("node:util");
 var import_esbuild = require("esbuild");
 var execFile = (0, import_node_util.promisify)(import_node_child_process.execFile);
 var DEFAULT_PORT = 37846;
-var DEFAULT_MODULE_PACKAGE = "com.lenerd.spotifyplus";
-var START_BRIDGE_ACTION = "com.lenerd.spotifyplus.action.START_BRIDGE";
-var HOT_RELOAD_ACTION = "com.lenerd.spotifyplus.action.HOT_RELOAD";
+var RUNTIME_PORT = 37846;
 var WATCH_EXTENSIONS = /* @__PURE__ */ new Set([".js", ".jsx", ".ts", ".tsx", ".json"]);
 var IGNORED_DIRECTORIES = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", ".gradle"]);
 function parseArgs(argv) {
@@ -43,8 +41,6 @@ function parseArgs(argv) {
     adb: process.env.ADB || "adb",
     device: "",
     port: DEFAULT_PORT,
-    modulePackage: DEFAULT_MODULE_PACKAGE,
-    spotifyPackage: "com.spotify.music",
     debounceMs: 150,
     help: false
   };
@@ -72,12 +68,6 @@ function parseArgs(argv) {
       case "port":
         options.port = parseInteger(value, "--port");
         break;
-      case "module-package":
-        options.modulePackage = value;
-        break;
-      case "spotify-package":
-        options.spotifyPackage = value;
-        break;
       case "debounce-ms":
         options.debounceMs = parseInteger(value, "--debounce-ms");
         break;
@@ -101,9 +91,7 @@ function printHelp() {
 Options:
   --adb <path>              adb executable to use (default: adb)
   --device <serial>         adb device serial
-  --port <port>             local HTTP/reverse port (default: ${DEFAULT_PORT})
-  --module-package <name>   SpotifyPlus manager app package (default: ${DEFAULT_MODULE_PACKAGE})
-  --spotify-package <name>  Spotify app package, reserved for future checks (default: com.spotify.music)
+  --port <port>             local forwarded hot reload port (default: ${DEFAULT_PORT})
   --debounce-ms <ms>        file change debounce (default: 150)
   --help, -h                show this help
 `);
@@ -160,36 +148,6 @@ async function resolveEntryPath(scriptDir, manifest) {
   }
   throw new Error(`Could not resolve ${manifestEntry}. Set manifest.main to a real source file, or add src/index.tsx.`);
 }
-function createReloadServer(state, port) {
-  const server = import_node_http.default.createServer((request, response) => {
-    const url = new URL(request.url ?? "/", `http://127.0.0.1:${port}`);
-    const match = /^\/reload\/([^/]+)\/([^/]+)\.json$/.exec(url.pathname);
-    if (!match) {
-      response.writeHead(404, { "content-type": "application/json" });
-      response.end(JSON.stringify({ error: "not found" }));
-      return;
-    }
-    const [, buildId, scriptId] = match;
-    const current = state.currentBuild;
-    if (!current || current.buildId !== buildId || current.manifest.id !== decodeURIComponent(scriptId)) {
-      response.writeHead(404, { "content-type": "application/json" });
-      response.end(JSON.stringify({ error: "build not found" }));
-      return;
-    }
-    response.writeHead(200, {
-      "content-type": "application/json; charset=utf-8",
-      "cache-control": "no-store"
-    });
-    response.end(JSON.stringify(current));
-  });
-  return new Promise((resolve, reject) => {
-    server.once("error", reject);
-    server.listen(port, "127.0.0.1", () => {
-      server.off("error", reject);
-      resolve(server);
-    });
-  });
-}
 async function adb(options, args) {
   const fullArgs = [];
   if (options.device) fullArgs.push("-s", options.device);
@@ -204,37 +162,43 @@ async function adb(options, args) {
   }
 }
 async function notifyDevice(options, buildInfo) {
-  const encodedScriptId = encodeURIComponent(buildInfo.manifest.id);
-  const url = `http://127.0.0.1:${options.port}/reload/${buildInfo.buildId}/${encodedScriptId}.json`;
-  await adb(options, ["reverse", `tcp:${options.port}`, `tcp:${options.port}`]);
-  await adb(options, [
-    "shell",
-    "am",
-    "broadcast",
-    "-a",
-    START_BRIDGE_ACTION,
-    "-n",
-    `${options.modulePackage}/.manager.bridge.BridgeStartReceiver`
-  ]);
-  await adb(options, [
-    "shell",
-    "am",
-    "broadcast",
-    "-a",
-    HOT_RELOAD_ACTION,
-    "-n",
-    `${options.modulePackage}/.manager.bridge.HotReloadReceiver`,
-    "--es",
-    "scriptId",
-    buildInfo.manifest.id,
-    "--es",
-    "buildId",
-    buildInfo.buildId,
-    "--es",
-    "url",
-    url
-  ]);
-  return url;
+  await adb(options, ["forward", `tcp:${options.port}`, `tcp:${RUNTIME_PORT}`]);
+  await postHotReloadBundle(options.port, buildInfo);
+}
+function postHotReloadBundle(port, buildInfo) {
+  const body = JSON.stringify(buildInfo);
+  return new Promise((resolve, reject) => {
+    const request = import_node_http.default.request({
+      host: "127.0.0.1",
+      port,
+      path: "/hot-reload",
+      method: "POST",
+      headers: {
+        "content-type": "application/json; charset=utf-8",
+        "content-length": Buffer.byteLength(body)
+      }
+    }, (response) => {
+      response.setEncoding("utf8");
+      let responseBody = "";
+      response.on("data", (chunk) => {
+        responseBody += chunk;
+      });
+      response.on("end", () => {
+        if ((response.statusCode ?? 0) >= 200 && (response.statusCode ?? 0) < 300) {
+          resolve(responseBody);
+          return;
+        }
+        reject(new Error(`SpotifyPlus runtime returned HTTP ${response.statusCode}: ${responseBody}`));
+      });
+    });
+    request.on("error", (error) => {
+      reject(new Error(`Could not reach SpotifyPlus runtime on forwarded port ${port}. Open Spotify and wait for the script runtime to start, then try again. ${error.message}`));
+    });
+    request.setTimeout(5e3, () => {
+      request.destroy(new Error(`Timed out connecting to SpotifyPlus runtime on forwarded port ${port}`));
+    });
+    request.end(body);
+  });
 }
 function shouldWatchFile(filePath) {
   return WATCH_EXTENSIONS.has(import_node_path.default.extname(filePath).toLowerCase());
@@ -283,9 +247,8 @@ async function run() {
     printHelp();
     return;
   }
-  const state = { currentBuild: null };
-  const server = await createReloadServer(state, options.port);
-  console.log(`[spotifyplus] dev server listening on http://127.0.0.1:${options.port}`);
+  await adb(options, ["forward", `tcp:${options.port}`, `tcp:${RUNTIME_PORT}`]);
+  console.log(`[spotifyplus] forwarding http://127.0.0.1:${options.port} to the SpotifyPlus runtime`);
   console.log(`[spotifyplus] watching ${options.scriptDir}`);
   let buildInFlight = false;
   let pendingBuild = false;
@@ -297,10 +260,8 @@ async function run() {
     buildInFlight = true;
     try {
       const buildInfo = await bundleScript(options.scriptDir);
-      state.currentBuild = buildInfo;
-      const url = await notifyDevice(options, buildInfo);
+      await notifyDevice(options, buildInfo);
       console.log(`[spotifyplus] reloaded ${buildInfo.manifest.id} (${buildInfo.buildId})`);
-      console.log(`[spotifyplus] served ${url}`);
     } catch (error) {
       console.error(`[spotifyplus] ${reason} failed`);
       console.error(error?.message ?? error);
@@ -324,7 +285,6 @@ async function run() {
   await rebuild("initial build");
   const close = () => {
     closeWatchers();
-    server.close();
     process.exit(0);
   };
   process.on("SIGINT", close);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "spotifyplus",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "type": "commonjs",
     "main": "./index.cjs",
     "types": "./index.d.ts",