spec-3nweb-server 1.5.1 → 1.5.2

package/build/3nstorage/owner.js

@@ -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);

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;

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

@@ -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;
@@ -342,9 +336,7 @@ class Store extends user_files_1.UserFiles {
                 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);
@@ -368,9 +360,7 @@ class Store extends user_files_1.UserFiles {
         else if (status.currentVersion !== version) {
             await this.statuses.deleteWithObj(objId);
         }
-        // this.storageEventsSink(this.userId, objRemoved.EVENT_NAME, {
-        // 	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
@@ -421,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/lib-common/service-api/3nstorage/owner.d.ts

@@ -249,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.
  */
@@ -263,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",