apipost-cli 1.0.13 → 1.0.15

package/dist/index.js

@@ -779,35 +779,34 @@ const downloadTestReport = async (data, options, request) => {
   const now = dayjs();
   const formattedTime = now.format('YYYY-MM-DD HH:mm:ss');
 
+  //检查options.outDir 是否存在，是否是目录
+  if (!fs.existsSync(options.outDir)) {
+    try {
+      fs.mkdirSync(options.outDir, { recursive: true });
+    }catch(e){
+      console.log(`${formattedTime}\t 报告目录${options.outDir}无法创建成功,${String(err)}, 报告保存失败`)
+      fs.appendFileSync(path.join(homedir, 'apipost-cli-error.log'), `${formattedTime}\t${String(err)}\n`);
+      return
+    }
+  }
+  
   for (const type of options.reporters.split(',')) {
     if (['html', 'json'].indexOf(type) > -1) {
       const reportContent = type === 'html'
         ? RENDER_TEST_REPORT_HTML_STR(data)
         : JSON.stringify(data, null, '\t');
 
-      const finalFilePath = __nccwpck_require__.ab + "apipost-cli/" + options.outDir + '/' + options.outFile || `apipost-reports-${formattedTime}` + '.' + type;
+      const finalFilePath = path.join(options.outDir, `${options.outFile || `apipost-reports-${formattedTime}`}.${type}`);
 
       let retries = 0;
 
-      while (true) {
+      for (let i = 0; i < 2; i++) {
         try {
           fs.writeFileSync(finalFilePath, reportContent);
           break;
         } catch (err) {
+          console.log(`${formattedTime}\t ${finalFilePath}报告保存失败,${String(err)}, 重试中...`)
           fs.appendFileSync(path.join(homedir, 'apipost-cli-error.log'), `${formattedTime}\t${String(err)}\n`);
-
-          if (err.code === 'ENOENT') {
-            fs.mkdirSync(options.outDir, { recursive: true });
-            continue;
-          }
-
-          if (err.code === 'EMFILE' && retries < 10) {
-            retries++;
-            await new Promise(resolve => setTimeout(resolve, 50 * retries));
-            continue;
-          }
-
-          throw err;
         }
       }
     }
@@ -565718,9 +565717,10 @@ program.version(pkginfo.version, '-v, --version', 'apipost-cli 当前版本')
 
 let last_msg = "";
 
+const currentWorkingDirectory = process.cwd();
 const cliOption = {
   reporters: 'cli',
-  outDir: './apipost-reports',
+  outDir: __nccwpck_require__.ab + "apipost-reports",
   outFile: '',
   iterationData: '',
   iterationCount: 1,
@@ -565855,8 +565855,12 @@ const runTestEvents = async (data, options) => {
 }
 
 const parseCommandString = async (url, options) => {
-  console.log(`log: ${formattedTime}\tstart run & log to ${path.join(homedir, 'apipost-cli-error.log')}`);
+  //判断是否有outDir， 如果把路径解析成绝对路径
+  if (options.outDir) {
+    options.outDir = path.resolve(options.outDir);
+  }
   _.merge(cliOption, _.mapKeys(options, (value, key) => _.camelCase(key)))
+  console.log(`log: ${formattedTime}\tstart run & log to ${path.join(homedir, 'apipost-cli-error.log')} & report dir ${cliOption.outDir}`);
 
   if (_.intersection(_.split(cliOption.reporters, ','), ['html', 'json'])) {
     const urlRegex = /^(?:(?:https?|ftp):\/\/)?(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|[\w-]+(?:\.[\w-]+)+)(?::\d+)?(?:\/[\w-]+)*(?:\?[\w-]+=[\w-]+(?:&[\w-]+=[\w-]+)*)?(?:#[\w-]+)?$/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apipost-cli",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Apipost 命令行运行工具",
   "main": "./dist/index.js",
   "files": [

package/dist/apipost-cli/node_modules/@azure/abort-controller/types/3.1/AbortController.d.ts

@@ -1,85 +0,0 @@
-import { AbortSignal, AbortSignalLike } from "./AbortSignal";
-/**
- * This error is thrown when an asynchronous operation has been aborted.
- * Check for this error by testing the `name` that the name property of the
- * error matches `"AbortError"`.
- *
- * @example
- * ```ts
- * const controller = new AbortController();
- * controller.abort();
- * try {
- *   doAsyncWork(controller.signal)
- * } catch (e) {
- *   if (e.name === 'AbortError') {
- *     // handle abort error here.
- *   }
- * }
- * ```
- */
-export declare class AbortError extends Error {
-    constructor(message?: string);
-}
-/**
- * An AbortController provides an AbortSignal and the associated controls to signal
- * that an asynchronous operation should be aborted.
- *
- * @example
- * Abort an operation when another event fires
- * ```ts
- * const controller = new AbortController();
- * const signal = controller.signal;
- * doAsyncWork(signal);
- * button.addEventListener('click', () => controller.abort());
- * ```
- *
- * @example
- * Share aborter cross multiple operations in 30s
- * ```ts
- * // Upload the same data to 2 different data centers at the same time,
- * // abort another when any of them is finished
- * const controller = AbortController.withTimeout(30 * 1000);
- * doAsyncWork(controller.signal).then(controller.abort);
- * doAsyncWork(controller.signal).then(controller.abort);
- *```
- *
- * @example
- * Cascaded aborting
- * ```ts
- * // All operations can't take more than 30 seconds
- * const aborter = Aborter.timeout(30 * 1000);
- *
- * // Following 2 operations can't take more than 25 seconds
- * await doAsyncWork(aborter.withTimeout(25 * 1000));
- * await doAsyncWork(aborter.withTimeout(25 * 1000));
- * ```
- */
-export declare class AbortController {
-    private _signal;
-    /**
-     * @param parentSignals - The AbortSignals that will signal aborted on the AbortSignal associated with this controller.
-     */
-    constructor(parentSignals?: AbortSignalLike[]);
-    /**
-     * @param parentSignals - The AbortSignals that will signal aborted on the AbortSignal associated with this controller.
-     */
-    constructor(...parentSignals: AbortSignalLike[]);
-    /*
-    * The AbortSignal associated with this controller that will signal aborted
-    * when the abort method is called on this controller.
-    *
-    * @readonly
-    */
-    readonly signal: AbortSignal;
-    /**
-     * Signal that any operations passed this controller's associated abort signal
-     * to cancel any remaining work and throw an `AbortError`.
-     */
-    abort(): void;
-    /**
-     * Creates a new AbortSignal instance that will abort after the provided ms.
-     * @param ms - Elapsed time in milliseconds to trigger an abort.
-     */
-    static timeout(ms: number): AbortSignal;
-}
-//# sourceMappingURL=AbortController.d.ts.map

package/dist/apipost-cli/node_modules/@azure/abort-controller/types/3.1/AbortSignal.d.ts

@@ -1,80 +0,0 @@
-/// <reference path="../../shims-public.d.ts" />
-/**
- * Allows the request to be aborted upon firing of the "abort" event.
- * Compatible with the browser built-in AbortSignal and common polyfills.
- */
-export interface AbortSignalLike {
-    /**
-     * Indicates if the signal has already been aborted.
-     */
-    readonly aborted: boolean;
-    /**
-     * Add new "abort" event listener, only support "abort" event.
-     */
-    addEventListener(type: "abort", listener: (this: AbortSignalLike, ev: any) => any, options?: any): void;
-    /**
-     * Remove "abort" event listener, only support "abort" event.
-     */
-    removeEventListener(type: "abort", listener: (this: AbortSignalLike, ev: any) => any, options?: any): void;
-}
-/**
- * An aborter instance implements AbortSignal interface, can abort HTTP requests.
- *
- * - Call AbortSignal.none to create a new AbortSignal instance that cannot be cancelled.
- * Use `AbortSignal.none` when you are required to pass a cancellation token but the operation
- * cannot or will not ever be cancelled.
- *
- * @example
- * Abort without timeout
- * ```ts
- * await doAsyncWork(AbortSignal.none);
- * ```
- */
-export declare class AbortSignal implements AbortSignalLike {
-    constructor();
-    /*
-    * Status of whether aborted or not.
-    *
-    * @readonly
-    */
-    readonly aborted: boolean;
-    /*
-    * Creates a new AbortSignal instance that will never be aborted.
-    *
-    * @readonly
-    */
-    static readonly none: AbortSignal;
-    /**
-     * onabort event listener.
-     */
-    onabort: ((ev?: Event) => any) | null;
-    /**
-     * Added new "abort" event listener, only support "abort" event.
-     *
-     * @param _type - Only support "abort" event
-     * @param listener - The listener to be added
-     */
-    addEventListener(_type: "abort", listener: (this: AbortSignalLike, ev: any) => any): void;
-    /**
-     * Remove "abort" event listener, only support "abort" event.
-     *
-     * @param _type - Only support "abort" event
-     * @param listener - The listener to be removed
-     */
-    removeEventListener(_type: "abort", listener: (this: AbortSignalLike, ev: any) => any): void;
-    /**
-     * Dispatches a synthetic event to the AbortSignal.
-     */
-    dispatchEvent(_event: Event): boolean;
-}
-/**
- * Helper to trigger an abort event immediately, the onabort and all abort event listeners will be triggered.
- * Will try to trigger abort event for all linked AbortSignal nodes.
- *
- * - If there is a timeout, the timer will be cancelled.
- * - If aborted is true, nothing will happen.
- *
- * @internal
- */
-export declare function abortSignal(signal: AbortSignal): void;
-//# sourceMappingURL=AbortSignal.d.ts.map

package/dist/apipost-cli/node_modules/@azure/abort-controller/types/3.1/index.d.ts

@@ -1,3 +0,0 @@
-export { AbortController, AbortError } from "./AbortController";
-export { AbortSignal, AbortSignalLike } from "./AbortSignal";
-//# sourceMappingURL=index.d.ts.map

package/dist/apipost-cli/node_modules/@azure/core-auth/types/3.1/core-auth.d.ts

@@ -1,229 +0,0 @@
-import { AbortSignalLike } from '@azure/abort-controller';
-/**
- * Represents an access token with an expiration time.
- */
-export declare interface AccessToken {
-    /**
-     * The access token returned by the authentication service.
-     */
-    token: string;
-    /**
-     * The access token's expiration timestamp in milliseconds, UNIX epoch time.
-     */
-    expiresOnTimestamp: number;
-}
-/**
- * A static-key-based credential that supports updating
- * the underlying key value.
- */
-export declare class AzureKeyCredential implements KeyCredential {
-    private _key;
-    /*
-    * The value of the key to be used in authentication
-    */
-    readonly key: string;
-    /**
-     * Create an instance of an AzureKeyCredential for use
-     * with a service client.
-     *
-     * @param key - The initial value of the key to use in authentication
-     */
-    constructor(key: string);
-    /**
-     * Change the value of the key.
-     *
-     * Updates will take effect upon the next request after
-     * updating the key value.
-     *
-     * @param newKey - The new key value to be used
-     */
-    update(newKey: string): void;
-}
-/**
- * A static name/key-based credential that supports updating
- * the underlying name and key values.
- */
-export declare class AzureNamedKeyCredential implements NamedKeyCredential {
-    private _key;
-    private _name;
-    /*
-    * The value of the key to be used in authentication.
-    */
-    readonly key: string;
-    /*
-    * The value of the name to be used in authentication.
-    */
-    readonly name: string;
-    /**
-     * Create an instance of an AzureNamedKeyCredential for use
-     * with a service client.
-     *
-     * @param name - The initial value of the name to use in authentication.
-     * @param key - The initial value of the key to use in authentication.
-     */
-    constructor(name: string, key: string);
-    /**
-     * Change the value of the key.
-     *
-     * Updates will take effect upon the next request after
-     * updating the key value.
-     *
-     * @param newName - The new name value to be used.
-     * @param newKey - The new key value to be used.
-     */
-    update(newName: string, newKey: string): void;
-}
-/**
- * A static-signature-based credential that supports updating
- * the underlying signature value.
- */
-export declare class AzureSASCredential implements SASCredential {
-    private _signature;
-    /*
-    * The value of the shared access signature to be used in authentication
-    */
-    readonly signature: string;
-    /**
-     * Create an instance of an AzureSASCredential for use
-     * with a service client.
-     *
-     * @param signature - The initial value of the shared access signature to use in authentication
-     */
-    constructor(signature: string);
-    /**
-     * Change the value of the signature.
-     *
-     * Updates will take effect upon the next request after
-     * updating the signature value.
-     *
-     * @param newSignature - The new shared access signature value to be used
-     */
-    update(newSignature: string): void;
-}
-/**
- * Defines options for TokenCredential.getToken.
- */
-export declare interface GetTokenOptions {
-    /**
-     * The signal which can be used to abort requests.
-     */
-    abortSignal?: AbortSignalLike;
-    /**
-     * Options used when creating and sending HTTP requests for this operation.
-     */
-    requestOptions?: {
-        /**
-         * The number of milliseconds a request can take before automatically being terminated.
-         */
-        timeout?: number;
-    };
-    /**
-     * Options used when tracing is enabled.
-     */
-    tracingOptions?: {
-        /**
-         * Tracing Context for the current request.
-         */
-        tracingContext?: TracingContext;
-    };
-    /**
-     * Allows specifying a tenantId. Useful to handle challenges that provide tenant Id hints.
-     */
-    tenantId?: string;
-    /**
-     * Claim details to perform the Continuous Access Evaluation authentication flow
-     */
-    claims?: string;
-}
-/**
- * Tests an object to determine whether it implements NamedKeyCredential.
- *
- * @param credential - The assumed NamedKeyCredential to be tested.
- */
-export declare function isNamedKeyCredential(credential: unknown): credential is NamedKeyCredential;
-/**
- * Tests an object to determine whether it implements SASCredential.
- *
- * @param credential - The assumed SASCredential to be tested.
- */
-export declare function isSASCredential(credential: unknown): credential is SASCredential;
-/**
- * Tests an object to determine whether it implements TokenCredential.
- *
- * @param credential - The assumed TokenCredential to be tested.
- */
-export declare function isTokenCredential(credential: unknown): credential is TokenCredential;
-/**
- * Represents a credential defined by a static API key.
- */
-export declare interface KeyCredential {
-    /**
-     * The value of the API key represented as a string
-     */
-    readonly key: string;
-}
-/**
- * Represents a credential defined by a static API name and key.
- */
-export declare interface NamedKeyCredential {
-    /**
-     * The value of the API key represented as a string
-     */
-    readonly key: string;
-    /**
-     * The value of the API name represented as a string.
-     */
-    readonly name: string;
-}
-/**
- * Represents a credential defined by a static shared access signature.
- */
-export declare interface SASCredential {
-    /**
-     * The value of the shared access signature represented as a string
-     */
-    readonly signature: string;
-}
-/**
- * Represents a credential capable of providing an authentication token.
- */
-export declare interface TokenCredential {
-    /**
-     * Gets the token provided by this credential.
-     *
-     * This method is called automatically by Azure SDK client libraries. You may call this method
-     * directly, but you must also handle token caching and token refreshing.
-     *
-     * @param scopes - The list of scopes for which the token will have access.
-     * @param options - The options used to configure any requests this
-     *                TokenCredential implementation might make.
-     */
-    getToken(scopes: string | string[], options?: GetTokenOptions): Promise<AccessToken | null>;
-}
-/**
- * An interface structurally compatible with OpenTelemetry.
- */
-export declare interface TracingContext {
-    /**
-     * Get a value from the context.
-     *
-     * @param key - key which identifies a context value
-     */
-    getValue(key: symbol): unknown;
-    /**
-     * Create a new context which inherits from this context and has
-     * the given key set to the given value.
-     *
-     * @param key - context key for which to set the value
-     * @param value - value to set for the given key
-     */
-    setValue(key: symbol, value: unknown): TracingContext;
-    /**
-     * Return a new context which inherits from this context but does
-     * not contain a value for the given key.
-     *
-     * @param key - context key for which to clear a value
-     */
-    deleteValue(key: symbol): TracingContext;
-}
-export {};