⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286615 in webkit


Ignore:
Timestamp:
Dec 7, 2021, 1:19:46 PM (5 years ago)
Author:
Russell Epstein
Message:

Cherry-pick r286533. rdar://problem/86052131

Add command line webpushtool for daemon development and debugging.
​https://bugs.webkit.org/show_bug.cgi?id=233845

Reviewed by Tim Horton.

No behavior change.

This utility will eventually be quite fleshed out.

For now, it can act as a terminal that prints debug messages from webpushd.

  • Configurations/webpushtool.xcconfig: Added.
  • Resources/webpushtool.entitlements: Added.
  • WebKit.xcodeproj/project.pbxproj:
  • WebKit.xcodeproj/xcshareddata/xcschemes/webpushtool.xcscheme: Added.
  • webpushd/webpushtool/WebPushToolConnection.h: Added.
  • webpushd/webpushtool/WebPushToolConnection.mm: Added. (WebPushTool::Connection::create): (WebPushTool::maybeConnectToService): (WebPushTool::Connection::Connection): (WebPushTool::Connection::connectToService): (WebPushTool::Connection::startAction): (WebPushTool::Connection::startDebugStreamAction): (WebPushTool::Connection::sendAuditToken): (WebPushTool::Connection::connectionDropped): (WebPushTool::Connection::messageReceived):
  • webpushd/webpushtool/WebPushToolMain.mm: Added. (printUsageAndTerminate): (main):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@286533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-613.1.10-branch/Source/WebKit
