fix(core): update
This commit is contained in:
parent
4d14526858
commit
830a46ab30
|
|
@ -12,20 +12,12 @@ stages:
|
|||
- release
|
||||
- metadata
|
||||
|
||||
before_script:
|
||||
- npm install -g @shipzone/npmci
|
||||
|
||||
# ====================
|
||||
# security stage
|
||||
# ====================
|
||||
mirror:
|
||||
stage: security
|
||||
script:
|
||||
- npmci git mirror
|
||||
only:
|
||||
- tags
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
auditProductionDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
stage: security
|
||||
|
|
@ -36,6 +28,7 @@ auditProductionDependencies:
|
|||
- npmci command npm audit --audit-level=high --only=prod --production
|
||||
tags:
|
||||
- docker
|
||||
allow_failure: true
|
||||
|
||||
auditDevDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
|
|
@ -96,10 +89,9 @@ codequality:
|
|||
only:
|
||||
- tags
|
||||
script:
|
||||
- npmci command npm install -g tslint typescript
|
||||
- npmci command npm install -g typescript
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
|
|
@ -119,11 +111,10 @@ trigger:
|
|||
pages:
|
||||
stage: metadata
|
||||
script:
|
||||
- npmci node install lts
|
||||
- npmci command npm install -g @gitzone/tsdoc
|
||||
- npmci node install stable
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command tsdoc
|
||||
- npmci command npm run buildDocs
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
|
|
|
|||
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
|
|
@ -2,28 +2,10 @@
|
|||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "current file",
|
||||
"type": "node",
|
||||
"command": "npm test",
|
||||
"name": "Run npm test",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"${relativeFile}"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"name": "test.ts",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"test/test.ts"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
"type": "node-terminal"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "uptimelink",
|
||||
"gitscope": "uptime.link",
|
||||
"gitrepo": "detector",
|
||||
"shortDescription": "a detector for answering network questions locally. It does not rely on any online services.",
|
||||
"npmPackagename": "@uptimelink/detector",
|
||||
"description": "a detector for answering network questions locally. It does not rely on any online services.",
|
||||
"npmPackagename": "@uptime.link/detector",
|
||||
"license": "MIT",
|
||||
"projectDomain": "uptime.link"
|
||||
}
|
||||
|
|
|
|||
18474
package-lock.json
generated
18474
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
|
|
@ -1,28 +1,30 @@
|
|||
{
|
||||
"name": "@uptimelink/detector",
|
||||
"name": "@uptime.link/detector",
|
||||
"version": "1.0.4",
|
||||
"private": false,
|
||||
"description": "a detector for answering network questions locally. It does not rely on any online services.",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
"type": "module",
|
||||
"author": "Lossless GmbH",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"test": "(tstest test/ --web)",
|
||||
"build": "(tsbuild --web)"
|
||||
"build": "(tsbuild --web --allowimplicitany)",
|
||||
"buildDocs": "tsdoc"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.25",
|
||||
"@gitzone/tsbundle": "^1.0.78",
|
||||
"@gitzone/tstest": "^1.0.44",
|
||||
"@pushrocks/tapbundle": "^3.2.9",
|
||||
"@types/node": "^14.11.2",
|
||||
"@gitzone/tsbuild": "^2.1.63",
|
||||
"@gitzone/tsbundle": "^2.0.5",
|
||||
"@gitzone/tstest": "^1.0.71",
|
||||
"@pushrocks/tapbundle": "^5.0.3",
|
||||
"@types/node": "^18.0.5",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-config-prettier": "^1.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@pushrocks/smartnetwork": "^2.0.4",
|
||||
"@pushrocks/smarturl": "^1.0.8"
|
||||
"@pushrocks/smartnetwork": "^3.0.0",
|
||||
"@pushrocks/smarturl": "^2.0.1"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 1 chrome versions"
|
||||
|
|
@ -39,4 +41,4 @@
|
|||
"npmextra.json",
|
||||
"readme.md"
|
||||
]
|
||||
}
|
||||
}
|
||||
24
readme.md
24
readme.md
|
|
@ -1,26 +1,26 @@
|
|||
# @uptimelink/detector
|
||||
# @uptime.link/detector
|
||||
a detector for answering network questions locally. It does not rely on any online services.
|
||||
|
||||
## Availabililty and Links
|
||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@uptimelink/detector)
|
||||
* [gitlab.com (source)](https://gitlab.com/uptimelink/detector)
|
||||
* [github.com (source mirror)](https://github.com/uptimelink/detector)
|
||||
* [docs (typedoc)](https://uptimelink.gitlab.io/detector/)
|
||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@uptime.link/detector)
|
||||
* [gitlab.com (source)](https://gitlab.com/uptime.link/detector)
|
||||
* [github.com (source mirror)](https://github.com/uptime.link/detector)
|
||||
* [docs (typedoc)](https://uptime.link.gitlab.io/detector/)
|
||||
|
||||
## Status for master
|
||||
|
||||
Status Category | Status Badge
|
||||
-- | --
|
||||
GitLab Pipelines | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
GitLab Pipelines | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
TypeScript Support | [](https://lossless.cloud)
|
||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
Code Style | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||
|
||||
## Usage
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
import { expect, tap } from '@pushrocks/tapbundle';
|
||||
import * as detector from '../ts/index';
|
||||
import * as detector from '../ts/index.js';
|
||||
|
||||
let testDetector: detector.Detector;
|
||||
|
||||
tap.test('first test', async () => {
|
||||
testDetector = new detector.Detector();
|
||||
expect(testDetector).to.be.instanceOf(detector.Detector);
|
||||
expect(testDetector).toBeInstanceOf(detector.Detector);
|
||||
});
|
||||
|
||||
tap.test('should detect an closed port on a local domain', async () => {
|
||||
const result = await testDetector.isActive('http://localhost:3008');
|
||||
expect(result).to.be.false;
|
||||
expect(result).toBeFalse();
|
||||
});
|
||||
|
||||
tap.test('should detect an open port on a remote domain', async () => {
|
||||
const result = await testDetector.isActive('https://lossless.com');
|
||||
expect(result).to.be.true;
|
||||
expect(result).toBeTrue();
|
||||
});
|
||||
|
||||
tap.start();
|
||||
|
|
|
|||
8
ts/00_commitinfo_data.ts
Normal file
8
ts/00_commitinfo_data.ts
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
/**
|
||||
* autocreated commitinfo by @pushrocks/commitinfo
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@uptime.link/detector',
|
||||
version: '1.0.5',
|
||||
description: 'a detector for answering network questions locally. It does not rely on any online services.'
|
||||
}
|
||||
|
|
@ -1,19 +1,23 @@
|
|||
import * as plugins from './detector.plugins';
|
||||
import * as plugins from './detector.plugins.js';
|
||||
|
||||
export class Detector {
|
||||
private smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
|
||||
private smarturlInstance = new plugins.smarturl.Smarturl();
|
||||
|
||||
public async isActive(urlArg: string): Promise<boolean> {
|
||||
const parsedUrl = this.smarturlInstance.parseUrl(urlArg);
|
||||
const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(urlArg);
|
||||
if (parsedUrl.hostname === 'localhost') {
|
||||
console.log(`detector target is localhost on port ${parsedUrl.port}`);
|
||||
const portUnused = await this.smartnetworkInstance.isLocalPortUnused(parseInt(parsedUrl.port, 10));
|
||||
const portUnused = await this.smartnetworkInstance.isLocalPortUnused(
|
||||
parseInt(parsedUrl.port, 10)
|
||||
);
|
||||
const portAvailable = !portUnused;
|
||||
return portAvailable;
|
||||
} else {
|
||||
console.log(`detector target is remote domain ${parsedUrl.host} on port ${parsedUrl.port}`);
|
||||
const postAvailable = await this.smartnetworkInstance.isRemotePortAvailable(parsedUrl.host, parseInt(parsedUrl.port, 10));
|
||||
const postAvailable = await this.smartnetworkInstance.isRemotePortAvailable(
|
||||
parsedUrl.host,
|
||||
parseInt(parsedUrl.port, 10)
|
||||
);
|
||||
return postAvailable;
|
||||
}
|
||||
}
|
||||
|
|
@ -21,4 +25,4 @@ export class Detector {
|
|||
public detectType(urlArg: string) {
|
||||
console.log('TODO'); // TODO
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,4 @@
|
|||
import * as smartnetwork from '@pushrocks/smartnetwork';
|
||||
import * as smarturl from '@pushrocks/smarturl';
|
||||
|
||||
export {
|
||||
smartnetwork,
|
||||
smarturl
|
||||
};
|
||||
export { smartnetwork, smarturl };
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
export * from './detectpr.classes.detector';
|
||||
export * from './detector.classes.detector.js';
|
||||
|
|
|
|||
10
tsconfig.json
Normal file
10
tsconfig.json
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"experimentalDecorators": true,
|
||||
"useDefineForClassFields": false,
|
||||
"target": "ES2022",
|
||||
"module": "ES2022",
|
||||
"moduleResolution": "nodenext",
|
||||
"esModuleInterop": true
|
||||
}
|
||||
}
|
||||
17
tslint.json
17
tslint.json
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
||||
"rules": {
|
||||
"semicolon": [true, "always"],
|
||||
"no-console": false,
|
||||
"ordered-imports": false,
|
||||
"object-literal-sort-keys": false,
|
||||
"member-ordering": {
|
||||
"options":{
|
||||
"order": [
|
||||
"static-method"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"defaultSeverity": "warning"
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user