fix(core): update
This commit is contained in:
		@@ -19,23 +19,35 @@ mirror:
 | 
			
		||||
  stage: security
 | 
			
		||||
  script:
 | 
			
		||||
    - npmci git mirror
 | 
			
		||||
  only:
 | 
			
		||||
    - tags
 | 
			
		||||
  tags:
 | 
			
		||||
    - lossless
 | 
			
		||||
    - docker
 | 
			
		||||
    - notpriv
 | 
			
		||||
 | 
			
		||||
audit:
 | 
			
		||||
auditProductionDependencies:
 | 
			
		||||
  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 | 
			
		||||
  stage: security
 | 
			
		||||
  script:
 | 
			
		||||
    - npmci npm prepare
 | 
			
		||||
    - npmci command npm install --production --ignore-scripts
 | 
			
		||||
    - npmci command npm config set registry https://registry.npmjs.org
 | 
			
		||||
    - npmci command npm audit --audit-level=high --only=prod --production
 | 
			
		||||
  tags:
 | 
			
		||||
    - docker
 | 
			
		||||
 | 
			
		||||
auditDevDependencies:
 | 
			
		||||
  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 | 
			
		||||
  stage: security
 | 
			
		||||
  script:
 | 
			
		||||
    - npmci npm prepare
 | 
			
		||||
    - npmci command npm install --ignore-scripts
 | 
			
		||||
    - npmci command npm config set registry https://registry.npmjs.org
 | 
			
		||||
    - npmci command npm audit --audit-level=high
 | 
			
		||||
    - npmci command npm audit --audit-level=high --only=dev
 | 
			
		||||
  tags:
 | 
			
		||||
    - lossless
 | 
			
		||||
    - docker
 | 
			
		||||
    - notpriv
 | 
			
		||||
  allow_failure: true
 | 
			
		||||
 | 
			
		||||
# ====================
 | 
			
		||||
# test stage
 | 
			
		||||
@@ -50,9 +62,7 @@ testStable:
 | 
			
		||||
    - npmci npm test
 | 
			
		||||
  coverage: /\d+.?\d+?\%\s*coverage/
 | 
			
		||||
  tags:
 | 
			
		||||
    - lossless
 | 
			
		||||
    - docker
 | 
			
		||||
    - priv
 | 
			
		||||
 | 
			
		||||
testBuild:
 | 
			
		||||
  stage: test
 | 
			
		||||
@@ -63,9 +73,7 @@ testBuild:
 | 
			
		||||
    - npmci command npm run build
 | 
			
		||||
  coverage: /\d+.?\d+?\%\s*coverage/
 | 
			
		||||
  tags:
 | 
			
		||||
    - lossless
 | 
			
		||||
    - docker
 | 
			
		||||
    - notpriv
 | 
			
		||||
 | 
			
		||||
release:
 | 
			
		||||
  stage: release
 | 
			
		||||
@@ -85,6 +93,8 @@ release:
 | 
			
		||||
codequality:
 | 
			
		||||
  stage: metadata
 | 
			
		||||
  allow_failure: true
 | 
			
		||||
  only:
 | 
			
		||||
    - tags
 | 
			
		||||
  script:
 | 
			
		||||
    - npmci command npm install -g tslint typescript
 | 
			
		||||
    - npmci npm prepare
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							@@ -15,7 +15,7 @@
 | 
			
		||||
            "properties": {
 | 
			
		||||
              "projectType": {
 | 
			
		||||
                "type": "string",
 | 
			
		||||
                "enum": ["website", "element", "service", "npm"]
 | 
			
		||||
                "enum": ["website", "element", "service", "npm", "wcc"]
 | 
			
		||||
              }
 | 
			
		||||
            }
 | 
			
		||||
          }
 | 
			
		||||
 
 | 
			
		||||
@@ -39,5 +39,8 @@
 | 
			
		||||
    "cli.js",
 | 
			
		||||
    "npmextra.json",
 | 
			
		||||
    "readme.md"
 | 
			
		||||
  ],
 | 
			
		||||
  "browserslist": [
 | 
			
		||||
    "last 1 chrome versions"
 | 
			
		||||
  ]
 | 
			
		||||
}
 | 
			
		||||
