spec-3nweb-server 1.6.0 → 1.6.3

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

@@ -153,10 +153,12 @@ class Store extends user_files_1.UserFiles {
             await spaceTracker.change(this, byteLen);
         }
         const params = {
-            isNewObj: opts.create,
             version: opts.ver,
             baseVersion: (diff ? diff.baseVersion : undefined)
         };
+        if (opts.ver === 1) {
+            params.isNewObj = true;
+        }
         const trans = await this.transactions.startNew(objId, params);
         let file;
         try {
@@ -401,7 +403,7 @@ class Store extends user_files_1.UserFiles {
             throw exports.SC.OBJ_UNKNOWN;
         }
         if (status.currentVersion !== version) {
-            throw exports.SC.OBJ_VER_UNKNOWN;
+            throw makeMismatchedObjVerException(status.currentVersion);
         }
         const arch = status.archivedVersions;
         if (Array.isArray(arch)) {
@@ -653,7 +655,7 @@ class ObjTransactions {
                 if (status.state !== 'current') {
                     throw exports.SC.OBJ_UNKNOWN;
                 }
-                else if (trans.version <= status.currentVersion) {
+                else if (trans.version !== (status.currentVersion + 1)) {
                     throw makeMismatchedObjVerException(status.currentVersion);
                 }
             }
@@ -728,7 +730,7 @@ class ObjTransactions {
 Object.freeze(ObjStatuses.prototype);
 Object.freeze(ObjStatuses);
 function toFName(version) {
-    return `${version}.`;
+    return `${version}.v`;
 }
 function noop() { }
 Object.freeze(exports);

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

@@ -38,10 +38,17 @@ function archiveCurrentObjVersion(root, archiveObjVerFunc) {
         }
         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.`);
+                if (err.type === 'mismatched-obj-ver') {
+                    const rep = {
+                        error: "Current object version doesn't match assumed one.",
+                        current_version: err.current_version
+                    };
+                    res.set(owner_1.HTTP_HEADER.objVersion, `${err.current_version}`);
+                    res.status(owner_1.archiveObj.SC.mismatchedObjVer).json(rep);
+                }
+                else {
+                    next(err);
+                }
             }
             else if (err === users_1.SC.OBJ_UNKNOWN) {
                 res.status(SC.unknownObj).send(root ?

package/build/3nstorage/routes/owner/put-current-obj.js

@@ -53,7 +53,7 @@ function saveCurrentObj(root, saveObjFunc, chunkLimit) {
         const { fstReq, sndReq } = opts;
         let diff;
         if (fstReq) {
-            if (fstReq.create && objId) {
+            if (!root && objId) {
                 if (!buffer_utils_1.base64urlSafe.allCharsFromAlphabet(objId)) {
                     return replyToMalformed(req, "Bad object id", res);
                 }
@@ -171,7 +171,6 @@ function extractQueryOptions(req) {
         // this is the first request
         // query fields are string or undefined, yet, type info helps the show
         const query = req.query;
-        const create = (query.create === 'true');
         const ver = parseInt(query.ver);
         if (isNaN(ver) || (ver < 1)) {
             return;
@@ -187,7 +186,7 @@ function extractQueryOptions(req) {
             return;
         }
         const last = (query.last === 'true');
-        return { fstReq: { diff, header, last, ver, create } };
+        return { fstReq: { diff, header, last, ver } };
     }
 }
 function getContentLenOrSendError(req, res, maxChunkSize) {

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

@@ -66,10 +66,6 @@ export interface GetObjQueryOpts {
     ver?: number;
 }
 export interface PutObjFirstQueryOpts {
-    /**
-     * This is a flag to indicate that new object should be created.
-     */
-    create?: boolean;
     /**
      * This parameter is object's new version.
      */
@@ -132,9 +128,10 @@ export declare namespace currentObj {
         mismatchedObjVer: number;
         objIncomplete: number;
     };
-    interface MismatchedObjVerReply extends ErrorReply {
-        current_version: number;
-    }
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
+}
+export interface MismatchedObjVerErrReply extends ErrorReply {
+    current_version: number;
 }
 export declare namespace currentRootObj {
     const EXPRESS_URL_END = "root/current";
@@ -240,23 +237,25 @@ export declare namespace rootStatus {
 export declare namespace archiveObj {
     const EXPRESS_URL_END = "obj/:objId/archive";
     function postAndDelReqUrlEnd(objId: string, version: number): string;
-    type VersionsList = number[];
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export declare namespace archiveRoot {
     const EXPRESS_URL_END = "root/archive";
     function postAndDelReqUrlEnd(version: number): string;
-    type VersionsList = archiveObj.VersionsList;
+    type MismatchedObjVerReply = archiveObj.MismatchedObjVerReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export interface ErrorReply {

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

@@ -258,7 +258,8 @@ var archiveObj;
         okPost: 200,
         okDelete: 200,
         unknownObj: 474,
-        unknownObjVer: 494
+        unknownObjVer: 494,
+        mismatchedObjVer: 495
     };
 })(archiveObj = exports.archiveObj || (exports.archiveObj = {}));
 Object.freeze(archiveObj);

package/package.json

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