3.0.29

.gitea/workflows/default_nottags.yaml

@@ -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

.gitea/workflows/default_tags.yaml

@@ -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 @git.zone/tsdoc
+        npmci command tsdoc
+      continue-on-error: true

npmextra.json

@@ -5,12 +5,31 @@
   "gitzone": {
     "projectType": "npm",
     "module": {
-      "githost": "gitlab.com",
+      "githost": "code.foss.global",
       "gitscope": "pushrocks",
       "gitrepo": "typedserver",
-      "description": "easy serving of static files",
-      "npmPackagename": "@apiglobal/typedserver",
-      "license": "MIT"
+      "description": "A TypeScript-based project for easy serving of static files with support for live reloading, compression, and typed requests.",
+      "npmPackagename": "@api.global/typedserver",
+      "license": "MIT",
+      "keywords": [
+        "TypeScript",
+        "static file serving",
+        "live reload",
+        "compression",
+        "typed requests",
+        "HTTP server",
+        "SSL",
+        "cors",
+        "express middleware",
+        "proxy",
+        "sitemap",
+        "feeds",
+        "robots.txt",
+        "compression (gzip, deflate, brotli)"
+      ]
     }
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package.json

@@ -1,13 +1,13 @@
 {
-  "name": "@apiglobal/typedserver",
-  "version": "2.0.42",
-  "description": "easy serving of static files",
+  "name": "@api.global/typedserver",
+  "version": "3.0.29",
+  "description": "A TypeScript-based project for easy serving of static files with support for live reloading, compression, and typed requests.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "type": "module",
   "scripts": {
     "test": "npm run build && tstest test/",
-    "build": "tsbuild --web --allowimplicitany && tsbundle --from ./ts_web/index.ts --to ./dist_ts_web/bundle.js",
+    "build": "tsbuild --web --allowimplicitany --skiplibcheck && tsbundle --from ./ts_web/index.ts --to ./dist_ts_web/bundle.js",
     "buildDocs": "tsdoc"
   },
   "repository": {
@@ -15,8 +15,20 @@
     "url": "https://github.com/pushrocks/easyserve.git"
   },
   "keywords": [
-    "serve",
-    "browser-sync"
+    "TypeScript",
+    "static file serving",
+    "live reload",
+    "compression",
+    "typed requests",
+    "HTTP server",
+    "SSL",
+    "cors",
+    "express middleware",
+    "proxy",
+    "sitemap",
+    "feeds",
+    "robots.txt",
+    "compression (gzip, deflate, brotli)"
   ],
   "author": "Lossless GmbH <office@lossless.com> (https://lossless.com)",
   "license": "MIT",
@@ -37,41 +49,44 @@
   ],
   "homepage": "https://github.com/pushrocks/easyserve",
   "dependencies": {
-    "@apiglobal/typedrequest": "^2.0.12",
-    "@apiglobal/typedrequest-interfaces": "^2.0.1",
-    "@apiglobal/typedsocket": "^2.0.23",
-    "@pushrocks/lik": "^6.0.2",
-    "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartenv": "^5.0.5",
-    "@pushrocks/smartfeed": "^1.0.11",
-    "@pushrocks/smartfile": "^10.0.7",
-    "@pushrocks/smartlog": "^3.0.1",
-    "@pushrocks/smartlog-destination-devtools": "^1.0.10",
-    "@pushrocks/smartmanifest": "^1.0.8",
-    "@pushrocks/smartmime": "^1.0.5",
-    "@pushrocks/smartopen": "^2.0.0",
-    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^2.0.11",
-    "@pushrocks/smartrx": "^3.0.0",
-    "@pushrocks/smartsitemap": "^2.0.1",
-    "@pushrocks/smarttime": "^4.0.1",
-    "@pushrocks/webstore": "^2.0.5",
-    "@tsclass/tsclass": "^4.0.34",
+    "@api.global/typedrequest": "^3.0.21",
+    "@api.global/typedrequest-interfaces": "^3.0.18",
+    "@api.global/typedsocket": "^3.0.1",
+    "@push.rocks/lik": "^6.0.15",
+    "@push.rocks/smartchok": "^1.0.33",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartenv": "^5.0.12",
+    "@push.rocks/smartfeed": "^1.0.11",
+    "@push.rocks/smartfile": "^11.0.14",
+    "@push.rocks/smartjson": "^5.0.19",
+    "@push.rocks/smartlog": "^3.0.3",
+    "@push.rocks/smartlog-destination-devtools": "^1.0.10",
+    "@push.rocks/smartmanifest": "^2.0.2",
+    "@push.rocks/smartmime": "^1.0.5",
+    "@push.rocks/smartopen": "^2.0.0",
+    "@push.rocks/smartpath": "^5.0.14",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartrequest": "^2.0.22",
+    "@push.rocks/smartrx": "^3.0.7",
+    "@push.rocks/smartsitemap": "^2.0.3",
+    "@push.rocks/smartstream": "^3.0.34",
+    "@push.rocks/smarttime": "^4.0.6",
+    "@push.rocks/webstore": "^2.0.14",
+    "@tsclass/tsclass": "^4.0.54",
+    "@types/express": "^4.17.21",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-force-ssl": "^0.3.2",
-    "lit": "^2.7.0"
+    "lit": "^3.1.3"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tsbundle": "^2.0.6",
-    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.72",
-    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.15.11"
+    "@git.zone/tsbuild": "^2.1.72",
+    "@git.zone/tsbundle": "^2.0.15",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.90",
+    "@push.rocks/tapbundle": "^5.0.23",
+    "@types/node": "^20.12.7"
   },
   "private": false,
   "browserslist": [

readme.hints.md

@@ -0,0 +1 @@
+ 

readme.md

@@ -1,49 +1,133 @@
-# @apiglobal/typedserver
-easy serving of static files
+```markdown
+# @api.global/typedserver
+Easy serving of static files
 
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@apiglobal/typedserver)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/typedserver)
-* [github.com (source mirror)](https://github.com/pushrocks/typedserver)
-* [docs (typedoc)](https://pushrocks.gitlab.io/typedserver/)
+## Install
+To install @api.global/typedserver, run the following command in your terminal:
 
-## Status for master
+```bash
+npm install @api.global/typedserver --save
+```
 
-Status Category | Status Badge
--- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/typedserver/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/typedserver/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@apiglobal/typedserver)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/typedserver)](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/@apiglobal/typedserver)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@apiglobal/typedserver)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@apiglobal/typedserver)](https://lossless.cloud)
+This will add `@api.global/typedserver` to your project's dependencies.
 
 ## Usage
 
-Use TypeScript for best in class instellisense.
+`@api.global/typedserver` is designed to make serving static files and handling web requests in a TypeScript environment easy and efficient. It leverages Express under the hood, providing a powerful API for web server creation with additional utilities for live reloading, typed requests/responses, and more, embracing TypeScript's static typing advantages.
 
-```javascript
-import { TypedServer } from '@apiglobal/typedserver';
+### Setting up a Basic Web Server
 
-let myTypedserver = new TypedServer('/some/path/to/webroot', 8080);
-myTypedserver.start().then(() => {
-  // this is executed when server is running guaranteed
-  myTypedserver.stop(); // .stop() will work even if not waiting for server to be fully started
-});
+The following example demonstrates how to set up a basic web server serving files from a directory.
 
-myTypedserver.reload(); // reloads all connected browsers of this instance
+```typescript
+import { TypedServer } from '@api.global/typedserver';
+
+const serverOptions = {
+  port: 8080, // Port to listen on
+  serveDir: 'public', // Directory to serve static files from
+  watch: true, // Enable live reloading of changes
+  injectReload: true, // Inject live reload script into served HTML files
+  cors: true // Enable CORS
+};
+
+const typedServer = new TypedServer(serverOptions);
+
+async function startServer() {
+  await typedServer.start();
+  console.log(`Server is running on http://localhost:${serverOptions.port}`);
+}
+
+startServer().catch(console.error);
 ```
 
-## Contribution
+In the example above, `TypedServer` is instantiated with an `IServerOptions` object specifying options like the port to listen on (`8080`), the directory containing static files to serve (`public`), and live reload features. Calling `start()` on the `typedServer` instance initiates the server.
 
-We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+### Using Typed Requests and Responses
 
-For further information read the linked docs at the top of this readme.
+`TypedServer` supports typed requests and responses, making API development more robust and maintainable. Define your request and response types, and use them to type-check incoming requests and their responses.
 
-## Legal
-> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+First, define the types:
+
+```typescript
+// Define a request type
+interface MyCustomRequest {
+  userId: string;
+}
+
+// Define a response type
+interface MyCustomResponse {
+  userName: string;
+}
+```
+
+Next, set up a route to handle requests using these types:
+
+```typescript
+import { TypedRouter, TypedHandler } from '@api.global/typedrequest';
+
+// Instantiate a TypedRouter
+const typedRouter = new TypedRouter();
+
+// Register a route with request and response types
+typedRouter.addTypedHandler<MyCustomRequest, MyCustomResponse>(
+  new TypedHandler('getUser', async (requestData) => {
+    // Implement your logic here. For example, fetch user data from a database.
+    const userData = { userName: 'John Doe' }; // Dummy implementation
+    return { response: userData };
+  })
+);
+
+// Bind the typed router to the server
+typedServer.useTypedRouter(typedRouter);
+
+// Now, the route is set up to handle requests with type checking
+```
+
+This example shows defining types for requests and responses, creating a `TypedRouter`, and adding a route with typed handling. This feature brings the benefits of TypeScript's static type checking to server-side logic, improving the development experience.
+
+### Enabling SSL/TLS
+
+To enable SSL/TLS, configure the `TypedServer` with the SSL options, including the paths to your SSL certificate and key files:
+
+```typescript
+const serverOptions = {
+  port: 443,
+  serveDir: 'public',
+  watch: true,
+  injectReload: true,
+  cors: true,
+  privateKey: fs.readFileSync('path/to/ssl/private.key'),
+  publicKey: fs.readFileSync('path/to/ssl/certificate.crt')
+};
+
+const typedServer = new TypedServer(serverOptions);
+startServer().catch(console.error);
+```
+
+Replace `'path/to/ssl/private.key'` and `'path/to/ssl/certificate.crt'` with the actual paths to your SSL key and certificate files. This setup ensures that your server communicates over HTTPS, encrypting the data transmitted between the client and the server.
+
+### Conclusion
+
+`@api.global/typedserver` offers a streamlined way to set up a web server with TypeScript, featuring static file serving, live reloading, typed request/response handling, and SSL support. This guide covers the basic usage, but `TypedServer` is highly configurable, catering to various hosting and development needs.
+```
+
+For a deeper dive into the API and more advanced configurations, refer to the official documentation and type definitions included in the package.
+
+## License and Legal Information
+
+This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+
+### Company Information
+
+Task Venture Capital GmbH  
+Registered at District court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/test.reload.ts

@@ -1,5 +1,5 @@
-import { tap, expect } from '@pushrocks/tapbundle';
-import * as smartpath from '@pushrocks/smartpath';
+import { tap, expect } from '@push.rocks/tapbundle';
+import * as smartpath from '@push.rocks/smartpath';
 
 import { TypedServer } from '../ts/index.js';
 

test/test.server.ts

@@ -1,11 +1,11 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
 // helper dependencies
 // tslint:disable-next-line:no-implicit-dependencies
 
-import * as smartpath from '@pushrocks/smartpath';
-import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartrequest from '@push.rocks/smartrequest';
 
 import * as typedserver from '../ts/index.js';
 
@@ -27,6 +27,13 @@ tap.test('should create a valid Server', async () => {
     manifest: {
       name: 'Test App',
       short_name: 'testapp',
+      start_url: '/',
+      display: 'standalone',
+      background_color: '#000',
+      theme_color: '#000',
+      scope: '/',
+      lang: 'en',
+      display_override: ['window-controls-overlay'],
     },
     feed: true,
     sitemap: true,
@@ -64,12 +71,14 @@ tap.test('should add handler to route', async () => {
 
 tap.test('should create a valid StaticHandler', async () => {
   testRoute2.addHandler(
-    new typedserver.servertools.HandlerStatic(smartpath.get.dirnameFromImportMetaUrl(import.meta.url))
+    new typedserver.servertools.HandlerStatic(
+      smartpath.get.dirnameFromImportMetaUrl(import.meta.url)
+    )
   );
 });
 
 tap.test('should add typedrequest and typedsocket', async () => {
-  const typedrequest = await import('@apiglobal/typedrequest');
+  const typedrequest = await import('@api.global/typedrequest');
 
   const typedrouter = new typedrequest.TypedRouter();
   testServer.addTypedRequest(typedrouter);

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@apiglobal/typedserver',
-  version: '2.0.42',
-  description: 'easy serving of static files'
+  name: '@api.global/typedserver',
+  version: '3.0.29',
+  description: 'A TypeScript-based project for easy serving of static files with support for live reloading, compression, and typed requests.'
 }

ts/index.ts

@@ -1,10 +1,8 @@
-import * as plugins from './typedserver.plugins.js';
+import * as plugins from './plugins.js';
 
 import * as servertools from './servertools/index.js';
 
-export {
-  servertools
-}
+export { servertools };
 
 export * from './typedserver.classes.typedserver.js';
 // Type helpers

ts/interfaces/responsemodifier.ts

@@ -1,11 +1,11 @@
 export type TResponseModifier = <T>(responseArg: {
   headers: { [header: string]: number | string | string[] | undefined };
   path: string;
-  responseContent: string;
+  responseContent: Buffer;
   travelData?: T;
 }) => Promise<{
   headers: { [header: string]: number | string | string[] | undefined };
   path: string;
-  responseContent: string;
+  responseContent: Buffer;
   travelData?: T;
 }>;

ts/interfaces/typedrequests.ts

@@ -1,12 +1,26 @@
-import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
+// not using the global plugins here to support better bundling...
+import * as typedrequestInterfaces from '@api.global/typedrequest-interfaces';
 
-export interface IReq_PushLatestServerChangeTime extends typedrequestInterfaces.implementsTR<
-  typedrequestInterfaces.ITypedRequest,
-  IReq_PushLatestServerChangeTime
-> {
-  method: 'pushLatestServerChangeTime',
+export interface IReq_PushLatestServerChangeTime
+  extends typedrequestInterfaces.implementsTR<
+    typedrequestInterfaces.ITypedRequest,
+    IReq_PushLatestServerChangeTime
+  > {
+  method: 'pushLatestServerChangeTime';
   request: {
     time: number;
   };
-  response: {}
+  response: {};
+}
+
+export interface IReq_GetLatestServerChangeTime
+  extends typedrequestInterfaces.implementsTR<
+    typedrequestInterfaces.ITypedRequest,
+    IReq_GetLatestServerChangeTime
+  > {
+  method: 'getLatestServerChangeTime';
+  request: {};
+  response: {
+    time: number;
+  };
 }

ts/plugins.ts

@@ -0,0 +1,67 @@
+// node native
+import * as http from 'http';
+import * as https from 'https';
+import * as net from 'net';
+import * as path from 'path';
+import * as stream from 'stream';
+import * as zlib from 'zlib';
+
+export { http, https, net, path, zlib };
+
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };
+
+// @apiglobal scope
+import * as typedrequest from '@api.global/typedrequest';
+import * as typedrequestInterfaces from '@api.global/typedrequest-interfaces';
+import * as typedsocket from '@api.global/typedsocket';
+
+export { typedrequest, typedrequestInterfaces, typedsocket };
+
+// @pushrocks scope
+import * as lik from '@push.rocks/lik';
+import * as smartchok from '@push.rocks/smartchok';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartfeed from '@push.rocks/smartfeed';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smartjson from '@push.rocks/smartjson';
+import * as smartmanifest from '@push.rocks/smartmanifest';
+import * as smartmime from '@push.rocks/smartmime';
+import * as smartopen from '@push.rocks/smartopen';
+import * as smartpath from '@push.rocks/smartpath';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartrx from '@push.rocks/smartrx';
+import * as smartsitemap from '@push.rocks/smartsitemap';
+import * as smartstream from '@push.rocks/smartstream';
+import * as smarttime from '@push.rocks/smarttime';
+
+export {
+  lik,
+  smartchok,
+  smartdelay,
+  smartfeed,
+  smartfile,
+  smartjson,
+  smartmanifest,
+  smartmime,
+  smartopen,
+  smartpath,
+  smartpromise,
+  smartrequest,
+  smartsitemap,
+  smartstream,
+  smarttime,
+  smartrx,
+};
+
+// express
+import bodyParser from 'body-parser';
+import cors from 'cors';
+import express from 'express';
+// @ts-ignore
+import expressForceSsl from 'express-force-ssl';
+
+export { bodyParser, cors, express, expressForceSsl };

ts/servertools/classes.compressor.ts

@@ -0,0 +1,127 @@
+import * as plugins from '../plugins.js';
+
+export type TCompressionMethod = 'gzip' | 'deflate' | 'br' | 'none';
+export interface ICompressionResult {
+  result: Buffer;
+  compressionMethod: TCompressionMethod;
+}
+
+export class Compressor {
+  private _cache: Map<string, Buffer>;
+  private MAX_CACHE_SIZE: number = 100 * 1024 * 1024; // 100 MB
+
+  constructor() {
+    this._cache = new Map<string, Buffer>();
+  }
+
+  private _addToCache(key: string, value: Buffer) {
+    this._cache.set(key, value);
+    this._manageCacheSize();
+  }
+
+  private _manageCacheSize() {
+    let currentSize = Array.from(this._cache.values()).reduce((acc, buffer) => acc + buffer.length, 0);
+
+    while (currentSize > this.MAX_CACHE_SIZE) {
+      const firstKey = this._cache.keys().next().value;
+      const firstValue = this._cache.get(firstKey)!;
+      currentSize -= firstValue.length;
+      this._cache.delete(firstKey);
+    }
+  }
+
+  public async compressContent(
+    content: Buffer,
+    method: 'gzip' | 'deflate' | 'br' | 'none'
+  ): Promise<Buffer> {
+    const cacheKey = content.toString('base64') + method;
+    const cachedResult = this._cache.get(cacheKey);
+
+    if (cachedResult) {
+      return cachedResult;
+    }
+
+    return new Promise((resolve, reject) => {
+      const callback = (err: Error | null, result: Buffer) => {
+        if (err) reject(err);
+        else {
+          this._addToCache(cacheKey, result);
+          resolve(result);
+        }
+      };
+
+      switch (method) {
+        case 'gzip':
+          plugins.zlib.gzip(content, {
+            level: 1,
+          },callback,);
+          break;
+        case 'br':
+          plugins.zlib.brotliCompress(content, {}, callback);
+          break;
+        case 'deflate':
+          plugins.zlib.deflate(content, callback);
+          break;
+        default:
+          this._addToCache(cacheKey, content);
+          resolve(content);
+      }
+    });
+  }
+
+  public determineCompression(acceptEncoding: string | string[], preferredCompressionMethodsArg: TCompressionMethod[] = []) {
+    // Ensure acceptEncoding is a single string
+    const encodingString = Array.isArray(acceptEncoding)
+      ? acceptEncoding.join(', ')
+      : acceptEncoding;
+
+    let compressionMethod: TCompressionMethod = 'none';
+
+    // Prioritize preferred compression methods if provided
+    for (const preferredMethod of preferredCompressionMethodsArg) {
+      if (new RegExp(`\\b${preferredMethod}\\b`).test(encodingString)) {
+        return preferredMethod;
+      }
+    }
+
+    // Fallback to default prioritization if no preferred method matches
+    if (/\bbr\b/.test(encodingString)) {
+      compressionMethod = 'br';
+    } else if (/\bgzip\b/.test(encodingString)) {
+      compressionMethod = 'gzip';
+    } else if (/\bdeflate\b/.test(encodingString)) {
+      compressionMethod = 'deflate';
+    }
+
+    return compressionMethod;
+  }
+
+  public async maybeCompress(requestHeaders: plugins.http.IncomingHttpHeaders, content: Buffer, preferredCompressionMethodsArg?: TCompressionMethod[]): Promise<ICompressionResult> {
+    const acceptEncoding = requestHeaders['accept-encoding'];
+    const compressionMethod = this.determineCompression(acceptEncoding, preferredCompressionMethodsArg);
+    const result = await this.compressContent(content, compressionMethod);
+    return {
+      result,
+      compressionMethod,
+    };
+  }
+
+  public createCompressionStream(method: 'gzip' | 'deflate' | 'br' | 'none') {
+    let compressionStream: any;
+    switch (method) {
+      case 'gzip':
+        compressionStream = plugins.zlib.createGzip();
+      case 'br':
+        compressionStream = plugins.zlib.createBrotliCompress({
+          chunkSize: 16 * 1024,
+          params: {
+            
+          },
+        });
+      case 'deflate':
+        compressionStream = plugins.zlib.createDeflate();
+      default:
+        compressionStream = plugins.smartstream.createPassThrough();
+    }
+  }
+}

ts/servertools/classes.feed.ts

@@ -1,6 +1,6 @@
 import { Handler } from './classes.handler.js';
 import { Server } from './classes.server.js';
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 
 export class Feed {
   public smartexpressRef: Server;

ts/servertools/classes.handler.ts

@@ -1,5 +1,5 @@
-import * as plugins from '../typedserver.plugins.js';
-import { Request, Response } from 'express';
+import * as plugins from '../plugins.js';
+import { type Request, type Response } from 'express';
 
 export interface IHandlerFunction {
   (requestArg: Request, responseArg: Response): void;

ts/servertools/classes.handlerproxy.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import { Handler } from './classes.handler.js';
 
 import * as interfaces from '../interfaces/index.js';
@@ -40,7 +40,7 @@ export class HandlerProxy extends Handler {
         }
       }
 
-      let responseToSend: string = proxiedResponse.body;
+      let responseToSend: Buffer = proxiedResponse.body;
       if (typeof responseToSend !== 'string') {
         console.log(proxyRequestUrl);
         console.log(responseToSend);

ts/servertools/classes.handlerstatic.ts

@@ -1,9 +1,11 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import * as interfaces from '../interfaces/index.js';
 
 import { Handler } from './classes.handler.js';
+import { Compressor, type TCompressionMethod, type ICompressionResult } from './classes.compressor.js';
 
 export class HandlerStatic extends Handler {
+  public compressor = new Compressor();
   constructor(
     pathArg: string,
     optionsArg?: {
@@ -11,6 +13,8 @@ export class HandlerStatic extends Handler {
       responseModifier?: interfaces.TResponseModifier;
       headers?: { [key: string]: string };
       serveIndexHtmlDefault?: boolean;
+      enableCompression?: boolean;
+      preferredCompressionMethod?: TCompressionMethod;
     }
   ) {
     super('GET', async (req, res) => {
@@ -62,11 +66,9 @@ export class HandlerStatic extends Handler {
       }
 
       // lets actually care about serving, if security checks pass
-      let fileString: string;
-      let fileEncoding: 'binary' | 'utf8';
+      let fileBuffer: Buffer;
       try {
-        fileString = plugins.smartfile.fs.toStringSync(joinedPath);
-        fileEncoding = plugins.smartmime.getEncoding(joinedPath);
+        fileBuffer = plugins.smartfile.fs.toBufferSync(joinedPath);
         usedPath = joinedPath;
       } catch (err) {
         // try serving index.html instead
@@ -75,8 +77,7 @@ export class HandlerStatic extends Handler {
           console.log(`serving default path ${defaultPath} instead of ${joinedPath}`);
           try {
             parsedPath = plugins.path.parse(defaultPath);
-            fileString = plugins.smartfile.fs.toStringSync(defaultPath);
-            fileEncoding = plugins.smartmime.getEncoding(defaultPath);
+            fileBuffer = plugins.smartfile.fs.toBufferSync(defaultPath);
             usedPath = defaultPath;
           } catch (err) {
             res.writeHead(500);
@@ -99,7 +100,7 @@ export class HandlerStatic extends Handler {
         const modifiedResponse = await optionsArg.responseModifier({
           headers: res.getHeaders(),
           path: usedPath,
-          responseContent: fileString,
+          responseContent: fileBuffer,
           travelData,
         });
 
@@ -115,11 +116,26 @@ export class HandlerStatic extends Handler {
         }
 
         // responseContent
-        fileString = modifiedResponse.responseContent;
+        fileBuffer = modifiedResponse.responseContent;
+      }
+
+      // lets finally deal with compression
+      let compressionResult: ICompressionResult;
+
+      if (optionsArg && optionsArg.enableCompression) {
+        compressionResult = await this.compressor.maybeCompress(requestHeaders, fileBuffer, [optionsArg.preferredCompressionMethod]);
+      } else {
+        compressionResult = {
+          compressionMethod: 'none',
+          result: fileBuffer,
+        };
       }
 
       res.status(200);
-      res.write(Buffer.from(fileString, fileEncoding));
+      if (compressionResult?.compressionMethod) {
+        res.header('Content-Encoding', compressionResult.compressionMethod);
+      }
+      res.write(compressionResult.result);
       res.end();
     });
   }

ts/servertools/classes.handlertypedrouter.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import { Handler } from './classes.handler.js';
 
 import * as interfaces from '../interfaces/index.js';
@@ -11,7 +11,9 @@ export class HandlerTypedRouter extends Handler {
   constructor(typedrouter: plugins.typedrequest.TypedRouter) {
     super('POST', async (req, res) => {
       const response = await typedrouter.routeAndAddResponse(req.body);
-      res.json(response);
+      res.type('json');
+      res.write(plugins.smartjson.stringify(response));
+      res.end();
     });
   }
 }

ts/servertools/classes.route.ts

@@ -1,14 +1,13 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import { Handler } from './classes.handler.js';
 import { Server } from './classes.server.js';
 
-import { ObjectMap } from '@pushrocks/lik';
-import { IRoute as IExpressRoute } from 'express';
+import { type IRoute as IExpressRoute } from 'express';
 
 export class Route {
   public routeString: string;
-  public handlerObjectMap = new ObjectMap<Handler>();
-  public expressMiddlewareObjectMap = new ObjectMap<any>();
+  public handlerObjectMap = new plugins.lik.ObjectMap<Handler>();
+  public expressMiddlewareObjectMap = new plugins.lik.ObjectMap<any>();
   public expressRoute: IExpressRoute; // will be set to server route on server start
   constructor(ServerArg: Server, routeStringArg: string) {
     this.routeString = routeStringArg;

ts/servertools/classes.server.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 
 import { Route } from './classes.route.js';
 import { Handler } from './classes.handler.js';
@@ -9,7 +9,7 @@ import { setupRobots } from './tools.robots.js';
 import { setupManifest } from './tools.manifest.js';
 import { Sitemap } from './classes.sitemap.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';
 
 /**
@@ -101,16 +101,10 @@ export class Server {
       console.log('Using externally supplied http server');
     }
     this.httpServer.keepAliveTimeout = 600 * 1000;
-    this.httpServer.headersTimeout = 600 * 1000;
+    this.httpServer.headersTimeout = 20 * 1000;
 
     // general request handlling
     this.expressAppInstance.use((req, res, next) => {
-      req.on('error', () => {
-        req.destroy();
-      });
-      req.on('timeout', () => {
-        req.destroy();
-      });
       next();
     });
 
@@ -138,13 +132,34 @@ export class Server {
 
     this.expressAppInstance.use((req, res, next) => {
       res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
-      res.setHeader('Cross-Origin-Embedder-Policy', 'unsafe-none');
+      res.setHeader('Cross-Origin-Embedder-Policy', 'require-corp');
+      res.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
       res.setHeader('Access-Control-Allow-Origin', '*');
+      res.setHeader('SERVEZONE_ROUTE', 'LOSSLESS_ORIGIN_CONTAINER');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Expires', new Date(Date.now()).toUTCString());
       next();
     });
 
     // body parsing
-    this.expressAppInstance.use(plugins.bodyParser.json({ limit: 100000000 })); // for parsing application/json
+    this.expressAppInstance.use(async (req, res, next) => {
+      if (req.headers['content-type'] === 'application/json') {
+        let data = '';
+        req.on('data', chunk => {
+          data += chunk;
+        });
+        req.on('end', () => {
+          try {
+            req.body = plugins.smartjson.parse(data);
+            next();
+          } catch (error) {
+            res.status(400).send('Invalid JSON');
+          }
+        });
+      } else {
+        next();
+      }
+    });
     this.expressAppInstance.use(plugins.bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
 
     // robots
@@ -221,25 +236,47 @@ export class Server {
     this.httpServer.on('connection', (connection: plugins.net.Socket) => {
       this.socketMap.add(connection);
       console.log(`added connection. now ${this.socketMap.getArray().length} sockets connected.`);
-      const cleanupConnection = () => {
+      
+      const closeListener = () => {
+        console.log('connection closed');
+        cleanupConnection();
+      };
+      
+      const errorListener = () => {
+        console.log('connection errored');
+        cleanupConnection();
+      };
+      
+      const endListener = () => {
+        console.log('connection ended');
+        cleanupConnection();
+      };
+      
+      const timeoutListener = () => {
+        console.log('connection timed out');
+        cleanupConnection();
+      };
+      
+      connection.addListener('close', closeListener);
+      connection.addListener('error', errorListener);
+      connection.addListener('end', endListener);
+      connection.addListener('timeout', timeoutListener);
+      
+      const cleanupConnection = async () => {
+        connection.removeListener('close', closeListener);
+        connection.removeListener('error', errorListener);
+        connection.removeListener('end', endListener);
+        connection.removeListener('timeout', timeoutListener);
+        
         if (this.socketMap.checkForObject(connection)) {
           this.socketMap.remove(connection);
           console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
-          connection.destroy();
+          await plugins.smartdelay.delayFor(0);
+          if (connection.destroyed === false) {
+            connection.destroy();
+          }
         }
       };
-      connection.on('close', () => {
-        cleanupConnection();
-      });
-      connection.on('error', () => {
-        cleanupConnection();
-      });
-      connection.on('end', () => {
-        cleanupConnection();
-      });
-      connection.on('timeout', () => {
-        cleanupConnection();
-      });
     });
 
     // finally listen on a port

ts/servertools/classes.sitemap.ts

@@ -1,7 +1,7 @@
 import { Server } from './classes.server.js';
 import { Handler } from './classes.handler.js';
-import * as plugins from '../typedserver.plugins.js';
-import { IUrlInfo } from '@pushrocks/smartsitemap';
+import * as plugins from '../plugins.js';
+import { type IUrlInfo } from '@push.rocks/smartsitemap';
 
 export class Sitemap {
   public smartexpressRef: Server;

ts/servertools/tools.manifest.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 
 export const setupManifest = async (
   expressInstanceArg: plugins.express.Application,

ts/servertools/tools.robots.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import { Server } from './classes.server.js';
 import { Handler } from './classes.handler.js';
 

ts/servertools/tools.sslredirect.ts

@@ -1,4 +1,4 @@
-import * as plugins from '../typedserver.plugins.js';
+import * as plugins from '../plugins.js';
 import { Server } from './classes.server.js';
 import { Handler } from './classes.handler.js';
 

ts/typedserver.classes.typedserver.ts

@@ -1,7 +1,8 @@
-import * as plugins from './typedserver.plugins.js';
+import * as plugins from './plugins.js';
 import * as paths from './typedserver.paths.js';
 import * as interfaces from './interfaces/index.js';
 import * as servertools from './servertools/index.js';
+import { type TCompressionMethod } from './servertools/classes.compressor.js';
 
 export interface IServerOptions {
   /**
@@ -14,6 +15,16 @@ export interface IServerOptions {
    */
   injectReload?: boolean;
 
+  /**
+   * enable compression
+   */
+  enableCompression?: boolean;
+
+  /**
+   * choose a preferred compression method
+   */
+  preferredCompressionMethod?: TCompressionMethod;
+
   /**
    * watch the serve directory?
    */
@@ -72,8 +83,8 @@ export class TypedServer {
   public ended = false;
   constructor(optionsArg: IServerOptions) {
     const standardOptions: IServerOptions = {
-      injectReload: true,
       port: 3000,
+      injectReload: false,
       serveDir: null,
       watch: false,
       cors: true,
@@ -109,18 +120,22 @@ export class TypedServer {
         }
       })
     );
+    this.server.addRoute(
+      '/typedrequest',
+      new servertools.HandlerTypedRouter(this.typedrouter)
+    )
   }
 
   /**
    * inits and starts the server
    */
   public async start() {
-    if(this.options.serveDir) {
+    if (this.options.serveDir) {
       this.server.addRoute(
         '/*',
         new servertools.HandlerStatic(this.options.serveDir, {
           responseModifier: async (responseArg) => {
-            let fileString = responseArg.responseContent;
+            let fileString = responseArg.responseContent.toString();
             if (plugins.path.parse(responseArg.path).ext === '.html') {
               const fileStringArray = fileString.split('<head>');
               if (this.options.injectReload && fileStringArray.length === 2) {
@@ -129,7 +144,7 @@ export class TypedServer {
                   <script async defer type="module" src="/typedserver/devtools"></script>
                   <script>
                     globalThis.typedserver = {
-                      lastReload: '${this.lastReload}',
+                      lastReload: ${this.lastReload},
                       versionInfo: ${JSON.stringify({}, null, 2)},
                     }
                   </script>
@@ -149,17 +164,21 @@ export class TypedServer {
             return {
               headers,
               path: responseArg.path,
-              responseContent: fileString,
+              responseContent: Buffer.from(fileString),
             };
           },
           serveIndexHtmlDefault: true,
+          enableCompression: this.options.enableCompression,
+          preferredCompressionMethod: this.options.preferredCompressionMethod,
         })
       );
     } 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) {
-      this.smartchokInstance = new plugins.smartchok.Smartchok([this.options.serveDir], {});
+      this.smartchokInstance = new plugins.smartchok.Smartchok([this.options.serveDir]);
       await this.smartchokInstance.start();
       (await this.smartchokInstance.getObservableFor('change')).subscribe(async () => {
         await this.createServeDirHash();
@@ -176,6 +195,15 @@ export class TypedServer {
       this.server
     );
 
+    // lets setup typedrouter
+    this.typedrouter.addTypedHandler<interfaces.IReq_GetLatestServerChangeTime>(
+      new plugins.typedrequest.TypedHandler('getLatestServerChangeTime', async (reqDataArg) => {
+        return {
+          time: this.lastReload,
+        };
+      })
+    );
+
     // console.log('open url in browser');
     // await plugins.smartopen.openUrl(`http://testing.git.zone:${this.options.port}`);
   }
@@ -185,7 +213,9 @@ export class TypedServer {
    */
   public async reload() {
     this.lastReload = Date.now();
-    for (const connectionArg of await this.typedsocket.findAllTargetConnections(async () => true)) {
+    for (const connectionArg of await this.typedsocket.findAllTargetConnectionsByTag(
+      'typedserver_frontend'
+    )) {
       const pushTime =
         this.typedsocket.createTypedRequest<interfaces.IReq_PushLatestServerChangeTime>(
           'pushLatestServerChangeTime',
@@ -201,7 +231,9 @@ export class TypedServer {
     this.ended = true;
     await this.server.stop();
     await this.typedsocket.stop();
-    await this.smartchokInstance.stop();
+    if (this.smartchokInstance) {
+      await this.smartchokInstance.stop();
+    }
   }
 
   public async createServeDirHash() {

ts/typedserver.paths.ts

@@ -1,4 +1,4 @@
-import * as plugins from './typedserver.plugins.js';
+import * as plugins from './plugins.js';
 
 export const packageDir = plugins.path.join(
   plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),

ts/typedserver.plugins.ts

@@ -1,67 +0,0 @@
-// node native
-import * as http from 'http';
-import * as https from 'https';
-import * as net from 'net';
-import * as path from 'path';
-
-export { http, https, net, path };
-
-// @tsclass scope
-import * as tsclass from '@tsclass/tsclass';
-
-export {
-  tsclass
-}
-
-// @apiglobal scope
-import * as typedrequest from '@apiglobal/typedrequest';
-import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
-import * as typedsocket from '@apiglobal/typedsocket';
-
-export {
-  typedrequest,
-  typedrequestInterfaces,
-  typedsocket,
-}
-
-// @pushrocks scope
-import * as lik from '@pushrocks/lik';
-import * as smartchok from '@pushrocks/smartchok';
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartfeed from '@pushrocks/smartfeed';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smartmanifest from '@pushrocks/smartmanifest';
-import * as smartmime from '@pushrocks/smartmime';
-import * as smartopen from '@pushrocks/smartopen';
-import * as smartpath from '@pushrocks/smartpath';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartrequest from '@pushrocks/smartrequest';
-import * as smartrx from '@pushrocks/smartrx';
-import * as smartsitemap from '@pushrocks/smartsitemap';
-import * as smarttime from '@pushrocks/smarttime';
-
-export {
-  lik,
-  smartchok,
-  smartdelay,
-  smartfeed,
-  smartfile,
-  smartmanifest,
-  smartmime,
-  smartopen,
-  smartpath,
-  smartpromise,
-  smartrequest,
-  smartsitemap,
-  smarttime,
-  smartrx,
-};
-
-// express
-import bodyParser from 'body-parser';
-import cors from 'cors';
-import express from 'express';
-// @ts-ignore
-import expressForceSsl from 'express-force-ssl';
-
-export { bodyParser, cors, express, expressForceSsl };

ts_web/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@apiglobal/typedserver',
-  version: '2.0.42',
-  description: 'easy serving of static files'
+  name: '@api.global/typedserver',
+  version: '3.0.29',
+  description: 'A TypeScript-based project for easy serving of static files with support for live reloading, compression, and typed requests.'
 }

ts_web/index.ts

@@ -61,11 +61,15 @@ export class ReloadChecker {
 
   public async checkReload(lastServerChange: number) {
     let reloadJustified = false;
-    (await this.store.get(this.storeKey)) !== lastServerChange ? (reloadJustified = true) : null;
+    let storedLastServerChange = await this.store.get(this.storeKey);
+    if (storedLastServerChange && storedLastServerChange !== lastServerChange) {
+      reloadJustified = true;
+    } else {
+    }
 
     if (reloadJustified) {
       this.store.set(this.storeKey, lastServerChange);
-      const reloadText = `about to reload ${
+      const reloadText = `upgrading... ${
         globalThis.globalSw ? '(purging the sw cache first...)' : ''
       }`;
       this.infoscreen.setText(reloadText);
@@ -98,18 +102,29 @@ export class ReloadChecker {
         this.typedrouter,
         plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl()
       );
-      this.typedsocket.eventSubject.subscribe(eventArg => {
+      this.typedsocket.addTag('typedserver_frontend', {});
+      this.typedsocket.eventSubject.subscribe(async (eventArg) => {
         console.log(`typedsocket event subscription: ${eventArg}`);
-        if (eventArg === 'disconnected' || eventArg === 'disconnecting' || eventArg === 'timedOut') {
+        if (
+          eventArg === 'disconnected' ||
+          eventArg === 'disconnecting' ||
+          eventArg === 'timedOut'
+        ) {
           this.backendConnectionLost = true;
-          this.infoscreen.setText(`typedsocket ${eventArg}!`)
+          this.infoscreen.setText(`typedsocket ${eventArg}!`);
         } else if (eventArg === 'connected' && this.backendConnectionLost) {
           this.backendConnectionLost = false;
-          this.infoscreen.setSuccess('typedsocket connected!')
+          this.infoscreen.setSuccess('typedsocket connected!');
+          // lets check if a reload is necessary
+          const getLatestServerChangeTime =
+            this.typedsocket.createTypedRequest<interfaces.IReq_GetLatestServerChangeTime>(
+              'getLatestServerChangeTime'
+            );
+          const response = await getLatestServerChangeTime.fire({});
+          this.checkReload(response.time);
         }
-
       });
-      logger.log('success', `ReloadChecker connected through typedsocket!`)
+      logger.log('success', `ReloadChecker connected through typedsocket!`);
     }
   }
 

ts_web/typedserver_web.infoscreen.ts

@@ -95,10 +95,13 @@ export class TypedserverInfoscreen extends LitElement {
 
   public async hide() {
     this.text = '';
-    const mainbox = this.shadowRoot.querySelector('.mainbox');
-    mainbox.classList.add('show');
+    if (this.appended) {
+      const mainbox = this.shadowRoot.querySelector('.mainbox');
+      mainbox.classList.remove('show');
+    }
     await plugins.smartdelay.delayFor(300);
     if (this.appended) {
+      this.appended = false;
       document.body.removeChild(this);
     }
   }

ts_web/typedserver_web.plugins.ts

@@ -1,6 +1,6 @@
 // @apiglobal scope
-import * as typedrequest from '@apiglobal/typedrequest';
-import * as typedsocket from '@apiglobal/typedsocket';
+import * as typedrequest from '@api.global/typedrequest';
+import * as typedsocket from '@api.global/typedsocket';
 
 export {
   typedrequest,
@@ -8,10 +8,10 @@ export {
 }
 
 // pushrocks scope
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartlogDestinationDevtools from '@pushrocks/smartlog-destination-devtools';
-import * as webstore from '@pushrocks/webstore';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartlogDestinationDevtools from '@push.rocks/smartlog-destination-devtools';
+import * as webstore from '@push.rocks/webstore';
 
 export  {
   smartdelay,

tsconfig.json

@@ -1,9 +1,14 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
+    "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }