Added headers for CRR Cascaded

models/backbeatRoutes/putMetadata.smithy

@@ -33,12 +33,18 @@ structure PutMetadataInput {
 
     @httpHeader("X-Scal-Request-Uids")
     RequestUids: String,
-
+
+    @httpHeader("x-scal-micro-version-id")
+    MicroVersionId: String,
+
     @httpPayload
     Body: Blob
 }
 
 structure PutMetadataOutput {
     /// Version ID of the stored metadata
-    versionId: String
+    versionId: String,
+
+    @httpHeader("x-scal-cascade-loop-detected")
+    CascadeLoopDetected: Boolean
 }

models/backbeatRoutes/putdata.smithy

@@ -31,6 +31,9 @@ structure PutDataInput {
     @httpHeader("X-Scal-Request-Uids")
     RequestUids: String,
 
+    @httpHeader("x-scal-micro-version-id")
+    MicroVersionId: String,
+
     @httpPayload
     @default("")
     Body: StreamingBlob
@@ -45,7 +48,10 @@ structure PutDataOutput {
 
     @httpHeader("x-amz-server-side-encryption-customer-algorithm")
     SSECustomerAlgorithm: String,
-    
+
     @httpHeader("x-amz-server-side-encryption-aws-kms-key-id")
-    SSEKMSKeyId: String
+    SSEKMSKeyId: String,
+
+    @httpHeader("x-scal-cascade-loop-detected")
+    CascadeLoopDetected: Boolean
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scality/cloudserverclient",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "engines": {
     "node": ">=20"
   },
@@ -56,8 +56,10 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1009.0",
+    "@aws-sdk/middleware-expect-continue": "^3.972.8",
     "JSONStream": "^1.3.5",
-    "fast-xml-parser": "^5.5.7"
+    "fast-xml-parser": "^5.5.7",
+    "uuid": "11"
   },
   "resolutions": {
     "flatted": "^3.4.2"

src/utils.ts

@@ -1,8 +1,51 @@
+import { addExpectContinueMiddleware } from '@aws-sdk/middleware-expect-continue';
+import { MiddlewareStack, RequestHandler } from '@smithy/types';
 import { XMLParser } from 'fast-xml-parser';
 import {
     CloudserverBackbeatRoutesServiceException
 } from '../build/smithy/cloudserverBackbeatRoutes/typescript-codegen';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type WithMiddlewareStack = { middlewareStack?: MiddlewareStack<any, any> };
+
+/**
+ * Attach the AWS SDK Expect: 100-continue middleware to a single command.
+ *
+ * Use this on commands whose target route honors 100-continue server-side.
+ * Pass the client's requestHandler so the underlying middleware can skip
+ * the header when running on FetchHttpHandler.
+ *
+ * @param command - The command to attach the middleware to.
+ * @param requestHandler - The client's requestHandler, used by the AWS SDK
+ *   middleware to detect FetchHttpHandler and skip the header in that case.
+ * @param expectContinueHeader - Controls when the header is set:
+ *   - `true` (default): always set the header on body-carrying requests.
+ *   - `false`: never set the header (middleware no-op).
+ *   - `number`: only set the header when the body's Content-Length is
+ *     greater than or equal to this threshold (in bytes). Useful to skip
+ *     the handshake cost on small payloads.
+ */
+export function attachExpectContinueMiddleware<TCommand>(
+    command: TCommand & WithMiddlewareStack,
+    requestHandler?: RequestHandler<unknown, unknown>,
+    expectContinueHeader: boolean | number = true,
+): TCommand {
+    if (!command.middlewareStack) {
+        throw new Error('Command does not have a middleware stack');
+    }
+
+    command.middlewareStack.add(
+        addExpectContinueMiddleware({
+            runtime: 'node',
+            requestHandler,
+            expectContinueHeader,
+        }),
+        { step: 'build', name: 'expectContinue' },
+    );
+
+    return command;
+}
+
 /**
  * Adds middleware to manually set the Content-Length header on a command.
  * 
@@ -20,14 +63,14 @@
         return;
     }
 
     const commandWithMiddleware = command as any;
     if (!commandWithMiddleware.middlewareStack) {
         throw new Error('Command does not have a middleware stack');
     }
 
     commandWithMiddleware.middlewareStack.add(
         (next: any) => async (args: any) => {
             const request = args.request as any;
             if (request?.headers && !request.headers['content-length']) {
                 request.headers['content-length'] = String(contentLength);
             }
@@ -40,10 +83,10 @@
 }
 
 export function createCustomErrorMiddleware() {
     return (next: any) => async (args: any) => {
         try {
             return await next(args);
         } catch (error: any) {
             const parseXmlError = (xml: string) => {
                 try {
                     const result = new XMLParser({}).parse(xml);
@@ -70,7 +113,7 @@
                 const xml = body?.toString() || '';
                 const errorInfo = parseXmlError(xml);
 
                 const xmlError: any = new CloudserverBackbeatRoutesServiceException({
                     name: errorInfo.code || error.name,
                     message: errorInfo.message || 'XML error response',
                     $fault: statusCode >= 500 ? 'server' : 'client',
@@ -90,7 +133,7 @@
                 const title = html.match(/<title[^>]*>([^<]+)<\/title>/i);
                 const message = title && title[1] || 'HTML error response';
 
                 const htmlError: any = new CloudserverBackbeatRoutesServiceException({
                     name: `HTML ${response?.reason || 'Error'}`,
                     message,
                     $fault: statusCode >= 500 ? 'server' : 'client',

tests/testApis.test.ts

@@ -13,10 +13,11 @@
 } from '../src/index';
 import { S3Client, GetObjectCommand as S3getCommand } from '@aws-sdk/client-s3';
 import { createTestClient, testConfig } from './testSetup';
 import { describeForMetadataBackend } from './testHelpers';
 import assert from 'assert';
+import { v7 as uuidv7 } from 'uuid';
 
-describeForMetadataBackend('CloudServer Backbeat Routes API Tests', () => {
+describe('CloudServer Backbeat Routes API Tests', () => {
     let backbeatRoutesClient: BackbeatRoutesClient;
     let s3client: S3Client;
 
@@ -37,7 +38,7 @@
             CanonicalID: testConfig.canonicalID,
             ContentMD5: etag,
             Body: getData.Body,
-            VersioningRequired: true
+            VersioningRequired: true,
         };
 
         const command2 = new PutDataCommand(putInput);
@@ -46,10 +47,44 @@
             getData.ContentLength
         );
         const data = await backbeatRoutesClient.send(command2);
         const locationAny: any = data.Location as any;
         assert.ok(locationAny[0].key !== undefined);
     });
 
+    it('should test putData for CRR-Cascaded', async () => {
+        const command = new S3getCommand({
+            Bucket: testConfig.bucketName,
+            Key: testConfig.objectKey,
+        });
+        const getData = await s3client.send(command);
+        const etag = getData.ETag?.replace(/"/g, '') || '';
+        let older = uuidv7();
+        // sleep for 10ms
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        const putInput: PutDataCommandInput = {
+            Bucket: testConfig.bucketName,
+            Key: testConfig.objectKey,
+            CanonicalID: testConfig.canonicalID,
+            ContentMD5: etag,
+            Body: getData.Body,
+            VersioningRequired: true,
+            MicroVersionId: uuidv7(),
+        };
+
+        const command2 = new PutDataCommand(putInput);
+        addContentLengthMiddleware(
+            command2,
+            getData.ContentLength
+        );
+        const data = await backbeatRoutesClient.send(command2);
+        console.log("AAAA data: ", data);
+        command2.input.MicroVersionId = older;
+        const data2 = await backbeatRoutesClient.send(command2);
+        console.log("AAAA data: ", data2);
+        // const locationAny: any = data.Location as any;
+        // assert.ok(locationAny[0].key !== undefined);
+    });
+
     it('should test GetSingleObject', async () => {
         const getInput: GetObjectInput = {
             Bucket: testConfig.bucketName,