@@ -53,9 +53,9 @@ const smartlogPackage: ILogPackage = {
 | 
			
		||||
    containerName: 'ci-mojoio-logdna',
 | 
			
		||||
    environment: 'test',
 | 
			
		||||
    runtime: 'node',
 | 
			
		||||
    zone: 'shipzone'
 | 
			
		||||
    zone: 'shipzone',
 | 
			
		||||
  },
 | 
			
		||||
  message: 'this is an awesome log message sent by the tapbundle test'
 | 
			
		||||
  message: 'this is an awesome log message sent by the tapbundle test',
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const logdnaMessage = LogdnaMessage.fromSmartLogPackage(smartlogPackage);
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										24
									
								
								test/test.ts
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								test/test.ts
									
									
									
									
									
								
							@@ -24,13 +24,13 @@ tap.test('should create a standard log message', async () => {
 | 
			
		||||
      containerName: 'ci-mojoio-logdna',
 | 
			
		||||
      environment: 'test',
 | 
			
		||||
      runtime: 'node',
 | 
			
		||||
      zone: 'shipzone'
 | 
			
		||||
      zone: 'shipzone',
 | 
			
		||||
    },
 | 
			
		||||
    correlation: {
 | 
			
		||||
      id: '123',
 | 
			
		||||
      type: 'none'
 | 
			
		||||
      type: 'none',
 | 
			
		||||
    },
 | 
			
		||||
    message: 'this is an awesome log message sent by the tapbundle test'
 | 
			
		||||
    message: 'this is an awesome log message sent by the tapbundle test',
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@@ -51,13 +51,13 @@ tap.test('should send in order', async () => {
 | 
			
		||||
        containerName: 'ci-mojoio-logdna',
 | 
			
		||||
        environment: 'test',
 | 
			
		||||
        runtime: 'node',
 | 
			
		||||
        zone: 'shipzone'
 | 
			
		||||
        zone: 'shipzone',
 | 
			
		||||
      },
 | 
			
		||||
      message: `this is an awesome log message sent by the tapbundle test #${i}`,
 | 
			
		||||
      correlation: {
 | 
			
		||||
        id: '123',
 | 
			
		||||
        type: 'none'
 | 
			
		||||
      }
 | 
			
		||||
        type: 'none',
 | 
			
		||||
      },
 | 
			
		||||
    };
 | 
			
		||||
    testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage);
 | 
			
		||||
    i++;
 | 
			
		||||
@@ -73,13 +73,13 @@ tap.test('should send in order', async () => {
 | 
			
		||||
      containerName: 'ci-mojoio-logdna',
 | 
			
		||||
      environment: 'test',
 | 
			
		||||
      runtime: 'node',
 | 
			
		||||
      zone: 'shipzone'
 | 
			
		||||
      zone: 'shipzone',
 | 
			
		||||
    },
 | 
			
		||||
    correlation: {
 | 
			
		||||
      id: '123',
 | 
			
		||||
      type: 'none'
 | 
			
		||||
      type: 'none',
 | 
			
		||||
    },
 | 
			
		||||
    message: `this is an awesome log message sent by the tapbundle test #${i}`
 | 
			
		||||
    message: `this is an awesome log message sent by the tapbundle test #${i}`,
 | 
			
		||||
  };
 | 
			
		||||
  testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage2);
 | 
			
		||||
 | 
			
		||||
