fix(core): update
This commit is contained in:
parent
9aebd59c08
commit
07739bec27
67
.gitea/workflows/default_nottags.yaml
Normal file
67
.gitea/workflows/default_nottags.yaml
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
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
|
110
.gitea/workflows/default_tags.yaml
Normal file
110
.gitea/workflows/default_tags.yaml
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
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: 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
|
||||||
|
|
||||||
|
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: 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: Code quality
|
||||||
|
run: |
|
||||||
|
npmci command npm install -g typescript
|
||||||
|
npmci npm prepare
|
||||||
|
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 @gitzone/tsdoc
|
||||||
|
npmci command tsdoc
|
||||||
|
continue-on-error: true
|
@ -45,7 +45,7 @@
|
|||||||
"@pushrocks/smartdelay": "^3.0.1",
|
"@pushrocks/smartdelay": "^3.0.1",
|
||||||
"@pushrocks/smartenv": "^5.0.5",
|
"@pushrocks/smartenv": "^5.0.5",
|
||||||
"@pushrocks/smartfeed": "^1.0.11",
|
"@pushrocks/smartfeed": "^1.0.11",
|
||||||
"@pushrocks/smartfile": "^10.0.7",
|
"@pushrocks/smartfile": "^10.0.25",
|
||||||
"@pushrocks/smartlog": "^3.0.1",
|
"@pushrocks/smartlog": "^3.0.1",
|
||||||
"@pushrocks/smartlog-destination-devtools": "^1.0.10",
|
"@pushrocks/smartlog-destination-devtools": "^1.0.10",
|
||||||
"@pushrocks/smartmanifest": "^2.0.2",
|
"@pushrocks/smartmanifest": "^2.0.2",
|
||||||
@ -70,11 +70,11 @@
|
|||||||
"@gitzone/tsbundle": "^2.0.8",
|
"@gitzone/tsbundle": "^2.0.8",
|
||||||
"@gitzone/tsrun": "^1.2.42",
|
"@gitzone/tsrun": "^1.2.42",
|
||||||
"@gitzone/tstest": "^1.0.72",
|
"@gitzone/tstest": "^1.0.72",
|
||||||
"@pushrocks/tapbundle": "^5.0.4",
|
"@pushrocks/tapbundle": "^5.0.8",
|
||||||
"@types/node": "^20.3.0"
|
"@types/node": "^20.3.3"
|
||||||
},
|
},
|
||||||
"private": false,
|
"private": false,
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 1 chrome versions"
|
"last 1 chrome versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
846
pnpm-lock.yaml
846
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
|||||||
# @apiglobal/typedserver
|
# @pushrocks/typedserver
|
||||||
easy serving of static files
|
easy serving of static files
|
||||||
|
|
||||||
## Availabililty and Links
|
## Availabililty and Links
|
||||||
|
@ -64,7 +64,9 @@ tap.test('should add handler to route', async () => {
|
|||||||
|
|
||||||
tap.test('should create a valid StaticHandler', async () => {
|
tap.test('should create a valid StaticHandler', async () => {
|
||||||
testRoute2.addHandler(
|
testRoute2.addHandler(
|
||||||
new typedserver.servertools.HandlerStatic(smartpath.get.dirnameFromImportMetaUrl(import.meta.url))
|
new typedserver.servertools.HandlerStatic(
|
||||||
|
smartpath.get.dirnameFromImportMetaUrl(import.meta.url)
|
||||||
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@apiglobal/typedserver',
|
name: '@apiglobal/typedserver',
|
||||||
version: '2.0.56',
|
version: '2.0.57',
|
||||||
description: 'easy serving of static files'
|
description: 'easy serving of static files'
|
||||||
}
|
}
|
||||||
|
@ -2,9 +2,7 @@ import * as plugins from './typedserver.plugins.js';
|
|||||||
|
|
||||||
import * as servertools from './servertools/index.js';
|
import * as servertools from './servertools/index.js';
|
||||||
|
|
||||||
export {
|
export { servertools };
|
||||||
servertools
|
|
||||||
}
|
|
||||||
|
|
||||||
export * from './typedserver.classes.typedserver.js';
|
export * from './typedserver.classes.typedserver.js';
|
||||||
// Type helpers
|
// Type helpers
|
||||||
|
@ -1,23 +1,25 @@
|
|||||||
import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
|
import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
|
||||||
|
|
||||||
export interface IReq_PushLatestServerChangeTime extends typedrequestInterfaces.implementsTR<
|
export interface IReq_PushLatestServerChangeTime
|
||||||
typedrequestInterfaces.ITypedRequest,
|
extends typedrequestInterfaces.implementsTR<
|
||||||
IReq_PushLatestServerChangeTime
|
typedrequestInterfaces.ITypedRequest,
|
||||||
> {
|
IReq_PushLatestServerChangeTime
|
||||||
method: 'pushLatestServerChangeTime',
|
> {
|
||||||
|
method: 'pushLatestServerChangeTime';
|
||||||
request: {
|
request: {
|
||||||
time: number;
|
time: number;
|
||||||
};
|
};
|
||||||
response: {}
|
response: {};
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IReq_GetLatestServerChangeTime extends typedrequestInterfaces.implementsTR<
|
export interface IReq_GetLatestServerChangeTime
|
||||||
typedrequestInterfaces.ITypedRequest,
|
extends typedrequestInterfaces.implementsTR<
|
||||||
IReq_GetLatestServerChangeTime
|
typedrequestInterfaces.ITypedRequest,
|
||||||
> {
|
IReq_GetLatestServerChangeTime
|
||||||
method: 'getLatestServerChangeTime',
|
> {
|
||||||
|
method: 'getLatestServerChangeTime';
|
||||||
request: {};
|
request: {};
|
||||||
response: {
|
response: {
|
||||||
time: number;
|
time: number;
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ import { setupRobots } from './tools.robots.js';
|
|||||||
import { setupManifest } from './tools.manifest.js';
|
import { setupManifest } from './tools.manifest.js';
|
||||||
import { Sitemap } from './classes.sitemap.js';
|
import { Sitemap } from './classes.sitemap.js';
|
||||||
import { Feed } from './classes.feed.js';
|
import { Feed } from './classes.feed.js';
|
||||||
import { IServerOptions } from '../typedserver.classes.typedserver.js'
|
import { type IServerOptions } from '../typedserver.classes.typedserver.js';
|
||||||
export type TServerStatus = 'initiated' | 'running' | 'stopped';
|
export type TServerStatus = 'initiated' | 'running' | 'stopped';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Server } from './classes.server.js';
|
import { Server } from './classes.server.js';
|
||||||
import { Handler } from './classes.handler.js';
|
import { Handler } from './classes.handler.js';
|
||||||
import * as plugins from '../typedserver.plugins.js';
|
import * as plugins from '../typedserver.plugins.js';
|
||||||
import { IUrlInfo } from '@pushrocks/smartsitemap';
|
import { type IUrlInfo } from '@pushrocks/smartsitemap';
|
||||||
|
|
||||||
export class Sitemap {
|
export class Sitemap {
|
||||||
public smartexpressRef: Server;
|
public smartexpressRef: Server;
|
||||||
|
@ -115,7 +115,7 @@ export class TypedServer {
|
|||||||
* inits and starts the server
|
* inits and starts the server
|
||||||
*/
|
*/
|
||||||
public async start() {
|
public async start() {
|
||||||
if(this.options.serveDir) {
|
if (this.options.serveDir) {
|
||||||
this.server.addRoute(
|
this.server.addRoute(
|
||||||
'/*',
|
'/*',
|
||||||
new servertools.HandlerStatic(this.options.serveDir, {
|
new servertools.HandlerStatic(this.options.serveDir, {
|
||||||
@ -156,7 +156,9 @@ export class TypedServer {
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
} else if (this.options.injectReload) {
|
} else if (this.options.injectReload) {
|
||||||
throw new Error('You set to inject the reload script without a serve dir. This is not supported at the moment.')
|
throw new Error(
|
||||||
|
'You set to inject the reload script without a serve dir. This is not supported at the moment.'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (this.options.watch && this.options.serveDir) {
|
if (this.options.watch && this.options.serveDir) {
|
||||||
this.smartchokInstance = new plugins.smartchok.Smartchok([this.options.serveDir], {});
|
this.smartchokInstance = new plugins.smartchok.Smartchok([this.options.serveDir], {});
|
||||||
@ -177,11 +179,13 @@ export class TypedServer {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// lets setup typedrouter
|
// lets setup typedrouter
|
||||||
this.typedrouter.addTypedHandler<interfaces.IReq_GetLatestServerChangeTime>(new plugins.typedrequest.TypedHandler('getLatestServerChangeTime', async reqDataArg => {
|
this.typedrouter.addTypedHandler<interfaces.IReq_GetLatestServerChangeTime>(
|
||||||
return {
|
new plugins.typedrequest.TypedHandler('getLatestServerChangeTime', async (reqDataArg) => {
|
||||||
time: this.lastReload,
|
return {
|
||||||
}
|
time: this.lastReload,
|
||||||
}))
|
};
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
// console.log('open url in browser');
|
// console.log('open url in browser');
|
||||||
// await plugins.smartopen.openUrl(`http://testing.git.zone:${this.options.port}`);
|
// await plugins.smartopen.openUrl(`http://testing.git.zone:${this.options.port}`);
|
||||||
@ -192,7 +196,9 @@ export class TypedServer {
|
|||||||
*/
|
*/
|
||||||
public async reload() {
|
public async reload() {
|
||||||
this.lastReload = Date.now();
|
this.lastReload = Date.now();
|
||||||
for (const connectionArg of await this.typedsocket.findAllTargetConnectionsByTag('typedserver_frontend')) {
|
for (const connectionArg of await this.typedsocket.findAllTargetConnectionsByTag(
|
||||||
|
'typedserver_frontend'
|
||||||
|
)) {
|
||||||
const pushTime =
|
const pushTime =
|
||||||
this.typedsocket.createTypedRequest<interfaces.IReq_PushLatestServerChangeTime>(
|
this.typedsocket.createTypedRequest<interfaces.IReq_PushLatestServerChangeTime>(
|
||||||
'pushLatestServerChangeTime',
|
'pushLatestServerChangeTime',
|
||||||
|
@ -9,20 +9,14 @@ export { http, https, net, path };
|
|||||||
// @tsclass scope
|
// @tsclass scope
|
||||||
import * as tsclass from '@tsclass/tsclass';
|
import * as tsclass from '@tsclass/tsclass';
|
||||||
|
|
||||||
export {
|
export { tsclass };
|
||||||
tsclass
|
|
||||||
}
|
|
||||||
|
|
||||||
// @apiglobal scope
|
// @apiglobal scope
|
||||||
import * as typedrequest from '@apiglobal/typedrequest';
|
import * as typedrequest from '@apiglobal/typedrequest';
|
||||||
import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
|
import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
|
||||||
import * as typedsocket from '@apiglobal/typedsocket';
|
import * as typedsocket from '@apiglobal/typedsocket';
|
||||||
|
|
||||||
export {
|
export { typedrequest, typedrequestInterfaces, typedsocket };
|
||||||
typedrequest,
|
|
||||||
typedrequestInterfaces,
|
|
||||||
typedsocket,
|
|
||||||
}
|
|
||||||
|
|
||||||
// @pushrocks scope
|
// @pushrocks scope
|
||||||
import * as lik from '@pushrocks/lik';
|
import * as lik from '@pushrocks/lik';
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@apiglobal/typedserver',
|
name: '@apiglobal/typedserver',
|
||||||
version: '2.0.56',
|
version: '2.0.57',
|
||||||
description: 'easy serving of static files'
|
description: 'easy serving of static files'
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user