mirror of
https://github.com/tachiyomiorg/tachiyomi-extensions-inspector.git
synced 2024-12-25 16:21:50 +01:00
Migrate from Oracle Nashorn to Mozilla's Rhino
This commit is contained in:
parent
d383939c9f
commit
bb09cfddb3
@ -53,7 +53,11 @@ dependencies {
|
|||||||
// AndroidX annotations
|
// AndroidX annotations
|
||||||
compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
|
compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
|
||||||
|
|
||||||
// compileOnly("io.reactivex:rxjava:1.3.8")
|
// substitute for duktape-android
|
||||||
|
// 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead
|
||||||
|
implementation("org.mozilla:rhino-runtime:1.7.13")
|
||||||
|
// 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn
|
||||||
|
implementation("org.mozilla:rhino-engine:1.7.13")
|
||||||
}
|
}
|
||||||
|
|
||||||
//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')
|
//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')
|
||||||
|
@ -1,20 +1,12 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2015 Square, Inc.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.squareup.duktape;
|
package com.squareup.duktape;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
import kotlin.NotImplementedError;
|
import kotlin.NotImplementedError;
|
||||||
|
|
||||||
import javax.script.ScriptEngine;
|
import javax.script.ScriptEngine;
|
||||||
@ -22,11 +14,18 @@ import javax.script.ScriptEngineManager;
|
|||||||
import javax.script.ScriptException;
|
import javax.script.ScriptException;
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
|
|
||||||
/** A simple EMCAScript (Javascript) interpreter. */
|
/* Note (March 2021):
|
||||||
|
* The old implementation for duktape-android used the nashorn engine which is deprecated.
|
||||||
|
* This new implementation uses Mozilla's Rhino: https://github.com/mozilla/rhino
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple EMCAScript (Javascript) interpreter.
|
||||||
|
*/
|
||||||
public final class Duktape implements Closeable, AutoCloseable {
|
public final class Duktape implements Closeable, AutoCloseable {
|
||||||
|
|
||||||
private ScriptEngineManager factory = new ScriptEngineManager();
|
private ScriptEngineManager factory = new ScriptEngineManager();
|
||||||
private ScriptEngine engine = factory.getEngineByName("JavaScript");
|
private ScriptEngine engine = factory.getEngineByName("rhino");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new interpreter instance. Calls to this method <strong>must</strong> matched with
|
* Create a new interpreter instance. Calls to this method <strong>must</strong> matched with
|
||||||
@ -38,17 +37,6 @@ public final class Duktape implements Closeable, AutoCloseable {
|
|||||||
|
|
||||||
private Duktape() {}
|
private Duktape() {}
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluate {@code script} and return a result. {@code fileName} will be used in error
|
|
||||||
* reporting. Note that the result must be one of the supported Java types or the call will
|
|
||||||
* return null.
|
|
||||||
*
|
|
||||||
* @throws DuktapeException if there is an error evaluating the script.
|
|
||||||
*/
|
|
||||||
public synchronized Object evaluate(String script, String fileName) {
|
|
||||||
throw new NotImplementedError("Not implemented!");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evaluate {@code script} and return a result. Note that the result must be one of the
|
* Evaluate {@code script} and return a result. Note that the result must be one of the
|
||||||
* supported Java types or the call will return null.
|
* supported Java types or the call will return null.
|
||||||
@ -76,18 +64,18 @@ public final class Duktape implements Closeable, AutoCloseable {
|
|||||||
throw new NotImplementedError("Not implemented!");
|
throw new NotImplementedError("Not implemented!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* Attaches to a global JavaScript object called {@code name} that implements {@code type}.
|
// * Attaches to a global JavaScript object called {@code name} that implements {@code type}.
|
||||||
* {@code type} defines the interface implemented in JavaScript that will be accessible to Java.
|
// * {@code type} defines the interface implemented in JavaScript that will be accessible to Java.
|
||||||
* {@code type} must be an interface that does not extend any other interfaces, and cannot define
|
// * {@code type} must be an interface that does not extend any other interfaces, and cannot define
|
||||||
* any overloaded methods.
|
// * any overloaded methods.
|
||||||
* <p>Methods of the interface may return {@code void} or any of the following supported argument
|
// * <p>Methods of the interface may return {@code void} or any of the following supported argument
|
||||||
* types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double},
|
// * types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double},
|
||||||
* {@link Double}, {@link String}.
|
// * {@link Double}, {@link String}.
|
||||||
*/
|
// */
|
||||||
public synchronized <T> T get(final String name, final Class<T> type) {
|
// public synchronized <T> T get(final String name, final Class<T> type) {
|
||||||
throw new NotImplementedError("Not implemented!");
|
// throw new NotImplementedError("Not implemented!");
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release the native resources associated with this object. You <strong>must</strong> call this
|
* Release the native resources associated with this object. You <strong>must</strong> call this
|
||||||
|
@ -0,0 +1,37 @@
|
|||||||
|
package com.squareup.duktape;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
// part of tachiyomi-extensions which was originally licensed under Apache License Version 2.0
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.Closeable;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
/** This is the reference Duktape stub that tachiyomi's extensions depend on.
|
||||||
|
* Intended to be used as a reference.
|
||||||
|
*/
|
||||||
|
public class DuktapeStub implements Closeable {
|
||||||
|
|
||||||
|
public static Duktape create() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public synchronized void close() throws IOException {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized Object evaluate(String script) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized <T> void set(String name, Class<T> type, T object) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -57,7 +57,6 @@ dependencies {
|
|||||||
|
|
||||||
implementation("org.jsoup:jsoup:1.13.1")
|
implementation("org.jsoup:jsoup:1.13.1")
|
||||||
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
|
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
|
||||||
implementation("com.squareup.duktape:duktape-android:1.3.0")
|
|
||||||
|
|
||||||
|
|
||||||
val coroutinesVersion = "1.3.9"
|
val coroutinesVersion = "1.3.9"
|
||||||
@ -86,9 +85,8 @@ dependencies {
|
|||||||
implementation(project(":AndroidCompat"))
|
implementation(project(":AndroidCompat"))
|
||||||
implementation(project(":AndroidCompat:Config"))
|
implementation(project(":AndroidCompat:Config"))
|
||||||
|
|
||||||
|
// uncomment to test extensions directly
|
||||||
// testImplementation("org.jetbrains.kotlin:kotlin-test")
|
// implementation(fileTree("lib/"))
|
||||||
// testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val name = "ir.armor.tachidesk.Main"
|
val name = "ir.armor.tachidesk.Main"
|
||||||
|
@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.source.SourceFactory
|
|||||||
import eu.kanade.tachiyomi.source.online.HttpSource
|
import eu.kanade.tachiyomi.source.online.HttpSource
|
||||||
import ir.armor.tachidesk.database.table.ExtensionTable
|
import ir.armor.tachidesk.database.table.ExtensionTable
|
||||||
import ir.armor.tachidesk.database.table.SourceTable
|
import ir.armor.tachidesk.database.table.SourceTable
|
||||||
|
import ir.armor.tachidesk.impl.util.APKExtractor
|
||||||
import ir.armor.tachidesk.server.applicationDirs
|
import ir.armor.tachidesk.server.applicationDirs
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import mu.KotlinLogging
|
import mu.KotlinLogging
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package ir.armor.tachidesk.impl;
|
package ir.armor.tachidesk.impl.util;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
* Copyright (C) Contributors to the Suwayomi project
|
Loading…
Reference in New Issue
Block a user