Files:
7 added
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-613.1.10-branch/Source/WebKit/ChangeLog

    r286614 r286615  
     12021-12-06  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r286533. rdar://problem/86052131
     4
     5    Add command line `webpushtool` for daemon development and debugging.
     6    https://bugs.webkit.org/show_bug.cgi?id=233845
     7   
     8    Reviewed by Tim Horton.
     9   
     10    No behavior change.
     11   
     12    This utility will eventually be quite fleshed out.
     13   
     14    For now, it can act as a terminal that prints debug messages from webpushd.
     15   
     16    * Configurations/webpushtool.xcconfig: Added.
     17    * Resources/webpushtool.entitlements: Added.
     18    * WebKit.xcodeproj/project.pbxproj:
     19    * WebKit.xcodeproj/xcshareddata/xcschemes/webpushtool.xcscheme: Added.
     20   
     21    * webpushd/webpushtool/WebPushToolConnection.h: Added.
     22    * webpushd/webpushtool/WebPushToolConnection.mm: Added.
     23    (WebPushTool::Connection::create):
     24    (WebPushTool::maybeConnectToService):
     25    (WebPushTool::Connection::Connection):
     26    (WebPushTool::Connection::connectToService):
     27    (WebPushTool::Connection::startAction):
     28    (WebPushTool::Connection::startDebugStreamAction):
     29    (WebPushTool::Connection::sendAuditToken):
     30    (WebPushTool::Connection::connectionDropped):
     31    (WebPushTool::Connection::messageReceived):
     32    * webpushd/webpushtool/WebPushToolMain.mm: Added.
     33    (printUsageAndTerminate):
     34    (main):
     35   
     36    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286533 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     37
     38    2021-12-04  Brady Eidson  <beidson@apple.com>
     39
     40            Add command line `webpushtool` for daemon development and debugging.
     41            https://bugs.webkit.org/show_bug.cgi?id=233845
     42
     43            Reviewed by Tim Horton.
     44
     45            No behavior change.
     46
     47            This utility will eventually be quite fleshed out.
     48
     49            For now, it can act as a terminal that prints debug messages from webpushd.
     50
     51            * Configurations/webpushtool.xcconfig: Added.
     52            * Resources/webpushtool.entitlements: Added.
     53            * WebKit.xcodeproj/project.pbxproj:
     54            * WebKit.xcodeproj/xcshareddata/xcschemes/webpushtool.xcscheme: Added.
     55
     56            * webpushd/webpushtool/WebPushToolConnection.h: Added.
     57            * webpushd/webpushtool/WebPushToolConnection.mm: Added.
     58            (WebPushTool::Connection::create):
     59            (WebPushTool::maybeConnectToService):
     60            (WebPushTool::Connection::Connection):
     61            (WebPushTool::Connection::connectToService):
     62            (WebPushTool::Connection::startAction):
     63            (WebPushTool::Connection::startDebugStreamAction):
     64            (WebPushTool::Connection::sendAuditToken):
     65            (WebPushTool::Connection::connectionDropped):
     66            (WebPushTool::Connection::messageReceived):
     67            * webpushd/webpushtool/WebPushToolMain.mm: Added.
     68            (printUsageAndTerminate):
     69            (main):
     70
    1712021-12-06  Russell Epstein  <repstein@apple.com>
    272

  • branches/safari-613.1.10-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r286614 r286615  
    1515                        );
    1616                        dependencies = (
     17                                517B5F6D275B07C3002DC22D /* PBXTargetDependency */,
    1718                                5C1579DF27165E0800ED5280 /* PBXTargetDependency */,
    1819                                5CAF7AA926F93F9F0003F19E /* PBXTargetDependency */,
    … …  
    10221023                517B5F2E2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F2D2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h */; };
    10231024                517B5F2F2757382B002DC22D /* WebPushDaemonConnectionConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F2D2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h */; };
     1025                517B5F65275A8D7F002DC22D /* WebPushToolMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */; };
     1026                517B5F68275A9A78002DC22D /* WebPushToolConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */; };
    10241027                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
    10251028                517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
    … …  
    21152118                        remoteGlobalIDString = C0CE72851247E66800BC0EC4;
    21162119                        remoteInfo = "Derived Sources";
     2120                };
     2121                517B5F6C275B07C3002DC22D /* PBXContainerItemProxy */ = {
     2122                        isa = PBXContainerItemProxy;
     2123                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
     2124                        proxyType = 1;
     2125                        remoteGlobalIDString = 517B5F5A275A8D3E002DC22D;
     2126                        remoteInfo = webpushtool;
    21172127                };
    21182128                5742A2E72535613F00B7BA14 /* PBXContainerItemProxy */ = {
    … …  
    43214331                517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSWClientConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/WebSWClientConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    43224332                517B5F2D2757382A002DC22D /* WebPushDaemonConnectionConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPushDaemonConnectionConfiguration.h; sourceTree = "<group>"; };
     4333                517B5F5B275A8D3E002DC22D /* webpushtool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = webpushtool; sourceTree = BUILT_PRODUCTS_DIR; };
     4334                517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPushToolMain.mm; sourceTree = "<group>"; };
     4335                517B5F66275A9A78002DC22D /* WebPushToolConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPushToolConnection.h; sourceTree = "<group>"; };
     4336                517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPushToolConnection.mm; sourceTree = "<group>"; };
     4337                517B5F6A275AA199002DC22D /* webpushtool.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = webpushtool.xcconfig; sourceTree = "<group>"; };
     4338                517B5F6B275AE50B002DC22D /* webpushtool.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = webpushtool.entitlements; path = Resources/webpushtool.entitlements; sourceTree = "<group>"; };
    43234339                517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkProcessConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    43244340                517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CacheStorageEngineConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/CacheStorageEngineConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    63736389                        runOnlyForDeploymentPostprocessing = 0;
    63746390                };
     6391                517B5F58275A8D3E002DC22D /* Frameworks */ = {
     6392                        isa = PBXFrameworksBuildPhase;
     6393                        buildActionMask = 2147483647;
     6394                        files = (
     6395                        );
     6396                        runOnlyForDeploymentPostprocessing = 0;
     6397                };
    63756398                5742A2ED2535613F00B7BA14 /* Frameworks */ = {
    63766399                        isa = PBXFrameworksBuildPhase;
    … …  
    64586481                                A16E66002581930800EE1749 /* MediaFormatReader.bundle */,
    64596482                                8DC2EF5B0486A6940098B216 /* WebKit.framework */,
     6483                                517B5F5B275A8D3E002DC22D /* webpushtool */,
    64606484                        );
    64616485                        name = Products;
    … …  
    67006724                                E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */,
    67016725                                E133FD891423DD7F00FC7BFB /* WebKit.icns */,
     6726                                517B5F6B275AE50B002DC22D /* webpushtool.entitlements */,
    67026727                        );
    67036728                        name = Resources;
    … …  
    68506875                                37119A7C20CCB64E002C6DC9 /* WebKitTargetConditionals.xcconfig */,
    68516876                                5C1579DD27165BE500ED5280 /* webpushd.xcconfig */,
     6877                                517B5F6A275AA199002DC22D /* webpushtool.xcconfig */,
    68526878                        );
    68536879                        path = Configurations;
    … …  
    93399365                        sourceTree = "<group>";
    93409366                };
     9367                517B5F63275A8D5C002DC22D /* webpushtool */ = {
     9368                        isa = PBXGroup;
     9369                        children = (
     9370                                517B5F66275A9A78002DC22D /* WebPushToolConnection.h */,
     9371                                517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */,
     9372                                517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */,
     9373                        );
     9374                        path = webpushtool;
     9375                        sourceTree = "<group>";
     9376                };
    93419377                518E8EF116B208F000E91429 /* Authentication */ = {
    93429378                        isa = PBXGroup;
    … …  
    98189854                        children = (
    98199855                                5CBB6D4D271F67CC00FD1A5D /* com.apple.webkit.webpushd.plist */,
     9856                                517B5F63275A8D5C002DC22D /* webpushtool */,
    98209857                                5160E954274B887100567388 /* AppBundleRequest.h */,
    98219858                                5160E953274B887100567388 /* AppBundleRequest.mm */,
    … …  
    1386913906                        productType = "com.apple.product-type.xpc-service";
    1387013907                };
     13908                517B5F5A275A8D3E002DC22D /* webpushtool */ = {
     13909                        isa = PBXNativeTarget;
     13910                        buildConfigurationList = 517B5F62275A8D3E002DC22D /* Build configuration list for PBXNativeTarget "webpushtool" */;
     13911                        buildPhases = (
     13912                                517B5F57275A8D3E002DC22D /* Sources */,
     13913                                517B5F58275A8D3E002DC22D /* Frameworks */,
     13914                        );
     13915                        buildRules = (
     13916                        );
     13917                        dependencies = (
     13918                        );
     13919                        name = webpushtool;
     13920                        productName = webpushtool;
     13921                        productReference = 517B5F5B275A8D3E002DC22D /* webpushtool */;
     13922                        productType = "com.apple.product-type.tool";
     13923                };
    1387113924                5742A2E52535613F00B7BA14 /* WebAuthn */ = {
    1387213925                        isa = PBXNativeTarget;
    … …  
    1406514118                                LastUpgradeCheck = 1140;
    1406614119                                TargetAttributes = {
     14120                                        517B5F5A275A8D3E002DC22D = {
     14121                                                CreatedOnToolsVersion = 13.0;
     14122                                        };
    1406714123                                        5325BDCD21DFF47700A0DEE1 = {
    1406814124                                                CreatedOnToolsVersion = 10.1;
    … …  
    1412114177                                5CAF7A9926F93A750003F19E /* adattributiond */,
    1412214178                                5C1579CC27165B2F00ED5280 /* webpushd */,
     14179                                517B5F5A275A8D3E002DC22D /* webpushtool */,
    1412314180                        );
    1412414181                };
    … …  
    1484514902                                5CE912112293C278005BEC78 /* AuxiliaryProcessMain.cpp in Sources */,
    1484614903                                5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
     14904                        );
     14905                        runOnlyForDeploymentPostprocessing = 0;
     14906                };
     14907                517B5F57275A8D3E002DC22D /* Sources */ = {
     14908                        isa = PBXSourcesBuildPhase;
     14909                        buildActionMask = 2147483647;
     14910                        files = (
     14911                                517B5F68275A9A78002DC22D /* WebPushToolConnection.mm in Sources */,
     14912                                517B5F65275A8D7F002DC22D /* WebPushToolMain.mm in Sources */,
    1484714913                        );
    1484814914                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1540215468                        targetProxy = 37F7407812721F740093869B /* PBXContainerItemProxy */;
    1540315469                };
     15470                517B5F6D275B07C3002DC22D /* PBXTargetDependency */ = {
     15471                        isa = PBXTargetDependency;
     15472                        target = 517B5F5A275A8D3E002DC22D /* webpushtool */;
     15473                        targetProxy = 517B5F6C275B07C3002DC22D /* PBXContainerItemProxy */;
     15474                };
    1540415475                5742A2E62535613F00B7BA14 /* PBXTargetDependency */ = {
    1540515476                        isa = PBXTargetDependency;
    … …  
    1563115702                        name = Production;
    1563215703                };
     15704                517B5F5F275A8D3E002DC22D /* Debug */ = {
     15705                        isa = XCBuildConfiguration;
     15706                        baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
     15707                        buildSettings = {
     15708                        };
     15709                        name = Debug;
     15710                };
     15711                517B5F60275A8D3E002DC22D /* Release */ = {
     15712                        isa = XCBuildConfiguration;
     15713                        baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
     15714                        buildSettings = {
     15715                        };
     15716                        name = Release;
     15717                };
     15718                517B5F61275A8D3E002DC22D /* Production */ = {
     15719                        isa = XCBuildConfiguration;
     15720                        baseConfigurationReference = 517B5F6A275AA199002DC22D /* webpushtool.xcconfig */;
     15721                        buildSettings = {
     15722                        };
     15723                        name = Production;
     15724                };
    1563315725                5325BDCE21DFF47800A0DEE1 /* Debug */ = {
    1563415726                        isa = XCBuildConfiguration;
    … …  
    1602416116                        defaultConfigurationName = Production;
    1602516117                };
     16118                517B5F62275A8D3E002DC22D /* Build configuration list for PBXNativeTarget "webpushtool" */ = {
     16119                        isa = XCConfigurationList;
     16120                        buildConfigurations = (
     16121                                517B5F5F275A8D3E002DC22D /* Debug */,
     16122                                517B5F60275A8D3E002DC22D /* Release */,
     16123                                517B5F61275A8D3E002DC22D /* Production */,
     16124                        );
     16125                        defaultConfigurationIsVisible = 0;
     16126                        defaultConfigurationName = Production;
     16127                };
    1602616128                5325BDD121DFF47800A0DEE1 /* Build configuration list for PBXAggregateTarget "Apply Configuration to XCFileLists" */ = {
    1602716129                        isa = XCConfigurationList;
Note: See TracChangeset for help on using the changeset viewer.