spec-3nweb-server 1.3.8 → 1.5.0

package/build/3nstorage/3nstorage-app.js

@@ -44,13 +44,13 @@ function setupStaticEntryRoute(app) {
 }
 function makeApp(dataFolder, domain, midAuthorizer) {
     const app = new app_1.AppWithWSs();
-    const ownersSessions = sessions_1.makeSessionFactory(20 * 60);
-    const sharingSessions = sessions_1.makeSessionFactory(20 * 60);
-    const users = users_1.makeFactory(dataFolder);
+    const ownersSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
+    const sharingSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
+    const users = (0, users_1.makeFactory)(dataFolder);
     setupStaticEntryRoute(app.http);
     app.use(PATHS.owner, owners.makeApp(domain, ownersSessions, users, midAuthorizer));
     app.http.use(PATHS.shared, sharing.makeApp(sharingSessions, users));
-    app.http.use(error_handler_1.makeErrHandler((err, req) => {
+    app.http.use((0, error_handler_1.makeErrHandler)((err, req) => {
         if (typeof err.status !== 'number') {
             console.error(`\n --- Error occured in storage, when handling ${req.method} request to ${req.originalUrl}`);
             console.error(err);

package/build/3nstorage/owner.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2022 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -59,44 +59,44 @@ const MAX_CHUNK_SIZE = '0.5mb';
 function setHttpPart(app, domain, sessions, users, midAuthorizer) {
     app.http.disable('etag');
     // Login
-    app.http.post('/' + api.midLogin.START_URL_END, sessions.checkSession(), body_parsers_1.json('1kb'), start_1.startSession(users.exists, sessions.generate));
-    app.http.post('/' + api.midLogin.AUTH_URL_END, sessions.ensureOpenedSession(), body_parsers_1.json('4kb'), mid_auth_1.midLogin(domain, midAuthorizer));
+    app.http.post('/' + api.midLogin.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_1.startSession)(users.exists, sessions.generate));
+    app.http.post('/' + api.midLogin.AUTH_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.json)('4kb'), (0, mid_auth_1.midLogin)(domain, midAuthorizer));
     // *** Require authorized session for everything below ***
     app.http.use(sessions.ensureAuthorizedSession());
-    app.http.post('/' + api.closeSession.URL_END, body_parsers_1.emptyBody(), close_1.closeSession());
+    app.http.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
     // Session params
-    app.http.get('/' + api.sessionParams.URL_END, session_params_1.sessionParams(MAX_CHUNK_SIZE));
+    app.http.get('/' + api.sessionParams.URL_END, (0, session_params_1.sessionParams)(MAX_CHUNK_SIZE));
     // Key derivation params
     app.http.route('/' + api.keyDerivParams.URL_END)
-        .get(param_getter_1.getParam(users.getKeyDerivParams))
-        .put(body_parsers_1.json('1kb'), param_setter_1.setParam(users.setKeyDerivParams));
+        .get((0, param_getter_1.getParam)(users.getKeyDerivParams))
+        .put((0, body_parsers_1.json)('1kb'), (0, param_setter_1.setParam)(users.setKeyDerivParams));
     // Transaction canceling
-    app.http.post('/' + api.cancelTransaction.EXPRESS_URL_END, body_parsers_1.emptyBody(), cancel_trans_1.cancelTransaction(false, users.cancelTransaction));
-    app.http.post('/' + api.cancelRootTransaction.EXPRESS_URL_END, body_parsers_1.emptyBody(), cancel_trans_1.cancelTransaction(true, users.cancelTransaction));
-    // Getting current root object
+    app.http.post('/' + api.cancelTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(false, users.cancelTransaction));
+    app.http.post('/' + api.cancelRootTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(true, users.cancelTransaction));
+    // Getting and updating current root object
     app.http.route('/' + api.currentRootObj.EXPRESS_URL_END)
-        .get(get_current_obj_1.getCurrentObj(true, users.getCurrentRootObj))
-        .put(put_current_obj_1.saveCurrentObj(true, users.saveNewRootVersion, MAX_CHUNK_SIZE));
-    // Getting current non-root objects
+        .get((0, get_current_obj_1.getCurrentObj)(true, users.getCurrentRootObj))
+        .put((0, put_current_obj_1.saveCurrentObj)(true, users.saveNewRootVersion, MAX_CHUNK_SIZE));
+    // Getting, updating and removing current non-root objects
     app.http.route('/' + api.currentObj.EXPRESS_URL_END)
-        .get(get_current_obj_1.getCurrentObj(false, users.getCurrentObj))
-        .delete(delete_obj_1.deleteObj(false, true, users.deleteObj))
-        .put(put_current_obj_1.saveCurrentObj(false, users.saveNewObjVersion, MAX_CHUNK_SIZE));
+        .get((0, get_current_obj_1.getCurrentObj)(false, users.getCurrentObj))
+        .delete((0, delete_obj_1.deleteCurrentObjVer)(users.deleteCurrentObjVersion))
+        .put((0, put_current_obj_1.saveCurrentObj)(false, users.saveNewObjVersion, MAX_CHUNK_SIZE));
+    // Getting root archived versions
+    app.http.route('/' + api.archivedRootVersion.EXPRESS_URL_END)
+        .get((0, get_archived_obj_ver_1.getArchivedObjVersion)(true, users.getArchivedRootVersion));
+    // Getting non-root object archived versions
+    app.http.route('/' + api.archivedObjVersion.EXPRESS_URL_END)
+        .get((0, get_archived_obj_ver_1.getArchivedObjVersion)(false, users.getArchivedObjVersion));
     // Archive root's current version
     app.http.route('/' + api.archiveRoot.URL_END)
-        .get(list_obj_archive_1.listObjArchive(true, users.listObjArchive))
-        .put(body_parsers_1.emptyBody(), archive_obj_version_1.archiveCurrentObjVersion(true, users.archiveObjVersion));
+        .get((0, list_obj_archive_1.listObjArchive)(true, users.listObjArchive))
+        .post((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(true, users.archiveObjVersion))
+        .delete((0, delete_obj_1.deleteArchivedObjVer)(true, users.deleteArchivedObjVersion));
     // Archive non-root object's current version
     app.http.route('/' + api.archiveObj.EXPRESS_URL_END)
-        .get(list_obj_archive_1.listObjArchive(false, users.listObjArchive))
-        .put(body_parsers_1.emptyBody(), archive_obj_version_1.archiveCurrentObjVersion(false, users.archiveObjVersion));
-    // Archived root versions
-    app.http.route('/' + api.archivedRootVersion.EXPRESS_URL_END)
-        .get(get_archived_obj_ver_1.getArchivedObjVersion(true, users.getArchivedRootVersion))
-        .delete(delete_obj_1.deleteObj(true, false, users.deleteObj));
-    // Removing archived and current versions of non-root object 
-    app.http.route('/' + api.archivedObjVersion.EXPRESS_URL_END)
-        .get(get_archived_obj_ver_1.getArchivedObjVersion(true, users.getArchivedObjVersion))
-        .delete(delete_obj_1.deleteObj(false, false, users.deleteObj));
+        .get((0, list_obj_archive_1.listObjArchive)(false, users.listObjArchive))
+        .post((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(false, users.archiveObjVersion))
+        .delete((0, delete_obj_1.deleteArchivedObjVer)(false, users.deleteArchivedObjVersion));
 }
 Object.freeze(exports);

package/build/3nstorage/resources/store.d.ts

@@ -102,15 +102,8 @@ export declare class Store extends UserFiles {
     getArchivedObjVersion(objId: string | null, version: number, header: boolean, segsOffset: number, segsLimit: number | undefined): Promise<ObjReader>;
     private makeObjReader;
     private getObjFile;
-    /**
-     * @param objId is a string object id for non-root objects, and null for
-     * root object.
-     * @param archVersion is an optional parameter, identifying archived version
-     * to delete. Default null value indicates that an object should be removed.
-     * If an object has any archived versions (even if current), these will not
-     * be removed, and such object state will be labeled as archived.
-     */
-    deleteObj(objId: string, archVersion?: number | null): Promise<void>;
+    deleteCurrentObjVer(objId: string, version?: number | null): Promise<void>;
+    deleteArchivedObjVer(objId: string | null, version: number): Promise<void>;
     /**
      * @param objId is a string object id for non-root objects, and null for
      * root object.

package/build/3nstorage/resources/store.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2019 - 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2019 - 2020, 2022 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -131,7 +131,7 @@ class Store extends user_files_1.UserFiles {
         Object.freeze(this);
     }
     static async make(userFolder, userId, storageEventsSink, writeBufferSize, readBufferSize) {
-        const path = path_1.join(userFolder, 'store');
+        const path = (0, path_1.join)(userFolder, 'store');
         const store = new Store(userId, path, storageEventsSink, writeBufferSize, readBufferSize);
         await store.ensureUserExistsOnDisk();
         return store;
@@ -153,7 +153,7 @@ class Store extends user_files_1.UserFiles {
             await spaceTracker.change(this, byteLen);
         }
         const params = {
-            isNewObj: (opts.ver === 1),
+            isNewObj: opts.create,
             version: opts.ver,
             baseVersion: (diff ? diff.baseVersion : undefined)
         };
@@ -163,10 +163,10 @@ class Store extends user_files_1.UserFiles {
             const filePath = this.transactions.objFileWritingPath(objId);
             file = await this.objVerFiles.forNewFile(objId, trans.version, filePath);
             if (diff) {
-                await file.setSegsLayout(utils_1.diffToLayout(diff), false);
+                await file.setSegsLayout((0, utils_1.diffToLayout)(diff), false);
             }
-            const chunks = utils_1.chunksInOrderedStream(byteLen, opts.header, 0);
-            await utils_1.streamToObjFile(file, chunks, bytes, this.fileWritingBufferSize);
+            const chunks = (0, utils_1.chunksInOrderedStream)(byteLen, opts.header, 0);
+            await (0, utils_1.streamToObjFile)(file, chunks, bytes, this.fileWritingBufferSize);
             if (opts.last) {
                 if (!file.isFileComplete()) {
                     throw exports.SC.OBJ_FILE_INCOMPLETE;
@@ -183,7 +183,7 @@ class Store extends user_files_1.UserFiles {
         }
         catch (err) {
             await spaceTracker.change(this, -byteLen);
-            await this.transactions.cancel(objId, trans.transactionId).catch(() => { });
+            await this.transactions.cancel(objId, trans.transactionId).catch(noop);
             throw err;
         }
     }
@@ -206,8 +206,8 @@ class Store extends user_files_1.UserFiles {
             const file = await this.objVerFiles.forExistingFile(objId, trans.version, filePath);
             if (byteLen > 0) {
                 await spaceTracker.change(this, byteLen);
-                const chunks = utils_1.chunksInOrderedStream(byteLen, undefined, opts.ofs);
-                await utils_1.streamToObjFile(file, chunks, bytes, this.fileWritingBufferSize);
+                const chunks = (0, utils_1.chunksInOrderedStream)(byteLen, undefined, opts.ofs);
+                await (0, utils_1.streamToObjFile)(file, chunks, bytes, this.fileWritingBufferSize);
             }
             if (opts.last) {
                 if (!file.isFileComplete()) {
@@ -302,75 +302,76 @@ class Store extends user_files_1.UserFiles {
                 len: (segBytesToRead + headerLen),
                 segsLen,
                 headerLen,
-                pipe: utils_1.makeObjPipe(file, true, segsOfs, segBytesToRead, objId, this.getObjFile)
+                pipe: (0, utils_1.makeObjPipe)(file, true, segsOfs, segBytesToRead, objId, this.getObjFile)
             };
         }
         else {
             reader = {
                 len: segBytesToRead,
                 segsLen,
-                pipe: utils_1.makeObjPipe(file, false, segsOfs, segBytesToRead, objId, this.getObjFile)
+                pipe: (0, utils_1.makeObjPipe)(file, false, segsOfs, segBytesToRead, objId, this.getObjFile)
             };
         }
         Object.freeze(reader);
         return reader;
     }
-    /**
-     * @param objId is a string object id for non-root objects, and null for
-     * root object.
-     * @param archVersion is an optional parameter, identifying archived version
-     * to delete. Default null value indicates that an object should be removed.
-     * If an object has any archived versions (even if current), these will not
-     * be removed, and such object state will be labeled as archived.
-     */
-    async deleteObj(objId, archVersion = null) {
+    async deleteCurrentObjVer(objId, version = null) {
+        if (!objId) {
+            throw new Error('Root object is not removable.');
+        }
         const status = await this.statuses.get(objId);
-        const arch = status.archivedVersions;
+        if (status.state !== 'current') {
+            throw exports.SC.OBJ_UNKNOWN;
+        }
+        if (version && (version !== status.currentVersion)) {
+            throw exports.SC.OBJ_VER_UNKNOWN;
+        }
         // XXX need to put removal transaction, closing it in a finally clause
-        if (archVersion === null) {
-            if (objId === null) {
-                throw new Error('Root object is not removable.');
-            }
-            if (status.state !== 'current') {
-                throw exports.SC.OBJ_UNKNOWN;
-            }
-            if (!Array.isArray(arch) || (arch.length === 0)) {
-                await this.statuses.deleteWithObj(objId);
-            }
-            else {
-                const currVer = status.currentVersion;
-                delete status.currentVersion;
-                status.state = 'archived';
-                await this.statuses.set(objId, status);
-                if (typeof currVer !== 'number') {
-                    throw new Error(`Illegal state of object status file for ${objId}: state is current, while current version is missing.`);
-                }
-                if (arch.indexOf(currVer) < 0) {
-                    await this.rmObjFiles(objId, currVer);
-                }
-            }
+        const arch = status.archivedVersions;
+        if (!Array.isArray(arch) || (arch.length === 0)) {
+            // remove everything related to this object
+            await this.statuses.deleteWithObj(objId);
         }
         else {
-            if (!Array.isArray(arch)) {
-                throw exports.SC.OBJ_UNKNOWN;
-            }
-            const indInArch = arch.indexOf(archVersion);
-            if (indInArch < 0) {
-                throw exports.SC.OBJ_UNKNOWN;
-            }
-            arch.splice(indInArch, 1);
-            if (arch.length === 0) {
-                delete status.archivedVersions;
-            }
+            // set status and remove version if it isn't archived
+            version = status.currentVersion;
+            delete status.currentVersion;
+            status.state = 'archived';
             await this.statuses.set(objId, status);
-            if (status.currentVersion !== archVersion) {
-                await this.rmObjFiles(objId, archVersion);
+            if (arch.indexOf(version) < 0) {
+                await this.rmObjFiles(objId, version);
             }
         }
         this.storageEventsSink(this.userId, owner_1.objRemoved.EVENT_NAME, {
             objId,
         });
     }
+    async deleteArchivedObjVer(objId, version) {
+        const status = await this.statuses.get(objId);
+        const arch = status.archivedVersions;
+        // XXX need to put removal transaction, closing it in a finally clause
+        if (!Array.isArray(arch)) {
+            throw exports.SC.OBJ_VER_UNKNOWN;
+        }
+        const indInArch = arch.indexOf(version);
+        if (indInArch < 0) {
+            throw exports.SC.OBJ_VER_UNKNOWN;
+        }
+        arch.splice(indInArch, 1);
+        if (arch.length === 0) {
+            delete status.archivedVersions;
+        }
+        await this.statuses.set(objId, status);
+        if (!status.archivedVersions && !status.currentVersion) {
+            await this.rmObjFiles(objId, version);
+        }
+        else if (status.currentVersion !== version) {
+            await this.statuses.deleteWithObj(objId);
+        }
+        // this.storageEventsSink(this.userId, objRemoved.EVENT_NAME, {
+        // 	objId,
+        // });
+    }
     /**
      * @param objId is a string object id for non-root objects, and null for
      * root object.
@@ -391,10 +392,10 @@ class Store extends user_files_1.UserFiles {
         const verPart = toFName(version);
         objFiles = objFiles.filter(fName => fName.startsWith(verPart));
         if (objFiles.length === 0) {
-            throw exports.SC.OBJ_UNKNOWN;
+            throw exports.SC.OBJ_VER_UNKNOWN;
         }
         for (const fName of objFiles) {
-            await fs.unlink(path_1.join(objFolder, fName)).catch(() => { });
+            await fs.unlink((0, path_1.join)(objFolder, fName)).catch(() => { });
         }
     }
     // XXX need both, archiving and removal transactions for atomic locking
@@ -404,12 +405,13 @@ class Store extends user_files_1.UserFiles {
     //		file/folder.
     async archiveCurrentObjVersion(objId, version) {
         // XXX need to put archiving transaction, closing it in a finally clause
+        //  - make in memory transactions for archival and removal, or chaining(?)
         const status = await this.statuses.get(objId);
         if (status.state !== 'current') {
             throw exports.SC.OBJ_UNKNOWN;
         }
-        if (typeof status.currentVersion !== 'number') {
-            throw new Error(`Illegal state of object status file for ${objId}: state is current, while current version is missing.`);
+        if (status.currentVersion !== version) {
+            throw exports.SC.OBJ_VER_UNKNOWN;
         }
         const arch = status.archivedVersions;
         if (Array.isArray(arch)) {
@@ -501,8 +503,8 @@ class ObjStatuses {
     }
     objFolder(objId) {
         return (objId ?
-            path_1.join(this.path, 'objects', objId) :
-            path_1.join(this.path, 'root'));
+            (0, path_1.join)(this.path, 'objects', objId) :
+            (0, path_1.join)(this.path, 'root'));
     }
     async get(objId) {
         let status = this.cache.get(objId);
@@ -513,7 +515,7 @@ class ObjStatuses {
         return status;
     }
     async fromFile(objId) {
-        const filePath = path_1.join(this.objFolder(objId), STATUS_FILE);
+        const filePath = (0, path_1.join)(this.objFolder(objId), STATUS_FILE);
         const str = await fs.readFile(filePath, { encoding: 'utf8', flag: 'r' }).catch((exc) => {
             if (exc.notFound) {
                 throw exports.SC.OBJ_UNKNOWN;
@@ -524,7 +526,7 @@ class ObjStatuses {
             return JSON.parse(str);
         }
         catch (err) {
-            throw error_1.errWithCause(err, `Can't parse content of obj status file`);
+            throw (0, error_1.errWithCause)(err, `Can't parse content of obj status file`);
         }
     }
     async set(objId, status) {
@@ -532,7 +534,7 @@ class ObjStatuses {
         await this.saveToFile(objId, status);
     }
     async saveToFile(objId, status) {
-        const filePath = path_1.join(this.objFolder(objId), STATUS_FILE);
+        const filePath = (0, path_1.join)(this.objFolder(objId), STATUS_FILE);
         const str = JSON.stringify(status);
         const procId = (objId ? objId : 'null');
         await this.saveProcs.startOrChain(procId, () => fs.writeFile(filePath, str, { encoding: 'utf8', flag: 'w' }));
@@ -540,7 +542,7 @@ class ObjStatuses {
     async deleteWithObj(objId) {
         this.cache.delete(objId);
         if (objId === null) {
-            await fs.unlink(path_1.join(this.objFolder(null), STATUS_FILE))
+            await fs.unlink((0, path_1.join)(this.objFolder(null), STATUS_FILE))
                 .catch(() => { });
         }
         else {
@@ -571,7 +573,7 @@ class ObjStatuses {
         });
     }
     objFileReadingPath(objId, version) {
-        return path_1.join(this.objFolder(objId), toFName(version));
+        return (0, path_1.join)(this.objFolder(objId), toFName(version));
     }
 }
 Object.freeze(ObjStatuses.prototype);
@@ -587,8 +589,8 @@ class ObjTransactions {
     }
     transactionFolder(objId) {
         return (objId ?
-            path_1.join(this.path, 'transactions', objId) :
-            path_1.join(this.path, 'root', 'transaction'));
+            (0, path_1.join)(this.path, 'transactions', objId) :
+            (0, path_1.join)(this.path, 'root', 'transaction'));
     }
     async get(objId, transactionId) {
         let isInCache = true;
@@ -606,7 +608,7 @@ class ObjTransactions {
         return trans;
     }
     transactionFilePath(objId) {
-        return path_1.join(this.transactionFolder(objId), 'transaction');
+        return (0, path_1.join)(this.transactionFolder(objId), 'transaction');
     }
     async fromFile(objId) {
         const filePath = this.transactionFilePath(objId);
@@ -625,7 +627,7 @@ class ObjTransactions {
             return JSON.parse(str);
         }
         catch (err) {
-            throw error_1.errWithCause(err, `Can't parse content of obj transaction file`);
+            throw (0, error_1.errWithCause)(err, `Can't parse content of obj transaction file`);
         }
     }
     async set(objId, status) {
@@ -639,11 +641,11 @@ class ObjTransactions {
         await this.saveProcs.startOrChain(procId, () => fs.writeFile(filePath, str, { encoding: 'utf8', flag: 'w' }));
     }
     objFileWritingPath(objId) {
-        return path_1.join(this.transactionFolder(objId), 'new');
+        return (0, path_1.join)(this.transactionFolder(objId), 'new');
     }
     async startNew(objId, reqTrans) {
         const trans = reqTrans;
-        trans.transactionId = await random_node_1.stringOfB64UrlSafeChars(10);
+        trans.transactionId = await (0, random_node_1.stringOfB64UrlSafeChars)(10);
         trans.transactionType = 'write';
         await this.makeTransactionFolder(objId);
         await this.set(objId, trans);
@@ -735,4 +737,5 @@ Object.freeze(ObjStatuses);
 function toFName(version) {
     return `${version}.`;
 }
+function noop() { }
 Object.freeze(exports);

package/build/3nstorage/resources/users.d.ts

@@ -18,7 +18,8 @@ export declare type GetArchivedObjVersion = (userId: string, objId: string | nul
 export declare type CancelTransaction = (userId: string, objId: string, transactionId?: string) => Promise<void>;
 export declare type ArchiveObjCurrentVersion = (userId: string, objId: string, version: number) => Promise<void>;
 export declare type ListObjArchive = (userId: string, objId: string) => Promise<number[]>;
-export declare type DeleteObj = (userId: string, objId: string, version: number) => Promise<void>;
+export declare type DeleteCurrentObjVersion = (userId: string, objId: string, version?: number) => Promise<void>;
+export declare type DeleteArchivedObjVersion = (userId: string, objId: string | null, version: number) => Promise<void>;
 declare type GetParam<T> = (userId: string) => Promise<T>;
 declare type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
 export declare type GetSpaceQuota = GetParam<number>;
@@ -42,7 +43,8 @@ export interface Factory {
     archiveObjVersion: ArchiveObjCurrentVersion;
     getArchivedRootVersion: GetArchivedObjVersion;
     getArchivedObjVersion: GetArchivedObjVersion;
-    deleteObj: DeleteObj;
+    deleteCurrentObjVersion: DeleteCurrentObjVersion;
+    deleteArchivedObjVersion: DeleteArchivedObjVersion;
     setStorageEventsSink(sink: EventsSink): void;
 }
 export declare function makeFactory(rootFolder: string, writeBufferSize?: string | number, readBufferSize?: string | number): Factory;

package/build/3nstorage/resources/users.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeFactory = void 0;
+exports.makeFactory = exports.SC = void 0;
 const store_1 = require("./store");
 const server_data_folders_1 = require("../../lib-server/resources/server-data-folders");
 var store_2 = require("./store");
@@ -40,7 +40,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
             }
         }
         else {
-            const userFolder = server_data_folders_1.userDataInRootFolder(rootFolder, userId);
+            const userFolder = (0, server_data_folders_1.userDataInRootFolder)(rootFolder, userId);
             const store = await store_1.Store.make(userFolder, userId, storageEventsSink, writeBufferSize, readBufferSize);
             stores.set(userId, store);
             return store;
@@ -122,9 +122,9 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         saveNewRootVersion: makeObjSaver(true),
         saveNewObjVersion: makeObjSaver(false),
         cancelTransaction: makeTransactionCanceller(),
-        deleteObj: async (userId, objId, version) => {
+        deleteCurrentObjVersion: async (userId, objId, version) => {
             const store = await getStore(userId);
-            await store.deleteObj(objId, version);
+            await store.deleteCurrentObjVer(objId, version);
         },
         archiveObjVersion: async (userId, objId, version) => {
             const store = await getStore(userId);
@@ -134,6 +134,10 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
             const store = await getStore(userId);
             return store.listObjArchive(objId);
         },
+        deleteArchivedObjVersion: async (userId, objId, version) => {
+            const store = await getStore(userId);
+            await store.deleteArchivedObjVer(objId, version);
+        },
         setStorageEventsSink(sink) {
             if (storageEventsSink) {
                 throw new Error(`Storage events sink is already set`);

package/build/3nstorage/routes/owner/archive-obj-version.d.ts

@@ -1,3 +1,3 @@
-import * as express from 'express';
+import { RequestHandler } from 'express';
 import { ArchiveObjCurrentVersion } from '../../resources/users';
-export declare function archiveCurrentObjVersion(root: boolean, archiveObjVerFunc: ArchiveObjCurrentVersion): express.RequestHandler;
+export declare function archiveCurrentObjVersion(root: boolean, archiveObjVerFunc: ArchiveObjCurrentVersion): RequestHandler;

package/build/3nstorage/routes/owner/archive-obj-version.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 3NSoft Inc.
+ Copyright (C) 2022 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -13,44 +13,49 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.archiveCurrentObjVersion = void 0;
+const users_1 = require("../../resources/users");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const SC = owner_1.archiveObj.SC;
 function archiveCurrentObjVersion(root, archiveObjVerFunc) {
     if ('function' !== typeof archiveObjVerFunc) {
         throw new TypeError("Given argument 'archiveObjVerFunc' must be function, but is not.");
     }
-    return async function (req, res, next) {
-        next(new Error('Not implemented, yet.'));
-        // const userId = req.session.params.userId;
-        // const objId: string = (root ? null : req.params.objId);
-        // const version: number = (delCurrent ? null : req.params.version);
-        // try {
-        // 	await deleteObjFunc(userId, objId, version);
-        // 	res.status(SC.ok).end();
-        // } catch (err) {
-        // 	if ("string" !== typeof err) {
-        // 		next(err);
-        // 	} else if (err === storeSC.CONCURRENT_TRANSACTION) {
-        // 		res.status(SC.concurrentTransaction).send(
-        // 			`Object ${objId} is currently under a transaction.`);
-        // 	} else if (err === storeSC.OBJ_UNKNOWN) {
-        // 		res.status(SC.unknownObj).send((version === null) ?
-        // 			`Object ${objId} is unknown.` :
-        // 			`Object ${objId} version ${version} is unknown.`);
-        // 	} else if (err === storeSC.WRONG_OBJ_STATE) {
-        // 		res.status(SC.incompatibleObjState).send(
-        // 			`Object ${objId} is in a state, that does not allow to procede with this request.`);
-        // 	} else if (err === storeSC.USER_UNKNOWN) {
-        // 		res.status(api.ERR_SC.server).send(
-        // 			"Recipient disappeared from the system.");
-        // 		req.session.close();
-        // 	} else {
-        // 		next(new Error("Unhandled storage error code: "+err));
-        // 	}
-        // }
+    return async (req, res, next) => {
+        const userId = req.session.params.userId;
+        const objId = (root ? null : req.params.objId);
+        const version = parseInt(req.query.ver);
+        if (isNaN(version) || (version < 1)) {
+            res.status(owner_1.ERR_SC.malformed).send("Bad query parameters");
+            return;
+        }
+        try {
+            await archiveObjVerFunc(userId, objId, version);
+            res.status(SC.okPost).end();
+        }
+        catch (err) {
+            if ("string" !== typeof err) {
+                next(err);
+            }
+            else if (err === users_1.SC.OBJ_VER_UNKNOWN) {
+                res.status(SC.unknownObjVer).send(`Object ${objId} version ${version} is not current.`);
+            }
+            else if (err === users_1.SC.OBJ_UNKNOWN) {
+                res.status(SC.unknownObj).send(root ?
+                    `Root object is not set.` :
+                    `Object ${objId} is unknown.`);
+            }
+            else if (err === users_1.SC.USER_UNKNOWN) {
+                res.status(owner_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                req.session.close();
+            }
+            else {
+                next(new Error("Unhandled storage error code: " + err));
+            }
+        }
     };
 }
 exports.archiveCurrentObjVersion = archiveCurrentObjVersion;

package/build/3nstorage/routes/owner/cancel-trans.js

@@ -23,7 +23,7 @@ function cancelTransaction(root, cancelTransFunc) {
     if ('function' !== typeof cancelTransFunc) {
         throw new TypeError("Given argument 'cancelTransFunc' must be function, but is not.");
     }
-    return async function (req, res, next) {
+    return async (req, res, next) => {
         const userId = req.session.params.userId;
         const objId = (root ? null : req.params.objId);
         const transactionId = req.params.transactionId;

package/build/3nstorage/routes/owner/delete-obj.d.ts

@@ -1,3 +1,4 @@
 import { RequestHandler } from 'express';
-import { DeleteObj } from '../../resources/users';
-export declare function deleteObj(root: boolean, delCurrent: boolean, deleteObjFunc: DeleteObj): RequestHandler;
+import { DeleteArchivedObjVersion, DeleteCurrentObjVersion } from '../../resources/users';
+export declare function deleteCurrentObjVer(deleteObjFunc: DeleteCurrentObjVersion): RequestHandler;
+export declare function deleteArchivedObjVer(root: boolean, deleteObjFunc: DeleteArchivedObjVersion): RequestHandler;