core-3nweb-client-lib 0.48.3 → 0.48.5

package/build/core/asmail/asmail-cap-ipc.js

@@ -58,7 +58,7 @@ function exposeASMailCAP(cap, expServices) {
                 removeMsg: removeMsg.wrapService(box.removeMsg),
                 subscribe: inboxSubscribe.wrapService(box.subscribe, expServices)
             },
-            config: exposeCofigCAP(cap.config)
+            config: exposeConfigCAP(cap.config)
         };
     }
 }
@@ -597,7 +597,7 @@ var observeDelivery;
     observeDelivery.makeCaller = makeCaller;
 })(observeDelivery || (observeDelivery = {}));
 Object.freeze(observeDelivery);
-function exposeCofigCAP(cap) {
+function exposeConfigCAP(cap) {
     return {
         getOnServer: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getOnServer'),
         setOnServer: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'setOnServer')

package/build/injected-globals/platform-devfs.d.ts

@@ -1,4 +1,4 @@
-import type { BufferEncodingOption, Mode, ObjectEncodingOptions, RmDirOptions, Stats } from 'fs';
+import type { Mode, ObjectEncodingOptions, Stats } from 'fs';
 export type { Stats } from 'fs';
 export type { FileException } from '../lib-common/exceptions/file';
 /**
@@ -47,14 +47,14 @@ declare function mkdir(path: string, options?: {
     recursive?: boolean;
 }): Promise<unknown>;
 declare function open(path: string, flags?: string, mode?: Mode): Promise<FileHandle>;
-declare function symlink(target: string, path: string, type?: string | null): Promise<void>;
-declare function readlink(path: string, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
-declare function readlink(path: string, options: BufferEncodingOption): Promise<Buffer>;
-declare function readlink(path: string, options?: ObjectEncodingOptions | string | null): Promise<string | Buffer>;
+declare function symlink(target: string, path: string): Promise<void>;
+declare function readlink(path: string): Promise<string>;
 declare function lstat(path: string): Promise<Stats>;
 declare function stat(path: string): Promise<Stats>;
 declare function readdir(path: string): Promise<string[]>;
-declare function rmdir(path: string, options?: RmDirOptions): Promise<void>;
+declare function rmdir(path: string, options?: {
+    recursive?: boolean;
+}): Promise<void>;
 declare function unlink(path: string): Promise<void>;
 declare function rename(oldPath: string, newPath: string): Promise<void>;
 declare function truncate(path: string, len?: number): Promise<void>;

package/build/lib-client/xsp-fs/xsp-payload-v2.js

@@ -95,12 +95,9 @@ class ReadonlyPayloadV2 {
         if (start === end) {
             return undefined;
         }
-        const startSecInd = this.contentSections
-            .findIndex(s => (s.ofs <= start));
-        const endSecInd = this.contentSections
-            .findIndex(s => ((s.ofs + s.len) >= end));
-        (0, assert_1.assert)((startSecInd >= 0) && (endSecInd >= 0) &&
-            (startSecInd <= endSecInd));
+        const startSecInd = this.contentSections.findIndex(s => (s.ofs <= start));
+        const endSecInd = this.contentSections.findIndex(s => ((s.ofs + s.len) >= end));
+        (0, assert_1.assert)((startSecInd >= 0) && (endSecInd >= 0) && (startSecInd <= endSecInd));
         return await this.syncProc.startOrChain((startSecInd === endSecInd) ?
             async () => {
                 const s = this.contentSections[startSecInd];
@@ -790,8 +787,21 @@ function payloadLayoutException(msg, cause) {
 }
 async function sureReadOfBytesFrom(src, ofs, len) {
     const bytes = await src.readAt(ofs, len);
-    (0, assert_1.assert)(!!bytes && (bytes.length === len));
-    return bytes;
+    (0, assert_1.assert)(!!bytes);
+    if (bytes.length === len) {
+        return bytes;
+    }
+    // somehow, on Android src.readAt(ofs, len) may produce a thing that is shorter than len, hence, loop below
+    len -= bytes.length;
+    ofs += bytes.length;
+    const chunks = [bytes];
+    while (len > 0) {
+        const chunk = await src.readAt(ofs, len);
+        (0, assert_1.assert)(!!chunk);
+        len -= chunk.length;
+        ofs += chunk.length;
+    }
+    return (0, buffer_utils_1.joinByteArrs)(chunks);
 }
 function noop() { }
 // XXX we may add smaller bytes for packing section info: there is enough values

package/build/lib-common/async-fs-node.d.ts

@@ -17,11 +17,9 @@ export declare const appendFile: (path: string, data: string | Uint8Array, optio
         encoding: BufferEncoding;
     } | BufferEncoding): Promise<string>;
     (path: string, options?: import("fs").ObjectEncodingOptions | BufferEncoding | null): Promise<string | Buffer>;
-}, readdir: (path: string) => Promise<string[]>, readlink: {
-    (path: string, options?: import("fs").ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
-    (path: string, options: import("fs").BufferEncodingOption): Promise<Buffer>;
-    (path: string, options?: import("fs").ObjectEncodingOptions | string | null): Promise<string | Buffer>;
-}, rename: (oldPath: string, newPath: string) => Promise<void>, rmdir: (path: string, options?: import("fs").RmDirOptions) => Promise<void>, stat: (path: string) => Promise<import("fs").Stats>, symlink: (target: string, path: string, type?: string | null) => Promise<void>, truncate: (path: string, len?: number) => Promise<void>, unlink: (path: string) => Promise<void>, writeFile: (file: string, data: string | Uint8Array, options?: (import("fs").ObjectEncodingOptions & {
+}, readdir: (path: string) => Promise<string[]>, readlink: (path: string) => Promise<string>, rename: (oldPath: string, newPath: string) => Promise<void>, rmdir: (path: string, options?: {
+    recursive?: boolean;
+}) => Promise<void>, stat: (path: string) => Promise<import("fs").Stats>, symlink: (target: string, path: string) => Promise<void>, truncate: (path: string, len?: number) => Promise<void>, unlink: (path: string) => Promise<void>, writeFile: (file: string, data: string | Uint8Array, options?: (import("fs").ObjectEncodingOptions & {
     mode?: import("fs").Mode;
     flag?: string;
     flush?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.48.3",
+  "version": "0.48.5",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -36,7 +36,7 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "ecma-nacl-cryptors": "^1.0.1",
-    "protobufjs": "^7.0.1",
+    "protobufjs": "^7.5.5",
     "punycode": "^2.1.1",
     "rxjs": "^7.5.7",
     "ws": "^8.18.3",