@rainbow-o23/n1 1.0.59 → 1.0.60

package/index.cjs

@@ -399,7 +399,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __decorate(decorators, target, key, desc) {
@@ -813,6 +813,12 @@ class AbstractPipeline extends AbstractPipelineExecution {
         const options = this.buildStepOptions();
         return await Promise.all(this.getStepBuilders().map(async (builder) => await builder.create(options)));
     }
+    defendPipelineRequest(request) {
+        if (request.$context == null) {
+            request.$context = new PipelineExecutionContext();
+        }
+        return request;
+    }
     convertRequestToPipelineData(request) {
         return {
             content: request.payload,
@@ -825,16 +831,8 @@ class AbstractPipeline extends AbstractPipelineExecution {
             $context: result.$context
         };
     }
-    createTraceId(request) {
-        const { traceId } = request.$context ?? {};
-        if (traceId == null || traceId.trim().length === 0) {
-            return nanoid.nanoid(16);
-        }
-        else {
-            return traceId;
-        }
-    }
     async perform(request) {
+        request = this.defendPipelineRequest(request);
         const $context = request.$context;
         const traceId = $context.traceId;
         const response = await this.measurePerformance(traceId, 'PIPELINE')

package/index.js

@@ -397,7 +397,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __decorate(decorators, target, key, desc) {
@@ -811,6 +811,12 @@ class AbstractPipeline extends AbstractPipelineExecution {
         const options = this.buildStepOptions();
         return await Promise.all(this.getStepBuilders().map(async (builder) => await builder.create(options)));
     }
+    defendPipelineRequest(request) {
+        if (request.$context == null) {
+            request.$context = new PipelineExecutionContext();
+        }
+        return request;
+    }
     convertRequestToPipelineData(request) {
         return {
             content: request.payload,
@@ -823,16 +829,8 @@ class AbstractPipeline extends AbstractPipelineExecution {
             $context: result.$context
         };
     }
-    createTraceId(request) {
-        const { traceId } = request.$context ?? {};
-        if (traceId == null || traceId.trim().length === 0) {
-            return nanoid(16);
-        }
-        else {
-            return traceId;
-        }
-    }
     async perform(request) {
+        request = this.defendPipelineRequest(request);
         const $context = request.$context;
         const traceId = $context.traceId;
         const response = await this.measurePerformance(traceId, 'PIPELINE')

package/lib/pipeline/pipeline.d.ts

@@ -5,7 +5,7 @@ import { PipelineStep, PipelineStepBuilder, PipelineStepData, PipelineStepOption
 export type PipelineRequestPayload = any;
 export interface PipelineRequest<C = PipelineRequestPayload> {
     payload: C;
-    $context: PipelineExecutionContext;
+    $context?: PipelineExecutionContext;
 }
 export type PipelineResponsePayload = any;
 export interface PipelineResponse<C = PipelineResponsePayload> {
@@ -30,9 +30,9 @@ export declare abstract class AbstractPipeline<In = any, Out = any> extends Abst
     protected abstract getStepBuilders(): Array<PipelineStepBuilder>;
     protected buildStepOptions(): Pick<PipelineStepOptions, 'config' | 'logger'>;
     createSteps(): Promise<Array<PipelineStep>>;
+    protected defendPipelineRequest(request: PipelineRequest<In>): Required<PipelineRequest<In>>;
     convertRequestToPipelineData<I, FirstStepIn>(request: PipelineRequest<I>): PipelineStepData<FirstStepIn>;
     convertPipelineDataToResponse<LastStepOut, O>(result: PipelineStepData<LastStepOut>): PipelineResponse<O>;
-    protected createTraceId(request: PipelineRequest<In>): string;
     perform(request: PipelineRequest<In>): Promise<PipelineResponse<Out>>;
 }
 export declare abstract class AbstractStaticPipeline<In = any, Out = any> extends AbstractPipeline<In, Out> {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rainbow-o23/n1",
-	"version": "1.0.59",
+	"version": "1.0.60",
 	"description": "o23 interfaces",
 	"main": "index.cjs",
 	"module": "index.js",

package/src/lib/pipeline/pipeline.ts

@@ -1,4 +1,3 @@
-import {nanoid} from 'nanoid';
 import {Config, Logger} from '../utils';
 import {AbstractPipelineExecution, PipelineExecutionOptions} from './pipeline-execution';
 import {PipelineExecutionContext} from './pipeline-execution-context';
@@ -16,7 +15,7 @@ export type PipelineRequestPayload = any;
 
 export interface PipelineRequest<C = PipelineRequestPayload> {
 	payload: C;
-	$context: PipelineExecutionContext;
+	$context?: PipelineExecutionContext;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -78,6 +77,13 @@ export abstract class AbstractPipeline<In = any, Out = any> extends AbstractPipe
 		return await Promise.all(this.getStepBuilders().map(async builder => await builder.create(options)));
 	}
 
+	protected defendPipelineRequest(request: PipelineRequest<In>): Required<PipelineRequest<In>> {
+		if (request.$context == null) {
+			request.$context = new PipelineExecutionContext();
+		}
+		return request as Required<PipelineRequest<In>>;
+	}
+
 	public convertRequestToPipelineData<I, FirstStepIn>(request: PipelineRequest<I>): PipelineStepData<FirstStepIn> {
 		return {
 			content: request.payload as unknown as FirstStepIn,
@@ -92,15 +98,6 @@ export abstract class AbstractPipeline<In = any, Out = any> extends AbstractPipe
 		};
 	}
 
-	protected createTraceId(request: PipelineRequest<In>): string {
-		const {traceId} = request.$context ?? {};
-		if (traceId == null || traceId.trim().length === 0) {
-			return nanoid(16);
-		} else {
-			return traceId;
-		}
-	}
-
 	/**
 	 * perform pipeline.
 	 * - first step use request as input,
@@ -108,6 +105,7 @@ export abstract class AbstractPipeline<In = any, Out = any> extends AbstractPipe
 	 * - use last step's result as response.
 	 */
 	public async perform(request: PipelineRequest<In>): Promise<PipelineResponse<Out>> {
+		request = this.defendPipelineRequest(request);
 		const $context = request.$context;
 		const traceId = $context.traceId;
 		const response = await this.measurePerformance(traceId, 'PIPELINE')