compiled deno binary in Android

aidant · aidant · commit 1a2e4a86dc40 · 2024-09-13T22:02:51.000+10:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,4 +3,4 @@ resolver = "2"
 members = ["packages/javascript-runtime-deno", "packages-meta/uniffi-bindgen"]
 
 [workspace.dependencies]
-uniffi = { version = "0.27.1" }
+uniffi = { version = "0.27.3" }
diff --git a/package.json b/package.json
@@ -1,12 +1,14 @@
 {
+  "name": "javascript-runtime",
   "scripts": {
     "build": "turbo run build",
-    "publish:latest": "pnpm -r publish --no-git-checks",
-    "publish": "turbo run publish:latest"
+    "publish": "turbo run publish:latest",
+    "publish:latest": "pnpm -r publish --no-git-checks"
   },
+  "packageManager": "pnpm@9.8.0",
   "devDependencies": {
     "tsup": "^8.0.2",
-    "turbo": "^1.13.3",
+    "turbo": "^2.1.2",
     "typescript": "^5.4.5"
   }
 }
diff --git a/packages-meta/javascript-runtime-cordova-e2e/package-lock.json b/packages-meta/javascript-runtime-cordova-e2e/package-lock.json
diff --git a/packages-meta/javascript-runtime-cordova-e2e/package.json b/packages-meta/javascript-runtime-cordova-e2e/package.json
@@ -3,9 +3,16 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
+    "cordova:plugin:add": "JAVASCRIPT_RUNTIME_ENGINE=../../../../packages/javascript-runtime-deno/javascript-runtime-deno-1.0.0.tgz cordova plugin add @javascript-runtime/cordova-plugin@latest",
+    "cordova:plugin:rm": "cordova plugin rm cordova-plugin-javascript-runtime",
     "cordova:android:build": "cordova build android",
