catalyst-core 0.1.0-beta.3 → 0.1.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/catalyst.js +8 -1
- package/changelog.md +6 -0
- package/dist/native/androidProject/app/build.gradle.kts +9 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/BridgeMessageValidator.kt +1 -1
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/CustomWebview.kt +17 -1
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/MainActivity.kt +31 -3
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/NativeBridge.kt +148 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/NativeCameraManager.kt +337 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/TransitionManager.kt +202 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/BarcodeDetector.kt +123 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/CameraSessionManager.kt +244 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/HoldController.kt +70 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/TorchController.kt +57 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/VideoStreamState.kt +41 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/VideoStreamStateMachine.kt +40 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/ViewfinderMapper.kt +75 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/camera/ZoomController.kt +156 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/plugins/CatalystPlugin.kt +7 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/plugins/GeneratedPluginIndex.kt +6 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/plugins/PluginBridge.kt +253 -0
- package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/utils/BridgeUtils.kt +42 -5
- package/dist/native/androidProject/app/src/main/res/drawable/debug_viewfinder_border.xml +8 -0
- package/dist/native/androidProject/app/src/main/res/layout/activity_main.xml +37 -0
- package/dist/native/androidProject/app/src/test/java/io/yourname/androidproject/plugins/PluginBridgeTest.kt +139 -0
- package/dist/native/bridge/WebBridge.js +5 -5
- package/dist/native/bridge/constants/NativeInterfaces.js +9 -5
- package/dist/native/bridge/hooks/index.js +1 -0
- package/dist/native/bridge/hooks/useCamera.js +9 -0
- package/dist/native/bridge/hooks/useDataProtection.js +2 -0
- package/dist/native/bridge/hooks/useDeviceInfo.js +2 -0
- package/dist/native/bridge/hooks/useFilePicker.js +2 -0
- package/dist/native/bridge/hooks/useGoogleSignIn.js +1 -0
- package/dist/native/bridge/hooks/useHapticFeedback.js +1 -0
- package/dist/native/bridge/hooks/useIntent.js +1 -0
- package/dist/native/bridge/hooks/useNativeTransition.js +43 -0
- package/dist/native/bridge/hooks/useNetworkStatus.js +3 -0
- package/dist/native/bridge/hooks/useNotification.js +2 -0
- package/dist/native/bridge/hooks/useSafeArea.js +2 -0
- package/dist/native/bridge/hooks/useVideoStream.js +6 -0
- package/dist/native/bridge/hooks/utils.js +1 -0
- package/dist/native/bridge/hooks.js +1 -137
- package/dist/native/bridge/useBaseHook.js +8 -3
- package/dist/native/bridge/utils/NativeBridge.js +36 -1
- package/dist/native/buildAppAndroid.js +2 -2
- package/dist/native/buildAppIos.js +12 -17
- package/dist/native/internalPluginUtils.js +7 -0
- package/dist/native/iosnativeWebView/Package.resolved +36 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/BarcodeDetector.swift +116 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/CameraPreviewView.swift +58 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/CameraSessionManager.swift +308 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/HoldController.swift +63 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/NativeCameraManager.swift +194 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/TorchController.swift +60 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/VideoStreamState.swift +44 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/VideoStreamStateMachine.swift +60 -0
- package/dist/native/iosnativeWebView/Sources/Core/Camera/ZoomController.swift +130 -0
- package/dist/native/iosnativeWebView/Sources/Core/Constants/CatalystConstants.swift +11 -1
- package/dist/native/iosnativeWebView/Sources/Core/Plugins/CatalystPlugin.swift +5 -0
- package/dist/native/iosnativeWebView/Sources/Core/Plugins/GeneratedPluginIndex.swift +6 -0
- package/dist/native/iosnativeWebView/Sources/Core/Plugins/PluginBridge.swift +364 -0
- package/dist/native/iosnativeWebView/Sources/Core/WebView/BridgeMessageValidator.swift +4 -1
- package/dist/native/iosnativeWebView/Sources/Core/WebView/NativeBridge.swift +227 -4
- package/dist/native/iosnativeWebView/Sources/Core/WebView/TransitionManager.swift +169 -0
- package/dist/native/iosnativeWebView/Sources/Core/WebView/WeakScriptMessageHandler.swift +14 -0
- package/dist/native/iosnativeWebView/Sources/Core/WebView/WebView.swift +38 -7
- package/dist/native/iosnativeWebView/Sources/Core/WebView/WebViewNavigationDelegate.swift +6 -2
- package/dist/native/iosnativeWebView/iosnativeWebView/ContentView.swift +15 -4
- package/dist/native/iosnativeWebView/iosnativeWebView/Info.plist +11 -17
- package/dist/native/iosnativeWebView/iosnativeWebView.xcodeproj/project.pbxproj +8 -2
- package/dist/native/iosnativeWebView/iosnativeWebViewTests/PluginBridgeTests.swift +160 -0
- package/dist/native/plugin-bridge/PluginBridge.js +1 -0
- package/dist/native/pluginComposerAndroid.js +28 -0
- package/dist/native/pluginComposerIos.js +16 -0
- package/dist/otel.js +70 -2
- package/dist/scripts/plugins.js +1 -0
- package/dist/server/renderer/extract.js +3 -3
- package/dist/server/renderer/handler.js +15 -14
- package/dist/webpack/development.client.babel.js +5 -1
- package/dist/webpack/production.ssr.babel.js +5 -1
- package/mcp_v2/knowledge-base.json +1564 -1067
- package/package.json +1 -1
|
@@ -2,27 +2,21 @@
|
|
|
2
2
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
3
3
|
<plist version="1.0">
|
|
4
4
|
<dict>
|
|
5
|
+
<key>FirebaseAppDelegateProxyEnabled</key>
|
|
6
|
+
<false/>
|
|
5
7
|
<key>NSAppTransportSecurity</key>
|
|
6
8
|
<dict>
|
|
7
9
|
<key>NSAllowsArbitraryLoads</key>
|
|
8
10
|
<true/>
|
|
9
11
|
</dict>
|
|
10
|
-
<key>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
<string>This app uses notifications to alert you about important events</string>
|
|
20
|
-
<key>UIBackgroundModes</key>
|
|
21
|
-
<array>
|
|
22
|
-
<string>remote-notification</string>
|
|
23
|
-
<string>background-fetch</string>
|
|
24
|
-
</array>
|
|
25
|
-
<key>FirebaseAppDelegateProxyEnabled</key>
|
|
26
|
-
<false/>
|
|
12
|
+
<key>NSLocalNotificationUsageDescription</key>
|
|
13
|
+
<string>This app uses notifications to alert you about important events</string>
|
|
14
|
+
<key>NSUserNotificationUsageDescription</key>
|
|
15
|
+
<string>This app needs notification permission to send you important updates</string>
|
|
16
|
+
<key>UIBackgroundModes</key>
|
|
17
|
+
<array>
|
|
18
|
+
<string>remote-notification</string>
|
|
19
|
+
<string>background-fetch</string>
|
|
20
|
+
</array>
|
|
27
21
|
</dict>
|
|
28
22
|
</plist>
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
E9F699E02EE065B0005E972E /* NotificationHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699DF2EE065B0005E972E /* NotificationHandlerTests.swift */; };
|
|
24
24
|
E9F699E22EE06650005E972E /* FrameworkServerUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699E12EE06650005E972E /* FrameworkServerUtilsTests.swift */; };
|
|
25
25
|
E9F699E42EE0696A005E972E /* BootTimingUtilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699E32EE0696A005E972E /* BootTimingUtilityTests.swift */; };
|
|
26
|
+
F2B100012F11111100AAA001 /* PluginBridgeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2B100022F11111100AAA001 /* PluginBridgeTests.swift */; };
|
|
26
27
|
F1234AC22E990180008C7F58 /* localhost.p12 in Resources */ = {isa = PBXBuildFile; fileRef = F1234AC32E990180008C7F58 /* localhost.p12 */; };
|
|
27
28
|
/* End PBXBuildFile section */
|
|
28
29
|
|
|
@@ -55,7 +56,7 @@
|
|
|
55
56
|
C99974382E97D69E00C25611 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
|
|
56
57
|
C9DAB6492E950DDC00A02A44 /* iosnativeWebView.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iosnativeWebView.entitlements; sourceTree = "<group>"; };
|
|
57
58
|
E90872B32E8D00D80076627C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
|
58
|
-
E9F699CF2EDEFCF3005E972E /* iosnativeWebView.xctestplan */ = {isa = PBXFileReference; lastKnownFileType =
|
|
59
|
+
E9F699CF2EDEFCF3005E972E /* iosnativeWebView.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = iosnativeWebView.xctestplan; sourceTree = "<group>"; };
|
|
59
60
|
E9F699D02EDEFEF2005E972E /* URLWhitelistManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLWhitelistManagerTests.swift; sourceTree = "<group>"; };
|
|
60
61
|
E9F699D32EE05984005E972E /* ConfigMappingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigMappingTests.swift; sourceTree = "<group>"; };
|
|
61
62
|
E9F699D52EE05D74005E972E /* BridgeMessageValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgeMessageValidatorTests.swift; sourceTree = "<group>"; };
|
|
@@ -66,6 +67,7 @@
|
|
|
66
67
|
E9F699DF2EE065B0005E972E /* NotificationHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationHandlerTests.swift; sourceTree = "<group>"; };
|
|
67
68
|
E9F699E12EE06650005E972E /* FrameworkServerUtilsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkServerUtilsTests.swift; sourceTree = "<group>"; };
|
|
68
69
|
E9F699E32EE0696A005E972E /* BootTimingUtilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootTimingUtilityTests.swift; sourceTree = "<group>"; };
|
|
70
|
+
F2B100022F11111100AAA001 /* PluginBridgeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginBridgeTests.swift; sourceTree = "<group>"; };
|
|
69
71
|
F1234AC32E990180008C7F58 /* localhost.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = localhost.p12; sourceTree = "<group>"; };
|
|
70
72
|
XCCONFIG001000000001 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
|
|
71
73
|
XCCONFIG001000000002 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
|
|
@@ -152,6 +154,7 @@
|
|
|
152
154
|
E9F699DB2EE06482005E972E /* CacheManagerTests.swift */,
|
|
153
155
|
E9F699D92EE063D5005E972E /* WebViewTests.swift */,
|
|
154
156
|
E9F699D72EE06068005E972E /* NativeBridgeTests.swift */,
|
|
157
|
+
F2B100022F11111100AAA001 /* PluginBridgeTests.swift */,
|
|
155
158
|
E9F699D52EE05D74005E972E /* BridgeMessageValidatorTests.swift */,
|
|
156
159
|
E9F699D32EE05984005E972E /* ConfigMappingTests.swift */,
|
|
157
160
|
E9F699D02EDEFEF2005E972E /* URLWhitelistManagerTests.swift */,
|
|
@@ -321,6 +324,7 @@
|
|
|
321
324
|
E9F699DC2EE06483005E972E /* CacheManagerTests.swift in Sources */,
|
|
322
325
|
E9F699D42EE05984005E972E /* ConfigMappingTests.swift in Sources */,
|
|
323
326
|
E9F699D82EE06068005E972E /* NativeBridgeTests.swift in Sources */,
|
|
327
|
+
F2B100012F11111100AAA001 /* PluginBridgeTests.swift in Sources */,
|
|
324
328
|
E9F699DA2EE063D5005E972E /* WebViewTests.swift in Sources */,
|
|
325
329
|
E9F699E42EE0696A005E972E /* BootTimingUtilityTests.swift in Sources */,
|
|
326
330
|
E9F699E22EE06650005E972E /* FrameworkServerUtilsTests.swift in Sources */,
|
|
@@ -478,6 +482,7 @@
|
|
|
478
482
|
baseConfigurationReference = XCCONFIG001000000001 /* Debug.xcconfig */;
|
|
479
483
|
buildSettings = {
|
|
480
484
|
CODE_SIGN_ENTITLEMENTS = iosnativeWebView/iosnativeWebView.entitlements;
|
|
485
|
+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = BHQQRZ69D3;
|
|
481
486
|
INFOPLIST_KEY_NSCameraUsageDescription = "This app requires camera access to capture images";
|
|
482
487
|
INFOPLIST_KEY_NSLocalNetworkUsageDescription = "Debug web content in Safari Web Inspector";
|
|
483
488
|
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "This app requires photo library access to select images from your gallery";
|
|
@@ -486,8 +491,9 @@
|
|
|
486
491
|
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
|
|
487
492
|
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
|
|
488
493
|
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
|
|
494
|
+
PRODUCT_BUNDLE_IDENTIFIER = com.1mg.pos;
|
|
489
495
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
490
|
-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" =
|
|
496
|
+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Tata1mgPos;
|
|
491
497
|
};
|
|
492
498
|
name = Debug;
|
|
493
499
|
};
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
import XCTest
|
|
2
|
+
import WebKit
|
|
3
|
+
import UIKit
|
|
4
|
+
@testable import CatalystCore
|
|
5
|
+
|
|
6
|
+
final class PluginBridgeTests: XCTestCase {
|
|
7
|
+
|
|
8
|
+
private var bridge: PluginBridge!
|
|
9
|
+
private var mockWebView: PluginMockWKWebView!
|
|
10
|
+
private var mockViewController: UIViewController!
|
|
11
|
+
private var testExpectation: XCTestExpectation!
|
|
12
|
+
|
|
13
|
+
@MainActor
|
|
14
|
+
override func setUp() {
|
|
15
|
+
super.setUp()
|
|
16
|
+
mockWebView = PluginMockWKWebView()
|
|
17
|
+
mockViewController = UIViewController()
|
|
18
|
+
bridge = PluginBridge(webView: mockWebView, viewController: mockViewController)
|
|
19
|
+
bridge.register()
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
@MainActor
|
|
23
|
+
override func tearDown() {
|
|
24
|
+
bridge.unregister()
|
|
25
|
+
bridge = nil
|
|
26
|
+
mockWebView = nil
|
|
27
|
+
mockViewController = nil
|
|
28
|
+
testExpectation = nil
|
|
29
|
+
super.tearDown()
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
@MainActor
|
|
33
|
+
func testMessageHandling_InvalidHandler_EmitsInvalidPayloadError() async {
|
|
34
|
+
testExpectation = expectation(description: "Invalid handler should emit bridge error")
|
|
35
|
+
mockWebView.onEvaluateJavaScript = { script in
|
|
36
|
+
if script.contains("PLUGIN_BRIDGE_ERROR") && script.contains("INVALID_PAYLOAD") {
|
|
37
|
+
self.testExpectation.fulfill()
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
let message = PluginMockScriptMessage(
|
|
42
|
+
name: "NativeBridge",
|
|
43
|
+
body: [
|
|
44
|
+
"pluginId": "device-info-plugin",
|
|
45
|
+
"command": "getDeviceInfo"
|
|
46
|
+
]
|
|
47
|
+
)
|
|
48
|
+
|
|
49
|
+
bridge.handleMessage(message)
|
|
50
|
+
|
|
51
|
+
await fulfillment(of: [testExpectation], timeout: 2.0)
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
@MainActor
|
|
55
|
+
func testMessageHandling_UnknownPlugin_EmitsPluginNotFoundError() async {
|
|
56
|
+
testExpectation = expectation(description: "Unknown plugin should emit plugin not found error")
|
|
57
|
+
mockWebView.onEvaluateJavaScript = { script in
|
|
58
|
+
if script.contains("PLUGIN_BRIDGE_ERROR") && script.contains("PLUGIN_NOT_FOUND") {
|
|
59
|
+
self.testExpectation.fulfill()
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
let message = PluginMockScriptMessage(
|
|
64
|
+
name: "PluginBridge",
|
|
65
|
+
body: [
|
|
66
|
+
"pluginId": "missing-plugin",
|
|
67
|
+
"command": "ping",
|
|
68
|
+
"requestId": "req-42"
|
|
69
|
+
]
|
|
70
|
+
)
|
|
71
|
+
|
|
72
|
+
bridge.handleMessage(message)
|
|
73
|
+
|
|
74
|
+
await fulfillment(of: [testExpectation], timeout: 2.0)
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
@MainActor
|
|
78
|
+
func testCallbackHandling_ArbitraryCallback_DispatchesPluginEnvelope() async {
|
|
79
|
+
testExpectation = expectation(description: "Arbitrary callback should dispatch plugin envelope")
|
|
80
|
+
mockWebView.onEvaluateJavaScript = { script in
|
|
81
|
+
if script.contains("PluginBridgeWeb.dispatch") &&
|
|
82
|
+
script.contains("sync-plugin") &&
|
|
83
|
+
script.contains("ON_FAILURE") &&
|
|
84
|
+
script.contains("req-9") &&
|
|
85
|
+
script.contains("syncData") {
|
|
86
|
+
self.testExpectation.fulfill()
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
let context = PluginBridgeContext(
|
|
91
|
+
webView: mockWebView,
|
|
92
|
+
viewController: mockViewController,
|
|
93
|
+
pluginId: "sync-plugin",
|
|
94
|
+
command: "syncData",
|
|
95
|
+
requestId: "req-9"
|
|
96
|
+
)
|
|
97
|
+
|
|
98
|
+
context.callback(eventName: "ON_FAILURE", data: ["reason": "network"])
|
|
99
|
+
|
|
100
|
+
await fulfillment(of: [testExpectation], timeout: 2.0)
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
@MainActor
|
|
104
|
+
func testCallbackHandling_ValidCallback_DispatchesPluginEnvelope() async {
|
|
105
|
+
testExpectation = expectation(description: "Valid callback should dispatch plugin envelope")
|
|
106
|
+
mockWebView.onEvaluateJavaScript = { script in
|
|
107
|
+
if script.contains("PluginBridgeWeb.dispatch") &&
|
|
108
|
+
script.contains("sync-plugin") &&
|
|
109
|
+
script.contains("ON_SUCCESS") &&
|
|
110
|
+
script.contains("req-10") {
|
|
111
|
+
self.testExpectation.fulfill()
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
let context = PluginBridgeContext(
|
|
116
|
+
webView: mockWebView,
|
|
117
|
+
viewController: mockViewController,
|
|
118
|
+
pluginId: "sync-plugin",
|
|
119
|
+
command: "syncData",
|
|
120
|
+
requestId: "req-10"
|
|
121
|
+
)
|
|
122
|
+
|
|
123
|
+
context.callback(eventName: "ON_SUCCESS", data: ["status": "ok"])
|
|
124
|
+
|
|
125
|
+
await fulfillment(of: [testExpectation], timeout: 2.0)
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
private final class PluginMockWKWebView: WKWebView {
|
|
130
|
+
var onEvaluateJavaScript: ((String) -> Void)?
|
|
131
|
+
var evaluatedScripts: [String] = []
|
|
132
|
+
|
|
133
|
+
override init(frame: CGRect, configuration: WKWebViewConfiguration) {
|
|
134
|
+
super.init(frame: frame, configuration: configuration)
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
convenience init() {
|
|
138
|
+
let config = WKWebViewConfiguration()
|
|
139
|
+
self.init(frame: .zero, configuration: config)
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
required init?(coder: NSCoder) {
|
|
143
|
+
fatalError("init(coder:) has not been implemented")
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
@MainActor
|
|
147
|
+
override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
|
|
148
|
+
evaluatedScripts.append(javaScriptString)
|
|
149
|
+
onEvaluateJavaScript?(javaScriptString)
|
|
150
|
+
|
|
151
|
+
DispatchQueue.main.async {
|
|
152
|
+
completionHandler?(nil, nil)
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
private struct PluginMockScriptMessage: PluginBridgeMessage {
|
|
158
|
+
let name: String
|
|
159
|
+
let body: Any
|
|
160
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;class PluginNativeBridge{constructor(){this.handlers=new Map();this.requestCount=0;this.isInitialized=false;}createRequestId=()=>{this.requestCount+=1;return`plugin_${Date.now()}_${this.requestCount}`;};normalizeRequiredString=(value,fieldName)=>{if(typeof value!=="string"||!value.trim()){throw new Error(`${fieldName} must be a non-empty string`);}return value.trim();};normalizeCommand=command=>{if(command==null){return null;}return this.normalizeRequiredString(command,"command");};getHandlerKey=({pluginId,eventName,command=null}={})=>{return JSON.stringify([this.normalizeRequiredString(pluginId,"pluginId"),this.normalizeRequiredString(eventName,"eventName"),this.normalizeCommand(command)]);};getHandlerSet=(key,create=false)=>{let handlers=this.handlers.get(key);if(!handlers&&create){handlers=new Set();this.handlers.set(key,handlers);}return handlers||null;};addHandler=({pluginId,eventName,command}={},handler)=>{if(typeof handler!=="function"){throw new Error("handler must be a function");}this.getHandlerSet(this.getHandlerKey({pluginId,eventName,command}),true).add(handler);};removeHandler=({pluginId,eventName,command}={},handler)=>{const key=this.getHandlerKey({pluginId,eventName,command});const handlers=this.getHandlerSet(key,false);if(!handlers){return false;}if(handler==null){handlers.clear();this.handlers.delete(key);return true;}const removed=handlers.delete(handler);if(handlers.size===0){this.handlers.delete(key);}return removed;};ensureInitialized=()=>{if(typeof window==="undefined"||this.isInitialized){return this;}window.PluginBridgeWeb=window.PluginBridgeWeb||{};window.PluginBridgeWeb.callback=this.dispatchCallback;window.PluginBridgeWeb.dispatch=message=>{let parsed=message;if(typeof parsed==="string"){try{parsed=JSON.parse(parsed);}catch{return false;}}if(!parsed||typeof parsed!=="object"){return false;}const payload=Object.prototype.hasOwnProperty.call(parsed,"payload")?parsed.payload:null;return this.dispatchCallback(parsed.pluginId,parsed.eventName,payload,parsed.requestId??null,parsed.command??null);};this.isInitialized=true;return this;};hasAndroidBridge=()=>typeof window!=="undefined"&&!!window.PluginBridge;hasIOSBridge=()=>typeof window!=="undefined"&&!!window.webkit?.messageHandlers?.PluginBridge;init=()=>this.ensureInitialized();assertInitialized=()=>{if(!this.isInitialized){throw new Error("PluginBridge.init() must be called before using emit() or register()");}};reportHandlerError=error=>{if(typeof queueMicrotask==="function"){queueMicrotask(()=>{throw error;});return;}setTimeout(()=>{throw error;},0);};emit=({pluginId,command,data=null}={})=>{const normalizedPluginId=this.normalizeRequiredString(pluginId,"pluginId");const normalizedCommand=this.normalizeRequiredString(command,"command");if(typeof window==="undefined"){throw new Error("PluginBridge is not available in this environment");}this.assertInitialized();const payload={pluginId:normalizedPluginId,command:normalizedCommand,data,requestId:this.createRequestId()};if(this.hasAndroidBridge()){window.PluginBridge.emit(JSON.stringify(payload));return;}if(this.hasIOSBridge()){window.webkit.messageHandlers.PluginBridge.postMessage(payload);return;}throw new Error("PluginBridge is not available in this environment");};register=({pluginId,eventName,command,handler}={})=>{this.assertInitialized();this.addHandler({pluginId,eventName,command},handler);return()=>this.removeHandler({pluginId,eventName,command},handler);};unregister=({pluginId,eventName,command,handler}={})=>{if(typeof handler!=="function"){throw new Error("handler must be a function");}return this.removeHandler({pluginId,eventName,command},handler);};dispatchCallback=(pluginId,eventName,payload,requestId=null,command=null)=>{void requestId;const normalizedPluginId=typeof pluginId==="string"&&pluginId.trim()?pluginId.trim():null;const normalizedEventName=typeof eventName==="string"&&eventName.trim()?eventName.trim():null;if(normalizedPluginId==null||normalizedEventName==null){return false;}const normalizedCommand=typeof command==="string"&&command.trim()?command.trim():null;const toCall=new Set();const collectHandlers=commandScope=>{const handlers=this.getHandlerSet(JSON.stringify([normalizedPluginId,normalizedEventName,commandScope]),false);if(!handlers){return;}handlers.forEach(handler=>{toCall.add(handler);});};if(normalizedCommand!=null){collectHandlers(normalizedCommand);}collectHandlers(null);if(toCall.size===0){return false;}const meta={pluginId:normalizedPluginId,eventName:normalizedEventName,command:normalizedCommand};toCall.forEach(handler=>{try{handler(payload,meta);}catch(error){this.reportHandlerError(error);}});return true;};}const pluginNativeBridge=new PluginNativeBridge();var _default=exports.default=pluginNativeBridge;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";const fs=require("fs");const path=require("path");const{discoverInternalPlugins}=require("./internalPluginUtils.js");const PLUGINS_PACKAGE_PARTS=["io","yourname","androidproject","plugins"];function isDir(dirPath){return fs.existsSync(dirPath)&&fs.statSync(dirPath).isDirectory();}function ensureDir(dirPath){if(!fs.existsSync(dirPath)){fs.mkdirSync(dirPath,{recursive:true});}}function sanitizeForPath(value){return value.replace(/[^a-zA-Z0-9_-]/g,"_");}function mustBeNonEmptyString(value,fieldName,sourcePath){if(typeof value!=="string"||!value.trim()){throw new Error(`Invalid '${fieldName}' in ${sourcePath}`);}return value.trim();}function asUniqueSorted(values){return[...new Set(values)].sort();}function parsePluginToggleConfig(pluginConfig){if(pluginConfig==null){return{};}if(typeof pluginConfig!=="object"||Array.isArray(pluginConfig)){throw new Error("'WEBVIEW_CONFIG.plugins' must be an object with boolean values");}const toggles={};for(const[key,value]of Object.entries(pluginConfig)){const normalizedKey=mustBeNonEmptyString(key,"plugins.<key>","WEBVIEW_CONFIG");if(typeof value!=="boolean"){throw new Error(`'WEBVIEW_CONFIG.plugins.${normalizedKey}' must be boolean`);}toggles[normalizedKey]=value;}return toggles;}function selectPluginsByConfig(plugins,pluginConfig,log){const toggles=parsePluginToggleConfig(pluginConfig);const matchedKeys=new Set();const selected=[];for(const plugin of plugins){const selectorKeys=plugin.configKey?[plugin.configKey,plugin.id]:[plugin.id];const matches=[];for(const key of selectorKeys){if(Object.prototype.hasOwnProperty.call(toggles,key)){matches.push({key,value:toggles[key]});matchedKeys.add(key);}}const uniqueValues=[...new Set(matches.map(entry=>entry.value))];if(uniqueValues.length>1){throw new Error(`Conflicting toggle values for plugin '${plugin.id}' across keys: ${matches.map(entry=>`${entry.key}=${entry.value}`).join(", ")}`);}const enabled=matches.length===0?false:matches[0].value;if(enabled){selected.push(plugin);}else{log(`Plugin disabled by config: ${plugin.id}`,"info");}}const unknownKeys=Object.keys(toggles).filter(key=>!matchedKeys.has(key));if(unknownKeys.length>0){throw new Error(`Unknown plugin toggle key(s) in WEBVIEW_CONFIG.plugins: ${unknownKeys.join(", ")}`);}return selected;}function parseDependency(dependency,pluginId){const parts=dependency.split(":");if(parts.length<3){throw new Error(`Dependency '${dependency}' in plugin '${pluginId}' must be in 'group:artifact:version' format`);}return{key:`${parts[0]}:${parts[1]}`,version:parts.slice(2).join(":")};}function validatePlugins(plugins){const pluginIds=new Set();const configKeys=new Set();const dependencies=new Map();const selectorKeys=new Map();for(const plugin of plugins){if(pluginIds.has(plugin.id)){throw new Error(`Duplicate plugin id detected: ${plugin.id}`);}pluginIds.add(plugin.id);if(plugin.configKey){if(configKeys.has(plugin.configKey)){throw new Error(`Duplicate configKey detected: ${plugin.configKey}`);}configKeys.add(plugin.configKey);}for(const[field,selector]of[["id",plugin.id],["configKey",plugin.configKey]]){if(!selector){continue;}const existing=selectorKeys.get(selector);if(existing&&existing.pluginId!==plugin.id){throw new Error(`Plugin selector collision for '${selector}': '${existing.pluginId}' (${existing.field}) conflicts with '${plugin.id}' (${field})`);}selectorKeys.set(selector,{pluginId:plugin.id,field});}if(new Set(plugin.commands).size!==plugin.commands.length){throw new Error(`Duplicate command(s) detected within plugin '${plugin.id}'`);}for(const dependency of plugin.android?.dependencies||[]){const parsed=parseDependency(dependency,plugin.id);const existing=dependencies.get(parsed.key);if(existing&&existing.version!==parsed.version){throw new Error(`Dependency version conflict for '${parsed.key}': '${existing.version}' in '${existing.pluginId}', '${parsed.version}' in '${plugin.id}'`);}if(!existing){dependencies.set(parsed.key,{version:parsed.version,pluginId:plugin.id});}}}}function selectPluginsForPlatform(plugins,platform,log){const selected=[];for(const plugin of plugins){if(plugin.platforms.includes(platform)){selected.push(plugin);continue;}log(`Plugin enabled but not supported on ${platform}: ${plugin.id}`,"info");}return selected;}function walkFiles(rootDir,predicate,results=[]){if(!isDir(rootDir)){return results;}for(const entry of fs.readdirSync(rootDir,{withFileTypes:true})){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - entry.name comes from readdirSync within the walked root.
|
|
2
|
+
const fullPath=path.join(rootDir,entry.name);if(entry.isDirectory()){walkFiles(fullPath,predicate,results);continue;}if(predicate(entry.name,fullPath)){results.push(fullPath);}}return results;}function resolvePluginClassSourcePath(plugin){const className=plugin.android.className.split(".").pop();const candidateNames=new Set([`${className}.kt`,`${className}.java`]);const candidates=walkFiles(plugin.android.sourceDir,name=>candidateNames.has(name));if(candidates.length>1){throw new Error(`Declared class '${plugin.android.className}' for selected plugin '${plugin.id}' resolved to multiple source files under ${plugin.android.sourceDir}`);}return candidates[0]||null;}function validateSelectedPluginSources(plugins){for(const plugin of plugins){if(!plugin.android){throw new Error(`Android config missing for selected plugin '${plugin.id}'`);}if(!isDir(plugin.android.sourceDir)){throw new Error(`Android source directory missing for selected plugin '${plugin.id}'`);}const codeFiles=walkFiles(plugin.android.sourceDir,name=>name.endsWith(".kt")||name.endsWith(".java"));if(codeFiles.length===0){throw new Error(`No Android source files found for selected plugin '${plugin.id}'`);}if(!resolvePluginClassSourcePath(plugin)){throw new Error(`Declared class '${plugin.android.className}' for selected plugin '${plugin.id}' was not found as a .kt or .java file under ${plugin.android.sourceDir}`);}}}function copyTree(sourceDir,targetDir){if(!isDir(sourceDir)){return;}ensureDir(targetDir);for(const filePath of walkFiles(sourceDir,()=>true)){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - filePath is produced by walking sourceDir, so the relative path remains within that tree.
|
|
3
|
+
const targetPath=path.join(targetDir,path.relative(sourceDir,filePath));ensureDir(path.dirname(targetPath));fs.copyFileSync(filePath,targetPath);}}function copyAndroidPluginSources(plugins,javaRoot,log){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The package path components are fixed constants.
|
|
4
|
+
const internalRoot=path.join(javaRoot,...PLUGINS_PACKAGE_PARTS,"internal");fs.rmSync(internalRoot,{recursive:true,force:true});ensureDir(internalRoot);let copiedCount=0;for(const plugin of plugins){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - plugin.id is sanitized before being used as a path component.
|
|
5
|
+
const pluginOutputDir=path.join(internalRoot,sanitizeForPath(plugin.id));const codeFiles=walkFiles(plugin.android.sourceDir,name=>name.endsWith(".kt")||name.endsWith(".java"));for(const sourcePath of codeFiles){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - sourcePath is produced by walking plugin.android.sourceDir.
|
|
6
|
+
const targetPath=path.join(pluginOutputDir,path.relative(plugin.android.sourceDir,sourcePath));ensureDir(path.dirname(targetPath));fs.copyFileSync(sourcePath,targetPath);copiedCount++;}}log(`Copied ${copiedCount} Android plugin source file(s)`,"info");}function copyPluginAssets(plugins,androidProjectPath,log){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The destination path components are fixed.
|
|
7
|
+
const baseAssetsDir=path.join(androidProjectPath,"app","src","main","assets","plugins");fs.rmSync(baseAssetsDir,{recursive:true,force:true});ensureDir(baseAssetsDir);for(const plugin of plugins){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - plugin.id is sanitized before being used as a path component.
|
|
8
|
+
const pluginAssetsDir=path.join(baseAssetsDir,sanitizeForPath(plugin.id));// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed asset directories beneath the discovered internal plugin directory.
|
|
9
|
+
copyTree(path.join(plugin.pluginDir,"assets","common"),path.join(pluginAssetsDir,"common"));// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed asset directories beneath the discovered internal plugin directory.
|
|
10
|
+
copyTree(path.join(plugin.pluginDir,"assets","android"),path.join(pluginAssetsDir,"android"));}log("Plugin assets copied to app/src/main/assets/plugins","info");}function formatKotlinMap(entries,emptyLiteral="emptyMap()"){return entries.length===0?emptyLiteral:`mapOf(\n${entries.join(",\n")}\n )`;}function generatePluginRegistryFiles(plugins,javaRoot){const pluginIdToClassName={};const pluginToCommands={};for(const plugin of plugins){pluginIdToClassName[plugin.id]=plugin.android.className;pluginToCommands[plugin.id]=asUniqueSorted(plugin.commands);}const classEntries=Object.keys(pluginIdToClassName).sort().map(pluginId=>` ${JSON.stringify(pluginId)} to ${JSON.stringify(pluginIdToClassName[pluginId])}`);const commandEntries=Object.keys(pluginToCommands).sort().map(pluginId=>{const commands=pluginToCommands[pluginId];const commandSet=commands.length?`setOf(${commands.map(value=>JSON.stringify(value)).join(", ")})`:"emptySet()";return` ${JSON.stringify(pluginId)} to ${commandSet}`;});const indexContent=`package io.yourname.androidproject.plugins
|
|
11
|
+
|
|
12
|
+
object GeneratedPluginIndex {
|
|
13
|
+
val pluginIdToClassName: Map<String, String> = ${formatKotlinMap(classEntries)}
|
|
14
|
+
val pluginToCommands: Map<String, Set<String>> = ${formatKotlinMap(commandEntries)}
|
|
15
|
+
}
|
|
16
|
+
`;// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The package path components are fixed constants.
|
|
17
|
+
const pluginsDir=path.join(javaRoot,...PLUGINS_PACKAGE_PARTS);ensureDir(pluginsDir);// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The generated filename is fixed.
|
|
18
|
+
fs.writeFileSync(path.join(pluginsDir,"GeneratedPluginIndex.kt"),indexContent);// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The generated filename is fixed.
|
|
19
|
+
fs.rmSync(path.join(pluginsDir,"GeneratedPluginMeta.kt"),{force:true});}function escapeRegexLiteral(value){return value.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");}function updateAndroidManifestPermissions(manifestPath,selectedPermissions,allKnownPluginPermissions){const uniquePermissions=asUniqueSorted(selectedPermissions);const knownPermissions=asUniqueSorted(allKnownPluginPermissions);let manifest=fs.readFileSync(manifestPath,"utf8");const beginMarker="<!-- CATALYST_PLUGIN_PERMISSIONS_START -->";const endMarker="<!-- CATALYST_PLUGIN_PERMISSIONS_END -->";const markerRegex=/[ \t]*<!-- CATALYST_PLUGIN_PERMISSIONS_START -->[\s\S]*?<!-- CATALYST_PLUGIN_PERMISSIONS_END -->\s*/g;manifest=manifest.replace(markerRegex,"");// Migration cleanup for legacy entries previously written without markers.
|
|
20
|
+
for(const permission of knownPermissions){const escaped=escapeRegexLiteral(permission);// nosemgrep: javascript.lang.security.audit.detect-non-literal-regexp.detect-non-literal-regexp - The dynamic value is escaped as a regex literal above.
|
|
21
|
+
const legacyRegex=new RegExp(`^[ \\t]*<uses-permission\\s+android:name="${escaped}"\\s*/>\\s*\\n?`,"gm");manifest=manifest.replace(legacyRegex,"");}if(uniquePermissions.length>0){const permissionLines=uniquePermissions.map(permission=>` <uses-permission android:name="${permission}" />`).join("\n");const managedBlock=` ${beginMarker}\n${permissionLines}\n ${endMarker}\n`;manifest=manifest.replace(/<application\b/,`${managedBlock} <application`);}fs.writeFileSync(manifestPath,manifest);}function findDependenciesBlockRange(gradleText,gradlePath){const headerMatch=gradleText.match(/^dependencies\s*\{/m);if(!headerMatch||headerMatch.index==null){throw new Error(`Could not find dependencies block in ${gradlePath}`);}const openBraceIndex=gradleText.indexOf("{",headerMatch.index);if(openBraceIndex===-1){throw new Error(`Malformed dependencies block in ${gradlePath}`);}let depth=0;for(let index=openBraceIndex;index<gradleText.length;index++){const ch=gradleText[index];if(ch==="{")depth++;if(ch==="}")depth--;if(depth===0){return{openBraceIndex,blockEnd:index};}}throw new Error(`Could not find end of dependencies block in ${gradlePath}`);}function updateGradleDependencies(gradlePath,selectedDependencies,allKnownPluginDependencies){const uniqueDependencies=asUniqueSorted(selectedDependencies);const knownDependencies=asUniqueSorted(allKnownPluginDependencies);let gradle=fs.readFileSync(gradlePath,"utf8");const{openBraceIndex,blockEnd}=findDependenciesBlockRange(gradle,gradlePath);let blockBody=gradle.slice(openBraceIndex+1,blockEnd);const beginMarker="// CATALYST_PLUGIN_DEPENDENCIES_START";const endMarker="// CATALYST_PLUGIN_DEPENDENCIES_END";const markerRegex=/[ \t]*\/\/ CATALYST_PLUGIN_DEPENDENCIES_START[\s\S]*?\/\/ CATALYST_PLUGIN_DEPENDENCIES_END\s*/g;blockBody=blockBody.replace(markerRegex,"");// Migration cleanup for legacy entries previously written without markers.
|
|
22
|
+
for(const dependency of knownDependencies){const escaped=escapeRegexLiteral(dependency);// nosemgrep: javascript.lang.security.audit.detect-non-literal-regexp.detect-non-literal-regexp - The dynamic value is escaped as a regex literal above.
|
|
23
|
+
const legacyRegex=new RegExp(`^[ \\t]*implementation\\("${escaped}"\\)\\s*\\n?`,"gm");blockBody=blockBody.replace(legacyRegex,"");}if(uniqueDependencies.length>0){const managedLines=uniqueDependencies.map(dependency=>` implementation("${dependency}")`).join("\n");blockBody=`${blockBody}\n ${beginMarker}\n${managedLines}\n ${endMarker}\n`;}gradle=`${gradle.slice(0,openBraceIndex+1)}${blockBody}${gradle.slice(blockEnd)}`;fs.writeFileSync(gradlePath,gradle);}function updateProguardKeepRules(proguardPath,selectedClassNames,allKnownPluginClassNames){const uniqueClassNames=asUniqueSorted(selectedClassNames);const knownClassNames=asUniqueSorted(allKnownPluginClassNames);let rules=fs.readFileSync(proguardPath,"utf8");const beginMarker="# CATALYST_PLUGIN_KEEP_START";const endMarker="# CATALYST_PLUGIN_KEEP_END";const markerRegex=/[ \t]*# CATALYST_PLUGIN_KEEP_START[\s\S]*?# CATALYST_PLUGIN_KEEP_END\s*/g;rules=rules.replace(markerRegex,"");for(const className of knownClassNames){const escaped=escapeRegexLiteral(className);// nosemgrep: javascript.lang.security.audit.detect-non-literal-regexp.detect-non-literal-regexp - The dynamic value is escaped as a regex literal above.
|
|
24
|
+
const legacyRegex=new RegExp(`^[ \\t]*-keep class ${escaped} \\{ \\*; \\}\\s*\\n?`,"gm");rules=rules.replace(legacyRegex,"");}if(uniqueClassNames.length>0){const keepLines=uniqueClassNames.map(className=>`-keep class ${className} { *; }`).join("\n");rules=`${rules.trimEnd()}\n\n${beginMarker}\n${keepLines}\n${endMarker}\n`;}fs.writeFileSync(proguardPath,rules);}function composeAndroidPlugins({corePluginsRoot,androidProjectPath,pluginConfig,log}){const discovered=discoverInternalPlugins(corePluginsRoot,log);validatePlugins(discovered);const enabled=selectPluginsByConfig(discovered,pluginConfig,log);const selected=selectPluginsForPlatform(enabled,"android",log);validateSelectedPluginSources(selected);// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed paths within the generated Android project.
|
|
25
|
+
const javaRoot=path.join(androidProjectPath,"app","src","main","java");// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed paths within the generated Android project.
|
|
26
|
+
const manifestPath=path.join(androidProjectPath,"app","src","main","AndroidManifest.xml");// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed paths within the generated Android project.
|
|
27
|
+
const gradlePath=path.join(androidProjectPath,"app","build.gradle.kts");// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - These are fixed paths within the generated Android project.
|
|
28
|
+
const proguardPath=path.join(androidProjectPath,"app","proguard-rules.pro");copyAndroidPluginSources(selected,javaRoot,log);copyPluginAssets(selected,androidProjectPath,log);generatePluginRegistryFiles(selected,javaRoot);updateAndroidManifestPermissions(manifestPath,selected.flatMap(plugin=>plugin.android?.permissions||[]),discovered.flatMap(plugin=>plugin.android?.permissions||[]));updateGradleDependencies(gradlePath,selected.flatMap(plugin=>plugin.android?.dependencies||[]),discovered.flatMap(plugin=>plugin.android?.dependencies||[]));updateProguardKeepRules(proguardPath,selected.map(plugin=>plugin.android?.className).filter(Boolean),discovered.map(plugin=>plugin.android?.className).filter(Boolean));log(`Plugin composition complete (${selected.length} enabled plugin(s))`,"success");return{pluginCount:selected.length,commandCount:selected.reduce((total,plugin)=>total+plugin.commands.length,0)};}module.exports={composeAndroidPlugins};
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";const fs=require("fs");const path=require("path");const{discoverInternalPlugins}=require("./internalPluginUtils.js");function isDir(dirPath){return fs.existsSync(dirPath)&&fs.statSync(dirPath).isDirectory();}function ensureDir(dirPath){if(!fs.existsSync(dirPath)){fs.mkdirSync(dirPath,{recursive:true});}}function sanitizeForPath(value){return value.replace(/[^a-zA-Z0-9_-]/g,"_");}function mustBeNonEmptyString(value,fieldName,sourcePath){if(typeof value!=="string"||!value.trim()){throw new Error(`Invalid '${fieldName}' in ${sourcePath}`);}return value.trim();}function asUniqueSorted(values){return[...new Set(values)].sort();}function isPlainObject(value){return!!value&&typeof value==="object"&&!Array.isArray(value);}function deepEqual(left,right){return JSON.stringify(left)===JSON.stringify(right);}function mergeStructuredValues(existing,incoming,fieldName){if(existing===undefined){return JSON.parse(JSON.stringify(incoming));}if(Array.isArray(existing)&&Array.isArray(incoming)){const merged=[];const seen=new Set();for(const value of[...existing,...incoming]){const key=JSON.stringify(value);if(seen.has(key)){continue;}seen.add(key);merged.push(value);}return merged;}if(isPlainObject(existing)&&isPlainObject(incoming)){const merged={...existing};for(const[key,value]of Object.entries(incoming)){merged[key]=mergeStructuredValues(merged[key],value,`${fieldName}.${key}`);}return merged;}if(deepEqual(existing,incoming)){return existing;}throw new Error(`Conflicting values for '${fieldName}' while composing selected iOS plugins`);}function dependencyKey(dependency){return dependency.url;}function requirementKey(dependency){return`${dependency.requirement.type}:${dependency.requirement.version}`;}function packageKey(dependency){return dependency.package;}function resolveManifestPath(pluginDir,relativePath,fieldName){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - Containment and realpath checks are enforced immediately below.
|
|
2
|
+
const resolvedPath=path.resolve(pluginDir,relativePath);// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - pluginDir comes from the internal plugin root.
|
|
3
|
+
const normalizedPluginDir=fs.realpathSync(path.resolve(pluginDir));if(resolvedPath!==normalizedPluginDir&&!resolvedPath.startsWith(`${normalizedPluginDir}${path.sep}`)){throw new Error(`'${fieldName}' must stay within plugin directory: ${relativePath}`);}if(!fs.existsSync(resolvedPath)){return resolvedPath;}const realResolvedPath=fs.realpathSync(resolvedPath);if(realResolvedPath!==normalizedPluginDir&&!realResolvedPath.startsWith(`${normalizedPluginDir}${path.sep}`)){throw new Error(`'${fieldName}' resolves outside plugin directory: ${relativePath}`);}return realResolvedPath;}function parsePluginToggleConfig(pluginConfig){if(pluginConfig==null){return{};}if(typeof pluginConfig!=="object"||Array.isArray(pluginConfig)){throw new Error("'WEBVIEW_CONFIG.plugins' must be an object with boolean values");}const toggles={};for(const[key,value]of Object.entries(pluginConfig)){const normalizedKey=mustBeNonEmptyString(key,"plugins.<key>","WEBVIEW_CONFIG");if(typeof value!=="boolean"){throw new Error(`'WEBVIEW_CONFIG.plugins.${normalizedKey}' must be boolean`);}toggles[normalizedKey]=value;}return toggles;}function selectPluginsByConfig(plugins,pluginConfig,log){const toggles=parsePluginToggleConfig(pluginConfig);const matchedKeys=new Set();const enabled=[];for(const plugin of plugins){const selectorKeys=plugin.configKey?[plugin.configKey,plugin.id]:[plugin.id];const matches=[];for(const key of selectorKeys){if(Object.prototype.hasOwnProperty.call(toggles,key)){matches.push({key,value:toggles[key]});matchedKeys.add(key);}}const uniqueValues=[...new Set(matches.map(entry=>entry.value))];if(uniqueValues.length>1){throw new Error(`Conflicting toggle values for plugin '${plugin.id}' across keys: ${matches.map(entry=>`${entry.key}=${entry.value}`).join(", ")}`);}const isEnabled=matches.length===0?false:matches[0].value;if(isEnabled){enabled.push(plugin);}else{log(`Plugin disabled by config: ${plugin.id}`,"info");}}const unknownKeys=Object.keys(toggles).filter(key=>!matchedKeys.has(key));if(unknownKeys.length>0){throw new Error(`Unknown plugin toggle key(s) in WEBVIEW_CONFIG.plugins: ${unknownKeys.join(", ")}`);}return enabled;}function validatePlugins(plugins){const pluginIds=new Set();const configKeys=new Set();const selectorKeys=new Map();const dependencies=new Map();for(const plugin of plugins){if(pluginIds.has(plugin.id)){throw new Error(`Duplicate plugin id detected: ${plugin.id}`);}pluginIds.add(plugin.id);if(plugin.configKey){if(configKeys.has(plugin.configKey)){throw new Error(`Duplicate configKey detected: ${plugin.configKey}`);}configKeys.add(plugin.configKey);}for(const[field,selector]of[["id",plugin.id],["configKey",plugin.configKey]]){if(!selector){continue;}const existing=selectorKeys.get(selector);if(existing&&existing.pluginId!==plugin.id){throw new Error(`Plugin selector collision for '${selector}': '${existing.pluginId}' (${existing.field}) conflicts with '${plugin.id}' (${field})`);}selectorKeys.set(selector,{pluginId:plugin.id,field});}if(new Set(plugin.commands).size!==plugin.commands.length){throw new Error(`Duplicate command(s) detected within plugin '${plugin.id}'`);}if(Object.prototype.hasOwnProperty.call(plugin.ios?.infoPlist||{},"CFBundleURLTypes")){throw new Error(`Plugin '${plugin.id}' must use 'ios.urlSchemes' instead of 'ios.infoPlist.CFBundleURLTypes'`);}if(Object.prototype.hasOwnProperty.call(plugin.ios?.infoPlist||{},"LSApplicationQueriesSchemes")){throw new Error(`Plugin '${plugin.id}' must use 'ios.querySchemes' instead of 'ios.infoPlist.LSApplicationQueriesSchemes'`);}for(const dependency of plugin.ios?.dependencies||[]){const existing=dependencies.get(dependencyKey(dependency));if(existing&&requirementKey(existing.dependency)!==requirementKey(dependency)){throw new Error(`iOS dependency version conflict for '${dependency.url}': '${existing.dependency.requirement.type}:${existing.dependency.requirement.version}' in '${existing.pluginId}', '${dependency.requirement.type}:${dependency.requirement.version}' in '${plugin.id}'`);}if(existing&&packageKey(existing.dependency)!==packageKey(dependency)){throw new Error(`iOS dependency package identity conflict for '${dependency.url}': '${existing.dependency.package}' in '${existing.pluginId}', '${dependency.package}' in '${plugin.id}'`);}if(!existing){dependencies.set(dependencyKey(dependency),{dependency,pluginId:plugin.id});}}for(const resourcePath of plugin.ios?.resources||[]){const resolvedPath=resolveManifestPath(plugin.pluginDir,resourcePath,`ios.resources for '${plugin.id}'`);if(!fs.existsSync(resolvedPath)){throw new Error(`iOS resource path not found for plugin '${plugin.id}': ${resourcePath}`);}}}}function selectPluginsForPlatform(plugins,platform,log){const selected=[];for(const plugin of plugins){if(plugin.platforms.includes(platform)){selected.push(plugin);continue;}log(`Plugin enabled but not supported on ${platform}: ${plugin.id}`,"info");}return selected;}function walkFiles(rootDir,predicate,results=[]){if(!isDir(rootDir)){return results;}for(const entry of fs.readdirSync(rootDir,{withFileTypes:true})){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - entry.name comes from readdirSync within the walked root.
|
|
4
|
+
const fullPath=path.join(rootDir,entry.name);if(entry.isDirectory()){walkFiles(fullPath,predicate,results);continue;}if(predicate(entry.name,fullPath)){results.push(fullPath);}}return results;}function resolvePluginClassSourcePath(plugin){const className=plugin.ios.className.split(".").pop();const candidateName=`${className}.swift`;const candidates=walkFiles(plugin.ios.sourceDir,name=>name===candidateName);return candidates[0]||null;}function validateSelectedPluginSources(plugins){for(const plugin of plugins){if(!plugin.ios){throw new Error(`iOS config missing for selected plugin '${plugin.id}'`);}if(!isDir(plugin.ios.sourceDir)){throw new Error(`iOS source directory missing for selected plugin '${plugin.id}'`);}const codeFiles=walkFiles(plugin.ios.sourceDir,name=>name.endsWith(".swift"));if(codeFiles.length===0){throw new Error(`No iOS source files found for selected plugin '${plugin.id}'`);}if(!resolvePluginClassSourcePath(plugin)){throw new Error(`Declared class '${plugin.ios.className}' for selected plugin '${plugin.id}' was not found under ${plugin.ios.sourceDir}`);}}}function collectIosDependencies(plugins){const dependenciesByUrl=new Map();for(const plugin of plugins){for(const dependency of plugin.ios?.dependencies||[]){const existing=dependenciesByUrl.get(dependency.url);if(!existing){dependenciesByUrl.set(dependency.url,{url:dependency.url,package:dependency.package,requirement:dependency.requirement,products:[...dependency.products]});continue;}if(requirementKey(existing)!==requirementKey(dependency)){throw new Error(`iOS dependency version conflict for '${dependency.url}' while composing selected plugins`);}if(packageKey(existing)!==packageKey(dependency)){throw new Error(`iOS dependency package identity conflict for '${dependency.url}' while composing selected plugins`);}existing.products=asUniqueSorted([...existing.products,...dependency.products]);}}return[...dependenciesByUrl.values()].sort((left,right)=>left.url.localeCompare(right.url));}function normalizeResourceRelativePath(plugin,absolutePath){const relativePath=path.relative(plugin.pluginDir,absolutePath);if(relativePath.startsWith(`ios${path.sep}resources${path.sep}`)){return relativePath.slice(`ios${path.sep}resources${path.sep}`.length);}if(relativePath.startsWith(`ios${path.sep}`)){return relativePath.slice(`ios${path.sep}`.length);}return relativePath;}function validateBundleRelativePath(pluginId,bundleRelativePath){const normalizedPath=path.posix.normalize(bundleRelativePath);const expectedPrefix=`PluginResources/${sanitizeForPath(pluginId)}`;if(path.posix.isAbsolute(normalizedPath)||normalizedPath===".."||normalizedPath.startsWith("../")){throw new Error(`Invalid bundled resource path for plugin '${pluginId}': ${bundleRelativePath}`);}if(normalizedPath!==expectedPrefix&&!normalizedPath.startsWith(`${expectedPrefix}/`)){throw new Error(`Bundled resource path escaped managed directory for plugin '${pluginId}': ${bundleRelativePath}`);}return normalizedPath;}function collectIosResources(plugins){const resources=[];for(const plugin of plugins){for(const resourcePath of plugin.ios?.resources||[]){const resolvedPath=resolveManifestPath(plugin.pluginDir,resourcePath,`ios.resources for '${plugin.id}'`);const entries=fs.statSync(resolvedPath).isDirectory()?walkFiles(resolvedPath,()=>true):[resolvedPath];for(const entryPath of entries){const normalizedRelativePath=normalizeResourceRelativePath(plugin,entryPath);const candidateBundleRelativePath=path// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The resulting path is checked by validateBundleRelativePath below.
|
|
5
|
+
.join("PluginResources",sanitizeForPath(plugin.id),normalizedRelativePath).split(path.sep).join("/");const bundleRelativePath=validateBundleRelativePath(plugin.id,candidateBundleRelativePath);resources.push({pluginId:plugin.id,sourcePath:entryPath,bundleRelativePath});}}}return resources.sort((left,right)=>left.bundleRelativePath.localeCompare(right.bundleRelativePath));}function collectIosInfoPlist(plugins){let infoPlist={};for(const plugin of plugins){infoPlist=mergeStructuredValues(infoPlist,plugin.ios?.infoPlist||{},`ios.infoPlist for '${plugin.id}'`);}return infoPlist;}function collectIosEntitlements(plugins){let entitlements={};for(const plugin of plugins){entitlements=mergeStructuredValues(entitlements,plugin.ios?.entitlements||{},`ios.entitlements for '${plugin.id}'`);}return entitlements;}function collectIosUrlSchemes(plugins){const entries=[];for(const plugin of plugins){for(const entry of plugin.ios?.urlSchemes||[]){entries.push({name:entry.name||plugin.id,schemes:asUniqueSorted(entry.schemes)});}}return entries;}function collectIosQuerySchemes(plugins){return asUniqueSorted(plugins.flatMap(plugin=>plugin.ios?.querySchemes||[]));}function copyIosPluginSources(plugins,iosProjectPath,log){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The destination path components are fixed.
|
|
6
|
+
const internalRoot=path.join(iosProjectPath,"Sources","Core","Plugins","Internal");fs.rmSync(internalRoot,{recursive:true,force:true});ensureDir(internalRoot);let copiedCount=0;for(const plugin of plugins){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - plugin.id is sanitized before being used as a path component.
|
|
7
|
+
const pluginOutputDir=path.join(internalRoot,sanitizeForPath(plugin.id));const codeFiles=walkFiles(plugin.ios.sourceDir,name=>name.endsWith(".swift"));for(const sourcePath of codeFiles){// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - sourcePath is produced by walking plugin.ios.sourceDir.
|
|
8
|
+
const targetPath=path.join(pluginOutputDir,path.relative(plugin.ios.sourceDir,sourcePath));ensureDir(path.dirname(targetPath));fs.copyFileSync(sourcePath,targetPath);copiedCount++;}}log(`Copied ${copiedCount} iOS plugin source file(s)`,"info");}function formatSwiftDictionary(entries,emptyLiteral="[:]"){return entries.length===0?emptyLiteral:`[\n${entries.join(",\n")}\n ]`;}function generatePluginRegistryFiles(plugins,iosProjectPath){const pluginFactories={};const pluginToCommands={};for(const plugin of plugins){pluginFactories[plugin.id]=plugin.ios.className;pluginToCommands[plugin.id]=asUniqueSorted(plugin.commands);}const factoryEntries=Object.keys(pluginFactories).sort().map(pluginId=>` ${JSON.stringify(pluginId)}: { ${pluginFactories[pluginId]}() }`);const commandEntries=Object.keys(pluginToCommands).sort().map(pluginId=>{const commands=pluginToCommands[pluginId];const commandSet=commands.length?`Set([${commands.map(value=>JSON.stringify(value)).join(", ")}])`:"[]";return` ${JSON.stringify(pluginId)}: ${commandSet}`;});const indexContent=`import Foundation
|
|
9
|
+
|
|
10
|
+
enum GeneratedPluginIndex {
|
|
11
|
+
static let pluginFactories: [String: () -> CatalystPlugin] = ${formatSwiftDictionary(factoryEntries)}
|
|
12
|
+
static let pluginToCommands: [String: Set<String>] = ${formatSwiftDictionary(commandEntries)}
|
|
13
|
+
}
|
|
14
|
+
`;// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The destination path components are fixed.
|
|
15
|
+
const pluginsDir=path.join(iosProjectPath,"Sources","Core","Plugins");ensureDir(pluginsDir);// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal - The generated filename is fixed.
|
|
16
|
+
fs.writeFileSync(path.join(pluginsDir,"GeneratedPluginIndex.swift"),indexContent);}function composeIosPlugins({corePluginsRoot,iosProjectPath,pluginConfig,log}){const discovered=discoverInternalPlugins(corePluginsRoot,log);validatePlugins(discovered);const enabled=selectPluginsByConfig(discovered,pluginConfig,log);const selected=selectPluginsForPlatform(enabled,"ios",log);validateSelectedPluginSources(selected);const iosDependencies=collectIosDependencies(selected);const infoPlist=collectIosInfoPlist(selected);const urlSchemes=collectIosUrlSchemes(selected);const querySchemes=collectIosQuerySchemes(selected);const entitlements=collectIosEntitlements(selected);const resources=collectIosResources(selected);copyIosPluginSources(selected,iosProjectPath,log);generatePluginRegistryFiles(selected,iosProjectPath);log(`Plugin composition complete (${selected.length} enabled iOS plugin(s))`,"success");return{pluginCount:selected.length,commandCount:selected.reduce((total,plugin)=>total+plugin.commands.length,0),iosDependencies,infoPlist,urlSchemes,querySchemes,entitlements,resources};}module.exports={composeIosPlugins};
|
package/dist/otel.js
CHANGED
|
@@ -1,4 +1,72 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;exports.withObservability=withObservability;exports.withSyncObservability=withSyncObservability;function _interopRequireWildcard(e,t){if("function"==typeof WeakMap)var r=new WeakMap(),n=new WeakMap();return(_interopRequireWildcard=function(e,t){if(!t&&e&&e.__esModule)return e;var o,i,f={__proto__:null,default:e};if(null===e||"object"!=typeof e&&"function"!=typeof e)return f;if(o=t?n:r){if(o.has(e))return o.get(e);o.set(e,f);}for(const t in e)"default"!==t&&{}.hasOwnProperty.call(e,t)&&((i=(o=Object.defineProperty)&&Object.getOwnPropertyDescriptor(e,t))&&(i.get||i.set)?o(f,t,i):f[t]=e[t]);return f;})(e,t);}// OpenTelemetry is an OPT-IN feature. Nothing from "@opentelemetry/*" is
|
|
2
|
+
// imported at module-eval time on purpose: the packages are declared as
|
|
3
|
+
// (optional) peerDependencies and may not be installed in the consuming app.
|
|
4
|
+
//
|
|
5
|
+
// All OTel packages are loaded lazily via dynamic import() inside init(), and
|
|
6
|
+
// only when OTEL_ENABLE === "true". Consequences:
|
|
7
|
+
// - Apps that keep OTEL disabled don't need the packages installed.
|
|
8
|
+
// - Bundlers don't pull the packages into the static import graph, so
|
|
9
|
+
// `import "catalyst-core/otel"` no longer forces them to resolve
|
|
10
|
+
// "@opentelemetry/exporter-trace-otlp-http" & friends at build time.
|
|
11
|
+
// (Pair this with marking "@opentelemetry/*" external in the bundler so the
|
|
12
|
+
// dynamic import() chunk isn't resolved at build time either — see the SSR
|
|
13
|
+
// webpack configs under src/webpack.)
|
|
14
|
+
// Set once by init() (when enabled) to the loaded "@opentelemetry/api" module.
|
|
15
|
+
// The wrappers below read it lazily so they never need a static OTel import.
|
|
16
|
+
let _otelApi=null;const isOtelEnabled=()=>process.env.OTEL_ENABLE==="true";async function init(config={}){if(!isOtelEnabled()){return{sdk:null,meter:null};}const{serviceName="catalyst-server",serviceVersion="1.0.0",environment="development",traceUrl="http://localhost:4317",metricUrl="http://localhost:4317",traceProtocol="grpc",// "grpc" or "http"
|
|
17
|
+
metricProtocol,// "grpc" or "http" - if not provided, metrics will be disabled
|
|
18
|
+
traceHeaders={},metricHeaders={},batchProcessorConfig={},exportIntervalMillis=10000,instrumentations,samplingRate=1.0,grpcCredentials}=config;try{// Lazy-load every OpenTelemetry package. These dynamic imports run only
|
|
19
|
+
// when OTEL_ENABLE=true, so the packages are required at runtime solely
|
|
20
|
+
// for opted-in deployments.
|
|
21
|
+
const[otelApi,{NodeSDK},{resourceFromAttributes},{BatchSpanProcessor,TraceIdRatioBasedSampler,ParentBasedSampler},{PeriodicExportingMetricReader},{OTLPTraceExporter},{OTLPMetricExporter},{getNodeAutoInstrumentations},{OTLPTraceExporter:OTLPTraceExporterHTTP},{OTLPMetricExporter:OTLPMetricExporterHTTP},{ATTR_SERVICE_NAME,ATTR_SERVICE_VERSION,ATTR_DEPLOYMENT_ENVIRONMENT}]=await Promise.all([Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/api"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/sdk-node"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/resources"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/sdk-trace-node"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/sdk-metrics"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/exporter-trace-otlp-grpc"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/exporter-metrics-otlp-grpc"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/auto-instrumentations-node"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/exporter-trace-otlp-http"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/exporter-metrics-otlp-http"))),Promise.resolve().then(()=>_interopRequireWildcard(require("@opentelemetry/semantic-conventions")))]);// Enables the withObservability / withSyncObservability wrappers.
|
|
22
|
+
_otelApi=otelApi;const traceExporters={OTLPTraceExporter,OTLPTraceExporterHTTP};const metricExporters={OTLPMetricExporter,OTLPMetricExporterHTTP};const otlpTraceExporter=createTraceExporter(traceExporters,traceProtocol,traceUrl,traceHeaders,grpcCredentials);// Create metric exporter only if metricProtocol is specified
|
|
23
|
+
let metricReader=null;if(metricProtocol){const otlpMetricExporter=createMetricExporter(metricExporters,metricProtocol,metricUrl,metricHeaders,grpcCredentials);metricReader=new PeriodicExportingMetricReader({exporter:otlpMetricExporter,exportIntervalMillis});}const sampler=new ParentBasedSampler({root:new TraceIdRatioBasedSampler(samplingRate)});const sdkConfig={resource:resourceFromAttributes({[ATTR_SERVICE_NAME]:serviceName,[ATTR_SERVICE_VERSION]:serviceVersion,[ATTR_DEPLOYMENT_ENVIRONMENT]:environment}),spanProcessor:new BatchSpanProcessor(otlpTraceExporter,batchProcessorConfig),instrumentations:instrumentations??[getNodeAutoInstrumentations()],sampler};// Add metric reader only if metrics are enabled
|
|
24
|
+
if(metricReader){sdkConfig.metricReader=metricReader;}const sdk=new NodeSDK(sdkConfig);sdk.start();logger.info("✅ OpenTelemetry started successfully");// Initialize custom metrics only if metrics are enabled
|
|
25
|
+
let meter=null;if(metricProtocol){meter=initializeCustomMetrics(otelApi,serviceName,serviceVersion);}const gracefulShutdown=signal=>{logger.info(`📡 Received ${signal}, shutting down OpenTelemetry gracefully...`);sdk.shutdown().then(()=>logger.info("✅ OpenTelemetry shutdown completed")).catch(error=>{logger.error("❌ Error terminating OpenTelemetry:",error);}).finally(()=>process.exit());};process.on("SIGTERM",()=>gracefulShutdown("SIGTERM"));process.on("SIGINT",()=>gracefulShutdown("SIGINT"));return{sdk,meter};}catch(error){logger.error("❌ Failed to initialize OpenTelemetry:",error);throw error;}}/**
|
|
26
|
+
* Creates a trace exporter based on the specified protocol
|
|
27
|
+
* @param {object} exporters - Lazily-loaded exporter constructors { OTLPTraceExporter, OTLPTraceExporterHTTP }
|
|
28
|
+
* @param {string} protocol - "grpc" or "http"
|
|
29
|
+
* @param {string} url - Exporter endpoint URL
|
|
30
|
+
* @param {object} headers - Headers to include in requests
|
|
31
|
+
* @param {Function} [grpcCredentials] - gRPC Credentials (optional)
|
|
32
|
+
* @returns {object} Configured trace exporter
|
|
33
|
+
*/function createTraceExporter(exporters,protocol,url,headers={},grpcCredentials){const{OTLPTraceExporter,OTLPTraceExporterHTTP}=exporters;if(protocol.toLowerCase()==="http"){logger.info(`📡 Creating HTTP trace exporter for URL: ${url}`);return new OTLPTraceExporterHTTP({url:url,headers:headers});}else if(protocol.toLowerCase()==="grpc"){logger.info(`📡 Creating gRPC trace exporter for URL: ${url}`);return new OTLPTraceExporter({url:url,headers:headers,credentials:grpcCredentials});}else{throw new Error(`❌ Unsupported trace protocol: ${protocol}. Supported protocols are "grpc" and "http"`);}}/**
|
|
34
|
+
* Creates a metric exporter based on the specified protocol
|
|
35
|
+
* @param {object} exporters - Lazily-loaded exporter constructors { OTLPMetricExporter, OTLPMetricExporterHTTP }
|
|
36
|
+
* @param {string} protocol - "grpc" or "http"
|
|
37
|
+
* @param {string} url - Exporter endpoint URL
|
|
38
|
+
* @param {object} headers - Headers to include in requests
|
|
39
|
+
* @param {Function} [grpcCredentials] - gRPC Credentials (optional)
|
|
40
|
+
* @returns {object} Configured metric exporter
|
|
41
|
+
*/function createMetricExporter(exporters,protocol,url,headers={},grpcCredentials){const{OTLPMetricExporter,OTLPMetricExporterHTTP}=exporters;if(protocol.toLowerCase()==="http"){logger.info(`📊 Creating HTTP metric exporter for URL: ${url}`);return new OTLPMetricExporterHTTP({url:url,headers:headers});}else if(protocol.toLowerCase()==="grpc"){logger.info(`📊 Creating gRPC metric exporter for URL: ${url}`);return new OTLPMetricExporter({url:url,headers:headers,credentials:grpcCredentials});}else{throw new Error(`❌ Unsupported metric protocol: ${protocol}. Supported protocols are "grpc" and "http"`);}}/**
|
|
42
|
+
* @param {object} otelApi - The loaded "@opentelemetry/api" module
|
|
43
|
+
*/function initializeCustomMetrics(otelApi,serviceName,serviceVersion){let customMetrics={};const meter=otelApi.metrics.getMeter(serviceName,serviceVersion);// CPU usage gauge
|
|
2
44
|
customMetrics.cpuUsage=meter.createObservableGauge("process_cpu_usage_percent",{description:"Current CPU usage percentage"});// Memory usage gauges
|
|
3
45
|
customMetrics.memoryUsage=meter.createObservableGauge("process_memory_usage_bytes",{description:"Current memory usage in bytes",unit:"bytes"});customMetrics.memoryHeapUsed=meter.createObservableGauge("process_memory_heap_used_bytes",{description:"Current heap memory used in bytes",unit:"bytes"});customMetrics.memoryHeapTotal=meter.createObservableGauge("process_memory_heap_total_bytes",{description:"Current heap memory total in bytes",unit:"bytes"});let lastCpuUsage=process.cpuUsage();let lastMeasureTime=process.hrtime.bigint();customMetrics.cpuUsage.addCallback(result=>{const currentCpuUsage=process.cpuUsage(lastCpuUsage);const currentTime=process.hrtime.bigint();const timeDiff=Number(currentTime-lastMeasureTime)/1000000;// Convert to milliseconds
|
|
4
|
-
const cpuPercent=(currentCpuUsage.user+currentCpuUsage.system)/1000/timeDiff*100;result.observe(cpuPercent);lastCpuUsage=process.cpuUsage();lastMeasureTime=currentTime;});customMetrics.memoryUsage.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.rss,{type:"rss"});result.observe(memUsage.external,{type:"external"});result.observe(memUsage.arrayBuffers,{type:"arrayBuffers"});});customMetrics.memoryHeapUsed.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.heapUsed);});customMetrics.memoryHeapTotal.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.heapTotal);});return meter;}
|
|
46
|
+
const cpuPercent=(currentCpuUsage.user+currentCpuUsage.system)/1000/timeDiff*100;result.observe(cpuPercent);lastCpuUsage=process.cpuUsage();lastMeasureTime=currentTime;});customMetrics.memoryUsage.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.rss,{type:"rss"});result.observe(memUsage.external,{type:"external"});result.observe(memUsage.arrayBuffers,{type:"arrayBuffers"});});customMetrics.memoryHeapUsed.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.heapUsed);});customMetrics.memoryHeapTotal.addCallback(result=>{const memUsage=process.memoryUsage();result.observe(memUsage.heapTotal);});return meter;}/**
|
|
47
|
+
* Wraps a synchronous function and measures total execution time.
|
|
48
|
+
* Creates a single OpenTelemetry span per function call.
|
|
49
|
+
* Use this instead of withObservability when the wrapped function is synchronous,
|
|
50
|
+
* so the return type and call sites remain unchanged.
|
|
51
|
+
*
|
|
52
|
+
* When OTEL is disabled the original function is returned unchanged, so there is
|
|
53
|
+
* zero overhead and no dependency on any @opentelemetry/* package.
|
|
54
|
+
*
|
|
55
|
+
* @param {string} serviceName - The name of the service
|
|
56
|
+
* @param {Function} fn - The synchronous function to wrap
|
|
57
|
+
* @param {string} name - Span name (optional)
|
|
58
|
+
* @returns {Function} Wrapped function (still synchronous)
|
|
59
|
+
*/function withSyncObservability(serviceName,fn,name){if(!isOtelEnabled())return fn;const spanName=name||fn.name||"anonymousFunction";return function(...args){// init() may not have populated the API yet — run untraced rather than throw.
|
|
60
|
+
const api=_otelApi;if(!api)return fn(...args);const tracer=api.trace.getTracer(serviceName);return tracer.startActiveSpan(spanName,span=>{try{return fn(...args);}catch(err){span.recordException(err);span.setStatus({code:2,message:err.message});throw err;}finally{span.end();}});};}/**
|
|
61
|
+
* Wraps a function (sync or async) and measures total execution time.
|
|
62
|
+
* Creates a single OpenTelemetry span per function call.
|
|
63
|
+
*
|
|
64
|
+
* When OTEL is disabled the original function is returned unchanged, so there is
|
|
65
|
+
* zero overhead and no dependency on any @opentelemetry/* package.
|
|
66
|
+
*
|
|
67
|
+
* @param {string} serviceName - The name of the service
|
|
68
|
+
* @param {Function} fn - The function to wrap
|
|
69
|
+
* @param {string} name - Span name (optional)
|
|
70
|
+
* @returns {Function} Wrapped function
|
|
71
|
+
*/function withObservability(serviceName,fn,name){if(!isOtelEnabled())return fn;const spanName=name||fn.name||"anonymousFunction";return async function(...args){// init() may not have populated the API yet — run untraced rather than throw.
|
|
72
|
+
const api=_otelApi;if(!api)return fn(...args);const tracer=api.trace.getTracer(serviceName);return tracer.startActiveSpan(spanName,async span=>{try{const result=await fn(...args);return result;}catch(err){span.recordException(err);span.setStatus({code:2,message:err.message});throw err;}finally{span.end();}});};}var _default=exports.default={init,withObservability,withSyncObservability};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";const fs=require("fs");const path=require("path");const readline=require("node:readline");const{bold,cyan,dim,green,red,yellow}=require("picocolors");const{discoverInternalPlugins,resolveInternalPluginsRoot}=require("../native/internalPluginUtils.js");const CONFIG_PATH=path.join(process.cwd(),"config","config.json");const TICK="x";function detectIndent(rawConfig){const indentMatch=rawConfig.match(/\n([ \t]+)"/);return indentMatch?indentMatch[1]:" ";}function readJsonFile(filePath,label){if(!fs.existsSync(filePath)){throw new Error(`${label} not found at ${filePath}`);}const raw=fs.readFileSync(filePath,"utf8");try{return{raw,json:JSON.parse(raw)};}catch(error){throw new Error(`Invalid JSON in ${filePath}: ${error.message}`);}}function ensureObject(value,label){if(value==null){return{};}if(typeof value!=="object"||Array.isArray(value)){throw new Error(`${label} must be an object`);}return value;}function splitPluginConfig(pluginConfig,plugins){const selectorToPlugin=new Map();const matchesByConfigKey=new Map();const staleToggleKeys=[];plugins.forEach(plugin=>{selectorToPlugin.set(plugin.configKey,plugin);selectorToPlugin.set(plugin.id,plugin);});for(const[key,value]of Object.entries(pluginConfig)){if(typeof value!=="boolean"){throw new Error(`WEBVIEW_CONFIG.plugins.${key} must be boolean`);}const plugin=selectorToPlugin.get(key);if(!plugin){staleToggleKeys.push(key);continue;}const matches=matchesByConfigKey.get(plugin.configKey)||[];matches.push({key,value,plugin});matchesByConfigKey.set(plugin.configKey,matches);}const knownToggles={};for(const plugin of plugins){const matches=matchesByConfigKey.get(plugin.configKey)||[];const uniqueValues=[...new Set(matches.map(entry=>entry.value))];if(uniqueValues.length>1){throw new Error(`Conflicting toggle values for plugin '${plugin.id}' across keys: ${matches.map(entry=>`${entry.key}=${entry.value}`).join(", ")}`);}if(matches.length>0){knownToggles[plugin.configKey]=matches[0].value;}}return{knownToggles,staleToggleKeys};}function createSession({configPath,rawConfig,config,plugins,pluginsRoot}){const webviewConfig=config.WEBVIEW_CONFIG==null?{}:ensureObject(config.WEBVIEW_CONFIG,"WEBVIEW_CONFIG");const pluginConfig=ensureObject(webviewConfig.plugins,"WEBVIEW_CONFIG.plugins");const{knownToggles,staleToggleKeys}=splitPluginConfig(pluginConfig,plugins);return{configPath,config,indent:detectIndent(rawConfig),pluginsRoot,plugins:plugins.map(plugin=>({...plugin,enabled:knownToggles[plugin.configKey]??false})),staleToggleKeys,notice:"",selectedIndex:0};}function buildPersistedPluginConfig(session){const nextConfig={};for(const plugin of session.plugins){nextConfig[plugin.configKey]=plugin.enabled;}return nextConfig;}function renderSession(session){if(typeof console.clear==="function"){console.clear();}console.log(bold("Catalyst Internal Plugins"));console.log(dim(`Config: ${session.configPath}`));console.log(dim(`Catalog: ${session.pluginsRoot}`));console.log("");if(session.staleToggleKeys.length>0){console.log(yellow(`Stale plugin toggle keys will be removed on save: ${session.staleToggleKeys.join(", ")}`));console.log("");}session.plugins.forEach((plugin,index)=>{const isSelected=index===session.selectedIndex;const pointer=isSelected?cyan(">"):" ";const checkbox=plugin.enabled?green(`[${TICK}]`):dim("[ ]");const title=isSelected?bold(plugin.displayName):plugin.displayName;const meta=dim(`(${plugin.configKey})`);console.log(`${pointer} ${checkbox} ${title} ${meta}`);console.log(` ${plugin.description}`);console.log(dim(` category: ${plugin.category} | platforms: ${plugin.platforms.join(", ")}`));console.log(dim(` id: ${plugin.id}`));console.log("");});console.log("Controls: up/down move, space or enter toggle, a enable all, n disable all, s save, q quit");if(session.notice){console.log("");console.log(session.notice);}}function saveSession(session){if(session.config.WEBVIEW_CONFIG==null){session.config.WEBVIEW_CONFIG={};}session.config.WEBVIEW_CONFIG.plugins=buildPersistedPluginConfig(session);fs.writeFileSync(session.configPath,`${JSON.stringify(session.config,null,session.indent)}\n`);}async function runInteractiveSession(session){if(!process.stdin.isTTY||!process.stdout.isTTY){renderSession(session);console.log("");console.log(yellow("Interactive mode requires a TTY. Re-run this command in a terminal session."));return;}const rl=readline.createInterface({input:process.stdin,output:process.stdout});readline.emitKeypressEvents(process.stdin,rl);if(typeof process.stdin.setRawMode==="function"){process.stdin.setRawMode(true);}try{renderSession(session);await new Promise(resolve=>{const finish=()=>{process.stdin.off("keypress",onKeypress);resolve();};const onKeypress=(_,key={})=>{if(key.ctrl&&key.name==="c"){session.notice=yellow("Exited without saving.");renderSession(session);finish();return;}if(key.name==="up"){session.selectedIndex=session.selectedIndex===0?session.plugins.length-1:session.selectedIndex-1;session.notice="";renderSession(session);return;}if(key.name==="down"){session.selectedIndex=session.selectedIndex===session.plugins.length-1?0:session.selectedIndex+1;session.notice="";renderSession(session);return;}if(key.name==="space"||key.name==="return"){const plugin=session.plugins[session.selectedIndex];plugin.enabled=!plugin.enabled;session.notice=green(`${plugin.displayName} is now ${plugin.enabled?"enabled":"disabled"} in the pending config.`);renderSession(session);return;}if(key.name==="a"){session.plugins.forEach(plugin=>{plugin.enabled=true;});session.notice=green("Enabled all discovered plugins.");renderSession(session);return;}if(key.name==="n"){session.plugins.forEach(plugin=>{plugin.enabled=false;});session.notice=yellow("Disabled all discovered plugins.");renderSession(session);return;}if(key.name==="s"){saveSession(session);session.notice=session.staleToggleKeys.length>0?green(`Saved plugin toggles to config/config.json and removed stale keys: ${session.staleToggleKeys.join(", ")}.`):green("Saved plugin toggles to config/config.json.");renderSession(session);finish();return;}if(key.name==="q"){session.notice=yellow("Exited without saving.");renderSession(session);finish();return;}session.notice=red(`Unsupported key: ${key.name||"unknown"}`);renderSession(session);};process.stdin.on("keypress",onKeypress);});}finally{if(typeof process.stdin.setRawMode==="function"){process.stdin.setRawMode(false);}rl.close();}}async function main(){const{raw:rawConfig,json:config}=readJsonFile(CONFIG_PATH,"App config");const catalystCoreRoot=path.dirname(require.resolve("catalyst-core/package.json"));const pluginsRoot=resolveInternalPluginsRoot(catalystCoreRoot);const plugins=discoverInternalPlugins(pluginsRoot);if(plugins.length===0){console.log(yellow(`No internal plugins were discovered at ${pluginsRoot}`));return;}const session=createSession({configPath:CONFIG_PATH,rawConfig,config,plugins,pluginsRoot});await runInteractiveSession(session);}main().catch(error=>{console.error(red(`Plugin manager failed: ${error.message}`));process.exit(1);});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.cacheAndFetchAssets=void 0;exports.cacheCSS=cacheCSS;exports.cachePreloadJSLinks=cachePreloadJSLinks;exports.default=
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.cacheAndFetchAssets=void 0;exports.cacheCSS=cacheCSS;exports.cachePreloadJSLinks=cachePreloadJSLinks;exports.default=void 0;var _path=_interopRequireDefault(require("path"));var _fs=_interopRequireDefault(require("fs"));var _otel=require("../../otel");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e};}const SSR_SERVICE=process.env.SERVICE_NAME||`pwa-${process.env.APPLICATION}-node-server-otel`;function cachePreloadJSLinks(key,data){if(!process.preloadJSLinkCache){process.preloadJSLinkCache={};}let preloadJSLinks=[];if(Array.isArray(data)){try{preloadJSLinks=data.filter(asset=>asset?.props?.as==="script");}catch(error){logger.error("Error in filtering preloaded JS:"+error);}}process.preloadJSLinkCache[key]=preloadJSLinks;}/**
|
|
2
2
|
* Stores css chunks styles into cache in string format
|
|
3
3
|
* @param {string} key - router path
|
|
4
4
|
* @param {object} data - css elements array extracted through loadable chunk extracter
|
|
@@ -14,7 +14,7 @@ process.cssCache[key]={pageCss,listOfCachedAssets};}return pageCss;}/**
|
|
|
14
14
|
* stores css and js in cache
|
|
15
15
|
* @param {object} res - response object
|
|
16
16
|
* @param {string} route - route path
|
|
17
|
-
*/
|
|
17
|
+
*/var _default=exports.default=(0,_otel.withSyncObservability)(SSR_SERVICE,function extractAssets(res,route){try{const requestPath=route.path;const cachedCss=fetchCachedCSS(requestPath);const cachedPreloadJSLinks=fetchPreloadJSLinkCache(requestPath);if(cachedCss||cachedPreloadJSLinks){res.locals.pageCss=cachedCss;res.locals.preloadJSLinks=cachedPreloadJSLinks;return;}logger.info({message:"Cache Missed",uri:requestPath});}catch(error){logger.error("Error in extracting assets:"+error);}},"extractAssets");const cacheAndFetchAssets=exports.cacheAndFetchAssets=(0,_otel.withSyncObservability)(SSR_SERVICE,function cacheAndFetchAssets({webExtractor,res,isBot}){// For bot first fold css and js would become complete page css and js
|
|
18
18
|
let firstFoldCss="";let firstFoldJS="";const isProd=process.env.NODE_ENV==="production";const{routePath,preloadJSLinks}=res.locals;const linkElements=webExtractor.getLinkElements();// We want to cache/or check for update css on every call
|
|
19
19
|
// We want to extract script tags for every call that will get added to body.
|
|
20
20
|
// Their corresponding preloaded link script tags are already present in head.
|
|
@@ -24,4 +24,4 @@ firstFoldJS=webExtractor.getScriptTags();}// This block will run for the first t
|
|
|
24
24
|
// firstFoldCss -> Inline css gets injected in body only for the first render
|
|
25
25
|
if(!isProd||isBot||routePath&&!preloadJSLinks){// For production, we inject link tags with preload/prefetch using getLinkElements and inlining them via file reads
|
|
26
26
|
// For local, given we have assets in memory we dont read from file rather directly inject via link elements returned without preload/prefetch
|
|
27
|
-
!isBot&&cachePreloadJSLinks(routePath,linkElements);}return{firstFoldCss,firstFoldJS};}
|
|
27
|
+
!isBot&&cachePreloadJSLinks(routePath,linkElements);}return{firstFoldCss,firstFoldJS};},"cacheAndFetchAssets");
|