release: v1.2.0

lionelhorn · Jul 21, 2022 · d66eaf5 · d66eaf5
1 parent f23dc51
commit d66eaf5
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0 (21 Jul 2022)
+
+* feat: support cdn option
+
 ## 1.1.0 (21 Jul 2022)
 
 * feat: cdn for embedded mode

diff --git a/bin/chii.js b/bin/chii.js
@@ -12,11 +12,13 @@ program
   .option('-p, --port <port>', 'set the port to start on. defaults to 3000', parseInt)
   .option('-h, --host <host>', 'set the host. defaults to 0.0.0.0')
   .option('-d, --domain <domain>', 'set the domain. defaults to localhost:port')
-  .action(({ port, host, domain }) => {
+  .option('--cdn <cdn>', 'use cdn like jsdelivr')
+  .action(({ port, host, domain, cdn }) => {
     server.start({
       port,
       host,
       domain,
+      cdn,
     });
   });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chii",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Chrome devtools framework",
   "main": "./server/index.js",
   "bin": {

diff --git a/server/index.js b/server/index.js
@@ -5,13 +5,13 @@ const compress = require('./middle/compress');
 const util = require('./lib/util');
 const WebSocketServer = require('./lib/WebSocketServer');
 
-function start({ port = 8080, host, domain, server } = {}) {
+function start({ port = 8080, host, domain, server, cdn } = {}) {
   domain = domain || 'localhost:' + port;
 
   const app = new Koa();
   const wss = new WebSocketServer();
 
-  app.use(compress()).use(router(wss.channelManager, domain));
+  app.use(compress()).use(router(wss.channelManager, domain, cdn));
 
   if (server) {
     server.on('request', app.callback());

diff --git a/server/middle/router.js b/server/middle/router.js
@@ -12,7 +12,7 @@ const pkg = require('../../package.json');
 
 const maxAge = ms('2h');
 
-module.exports = function (channelManager, domain) {
+module.exports = function (channelManager, domain, cdn) {
   const router = new Router();
 
   router.get('/', async ctx => {
@@ -31,6 +31,15 @@ module.exports = function (channelManager, domain) {
     });
   });
 
+  if (cdn) {
+    router.get('/front_end/chii_app.html', async ctx => {
+      const tpl = await readTpl('chii_app');
+      ctx.body = tpl({
+        cdn,
+      });
+    });
+  }
+
   let timestamp = now();
   router.get('/timestamp', ctx => {
     ctx.body = timestamp;

diff --git a/server/tpl/chii_app.hbs b/server/tpl/chii_app.hbs
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>DevTools</title>
+<style>
+  @media (prefers-color-scheme: dark) {
+    body {
+      background-color: rgb(41 42 45);
+    }
+  }
+</style>
+<meta name="referrer" content="no-referrer">
+<script type="module" src="{{cdn}}/front_end/entrypoints/chii_app/chii_app.js"></script>
+<body class="undocked" id="-blink-dev-tools">
diff --git a/src/DevtoolsFrame.ts b/src/DevtoolsFrame.ts
@@ -5,6 +5,8 @@ import evalCss from 'licia/evalCss';
 import toStr from 'licia/toStr';
 import toNum from 'licia/toNum';
 import startWith from 'licia/startWith';
+import isStr from 'licia/isStr';
+import isJson from 'licia/isJson';
 
 const $document = $(document as any);
 
@@ -92,7 +94,7 @@ export default class DevtoolsFrame {
       if (event.origin !== targetOrigin) {
         return;
       }
-      if (event.data) {
+      if (event.data && isStr(event.data) && isJson(event.data)) {
         chobitsu.sendRawMessage(event.data);
       }
     });