cordova-plugin-mserviceinterface-2.0 1.0.92 → 1.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.92",
+  "version": "1.0.94",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.92">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.94">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>

package/src/android/mInterface.java

@@ -343,7 +343,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                             baseDir = cordova.getActivity().getExternalFilesDir(null);
                             if (baseDir == null) baseDir = cordova.getActivity().getFilesDir();
 
-                            kind = p.optString("kind", "controller"); // controller|label|rule|template|ui
+                            kind = p.optString("configType", "controller"); // controller|label|rule|template|ui
                             id = p.optString("id", "");
                             clientId = p.optString("clientId", "");
                             countryCode = p.optString("countryCode", "");
@@ -438,7 +438,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
 
                             if (found) {
                                 out = new org.json.JSONObject();
-                                out.put("kind", kind);
+                                out.put("configType", kind);
                                 out.put("srcKey", resolvedKey);
                                 out.put("ext", usedExt);
                                 out.put("path", absPath);

package/src/ios/mInterface.h

@@ -43,6 +43,7 @@
     UIInterfaceOrientation _lastOrientation;
 }
 @property(strong) NSString* callbackID;
+- (void)GetConfigCascade:(CDVInvokedUrlCommand*)command;
 - (void)ScanBarCode:(CDVInvokedUrlCommand*)command;
 - (void)ScanQRCode:(CDVInvokedUrlCommand*)command;
 - (void)viewRoute:(CDVInvokedUrlCommand*)command;

package/src/ios/mInterface.m

@@ -13,6 +13,7 @@
 #import "OneSignalPush.h"
 #import <objc/runtime.h>
 #import <AVFoundation/AVFoundation.h>
+#import <Cordova/CDV.h>
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 @import UserNotifications;
 #endif
@@ -20,7 +21,14 @@
 #ifndef NSFoundationVersionNumber_iOS_9_x_Max
 #define NSFoundationVersionNumber_iOS_9_x_Max 1299
 #endif
-
+/*** TOP-LEVEL helper (NOT inside @implementation mInterface) ***/
+@interface ResolveResult : NSObject
+@property (nonatomic, strong) NSURL *fileURL;
+@property (nonatomic, copy)   NSString *ext;
+@end
+ 
+@implementation ResolveResult
+@end
 @implementation mInterface
 @synthesize btnGallery;
 @synthesize indicator = _indicator;
@@ -29,6 +37,333 @@
 @synthesize callbackID;
 
 
