Merge pull request #94 from com-pas/service-worker-and-401

Change Workbox config to excluded index.html and also compas url's.

Author: Rob Tjalma

index.html

@@ -13,7 +13,7 @@
   <!-- Original URL from Google: https://fonts.googleapis.com/css?family=Material+Icons+Outlined&display=block -->
   <link href="public/google/icons/material-icons-outlined.css" rel="stylesheet">
   <link href="public/css/normalize.css" rel="stylesheet">
-  <link rel="manifest" href="manifest.json">
+  <link rel="manifest" href="manifest.json" crossorigin="use-credentials">
   <link rel="icon" type="image/png" sizes="16x16" href="public/favicon-16x16.png">
   <link rel="icon" type="image/png" sizes="32x32" href="public/favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="192x192" href="public/icon-192x192.png">

package.json

@@ -65,7 +65,8 @@
     "release:patch": "standard-version --release-as patch",
     "release:major": "standard-version --release-as major",
     "build": "npm run test && npm run build:notest && cp .nojekyll build/",
-    "build:notest": "npm run doc && snowpack build && workbox generateSW workbox-config.cjs",
+    "build:notest": "npm run doc && npm run build:only",
+    "build:only": "snowpack build && workbox generateSW workbox-config.cjs",
     "start": "snowpack dev"
   },
   "devDependencies": {
@@ -128,18 +129,28 @@
     ]
   },
   "snowpack": {
+    "buildOptions": {
+      "clean": true
+    },
     "exclude": [
       "**/node_modules/**/*",
-      "**/*.@(spec|test).@(js|mjs)",
-      "test/**/*",
-      "out-tsc/**/*",
       ".editorconfig",
       ".eslintrc.cjs",
-      ".gitignore",
       ".travis.yml",
-      "karma.conf.cjs",
-      "package*",
-      "tsconfig.json"
+      "**/karma.conf.cjs",
+      "**/Dockerfile",
+      "**/package*.json",
+      "**/tsconfig.json",
+      "**/workbox-config.cjs",
+      "**/*.@(spec|test).@(js|mjs)",
+      "**/__snapshots__/**/*",
+      "**/coverage/**/*",
+      "**/out-tsc/**/*",
+      "**/test/**/*",
+      ".gitignore",
+      "**/.git/**",
+      "**/.github/**",
+      "**/.idea/**"
     ],
     "plugins": [
       "@snowpack/plugin-typescript"

src/compas/CompasSession.ts

@@ -153,16 +153,16 @@ export function renderCompasSessionDialogs(doc: Document | null, docName: string
 
 let pingTimer: NodeJS.Timeout | null = null;
 
-async function executeKeepAlivePing() {
-  await CompasUserInfoService().ping()
-    .finally(() => pingTimer = null)
+function resetKeepAlivePing() {
+  pingTimer = null;
 }
 
 function schedulePing() {
-  if (!pingTimer) {
+  if (pingTimer === null) {
     // Every minute we will send a Ping to the CoMPAS Services while the user is still active.
     // This to keep the connection alive so long the user is working.
-    pingTimer = setTimeout(executeKeepAlivePing, (60 * 1000));
+    CompasUserInfoService().ping().finally(() => console.debug('Ping executed.'))
+    pingTimer = setTimeout(resetKeepAlivePing, (60 * 1000));
   }
 }
 

tsconfig.json

@@ -1,4 +1,4 @@
-  {
+{
   "compilerOptions": {
     "target": "es2020",
     "module": "esnext",

workbox-config.cjs

@@ -1,16 +1,23 @@
 module.exports = {
+  cacheId: 'compas',
   globDirectory: 'build/',
   globPatterns: [
+    '_snowpack/**/*.{md,js,png,xml,pdf,css,html,info,json,ico,svg,wasm}',
     'public/**/*.{md,js,png,xml,pdf,css,html,info,json,ico,svg,wasm}',
     'src/**/*.{md,js,png,xml,pdf,css,html,info,json,ico,svg,wasm}',
-    'web_modules/**/*.{md,js,png,xml,pdf,css,html,info,json,ico,svg,wasm}',
-    '*.{md,js,png,xml,pdf,css,html,info,json,ico,svg,wasm}',
+    '*.{md,json,ico,xml}',
   ],
   swDest: 'build/sw.js',
   runtimeCaching: [
     {
-      urlPattern: /.*/,
+      urlPattern: /\/(_snowpack|public|src)\/.*/,
       handler: 'NetworkFirst',
+      options: {
+        cacheName: 'compas-runtime-http',
+        fetchOptions: {
+          credentials: 'include',
+        },
+      }
     },
   ],
   skipWaiting: true,