Skip to content

Commit 32b98b6

Browse files
committed
Add server.origin prop, fixes #30
1 parent bf490de commit 32b98b6

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

android/src/main/java/com/futurepress/staticserver/FPStaticServerModule.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,15 @@ public void stop() {
168168
}
169169
}
170170

171+
@ReactMethod
172+
public void origin(Promise promise) {
173+
if (server != null) {
174+
promise.resolve(url);
175+
} else {
176+
promise.resolve("");
177+
}
178+
}
179+
171180
/* Shut down the server if app is destroyed or paused */
172181
@Override
173182
public void onHostResume() {

index.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class StaticServer {
5353

5454

5555
this.started = false;
56+
this._origin = undefined;
5657
}
5758

5859
start() {
@@ -67,7 +68,11 @@ class StaticServer {
6768
AppState.addEventListener('change', this._handleAppStateChange.bind(this));
6869
}
6970

70-
return FPStaticServer.start(this.port, this.root, this.localOnly, this.keepAlive);
71+
return FPStaticServer.start(this.port, this.root, this.localOnly, this.keepAlive)
72+
.then((origin) => {
73+
this._origin = origin;
74+
return origin;
75+
});
7176
}
7277

7378
stop() {
@@ -83,6 +88,7 @@ class StaticServer {
8388
kill() {
8489
this.stop();
8590
this.started = false;
91+
this._origin = undefined;
8692
AppState.removeEventListener('change', this._handleAppStateChange.bind(this));
8793
}
8894

@@ -104,6 +110,9 @@ class StaticServer {
104110
}
105111
}
106112

113+
get origin() {
114+
return this._origin;
115+
}
107116

108117
}
109118

ios/FPStaticServer.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ - (dispatch_queue_t)methodQueue
123123
}
124124
}
125125

126+
RCT_EXPORT_METHOD(origin:(RCTPromiseResolveBlock)resolve
127+
rejecter:(RCTPromiseRejectBlock)reject) {
128+
if(_webServer.isRunning == YES) {
129+
resolve(self.url);
130+
} else {
131+
resolve(@"");
132+
}
133+
}
126134

127135
@end
128136

0 commit comments

Comments
 (0)