fixes

hanakla · hanakla · commit 3c0e2ff5fc0f · 2025-03-25T03:30:52.000+09:00
diff --git a/pkgs/ai-deno/src/deno/module_loader/jsr_package_manager.rs b/pkgs/ai-deno/src/deno/module_loader/jsr_package_manager.rs
@@ -346,6 +346,11 @@ impl JsrPackageManager {
     ) -> Result<(), JsErrorBox> {
         let base_dir = self.compute_package_dir(&nv.name, Some(&nv.version.to_string().as_str()));
 
+        if base_dir.exists() {
+            // TODO: Offline Support
+            return Ok(());
+        }
+
         self.sys.fs_create_dir_all(&base_dir).map_err(|e| {
             JsErrorBox::generic(format!("Failed to create package directory: {}", e))
         })?;
diff --git a/pkgs/ai-deno/src/js/src/main.ts b/pkgs/ai-deno/src/js/src/main.ts
@@ -5,17 +5,16 @@ import { toFileUrl, join, fromFileUrl } from "jsr:@std/path@1.0.8";
 import { isEqual } from "jsr:@es-toolkit/es-toolkit@1.33.0";
 import { homedir } from "node:os";
 
-// import { blurEffect } from "./live-effects/blurEffect.ts";
 import { chromaticAberration } from "./live-effects/chromatic-aberration.ts";
 import { testBlueFill } from "./live-effects/test-blue-fill.ts";
 import { ChangeEventHandler, ui, UINode } from "./ui/nodes.ts";
 import { directionalBlur } from "./live-effects/directional-blur.ts";
-import { kirakiraGlow } from "./live-effects/kirakira-glow.ts";
+import { kirakiraBlur } from "./live-effects/kirakira-blur.ts";
 import { dithering } from "./live-effects/dithering.ts";
 import { pixelSort } from "./live-effects/pixel-sort.ts";
 import { glitch } from "./live-effects/glitch.ts";
 import { logger } from "./logger.ts";
-import { outlineEffect } from "./live-effects/outline.ts";
+import { outline } from "./live-effects/outline.ts";
 import { innerGlow } from "./live-effects/inner-glow.ts";
 import { cropImageData, resizeImageData } from "./live-effects/_utils.ts";
 import { coastic } from "./live-effects/coastic.ts";
@@ -32,9 +31,8 @@ import { gaussianBlur } from "./live-effects/gaussian-blur.ts";
 const EFFECTS_DIR = new URL(toFileUrl(join(homedir(), ".ai-deno/effects")));
 
 const allPlugins: AIPlugin<any, any>[] = [
-  // blurEffect,
-  coastic,
   chromaticAberration,
+  coastic,
   dataMosh,
   directionalBlur,
   dithering,
@@ -45,8 +43,8 @@ const allPlugins: AIPlugin<any, any>[] = [
   halftone,
   // innerGlow,
   kaleidoscope,
-  kirakiraGlow,
-  outlineEffect,
+  kirakiraBlur,
+  outline,
   // pixelSort,
   // randomNoiseEffect,
   selectiveColorCorrection,
@@ -98,9 +96,6 @@ try {
   }
 }
 
-console.log(_AI_DENO_.op_ai_deno_get_user_locale());
-console.log(_AI_DENO_.op_ai_get_plugin_version());
-
 export async function loadEffects() {
   ensureDirSync(EFFECTS_DIR);
 
diff --git a/pkgs/plugin/AiWebGPUPlugin.xcodeproj/xcshareddata/xcschemes/release + Ai.xcscheme b/pkgs/plugin/AiWebGPUPlugin.xcodeproj/xcshareddata/xcschemes/release + Ai.xcscheme
@@ -48,6 +48,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUFrameCaptureMode = "3"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <PathRunnable
          runnableDebuggingMode = "0"
diff --git a/pkgs/plugin/Source/AiDenoPlugin.cpp b/pkgs/plugin/Source/AiDenoPlugin.cpp
@@ -102,13 +102,11 @@ ASErr HelloWorldPlugin::InitLiveEffect(SPInterfaceMessage* message) {
         "%s%s", EFFECT_PREFIX.c_str(), effectDef["id"].get<std::string>().c_str()
     ));
 
-    // char *title =
-    // ai::UnicodeString(effectDef["title"].get<std::string>().c_str(),
-    // kAIUTF8CharacterEncoding).as_UTF8().data();
-    effect.title = suai::str::strdup(
-        suai::str::toAiUnicodeStringUtf8(effectDef["title"].get<std::string>())
-    );
-    // effect.title = title;
+    char title[128];
+    suai::str::toAiUnicodeStringUtf8(effectDef["title"].get<std::string>())
+        .as_Platform(title, 128);
+
+    effect.title          = title;
     effect.majorVersion   = effectDef["version"]["major"].get<int>();
     effect.minorVersion   = effectDef["version"]["minor"].get<int>();
     effect.prefersAsInput = AIStyleFilterPreferredInputArtType::kInputArtDynamic;
@@ -121,9 +119,7 @@ ASErr HelloWorldPlugin::InitLiveEffect(SPInterfaceMessage* message) {
     AddLiveEffectMenuData menu;
     menu.category =
         suai::str::strdup(ai::UnicodeString("Deno Effectors", kAIUTF8CharacterEncoding));
-    menu.title = suai::str::strdup(
-        suai::str::toAiUnicodeStringUtf8(effectDef["title"].get<std::string>())
-    );
+    menu.title   = title;
     menu.options = 0;
 
     csb("title", effect.title);
@@ -162,7 +158,7 @@ ASErr HelloWorldPlugin::GoLiveEffect(AILiveEffectGoMessage* message) {
 
   // csl("art JSON: %s", suai::art::serialize::ArtToJSON(art).dump(2).c_str());
   // Test calling for checking it works
-  suai::art::serialize::ArtToJSON(art);
+  //  suai::art::serialize::ArtToJSON(art);
 
   PluginParams params;
   error = this->getDictionaryValues(
@@ -568,7 +564,7 @@ ASErr HelloWorldPlugin::EditLiveEffectParameters(AILiveEffectEditParamMessage* m
           }
         };
 
-    ImGuiModal::OnChangeCallback modaloOnChangeCallback =
+    ImGuiModal::OnChangeCallback modalOnChangeCallback =
         [&pluginParams, &isModalOpened, &isPreviewed, &error, &message, &currentParams,
          &nodeTree, &modal, this](json patch) {
           if (isModalOpened) isPreviewed = true;
@@ -618,7 +614,7 @@ ASErr HelloWorldPlugin::EditLiveEffectParameters(AILiveEffectEditParamMessage* m
           }
         };
 
-    modaloOnChangeCallback(initialParams);
+    modalOnChangeCallback(initialParams);
 
     PluginPreferences pref = this->getPreferences(&error);
     CHKERR();
@@ -633,7 +629,7 @@ ASErr HelloWorldPlugin::EditLiveEffectParameters(AILiveEffectEditParamMessage* m
     isModalOpened = true;
     csl("Opening modal: %s", nodeTree.dump().c_str());
     ModalStatusCode dialogResult = modal->runModal(
-        nodeTree, effectTitle, lastPosition, modaloOnChangeCallback,
+        nodeTree, effectTitle, lastPosition, modalOnChangeCallback,
         modalOnFireEventCallback
     );
 
@@ -668,8 +664,11 @@ ASErr HelloWorldPlugin::EditLiveEffectParameters(AILiveEffectEditParamMessage* m
     }
   } catch (ai::Error& ex) {
     error = ex;
-    csl("Error: %s (code: %s [raw: %d])", ex.what(), stringify_ASErr(error).c_str(),
+    cse("Error: %s (code: %s [raw: %d])", ex.what(), stringify_ASErr(error).c_str(),
         error);
+  } catch (std::exception& ex) {
+    error = kCantHappenErr;
+    cse("Error: %s", ex.what());
   } catch (...) { error = kCantHappenErr; }
 
   return error;
diff --git a/pkgs/plugin/Source/bridging.h b/pkgs/plugin/Source/bridging.h
@@ -30,8 +30,6 @@ extern "C" {
     ai::UnicodeString locale;
     sAIUser->GetAILanguageCode(locale);
 
-    std::cout << "locale: " << suai::str::toUtf8StdString(locale) << std::endl;
-
     const char* localeStr = suai::str::strdup(locale.as_UTF8().c_str());
     return localeStr;
   }
diff --git a/pkgs/plugin/Source/debugHelper.h b/pkgs/plugin/Source/debugHelper.h
@@ -48,6 +48,16 @@ void csl(const char* format, Args... args) {
   std::cout << indentLines(ss.str(), "\033[1m[deno_ai(C)]\033[0m ") << std::endl;
 }
 
+template <typename... Args>
+void cse(const char* format, Args... args) {
+  if (!AI_DENO_DEBUG) return;
+
+  std::ostringstream ss;
+  ss << string_format(format, args...) << std::endl;
+
+  std::cerr << indentLines(ss.str(), "\033[1m[deno_ai(C)]\033[0m ") << std::endl;
+}
+
 // print as hex binary json array
 void csb(const char* label, const char* value) {
   if (!AI_DENO_DEBUG) return;
diff --git a/pkgs/plugin/Source/super-illustrator.h b/pkgs/plugin/Source/super-illustrator.h
@@ -389,7 +389,10 @@ namespace suai {
     std::string getTitle() {
       const char* effectTitle = NULL;
       sAILiveEffect->GetLiveEffectTitle(effectHandle, &effectTitle);
-      return str::toUtf8StdString(effectTitle);
+
+      ai::UnicodeString title = ai::UnicodeString(effectTitle, kAIPlatformCharacterEncoding);
+
+      return title.as_UTF8().data();
     }
   };
 
diff --git a/pkgs/plugin/Source/views/ImGuiRenderComponents.cpp b/pkgs/plugin/Source/views/ImGuiRenderComponents.cpp
@@ -36,8 +36,10 @@ ModalStatusCode AiDenoImGuiRenderComponents(
 ) {
   ModalStatusCode resultStatus = ModalStatusCode::None;
 
+  std::cout << "renderTree: " << renderTree.dump() << std::endl;
+
   std::function<void(json)> renderNode = [&](json node) -> void {
-    if (!node.contains("type")) return;
+    if (node.is_null() || !node.contains("type")) return;
 
     std::string type   = node["type"];
     std::string nodeId = node["nodeId"];
@@ -48,15 +50,15 @@ ModalStatusCode AiDenoImGuiRenderComponents(
 
     if (type == "group") {
       std::string         direction = node["direction"];
-      std::optional<bool> disabled  = node["disabled"];
+      std::optional<bool> disabled  = getOptional<bool>(node["disabled"]);
 
       ImGui::BeginGroup();
-      if (disabled) { ui::styleStack.beginDisabled(); }
+      if (disabled.value_or(false)) { ui::styleStack.beginDisabled(); }
       for (json& child : node["children"]) {
         renderNode(child);
         if (direction == "row") ImGui::SameLine();
       }
-      if (disabled) { ui::styleStack.endDisabled(); }
+      if (disabled.value_or(false)) { ui::styleStack.endDisabled(); }
       ImGui::EndGroup();
 
     } else if (type == "text") {
diff --git a/pkgs/plugin/Source/views/ImgUIEditModal_osx.h b/pkgs/plugin/Source/views/ImgUIEditModal_osx.h
@@ -56,7 +56,7 @@ using json = nlohmann::json;
                lastPosition:(std::tuple<int, int>*)lastPosition
                    onChange:(ImGuiModal::OnChangeCallback)onChange
                 onFireEvent:(ImGuiModal::OnFireEventCallback)onFireEventCallback;
-- (void)restoreWindowPosition:(NSWindow*)window pos:(std::tuple<int, int>)pos;
+- (void)restoreWindowPosition:(std::tuple<int, int>*)pos;
 - (void)releaseDialog;
 @end
 
@@ -105,12 +105,19 @@ class ImGuiModalOSX : public ImGuiModal::IModalImpl {
   ) override {
     ModalStatusCode result = ModalStatusCode::None;
 
-    [this->controller setTitle:title];
+    try {
+      [this->controller setTitle:title];
+
+      result = [this->controller runModal:renderTree
+                             lastPosition:lastPosition
+                                 onChange:onChange
+                              onFireEvent:onFireEventCallback];
+    } catch (...) {
+      [this->controller releaseDialog];
+      this->controller = nullptr;
+      throw;
+    }
 
-    result = [this->controller runModal:renderTree
-                           lastPosition:lastPosition
-                               onChange:onChange
-                            onFireEvent:onFireEventCallback];
     [this->controller releaseDialog];
     this->controller = nullptr;
 

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ extern "C" {`
`30`	`30`	`ai::UnicodeString locale;`
`31`	`31`	`sAIUser->GetAILanguageCode(locale);`
`32`	`32`
`33`		`- std::cout << "locale: " << suai::str::toUtf8StdString(locale) << std::endl;`
`34`		`-`
`35`	`33`	`const char* localeStr = suai::str::strdup(locale.as_UTF8().c_str());`
`36`	`34`	`return localeStr;`
`37`	`35`	`}`