scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-08-28 05:25:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use the bundled mozilla httpd (#5148)

Browse source
This commit is contained in:
Adomas Venčkauskas 2024-05-31 13:40:02 +03:00 • committed by Dan Stillman
parent db1c542a50
commit 67b5a0bb19
12 changed files with 13 additions and 5629 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/server.js
View file

@ -23,6 +23,9 @@
***** END LICENSE BLOCK *****
*/
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");
Components.utils.import("resource://gre/modules/NetUtil.jsm");
Zotero.Server = new function() {
var _onlineObserverRegistered, serv;
this.responseCodes = {

3
test/content/support.js
View file

@ -1167,7 +1167,8 @@ async function startHTTPServer(port = null) {
if (!port) {
port = httpdServerPort;
}
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
var httpd = new HttpServer();
while (true) {
try {

5617
test/resource/httpd.js
View file

File diff suppressed because it is too large Load diff

4
test/tests/HiddenBrowserTest.js
View file

@ -1,4 +1,5 @@
describe("HiddenBrowser", function() {
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
const { HiddenBrowser } = ChromeUtils.import(
"chrome://zotero/content/HiddenBrowser.jsm"
);
@ -11,7 +12,6 @@ describe("HiddenBrowser", function() {
var pngRequested = false;
before(function () {
Cu.import("resource://zotero-unit/httpd.js");
httpd = new HttpServer();
httpd.start(port);
});
@ -92,7 +92,6 @@ describe("HiddenBrowser", function() {
}
before(function () {
Cu.import("resource://zotero-unit/httpd.js");
httpd = new HttpServer();
httpd.start(port);
@ -175,7 +174,6 @@ describe("HiddenBrowser", function() {
var baseURL2 = `http://127.0.0.1:${port2}/`;
before(function () {
Cu.import("resource://zotero-unit/httpd.js");
// Create two servers with two separate origins
httpd1 = new HttpServer();
httpd1.start(port1);

2
test/tests/collectionTreeTest.js
View file

@ -1393,7 +1393,7 @@ describe("Zotero.CollectionTree", function() {
describe("with feed items", function () {
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
const httpdPort = 16214;
var httpd;

2
test/tests/fileTest.js
View file

@ -469,7 +469,7 @@ describe("Zotero.File", function () {
before(async function () {
// Real HTTP server
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
port = 16213;
httpd = new HttpServer();
baseURL = `http://127.0.0.1:${port}`;

2
test/tests/httpTest.js
View file

@ -13,7 +13,7 @@ describe("Zotero.HTTP", function () {
before(function* () {
// Real HTTP server
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
httpd = new HttpServer();
httpd.start(port);
httpd.registerPathHandler(

2
test/tests/itemTreeTest.js
View file

@ -1004,7 +1004,7 @@ describe("Zotero.ItemTree", function() {
// Serve a PDF to test URL dragging
before(function () {
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
httpd = new HttpServer();
httpd.start(port);
var file = getTestDataDirectory();

2
test/tests/mendeleyImportTest.js
View file

@ -23,7 +23,7 @@ describe('Zotero_Import_Mendeley', function () {
Components.utils.import('chrome://zotero/content/import/mendeley/mendeleyImport.js');
// A real HTTP server is used to deliver a Bitcoin PDF so that annotations can be processed during import.
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
const port = 16213;
httpd = new HttpServer();
httpdURL = `http://127.0.0.1:${port}`;

1
test/tests/serverTest.js
View file

@ -1,7 +1,6 @@
"use strict";
describe("Zotero.Server", function () {
Components.utils.import("resource://zotero-unit/httpd.js");
var serverPath;
before(function* () {

2
test/tests/server_connectorTest.js
View file

@ -1,7 +1,7 @@
"use strict";
describe("Connector Server", function () {
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
var win, connectorServerPath, testServerPath, httpd;
var testServerPort = 16213;
var snapshotHTML = "<html><head><title>Title</title><body>Body</body></html>";

2
test/tests/translateTest.js
View file

@ -1,5 +1,5 @@
new function() {
Components.utils.import("resource://zotero-unit/httpd.js");
var { HttpServer } = ChromeUtils.importESModule("chrome://remote/content/server/httpd.sys.mjs");;
const { HiddenBrowser } = ChromeUtils.import('chrome://zotero/content/HiddenBrowser.jsm');