2.0.50

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiglobal/typedserver",
-  "version": "2.0.42",
+  "version": "2.0.50",
   "description": "easy serving of static files",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@apiglobal/typedserver',
-  version: '2.0.42',
+  version: '2.0.50',
   description: 'easy serving of static files'
 }

ts/interfaces/typedrequests.ts

@@ -10,3 +10,14 @@ export interface IReq_PushLatestServerChangeTime extends typedrequestInterfaces.
   };
   response: {}
 }
+
+export interface IReq_GetLatestServerChangeTime extends typedrequestInterfaces.implementsTR<
+  typedrequestInterfaces.ITypedRequest,
+  IReq_GetLatestServerChangeTime
+> {
+  method: 'getLatestServerChangeTime',
+  request: {};
+  response: {
+    time: number;
+  }
+}

ts/servertools/classes.server.ts

@@ -140,6 +140,9 @@ export class Server {
       res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
       res.setHeader('Cross-Origin-Embedder-Policy', 'unsafe-none');
       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();
     });
 

ts/typedserver.classes.typedserver.ts

@@ -72,8 +72,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,
@@ -176,6 +176,13 @@ 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 +192,7 @@ 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 +208,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_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@apiglobal/typedserver',
-  version: '2.0.42',
+  version: '2.0.50',
   description: 'easy serving of static files'
 }

ts_web/index.ts

@@ -65,7 +65,7 @@ export class ReloadChecker {
 
     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,14 +98,19 @@ 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') {
           this.backendConnectionLost = true;
           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);
         }
 
       });

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);
     }
   }