3.0.12

.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

@@ -9,7 +9,7 @@
       "gitscope": "pushrocks",
       "gitrepo": "typedserver",
       "description": "easy serving of static files",
-      "npmPackagename": "@apiglobal/typedserver",
+      "npmPackagename": "@api.global/typedserver",
       "license": "MIT"
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@apiglobal/typedserver",
-  "version": "2.0.45",
+  "name": "@api.global/typedserver",
+  "version": "3.0.12",
   "description": "easy serving of static files",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -37,41 +37,43 @@
   ],
   "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.4",
+    "@api.global/typedrequest-interfaces": "^3.0.1",
+    "@api.global/typedsocket": "^3.0.0",
+    "@push.rocks/lik": "^6.0.12",
+    "@push.rocks/smartchok": "^1.0.23",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartenv": "^5.0.12",
+    "@push.rocks/smartfeed": "^1.0.11",
+    "@push.rocks/smartfile": "^11.0.4",
+    "@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.11",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartrequest": "^2.0.21",
+    "@push.rocks/smartrx": "^3.0.7",
+    "@push.rocks/smartsitemap": "^2.0.3",
+    "@push.rocks/smartstream": "^3.0.30",
+    "@push.rocks/smarttime": "^4.0.6",
+    "@push.rocks/webstore": "^2.0.13",
+    "@tsclass/tsclass": "^4.0.46",
+    "@types/express": "^4.17.21",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-force-ssl": "^0.3.2",
-    "lit": "^2.7.0"
+    "lit": "^3.1.0"
   },
   "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.66",
+    "@git.zone/tsbundle": "^2.0.8",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.84",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.10.7"
   },
   "private": false,
   "browserslist": [

readme.md

@@ -1,4 +1,4 @@
-# @apiglobal/typedserver
+# @pushrocks/typedserver
 easy serving of static files
 
 ## Availabililty and Links

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.45',
+  name: '@api.global/typedserver',
+  version: '3.0.12',
   description: 'easy serving of static files'
 }

ts/index.ts

@@ -2,9 +2,7 @@ import * as plugins from './typedserver.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,23 +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',
+export interface IReq_GetLatestServerChangeTime
+  extends typedrequestInterfaces.implementsTR<
+    typedrequestInterfaces.ITypedRequest,
+    IReq_GetLatestServerChangeTime
+  > {
+  method: 'getLatestServerChangeTime';
   request: {};
   response: {
     time: number;
-  }
+  };
 }

ts/servertools/classes.compressor.ts

@@ -0,0 +1,76 @@
+import * as plugins from '../typedserver.plugins.js';
+
+export class Compressor {
+  public async compressContent(
+    content: Buffer,
+    method: 'gzip' | 'deflate' | 'br' | 'none'
+  ): Promise<Buffer> {
+    return new Promise((resolve, reject) => {
+      switch (method) {
+        case 'gzip':
+          plugins.zlib.gzip(content, (err, result) => {
+            if (err) reject(err);
+            else resolve(result);
+          });
+          break;
+        case 'br':
+          plugins.zlib.brotliCompress(content, (err, result) => {
+            if (err) reject(err);
+            else resolve(result);
+          });
+          break;
+        case 'deflate':
+          plugins.zlib.deflate(content, (err, result) => {
+            if (err) reject(err);
+            else resolve(result);
+          });
+          break;
+        default:
+          resolve(content);
+      }
+    });
+  }
+
+  public determineCompression(acceptEncoding: string | string[]) {
+    // Ensure acceptEncoding is a single string
+    const encodingString = Array.isArray(acceptEncoding)
+      ? acceptEncoding.join(', ')
+      : acceptEncoding;
+
+    let compressionMethod: 'gzip' | 'deflate' | 'br' | 'none' = 'none';
+
+    // Check and prioritize compression methods
+    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) {
+    const acceptEncoding = requestHeaders['accept-encoding'];
+    const compressionMethod = this.determineCompression(acceptEncoding);
+    const result = await this.compressContent(content, compressionMethod);
+    return {
+      result,
+      compressionMethod,
+    };
+  }
+
+  public createCompressionStream(method: 'gzip' | 'deflate' | 'br' | 'none') {
+    switch (method) {
+      case 'gzip':
+        return plugins.zlib.createGzip();
+      case 'br':
+        return plugins.zlib.createBrotliCompress();
+      case 'deflate':
+        return plugins.zlib.createDeflate();
+      default:
+        throw new Error('Invalid compression method');
+    }
+  }
+}

