blocks map fixes

Author: daimor

Blocks/Router.cls.xml

@@ -8,27 +8,15 @@
 <XData name="UrlMap">
 <Data><![CDATA[
 <Routes>
-<Route Url="/dblist" Method="GET" Call="DBList"/>
-<Route Url="/block/:block" Method="GET" Call="BlockInfo"/>
-<Route Url="/block/:block" Method="POST" Call="BlockInfo"/>
+<Route Url="(?:/rest)?/dblist" Method="GET" Call="DBList"/>
+<Route Url="(?:/rest)?/block/:block" Method="GET" Call="BlockInfo"/>
+<Route Url="(?:/rest)?/block/:block" Method="POST" Call="BlockInfo"/>
 <Route Url="/websocket" Method="GET" Call="WebSocket"/>
 <Route Url="/((?!rest/).*)" Method="GET" Call="GetStatic"/>
 </Routes>
 ]]></Data>
 </XData>
 
-<Method name="Page">
-<ClassMethod>1</ClassMethod>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	if (%request.GetCgiEnv("HTTP_CONNECTION") = "Upgrade") {
-		quit ##class(Blocks.WebSocket).Page()
-	}
-
-	quit ##super()
-]]></Implementation>
-</Method>
-
 <Method name="WebSocket">
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>

Blocks/WebSocket.cls.xml

@@ -75,7 +75,6 @@
 <Method name="SendBlocksData">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	;do ..Write("error", "test0" _ ..Event)
     set st = $$$OK
     
     quit:..Event="" $$$OK

gulpfile.js

@@ -2,6 +2,8 @@ var gulp = require('gulp')
 var gutil = require('gulp-util')
 var clean = require('gulp-clean')
 var cheerio = require('gulp-cheerio')
+var wrapper = require('gulp-wrapper')
+var rename = require('gulp-rename')
 var htmlReplace = require('gulp-html-replace')
 var fs = require('fs')
 var path = require('path')
@@ -34,56 +36,77 @@ gulp.task('webpack', ['clean'], function (callback) {
   });
 })
 
+gulp.task('csp', ['webpack'], function () {
+  return gulp.src([
+    './build/**/*',
+    '!./build/xml',
+    '!./build/**/*.xml'
+  ])
+  .pipe(wrapper({
+    header: '<?xml version="1.0" encoding="UTF-8"?>\n<Export generator="Cache" version="24">\n<CSP name="${filename}" application="/blocks/" default="1"><![CDATA[',
+    footer: ']]></CSP>\n</Export>'
+  }))
+  .pipe(rename(function(path ){
+    path.extname += '.xml'
+  }))
+  .pipe(gulp.dest('./build/xml/'))
+});
+
 gulp.task('xml', ['clean', 'webpack'], function () {
   return gulp.src([
     './BlocksExplorer.prj.xml',
     './Blocks/**/*.xml'
   ])
     .pipe(cheerio({
       run: function ($, file) {
-        var staticFiles = fs.readdirSync('./build/')
-
-        staticFiles.map(function (fileName) {
-          try {
-            fullName = path.join('./build/', fileName)
-            if (!fs.statSync(fullName).isDirectory()) {
-              $('Class[name="Blocks.Router"]').append($('<XData>')
-                .attr('name', fileName.replace(/\./g, '_'))
-                .append('<Description>*base64*</Description>')
-                .append(
-                $('<Data><![CDATA[ <data>' + (fs.readFileSync(fullName, {
-                  encoding: 'base64'
-                })).replace(/[\n\r]/g, '') + '</data> ]]> </Data>')
-                )
-              )
-            }
-          } catch (err) {
-            console.log(err)
-          }
-        })
+        // var staticFiles = fs.readdirSync('./build/')
+
+        // staticFiles.map(function (fileName) {
+        //   try {
+        //     fullName = path.join('./build/', fileName)
+        //     if (!fs.statSync(fullName).isDirectory()) {
+        //       $('Project>Items').append(
+        //         $('<ProjectItem>')
+        //           .attr('type', 'CSP')
+        //           .attr('name', fileName)
+        //       );
+        //       // $('Class[name="Blocks.Router"]').append($('<XData>')
+        //       //   .attr('name', fileName.replace(/\./g, '_'))
+        //       //   .append('<Description>*base64*</Description>')
+        //       //   .append(
+        //       //   $('<Data><![CDATA[ <data>' + (fs.readFileSync(fullName, {
+        //       //     encoding: 'base64'
+        //       //   })).replace(/[\n\r]/g, '') + '</data> ]]> </Data>')
+        //       //   )
+        //       // )
+        //     }
+        //   } catch (err) {
+        //     console.log(err)
+        //   }
+        // })
 
       },
       parserOptions: {
         xmlMode: true,
         prettify: true
       }
     }))
-    .pipe(gulp.dest('./build/src/'))
+    .pipe(gulp.dest('./build/xml/'))
 })
 
-gulp.task('project', ['clean', 'xml', 'webpack'], function () {
+gulp.task('project', ['clean', 'xml', 'csp'], function () {
   return gulp.src([
-    './build/src/BlocksExplorer.prj.xml',
-    './build/src/**/*.xml',
-    '!./build/src/**/*Installer.cls.xml'
+    './build/xml/BlocksExplorer.prj.xml',
+    './build/xml/**/*.xml',
+    '!./build/xml/**/*Installer.cls.xml'
   ])
     .pipe(cacheBuilder('CacheBlocksExplorerProject.xml'))
     .pipe(gulp.dest('./build/'))
 })
 
 gulp.task('standalone', ['project'], function () {
   return gulp.src([
-    './build/src/StandaloneInstaller.cls.xml'
+    './build/xml/StandaloneInstaller.cls.xml'
   ])
     .pipe(cheerio({
       run: function ($, file) {
@@ -145,7 +168,7 @@ gulp.task('serve', function (callback) {
         target: 'http://localhost:57774/blocks'
       },
       '/websocket': {
-        target: 'ws://localhost:57774/blocks/rest',
+        target: 'ws://localhost:57774/blocks',
         changeOrigin: true,
         ws: true
       }

js/main.js

@@ -28,7 +28,7 @@ var App = function () {
   }
 
   var wsUrl = ((window.location.protocol == "https:") ? "wss:" : "ws:" + "//" + window.location.host)
-  wsUrl += window.location.pathname + 'websocket'
+  wsUrl += window.location.pathname + 'Blocks.WebSocket.cls'
   this.ws = new FancyWebSocket(wsUrl)
 
   this.ws.bind('error', function (data) {

package.json

@@ -24,9 +24,11 @@
     "gulp-html-replace": "^1.6.1",
     "gulp-minify-css": "^1.2.4",
     "gulp-postcss": "^6.2.0",
+    "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
     "gulp-uglify": "^2.0.0",
     "gulp-util": "^3.0.7",
+    "gulp-wrapper": "^1.0.0",
     "html-loader": "^0.4.4",
     "html-webpack-plugin": "^2.22.0",
     "postcss-loader": "^0.13.0",