Many fixes, IRIS support

Author: daimor

docker-compose.iris.yml

@@ -0,0 +1,34 @@
+version: "3"
+
+services:
+  server:
+    build:
+      context: server
+      dockerfile: Dockerfile-iris
+      args:
+        IRIS_KEY: ${IRIS_KEY}
+        IRIS_VERSION: ${IRIS_VERSION}
+    ports:
+      - "${IRIS_WEBPORT-52773}:52773"
+      - "${IRIS_PORT-51773}:51773"
+    volumes:
+      - ~/iris.key:/usr/irissys/mgr/iris.key
+      - ./server/src:/opt/blocks/src
+  web:
+    build:
+      context: web
+    links:
+      - server
+    environment:
+      - DB_HOST=server
+      - DB_PORT=${IRIS_WEBPORT-52773}
+      - WEB_PORT=${WEB_PORT-80}
+    ports:
+      - "${WEB_PORT-80}:${WEB_PORT-80}"
+    volumes:
+      - node_modules:/opt/app/node_modules
+      - web_build:/opt/app/build
+      - ./web:/opt/app
+volumes:
+  node_modules: null
+  web_build: null

docker-compose.yml

@@ -1,25 +1,24 @@
 version: "3"
 
 services:
-  cache:
+  server:
     build:
-      context: cache
+      context: server
       args:
-        CACHE_KEY: ${CACHE_KEY}
         CACHE_VERSION: ${CACHE_VERSION}
     ports:
       - "${CACHE_WEBPORT-57772}:57772"
       - "${CACHE_PORT-1972}:1972"
     volumes:
-      - ./cache/src:/opt/blocks/src
-      - blocks_data:/opt/blocks
+      - ~/cache.key:/usr/cachesys/mgr/cache.key
+      - ./server/src:/opt/blocks/src
   web:
     build:
       context: web
     links:
-      - cache:db
+      - server
     environment:
-      - DB_HOST=db
+      - DB_HOST=server
       - DB_PORT=${CACHE_WEBPORT-57772}
       - WEB_PORT=${WEB_PORT-80}
     ports:
@@ -31,4 +30,3 @@ services:
 volumes:
   node_modules: null
   web_build: null
-  blocks_data: null

cache/.dockerignore server/.dockerignorecache/.dockerignore renamed to server/.dockerignore

@@ -5,9 +5,6 @@ WORKDIR /opt/blocks
 
 COPY ./src/ ./src
 
-ARG CACHE_KEY=
-RUN echo -e "${CACHE_KEY}" > /opt/cache/mgr/cache.key
-
 RUN ccontrol start $ISC_PACKAGE_INSTANCENAME quietly \
  && echo -e "" \
  "do ##class(%SYSTEM.OBJ).Load(\"/opt/blocks/src/DevInstaller.cls\",\"cdk\")\n" \
@@ -18,4 +15,4 @@ RUN ccontrol start $ISC_PACKAGE_INSTANCENAME quietly \
 # Stop Caché instance
  && ccontrol stop $ISC_PACKAGE_INSTANCENAME quietly
 
-VOLUME [ "/opt/blocks" ]
+VOLUME [ "/opt/blocks/db" ]

cache/Dockerfile server/Dockerfilecache/Dockerfile renamed to server/Dockerfile

@@ -0,0 +1,17 @@
+ARG IRIS_VERSION=2018.1
+FROM daimor/intersystems-iris:${IRIS_VERSION}
+
+WORKDIR /opt/blocks
+
+COPY ./src/ ./src
+
+RUN iris start $ISC_PACKAGE_INSTANCENAME quietly \
+ && /bin/echo -e "do ##class(%SYSTEM.OBJ).Load(\"/opt/blocks/src/DevInstaller.cls\",\"cdk\")\n" \
+                 "set sc=##class(Blocks.DevInstaller).setupWithVars(\"/opt/blocks/\")\n" \
+                 "do:'sc \$zu(4,\$j,1)\n" \
+                 "Halt\n" \
+  | iris session ${ISC_PACKAGE_INSTANCENAME} \
+ && iris stop $ISC_PACKAGE_INSTANCENAME quietly
+
+VOLUME [ "/opt/blocks/db" ]
+

server/Dockerfile-iris

@@ -10,14 +10,17 @@ XData UrlMap
     <Route Url="(?:/rest)?/ping" Method="GET" Call="Ping"/>
     <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>
 }
 
-ClassMethod WebSocket() As %Status
+ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue As %Boolean) As %Status
 {
-    quit ##class(Blocks.WebSocket).Page()
+  if pUrl = "/websocket" {
+    set pContinue = 0
+    set %response.ServerSideRedirect = "/csp/blocks/Blocks.WebSocket.cls"
+  }
+  Quit $$$OK
 }
 
 ClassMethod outputJSON(data)

cache/src/Blocks/BlocksInstaller.cls server/src/Blocks/BlocksInstaller.clscache/src/Blocks/BlocksInstaller.cls renamed to server/src/Blocks/BlocksInstaller.cls

