3.0.4

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.64",
+  "name": "@api.global/typedserver",
+  "version": "3.0.4",
   "description": "easy serving of static files",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -37,42 +37,42 @@
   ],
   "homepage": "https://github.com/pushrocks/easyserve",
   "dependencies": {
-    "@apiglobal/typedrequest": "^2.0.12",
-    "@apiglobal/typedrequest-interfaces": "^2.0.1",
-    "@apiglobal/typedsocket": "^2.0.24",
-    "@pushrocks/lik": "^6.0.2",
-    "@pushrocks/smartchok": "^1.0.23",
-    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartenv": "^5.0.5",
-    "@pushrocks/smartfeed": "^1.0.11",
-    "@pushrocks/smartfile": "^10.0.25",
-    "@pushrocks/smartlog": "^3.0.2",
-    "@pushrocks/smartlog-destination-devtools": "^1.0.10",
-    "@pushrocks/smartmanifest": "^2.0.2",
-    "@pushrocks/smartmime": "^1.0.5",
-    "@pushrocks/smartopen": "^2.0.0",
-    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartrequest": "^2.0.15",
-    "@pushrocks/smartrx": "^3.0.2",
-    "@pushrocks/smartsitemap": "^2.0.1",
-    "@pushrocks/smarttime": "^4.0.1",
-    "@pushrocks/webstore": "^2.0.8",
+    "@api.global/typedrequest": "^3.0.1",
+    "@api.global/typedrequest-interfaces": "^3.0.1",
+    "@api.global/typedsocket": "^3.0.0",
+    "@push.rocks/lik": "^6.0.3",
+    "@push.rocks/smartchok": "^1.0.23",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartenv": "^5.0.5",
+    "@push.rocks/smartfeed": "^1.0.11",
+    "@push.rocks/smartfile": "^10.0.28",
+    "@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.18",
+    "@push.rocks/smartrx": "^3.0.6",
+    "@push.rocks/smartsitemap": "^2.0.2",
+    "@push.rocks/smarttime": "^4.0.4",
+    "@push.rocks/webstore": "^2.0.9",
     "@tsclass/tsclass": "^4.0.42",
     "@types/express": "^4.17.17",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-force-ssl": "^0.3.2",
-    "lit": "^2.7.5"
+    "lit": "^2.8.0"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.66",
     "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^20.3.3"
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.12",
+    "@types/node": "^20.4.8"
   },
   "private": false,
   "browserslist": [

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,
@@ -71,7 +78,7 @@ tap.test('should create a valid StaticHandler', async () => {
 });
 
 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.64',
+  name: '@api.global/typedserver',
+  version: '3.0.4',
   description: 'easy serving of static files'
 }

ts/interfaces/typedrequests.ts

@@ -1,4 +1,5 @@
-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<

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

@@ -254,7 +254,9 @@ export class Server {
           this.socketMap.remove(connection);
           console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
           await plugins.smartdelay.delayFor(0);
-          connection.destroy();
+          if (connection.destroyed === false) {
+            connection.destroy();
+          }
         }
       };
     });

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 { type IUrlInfo } from '@pushrocks/smartsitemap';
+import { type IUrlInfo } from '@push.rocks/smartsitemap';
 
 export class Sitemap {
   public smartexpressRef: Server;

ts/typedserver.classes.typedserver.ts

@@ -109,6 +109,10 @@ export class TypedServer {
         }
       })
     );
+    this.server.addRoute(
+      '/typedrequest',
+      new servertools.HandlerTypedRouter(this.typedrouter)
+    )
   }
 
   /**

ts/typedserver.plugins.ts

@@ -12,27 +12,27 @@ 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';
+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 '@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 smarttime from '@push.rocks/smarttime';
 
 export {
   lik,

ts_web/00_commitinfo_data.ts

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

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,