fix(core): update
This commit is contained in:
parent
4d14526858
commit
830a46ab30
@ -12,20 +12,12 @@ stages:
|
|||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- npm install -g @shipzone/npmci
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
mirror:
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci git mirror
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
auditProductionDependencies:
|
auditProductionDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
@ -36,6 +28,7 @@ auditProductionDependencies:
|
|||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
- npmci command npm audit --audit-level=high --only=prod --production
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
auditDevDependencies:
|
auditDevDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
@ -96,10 +89,9 @@ codequality:
|
|||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g typescript
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
@ -119,11 +111,10 @@ trigger:
|
|||||||
pages:
|
pages:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command npm run buildDocs
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -2,28 +2,10 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "current file",
|
"command": "npm test",
|
||||||
"type": "node",
|
"name": "Run npm test",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"args": [
|
"type": "node-terminal"
|
||||||
"${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"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
"projectType": "npm",
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "uptimelink",
|
"gitscope": "uptime.link",
|
||||||
"gitrepo": "detector",
|
"gitrepo": "detector",
|
||||||
"shortDescription": "a detector for answering network questions locally. It does not rely on any online services.",
|
"description": "a detector for answering network questions locally. It does not rely on any online services.",
|
||||||
"npmPackagename": "@uptimelink/detector",
|
"npmPackagename": "@uptime.link/detector",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"projectDomain": "uptime.link"
|
"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",
|
"version": "1.0.4",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "a detector for answering network questions locally. It does not rely on any online services.",
|
"description": "a detector for answering network questions locally. It does not rely on any online services.",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
|
"type": "module",
|
||||||
"author": "Lossless GmbH",
|
"author": "Lossless GmbH",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/ --web)",
|
"test": "(tstest test/ --web)",
|
||||||
"build": "(tsbuild --web)"
|
"build": "(tsbuild --web --allowimplicitany)",
|
||||||
|
"buildDocs": "tsdoc"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.25",
|
"@gitzone/tsbuild": "^2.1.63",
|
||||||
"@gitzone/tsbundle": "^1.0.78",
|
"@gitzone/tsbundle": "^2.0.5",
|
||||||
"@gitzone/tstest": "^1.0.44",
|
"@gitzone/tstest": "^1.0.71",
|
||||||
"@pushrocks/tapbundle": "^3.2.9",
|
"@pushrocks/tapbundle": "^5.0.3",
|
||||||
"@types/node": "^14.11.2",
|
"@types/node": "^18.0.5",
|
||||||
"tslint": "^6.1.3",
|
"tslint": "^6.1.3",
|
||||||
"tslint-config-prettier": "^1.15.0"
|
"tslint-config-prettier": "^1.15.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartnetwork": "^2.0.4",
|
"@pushrocks/smartnetwork": "^3.0.0",
|
||||||
"@pushrocks/smarturl": "^1.0.8"
|
"@pushrocks/smarturl": "^2.0.1"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 1 chrome versions"
|
"last 1 chrome versions"
|
||||||
@ -39,4 +41,4 @@
|
|||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"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.
|
a detector for answering network questions locally. It does not rely on any online services.
|
||||||
|
|
||||||
## Availabililty and Links
|
## Availabililty and Links
|
||||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@uptimelink/detector)
|
* [npmjs.org (npm package)](https://www.npmjs.com/package/@uptime.link/detector)
|
||||||
* [gitlab.com (source)](https://gitlab.com/uptimelink/detector)
|
* [gitlab.com (source)](https://gitlab.com/uptime.link/detector)
|
||||||
* [github.com (source mirror)](https://github.com/uptimelink/detector)
|
* [github.com (source mirror)](https://github.com/uptime.link/detector)
|
||||||
* [docs (typedoc)](https://uptimelink.gitlab.io/detector/)
|
* [docs (typedoc)](https://uptime.link.gitlab.io/detector/)
|
||||||
|
|
||||||
## Status for master
|
## Status for master
|
||||||
|
|
||||||
Status Category | Status Badge
|
Status Category | Status Badge
|
||||||
-- | --
|
-- | --
|
||||||
GitLab Pipelines | [![pipeline status](https://gitlab.com/uptimelink/detector/badges/master/pipeline.svg)](https://lossless.cloud)
|
GitLab Pipelines | [![pipeline status](https://gitlab.com/uptime.link/detector/badges/master/pipeline.svg)](https://lossless.cloud)
|
||||||
GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/uptimelink/detector/badges/master/coverage.svg)](https://lossless.cloud)
|
GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/uptime.link/detector/badges/master/coverage.svg)](https://lossless.cloud)
|
||||||
npm | [![npm downloads per month](https://badgen.net/npm/dy/@uptimelink/detector)](https://lossless.cloud)
|
npm | [![npm downloads per month](https://badgen.net/npm/dy/@uptime.link/detector)](https://lossless.cloud)
|
||||||
Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/uptimelink/detector)](https://lossless.cloud)
|
Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/uptime.link/detector)](https://lossless.cloud)
|
||||||
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
|
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
|
||||||
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
|
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
|
||||||
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@uptimelink/detector)](https://lossless.cloud)
|
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@uptime.link/detector)](https://lossless.cloud)
|
||||||
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@uptimelink/detector)](https://lossless.cloud)
|
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@uptime.link/detector)](https://lossless.cloud)
|
||||||
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@uptimelink/detector)](https://lossless.cloud)
|
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@uptime.link/detector)](https://lossless.cloud)
|
||||||
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
|
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
@ -1,21 +1,21 @@
|
|||||||
import { expect, tap } from '@pushrocks/tapbundle';
|
import { expect, tap } from '@pushrocks/tapbundle';
|
||||||
import * as detector from '../ts/index';
|
import * as detector from '../ts/index.js';
|
||||||
|
|
||||||
let testDetector: detector.Detector;
|
let testDetector: detector.Detector;
|
||||||
|
|
||||||
tap.test('first test', async () => {
|
tap.test('first test', async () => {
|
||||||
testDetector = new detector.Detector();
|
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 () => {
|
tap.test('should detect an closed port on a local domain', async () => {
|
||||||
const result = await testDetector.isActive('http://localhost:3008');
|
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 () => {
|
tap.test('should detect an open port on a remote domain', async () => {
|
||||||
const result = await testDetector.isActive('https://lossless.com');
|
const result = await testDetector.isActive('https://lossless.com');
|
||||||
expect(result).to.be.true;
|
expect(result).toBeTrue();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
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 {
|
export class Detector {
|
||||||
private smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
|
private smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
|
||||||
private smarturlInstance = new plugins.smarturl.Smarturl();
|
|
||||||
|
|
||||||
public async isActive(urlArg: string): Promise<boolean> {
|
public async isActive(urlArg: string): Promise<boolean> {
|
||||||
const parsedUrl = this.smarturlInstance.parseUrl(urlArg);
|
const parsedUrl = plugins.smarturl.Smarturl.createFromUrl(urlArg);
|
||||||
if (parsedUrl.hostname === 'localhost') {
|
if (parsedUrl.hostname === 'localhost') {
|
||||||
console.log(`detector target is localhost on port ${parsedUrl.port}`);
|
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;
|
const portAvailable = !portUnused;
|
||||||
return portAvailable;
|
return portAvailable;
|
||||||
} else {
|
} else {
|
||||||
console.log(`detector target is remote domain ${parsedUrl.host} on port ${parsedUrl.port}`);
|
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;
|
return postAvailable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -21,4 +25,4 @@ export class Detector {
|
|||||||
public detectType(urlArg: string) {
|
public detectType(urlArg: string) {
|
||||||
console.log('TODO'); // TODO
|
console.log('TODO'); // TODO
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -2,7 +2,4 @@
|
|||||||
import * as smartnetwork from '@pushrocks/smartnetwork';
|
import * as smartnetwork from '@pushrocks/smartnetwork';
|
||||||
import * as smarturl from '@pushrocks/smarturl';
|
import * as smarturl from '@pushrocks/smarturl';
|
||||||
|
|
||||||
export {
|
export { smartnetwork, smarturl };
|
||||||
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