libshv-js 3.6.3 → 3.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "3.6.3",
+  "version": "3.6.5",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/cpon.ts

@@ -674,7 +674,7 @@ class CponWriter {
     ctx: PackContext;
     nestLevel = 0;
 
-    constructor(private readonly indentString?: string) {
+    constructor(private readonly indentString?: string, private oneLiners: OneLiners = OneLiners.Yes) {
         this.ctx = new PackContext();
     }
 
@@ -949,6 +949,10 @@ class CponWriter {
     }
 
     private isOneLiner(value: MetaMap | ShvMap | IMap | List) {
+        if (this.oneLiners === OneLiners.No) {
+            return false;
+        }
+
         const keyThreshold = Array.isArray(value) ? 10 : 5;
 
         if (Array.isArray(value)) {
@@ -971,8 +975,13 @@ class CponWriter {
     }
 }
 
-const toCpon = (value: RpcValue, indentString?: string) => {
-    const wr = new CponWriter(indentString);
+export enum OneLiners {
+    Yes,
+    No,
+}
+
+const toCpon = (value: RpcValue, indentString?: string, oneLiners: OneLiners = OneLiners.Yes) => {
+    const wr = new CponWriter(indentString, oneLiners);
     wr.write(value);
     return new TextDecoder().decode(wr.ctx.buffer());
 };

package/src/ws-client.ts

@@ -104,8 +104,6 @@ class RpcError extends Error {
     }
 }
 
-class ProtocolError extends Error {}
-
 class InvalidRequest extends RpcError {}
 class MethodNotFound extends RpcError {}
 class InvalidParams extends RpcError {}
@@ -195,7 +193,8 @@ class WsClient {
                             return rpcMsg.value[RPC_MESSAGE_RESULT];
                         }
 
-                        return new ProtocolError('Response included neither result nor error');
+                        // If both result and error are missing, the result is implicitly Null.
+                        // https://silicon-heaven.github.io/shv-doc/rpcmessage.html#response
                     })());
                     // eslint-disable-next-line @typescript-eslint/no-array-delete
                     delete this.rpcHandlers[Number(requestId)];