spec-3nweb-server 1.4.1 → 1.5.2

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
@@ -48,8 +48,7 @@ function makeApp(domain, sessions, users, midAuthorizer) {
 exports.makeApp = makeApp;
 function setWSPart(app, sessions, users) {
     const sockets = new app_1.UserSockets(sessions.ensureAuthorizedSessionForSocketStart());
-    const storageEvents = new server_events_1.ServerEvents(undefined, [api.objChanged.EVENT_NAME,
-        api.objRemoved.EVENT_NAME], sockets.socketGetter);
+    const storageEvents = new server_events_1.ServerEvents(undefined, api.events.all, sockets.socketGetter);
     // give events ipc to both ends
     sockets.addSocketIPC(storageEvents);
     users.setStorageEventsSink(storageEvents.eventsSink);
@@ -73,30 +72,30 @@ function setHttpPart(app, domain, sessions, users, midAuthorizer) {
     // Transaction canceling
     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 current root object
+    // Getting and updating current root object
     app.http.route('/' + api.currentRootObj.EXPRESS_URL_END)
         .get((0, get_current_obj_1.getCurrentObj)(true, users.getCurrentRootObj))
         .put((0, put_current_obj_1.saveCurrentObj)(true, users.saveNewRootVersion, MAX_CHUNK_SIZE));
-    // Getting current non-root objects
+    // Getting, updating and removing current non-root objects
     app.http.route('/' + api.currentObj.EXPRESS_URL_END)
         .get((0, get_current_obj_1.getCurrentObj)(false, users.getCurrentObj))
-        .delete((0, delete_obj_1.deleteObj)(false, true, users.deleteObj))
+        .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((0, list_obj_archive_1.listObjArchive)(true, users.listObjArchive))
-        .put((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(true, users.archiveObjVersion));
+        .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((0, list_obj_archive_1.listObjArchive)(false, users.listObjArchive))
-        .put((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(false, users.archiveObjVersion));
-    // Archived root versions
-    app.http.route('/' + api.archivedRootVersion.EXPRESS_URL_END)
-        .get((0, get_archived_obj_ver_1.getArchivedObjVersion)(true, users.getArchivedRootVersion))
-        .delete((0, 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((0, get_archived_obj_ver_1.getArchivedObjVersion)(true, users.getArchivedObjVersion))
-        .delete((0, delete_obj_1.deleteObj)(false, false, users.deleteObj));
+        .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

@@ -2,11 +2,10 @@
 import { Readable } from 'stream';
 import { PutObjFirstQueryOpts, PutObjSecondQueryOpts } from '../../lib-common/service-api/3nstorage/owner';
 import { UserFiles, ObjReader } from '../../lib-server/resources/user-files';
-import { DiffInfo, objChanged, objRemoved } from '../../lib-common/service-api/3nstorage/owner';
+import { DiffInfo, events } from '../../lib-common/service-api/3nstorage/owner';
 export { DiffInfo } from '../../lib-common/service-api/3nstorage/owner';
 export { ObjPipe, ObjReader } from '../../lib-server/resources/user-files';
-export declare type MsgEvents = objChanged.Event | objRemoved.Event;
-export declare type StorageEventsSink = (userId: string, channel: string, event: MsgEvents) => void;
+export declare type StorageEventsSink = (userId: string, channel: events.EventNameType, event: events.AllTypes) => void;
 export declare const SC: {
     USER_UNKNOWN: string;
     OBJ_EXIST: string;
@@ -102,15 +101,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
@@ -172,10 +172,7 @@ class Store extends user_files_1.UserFiles {
                     throw exports.SC.OBJ_FILE_INCOMPLETE;
                 }
                 await this.transactions.complete(objId, trans, file);
-                this.storageEventsSink(this.userId, owner_1.objChanged.EVENT_NAME, {
-                    objId,
-                    newVer: opts.ver
-                });
+                this.storageEventsSink(this.userId, owner_1.events.objChanged.EVENT_NAME, { objId, newVer: opts.ver });
             }
             else {
                 return trans.transactionId;
@@ -214,10 +211,7 @@ class Store extends user_files_1.UserFiles {
                     throw exports.SC.OBJ_FILE_INCOMPLETE;
                 }
                 await this.transactions.complete(objId, trans, file);
-                this.storageEventsSink(this.userId, owner_1.objChanged.EVENT_NAME, {
-                    objId,
-                    newVer: trans.version
-                });
+                this.storageEventsSink(this.userId, owner_1.events.objChanged.EVENT_NAME, { objId, newVer: trans.version });
             }
             else {
                 return opts.trans;
@@ -315,61 +309,58 @@ class Store extends user_files_1.UserFiles {
         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,
-        });
+        this.storageEventsSink(this.userId, owner_1.events.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, owner_1.events.objArchivedVersionRemoved.EVENT_NAME, { objId, archivedVer: version });
     }
     /**
      * @param objId is a string object id for non-root objects, and null for
@@ -391,7 +382,7 @@ 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((0, path_1.join)(objFolder, fName)).catch(() => { });
@@ -404,12 +395,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)) {
@@ -419,6 +411,7 @@ class Store extends user_files_1.UserFiles {
             status.archivedVersions = [status.currentVersion];
         }
         await this.statuses.set(objId, status);
+        this.storageEventsSink(this.userId, owner_1.events.objVersionArchived.EVENT_NAME, { objId, archivedVer: version });
     }
     async listObjArchive(objId) {
         const status = await this.statuses.get(objId);

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

@@ -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.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
@@ -17,6 +17,7 @@
 */
 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) {
@@ -24,34 +25,37 @@ function archiveCurrentObjVersion(root, archiveObjVerFunc) {
         throw new TypeError("Given argument 'archiveObjVerFunc' must be function, but is not.");
     }
     return async (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));
-        // 	}
-        // }
+        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/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;

package/build/3nstorage/routes/owner/delete-obj.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016, 2020 3NSoft Inc.
+ Copyright (C) 2016, 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
@@ -16,19 +16,45 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteObj = void 0;
+exports.deleteArchivedObjVer = exports.deleteCurrentObjVer = void 0;
 const users_1 = require("../../resources/users");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
+const assert_1 = require("../../../lib-common/assert");
 function deleteObj(root, delCurrent, deleteObjFunc) {
     if ('function' !== typeof deleteObjFunc) {
         throw new TypeError("Given argument 'deleteObjFunc' must be function, but is not.");
     }
+    if (delCurrent) {
+        (0, assert_1.assert)(!root);
+    }
     return async (req, res, next) => {
         const userId = req.session.params.userId;
         const objId = (root ? null : req.params.objId);
-        const version = (delCurrent ? null : req.params.version);
+        const ver = parseInt(req.query.ver);
+        let version;
+        if (isNaN(ver)) {
+            if (delCurrent) {
+                version = undefined;
+            }
+            else {
+                res.status(owner_1.ERR_SC.malformed).send("Bad query parameters");
+                return;
+            }
+        }
+        else {
+            if (ver < 1) {
+                res.status(owner_1.ERR_SC.malformed).send("Bad query parameters");
+                return;
+            }
+            version = ver;
+        }
         try {
-            await deleteObjFunc(userId, objId, version);
+            if (delCurrent) {
+                await deleteObjFunc(userId, objId, version);
+            }
+            else {
+                await deleteObjFunc(userId, objId, version);
+            }
             res.status(owner_1.currentObj.SC.okDelete).end();
         }
         catch (err) {
@@ -41,6 +67,9 @@ function deleteObj(root, delCurrent, deleteObjFunc) {
             else if (err === users_1.SC.OBJ_UNKNOWN) {
                 res.status(owner_1.currentObj.SC.unknownObj).send(`Object ${objId} is unknown.`);
             }
+            else if (err === users_1.SC.OBJ_VER_UNKNOWN) {
+                res.status(owner_1.currentObj.SC.unknownObjVer).send(`Object version ${version} 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();
@@ -51,6 +80,12 @@ function deleteObj(root, delCurrent, deleteObjFunc) {
         }
     };
 }
-exports.deleteObj = deleteObj;
-;
+function deleteCurrentObjVer(deleteObjFunc) {
+    return deleteObj(false, true, deleteObjFunc);
+}
+exports.deleteCurrentObjVer = deleteCurrentObjVer;
+function deleteArchivedObjVer(root, deleteObjFunc) {
+    return deleteObj(root, false, deleteObjFunc);
+}
+exports.deleteArchivedObjVer = deleteArchivedObjVer;
 Object.freeze(exports);

package/build/3nstorage/routes/owner/get-archived-obj-ver.js

@@ -85,10 +85,14 @@ function getArchivedObjVersion(root, getArchivedObjFunc) {
             if ("string" !== typeof err) {
                 next(err);
             }
-            else if ((err === users_1.SC.OBJ_UNKNOWN)
-                || (err === users_1.SC.OBJ_VER_UNKNOWN)) {
-                res.status(owner_1.archivedObjVersion.SC.missing).send(objId ?
-                    `Object ${objId}, version ${opts.ver} is unknown.` : `Root object version ${opts.ver} is not known.`);
+            else if (err === users_1.SC.OBJ_UNKNOWN) {
+                res.status(owner_1.archivedObjVersion.SC.unknownObj).send(objId ?
+                    `Object ${objId}is unknown.` : `Root object is not set`);
+            }
+            else if (err === users_1.SC.OBJ_VER_UNKNOWN) {
+                res.status(owner_1.archivedObjVersion.SC.unknownObjVer).send(objId ?
+                    `Object ${objId}, version ${opts.ver} is unknown.` :
+                    `Root object version ${opts.ver} is not known.`);
             }
             else if (err === users_1.SC.USER_UNKNOWN) {
                 res.status(owner_1.ERR_SC.server).send(`Recipient disappeared from the system.`);

package/build/3nstorage/routes/owner/list-obj-archive.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
@@ -17,39 +17,35 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listObjArchive = void 0;
+const users_1 = require("../../resources/users");
+const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 function listObjArchive(root, listObjArchiveFunc) {
     if ('function' !== typeof listObjArchiveFunc) {
         throw new TypeError("Given argument 'listObjArchiveFunc' must be function, but is not.");
     }
     return async (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));
-        // 	}
-        // }
+        const userId = req.session.params.userId;
+        const objId = (root ? null : req.params.objId);
+        try {
+            const lst = await listObjArchiveFunc(userId, objId);
+            res.status(owner_1.archiveObj.SC.okGet).json(lst);
+        }
+        catch (err) {
+            if ("string" !== typeof err) {
+                next(err);
+            }
+            else if (err === users_1.SC.OBJ_UNKNOWN) {
+                res.status(owner_1.archiveObj.SC.unknownObj).send(root ?
+                    `Root object is 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.listObjArchive = listObjArchive;

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

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import * as fs from 'fs';
 import { Readable, Writable } from 'stream';
 export { Stats } from 'fs';

package/build/lib-common/objs-on-disk/utils.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Layout } from 'xsp-files';
 import { DiffInfo } from '../service-api/3nstorage/owner';
 import { ObjVersionFile } from './obj-file';

package/build/lib-common/service-api/3nstorage/owner.d.ts

@@ -157,24 +157,20 @@ export declare namespace currentRootObj {
 }
 export declare namespace archivedObjVersion {
     const EXPRESS_URL_END = "/obj/:objId/archived";
-    function getReqUrlEnd(objId: string, version: number, opts?: GetObjQueryOpts): string;
+    function getReqUrlEnd(objId: string, opts: GetObjQueryOpts): string;
     const SC: {
         okGet: number;
-        okDelete: number;
-        missing: number;
-        concurrentTransaction: number;
-        incompatibleObjState: number;
+        unknownObj: number;
+        unknownObjVer: number;
     };
 }
 export declare namespace archivedRootVersion {
     const EXPRESS_URL_END = "root/archived";
-    function getReqUrlEnd(version: number, opts?: GetObjQueryOpts): string;
+    function getReqUrlEnd(opts: GetObjQueryOpts): string;
     const SC: {
         okGet: number;
-        okDelete: number;
-        missing: number;
-        concurrentTransaction: number;
-        incompatibleObjState: number;
+        unknownObj: number;
+        unknownObjVer: number;
     };
 }
 export interface DiffInfo {
@@ -221,18 +217,27 @@ export declare namespace cancelRootTransaction {
 export declare namespace archiveObj {
     const EXPRESS_URL_END = "obj/:objId/archive";
     function getReqUrlEnd(objId: string): string;
+    function postAndDelReqUrlEnd(objId: string, version: number): string;
+    type VersionsList = number[];
     const SC: {
         okGet: number;
-        okPut: number;
-        missing: number;
+        okPost: number;
+        okDelete: number;
+        unknownObj: number;
+        unknownObjVer: number;
     };
 }
 export declare namespace archiveRoot {
     const URL_END = "root/archive";
+    function getReqUrlEnd(): string;
+    function postAndDelReqUrlEnd(version: number): string;
+    type VersionsList = archiveObj.VersionsList;
     const SC: {
         okGet: number;
-        okPut: number;
-        missing: number;
+        okPost: number;
+        okDelete: number;
+        unknownObj: number;
+        unknownObjVer: number;
     };
 }
 export interface ErrorReply {
@@ -244,23 +249,59 @@ export declare namespace wsEventChannel {
         ok: number;
     };
 }
-export declare namespace objChanged {
-    const EVENT_NAME = "obj-changed";
-    interface Event {
-        /**
-         * This indentifies a non-root object by its string id, while null value
-         * identifies root object.
-         */
-        objId: string | null;
-        newVer: number;
+export declare namespace events {
+    namespace objChanged {
+        const EVENT_NAME = "obj-changed";
+        interface Event {
+            /**
+             * This indentifies a non-root object by its string id, while null
+             * value identifies root object.
+             */
+            objId: string | null;
+            /**
+             * New current version on the server.
+             */
+            newVer: number;
+        }
     }
-}
-export declare namespace objRemoved {
-    const EVENT_NAME = "obj-removed";
-    interface Event {
-        /**
-         * This indentifies a removed non-root object by its string id.
-         */
-        objId: string;
+    namespace objRemoved {
+        const EVENT_NAME = "obj-removed";
+        interface Event {
+            /**
+             * This indentifies a removed non-root object by its string id.
+             */
+            objId: string;
+        }
+    }
+    namespace objVersionArchived {
+        const EVENT_NAME = "obj-ver-archived";
+        interface Event {
+            /**
+             * This indentifies a non-root object by its string id, while null
+             * value identifies root object.
+             */
+            objId: string | null;
+            /**
+             * Version that was set archived on the server.
+             */
+            archivedVer: number;
+        }
+    }
+    namespace objArchivedVersionRemoved {
+        const EVENT_NAME = "obj-ver-removed";
+        interface Event {
+            /**
+             * This indentifies a non-root object by its string id, while null
+             * value identifies root object.
+             */
+            objId: string | null;
+            /**
+             * Archived version that was removed on the server.
+             */
+            archivedVer: number;
+        }
     }
+    const all: string[];
+    type EventNameType = (typeof objChanged.EVENT_NAME) | (typeof objRemoved.EVENT_NAME) | (typeof objVersionArchived.EVENT_NAME) | (typeof objArchivedVersionRemoved.EVENT_NAME);
+    type AllTypes = objChanged.Event | objRemoved.Event | objVersionArchived.Event | objArchivedVersionRemoved.Event;
 }

package/build/lib-common/service-api/3nstorage/owner.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.objRemoved = exports.objChanged = exports.wsEventChannel = exports.archiveRoot = exports.archiveObj = exports.cancelRootTransaction = exports.cancelTransaction = exports.addDiffSectionTo = exports.sanitizedDiff = exports.archivedRootVersion = exports.archivedObjVersion = exports.currentRootObj = exports.currentObj = exports.keyDerivParams = exports.PARAM_SC = exports.sessionParams = exports.closeSession = exports.midLogin = exports.BIN_TYPE = exports.HTTP_HEADER = exports.ERR_SC = void 0;
+exports.events = exports.wsEventChannel = exports.archiveRoot = exports.archiveObj = exports.cancelRootTransaction = exports.cancelTransaction = exports.addDiffSectionTo = exports.sanitizedDiff = exports.archivedRootVersion = exports.archivedObjVersion = exports.currentRootObj = exports.currentObj = exports.keyDerivParams = exports.PARAM_SC = exports.sessionParams = exports.closeSession = exports.midLogin = exports.BIN_TYPE = exports.HTTP_HEADER = exports.ERR_SC = void 0;
 /**
  * This defines interfaces for 3nstorage owner's requests.
  */
@@ -123,32 +123,22 @@ Object.freeze(currentRootObj);
 var archivedObjVersion;
 (function (archivedObjVersion) {
     archivedObjVersion.EXPRESS_URL_END = '/obj/:objId/archived';
-    function getReqUrlEnd(objId, version, opts) {
-        if (opts) {
-            opts.ver = version;
-        }
-        const query = (opts ? `?${(0, querystring_1.stringify)(opts)}` : '');
-        return `/obj/${objId}/archived${query}`;
+    function getReqUrlEnd(objId, opts) {
+        return `/obj/${objId}/archived?${(0, querystring_1.stringify)(opts)}`;
     }
     archivedObjVersion.getReqUrlEnd = getReqUrlEnd;
     archivedObjVersion.SC = {
         okGet: 200,
-        okDelete: 200,
-        missing: 474,
-        concurrentTransaction: 483,
-        incompatibleObjState: 484
+        unknownObj: 474,
+        unknownObjVer: 494
     };
 })(archivedObjVersion = exports.archivedObjVersion || (exports.archivedObjVersion = {}));
 Object.freeze(archivedObjVersion);
 var archivedRootVersion;
 (function (archivedRootVersion) {
     archivedRootVersion.EXPRESS_URL_END = 'root/archived';
-    function getReqUrlEnd(version, opts) {
-        if (opts) {
-            opts.ver = version;
-        }
-        const query = (opts ? `?${(0, querystring_1.stringify)(opts)}` : '');
-        return `root/archived${query}`;
+    function getReqUrlEnd(opts) {
+        return `root/archived?${(0, querystring_1.stringify)(opts)}`;
     }
     archivedRootVersion.getReqUrlEnd = getReqUrlEnd;
     archivedRootVersion.SC = archivedObjVersion.SC;
@@ -237,16 +227,30 @@ var archiveObj;
         return `obj/${objId}/archive`;
     }
     archiveObj.getReqUrlEnd = getReqUrlEnd;
+    function postAndDelReqUrlEnd(objId, version) {
+        return `obj/${objId}/archive?ver=${version}`;
+    }
+    archiveObj.postAndDelReqUrlEnd = postAndDelReqUrlEnd;
     archiveObj.SC = {
         okGet: 200,
-        okPut: 201,
-        missing: 474
+        okPost: 200,
+        okDelete: 200,
+        unknownObj: 474,
+        unknownObjVer: 494
     };
 })(archiveObj = exports.archiveObj || (exports.archiveObj = {}));
 Object.freeze(archiveObj);
 var archiveRoot;
 (function (archiveRoot) {
     archiveRoot.URL_END = 'root/archive';
+    function getReqUrlEnd() {
+        return `root/archive`;
+    }
+    archiveRoot.getReqUrlEnd = getReqUrlEnd;
+    function postAndDelReqUrlEnd(version) {
+        return `root/archive?ver=${version}`;
+    }
+    archiveRoot.postAndDelReqUrlEnd = postAndDelReqUrlEnd;
     archiveRoot.SC = archiveObj.SC;
 })(archiveRoot = exports.archiveRoot || (exports.archiveRoot = {}));
 Object.freeze(archiveRoot);
@@ -259,14 +263,34 @@ var wsEventChannel;
     Object.freeze(wsEventChannel.SC);
 })(wsEventChannel = exports.wsEventChannel || (exports.wsEventChannel = {}));
 Object.freeze(wsEventChannel);
-var objChanged;
-(function (objChanged) {
-    objChanged.EVENT_NAME = 'obj-changed';
-})(objChanged = exports.objChanged || (exports.objChanged = {}));
-Object.freeze(objChanged);
-var objRemoved;
-(function (objRemoved) {
-    objRemoved.EVENT_NAME = 'obj-removed';
-})(objRemoved = exports.objRemoved || (exports.objRemoved = {}));
-Object.freeze(objChanged);
+var events;
+(function (events) {
+    let objChanged;
+    (function (objChanged) {
+        objChanged.EVENT_NAME = 'obj-changed';
+    })(objChanged = events.objChanged || (events.objChanged = {}));
+    Object.freeze(objChanged);
+    let objRemoved;
+    (function (objRemoved) {
+        objRemoved.EVENT_NAME = 'obj-removed';
+    })(objRemoved = events.objRemoved || (events.objRemoved = {}));
+    Object.freeze(objRemoved);
+    let objVersionArchived;
+    (function (objVersionArchived) {
+        objVersionArchived.EVENT_NAME = 'obj-ver-archived';
+    })(objVersionArchived = events.objVersionArchived || (events.objVersionArchived = {}));
+    Object.freeze(objVersionArchived);
+    let objArchivedVersionRemoved;
+    (function (objArchivedVersionRemoved) {
+        objArchivedVersionRemoved.EVENT_NAME = 'obj-ver-removed';
+    })(objArchivedVersionRemoved = events.objArchivedVersionRemoved || (events.objArchivedVersionRemoved = {}));
+    Object.freeze(objArchivedVersionRemoved);
+    events.all = [
+        objChanged.EVENT_NAME,
+        objRemoved.EVENT_NAME,
+        objVersionArchived.EVENT_NAME,
+        objArchivedVersionRemoved.EVENT_NAME,
+    ];
+})(events = exports.events || (exports.events = {}));
+Object.freeze(events);
 Object.freeze(exports);

package/build/lib-server/web-sockets/app.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import * as http from 'http';
 import * as https from 'https';
 import * as express from 'express';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.4.1",
+  "version": "1.5.2",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",
@@ -36,13 +36,13 @@
     "xsp-files": "^2.0.0"
   },
   "devDependencies": {
-    "@types/express": "",
-    "@types/jasmine": "",
-    "@types/node": "",
+    "@types/express": "4.17.13",
+    "@types/jasmine": "^3.9.1",
+    "@types/node": "^16.11.7",
     "@types/ws": "^4.0.0",
-    "jasmine": "^2.5.3",
+    "jasmine": "^3.9.0",
     "rxjs": "^5.3.0",
-    "typescript": "^4.6.3",
+    "typescript": "^4.7.4",
     "xhr2": "^0.1.3"
   },
   "readmeFilename": "README.md"