@unvt/charites 2.1.2 → 2.1.4

package/dist/commands/serve.js

@@ -38,6 +38,14 @@ export async function serve(source, options) {
     }
     const server = http.createServer(async (req, res) => {
         const url = (req.url || '').replace(/\?.*/, '');
+        res.setHeader('Access-Control-Allow-Origin', '*');
+        res.setHeader('Access-Control-Allow-Methods', 'GET,HEAD,OPTIONS');
+        res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+        if (req.method === 'OPTIONS') {
+            res.statusCode = 204;
+            res.end();
+            return;
+        }
         if (typeof spriteOut !== 'undefined' &&
             url.match(/^\/sprite(@2x)?\.(json|png)/)) {
             res.statusCode = 200;
@@ -112,35 +120,38 @@ export async function serve(source, options) {
         }
     });
     const wss = new WebSocketServer({ server });
-    wss.on('connection', (ws) => {
-        const watcher = watch(path.dirname(sourcePath), { recursive: true, filter: /\.yml$|\.svg$/i }, (event, file) => {
-            console.log(`${(event || '').toUpperCase()}: ${file}`);
-            try {
-                if (file?.toLowerCase().endsWith('.yml')) {
-                    ws.send(JSON.stringify({
-                        event: 'styleUpdate',
-                    }));
-                }
-                else if (file?.toLowerCase().endsWith('.svg') &&
-                    typeof spriteRefresher !== 'undefined') {
-                    spriteRefresher().then(() => {
-                        ws.send(JSON.stringify({
-                            event: 'spriteUpdate',
-                        }));
-                    });
+    const sockets = new Set();
+    const watcher = watch(path.dirname(sourcePath), { recursive: true, filter: /\.yml$|\.svg$/i }, (event, file) => {
+        console.log(`${(event || '').toUpperCase()}: ${file}`);
+        try {
+            if (file?.toLowerCase().endsWith('.yml')) {
+                for (const client of sockets) {
+                    client.send(JSON.stringify({ event: 'styleUpdate' }));
                 }
             }
-            catch (_) {
-                // Nothing to do
+            else if (file?.toLowerCase().endsWith('.svg') &&
+                typeof spriteRefresher !== 'undefined') {
+                spriteRefresher().then(() => {
+                    for (const client of sockets) {
+                        client.send(JSON.stringify({ event: 'spriteUpdate' }));
+                    }
+                });
             }
-        });
-        wss.on('close', () => {
-            watcher.close();
+        }
+        catch (_) {
+            // Nothing to do
+        }
+    });
+    wss.on('connection', (ws) => {
+        sockets.add(ws);
+        ws.on('close', () => {
+            sockets.delete(ws);
         });
     });
     process.on('SIGINT', () => {
         console.log('Cleaning up...');
         server.close();
+        watcher.close();
         if (typeof spriteOut !== 'undefined') {
             fs.rmSync(spriteOut, { recursive: true });
             spriteOut = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unvt/charites",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "",
   "bin": {
     "charites": "dist/cli.js"

package/src/commands/serve.ts

@@ -5,6 +5,7 @@ import http from 'http'
 import open from 'open'
 // tweak to fix WebSocketServer is not a constructor
 const ws = await import('ws')
+import type { WebSocket as WSWebSocket } from 'ws'
 const WebSocketServer = ws.default.WebSocketServer || ws.WebSocketServer
 import watch from 'node-watch'
 
@@ -54,6 +55,14 @@ export async function serve(source: string, options: serveOptions) {
 
   const server = http.createServer(async (req, res) => {
     const url = (req.url || '').replace(/\?.*/, '')
+    res.setHeader('Access-Control-Allow-Origin', '*')
+    res.setHeader('Access-Control-Allow-Methods', 'GET,HEAD,OPTIONS')
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type')
+    if (req.method === 'OPTIONS') {
+      res.statusCode = 204
+      res.end()
+      return
+    }
 
     if (
       typeof spriteOut !== 'undefined' &&
@@ -137,45 +146,45 @@ export async function serve(source: string, options: serveOptions) {
   })
 
   const wss = new WebSocketServer({ server })
+  const sockets = new Set<WSWebSocket>()
 
-  wss.on('connection', (ws: WebSocket) => {
-    const watcher = watch(
-      path.dirname(sourcePath),
-      { recursive: true, filter: /\.yml$|\.svg$/i },
-      (event: string, file: string) => {
-        console.log(`${(event || '').toUpperCase()}: ${file}`)
-        try {
-          if (file?.toLowerCase().endsWith('.yml')) {
-            ws.send(
-              JSON.stringify({
-                event: 'styleUpdate',
-              }),
-            )
-          } else if (
-            file?.toLowerCase().endsWith('.svg') &&
-            typeof spriteRefresher !== 'undefined'
-          ) {
-            spriteRefresher().then(() => {
-              ws.send(
-                JSON.stringify({
-                  event: 'spriteUpdate',
-                }),
-              )
-            })
+  const watcher = watch(
+    path.dirname(sourcePath),
+    { recursive: true, filter: /\.yml$|\.svg$/i },
+    (event: string, file: string) => {
+      console.log(`${(event || '').toUpperCase()}: ${file}`)
+      try {
+        if (file?.toLowerCase().endsWith('.yml')) {
+          for (const client of sockets) {
+            client.send(JSON.stringify({ event: 'styleUpdate' }))
           }
-        } catch (_) {
-          // Nothing to do
+        } else if (
+          file?.toLowerCase().endsWith('.svg') &&
+          typeof spriteRefresher !== 'undefined'
+        ) {
+          spriteRefresher().then(() => {
+            for (const client of sockets) {
+              client.send(JSON.stringify({ event: 'spriteUpdate' }))
+            }
+          })
         }
-      },
-    )
-    wss.on('close', () => {
-      watcher.close()
+      } catch (_) {
+        // Nothing to do
+      }
+    },
+  )
+
+  wss.on('connection', (ws: WSWebSocket) => {
+    sockets.add(ws)
+    ws.on('close', () => {
+      sockets.delete(ws)
     })
   })
 
   process.on('SIGINT', () => {
     console.log('Cleaning up...')
     server.close()
+    watcher.close()
     if (typeof spriteOut !== 'undefined') {
       fs.rmSync(spriteOut, { recursive: true })
       spriteOut = undefined