core-3nweb-client-lib 0.48.1 → 0.48.3

package/build/core/keyring/index.js

@@ -22,7 +22,6 @@ const id_to_email_map_1 = require("./id-to-email-map");
 const common_1 = require("./common");
 const async_cryptor_wrap_1 = require("../../lib-common/async-cryptor-wrap");
 const xsp_files_1 = require("xsp-files");
-const random = require("../../lib-common-on-node/random-node");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const common_2 = require("../asmail/delivery/common");
@@ -119,7 +118,7 @@ class Keyrings {
         }
         const { msgMasterKey, currentPair, msgCount } = await ck.getSendingPair(introPKeyFromServer);
         // prepare message encryptor
-        const nextNonce = await random.bytes(xsp_files_1.NONCE_LENGTH);
+        const nextNonce = await this.random(xsp_files_1.NONCE_LENGTH);
         const encryptor = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, this.workLabel, msgMasterKey, nextNonce);
         msgMasterKey.fill(0);
         return { encryptor, currentPair, msgCount };

package/build/core/storage/local/storage.js

@@ -19,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = void 0;
 const common_1 = require("../../../lib-client/xsp-fs/common");
 const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
-const random_node_1 = require("../../../lib-common-on-node/random-node");
 const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const obj_files_1 = require("./obj-files");
@@ -75,7 +74,7 @@ class LocalStorage {
         return obj.localStatus();
     }
     async generateNewObjId() {
-        const nonce = await (0, random_node_1.bytes)(ecma_nacl_1.secret_box.NONCE_LENGTH);
+        const nonce = await this.random(ecma_nacl_1.secret_box.NONCE_LENGTH);
         const id = buffer_utils_1.base64urlSafe.pack(nonce);
         if (this.nodes.reserveId(id)) {
             return id;

package/build/core/storage/synced/storage.js

@@ -21,7 +21,6 @@ const common_1 = require("../../../lib-client/xsp-fs/common");
 const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 const storage_owner_1 = require("../../../lib-client/3nstorage/storage-owner");
 const obj_files_1 = require("./obj-files");
-const random_node_1 = require("../../../lib-common-on-node/random-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const xsp_files_1 = require("xsp-files");
 const remote_events_1 = require("./remote-events");
@@ -160,7 +159,7 @@ class SyncedStore {
         return this.remoteStorage.getKeyDerivParams();
     }
     async generateNewObjId() {
-        const nonce = await (0, random_node_1.bytes)(xsp_files_1.NONCE_LENGTH);
+        const nonce = await this.random(xsp_files_1.NONCE_LENGTH);
         const id = buffer_utils_1.base64urlSafe.pack(nonce);
         if (this.nodes.reserveId(id)) {
             return id;

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

@@ -1,7 +1,6 @@
-import type { BufferEncodingOption, promises as fsFns, Mode, ObjectEncodingOptions, OpenMode, RmDirOptions, StatOptions, Stats } from 'fs';
+import type { BufferEncodingOption, Mode, ObjectEncodingOptions, RmDirOptions, Stats } from 'fs';
 export type { Stats } from 'fs';
 export type { FileException } from '../lib-common/exceptions/file';
-export type FileHandle = fsFns.FileHandle;
 /**
  * This should be injected at globalThis.platform.device_fs
  */
@@ -38,7 +37,7 @@ declare function readFile(path: string, options: {
 declare function readFile(path: string, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string | Buffer>;
 declare function writeFile(file: string, data: string | Uint8Array, options?: (ObjectEncodingOptions & {
     mode?: Mode;
-    flag?: OpenMode;
+    flag?: string;
     flush?: boolean;
 }) | BufferEncoding | null): Promise<void>;
 declare function appendFile(path: string, data: string | Uint8Array, options?: (ObjectEncodingOptions & {
@@ -47,15 +46,28 @@ declare function appendFile(path: string, data: string | Uint8Array, options?: (
 declare function mkdir(path: string, options?: {
     recursive?: boolean;
 }): Promise<unknown>;
-declare function open(path: string, flags?: string | number, mode?: Mode): Promise<FileHandle>;
+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 lstat(path: string, opts?: StatOptions): Promise<Stats>;
-declare function stat(path: string, opts?: StatOptions): Promise<Stats>;
+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 unlink(path: string): Promise<void>;
 declare function rename(oldPath: string, newPath: string): Promise<void>;
 declare function truncate(path: string, len?: number): Promise<void>;
+export interface FileHandle {
+    readonly fd: number;
+    stat(): Promise<Stats>;
+    close(): Promise<void>;
+    read(buffer: Uint8Array, offset?: number, length?: number, position?: number): Promise<{
+        bytesRead: number;
+    }>;
+    write(buffer: Uint8Array, offset?: number, length?: number, position?: number): Promise<{
+        bytesWritten: number;
+    }>;
+    sync(): Promise<void>;
+    truncate(len?: number): Promise<void>;
+}

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

@@ -7,9 +7,9 @@ export type { FileHandle, FileException, Stats } from '../injected-globals/platf
  */
 export declare const appendFile: (path: string, data: string | Uint8Array, options?: (import("fs").ObjectEncodingOptions & {
     flush?: boolean | undefined;
-}) | BufferEncoding | null) => Promise<void>, lstat: (path: string, opts?: import("fs").StatOptions) => Promise<import("fs").Stats>, mkdir: (path: string, options?: {
+}) | BufferEncoding | null) => Promise<void>, lstat: (path: string) => Promise<import("fs").Stats>, mkdir: (path: string, options?: {
     recursive?: boolean;
-}) => Promise<unknown>, open: (path: string, flags?: string | number, mode?: import("fs").Mode) => Promise<FileHandle>, readFile: {
+}) => Promise<unknown>, open: (path: string, flags?: string, mode?: import("fs").Mode) => Promise<FileHandle>, readFile: {
     (path: string, options?: {
         encoding?: null;
     } | null): Promise<Buffer>;
@@ -21,9 +21,9 @@ export declare const appendFile: (path: string, data: string | Uint8Array, optio
     (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, opts?: import("fs").StatOptions) => 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 & {
+}, 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 & {
     mode?: import("fs").Mode;
-    flag?: import("fs").OpenMode;
+    flag?: string;
     flush?: boolean;
 }) | BufferEncoding | null) => Promise<void>, copyFile: (src: string, dst: string, overwrite?: boolean, dstMode?: string) => Promise<void>;
 /**
@@ -80,12 +80,6 @@ export declare function getFolderContentSize(folderPath: string): Promise<number
  * @returns a promise, resolvable when all bytes were written to it.
  */
 export declare function write(fh: FileHandle, pos: number, buf: Buffer): Promise<void>;
-/**
- * @param fh is an open file handle in append mode.
- * @param buf is a buffer, from which all bytes should be written into the file.
- * @returns a promise, resolvable when all bytes were written to it.
- */
-export declare function append(fh: FileHandle, buf: Buffer): Promise<void>;
 /**
  * @param filePath
  * @param pos is a position in the file, from which writting should start

package/build/lib-common/async-fs-node.js

@@ -26,7 +26,6 @@ exports.existsFolder = existsFolder;
 exports.getFileSize = getFileSize;
 exports.getFolderContentSize = getFolderContentSize;
 exports.write = write;
-exports.append = append;
 exports.streamToExistingFile = streamToExistingFile;
 exports.read = read;
 exports.rmDirWithContent = rmDirWithContent;
@@ -191,18 +190,6 @@ async function write(fh, pos, buf) {
     }
     await fh.sync();
 }
-/**
- * @param fh is an open file handle in append mode.
- * @param buf is a buffer, from which all bytes should be written into the file.
- * @returns a promise, resolvable when all bytes were written to it.
- */
-async function append(fh, buf) {
-    let bytesWritten = 0;
-    while (bytesWritten < buf.length) {
-        const { bytesWritten: bNum } = await fh.write(buf, bytesWritten, buf.length - bytesWritten);
-        bytesWritten += bNum;
-    }
-}
 /**
  * @param filePath is a path to an existing file
  * @param pos is a position in the file, from which writing should start

package/build/lib-common/objs-on-disk/obj-version-file.js

@@ -86,6 +86,7 @@ class ObjVersionFile {
         await fs.writeFromBuf(fh, ofs, layoutBytes);
         await recordLayoutOffsetInV1(fh, ofs);
         await fh.truncate(ofs + layoutBytes.length);
+        await fh.sync();
     }
     withRWFile(action) {
         return this.writeProc.startOrChain(async () => {
@@ -188,7 +189,7 @@ class ObjVersionFile {
         }
         await this.withROFile(async (fd) => {
             const src = (0, fs_1.createReadStream)('', {
-                fd,
+                fd: fd,
                 autoClose: false,
                 start: chunkInfo.fileOfs,
                 end: chunkInfo.fileOfs + chunkInfo.len - 1
@@ -221,7 +222,7 @@ class ObjVersionFile {
                 if ((chunk.type === 'new-on-disk')
                     || (chunk.type === 'base-on-disk')) {
                     const src = (0, fs_1.createReadStream)('', {
-                        fd,
+                        fd: fd,
                         autoClose: false,
                         start: chunk.fileOfs,
                         end: chunk.fileOfs + chunk.len - 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.48.1",
+  "version": "0.48.3",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",