+
+- (void)GetConfigCascade:(CDVInvokedUrlCommand*)command {
+    // Declarations first
+    
+
+    @try {
+        [self.commandDelegate runInBackground:^{
+            @try {
+                // --- parse input
+                NSDictionary *p = (command.arguments.count > 0 && [command.arguments[0] isKindOfClass:[NSDictionary class]]) ? command.arguments[0] : @{};
+                NSString *kind       = p[@"configType"] ?: @"controller";
+                NSString *identifier  = p[@"id"] ?: @"";
+                NSString *clientId    = p[@"clientId"] ?: @"";
+                NSString *countryCode = p[@"countryCode"] ?: @"";
+                NSString *clientGroup = p[@"clientGroup"] ?: @"";
+                NSString *vertical    = p[@"vertical"] ?: @"";
+                NSString *solution    = p[@"solution"] ?: @"";
+                NSString *scope       = p[@"scope"] ?: kind;
+                NSString *transNo     = p[@"transNo"] ?: @"";
+                NSString *rootPrefix  = p[@"root"] ?: @"";
+                NSString *localeId    = p[@"localeId"] ?: @"";
+
+                // --- base dir
+                NSFileManager *fm = [NSFileManager defaultManager];
+                NSURL *baseDir = [[fm URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
+                if (!baseDir) baseDir = [[fm URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] firstObject];
+
+                // --- roots
+                NSArray<NSURL *> *roots = [self buildRootsWithBase:baseDir
+                                       rootPrefix:rootPrefix
+                                      clientGroup:clientGroup
+                                         clientId:clientId
+                                      countryCode:countryCode];
+
+                // --- keys (label is locale-aware)
+                NSMutableArray<NSString *> *keys = [NSMutableArray array];
+                if ([kind isEqualToString:@"label"] && localeId.length > 0) {
+                    if (clientId.length && countryCode.length) [keys addObject:[NSString stringWithFormat:@"%@_%@_%@_%@", identifier, clientId, countryCode, localeId]];
+                    if (clientId.length)                      [keys addObject:[NSString stringWithFormat:@"%@_%@_%@", identifier, clientId, localeId]];
+                    if (clientGroup.length)                   [keys addObject:[NSString stringWithFormat:@"%@_%@_%@", identifier, clientGroup, localeId]];
+                    if (vertical.length)                      [keys addObject:[NSString stringWithFormat:@"%@_%@_%@", identifier, vertical, localeId]];
+                    if (solution.length)                      [keys addObject:[NSString stringWithFormat:@"%@_%@_%@", identifier, solution, localeId]];
+                                                                   [keys addObject:[NSString stringWithFormat:@"%@_%@", identifier, localeId]];
+                } else {
+                    if (clientId.length && countryCode.length) [keys addObject:[NSString stringWithFormat:@"%@_%@_%@", identifier, clientId, countryCode]];
+                    if (clientId.length)                       [keys addObject:[NSString stringWithFormat:@"%@_%@", identifier, clientId]];
+                    if (clientGroup.length)                    [keys addObject:[NSString stringWithFormat:@"%@_%@", identifier, clientGroup]];
+                    if (vertical.length)                       [keys addObject:[NSString stringWithFormat:@"%@_%@", identifier, vertical]];
+                    if (solution.length)                       [keys addObject:[NSString stringWithFormat:@"%@_%@", identifier, solution]];
+                                                                   [keys addObject:identifier ?: @""];
+                }
+
+                // --- scopes
+                NSMutableArray<NSString *> *scopesToTry = [NSMutableArray array];
+                if ([scope isEqualToString:@"containR"]) {
+                    [scopesToTry addObject:@"containR"];
+                    [scopesToTry addObject:kind];
+                } else {
+                    [scopesToTry addObject:kind];
+                    [scopesToTry addObject:@"containR"];
+                }
+
+                // --- search
+                BOOL found = NO;
+                NSString *resolvedKey = nil; NSString *usedExt = nil; NSString *absPath = nil; NSString *content = nil;
+
+                for (NSString *key in keys) {
+                    for (NSString *sc in scopesToTry) {
+                        ResolveResult *rr = [self resolveGenericFileWithRoots:roots
+                                                                         scope:sc
+                                                                          kind:kind
+                                                                            id:identifier
+                                                                        transNo:transNo
+                                                                           key:key];
+                        if (rr && rr.fileURL) {
+                            NSString *tryPath = rr.fileURL.path;
+                            NSLog(@"mInterface: Trying: %@", tryPath);
+                            BOOL isDir = NO;
+                            if ([fm fileExistsAtPath:tryPath isDirectory:&isDir] && !isDir) {
+                                NSError *readErr = nil;
+                                NSString *txt = [NSString stringWithContentsOfURL:rr.fileURL
+                                                                         encoding:NSUTF8StringEncoding
+                                                                            error:&readErr];
+                                if (!readErr && txt != nil) {
+                                    content     = txt;
+                                    resolvedKey = key;
+                                    usedExt     = rr.ext ?: @"";
+                                    absPath     = tryPath;
+                                    found       = YES;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (found) break;
+                }
+
+                // --- respond
+                if (found) {
+                    NSDictionary *payload = @{
+                        @"configType":    kind ?: @"",
+                        @"srcKey":  resolvedKey ?: @"",
+                        @"ext":     usedExt ?: @"",
+                        @"path":    absPath ?: @"",
+                        @"content": content ?: @""
+                    };
+                 
+                    NSError *jsonError = nil; // declare inside the block
+                    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:payload
+                                                                       options:0
+                                                                         error:&jsonError];
+                    NSString *jsonStr = [[NSString alloc] initWithData:jsonData
+                                                              encoding:NSUTF8StringEncoding];
+                 
+                    CDVPluginResult *ok = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
+                                                            messageAsString:jsonStr ?: @"{}"];
+                    [self.commandDelegate sendPluginResult:ok callbackId:command.callbackId];
+                } else {
+                    CDVPluginResult *errRes = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                                               messageAsString:@"NOT_FOUND"];
+                    [self.commandDelegate sendPluginResult:errRes callbackId:command.callbackId];
+                }
+
+            } @catch (NSException *ex) {
+                CDVPluginResult *errRes = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[NSString stringWithFormat:@"GetConfigCascade failed: %@", ex.reason ?: @""]];
+                [self.commandDelegate sendPluginResult:errRes callbackId:command.callbackId];
+            }
+        }];
+    } @catch (NSException *exOuter) {
+        CDVPluginResult *errRes = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[NSString stringWithFormat:@"GetConfigCascade failed: %@", exOuter.reason ?: @""]];
+        [self.commandDelegate sendPluginResult:errRes callbackId:command.callbackId];
+    }
+}
+
+#pragma mark - Helpers
+
+- (NSArray<NSURL*> *)buildRootsWithBase:(NSURL *)baseDir
+                             rootPrefix:(NSString *)rootPrefix
+                            clientGroup:(NSString *)clientGroup
+                               clientId:(NSString *)clientId
+                            countryCode:(NSString *)countryCode {
+    NSMutableArray<NSURL*> *roots = [NSMutableArray array];
+    NSMutableSet<NSString*> *seen = [NSMutableSet set];
+
+    void (^addIfUnique)(NSURL *) = ^(NSURL *u){
+        if (!u) return;
+        NSString *p = u.path;
+        if (p.length && ![seen containsObject:p]) { [roots addObject:u]; [seen addObject:p]; }
+    };
+
+    @try {
+        NSURL *r1 = [[[baseDir URLByAppendingPathComponent:rootPrefix isDirectory:YES]
+                                 URLByAppendingPathComponent:clientId isDirectory:YES]
+                                 URLByAppendingPathComponent:countryCode isDirectory:YES];
+        addIfUnique(r1);
+
+        NSURL *r2 = [[[[baseDir URLByAppendingPathComponent:rootPrefix isDirectory:YES]
+                                   URLByAppendingPathComponent:clientId isDirectory:YES]
+                                   URLByAppendingPathComponent:clientId isDirectory:YES]
+                                   URLByAppendingPathComponent:countryCode isDirectory:YES];
+        addIfUnique(r2);
+
+        if (clientGroup.length) {
+            NSURL *r3 = [[[[baseDir URLByAppendingPathComponent:rootPrefix isDirectory:YES]
+                                       URLByAppendingPathComponent:clientGroup isDirectory:YES]
+                                       URLByAppendingPathComponent:clientId isDirectory:YES]
+                                       URLByAppendingPathComponent:countryCode isDirectory:YES];
+            addIfUnique(r3);
+        }
+    } @catch (__unused NSException *e) {}
+    return roots;
+}
+
+- (NSString *)prefixForKind:(NSString *)kind {
+    if ([kind isEqualToString:@"controller"]) return @"controller_";
+    if ([kind isEqualToString:@"label"])      return @"label_";
+    if ([kind isEqualToString:@"rule"])       return @"rule_";
+    if ([kind isEqualToString:@"template"])   return @"template_";
+    if ([kind isEqualToString:@"ui"])         return @"ui_";
+    return [kind stringByAppendingString:@"_"];
+}
+
+- (NSArray<NSString*> *)extensionsForKind:(NSString *)kind {
+    if ([kind isEqualToString:@"controller"]) return @[ @"json" ];
+    if ([kind isEqualToString:@"label"])      return @[ @"json", @"txt" ];
+    if ([kind isEqualToString:@"rule"])       return @[ @"txt", @"json" ];
+    if ([kind isEqualToString:@"template"])   return @[ @"html", @"json" ];
+    if ([kind isEqualToString:@"ui"])         return @[ @"html", @"json" ];
+    return @[ @"json" ];
+}
+
+- (ResolveResult *)resolveGenericFileWithRoots:(NSArray<NSURL*> *)roots
+                                         scope:(NSString *)scope
+                                          kind:(NSString *)kind
+                                            id:(NSString *)identifier
+                                        transNo:(NSString *)transNo
+                                           key:(NSString *)key {
+    NSArray<NSString*> *exts = [self extensionsForKind:kind];
+    NSString *prefix = [self prefixForKind:kind];
+
+    NSArray<NSString*> *nameVariants = [kind isEqualToString:@"label"]
+        ? @[ [prefix stringByAppendingString:key], key ]
+        : @[ [prefix stringByAppendingString:key] ];
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+
+    @try {
+        for (NSURL *root in roots) {
+            if (!root) continue;
+
+            for (NSString *ext in exts) {
+
+                if ([scope isEqualToString:@"containR"]) {
+                    NSURL *containRDir = [root URLByAppendingPathComponent:@"containR" isDirectory:YES];
+                    NSURL *screenDir   = [containRDir URLByAppendingPathComponent:identifier isDirectory:YES];
+
+                    if (transNo.length) {
+                        NSURL *transDir = [screenDir URLByAppendingPathComponent:transNo isDirectory:YES];
+
+                        if ([kind isEqualToString:@"label"]) {
+                            NSURL *labelDir  = [transDir URLByAppendingPathComponent:@"label"  isDirectory:YES];
+                            NSURL *labelsDir = [transDir URLByAppendingPathComponent:@"labels" isDirectory:YES];
+
+                            for (NSString *nv in nameVariants) {
+                                NSArray<NSURL*> *cands = @[
+                                    [labelDir  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                    [labelsDir URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                    [transDir  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]]
+                                ];
+                                for (NSURL *u in cands) {
+                                    if ([fm fileExistsAtPath:u.path isDirectory:NULL]) {
+                                        ResolveResult *rr = [ResolveResult new]; rr.fileURL = u; rr.ext = ext; return rr;
+                                    }
+                                }
+                            }
+                        } else {
+                            NSURL *typeDir = [transDir URLByAppendingPathComponent:kind isDirectory:YES];
+                            NSURL *f1 = [typeDir URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                            NSURL *f2 = [transDir URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                            if ([fm fileExistsAtPath:f1.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f1; rr.ext=ext; return rr; }
+                            if ([fm fileExistsAtPath:f2.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f2; rr.ext=ext; return rr; }
+                        }
+                    }
+
+                    if ([kind isEqualToString:@"label"]) {
+                        NSURL *labelDirNT  = [screenDir URLByAppendingPathComponent:@"label"  isDirectory:YES];
+                        NSURL *labelsDirNT = [screenDir URLByAppendingPathComponent:@"labels" isDirectory:YES];
+                        for (NSString *nv in nameVariants) {
+                            NSArray<NSURL*> *cands = @[
+                                [labelDirNT  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [labelsDirNT URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [screenDir   URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]]
+                            ];
+                            for (NSURL *u in cands) {
+                                if ([fm fileExistsAtPath:u.path isDirectory:NULL]) {
+                                    ResolveResult *rr = [ResolveResult new]; rr.fileURL = u; rr.ext = ext; return rr;
+                                }
+                            }
+                        }
+                    } else {
+                        NSURL *typeDirNT = [screenDir URLByAppendingPathComponent:kind isDirectory:YES];
+                        NSURL *f1 = [typeDirNT URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        NSURL *f2 = [screenDir  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        if ([fm fileExistsAtPath:f1.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f1; rr.ext=ext; return rr; }
+                        if ([fm fileExistsAtPath:f2.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f2; rr.ext=ext; return rr; }
+                    }
+
+                } else {
+                    NSURL *cfg = [root URLByAppendingPathComponent:@"configuration_package" isDirectory:YES];
+
+                    if ([kind isEqualToString:@"label"]) {
+                        NSURL *labelDir  = [cfg URLByAppendingPathComponent:@"label"  isDirectory:YES];
+                        NSURL *labelsDir = [cfg URLByAppendingPathComponent:@"labels" isDirectory:YES];
+
+                        for (NSString *nv in nameVariants) {
+                            NSArray<NSURL*> *cands1 = @[
+                                [labelDir  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [labelsDir URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]]
+                            ];
+                            for (NSURL *u in cands1) {
+                                if ([fm fileExistsAtPath:u.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=u; rr.ext=ext; return rr; }
+                            }
+                            NSArray<NSURL*> *cands2 = @[
+                                [[labelDir  URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [[labelsDir URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]]
+                            ];
+                            for (NSURL *u in cands2) {
+                                if ([fm fileExistsAtPath:u.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=u; rr.ext=ext; return rr; }
+                            }
+                        }
+
+                        NSURL *cfg2    = [root URLByAppendingPathComponent:@"configuration" isDirectory:YES];
+                        NSURL *label2  = [cfg2 URLByAppendingPathComponent:@"label"  isDirectory:YES];
+                        NSURL *labels2 = [cfg2 URLByAppendingPathComponent:@"labels" isDirectory:YES];
+                        for (NSString *nv in nameVariants) {
+                            NSArray<NSURL*> *cands3 = @[
+                                [label2  URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [labels2 URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [[label2  URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]],
+                                [[labels2 URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", nv, ext]]
+                            ];
+                            for (NSURL *u in cands3) {
+                                if ([fm fileExistsAtPath:u.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=u; rr.ext=ext; return rr; }
+                            }
+                        }
+
+                    } else {
+                        NSURL *typeDir = [cfg URLByAppendingPathComponent:kind isDirectory:YES];
+                        NSURL *f1 = [typeDir URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        NSURL *f2 = [[typeDir URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        if ([fm fileExistsAtPath:f1.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f1; rr.ext=ext; return rr; }
+                        if ([fm fileExistsAtPath:f2.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f2; rr.ext=ext; return rr; }
+
+                        NSURL *cfg2  = [root URLByAppendingPathComponent:@"configuration" isDirectory:YES];
+                        NSURL *type2 = [cfg2 URLByAppendingPathComponent:kind isDirectory:YES];
+                        NSURL *f3 = [type2 URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        NSURL *f4 = [[type2 URLByAppendingPathComponent:identifier isDirectory:YES] URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [prefix stringByAppendingString:key], ext]];
+                        if ([fm fileExistsAtPath:f3.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f3; rr.ext=ext; return rr; }
+                        if ([fm fileExistsAtPath:f4.path isDirectory:NULL]) { ResolveResult *rr=[ResolveResult new]; rr.fileURL=f4; rr.ext=ext; return rr; }
+                    }
+                }
+            }
+        }
+    } @catch (__unused NSException *e) {}
+    return nil;
+}
+
  
 // Inside the @implementation block
 - (void)ScanBarCode:(CDVInvokedUrlCommand*)command {