core-3nweb-client-lib 0.29.0 → 0.29.2

package/build/core/asmail/inbox/index.js

@@ -30,7 +30,7 @@ const file_1 = require("../../../lib-common/exceptions/file");
 const msg_downloader_1 = require("./msg-downloader");
 const cached_msgs_1 = require("./cached-msgs");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
-const fs_sync_utils_1 = require("../../../lib-client/fs-sync-utils");
+const fs_sync_utils_1 = require("../../../lib-client/fs-utils/fs-sync-utils");
 const MSG_INDEX_FOLDER = 'msg-index';
 /**
  * Instance of this class represents inbox-on-mail-server.

package/build/core/asmail/inbox/msg-indexing/sql-indexing.js

@@ -20,7 +20,7 @@ exports.makeSqliteBasedIndexedRecords = void 0;
 const timed_cache_1 = require("../../../../lib-common/timed-cache");
 const lib_sqlite_on_3nstorage_1 = require("../../../../lib-sqlite-on-3nstorage");
 const file_1 = require("../../../../lib-common/exceptions/file");
-const fs_sync_utils_1 = require("../../../../lib-client/fs-sync-utils");
+const fs_sync_utils_1 = require("../../../../lib-client/fs-utils/fs-sync-utils");
 const operators_1 = require("rxjs/operators");
 const tab = new lib_sqlite_on_3nstorage_1.TableColumnsAndParams('inbox_index', {
     msgId: ['msg_id', 'TEXT PRIMARY KEY'],

package/build/core/asmail/index.js

@@ -23,7 +23,7 @@ const keyring_1 = require("./keyring");
 const config_1 = require("./config");
 const delivery_1 = require("./delivery");
 const sending_params_1 = require("./sending-params");
-const fs_sync_utils_1 = require("../../lib-client/fs-sync-utils");
+const fs_sync_utils_1 = require("../../lib-client/fs-utils/fs-sync-utils");
 const KEYRING_DATA_FOLDER = 'keyring';
 const INBOX_DATA_FOLDER = 'inbox';
 const CONFIG_DATA_FOLDER = 'config';

package/build/core/storage/index.js

@@ -21,7 +21,7 @@ const fs_1 = require("../../lib-client/3nstorage/xsp-fs/fs");
 const storage_1 = require("./synced/storage");
 const storage_2 = require("./local/storage");
 const file_1 = require("../../lib-common/exceptions/file");
-const fs_collection_1 = require("../../lib-client/fs-collection");
+const fs_collection_1 = require("../../lib-client/fs-utils/fs-collection");
 const async_iter_1 = require("../../lib-common/async-iter");
 const path_1 = require("path");
 const fs = require("../../lib-common/async-fs-node");
@@ -457,12 +457,13 @@ Object.freeze(PerAppStorage.prototype);
 Object.freeze(PerAppStorage);
 async function applyPolicyToFSItem(fsi, policy, path) {
     if (fsi.isFolder) {
-        const item = await applyPolicyToFS(fsi.item, policy, path);
-        return { isFolder: true, item };
+        return {
+            isFolder: true,
+            item: await applyPolicyToFS(fsi.item, policy, path)
+        };
     }
     else if (fsi.isCollection) {
-        const item = await applyPolicyToFSCollection(fsi.item, policy, path);
-        return { isCollection: true, item };
+        return await applyPolicyToFSCollection(fsi.item, policy, path);
     }
     else {
         throw new Error(`Given fs item is neither folder, nor fs collection`);
@@ -482,7 +483,7 @@ async function applyPolicyToFS(fs, policy, path) {
 async function applyPolicyToFSCollection(c, policy, path) {
     if (path === undefined) {
         if (policy === 'w') {
-            return (0, fs_collection_1.readonlyWrapFSCollection)(c);
+            return { isCollection: true, item: (0, fs_collection_1.readonlyWrapFSCollection)(c) };
         }
         else {
             const roFSs = (0, fs_collection_1.makeFSCollection)();
@@ -494,13 +495,13 @@ async function applyPolicyToFSCollection(c, policy, path) {
                 v[1].item = await v[1].item.readonlySubRoot('/');
                 await roFSs.set(v[0], v[1]);
             }
-            return (0, fs_collection_1.readonlyWrapFSCollection)(roFSs);
+            return { isCollection: true, item: (0, fs_collection_1.readonlyWrapFSCollection)(roFSs) };
         }
     }
     if (path.startsWith('/')) {
         path = path.substring(1);
     }
-    const nameAndItem = await (0, async_iter_1.asyncFind)(await c.entries(), async (v) => path.startsWith(v[0]));
+    const nameAndItem = await (0, async_iter_1.asyncFind)(await c.entries(), v => path.startsWith(v[0]));
     if (!nameAndItem) {
         throw (0, file_1.makeFileException)('notFound', path);
     }
@@ -510,14 +511,47 @@ async function applyPolicyToFSCollection(c, policy, path) {
     if (!item.isFolder || !fs || !fs.listFolder) {
         throw new Error('Expected item to be a folder object');
     }
-    if (policy === 'w') {
-        return ((path === undefined) ? fs : fs.writableSubRoot(path));
+    if (typeof path !== 'string') {
+        return {
+            isFolder: true,
+            item: await ((policy === 'w') ? fs : fs.readonlySubRoot('/'))
+        };
     }
-    else {
-        if (path === undefined) {
-            path = '/';
+    const atPath = await fs.stat(path);
+    if (atPath.isFolder) {
+        return {
+            isFolder: true,
+            item: await ((policy === 'w') ?
+                fs.writableSubRoot(path) : fs.readonlySubRoot(path))
+        };
+    }
+    else if (atPath.isFile) {
+        return {
+            isFile: true,
+            item: await ((policy === 'w') ?
+                fs.writableFile(path) : fs.readonlyFile(path))
+        };
+    }
+    else if (atPath.isLink) {
+        const link = await fs.readLink(path);
+        if (link.isFolder) {
+            return {
+                isFolder: true,
+                item: await link.target()
+            };
         }
-        return fs.readonlySubRoot(path);
+        else if (link.isFile) {
+            return {
+                isFile: true,
+                item: await link.target()
+            };
+        }
+        else {
+            throw (0, file_1.makeFileException)('ioError', path, `Unknown type of linked fs item`);
+        }
+    }
+    else {
+        throw (0, file_1.makeFileException)('ioError', path, `Unknown type of fs item`);
     }
 }
 Object.freeze(exports);

package/build/core/storage/system-folders/index.js

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sysFilesOnDevice = exports.userFilesOnDevice = exports.initSysFolders = exports.sysFolders = void 0;
-const fs_collection_1 = require("../../../lib-client/fs-collection");
+const fs_collection_1 = require("../../../lib-client/fs-utils/fs-collection");
 const lib_index_1 = require("../../../lib-index");
 exports.sysFolders = {
     appData: 'Apps Data',

package/build/lib-client/3nstorage/xsp-fs/attrs.js

@@ -198,7 +198,7 @@ var extAttrs;
     }
     extAttrs.readNamedAttr = readNamedAttr;
     function parseTypeByte(b) {
-        const type = ((b & 0b11111000) >> 5);
+        const type = ((b & 0b11111000) >> 3);
         const nameLen = ((b & 0b00000100) >> 2) + 1;
         const contentLen = (b & 0b00000011) + 1;
         return { type, contentLen, nameLen };

package/build/lib-client/3nstorage/xsp-fs/file-node.d.ts

@@ -3,7 +3,7 @@
  * reliance set.
  */
 import { NodeInFS } from './node-in-fs';