ts/servertools/classes.handler.ts

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

ts/servertools/classes.handlerproxy.ts

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

@@ -2,8 +2,10 @@ import * as plugins from '../typedserver.plugins.js';
 import * as interfaces from '../interfaces/index.js';
 
 import { Handler } from './classes.handler.js';
+import { Compressor } from './classes.compressor.js';
 
 export class HandlerStatic extends Handler {
+  public compressor = new Compressor();
   constructor(
     pathArg: string,
     optionsArg?: {
@@ -62,11 +64,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 +75,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 +98,7 @@ export class HandlerStatic extends Handler {
         const modifiedResponse = await optionsArg.responseModifier({
           headers: res.getHeaders(),
           path: usedPath,
-          responseContent: fileString,
+          responseContent: fileBuffer,
           travelData,
         });
 
@@ -115,11 +114,15 @@ export class HandlerStatic extends Handler {
         }
 
         // responseContent
-        fileString = modifiedResponse.responseContent;
+        fileBuffer = modifiedResponse.responseContent;
       }
 
+      // lets finally deal with compression
+      const compressionResult = await this.compressor.maybeCompress(requestHeaders, fileBuffer);
+
       res.status(200);
-      res.write(Buffer.from(fileString, fileEncoding));
+      res.header('Content-Encoding', compressionResult.compressionMethod);
+      res.write(compressionResult.result);
       res.end();
     });
   }

ts/servertools/classes.route.ts

@@ -2,13 +2,12 @@ import * as plugins from '../typedserver.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

@@ -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,8 +132,12 @@ 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();
     });
 
@@ -221,25 +219,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 { type IUrlInfo } from '@push.rocks/smartsitemap';
 
 export class Sitemap {
   public smartexpressRef: Server;

ts/typedserver.classes.typedserver.ts

@@ -109,18 +109,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 +133,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,14 +153,16 @@ export class TypedServer {
             return {
               headers,
               path: responseArg.path,
-              responseContent: fileString,
+              responseContent: Buffer.from(fileString),
             };
           },
           serveIndexHtmlDefault: true,
         })
       );
     } 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], {});
@@ -177,11 +183,13 @@ export class TypedServer {
     );
 
     // lets setup typedrouter
-    this.typedrouter.addTypedHandler<interfaces.IReq_GetLatestServerChangeTime>(new plugins.typedrequest.TypedHandler('getLatestServerChangeTime', async reqDataArg => {
-      return {
-        time: this.lastReload,
-      }
-    }))
+    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}`);
@@ -192,7 +200,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',

ts/typedserver.plugins.ts

@@ -3,42 +3,38 @@ import * as http from 'http';
 import * as https from 'https';
 import * as net from 'net';
 import * as path from 'path';
+import * as zlib from 'zlib';
 
-export { http, https, net, path };
+export { http, https, net, path, zlib };
 
 // @tsclass scope
 import * as tsclass from '@tsclass/tsclass';
 
-export {
-  tsclass
-}
+export { tsclass };
 
 // @apiglobal scope
-import * as typedrequest from '@apiglobal/typedrequest';
-import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
-import * as typedsocket from '@apiglobal/typedsocket';
+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,
-}
+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';
+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 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,
@@ -53,6 +49,7 @@ export {
   smartpromise,
   smartrequest,
   smartsitemap,
+  smartstream,
   smarttime,
   smartrx,
 };

ts_web/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@apiglobal/typedserver',
-  version: '2.0.45',
+  name: '@api.global/typedserver',
+  version: '3.0.12',
   description: 'easy serving of static files'
 }

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,22 +102,29 @@ export class ReloadChecker {
         this.typedrouter,
         plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl()
       );
-      this.typedsocket.eventSubject.subscribe(async 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!');
           // lets check if a reload is necessary
-          const getLatestServerChangeTime = this.typedsocket.createTypedRequest<interfaces.IReq_GetLatestServerChangeTime>('getLatestServerChangeTime');
+          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,