Revert "write reponse to binary file"

This reverts commit a88ced4.
c3-e · Jun 27, 2023 · 1c9d690 · 1c9d690
1 parent a88ced4
commit 1c9d690
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 40 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -65,15 +65,7 @@ function readResponseFile(filePath) {
       throw new Error("Response file waiting to read for > 30s in main thread in sync-rpc.");
     }
   }
-  const contentPath = filePath.split(".")[0];
-  const content = fs.readFileSync(contentPath);
-  const res = JSON.parse(fs.readFileSync(filePath));
-  if (res.s == true) {
-    res.v.b = content.toString('utf-8');
-  } else {
-    res.v = JSON.parse(content.toString('utf-8'));
-  }
-  fs.unlinkSync(contentPath);
+  const res = fs.readFileSync(filePath);
   fs.unlinkSync(filePath);
   return res;
 }
@@ -116,11 +108,10 @@ function start() {
   if (!spawnSync) {
     throw new Error(
       'Sync-request requires node version 0.12 or later.  If you need to use it with an older version of node\n' +
-      'you can `npm install sync-request@2.2.0`, which was the last version to support older versions of node.'
+        'you can `npm install sync-request@2.2.0`, which was the last version to support older versions of node.'
     );
   }
   const port = findPort();
-  // '--inspect-brk',
   const p = spawn(process.execPath, [require.resolve('./worker'), port, ...FLAGS], {
     stdio: debugMode ? ['ignore', outputFile, errorFile] : 'inherit',
     windowsHide: true,
@@ -157,7 +148,7 @@ function findPort() {
   if (findPortResult.status !== 0) {
     throw new Error(
       findPortResult.stderr.toString() ||
-      'find port exited with code ' + findPortResult.status
+        'find port exited with code ' + findPortResult.status
     );
   }
   const portString = findPortResult.stdout.toString('utf8').trim();
@@ -181,8 +172,8 @@ function waitForAlive(port, delay) {
   if (response !== 'pong') {
     throw new Error(
       'Timed out waiting for sync-rpc server to start (it should respond with "pong" when sent "ping"):\n\n' +
-      '\n' +
-      response
+        '\n' +
+        response
     );
   }
 }
@@ -194,10 +185,10 @@ function nativeNC(port, input) {
   let res;
   try {
     res = spawnSync(`nc`, [host, port], {
-      input: input,
-      maxBuffer: Infinity,
-      windowsHide: true,
-    });
+        input: input,
+        maxBuffer: Infinity,
+        windowsHide: true,
+      });
   } catch (e) {
     debugMode && logToFile(`Received error: ${e.message}`);
   }
@@ -268,7 +259,7 @@ function sendMessage(input) {
     debugMode && logToFile(`${channel} received response #${index[0]} at client.`, localClientLog);
   }
   try {
-    return spawnSyncCall ? JSON.parse(res.stdout.toString('utf8')) : res;
+    return JSON.parse(spawnSyncCall ? res.stdout.toString('utf8') : res.toString('utf8'));
   } catch (ex) {
     if (spawnSyncCall) {
       if (res.error) {

diff --git a/lib/worker.js b/lib/worker.js
@@ -29,20 +29,6 @@ function writeResponseToFile(filePath, response) {
   debugMode && console.log(`Changed response file to readonly.`);
 }
 
-function writeResponseContent(filePath, content) {
-  const startTime = Date.now();
-  while (!responseFileReadyForWriting(filePath)) {
-    if (timeLimitExceeded(startTime)) {
-      fs.unlinkSync(filePath);
-      writeResponseContent(filePath, JSON.stringify({s: false, v: {code: -1, message: "Response content file waiting to write for > 30s in worker thread in sync-rpc."}}));
-    }
-  }
-  fs.writeFileSync(filePath, content, {encoding: 'binary'});
-  debugMode && console.log(`Written content to file.`);
-  fs.chmodSync(filePath, '444');
-  debugMode && console.log(`Changed content file to readonly.`);
-}
-
 const INIT = 1;
 const CALL = 0;
 const modules = [];
@@ -88,9 +74,6 @@ const server = net.createServer({allowHalfOpen: true}, c => {
         if (req.client != 'ready') {
           respond({s: true, v: response});
         } else {
-          const responseContentPath = req.responseFilePath.split('.')[0];
-          writeResponseContent(responseContentPath, response.b);
-          response.b = responseContentPath;
           writeResponseToFile(req.responseFilePath, JSON.stringify({s: true, v: response}));
         }
         debugMode && console.log(`sent response #${index[0]} to local client.`);
@@ -100,9 +83,7 @@ const server = net.createServer({allowHalfOpen: true}, c => {
         if (req.client != 'ready') {
           respond({s: false, v: {code: err.code, message: err.message}});
         } else {
-          const responseContentPath = req.responseFilePath.split('.')[0];
-          writeResponseContent(responseContentPath, JSON.stringify({code: err.code, message: err.message}));
-          writeResponseToFile(req.responseFilePath, JSON.stringify({s: false, v: responseContentPath}));
+          writeResponseToFile(req.responseFilePath, JSON.stringify({s: false, v: {code: err.code, message: err.message}}));
         }
       }
     );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sync-rpc",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "lib/index.js",
   "description": "Run asynchronous commands synchronously by putting them in a separate process",
   "keywords": [],