1.0.16

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitlab-ci.yml

@@ -1,128 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - pnpm install -g pnpm
-  - pnpm install -g @shipzone/npmci
-  - npmci npm prepare
-
-# ====================
-# security stage
-# ====================
-# ====================
-# security stage
-# ====================
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-     - npmci command npm config set registry https://registry.npmjs.org
-     - npmci command pnpm audit --audit-level=high --prod
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command pnpm audit --audit-level=high --dev
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run buildDocs
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartwhois",
       "description": "a package for dealing with whois requests",
-      "npmPackagename": "@pushrocks/smartwhois",
+      "npmPackagename": "@push.rocks/smartwhois",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartwhois",
+  "name": "@push.rocks/smartwhois",
-  "version": "1.0.10",
+  "version": "1.0.16",
   "private": false,
   "description": "a package for dealing with whois requests",
   "main": "dist_ts/index.js",
@@ -11,20 +11,20 @@
   "scripts": {
     "test": "(tstest test/ --web)",
     "build": "(tsbuild --web --allowimplicitany)",
-    "buildDocs": "(tsdoc)"
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
+    "@git.zone/tsbuild": "^2.1.65",
-    "@gitzone/tsbundle": "^2.0.7",
+    "@git.zone/tsbundle": "^2.0.7",
-    "@gitzone/tsdoc": "^1.1.12",
+    "@git.zone/tsrun": "^1.2.39",
-    "@gitzone/tsrun": "^1.2.39",
+    "@git.zone/tstest": "^1.0.74",
-    "@gitzone/tstest": "^1.0.74",
+    "@push.rocks/tapbundle": "^5.0.4",
-    "@pushrocks/tapbundle": "^5.0.4",
     "@types/node": "^18.15.11"
   },
   "dependencies": {
-    "@pushrocks/smartrequest": "^2.0.15",
+    "@push.rocks/smartrequest": "^2.0.15",
-    "@pushrocks/smarturl": "^3.0.6",
+    "@push.rocks/smarturl": "^3.0.6",
+    "@tsclass/tsclass": "^4.0.38",
     "tldts": "^6.0.3",
     "whoiser": "^1.16.0"
   },

readme.md

@@ -1,26 +1,26 @@
-# @pushrocks/smartwhois
+# @push.rocks/smartwhois
 a package for dealing with whois requests
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartwhois)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartwhois)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartwhois)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartwhois)
-* [github.com (source mirror)](https://github.com/pushrocks/smartwhois)
+* [github.com (source mirror)](https://github.com/push.rocks/smartwhois)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartwhois/)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smartwhois/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartwhois/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartwhois/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartwhois/badges/master/coverage.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartwhois/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartwhois)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartwhois)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartwhois)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartwhois)](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/)
 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/@pushrocks/smartwhois)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartwhois)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartwhois)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartwhois)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartwhois)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartwhois)](https://lossless.cloud)
 
 ## Usage
 

test/test.ts

@@ -1,4 +1,4 @@
-import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@push.rocks/tapbundle';
 import * as smartwhois from '../ts/index.js';
 
 let testSmartWhois: smartwhois.SmartWhois;
@@ -9,8 +9,10 @@ tap.test('should create a valid instance of SmartWhois', async () => {
 });
 
 tap.test('should get a parsed url result for whois', async () => {
-  const parsedUrlResult = await testSmartWhois.getParsedUrlResultForWhois('https://coffee.link/understanding-gen-z/');
+  const domainDelegation = await testSmartWhois.getDomainDelegation('https://coffee.link/understanding-gen-z/');
-  console.log(parsedUrlResult);
+  console.log(domainDelegation);
+  const parsedUrlResult2 = await testSmartWhois.getDomainDelegation('task.vc');
+  console.log(parsedUrlResult2);
 });
 
 tap.test('should get additional data', async () => {
@@ -22,6 +24,10 @@ tap.test('should get whois info for domain', async () => {
   const whoisInfo = await testSmartWhois.getWhoisForDomain('task.vc');
   console.log(whoisInfo);
 });
+tap.test('should get whois info for domain', async () => {
+  const whoisInfo = await testSmartWhois.getWhoisForDomain('https://lossless.com');
+  console.log(whoisInfo);
+});
 
 tap.test('should get whois info for domain', async () => {
   const whoisInfo = await testSmartWhois.getWhoisForDomain('https://coffee.link/understanding-gen-z/');

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartwhois',
+  name: '@push.rocks/smartwhois',
-  version: '1.0.10',
+  version: '1.0.16',
   description: 'a package for dealing with whois requests'
 }

ts/index.ts

@@ -41,7 +41,10 @@ export class SmartWhois {
   /**
    * can be used to prepare an input for the whois command
    */
-  public async getParsedUrlResultForWhois(urlArg: string) {
+  public async getDomainDelegation(urlArg: string): Promise<plugins.tsclass.network.IDomainDelegation> {
+    if (!urlArg.includes('//')) {
+      urlArg = `https://${urlArg}`;
+    }
     const smarturlInstance = plugins.smarturl.Smarturl.createFromUrl(urlArg);
     const tldtsData = plugins.tldts.parse(urlArg);
     return {
@@ -50,12 +53,14 @@ export class SmartWhois {
       domain: tldtsData.domain,
       publicSuffix: tldtsData.publicSuffix,
       subdomain: tldtsData.subdomain,
+      domainWithoutSuffix: tldtsData.domainWithoutSuffix,
+      isIcann: tldtsData.isIcann,
     }
   }
 
   public async getAdditionalWhoisDataForDomain(domainArg: string) {
     if (domainArg.includes('//')) {
-      const parsedUrlResult = await this.getParsedUrlResultForWhois(domainArg);
+      const parsedUrlResult = await this.getDomainDelegation(domainArg);
       domainArg = parsedUrlResult.fullDomain;
     }
 
@@ -77,7 +82,7 @@ export class SmartWhois {
 
   public async getWhoisForDomain(domainArg: string): Promise<IWhoisInfo> {
     if (domainArg.includes('//')) {
-      const parsedUrlResult = await this.getParsedUrlResultForWhois(domainArg);
+      const parsedUrlResult = await this.getDomainDelegation(domainArg);
       domainArg = parsedUrlResult.fullDomain;
     }
     const whoisInfo = await plugins.whoiser.domain(domainArg);

ts/smartwhois.plugins.ts

@@ -1,6 +1,13 @@
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass,
+}
+
 // pushrocks scope
-import * as smarturl from '@pushrocks/smarturl';
+import * as smarturl from '@push.rocks/smarturl';
-import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartrequest from '@push.rocks/smartrequest';
 
 export {
   smarturl,