-    "cordova:android:prepare": "rm -rf platforms/android && cordova platform add android",
-    "cordova:android:run": "cordova run android"
+    "cordova:android:prepare": "rm -rf platforms/android && JAVASCRIPT_RUNTIME_ENGINE=../../../../packages/javascript-runtime-deno/javascript-runtime-deno-1.0.0.tgz cordova platform add android",
+    "cordova:android:run": "cordova run android",
+    "cordova:android:logs": "adb logcat --pid=$(adb shell pidof -s invalid.javascript_runtime.cordova_e2e)"
+  },
+  "engines": {
+    "node": ">=16.13.0",
+    "npm": "^8.1.0"
   },
   "cordova": {
     "platforms": [
diff --git a/packages-meta/npm-registry/package.json b/packages-meta/npm-registry/package.json
@@ -6,6 +6,7 @@
     "start": "pnpm run start:verdaccio && pnpm run start:config",
     "start:config": "cd ../.. && npm config set @javascript-runtime:registry http://localhost:4873/ && npm config set //localhost:4873/:_authToken example",
     "start:verdaccio": "pm2 start --interpreter none $(which verdaccio) -- --config verdaccio.yaml",
+    "logs": "pm2 logs",
     "stop": "pnpm run stop:config && pnpm run stop:verdaccio",
     "stop:config": "cd ../.. && npm config delete key @javascript-runtime:registry && npm config delete key //localhost:4873/:_authToken",
     "stop:verdaccio": "pm2 stop verdaccio && pm2 delete verdaccio"
diff --git a/packages-meta/npm-registry/turbo.json b/packages-meta/npm-registry/turbo.json
@@ -0,0 +1,8 @@
+{
+  "extends": ["//"],
+  "tasks": {
+    "start": {},
+    "logs": {},
+    "stop": {}
+  }
+}
diff --git a/packages/javascript-runtime-cordova-plugin/hooks/install-dependencies.js b/packages/javascript-runtime-cordova-plugin/hooks/install-dependencies.js
@@ -2,11 +2,14 @@ const { spawn } = require('child_process')
 const { once } = require('events')
 const path = require('path')
 
-module.exports = exports = async () => {
+module.exports = exports = async (context) => {
+  if (context.opts.plugin?.id !== 'cordova-plugin-javascript-runtime') return
+
   const JAVASCRIPT_RUNTIME_ENGINE =
-    process.env['JAVASCRIPT_RUNTIME_ENGINE'] || '@javascript-runtime/deno'
+    process.env['JAVASCRIPT_RUNTIME_ENGINE'] ||
+    `https://github.com/aidant/javascript-runtime/releases/download/v1.0/javascript-runtime-deno.tgz`
 
-  const npm = spawn('npm', ['install', '--no-save', JAVASCRIPT_RUNTIME_ENGINE], {
+  const npm = spawn('npm', ['install', '--no-save', '--install-links', JAVASCRIPT_RUNTIME_ENGINE], {
     cwd: path.resolve(__dirname, '..'),
     env: process.env,
     stdio: ['inherit', 'inherit', 'inherit'],
diff --git a/packages/javascript-runtime-cordova-plugin/hooks/set-preferences.js b/packages/javascript-runtime-cordova-plugin/hooks/set-preferences.js
@@ -1,7 +1,9 @@
 const fs = require('fs/promises')
 const path = require('path')
 
-module.exports = exports = async () => {
+module.exports = exports = async (context) => {
+  if (context.opts.plugin && context.opts.plugin.id !== 'cordova-plugin-javascript-runtime') return
+
   const lib =
     process.env['JAVASCRIPT_RUNTIME_LIB'] ||
     path.relative(
diff --git a/packages/javascript-runtime-cordova-plugin/plugin.xml b/packages/javascript-runtime-cordova-plugin/plugin.xml
@@ -17,7 +17,7 @@
   <license>MIT</license>
 
   <hook type="before_plugin_install" src="hooks/install-dependencies.js" />
-  <hook type="after_plugin_install" src="hooks/set-preferences.js" />
+  <hook type="before_plugin_install" src="hooks/set-preferences.js" />
   <hook type="before_build" src="hooks/set-preferences.js" />
   <hook type="before_run" src="hooks/set-preferences.js" />
 
diff --git a/packages/javascript-runtime-cordova-plugin/src/mod.ts b/packages/javascript-runtime-cordova-plugin/src/mod.ts
@@ -23,7 +23,7 @@ const exec = <Action extends keyof JavaScriptRuntimeOps>(
     cordova.exec(
       resolve,
       (message: string) => reject(new Error(message)),
-      'JavaScriptRuntime',
+      'JavaScriptRuntimePlugin',
       action,
       args
     )
diff --git a/packages/javascript-runtime-deno/Cargo.toml b/packages/javascript-runtime-deno/Cargo.toml
@@ -9,13 +9,13 @@ crate-type = ["cdylib", "staticlib"]
 name = "javascript_runtime"
 
 [dependencies]
-anyhow = { version = "1.0.83" }
-deno_core = { version = "0.280.0" }
-deno_runtime = { git = "https://github.com/aidant/deno.git", rev = "3a611534d33d09823a7d4470178a7c51b2d15302" }
-serde = { version = "1.0.202", features = ["derive"] }
-serde_json = { version = "1.0.117" }
+anyhow = { version = "1.0.88" }
+deno_core = { version = "0.299.0" }
+deno_runtime = { git = 'https://github.com/aidant/deno.git', rev = "c8b166e98ef965e86aad3c3cb14cbeac0d6453d9" }
+serde = { version = "1.0.210", features = ["derive"] }
+serde_json = { version = "1.0.128" }
 serde_v8 = { version = "0.189.0" }
-thiserror = { version = "1.0.60" }
-tokio = { version = "1.37.0" }
+thiserror = { version = "1.0.63" }
+tokio = { version = "1.36.0" }
 uniffi = { workspace = true }
-uuid = { version = "1.8.0", features = ["v4", "serde"] }
+uuid = { version = "1.10.0", features = ["v4", "serde"] }
diff --git a/packages/javascript-runtime-deno/src/lib.rs b/packages/javascript-runtime-deno/src/lib.rs
@@ -1,7 +1,7 @@
 use anyhow::anyhow;
-use deno_core::{FsModuleLoader, ModuleSpecifier};
 use deno_runtime::{
-    permissions::PermissionsContainer,
+    deno_core::{FsModuleLoader, ModuleSpecifier},
+    deno_permissions::PermissionsContainer,
     worker::{MainWorker, WorkerOptions},
 };
 use event::{DispatchEvent, MessageEventInit};
diff --git a/packages/javascript-runtime-deno/src/op_javascript_runtime.js b/packages/javascript-runtime-deno/src/op_javascript_runtime.js
@@ -18,15 +18,17 @@ const EventConstructor = {
 const target = new EventTarget()
 
 ;(async () => {
-  const promise = op_javascript_runtime_poll_dispatch_event()
-  core.unrefOpPromise(promise)
-  const response = await promise
+  while (true) {
+    const promise = op_javascript_runtime_poll_dispatch_event()
+    core.unrefOpPromise(promise)
+    const response = await promise
 
-  if (!response) return
+    if (!response) return
 
-  target.dispatchEvent(
-    new EventConstructor[response.constructor](response.type, response.eventInitDict)
-  )
+    target.dispatchEvent(
+      new EventConstructor[response.constructor](response.type, response.eventInitDict)
+    )
+  }
 })()
 
 ObjectDefineProperty(
diff --git a/packages/javascript-runtime-deno/turbo.json b/packages/javascript-runtime-deno/turbo.json
@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "cache": false
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/turbo.json b/turbo.json

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`	`1`	`{`
	`2`	`+ "name": "javascript-runtime",`
`2`	`3`	`"scripts": {`
`3`	`4`	`"build": "turbo run build",`
`4`		`- "publish:latest": "pnpm -r publish --no-git-checks",`
`5`		`- "publish": "turbo run publish:latest"`
	`5`	`+ "publish": "turbo run publish:latest",`
	`6`	`+ "publish:latest": "pnpm -r publish --no-git-checks"`
`6`	`7`	`},`
	`8`	`+ "packageManager": "[email protected]",`
`7`	`9`	`"devDependencies": {`
`8`	`10`	`"tsup": "^8.0.2",`
`9`		`- "turbo": "^1.13.3",`
	`11`	`+ "turbo": "^2.1.2",`
`10`	`12`	`"typescript": "^5.4.5"`
`11`	`13`	`}`
`12`	`14`	`}`