@deltachat/stdio-rpc-server 1.137.4 → 1.138.5

package/{Readme.md → README.md}

@@ -27,7 +27,7 @@ For a more complete example refer to https://github.com/deltachat-bot/echo/pull/
 
 ## How to use on an unsupported platform
 
-<!-- todo instructions, will uses an env var for pointing to `deltachat-rpx-server` binary -->
+<!-- todo instructions, will uses an env var for pointing to `deltachat-rpc-server` binary -->
 
 <!-- todo copy parts from https://github.com/deltachat/deltachat-desktop/blob/7045c6f549e4b9d5caa0709d5bd314bbd9fd53db/docs/UPDATE_CORE.md -->
 
@@ -61,7 +61,7 @@ When you import this package it searches for the rpc server in the following loc
 - Then pass it as an artifact to the last CI action that publishes the main package.
 - upload all packages from `deltachat-rpc-server/npm-package/platform_package`.
 - then publish `deltachat-rpc-server/npm-package`,
-  - this will run `update_optional_dependencie_and_version.js` (in the `prepack` script),
+  - this will run `update_optional_dependencies_and_version.js` (in the `prepack` script),
     which puts all platform packages into `optionalDependencies` and updates the `version` in `package.json`
 
 ## How to build a version you can use localy on your host machine for development

package/index.js

@@ -65,31 +65,15 @@ export async function getRPCServerPath(
 
   // 2. check if it can be found in PATH
   if (!process.env[SKIP_SEARCH_IN_PATH] && !skipSearchInPath) {
-    const path_dirs = process.env["PATH"].split(/:|;/);
-    // check cargo dir first
-    const cargo_dirs = path_dirs.filter((p) => p.endsWith(".cargo/bin"));
-    const findExecutable = async (directory) => {
-      const files = await readdir(directory);
-      const file = files.find((p) =>
-        basename(p).includes(PATH_EXECUTABLE_NAME)
-      );
-      if (file) {
-        return join(directory, file);
-      } else {
-        throw null;
-      }
-    };
-    const executable_search = // TODO make code simpler to read
-      (await Promise.allSettled(cargo_dirs.map(findExecutable))).find(
-        ({ status }) => status === "fulfilled"
-      ) ||
-      (await Promise.allSettled(path_dirs.map(findExecutable))).find(
-        ({ status }) => status === "fulfilled"
-      );
-    // TODO maybe we could the system do this stuff automatically
-    // by just trying to execute it and then use "which" (unix) or "where" (windows) to get the path to the executable
-    if (executable_search.status === "fulfilled") {
-      const executable = executable_search.value;
+    const exec = promisify(execFile);
+
+    const { stdout: executable } =
+      os.platform() !== "win32"
+        ? await exec("command", ["-v", PATH_EXECUTABLE_NAME])
+        : await exec("where", [PATH_EXECUTABLE_NAME]);
+
+    // by just trying to execute it and then use "command -v deltachat-rpc-server" (unix) or "where deltachat-rpc-server" (windows) to get the path to the executable
+    if (executable.length > 1) {
       // test if it is the right version
       try {
         // for some unknown reason it is in stderr and not in stdout
@@ -153,7 +137,7 @@ export async function startDeltaChat(directory, options) {
   };
 
   //@ts-expect-error
-  dc.pathToServerBinary = pathToServerBinary
+  dc.pathToServerBinary = pathToServerBinary;
 
   return dc;
 }

package/package.json

@@ -1,26 +1,30 @@
 {
-    "type": "module",
-    "name": "@deltachat/stdio-rpc-server",
-    "version": "1.137.4",
     "license": "MPL-2.0",
     "main": "index.js",
-    "types": "index.d.ts",
-    "scripts": {
-        "prepack": "node scripts/update_optional_dependencies_and_version.js"
-    },
+    "name": "@deltachat/stdio-rpc-server",
     "optionalDependencies": {
-        "@deltachat/stdio-rpc-server-darwin-arm64": "1.137.4",
-        "@deltachat/stdio-rpc-server-android-arm64": "1.137.4",
-        "@deltachat/stdio-rpc-server-linux-arm64": "1.137.4",
-        "@deltachat/stdio-rpc-server-linux-arm": "1.137.4",
-        "@deltachat/stdio-rpc-server-android-arm": "1.137.4",
-        "@deltachat/stdio-rpc-server-win32-i32": "1.137.4",
-        "@deltachat/stdio-rpc-server-linux-i32": "1.137.4",
-        "@deltachat/stdio-rpc-server-darwin-x64": "1.137.4",
-        "@deltachat/stdio-rpc-server-win32-x64": "1.137.4",
-        "@deltachat/stdio-rpc-server-linux-x64": "1.137.4"
+        "@deltachat/stdio-rpc-server-darwin-arm64": "1.138.5",
+        "@deltachat/stdio-rpc-server-android-arm64": "1.138.5",
+        "@deltachat/stdio-rpc-server-linux-arm64": "1.138.5",
+        "@deltachat/stdio-rpc-server-linux-arm": "1.138.5",
+        "@deltachat/stdio-rpc-server-android-arm": "1.138.5",
+        "@deltachat/stdio-rpc-server-win32-i32": "1.138.5",
+        "@deltachat/stdio-rpc-server-linux-i32": "1.138.5",
+        "@deltachat/stdio-rpc-server-darwin-x64": "1.138.5",
+        "@deltachat/stdio-rpc-server-win32-x64": "1.138.5",
+        "@deltachat/stdio-rpc-server-linux-x64": "1.138.5"
     },
     "peerDependencies": {
         "@deltachat/jsonrpc-client": "*"
-    }
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/deltachat/deltachat-core-rust.git"
+    },
+    "scripts": {
+        "prepack": "node scripts/update_optional_dependencies_and_version.js"
+    },
+    "type": "module",
+    "types": "index.d.ts",
+    "version": "1.138.5"
 }