@@ -25,14 +25,13 @@ Method OnPreServer() As %Status
 
 Method Server() As %Status
 {
-    Set timeout=.5
+    Set timeout=.1
     set quit=0
-    set dataGN="",event=""
     #dim exception As %Exception.AbstractException
     Set len=32656
     while 'quit {
         try {
-            Set data=..Read(.len, .status, $select($isobject(event):0.1,1:timeout))
+            Set data=..Read(.len, .status, timeout)
             If $$$ISERR(status),$$$GETERRORCODE(status) = $$$CSPWebSocketClosed {
                 set quit=1
                 quit
@@ -65,7 +64,7 @@ Method SendBlocksData() As %Status
     set child = ..ChildPID
     set resName = ..ResourceName
 
-    set responseData = ##class(%ListOfDataTypes).%New()
+    set responseData = ##class(%DynamicArray).%New()
     kill blocksData
     set countData=0
     set atEnd=0
@@ -79,30 +78,29 @@ Method SendBlocksData() As %Status
         set $listbuild(parent,block,global,fill)=data
         if $p(..Event,"_",2)="tree" {
             if '$data(blocksData(parent)) {
-                set blocksData(parent)=##class(%ZEN.proxyObject).%New()
+                set blocksData(parent)=##class(%DynamicObject).%New()
                 set blocksData(parent).block = parent
-                set blocksData(parent).child = ##class(%ListOfDataTypes).%New()
-                do responseData.Insert(blocksData(parent))
+                set blocksData(parent).child = ##class(%DynamicArray).%New()
+                do responseData.%Push(blocksData(parent))
             }
-            do blocksData(parent).child.Insert(block)
+            do blocksData(parent).child.%Push(block)
         } else {
             if '$data(blocksData(global)) {
-                set blocksData(global)=##class(%ZEN.proxyObject).%New()
+                set blocksData(global)=##class(%DynamicObject).%New()
                 set blocksData(global).global = global
-                set blocksData(global).blocks = ##class(%ListOfDataTypes).%New()
-                do responseData.Insert(blocksData(global))
+                set blocksData(global).blocks = ##class(%DynamicArray).%New()
+                do responseData.%Push(blocksData(global))
             }
-            set blockInfo = ##class(%ListOfDataTypes).%New()
-            do blockInfo.Insert(block)
-            do blockInfo.Insert(fill)
-            do blocksData(global).blocks.Insert(blockInfo)
+            set blockInfo = ##class(%DynamicArray).%New()
+            do blockInfo.%Push(block)
+            do blockInfo.%Push(fill)
+            do blocksData(global).blocks.%Push(blockInfo)
             kill blockInfo
         }
         quit:$i(countData)>=1000
 	}
-
     if responseData.Size > 0 {
-        do ..Write(..Event, responseData)
+      do ..Write(..Event, responseData)
     }
     if atEnd {
         set ..Event = ""
@@ -111,13 +109,14 @@ Method SendBlocksData() As %Status
     quit $$$OK
 }
 
-Method Action(obj As %ZEN.proxyObject) As %Status
+Method Action(obj As %DynamicObject) As %Status
 {
     set st = $$$OK
     #dim exception As %Exception.AbstractException
     try {
+      quit:obj=""
         set action = obj.event
-        set data = ##class(%ListOfDataTypes).%New()
+        set data = ##class(%DynamicArray).%New()
         if action="ping" {
             set sc=..Write(action, "pong")
         } elseif $p(action,"_")="blocks" {
@@ -228,7 +227,7 @@ ClassMethod ReadBlocks(aAsTree As %Boolean = 0, aBlockId As %Integer = 3, aParen
 add(parentBlock,blockId,global,offset)
     set data=$listbuild(parentBlock,blockId)
     if 'aAsTree set data=data_$listbuild(global,$j(offset/blockSize*100,0,0))
- 	do $system.Event.Signal(ResourceName, data)
+ 	  do $system.Event.Signal(ResourceName, data)
 }
 
 /// Reads up to len characters from the client.
@@ -238,8 +237,13 @@ Method Read(ByRef len As %Integer = 32656, ByRef sc As %Status, timeout As %Inte
 {
     Set json = ##super(len, .sc, timeout)
     Do:$$$ISERR(sc) ..EndServer()
-    Set st = ##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(json,,.obj,1)
-    Do:$$$ISERR(st) ..EndServer()
+    quit:json="" ""
+    try {
+      set obj = ##class(%DynamicObject).%FromJSON(json)
+    } catch ex {
+      set sc = ex.AsStatus()
+      set obj = ""
+    }
     Quit obj
 }
 
@@ -248,49 +252,12 @@ Method Write(eventName As %String = "", data As %String) As %Status
     if '$d(data) {
         quit ##super(eventName)
     }
-    set response = ##class(%ZEN.proxyObject).%New()
+    set response = ##class(%DynamicObject).%New()
     set response.event = eventName
     set response.data = data
 
-    Quit ##super(..OutputToStr(response,"%ToJSON"))
-}
-
-ClassMethod OutputToStr(obj, method, args...) As %String [ ProcedureBlock = 0 ]
-{
-    Set str=""
-    //Redirect IO to the current routine - makes use of the labels defined below
-    Use $io::("^"_$ZNAME)
-
-    //Enable redirection
-    Do ##class(%Device).ReDirectIO(1)
-
-    if $isobject(obj) {
-        Do $Method(obj,method,args...)
-    } elseif $$$comClassDefined(obj) {
-        Do $ClassMethod(obj,method,args...)
-    }
-
-    //Disable redirection
-    Do ##class(%Device).ReDirectIO(0)
-    Quit str
-    //Labels that allow for IO redirection
-    //Read Character - we Don't care about reading
-rchr(c)      quit
-    //Read a string - we Don't care about reading
-rstr(sz,to)  quit
-    //Write a character - call the output label
-wchr(s)      Do output($char(s))  quit
-    //Write a form feed - call the output label
-wff()        Do output($char(12))  quit
-    //Write a newline - call the output label
-wnl()        Do output($char(13,10))  quit
-    //Write a string - call the output label
-wstr(s)      Do output(s)  quit
-    //Write a tab - call the output label
-wtab(s)      Do output($char(9))  quit
-    //Output label - this is where you would handle what you actually want to Do.
-    //  in our case, we want to Write to str
-output(s)    Set str=str_s   quit
+    set json = response.%ToJSON()
+    quit ##super(json)
 }
 
 }