-import { LinkParameters } from '../../files';
+import { LinkParameters } from '../../fs-utils/files';
 import { Storage, AsyncSBoxCryptor } from './common';
 import { Subscribe, ObjSource } from 'xsp-files';
 import { CommonAttrs, XAttrs } from './attrs';

package/build/lib-client/3nstorage/xsp-fs/file.d.ts

@@ -1,4 +1,4 @@
-import { Linkable, LinkParameters } from '../../files';
+import { Linkable, LinkParameters } from '../../fs-utils/files';
 import { FileNode, FileLinkParams } from './file-node';
 import { Storage } from './common';
 declare type Stats = web3n.files.Stats;

package/build/lib-client/3nstorage/xsp-fs/file.js

@@ -22,7 +22,7 @@ exports.FileObject = void 0;
  * reliance set.
  */
 const file_1 = require("../../../lib-common/exceptions/file");
-const files_1 = require("../../files");
+const files_1 = require("../../fs-utils/files");
 const file_node_1 = require("./file-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const pipe_1 = require("../../../lib-common/byte-streaming/pipe");

package/build/lib-client/3nstorage/xsp-fs/folder-node.d.ts

@@ -2,7 +2,7 @@ import { Storage, NodeType } from './common';
 import { NodeInFS } from './node-in-fs';
 import { FileNode } from './file-node';
 import { LinkNode } from './link-node';
-import { LinkParameters } from '../../files';
+import { LinkParameters } from '../../fs-utils/files';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { CommonAttrs, XAttrs } from './attrs';
 import { NodePersistance } from './node-persistence';

package/build/lib-client/3nstorage/xsp-fs/fs.d.ts

@@ -1,7 +1,7 @@
 import { FolderNode, FolderLinkParams, FolderInJSON } from './folder-node';
 import { FileNode } from './file-node';
 import { Storage } from './common';
-import { LinkParameters } from '../../files';
+import { LinkParameters } from '../../fs-utils/files';
 import { NodeInFS } from './node-in-fs';
 declare type Stats = web3n.files.Stats;
 declare type FS = web3n.files.FS;

package/build/lib-client/3nstorage/xsp-fs/fs.js

@@ -25,8 +25,8 @@ const file_1 = require("../../../lib-common/exceptions/file");
 const folder_node_1 = require("./folder-node");
 const file_2 = require("./file");
 const common_1 = require("./common");
-const files_1 = require("../../files");
-const files_select_1 = require("../../files-select");
+const files_1 = require("../../fs-utils/files");
+const files_select_1 = require("../../fs-utils/files-select");
 const path_1 = require("path");
 const pipe_1 = require("../../../lib-common/byte-streaming/pipe");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");

package/build/lib-client/3nstorage/xsp-fs/link-node.d.ts

@@ -3,7 +3,7 @@
  * reliance set.
  */
 import { NodeInFS } from './node-in-fs';
-import { LinkParameters } from '../../files';
+import { LinkParameters } from '../../fs-utils/files';
 import { Storage, AsyncSBoxCryptor } from './common';
 import { ObjSource, Subscribe } from 'xsp-files';
 import { CommonAttrs, XAttrs } from './attrs';

package/build/lib-client/{fs-collection.js → fs-utils/fs-collection.js}

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFSCollection = exports.readonlyWrapFSCollection = void 0;
 const rxjs_1 = require("rxjs");
-const utils_for_observables_1 = require("../lib-common/utils-for-observables");
+const utils_for_observables_1 = require("../../lib-common/utils-for-observables");
 class FSItemsCollection {
     constructor() {
         this.items = new Map();

package/build/lib-client/{fs-sync-utils.js → fs-utils/fs-sync-utils.js}

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.observableFromTreeEvents = exports.uploadFolderChangesIfAny = exports.getOrMakeAndUploadFolderIn = exports.getRemoteFolderChanges = void 0;
 const rxjs_1 = require("rxjs");
-const exceptions_1 = require("./3nstorage/exceptions");
+const exceptions_1 = require("../3nstorage/exceptions");
 async function getRemoteFolderChanges(fs, forceServerCheck = false) {
     if (forceServerCheck) {
         await fs.v.sync.updateStatusInfo('');

package/build/lib-client/local-files/device-fs.d.ts

@@ -1,4 +1,4 @@
-import { LinkParameters, Linkable } from '../files';
+import { LinkParameters, Linkable } from '../fs-utils/files';
 declare type Stats = web3n.files.Stats;
 declare type FS = web3n.files.FS;
 declare type WritableFS = web3n.files.WritableFS;

package/build/lib-client/local-files/device-fs.js

@@ -22,8 +22,8 @@ const pathMod = require("path");
 const fs_1 = require("fs");
 const file_1 = require("../../lib-common/exceptions/file");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
-const files_1 = require("../files");
-const files_select_1 = require("../files-select");
+const files_1 = require("../fs-utils/files");
+const files_select_1 = require("../fs-utils/files-select");
 const buffer_utils_2 = require("../../lib-common/buffer-utils");
 const pipe_1 = require("../../lib-common/byte-streaming/pipe");
 const dev_file_src_1 = require("./dev-file-src");

package/build/lib-common/async-iter.d.ts

@@ -1,2 +1,2 @@
 export declare function asyncIteration<T>(iter: web3n.AsyncIterator<T>, func: (v: T) => Promise<void>): Promise<void>;
-export declare function asyncFind<T>(iter: web3n.AsyncIterator<T>, predicate: (v: T) => Promise<boolean>): Promise<T | undefined>;
+export declare function asyncFind<T>(iter: web3n.AsyncIterator<T>, predicate: (v: T) => boolean | Promise<boolean>): Promise<T | undefined>;

package/build/lib-common/async-iter.js

@@ -34,7 +34,8 @@ async function asyncFind(iter, predicate) {
         if (item.done) {
             return;
         }
-        if (await predicate(item.value)) {
+        const check = predicate(item.value);
+        if ((typeof check === 'boolean') ? check : await check) {
             return item.value;
         }
     } while (true);

package/package.json

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