public/cordova-plugin-webserver
public/cordova-plugin-webserver
9
0
Fork 0
forked from github/cordova-plugin-webserver
Code Pull Requests Activity

correct implementation errors and readme text

Browse Source
This commit is contained in:
Keith Wait 2018-09-03 10:55:14 -05:00
parent 60f55066ce
commit 128933f721
3 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -73,6 +73,18 @@ The params have to look like this (there are not default values for the params!)
}
```
### sendFileResponse(responseObject, callbackSuccess, callbackError) (currently Android-only support)
This method allows sending file content in response to an http request. It is intended that this would be used in conjunction with cordova-plugin-file to locate the path of the file data to be sent.
The response object should look like this. Here, the provided path should be accessible by your cordova app and the type should be the mime type of the file. Note that the MIME type of the file can be found from the [.type property of the File object](https://developer.mozilla.org/en-US/docs/Web/API/File).
```
{
path: '/sdcard0/Downloads/whatever.txt',
type: 'text/plain'
}
```
## Example
```javascript
@ -106,4 +118,3 @@ Special thanks to:
- https://github.com/NanoHttpd/nanohttpd
- https://github.com/swisspol/GCDWebServer

44
src/android/NanoHTTPDWebserver.java
View File

@ -21,6 +21,10 @@ import java.util.UUID;
import java.util.HashMap;
import java.util.Map;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
public class NanoHTTPDWebserver extends NanoHTTPD {
Webserver webserver;
@ -81,6 +85,13 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
}
}
private Response newFixedFileResponse(File file, String mime) throws FileNotFoundException {
Response res;
res = newFixedLengthResponse(Response.Status.OK, mime, new FileInputStream(file), (int) file.length());
res.addHeader("Accept-Ranges", "bytes");
return res;
}
Response serveFile(Map<String, String> header, File file, String mime) {
Response res;
try {
@ -125,7 +136,7 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
// and the startFrom of the range is satisfiable
// would return range from file
// respond with not-modified
res = newFixedLengthResponse(Status.NOT_MODIFIED, mime, "");
res = newFixedLengthResponse(Response.Status.NOT_MODIFIED, mime, "");
res.addHeader("ETag", etag);
} else {
if (endAt < 0) {
@ -139,7 +150,7 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
FileInputStream fis = new FileInputStream(file);
fis.skip(startFrom);
res = Response.newFixedLengthResponse(Status.PARTIAL_CONTENT, mime, fis, newLen);
res = newFixedLengthResponse(Response.Status.PARTIAL_CONTENT, mime, fis, newLen);
res.addHeader("Accept-Ranges", "bytes");
res.addHeader("Content-Length", "" + newLen);
res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
@ -150,21 +161,21 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
if (headerIfRangeMissingOrMatching && range != null && startFrom >= fileLen) {
// return the size of the file
// 4xx responses are not trumped by if-none-match
res = newFixedLengthResponse(Status.RANGE_NOT_SATISFIABLE, NanoHTTPD.MIME_PLAINTEXT, "");
res = newFixedLengthResponse(Response.Status.RANGE_NOT_SATISFIABLE, NanoHTTPD.MIME_PLAINTEXT, "");
res.addHeader("Content-Range", "bytes */" + fileLen);
res.addHeader("ETag", etag);
} else if (range == null && headerIfNoneMatchPresentAndMatching) {
// full-file-fetch request
// would return entire file
// respond with not-modified
res = newFixedLengthResponse(Status.NOT_MODIFIED, mime, "");
res = newFixedLengthResponse(Response.Status.NOT_MODIFIED, mime, "");
res.addHeader("ETag", etag);
} else if (!headerIfRangeMissingOrMatching && headerIfNoneMatchPresentAndMatching) {
// range request that doesn't match current etag
// would return entire (different) file
// respond with not-modified
res = newFixedLengthResponse(Status.NOT_MODIFIED, mime, "");
res = newFixedLengthResponse(Response.Status.NOT_MODIFIED, mime, "");
res.addHeader("ETag", etag);
} else {
// supply the file
@ -174,7 +185,7 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
}
}
} catch (IOException ioe) {
res = getForbiddenResponse("Reading file failed.");
res = newFixedLengthResponse(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "FORBIDDEN: Reading file failed.");
}
return res;
@ -196,7 +207,7 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
pluginResult.setKeepCallback(true);
this.webserver.onRequestCallbackContext.sendPluginResult(pluginResult);
while (!this.webserver.responses.containsKey(requestUUID) && !this.webserver.responses.containsKey('file')) {
while (!this.webserver.responses.containsKey(requestUUID) && !this.webserver.responses.containsKey("file")) {
try {
Thread.sleep(1);
} catch (InterruptedException e) {
@ -204,14 +215,25 @@ public class NanoHTTPDWebserver extends NanoHTTPD {
}
}
if (this.webserver.responses.containsKey('file')) {
JSONObject responseObject;
Response response = null;
if (this.webserver.responses.containsKey("file")) {
// TODO should specify a more correct mime-type
return serveFile(session.getHeaders(), new File((String) this.webserver.responses.get('file')), 'application/octet-stream');
try {
responseObject = (JSONObject) this.webserver.responses.get("file");
Log.d(this.getClass().getName(), "responseObject: " + responseObject.toString());
return serveFile(session.getHeaders(), new File(responseObject.getString("path")), responseObject.getString("type"));
}
catch (JSONException e) {
e.printStackTrace();
}
return response;
}
JSONObject responseObject = (JSONObject) this.webserver.responses.get(requestUUID);
responseObject = (JSONObject) this.webserver.responses.get(requestUUID);
Log.d(this.getClass().getName(), "responseObject: " + responseObject.toString());
Response response = null;
try {
response = newFixedLengthResponse(

3
src/android/Webserver.java
View File

@ -101,7 +101,8 @@ public class Webserver extends CordovaPlugin {
}
private void sendFileResponse(JSONArray args, CallbackContext callbackContext) throws JSONException {
this.responses.put('file', args.get(1));
Log.d(this.getClass().getName(), "Got sendResponse: " + args.toString());
this.responses.put("file", args.get(0));
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK));
}