Create client function to setup server. [node_publish] (#476)

Author: shanedell

CMakeLists.txt

@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13)
 
 # Project information
 project(omega_edit
-        VERSION 0.9.29
+        VERSION 0.9.30
         DESCRIPTION "Apache open source library for building editors"
         HOMEPAGE_URL "https://github.com/ctc-oss/omega-edit"
         LANGUAGES C CXX)

src/rpc/client/ts/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "omega-edit",
-  "version": "0.9.29",
+  "version": "0.9.30",
   "description": "OmegaEdit gRPC Client TypeScript Types",
   "publisher": "ctc-oss",
   "repository": {

src/rpc/client/ts/package.json

@@ -23,4 +23,8 @@ declare module 'omega-edit/server' {
     omegaEditVersion: string
   ): Promise<number | undefined>
   export function stopServer(id: number | undefined): Promise<boolean>
+  export function setupServer(
+    rootPath: string,
+    omegaEditVersion: string
+  ): Promise<[string, string]>
 }

src/rpc/client/ts/src/server.d.ts

@@ -23,9 +23,6 @@ import * as unzip from 'unzip-stream'
 import * as os from 'os'
 import * as child_process from 'child_process'
 
-// const xdgAppPaths = XDGAppPaths({ name: 'omega_edit' })
-const wait_port = require('wait-port')
-
 class Artifact {
   name: string
   archive: string
@@ -45,6 +42,9 @@ class Artifact {
   }
 }
 
+// const xdgAppPaths = XDGAppPaths({ name: 'omega_edit' })
+const wait_port = require('wait-port')
+
 async function unzipFile(zipFilePath: string, extractPath: string) {
   return await new Promise((resolve, reject) => {
     let stream = fs
@@ -60,18 +60,16 @@ async function unzipFile(zipFilePath: string, extractPath: string) {
   })
 }
 
-export async function startServer(
+export async function setupServer(
   rootPath: string,
   omegaEditVersion: string
-): Promise<number | undefined> {
+): Promise<[string, string]> {
   const artifact = new Artifact(
     'omega-edit-scala-server',
     omegaEditVersion,
     'omega-edit-grpc-server'
   )
 
-  // let rootPath = xdgAppPaths.data()
-
   if (!fs.existsSync(rootPath)) {
     fs.mkdirSync(rootPath, { recursive: true })
   }
@@ -107,7 +105,16 @@ export async function startServer(
     )
   }
 
-  let server = child_process.spawn(artifact.scriptName, [], {
+  return [artifact.scriptName, scriptPath]
+}
+
+export async function startServer(
+  rootPath: string,
+  omegaEditVersion: string
+): Promise<number | undefined> {
+  const [scriptName, scriptPath] = await setupServer(rootPath, omegaEditVersion)
+
+  let server = child_process.spawn(scriptName, [], {
     cwd: `${scriptPath}/bin`,
     detached: true,
   })