Pass query and headers to application initialisation function

Dyalog · Sep 9, 2024 · 387bcee · 387bcee
1 parent 617941f
commit 387bcee
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 6 deletions.
diff --git a/EWC/Handler.aplf b/EWC/Handler.aplf
@@ -1,4 +1,4 @@
- r←con Handler payload;ns;Event;ID;Info;events;fns;fn;event;reqfn;info;sns;i;code;conn;coni;sock;z;m;msg;sessionspace;form;hr;CALLER;app;new;old;token;TID
+ r←con Handler payload;ns;Event;ID;Info;events;fns;fn;event;reqfn;info;sns;i;code;conn;coni;sock;z;m;msg;sessionspace;form;hr;CALLER;app;new;old;token;TID;URL
  ⎕TRAP←0 'S'
  'R'Log'#',(⍕con),': ',payload
  i←(2⊃SESSIONS)⍳con
@@ -19,11 +19,15 @@
      :AndIf 0≠≢ns←{0::⍬ ⋄ (⎕JSON ⍵).Initialise}payload
          :If 2=ns.⎕NC 'Version' ⋄ CLIENTVERSION←ns.Version ⋄ :EndIf
          :If 2=ns.⎕NC 'Function' ⋄ fn←reqfn←ns.Function ⋄ :Else ⋄ fn←'' ⋄ :EndIf
+         :If 2=ns.⎕NC 'URL' ⋄ URL←ns.URL ⋄ :Else ⋄ URL←'' ⋄ :EndIf
      :Else
          fn←reqfn←(10↓payload)~'()'
      :EndIf
      fn,←(0=≢fn)/'Initialise'
      app←code
+     app._EWC.URL←URL
+     app._EWC.QUERY←ParseQueryString (URL⍳'?')↓URL
+     app._EWC.HDRS←⊃WSS.Conx[(¯8↑¨WSS.Conx[;1])⍳⊂,'ZI8' ⎕FMT con;2]
      :If 0≠app.⎕NC 'workNamespace' ⍝ /// change this name in DWI
         app←app.workNamespace
      :EndIf

diff --git a/EWC/ParseQueryString.aplf b/EWC/ParseQueryString.aplf
@@ -0,0 +1,8 @@
+ params←ParseQueryString query
+ params←0 2⍴⊂''
+ →0⍴⍨0∊⍴query
+ :If '='∊query ⍝ contains name=value?
+     params←URLDecode¨2↑[2]↑'='(≠⊆⊢)¨'&'(≠⊆⊢)query
+ :Else
+     params←URLDecode query
+ :EndIf
diff --git a/EWC/URLDecode.aplf b/EWC/URLDecode.aplf
@@ -0,0 +1,18 @@
+ r←URLDecode r;rgx;rgxu;i;j;z;t;m;⎕IO;lens;fill
+ :Access public shared
+⍝ Decode a Percent Encoded string https://en.wikipedia.org/wiki/Percent-encoding
+ ⎕IO←0
+ ((r='+')/r)←' '
+ rgx←'[0-9a-fA-F]'
+ rgxu←'%[uU]',(4×⍴rgx)⍴rgx ⍝ 4 characters
+ r←(rgxu ⎕R{{⎕UCS 16⊥⍉16|'0123456789ABCDEF0123456789abcdef'⍳⍵}2↓⍵.Match})r
+ :If 0≠⍴i←(r='%')/⍳⍴r
+ :AndIf 0≠⍴i←(i≤¯2+⍴r)/i
+     z←r[j←i∘.+1 2]
+     t←'UTF-8'⎕UCS 16⊥⍉16|'0123456789ABCDEF0123456789abcdef'⍳z
+     lens←⊃∘⍴¨'UTF-8'∘⎕UCS¨t  ⍝ UTF-8 is variable length encoding
+     fill←i[¯1↓+\0,lens]
+     r[fill]←t
+     m←(⍴r)⍴1 ⋄ m[(,j),i~fill]←0
+     r←m/r
+ :EndIf
diff --git a/EWC/wss.aplc b/EWC/wss.aplc
@@ -139,7 +139,7 @@
                       :Leave
                   :EndIf
                   hdrs←ParseHeaders data
-                  Conx⍪←obj(hdrs GetHeader'sec-websocket-key')
+                  Conx⍪←obj hdrs
 
               :Case 'WSReceive'
                   :If 0≠evt RunHandler wres
@@ -198,10 +198,11 @@
 
 
     ∇ obj Serve data;method;url;httpver;headers;file;respheaders;rc;msg;status;payload;close;ind;i
-    ⍝ serve HTML content
+    ⍝ serve HTML content   
       (method url httpver headers)←data
       respheaders←1 2⍴'Server'(deb⍕2↑Version)
       respheaders⍪←'Date'(2⊃LDRC.GetProp'.' 'HttpDate')
+      url←(¯1+url⍳'?')↑url ⍝ Ignore queries
       :If method≡⍥⎕C'get' 
           :If '/'≡⍥,url
               url←DefaultPage

diff --git a/demo/CBRunDemo.aplf b/demo/CBRunDemo.aplf
@@ -1,4 +1,8 @@
- CBRunDemo args;e;scores;cols;fcol;pass;ii;ids;target;demo;sf;f;name
+ {presel} CBRunDemo args;e;scores;cols;fcol;pass;ii;ids;target;demo;sf;f;name
+ :If 2=⎕NC 'presel'
+     →RUN ⊣ demo←presel
+ :EndIf
+
  Event←⎕NS''
  e←Event.Event←⎕NS''
  e.(ID EventName Info)←(2↑args),⊂2↓args
@@ -23,6 +27,7 @@
 
  demo←'Demo',(3⊃args)⊃(⊃args)eWG'Items'
 
+RUN:
  :If 3=⎕NC demo
      ⎕←''
      ⎕←'Running "',demo,'" with',((~EWC.USEWIN32)/'out'),' Win32'

diff --git a/demo/Initialise.aplf b/demo/Initialise.aplf
@@ -1,7 +1,15 @@
- Initialise connected;r
+ Initialise connected;r;m;demo
 
  →(EWC.MODE=0)⍴0 ⍝ Only in webby modes
- DemoMenu connected
+
+ :If (≢_EWC.QUERY)≥i←_EWC.QUERY[;1]⍳⊂'Demo'
+     demo←'Demo',⊃_EWC.QUERY[i;2]
+ :AndIf 3=⎕NC demo
+     demo CBRunDemo ''
+ :Else
+     DemoMenu connected
+ :EndIf
+
  :If EWC.MODE=2
      eDQ 'F1'
  :EndIf