Skip to content

Commit 8d30928

Browse files
author
jin
committed
+2
1 parent 1d6723e commit 8d30928

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

rest/demo/demo.node.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/** @jsx $mol_jsx */
22
namespace $ {
33

4+
@ $mol_rest_server.start
45
export class $mol_rest_demo extends $mol_rest_resource {
56

67
GET( msg: $mol_rest_message ) {
@@ -14,8 +15,8 @@ namespace $ {
1415
@ $mol_mem crud() { return $mol_rest_demo_crud.make({}) }
1516

1617
}
17-
$mol_rest_demo.serve()
1818

19+
@ $mol_rest_server.start
1920
export class $mol_rest_demo_crud extends $mol_rest_resource {
2021

2122
GET( msg: $mol_rest_message ) {
@@ -44,5 +45,6 @@ namespace $ {
4445
@ $mol_mem nested() { return $mol_rest_demo_crud.make({}) }
4546

4647
}
48+
// $mol_rest_demo_crud.serve()
4749

4850
}

rest/readme.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Rich REST server. **Alpha-version**
88
## Simple CRUD
99

1010
```ts
11+
@ $mol_rest_server.start
1112
export class $my_crud extends $mol_rest_resource {
1213

1314
GET( msg: $mol_rest_message ) {
@@ -36,14 +37,13 @@ export class $my_crud extends $mol_rest_resource {
3637
@ $mol_mem nested() { return $mol_rest_demo_crud.make({}) }
3738

3839
}
39-
$my_crud.serve()
4040
```
4141

4242
### Start develop
4343

4444
```sh
4545
npm start
46-
+ my/crud port=9090
46+
+ my/crud $my_crud=9090
4747
```
4848

4949
### Build release
@@ -54,7 +54,7 @@ npm start my/crud
5454

5555
### Start release
5656
```sh
57-
node my/crud/-/node.js port=9090
57+
node my/crud/-/node.js $my_crud=9090
5858
```
5959

6060
## HTTP Requests
@@ -96,6 +96,7 @@ chan.send( 'ping' )
9696
## Composing Resources
9797

9898
```tsx
99+
@ $mol_rest_server.start
99100
export class $my_name extends $mol_rest_resource {
100101

101102
// Root handler

rest/resource/resource.node.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ namespace $ {
7878

7979
static serve() {
8080

81-
const port = Number( this.$.$mol_state_arg.value( 'port' ) )
81+
const name = this.$.$mol_func_name( this )
82+
const port = Number( this.$.$mol_state_arg.value( name ) )
8283
if( !port ) return
8384

8485
const server = this.port( port )
8586
server.root( new this )
86-
server.run()
87+
server.start()
8788

8889
return server
8990
}

rest/server/server.node.ts

+11-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace $ {
88
}
99

1010
@ $mol_mem
11-
run() {
11+
start() {
1212
this.http_server()
1313
}
1414

@@ -47,8 +47,7 @@ namespace $ {
4747

4848
$mol_wire_sync( this.$ ).$mol_log3_rise({
4949
place: this,
50-
message: 'REQUEST',
51-
method: message.method(),
50+
message: message.method(),
5251
url: message.uri(),
5352
})
5453

@@ -84,20 +83,18 @@ namespace $ {
8483
return resource ?? $mol_rest_resource.make({})
8584
}
8685

87-
static run() {
86+
static start< Resource extends typeof $mol_rest_resource >( Resource: Resource ) {
8887

89-
const port = Number( this.$.$mol_state_arg.value( 'port' ) )
90-
if( !port ) return
88+
const name = $$.$mol_func_name( Resource )
9189

92-
const server = this.port( port )
93-
server.run()
90+
const port = Number( $$.$mol_state_arg.value( name ) )
91+
if( !port ) return null!
9492

95-
return server
96-
}
97-
98-
@ $mol_mem_key
99-
static port( port: number ) {
100-
return this.make({ port: ()=> port })
93+
const server = Resource.port( port )
94+
server.root( Resource.make({}) )
95+
server.start()
96+
97+
return Resource
10198
}
10299

103100
}

0 commit comments

Comments
 (0)