@tamer4lynx/cli 0.0.4 → 0.0.6

package/dist/index.js

@@ -12,7 +12,7 @@ import path24 from "path";
 import { program } from "commander";
 
 // package.json
-var version = "0.0.4";
+var version = "0.0.6";
 
 // src/android/create.ts
 import fs3 from "fs";
@@ -375,6 +375,18 @@ import ${vars.packageName}.generated.GeneratedLynxExtensions;
  LynxEnv.inst().init(this, null, new TemplateProvider(this), null);
  }`
   );
+  out = out.replace(
+    /LynxServiceCenter\.inst\(\)\.registerService\(LynxLogService\.INSTANCE\);/,
+    `try {
+      Object logService = Class.forName("com.nanofuxion.tamerdevclient.TamerRelogLogService")
+        .getField("INSTANCE")
+        .get(null);
+      logService.getClass().getMethod("init", android.content.Context.class).invoke(logService, this);
+      LynxServiceCenter.inst().registerService((com.lynx.tasm.service.ILynxLogService) logService);
+    } catch (Exception ignored) {
+      LynxServiceCenter.inst().registerService(LynxLogService.INSTANCE);
+    }`
+  );
   return out.replace(/\n{3,}/g, "\n\n");
 }
 function getLoadTemplateBody(vars) {
@@ -548,6 +560,8 @@ class DevClientManager(private val context: Context, private val onReload: Runna
 function getProjectActivity(vars) {
   const hasDevClient = vars.devMode === "embedded";
   const devClientInit = hasDevClient ? `
+        TamerRelogLogService.init(this)
+        TamerRelogLogService.connect()
         devClientManager = DevClientManager(this) { reloadProjectView() }
         devClientManager?.connect()
 ` : "";
@@ -555,9 +569,11 @@ function getProjectActivity(vars) {
 ` : "";
   const devClientCleanup = hasDevClient ? `
         devClientManager?.disconnect()
+        TamerRelogLogService.disconnect()
 ` : "";
   const devClientImports = hasDevClient ? `
-import ${vars.packageName}.DevClientManager` : "";
+import ${vars.packageName}.DevClientManager
+import com.nanofuxion.tamerdevclient.TamerRelogLogService` : "";
   const reloadMethod = hasDevClient ? `
     private fun reloadProjectView() {
         GeneratedActivityLifecycle.onViewDetached()
@@ -1681,7 +1697,7 @@ var REQUIRED_PLUGIN_ENTRIES = {
     pluginLine: 'kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }'
   }
 };
-var autolink = () => {
+var autolink = (opts) => {
   let resolved;
   try {
     resolved = resolveHostPaths();
@@ -1810,17 +1826,17 @@ ${generateActivityLifecycleKotlin(packages, projectPackage)}`;
   function run() {
     console.log("\u{1F50E} Finding Lynx extension packages (lynx.ext.json / tamer.json)...");
     let packages = discoverModules(projectRoot).filter((p) => p.config.android);
-    const isDevApp = packageName === "com.nanofuxion.tamerdevapp";
+    const includeDevClient = opts?.includeDevClient === true;
     const devClientScoped = path6.join(projectRoot, "node_modules", "@tamer4lynx", "tamer-dev-client");
     const devClientFlat = path6.join(projectRoot, "node_modules", "tamer-dev-client");
     const devClientPath = fs6.existsSync(path6.join(devClientScoped, "android")) ? devClientScoped : fs6.existsSync(path6.join(devClientFlat, "android")) ? devClientFlat : null;
     const hasDevClient = packages.some((p) => p.name === "@tamer4lynx/tamer-dev-client" || p.name === "tamer-dev-client");
-    if (isDevApp && devClientPath && !hasDevClient) {
+    if (includeDevClient && devClientPath && !hasDevClient) {
       packages = [{
         ...TAMER_DEV_CLIENT_FALLBACK,
         packagePath: devClientPath
       }, ...packages];
-      console.log("\u2139\uFE0F Added tamer-dev-client (fallback for dev-app; lynx.ext.json missing in published package).");
+      console.log("\u2139\uFE0F Added tamer-dev-client (fallback; lynx.ext.json missing in published package).");
     }
     if (packages.length > 0) {
       console.log(`Found ${packages.length} package(s): ${packages.map((p) => p.name).join(", ")}`);
@@ -1972,6 +1988,30 @@ function readAndSubstituteTemplate2(templatePath, vars) {
     raw
   );
 }
+function patchAppLogService(appPath) {
+  if (!fs8.existsSync(appPath)) return;
+  const raw = fs8.readFileSync(appPath, "utf-8");
+  const patched = raw.replace(
+    /private void initLynxService\(\)\s*\{[\s\S]*?\n\s*}\s*\n\s*private void initFresco\(\)/,
+    `private void initLynxService() {
+    try {
+      Object logService = Class.forName("com.nanofuxion.tamerdevclient.TamerRelogLogService")
+        .getField("INSTANCE")
+        .get(null);
+      logService.getClass().getMethod("init", android.content.Context.class).invoke(logService, this);
+      LynxServiceCenter.inst().registerService((com.lynx.tasm.service.ILynxLogService) logService);
+    } catch (Exception ignored) {
+      LynxServiceCenter.inst().registerService(LynxLogService.INSTANCE);
+    }
+    LynxServiceCenter.inst().registerService(LynxImageService.getInstance());
+    LynxServiceCenter.inst().registerService(LynxHttpService.INSTANCE);
+  }
+  private void initFresco()`
+  );
+  if (patched !== raw) {
+    fs8.writeFileSync(appPath, patched);
+  }
+}
 async function syncDevClient(opts) {
   let resolved;
   try {
@@ -2004,6 +2044,7 @@ async function syncDevClient(opts) {
   ]);
   fs8.writeFileSync(path8.join(javaDir, "TemplateProvider.java"), templateProviderSource);
   fs8.writeFileSync(path8.join(kotlinDir, "MainActivity.kt"), getStandaloneMainActivity(vars));
+  patchAppLogService(path8.join(javaDir, "App.java"));
   const appDir = path8.join(rootDir, "app");
   const mainDir = path8.join(appDir, "src", "main");
   const manifestPath = path8.join(mainDir, "AndroidManifest.xml");
@@ -2084,7 +2125,7 @@ async function bundleAndDeploy(opts = {}) {
   const devClientPkg = findDevClientPackage(projectRoot);
   const includeDevClient = !release && !!devClientPkg;
   const destinationDir = androidAssetsDir;
-  autolink_default();
+  autolink_default({ includeDevClient });
   await syncDevClient_default({ includeDevClient });
   const bundleExists = fs9.existsSync(lynxBundlePath);
   if (!bundleExists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamer4lynx/cli",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "module": "index.ts",
   "type": "module",
   "description": "A CLI tool for managing LynxJS native modules.",