@rip-lang/server 1.3.32 → 1.3.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/server.rip +14 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rip-lang/server",
3
- "version": "1.3.32",
3
+ "version": "1.3.34",
4
4
  "description": "Pure Rip web framework and application server",
5
5
  "type": "module",
6
6
  "main": "api.rip",
@@ -45,7 +45,7 @@
45
45
  "author": "Steve Shreeve <steve.shreeve@gmail.com>",
46
46
  "license": "MIT",
47
47
  "dependencies": {
48
- "rip-lang": ">=3.13.48"
48
+ "rip-lang": ">=3.13.51"
49
49
  },
50
50
  "files": [
51
51
  "api.rip",
package/server.rip CHANGED
@@ -737,6 +737,7 @@ class Server
737
737
  @availableWorkers = []
738
738
  @inflightTotal = 0
739
739
  @queue = []
740
+ @urls = []
740
741
  @startedAt = nowMs()
741
742
  @newestVersion = null
742
743
  @httpsActive = false
@@ -1026,7 +1027,9 @@ class Server
1026
1027
 
1027
1028
  port = @flags.httpsPort or @flags.httpPort or 80
1028
1029
  protocol = if @flags.httpsPort then 'https' else 'http'
1029
- console.log "rip-server: #{protocol}://#{@flags.appName}.ripdev.io#{formatPort(protocol, port)}" unless @flags.quiet
1030
+ url = "#{protocol}://#{@flags.appName}.ripdev.io#{formatPort(protocol, port)}"
1031
+ @urls.push(url)
1032
+ p "rip-server: #{url}" unless @flags.quiet or @flags.hideUrls
1030
1033
 
1031
1034
  controlFetch: (req) ->
1032
1035
  url = new URL(req.url)
@@ -1148,7 +1151,9 @@ class Server
1148
1151
  stderr: 'ignore'
1149
1152
 
1150
1153
  @mdnsProcesses.set(host, proc)
1151
- console.log "rip-server: #{protocol}://#{host}#{formatPort(protocol, port)}" unless @flags.quiet
1154
+ url = "#{protocol}://#{host}#{formatPort(protocol, port)}"
1155
+ @urls.push(url)
1156
+ p "rip-server: #{url}" unless @flags.quiet or @flags.hideUrls
1152
1157
  catch e
1153
1158
  console.error "rip-server: failed to advertise #{host} via mDNS:", e.message
1154
1159
 
@@ -1293,12 +1298,16 @@ main = ->
1293
1298
  console.error 'rip-server: unhandled rejection:', err
1294
1299
  cleanup()
1295
1300
 
1296
- httpOnly = flags.httpsPort is null
1297
- protocol = if httpOnly then 'http' else 'https'
1298
- process.env.RIP_HTTP_ONLY = '1' if httpOnly
1301
+ # Suppress top URL lines if setup.rip will print them at the bottom
1302
+ setupFile = join(dirname(flags.appEntry), 'setup.rip')
1303
+ flags.hideUrls = existsSync(setupFile)
1299
1304
 
1300
1305
  svr.start!
1306
+ process.env.RIP_URLS = svr.urls.join(',') # exact URLs the Server just built
1301
1307
  mgr.start!
1308
+
1309
+ httpOnly = flags.httpsPort is null
1310
+ protocol = if httpOnly then 'http' else 'https'
1302
1311
  port = flags.httpsPort or flags.httpPort or 80
1303
1312
  console.log "rip-server: app=#{flags.appName} workers=#{flags.workers} url=#{protocol}://#{flags.appName}.ripdev.io#{formatPort(protocol, port)}/server"
1304
1313