@@ -93,13 +93,13 @@ tap.test('should send in order', async () => {
 | 
			
		||||
      containerName: 'ci-mojoio-logdna',
 | 
			
		||||
      environment: 'test',
 | 
			
		||||
      runtime: 'node',
 | 
			
		||||
      zone: 'shipzone'
 | 
			
		||||
      zone: 'shipzone',
 | 
			
		||||
    },
 | 
			
		||||
    correlation: {
 | 
			
		||||
      id: '123',
 | 
			
		||||
      type: 'none'
 | 
			
		||||
      type: 'none',
 | 
			
		||||
    },
 | 
			
		||||
    message: `this is an awesome log message sent by the tapbundle test #${i}`
 | 
			
		||||
    message: `this is an awesome log message sent by the tapbundle test #${i}`,
 | 
			
		||||
  };
 | 
			
		||||
  testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage3);
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ export class LogAggregator {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public addLog(urlIdentifierArg: string, logLineArg: any) {
 | 
			
		||||
    let existinglogCandidate = this.logObjectMap.find(logCandidate => {
 | 
			
		||||
    let existinglogCandidate = this.logObjectMap.find((logCandidate) => {
 | 
			
		||||
      return logCandidate.urlIdentifier === urlIdentifierArg;
 | 
			
		||||
    });
 | 
			
		||||
    if (!existinglogCandidate) {
 | 
			
		||||
@@ -42,18 +42,15 @@ export class LogAggregator {
 | 
			
		||||
    this.logObjectMap.remove(logCandidate);
 | 
			
		||||
    // lets post the message to logdna
 | 
			
		||||
    const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`;
 | 
			
		||||
    const response = await plugins.smartrequest.postJson(
 | 
			
		||||
      url,
 | 
			
		||||
      {
 | 
			
		||||
    const response = await plugins.smartrequest.postJson(url, {
 | 
			
		||||
      headers: {
 | 
			
		||||
        Authorization: this.createBasicAuth(),
 | 
			
		||||
          charset: 'UTF-8'
 | 
			
		||||
        charset: 'UTF-8',
 | 
			
		||||
      },
 | 
			
		||||
      requestBody: {
 | 
			
		||||
          lines: logCandidate.logLines
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    );
 | 
			
		||||
        lines: logCandidate.logLines,
 | 
			
		||||
      },
 | 
			
		||||
    });
 | 
			
		||||
    if (response.statusCode !== 200) {
 | 
			
		||||
      console.log(response.body);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -73,7 +73,7 @@ export class LogdnaMessage {
 | 
			
		||||
        ...smartlogPackageArg.context,
 | 
			
		||||
        logType: smartlogPackageArg.type,
 | 
			
		||||
        correlation: smartlogPackageArg.correlation,
 | 
			
		||||
        data: smartlogPackageArg.data || {}
 | 
			
		||||
        data: smartlogPackageArg.data || {},
 | 
			
		||||
      },
 | 
			
		||||
      env: smartlogPackageArg.context.environment,
 | 
			
		||||
      hostname: smartlogPackageArg.context.zone,
 | 
			
		||||
@@ -86,7 +86,7 @@ export class LogdnaMessage {
 | 
			
		||||
        return tagArray;
 | 
			
		||||
      })(),
 | 
			
		||||
      ip: '0.0.0.0',
 | 
			
		||||
      mac: 'aa:aa:aa:aa:aa:aa'
 | 
			
		||||
      mac: 'aa:aa:aa:aa:aa:aa',
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ export class LogdnaAccount {
 | 
			
		||||
          return `${reduced},${euc(newItem)}`;
 | 
			
		||||
        });
 | 
			
		||||
      })()
 | 
			
		||||
    )
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    // let construct the request uri
 | 
			
		||||
    const requestUrlWithParams = `?hostname=${uriHostname}&mac=${uriMac}&ip=1${uriIp}&tags=${uriTags}`;
 | 
			
		||||
@@ -51,7 +51,7 @@ export class LogdnaAccount {
 | 
			
		||||
      app: lm.options.app,
 | 
			
		||||
      level: lm.options.level,
 | 
			
		||||
      env: lm.options.env,
 | 
			
		||||
      meta: lm.options.meta
 | 
			
		||||
      meta: lm.options.meta,
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    this.logAggregator.addLog(requestUrlWithParams, logLine);
 | 
			
		||||
@@ -69,9 +69,9 @@ export class LogdnaAccount {
 | 
			
		||||
   */
 | 
			
		||||
  public get smartlogDestination(): ILogDestination {
 | 
			
		||||
    return {
 | 
			
		||||
      handleLog: async logPackageArg => {
 | 
			
		||||
      handleLog: async (logPackageArg) => {
 | 
			
		||||
        this.sendSmartlogPackage(logPackageArg);
 | 
			
		||||
      }
 | 
			
		||||
      },
 | 
			
		||||
    };
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user