tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

format OC code

Browse Source
This commit is contained in:
pengfei.zhou
2019-10-12 14:48:19 +08:00
parent 820f1e9f8c
commit f9b599e7cf
43 changed files with 493 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
iOS/Pod/Classes/Dev/DoricLocalServer.m
View File

@@ -15,11 +15,11 @@
#include <net/if.h>
#include <ifaddrs.h>
typedef id (^ServerHandler)(GCDWebServerRequest * request);
typedef id (^ServerHandler)(GCDWebServerRequest *request);
@interface DoricLocalServer()
@property (nonatomic, strong) GCDWebServer *server;
@property (nonatomic, strong) NSMutableDictionary *handlers;
@interface DoricLocalServer ()
@property(nonatomic, strong) GCDWebServer *server;
@property(nonatomic, strong) NSMutableDictionary *handlers;
@end
@implementation DoricLocalServer
@@ -36,14 +36,14 @@ - (instancetype)init {
- (NSString *)localIPAddress {
NSString *localIP = nil;
struct ifaddrs *addrs;
if (getifaddrs(&addrs)==0) {
if (getifaddrs(&addrs) == 0) {
const struct ifaddrs *cursor = addrs;
while (cursor != NULL) {
if (cursor->ifa_addr->sa_family == AF_INET && (cursor->ifa_flags & IFF_LOOPBACK) == 0) {
//NSString *name = [NSString stringWithUTF8String:cursor->ifa_name];
//if ([name isEqualToString:@"en0"]) // Wi-Fi adapter
{
localIP = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)cursor->ifa_addr)->sin_addr)];
localIP = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *) cursor->ifa_addr)->sin_addr)];
break;
}
}
@@ -65,7 +65,7 @@ - (GCDWebServerResponse *)handleRequest:(GCDWebServerRequest *)request {
return [GCDWebServerDataResponse responseWithHTML:@"<html><body><p>It's a API request.</p></body></html>"];
}
NSBundle *bundle = DoricBundle();
NSString *filePath = [NSString stringWithFormat:@"%@/dist%@",bundle.bundlePath,request.path];
NSString *filePath = [NSString stringWithFormat:@"%@/dist%@", bundle.bundlePath, request.path];
NSData *data = [NSData dataWithContentsOfFile:filePath];
NSURL *url = [NSURL fileURLWithPath:filePath];
NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:url];
@@ -78,38 +78,38 @@ - (void)configurate {
__weak typeof(self) _self = self;
[self.server addDefaultHandlerForMethod:@"GET"
requestClass:[GCDWebServerRequest class]
processBlock:^GCDWebServerResponse * (GCDWebServerRequest * request) {
processBlock:^GCDWebServerResponse *(GCDWebServerRequest *request) {
__strong typeof(_self) self = _self;
return [self handleRequest:request];
}];
[self.handlers setObject:^id(GCDWebServerRequest *request) {
NSMutableArray *array = [[NSMutableArray alloc] init];
for(NSValue *value in [[DoricContextManager instance] aliveContexts]) {
DoricContext *context = value.nonretainedObjectValue;
[array addObject:@{
@"source":context.source,
@"id":context.contextId,
}];
}
return array;
}
forKey:@"allContexts"];
[self.handlers setObject:^id(GCDWebServerRequest *request) {
NSString *contextId = [request.query objectForKey:@"id"];
DoricContext *context = [[DoricContextManager instance] getContext:contextId];
return @{
@"id":context.contextId,
@"source":context.source,
@"script":context.script
};
}
NSMutableArray *array = [[NSMutableArray alloc] init];
for (NSValue *value in [[DoricContextManager instance] aliveContexts]) {
DoricContext *context = value.nonretainedObjectValue;
[array addObject:@{
@"source": context.source,
@"id": context.contextId,
}];
}
return array;
}
forKey:@"allContexts"];
[self.handlers setObject:^id(GCDWebServerRequest *request) {
NSString *contextId = [request.query objectForKey:@"id"];
DoricContext *context = [[DoricContextManager instance] getContext:contextId];
return @{
@"id": context.contextId,
@"source": context.source,
@"script": context.script
};
}
forKey:@"context"];
}
- (void)startWithPort:(NSUInteger)port {
[self.server startWithPort:port bonjourName:nil];
DoricLog(@"Start Server At %@:%d",[self localIPAddress],port);
DoricLog(@"Start Server At %@:%d", [self localIPAddress], port);
}
@end

15
iOS/Pod/Classes/Dev/DoricWSClient.m
View File

@@ -10,19 +10,20 @@
#import "DoricUtil.h"
#import "DoricContextManager.h"
@interface DoricWSClient()<SRWebSocketDelegate>
@property (nonatomic,strong) SRWebSocket *websocket;
@interface DoricWSClient () <SRWebSocketDelegate>
@property(nonatomic, strong) SRWebSocket *websocket;
@end
@implementation DoricWSClient
- (instancetype)initWithUrl:(NSString *)url {
if(self = [super init]) {
if (self = [super init]) {
_websocket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:url]];
_websocket.delegate = self;
[_websocket open];
}
return self;
}
- (void)webSocketDidOpen:(SRWebSocket *)webSocket {
DoricLog(@"webSocketDidOpen");
}
@@ -37,15 +38,15 @@ - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message {
NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
options:NSJSONReadingMutableContainers
error:&err];
if(err) {
DoricLog(@"webSocketdidReceiveMessage parse error：%@",err);
if (err) {
DoricLog(@"webSocketdidReceiveMessage parse error：%@", err);
return;
}
NSString *source = [[dic valueForKey:@"source"] mutableCopy];
NSString *script = [dic valueForKey:@"script"];
for(NSValue *value in [[DoricContextManager instance] aliveContexts]) {
for (NSValue *value in [[DoricContextManager instance] aliveContexts]) {
DoricContext *context = value.nonretainedObjectValue;
if([source containsString:context.source]) {
if ([source containsString:context.source]) {
[context reload:script];
}
}