Merge pull request 'Update deviceAttributes' (#3) from abbodi1406/api:master into master

Reviewed-on: uup-dump/api#3

fetchupd.php

@@ -33,6 +33,15 @@ function uupApiPrivateParseFlags($str) {
     return [$split[0], $flagsSafe];
 }
 
+function uupApiPrivateParseRing($str) {
+    $split = explode(':', $str);
+    if(!isset($split[1])) {
+        return [$split[0], -1];
+    }
+
+    return $split;
+}
+
 function uupApiPrivateGetLatestBuild() {
     $ids = uupListIds();
 
@@ -100,6 +109,7 @@ function uupApiPrivateNormalizeFetchParams($params) {
         'sku' => 48,
         'type' => 'Production',
         'flags' => [],
+        'targetRelease' => -1,
     ], $params);
 
     if(!is_array($np['flags'])) $np['flags'] = [];
@@ -113,6 +123,7 @@ function uupApiPrivateNormalizeFetchParams($params) {
     $np['sku'] = intval($np['sku']);
     $np['type'] = ucwords(strtolower($np['type']));
     $np['flags'] = array_map('strtolower', $np['flags']);
+    $np['targetRelease'] = intval($np['targetRelease']);
 
     return $np;
 }
@@ -128,6 +139,7 @@ function uupFetchUpd(
     $cacheRequests = 0
 ) {
     [$build, $flags] = uupApiPrivateParseFlags($build);
+    [$ring, $targetRelease] = uupApiPrivateParseRing($ring);
 
     $params = [
         'arch' => $arch,
@@ -138,6 +150,7 @@ function uupFetchUpd(
         'sku' => $sku,
         'type' => $type,
         'flags' => $flags,
+        'targetRelease' => $targetRelease,
     ];
 
     return uupFetchUpd2($params, $cacheRequests);
@@ -157,6 +170,7 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
     $sku = $np['sku'];
     $type = $np['type'];
     $flags = $np['flags'];
+    $targetRelease = $np['targetRelease'];
 
     $flagsStr = implode(',', $flags);
 
@@ -214,13 +228,13 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
         $type = 'Production';
     }
 
-    $res = "api-fetch-$arch-$ring-$flight-$branch-$build-$flagsStr-$minor-$sku-$type";
+    $res = "api-fetch-$arch-$ring-$flight-$branch-$build-$flagsStr-$minor-$sku-$type-$targetRelease";
     $cache = new UupDumpCache($res);
     $fromCache = $cache->get();
     if($fromCache !== false) return $fromCache;
 
     consoleLogger('Fetching information from the server...');
-    $composerArgs = [$arch, $flight, $ring, $build, $sku, $type, $flags, $branch];
+    $composerArgs = [$arch, $flight, $ring, $build, $sku, $type, $flags, $branch, $targetRelease];
     $out = sendWuPostRequestHelper('client', 'composeFetchUpdRequest', $composerArgs);
     if($out === false || $out['error'] != 200) {
         consoleLogger('The request has failed');
@@ -248,7 +262,7 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
         $num++;
         consoleLogger("Checking build information for update {$num} of {$updatesNum}...");
 
-        $info = parseFetchUpdate($val, $out, $arch, $ring, $flight, $build, $sku, $type, $flags, $branch);
+        $info = parseFetchUpdate($val, $out, $arch, $ring, $flight, $build, $sku, $type, $flags, $branch, $targetRelease);
         if(isset($info['error'])) {
             $errorCount++;
             continue;
@@ -278,7 +292,7 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
     return $data;
 }
 
-function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku, $type, $flags, $branch) {
+function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku, $type, $flags, $branch, $targetRelease) {
     $updateNumId = preg_replace('/<UpdateInfo><ID>|<\/ID>.*/i', '', $updateInfo);
 
     $updates = preg_replace('/<Update>/', "\n<Update>", $out);
@@ -493,6 +507,7 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
         $temp['ring'] = $ring;
         $temp['flight'] = $flight;
         $temp['branch'] = $branch;
+        $temp['targetRelease'] = $targetRelease;
         $temp['arch'] = $foundArch;
         $temp['fetchArch'] = $arch == 'all' ? 'amd64' : $arch;
         $temp['build'] = $foundBuild;

listid.php

@@ -27,19 +27,8 @@ function uupApiPrivateInvalidateFileinfoCache() {
     $cache2->delete();
 }
 
-function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
-    $dirs = uupApiGetFileinfoDirs();
-    $fileinfo = $dirs['fileinfoData'];
-    $fileinfoRoot = $dirs['fileinfo'];
-
-    $files = scandir($fileinfo);
-    $files = preg_grep('/\.json$/', $files);
-
-    consoleLogger('Parsing database info...');
-
-    $cacheFile = $fileinfoRoot.'/cache.json';
+function uupApiGetFileInfoCache($cacheFile) {
     $cacheV2Version = 1;
-
     $database = uupApiReadJson($cacheFile);
 
     if(isset($database['version'])) {
@@ -54,88 +43,98 @@ function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
         $database = array();
     }
 
-    if(empty($database)) $database = array();
+    if(empty($database))
+        $database = [];
+
+    return $database;
+}
+
+function uupApiPrivateGetCachedBuild(&$cache, $uuid) {
+    if(!isset($cache[$uuid])) {
+        $info = uupApiReadFileinfoMeta($uuid);
+        $data = [
+            'title' => isset($info['title']) ? $info['title'] : 'UNKNOWN',
+            'build' => isset($info['build']) ? $info['build'] : 'UNKNOWN',
+            'arch' => isset($info['arch']) ? $info['arch'] : 'UNKNOWN',
+            'created' => isset($info['created']) ? $info['created'] : null,
+        ];
+
+        $cache[$uuid] = $data;
+    } else {
+        $data = $cache[$uuid];
+    }
+
+    $data['uuid'] = $uuid;
+    return $data;
+}
+
+function uupApiPrivateGetSortTag($data, $sortByDate) {
+    $tmp = explode('.', $data['build']);
+
+    if($sortByDate) {
+        $tag = PHP_INT_MAX - intval($data['created']);
+    } else {
+        $tag = '';
+    }
+
+    $tag .= intval(uupApiIsUpdateLowPriority($data['title']));
+
+    if(isset($tmp[1])) {
+        $tag .= str_pad(999999999 - $tmp[0], 10, '0', STR_PAD_LEFT);
+        $tag .= str_pad(999999999 - $tmp[1], 10, '0', STR_PAD_LEFT);
+    }
+
+    $tag .= $data['arch'] . $data['title'] . $data['uuid'];
+
+    return $tag;
+}
+
+function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
+    $dirs = uupApiGetFileinfoDirs();
+    $fileinfo = $dirs['fileinfoData'];
+    $fileinfoRoot = $dirs['fileinfo'];
+
+    $files = scandir($fileinfo);
+    $files = preg_grep('/\.json$/', $files);
+
+    consoleLogger('Parsing database info...');
+
+    $cacheFile = $fileinfoRoot.'/cache.json';
+    $cacheV2Version = 1;
+
+    $database = uupApiGetFileInfoCache($cacheFile);
+    $oldDb = $database;
 
-    $newDb = array();
-    $builds = array();
     foreach($files as $file) {
         if($file == '.' || $file == '..')
             continue;
 
         $uuid = preg_replace('/\.json$/', '', $file);
 
-        if(!isset($database[$uuid])) {
-            $info = uupApiReadFileinfoMeta($uuid);
+        $data = uupApiPrivateGetCachedBuild($database, $uuid);
+        $tag = uupApiPrivateGetSortTag($data, $sortByDate);
 
-            $title = isset($info['title']) ? $info['title'] : 'UNKNOWN';
-            $build = isset($info['build']) ? $info['build'] : 'UNKNOWN';
-            $arch = isset($info['arch']) ? $info['arch'] : 'UNKNOWN';
-            $created = isset($info['created']) ? $info['created'] : null;
-
-            $temp = array(
-                'title' => $title,
-                'build' => $build,
-                'arch' => $arch,
-                'created' => $created,
-            );
-
-            $newDb[$uuid] = $temp;
-        } else {
-            $title = $database[$uuid]['title'];
-            $build = $database[$uuid]['build'];
-            $arch = $database[$uuid]['arch'];
-            $created = $database[$uuid]['created'];
-
-            $newDb[$uuid] = $database[$uuid];
-        }
-
-        $temp = array(
-            'title' => $title,
-            'build' => $build,
-            'arch' => $arch,
-            'created' => $created,
-            'uuid' => $uuid,
-        );
-
-        $tmp = explode('.', $build);
-        if(isset($tmp[1])) {
-            $tmp[0] = str_pad($tmp[0], 10, '0', STR_PAD_LEFT);
-            $tmp[1] = str_pad($tmp[1], 10, '0', STR_PAD_LEFT);
-            $tmp = $tmp[0].$tmp[1];
-        } else {
-            consoleLogger($uuid.'.json appears to be broken and may be useless.');
-            $tmp = 0;
-        }
-
-        if($sortByDate) {
-            $tmp = $created.$tmp;
-        }
-
-        $buildAssoc[$tmp][] = $arch.$title.$uuid;
-        $builds[$tmp.$arch.$title.$uuid] = $temp;
+        $buildAssoc[$tag] = $uuid;
     }
 
-    if(empty($buildAssoc)) return [];
+    if(empty($buildAssoc)) 
+        return [];
 
-    krsort($buildAssoc);
-    $buildsNew = array();
+    ksort($buildAssoc);
 
-    foreach($buildAssoc as $key => $val) {
-        sort($val);
-        foreach($val as $id) {
-            $buildsNew[] = $builds[$key.$id];
-        }
+    $builds = [];
+    foreach($buildAssoc as $val) {
+        $builds[] = uupApiPrivateGetCachedBuild($database, $val);
     }
 
-    $builds = $buildsNew;
     consoleLogger('Done parsing database info.');
 
-    if($newDb != $database) {
+    if($database != $oldDb) {
         if(!file_exists('cache')) mkdir('cache');
 
         $cacheData = array(
             'version' => $cacheV2Version,
-            'database' => $newDb,
+            'database' => $database,
         );
 
         $success = @file_put_contents(

shared/requests.php

@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 // Composes DeviceAttributes parameter needed to fetch data
-function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $flags, $branch) {
+function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $flags, $branch, $targetRelease) {
     if($branch == 'auto')
         $branch = branchFromBuild($build);
 
@@ -116,29 +116,31 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=352',
+        'AttrDataVer=370',
         'AllowInPlaceUpgrade=1',
         'AllowOptionalContent=1',
         'AllowUpgradesWithUnsupportedTPMOrCPU=1',
+        'AllowWindowsServerFeatureUpdate=1',
         'BlockFeatureUpdates='.$blockUpgrades,
         'BranchReadinessLevel=CB',
         'CIOptin=1',
         'CurrentBranch='.$branch,
+        'DataExpDateEpoch_GE26H2='.(time()+82800),
         'DataExpDateEpoch_GE25H2='.(time()+82800),
         'DataExpDateEpoch_GE24H2='.(time()+82800),
         'DataExpDateEpoch_GE24H2Setup='.(time()+82800),
-        'DataExpDateEpoch_CU23H2='.(time()+82800),
-        'DataExpDateEpoch_CU23H2Setup='.(time()+82800),
+        'DataExpDateEpoch_NI23H2='.(time()+82800),
         'DataExpDateEpoch_NI22H2='.(time()+82800),
         'DataExpDateEpoch_NI22H2Setup='.(time()+82800),
         'DataExpDateEpoch_CO21H2='.(time()+82800),
         'DataExpDateEpoch_CO21H2Setup='.(time()+82800),
-        'DataExpDateEpoch_23H2='.(time()+82800),
         'DataExpDateEpoch_22H2='.(time()+82800),
         'DataExpDateEpoch_21H2='.(time()+82800),
         'DataExpDateEpoch_21H1='.(time()+82800),
         'DataExpDateEpoch_20H1='.(time()+82800),
+        'DataExpDateEpoch_20H1Setup='.(time()+82800),
         'DataExpDateEpoch_19H1='.(time()+82800),
+        'DataExpDateEpoch_19H1Setup='.(time()+82800),
         'DataVer_RS5=2000000000',
         'DefaultUserRegion=191',
         'DeviceFamily='.$dvcFamily,
@@ -149,11 +151,10 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         //'FlightContent='.$fltContent,
         'FlightRing='.$fltRing,
         'Free=gt64',
+        'GStatus_GE26H2=2',
         'GStatus_GE25H2=2',
         'GStatus_GE24H2=2',
         'GStatus_GE24H2Setup=2',
-        'GStatus_CU23H2=2',
-        'GStatus_CU23H2Setup=2',
         'GStatus_NI23H2=2',
         'GStatus_NI22H2=2',
         'GStatus_NI22H2Setup=2',
@@ -193,14 +194,17 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'ProcessorModel=13th Gen Intel(R) Core(TM) i7-1355U',
         'ProductType='.$prodType,
         'ReleaseType='.$type,
+        'SdbVer_GE24H2=2000000000',
+        'SdbVer_NI22H2=2000000000',
+        'SdbVer_CO21H2=2000000000',
         'SdbVer_20H1=2000000000',
         'SdbVer_19H1=2000000000',
         'SecureBootCapable=1',
         'TelemetryLevel=3',
+        'TimestampEpochString_GE26H2='.(time()-3600),
+        'TimestampEpochString_GE25H2='.(time()-3600),
         'TimestampEpochString_GE24H2='.(time()-3600),
         'TimestampEpochString_GE24H2Setup='.(time()-3600),
-        'TimestampEpochString_CU23H2='.(time()-3600),
-        'TimestampEpochString_CU23H2Setup='.(time()-3600),
         'TimestampEpochString_NI23H2='.(time()-3600),
         'TimestampEpochString_NI22H2='.(time()-3600),
         'TimestampEpochString_NI22H2Setup='.(time()-3600),
@@ -210,17 +214,21 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'TimestampEpochString_21H2='.(time()-3600),
         'TimestampEpochString_21H1='.(time()-3600),
         'TimestampEpochString_20H1='.(time()-3600),
+        'TimestampEpochString_20H1Setup='.(time()-3600),
         'TimestampEpochString_19H1='.(time()-3600),
+        'TimestampEpochString_19H1Setup='.(time()-3600),
         'TPMVersion=2',
         'UpdateManagementGroup=2',
         'UpdateOfferedDays=0',
+        'UpgEx_GE26H2=Green',
         'UpgEx_GE25H2=Green',
         'UpgEx_GE24H2Setup=Green',
         'UpgEx_GE24H2=Green',
-        'UpgEx_CU23H2=Green',
         'UpgEx_NI23H2=Green',
         'UpgEx_NI22H2=Green',
+        'UpgEx_NI22H2Setup=Green',
         'UpgEx_CO21H2=Green',
+        'UpgEx_CO21H2Setup=Green',
         'UpgEx_23H2=Green',
         'UpgEx_22H2=Green',
         'UpgEx_21H2=Green',
@@ -234,13 +242,18 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'VBSState=2',
         'Version_RS5=2000000000',
         'Win10CommercialAzureESUEligible=1',
-        'Win10CommercialKeybasedESUEligible=1',
+        'Win10CommercialKeybasedESUEligible=2',
         'Win10CommercialW365ESUEligible=1',
         'Win10ConsumerESUStatus=3',
-        'Win10ConsumerESUAY=9',
+        'Win10ConsumerESUAY=10',
         'WuClientVer='.$build,
     );
 
+    if($bldnum >= 26100) {
+        $attrib[] = 'FlightUpgradeTarget='.$targetRelease;
+        $attrib[] = 'IsFutureKeyEnabled=1';
+    }
+
     if(in_array('thisonly', $flags)) {
         $attrib[] = 'MediaBranch='.$branch;
     }
@@ -288,7 +301,6 @@ function branchFromBuild($build) {
         case 19043:
         case 19044:
         case 19045:
-        case 19046:
             $branch = 'vb_release';
             break;
 
@@ -307,7 +319,6 @@ function branchFromBuild($build) {
 
         case 22621:
         case 22631:
-        case 22635:
             $branch = 'ni_release';
             break;
 
@@ -316,7 +327,6 @@ function branchFromBuild($build) {
             break;
 
         case 26100:
-        case 26120:
         case 26200:
         case 26300:
             $branch = 'ge_release';
@@ -363,6 +373,7 @@ function composeFileGetRequest($updateId, $info, $rev = 1, $type = 'Production')
         $type,
         isset($info['flags']) ? $info['flags'] : [],
         isset($info['branch']) ? $info['branch'] : 'auto',
+        isset($info['targetRelease']) ? $info['targetRelease'] : -1
     );
 
     return <<<XML
@@ -406,7 +417,7 @@ XML;
 }
 
 // Composes POST data for fetching the latest update information from Windows Update
-function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type = 'Production', $flags = [], $branch = 'auto') {
+function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type = 'Production', $flags = [], $branch = 'auto', $targetRelease = -1) {
     $encData = uupEncryptedData();
     if($encData === false)
         return false;
@@ -506,7 +517,8 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
         $sku,
         $type,
         $flags,
-        $branch
+        $branch,
+        $targetRelease
     );
 
     $syncCurrent = in_array('thisonly', $flags) ? 'true' : 'false';
@@ -601,7 +613,7 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
                     <int>327065581</int>
                     <int>327072300</int>
                     <int>327072305</int>
-                    <int>327100345</int>
+                    <int>333703234</int>
                     <int>5143990</int>
                     <int>5169043</int>
                     <int>5169044</int>

shared/utils.php

@@ -207,3 +207,18 @@ function getAllowedFlags() {
 function uupAreAppxPresent($genPack) {
     return isset($genPack['neutral']['APP']);
 }
+
+function uupApiIsUpdateLowPriority($title) {
+    $titles = [
+        'Update Stack Package',
+        '.NET Framework',
+        'OOBE'
+    ];
+
+    foreach($titles as $val) {
+        if(str_contains($title, $val) == true)
+            return true;
+    }
+
+    return false;
+}